wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Hans Leidekker : winhttp: Store a copy of the proxy server name and bypass list.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 87487c14c7bd57daa3e5755c84103f47229fb3de URL: http://source.winehq.org/git/wine.git/?a=commit;h=87487c14c7bd57daa3e5755c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 29 13:26:02 2011 +0200 winhttp: Store a copy of the proxy server name and bypass list. --- dlls/winhttp/request.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8effad5..0130cd4 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2202,6 +2202,8 @@ static ULONG WINAPI winhttp_request_Release( WinHttpCloseHandle( request->hsession ); CloseHandle( request->wait ); CloseHandle( request->cancel ); + heap_free( (WCHAR *)request->proxy.lpszProxy ); + heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); heap_free( request->buffer ); heap_free( request->verb ); heap_free( request ); @@ -2384,8 +2386,8 @@ static HRESULT WINAPI winhttp_request_SetProxy( case HTTPREQUEST_PROXYSETTING_PROXY: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - request->proxy.lpszProxy = V_BSTR( &proxy_server ); - request->proxy.lpszProxyBypass = V_BSTR( &bypass_list ); + request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); + request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); break; default: return E_INVALIDARG; @@ -3021,6 +3023,8 @@ static HRESULT WINAPI winhttp_request_Abort( WinHttpCloseHandle( request->hsession ); CloseHandle( request->wait ); CloseHandle( request->cancel ); + heap_free( (WCHAR *)request->proxy.lpszProxy ); + heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); heap_free( request->buffer ); heap_free( request->verb ); initialize_request( request );

1 0

Hans Leidekker : winhttp: Factor out request initialization.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 36014639eac90e7cd99d2de5a6807dcdbef57544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36014639eac90e7cd99d2de5a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 29 13:25:39 2011 +0200 winhttp: Factor out request initialization. --- dlls/winhttp/request.c | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3efa8a3..8effad5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2985,21 +2985,8 @@ static HRESULT WINAPI winhttp_request_WaitForResponse( } } -static HRESULT WINAPI winhttp_request_Abort( - IWinHttpRequest *iface ) +static void initialize_request( struct winhttp_request *request ) { - struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); - - TRACE("%p\n", request); - - SetEvent( request->cancel ); - WinHttpCloseHandle( request->hrequest ); - WinHttpCloseHandle( request->hconnect ); - WinHttpCloseHandle( request->hsession ); - CloseHandle( request->wait ); - CloseHandle( request->cancel ); - heap_free( request->buffer ); - heap_free( request->verb ); request->state = REQUEST_STATE_INVALID; request->hrequest = NULL; request->hconnect = NULL; @@ -3015,6 +3002,28 @@ static HRESULT WINAPI winhttp_request_Abort( request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; + request->resolve_timeout = 0; + request->connect_timeout = 60000; + request->send_timeout = 30000; + request->receive_timeout = 30000; +} + +static HRESULT WINAPI winhttp_request_Abort( + IWinHttpRequest *iface ) +{ + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + + TRACE("%p\n", request); + + SetEvent( request->cancel ); + WinHttpCloseHandle( request->hrequest ); + WinHttpCloseHandle( request->hconnect ); + WinHttpCloseHandle( request->hsession ); + CloseHandle( request->wait ); + CloseHandle( request->cancel ); + heap_free( request->buffer ); + heap_free( request->verb ); + initialize_request( request ); return S_OK; } @@ -3088,13 +3097,10 @@ HRESULT WinHttpRequest_create( IUnknown *unknown, void **obj ) TRACE("%p, %p\n", unknown, obj); - if (!(request = heap_alloc_zero( sizeof(*request) ))) return E_OUTOFMEMORY; + if (!(request = heap_alloc( sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; - request->resolve_timeout = 0; - request->connect_timeout = 60000; - request->send_timeout = 30000; - request->receive_timeout = 30000; + initialize_request( request ); *obj = &request->IWinHttpRequest_iface; TRACE("returning iface %p\n", *obj);

1 0

Hans Leidekker : winhttp: Set an appropriate error when the request is cancelled.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: fb7fc894f055e43e539174d242a3f9a6419f9558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb7fc894f055e43e539174d24… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 29 13:25:24 2011 +0200 winhttp: Set an appropriate error when the request is cancelled. --- dlls/winhttp/request.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a57f801..3efa8a3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2565,6 +2565,9 @@ static DWORD wait_for_completion( struct winhttp_request *request, DWORD timeout { case WAIT_OBJECT_0: break; + case WAIT_OBJECT_0 + 1: + request->error = ERROR_CANCELLED; + break; case WAIT_TIMEOUT: request->error = ERROR_TIMEOUT; break;

1 0

Hans Leidekker : winhttp: Fix some valgrind warnings.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: c54772c114150c5d787712f2ed1156269baeabf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c54772c114150c5d787712f2e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 29 13:25:04 2011 +0200 winhttp: Fix some valgrind warnings. --- dlls/winhttp/request.c | 5 +++-- dlls/winhttp/tests/winhttp.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 01fdc20..a57f801 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2446,7 +2446,6 @@ static HRESULT WINAPI winhttp_request_Open( debugstr_variant(&async)); if (!method || !url) return E_INVALIDARG; - if (!(request->verb = strdupW( method ))) return E_OUTOFMEMORY; memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); @@ -2455,6 +2454,7 @@ static HRESULT WINAPI winhttp_request_Open( uc.dwUrlPathLength = ~0u; uc.dwExtraInfoLength = ~0u; if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( get_last_error() ); + if (!(request->verb = strdupW( method ))) return E_OUTOFMEMORY; if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); @@ -2541,7 +2541,7 @@ static HRESULT WINAPI winhttp_request_SetRequestHeader( } len = strlenW( header ) + 4; if (value) len += strlenW( value ); - if (!(str = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(str = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; sprintfW( str, fmtW, header, value ? value : emptyW ); ret = WinHttpAddRequestHeaders( request->hrequest, str, len, WINHTTP_ADDREQ_FLAG_REPLACE ); @@ -2795,6 +2795,7 @@ static DWORD request_read_body( struct winhttp_request *request, DWORD timeout ) request->state = REQUEST_STATE_RESPONSE_RECEIVED; if (!(request->buffer = heap_alloc( buflen ))) return E_OUTOFMEMORY; + request->buffer[0] = 0; size = total_bytes_read = 0; do { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index df8dd40..b450df7 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2473,6 +2473,7 @@ static void test_IWinHttpRequest(void) SysFreeString( url ); SysFreeString( username ); SysFreeString( password ); + SysFreeString( connection ); SysFreeString( date ); SysFreeString( today ); VariantClear( &proxy_server );

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 48ccf4f9f83b081dd87c303588db748e17bafe83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ccf4f9f83b081dd87c30358… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 29 12:29:54 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 100 ++++++++++++++++++++-------------------- dlls/msvcp60/msvcp60.spec | 84 +++++++++++++++++----------------- dlls/msvcp70/msvcp70.spec | 88 ++++++++++++++++++------------------ dlls/msvcp71/msvcp71.spec | 88 ++++++++++++++++++------------------ dlls/msvcp80/msvcp80.spec | 104 +++++++++++++++++++++--------------------- 5 files changed, 232 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48ccf4f9f83b081dd87c3…

1 0

Piotr Caban : msvcp90: Added _Locinfo class stub.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: dca8da61c11a31674c4b5643a19f8ae614cd7968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca8da61c11a31674c4b5643a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 29 12:29:32 2011 +0200 msvcp90: Added _Locinfo class stub. --- dlls/msvcp90/locale.c | 289 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.spec | 112 +++++++++--------- 2 files changed, 341 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dca8da61c11a31674c4b5…

1 0

Jacek Caban : mshtml: Fixed HTMLHeadElement_QI implementation.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: bc9850b42c9a342120f06566281e53b96ac32bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9850b42c9a342120f065662… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 13:06:35 2011 +0200 mshtml: Fixed HTMLHeadElement_QI implementation. --- dlls/mshtml/htmlhead.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 51095ee..69e4edf 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -295,7 +295,7 @@ static HRESULT HTMLHeadElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) TRACE("(%p)->(IID_IHTMLHeadElement %p)\n", This, ppv); *ppv = &This->IHTMLHeadElement_iface; }else { - HTMLElement_QI(&This->element.node, riid, ppv); + return HTMLElement_QI(&This->element.node, riid, ppv); } IUnknown_AddRef((IUnknown*)*ppv);

1 0

Jacek Caban : ieframe: Removed remaining bits of shdocvw.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 7a428c3fd2aa66a9c7921f4e069b42b9042d342b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a428c3fd2aa66a9c7921f4e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 12:18:33 2011 +0200 ieframe: Removed remaining bits of shdocvw. --- dlls/ieframe/Es.rc | 2 +- dlls/ieframe/Fr.rc | 2 +- dlls/ieframe/classinfo.c | 2 +- dlls/ieframe/client.c | 2 +- dlls/ieframe/dochost.c | 2 +- dlls/ieframe/events.c | 2 +- dlls/ieframe/frame.c | 2 +- dlls/ieframe/ie.c | 2 +- dlls/ieframe/ieframe.h | 2 +- dlls/ieframe/iexplore.c | 4 ++-- dlls/ieframe/navigate.c | 2 +- dlls/ieframe/oleobject.c | 2 +- dlls/ieframe/persist.c | 2 +- dlls/ieframe/shellbrowser.c | 2 +- dlls/ieframe/taskbarlist.c | 2 +- dlls/ieframe/urlhist.c | 2 +- dlls/ieframe/view.c | 2 +- dlls/ieframe/webbrowser.c | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/Es.rc b/dlls/ieframe/Es.rc index e0537f1..808de7b 100644 --- a/dlls/ieframe/Es.rc +++ b/dlls/ieframe/Es.rc @@ -1,5 +1,5 @@ /* - * Spanish resources for shdocvw + * Spanish resources for ieframe * * Copyright 2010 José Rostagno * diff --git a/dlls/ieframe/Fr.rc b/dlls/ieframe/Fr.rc index 7b25fee..485420a 100644 --- a/dlls/ieframe/Fr.rc +++ b/dlls/ieframe/Fr.rc @@ -1,5 +1,5 @@ /* - * shdocvw French resources + * ieframe French resources * * Copyright 2010 Frédéric Delanoy * diff --git a/dlls/ieframe/classinfo.c b/dlls/ieframe/classinfo.c index 8e68754..30b8871 100644 --- a/dlls/ieframe/classinfo.c +++ b/dlls/ieframe/classinfo.c @@ -22,7 +22,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); /********************************************************************** * Implement the IProvideClassInfo2 interface diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index e9d6ad9..970e28d 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -25,7 +25,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static inline DocHost *impl_from_IOleClientSite(IOleClientSite *iface) { diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index ffe65a1..5f60056 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -24,7 +24,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); diff --git a/dlls/ieframe/events.c b/dlls/ieframe/events.c index d2c6f1f..5a426ab 100644 --- a/dlls/ieframe/events.c +++ b/dlls/ieframe/events.c @@ -28,7 +28,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); struct ConnectionPoint { IConnectionPoint IConnectionPoint_iface; diff --git a/dlls/ieframe/frame.c b/dlls/ieframe/frame.c index ef06064..d394d74 100644 --- a/dlls/ieframe/frame.c +++ b/dlls/ieframe/frame.c @@ -20,7 +20,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static inline DocHost *impl_from_IOleInPlaceFrame(IOleInPlaceFrame *iface) { diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index c1f9cfd..5fe0a26 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -20,7 +20,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static inline InternetExplorer *impl_from_IWebBrowser2(IWebBrowser2 *iface) { diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index f657ce4..89f69fa 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -1,5 +1,5 @@ /* - * Header includes for shdocvw.dll + * Header includes for ieframe.dll * * Copyright 2011 Jacek Caban for CodeWeavers * diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 76bef14..99e3003 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -42,7 +42,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); #define IDI_APPICON 1 @@ -1016,7 +1016,7 @@ static void release_dde(void) } /****************************************************************** - * IEWinMain (SHDOCVW.101) + * IEWinMain (ieframe.101) * * Only returns on error. */ diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 35c550d..2fea374 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -30,7 +30,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static const WCHAR emptyW[] = {0}; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index e4ee717..d227bcc 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -33,7 +33,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); /* shlwapi.dll */ HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent); diff --git a/dlls/ieframe/persist.c b/dlls/ieframe/persist.c index 93716bb..3529023 100644 --- a/dlls/ieframe/persist.c +++ b/dlls/ieframe/persist.c @@ -23,7 +23,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); /********************************************************************** * Implement the IPersistStorage interface diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 48f0e20..c3ff6c8 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -25,7 +25,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); typedef struct { IShellBrowser IShellBrowser_iface; diff --git a/dlls/ieframe/taskbarlist.c b/dlls/ieframe/taskbarlist.c index 747a033..5055d80 100644 --- a/dlls/ieframe/taskbarlist.c +++ b/dlls/ieframe/taskbarlist.c @@ -22,7 +22,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); struct taskbar_list { diff --git a/dlls/ieframe/urlhist.c b/dlls/ieframe/urlhist.c index 89480df..157138c 100644 --- a/dlls/ieframe/urlhist.c +++ b/dlls/ieframe/urlhist.c @@ -21,7 +21,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static HRESULT WINAPI UrlHistoryStg_QueryInterface(IUrlHistoryStg2 *iface, REFIID riid, void **ppv) { diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c index 5d0c87d..2bf14b5 100644 --- a/dlls/ieframe/view.c +++ b/dlls/ieframe/view.c @@ -21,7 +21,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); /********************************************************************** * Implement the IViewObject interface diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index c398786..d1004df 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -27,7 +27,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static inline WebBrowser *impl_from_IWebBrowser2(IWebBrowser2 *iface) {

1 0

Jacek Caban : iexplore: Removed unneeded imports.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: a9700cbc84187822851f4e62052e7628a07729ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9700cbc84187822851f4e620… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 12:14:40 2011 +0200 iexplore: Removed unneeded imports. --- programs/iexplore/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 6762af6..1c1e191 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = iexplore.exe APPMODE = -mwindows -IMPORTS = shdocvw user32 gdi32 +IMPORTS = shdocvw DELAYIMPORTS = advpack version C_SRCS = \

1 0

Jacek Caban : iexplore: Moved iexplore registration extension to iexplore. exe.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 3faa938712cbce470701b49b935687cffeb058c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3faa938712cbce470701b49b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 12:14:19 2011 +0200 iexplore: Moved iexplore registration extension to iexplore.exe. --- dlls/shdocvw/factory.c | 125 +------------------- dlls/shdocvw/shdocvw.rc | 3 - programs/iexplore/Makefile.in | 1 + .../shdocvw.inf => programs/iexplore/iexplore.inf | 17 +-- programs/iexplore/iexplore.rc | 3 + programs/iexplore/main.c | 56 +++++++++- 6 files changed, 70 insertions(+), 135 deletions(-) diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index 5c0f106..ce6ddb9 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -23,7 +23,6 @@ #include "shdocvw.h" #include "winreg.h" -#include "advpub.h" #include "rpcproxy.h" #include "isguids.h" @@ -74,77 +73,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); } -static HRESULT reg_install(LPCSTR section, STRTABLEA *strtable) -{ - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - HMODULE hadvpack; - HRESULT hres; - - static const WCHAR advpackW[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - hadvpack = LoadLibraryW(advpackW); - pRegInstall = (void *)GetProcAddress(hadvpack, "RegInstall"); - - hres = pRegInstall(shdocvw_hinstance, section, strtable); - - FreeLibrary(hadvpack); - return hres; -} - -#define INF_SET_CLSID(clsid) \ - do \ - { \ - static CHAR name[] = "CLSID_" #clsid; \ - \ - pse[i].pszName = name; \ - clsids[i++] = &CLSID_ ## clsid; \ - } while (0) - -static HRESULT register_server(BOOL doregister) -{ - STRTABLEA strtable; - STRENTRYA pse[3]; - static CLSID const *clsids[3]; - unsigned int i = 0; - HRESULT hres; - - INF_SET_CLSID(Internet); - INF_SET_CLSID(InternetExplorer); - INF_SET_CLSID(InternetShortcut); - - for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], - clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], - clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); - } - - strtable.cEntries = sizeof(pse)/sizeof(pse[0]); - strtable.pse = pse; - - hres = reg_install(doregister ? "RegisterDll" : "UnregisterDll", &strtable); - - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) - HeapFree(GetProcessHeap(), 0, pse[i].pszValue); - - return hres; -} - -#undef INF_SET_CLSID - /*********************************************************************** * DllRegisterServer (shdocvw.@) */ HRESULT WINAPI DllRegisterServer(void) { - HRESULT hres; - - hres = __wine_register_resources( shdocvw_hinstance, NULL ); - if(FAILED(hres)) - return hres; - - return register_server(TRUE); + TRACE("\n"); + return __wine_register_resources( shdocvw_hinstance, NULL ); } /*********************************************************************** @@ -152,57 +87,12 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - HRESULT hres; - - hres = register_server(FALSE); - if(FAILED(hres)) - return hres; - + TRACE("\n"); return __wine_unregister_resources( shdocvw_hinstance, NULL ); } -static BOOL check_native_ie(void) -{ - static const WCHAR cszPath[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; - DWORD handle,size; - BOOL ret = TRUE; - - size = GetFileVersionInfoSizeW(cszPath,&handle); - if (size) - { - LPVOID buf; - LPWSTR lpFileDescription; - UINT dwBytes; - static const WCHAR cszFD[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\','0','4','0','9','0','4','e','4','\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR cszWine[] = {'W','i','n','e',0}; - - buf = HeapAlloc(GetProcessHeap(),0,size); - GetFileVersionInfoW(cszPath,0,size,buf); - - if (VerQueryValueW(buf, cszFD, (LPVOID*)&lpFileDescription, &dwBytes) && - strstrW(lpFileDescription,cszWine)) - ret = FALSE; - - HeapFree(GetProcessHeap(), 0, buf); - } - - return ret; -} - -static DWORD register_iexplore(BOOL doregister) -{ - HRESULT hres; - if (check_native_ie()) - { - TRACE("Native IE detected, not doing registration\n"); - return S_OK; - } - hres = reg_install(doregister ? "RegisterIE" : "UnregisterIE", NULL); - return FAILED(hres); -} - /****************************************************************** - * IEWinMain (SHDOCVW.101) + * IEWinMain (SHDOCVW.101) * * Only returns on error. */ @@ -212,13 +102,6 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) TRACE("%s %d\n", debugstr_a(szCommandLine), nShowWindow); - if(*szCommandLine == '-' || *szCommandLine == '/') { - if(!strcasecmp(szCommandLine+1, "regserver")) - return register_iexplore(TRUE); - if(!strcasecmp(szCommandLine+1, "unregserver")) - return register_iexplore(FALSE); - } - pIEWinMain = (void*)GetProcAddress(get_ieframe_instance(), MAKEINTRESOURCEA(101)); if(!pIEWinMain) ExitProcess(1); diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index bd47bbd..555eabd 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -33,8 +33,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: shdocvw_v1.tlb */ 1 TYPELIB shdocvw_v1.tlb -/* @makedep: shdocvw.inf */ -REGINST REGINST shdocvw.inf - /* @makedep: shdocvw.rgs */ 2 WINE_REGISTRY shdocvw.rgs diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 547f8f0..6762af6 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = iexplore.exe APPMODE = -mwindows IMPORTS = shdocvw user32 gdi32 +DELAYIMPORTS = advpack version C_SRCS = \ main.c diff --git a/dlls/shdocvw/shdocvw.inf b/programs/iexplore/iexplore.inf similarity index 88% rename from dlls/shdocvw/shdocvw.inf rename to programs/iexplore/iexplore.inf index 2cf9d6e..a45df9f 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/programs/iexplore/iexplore.inf @@ -2,20 +2,12 @@ Signature="$CHICAGO$" -[RegisterDll] -AddReg=Classes.Reg - - -[UnregisterDll] -DelReg=Classes.Reg - - [RegisterIE] -AddReg=IE.Reg, Settings.Reg +AddReg=Classes.Reg, IE.Reg, Settings.Reg [UnregisterIE] -DelReg=IE.Reg, Settings.Reg +DelReg=Classes.Reg, IE.Reg, Settings.Reg [Classes.Reg] @@ -44,3 +36,8 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",, HKLM,"Software\Microsoft\Internet Explorer","Build",,"86001" HKLM,"Software\Microsoft\Internet Explorer","Version",,"8.0.6001.18702" HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"8.0.6001.18702" + + +[Strings] +CLSID_InternetExplorer="{0002df01-0000-0000-c000-000000000046}" +CLSID_Internet="{871c5380-42a0-1069-a2ea-08002b30309d}" diff --git a/programs/iexplore/iexplore.rc b/programs/iexplore/iexplore.rc index 64a976c..cd75781 100644 --- a/programs/iexplore/iexplore.rc +++ b/programs/iexplore/iexplore.rc @@ -28,3 +28,6 @@ /* @makedep: iexplore.ico */ 1 ICON iexplore.ico + +/* @makedep: iexplore.inf */ +REGINST REGINST iexplore.inf diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index 0ecf0d9..6065ba9 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -19,10 +19,64 @@ */ #include <windows.h> +#include <advpub.h> +#include <rpcproxy.h> + +#include "wine/unicode.h" +#include "wine/debug.h" extern DWORD WINAPI IEWinMain(LPSTR, int); -int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +static BOOL check_native_ie(void) +{ + DWORD handle, size; + LPWSTR file_desc; + UINT bytes; + void* buf; + BOOL ret; + + static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; + static const WCHAR wineW[] = {'W','i','n','e',0}; + static const WCHAR file_desc_strW[] = + {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', + '\\','0','4','0','9','0','4','e','4', + '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; + + size = GetFileVersionInfoSizeW(browseui_dllW, &handle); + if(!size) + return TRUE; + + buf = HeapAlloc(GetProcessHeap(), 0, size); + GetFileVersionInfoW(browseui_dllW, 0, size,buf); + + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW); + + HeapFree(GetProcessHeap(), 0, buf); + return ret; +} + +static DWORD register_iexplore(BOOL doregister) +{ + HRESULT hres; + + if (check_native_ie()) { + WINE_MESSAGE("Native IE detected, not doing registration\n"); + return 0; + } + + hres = RegInstallA(NULL, doregister ? "RegisterIE" : "UnregisterIE", NULL); + return FAILED(hres); +} + +int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) { + + if(*cmdline == '-' || *cmdline == '/') { + if(!strcasecmp(cmdline+1, "regserver")) + return register_iexplore(TRUE); + if(!strcasecmp(cmdline+1, "unregserver")) + return register_iexplore(FALSE); + } + return IEWinMain(cmdline, show); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2011