July 2007 - Wine-devel - list.winehq.org

programs: Add extrac32
by Kirill K. Smirnov 07 Jul '07

07 Jul '07

> +int PASCAL wWinMain ( HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int show ) Sorry for asking this too late, but what's the point to use WinMain in pure console application? 'cmd' and 'xcopy' use wmain. -- Kirill

2 1

Re: [1/2] gdiplus: rendering of linecaps [try2]
by Laurent Vromman 07 Jul '07

07 Jul '07

Why do you use M_PI / 2.0 or M_PI / 4.0 and not directly M_PI_2 and M_PI_4? Laurent Evan Stade a écrit : > Hi, > > [try2] Removed non-portable constructs. > > Changelog: > * added helpers that render line caps > * added end cap drawing for GdipDrawLineI > > dlls/gdiplus/graphics.c | 220 > ++++++++++++++++++++++++++++++++++++++++++++++- > dlls/gdiplus/pen.c | 5 - > 2 files changed, 217 insertions(+), 8 deletions(-) > > ------------------------------------------------------------------------ > > diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c > index 4765e33..6c40aec 100644 > --- a/dlls/gdiplus/graphics.c > +++ b/dlls/gdiplus/graphics.c > @@ -27,8 +27,11 @@ #include "gdiplus.h" > #include "gdiplus_private.h" > #include "wine/debug.h" > > -/* looks-right constant */ > +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); > + > +/* looks-right constants */ > #define TENSION_CONST (0.3) > +#define ANCHOR_WIDTH (2.0) > > static inline INT roundr(REAL x) > { > @@ -108,6 +111,212 @@ static void calc_curve_bezier_endp(REAL > *y = roundr(tension * (yadj - yend) + yend); > } > > +/* Draws the linecap the specified color and size on the hdc. The linecap is in > + * direction of the line from x1, y1 to x2, y2 and is anchored on x2, y2. */ > +static void draw_cap(HDC hdc, COLORREF color, GpLineCap cap, REAL size, > + REAL x1, REAL y1, REAL x2, REAL y2) > +{ > + HGDIOBJ oldbrush, oldpen; > + HBRUSH brush; > + HPEN pen; > + POINT pt[4]; > + REAL theta, dsmall, dbig, dx, dy, invert; > + > + if(x2 != x1) > + theta = atan((y2 - y1) / (x2 - x1)); > + else if(y2 != y1){ > + theta = M_PI / 2.0 * (y2 > y1 ? 1.0 : -1.0); > + } > + else > + return; > + > + invert = ((x2 - x1) >= 0.0 ? 1.0 : -1.0); > + brush = CreateSolidBrush(color); > + pen = CreatePen(PS_SOLID, 1, color); > + oldbrush = SelectObject(hdc, brush); > + oldpen = SelectObject(hdc, pen); > + > + switch(cap){ > + case LineCapFlat: > + break; > + case LineCapSquare: > + case LineCapSquareAnchor: > + case LineCapDiamondAnchor: > + size = size * (cap & LineCapNoAnchor ? ANCHOR_WIDTH : 1.0) / 2.0; > + if(cap == LineCapDiamondAnchor){ > + dsmall = cos(theta + M_PI / 2.0) * size; > + dbig = sin(theta + M_PI / 2.0) * size; > + } > + else{ > + dsmall = cos(theta + M_PI / 4.0) * size; > + dbig = sin(theta + M_PI / 4.0) * size; > + } > + > + /* calculating the latter points from the earlier points makes them > + * look a little better because of rounding issues */ > + pt[0].x = roundr(x2 - dsmall); > + pt[1].x = roundr(((REAL)pt[0].x) + dbig + dsmall); > + > + pt[0].y = roundr(y2 - dbig); > + pt[3].y = roundr(((REAL)pt[0].y) + dsmall + dbig); > + > + pt[1].y = roundr(y2 - dsmall); > + pt[2].y = roundr(dbig + dsmall + ((REAL)pt[1].y)); > + > + pt[3].x = roundr(x2 - dbig); > + pt[2].x = roundr(((REAL)pt[3].x) + dsmall + dbig); > + > + Polygon(hdc, pt, 4); > + > + break; > + case LineCapArrowAnchor: > + size = size * 4.0 / sqrt(3.0); > + > + dx = cos(M_PI / 6.0 + theta) * size * invert; > + dy = sin(M_PI / 6.0 + theta) * size * invert; > + > + pt[0].x = roundr(x2 - dx); > + pt[0].y = roundr(y2 - dy); > + > + dx = cos(- M_PI / 6.0 + theta) * size * invert; > + dy = sin(- M_PI / 6.0 + theta) * size * invert; > + > + pt[1].x = roundr(x2 - dx); > + pt[1].y = roundr(y2 - dy); > + > + pt[2].x = roundr(x2); > + pt[2].y = roundr(y2); > + > + Polygon(hdc, pt, 3); > + > + break; > + case LineCapRoundAnchor: > + dx = dy = ANCHOR_WIDTH * size / 2.0; > + > + x2 = (REAL) roundr(x2 - dx); > + y2 = (REAL) roundr(y2 - dy); > + > + Ellipse(hdc, (INT) x2, (INT) y2, roundr(x2 + 2.0 * dx), > + roundr(y2 + 2.0 * dy)); > + break; > + case LineCapTriangle: > + size = size / 2.0; > + dx = cos(M_PI / 2.0 + theta) * size; > + dy = sin(M_PI / 2.0 + theta) * size; > + > + /* Using roundr here can make the triangle float off the end of the > + * line. */ > + pt[0].x = ((x2 - x1) >= 0 ? floor(x2 - dx) : ceil(x2 - dx)); > + pt[0].y = ((y2 - y1) >= 0 ? floor(y2 - dy) : ceil(y2 - dy)); > + pt[1].x = roundr(pt[0].x + 2.0 * dx); > + pt[1].y = roundr(pt[0].y + 2.0 * dy); > + > + dx = cos(theta) * size * invert; > + dy = sin(theta) * size * invert; > + > + pt[2].x = roundr(x2 + dx); > + pt[2].y = roundr(y2 + dy); > + > + Polygon(hdc, pt, 3); > + > + break; > + case LineCapRound: > + dx = -cos(M_PI / 2.0 + theta) * size * invert; > + dy = -sin(M_PI / 2.0 + theta) * size * invert; > + > + pt[0].x = ((x2 - x1) >= 0 ? floor(x2 - dx) : ceil(x2 - dx)); > + pt[0].y = ((y2 - y1) >= 0 ? floor(y2 - dy) : ceil(y2 - dy)); > + pt[1].x = roundr(pt[0].x + 2.0 * dx); > + pt[1].y = roundr(pt[0].y + 2.0 * dy); > + > + dx = dy = size / 2.0; > + > + x2 = (REAL) roundr(x2 - dx); > + y2 = (REAL) roundr(y2 - dy); > + > + Pie(hdc, (INT) x2, (INT) y2, roundr(x2 + 2.0 * dx), > + roundr(y2 + 2.0 * dy), pt[0].x, pt[0].y, pt[1].x, pt[1].y); > + break; > + case LineCapCustom: > + FIXME("line cap not implemented\n"); > + default: > + break; > + } > + > + SelectObject(hdc, oldbrush); > + SelectObject(hdc, oldpen); > + DeleteObject(brush); > + DeleteObject(pen); > +} > + > +/* Shortens the line by the given percent by changing x2, y2. > + * If percent is > 1.0 then the line will change direction. */ > +static void shorten_line_percent(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL percent) > +{ > + REAL dist, theta, dx, dy; > + > + if((y1 == *y2) && (x1 == *x2)) > + return; > + > + dist = sqrt((*x2 - x1) * (*x2 - x1) + (*y2 - y1) * (*y2 - y1)) * percent; > + theta = (*x2 == x1 ? M_PI / 2.0 : atan((*y2 - y1) / (*x2 - x1))); > + dx = cos(theta) * dist; > + dy = sin(theta) * dist; > + > + *x2 = *x2 + fabs(dx) * (*x2 > x1 ? -1.0 : 1.0); > + *y2 = *y2 + fabs(dy) * (*y2 > y1 ? -1.0 : 1.0); > +} > + > +/* Shortens the line by the given amount by changing x2, y2. > + * If the amount is greater than the distance, the line will become length 0. */ > +static void shorten_line_amt(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL amt) > +{ > + REAL dx, dy, percent; > + > + dx = *x2 - x1; > + dy = *y2 - y1; > + if(dx == 0 && dy == 0) > + return; > + > + percent = amt / sqrt(dx * dx + dy * dy); > + if(percent >= 1.0){ > + *x2 = x1; > + *y2 = y1; > + return; > + } > + > + shorten_line_percent(x1, y1, x2, y2, percent); > +} > + > +/* Draws lines between the given points, and if caps is true then draws an endcap > + * at the end of the last line. FIXME: Startcaps not implemented. */ > +static void draw_polyline(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, > + INT count, BOOL caps) > +{ > + POINT *pti = GdipAlloc(count * sizeof(POINT)); > + REAL x = pt[count - 1].X, y = pt[count - 1].Y; > + INT i; > + > + if(caps){ > + if(pen->endcap == LineCapArrowAnchor) > + shorten_line_amt(pt[count-2].X, pt[count-2].Y, &x, &y, pen->width); > + > + draw_cap(hdc, pen->color, pen->endcap, pen->width, pt[count-2].X, > + pt[count-2].Y, pt[count - 1].X, pt[count - 1].Y); > + } > + > + for(i = 0; i < count - 1; i ++){ > + pti[i].x = roundr(pt[i].X); > + pti[i].y = roundr(pt[i].Y); > + } > + > + pti[i].x = roundr(x); > + pti[i].y = roundr(y); > + > + Polyline(hdc, pti, count); > + GdipFree(pti); > +} > + > GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) > { > if(hdc == NULL) > @@ -248,16 +457,21 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGrap > INT y1, INT x2, INT y2) > { > INT save_state; > + GpPointF pt[2]; > > if(!pen || !graphics) > return InvalidParameter; > > + pt[0].X = (REAL)x1; > + pt[0].Y = (REAL)y1; > + pt[1].X = (REAL)x2; > + pt[1].Y = (REAL)y2; > + > save_state = SaveDC(graphics->hdc); > EndPath(graphics->hdc); > SelectObject(graphics->hdc, pen->gdipen); > > - MoveToEx(graphics->hdc, x1, y1, NULL); > - LineTo(graphics->hdc, x2, y2); > + draw_polyline(graphics->hdc, pen, pt, 2, TRUE); > > RestoreDC(graphics->hdc, save_state); > > diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c > index 0fcbb69..52515d5 100644 > --- a/dlls/gdiplus/pen.c > +++ b/dlls/gdiplus/pen.c > @@ -77,11 +77,6 @@ GpStatus WINGDIPAPI GdipSetPenEndCap(GpP > { > if(!pen) return InvalidParameter; > > - if(cap != LineCapFlat){ > - FIXME("Not implemented for non-flat EndCap\n"); > - return NotImplemented; > - } > - > pen->endcap = cap; > > return Ok; > > ------------------------------------------------------------------------ > > >

1 0

Wine tests failing on Linux
by Michael Stefaniuc 06 Jul '07

06 Jul '07

Hello! I was showing a little bit of schadenfreude on #winehackers that Alexandre has now failing Wine tests on his brand new computer. So I thought to do a full run of the Wine tests on my machine and report the errors. Maybe Alexandre will fix this bugs too ;) while at it. Test setup: - 3 GHz P4 with HT enabled - FC6 up2date box, self baked kernel (2.6.20.14 SMP) - GeForce FX 5200 with NVidia binary driver 1.0-9746 - EMU10k1 SB Live sound card - Out of source tree build wine and installed (make install). Running the tests: make testclean rm -rf ~/.wine wineprefixcreate make test When a test fails, run it a second time and if it still fails manually touch the offending *.ok file and run make test again. While make test was running I didn't touch the keyboard or the mouse. Results: Not as bad as I thought: "officially" only 3 files with failing tests. But there is one test that crashes, winedebug is run automatically, does a backtrace and returns with return code 0 thus make won't detect it as error: /home/michi/work/wine/tools/runtest -q -P wine -M mshtml.dll -T ../../.. -p mshtml_test.exe.so /home/michi/work/wine/dlls/mshtml/tests/dom.c && touch dom.ok Could not load Mozilla. HTML rendering will be disabled. wine: Unhandled page fault on read access to 0x00000000 at address 0x604e9914 (thread 0023), starting debugger... Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x604e9914). ... Backtrace: =>1 0x604e9914 test_doc_elem+0xd4(doc=0x165468) [/home/michi/work/wine/dlls/mshtml/tests/dom.c:66] in mshtml_test (0x0033fdf8) ... The "normal" test failures: /home/michi/work/wine/tools/runtest -q -P wine -M comctl32.dll -T ../../.. -p comctl32_test.exe.so /home/michi/work/wine/dlls/comctl32/tests/monthcal.c && touch monthcal.ok monthcal.c:773: Test succeeded inside todo block: Expected 65536, got 65536 make[2]: *** [monthcal.ok] Error 1 /home/michi/work/wine/tools/runtest -q -P wine -M gdi32.dll -T ../../.. -p gdi32_test.exe.so /home/michi/work/wine/dlls/gdi32/tests/font.c && touch font.ok font.c:1574: Test failed: A: tmDefaultChar for Goha-Tibeb Zemen 20 != 0x1f font.c:1574: Test failed: A: tmDefaultChar for Lucida Sans Typewriter ff != 0x1f font.c:1574: Test failed: A: tmDefaultChar for Lucida Sans Typewriter ff != 0x1f font.c:1574: Test failed: A: tmDefaultChar for Lucida Sans Typewriter ff != 0x1f font.c:1574: Test failed: A: tmDefaultChar for Lucida Sans Typewriter ff != 0x1f font.c:1574: Test failed: A: tmDefaultChar for Lucida Sans Typewriter ff != 0x1f font.c:1574: Test failed: A: tmDefaultChar for Lucida Sans Typewriter ff != 0x1f font.c:1574: Test failed: A: tmDefaultChar for Lucida Sans Typewriter ff != 0x1f font.c:1574: Test failed: A: tmDefaultChar for Lucida Sans Typewriter ff != 0x1f font.c:1574: Test failed: A: tmDefaultChar for Lucida Sans Typewriter ff != 0x1f make[2]: *** [font.ok] Error 10 /home/michi/work/wine/tools/runtest -q -P wine -M user32.dll -T ../../.. -p user32_test.exe.so /home/michi/work/wine/dlls/user32/tests/msg.c && touch msg.ok msg.c:5878: Test failed: Alt+MouseButton press/release: the msg 0x0104 was expected, but got msg 0x0021 instead msg.c:5878: Test failed: Alt+MouseButton press/release: the msg 0x0104 was expected, but got msg 0x0021 instead msg.c:5878: Test failed: Alt+MouseButton press/release: the msg 0x0201 was expected, but got msg 0x0104 instead msg.c:5878: Test failed: Alt+MouseButton press/release: the msg 0x0201 was expected, but got msg 0x0104 instead msg.c:5878: Test failed: Alt+MouseButton press/release: the msg 0x0202 was expected, but got msg 0x0201 instead msg.c:5878: Test failed: Alt+MouseButton press/release: the msg 0x0202 was expected, but got msg 0x0201 instead msg.c:5878: Test failed: Alt+MouseButton press/release: the msg 0x0105 was expected, but got msg 0x0202 instead msg.c:5878: Test failed: Alt+MouseButton press/release: the msg 0x0105 was expected, but got msg 0x0202 instead msg.c:5878: Test failed: Alt+MouseButton press/release: the msg sequence is not complete: expected 0000 - actual 0105 make[2]: *** [msg.ok] Error 9 bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 Sr. Network Engineer Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

2 1

Dead links in the source
by Detlef Riekenberg 06 Jul '07

06 Jul '07

On Fr, 2007-07-06 at 18:33 +0200, Stefan Dösinger wrote: > -/* Implementation details at http://developer.nvidia.com/attach/6494 > -and > -http://oss.sgi.com/projects/ogl-sample/registry/NV/evaluators.txt > -hmm.. no longer supported use > -OpenGL evaluators or tessellate surfaces within your application. > -*/ > - > -/* > http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… */ That Patch stopped one line to early. The URL is dead What is the general advise for links? Many links to msdn.microsoft.com are dead. Total: detlef(a)p4:~/wine.cvs/src$ grep http:// dlls/*/* | wc -l 195 detlef(a)p4:~/wine.cvs/src$ grep msdn.microsoft.com dlls/*/* | wc -l 75 Should we remove or update the old links? (I prefer: remove) IMHO, a nice Janatorial Project -- By by ... Detlef

2 1

Re: crypt32: implement CryptSIPLoad (resend)
by Alexandre Julliard 06 Jul '07

06 Jul '07

"Juan Lang" <juan.lang(a)gmail.com> writes: > Hi, any feedback on this one, please? You should use module handles to identify dlls, not file names. You can use GetModuleHandle to find out if a dll is loaded already. -- Alexandre Julliard julliard(a)winehq.org

2 4

Random X errors caused by recent cursor patch
by Vitaly N. Zadunaisky 06 Jul '07

06 Jul '07

Subject: Using Win32 apllication under wine. Using wine for running win32 applications we met the problem. The origin error is: X Error of failed request: BadPixmap (invalid Pixmap parameter) Major opcode of failed request: 54 (X_FreePixmap) Resource id in failed request: 0x2a029f9 Serial number of failed request: 105496 Current serial number in output stream: 107860 After this error application crashes. The error appears when menu items is selected for some action. ------------------------------------------------------------------------------------- The patch described in http://www.winehq.org/pipermail/wine-devel/2007-April/055637.html apparently helps us. Great thanks! But it's still not fixed in current release 0.9.40, as I can understand. ------------------------------------------------------------------------------------- Good luck. good-bye. Yours faithfully Vitaly

2 1

[5/5] WineD3D: Implement high order patches
by Stefan Dösinger 06 Jul '07

06 Jul '07

1 0

Re: programs:extrac32: Add new program (Extrac32.exe) (Pre alpha version :)) [try2]
by Detlef Riekenberg 06 Jul '07

06 Jul '07

On Do, 2007-07-05 at 20:00 +0400, Anatoly Lyutin wrote: > --- programs/Makefile.in 18 May 2007 13:05:27 -0000 1.65 > +++ programs/Makefile.in 4 Jul 2007 15:47:09 -0000 > --- Makefile.in 21 Jun 2007 14:49:30 -0000 1.243 > +++ Makefile.in 4 Jul 2007 15:45:57 -0000 > --- configure.ac 4 Jul 2007 11:58:41 -0000 1.679 > +++ configure.ac 4 Jul 2007 15:45:29 -0000 Please do not include any autogenerated code. The files are updated by "tools/make_makefiles", when Alexandre commit your Patch. This prevent conflicting Patches, when another Program is added at the same Time. Thanks -- By by ... Detlef

1 0

programs:extrac32 Add new program (Extrac32.exe) (Pre alpha version :))
by Kirill K. Smirnov 06 Jul '07

06 Jul '07

Hi, > +MODULE = EXTRAC32.exe It is very unusual to have upper-case name of exe file > WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE),"Run Wine Extrac32. \n",strlen("Run Wine Extrac32.\n"),NULL,NULL); The utility is compiled as UNICODE (EXTRADEFS = -DUNICODE), thus WriteConsoleW is used, but here MultiByte string is passed. As expected, it does not work. Moreover, if output is redirected to file, it does not work, since WriteConsole can be used only with real console. msvcrt printf is better from this point of view, but it does not suit us, see bug #8598 and bug #8554. Currenly working solution is implemented in cmd.exe (and msdn recommends this: http://msdn2.microsoft.com/en-us/library/ms687401.aspx) -- Kirill

3 3

Issue(s) when running winetest on Windows
by Paul Vriens 06 Jul '07

06 Jul '07

Hi, I've had several cases in the last weeks where I run a wintest on Windows and it was submitted. It however never showed up on tests.winehq.org. Currently there's no error reporting on that box for the tests page creation (will look into that if time permits). The one reason I've found so far it that sometimes the results file contains: msvcrt:file start dlls/msvcrt/tests/file.c 1.48 file: 3 tests executed (0 marked as todo, 0 failures), 0 skipped. file: 1 tests executed (0 marked as todo, 0 failures), 0 skipped. file: 2 tests executed (0 marked as todo, 0 failures), 0 skipped. file: 2 tests executed (0 marked as todo, 0 failures), 0 skipped. msvcrt:file done (0) file: 373 tests executed (0 marked as todo, 0 failures), 0 skipped. instead of the correct: msvcrt:file start dlls/msvcrt/tests/file.c 1.48 file: 3 tests executed (0 marked as todo, 0 failures), 0 skipped. file: 1 tests executed (0 marked as todo, 0 failures), 0 skipped. file: 2 tests executed (0 marked as todo, 0 failures), 0 skipped. file: 2 tests executed (0 marked as todo, 0 failures), 0 skipped. file: 373 tests executed (0 marked as todo, 0 failures), 0 skipped. msvcrt:file done (0) And this is the only reason I've found for this particular test. So now before submitting the results I check the results file and change the contents accordingly. (I didn't make a list yet on which platforms it occurs). The current dissect expects a 'start' line, right after a 'done' line and bails out if this isn't the case. Can anybody thinks of reasons why some of these lines come after the 'done' line? Or better yet, why lines are not always in the correct order? I do find some spurious entries every now and then that should have belonged to a different tests. The only reason I can think of so far is when a test creates a new process and somethings goes wrong there. Cheers, Paul.

1 0