July 2011 - Wine-Devel - list.winehq.org

Re: netapi32: add msvcrt to importlibs
by Alexandre Julliard July 21, 2011

July 21, 2011

Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> writes: > hi, this fixes bug http://bugs.winehq.org/show_bug.cgi?id=27827 > > Creo Elements expects msvcrt to be loaded, and fails to start. > > Dependancywalker on windows shows netapi32 loads the msvcrt. I guess > when more netapi32 functions will be implemented in future this will > become a "real" necessary dependency It won't help if it's not used, and you'd need to use msvcrt headers too. I don't think it's the right place to fix this. -- Alexandre Julliard julliard(a)winehq.org

1 0

Experimental website for tracking translation issues
by Francois Gouget July 21, 2011

July 21, 2011

I have started running a script that can check for translation issues in PO files against Wine's PO files. The issues it checks for include: * Mismatched printf format specifiers. * Mismatched trailing ellipsis. * Other mismatched trailing punctuation like full stop, question mark, space, etc. * Mismatched line feeds, trailing or not. * Spaces followed by line feeds. * Untranslated strings. Obviously some of these result in false positives. For instance 'Document' is written exactly the same in English and in French so to the script it will look like it was not translated. If you send me the corresponding error lines I'll make sure they are ignored by putting them in an 'ignore' file. So here's the web site: http://fgouget.free.fr/wine-po/ A typical report looks like this: L71: msgid or msgstr does not end in '[.]{3}' L75: msgid or msgstr does not end in '[.]{3}' You'd typically have the report and the corresponding PO file (here pl.po) open side by side, and jump to the PO lines mentionned in the report to investigate each of them. These are two ellipsis issues by the way. As you can see it's quite primitive. That's both because I'm not much of a web developer guy and because I'm still unsure how much interest there is in this. Also there's an open-source tool that does the same type of checks and more, though it seems to lack a way to handle false positives. It's pofilter from the translate-toolkit package. This tool is integrated with Pootle (the online PO file editor), so maybe this will do all we need once we put our PO files online for translation. In the meantime if any translator is interested in seeing what potential issues lie in their PO files... I'd particularly appreciate help with cleaning up the ellipsis, trailing spaces and untranslated string issues. See wine-patches for a handful of patches I'm sending based on the initial reports. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ 145 = 1! + 4! + 5!

3 7

Re: po: French translation tweaks and fixes.
by Frédéric Delanoy July 20, 2011

July 20, 2011

2011/7/20 Francois Gouget <fgouget(a)free.fr>: > --- > po/fr.po | 108 ++++++++++++++++++++++++++++++++------------------------------ > 1 files changed, 56 insertions(+), 52 deletions(-) @@ -6857,7 +6859,7 @@ msgstr "Corbeille" #: shlwapi.rc:27 msgid "%ld bytes" -msgstr "%ld bytes" +msgstr "%ld octets" #: shlwapi.rc:28 msgid " hr" Bytes and octets are different things; octets have exactly 8 bits while bytes can have more (or less) -"Start est fourni sans AUCUNE GARANTIE ; pour les détails lancez avec " +"Start est fourni sans AUCUNE GARANTIE ; pour plus de détails lancez le avec\n" Should be "lancez-le" #: winefile.rc:101 msgid "root fs" -msgstr "root fs" +msgstr "fs racine" Maybe "sdf racine" for "système de fichiers"? Frédéric

3 3

[PATCH 4/4] winmm: Fix check for DCB_NULL callback type
by Joerg-Cyril.Hoehle＠t-systems.com July 20, 2011

July 20, 2011

Andrew Eikum wrote: >- if(info->flags & DCB_NULL) >+ if((info->flags & DCB_TYPEMASK) == DCB_NULL) Instead of add ing a special case, I suggest to simplify the code: always call DriverCallback and declare void WINMM_NotifyClient. You currently ignore its return value anyway. Using void is consistent with an ealier notification patch of mine around April this year. Michael, wouldn't it be possible to add a function to the static checkers to be able to detect static functions whose return is systematically ignored and rewrit these and their callers to use void? I came across another occurence of that pattern no later than yesterday (mcimidi IIRC). Regards, Jörg Höhle

2 1

Re: [PATCH 2/2] ntdll: Set restart_scan on first call to NtQueryDirectoryFile.
by Alexandre Julliard July 20, 2011

July 20, 2011

Grazvydas Ignotas <notasas(a)gmail.com> writes: > @@ -2004,6 +2004,8 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, > fstat( fd, &st ); > curdir.dev = st.st_dev; > curdir.ino = st.st_ino; > + if (lseek( fd, 0, SEEK_CUR ) == 0) > + restart_scan = TRUE; That won't work if we already returned '.' and '..'. -- Alexandre Julliard julliard(a)winehq.org

4 10

Re: comctl32: Improve the stub of TaskDialogIndirect to display a simple message box pending a full implementation
by Reece Dunn July 20, 2011

July 20, 2011

On 20 July 2011 15:39, Jeff Latimer <lats(a)yless4u.com.au> wrote: > This should allow more apps to run. My mail import has blown up and I > may have messed up the format of the patch. The patch is line wrapped -- you need to send the patch as an attachment in a form that gets recognised as an octet stream (using the .patch extension should do this). > + if (pTaskConfig->dwCommonButtons & (TDCBF_YES_BUTTON | > TDCBF_NO_BUTTON | TDCBF_CANCEL_BUTTON)) > + uType &= MB_YESNOCANCEL; > + else > + if (pTaskConfig->dwCommonButtons & (TDCBF_YES_BUTTON | > TDCBF_NO_BUTTON)) > + uType &= MB_YESNO; This will not work as intended -- (a & (b | c)) will evaluate true if a contains either b or c, equivalent to ((a & b) || (a & c)). You need to use ((a & b) == b) instead. - Reece

1 0

Re: po: Remove English strings from the Polish translation.
by Jacek Caban July 20, 2011

July 20, 2011

Hi Francois, On 07/20/11 16:14, Francois Gouget wrote: > --- > po/pl.po | 88 +++++++++++++++++++++++++++++++------------------------------- > 1 files changed, 44 insertions(+), 44 deletions(-) > Separator, diagram and folder are the right Polish translations (that happen to be identical to English). Others should, obviously, be removed. Jacek

2 2

Re: [PATCH 1/5] quartz: Rather than assert, continue when IAsyncReader::WaitForNext is flushing and break when it actually times out.
by Alexandre Julliard July 20, 2011

July 20, 2011

Erich Hoover <ehoover(a)mines.edu> writes: > @@ -479,13 +488,27 @@ static void PullPin_Thread_Process(PullPin *This) > else > { > /* FIXME: This is not well handled yet! */ > - ERR("Processing error: %x\n", hr); > if (hr == VFW_E_TIMEOUT) > { > - assert(!pSample); > + struct timeval tve; > + > + /* > + * Calculate the time elapsed in IAsyncReader::WaitForNext > + * in order to determine whether a timeout actually occurred > + * or whether the pin is flushing. > + */ > + timersub(&tv2, &tv1, &tve); > + if (!timercmp(&tve, &tvw, <) && pSample != NULL) > + { > + ERR("Non-NULL sample returned with VFW_E_TIMEOUT.\n"); > + break; > + } That's really ugly. Surely there's a better way to do this than measuring the elapsed time. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 10/10] ntdll/tests: add a number of tests for the Nt pipe functions and ioctls
by Marvin July 19, 2011

July 19, 2011

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=12606 Your paranoid android. === WNT4WSSP6 (32 bit pipe) === Timeout

1 0

Re: d3dx9_36: Use SUCCEEDED instead of !FAILED.
by Matteo Bruni July 19, 2011

July 19, 2011

2011/7/19 Michael Stefaniuc <mstefani(a)redhat.de>: > --- > dlls/d3dx9_36/mesh.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c > index 94a291f..d8f72c4 100644 > --- a/dlls/d3dx9_36/mesh.c > +++ b/dlls/d3dx9_36/mesh.c > @@ -3376,7 +3376,7 @@ HRESULT WINAPI D3DXLoadMeshFromXResource(HMODULE module, > if (!resinfo) return D3DXERR_INVALIDDATA; > > hr = load_resource_into_memory(module, resinfo, &buffer, &size); > - if (!FAILED(hr)) return D3DXERR_INVALIDDATA; > + if (SUCCEEDED(hr)) return D3DXERR_INVALIDDATA; > > return D3DXLoadMeshFromXInMemory(buffer, size, options, device, adjacency, > materials, effect_instances, num_materials, mesh); > -- > 1.7.6 > > > Isn't that supposed to be "if (FAILED(hr))" ? If I'm not mistaken, now it is returning failure when the resource is correctly loaded... Thumbs up for Michael's scripts finding real bugs ;)

2 1

Re: use Lithuanian letter in my name
by Frédéric Delanoy July 19, 2011

July 19, 2011

On Mon, Jul 18, 2011 at 23:53, Nerijus Baliunas <nerijus(a)users.sourceforge.net> wrote: > --- > AUTHORS | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Maybe you should ensure that the name you commit your patches with (foo in 'foo <email>') is correctly spelled as well. I believe the authors list is generated from wine git's patch authors Frédéric

3 2

Re: [PATCH 2/5] d3dx9_36: Improved constant table handle support (try 3)
by Alexandre Julliard July 18, 2011

July 18, 2011

Travis Athougies <iammisc(a)gmail.com> writes: > +static ctab_constant *is_valid_constant(ID3DXConstantTableImpl *This, D3DXHANDLE parameter) > +{ > + UINT i; > + > + for (i = 0; i < This->desc.Constants; i++) > + if ((ctab_constant *)parameter == &This->constants[i]) > + return (ctab_constant *)parameter; This doesn't look like an improvement. -- Alexandre Julliard julliard(a)winehq.org

2 1

Rejected or commited?
by wylda＠volny.cz July 18, 2011

July 18, 2011

Hi, I just noticed that patch 76524 is "Rejected". But there is the same patch commited as 48d03555a7a6931ee8ba0952ccb92c70925c6bed. Duno, if some other patch should not be merged instead. Regards, W. -- Sháníte letenky na pracovní cestu, dovolenou či jen na výlet? Na http://letenky.volny.cz si zajisté vyberete.

2 1

Re: jscript: Properly handle aggregation attempt
by Marvin July 18, 2011

July 18, 2011

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=12575 Your paranoid android. === W2KPROSP4 (32 bit jscript) === jscript.c:615: Test failed: CoCreateInstance failed: 80070057, expected CLASS_E_NOAGGREGATION

1 0

Re: [PATCH 3/3] vbscript: Added creation tests
by Marvin July 18, 2011

July 18, 2011

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=12573 Your paranoid android. === WNT4WSSP6 (32 bit vbscript) === vbscript.c:38: Test failed: CoCreateInstance failed: 80040154 vbscript: unhandled exception c0000005 at 004012F2

1 0

Re: mshtml: Added IHTMLStyle::pageBreakAfter property implementation
by Marvin July 18, 2011

July 18, 2011

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=12568 Your paranoid android. === WXPPROSP3 (32 bit dom) === dom.c:5716: Test failed: put_pageBreakAfter failed: 80070057 dom.c:5721: Test failed: pageBreakAfter = (null) === WVISTAADM (32 bit dom) === dom.c:5716: Test failed: put_pageBreakAfter failed: 80070057 dom.c:5721: Test failed: pageBreakAfter = (null) === W2K8SE (32 bit dom) === dom.c:5716: Test failed: put_pageBreakAfter failed: 80070057 dom.c:5721: Test failed: pageBreakAfter = (null)

1 0

Re: [PATCH 02/10] ntdll/tests: add a test for STATUS_OBJECT_TYPE_MISMATCH
by Alexandre Julliard July 18, 2011

July 18, 2011

Bernhard Loos <bernhardloos(a)googlemail.com> writes: > @@ -774,6 +775,28 @@ static void test_query_object(void) > pNtClose( handle ); > } > > +static void test_type_mismatch(void) > +{ > + HANDLE h; > + NTSTATUS res; > + OBJECT_ATTRIBUTES attr; > + > + attr.Length = sizeof(attr); > + attr.RootDirectory = 0; > + attr.ObjectName = NULL; > + attr.Attributes = 0; > + attr.SecurityDescriptor = NULL; > + attr.SecurityQualityOfService = NULL; > + Please avoid messing up the indentation. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/4] dsound/tests: Add tests to check notifications after duplicate.
by Alexandre Julliard July 18, 2011

July 18, 2011

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > --- > dlls/dsound/tests/dsound.c | 178 ++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 178 insertions(+), 0 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M dsound.dll -T ../../.. -p dsound_test.exe.so dsound.c && touch dsound.ok dsound.c:1066: Test succeeded inside todo block: expected 1. got 1 make[1]: *** [dsound.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/2] user32: handle %I... formats in user32.wsprintf* (try 2)
by Alexandre Julliard July 18, 2011

July 18, 2011

Dan Kegel <dank(a)kegel.com> writes: > + i64 = 0x100000000LL; Don't use LL constants. > @@ -257,14 +282,25 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg, > case WPR_SIGNED: > len = sprintf( number, "%d", arg->int_view ); > break; > + case WPR_SIGNED64: > + len = sprintf( number, "%lld", arg->int64_view ); > + break; Don't use %ll formats. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 01/11] wscript: fixed running script from outside its directory (resend)
by Alexandre Julliard July 18, 2011

July 18, 2011

Michał Ziętek <smierc.w.wenecji(a)gmail.com> writes: > @@ -347,7 +347,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm > return 1; > } > > - ext = strchrW(filename, '.'); > + ext = strrchrW(filename, '.'); That's not much better. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: mshtml: Implment IHTMLDocument2 elementFromPoint
by Jacek Caban July 18, 2011

July 18, 2011

Hi Alistair, On 07/18/11 06:29, Alistair Leslie-Hughes wrote: > Hi, > Fixmes http://bugs.winehq.org/show_bug.cgi?id=27682 > > > Changelog: > mshtml: Implment IHTMLDocument2 elementFromPoint > First of all, tests please. + nsIDOMElement *nselem = NULL; + nsresult nsres; + HRESULT hres; + HTMLDOMNode *node; You use tabs in the whole patch. + nsIDOMNSDocument *pNSDoc; Please don't add such variable names. Jacek

1 0

Re: mshtml: Handle the failure case in get_nsstyle_attr.
by Jacek Caban July 18, 2011

July 18, 2011

Hi Gerald, On 07/15/11 22:49, Gerald Pfeifer wrote: > --- > dlls/mshtml/htmlstyle.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c > index cd1f6b5..3e76e61 100644 > --- a/dlls/mshtml/htmlstyle.c > +++ b/dlls/mshtml/htmlstyle.c > @@ -468,6 +468,8 @@ HRESULT get_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, BSTR > > nsAString_GetData(&str_value, &value); > hres = nsstyle_to_bstr(value, flags, p); > + if( FAILED(hres) ) > + return hres; > nsAString_Finish(&str_value); Good catch, but you add a leak here. Jacek

1 0

Re: [PATCH 10/10] ntdll/tests: add a number of tests for the Nt pipe functions and ioctls
by Marvin July 18, 2011

July 18, 2011

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=12563 Your paranoid android. === WNT4WSSP6 (32 bit pipe) === Timeout

1 0

Re: ole32: Remove dead code.
by Nikolay Sivov July 18, 2011

July 18, 2011

On Mon, Jul 18, 2011 at 9:43 AM, Adam Martinson <amartinson(a)codeweavers.com> wrote: > > MSHLFLAGS_NORMAL == 0. > --- > dlls/ole32/compobj_private.h | 4 +--- > dlls/ole32/stubmanager.c | 19 ++----------------- > 2 files changed, 3 insertions(+), 20 deletions(-) > > Maybe it should be like 'flags == MSHLFLAGS_NORMAL' ?

1 0

Re: [PATCH 12/12] ntdll/tests: add some todo_wines to the new pipe test
by Marvin July 16, 2011

July 16, 2011

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=12529 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 07/12] ntdll/tests: add a test for STATUS_OBJECT_TYPE_MISMATCH
by Marvin July 16, 2011

July 16, 2011

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=12528 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 03/12] ntdll/tests: add a number of tests for the Nt pipe functions and ioctls
by Marvin July 16, 2011

July 16, 2011

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=12527 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 02/12] kernel32/tests: make sure the pipe is opened in an nonalertable mode
by Marvin July 16, 2011

July 16, 2011

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=12526 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

re: Glitch-free iTunes?
by Dan Kegel July 16, 2011

July 16, 2011

Keith wrote: > http://www.pcworld.com/businesscenter/article/229398-2/day_3_dude_wheres_my… > Can you make a goal of supporting iTunes with no glitches? ... > Just this one app could be huge for Linux on the desktop. The main problem is driver support, I think (mainly usb, but probably also cd-r). There is some work on usb support going on; see http://wiki.winehq.org/USB I haven't tried that myself. (Has anyone tried this with iTunes yet?) According to $ winedump -j import ~/".wine/drive_c/Program Files/Common Files/Apple/Mobile Device Support/Drivers/usbaapl.sys" | grep offset offset 00009250 ntoskrnl.exe offset 00009264 HAL.dll offset 00009278 WMILIB.SYS offset 0000928c USBD.SYS support for wmilib.sys might need to be added for this app. And I suspect the pcworld guy was using an outdated version of wine (given the problems he reported with the package manager ui). Otherwise, current iTunes seems to be working reasonably well in current wine. I just downloaded and installed iTunes 10.3.1 with wine-1.3.23. I did have to set win7 mode, and I do have to click through one dialog saying it won't be able to burn cd's, but I can use the iTunes store to search for movies and play their trailers nicely; I can listen to internet radio or a local .mp3 for 5-10 minutes with no hint of trouble. So: yeah, we know it's an important app. But it's hard. Feel free to help out. - Dan

8 9

Re: [PATCH 02/12] kernel32/tests: make sure the pipe is opened in nonalertable mode
by Alexandre Julliard July 15, 2011

July 15, 2011

Bernhard Loos <bernhardloos(a)googlemail.com> writes: > --- > dlls/kernel32/tests/pipe.c | 12 ++++++++++-- > 1 files changed, 10 insertions(+), 2 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M kernel32.dll -T ../../.. -p kernel32_test.exe.so pipe.c && touch pipe.ok pipe.c:484: Test failed: ConnectNamedPipe pipe.c:494: Test failed: ReadFile pipe.c:497: Test failed: WriteFile pipe.c:503: Test failed: DisconnectNamedPipe Segmentation fault (core dumped) make: *** [pipe.ok] Error 139 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [1/2] cmd/tests: Add tests for recursive rmdir
by Marvin July 15, 2011

July 15, 2011

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=12505 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:214: Test failed: unexpected char 0x65 position 0 in line 125 (got 'errorlevel just right, good', wanted 'ok, foo created') batch.c:214: Test failed: unexpected char 0x61 position 0 in line 126 (got 'abc1def', wanted '1') batch.c:214: Test failed: unexpected char 0x65 position 0 in line 127 (got 'errorlevel nonzero, bad', wanted 'ok, foo\bar created') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 128 (got '7 should be 7', wanted '----------- Testing rmdir -----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 129 (got '7 should still be 7', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 130 (got '-----------Testing GOTO-----------', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 131 (got 'goto with no leading space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 132 (got 'goto with a leading space worked', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 133 (got 'goto with a leading tab worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 134 (got 'goto with a following space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 135 (got '-----------Done, jumping to EOF-----------', wanted 'file not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 136 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 137 (got 'ok, foo created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 138 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 139 (got 'ok, foo\bar created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 140 (got '----------- Testing rmdir -----------', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 141 (got '7', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 142 (got 'dir removed', wanted '-----------Testing Errorlevel-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 143 (got '7', wanted '1') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 144 (got 'dir removed', wanted 'errorlevel just right, good') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 145 (got '7', wanted 'abc0def(a)or_broken@abc1def') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 146 (got '7', wanted 'errorlevel zero, good(a)or_broken@errorlevel nonzero, bad') batch.c:214: Test failed: unexpected char 0x66 position 0 in line 147 (got 'file not removed', wanted '7 should be 7') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 148 (got '7', wanted '7 should still be 7') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 149 (got 'non-empty dir not removed', wanted '-----------Testing GOTO-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 150 (got '7', wanted 'goto with no leading space worked') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 151 (got 'non-empty dir not removed', wanted 'goto with a leading space worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 152 (got 'recursive rmdir succeeded', wanted 'goto with a leading tab worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 153 (got 'recursive rmdir succeeded', wanted 'goto with a following space worked') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 154 (got '-----------Testing Errorlevel-----------', wanted '-----------Done, jumping to EOF-----------') batch.c:228: Test failed: too long output, got additional 7 === W2KPROSP4 (32 bit) === batch.c:214: Test failed: unexpected char 0x65 position 0 in line 125 (got 'errorlevel just right, good', wanted 'ok, foo created') batch.c:214: Test failed: unexpected char 0x61 position 0 in line 126 (got 'abc0def', wanted '1') batch.c:214: Test failed: unexpected char 0x65 position 0 in line 127 (got 'errorlevel zero, good', wanted 'ok, foo\bar created') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 128 (got '7 should be 7', wanted '----------- Testing rmdir -----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 129 (got '7 should still be 7', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 130 (got '-----------Testing GOTO-----------', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 131 (got 'goto with no leading space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 132 (got 'goto with a leading space worked', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 133 (got 'goto with a leading tab worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 134 (got 'goto with a following space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 135 (got '-----------Done, jumping to EOF-----------', wanted 'file not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 136 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 137 (got 'ok, foo created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 138 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 139 (got 'ok, foo\bar created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 140 (got '----------- Testing rmdir -----------', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 141 (got '7', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 142 (got 'dir removed', wanted '-----------Testing Errorlevel-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 143 (got '7', wanted '1') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 144 (got 'dir removed', wanted 'errorlevel just right, good') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 145 (got '7', wanted 'abc0def(a)or_broken@abc1def') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 146 (got '7', wanted 'errorlevel zero, good(a)or_broken@errorlevel nonzero, bad') batch.c:214: Test failed: unexpected char 0x66 position 0 in line 147 (got 'file not removed', wanted '7 should be 7') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 148 (got '7', wanted '7 should still be 7') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 149 (got 'non-empty dir not removed', wanted '-----------Testing GOTO-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 150 (got '7', wanted 'goto with no leading space worked') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 151 (got 'non-empty dir not removed', wanted 'goto with a leading space worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 152 (got 'recursive rmdir succeeded', wanted 'goto with a leading tab worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 153 (got 'recursive rmdir succeeded', wanted 'goto with a following space worked') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 154 (got '-----------Testing Errorlevel-----------', wanted '-----------Done, jumping to EOF-----------') batch.c:228: Test failed: too long output, got additional 7 === WXPPROSP3 (32 bit) === batch.c:214: Test failed: unexpected char 0x65 position 0 in line 125 (got 'errorlevel just right, good', wanted 'ok, foo created') batch.c:214: Test failed: unexpected char 0x61 position 0 in line 126 (got 'abc0def', wanted '1') batch.c:214: Test failed: unexpected char 0x65 position 0 in line 127 (got 'errorlevel zero, good', wanted 'ok, foo\bar created') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 128 (got '7 should be 7', wanted '----------- Testing rmdir -----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 129 (got '7 should still be 7', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 130 (got '-----------Testing GOTO-----------', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 131 (got 'goto with no leading space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 132 (got 'goto with a leading space worked', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 133 (got 'goto with a leading tab worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 134 (got 'goto with a following space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 135 (got '-----------Done, jumping to EOF-----------', wanted 'file not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 136 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 137 (got 'ok, foo created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 138 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 139 (got 'ok, foo\bar created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 140 (got '----------- Testing rmdir -----------', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 141 (got '7', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 142 (got 'dir removed', wanted '-----------Testing Errorlevel-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 143 (got '7', wanted '1') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 144 (got 'dir removed', wanted 'errorlevel just right, good') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 145 (got '7', wanted 'abc0def(a)or_broken@abc1def') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 146 (got '7', wanted 'errorlevel zero, good(a)or_broken@errorlevel nonzero, bad') batch.c:214: Test failed: unexpected char 0x66 position 0 in line 147 (got 'file not removed', wanted '7 should be 7') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 148 (got '7', wanted '7 should still be 7') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 149 (got 'non-empty dir not removed', wanted '-----------Testing GOTO-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 150 (got '7', wanted 'goto with no leading space worked') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 151 (got 'non-empty dir not removed', wanted 'goto with a leading space worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 152 (got 'recursive rmdir succeeded', wanted 'goto with a leading tab worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 153 (got 'recursive rmdir succeeded', wanted 'goto with a following space worked') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 154 (got '-----------Testing Errorlevel-----------', wanted '-----------Done, jumping to EOF-----------') batch.c:228: Test failed: too long output, got additional 7 === W2K3R2SESP2 (32 bit) === batch.c:214: Test failed: unexpected char 0x65 position 0 in line 125 (got 'errorlevel just right, good', wanted 'ok, foo created') batch.c:214: Test failed: unexpected char 0x61 position 0 in line 126 (got 'abc0def', wanted '1') batch.c:214: Test failed: unexpected char 0x65 position 0 in line 127 (got 'errorlevel zero, good', wanted 'ok, foo\bar created') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 128 (got '7 should be 7', wanted '----------- Testing rmdir -----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 129 (got '7 should still be 7', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 130 (got '-----------Testing GOTO-----------', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 131 (got 'goto with no leading space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 132 (got 'goto with a leading space worked', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 133 (got 'goto with a leading tab worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 134 (got 'goto with a following space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 135 (got '-----------Done, jumping to EOF-----------', wanted 'file not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 136 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 137 (got 'ok, foo created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 138 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 139 (got 'ok, foo\bar created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 140 (got '----------- Testing rmdir -----------', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 141 (got '7', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 142 (got 'dir removed', wanted '-----------Testing Errorlevel-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 143 (got '7', wanted '1') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 144 (got 'dir removed', wanted 'errorlevel just right, good') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 145 (got '7', wanted 'abc0def(a)or_broken@abc1def') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 146 (got '7', wanted 'errorlevel zero, good(a)or_broken@errorlevel nonzero, bad') batch.c:214: Test failed: unexpected char 0x66 position 0 in line 147 (got 'file not removed', wanted '7 should be 7') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 148 (got '7', wanted '7 should still be 7') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 149 (got 'non-empty dir not removed', wanted '-----------Testing GOTO-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 150 (got '7', wanted 'goto with no leading space worked') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 151 (got 'non-empty dir not removed', wanted 'goto with a leading space worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 152 (got 'recursive rmdir succeeded', wanted 'goto with a leading tab worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 153 (got 'recursive rmdir succeeded', wanted 'goto with a following space worked') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 154 (got '-----------Testing Errorlevel-----------', wanted '-----------Done, jumping to EOF-----------') batch.c:228: Test failed: too long output, got additional 7 === WVISTAADM (32 bit) === batch.c:214: Test failed: unexpected char 0x65 position 0 in line 125 (got 'errorlevel just right, good', wanted 'ok, foo created') batch.c:214: Test failed: unexpected char 0x61 position 0 in line 126 (got 'abc0def', wanted '1') batch.c:214: Test failed: unexpected char 0x65 position 0 in line 127 (got 'errorlevel zero, good', wanted 'ok, foo\bar created') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 128 (got '7 should be 7', wanted '----------- Testing rmdir -----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 129 (got '7 should still be 7', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 130 (got '-----------Testing GOTO-----------', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 131 (got 'goto with no leading space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 132 (got 'goto with a leading space worked', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 133 (got 'goto with a leading tab worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 134 (got 'goto with a following space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 135 (got '-----------Done, jumping to EOF-----------', wanted 'file not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 136 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 137 (got 'ok, foo created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 138 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 139 (got 'ok, foo\bar created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 140 (got '----------- Testing rmdir -----------', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 141 (got '7', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 142 (got 'dir removed', wanted '-----------Testing Errorlevel-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 143 (got '7', wanted '1') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 144 (got 'dir removed', wanted 'errorlevel just right, good') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 145 (got '7', wanted 'abc0def(a)or_broken@abc1def') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 146 (got '7', wanted 'errorlevel zero, good(a)or_broken@errorlevel nonzero, bad') batch.c:214: Test failed: unexpected char 0x66 position 0 in line 147 (got 'file not removed', wanted '7 should be 7') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 148 (got '7', wanted '7 should still be 7') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 149 (got 'non-empty dir not removed', wanted '-----------Testing GOTO-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 150 (got '7', wanted 'goto with no leading space worked') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 151 (got 'non-empty dir not removed', wanted 'goto with a leading space worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 152 (got 'recursive rmdir succeeded', wanted 'goto with a leading tab worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 153 (got 'recursive rmdir succeeded', wanted 'goto with a following space worked') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 154 (got '-----------Testing Errorlevel-----------', wanted '-----------Done, jumping to EOF-----------') batch.c:228: Test failed: too long output, got additional 7 === W2K8SE (32 bit) === batch.c:214: Test failed: unexpected char 0x65 position 0 in line 125 (got 'errorlevel just right, good', wanted 'ok, foo created') batch.c:214: Test failed: unexpected char 0x61 position 0 in line 126 (got 'abc0def', wanted '1') batch.c:214: Test failed: unexpected char 0x65 position 0 in line 127 (got 'errorlevel zero, good', wanted 'ok, foo\bar created') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 128 (got '7 should be 7', wanted '----------- Testing rmdir -----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 129 (got '7 should still be 7', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 130 (got '-----------Testing GOTO-----------', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 131 (got 'goto with no leading space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 132 (got 'goto with a leading space worked', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 133 (got 'goto with a leading tab worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 134 (got 'goto with a following space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 135 (got '-----------Done, jumping to EOF-----------', wanted 'file not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 136 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 137 (got 'ok, foo created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 138 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 139 (got 'ok, foo\bar created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 140 (got '----------- Testing rmdir -----------', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 141 (got '7', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 142 (got 'dir removed', wanted '-----------Testing Errorlevel-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 143 (got '7', wanted '1') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 144 (got 'dir removed', wanted 'errorlevel just right, good') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 145 (got '7', wanted 'abc0def(a)or_broken@abc1def') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 146 (got '7', wanted 'errorlevel zero, good(a)or_broken@errorlevel nonzero, bad') batch.c:214: Test failed: unexpected char 0x66 position 0 in line 147 (got 'file not removed', wanted '7 should be 7') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 148 (got '7', wanted '7 should still be 7') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 149 (got 'non-empty dir not removed', wanted '-----------Testing GOTO-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 150 (got '7', wanted 'goto with no leading space worked') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 151 (got 'non-empty dir not removed', wanted 'goto with a leading space worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 152 (got 'recursive rmdir succeeded', wanted 'goto with a leading tab worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 153 (got 'recursive rmdir succeeded', wanted 'goto with a following space worked') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 154 (got '-----------Testing Errorlevel-----------', wanted '-----------Done, jumping to EOF-----------') batch.c:228: Test failed: too long output, got additional 7 === W7PRO (32 bit) === batch.c:214: Test failed: unexpected char 0x65 position 0 in line 125 (got 'errorlevel just right, good', wanted 'ok, foo created') batch.c:214: Test failed: unexpected char 0x61 position 0 in line 126 (got 'abc0def', wanted '1') batch.c:214: Test failed: unexpected char 0x65 position 0 in line 127 (got 'errorlevel zero, good', wanted 'ok, foo\bar created') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 128 (got '7 should be 7', wanted '----------- Testing rmdir -----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 129 (got '7 should still be 7', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 130 (got '-----------Testing GOTO-----------', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 131 (got 'goto with no leading space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 132 (got 'goto with a leading space worked', wanted 'dir removed') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 133 (got 'goto with a leading tab worked', wanted '0') batch.c:214: Test failed: unexpected char 0x67 position 0 in line 134 (got 'goto with a following space worked', wanted '0') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 135 (got '-----------Done, jumping to EOF-----------', wanted 'file not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 136 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 137 (got 'ok, foo created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 138 (got '7', wanted '0') batch.c:214: Test failed: unexpected char 0x6f position 0 in line 139 (got 'ok, foo\bar created', wanted 'non-empty dir not removed') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 140 (got '----------- Testing rmdir -----------', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 141 (got '7', wanted 'recursive rmdir succeeded') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 142 (got 'dir removed', wanted '-----------Testing Errorlevel-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 143 (got '7', wanted '1') batch.c:214: Test failed: unexpected char 0x64 position 0 in line 144 (got 'dir removed', wanted 'errorlevel just right, good') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 145 (got '7', wanted 'abc0def(a)or_broken@abc1def') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 146 (got '7', wanted 'errorlevel zero, good(a)or_broken@errorlevel nonzero, bad') batch.c:214: Test failed: unexpected char 0x66 position 0 in line 147 (got 'file not removed', wanted '7 should be 7') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 148 (got '7', wanted '7 should still be 7') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 149 (got 'non-empty dir not removed', wanted '-----------Testing GOTO-----------') batch.c:214: Test failed: unexpected char 0x37 position 0 in line 150 (got '7', wanted 'goto with no leading space worked') batch.c:214: Test failed: unexpected char 0x6e position 0 in line 151 (got 'non-empty dir not removed', wanted 'goto with a leading space worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 152 (got 'recursive rmdir succeeded', wanted 'goto with a leading tab worked') batch.c:214: Test failed: unexpected char 0x72 position 0 in line 153 (got 'recursive rmdir succeeded', wanted 'goto with a following space worked') batch.c:214: Test failed: unexpected char 0x2d position 0 in line 154 (got '-----------Testing Errorlevel-----------', wanted '-----------Done, jumping to EOF-----------') batch.c:228: Test failed: too long output, got additional 7

2 1

Re: [PATCH 10/11] wscript: implemented Host_get_Interactive
by Jacek Caban July 15, 2011

July 15, 2011

Hi Michał, On 07/15/11 03:22, Michał Ziętek wrote: > --- > programs/wscript/host.c | 7 +++++-- > programs/wscript/main.c | 26 +++++++++++++++++++++++++- > programs/wscript/wscript.h | 2 ++ > 3 files changed, 32 insertions(+), 3 deletions(-) > +static const WCHAR* get_arg_beginning(const WCHAR* arg) +{ + const WCHAR *beg = arg; + while(*beg == '/' || *beg == '-') { + ++beg; + } + return beg; +} This won't do what you want it to. Jacek

1 0

Re: shell32: Fix cast in RecycleBinMenu_InvokeCommand
by Alexandre Julliard July 14, 2011

July 14, 2011

Jay Yang <jkelleyy(a)gmail.com> writes: > @@ -240,7 +240,7 @@ static HRESULT WINAPI RecycleBinMenu_InvokeCommand(IContextMenu2 *iface, > LPCSTR verb = pici->lpVerb; > if(!HIWORD(verb)) > { > - switch((UINT)verb) > + switch((UINT_PTR)verb) Actually the HIWORD() is more problematic. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: shell32: Make ISFHelper_fnCopyItems actually copy the items (try 2)
by Alexandre Julliard July 14, 2011

July 14, 2011

Jay Yang <jkelleyy(a)gmail.com> writes: > Removed an unused variable. Still failing ("ret may be used uninitialized"). -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/2] d3dx9_36: Added support for structs and arrays to ID3DXConstantTable (Try 2)
by Matteo Bruni July 14, 2011

July 14, 2011

2011/7/14 Travis Athougies <iammisc(a)gmail.com>: > Needed for Assassin's Creed Brotherhood and Dead Space 2. > > Changes from last patch: > - New way of distinguishing handles from strings > - Support for parent constants in ID3DXConstantTable::GetConstantByName and ID3DXConstantTable::GetConstant > - Implemented ID3DXContantTable::GetConstantElement > You should split the reworking of D3DXHANDLEs into a separate patch. GetConstantElement could be on its own patch too, probably.

1 0

Bad flag check
by Francois Gouget July 14, 2011

July 14, 2011

One of my scripts noticed that the following code does not make sense in dlls/winmm/waveform.c: static DWORD WINMM_NotifyClient(WINMM_CBInfo *info, WORD msg, DWORD_PTR param1, DWORD_PTR param2) { if(info->flags & DCB_NULL) return MMSYSERR_NOERROR; That's because DCB_NULL is 0 so this condition is always false. What was the intent? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ RFC 2549: ftp://ftp.isi.edu/in-notes/rfc2549.txt IP over Avian Carriers with Quality of Service

2 1

Fwd: GSoC-2011: Implement Missing Mesh Functions in Wine’s D3DX9
by Michael Mc Donnell July 14, 2011

July 14, 2011

Hi Stefan sorry for the duplicate email. I forgot to also send it to wine-devel. On Fri, Jun 17, 2011 at 12:02 AM, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > On Thursday 16 June 2011 10:49:19 Michael Mc Donnell wrote: >> I've added the test you outlined. It shows you're correct that >> GetDeclaration only writes up to D3DDECL_END(). I've changed the >> implementation so that it caches the number of elements and only >> writes up to D3DDECL_END(). > Looks good to me. Great! >> You're right it could potentially read undefined memory depending on >> the compiler semantics. I think the safest thing is just to read up to >> D3DDECL_END() in the passed in declaration, then it will never read >> undefined memory (except if the programmer makes a mistake). > Looks good, but please write a WARN message in every case where you return an > error to the application. We believe that we handled the error condition > correctly, so there's no need for a FIXME, but the broken app behavior may > have been triggered by some other problem in Wine, so the message is more > important than a simple TRACE. Ok I've added WARN message for every case where it returns an error to the application. I've also reworded the WARN where it uses an invalid declaration but still must return D3D_OK.

4 36

Visual Studio project to compile the d3d code
by Stefan Dösinger July 14, 2011

July 14, 2011

Hi, After two people told me they might have use for my Visual Studio setup to compile wined3d I finally got around to put it on my git server. You can download it with GIT_SSL_NO_VERIFY=1 git clone https://84.112.174.163/~git/wined3d_vs What is this good for? My aims were to have Microsoft-Style debug symbols to use various Windows development tools. The also aim was to to work without Mingw, Msys or any other Unix tool besides git, mostly because mingw+msys is a pain. It performs an out-of-tree build of ddraw, d3d8, d3d9, the tests, wined3d and a few dependencies. Just put the files next to the wine sources, the project essentially loads the source files from ../wine/*. I also have d3dx9_36.dll in the project, but it doesn't link at the moment because d3dcompiler.dll is missing and some math functions. The testlist.c files for the tests cannot be autogenerated yet. The main issue is that this project is a stripped-down reimplementation of the wine build system. The source files and library exports are hardcoded, so if they change the msvc project needs manual adjustments. It would be much nicer to use the msvcmaker script for that, but I wasn't aware of this script when I started this. No additional software besides Visual Studio 2010 is needed, except for d3dx9_36 which needs the DirectX SDK. I just noticed that the d3d8 tests hardcode a path to the SDK sdk too, that is a bug that I can fix. I tried to compile the tests and d3d client libs with the MS headers to test our header compatibility but ran into some difficulties. The generated binaries also have no dependencies except the msvc2010 C runtime(msvcr100.dll) One word about licensing: I didn't find any obstacles that prevent personal use of MSVC Express, but please double-check the EULAs. Redistribution of Microsoft code is a problem however. The project setup doesn't deliberately include any MS code in the binaries, but it is possible that some functions from the C runtime is inlined, so to stay on the safe side I don't redistribute any binaries built from Visual Studio. There are a bunch of warnings left in the code. I fixed the warnings in wined3d.dll, d3d8.dll, d3d9.dll and the d3d8 tests, or silenced some warnings that I considered too pedantic or hard to fix. ddraw.dll, the ddraw tests and d3dx9 and the d3d9 tests have a number of legitimate warnings left. Stefan

2 5

Re: [PATCH 03/12] ntdll/tests: add a number of tests for the Nt pipe functions and ioctls
by Marvin July 13, 2011

July 13, 2011

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=12469 Your paranoid android. === WNT4WSSP6 (32 bit pipe) === Timeout === W2K3R2SESP2 (32 bit pipe) === pipe.c:154: Test failed: NtCreateNamedPipeFile returned c000000d pipe.c:157: Test failed: NtCreateNamedPipeFile returned c0000008 pipe.c:162: Test failed: NtCreateNamedPipeFile returned 0 === WVISTAADM (32 bit pipe) === pipe.c:154: Test failed: NtCreateNamedPipeFile returned c0000022 pipe.c:157: Test failed: NtCreateNamedPipeFile returned c0000008 pipe.c:162: Test failed: NtCreateNamedPipeFile returned 0 === W2K8SE (32 bit pipe) === pipe.c:154: Test failed: NtCreateNamedPipeFile returned c0000022 pipe.c:157: Test failed: NtCreateNamedPipeFile returned c0000008 pipe.c:162: Test failed: NtCreateNamedPipeFile returned 0 === W7PRO (32 bit pipe) === pipe.c:154: Test failed: NtCreateNamedPipeFile returned c0000022 pipe.c:157: Test failed: NtCreateNamedPipeFile returned c0000008 pipe.c:162: Test failed: NtCreateNamedPipeFile returned 0 pipe.c:378: Test failed: IOAPC ran too early

1 0

Re: [PATCH 12/12] ntdll/tests: add some todo_wines to the new pipe test
by Marvin July 13, 2011

July 13, 2011

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=12472 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 07/12] ntdll/tests: add a test for STATUS_OBJECT_TYPE_MISMATCH
by Marvin July 13, 2011

July 13, 2011

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=12471 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

New API functions for loading external dlls
by Saulius Krasuckas July 13, 2011

July 13, 2011

It seems MS announced three new functions yesterday: SetDefaultDllDirectories AddDllDirectory RemoveDllDirectory These are "to help developers correctly and securely load external libraries". [1] I remember some talk about SetDllDirectory() in the past [2], so now it's interesting how these two ways would coexist. Plus, could the new way help to simplify loading Gecko / XPCOM [3] by a chance? Probably not:) S. [1] http://support.microsoft.com/KB/2533623 [2] http://www.winehq.org/pipermail/wine-patches/2005-August/019625.html [3] http://source.winehq.org/source/dlls/mshtml/nsembed.c?v=wine-1.1.8#L144

1 0

Re: [PATCH 02/12] wscript: added helper function for tests
by Juan Lang July 12, 2011

July 12, 2011

Hi Michal, please combine this with patch 3, it doesn't make sense on its own. --Juan

1 0

Re: d3dx9_36: Provide a replacement for signbit() if it is missing.
by Alexandre Julliard July 12, 2011

July 12, 2011

Francois Gouget <fgouget(a)codeweavers.com> writes: > @@ -292,6 +292,10 @@ ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset ); > int readlink( const char *path, char *buf, size_t size ); > #endif /* HAVE_READLINK */ > > +#ifndef HAVE_SIGNBIT > +#define signbit(x) (copysign(1, (x)) < 0) > +#endif /* !defined(HAVE_SIGNBIT) */ This isn't quite correct for floats, and it's not much more portable. I'd suggest to fix the code instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: oleaut32: Add DISPID_PICT_RENDER support to OLEPictureImpl_Invoke
by Nikolay Sivov July 12, 2011

July 12, 2011

On Tue, Jul 12, 2011 at 1:19 PM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Hi, > > > Changelog: > oleaut32: Add DISPID_PICT_RENDER support to OLEPictureImpl_Invoke > + case DISPID_PICT_RENDER: + if (wFlags & DISPATCH_METHOD) + { + TRACE("DISPID_PICT_RENDER %d %d %d %d %d %d %d %d %d %d\n", + V_VT(&pDispParams->rgvarg[0]), V_VT(&pDispParams->rgvarg[1]), + V_VT(&pDispParams->rgvarg[2]), V_VT(&pDispParams->rgvarg[3]), + V_VT(&pDispParams->rgvarg[4]), V_VT(&pDispParams->rgvarg[5]), + V_VT(&pDispParams->rgvarg[6]), V_VT(&pDispParams->rgvarg[7]), + V_VT(&pDispParams->rgvarg[8]), V_VT(&pDispParams->rgvarg[9])); + + return IPicture_Render(&This->IPicture_iface, (HDC)V_I4(&pDispParams->rgvarg[9]), + V_I4(&pDispParams->rgvarg[8]), V_I4(&pDispParams->rgvarg[7]), + V_I4(&pDispParams->rgvarg[6]), V_I4(&pDispParams->rgvarg[5]), + V_I4(&pDispParams->rgvarg[4]), V_I4(&pDispParams->rgvarg[3]), + V_I4(&pDispParams->rgvarg[2]), V_I4(&pDispParams->rgvarg[1]), + (LPCRECT)&V_I4(&pDispParams->rgvarg[0])); + } + break; Correct me if I'm wrong, isn't it supposed to coerce arguments here? > > Best Regards > Alistair Leslie-Hughes > > > >

1 0

RE: oleaut32: Add DISPID_PICT_RENDER support to OLEPictureImpl_Invoke
by wylda＠volny.cz July 12, 2011

July 12, 2011

Hi, isn't there a white space issue? (trailing) Regards, W.

1 0

Re: [PATCH 4/9 (try5)] winmm: Implement waveIn* on top of MMDevAPI
by Alexandre Julliard July 12, 2011

July 12, 2011

Andrew Eikum <aeikum(a)codeweavers.com> writes: > --- > dlls/winmm/waveform.c | 622 > +++++++++++++++++++++++++++++++++++++++++++++---- > 1 files changed, 574 insertions(+), 48 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M dsound.dll -T ../../.. -p dsound_test.exe.so capture.c && touch capture.ok wine: Unhandled page fault on write access to 0x00000018 at address 0x68e9a0ab (thread 0009), starting debugger... Unhandled exception: page fault on write access to 0x00000018 in 32-bit code (0x68e9a0ab). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:68e9a0ab ESP:0032fc2c EBP:0032fc68 EFLAGS:00010246( R- -- I Z- -P- ) EAX:00000000 EBX:68ec468c ECX:00110064 EDX:00000000 ESI:0012c0f8 EDI:00128df0 Stack dump: 0x0032fc2c: 686a71ec 00128df0 00129c80 6869e7f0 0x0032fc3c: 686a71ec 00128df0 6869e7f0 0032fc68 0x0032fc4c: 00000000 00000001 6869ef24 0032fc78 0x0032fc5c: 686a71ec 00128df0 6869e7f0 0032fcc8 0x0032fc6c: 686864c1 00128df0 6869ef24 00000000 0x0032fc7c: 6869dbd5 00000002 00000000 00000000 Backtrace: =>0 0x68e9a0ab IDirectSoundCaptureImpl_Release+0xdb(iface=0x128df0) [/home/julliard/wine/wine/dlls/dsound/capture.c:1027] in dsound (0x0032fc68) 1 0x686864c1 IDirectSoundCapture_test+0x350(dsco=0x128df0, initialized=0, lpGuid=(nil)) [/home/julliard/wine/wine/dlls/dsound/tests/capture.c:175] in dsound_test (0x0032fcc8) 2 0x686881b1 func_capture+0x220() [/home/julliard/wine/wine/dlls/dsound/tests/capture.c:207] in dsound_test (0x0032fd38) 3 0x6869da3e run_test+0x14d(name="capture.c") [/home/julliard/wine/wine/dlls/dsound/tests/../../../include/wine/test.h:556] in dsound_test (0x0032fd88) 4 0x6869e507 main+0x156(argc=0xffffffff, argv=(nil)) [/home/julliard/wine/wine/dlls/dsound/tests/../../../include/wine/test.h:624] in dsound_test (0x0032fe48) 5 0x6869e6dc __wine_spec_exe_entry+0x7b(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in dsound_test (0x0032fe90) 6 0x7b85ac4c call_process_entry+0xb() in kernel32 (0x0032fea8) 7 0x7b85bc4f start_process+0x5e(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/kernel32/process.c:1087] in kernel32 (0x0032fee8) 8 0x7bc73908 call_thread_func+0xb() in ntdll (0x0032fef8) 9 0x7bc7706e call_thread_entry_point+0x6d(entry=0x7b85bbf0, arg=0x7ffdf000) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2499] in ntdll (0x0032ffc8) 10 0x7bc4c16e start_process+0x1d(kernel_start=0x7b85bbf0) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2612] in ntdll (0x0032ffe8) 11 0x6802996d wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 0x68e9a0ab IDirectSoundCaptureImpl_Release+0xdb [/home/julliard/wine/wine/dlls/dsound/capture.c:1027] in dsound: movl $0x0,0x18(%eax) 1027 device->lock.DebugInfo->Spare[0] = 0; -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: dinput: BuildActionMap and SetActionMap stubs for generic joystick
by Michael Stefaniuc July 12, 2011

July 12, 2011

Hello Lucas, for the future please stop adding the LPJUNK for COM interfaces, e.g. LPDIRECTINPUTDEVICE8W, use IDirectInputDevice8W* instead. In addition to the normal issues with the LPJUNK it hides the fact that this are interfaces making it hard to review that the COM rules aren't violated. It also complicates my COM cleanup script to the point that I've started to automatically replace PJUNK and LPJUNK with IJunk*. thanks bye michael Lucas Fialho Zawacki wrote: > --- > dlls/dinput/joystick.c | 60 +++++++++++++++++++++++++++++++++++++ > dlls/dinput/joystick_linux.c | 8 ++-- > dlls/dinput/joystick_linuxinput.c | 8 ++-- > dlls/dinput/joystick_osx.c | 8 ++-- > dlls/dinput/joystick_private.h | 6 ++++ > 5 files changed, 78 insertions(+), 12 deletions(-) > > diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c > index 1be6f31..68dcc6a 100644 > --- a/dlls/dinput/joystick.c > +++ b/dlls/dinput/joystick.c > @@ -426,6 +426,66 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, > return JoystickWGenericImpl_GetDeviceState(IDirectInputDevice8W_from_impl(This), len, ptr); > } > > + > +HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, > + LPDIACTIONFORMATW lpdiaf, > + LPCWSTR lpszUserName, > + DWORD dwFlags) > +{ > + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); > + > + return DI_NOEFFECT; > +} > + > +HRESULT WINAPI JoystickAGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, > + LPDIACTIONFORMATA lpdiaf, > + LPCSTR lpszUserName, > + DWORD dwFlags) > +{ > + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); > + DIACTIONFORMATW diafW; > + HRESULT hr; > + > + diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); > + _copy_diactionformatAtoW(&diafW, lpdiaf); > + > + hr = JoystickWGenericImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); > + > + _copy_diactionformatWtoA(lpdiaf, &diafW); > + HeapFree(GetProcessHeap(), 0, diafW.rgoAction); > + > + return hr; > +} > + > +HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, > + LPDIACTIONFORMATW lpdiaf, > + LPCWSTR lpszUserName, > + DWORD dwFlags) > +{ > + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); > + > + return DI_NOEFFECT; > +} > + > +HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, > + LPDIACTIONFORMATA lpdiaf, > + LPCSTR lpszUserName, > + DWORD dwFlags) > +{ > + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); > + DIACTIONFORMATW diafW; > + HRESULT hr; > + > + diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); > + _copy_diactionformatAtoW(&diafW, lpdiaf); > + > + hr = JoystickWGenericImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); > + > + HeapFree(GetProcessHeap(), 0, diafW.rgoAction); > + > + return hr; > +} > + > /* > * This maps the read value (from the input event) to a value in the > * 'wanted' range. > diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c > index 5541522..3ad592d 100644 > --- a/dlls/dinput/joystick_linux.c > +++ b/dlls/dinput/joystick_linux.c > @@ -682,8 +682,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = > IDirectInputDevice2AImpl_SendDeviceData, > IDirectInputDevice7AImpl_EnumEffectsInFile, > IDirectInputDevice7AImpl_WriteEffectToFile, > - IDirectInputDevice8AImpl_BuildActionMap, > - IDirectInputDevice8AImpl_SetActionMap, > + JoystickAGenericImpl_BuildActionMap, > + JoystickAGenericImpl_SetActionMap, > IDirectInputDevice8AImpl_GetImageInfo > }; > > @@ -718,8 +718,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = > IDirectInputDevice2WImpl_SendDeviceData, > IDirectInputDevice7WImpl_EnumEffectsInFile, > IDirectInputDevice7WImpl_WriteEffectToFile, > - IDirectInputDevice8WImpl_BuildActionMap, > - IDirectInputDevice8WImpl_SetActionMap, > + JoystickWGenericImpl_BuildActionMap, > + JoystickWGenericImpl_SetActionMap, > IDirectInputDevice8WImpl_GetImageInfo > }; > > diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c > index c11edc7..afdee1e 100644 > --- a/dlls/dinput/joystick_linuxinput.c > +++ b/dlls/dinput/joystick_linuxinput.c > @@ -1417,8 +1417,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = > IDirectInputDevice2AImpl_SendDeviceData, > IDirectInputDevice7AImpl_EnumEffectsInFile, > IDirectInputDevice7AImpl_WriteEffectToFile, > - IDirectInputDevice8AImpl_BuildActionMap, > - IDirectInputDevice8AImpl_SetActionMap, > + JoystickAGenericImpl_BuildActionMap, > + JoystickAGenericImpl_SetActionMap, > IDirectInputDevice8AImpl_GetImageInfo > }; > > @@ -1453,8 +1453,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = > IDirectInputDevice2WImpl_SendDeviceData, > IDirectInputDevice7WImpl_EnumEffectsInFile, > IDirectInputDevice7WImpl_WriteEffectToFile, > - IDirectInputDevice8WImpl_BuildActionMap, > - IDirectInputDevice8WImpl_SetActionMap, > + JoystickWGenericImpl_BuildActionMap, > + JoystickWGenericImpl_SetActionMap, > IDirectInputDevice8WImpl_GetImageInfo > }; > > diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c > index 439c8ad..756a682 100644 > --- a/dlls/dinput/joystick_osx.c > +++ b/dlls/dinput/joystick_osx.c > @@ -972,8 +972,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = > IDirectInputDevice2AImpl_SendDeviceData, > IDirectInputDevice7AImpl_EnumEffectsInFile, > IDirectInputDevice7AImpl_WriteEffectToFile, > - IDirectInputDevice8AImpl_BuildActionMap, > - IDirectInputDevice8AImpl_SetActionMap, > + JoystickAGenericImpl_BuildActionMap, > + JoystickAGenericImpl_SetActionMap, > IDirectInputDevice8AImpl_GetImageInfo > }; > > @@ -1008,8 +1008,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = > IDirectInputDevice2WImpl_SendDeviceData, > IDirectInputDevice7WImpl_EnumEffectsInFile, > IDirectInputDevice7WImpl_WriteEffectToFile, > - IDirectInputDevice8WImpl_BuildActionMap, > - IDirectInputDevice8WImpl_SetActionMap, > + JoystickWGenericImpl_BuildActionMap, > + JoystickWGenericImpl_SetActionMap, > IDirectInputDevice8WImpl_GetImageInfo > }; > > diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h > index a332e24..71d91f1 100644 > --- a/dlls/dinput/joystick_private.h > +++ b/dlls/dinput/joystick_private.h > @@ -86,4 +86,10 @@ HRESULT WINAPI JoystickWGenericImpl_Poll(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_H > HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) DECLSPEC_HIDDEN; > HRESULT WINAPI JoystickWGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) DECLSPEC_HIDDEN; > > +HRESULT WINAPI JoystickAGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, LPDIACTIONFORMATA lpdiaf, LPCSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; > +HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; > + > +HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, LPDIACTIONFORMATA lpdiaf, LPCSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; > +HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; > + > #endif /* __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H */

1 0

Re: [PATCH] libv4l: Fixed videodev.h header moving away from glibc to libv4l-devel
by Alexandre Julliard July 12, 2011

July 12, 2011

Marcus Meissner <marcus(a)jet.franken.de> writes: > Hi, > > As seen in openSUSE 12.1 development, <linux/videodev.h> is no longer, ioctls > come from the libv4l compat library. We should probably switch to version 2 instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

Raw Input Patch Update 16
by Vincas Miliūnas July 12, 2011

July 12, 2011

This time submitting the full implementation to wine-devel and only the first patch to wine-patches. Changelog of the full implementation: * Rewritten test assertion messages to just state the reason of failure * Improved WM_INPUT posting, so it would be reflected using the GetQueueStatus function * Added proper GetRawInputBuffer implementation, that requires selecting and removing messages from the message queue, but that's how it works * Added releasing of allocated resources for raw input when destroying a process * Fixed DefRawInputProc to return -1 in case of an error instead of an error code. Also improved function's tests * Added tests and made RegisterRawInputDevices atomic, so there would be no changes if one of submitted registrations fails * Added tests to check for the correct GetQueueStatus(QS_RAWINPUT) status * Added tests to check for empty input queue before sending input using GetInputState * Tests of GetRegisteredRawInputDevices and RegisterRawInputDevices need to be paired and have both as a dependency, so split their tests into 4 parts to make smaller blocks of code * Moved raw input server request handlers to the bottom of the source file, like in the other files * Applied aligned formatting for groups of assignment statements * Other minor refactorings Zipped version - http://dl.dropbox.com/u/6901628/try16.zip Also I need to note the lack of applications that make extensive use of the raw input API. There are just a few games and they are convenient with just the mouse movement data.

2 1