February 2008 - Wine-Devel - list.winehq.org

Re: [RFC] winecfg enhancements

by Jeff Zaroyko

Reece Dunn <msclrhd <at> googlemail.com> writes: > > Hi, > > I am looking at how we can make winecfg more useful. I have already > supplied patches to allow importing a ubuntu human theme to work :). > So I am now looking at how to build on that. > [...] > > - Reece > > I think this could probably do with some consideration http://bugs.winehq.org/show_bug.cgi?id=6233 , it describes how the Applications tab does not belong among the other tabs because it should be higher up in the hierarchy of things.

Feb. 13, 2008

Re: msxml3: Implement IXMLDOMDocument IDispatch interface

by Alistair Leslie-Hughes

Hi, Was there anything wrong with this patch? Dont commit this patch if nothing is wrong. I will submit a series of patches, that will include these changes. Best Regards Alistair Leslie-Hughes "Alistair Leslie-Hughes" <leslie_alistair(a)hotmail.com> wrote in message news:fnchqv$a5r$1(a)ger.gmane.org... > Hi, > > Fixes bug http://bugs.winehq.org/show_bug.cgi?id=11257 > > Changelog: > msxml3: Implement IXMLDOMDocument IDispatch interface > > Best Regards > Alistair Leslie-Hughes > -------------------------------------------------------------------------------- > From 7cc5228684ed6d9aaace829cc1b8ebb43e5f4325 Mon Sep 17 00:00:00 2001 > From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > Date: Fri, 25 Jan 2008 22:34:36 +1100 > Subject: [PATCH] Implement IXMLDOMDocument IDispatch interface > To: wine-patches <wine-patches(a)winehq.org> > > --- > dlls/msxml3/domdoc.c | 53 +++++++++++++++++++++++++++++++++------ > dlls/msxml3/main.c | 58 > +++++++++++++++++++++++++++++++++++++++++++ > dlls/msxml3/msxml_private.h | 8 ++++++ > 3 files changed, 111 insertions(+), 8 deletions(-) > > diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c > index 06388c8..9d6b94b 100644 > --- a/dlls/msxml3/domdoc.c > +++ b/dlls/msxml3/domdoc.c > @@ -416,16 +416,29 @@ static ULONG WINAPI domdoc_Release( > > static HRESULT WINAPI domdoc_GetTypeInfoCount( IXMLDOMDocument2 *iface, > UINT* pctinfo ) > { > - FIXME("\n"); > - return E_NOTIMPL; > + domdoc *This = impl_from_IXMLDOMDocument2( iface ); > + > + TRACE("(%p)->(%p)\n", This, pctinfo); > + > + *pctinfo = 1; > + > + return S_OK; > } > > static HRESULT WINAPI domdoc_GetTypeInfo( > IXMLDOMDocument2 *iface, > UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) > { > - FIXME("\n"); > - return E_NOTIMPL; > + domdoc *This = impl_from_IXMLDOMDocument2( iface ); > + HRESULT hr; > + > + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); > + > + hr = get_typeinfo(IXMLDOMDocument2_tid, ppTInfo); > + if(SUCCEEDED(hr)) > + ITypeInfo_AddRef(*ppTInfo); > + > + return hr; > } > > static HRESULT WINAPI domdoc_GetIDsOfNames( > @@ -436,8 +449,21 @@ static HRESULT WINAPI domdoc_GetIDsOfNames( > LCID lcid, > DISPID* rgDispId) > { > - FIXME("\n"); > - return E_NOTIMPL; > + domdoc *This = impl_from_IXMLDOMDocument2( iface ); > + ITypeInfo *typeinfo; > + HRESULT hr; > + > + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), > rgszNames, cNames, > + lcid, rgDispId); > + > + if(!rgszNames || cNames == 0 || !rgDispId) > + return E_INVALIDARG; > + > + hr = get_typeinfo(IXMLDOMDocument2_tid, &typeinfo); > + if(SUCCEEDED(hr)) > + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, > rgDispId); > + > + return hr; > } > > > @@ -452,8 +478,19 @@ static HRESULT WINAPI domdoc_Invoke( > EXCEPINFO* pExcepInfo, > UINT* puArgErr) > { > - FIXME("\n"); > - return E_NOTIMPL; > + domdoc *This = impl_from_IXMLDOMDocument2( iface ); > + ITypeInfo *typeinfo; > + HRESULT hr; > + > + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, > debugstr_guid(riid), > + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); > + > + hr = get_typeinfo(IXMLDOMDocument2_tid, &typeinfo); > + if(SUCCEEDED(hr)) > + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, > wFlags, pDispParams, > + pVarResult, pExcepInfo, puArgErr); > + > + return hr; > } > > > diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c > index 62bf2b5..41afbe6 100644 > --- a/dlls/msxml3/main.c > +++ b/dlls/msxml3/main.c > @@ -21,6 +21,8 @@ > > #include "config.h" > > +#define COBJMACROS > + > #include <stdarg.h> > #include "windef.h" > #include "winbase.h" > @@ -34,6 +36,61 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(msxml); > > + > +static ITypeLib *typelib; > +static ITypeInfo *typeinfos[LAST_tid]; > + > +static REFIID tid_ids[] = { > + &IID_IXMLDOMDocument2 > +}; > + > +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) > +{ > + HRESULT hres; > + > + if(!typelib) { > + ITypeLib *tl; > + > + hres = LoadRegTypeLib(&LIBID_MSXML2, 3, 0, LOCALE_SYSTEM_DEFAULT, > &tl); > + if(FAILED(hres)) { > + ERR("LoadRegTypeLib failed: %08x\n", hres); > + return hres; > + } > + > + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) > + ITypeLib_Release(tl); > + } > + > + if(!typeinfos[tid]) { > + ITypeInfo *typeinfo; > + > + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], > &typeinfo); > + if(FAILED(hres)) { > + ERR("GetTypeInfoOfGuid failed: %08x\n", hres); > + return hres; > + } > + > + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), > typeinfo, NULL)) > + ITypeInfo_Release(typeinfo); > + } > + > + *typeinfo = typeinfos[tid]; > + return S_OK; > +} > + > +static void process_detach(void) > +{ > + if(typelib) { > + unsigned i; > + > + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) > + if(typeinfos[i]) > + ITypeInfo_Release(typeinfos[i]); > + > + ITypeLib_Release(typelib); > + } > +} > + > HRESULT WINAPI DllCanUnloadNow(void) > { > FIXME("\n"); > @@ -53,6 +110,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD > fdwReason, LPVOID lpv) > case DLL_PROCESS_DETACH: > #ifdef HAVE_LIBXML2 > xmlCleanupParser(); > + process_detach(); > #endif > break; > } > diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h > index 8d79d2e..c7d97a1 100644 > --- a/dlls/msxml3/msxml_private.h > +++ b/dlls/msxml3/msxml_private.h > @@ -91,4 +91,12 @@ extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, > LPVOID *ppObj ); > extern HRESULT SchemaCache_create( IUnknown *pUnkOuter, LPVOID *ppObj ); > extern HRESULT XMLDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); > > +/* typelibs */ > +enum tid_t { > + IXMLDOMDocument2_tid, > + LAST_tid > +}; > + > +extern HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo); > + > #endif /* __MSXML_PRIVATE__ */ > -- > 1.5.3.7 > > -------------------------------------------------------------------------------- > >

Feb. 13, 2008

Re: [RFC] winecfg enhancements

by Reece Dunn

On 13/02/2008, Juan Lang <juan.lang(a)gmail.com> wrote: > > Q: Should we provide a --simple mode for winecfg that has the work > > flow that Ubuntu is planning? Not specifying --simple would bring up > > the standard winecfg dialog. > > If you don't explain what that is, don't expect to many responses. At > least, I don't know what it is. >From https://wiki.ubuntu.com/BetterIntegratedWineSpec: <quote> System->Preferences->Windows Applications Here we reimplement only the Wine configuration options we need. * (Pulldown menu): "Default Windows version to emulate when launching Windows applications" o Windows 2000 is currently the upstream default, which works for most apps * (unchecked by default) Automatically launch applications upon inserting a disc o This is where the user can disable autorun by default if he enabled it with the checkbox in the autorun prompt * (radio button default): Allow full screen applications to change the resolution * (radio button alternate): Contain full screen applications in a window when smaller than the desktop o These are the two main use cases of Wine's various Window managing options. The latter might not be fully functional in time for Hardy. * (button) Advanced o Launches winecfg, or a similarly functional GTK application. We can consider removing this when Wine's defaults get good enough, however likely not by Hardy. To reimplement the configuration we need in GTK requires some upstream changes (see [WWW] ConsoleConfiguration on Wine's wiki. </quote> And the other proposed improvements? Those were mentioned and can be commented on. - Reece

Feb. 13, 2008

Re: [PATCH] Environment variable to specify X11 window for desktop

by Lei Zhang

On Feb 12, 2008 5:13 PM, Timothy Lee <timothy.lee(a)siriushk.com> wrote: > Dear all, > > The attached patch allows the WINE desktop to be embedded within an > existing X11 window, and is similar to the windowed mode in WINE. > > I've tested this feature using MS PowerPoint Viewer 2007, so that a > fullscreen slideshow can be fitted inside any X11 window. > > Regards, > Timothy Lee > > > > > Patches should be sent to wine-patches(a)winehq.org. Please do not use C++ style comments. See: http://www.winehq.org/site/docs/winedev-guide/style-notes

Feb. 13, 2008

Re: user32: correct the caption bar and it's buttons' sizes

by Peter Oberndorfer

On Mittwoch 13 Februar 2008, Divan Burger wrote: > What is the problem without the patch? is the caption bar drawn too high 1 pixel? I ask because i have a patch that restores the 1 pixel high line between the caption bar and the client area (and at the same time decreases the height of the caption bar) see it attached for the NC_DrawXXXButton functions: you also need to update hittest calculation else the wrong buttons are activated. For example when you press the mouse down on the left side of the close button, but maximize gets activated > case SM_CYCAPTION: > if (!spi_loaded[SPI_NONCLIENTMETRICS_IDX]) load_nonclient_metrics(); >- return nonclient_metrics.iCaptionHeight + 1; >+ return nonclient_metrics.iCaptionHeight; this breaks a test in sysparams.c:2416 ok_gsm( SM_CYCAPTION, ncm.iCaptionHeight+1); and 5 other tests Greetings Peter

Feb. 13, 2008

missed systray patches

by Kirill K. Smirnov

Hello, Is there anything wrong with the serie of patches? systray[0/4]: systray improvements [try 2] http://www.winehq.org/pipermail/wine-patches/2008-February/049772.html -- Kirill

Feb. 13, 2008

Re: [RFC] winecfg enhancements

by Juan Lang

> Q: Should we provide a --simple mode for winecfg that has the work > flow that Ubuntu is planning? Not specifying --simple would bring up > the standard winecfg dialog. If you don't explain what that is, don't expect to many responses. At least, I don't know what it is. --Juan

Feb. 13, 2008

Re: Fixing the last failing tests

by Kuba Ober

On Tuesday 12 February 2008, James Hawkins wrote: > On Feb 12, 2008 8:16 PM, Peter Dons Tychsen <donpedro(a)tdcadsl.dk> wrote: > > Hello M. > > > > What is wrong with detecting the version, and branching the test code > > accordingly? Other tests do that IIRC. I think that is a better > > solution, if the version selector in winecfg is still going to be > > meaningful (registry). > > The only time the tests should check for the windows version is if we > know an app does the same thing, which is hardly ever. Well, if we have an old app from win9x times, it will expect windows 95 behavior, without checking for windows version of course. So if Wine is set to impersonate win95, then it should behave like on win95 and the tests should check windows (here: wine) version to select a proper test. Such a version-specific test should pass on win95 and wine with win95 personality chosen. It should also pass on other versions, by choosing a different path (and possibly doing nothing if it doesn't apply to that windows version). So, for example, methinks all applicable unicode tests should be disabled on the early win95 versions which had no such support (if so bolt-on unicode is detected). Wouldn't that make sense? Cheers, Kuba

Feb. 13, 2008

Re: How is the testsuite built for windows

by Paul Millar

Hi Maarten, On Wednesday 13 February 2008 00:51:11 Maarten Lankhorst wrote: > Who managed to compile all wine tests for windows, and how is it done? Once a day, quisquiliae head-node (attempt to) build winetest.exe (and also the other Wine .exe and .dll files). Some details about this are available here: http://quisquiliae.physics.gla.ac.uk/cross/ The cron script builds winetest.exe and checks whether it has changed since last time. If so, registers the new build. (This is a slight over-simplification.) There are some notes on how to build a Windows PE cross-compiler available from here: http://www.astro.gla.ac.uk/~paulm/Cross/ There is also a script that automates building the cross-compiler. Wine is written exclusively in C, so by default, only the C frontend is built. The script should support building other language frontends, but this hasn't been tested much. This page also includes a set of patches for MinGW's Win32API package to allow MinGW to compile winetest.exe. This patch-set is almost exclusively the work of others: Stefan Leichter featuring most prominently (many thanks!) Hans Leidekker maintains a set of RPMs that should provide identical coverage of Win32API as Stefan, Hans, myself and others share the set of patches. Hans' RPMs are available from: http://mirzam.it.vu.nl/mingw/ Cheers, Paul.

Feb. 13, 2008

Re: [PATCH #1] wininet: Added beginning support for HTTP cache files.

by Robert Shearman

Jacek Caban wrote: > + /* FIXME: Better check, when we have to create the cache file */ > + if(bSuccess && (lpwhr->hdr.dwFlags & INTERNET_FLAG_NEED_FILE)) { > + WCHAR url[INTERNET_MAX_URL_LENGTH]; > + WCHAR cacheFileName[MAX_PATH+1]; > + BOOL b; > + > + b = HTTP_GetRequestURL(lpwhr, url); > + if(!b) { > + WARN("Could not get URL\n"); > + goto lend; > + } > + > + b = CreateUrlCacheEntryW(url, lpwhr->dwContentLength > 0 ? lpwhr->dwContentLength : 0, NULL, cacheFileName, 0); > + if(b) { > + lpwhr->lpszCacheFile = WININET_strdupW(cacheFileName); > + lpwhr->hCacheFile = CreateFileW(lpwhr->lpszCacheFile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, > + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); > + if(lpwhr->hCacheFile == INVALID_HANDLE_VALUE) { > + WARN("Could not create file: %u\n", GetLastError()); > + lpwhr->hCacheFile = NULL; > + } > + }else { > + WARN("Could not create cache entry: %08x\n", GetLastError()); > + } > + } > > It may be beyond the scope of your patch, but you're creating the cache file without committing the entry elsewhere so that it can be found at a later time. According to MSDN, this should be done in HTTP_FinishedReading. -- Rob Shearman

Feb. 13, 2008