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

Re: [21/28] qcap/tests: Use common wine_dbgstr_guid implementation from test.h
by Marvin Jan. 17, 2014

Jan. 17, 2014

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=4333 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [20/28] oledb32/tests: Use common wine_dbgstr_guid implementation from test.h
by Marvin Jan. 17, 2014

Jan. 17, 2014

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=4332 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [1/6] dpnet: Add stubbed interface IDirectPlay8Server (try 4)
by Stefan Dösinger Jan. 17, 2014

Jan. 17, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Am 2014-01-17 02:07, schrieb Alistair Leslie-Hughes: > Added server tests. I noticed that you still have style inconsistencies in these patches. I haven't done a deeper review of the content yet. I'll get to that once I'm done with my own patches :-\ . -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS2RGzAAoJEN0/YqbEcdMwTPEP/0ugKXy7Ecy6Dev1yXp4k/KG HqDB5DS3pbMcFtFLte8qa0DrtQNz0YsX0Po1Hbsrz6dB1GzVLa0VhqzJxJJ3C48j kkyz2IIXlTTzy2I/53MrZ8/pcjXWbIztkNRuki3OQA31k9VNo1d27cdYWysc2uxs OJKO+QSfM3ZMdrdHJF0sgfynudDnrq7A25KZbwPxnu1io1GKFQFLQVPz1pulnrkz Jp6i8sr2PhtfJU6YrxABP3sOOx8LQSCTVdpHhwOJez4eYSToYs+B5Fa67Ed/ol2m QfeAiwdD1xzA1FtwwzrbOGuy7GK4YB9CM0oNSSCCl2g92jGDR4YAG504L5QfjtBa GtN4CDQETi7phx292cCwNYApPYPwHFeL3lgKW+F6HnkF9oVPXx9IoaX6fwIf9P/Z ADX5coB/wgBsCj5wrjN8axVtFDwzSGTdv+OvHQKwllQKF3RLAthJpeJozg7NXz9N caFZ2Gbs6Sz00RZ7n7LokwMv8p32TY6P9hyKrJfDs0olMymTYCjVvJWUPEaoskIW ZfMAKZrgSgMvCf+ROdmh0ZhfpS+D2A4867vuDO48GfP6HzHG+rEffKwMACJ0uI2+ 7GuKJ83mw5s24pxMoyeByzj7KJgUtMalE+WGSqO8R70B3+aeaR29g6xn5fGu2NL7 TAouZUc5fcNM67Dsr8zp =2wkj -----END PGP SIGNATURE-----

2 2

Re: tests: Avoid duplicating debugstr_guid()
by Jacek Caban Jan. 17, 2014

Jan. 17, 2014

Hi Frédéric, On 01/15/14 23:53, Frédéric Delanoy wrote: > diff --git a/include/wine/test.h b/include/wine/test.h > index 373fe76..d7ce8c1 100644 > --- a/include/wine/test.h > +++ b/include/wine/test.h > @@ -65,6 +65,7 @@ extern void winetest_add_failures( LONG new_failures ); > extern void winetest_wait_child_process( HANDLE process ); > > extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); > +extern const char *debugstr_guid( const GUID *guid ); You probably want to follow existing test.h convention and call it wine_dbgstr_guid. This has a bonus advantage that you may split the patch for function introduction and per-dll replace. > static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } > > /* strcmpW is available for tests compiled under Wine, but not in standalone > @@ -523,6 +524,21 @@ const char *wine_dbgstr_wn( const WCHAR *str, int n ) > return res; > } > > +const char *debugstr_guid( const GUID *guid ) > +{ > + static char buf[50]; > + > + if (!guid) > + return "(null)"; > + > + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", > + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], > + guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], > + guid->Data4[5], guid->Data4[6], guid->Data4[7]); > + > + return buf; > +} It would be a good idea to use get_temp_buffer, like wine_dbgstr_wn, instead of static variable. Thanks, Jacek

2 2

Re: mmdevapi/tests: Remove unused dbgstr_guid function
by Marvin Jan. 17, 2014

Jan. 17, 2014

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=4313 Your paranoid android. === wvista (32 bit render) === render.c:1206: Test failed: GetPosition failed: 00000001 === w7pro64 (32 bit render) === render.c:654: Test failed: Wait(event) after Stop gave 102

1 0

Re: [PATCH 2/3] ddraw/tests: Rewrite AttachmentTest() and AttachmentTest7().
by Marvin Jan. 17, 2014

Jan. 17, 2014

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=4304 Your paranoid android. === w2008s64 (64 bit ddraw7) === ddraw7.c:5769: Test failed: Failed to create surface, hr 0x80004002. ddraw7.c:5795: Test failed: Failed to create surface, hr 0x80004002. === w7pro64 (64 bit ddraw7) === ddraw7.c:5769: Test failed: Failed to create surface, hr 0x80004002. ddraw7.c:5795: Test failed: Failed to create surface, hr 0x80004002.

1 0

Re: [5/5] gdiplus: Add test for page transform in metafiles.
by Marvin Jan. 17, 2014

Jan. 17, 2014

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=4302 Your paranoid android. === wxppro (32 bit metafile) === metafile.c:872: Test failed: Expected 72.000000, got 81.279991 metafile.c:880: Test failed: Expected 00000168, got 00000196 === wvista (32 bit metafile) === metafile.c:872: Test failed: Expected 72.000000, got 81.279991 metafile.c:880: Test failed: Expected 00000168, got 00000196 === w2008s64 (32 bit metafile) === metafile.c:872: Test failed: Expected 72.000000, got 81.279991 metafile.c:880: Test failed: Expected 00000168, got 00000196 === w7pro64 (32 bit metafile) === metafile.c:872: Test failed: Expected 72.000000, got 81.279991 metafile.c:880: Test failed: Expected 00000168, got 00000196 === w2008s64 (64 bit metafile) === metafile.c:872: Test failed: Expected 72.000000, got 81.279999 metafile.c:880: Test failed: Expected 00000168, got 00000196 === w7pro64 (64 bit metafile) === metafile.c:872: Test failed: Expected 72.000000, got 81.279991 metafile.c:880: Test failed: Expected 00000168, got 00000196

1 0

Re: [PATCH] widl: Fix pointer size for SYS_WIN64 typelibs
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > --- > tools/widl/write_msft.c | 28 +++++++++++++--------------- > 1 file changed, 13 insertions(+), 15 deletions(-) It breaks the tests: ../../../../wine/tools/runtest -q -P wine -T ../../.. -M oleaut32.dll -p oleaut32_test.exe.so typelib && touch typelib.ok typelib.c:3909: Test failed: typeattr->cbSizeInstance expected 4 got 8 typelib.c:3909: Test failed: typeattr->cbSizeInstance expected 4 got 8 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: tests: Avoid duplicating debugstr_guid()
by Marvin Jan. 16, 2014

Jan. 16, 2014

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=4266 Your paranoid android. === wvista (32 bit htmldoc) === No test summary line found === w7pro64 (32 bit htmldoc) === No test summary line found

1 0

Re: tests: Avoid duplicating debugstr_guid()
by Marvin Jan. 16, 2014

Jan. 16, 2014

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=4252 Your paranoid android. === wxppro (32 bit domdoc) === domdoc.c:9845: Test failed: got 00244F94

1 0

Re: dpnet: Improve Error checking in Get/Set SP
by Stefan Dösinger Jan. 15, 2014

Jan. 15, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, > + hr = IDirectPlay8Address_GetSP(localaddr, &guidsp); > + ok(hr == DPNERR_DOESNOTEXIST, "got 0x%08x\n", hr); For the sake of completion I'd test setting GUID_NULL, IID_IUnknown and something nonsensical like IID_IDirectDrawGammaControl (or maybe something you have access to without additional headers like IID_IDirectPlay8Address). Some style nitpicks follow. If you end up becoming the de-facto maintainer of dplay it's up to you how important they are: > + sprintf(buf, > + "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", > + guid->Data1, guid->Data2, guid->Data3, > + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], > + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); In the d3d code we use 8 space indentations. You may want to follow that. Also, there's debugstr_guid in wine/debug.h. It seems you're aware of that and used your own functions because wine/debug.h doesn't work in the tests. Is this correct? > + if(!pguidSP) > + return DPNERR_INVALIDPOINTER; > ... > + if( SUCCEEDED(hr) ) > + { > ... > + if (hr != S_OK) The whitespaces around the () are inconsistent. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS1kqJAAoJEN0/YqbEcdMwfngP/RUrjrAH/vDvQH+jtBSOQwd8 OymWNEWmt4jqzt3febi5Mo15oDGSuuqIjcyoRwpOTPrlmwGYmeAjm/z5JxAcH+o1 XFhZF8zL85u0sAlW8A3bAEuPB/a0nP2/K8y523mt+uFYz/4cOwv11sR/fAJjCgR5 SkkWI29t/JXBkQmPhQHArdyi1CgRTQ+MSNEwzM3B+nudn8zhjV3VH+WYDyLkl8D6 GS3GBJqAAka0Iqo6KdVC4VTdxSVUJVivfAZSlSTZVHcYAlC49k6F5uYtTLd+MQRZ bUlnHSkJtveC1lj9FiIliJexO1M9zLr+lY5/RtD9ntbe4K5i+tgEpjExg6uSNbmD cw6IjE+qcrQsp2x9NBED7j1OetUmjeUgwUQcWo56FoVQBp9N7ynSLF2HOPQ7rf8Q SHroMxtOzwPHxmyXNFDCbDYwnVviq17KqSOXcD46VvY99NbFEmm5nyPBNuLUzPQb JkkakS4i1+eUigD3QnY5eHE5NPWJBq4/WeEF9TYtBUjg30Q0pU5CmDf888fyFPj2 UYsheWKR5LcUIZ3oXFPrzcaiS+1hLAfEiKCH8VXsNCPMV4S6KDS2hIhHJQh3mWEj z//uLe23Ll2bNrZOOfzwWBGfAmLNB+TfW+Q2phXlTTH5lgITxU4N0KR/pNpCkqz8 KrWsuFvS8iZSfT3G+fSw =XG/n -----END PGP SIGNATURE-----

2 1

Re:My ideas of New wine function.
by Akira Nakagawa Jan. 15, 2014

Jan. 15, 2014

http://wiki.winehq.org/AkiraNakagawa Please write your opinion here. I think the compatibility is the first we maintain. So we should do it optionally.

1 0

Re: wine.inf: Add DirectPlay8 Registry keys
by Bruno Jesus Jan. 14, 2014

Jan. 14, 2014

On Fri, Jan 10, 2014 at 5:06 AM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Hi, > > > Changelog: > wine.inf: Add DirectPlay8 Registry keys This patch seems to make Rise of Nations go a lit bit further in it's attempt to get multiplayer running. > Best Regards > Alistair Leslie-Hughes Regards, Bruno

4 7

Re: [bcrypt] add missing definitions
by Dmitry Timoshkov Jan. 14, 2014

Jan. 14, 2014

Vijay Kiran Kamuju <infyquest(a)gmail.com> wrote: > +#define MS_PRIMITIVE_PROVIDER L"Microsoft Primitive Provider" > + > +/* Algorithm Identifiers */ > +#define BCRYPT_RSA_ALGORITHM L"RSA" This can't work properly in Wine. -- Dmitry.

4 5

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

Jan. 14, 2014

>On Tue, Jan 07, 2014 at 02:33:32PM +0100, Ralf Habacker wrote: >> @@ -1327,6 +1327,20 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, INT max_ext, >> } >> } >> >> + 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 ); >> + } >> + } > >Does Windows really do this only in the same-scaled, non-sheared case? The updated patch http://www.winehq.org/pipermail/wine-patches/2014-January/129505.html contains a related hint from the developer: "Note: The current implementation only works on matrixes with uniform scale and shear, which has to be checked by a call to xform_has_rotate_and_uniform_scale_and_shear(). Hints how to get *unique* values for non-uniform matrixes are welcome." The application, for which the patch has been written (http://appdb.winehq.org/objectManager.php?sClass=application&iId=13649) works fine with this patches, as it only uses dc rotatation. Regards Ralf

1 0

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

Jan. 14, 2014

>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 Jan. 14, 2014

Jan. 14, 2014

>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 Jan. 14, 2014

Jan. 14, 2014

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 Jan. 14, 2014

Jan. 14, 2014

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 Jan. 13, 2014

Jan. 13, 2014

-----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 Jan. 13, 2014

Jan. 13, 2014

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 Jan. 13, 2014

Jan. 13, 2014

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 Jan. 13, 2014

Jan. 13, 2014

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 Jan. 12, 2014

Jan. 12, 2014

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 Jan. 12, 2014

Jan. 12, 2014

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