URLMON: Added IHttpNegotiate2 interface

[Jacek Caban]

Changelog:
    - Added IHttpNegotiate2 interface
    - Update BINDSTRING and IInternetSession
-------------- next part --------------
Index: include/urlmon.idl
===================================================================
RCS file: /home/wine/wine/include/urlmon.idl,v
retrieving revision 1.23
diff -u -p -r1.23 urlmon.idl
--- include/urlmon.idl	13 Sep 2005 15:00:32 -0000	1.23
+++ include/urlmon.idl	18 Sep 2005 13:07:07 -0000
@@ -293,6 +293,49 @@ interface IAuthenticate : IUnknown
 }
 
 /*****************************************************************************
+ * IHttpNegotiate interface
+ */
+[
+    object,
+    uuid(79EAC9D2-BAF9-11CE-8C82-00AA004BA90B),
+    pointer_default(unique)
+]
+interface IHttpNegotiate : IUnknown
+{
+    typedef [unique] IHttpNegotiate *LPHTTPNEGOTIATE;
+
+    HRESULT BeginningTransaction(
+        [in] LPCWSTR szURL,
+        [in, unique] LPCWSTR szHeaders,
+        [in] DWORD dwReserved,
+        [out] LPWSTR *pszAdditionalHeaders);
+
+    HRESULT OnResponse(
+        [in] DWORD dwResponseCode,
+        [in, unique] LPCWSTR szResponseHeaders,
+        [in, unique] LPCWSTR szRequestHeaders,
+        [out] LPWSTR *pszAdditionalRequestHeaders);
+}
+
+/*****************************************************************************
+ * IHttpNegotiate2 interface
+ */
+[
+    object,
+    uuid(4F9F9FCB-E0F4-48eb-B7AB-FA2EA9365CB4),
+    pointer_default(unique)
+]
+interface IHttpNegotiate2 : IHttpNegotiate
+{
+    typedef [unique] IHttpNegotiate2 *LPHTTPNEGOTIATE2;
+
+    HRESULT GetRootSecurityId(
+         [out, size_is(*pcbSecurityId)] BYTE *pbSecurityId,
+         [in, out] DWORD *pcbSecurityId,
+         [in] DWORD_PTR dwReserved);
+}
+
+/*****************************************************************************
  * IBindHost interface
  */
 cpp_quote("#define SID_IBindHost IID_IBindHost")
@@ -490,7 +533,10 @@ interface IInternetBindInfo : IUnknown
         BINDSTRING_ACCEPT_ENCODINGS,
         BINDSTRING_POST_COOKIE,
         BINDSTRING_POST_DATA_MIME,
-        BINDSTRING_URL
+        BINDSTRING_URL,
+        BINDSTRING_IID,
+        BINDSTRING_FLAG_BIND_TO_OBJECT,
+        BINDSTRING_PTR_BIND_CONTEXT
     } BINDSTRING;
 
     HRESULT GetBindInfo(
@@ -777,7 +823,7 @@ interface IInternetSession : IUnknown
         [in] LPCWSTR szUrl,
         [in] IUnknown *pUnkOuter,
         [out, unique] IUnknown **ppUnk,
-        [out, unique] /*IInternetProtocol*/ void **ppOInetProt,
+        [out, unique] IInternetProtocol **ppOInetProt,
         [in] DWORD dwOption);
 
     HRESULT SetSessionOption(
Index: dlls/urlmon/session.c
===================================================================
RCS file: /home/wine/wine/dlls/urlmon/session.c,v
retrieving revision 1.2
diff -u -p -r1.2 session.c
--- dlls/urlmon/session.c	15 Sep 2005 18:55:37 -0000	1.2
+++ dlls/urlmon/session.c	18 Sep 2005 13:07:07 -0000
@@ -92,7 +92,7 @@ static HRESULT WINAPI InternetSession_Un
 
 static HRESULT WINAPI InternetSession_CreateBinding(IInternetSession *iface,
         LPBC pBC, LPCWSTR szUrl, IUnknown *pUnkOuter, IUnknown **ppUnk,
-        void **ppOInetProt, DWORD dwOption)
+        IInternetProtocol **ppOInetProt, DWORD dwOption)
 {
     FIXME("(%p %s %p %p %p %08lx)\n", pBC, debugstr_w(szUrl), pUnkOuter, ppUnk,
             ppOInetProt, dwOption);