March 2009 - Wine-devel - list.winehq.org

Re: SoC: DirectShow/Gstreamer
by paulo lesgaz 17 Mar '09

17 Mar '09

o --- En date de : Mar 17.3.09, Roderick Colenbrander <thunderbird2k(a)gmx.net> a écrit : De: Roderick Colenbrander <thunderbird2k(a)gmx.net> Objet: Re: SoC: DirectShow/Gstreamer À: "Trevor Davenport" <trevor.davenport(a)gmail.com>, wine-devel(a)winehq.org Date: Mardi 17 Mars 2009, 11h43 > Hi, > > I'm interested in applying for a GSoC project related to wine. I am > looking at doing the DirectShow/Gstreamer idea that is listed in the > wiki (http://wiki.winehq.org/SummerOfCode) From the idea description > there are a number of factors that would make this an ideal solution. > The description mentions the availability of legal codecs (from > fluendo) plus the ability to use the codecs already exposed to > gstreamer (ie. install a codec and native/wine applications instantly > get support). > > Recently GStreamer has added some pipeline elements targeted at > integrating with other frameworks (appsrc/appsink) which allow sending > data down a gstreamer pipeline and/or recieving it. Prior to these > you had to write your own element (this wasn't too much work either > depending on your needs and may still be preferred for more > compatibility). > > I am quite familiar with both C and GStreamer. I have never looked at > DirectShow though from what i know they are similar in concept. > GStreamer does have some DirectShow filters that allow it to use > directshow elements inside GStreamer (on windows anyway). > > My experience with wine has been limited to my own experiments. I've > played around with audio drivers for wine. I wrote one that used > GStreamer and later adjusted this to use pulseaudio instead. I never > got time to clean them up to the point of submitting them. > > I have a few questions in regard to this idea. Do you think this > project would provide adequate work to occupy the SoC timeframe? I > would have to learn DirectShow which I don't believe would be too > difficult. I've worked with DirectSound/DirectX and would expect it > to require a similiar amount of work. I've also spent a fair amount > of time inside wine's source code looking into various bugs. > > I welcome any comments, suggestions or idea related to this. I'd love > any feedback so I know this is an idea that is wanted (i would like > it...i use wine quite often) and so my application is as good as it > can be. > > Cheers, > Trevor Davenport > Hi Trevor, I was the one who put this project suggestion on the wiki. Personally I think it should be a fine soc project. The project would be quite flexible. I expect that the project is too broad and initially should be confined to some widely used audio / video codecs and some widely used rendering methods (rgb / yuv). There will likely be bugs enough to fix ;) Further I would define one or more apps you want to get working. If I remember correctly some games want to use mpeg or divx for movie playback (Warcraft III uses another codec). The ultimate app to get working using wine's quartz + gstreamer would of course be Windows Media Player ;) Though an open source media player like Media player classic which can use the same codecs is likely easier because you have the source. Roderick -- Psssst! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen: http://www.gmx.net/de/go/multimessenger01 It would be great if the winemp3.acm decoder could be removed and that Wine can decode mpeg1 (tons of game uses this codec) Now, for the SoC application: In the past years, some SoC did not lead any patches in the Wine git tree: applicants gave up before the end, or they did not clean their patches to be put in the tree. To avoid this, the last year, it was requested for the applicants to have a few patches committed before applying. That showed that thy knew how Wine work. I think that it was a good idea. Maybe it was a consequence of that, but almost the SoC gave quite a lot of patches in the tree. Could this be done again for this year. David

1 0

New Coverity run
by Paul Vriens 17 Mar '09

17 Mar '09

Hi, Just wanted to mention that there is a new Coverity run. There were some issues the last weeks that made sure the source wasn't updated (most likely started with the disk issue on winehq.org early February). -- Cheers, Paul.

1 0

[riched20/tests] Changed tests for EM_FORMATRANGE
by Paul Vriens 16 Mar '09

16 Mar '09

Hi, I've been playing with this and just wanted to see if anybody has comments on these changed tests. Tests succeed on Win95/Win98 and W2K3 with every possible resolution (as we are not relying on the resolution anymore) and 96/120 dpi. -- Cheers, Paul. diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 331fd69..d72ef77 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4706,46 +4706,95 @@ static void test_WM_PASTE(void) static void test_EM_FORMATRANGE(void) { - int r; - FORMATRANGE fr; + int i, tpp_x, tpp_y; HDC hdc; HWND hwndRichEdit = new_richedit(NULL); - - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) haystack); + static const struct { + const char *string; /* The string */ + int first; /* First 'pagebreak', 0 for don't care */ + int second; /* Second 'pagebreak', 0 for don't care */ + } fmtstrings[] = { + {"WINE wine", 0, 0}, + {"WINE wineWine", 0, 0}, + {"WINE\r\nwine\r\nwine", 5, 10}, + {"WINE\r\nWINEwine\r\nWINEwine", 5, 14}, + {"WINE\r\n\r\nwine\r\nwine", 5, 6} + }; hdc = GetDC(hwndRichEdit); ok(hdc != NULL, "Could not get HDC\n"); + + /* Calculate the twips per pixel */ + tpp_x = 1440 / GetDeviceCaps(hdc, LOGPIXELSX); + tpp_y = 1440 / GetDeviceCaps(hdc, LOGPIXELSY); - fr.hdc = fr.hdcTarget = hdc; - fr.rc.top = fr.rcPage.top = fr.rc.left = fr.rcPage.left = 0; - fr.rc.right = fr.rcPage.right = GetDeviceCaps(hdc, HORZRES); - fr.rc.bottom = fr.rcPage.bottom = GetDeviceCaps(hdc, VERTRES); - fr.chrg.cpMin = 0; - fr.chrg.cpMax = 20; + SendMessage(hwndRichEdit, EM_FORMATRANGE, FALSE, 0); - r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, 0); - todo_wine { - ok(r == 31, "EM_FORMATRANGE expect %d, got %d\n", 31, r); - } + for (i = 0; i < sizeof(fmtstrings)/sizeof(fmtstrings[0]); i++) + { + FORMATRANGE fr; + GETTEXTLENGTHEX gtl; + SIZE stringsize; + int r, len; - r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); - todo_wine { - ok(r == 20 || r == 9, "EM_FORMATRANGE expect 20 or 9, got %d\n", r); - } + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) fmtstrings[i].string); - fr.chrg.cpMin = 0; - fr.chrg.cpMax = 10; + gtl.flags = GTL_NUMCHARS | GTL_PRECISE; + gtl.codepage = CP_ACP; + len = SendMessageA(hwndRichEdit, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); - r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); - todo_wine { - ok(r == 10, "EM_FORMATRANGE expect %d, got %d\n", 10, r); - } + /* Get some size information for the string */ + GetTextExtentPoint32(hdc, fmtstrings[i].string, strlen(fmtstrings[i].string), &stringsize); - r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, 0); - todo_wine { - ok(r == 31, "EM_FORMATRANGE expect %d, got %d\n", 31, r); + /* Define the box to be half the width needed and a bit larger than the height. + * Changes to the width means we have at least 2 pages. Changes to the height + * is done so we can check the changing of fr.rc.bottom. + */ + fr.hdc = fr.hdcTarget = hdc; + fr.rc.top = fr.rcPage.top = fr.rc.left = fr.rcPage.left = 0; + fr.rc.right = fr.rcPage.right = (stringsize.cx / 2) * tpp_x; + fr.rc.bottom = fr.rcPage.bottom = (stringsize.cy + 10) * tpp_y; + + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, 0); + todo_wine { + ok(r == len, "(EM_FORMATRANGE) Expected %d, got %d\n", len, r); + } + + /* We know that the page can't hold the full string. See how many characters + * are on the first one + */ + fr.chrg.cpMin = 0; + fr.chrg.cpMax = -1; + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); + todo_wine { + ok(fr.rc.bottom == (stringsize.cy * tpp_y), "Expected bottom to be %d, got %d\n", (stringsize.cy * tpp_y), fr.rc.bottom); + } + if (fmtstrings[i].first) + todo_wine { + ok(r == fmtstrings[i].first, "(EM_FORMATRANGE) Expected %d, got %d\n", fmtstrings[i].first, r); + } + else + ok(r < len, "(EM_FORMATRANGE) Expected < %d, got %d\n", len, r); + + /* Do another page */ + fr.chrg.cpMin = r; + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); + if (fmtstrings[i].second) + todo_wine { + ok(r == fmtstrings[i].second, "(EM_FORMATRANGE) Expected %d, got %d\n", fmtstrings[i].second, r); + } + else + ok (r < len, "(EM_FORMATRANGE) Expected < %d, got %d\n", len, r); + + /* There is at least on more page, but we don't care */ + + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, 0); + todo_wine { + ok(r == len, "(EM_FORMATRANGE) Expected %d, got %d\n", len, r); + } } + ReleaseDC(NULL, hdc); DestroyWindow(hwndRichEdit); }

2 1

Re: Registry: Set FontSmoothing as default enabled (AA)
by Stefan Dösinger 16 Mar '09

16 Mar '09

Am Montag, 16. März 2009 17:46:17 schrieb André Hentschel: > Many people report they are missing AA, but its already implemented. > This Patch changes the wine.inf to enable it as default. I don't know how that would be done, but wouldn't it be better to read this on startup from the KDE/Gnome system settings? That way we avoid people asking how to disable AA

1 0

Re: How to enable font anti-aliasing in Wine?
by André Hentschel 16 Mar '09

16 Mar '09

In my case there is no ~/.fonts.conf That depends too much on distribution and windows manager. I think it should be on by default and if there might be problems you can turn it off in registry.

2 1

Re: wldap32: Silence a compiler warning.
by Michael Stefaniuc 16 Mar '09

16 Mar '09

Dmitry Timoshkov wrote: > --- > dlls/wldap32/parse.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c > index f7e93dd..6439ba6 100644 > --- a/dlls/wldap32/parse.c > +++ b/dlls/wldap32/parse.c > @@ -444,7 +444,7 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, > > #ifdef HAVE_LDAP_PARSE_VLV_CONTROL > if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count, > - context, errcode ))) > + (struct berval **)context, errcode ))) > { > *targetpos = pos; > *listcount = count; Dmitry,, Alexandre doesn't want to accept that patch. See http://www.winehq.org/pipermail/wine-devel/2009-January/072151.html bye michael

2 1

Re: riched20: add tests for EM_FORMATRANGE
by Paul Vriens 16 Mar '09

16 Mar '09

Lei Zhang wrote: > Hi, > > In my last attempt, I submitted Troy Rollo's EM_FORMATRANGE > implementation and with my test cases. I'm not sure what was wrong > with the implementation, but the test cases should be ok. > > > ------------------------------------------------------------------------ > > Hi Lei, Pretty old patch. (June 2007) I just moved some of my VMware 'boxes' to my new laptop (laptop resolution 1024x800) and I suddenly had some failures. The resolution that VMware can use (with all those borders and the sidebar) is 1044x574. Running the tests fullscreen makes them pass again. You can replicate this by playing with the screen resolution. The smaller the resolution the more test failures. Any idea where I need to look? -- Cheers, Paul.

3 6

Re: [1/7] mshtml: Implement IHTMLStyle get/put borderLeftWidth (resend)
by Alistair Leslie-Hughes 15 Mar '09

15 Mar '09

Could I get some feedback on this patch please? Best Regards Alistair Leslie-Hughes -------------------------------------------------------------------------------- > >From 60473b955b3b35feb089ad1cbf1320ce9f971020 Mon Sep 17 00:00:00 2001 > From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > Date: Thu, 5 Mar 2009 20:44:38 +1100 > Subject: [PATCH] Implement IHTMLStyle get/put borderLeftWidth > To: wine-patches <wine-patches(a)winehq.org> > > --- > dlls/mshtml/htmlstyle.c | 11 +++++++---- > dlls/mshtml/htmlstyle.h | 1 + > dlls/mshtml/tests/dom.c | 19 +++++++++++++++++++ > 3 files changed, 27 insertions(+), 4 deletions(-) > > diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c > index 7641701..10f90e1 100644 > --- a/dlls/mshtml/htmlstyle.c > +++ b/dlls/mshtml/htmlstyle.c > @@ -59,6 +59,8 @@ static const WCHAR attrBorderLeft[] = > {'b','o','r','d','e','r','-','l','e','f','t',0}; > static const WCHAR attrBorderLeftStyle[] = > > {'b','o','r','d','e','r','-','l','e','f','t','-','s','t','y','l','e',0}; > +static const WCHAR attrBorderLeftWidth[] = > + > {'b','o','r','d','e','r','-','l','e','f','t','-','w','i','d','t','h',0}; > static const WCHAR attrBorderRightStyle[] = > > {'b','o','r','d','e','r','-','r','i','g','h','t','-','s','t','y','l','e',0}; > static const WCHAR attrBorderRightWidth[] = > @@ -138,6 +140,7 @@ static const struct{ > {attrBorderColor, DISPID_IHTMLSTYLE_BORDERCOLOR}, > {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, > {attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE}, > + {attrBorderLeftWidth, DISPID_IHTMLSTYLE_BORDERLEFTWIDTH}, > {attrBorderRightStyle, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE}, > {attrBorderRightWidth, DISPID_IHTMLSTYLE_BORDERRIGHTWIDTH}, > {attrBorderStyle, DISPID_IHTMLSTYLE_BORDERSTYLE}, > @@ -1571,15 +1574,15 @@ static HRESULT WINAPI > HTMLStyle_get_borderBottomWidth(IHTMLStyle *iface, VARIANT > static HRESULT WINAPI HTMLStyle_put_borderLeftWidth(IHTMLStyle *iface, > VARIANT v) > { > HTMLStyle *This = HTMLSTYLE_THIS(iface); > - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); > - return E_NOTIMPL; > + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); > + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_LEFT_WIDTH, > &v, 0); > } > > static HRESULT WINAPI HTMLStyle_get_borderLeftWidth(IHTMLStyle *iface, > VARIANT *p) > { > HTMLStyle *This = HTMLSTYLE_THIS(iface); > - FIXME("(%p)->(%p)\n", This, p); > - return E_NOTIMPL; > + TRACE("(%p)->(%p)\n", This, p); > + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_LEFT_WIDTH, > p, 0); > } > > static HRESULT WINAPI HTMLStyle_put_borderStyle(IHTMLStyle *iface, BSTR v) > diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h > index 596f579..b900e67 100644 > --- a/dlls/mshtml/htmlstyle.h > +++ b/dlls/mshtml/htmlstyle.h > @@ -47,6 +47,7 @@ typedef enum { > STYLEID_BORDER_COLOR, > STYLEID_BORDER_LEFT, > STYLEID_BORDER_LEFT_STYLE, > + STYLEID_BORDER_LEFT_WIDTH, > STYLEID_BORDER_RIGHT_STYLE, > STYLEID_BORDER_RIGHT_WIDTH, > STYLEID_BORDER_STYLE, > diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c > index f95b753..be877b2 100644 > --- a/dlls/mshtml/tests/dom.c > +++ b/dlls/mshtml/tests/dom.c > @@ -3587,6 +3587,25 @@ static void test_default_style(IHTMLStyle *style) > ok(hres == S_OK, "put_borderBottomWidth: %08x\n", hres); > VariantClear(&vDefault); > > + /* borderLeftWidth */ > + hres = IHTMLStyle_get_borderLeftWidth(style, &vDefault); > + ok(hres == S_OK, "get_borderLeftWidth: %08x\n", hres); > + > + V_VT(&v) = VT_BSTR; > + V_BSTR(&v) = a2bstr("10"); > + hres = IHTMLStyle_put_borderLeftWidth(style, v); > + ok(hres == S_OK, "put_borderLeftWidth: %08x\n", hres); > + VariantClear(&v); > + > + hres = IHTMLStyle_get_borderLeftWidth(style, &v); > + ok(hres == S_OK, "get_borderLeftWidth: %08x\n", hres); > + ok(!strcmp_wa(V_BSTR(&v), "10px"), "expected 10px = %s\n", > dbgstr_w(V_BSTR(&v))); > + VariantClear(&v); > + > + hres = IHTMLStyle_put_borderLeftWidth(style, vDefault); > + ok(hres == S_OK, "put_borderLeftWidth: %08x\n", hres); > + VariantClear(&vDefault); > + > hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, > (void**)&style2); > ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); > if(SUCCEEDED(hres)) { > -- > 1.5.4.3 > > -------------------------------------------------------------------------------- > >

1 0

[PATCH] RESEND mountmgr.sys: implement tracking of fixed/hardisk devices
by Ben Klein 15 Mar '09

15 Mar '09

Out of all the drive types that can be set in winecfg, the only one that currently doesn't work is "Local disk", which should map to DRIVE_FIXED. It seems to me that define_unix_drive, which handles creation and changes to the "Drives" tab in winecfg, is missing the case for DRIVE_FIXED mapping to DEVICE_HARDISK_VOL, as it appears in the query_unix_drive later in mountmgr.c. I'd like some comment on whether this patch is appropriate. 2009/3/6 Ben Klein <shacklein(a)gmail.com>: > This fixes bug 17618, where setting a drive type to "Local disk" does not save > the appropriate change to the registry. The problem can be traced to mountmgr.c, > where define_unix_drive has no case for the type being "Local disk" > (DRIVE_FIXED).

1 0

[PATCH] RESEND programs/explorer: Allow spaces in virtual desktop names via command line /desktop option
by Ben Klein 15 Mar '09

15 Mar '09

I noticed I left off the component in the subject of a few of my recent patch submissions. Resend. I'd love to have suggestions on cleaning this up! :D 2009/3/9 Ben Klein <shacklein(a)gmail.com>: > The purpose of this patch should be pretty clear from the subject > line. Feel free to adjust the comments I've added; it seems like what > I've done here might not be completely obvious.

1 0