ieframe: Use BOOL instead of VARIANT_BOOL in on_commandstate_change().

Michael Stefaniuc mstefani at redhat.de
Wed Nov 25 03:04:59 CST 2015


Commit abe564ad3bed8eee07dda6032bc926f63fe2960b started this change:
- "enable" is treated like a BOOL now.
- It is passed to methods that take a BOOL as an argument.

Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
---

De facto this is a no-op but the compiler generates different code for
dochost.c. So I'm fine if this patch gets Deferred. I just want to
send it now as long as my memory is fresh. I got puzzled by two false
positive defects reported by PVS-Studio in lines that were later
modified by the above commit.



 dlls/ieframe/dochost.c   | 2 +-
 dlls/ieframe/ieframe.h   | 2 +-
 dlls/ieframe/navigate.c  | 4 ++--
 dlls/ieframe/oleobject.c | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c
index 8f3b088..2d4261a 100644
--- a/dlls/ieframe/dochost.c
+++ b/dlls/ieframe/dochost.c
@@ -80,7 +80,7 @@ void abort_dochost_tasks(DocHost *This, task_proc_t proc)
     }
 }
 
-void on_commandstate_change(DocHost *doc_host, LONG command, VARIANT_BOOL enable)
+void on_commandstate_change(DocHost *doc_host, LONG command, BOOL enable)
 {
     DISPPARAMS dispparams;
     VARIANTARG params[2];
diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h
index ae36c65..371cb03 100644
--- a/dlls/ieframe/ieframe.h
+++ b/dlls/ieframe/ieframe.h
@@ -278,7 +278,7 @@ HRESULT dochost_object_available(DocHost*,IUnknown*) DECLSPEC_HIDDEN;
 void set_doc_state(DocHost*,READYSTATE) DECLSPEC_HIDDEN;
 void deactivate_document(DocHost*) DECLSPEC_HIDDEN;
 void create_doc_view_hwnd(DocHost*) DECLSPEC_HIDDEN;
-void on_commandstate_change(DocHost*,LONG,VARIANT_BOOL) DECLSPEC_HIDDEN;
+void on_commandstate_change(DocHost*,LONG,BOOL) DECLSPEC_HIDDEN;
 void notify_download_state(DocHost*,BOOL) DECLSPEC_HIDDEN;
 void update_navigation_commands(DocHost *dochost) DECLSPEC_HIDDEN;
 
diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c
index 1b42fa5..1027313eb 100644
--- a/dlls/ieframe/navigate.c
+++ b/dlls/ieframe/navigate.c
@@ -885,8 +885,8 @@ static HRESULT navigate_bsc(DocHost *This, BindStatusCallback *bsc, IMoniker *mo
     }
 
     notify_download_state(This, TRUE);
-    on_commandstate_change(This, CSC_NAVIGATEBACK, VARIANT_FALSE);
-    on_commandstate_change(This, CSC_NAVIGATEFORWARD, VARIANT_FALSE);
+    on_commandstate_change(This, CSC_NAVIGATEBACK, FALSE);
+    on_commandstate_change(This, CSC_NAVIGATEFORWARD, FALSE);
 
     if(This->document)
         deactivate_document(This);
diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c
index 3a75a71..2d3cac6 100644
--- a/dlls/ieframe/oleobject.c
+++ b/dlls/ieframe/oleobject.c
@@ -471,8 +471,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE
     release_client_site(This);
 
     if(!pClientSite) {
-        on_commandstate_change(&This->doc_host, CSC_NAVIGATEBACK, VARIANT_FALSE);
-        on_commandstate_change(&This->doc_host, CSC_NAVIGATEFORWARD, VARIANT_FALSE);
+        on_commandstate_change(&This->doc_host, CSC_NAVIGATEBACK, FALSE);
+        on_commandstate_change(&This->doc_host, CSC_NAVIGATEFORWARD, FALSE);
 
         if(This->doc_host.document)
             deactivate_document(&This->doc_host);
-- 
2.4.3



More information about the wine-patches mailing list