August 2010 - Wine-Devel - list.winehq.org

Re: [PATCH 1/6] winealsa.drv: Init mixer on cards with a single Mic control, like snd_usb_audio mics (try 2)

by Alexandre Julliard

Jeff Cook <jeff(a)deserettechnology.com> writes: > @@ -245,6 +245,10 @@ static void fillcontrols(mixer *mmixer) > for (id = 0; id < mmixer->chans; ++id) > { > line *mline = &mmixer->lines[id]; > + if (!mline->elem) > + { > + break; > + } > int ofs = CONTROLSPERLINE * id; You can't do that: mixer.c: In function ‘fillcontrols’: mixer.c:252: error: ISO C90 forbids mixed declarations and code -- Alexandre Julliard julliard(a)winehq.org

Aug. 2, 2010

Re: [5/5] shdocvw: Recurse into directories when adding Favorites

by Alexandre Julliard

Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> writes: > @@ -109,10 +109,10 @@ static void add_fav_to_menu(HMENU menu, LPWSTR title, LPCWSTR url) > { > MENUITEMINFOW item; > /* Subtract the number of standard elements in the Favorites menu */ > - INT favcount = GetMenuItemCount(menu) - 2; > + static INT favcount; > LPWSTR urlbuf; The previous version was better, you don't want a static variable for this, you may want to do it multiple times, or the menu may get changed somewhere else. -- Alexandre Julliard julliard(a)winehq.org

Aug. 2, 2010

Re: The WineAPI wiki.

by Dmitry Timoshkov

Max TenEyck Woodbury <max(a)mtew.isa-geek.net> wrote: > > You have chosen not very good name. There is no such a thing as Wine API, > > Wine implements Win32 API, and doesn't specify/add anything custom to it. > > The name "WineAPI" implies that Wine defines its own API which is not true, > > and is confusing. > > > This has been discussed elsewhere on this mailing list. > > There is a lot of information specific to Wine, particularly its > internal structure, that is not shared with Microsoft's product. Then "Wine internals" or "Wine architecture" would be more appropriate. > Further, there is a little confusing and incorrect information in the > Microsoft documentation. Bluntly, the Microsoft documentation is what > they want it to be. We need to document what it really is. Regardless of the quality of Microsoft documentation it's still Win32 API, not a Wine API. -- Dmitry.

Aug. 2, 2010

Re: mshtml: Send more informative messages to OleInPlaceFrame

by Jacek Caban

On 08/02/10 13:30, Alexander Nicolaysen Sørnes wrote: > These are displayed in Internet Explorer. > > > Alexander N. Sørnes > +LPCWSTR get_statustext(INT id, BOOL has_arg, LPCWSTR arg_in) WHy do you need has_arg argument? Isn't NULL arg_in enough to recognize no argument? +{ + static LPWSTR strings[NUM_STATUS_STRINGS]; + int index = id - IDS_STATUS_DONE; + DWORD maxlen = 255; + DWORD len = maxlen; + LPWSTR* p = &strings[index]; + + if(!*p) + { + if(has_arg) + len *= 3; + + *p = heap_alloc(len * sizeof(WCHAR)); + len = LoadStringW(hInst, id, *p, len); + len++; + + if(!has_arg) + *p = heap_realloc(*p, len * sizeof(WCHAR)); + } + + if(has_arg) + { + LPWSTR p2 = strings[index] + maxlen; + LPCWSTR arg = arg_in; + + if(!arg) + { + const WCHAR empty = 0; + arg = ∅ + ERR("Missing arg for message (id=%d) '%s'\n", id, debugstr_w(strings[index])); + } + snprintfW(p2, (maxlen * 2) - 1, strings[index], arg); + + return p2; + } + + return *p; +} This caching mechanism is broken and not thread safe. + LPCWSTR text = get_statustext(IDS_STATUS_DONE, FALSE, NULL); + IOleInPlaceFrame_SetStatusText(doc_obj->frame, text); The helper function should take care of calling SetStatusText. if(doc->frame) - IOleInPlaceFrame_SetStatusText(doc->frame, NULL /* FIXME */); + { + LPCWSTR text = get_statustext(IDS_STATUS_DOWNLOADINGFROM, TRUE, task->url); + CoTaskMemFree(task->url); + IOleInPlaceFrame_SetStatusText(doc->frame, text); + } You leak task->url here if doc->frame is NULL. Jacek

Aug. 2, 2010

GetVolumeInformationA: please test this on MS-Windows

by Joerg-Cyril.Hoehle＠t-systems.com

Jeff Zaroyko wrote: >Would you mind supplying a new binary? Testbot did it for us: job #4154 https://testbot.winehq.org/JobDetails.pl?Key=4154 Regards, Jörg Höhle

Aug. 2, 2010

Re: [5/5] wined3d: Fix NaN and Inf generation in msvc

by Henri Verbeet

On 2 August 2010 13:20, GOUJON Alexandre <ale.goujon(a)gmail.com> wrote: > Why don't you use math.h NAN macro ? > A quick search on google gave me > http://www.gnu.org/software/libc/manual//html_node/Infinity-and-NaN.html > That's not portable enough.

Aug. 2, 2010

Re: The WineAPI wiki.

by Max TenEyck Woodbury

On 08/02/2010 07:00 AM, Dmitry Timoshkov wrote: > Max TenEyck Woodbury<max(a)mtew.isa-geek.net> wrote: > >> I have started the WineAPI wiki at >> >> https://sourceforge.net/apps/mediawiki/wineapi/index.php?title=Main_Page > > You have chosen not very good name. There is no such a thing as Wine API, > Wine implements Win32 API, and doesn't specify/add anything custom to it. > The name "WineAPI" implies that Wine defines its own API which is not true, > and is confusing. > This has been discussed elsewhere on this mailing list. There is a lot of information specific to Wine, particularly its internal structure, that is not shared with Microsoft's product. Further, there is a little confusing and incorrect information in the Microsoft documentation. Bluntly, the Microsoft documentation is what they want it to be. We need to document what it really is. We have tried to embed API documentation in the source code. That has not worked as well as it could. Alexandre Julliard has said as much. I think that having good documentation will help the project. Not having good documentation can and does hurt Wine in my opinion. I also think that trying to prevent the creation of that documentation might be harmful. - Max

Aug. 2, 2010

Re: [5/5] wined3d: Fix NaN and Inf generation in msvc

by GOUJON Alexandre

On 08/02/2010 12:00 PM, Henri Verbeet wrote: > On 31 July 2010 08:48, Stefan Dösinger<stefan(a)codeweavers.com> wrote: > >> This workaround isn't ideal, >> > Yeah, I don't think this is much of an improvement Why don't you use math.h NAN macro ? A quick search on google gave me http://www.gnu.org/software/libc/manual//html_node/Infinity-and-NaN.html

Aug. 2, 2010

Re: The WineAPI wiki.

by Dmitry Timoshkov

Max TenEyck Woodbury <max(a)mtew.isa-geek.net> wrote: > I have started the WineAPI wiki at > > https://sourceforge.net/apps/mediawiki/wineapi/index.php?title=Main_Page You have chosen not very good name. There is no such a thing as Wine API, Wine implements Win32 API, and doesn't specify/add anything custom to it. The name "WineAPI" implies that Wine defines its own API which is not true, and is confusing. -- Dmitry.

Aug. 2, 2010

The WineAPI wiki.

by Max TenEyck Woodbury

I have started the WineAPI wiki at https://sourceforge.net/apps/mediawiki/wineapi/index.php?title=Main_Page Some issues have come up that may need to be discussed here. In particular, there is going to be an 'Overview' section for many articles and I think the information to fill it in should come from the wine source tree. Specifically, I'd like to create 'Overview.wiki' files to contain this information. - Max

Aug. 2, 2010

Re: [5/5] wined3d: Fix NaN and Inf generation in msvc

by Henri Verbeet

On 31 July 2010 08:48, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > This workaround isn't ideal, Yeah, I don't think this is much of an improvement.

Aug. 2, 2010

Re: [PATCH 1/4] wined3d: separate driver info from GPU info

by Henri Verbeet

On 1 August 2010 05:37, Roderick Colenbrander <thunderbird2k(a)gmail.com> wrote: > struct driver_version_information > { > + WORD vendor; /* reported PCI card vendor ID */ ... > + enum wined3d_display_driver driver; > +}; That doesn't make all that much sense.

Aug. 2, 2010

Re: [PATCH 4/4] jscript: Use generic property for Error.number.

by testbot＠testbot.winehq.org

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=4153 Your paranoid android. === W98SE (32 bit) === No test summary line found === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found

Aug. 2, 2010

Re: GetVolumeInformationA: please test this on MS-Windows

by Jeff Zaroyko

On Mon, Aug 2, 2010 at 7:03 PM, <Joerg-Cyril.Hoehle(a)t-systems.com> wrote: > Hi, > > Jeff Zaroyko wrote: >>No failures outside of MinGW. > Thanks. This validates the relationship between GetVolumeInformation > and the per-drive current directory on win95/98/2k/xp/7. > >>Inside MinGW, I invoke cmd to run the batch file: >>volume: 406 tests executed (0 marked as todo, 2 failures), 0 skipped. > Wait! When starting from C: as in cases a) and b) there should have been a skip. > if (currentdir[0] == windowsdir[0]) { > skip("Please re-run from another device than %c:\n", windowsdir[0]); > If properly skipped, there would have been 0 failures. > > Could you please add a > TRACE("%s vs. %s\n", currentdir, windowsdir); Would you mind supplying a new binary? My regular GNU/Linux system is dead due to hardware issues and I don't have a new enough version of flex to try building with MinGW on Windows.

Aug. 2, 2010

Re: [PATCH 3/4] jscript: Fixed test crash on some win9x installations.

by testbot＠testbot.winehq.org

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=4152 Your paranoid android. === WNT4WSSP6 (32 bit jscript) === jscript.c:388: Test failed: CoCreateInstance failed: 80040154 jscript.c:468: Test failed: CoCreateInstance failed: 80040154

Aug. 2, 2010

Re: [PATCH 2/4] jscript: Use generic properties for NaN and Infinity implementation.

by testbot＠testbot.winehq.org

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=4151 Your paranoid android. === W98SE (32 bit) === No test summary line found === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found

Aug. 2, 2010

GetVolumeInformationA: please test this on MS-Windows

by Joerg-Cyril.Hoehle＠t-systems.com

Hi, Jeff Zaroyko wrote: >No failures outside of MinGW. Thanks. This validates the relationship between GetVolumeInformation and the per-drive current directory on win95/98/2k/xp/7. >Inside MinGW, I invoke cmd to run the batch file: >volume: 406 tests executed (0 marked as todo, 2 failures), 0 skipped. Wait! When starting from C: as in cases a) and b) there should have been a skip. if (currentdir[0] == windowsdir[0]) { skip("Please re-run from another device than %c:\n", windowsdir[0]); If properly skipped, there would have been 0 failures. Could you please add a TRACE("%s vs. %s\n", currentdir, windowsdir); Either the path is in a strange format, or there's a case issue. Perhaps GetCurrentDir reports "C:\..." while GetWindowsDir uses "c:\..."? Then I should use toupper(currentdir[0]) == toupper(windowsdir[0]) Could you please retry the test with if (toupper(currentdir[0]) == toupper(windowsdir[0])) { skip(...) > a) C:\ # many GetVolumeInfo tests are skipped > b) C:\windows # dito > c) X:\ with \windows as CD on C: > d) X:\anysubdir with \windows as CD on C: > e) X:\anysubdir with \ as CD on C: > f) X:\ with \ as CD on C: Regards, Jörg Höhle

Aug. 2, 2010

Re: shell32: Partial implementation of IShellItem::BindToHandler.

by Nikolay Sivov

On 8/2/2010 12:07, David Hedberg wrote: > Hi, > > On Mon, Aug 2, 2010 at 7:04 AM, Nikolay Sivov<nsivov(a)codeweavers.com> wrote: >> On 8/2/2010 02:36, David Hedberg wrote: >>> +static HRESULT ShellItem_get_shellfolder(ShellItem *This, IBindCtx *pbc, >>> IShellFolder **ppsf) >>> +{ >>> + IShellFolder *desktop; >>> + HRESULT ret; >>> + >>> + ret = SHGetDesktopFolder(&desktop); >>> + if (SUCCEEDED(ret)) >>> + { >>> + if (_ILIsDesktop(This->pidl)) >>> + { >>> + *ppsf = desktop; >>> + IShellFolder_AddRef(*ppsf); >>> + } >>> + else >>> + { >>> + ret = IShellFolder_BindToObject(desktop, This->pidl, >>> pbc,&IID_IShellFolder, (void**)ppsf); >>> + } >>> + >>> + IShellFolder_Release(desktop); >>> + } >>> + >>> + return ret; >>> +} >>> + >>> >> I don't think this explicit check for desktop folder is needed here, as I >> understand ::BindToObject() it should handle this case internally. >> > I wrote a quick testcase and tested it with wine, Windows XP and > Windows 7. BindToObject() does not seem to handle this case in any of > these, instead they all return E_INVALIDARG. Wine appears to > accomplish this with the check for "!pidlComplete->mkid.cb" in > shlfolder.c:Shell32_BindToChild. So as far as I can tell, the explicit > check here seems to be needed.. Ok, this test is present already cause Desktop list is an empty list. So please change this test for mkid.cb magic value to _ILIsEmpty() in BindToObject() and all other occurrences too (InitializeTreeView() for example).

Aug. 2, 2010

Re: shell32: Partial implementation of IShellItem::BindToHandler.

by David Hedberg

Hi, On Mon, Aug 2, 2010 at 7:04 AM, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > On 8/2/2010 02:36, David Hedberg wrote: >> >> +static HRESULT ShellItem_get_shellfolder(ShellItem *This, IBindCtx *pbc, >> IShellFolder **ppsf) >> +{ >> + IShellFolder *desktop; >> + HRESULT ret; >> + >> + ret = SHGetDesktopFolder(&desktop); >> + if (SUCCEEDED(ret)) >> + { >> + if (_ILIsDesktop(This->pidl)) >> + { >> + *ppsf = desktop; >> + IShellFolder_AddRef(*ppsf); >> + } >> + else >> + { >> + ret = IShellFolder_BindToObject(desktop, This->pidl, >> pbc,&IID_IShellFolder, (void**)ppsf); >> + } >> + >> + IShellFolder_Release(desktop); >> + } >> + >> + return ret; >> +} >> + >> > I don't think this explicit check for desktop folder is needed here, as I > understand ::BindToObject() it should handle this case internally. > I wrote a quick testcase and tested it with wine, Windows XP and Windows 7. BindToObject() does not seem to handle this case in any of these, instead they all return E_INVALIDARG. Wine appears to accomplish this with the check for "!pidlComplete->mkid.cb" in shlfolder.c:Shell32_BindToChild. So as far as I can tell, the explicit check here seems to be needed..

Aug. 2, 2010

Re: gdi32: Do not crash on an invalid pointer passed to AddFontMemResourceEx.

by testbot＠testbot.winehq.org

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=4149 Your paranoid android. === W98SE (32 bit font) === Failure running script in VM: Exceeded timeout limit of 315 sec === WNT4WSSP6 (32 bit font) === Timeout

Aug. 2, 2010

Re: shell32: Partial implementation of IShellItem::BindToHandler.

by Nikolay Sivov

On 8/2/2010 02:36, David Hedberg wrote: > +static HRESULT ShellItem_get_shellfolder(ShellItem *This, IBindCtx *pbc, IShellFolder **ppsf) > +{ > + IShellFolder *desktop; > + HRESULT ret; > + > + ret = SHGetDesktopFolder(&desktop); > + if (SUCCEEDED(ret)) > + { > + if (_ILIsDesktop(This->pidl)) > + { > + *ppsf = desktop; > + IShellFolder_AddRef(*ppsf); > + } > + else > + { > + ret = IShellFolder_BindToObject(desktop, This->pidl, pbc,&IID_IShellFolder, (void**)ppsf); > + } > + > + IShellFolder_Release(desktop); > + } > + > + return ret; > +} > + > I don't think this explicit check for desktop folder is needed here, as I understand ::BindToObject() it should handle this case internally.

Aug. 2, 2010

Re: wordpad: Added Hebrew translation.

by Paul Vriens

Hi Yaron, On 08/01/2010 10:52 AM, Yaron Shahrabani wrote: > Alexander and Paul, please notice I added the EXSTYLE WS_EX_LAYOUTRTL > for the dialogs, hope that helps. > > Also found out that menus does not need any special RTL property, they > are self aligned according to the app. What do you mean by that? Running Wordpad in Hebrew still gives me LTR menu styles/justification. The global (per process) RTL settings still need to be implemented for our internal apps. > > Kind regards, > Yaron Shahrabani > > <Hebrew translator> > > > > 0002-wordpad-Added-Hebrew-translation.patch > > > From 8f5dfcb55656e7e4d7943d622234fb37753210f7 Mon Sep 17 00:00:00 2001 > From: Yaron Shahrabani<sh.yaron(a)gmail.com> > Date: Sun, 1 Aug 2010 11:48:23 +0300 > Subject: wordpad: Added Hebrew translation. > > --- > programs/wordpad/He.rc | 282 ++++++++++++++++++++++++++++++++++++++++++ > programs/wordpad/Makefile.in | 1 + > 2 files changed, 283 insertions(+), 0 deletions(-) > create mode 100644 programs/wordpad/He.rc > > diff --git a/programs/wordpad/He.rc b/programs/wordpad/He.rc > new file mode 100644 > index 0000000..091ec98 > --- /dev/null > +++ b/programs/wordpad/He.rc > @@ -0,0 +1,282 @@ > +/* > + * Copyright 2004 by Krzysztof Foltman > + * Hebrew Translation by Yaron Shahrabani<sh.yaron(a)gmail.com>, 2010 Minor, but why did you not use the same format (as we see in most files)? So something like: /* * Hebrew Translation of wordpad * * Copyright 2004 by Krzysztof Foltman * Copyright 2010 Yaron Shahrabani<sh.yaron(a)gmail.com> > +IDD_DATETIME DIALOG 30, 20, 130, 80 > +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU > +EXSTYLE WS_EX_LAYOUTRTL Eventually we probably have to but I'm not sure what Alexandre thinks about introducing it (now). We probably also have to teach our tools (like the translation site) that detects translation differences/issues to cope with this. > +STRINGTABLE > +BEGIN > + STRING_ALIGN_LEFT, "שמאל" > + STRING_ALIGN_RIGHT, "ימין" > + STRING_ALIGN_CENTER, "מרכז" > +END This piece is already defined starting on line 226 and thus leads to: ../../../wine-git/programs/wordpad/He.rc:279:32: Error: Stringtable ID 1416 already in use -- Cheers, Paul.

Aug. 1, 2010

Re: user32: Add a test for GetClassInfo, make it pass under Wine. Take 2.

by testbot＠testbot.winehq.org

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=4119 Your paranoid android. === WNT4WSSP6 (32 bit class) === class.c:939: Test failed: expected ERROR_NOACCESS, got -559038737

Aug. 1, 2010

Re: New winetricks 20100731: new verbs eadm eufonts gfw glut ie8 safari secur32 xlive

by Octavian Voicu

On Sun, Aug 1, 2010 at 2:38 AM, Dan Kegel <dank(a)kegel.com> wrote: > Changes: > > Austin English: > New verbs eufonts [...] Nice, thanks! Octavian

Aug. 1, 2010

Re: New winetricks 20100731: new verbs eadm eufonts gfw glut ie8 safari secur32 xlive

by Dan Kegel

On Sat, Jul 31, 2010 at 4:38 PM, Dan Kegel <dank(a)kegel.com> wrote: > Changes: > > Austin English: > New verbs eadm eufonts gfw (aka xlive) ie8 safari secur32 I should have mentioned: ie8 doesn't quite work yet, but safari works well enough to do light browsing. I asked Austin to add the ie8 verb because some software requires it as a prerequisite, see http://bugs.winehq.org/show_bug.cgi?id=22732

Aug. 1, 2010