September 2013 - Wine-commits

Stefan Dösinger : wined3d: Pass the destination pitch to format conversion functions.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 24fbe9f2ecfdac12dcf7af49f03d7624d6c77494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24fbe9f2ecfdac12dcf7af49f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 20 13:04:49 2013 +0200 wined3d: Pass the destination pitch to format conversion functions. The relation between src and dst pitches is not correct if the source pitch is padded to match pitch alignment requirements. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/utils.c | 77 +++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 43 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24fbe9f2ecfdac12dcf7a…

1 0

Francois Gouget : winapi: Small tweaks to fix perl warnings.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 3b5fb27f914bedbf06d95b57be34a9ab7e706b88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5fb27f914bedbf06d95b57b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 20 11:49:34 2013 +0200 winapi: Small tweaks to fix perl warnings. perl says defined(@array) is deprecated. --- tools/winapi/options.pm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winapi/options.pm b/tools/winapi/options.pm index 749b9b7..3daeb11 100644 --- a/tools/winapi/options.pm +++ b/tools/winapi/options.pm @@ -414,7 +414,7 @@ sub c_files($) { my $c_files = \@{$self->{_C_FILES}}; - if(!defined(@$c_files)) { + if(!@$c_files) { $self->parse_files; } @@ -426,7 +426,7 @@ sub h_files($) { my $h_files = \@{$self->{_H_FILES}}; - if(!defined(@$h_files)) { + if(!@$h_files) { $self->parse_files; } @@ -438,7 +438,7 @@ sub directories($) { my $directories = \@{$self->{_DIRECTORIES}}; - if(!defined(@$directories)) { + if(!@$directories) { $self->parse_files; }

1 0

Jacek Caban : appwiz.cpl: Allow cancelling download of addons.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 2c9774f002521adc6da7bd07274052f111536697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9774f002521adc6da7bd072… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 20 16:36:19 2013 +0200 appwiz.cpl: Allow cancelling download of addons. --- dlls/appwiz.cpl/addons.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index be6fb6d..b278a4a 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -106,6 +106,7 @@ static const addon_info_t *addon; static HWND install_dialog = NULL; static LPWSTR url = NULL; +static IBinding *dwl_binding; static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); static const WCHAR kernel32_dllW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; @@ -185,6 +186,8 @@ static enum install_res install_file(const WCHAR *file_name) { ULONG res; + EnableWindow(GetDlgItem(install_dialog, IDCANCEL), 0); + res = MsiInstallProductW(file_name, NULL); if(res != ERROR_SUCCESS) { ERR("MsiInstallProduct failed: %u\n", res); @@ -437,6 +440,10 @@ static HRESULT WINAPI InstallCallback_OnStartBinding(IBindStatusCallback *iface, DWORD dwReserved, IBinding *pib) { set_status(IDS_DOWNLOADING); + + IBinding_AddRef(pib); + dwl_binding = pib; + return S_OK; } @@ -468,8 +475,16 @@ static HRESULT WINAPI InstallCallback_OnProgress(IBindStatusCallback *iface, ULO static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) { + if(dwl_binding) { + IBinding_Release(dwl_binding); + dwl_binding = NULL; + } + if(FAILED(hresult)) { - ERR("Binding failed %08x\n", hresult); + if(hresult == E_ABORT) + TRACE("Binding aborted\n"); + else + ERR("Binding failed %08x\n", hresult); return S_OK; } @@ -660,13 +675,14 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA case WM_COMMAND: switch(wParam) { case IDCANCEL: + if(dwl_binding) + IBinding_Abort(dwl_binding); EndDialog(hwnd, 0); return FALSE; case ID_DWL_INSTALL: ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_SHOW); EnableWindow(GetDlgItem(hwnd, ID_DWL_INSTALL), 0); - EnableWindow(GetDlgItem(hwnd, IDCANCEL), 0); /* FIXME */ CloseHandle( CreateThread(NULL, 0, download_proc, NULL, 0, NULL)); return FALSE; }

1 0

Frédéric Delanoy : wineusr: Assorted formatting & tagging fixes.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: docs Branch: master Commit: c206e3d0be7ea2a35c64be37fc8c212b8fe69591 URL: http://source.winehq.org/git/docs.git/?a=commit;h=c206e3d0be7ea2a35c64be37f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 20 11:08:18 2013 +0200 wineusr: Assorted formatting & tagging fixes. A couple typos as well. --- en/wineusr-bugs.sgml | 2 +- en/wineusr-configuring.sgml | 15 ++++++++------- en/wineusr-running.sgml | 29 +++++++++++++++-------------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index e251bdd..c13cb17 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -270,7 +270,7 @@ </listitem> <listitem> <para> - The exact command line you used to start Wine. + The exact command line you used to start Wine (e.g. <userinput>wine "C:\Program Files\<replaceable>Test</replaceable>\<replaceable>program.exe</replaceable>"</userinput>). </para> </listitem> diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index ff54fa5..84a6de0 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -288,7 +288,7 @@ err:module:import_dll Library MFC42.DLL (which is needed by L"C:\\Program Files\ You may be interested in configuring your drive settings outside of <command>winecfg</command>, in which case you're in luck because it's quite easy. All of the drive settings reside in a special - directory, <filename class="directory">~/.wine/dosdevices</filename>. Each + directory: <filename class="directory">~/.wine/dosdevices</filename>. Each <quote>drive</quote> is simply a link to where it actually resides. Wine automatically sets up two drives the first time you run Wine: </para> @@ -700,7 +700,7 @@ ln -s /mnt/smb/<replaceable>myserver</replaceable>/<replaceable>some</replaceabl The ODBC system within Wine, as with the printing system, is designed to hook across to the Unix system at a high level. Rather than ensuring that all the Windows code works under Wine it uses a suitable - Unix ODBC provider, such as UnixODBC. Thus if you configure Wine to + Unix ODBC provider, such as <literal>unixODBC</literal>. Thus if you configure Wine to use the built-in <filename class="libraryfile">odbc32.dll</filename>, that Wine DLL will interface to your Unix ODBC package and let that do the work, whereas if you configure @@ -713,7 +713,7 @@ ln -s /mnt/smb/<replaceable>myserver</replaceable>/<replaceable>some</replaceabl The first step in using a Unix ODBC system with Wine is, of course, to get the Unix ODBC system working itself. This may involve downloading code or binary packages etc. There are several Unix ODBC systems - available such as unixODBC or an ODBC-ODBC bridge that can be used + available such as <literal>unixODBC</literal> or an ODBC-ODBC bridge that can be used to access a Microsoft Access database. Typically such systems will include a tool, such as <command>isql</command>, which will allow you to access the data from the command line so that you can check @@ -752,10 +752,10 @@ LIB_ODBC_DRIVER_MANAGER=/usr/lib/libodbc.so.1.0.0 If you have any problems then you can use <userinput><envar>WINEDEBUG</envar>=+odbc32</userinput> command before running Wine to trace what is happening. One word of - warning. Some programs actually cheat a little and bypass the ODBC + warning: some programs actually cheat a little and bypass the ODBC library. For example the Crystal Reports engine goes to the registry - to check on the DSN. The fix for this is documented at unixODBC - site where there is a section on using unixODBC with Wine. + to check on the DSN. The fix for this is documented at <literal>unixODBC</literal> + site where there is a section on using <literal>unixODBC</literal> with Wine. </para> </sect3> <sect3> @@ -769,7 +769,8 @@ LIB_ODBC_DRIVER_MANAGER=/usr/lib/libodbc.so.1.0.0 </para> <para> In order to set up MSSQL support you will first need to download - and run the <command>mdac_typ.exe</command> installer from microsoft.com. In order to + and run the <command>mdac_typ.exe</command> installer from <uri + type="homepage">www.microsoft.com</uri>. In order to configure your ODBC connections you must then run <command>CLICONFG.EXE</command> and <command>ODBCAD32.EXE</command> under Wine. You can find them in the <filename class="directory">windows\system</filename> diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index 090eb58..ce4abae 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -383,7 +383,7 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" <title>-w</title> <para> This parameter makes a newly started <command>wineserver</command> wait until the - currently active <command>wineserver</command> instance terminates. + currently active instance terminates. </para> </sect2> </sect1> @@ -470,12 +470,12 @@ export <envar>MYENVIRONMENTVAR</envar>=<replaceable>myenvironmentvarsetting</rep </listitem> <listitem> <para> - <command>wineconsole</command> with <parameter>user</parameter> backend + <command>wineconsole</command> with <literal>user</literal> backend </para> </listitem> <listitem> <para> - <command>wineconsole</command> with <parameter>curses</parameter> backend + <command>wineconsole</command> with <literal>curses</literal> backend </para> </listitem> </itemizedlist> @@ -496,8 +496,8 @@ export <envar>MYENVIRONMENTVAR</envar>=<replaceable>myenvironmentvarsetting</rep <row> <entry>Function</entry> <entry>Bare streams</entry> - <entry>Wineconsole & user backend</entry> - <entry>Wineconsole & curses backend</entry> + <entry>Wineconsole with <literal>user</literal> backend</entry> + <entry>Wineconsole with <literal>curses</literal> backend</entry> </row> </thead> <tbody> @@ -538,8 +538,9 @@ export <envar>MYENVIRONMENTVAR</envar>=<replaceable>myenvironmentvarsetting</rep </row> <row> <entry>Implementation</entry> - <entry>Maps the standard Windows streams to the - standard Unix streams (stdin/stdout/stderr) + <entry> + Maps the standard Windows streams to the standard Unix streams + (<literal>stdin<literal>/<literal>stdout</literal>/<literal>stderr</literal>) </entry> <entry> <command>wineconsole</command> will create a new window (hence @@ -549,8 +550,9 @@ export <envar>MYENVIRONMENTVAR</envar>=<replaceable>myenvironmentvarsetting</rep <entry> <command>wineconsole</command> will use existing Unix console (from which the program is run) and with the help of - the (n)curses library take control of all the terminal - surface for interacting with the user + the <filename class="libraryfile">curses</filename>/<filename + class="libraryfile">ncurses</filename> library take control of all + the terminal surface for interacting with the user </entry> </row> <row> @@ -576,9 +578,9 @@ export <envar>MYENVIRONMENTVAR</envar>=<replaceable>myenvironmentvarsetting</rep to have for a given application. </para> <para> - As of today, only the USER backend allows you to edit those + As of today, only the <literal>user</literal> backend allows you to edit those options (we don't recommend editing by hand the registry - contents). This edition is fired when a user right click in + contents). This edition is fired when a user right clicks in the console (this popups a menu), where you can either choose from: <itemizedlist> @@ -588,9 +590,8 @@ export <envar>MYENVIRONMENTVAR</envar>=<replaceable>myenvironmentvarsetting</rep applications which haven't been configured yet. So, when an application is first run (on your machine, under your account) in <command>wineconsole</command>, - <command>wineconsole</command> will - inherit this default settings for the - application. Afterwards, the application will have its + it will inherit these default settings. + Afterwards, the application will have its own settings, that you'll be able to modify at your will. </para> <para>

1 0

Jacek Caban : mshtml: Keep moniker reference after start_binding call.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: 4db1b0081533ed93c06f9be2934f3b469fca22af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db1b0081533ed93c06f9be29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 19 16:12:42 2013 +0200 mshtml: Keep moniker reference after start_binding call. --- dlls/mshtml/navigate.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fb639a8..94c7717 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -360,6 +360,11 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac This->binding = NULL; } + if(This->mon) { + IMoniker_Release(This->mon); + This->mon = NULL; + } + list_remove(&This->entry); list_init(&This->entry); This->window = NULL; @@ -823,9 +828,6 @@ HRESULT start_binding(HTMLInnerWindow *inner_window, BSCallback *bscallback, IBi if(str) IStream_Release(str); - IMoniker_Release(bscallback->mon); - bscallback->mon = NULL; - return S_OK; }

1 0

Jacek Caban : mshtml: Don' t pass navigation to Gecko for MIME types that it doesn't support.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: b17d139328895b88d43af753ce6560af5b1bbe74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17d139328895b88d43af753c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 19 16:12:51 2013 +0200 mshtml: Don't pass navigation to Gecko for MIME types that it doesn't support. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 29 ++++++++++++++++++++++++++++- dlls/mshtml/nsembed.c | 19 +++++++++++++++++++ dlls/mshtml/nsiface.idl | 16 ++++++++++++++++ 4 files changed, 64 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8063ac5..f3c3b28 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -832,6 +832,7 @@ void get_editor_controller(NSContainer*) DECLSPEC_HIDDEN; nsresult get_nsinterface(nsISupports*,REFIID,void**) DECLSPEC_HIDDEN; nsIWritableVariant *create_nsvariant(void) DECLSPEC_HIDDEN; nsresult create_nsfile(const PRUnichar*,nsIFile**) DECLSPEC_HIDDEN; +char *get_nscategory_entry(const char*,const char*) DECLSPEC_HIDDEN; HRESULT create_pending_window(HTMLOuterWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; HRESULT start_binding(HTMLInnerWindow*,BSCallback*,IBindCtx*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 94c7717..444abbc 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1161,6 +1161,9 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) } } + if(!This->nschannel) + return S_OK; + if(!This->nslistener) { BYTE buf[1024]; @@ -1544,7 +1547,7 @@ static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) if(result != E_ABORT) { if(FAILED(result)) handle_navigation_error(This, result); - else if(This->is_doc_channel) { + else if(This->is_doc_channel && This->nschannel) { result = async_stop_request(This); if(SUCCEEDED(result)) return S_OK; @@ -1604,12 +1607,36 @@ static HRESULT handle_redirect(nsChannelBSC *This, const WCHAR *new_url) return hres; } +static BOOL is_supported_doc_mime(const WCHAR *mime) +{ + char *nscat, *mimea; + BOOL ret; + + mimea = heap_strdupWtoA(mime); + if(!mimea) + return FALSE; + + nscat = get_nscategory_entry("Gecko-Content-Viewers", mimea); + + ret = nscat != NULL && !strcmp(nscat, "@mozilla.org/content/document-loader-factory;1"); + + heap_free(mimea); + nsfree(nscat); + return ret; +} + static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCWSTR status_text) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); switch(status_code) { case BINDSTATUS_MIMETYPEAVAILABLE: + if(This->is_doc_channel && !is_supported_doc_mime(status_text)) { + FIXME("External MIME: %s\n", debugstr_w(status_text)); + + This->nschannel = NULL; + } + if(!This->nschannel) return S_OK; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 4e72464..bbac821 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -48,6 +48,7 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_EDITORCONTROLLER_CONTRACTID "@mozilla.org/editor/editorcontroller;1" #define NS_PREFERENCES_CONTRACTID "@mozilla.org/preferences;1" #define NS_VARIANT_CONTRACTID "@mozilla.org/variant;1" +#define NS_CATEGORYMANAGER_CONTRACTID "@mozilla.org/categorymanager;1" #define PR_UINT32_MAX 0xffffffff @@ -73,6 +74,7 @@ static HINSTANCE xul_handle = NULL; static nsIServiceManager *pServMgr = NULL; static nsIComponentManager *pCompMgr = NULL; +static nsICategoryManager *cat_mgr; static nsIMemory *nsmem = NULL; static nsIFile *profile_directory, *plugin_directory; @@ -725,6 +727,11 @@ static BOOL init_xpcom(const PRUnichar *gre_path) if(NS_FAILED(nsres)) ERR("Could not get nsIMemory: %08x\n", nsres); + nsres = nsIServiceManager_GetServiceByContractID(pServMgr, NS_CATEGORYMANAGER_CONTRACTID, + &IID_nsICategoryManager, (void**)&cat_mgr); + if(NS_FAILED(nsres)) + ERR("Could not get category manager service: %08x\n", nsres); + if(registrar) { register_nsservice(registrar, pServMgr); nsIComponentRegistrar_Release(registrar); @@ -901,6 +908,15 @@ nsIWritableVariant *create_nsvariant(void) return ret; } +char *get_nscategory_entry(const char *category, const char *entry) +{ + char *ret = NULL; + nsresult nsres; + + nsres = nsICategoryManager_GetCategoryEntry(cat_mgr, category, entry, &ret); + return NS_SUCCEEDED(nsres) ? ret : NULL; +} + nsresult get_nsinterface(nsISupports *iface, REFIID riid, void **ppv) { nsIInterfaceRequestor *iface_req; @@ -1093,6 +1109,9 @@ void close_gecko(void) if(pServMgr) nsIServiceManager_Release(pServMgr); + if(cat_mgr) + nsICategoryManager_Release(cat_mgr); + if(nsmem) nsIMemory_Release(nsmem); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index fcdf6f1..010aa51 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3263,6 +3263,22 @@ interface nsICommandManager : nsISupports [ object, + uuid(3275b2cd-af6d-429a-80d7-f0c5120342ac), + local +] +interface nsICategoryManager : nsISupports +{ + nsresult GetCategoryEntry(const char *aCategory, const char *aEntry, char **_retval); + nsresult AddCategoryEntry(const char *aCategory, const char *aEntry, const char *aValue, bool aPersist, + bool aReplace, char **_retval); + nsresult DeleteCategoryEntry(const char *aCategory, const char *aEntry, bool aPersist); + nsresult DeleteCategory(const char *aCategory); + nsresult EnumerateCategory(const char *aCategory, nsISimpleEnumerator **_retval); + nsresult EnumerateCategories(nsISimpleEnumerator **_retval); +} + +[ + object, uuid(47b82b60-a36f-4167-8072-6f421151ed50), local ]

1 0

Jacek Caban : mshtml: Pass external connection to WebBrowser host, if possible.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: d36ffab315de831dd3e430ee9320584d4db171a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36ffab315de831dd3e430ee9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 19 16:13:06 2013 +0200 mshtml: Pass external connection to WebBrowser host, if possible. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 85 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/oleobj.c | 2 +- 3 files changed, 87 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f3c3b28..df7b600 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -965,6 +965,7 @@ void do_ns_command(HTMLDocument*,const char*,nsICommandParams*) DECLSPEC_HIDDEN; void update_doc(HTMLDocument*,DWORD) DECLSPEC_HIDDEN; void update_title(HTMLDocumentObj*) DECLSPEC_HIDDEN; +void set_document_navigation(HTMLDocumentObj*,BOOL) DECLSPEC_HIDDEN; HRESULT do_query_service(IUnknown*,REFGUID,REFIID,void**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 444abbc..2c0666e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1625,6 +1625,89 @@ static BOOL is_supported_doc_mime(const WCHAR *mime) return ret; } +static IUri *get_moniker_uri(IMoniker *mon) +{ + IUriContainer *uri_container; + IUri *ret = NULL; + HRESULT hres; + + hres = IMoniker_QueryInterface(mon, &IID_IUriContainer, (void**)&uri_container); + if(SUCCEEDED(hres)) { + hres = IUriContainer_GetIUri(uri_container, &ret); + IUriContainer_Release(uri_container); + if(FAILED(hres)) + return NULL; + }else { + FIXME("No IUriContainer\n"); + } + + return ret; +} + +static void handle_extern_mime_navigation(nsChannelBSC *This) +{ + IWebBrowserPriv2IE8 *webbrowser_priv; + IOleCommandTarget *cmdtrg; + HTMLDocumentObj *doc_obj; + IBindCtx *bind_ctx; + IUri *uri; + VARIANT flags; + HRESULT hres; + + if(!This->bsc.window || !This->bsc.window->base.outer_window || !This->bsc.window->base.outer_window->doc_obj) + return; + + doc_obj = This->bsc.window->base.outer_window->doc_obj; + + hres = IOleClientSite_QueryInterface(doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 62, 0, NULL, NULL); + IOleCommandTarget_Release(cmdtrg); + } + + set_document_navigation(doc_obj, FALSE); + + if(!doc_obj->webbrowser) { + FIXME("unimplemented in non-webbrowser mode\n"); + return; + } + + uri = get_moniker_uri(This->bsc.mon); + if(!uri) + return; + + hres = CreateBindCtx(0, &bind_ctx); + if(FAILED(hres)) { + IUri_Release(uri); + return; + } + + V_VT(&flags) = VT_I4; + V_I4(&flags) = navHyperlink; + + hres = IUnknown_QueryInterface(doc_obj->webbrowser, &IID_IWebBrowserPriv2IE8, (void**)&webbrowser_priv); + if(SUCCEEDED(hres)) { + hres = IWebBrowserPriv2IE8_NavigateWithBindCtx2(webbrowser_priv, uri, &flags, NULL, NULL, NULL, bind_ctx, NULL); + IWebBrowserPriv2IE8_Release(webbrowser_priv); + }else { + IWebBrowserPriv *webbrowser_priv_old; + VARIANT uriv; + + hres = IUnknown_QueryInterface(doc_obj->webbrowser, &IID_IWebBrowserPriv, (void**)&webbrowser_priv_old); + if(SUCCEEDED(hres)) { + V_VT(&uriv) = VT_BSTR; + IUri_GetDisplayUri(uri, &V_BSTR(&uriv)); + + hres = IWebBrowserPriv_NavigateWithBindCtx(webbrowser_priv_old, &uriv, &flags, NULL, NULL, NULL, bind_ctx, NULL); + + SysFreeString(V_BSTR(&uriv)); + IWebBrowserPriv_Release(webbrowser_priv_old); + } + } + + IUri_Release(uri); +} + static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCWSTR status_text) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); @@ -1634,6 +1717,8 @@ static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCW if(This->is_doc_channel && !is_supported_doc_mime(status_text)) { FIXME("External MIME: %s\n", debugstr_w(status_text)); + handle_extern_mime_navigation(This); + This->nschannel = NULL; } diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index fded548..1a123ac 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -210,7 +210,7 @@ void call_docview_84(HTMLDocumentObj *doc) FIXME("handle result\n"); } -static void set_document_navigation(HTMLDocumentObj *doc, BOOL doc_can_navigate) +void set_document_navigation(HTMLDocumentObj *doc, BOOL doc_can_navigate) { VARIANT var;

1 0

Jacek Caban : mshtml: Added external MIME handling tests.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: 6e143e6c81b7e1bef49fbf447b9b77226138c616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e143e6c81b7e1bef49fbf447… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 19 16:13:20 2013 +0200 mshtml: Added external MIME handling tests. --- dlls/mshtml/tests/htmldoc.c | 353 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 291 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e143e6c81b7e1bef49fb…

1 0

Hans Leidekker : rsaenh: Add support for retrieving the security descriptor on key containers.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: 8e74c8953a60c128491026ce66d988c382a6c86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e74c8953a60c128491026ce6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 19 16:23:42 2013 +0200 rsaenh: Add support for retrieving the security descriptor on key containers. --- dlls/advapi32/tests/crypt.c | 32 ++++++++++++++++++++++++++++++++ dlls/rsaenh/rsaenh.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 768dd3b..dc10cce 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -1140,6 +1140,37 @@ static void test_SystemFunction036(void) ok(ret == TRUE, "Expected SystemFunction036 to return TRUE, got %d\n", ret); } +static void test_container_sd(void) +{ + HCRYPTPROV prov; + SECURITY_DESCRIPTOR *sd; + DWORD len; + BOOL ret; + + ret = CryptAcquireContextA(&prov, "winetest", "Microsoft Enhanced Cryptographic Provider v1.0", + PROV_RSA_FULL, CRYPT_MACHINE_KEYSET|CRYPT_NEWKEYSET); + ok(ret, "got %u\n", GetLastError()); + + len = 0; + SetLastError(0xdeadbeef); + ret = CryptGetProvParam(prov, PP_KEYSET_SEC_DESCR, NULL, &len, OWNER_SECURITY_INFORMATION); + ok(ret, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(len, "expected len > 0\n"); + + sd = HeapAlloc(GetProcessHeap(), 0, len); + ret = CryptGetProvParam(prov, PP_KEYSET_SEC_DESCR, (BYTE *)sd, &len, OWNER_SECURITY_INFORMATION); + ok(ret, "got %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, sd); + + ret = CryptReleaseContext(prov, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = CryptAcquireContextA(&prov, "winetest", "Microsoft Enhanced Cryptographic Provider v1.0", + PROV_RSA_FULL, CRYPT_MACHINE_KEYSET|CRYPT_DELETEKEYSET); + ok(ret, "got %u\n", GetLastError()); +} + START_TEST(crypt) { init_function_pointers(); @@ -1151,6 +1182,7 @@ START_TEST(crypt) test_incorrect_api_usage(); test_verify_sig(); test_machine_guid(); + test_container_sd(); clean_up_environment(); } diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index b4e4b35..df2db42 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -38,6 +38,7 @@ #include "implglue.h" #include "objbase.h" #include "rpcproxy.h" +#include "aclapi.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -3674,6 +3675,7 @@ BOOL WINAPI RSAENH_CPGetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam * - PP_SIG_KEYSIZE_INC: RSA signature keywidth granularity in bits. * - PP_KEYX_KEYSIZE_INC: RSA key-exchange keywidth granularity in bits. * - PP_ENUMALGS{_EX}: Query provider capabilities. + * - PP_KEYSET_SEC_DESCR: Retrieve security descriptor on container. */ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD *pdwDataLen, DWORD dwFlags) @@ -3834,6 +3836,34 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, case PP_CRYPT_COUNT_KEY_USE: /* Asked for by IE About dialog */ return copy_param(pbData, pdwDataLen, abWTF, sizeof(abWTF)); + case PP_KEYSET_SEC_DESCR: + { + SECURITY_DESCRIPTOR *sd; + DWORD err, len, flags = (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET); + + if (!open_container_key(pKeyContainer->szName, flags, &hKey)) + { + SetLastError(NTE_BAD_KEYSET); + return FALSE; + } + + err = GetSecurityInfo(hKey, SE_REGISTRY_KEY, dwFlags, NULL, NULL, NULL, NULL, (void **)&sd); + RegCloseKey(hKey); + if (err) + { + SetLastError(err); + return FALSE; + } + + len = GetSecurityDescriptorLength(sd); + if (*pdwDataLen >= len) memcpy(pbData, sd, len); + else SetLastError(ERROR_INSUFFICIENT_BUFFER); + *pdwDataLen = len; + + LocalFree(sd); + return TRUE; + } + default: /* MSDN: Unknown parameter number in dwParam */ SetLastError(NTE_BAD_TYPE);

1 0

Huw Davies : iphlpapi: Combine the various interface enumeration functions into one function.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: 8876c3ee820a7c0ef6662ef6c81f45bab0b204ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8876c3ee820a7c0ef6662ef6c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 19 15:39:20 2013 +0100 iphlpapi: Combine the various interface enumeration functions into one function. --- dlls/iphlpapi/ifenum.c | 119 ++++++++++------------------------------- dlls/iphlpapi/ifenum.h | 13 ++--- dlls/iphlpapi/iphlpapi_main.c | 18 ++++--- dlls/iphlpapi/ipstats.c | 4 +- 4 files changed, 45 insertions(+), 109 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index d8eebca..6ad08a8 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -161,103 +161,42 @@ BOOL isIfIndexLoopback(ULONG idx) return ret; } -DWORD getNumNonLoopbackInterfaces(void) -{ - DWORD numInterfaces; - int fd = socket(PF_INET, SOCK_DGRAM, 0); - - if (fd != -1) { - struct if_nameindex *indexes = if_nameindex(); - - if (indexes) { - struct if_nameindex *p; - - for (p = indexes, numInterfaces = 0; p && p->if_name; p++) - if (!isLoopbackInterface(fd, p->if_name)) - numInterfaces++; - if_freenameindex(indexes); - } - else - numInterfaces = 0; - close(fd); - } - else - numInterfaces = 0; - return numInterfaces; -} -DWORD getNumInterfaces(void) +DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) { - DWORD numInterfaces; - struct if_nameindex *indexes = if_nameindex(); + DWORD count = 0, i; + struct if_nameindex *p, *indices = if_nameindex(); + InterfaceIndexTable *ret; - if (indexes) { - struct if_nameindex *p; + if (table) *table = NULL; + if (!indices) return 0; - for (p = indexes, numInterfaces = 0; p && p->if_name; p++) - numInterfaces++; - if_freenameindex(indexes); - } - else - numInterfaces = 0; - return numInterfaces; -} - -InterfaceIndexTable *getInterfaceIndexTable(void) -{ - DWORD numInterfaces; - InterfaceIndexTable *ret; - struct if_nameindex *indexes = if_nameindex(); - - if (indexes) { - struct if_nameindex *p; - - for (p = indexes, numInterfaces = 0; p && p->if_name; p++) - numInterfaces++; - ret = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceIndexTable, indexes[numInterfaces])); - if (ret) { - ret->numIndexes = 0; - for (p = indexes; p && p->if_name; p++) - ret->indexes[ret->numIndexes++] = p->if_index; + for (p = indices; p->if_name; p++) + { + if (skip_loopback && isIfIndexLoopback( p->if_index )) continue; + count++; } - if_freenameindex(indexes); - } - else - ret = NULL; - return ret; -} - -InterfaceIndexTable *getNonLoopbackInterfaceIndexTable(void) -{ - DWORD numInterfaces; - InterfaceIndexTable *ret; - int fd = socket(PF_INET, SOCK_DGRAM, 0); - if (fd != -1) { - struct if_nameindex *indexes = if_nameindex(); - - if (indexes) { - struct if_nameindex *p; - - for (p = indexes, numInterfaces = 0; p && p->if_name; p++) - if (!isLoopbackInterface(fd, p->if_name)) - numInterfaces++; - ret = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceIndexTable, indexes[numInterfaces])); - if (ret) { - ret->numIndexes = 0; - for (p = indexes; p && p->if_name; p++) - if (!isLoopbackInterface(fd, p->if_name)) - ret->indexes[ret->numIndexes++] = p->if_index; - } - if_freenameindex(indexes); + if (table) + { + ret = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(InterfaceIndexTable, indexes[count]) ); + if (!ret) + { + count = 0; + goto end; + } + for (p = indices, i = 0; p->if_name && i < count; p++) + { + if (skip_loopback && isIfIndexLoopback( p->if_index )) continue; + ret->indexes[i++] = p->if_index; + } + ret->numIndexes = count = i; + *table = ret; } - else - ret = NULL; - close(fd); - } - else - ret = NULL; - return ret; + +end: + if_freenameindex( indices ); + return count; } static DWORD getInterfaceBCastAddrByName(const char *name) diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index 304f0db..49b6e7b 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -44,23 +44,18 @@ #define MAX_INTERFACE_PHYSADDR 8 #define MAX_INTERFACE_DESCRIPTION 256 -DWORD getNumInterfaces(void) DECLSPEC_HIDDEN; -DWORD getNumNonLoopbackInterfaces(void) DECLSPEC_HIDDEN; BOOL isIfIndexLoopback(ULONG idx) DECLSPEC_HIDDEN; -/* A table of interface indexes, see get*InterfaceTable(). */ +/* A table of interface indexes, see get_interface_indices(). */ typedef struct _InterfaceIndexTable { DWORD numIndexes; IF_INDEX indexes[1]; } InterfaceIndexTable; -/* Returns a table with all known interface indexes, or NULL if one could not - * be allocated. HeapFree() the returned table. +/* Returns the count of all interface indexes and optionally a ptr to an interface table. + * HeapFree() the returned table. Will optionally ignore loopback devices. */ -InterfaceIndexTable *getInterfaceIndexTable(void) DECLSPEC_HIDDEN; - -/* Like getInterfaceIndexTable, but filters out loopback interfaces. */ -InterfaceIndexTable *getNonLoopbackInterfaceIndexTable(void) DECLSPEC_HIDDEN; +DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) DECLSPEC_HIDDEN; /* ByName/ByIndex versions of various getter functions. */ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e2d09eb..9d23c82 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -463,7 +463,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) if (!pOutBufLen) ret = ERROR_INVALID_PARAMETER; else { - DWORD numNonLoopbackInterfaces = getNumNonLoopbackInterfaces(); + DWORD numNonLoopbackInterfaces = get_interface_indices( TRUE, NULL ); if (numNonLoopbackInterfaces > 0) { DWORD numIPAddresses = getNumIPAddresses(); @@ -489,7 +489,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) if (!ret) ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); if (!ret) - table = getNonLoopbackInterfaceIndexTable(); + get_interface_indices( TRUE, &table ); if (table) { size = sizeof(IP_ADAPTER_INFO) * table->numIndexes; size += ipAddrTable->dwNumEntries * sizeof(IP_ADDR_STRING); @@ -1129,7 +1129,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P if (!buflen) return ERROR_INVALID_PARAMETER; - table = getInterfaceIndexTable(); + get_interface_indices( FALSE, &table ); if (!table || !table->numIndexes) { HeapFree(GetProcessHeap(), 0, table); @@ -1431,7 +1431,7 @@ DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) if (!pdwSize) ret = ERROR_INVALID_PARAMETER; else { - DWORD numInterfaces = getNumInterfaces(); + DWORD numInterfaces = get_interface_indices( FALSE, NULL ); ULONG size = sizeof(MIB_IFTABLE); if (numInterfaces > 1) @@ -1441,7 +1441,8 @@ DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) ret = ERROR_INSUFFICIENT_BUFFER; } else { - InterfaceIndexTable *table = getInterfaceIndexTable(); + InterfaceIndexTable *table; + get_interface_indices( FALSE, &table ); if (table) { size = sizeof(MIB_IFTABLE); @@ -1501,7 +1502,7 @@ DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO pIfTable, PULONG dwOutBufLen) if (!dwOutBufLen) ret = ERROR_INVALID_PARAMETER; else { - DWORD numInterfaces = getNumInterfaces(); + DWORD numInterfaces = get_interface_indices( FALSE, NULL ); ULONG size = sizeof(IP_INTERFACE_INFO); if (numInterfaces > 1) @@ -1511,7 +1512,8 @@ DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO pIfTable, PULONG dwOutBufLen) ret = ERROR_INSUFFICIENT_BUFFER; } else { - InterfaceIndexTable *table = getInterfaceIndexTable(); + InterfaceIndexTable *table; + get_interface_indices( FALSE, &table ); if (table) { size = sizeof(IP_INTERFACE_INFO); @@ -1837,7 +1839,7 @@ DWORD WINAPI GetNumberOfInterfaces(PDWORD pdwNumIf) if (!pdwNumIf) ret = ERROR_INVALID_PARAMETER; else { - *pdwNumIf = getNumInterfaces(); + *pdwNumIf = get_interface_indices( FALSE, NULL ); ret = NO_ERROR; } TRACE("returning %d\n", ret); diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 1185f08..3ff30f3 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -763,7 +763,7 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; memset( stats, 0, sizeof(*stats) ); - stats->dwNumIf = stats->dwNumAddr = getNumInterfaces(); + stats->dwNumIf = stats->dwNumAddr = get_interface_indices( FALSE, NULL ); if (!AllocateAndGetIpForwardTableFromStack( &fwd_table, FALSE, GetProcessHeap(), 0 )) { stats->dwNumRoutes = fwd_table->dwNumEntries; @@ -1174,7 +1174,7 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; memset( stats, 0, sizeof(*stats) ); - stats->dwNumAddrs = getNumInterfaces(); + stats->dwNumAddrs = get_interface_indices( FALSE, NULL ); if (family == WS_AF_INET6) {

1 0