January 2014 - Wine-devel - list.winehq.org

[2/4] gdi32: Fix text rotation problem in GM_ADVANCED graphics mode.
by Ralf Habacker 14 Jan '14

14 Jan '14

>On 1/7/2014 17:33, Ralf Habacker wrote: >> This patch detects operational condition first and then removes >> temporary rotation from the world transform. >> Bug: http://bugs.winehq.org/show_bug.cgi?id=33190 >> --- >> dlls/gdi32/font.c | 19 +++++++++++++++++++ >> 1 file changed, 19 insertions(+) >> >> + XFORM old; >> + BOOL exclude_rotation = FALSE; >> + if ( GetGraphicsMode( hdc ) == GM_ADVANCED ) >> + { >> + GetWorldTransform( hdc, &old ); >> + XFORM xf = old; >> + if ( hasRotatedAndSameScaledMatrixOnly( &xf ) ) >> + { >> + exclude_rotation = TRUE; >> + removeRotationFromMatrix( &xf, NULL ); >> + SetWorldTransform( hdc, &xf ); >> + } >> + } >> + >Flag really means do we need to restore transform or not. done http://www.winehq.org/pipermail/wine-patches/2014-January/129513.html > >> + if ( GetGraphicsMode( hdc ) == GM_ADVANCED && exclude_rotation == TRUE ) >> + { >> + SetWorldTransform( hdc, &old ); >> + } >> + >Doesn't look like you need to check a mode again. done, see above link Regards Ralf

1 0

[1/4] gid32: Add matrix helper functions.
by Ralf Habacker 14 Jan '14

14 Jan '14

>On 1/7/2014 17:31, Ralf Habacker wrote: >> Contains basic functions required by further patches >> --- >> dlls/gdi32/dibdrv/graphics.c | 49 >> ++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 49 insertions(+) >> >That should be merged with a first patch that uses it. done http://www.winehq.org/pipermail/wine-patches/2014-January/129505.html >> +/* >> + check matrix for condition >> +*/ >> +BOOL hasRotatedAndSameScaledMatrixOnly(XFORM *xform) >> +{ >> + return xform->eM11 == xform->eM22 && >> + -xform->eM21 == xform->eM12; >> +} >> + >Comment is telling nothing, 'xform' should be const probably. done, see above link > >> + double determinant = 0; >> + >> + /* xform = xfrom-transposed * xform */ >> + xform->eM11 = sqrt( xform->eM11 * xform->eM11 + xform->eM21 * xform->eM21 ); >> + xform->eM22 = sqrt( xform->eM12 * xform->eM12 + xform->eM22 * xform->eM22 ); >> + xform->eM12 = 0; >> + xform->eM21 = 0; >> + xform->eDx = 0; >> + xform->eDy = 0; >> + >> + if ( rotation_and_translation == NULL ) >> + return TRUE; >> + >> + determinant = xform->eM11 * xform->eM22; >> + >> + inverse_matrix_scale.eM11 = xform->eM22 / determinant; >Is it possible to get 0 determinant here? Function never returns FALSE, >so return value is useless. fixed in above mentioned file. > >Also please follow function and variable naming conventions used in this >file. done, found also better names for this functions. Regards Ralf

1 0

Re: [PATCH 2/2] oleaut32/tests: Added some IRecordInfo tests
by Marvin 14 Jan '14

14 Jan '14

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 https://newtestbot.winehq.org/JobDetails.pl?Key=4221 Your paranoid android. === w2008s64 (64 bit vartype) === vartype.c:6379: Test failed: got size 12 vartype.c:6410: Test failed: got 00000000DEADBEEF vartype: unhandled exception c0000005 at 000007FEFF93127F === w7pro64 (64 bit vartype) === vartype.c:6379: Test failed: got size 12 vartype.c:6410: Test failed: got 00000000DEADBEEF vartype: unhandled exception c0000005 at 000007FEFEBE30FA

1 0

Re: My idea about new wine functions.
by Akira Nakagawa 14 Jan '14

14 Jan '14

I understand 1 is difficult.(Then I want to use winelib from Synaptic!) But 2 is very easy,isn't it? Most wine function call Trace() at first,so you patch Trace() that translates argument.

2 1

My idea about new wine functions.
by Akira Nakagawa 13 Jan '14

13 Jan '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 1.export Directx from winelib and publish as a development package. In other word,let winelib Directx be used as OpenGL be in Unix native applications.(and support pkg-config) 2.Dynamic translation using gettext on windows application. That is,in short,enable windows application to translate through Wine API although the applications don't support internationalization. This is how,for example. An application supposed to create new windows titled "New Windows". Then,wine receive string "New Window" and replace it to "新しいウィンドウ" in Japanese or "新窗口" in Chinese.Most applications use Windows API to show string,so you can use wine to translate dynamically. 3.Unite Wine settings(winecfg and uninstaller) to OS's control panel which wine runs in. (I want GUI font replacement configuration,too.) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS01SIAAoJEGIH3IGNPdCozn8P/3OD/w/p89N1q0TF5DcczXHn 9dVjeogZHo1KHihWUXxUHow6+dzrfkYXnFAPVcEqViYpv/c5tgKLAaSojmfwYW19 W7XdHLL/9qZrFVWm9TmEqC34ikjvyLAurL5DYbBZq1SvJktzD0nzWr0WMPUzT7E3 j5Lg/4gHTipPhqr7xwwz5pIH7Vr84YxN5ZcsiMGWEVvV/y/9sSzKs0FLWlSWgSVh EkRuVZNLoYEy0kXN+NIUH3ojapYGsNgL4lNOr4uuH7NuESV+a/+h4wEMLYpOGHv+ NiUOZrF/dDpwDxRok7NTP+utQSN4UACwy8XpYHpcYBaEZhwNSH6Y3HP6mNRZDQSs zRzmCfWs6Ml1p99lLwn3V6Iak+D5aDGGzBZZuboD1tiae0asVwXrFYTyjmh6yNPB WgLIQYj/6WhHGWqqiKpFoMpJswMKzV/2IgpiNlQ3bCbgDyoI78a6FVmEJyN09710 RZGmy2iCfAK8YfmMMcHWKNP6KgdcE0JKkDPrP4OJsnbVDbiR10B5jBEoSCIbQt4+ funbn+3CZNAHCHMzGEV+C+H3OCn9+pMSDeEpPfDjbXVAzVdYtSZQwdqQRI8eakzf ZrmR+KogboT1YlH0XFBWsAtA8QfBb74jto9RyyGmrvvC1J9CVQMvgb+p44buhP80 Mc12miN6vkVge93IdpHc =+JHI -----END PGP SIGNATURE-----

3 2

Re: dssenh/tests: Added Cylink Mek algorithm definition and crypto provider algorithm tests for dssenh (try 2).
by Alexandre Julliard 13 Jan '14

13 Jan '14

Marek Chmiel <kcmark(a)gmail.com> writes: > + for(i = 0; i < testLen; i++) > + { > + SetLastError(0xdeadbeef); > + dataLen = sizeof(dataBuffer); > + > + result = CryptGetProvParam(hProv, PP_ENUMALGS_EX, dataBuffer, &dataLen, flag); > + ok(result, "Failed to get parameter from CSP."); > + > + pointer = dataBuffer; That's better but you should still check that you reached the end of the enumeration. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: msvcrt: Add INFINITY and NAN definitions to math.h.
by Jacek Caban 13 Jan '14

13 Jan '14

Hi Francois, On 01/10/14 15:29, Francois Gouget wrote: > --- > > The INFINITY and NAN definitions have been added to math.h in recent > versions of msvcrt (i.e. they were not present in Visual C++ 2008 but > are in Visual C++ 2013). This means we have to provide them too > otherwise code that compiles with Visual C++ could fail to compile with > Winelib. > > To do so I'm just reusing the definition we have in wine/port.h. > > This definition bothers me a bit in that it clearly depends on the > in-memory representation of these floating point constants, which might > not be very portable (depending on whether the system uses IEEE 754 or > not, etc). In d3dx9_36 we used to define NAN as '0.0f / 0.0f'. Other > definitions would be variants like 'INFINITY * 0.0f', etc. I can't > really claim that those are really more portable and the compiler may > (and some do) complain about them. Hence why I went with the wine/port.h > definitions in the end. If they're good enough for port.h they should be > good for math.h too. > > > include/msvcrt/math.h | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h > index 34aa268..42d6bfe 100644 > --- a/include/msvcrt/math.h > +++ b/include/msvcrt/math.h > @@ -146,6 +146,26 @@ static const union { > # endif > #endif > > +#ifndef INFINITY > +/* From wine/port.h */ > +static inline float __port_infinity(void) > +{ > + static const unsigned __inf_bytes = 0x7f800000; > + return *(const float *)&__inf_bytes; > +} > +#define INFINITY __port_infinity() > +#endif > + > +#ifndef NAN > +/* From wine/port.h */ > +static inline float __port_nan(void) > +{ > + static const unsigned __nan_bytes = 0x7fc00000; > + return *(const float *)&__nan_bytes; > +} > +#define NAN __port_nan() > +#endif > + > #ifdef __cplusplus > } > #endif In wine/port.h, we implement worst-case scenario where math.h doesn't define NAN/INFINITY. In this case, since glibc/system math.h won't be used and our msvcrt math.h will be included instead, we should try to provide better NAN/INFINITY versions when possible. Looking at how it's done in my Linux headers, there is __builtin_nanf() and __builtin_inff() guarded by GCC >= 3.3 that we could use. How is it defined on MSVC? Jacek

2 3

Re: oleaut32/tests: Mark W2k results as broken
by Dmitry Timoshkov 13 Jan '14

13 Jan '14

André Hentschel <nerv(a)dawncrow.de> wrote: > - ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sa->fFeatures); > - ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sacopy->fFeatures); > + ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || > + sa->fFeatures == broken(FADF_CREATEVECTOR /* W2k */), > + "got 0x%08x\n", sa->fFeatures); > + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || > + sacopy->fFeatures == broken(FADF_CREATEVECTOR /* W2k */), > + "got 0x%08x\n", sacopy->fFeatures); > hres = SafeArrayCopyData(sa, sacopy); > ok(hres == S_OK, "got 0x%08x\n", hres); > - ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%04x\n", sacopy->fFeatures); > + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || > + sacopy->fFeatures == broken(FADF_CREATEVECTOR /* W2k */), > + "got 0x%04x\n", sacopy->fFeatures); Usage of 'broken' statement is incorrect. -- Dmitry.

1 0

Re: dmscript/tests: Add COM tests for DirectMusicScriptTrack. (2nd try)
by Marvin 12 Jan '14

12 Jan '14

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 https://newtestbot.winehq.org/JobDetails.pl?Key=4196 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 08/11] dmscript/tests: Add COM tests for DirectMusicScriptTrack.
by Marvin 12 Jan '14

12 Jan '14

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 https://newtestbot.winehq.org/JobDetails.pl?Key=4193 Your paranoid android. === wxppro (32 bit dmscript) === dmscript.c:147: Test failed: DirectMusicScriptTrack create failed: 80040110, expected E_POINTER === wvista (32 bit dmscript) === dmscript.c:147: Test failed: DirectMusicScriptTrack create failed: 80040110, expected E_POINTER === w7pro64 (32 bit dmscript) === dmscript.c:147: Test failed: DirectMusicScriptTrack create failed: 80040110, expected E_POINTER

1 0