Jacek Caban : mshtml: Added nsICommandParams argument to do_ns_command.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: beaa66f17e1039a4c91f2e58f9b34f0731b2a732
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=beaa66f17e1039a4c91f2e58...

Author: Jacek Caban 
Date:   Sat Aug 26 16:41:20 2006 +0200

mshtml: Added nsICommandParams argument to do_ns_command.

---

dlls/mshtml/nsiface.idl |   31 ++++++++++++++++++++++++++++---
 dlls/mshtml/olecmd.c    |    6 +++---
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index 8bd59c4..601e54e 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -40,6 +40,7 @@ typedef LPCWSTR nscwstring;
 typedef ULONG PRUint32;
 typedef LONG PRInt32;
 typedef WORD PRUint16;
+typedef INT16 PRInt16;
 typedef BYTE PRUint8;
 typedef BOOL PRBool;
 typedef LARGE_INTEGER PRInt64;
@@ -109,7 +110,6 @@ typedef nsISupports nsIDOMHTMLOptionsCol
 typedef nsISupports nsIDOMHTMLCollection;
 typedef nsISupports nsIDOMRange;
 typedef nsISupports nsIEditor;
-typedef nsISupports nsICommandParams;

[
     object,
@@ -540,8 +540,8 @@ interface nsIDOMHTMLDocument : nsIDOMDoc
     nsresult GetAnchors(nsIDOMHTMLCollection **aAnchors);
     nsresult GetCookie(nsAString *aCookie);
     nsresult SetCookie(const nsAString *aCookie);
-    nsresult Open(void);
-    nsresult Close(void);
+    nsresult Open();
+    nsresult Close();
     nsresult Write(const nsAString *text);
     nsresult Writeln(const nsAString *text);
     nsresult GetElementsByName(const nsAString *elementName, nsIDOMNodeList **_retval);
@@ -1177,6 +1177,31 @@ interface nsIEditingSession : nsISupport

[
     object,
+    uuid(83f892cf-7ed3-490e-967a-62640f3158e1)
+]
+interface nsICommandParams : nsISupports
+{
+    nsresult GetValueType(const char *name, PRInt16 *_retval);
+    nsresult GetBooleanValue(const char *name, PRBool *_retval);
+    nsresult GetLongValue(const char *name, PRInt32 *_retval);
+    nsresult GetDoubleValue(const char *name, double *_retval);
+    nsresult GetStringValue(const char *name, nsAString *_retval);
+    nsresult GetCStringValue(const char *name, char **_retval);
+    nsresult GetISupportsValue(const char *name, nsISupports **_retval);
+    nsresult SetBooleanValue(const char *name, PRBool value);
+    nsresult SetLongValue(const char *name, PRInt32 value);
+    nsresult SetDoubleValue(const char *name, double value);
+    nsresult SetStringValue(const char *name, const nsAString *value);
+    nsresult SetCStringValue(const char *name, const char *value);
+    nsresult SetISupportsValue(const char *name, nsISupports *value);
+    nsresult RemoveValue(const char *name);
+    nsresult HasMoreElements(PRBool *_retval);
+    nsresult First();
+    nsresult GetNext(char **_retval);
+}
+
+[
+    object,
     uuid(080d2001-f91e-11d4-a73c-f9242928207c)
 ]
 interface nsICommandManager : nsISupports
diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c
index 72d6d98..09905c2 100644
--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -238,7 +238,7 @@ static HRESULT exec_get_print_template(H
     return E_NOTIMPL;
 }

-static void do_ns_command(NSContainer *This, const char *cmd)
+static void do_ns_command(NSContainer *This, const char *cmd, nsICommandParams *nsparam)
 {
     nsICommandManager *cmdmgr;
     nsIInterfaceRequestor *iface_req;
@@ -261,7 +261,7 @@ static void do_ns_command(NSContainer *T
         return;
     }

-    nsres = nsICommandManager_DoCommand(cmdmgr, cmd, NULL, NULL);
+    nsres = nsICommandManager_DoCommand(cmdmgr, cmd, nsparam, NULL);
     if(NS_FAILED(nsres))
         ERR("DoCommand(%s) failed: %08lx\n", debugstr_a(cmd), nsres);

@@ -273,7 +273,7 @@ static HRESULT exec_bold(HTMLDocument *T
     TRACE("(%p)\n", This);

if(This->nscontainer)
-        do_ns_command(This->nscontainer, "cmd_bold");
+        do_ns_command(This->nscontainer, "cmd_bold", NULL);

return S_OK;
 }