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

Re: d3dx9: Implemented D3DXWeldVertices and test.
by Stefan Dösinger Aug. 17, 2011

Aug. 17, 2011

On Monday 15 August 2011 12:16:55 Michael Mc Donnell wrote: > Stefan thought a previous version of this looked ok, and I haven't had > any negative feedback on this version either. The 104 kb / 3000 line patch is rather big, you could probably split it up in test+patch like you did with the other patches to make it obvious that the bulk of this code is the tests. That'll not only help Alexandre, but also people who try to debug potential regressions caused by this patch(*) To avoid lots of todo_wine's just send the implementation first and then the tests. That's not how test driven development works, but most people send patches in this order because it's easier. (*) Ok, a patch adding a new function is unlikely to cause a regression, but still.

2 1

OSA-applets on OS X
by Per Johansson Aug. 16, 2011

Aug. 16, 2011

Hi, my first post to the list, be gentle. :) I'd like some help to fix up the attached patch for submission. It's a change to winemenubuilder such that it will create an OSA applet instead of a .desktop file, when generating a file on the desktop (and only on the desktop). Obviously that's only useful on OS X, which has AppleScript. The main thing left to do is that I'd like to have to hard coded default determined by configure instead, with an option to set it. I didn't find any other code in configure.ac doing such a thing though, so I'm unsure how and if it should be done. I'm also unsure if it's ok to use posix_spawnp. I chose that function because as far as I can tell spawnvp does not allow me to send data to stdin, and popen requires the argument to be escaped, which seems unnecessary. You'll also notice that I include a few environment variables in the applet. That's because by default applications launched on OS X will only have /bin:/usr/bin as path and only look for libraries in /usr/lib. That's not typical locations for wine on OS X and if the paths are not set the applet is unlikely to find the wine binaries. The final point which should be considered is the copying of the icon file from /tmp to the location inside the applet. A more proper way is perhaps to generate the icon file in the correct place in the first place, but doing that requires rather large changes to the code, and this way was much more simple. Any feedback is appreciated, -- Per Johansson Ps. If someone tries to apply it you'll probably get a conflict around line 3065 since the patch currently assumes that my other patch[1] to winemenubuilder is already applied. [1] http://www.winehq.org/pipermail/wine-patches/2011-August/105396.html

1 0

Assining .bat and .com files with the desktop
by Nowres Rafid Aug. 15, 2011

Aug. 15, 2011

I propose to associate .bat and .com files with wine's cmd in GNOME, KDE and others

7 9

Wine Gecko 1.3-beta1
by Jacek Caban Aug. 14, 2011

Aug. 14, 2011

Hi all, I've just uploaded a new Wine Gecko beta package. It's a bit earlier than we usually updated the package, but it's part of the plan. The last release was the most successful ever - we've successfully avoided regressions and fixed existing bugs. The fact that we had long (over month) beta period and that the release was made based on stable Firefox release helped a lot IMO. We can improve stability of Gecko package by releasing more often, meaning less changes are included in each single release. We can do this thanks to Mozilla rapid release cycles, that gives us a chance to release Wine Gecko based on the very recent code base, stabilized by Mozilla every six weeks. Six weeks releases are, however, more than we can handle and more than we need, so my current plan is to release every two Firerox version (that is every 12 weeks), with no pressure. Back to current release, it's mostly an update of code base to keep on track with Gecko changes. Builds are available, as usually, on sourceforge [1]. To test it, you also need the attached patch to Wine. Any help with testing is appreciated. Everything that uses MSHTML in any way is worth testing. Informations for packages interested in building the package themselves: My builds are done with GCC 4.5.3, but any GCC newer than 4.5.1 should be good. There was a fix to Mozilla code needed for GCC 4.6.* builds that I've included in the source, so GCC 4.6 32-bit builds should be fine. If you want to use it for 64-bit builds, please test it carefully as I wasn't able to test them (linking GCC 4.6 builds consumes awfully lot of memory, so it failed for me). Cheers, Jacek [1] http://sourceforge.net/projects/wine/files/Wine%20Gecko/1.3-beta1/

1 1

setting up a wine buildbot
by Dan Kegel Aug. 14, 2011

Aug. 14, 2011

I've been experimenting with buildbot lately, and confirmed that it can be used to implement a wine patchwatcher. A proof-of-concept script is at http://code.google.com/p/winezeug/source/browse/trunk/buildbot/winebuildbot… It's running on my laptop now; I'll try to put it on a more stable box when I get home from vacation.

1 0

Msg Context to solve ampersand problems?
by André Hentschel Aug. 14, 2011

Aug. 14, 2011

Hi, i have some translations that only differ in the ampersand position, like: #-#-#-#-# de.po (Wine) #-#-#-#-#\n Aus&schneiden\n #-#-#-#-# de.po (Wine) #-#-#-#-#\n &Ausschneiden The Problem is that in most cases i can't find a good position that fits for both. IIRC AJ once that using msgcontext for that is not reasonable, so i wonder what i should do. Simply remove the ampersand? -- Best Regards, André Hentschel

2 1

many sound cards => timeout in winmm:wave tests
by Joerg-Cyril.Hoehle＠t-systems.com Aug. 12, 2011

Aug. 12, 2011

Hi, some native machines on test.winehq time out the winmm:wave tests. http://test.winehq.org/data/8c00ee0beff1a9a6be08f32d821186c798d15b9d/win7_w… Their logs show that they play ~25 times 1 second silence and a few times 0.5 second silence. I believe winetest.exe kills tests that take longer than 30 seconds. That explains the apparent timeout. The reason that they play that long is that they are equipped with several sound cards, each of which being used in turn. It's good IMHO that all sound cards are used. However, we should evaluate whether all combinations of flags that winmm:wave tests make sense or whether some could be played shorter than 1s. Or perhaps increase the timeout for winmm:wave? Regards, Jörg Höhle

2 1

Re: cmd: fixing an issue with extra whitespaces after cd parameter
by Marvin Aug. 12, 2011

Aug. 12, 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=13451 Your paranoid android. === W7PROX64 (64 bit) === batch.c:241: Test failed: unexpected char 0x2d position 0 in line 66 (got '------------ Testing 'cd' --------------', wanted '------------ Testing redirection operators --------------') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 67 (got 'C:\winetest', wanted '...stdout redirection') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 68 (got 'C:\winetest\test', wanted 'foo') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 69 (got 'C:\winetest', wanted 'foo(a)space@') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 70 (got 'C:\winetest\test', wanted 'foo1') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 71 (got 'C:\winetest', wanted 'foo11') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 72 (got 'C:\winetest\test', wanted 'foo12') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 73 (got '------------ Testing redirection operators --------------', wanted '...stdout appending') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 74 (got '...stdout redirection', wanted 'foo') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 76 (got 'foo ', wanted 'foob(a)space@') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 77 (got 'foo1', wanted 'foob(a)space@') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 78 (got 'foo11', wanted 'fooc(a)space@') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 79 (got 'foo12', wanted 'foob(a)space@') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 80 (got '...stdout appending', wanted 'fooc(a)space@') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 81 (got 'foo', wanted 'food1') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 82 (got 'foo ', wanted 'foob(a)space@') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 83 (got 'foob ', wanted 'fooc(a)space@') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 84 (got 'foob ', wanted 'food1') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 85 (got 'fooc ', wanted 'food2') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 86 (got 'foob ', wanted 'food21') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 87 (got 'fooc ', wanted '------------ Testing ^ escape character --------------') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 88 (got 'food1', wanted 'hello, world') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 89 (got 'foob ', wanted 'hello, world') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 90 (got 'fooc ', wanted 'hell^o, world') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 91 (got 'food1', wanted 'hell^o, world') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 92 (got 'food2', wanted 'baz') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 93 (got 'food21', wanted 'baz') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 94 (got '------------ Testing ^ escape character --------------', wanted 'foo | echo bar') batch.c:241: Test failed: unexpected char 0x68 position 0 in line 95 (got 'hello, world', wanted 'foo & echo bar') batch.c:241: Test failed: unexpected char 0x68 position 0 in line 96 (got 'hello, world', wanted 'bak &') batch.c:241: Test failed: unexpected char 0x68 position 0 in line 97 (got 'hell^o, world', wanted 'baz(a)space@') batch.c:241: Test failed: unexpected char 0x68 position 0 in line 98 (got 'hell^o, world', wanted '0(a)or_broken@1') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 99 (got 'baz', wanted 'foo > foo') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 100 (got 'baz', wanted '<') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 101 (got 'foo | echo bar', wanted 'ffoof') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 102 (got 'foo & echo bar', wanted 'FOO=bar | baz') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 103 (got 'bak &', wanted '0') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 104 (got 'baz ', wanted 'FOO=bar ^| baz') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 105 (got '0', wanted 'bar | baz') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 106 (got 'foo > foo', wanted '0') batch.c:241: Test failed: unexpected char 0x3c position 0 in line 107 (got '<', wanted '------------ Testing 'set' --------------') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 108 (got 'ffoof', wanted '1') batch.c:241: Test failed: unexpected char 0x46 position 0 in line 109 (got 'FOO=bar | baz', wanted '0') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 110 (got '0', wanted 'FOOBAR not defined') batch.c:241: Test failed: unexpected char 0x46 position 0 in line 111 (got 'FOO=bar ^| baz', wanted ' baz') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 112 (got 'bar | baz', wanted 'FOOBAR = baz') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 114 (got '------------ Testing 'set' --------------', wanted ' baz2') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 115 (got '1', wanted '0') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 116 (got '0', wanted ' bar') batch.c:241: Test failed: unexpected char 0x46 position 0 in line 117 (got 'FOOBAR not defined', wanted 'FOOBAR= bar') batch.c:241: Test failed: unexpected char 0x20 position 0 in line 118 (got ' baz', wanted 'FOOBAR = baz2') batch.c:241: Test failed: unexpected char 0x46 position 0 in line 119 (got 'FOOBAR = baz', wanted 'FOOBAR = baz2') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 120 (got '0', wanted 'FOOBAR not defined') batch.c:241: Test failed: unexpected char 0x20 position 0 in line 121 (got ' baz2', wanted '1') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 122 (got '0', wanted 'bar') batch.c:241: Test failed: unexpected char 0x20 position 0 in line 123 (got ' bar', wanted 'foobar') batch.c:241: Test failed: unexpected char 0x46 position 0 in line 124 (got 'FOOBAR= bar', wanted 'FOO not defined') batch.c:241: Test failed: unexpected char 0x46 position 0 in line 125 (got 'FOOBAR = baz2', wanted 'BAZ=bazbaz') batch.c:241: Test failed: unexpected char 0x46 position 0 in line 126 (got 'FOOBAR = baz2', wanted 'bazbaz') batch.c:241: Test failed: unexpected char 0x46 position 0 in line 127 (got 'FOOBAR not defined', wanted 'set "FOO=bar" should not include the quotes in the variable value') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 128 (got '1', wanted 'bar') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 129 (got 'bar', wanted '------------ Testing variable expansion --------------') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 130 (got 'foobar', wanted '~dp0 should be directory containing batch file') batch.c:241: Test failed: unexpected char 0x46 position 0 in line 131 (got 'FOO not defined', wanted '@pwd@\') batch.c:241: Test failed: unexpected char 0x42 position 0 in line 132 (got 'BAZ=bazbaz', wanted '@pwd@\') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 133 (got 'bazbaz', wanted 'CD value @pwd@@or_broken(a)CD value(a)space@') batch.c:241: Test failed: unexpected char 0x73 position 0 in line 134 (got 'set "FOO=bar" should not include the quotes in the variable value', wanted '%') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 135 (got 'bar', wanted 'P') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 136 (got '------------ Testing variable expansion --------------', wanted 'P') batch.c:241: Test failed: unexpected char 0x7e position 0 in line 137 (got '~dp0 should be directory containing batch file', wanted 'S') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 138 (got 'C:\winetest\', wanted 'P') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 139 (got 'C:\winetest\', wanted 'PS') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 140 (got 'CD value C:\winetest', wanted 'ERRORLEVEL') batch.c:241: Test failed: unexpected char 0x25 position 0 in line 141 (got '%', wanted '0') batch.c:241: Test failed: unexpected char 0x50 position 0 in line 142 (got 'P', wanted '00') batch.c:241: Test failed: unexpected char 0x50 position 0 in line 143 (got 'P', wanted '0ERRORLEVEL') batch.c:241: Test failed: unexpected char 0x53 position 0 in line 144 (got 'S', wanted '0') batch.c:241: Test failed: unexpected char 0x50 position 0 in line 145 (got 'P', wanted '0%') batch.c:241: Test failed: unexpected char 0x50 position 0 in line 146 (got 'PS', wanted 'P0') batch.c:241: Test failed: unexpected char 0x45 position 0 in line 147 (got 'ERRORLEVEL', wanted '0S') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 148 (got '0', wanted 'P0S') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 149 (got '00', wanted '------------ Testing variable delayed expansion --------------') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 150 (got '0ERRORLEVEL', wanted '...default mode (load-time expansion)') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 151 (got '0', wanted 'foo') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 152 (got '0%', wanted '!FOO!') batch.c:241: Test failed: unexpected char 0x50 position 0 in line 153 (got 'P0', wanted 'foo') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 154 (got '0S', wanted 'foo') batch.c:241: Test failed: unexpected char 0x50 position 0 in line 155 (got 'P0S', wanted '...runtime (delayed) expansion mode') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 156 (got '------------ Testing variable delayed expansion --------------', wanted 'foo') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 157 (got '...default mode (load-time expansion)', wanted 'foo(a)or_broken@!FOO!') batch.c:241: Test failed: unexpected char 0x21 position 0 in line 159 (got '!FOO!', wanted 'bar(a)or_broken@foo') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 160 (got 'foo', wanted '0') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 161 (got 'foo', wanted '0(a)or_broken@1') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 162 (got '...runtime (delayed) expansion mode', wanted 'foo') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 163 (got 'foo', wanted '!FOO!') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 164 (got 'foo', wanted '...using /V cmd flag') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 166 (got 'bar', wanted 'foo(a)or_broken@!FOO!') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 167 (got '0', wanted 'foo') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 168 (got '0', wanted '!FOO!') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 169 (got 'foo', wanted '------------ Testing conditional execution --------------') batch.c:241: Test failed: unexpected char 0x21 position 0 in line 170 (got '!FOO!', wanted '...unconditional &') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 171 (got '...using /V cmd flag', wanted 'foo1') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 172 (got 'foo', wanted 'bar2(a)space@') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 173 (got 'foo', wanted 'foo2') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 174 (got 'foo', wanted 'foobar deleted') batch.c:241: Test failed: unexpected char 0x21 position 0 in line 175 (got '!FOO!', wanted '...on success conditional &&') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 176 (got '------------ Testing conditional execution --------------', wanted 'foo3 not created') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 177 (got '...unconditional &', wanted 'bar4(a)space@') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 178 (got 'foo1', wanted 'foo4') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 179 (got 'bar2 ', wanted '...on failure conditional ||') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 180 (got 'foo2', wanted 'foo5') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 181 (got 'foobar deleted', wanted 'foo6(a)space@') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 182 (got '...on success conditional &&', wanted '------------ Testing type ------------') batch.c:238: Test failed: excess characters on line 183 (got 'foo3 not created', wanted '') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 184 (got 'bar4 ', wanted '@pwd@>type foobaz(a)space@') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 185 (got 'foo4', wanted 'bar') batch.c:238: Test failed: excess characters on line 186 (got '...on failure conditional ||', wanted '') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 187 (got 'foo5', wanted '@pwd@>echo ***@space@') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 188 (got 'foo6 ', wanted '***') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 189 (got '------------ Testing type ------------', wanted 'bar') batch.c:235: Test failed: unexpected end of line 190 (got '', wanted '***') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 191 (got 'C:\winetest>type foobaz ', wanted '------------ Testing NUL ------------') batch.c:235: Test failed: unexpected end of line 193 (got '', wanted 'bar') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 194 (got 'C:\winetest>echo *** ', wanted 'bar') batch.c:241: Test failed: unexpected char 0x2a position 0 in line 195 (got '***', wanted 'NUL') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 196 (got 'bar', wanted 'foo created') batch.c:241: Test failed: unexpected char 0x2a position 0 in line 197 (got '***', wanted '------------ Testing if/else --------------') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 198 (got '------------ Testing NUL ------------', wanted 'if/else should work with blocks') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 199 (got 'bar', wanted 'if seems to work') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 200 (got 'bar', wanted 'else seems to work') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 201 (got 'bar', wanted 'if seems not to detect /c as parameter') batch.c:241: Test failed: unexpected char 0x4e position 0 in line 202 (got 'NUL', wanted 'Testing case sensitivity with and without /i option') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 203 (got 'foo created', wanted 'if seems to default to case sensitivity') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 204 (got '------------ Testing if/else --------------', wanted 'if /i seems to work') batch.c:241: Test failed: unexpected char 0x69 position 0 in line 205 (got 'if/else should work with blocks', wanted 'if /I seems to work') batch.c:241: Test failed: unexpected char 0x69 position 0 in line 206 (got 'if seems to work', wanted '-----------Testing for -----------') batch.c:241: Test failed: unexpected char 0x65 position 0 in line 207 (got 'else seems to work', wanted '...plain FOR') batch.c:241: Test failed: unexpected char 0x69 position 0 in line 208 (got 'if seems not to detect /c as parameter', wanted 'A') batch.c:241: Test failed: unexpected char 0x54 position 0 in line 209 (got 'Testing case sensitivity with and without /i option', wanted 'B') batch.c:241: Test failed: unexpected char 0x69 position 0 in line 210 (got 'if seems to default to case sensitivity', wanted 'C') batch.c:241: Test failed: unexpected char 0x69 position 0 in line 211 (got 'if /i seems to work', wanted '%I') batch.c:241: Test failed: unexpected char 0x69 position 0 in line 212 (got 'if /I seems to work', wanted '%I') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 213 (got '-----------Testing for -----------', wanted '%I') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 214 (got '...plain FOR', wanted '%j') batch.c:241: Test failed: unexpected char 0x41 position 0 in line 215 (got 'A', wanted '%j') batch.c:241: Test failed: unexpected char 0x42 position 0 in line 216 (got 'B', wanted '%j') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 217 (got 'C', wanted 'A') batch.c:241: Test failed: unexpected char 0x25 position 0 in line 218 (got '%I', wanted 'B') batch.c:241: Test failed: unexpected char 0x25 position 0 in line 219 (got '%I', wanted 'C') batch.c:241: Test failed: unexpected char 0x25 position 0 in line 220 (got '%I', wanted '1') batch.c:241: Test failed: unexpected char 0x25 position 0 in line 221 (got '%j', wanted '4') batch.c:241: Test failed: unexpected char 0x25 position 0 in line 222 (got '%j', wanted '1') batch.c:241: Test failed: unexpected char 0x25 position 0 in line 223 (got '%j', wanted 'A') batch.c:241: Test failed: unexpected char 0x41 position 0 in line 224 (got 'A', wanted 'B') batch.c:241: Test failed: unexpected char 0x42 position 0 in line 225 (got 'B', wanted 'C') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 226 (got 'C', wanted '...imbricated FORs') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 227 (got '1', wanted 'X Y') batch.c:241: Test failed: unexpected char 0x34 position 0 in line 228 (got '4', wanted 'X Y') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 229 (got '1', wanted 'A C') batch.c:241: Test failed: unexpected char 0x41 position 0 in line 230 (got 'A', wanted 'A D') batch.c:241: Test failed: unexpected char 0x42 position 0 in line 231 (got 'B', wanted 'B C') batch.c:241: Test failed: unexpected char 0x43 position 0 in line 232 (got 'C', wanted 'B D') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 233 (got '...imbricated FORs', wanted 'A C') batch.c:241: Test failed: unexpected char 0x58 position 0 in line 234 (got 'X Y', wanted 'A D') batch.c:241: Test failed: unexpected char 0x58 position 0 in line 235 (got 'X Y', wanted 'B C') batch.c:241: Test failed: unexpected char 0x41 position 0 in line 236 (got 'A C', wanted 'B D') batch.c:241: Test failed: unexpected char 0x41 position 0 in line 237 (got 'A D', wanted '...basic wildcards') batch.c:241: Test failed: unexpected char 0x42 position 0 in line 238 (got 'B C', wanted 'bazbaz') batch.c:241: Test failed: unexpected char 0x42 position 0 in line 239 (got 'B D', wanted '...for /d') batch.c:241: Test failed: unexpected char 0x41 position 0 in line 240 (got 'A C', wanted 'baz') batch.c:241: Test failed: unexpected char 0x41 position 0 in line 241 (got 'A D', wanted 'foo') batch.c:241: Test failed: unexpected char 0x42 position 0 in line 242 (got 'B C', wanted 'bar') batch.c:241: Test failed: unexpected char 0x42 position 0 in line 243 (got 'B D', wanted '...for /L') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 244 (got '...basic wildcards', wanted '1') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 245 (got 'bazbaz', wanted '3') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 246 (got '...for /d', wanted '5') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 247 (got 'baz', wanted '1') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 248 (got 'foo', wanted '3') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 249 (got 'bar', wanted '5') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 250 (got '...for /L', wanted '0') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 251 (got '1', wanted '2') batch.c:241: Test failed: unexpected char 0x33 position 0 in line 252 (got '3', wanted '1') batch.c:241: Test failed: unexpected char 0x35 position 0 in line 253 (got '5', wanted '-1') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 254 (got '1', wanted 'ErrorLevel 0') batch.c:241: Test failed: unexpected char 0x33 position 0 in line 255 (got '3', wanted 'ErrorLevel 0') batch.c:241: Test failed: unexpected char 0x35 position 0 in line 256 (got '5', wanted '...for /a') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 257 (got '0', wanted '......individual operations') batch.c:241: Test failed: unexpected char 0x32 position 0 in line 258 (got '2', wanted '0') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 259 (got '1', wanted '3') batch.c:241: Test failed: unexpected char 0x45 position 0 in line 261 (got 'ErrorLevel 0', wanted '3') batch.c:241: Test failed: unexpected char 0x45 position 0 in line 262 (got 'ErrorLevel 0', wanted '6') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 263 (got '...for /a', wanted '10') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 264 (got '......individual operations', wanted '4') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 265 (got '0', wanted '4') batch.c:241: Test failed: unexpected char 0x33 position 0 in line 266 (got '3', wanted '-4') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 267 (got '-1', wanted '0') batch.c:241: Test failed: unexpected char 0x33 position 0 in line 268 (got '3', wanted '2') batch.c:241: Test failed: unexpected char 0x36 position 0 in line 269 (got '6', wanted '2') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 270 (got '10', wanted '-2') batch.c:241: Test failed: unexpected char 0x34 position 0 in line 271 (got '4', wanted '1') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 273 (got '-4', wanted '0(a)or_broken@1073741824') batch.c:241: Test failed: unexpected char 0x32 position 0 in line 275 (got '2', wanted '-4') batch.c:241: Test failed: unexpected char 0x32 position 0 in line 276 (got '2', wanted '9') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 277 (got '-2', wanted '2') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 278 (got '1', wanted '0') batch.c:241: Test failed: unexpected char 0x34 position 0 in line 279 (got '4', wanted '-1') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 280 (got '0', wanted '-3') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 282 (got '-4', wanted '1') batch.c:241: Test failed: unexpected char 0x39 position 0 in line 283 (got '9', wanted '1') batch.c:241: Test failed: unexpected char 0x32 position 0 in line 284 (got '2', wanted '4') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 285 (got '0', wanted '1') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 286 (got '-1', wanted '5') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 287 (got '-3', wanted '5') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 288 (got '0', wanted '7') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 289 (got '1', wanted '5') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 290 (got '1', wanted '5') batch.c:241: Test failed: unexpected char 0x34 position 0 in line 291 (got '4', wanted '5') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 292 (got '1', wanted '4') batch.c:241: Test failed: unexpected char 0x35 position 0 in line 293 (got '5', wanted '6') batch.c:241: Test failed: unexpected char 0x35 position 0 in line 294 (got '5', wanted '1') batch.c:241: Test failed: unexpected char 0x37 position 0 in line 295 (got '7', wanted '......precedence and grouping') batch.c:241: Test failed: unexpected char 0x35 position 0 in line 296 (got '5', wanted '4') batch.c:241: Test failed: unexpected char 0x35 position 0 in line 297 (got '5', wanted '10') batch.c:241: Test failed: unexpected char 0x35 position 0 in line 298 (got '5', wanted '18(a)or_broken@10') batch.c:241: Test failed: unexpected char 0x34 position 0 in line 299 (got '4', wanted '2(a)or_broken@0') batch.c:241: Test failed: unexpected char 0x36 position 0 in line 300 (got '6', wanted '2(a)or_broken@0') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 301 (got '1', wanted '0(a)or_broken@4') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 302 (got '......precedence and grouping', wanted '4') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 304 (got '10', wanted '......octal and hexadecimal') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 305 (got '18', wanted '3(a)or_broken@4') batch.c:241: Test failed: unexpected char 0x32 position 0 in line 306 (got '2', wanted '18') batch.c:241: Test failed: unexpected char 0x32 position 0 in line 307 (got '2', wanted '18') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 308 (got '0', wanted '15') batch.c:241: Test failed: unexpected char 0x34 position 0 in line 309 (got '4', wanted '......variables') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 311 (got '......octal and hexadecimal', wanted '3(a)or_broken@foo not defined') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 313 (got '18', wanted '3(a)or_broken@0') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 314 (got '18', wanted '3(a)or_broken@0') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 315 (got '15', wanted '9(a)or_broken@0') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 316 (got '......variables', wanted '0') batch.c:241: Test failed: unexpected char 0x33 position 0 in line 317 (got '3', wanted '4(a)or_broken@0') batch.c:241: Test failed: unexpected char 0x33 position 0 in line 318 (got '3', wanted '-7(a)or_broken@0') batch.c:241: Test failed: unexpected char 0x33 position 0 in line 319 (got '3', wanted '-1(a)or_broken@0') batch.c:241: Test failed: unexpected char 0x33 position 0 in line 320 (got '3', wanted '5(a)or_broken@0') batch.c:241: Test failed: unexpected char 0x33 position 0 in line 321 (got '3', wanted '4(a)or_broken@0') batch.c:241: Test failed: unexpected char 0x39 position 0 in line 322 (got '9', wanted '1(a)or_broken@0') batch.c:241: Test failed: unexpected char 0x34 position 0 in line 324 (got '4', wanted '5(a)or_broken@0') batch.c:238: Test failed: excess characters on line 325 (got '-7', wanted '') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 326 (got '-1', wanted '-----------Testing del /a-----------') batch.c:241: Test failed: unexpected char 0x35 position 0 in line 327 (got '5', wanted 'not-r.test not found after delete, good') batch.c:241: Test failed: unexpected char 0x34 position 0 in line 328 (got '4', wanted 'r.test found before delete, good') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 329 (got '1', wanted 'r.test not found after delete, good') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 330 (got '0', wanted '------------ Testing del /q --------------') batch.c:241: Test failed: unexpected char 0x35 position 0 in line 331 (got '5', wanted 'del /q * succeeded on file1') batch.c:235: Test failed: unexpected end of line 332 (got '', wanted 'del /q * succeeded on file2.dat') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 333 (got '-----------Testing del /a-----------', wanted '------------ Testing del /s --------------') batch.c:241: Test failed: unexpected char 0x6e position 0 in line 334 (got 'not-r.test not found after delete, good', wanted '----------- Testing mkdir -----------') batch.c:241: Test failed: unexpected char 0x72 position 0 in line 335 (got 'r.test found before delete, good', wanted '0') batch.c:241: Test failed: unexpected char 0x72 position 0 in line 336 (got 'r.test not found after delete, good', wanted '0') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 337 (got '------------ Testing del /q --------------', wanted '1') batch.c:241: Test failed: unexpected char 0x64 position 0 in line 338 (got 'del /q * succeeded on file1', wanted '1') batch.c:241: Test failed: unexpected char 0x64 position 0 in line 339 (got 'del /q * succeeded on file2.dat', wanted '0') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 340 (got '------------ Testing del /s --------------', wanted '0') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 341 (got '----------- Testing mkdir -----------', wanted '0') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 345 (got '1', wanted '0') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 348 (got '0', wanted 'dir created') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 350 (got '0', wanted 'mkdir ? gives errorlevel 1') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 351 (got '1', wanted 'mkdir ?\foo gives errorlevel 1') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 352 (got '0', wanted 'mkdir foo\? gives errorlevel 1') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 353 (got '0', wanted 'ok, foo created') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 354 (got '0', wanted 'mkdir foo\bar\? gives errorlevel 1') batch.c:241: Test failed: unexpected char 0x64 position 0 in line 355 (got 'dir created', wanted 'ok, foo\bar created') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 356 (got '0', wanted 'foo created') batch.c:241: Test failed: unexpected char 0x6d position 0 in line 357 (got 'mkdir ? gives errorlevel 1', wanted 'bar created') batch.c:241: Test failed: unexpected char 0x6d position 0 in line 358 (got 'mkdir ?\foo gives errorlevel 1', wanted 'foobar created') batch.c:241: Test failed: unexpected char 0x6d position 0 in line 359 (got 'mkdir foo\? gives errorlevel 1', wanted 'bar\baz created') batch.c:241: Test failed: unexpected char 0x6f position 0 in line 360 (got 'ok, foo created', wanted 'mkdir foo\* errorlevel 1') batch.c:241: Test failed: unexpected char 0x6d position 0 in line 361 (got 'mkdir foo\bar\? gives errorlevel 1', wanted 'ok, foo created') batch.c:241: Test failed: unexpected char 0x6f position 0 in line 362 (got 'ok, foo\bar created', wanted '----------- Testing rmdir -----------') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 363 (got 'foo created', wanted '0') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 364 (got 'bar created', wanted 'dir removed') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 365 (got 'foobar created', wanted '0') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 366 (got 'bar\baz created', wanted 'dir removed') batch.c:241: Test failed: unexpected char 0x6d position 0 in line 367 (got 'mkdir foo\* errorlevel 1', wanted '0') batch.c:241: Test failed: unexpected char 0x6f position 0 in line 368 (got 'ok, foo created', wanted '0') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 369 (got '----------- Testing rmdir -----------', wanted 'file not removed') batch.c:241: Test failed: unexpected char 0x64 position 0 in line 371 (got 'dir removed', wanted 'non-empty dir not removed') batch.c:241: Test failed: unexpected char 0x64 position 0 in line 373 (got 'dir removed', wanted 'non-empty dir not removed') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 374 (got '0', wanted 'recursive rmdir succeeded') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 375 (got '0', wanted 'recursive rmdir succeeded') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 376 (got 'file not removed', wanted 'foo removed') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 377 (got '0', wanted 'bar removed') batch.c:241: Test failed: unexpected char 0x6e position 0 in line 378 (got 'non-empty dir not removed', wanted 'foobar removed') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 379 (got '0', wanted 'bar\baz removed') batch.c:241: Test failed: unexpected char 0x6e position 0 in line 380 (got 'non-empty dir not removed', wanted '------------ Testing CALL --------------') batch.c:241: Test failed: unexpected char 0x72 position 0 in line 381 (got 'recursive rmdir succeeded', wanted 'foo(a)space@') batch.c:241: Test failed: unexpected char 0x72 position 0 in line 382 (got 'recursive rmdir succeeded', wanted 'foo 8') batch.c:238: Test failed: excess characters on line 383 (got 'foo removed', wanted 'foo(a)space@@space@') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 384 (got 'bar removed', wanted 'foo bar(a)space@') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 385 (got 'foobar removed', wanted 'foo ""@space@') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 386 (got 'bar\baz removed', wanted '"" bar(a)space@') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 387 (got '------------ Testing CALL --------------', wanted 'foo ''@space@') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 388 (got 'foo ', wanted ''' bar(a)space@') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 389 (got 'foo 8', wanted 'bar :testRoutine') batch.c:238: Test failed: excess characters on line 390 (got 'foo ', wanted 'foo(a)space@') batch.c:238: Test failed: excess characters on line 391 (got 'foo bar ', wanted 'foo bar') batch.c:238: Test failed: excess characters on line 392 (got 'foo "" ', wanted 'foo ""') batch.c:238: Test failed: excess characters on line 393 (got '"" bar ', wanted '"" bar') batch.c:238: Test failed: excess characters on line 394 (got 'foo '' ', wanted 'foo ''') batch.c:238: Test failed: excess characters on line 395 (got ''' bar ', wanted ''' bar') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 396 (got 'bar :testRoutine', wanted '0') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 397 (got 'foo ', wanted 'foo created') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 398 (got 'foo bar', wanted 'Should expand foobaz') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 399 (got 'foo ""', wanted 'batfile') batch.c:241: Test failed: unexpected char 0x22 position 0 in line 400 (got '"" bar', wanted 'robinfile') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 401 (got 'foo ''', wanted '1') batch.c:241: Test failed: unexpected char 0x27 position 0 in line 402 (got ''' bar', wanted '1') batch.c:241: Test failed: unexpected char 0x30 position 0 in line 403 (got '0', wanted 'non-builtin dir') batch.c:241: Test failed: unexpected char 0x66 position 0 in line 404 (got 'foo created', wanted '------------ Testing setlocal/endlocal ------------') batch.c:241: Test failed: unexpected char 0x53 position 0 in line 405 (got 'Should expand foobaz', wanted '...enable/disable extensions') batch.c:241: Test failed: unexpected char 0x62 position 0 in line 406 (got 'batfile', wanted 'ErrLev:@space@') batch.c:241: Test failed: unexpected char 0x72 position 0 in line 407 (got 'robinfile', wanted 'ErrLev: 0') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 408 (got '1', wanted 'ErrLev: 0') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 409 (got '1', wanted 'ErrLev:@space@@or_broken(a)ErrLev: 0') batch.c:241: Test failed: unexpected char 0x6e position 0 in line 410 (got 'non-builtin dir', wanted 'ErrLev: 0') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 411 (got '------------ Testing setlocal/endlocal ------------', wanted '...setlocal with corresponding endlocal') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 412 (got '...enable/disable extensions', wanted 'globalval') batch.c:241: Test failed: unexpected char 0x45 position 0 in line 413 (got 'ErrLev: ', wanted 'localval') batch.c:241: Test failed: unexpected char 0x45 position 0 in line 414 (got 'ErrLev: 0', wanted 'globalval') batch.c:241: Test failed: unexpected char 0x45 position 0 in line 415 (got 'ErrLev: 0', wanted 'globalval') batch.c:241: Test failed: unexpected char 0x45 position 0 in line 416 (got 'ErrLev: ', wanted '...setlocal with no corresponding endlocal') batch.c:241: Test failed: unexpected char 0x45 position 0 in line 417 (got 'ErrLev: 0', wanted 'globalval') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 418 (got '...setlocal with corresponding endlocal', wanted 'localval') batch.c:241: Test failed: unexpected char 0x6c position 0 in line 420 (got 'localval', wanted '-----------Testing Errorlevel-----------') batch.c:241: Test failed: unexpected char 0x67 position 0 in line 421 (got 'globalval', wanted '9009') batch.c:241: Test failed: unexpected char 0x67 position 0 in line 422 (got 'globalval', wanted '1') batch.c:241: Test failed: unexpected char 0x2e position 0 in line 423 (got '...setlocal with no corresponding endlocal', wanted 'errorlevel just right, good') batch.c:241: Test failed: unexpected char 0x67 position 0 in line 424 (got 'globalval', wanted 'abc0def(a)or_broken@abc1def') batch.c:241: Test failed: unexpected char 0x6c position 0 in line 425 (got 'localval', wanted 'errorlevel zero, good(a)or_broken@errorlevel nonzero, bad') batch.c:241: Test failed: unexpected char 0x67 position 0 in line 426 (got 'globalval', wanted '7 should be 7') batch.c:241: Test failed: unexpected char 0x2d position 0 in line 427 (got '-----------Testing Errorlevel-----------', wanted '7 should still be 7') batch.c:241: Test failed: unexpected char 0x39 position 0 in line 428 (got '9009', wanted '-----------Testing GOTO-----------') batch.c:241: Test failed: unexpected char 0x31 position 0 in line 429 (got '1', wanted 'goto with no leading space worked') batch.c:241: Test failed: unexpected char 0x65 position 0 in line 430 (got 'errorlevel just right, good', wanted 'goto with a leading space worked') batch.c:241: Test failed: unexpected char 0x61 position 0 in line 431 (got 'abc0def', wanted 'goto with a leading tab worked') batch.c:241: Test failed: unexpected char 0x65 position 0 in line 432 (got 'errorlevel zero, good', wanted 'goto with a following space worked') batch.c:241: Test failed: unexpected char 0x37 position 0 in line 433 (got '7 should be 7', wanted '-----------Done, jumping to EOF-----------') batch.c:255: Test failed: too long output, got additional 7 should still be 7

1 0

Re: wined3d: Only update the sampler map when needed
by Henri Verbeet Aug. 11, 2011

Aug. 11, 2011

On 26 July 2011 22:28, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > - if (state < gl_info->limits.fragment_samplers) > + if (state < gl_info->limits.combined_samplers) This looks like it should be a separate change. > + device->fixed_function_usage_map = 0xff; This looks questionable, it will cause unused textures to be loaded.

2 1

Re: [1/3] gdi32: Initial Gamma setting tests
by Nikolay Sivov Aug. 11, 2011

Aug. 11, 2011

On 8/11/2011 00:58, André Hentschel wrote: > --- > dlls/gdi32/tests/dc.c | 40 ++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 40 insertions(+), 0 deletions(-) > > diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c > index 5017583..f8ceccd 100644 > --- a/dlls/gdi32/tests/dc.c > +++ b/dlls/gdi32/tests/dc.c > @@ -24,6 +24,7 @@ > #include<assert.h> > #include<stdio.h> > > +#include "ddraw.h" > #include "wine/test.h" > #include "winbase.h" > #include "wingdi.h" > @@ -599,6 +600,44 @@ static void test_desktop_colorres(void) > ReleaseDC(NULL, hdc); > } > > +static void test_gamma(void) > +{ > + BOOL ret; > + HDC hdc = GetDC(NULL); > + DDGAMMARAMP oldramp; I think it's better to use plain buffer for that to match prototype. > + > + ret = GetDeviceGammaRamp(hdc,&oldramp); > + > + if (ret) > + { To avoid extra indentation level maybe just exit earlier.. > + DDGAMMARAMP ramp; > + ZeroMemory(&ramp, sizeof(ramp)); > + > + /* ramps are zero for every color */ > + ret = SetDeviceGammaRamp(hdc,&ramp); > + todo_wine ok(!ret, "SetDeviceGammaRamp succeeded\n"); > + > + /* set a ramp part at the end of every color to non-zero */ > + ramp.red[255] = 1; > + ramp.green[255] = 1; > + ramp.blue[255] = 1; > + ret = SetDeviceGammaRamp(hdc,&ramp); > + todo_wine ok(!ret, "SetDeviceGammaRamp succeeded\n"); > + > + /* set a ramp part in the middle of one color to non-zero */ > + ramp.blue[127] = 1; > + ret = SetDeviceGammaRamp(hdc,&ramp); > + todo_wine ok(!ret, "SetDeviceGammaRamp succeeded\n"); > + This needs more tests, is it possible you can't have any zeros at all? > + /* cleanup: set old ramp */ > + ret = SetDeviceGammaRamp(hdc,&oldramp); > + ok(ret || broken(!ret), "SetDeviceGammaRamp failed\n"); What a broken case is about? > + else win_skip("GetDeviceGammaRamp failed, skipping tests\n"); When it fails on native by the way? > + > + ReleaseDC(NULL, hdc); > +} > + > START_TEST(dc) > { > test_savedc(); > @@ -609,4 +648,5 @@ START_TEST(dc) > test_DeleteDC(); > test_boundsrect_invalid(); > test_desktop_colorres(); > + test_gamma(); > }

2 1

cmd: an issue with cd .. command
by Nowres Rafid Aug. 11, 2011

Aug. 11, 2011

Hello, the command "cd .. " doesn't work when there is extra spaces at the end. I propose this patch and ask for your confirmation about it. best regards.

3 3

Re: cmd: an issue with cd .. command
by Frédéric Delanoy Aug. 11, 2011

Aug. 11, 2011

2011/8/11 Nowres Rafid <nowres.rafed(a)gmail.com>: > here we change the "command" > > if (CompareStringW(LOCALE_USER_DEFAULT, > NORM_IGNORECASE | SORT_STRINGSORT, > command, 2, parmD, -1) == 2) { > command += 2; > while (*command && *command==' ') command++; > } > > that's why I decided to change it too. What I mean by constant is that the "WCHAR* command" contents isn't modified. Here the "command" formal parameter is just a copy of caller's WCHAR pointer, so you don't affect the caller by doing pointer arithmetic on it (although using a local pointer would be clearer/better style), and the actual contents isn't altered. Frédéric NB: You should leave wine-devel as Cc:

1 0

Re: cmd: an issue with cd .. command
by Frédéric Delanoy Aug. 11, 2011

Aug. 11, 2011

2011/8/11 Nowres Rafid <nowres.rafed(a)gmail.com>: > where is the code that eliminates extra spaces after normal directories > name? > (because "cd dir " works) Don't know. You'll have to find yourself, possibly by running with cmd debug channel and/or debugger Frédéric

1 0

Re: wined3d: Fix does not clip transformed vertices in z-direction
by Henri Verbeet Aug. 10, 2011

Aug. 10, 2011

On 10 August 2011 17:35, Антон Ярцев <thunder_8888(a)mail.ru> wrote: > In some d3d9 2d-games, some sprites does not draws, or draws like thin line > because game use transformation for primitives, and z-coordinate(detected ~ > -700...+700 range) of vertices might be not in view volume as occurs. I'm pretty sure I've mentioned this before, but this clearly needs tests before you can even start thinking about a fix. As it is, the patch is simply wrong, it causes several test failures.

1 0

re: Current state of USBD.SYS
by Dan Kegel Aug. 10, 2011

Aug. 10, 2011

Louis wrote > Our patches should already be available (Google for "Muse Research open > source"; I can't recall the server it's on at the moment, but it should be > in the "1.8" subdirectory). I think it's ftp://ftp.museresearch.com/rpms/1.8/ and in particular ftp://anonymous+museresearch.com(a)ftp.museresearch.com/rpms/1.8/wine-1.1.7… - Dan p.s. http://www.museresearch.com/support/receptor-faq.php says Q. If Receptor uses GPLed code, where can I download the source? A. You can download all relevant Source Code here: http://www.museresearch.com/support/receptor.php?r=src but there's nothing there; the right url seems to be http://www.muse.reprisesoftware.com/receptor.php?r=src which points to the files. Louis, maybe you could get the FAQ updated...

2 1

Current state of USBD.SYS
by louis＠museresearch.com Aug. 10, 2011

Aug. 10, 2011

Hi, I'm in the process of migrating custom patches made to WINE 1.1.7 to WINE 1.3.24. Among those is USBD.SYS, which we use to run a Windows driver for a specific USB device which has no equivalent Linux driver. I was wondering what to expect from 1.3.24 as far as USB device discovery and Windows driver support goes. For example, our older patched version ties into Linux HAL to find devices, but there doesn't *appear* to be the same functionality in this newer stock version. Does anyone know what the goal of usbd.sys is in WINE 1.3.24? Also what I'd like to find out is if there is maybe a cutting-edge usbd.sys module that hasn't made it into the development WINE branch. Anyway, thanks for your time and any help is greatly appreciated, as always. -Louis

2 2

[PATCH] winealsa.drv: Fix AudioRenderClient write pointer calculation
by Joerg-Cyril.Hoehle＠t-systems.com Aug. 10, 2011

Aug. 10, 2011

Hi, The buffering code in winealsa & wineoss is still very complex and I've had a hard time following it. Because of the complexity, it's potentially error-prone. Here's an error: Consider this sequence of calls: BufferSize 100 GetBuffer(80) Release(80) pcm_write(50) => offs = 50, held = 30 (80-50) GetBuffer(30) (max 70) =>LOCKED_WRAPPED (because pos 80 + 30 is > 100) Release(30) => wrap_buffer 20 at end & 10 at beginning => offs = 50, held = 60 (note offs+held > 100) GetBuffer(10) (max 40) =>LOCKED_NORMAL (fits into primary) Release(10) =>computes buffer = offs+held = 50+60 = 110 > 100! =>illegal memory access An easy fix would be to correct buffer = This->local_buffer + + (This->lcl_offs_frames + This->held_frames) * This->fmt->nBlockAlign; into (offs+held %buffer_size) However are we sure that's all? I'd love to see the code as understandable as winecoreaudio (although I know there need be more state variables to handle the two buffers). Precisely because winecoreaudio is more readable I was able to fix the Get/ReleaseBuffer ordering issue, while ALSA and OSS are still waiting (waiting too for another patch to have GetCurrentPadding simply return held_frames on top of it). IOW, the winecoreaudio driver is the best of the three, receiving fixes written easily, while ALSA and OSS are lagging behind because it's tedious to patch them correctly. Regards, Jörg Höhle

1 0

Best way to get Program Files/Common Files?
by Lucas Zawacki Aug. 9, 2011

Aug. 9, 2011

I need to get the user configured path to Program Files/Common Files to save the dinput action mapping settings. What are the my options for doing this? One way I found is the SHGetSpecialFolderPath function, but it requires me to link to shell32 and I suspect there's a better way. Thanks

3 3

GSoC: dinput8 Action Mapping - dialog testing
by Marcus Meissner Aug. 9, 2011

Aug. 9, 2011

On Tue, Aug 02, 2011 at 06:25:49PM -0300, Lucas Zawacki wrote: > Hello. I need some help here. > > Before commiting the ConfigureDevices patches tried to add a couple > simple tests for the function, the problem is that I now have to test > a dialog. What is the best way to do it? I'm thinking of creating > another thread and sending the desired messages to the dialog, is that > a good option? I'm open to suggestions. This is over my head... There are some dlls that test dialogs, like dlls/comdlg32/tests but it does not seem obvious how they do it. (I unthreaded this e-mail so more people can read it ... Perhaps post new stuff in new e-mail threads for more comments.) Ciao, Marcus

3 3

[rfc] WINE_ONCE macro
by Dan Kegel Aug. 9, 2011

Aug. 9, 2011

There are many places in the wine source that use a static to print a fixme just once. Here's a simple macro that combines declaring and testing the static. Thoughts? diff --git a/include/wine/debug.h b/include/wine/debug.h index ba6fabe..3112401 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -250,6 +250,8 @@ static inline const char *wine_dbgstr_longlong( ULONGLONG ll ) #define WINE_DPRINTF wine_dbg_printf #define WINE_MESSAGE wine_dbg_printf +#define WINE_ONCE(s) { static int once; if (!once++) s; } + #ifdef __WINESRC__ /* Wine uses shorter names that are very likely to conflict with other software */ @@ -276,6 +278,8 @@ static inline const char *debugstr_w( const WCHAR *s ) { return wine_dbgstr_wn( #define ERR_(ch) WINE_ERR_(ch) #define ERR_ON(ch) WINE_ERR_ON(ch) +#define ONCE(s) WINE_ONCE(s) + #define DPRINTF WINE_DPRINTF #define MESSAGE WINE_MESSAGE And here's an example of its use: diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index fd24f11..af75095 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -310,9 +310,7 @@ int CDECL _atoflt( _CRT_FLOAT *value, char *str ) DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_name_internal_method,8) const char * __thiscall MSVCRT_type_info_name_internal_method(type_info * _this, struct __type_info_node *node) { - static int once; - - if (node && !once++) FIXME("type_info_node parameter ignored\n"); + if (node) ONCE(FIXME("type_info_node parameter ignored\n")); if (!_this->name) {

3 3

Re: wldap32/tests: Skip tests if ldap_init failed (try 3)
by Hans Leidekker Aug. 9, 2011

Aug. 9, 2011

On Tue, 2011-08-09 at 19:31 +0200, André Hentschel wrote: > diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c > index 4cf8564..ed37d88 100644 > --- a/dlls/wldap32/tests/parse.c > +++ b/dlls/wldap32/tests/parse.c > @@ -128,7 +128,11 @@ START_TEST (parse) > LDAP *ld; > > ld = ldap_initA((char *)"ldap.itd.umich.edu", 389 ); > - ok( ld != NULL, "ldap_init failed\n" ); > + if (!ld) > + { > + skip("ldap_init failed, skipping tests\n"); > + return; > + } > > test_ldap_parse_sort_control( ld ); > test_ldap_search_extW( ld ); If it fails on Wine it's probably because LDAP development files were not present at build time. I'm not sure if we want to hide this failure though, applications may expect ldap_init to succeed.

3 2

Re: wldap32/tests: Skip tests if ldap_init failed
by Hans Leidekker Aug. 9, 2011

Aug. 9, 2011

On Tue, 2011-08-09 at 19:17 +0200, André Hentschel wrote: > diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c > index 4cf8564..faad474 100644 > --- a/dlls/wldap32/tests/parse.c > +++ b/dlls/wldap32/tests/parse.c > @@ -128,7 +128,11 @@ START_TEST (parse) > LDAP *ld; > > ld = ldap_initA((char *)"ldap.itd.umich.edu", 389 ); > - ok( ld != NULL, "ldap_init failed\n" ); > + if (!ld) > + { > + win_skip("ldap_init failed, skipping tests\n"); > + return; > + } > > test_ldap_parse_sort_control( ld ); > test_ldap_search_extW( ld ); Do you see it fail on Windows?

2 1

Re: Bug #27975 and one small change
by Frédéric Delanoy Aug. 9, 2011

Aug. 9, 2011

2011/8/8 Adam Stachowicz <saibamenppl(a)gmail.com>: > From f91549a682b52b77853b53a475011c7869f861b2 Mon Sep 17 00:00:00 2001 > From: Saibamen <saibamenppl(a)gmail.com> > Date: Mon, 8 Aug 2011 15:43:48 +0200 > Subject: Resize control to allow wider string of polish translator and bug > 27975 Please see http://wiki.winehq.org/SubmittingPatches for how to submit in the correct patch format. Frédéric

2 3

Re: [1/4] explorer: implement the explorer using IExplorerBrowser (try 3)
by Austin English Aug. 8, 2011

Aug. 8, 2011

On Sat, Jun 11, 2011 at 14:42, Jay Yang <jkelleyy(a)gmail.com> wrote: > --- > configure.ac | 2 +- > programs/explorer/Makefile.in | 6 +- > programs/explorer/explorer.c | 208 ++++++++++++++++++++++++++++++----------- > programs/explorer/explorer.rc | 26 +++++ > programs/explorer/resource.h | 26 +++++ > 5 files changed, 213 insertions(+), 55 deletions(-) > create mode 100644 programs/explorer/explorer.rc > create mode 100644 programs/explorer/resource.h Introduced a regression, see http://bugs.winehq.org/show_bug.cgi?id=28029. -- -Austin

1 0

bugzilla: merge OS X/Windows OS versions
by Austin English Aug. 8, 2011

Aug. 8, 2011

This was mentioned a while back, though I can't find the reference on wine-devel, perhaps it was in #winehackers... Anyway, would anyone be opposed to merging the Mac OS X versions (and possibly the Windows versions) in the OS field in Bugzilla? We don't differentiate any other OS, and for Windows, there are very few bugs filed anyway (mostly against the test suite or building on cygwin). So, instead of: Windows 3.1 Windows 95 Windows 98 Windows ME Windows 2000 Windows NT Windows XP Windows Vista Mac OS X 10.2 Mac OS X 10.3 Mac OS X 10.4 Mac OS X 10.5 Mac OS X 10.6 We'd have: Windows (All versions) Mac OS X I meant to do this a while ago, but forgot, and http://bugs.winehq.org/show_bug.cgi?id=27930 reminded me -- -Austin

2 2