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

[PATCH 18/18] XCOPY: Add help
by Ann & Jason Edmeades 30 Mar '07

30 Mar '07

Er... I have just managed to get git send-email set up and working, and it would appear to be a feature of it. I do get one question which I answered n to, perhaps I should anser yes to it and see what happens :-) Anyone else using git send-email want to comment on how to avoid this? Thanks! Jason

1 0

Re: [PATCH 13/18] XCOPY: Add support for /EXCLUDELIST:file1+file2 etc
by Alexandre Julliard 30 Mar '07

30 Mar '07

Jason Edmeades <us(a)edmeades.me.uk> writes: > + /* Loop through testing each exclude line */ > + while (pos) { > + if (wcsstr(copyFromUpper, pos->name) != NULL) { > + WINE_TRACE("Skipping file as matches exclude '%s'\n", > + wine_dbgstr_w(pos->name)); wcsstr() doesn't seem the right way to compare file names. You probably want to do a wcsicmp() of the end of the name or something like that. -- Alexandre Julliard julliard(a)winehq.org

2 1

ExtTextOut with rotation and MM_ANISOTROPIC inverted coordinates
by Carl-Daniel Hailfinger 30 Mar '07

30 Mar '07

Hi, I have a problem with rotated Text displayed by ExtTextOut after SetMapMode(hdc, MM_ANISOTROPIC); SetWindowExtEx(hdc, 1000, -1000, NULL); Basically, giving one negative parameter to SetWindowExtEx should reverse the direction (clockwise/counterclockwise) in which rotation is done. It works in Windows, but has no effect in wine. The patch I created uses a side effect of the WMF file I had as test case, basically it sets lfClipPrecision = CLIP_LH_ANGLES and triggers direction inversion based on that instead of checking the WindowExtEx settings. That is of course wrong, but it is available almost everywhere in the text output paths and served me nicely as "inverse rotation" flag. Instead of abusing lfClipPrecision, what should we use? The SetWindowExtEx call sets some_matrix.eM11 to a negative value if its first argument is negative and eM22 to a negative value if its second argument is negative. So checking (eM11 * eM22 < 0) && (mapmode == MM_ANISOTROPIC) should be the correct solution. Problem: You can't always check these things because the dc is not available everywhere. In case you have a GdiFont, you can check (font->font_desc.matrix.eM11 * font->font_desc.matrix.eM22 < 0) or in case you have a LOGFONT (dc->xformWorld2Vport.eM11 * dc->xformWorld2Vport.eM22 < 0) I have not tested whether the parameters of the current dc, the parameters at the time CreateFontIndirect was run or the parameters at the time SelectObject(hdc, hfont) was run are responsible for the rotation inversion. What works? With the patch, lfClipPrecision = CLIP_LH_ANGLES has the effect SetWindowExtEx(hdc, positivevalue, negativevalue, NULL) should have. Exception: The text is clipped at the border, while Windows auto-extends the borders to avoid clipping. What doesn't work? SetWindowExtEx(hdc, positivevalue, negativevalue, NULL) still has no effect on the rotation angle. Attached are: create_mf.c: Testcase in C (thanks to Dmitry Timoshkov, who created the C code from a reduced WMF testcase I sent him) create_mf_generated.wmf: WMF file output by ./create_mf file.wmf wine-fontdirection-24.diff: Preliminary patch described above If somebody can take a look at the patch and mangle it so that it does the right thing, I'd be very grateful. Regards, Carl-Daniel -- http://www.hailfinger.org/ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index ea2e66c..40d76c4 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1944,6 +1944,10 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, { cosEsc = cos(lf.lfEscapement * M_PI / 1800); sinEsc = sin(lf.lfEscapement * M_PI / 1800); + if (lf.lfClipPrecision & CLIP_LH_ANGLES) + { + sinEsc = - sinEsc; + } } else { diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f7b1220..730725a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2675,10 +2675,10 @@ GdiFont *WineEngCreateFontInstance(DC *d if (!GetObjectW( hfont, sizeof(lf), &lf )) return NULL; can_use_bitmap = GetDeviceCaps(dc->hSelf, TEXTCAPS) & TC_RA_ABLE; - TRACE("%s, h=%d, it=%d, weight=%d, PandF=%02x, charset=%d orient %d escapement %d\n", + TRACE("%s, h=%d, it=%d, weight=%d, PandF=%02x, charset=%d orient %d escapement %d clipprecision %d\n", debugstr_w(lf.lfFaceName), lf.lfHeight, lf.lfItalic, lf.lfWeight, lf.lfPitchAndFamily, lf.lfCharSet, lf.lfOrientation, - lf.lfEscapement); + lf.lfEscapement, lf.lfClipPrecision); /* check the cache first */ if((ret = find_in_cache(hfont, &lf, &dc->xformWorld2Vport, can_use_bitmap)) != NULL) { @@ -2946,6 +2946,10 @@ found: } ret->orientation = FT_IS_SCALABLE(ret->ft_face) ? lf.lfOrientation : 0; + if (lf.lfClipPrecision & CLIP_LH_ANGLES) + { + ret->orientation = FT_IS_SCALABLE(ret->ft_face) ? 3600 - (lf.lfOrientation % 3600) : 0; + } ret->name = strdupW(family->FamilyName); ret->underline = lf.lfUnderline ? 0xff : 0; ret->strikeout = lf.lfStrikeOut ? 0xff : 0; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index af756b3..bc326ab 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1363,6 +1363,10 @@ BOOL PATH_ExtTextOut(DC *dc, INT x, INT { cosEsc = cos(lf.lfEscapement * M_PI / 1800); sinEsc = sin(lf.lfEscapement * M_PI / 1800); + if (lf.lfClipPrecision & CLIP_LH_ANGLES) + { + sinEsc = - sinEsc; + } } else { cosEsc = 1; diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index 9e0ae39..7bfc53c 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -108,6 +108,10 @@ HFONT PSDRV_SelectFont( PSDRV_PDEVICE *p } physDev->font.escapement = lf.lfEscapement; + if (lf.lfClipPrecision & CLIP_LH_ANGLES) + { + physDev->font.escapement = lf.lfEscapement ? 3600 - (lf.lfEscapement % 3600) : 0; + } physDev->font.set = FALSE; if(gdiFont && !subst) { diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index 59ac7c7..f6bd58c 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -105,6 +105,10 @@ static BOOL PSDRV_Text(PSDRV_PDEVICE *ph if(lf.lfEscapement != 0) { cosEsc = cos(lf.lfEscapement * M_PI / 1800); sinEsc = sin(lf.lfEscapement * M_PI / 1800); + if (lf.lfClipPrecision & CLIP_LH_ANGLES) + { + sinEsc = - sinEsc; + } } else { cosEsc = 1; sinEsc = 0; diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 60bd70d..3ecd3dc 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -944,6 +944,10 @@ static BOOL LFD_ComposeLFD( const fontOb if (fo->lf.lfEscapement) { /* escapement is in tenths of degrees, theta is in radians */ double theta = M_PI*fo->lf.lfEscapement/1800.; + if (fo->lf.lfClipPrecision & CLIP_LH_ANGLES) + { + theta = - theta; + } LFD_AngleMatrix(h_string, h, theta); } else diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e03540e..76d4e04 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1136,6 +1136,10 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_P if(lf.lfEscapement != 0) { cosEsc = cos(lf.lfEscapement * M_PI / 1800); sinEsc = sin(lf.lfEscapement * M_PI / 1800); + if (lf.lfClipPrecision & CLIP_LH_ANGLES) + { + sinEsc = - sinEsc; + } } else { cosEsc = 1; sinEsc = 0;

1 0

Cross-Library tests, tests using multiple processes
by Stefan Dösinger 30 Mar '07

30 Mar '07

Hi, Screen resolution setting in DirectX games is still a huge mess. I want to fix it properly finally. Write tests to find out what really happens in windows, then implement it. Unfortunately that fails at the tests already. Our test framework is mainly limited to test single DLLs, and all tests I have been used to so far were in one single process. I would have to test what happens if there is one process requesting exclusive ddraw access and once process requesting explusive d3d9 access at once, and maybe a third process doing a screen resolution change, etc. Is there a way to write a test accross multiple libraries? I guess it is not hard to do, but it would look a bit bad if a ddraw test started using d3d9 directly. And is there a prefered way to spawn new processes and do communication between them? (Windows IPC I guess).

1 0

Re: Hardware cursor patch that does not break 'make test'.
by Stefan Dösinger 30 Mar '07

30 Mar '07

Am Freitag 30 März 2007 16:36 schrieb Andrew Riedi: > Here is the patch, opps, forgot to attach. > > On 3/30/07, Andrew Riedi <andrewriedi(a)gmail.com> wrote: > > Here is an updated patch that does not break make test. Sorry about > > sending in a bad patch, I always saw that regular make would create stuff > > in /tests dir's and thought that tested stuff. :\ Anyhow, this one > > should be fine. > > > > changelog: wined3d: Add hardware cursor support. Wouldn't you have to restore the original cursor in device::release? In general this shouldn't matter because 99% of all applications will terminate after destroying the device, but I think we should take care of that. What happens to cursorInfo.hbmMask and cursorinfo.hbmcolor after CreateIconIndirect? Is it destroyed with the cursor, or does it leak after cursorInfo, which sits on the stack, is destroyed?

1 0

re: Corrupted system.reg in clustered environment - where to look?
by Dan Kegel 30 Mar '07

30 Mar '07

Alexander.Farber at nokia.com wrote: > [I use wine on multiple machines with ~/.wine shared via NFS, > and after a while, the registry is corrupt.] Well, if it hurts, don't do it :-) Seriously. NFS is not a good place to put WINEPREFIX. In my testing, it causes serious performance problems. And NFS file locking has been broken from day 1. They keep trying to make it work, but it's never going to make you happy. So why not take the easy way out, and put WINEPREFIX on local disk? Surely you can do this. If you really need the Wine applications to share data, you can do it by creating D: or some directory in C: as a shared folder. Just don't share everything. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

Re: Stub for all raw input functions
by Dmitry Timoshkov 30 Mar '07

30 Mar '07

"Kovács András" <andras(a)csevego.net> wrote: > +LRESULT WINAPI DefRawInputProc( PRAWINPUT *paRawInput, INT nInput, UINT cbSizeHeader ) > +{ > + FIXME("(paRawInput=%p, nInput=%d, cbSizeHeader=%d) stub!\n", *paRawInput, nInput, cbSizeHeader); > + > + return S_OK; > +} Although MSDN documents that on success DefRawInputProc returns S_OK, that's most likely a misguided documenters error: S_OK is an HRESULT and an OLE error value, while it's user32 and return type is LRESULT. So IMO simply returning 0 should be OK here. > +BOOL WINAPI RegisterRawInputDevices( PRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize ) > +{ > + FIXME("(pRawInputDevices=%p, uiNumDevices=%d, cbSize=%d) stub!\n", pRawInputDevices, uiNumDevices, cbSize); > + > + return TRUE; > +} Probably this stub should return FALSE. > +UINT WINAPI GetRawInputBuffer( PRAWINPUT pData, PUINT pcbSize, UINT cbSizeHeader ) > +{ > + FIXME("(pData=%p, pcbSize=%p, cbSizeHeader=%d) stub!\n", pData, pcbSize, cbSizeHeader); > + > + return 0; > +} MSDN says that an error indicator is -1, not 0, same as for others raw input APIs. -- Dmitry.

2 1

Corrupted system.reg in clustered environment - where to look?
by Alexander.Farber＠nokia.com 30 Mar '07

30 Mar '07

Hello Wine developers, we try to use Wine in clustered environment with multiple Wine processes being started simultaneously on 8 to 80 Linux machines by a modified GNU make. The source code being built is located on an NFS mount visible by all cluster machines. Unfortunately Wine fails after some time because of corrupted ~/.wine/system.reg. I guess multiple Wine processes try to update some keys in that file, like (differing) processor steppings etc. and this goes wrong at some point. Also I've noticed, that the registry is being re-saved every 30 seconds (why?) - here in wine-0.9.32/server/registry.c: static const int save_period = 30000; /* delay between periodic saves (in ms) */ I've tried adding file locking using fcntl() (which should work over NFS too) by modifiyng load_registry() and save_registry() as in the attached diff, but unfortunately it doesn't help. Does anybody have a hint where to look? Why updating registry is needed at all and can I disable it maybe? (And where would be the good spot to do that?) Thank you Alex

2 2

Re: [1/2] regedit: Support the REG_MULTI_SZ.
by Juan Lang 30 Mar '07

30 Mar '07

Hi Byeong-Sik, + lRet = RegSetValueEx(hKey, valueName, 0, type, (LPBYTE)stringValueData, j); I think that should be j * sizeof(TCHAR), yes? --Juan ____________________________________________________________________________________ Food fight? Enjoy some healthy debate in the Yahoo! Answers Food & Drink Q&A. http://answers.yahoo.com/dir/?link=list&sid=396545367

2 1

RE: Jason Edmeades : xcopy: Add support for COPYCMD override and fix /-y.
by Alexander.Farber＠nokia.com 30 Mar '07

30 Mar '07

Hello, wouldn't it be nicer to use sizeof(copyCmd) here? if (GetEnvironmentVariable(COPYCMD, copyCmd, MAXSTRING)) { There are many spots like this in wcmdmain.c Regards Alex > -----Original Message----- > From: wine-cvs-bounces(a)winehq.org > [mailto:wine-cvs-bounces(a)winehq.org] On Behalf Of ext Alexandre Julliard .... > > + /* Preinitialize flags based on COPYCMD */ > + if (GetEnvironmentVariable(COPYCMD, copyCmd, MAXSTRING)) { > + if (wcsstr(copyCmd, PROMPTSTR1) != NULL || > + wcsstr(copyCmd, PROMPTSTR2) != NULL) { > + flags |= OPT_NOPROMPT; > + } > + } > + >

1 0