wine-devel September 2011

wine-devel@winehq.org

83 participants
387 discussions

Re: [PATCH 1/5] cmd/tests: add tests for command line parsing
by Frédéric Delanoy 25 Sep '11

25 Sep '11

This patch fails; see http://source.winehq.org/patches/ and http://source.winehq.org/patches/data/79288.testfail Got a lot of errors on NT4, and 1 on other systems batch.c:301: Test failed: unexpected char 0x54 position 0 in line 46 (got 'THIS FAILS: cmd ignoreme/c say one', wanted '0@space@' You might want to use @todo_wine@ as documented on http://wiki.winehq.org/CmdConformanceTests Patches generating at least 1 error on one of testbot's systems (NT included) have 0% chance of being committed (see http://wiki.winehq.org/SubmittingPatches) [I know NT4 is sometimes $#!+... be thankful win9x is not a prerequisite anymore... ;) ] Frédéric PS: "resend" is used for unchanged patches (or only rebased); in other cases you should use "try N"

1 1

Re: user32/tests: Don't test function directly when reporting GetLastError()
by Marvin 25 Sep '11

25 Sep '11

1 0

re: gdi32: Add traces for the gamma functions
by Dan Kegel 25 Sep '11

25 Sep '11

Looks like you forgot something: cc1: warnings being treated as errors dc.c: In function ‘GetDeviceGammaRamp’: dc.c:1289: error: too few arguments for format dc.c: In function ‘SetDeviceGammaRamp’: dc.c:1307: error: too few arguments for format make[1]: *** [dc.o] Error 1 ---------- Forwarded message ---------- From: <buildbot(a)kegel.com> Date: Sun, Sep 25, 2011 at 12:10 PM Subject: Re: 79299: gdi32: Add traces for the gamma functions To: dank(a)kegel.com This is an experimental automated build and test service. Please feel free to ignore this email while we work the kinks out. For more info about this message, see http://wiki.winehq.org/BuildBot The Buildbot has detected a failed build on builder runtests-default while building Wine. Full details are available at: http://buildbot.kegel.com/builders/runtests-default/builds/69 (though maybe not for long, as I'm still reinstalling the buildbot periodically while experimenting) BUILD FAILED: failed shell_2 Errors: make: *** [dlls/gdi32] Error 2

2 1

Re: [PATCH 5/5] cmd: fix parameter parsing of quotes and special chars
by Marvin 25 Sep '11

25 Sep '11

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=14499 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:301: Test failed: unexpected char 0x65 position 0 in line 7 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 8 (got '0 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 9 (got '1 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 10 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 11 (got '2 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 12 (got 'error 1', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 13 (got '0 ', wanted '4@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 14 (got '3 ', wanted '------ Testing invocation with CMD /C -------------') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 15 (got '3 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 16 (got 'error 1', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x34 position 0 in line 17 (got '4 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 18 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 19 (got '------ Testing invocation with CMD /C -------------', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 22 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 24 (got '1 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 25 (got '0 ', wanted '4@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 26 (got '1 ', wanted '---------- Testing CMD /C quoting -----------------') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 27 (got '2 ', wanted '"hi"') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 28 (got '0 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 29 (got '3 ', wanted '"\"\\"\\\"\\\\"@space@"\"\\"\\\"\\\\"') batch.c:301: Test failed: unexpected char 0x34 position 0 in line 30 (got '4 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 31 (got '---------- Testing CMD /C quoting -----------------', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x22 position 0 in line 32 (got '"hi"', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 33 (got '1 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x22 position 0 in line 34 (got '"\"\\"\\\"\\\\" "\"\\"\\\"\\\\"', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 35 (got '1 ', wanted '0@space@@or_broken@3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 36 (got '0 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 37 (got '1 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 38 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 39 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 41 (got '3 ', wanted '5@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 42 (got '2 ', wanted '------- Testing CMD /C qualifier treatment ------------') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 43 (got '2 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 44 (got '2 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x35 position 0 in line 46 (got '5 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 47 (got '------- Testing CMD /C qualifier treatment ------------', wanted '--------- Testing special characters --------------') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 49 (got '1 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 50 (got '0 ', wanted ')@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 51 (got '0 ', wanted '[@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 52 (got '--------- Testing special characters --------------', wanted ']@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 53 (got '0 ', wanted '{@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 54 (got '0 ', wanted '}@space@') batch.c:301: Test failed: unexpected char 0x29 position 0 in line 55 (got ') ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x5b position 0 in line 56 (got '[ ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x5d position 0 in line 57 (got '] ', wanted '!@space@') batch.c:301: Test failed: unexpected char 0x7b position 0 in line 58 (got '{ ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x7d position 0 in line 59 (got '} ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 60 (got '0 ', wanted ''@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 61 (got '0 ', wanted '+@space@') batch.c:301: Test failed: unexpected char 0x21 position 0 in line 62 (got '! ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x21 position 0 in line 63 (got '! ', wanted ''@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 64 (got '0 ', wanted '~@space@') batch.c:301: Test failed: unexpected char 0x27 position 0 in line 65 (got '' ', wanted '--------- Testing parameter passing --------------') batch.c:301: Test failed: unexpected char 0x2b position 0 in line 66 (got '+ ', wanted '1:1,2:@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 67 (got '0 ', wanted '1:(1),2:@space@') batch.c:301: Test failed: unexpected char 0x27 position 0 in line 68 (got '' ', wanted '1:1(2),2:@space@') batch.c:301: Test failed: unexpected char 0x7e position 0 in line 69 (got '~ ', wanted '1:(1),2:@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 70 (got '--------- Testing parameter passing --------------', wanted '1:((1)),2:@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 71 (got '1:1,2: ', wanted '1:(1)(2),2:@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 72 (got '1:(1),2: ', wanted '1:(1),2:(2)@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 73 (got '1:1(2),2: ', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 74 (got '1:(1),2: ', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 75 (got 'error 1', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 76 (got '1:((1)),2: ', wanted '1:"p@space@"1,2:p"@space@"2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 77 (got 'error 1', wanted '1:p"1@space@p",2:2@space@') batch.c:315: Test failed: too long output, got additional 1:(1)(2),2:

1 0

Re: [PATCH 4/5] cmd: fix handling of special characters in command line
by Marvin 25 Sep '11

25 Sep '11

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=14498 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:301: Test failed: unexpected char 0x65 position 0 in line 7 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 8 (got '0 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 9 (got '1 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 10 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 11 (got '2 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 12 (got 'error 1', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 13 (got '0 ', wanted '4@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 14 (got '3 ', wanted '------ Testing invocation with CMD /C -------------') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 15 (got '3 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 16 (got 'error 1', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x34 position 0 in line 17 (got '4 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 18 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 19 (got '------ Testing invocation with CMD /C -------------', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 22 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 24 (got '1 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 25 (got '0 ', wanted '4@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 26 (got '1 ', wanted '---------- Testing CMD /C quoting -----------------') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 27 (got '2 ', wanted '"hi"') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 28 (got '0 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 29 (got '3 ', wanted '"\"\\"\\\"\\\\"@space@"\"\\"\\\"\\\\"') batch.c:301: Test failed: unexpected char 0x34 position 0 in line 30 (got '4 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 31 (got '---------- Testing CMD /C quoting -----------------', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x22 position 0 in line 32 (got '"hi"', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 33 (got '1 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x22 position 0 in line 34 (got '"\"\\"\\\"\\\\" "\"\\"\\\"\\\\"', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 35 (got '1 ', wanted '0@space@@or_broken@3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 36 (got '0 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 37 (got '1 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 38 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 39 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 41 (got '3 ', wanted '5@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 42 (got '2 ', wanted '------- Testing CMD /C qualifier treatment ------------') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 43 (got '2 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 44 (got '2 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x35 position 0 in line 46 (got '5 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 47 (got '------- Testing CMD /C qualifier treatment ------------', wanted '--------- Testing special characters --------------') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 49 (got '1 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 50 (got '0 ', wanted ')@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 51 (got '0 ', wanted '[@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 52 (got '--------- Testing special characters --------------', wanted ']@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 53 (got '0 ', wanted '{@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 54 (got '0 ', wanted '}@space@') batch.c:301: Test failed: unexpected char 0x29 position 0 in line 55 (got ') ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x5b position 0 in line 56 (got '[ ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x5d position 0 in line 57 (got '] ', wanted '!@space@') batch.c:301: Test failed: unexpected char 0x7b position 0 in line 58 (got '{ ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x7d position 0 in line 59 (got '} ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 60 (got '0 ', wanted ''@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 61 (got '0 ', wanted '+@space@') batch.c:301: Test failed: unexpected char 0x21 position 0 in line 62 (got '! ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x21 position 0 in line 63 (got '! ', wanted ''@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 64 (got '0 ', wanted '~@space@') batch.c:301: Test failed: unexpected char 0x27 position 0 in line 65 (got '' ', wanted '--------- Testing parameter passing --------------') batch.c:301: Test failed: unexpected char 0x2b position 0 in line 66 (got '+ ', wanted '1:1,2:@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 67 (got '0 ', wanted '1:(1),2:@space@') batch.c:301: Test failed: unexpected char 0x27 position 0 in line 68 (got '' ', wanted '1:1(2),2:@space@') batch.c:301: Test failed: unexpected char 0x7e position 0 in line 69 (got '~ ', wanted '1:(1),2:@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 70 (got '--------- Testing parameter passing --------------', wanted '1:((1)),2:@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 71 (got '1:1,2: ', wanted '1:(1)(2),2:@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 72 (got '1:(1),2: ', wanted '1:(1),2:(2)@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 73 (got '1:1(2),2: ', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 74 (got '1:(1),2: ', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 75 (got 'error 1', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 76 (got '1:((1)),2: ', wanted '1:"p@space@"1,2:p"@space@"2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 77 (got 'error 1', wanted '1:p"1@space@p",2:2@space@') batch.c:315: Test failed: too long output, got additional 1:(1)(2),2:

1 0

Re: [PATCH 3/5] cmd: improve parsing of quotes in command line
by Marvin 25 Sep '11

25 Sep '11

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=14497 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:301: Test failed: unexpected char 0x65 position 0 in line 7 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 8 (got '0 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 9 (got '1 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 10 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 11 (got '2 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 12 (got 'error 1', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 13 (got '0 ', wanted '4@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 14 (got '3 ', wanted '------ Testing invocation with CMD /C -------------') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 15 (got '3 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 16 (got 'error 1', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x34 position 0 in line 17 (got '4 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 18 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 19 (got '------ Testing invocation with CMD /C -------------', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 22 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 24 (got '1 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 25 (got '0 ', wanted '4@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 26 (got '1 ', wanted '---------- Testing CMD /C quoting -----------------') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 27 (got '2 ', wanted '"hi"') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 28 (got '0 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 29 (got '3 ', wanted '"\"\\"\\\"\\\\"@space@"\"\\"\\\"\\\\"') batch.c:301: Test failed: unexpected char 0x34 position 0 in line 30 (got '4 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 31 (got '---------- Testing CMD /C quoting -----------------', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x22 position 0 in line 32 (got '"hi"', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 33 (got '1 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x22 position 0 in line 34 (got '"\"\\"\\\"\\\\" "\"\\"\\\"\\\\"', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 35 (got '1 ', wanted '0@space@@or_broken@3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 36 (got '0 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 37 (got '1 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 38 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 39 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 41 (got '3 ', wanted '5@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 42 (got '2 ', wanted '------- Testing CMD /C qualifier treatment ------------') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 43 (got '2 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 44 (got '2 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x35 position 0 in line 46 (got '5 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 47 (got '------- Testing CMD /C qualifier treatment ------------', wanted '--------- Testing special characters --------------') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 49 (got '1 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 50 (got '0 ', wanted ')@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 51 (got '0 ', wanted '[@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 52 (got '--------- Testing special characters --------------', wanted ']@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 53 (got '0 ', wanted '{@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 54 (got '0 ', wanted '}@space@') batch.c:301: Test failed: unexpected char 0x29 position 0 in line 55 (got ') ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x5b position 0 in line 56 (got '[ ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x5d position 0 in line 57 (got '] ', wanted '!@space@') batch.c:301: Test failed: unexpected char 0x7b position 0 in line 58 (got '{ ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x7d position 0 in line 59 (got '} ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 60 (got '0 ', wanted ''@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 61 (got '0 ', wanted '+@space@') batch.c:301: Test failed: unexpected char 0x21 position 0 in line 62 (got '! ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x21 position 0 in line 63 (got '! ', wanted ''@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 64 (got '0 ', wanted '~@space@') batch.c:301: Test failed: unexpected char 0x27 position 0 in line 65 (got '' ', wanted '--------- Testing parameter passing --------------') batch.c:301: Test failed: unexpected char 0x2b position 0 in line 66 (got '+ ', wanted '1:1,2:@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 67 (got '0 ', wanted '1:(1),2:@space@') batch.c:301: Test failed: unexpected char 0x27 position 0 in line 68 (got '' ', wanted '1:1(2),2:@space@') batch.c:301: Test failed: unexpected char 0x7e position 0 in line 69 (got '~ ', wanted '1:(1),2:@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 70 (got '--------- Testing parameter passing --------------', wanted '1:((1)),2:@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 71 (got '1:1,2: ', wanted '1:(1)(2),2:@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 72 (got '1:(1),2: ', wanted '1:(1),2:(2)@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 73 (got '1:1(2),2: ', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 74 (got '1:(1),2: ', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 75 (got 'error 1', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 76 (got '1:((1)),2: ', wanted '1:"p@space@"1,2:p"@space@"2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 77 (got 'error 1', wanted '1:p"1@space@p",2:2@space@') batch.c:315: Test failed: too long output, got additional 1:(1)(2),2:

1 0

Re: [PATCH 2/9] cmd: use GetCommandline() rather than argv
by Martin Wilck 25 Sep '11

25 Sep '11

Hi Dan, (re-cc'ing wine-devel) > Running it through the buildbot now... seems ok on first two tries, so > you may have accidentally fixed the problem. I'll resubmit to wine-patches shortly, probably tonight. >> > I ran the stuff through the bot, 0 errors everywhere except on NT (NT >> > fails totally, do I really need to investigate that?). > Yes, you may need to skip these tests on nt. > >> > I don't have a i7 machine, > It's probably just mine that gets lucky. Some tests > fail better on some machines than others. > Did you test with WINEDEBUG=warn+heap ? No, I didn't. I thought you wree telling me that that made your problem go away, so I didn't bother. I can do that of course if it helps. >> but I tested on a Westmere EX server I have access to, no >> problems with the conformance test. I also did some valgrind runs on >> that machine, but I have little experience in reading valgrind output. > > Did you follow http://wiki.winehq.org/Wine_and_Valgrind ? > Feel free to ask questions. Yes, I did. I am seeing no regressions (read: additional warnings and/or errors) between the trunk and my patched version. > A few notes: > + if (!in_quotes && (*p == ' ' || *p == '\t')) { > > Could you use isspaceW() ? I suppose not in the case statement below, > but you check this in several places, and the function might be clearer > (if it's correct)? Honestly, I didn't consider it. I tried to change as little as possible of the existing code. > Is there duplication between WCMD_parameter and WCMD_parse > that could be gotten rid of productively? Yes, there is, as I noted in an early posting on this subject. Indeed the two functions have essentially the same purpose. However I don't feel bold enough to try fixing that as long as my current stuff isn't accepted. Originally, all that I wanted to fix was 'echo "Hi"'. I have gone quite a few steps ahead from there with my current patch set. When I see this getting merged I'll consider further fixes, but I won't be able to follow up *much* further. Best regards Martin

2 1

Re: [PATCH 2/5] cmd: use GetCommandline() rather than argv
by Marvin 25 Sep '11

25 Sep '11

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=14496 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:301: Test failed: unexpected char 0x65 position 0 in line 7 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 8 (got '0 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 9 (got '1 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 10 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 11 (got '2 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 12 (got 'error 1', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 13 (got '0 ', wanted '4@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 14 (got '3 ', wanted '------ Testing invocation with CMD /C -------------') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 15 (got '3 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 16 (got 'error 1', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x34 position 0 in line 17 (got '4 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 18 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 19 (got '------ Testing invocation with CMD /C -------------', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 22 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 24 (got '1 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 25 (got '0 ', wanted '4@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 26 (got '1 ', wanted '---------- Testing CMD /C quoting -----------------') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 27 (got '2 ', wanted '"hi"') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 28 (got '0 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 29 (got '3 ', wanted '"\"\\"\\\"\\\\"@space@"\"\\"\\\"\\\\"') batch.c:301: Test failed: unexpected char 0x34 position 0 in line 30 (got '4 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 31 (got '---------- Testing CMD /C quoting -----------------', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x22 position 0 in line 32 (got '"hi"', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 33 (got '1 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x22 position 0 in line 34 (got '"\"\\"\\\"\\\\" "\"\\"\\\"\\\\"', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 35 (got '1 ', wanted '0@space@@or_broken@3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 36 (got '0 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 37 (got '1 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 38 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 39 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 41 (got '3 ', wanted '5@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 42 (got '2 ', wanted '------- Testing CMD /C qualifier treatment ------------') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 43 (got '2 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 44 (got '2 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x35 position 0 in line 46 (got '5 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 47 (got '------- Testing CMD /C qualifier treatment ------------', wanted '--------- Testing special characters --------------') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 49 (got '1 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 50 (got '0 ', wanted ')@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 51 (got '0 ', wanted '[@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 52 (got '--------- Testing special characters --------------', wanted ']@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 53 (got '0 ', wanted '{@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 54 (got '0 ', wanted '}@space@') batch.c:301: Test failed: unexpected char 0x29 position 0 in line 55 (got ') ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x5b position 0 in line 56 (got '[ ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x5d position 0 in line 57 (got '] ', wanted '!@space@') batch.c:301: Test failed: unexpected char 0x7b position 0 in line 58 (got '{ ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x7d position 0 in line 59 (got '} ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 60 (got '0 ', wanted ''@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 61 (got '0 ', wanted '+@space@') batch.c:301: Test failed: unexpected char 0x21 position 0 in line 62 (got '! ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x21 position 0 in line 63 (got '! ', wanted ''@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 64 (got '0 ', wanted '~@space@') batch.c:301: Test failed: unexpected char 0x27 position 0 in line 65 (got '' ', wanted '--------- Testing parameter passing --------------') batch.c:301: Test failed: unexpected char 0x2b position 0 in line 66 (got '+ ', wanted '1:1,2:@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 67 (got '0 ', wanted '1:(1),2:@space@') batch.c:301: Test failed: unexpected char 0x27 position 0 in line 68 (got '' ', wanted '1:1(2),2:@space@') batch.c:301: Test failed: unexpected char 0x7e position 0 in line 69 (got '~ ', wanted '1:(1),2:@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 70 (got '--------- Testing parameter passing --------------', wanted '1:((1)),2:@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 71 (got '1:1,2: ', wanted '1:(1)(2),2:@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 72 (got '1:(1),2: ', wanted '1:(1),2:(2)@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 73 (got '1:1(2),2: ', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 74 (got '1:(1),2: ', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 75 (got 'error 1', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 76 (got '1:((1)),2: ', wanted '1:"p@space@"1,2:p"@space@"2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 77 (got 'error 1', wanted '1:p"1@space@p",2:2@space@') batch.c:315: Test failed: too long output, got additional 1:(1)(2),2:

1 0

Re: [PATCH 1/5] cmd/tests: add tests for command line parsing
by Marvin 25 Sep '11

25 Sep '11

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=14495 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:301: Test failed: unexpected char 0x65 position 0 in line 7 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 8 (got '0 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 9 (got '1 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 10 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 11 (got '2 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 12 (got 'error 1', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 13 (got '0 ', wanted '4@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 14 (got '3 ', wanted '------ Testing invocation with CMD /C -------------') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 15 (got '3 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 16 (got 'error 1', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x34 position 0 in line 17 (got '4 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 18 (got 'error 1', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 19 (got '------ Testing invocation with CMD /C -------------', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 22 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 24 (got '1 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 25 (got '0 ', wanted '4@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 26 (got '1 ', wanted '---------- Testing CMD /C quoting -----------------') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 27 (got '2 ', wanted '"hi"') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 28 (got '0 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 29 (got '3 ', wanted '"\"\\"\\\"\\\\"@space@"\"\\"\\\"\\\\"') batch.c:301: Test failed: unexpected char 0x34 position 0 in line 30 (got '4 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 31 (got '---------- Testing CMD /C quoting -----------------', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x22 position 0 in line 32 (got '"hi"', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 33 (got '1 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x22 position 0 in line 34 (got '"\"\\"\\\"\\\\" "\"\\"\\\"\\\\"', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 35 (got '1 ', wanted '0@space@@or_broken@3@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 36 (got '0 ', wanted '3@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 37 (got '1 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 38 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 39 (got '0 ', wanted '2@space@') batch.c:301: Test failed: unexpected char 0x33 position 0 in line 41 (got '3 ', wanted '5@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 42 (got '2 ', wanted '------- Testing CMD /C qualifier treatment ------------') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 43 (got '2 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x32 position 0 in line 44 (got '2 ', wanted '1@space@') batch.c:301: Test failed: unexpected char 0x35 position 0 in line 46 (got '5 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 47 (got '------- Testing CMD /C qualifier treatment ------------', wanted '--------- Testing special characters --------------') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 49 (got '1 ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 50 (got '0 ', wanted ')@space@') batch.c:301: Test failed: unexpected char 0x54 position 0 in line 51 (got 'THIS FAILS: cmd ignoreme/c say one', wanted '[@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 52 (got '--------- Testing special characters --------------', wanted ']@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 53 (got '0 ', wanted '{@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 54 (got '0 ', wanted '}@space@') batch.c:301: Test failed: unexpected char 0x29 position 0 in line 55 (got ') ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x5b position 0 in line 56 (got '[ ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x5d position 0 in line 57 (got '] ', wanted '!@space@') batch.c:301: Test failed: unexpected char 0x7b position 0 in line 58 (got '{ ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x7d position 0 in line 59 (got '} ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 60 (got '0 ', wanted ''@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 61 (got '0 ', wanted '+@space@') batch.c:301: Test failed: unexpected char 0x21 position 0 in line 62 (got '! ', wanted '0@space@') batch.c:301: Test failed: unexpected char 0x21 position 0 in line 63 (got '! ', wanted ''@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 64 (got '0 ', wanted '~@space@') batch.c:301: Test failed: unexpected char 0x27 position 0 in line 65 (got '' ', wanted '--------- Testing parameter passing --------------') batch.c:301: Test failed: unexpected char 0x2b position 0 in line 66 (got '+ ', wanted '1:1,2:@space@') batch.c:301: Test failed: unexpected char 0x30 position 0 in line 67 (got '0 ', wanted '1:(1),2:@space@') batch.c:301: Test failed: unexpected char 0x27 position 0 in line 68 (got '' ', wanted '1:1(2),2:@space@') batch.c:301: Test failed: unexpected char 0x7e position 0 in line 69 (got '~ ', wanted '1:(1),2:@space@') batch.c:301: Test failed: unexpected char 0x2d position 0 in line 70 (got '--------- Testing parameter passing --------------', wanted '1:((1)),2:@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 71 (got '1:1,2: ', wanted '1:(1)(2),2:@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 72 (got '1:(1),2: ', wanted '1:(1),2:(2)@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 73 (got '1:1(2),2: ', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 74 (got '1:(1),2: ', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 75 (got 'error 1', wanted '1:1,2:2@space@') batch.c:301: Test failed: unexpected char 0x31 position 0 in line 76 (got '1:((1)),2: ', wanted '1:"p@space@"1,2:p"@space@"2@space@') batch.c:301: Test failed: unexpected char 0x65 position 0 in line 77 (got 'error 1', wanted '1:p"1@space@p",2:2@space@') batch.c:315: Test failed: too long output, got additional 1:(1)(2),2: === W2KPROSP4 (32 bit) === batch.c:301: Test failed: unexpected char 0x54 position 0 in line 46 (got 'THIS FAILS: cmd ignoreme/c say one', wanted '0@space@') === WXPPROSP3 (32 bit) === batch.c:301: Test failed: unexpected char 0x54 position 0 in line 46 (got 'THIS FAILS: cmd ignoreme/c say one', wanted '0@space@') === W2K3R2SESP2 (32 bit) === batch.c:301: Test failed: unexpected char 0x54 position 0 in line 46 (got 'THIS FAILS: cmd ignoreme/c say one', wanted '0@space@') === WVISTAADM (32 bit) === batch.c:301: Test failed: unexpected char 0x54 position 0 in line 46 (got 'THIS FAILS: cmd ignoreme/c say one', wanted '0@space@') === W2K8SE (32 bit) === batch.c:301: Test failed: unexpected char 0x54 position 0 in line 46 (got 'THIS FAILS: cmd ignoreme/c say one', wanted '0@space@') === W7PRO (32 bit) === batch.c:301: Test failed: unexpected char 0x54 position 0 in line 46 (got 'THIS FAILS: cmd ignoreme/c say one', wanted '0@space@') === W7PROX64 (32 bit) === batch.c:301: Test failed: unexpected char 0x54 position 0 in line 46 (got 'THIS FAILS: cmd ignoreme/c say one', wanted '0@space@') === TEST64_W7SP1 (32 bit) === batch.c:301: Test failed: unexpected char 0x54 position 0 in line 46 (got 'THIS FAILS: cmd ignoreme/c say one', wanted '0@space@') === W7PROX64 (64 bit) === batch.c:301: Test failed: unexpected char 0x54 position 0 in line 46 (got 'THIS FAILS: cmd ignoreme/c say one', wanted '0@space@') === TEST64_W7SP1 (64 bit) === batch.c:301: Test failed: unexpected char 0x54 position 0 in line 46 (got 'THIS FAILS: cmd ignoreme/c say one', wanted '0@space@')

1 0

Re: advpack: Only do_ocx_reg (and thus DllRegisterServer) from RegisterOCX when 'N' is passed as a flag. Clarify documentation.
by James Hawkins 24 Sep '11

24 Sep '11

I'm very hesitant about this. MSDN has no documentation about RegisterOCX, so I'm not sure how you're justifying this change. It's been a long time since I worked on this, so I don't remember much, but I do remember testing this method and documenting the parameters correctly. Where are you getting information that 'I' is required when using 'N'? James On Tue, May 11, 2010 at 1:24 PM, Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > This is my humble attempt of addressing Alexandre's feeback at > > http://www.winehq.org/pipermail/wine-devel/2010-May/083518.html > > It does pass testing for me, even on FreeBSD/i386, but I will say I did > not find the MSDN documentation I located too helpful/clear, and may have > been misled. > > As a next step we'd need to look into DllInstall. This change, hopefully, > is a move in the right direction, though. If not, some guidance or one of > the pros looking into it will be appreciated. > > Gerald > > --- > dlls/advpack/advpack.c | 14 ++++++++++---- > 1 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c > index 112d38a..f040ec6 100644 > --- a/dlls/advpack/advpack.c > +++ b/dlls/advpack/advpack.c > @@ -486,8 +486,10 @@ HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg) > * NOTES > * OCX - Filename of the OCX to register. > * flags - Controls the operation of RegisterOCX. > - * 'I' Call DllRegisterServer and DllInstall. > - * 'N' Only call DllInstall. > + * 'I' Call DllInstall and, unless 'N' is specified as well, > + * DllRegisterServer. > + * 'N' Do not call DllRegisterServer; only valid if 'I' is > + * specified too. > * param - Command line passed to DllInstall. > */ > HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show) > @@ -519,8 +521,12 @@ HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show) > if (!hm) > goto done; > > - hr = do_ocx_reg(hm, TRUE); > - > + if(strchrW(str_flags,'I')) > + { > + if (!strchrW(str_flags,'N')) > + hr = do_ocx_reg(hm, TRUE); > + } > + > done: > FreeLibrary(hm); > HeapFree(GetProcessHeap(), 0, cmdline_copy); > -- > 1.6.6.2 > > >

2 3

← Newer
1
...
5
6
7
8
9
10
11
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel September 2011