July 2011 - Wine-Commits - list.winehq.org

Jacek Caban : ieframe: Moved CUrlHistory implementation to ieframe.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: a40345cf84fdb79fc33c865e38aaa58d99dca703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a40345cf84fdb79fc33c865e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 12:03:33 2011 +0200 ieframe: Moved CUrlHistory implementation to ieframe. --- dlls/ieframe/Makefile.in | 3 ++- dlls/ieframe/ieframe.h | 3 ++- dlls/ieframe/ieframe_main.c | 16 ++++++++++++++++ dlls/{shdocvw => ieframe}/urlhist.c | 11 ++++++----- dlls/shdocvw/Makefile.in | 1 - dlls/shdocvw/factory.c | 7 ++----- dlls/shdocvw/shdocvw.h | 1 - 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index 129aab1..340beb0 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = uuid urlmon shell32 ole32 advapi32 C_SRCS = \ ieframe_main.c \ - intshcut.c + intshcut.c \ + urlhist.c @MAKE_DLL_RULES@ diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index e44b9c1..4e14eb9 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -32,7 +32,8 @@ #include "wine/unicode.h" -HRESULT WINAPI InternetShortcut_Create(IClassFactory*,IUnknown*,REFIID,void**); +HRESULT WINAPI CUrlHistory_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT WINAPI InternetShortcut_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern LONG module_ref DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index 225c33b..569c425 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -18,6 +18,7 @@ #include "ieframe.h" +#include "shlguid.h" #include "isguids.h" #include "wine/debug.h" @@ -75,6 +76,16 @@ static const IClassFactoryVtbl InternetShortcutFactoryVtbl = { static IClassFactory InternetShortcutFactory = { &InternetShortcutFactoryVtbl }; +static const IClassFactoryVtbl CUrlHistoryFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + CUrlHistory_Create, + ClassFactory_LockServer +}; + +static IClassFactory CUrlHistoryFactory = { &CUrlHistoryFactoryVtbl }; + /****************************************************************** * DllMain (ieframe.@) */ @@ -104,6 +115,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return IClassFactory_QueryInterface(&InternetShortcutFactory, riid, ppv); } + if(IsEqualGUID(&CLSID_CUrlHistory, rclsid)) { + TRACE("(CLSID_CUrlHistory %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&CUrlHistoryFactory, riid, ppv); + } + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/shdocvw/urlhist.c b/dlls/ieframe/urlhist.c similarity index 95% rename from dlls/shdocvw/urlhist.c rename to dlls/ieframe/urlhist.c index c801718..89480df 100644 --- a/dlls/shdocvw/urlhist.c +++ b/dlls/ieframe/urlhist.c @@ -16,10 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" -#include "shdocvw.h" +#include "ieframe.h" #include "urlhist.h" +#include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); static HRESULT WINAPI UrlHistoryStg_QueryInterface(IUrlHistoryStg2 *iface, REFIID riid, void **ppv) @@ -48,13 +49,13 @@ static HRESULT WINAPI UrlHistoryStg_QueryInterface(IUrlHistoryStg2 *iface, REFII static ULONG WINAPI UrlHistoryStg_AddRef(IUrlHistoryStg2 *iface) { - SHDOCVW_LockModule(); + lock_module(); return 2; } static ULONG WINAPI UrlHistoryStg_Release(IUrlHistoryStg2 *iface) { - SHDOCVW_UnlockModule(); + unlock_module(); return 1; } @@ -122,7 +123,7 @@ static const IUrlHistoryStg2Vtbl UrlHistoryStg2Vtbl = { static IUrlHistoryStg2 UrlHistoryStg2 = { &UrlHistoryStg2Vtbl }; -HRESULT CUrlHistory_Create(IUnknown *pOuter, REFIID riid, void **ppv) +HRESULT WINAPI CUrlHistory_Create(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppv) { if(pOuter) return CLASS_E_NOAGGREGATION; diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index d5dad46..7c13420 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -20,7 +20,6 @@ C_SRCS = \ shellbrowser.c \ shlinstobj.c \ taskbarlist.c \ - urlhist.c \ view.c \ webbrowser.c diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index d8a4b11..d9f6d68 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -154,7 +154,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { static IClassFactoryImpl WB1ClassFactory = {{&WBCF_Vtbl}, WebBrowserV1_Create}; static IClassFactoryImpl WB2ClassFactory = {{&WBCF_Vtbl}, WebBrowserV2_Create}; - static IClassFactoryImpl CUHClassFactory = {{&WBCF_Vtbl}, CUrlHistory_Create}; static IClassFactoryImpl TBLClassFactory = {{&WBCF_Vtbl}, TaskbarList_Create}; TRACE("\n"); @@ -165,10 +164,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) if(IsEqualGUID(&CLSID_WebBrowser_V1, rclsid)) return IClassFactory_QueryInterface(&WB1ClassFactory.IClassFactory_iface, riid, ppv); - if(IsEqualGUID(&CLSID_CUrlHistory, rclsid)) - return IClassFactory_QueryInterface(&CUHClassFactory.IClassFactory_iface, riid, ppv); - - if(IsEqualGUID(&CLSID_InternetShortcut, rclsid)) + if(IsEqualGUID(&CLSID_InternetShortcut, rclsid) + || IsEqualGUID(&CLSID_CUrlHistory, rclsid)) return get_ieframe_object(rclsid, riid, ppv); if(IsEqualGUID(&CLSID_TaskbarList, rclsid)) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index bd65551..4522b65 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -258,7 +258,6 @@ void InternetExplorer_WebBrowser_Init(InternetExplorer*) DECLSPEC_HIDDEN; void released_obj(void) DECLSPEC_HIDDEN; -HRESULT CUrlHistory_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT TaskbarList_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; /**********************************************************************

1 0

Jacek Caban : ieframe: Added version information.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 33a8ae9fe65ce125e078bdfcdd255ee4459cb41d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a8ae9fe65ce125e078bdfcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 12:04:48 2011 +0200 ieframe: Added version information. --- dlls/ieframe/Makefile.in | 3 +++ dlls/ieframe/ieframe.rc | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index a6e0f23..4e2f58a 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -8,4 +8,7 @@ C_SRCS = \ taskbarlist.c \ urlhist.c +RC_SRCS = \ + ieframe.rc + @MAKE_DLL_RULES@ diff --git a/dlls/ieframe/ieframe.rc b/dlls/ieframe/ieframe.rc new file mode 100644 index 0000000..d4c632e --- /dev/null +++ b/dlls/ieframe/ieframe.rc @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Internet Browser" +#define WINE_FILENAME_STR "ieframe.dll" +#define WINE_FILEVERSION 8,00,7601,17601 +#define WINE_FILEVERSION_STR "8.00.7601.17601" +#define WINE_PRODUCTVERSION 8,00,7601,17601 +#define WINE_PRODUCTVERSION_STR "8.00.7601.17601" +#define WINE_EXTRAVALUES VALUE "OLESelfRegister","" + +#include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : winhttp: Add support for sending data with a request.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 6191469bc2fe1e2995127349236fbf1950c04532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6191469bc2fe1e29951273492… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 26 09:27:59 2011 +0200 winhttp: Add support for sending data with a request. --- dlls/winhttp/request.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3093bd3..af69a41 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2673,6 +2673,12 @@ static HRESULT WINAPI winhttp_request_Send( VARIANT body ) { struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + SAFEARRAY *sa = NULL; + VARIANT array; + char *ptr = NULL; + LONG size = 0; + HRESULT hr; + BOOL ret; DWORD err; TRACE("%p, %s\n", request, debugstr_variant(&body)); @@ -2695,11 +2701,20 @@ static HRESULT WINAPI winhttp_request_Send( { return HRESULT_FROM_WIN32( get_last_error() ); } - wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT ); - if (!WinHttpSendRequest( request->hrequest, NULL, 0, NULL, 0, 0, 0 )) + VariantInit( &array ); + if (VariantChangeType( &array, &body, 0, VT_ARRAY|VT_UI1 ) == S_OK) { - return HRESULT_FROM_WIN32( get_last_error() ); + SAFEARRAY *sa = V_ARRAY( &array ); + if ((hr = SafeArrayAccessData( sa, (void **)&ptr )) != S_OK) return hr; + if ((hr = SafeArrayGetUBound( sa, 1, &size ) != S_OK)) return hr; + size++; } + wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT ); + ret = WinHttpSendRequest( request->hrequest, NULL, 0, ptr, size, size, 0 ); + err = get_last_error(); + if (sa && (hr = SafeArrayUnaccessData( sa )) != S_OK) return hr; + if (!ret) return HRESULT_FROM_WIN32( err ); + if ((err = wait_for_completion( request, INFINITE ))) return HRESULT_FROM_WIN32( err ); request->state = REQUEST_STATE_SENT; return S_OK;

1 0

Jacek Caban : ieframe: Moved TaskbarList implementation to ieframe.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 5ac7376e49642488428d8149a52e4a4dbea67420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac7376e49642488428d8149a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 12:03:49 2011 +0200 ieframe: Moved TaskbarList implementation to ieframe. --- dlls/ieframe/Makefile.in | 1 + dlls/ieframe/ieframe.h | 2 + dlls/ieframe/ieframe_main.c | 16 +++++++++++++++ dlls/{shdocvw => ieframe}/taskbarlist.c | 32 +++++++++++------------------- dlls/shdocvw/Makefile.in | 1 - dlls/shdocvw/factory.c | 7 +---- dlls/shdocvw/shdocvw.h | 2 - 7 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index 340beb0..a6e0f23 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = uuid urlmon shell32 ole32 advapi32 C_SRCS = \ ieframe_main.c \ intshcut.c \ + taskbarlist.c \ urlhist.c @MAKE_DLL_RULES@ diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 4e14eb9..f449369 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -29,11 +29,13 @@ #include "winuser.h" #include "ole2.h" +#include "shlobj.h" #include "wine/unicode.h" HRESULT WINAPI CUrlHistory_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI InternetShortcut_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT WINAPI TaskbarList_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern LONG module_ref DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index 569c425..1b8a3d7 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -86,6 +86,16 @@ static const IClassFactoryVtbl CUrlHistoryFactoryVtbl = { static IClassFactory CUrlHistoryFactory = { &CUrlHistoryFactoryVtbl }; +static const IClassFactoryVtbl TaskbarListFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + TaskbarList_Create, + ClassFactory_LockServer +}; + +static IClassFactory TaskbarListFactory = { &TaskbarListFactoryVtbl }; + /****************************************************************** * DllMain (ieframe.@) */ @@ -120,6 +130,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return IClassFactory_QueryInterface(&CUrlHistoryFactory, riid, ppv); } + if(IsEqualGUID(&CLSID_TaskbarList, rclsid)) { + TRACE("(CLSID_TaskbarList %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&TaskbarListFactory, riid, ppv); + } + + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/shdocvw/taskbarlist.c b/dlls/ieframe/taskbarlist.c similarity index 94% rename from dlls/shdocvw/taskbarlist.c rename to dlls/ieframe/taskbarlist.c index 5834cf6..747a033 100644 --- a/dlls/shdocvw/taskbarlist.c +++ b/dlls/ieframe/taskbarlist.c @@ -18,11 +18,9 @@ * */ -#include "config.h" -#include "wine/port.h" -#include "wine/debug.h" +#include "ieframe.h" -#include "shdocvw.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -79,8 +77,8 @@ static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList4 *iface) if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); - SHDOCVW_UnlockModule(); + heap_free(This); + unlock_module(); } return refcount; @@ -289,10 +287,10 @@ static const struct ITaskbarList4Vtbl taskbar_list_vtbl = taskbar_list_SetTabProperties, }; -HRESULT TaskbarList_Create(IUnknown *outer, REFIID riid, void **taskbar_list) +HRESULT WINAPI TaskbarList_Create(IClassFactory *iface, IUnknown *outer, REFIID riid, void **taskbar_list) { struct taskbar_list *object; - HRESULT hr; + HRESULT hres; TRACE("outer %p, riid %s, taskbar_list %p\n", outer, debugstr_guid(riid), taskbar_list); @@ -303,7 +301,7 @@ HRESULT TaskbarList_Create(IUnknown *outer, REFIID riid, void **taskbar_list) return CLASS_E_NOAGGREGATION; } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = heap_alloc_zero(sizeof(*object)); if (!object) { ERR("Failed to allocate taskbar list object memory\n"); @@ -312,18 +310,12 @@ HRESULT TaskbarList_Create(IUnknown *outer, REFIID riid, void **taskbar_list) } object->ITaskbarList4_iface.lpVtbl = &taskbar_list_vtbl; - object->refcount = 0; + object->refcount = 1; + lock_module(); TRACE("Created ITaskbarList4 %p\n", object); - hr = ITaskbarList4_QueryInterface(&object->ITaskbarList4_iface, riid, taskbar_list); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - SHDOCVW_LockModule(); - - return S_OK; + hres = ITaskbarList4_QueryInterface(&object->ITaskbarList4_iface, riid, taskbar_list); + ITaskbarList4_Release(&object->ITaskbarList4_iface); + return hres; } diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 7c13420..b3c3156 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -19,7 +19,6 @@ C_SRCS = \ shdocvw_main.c \ shellbrowser.c \ shlinstobj.c \ - taskbarlist.c \ view.c \ webbrowser.c diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index d9f6d68..3288813 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -154,7 +154,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { static IClassFactoryImpl WB1ClassFactory = {{&WBCF_Vtbl}, WebBrowserV1_Create}; static IClassFactoryImpl WB2ClassFactory = {{&WBCF_Vtbl}, WebBrowserV2_Create}; - static IClassFactoryImpl TBLClassFactory = {{&WBCF_Vtbl}, TaskbarList_Create}; TRACE("\n"); @@ -165,12 +164,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return IClassFactory_QueryInterface(&WB1ClassFactory.IClassFactory_iface, riid, ppv); if(IsEqualGUID(&CLSID_InternetShortcut, rclsid) - || IsEqualGUID(&CLSID_CUrlHistory, rclsid)) + || IsEqualGUID(&CLSID_CUrlHistory, rclsid) + || IsEqualGUID(&CLSID_TaskbarList, rclsid)) return get_ieframe_object(rclsid, riid, ppv); - if(IsEqualGUID(&CLSID_TaskbarList, rclsid)) - return IClassFactory_QueryInterface(&TBLClassFactory.IClassFactory_iface, riid, ppv); - /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 4522b65..f960a1a 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -258,8 +258,6 @@ void InternetExplorer_WebBrowser_Init(InternetExplorer*) DECLSPEC_HIDDEN; void released_obj(void) DECLSPEC_HIDDEN; -HRESULT TaskbarList_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; - /********************************************************************** * Dll lifetime tracking declaration for shdocvw.dll */

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::GetResponseHeader.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 2c8765e7fb8063ddea47ae390a04e56fbb6562bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8765e7fb8063ddea47ae390… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 26 09:27:23 2011 +0200 winhttp: Implement IWinHttpRequest::GetResponseHeader. --- dlls/winhttp/request.c | 40 +++++++++++++++++++++++++++++++--------- dlls/winhttp/tests/winhttp.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2053c96..2a2d403 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2515,15 +2515,6 @@ static HRESULT WINAPI winhttp_request_SetRequestHeader( return E_NOTIMPL; } -static HRESULT WINAPI winhttp_request_GetResponseHeader( - IWinHttpRequest *iface, - BSTR header, - BSTR *value ) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static DWORD wait_for_completion( struct winhttp_request *request, DWORD timeout ) { HANDLE handles[2]; @@ -2591,6 +2582,37 @@ static DWORD request_wait_for_response( struct winhttp_request *request, DWORD t return wait_for_completion( request, timeout ); } +static HRESULT WINAPI winhttp_request_GetResponseHeader( + IWinHttpRequest *iface, + BSTR header, + BSTR *value ) +{ + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + DWORD err, size; + + TRACE("%p, %p\n", request, header); + + if (request->state < REQUEST_STATE_SENT) + { + return HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ); + } + if (!header || !value) return E_INVALIDARG; + if ((err = request_wait_for_response( request, INFINITE ))) return HRESULT_FROM_WIN32( err ); + request->state = REQUEST_STATE_RESPONSE_RECEIVED; + + size = 0; + WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_CUSTOM, header, NULL, &size, NULL ); + err = get_last_error(); + if (err != ERROR_INSUFFICIENT_BUFFER) return HRESULT_FROM_WIN32( err ); + if (!(*value = SysAllocStringLen( NULL, size / sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_CUSTOM, header, *value, &size, NULL )) + { + SysFreeString( *value ); + return HRESULT_FROM_WIN32( get_last_error() ); + } + return S_OK; +} + static HRESULT WINAPI winhttp_request_GetAllResponseHeaders( IWinHttpRequest *iface, BSTR *headers ) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e3f1fb6..0f932b3 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2112,9 +2112,11 @@ static void test_IWinHttpRequest(void) static const WCHAR method2W[] = {'I','N','V','A','L','I','D',0}; static const WCHAR proxy_serverW[] = {'p','r','o','x','y','s','e','r','v','e','r',0}; static const WCHAR bypas_listW[] = {'b','y','p','a','s','s','l','i','s','t',0}; + static const WCHAR connectionW[] = {'C','o','n','n','e','c','t','i','o','n',0}; HRESULT hr; IWinHttpRequest *req; BSTR method, url, username, password, response = NULL, status_text = NULL, headers = NULL; + BSTR connection, value = NULL; VARIANT async, empty, timeout, body, proxy_server, bypass_list; VARIANT_BOOL succeeded; LONG status; @@ -2236,6 +2238,16 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + hr = IWinHttpRequest_GetResponseHeader( req, NULL, NULL ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + connection = SysAllocString( connectionW ); + hr = IWinHttpRequest_GetResponseHeader( req, connection, NULL ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + SysFreeString( method ); method = SysAllocString( method1W ); SysFreeString( url ); @@ -2297,6 +2309,9 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2345,6 +2360,16 @@ static void test_IWinHttpRequest(void) ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( headers ); + hr = IWinHttpRequest_GetResponseHeader( req, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_GetResponseHeader( req, connection, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( value ); + VariantInit( &timeout ); V_VT( &timeout ) = VT_I4; V_I4( &timeout ) = 10; @@ -2399,6 +2424,10 @@ static void test_IWinHttpRequest(void) ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( headers ); + hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( value ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Hans Leidekker : winhttp: Set WINHTTP_FLAG_SECURE if the scheme is https.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 80d17a79ff0074eb961a4508955b2c146c13ca29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d17a79ff0074eb961a45089… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 26 09:26:34 2011 +0200 winhttp: Set WINHTTP_FLAG_SECURE if the scheme is https. --- dlls/winhttp/request.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 611e8e0..3ae8dbc 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2429,6 +2429,7 @@ static HRESULT WINAPI winhttp_request_Open( { static const WCHAR typeW[] = {'*','/','*',0}; static const WCHAR *acceptW[] = {typeW, NULL}; + static const WCHAR httpsW[] = {'h','t','t','p','s'}; static const WCHAR user_agentW[] = { 'M','o','z','i','l','l','a','/','4','.','0',' ','(','c','o','m','p','a','t','i','b','l','e',';',' ', 'W','i','n','3','2',';',' ','W','i','n','H','t','t','p','.','W','i','n','H','t','t','p', @@ -2437,7 +2438,7 @@ static HRESULT WINAPI winhttp_request_Open( HINTERNET hsession = NULL, hconnect = NULL, hrequest; URL_COMPONENTS uc; WCHAR *hostname, *path; - DWORD err, flags = 0; + DWORD err, len, flags = 0, request_flags = 0; TRACE("%p, %s, %s, %s\n", request, debugstr_w(method), debugstr_w(url), debugstr_variant(&async)); @@ -2446,6 +2447,7 @@ static HRESULT WINAPI winhttp_request_Open( memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); + uc.dwSchemeLength = ~0u; uc.dwHostNameLength = ~0u; uc.dwUrlPathLength = ~0u; if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( get_last_error() ); @@ -2472,7 +2474,12 @@ static HRESULT WINAPI winhttp_request_Open( err = get_last_error(); goto error; } - if (!(hrequest = WinHttpOpenRequest( hconnect, method, path, NULL, NULL, acceptW, 0 ))) + len = sizeof(httpsW) / sizeof(WCHAR); + if (uc.dwSchemeLength == len && !memcmp( uc.lpszScheme, httpsW, len * sizeof(WCHAR) )) + { + request_flags |= WINHTTP_FLAG_SECURE; + } + if (!(hrequest = WinHttpOpenRequest( hconnect, method, path, NULL, NULL, acceptW, request_flags ))) { err = get_last_error(); goto error;

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::SetRequestHeader.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 114bc2b85606db340924b422a17d003d3e1f2ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114bc2b85606db340924b422a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 26 09:27:41 2011 +0200 winhttp: Implement IWinHttpRequest::SetRequestHeader. --- dlls/winhttp/request.c | 29 +++++++++++++++++++++++++++-- dlls/winhttp/tests/winhttp.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2a2d403..3093bd3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2511,8 +2511,33 @@ static HRESULT WINAPI winhttp_request_SetRequestHeader( BSTR header, BSTR value ) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR fmtW[] = {'%','s',':',' ','%','s','\r','\n',0}; + static const WCHAR emptyW[] = {0}; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + DWORD len; + WCHAR *str; + BOOL ret; + + TRACE("%p, %s, %s\n", request, debugstr_w(header), debugstr_w(value)); + + if (!header) return E_INVALIDARG; + if (request->state < REQUEST_STATE_OPEN) + { + return HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ); + } + if (request->state >= REQUEST_STATE_SENT) + { + return HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ); + } + len = strlenW( header ) + 4; + if (value) len += strlenW( value ); + if (!(str = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + + sprintfW( str, fmtW, header, value ? value : emptyW ); + ret = WinHttpAddRequestHeaders( request->hrequest, str, len, WINHTTP_ADDREQ_FLAG_REPLACE ); + heap_free( str ); + if (ret) return S_OK; + return HRESULT_FROM_WIN32( get_last_error() ); } static DWORD wait_for_completion( struct winhttp_request *request, DWORD timeout ) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 0f932b3..df8dd40 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2113,13 +2113,19 @@ static void test_IWinHttpRequest(void) static const WCHAR proxy_serverW[] = {'p','r','o','x','y','s','e','r','v','e','r',0}; static const WCHAR bypas_listW[] = {'b','y','p','a','s','s','l','i','s','t',0}; static const WCHAR connectionW[] = {'C','o','n','n','e','c','t','i','o','n',0}; + static const WCHAR dateW[] = {'D','a','t','e',0}; HRESULT hr; IWinHttpRequest *req; BSTR method, url, username, password, response = NULL, status_text = NULL, headers = NULL; - BSTR connection, value = NULL; + BSTR date, today, connection, value = NULL; VARIANT async, empty, timeout, body, proxy_server, bypass_list; VARIANT_BOOL succeeded; LONG status; + WCHAR todayW[WINHTTP_TIME_FORMAT_BUFSIZE]; + SYSTEMTIME st; + + GetSystemTime( &st ); + WinHttpTimeFromSystemTime( &st, todayW ); CoInitialize( NULL ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); @@ -2248,6 +2254,17 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + hr = IWinHttpRequest_SetRequestHeader( req, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + date = SysAllocString( dateW ); + hr = IWinHttpRequest_SetRequestHeader( req, date, NULL ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + + today = SysAllocString( todayW ); + hr = IWinHttpRequest_SetRequestHeader( req, date, today ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + SysFreeString( method ); method = SysAllocString( method1W ); SysFreeString( url ); @@ -2312,6 +2329,12 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + hr = IWinHttpRequest_SetRequestHeader( req, date, today ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetRequestHeader( req, date, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2370,6 +2393,9 @@ static void test_IWinHttpRequest(void) ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( value ); + hr = IWinHttpRequest_SetRequestHeader( req, date, today ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %08x\n", hr ); + VariantInit( &timeout ); V_VT( &timeout ) = VT_I4; V_I4( &timeout ) = 10; @@ -2428,6 +2454,9 @@ static void test_IWinHttpRequest(void) ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( value ); + hr = IWinHttpRequest_SetRequestHeader( req, date, today ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2444,6 +2473,8 @@ static void test_IWinHttpRequest(void) SysFreeString( url ); SysFreeString( username ); SysFreeString( password ); + SysFreeString( date ); + SysFreeString( today ); VariantClear( &proxy_server ); VariantClear( &bypass_list ); CoUninitialize();

1 0

Hans Leidekker : winhttp: Add some parameter checks.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 363890803964c9acdaf37a0ee26abbb3e3223d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=363890803964c9acdaf37a0ee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 26 09:27:05 2011 +0200 winhttp: Add some parameter checks. --- dlls/winhttp/request.c | 10 ++++- dlls/winhttp/tests/winhttp.c | 84 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 88 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=363890803964c9acdaf37…

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::GetAllResponseHeaders.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: ca9ab005fc1aab828fa4630c734e72bbcee5447b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9ab005fc1aab828fa4630c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 26 09:26:48 2011 +0200 winhttp: Implement IWinHttpRequest::GetAllResponseHeaders. --- dlls/winhttp/request.c | 62 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3ae8dbc..38150ec 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2524,14 +2524,6 @@ static HRESULT WINAPI winhttp_request_GetResponseHeader( return E_NOTIMPL; } -static HRESULT WINAPI winhttp_request_GetAllResponseHeaders( - IWinHttpRequest *iface, - BSTR *headers ) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static DWORD wait_for_completion( struct winhttp_request *request, DWORD timeout ) { HANDLE handles[2]; @@ -2587,6 +2579,48 @@ static void wait_set_status_callback( struct winhttp_request *request, DWORD sta WinHttpSetStatusCallback( request->hrequest, wait_status_callback, status, 0 ); } +static DWORD request_wait_for_response( struct winhttp_request *request, DWORD timeout ) +{ + if (request->state >= REQUEST_STATE_RESPONSE_RECEIVED) return ERROR_SUCCESS; + + wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE ); + if (!WinHttpReceiveResponse( request->hrequest, NULL )) + { + return get_last_error(); + } + return wait_for_completion( request, timeout ); +} + +static HRESULT WINAPI winhttp_request_GetAllResponseHeaders( + IWinHttpRequest *iface, + BSTR *headers ) +{ + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + DWORD err, size; + + TRACE("%p, %p\n", request, headers); + + if (!headers) return E_INVALIDARG; + if (request->state < REQUEST_STATE_SENT) + { + return HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ); + } + if ((err = request_wait_for_response( request, INFINITE ))) return HRESULT_FROM_WIN32( err ); + request->state = REQUEST_STATE_RESPONSE_RECEIVED; + + size = 0; + WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL ); + err = get_last_error(); + if (err != ERROR_INSUFFICIENT_BUFFER) return HRESULT_FROM_WIN32( err ); + if (!(*headers = SysAllocStringLen( NULL, size / sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, *headers, &size, NULL )) + { + SysFreeString( *headers ); + return HRESULT_FROM_WIN32( get_last_error() ); + } + return S_OK; +} + static HRESULT WINAPI winhttp_request_Send( IWinHttpRequest *iface, VARIANT body ) @@ -2624,18 +2658,6 @@ static HRESULT WINAPI winhttp_request_Send( return S_OK; } -static DWORD request_wait_for_response( struct winhttp_request *request, DWORD timeout ) -{ - if (request->state >= REQUEST_STATE_RESPONSE_RECEIVED) return ERROR_SUCCESS; - - wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE ); - if (!WinHttpReceiveResponse( request->hrequest, NULL )) - { - return get_last_error(); - } - return wait_for_completion( request, timeout ); -} - static HRESULT WINAPI winhttp_request_get_Status( IWinHttpRequest *iface, LONG *status )

1 0

Hans Leidekker : winhttp: Add a default user agent header.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 7227c29a09473f27cd009775cea34b1822ca8075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7227c29a09473f27cd009775c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 26 09:26:20 2011 +0200 winhttp: Add a default user agent header. --- dlls/winhttp/request.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 00f5caf..611e8e0 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2429,6 +2429,10 @@ static HRESULT WINAPI winhttp_request_Open( { static const WCHAR typeW[] = {'*','/','*',0}; static const WCHAR *acceptW[] = {typeW, NULL}; + static const WCHAR user_agentW[] = { + 'M','o','z','i','l','l','a','/','4','.','0',' ','(','c','o','m','p','a','t','i','b','l','e',';',' ', + 'W','i','n','3','2',';',' ','W','i','n','H','t','t','p','.','W','i','n','H','t','t','p', + 'R','e','q','u','e','s','t','.','5',')',0}; struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); HINTERNET hsession = NULL, hconnect = NULL, hrequest; URL_COMPONENTS uc; @@ -2458,7 +2462,7 @@ static HRESULT WINAPI winhttp_request_Open( path[uc.dwUrlPathLength] = 0; if (V_BOOL( &async ) == VARIANT_TRUE) flags |= WINHTTP_FLAG_ASYNC; - if (!(hsession = WinHttpOpen( NULL, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) + if (!(hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) { err = get_last_error(); goto error;

1 0