November 2014 - Wine-Commits

André Hentschel : urlmon/tests: Clarify ok() condition (PVS-Studio).
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 388ff35a1817975d78a43ea5f355a74a39b8ad86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=388ff35a1817975d78a43ea5f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 10 21:06:21 2014 +0100 urlmon/tests: Clarify ok() condition (PVS-Studio). --- dlls/urlmon/tests/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index df3c364..9aadf1e 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -2927,7 +2927,7 @@ static void test_protocol_terminate(IInternetProtocol *protocol) ok(hres == S_OK, "LockRequest failed: %08x\n", hres); hres = IInternetProtocol_Read(protocol, buf, 1, &cb); - ok(hres == test_abort ? S_OK : S_FALSE, "Read failed: %08x\n", hres); + ok(hres == (test_abort ? S_OK : S_FALSE), "Read failed: %08x\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); ok(hres == S_OK, "Terminate failed: %08x\n", hres);

1 0

Matteo Bruni : d3dx9: Handle GUID_WICPixelFormat8bppGray format.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: fb9c01f1dcc4cf7fb5b2229e47bdec49920598cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9c01f1dcc4cf7fb5b2229e4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 10 18:56:12 2014 +0100 d3dx9: Handle GUID_WICPixelFormat8bppGray format. --- dlls/d3dx9_36/surface.c | 1 + dlls/d3dx9_36/tests/surface.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index c91048b..f187031 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -40,6 +40,7 @@ static const struct { &GUID_WICPixelFormat8bppIndexed, D3DFMT_P8 }, { &GUID_WICPixelFormat1bppIndexed, D3DFMT_P8 }, { &GUID_WICPixelFormat4bppIndexed, D3DFMT_P8 }, + { &GUID_WICPixelFormat8bppGray, D3DFMT_L8 }, { &GUID_WICPixelFormat16bppBGR555, D3DFMT_X1R5G5B5 }, { &GUID_WICPixelFormat16bppBGR565, D3DFMT_R5G6B5 }, { &GUID_WICPixelFormat24bppBGR, D3DFMT_R8G8B8 }, diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 2ddc704..4490dc3 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -80,6 +80,16 @@ static const unsigned char bmp_8bpp[] = { 0x00,0x00 }; +static const unsigned char png_grayscale[] = +{ + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, + 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x00, + 0x00, 0x00, 0x00, 0x3a, 0x7e, 0x9b, 0x55, 0x00, 0x00, 0x00, 0x0a, 0x49, 0x44, + 0x41, 0x54, 0x08, 0xd7, 0x63, 0xf8, 0x0f, 0x00, 0x01, 0x01, 0x01, 0x00, 0x1b, + 0xb6, 0xee, 0x56, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, + 0x60, 0x82 +}; + /* 2x2 A8R8G8B8 pixel data */ static const unsigned char pixdata[] = { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff @@ -493,6 +503,12 @@ static void test_D3DXGetImageInfo(void) ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + /* Grayscale PNG */ + hr = D3DXGetImageInfoFromFileInMemory(png_grayscale, sizeof(png_grayscale), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); + ok(info.Format == D3DFMT_L8, "Got format %u, expected %u\n", info.Format, D3DFMT_L8); + /* test DDS support */ hr = D3DXGetImageInfoFromFileInMemory(dds_24bit, sizeof(dds_24bit), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);

1 0

Matteo Bruni : winex11.drv: Actually report WGL_SWAP_EXCHANGE_ARB as the swap method.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 3ac85842d34cce334305d2165bc7c50159dfc8cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac85842d34cce334305d2165… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 10 18:56:10 2014 +0100 winex11.drv: Actually report WGL_SWAP_EXCHANGE_ARB as the swap method. --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 71af3db..1481034 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2742,7 +2742,7 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int * point only ATI offers this. */ piValues[i] = WGL_SWAP_EXCHANGE_ARB; - break; + continue; case WGL_PBUFFER_LARGEST_ARB: curGLXAttr = GLX_LARGEST_PBUFFER;

1 0

Qian Hong : user32: Add more exception handlings for timer callbacks.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: cd21d2dbda3722374d7eed372ed914712216a0cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd21d2dbda3722374d7eed372… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Nov 10 16:27:54 2014 +0800 user32: Add more exception handlings for timer callbacks. --- dlls/user32/message.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b75c7e9..eac4e4d 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3934,7 +3934,7 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg ) retval = CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd, msg->message, msg->wParam, GetTickCount() ); } - __EXCEPT_PAGE_FAULT + __EXCEPT_ALL { retval = 0; } @@ -4005,7 +4005,7 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageW( const MSG* msg ) retval = CallWindowProcW( (WNDPROC)msg->lParam, msg->hwnd, msg->message, msg->wParam, GetTickCount() ); } - __EXCEPT_PAGE_FAULT + __EXCEPT_ALL { retval = 0; }

1 0

Michael Stefaniuc : wininet: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 51302e011af440eada59bf09759e0ad06a42d1f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51302e011af440eada59bf097… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 10 23:41:51 2014 +0100 wininet: Simplify the check for an empty string (PVS-Studio). --- dlls/wininet/ftp.c | 2 +- dlls/wininet/tests/internet.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 855aee0..f45e495 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2496,7 +2496,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, if(hIC->proxyBypass) FIXME("Proxy bypass is ignored.\n"); } - if (!lpszUserName || !strlenW(lpszUserName)) { + if (!lpszUserName || !lpszUserName[0]) { HKEY key; WCHAR szPassword[MAX_PATH]; DWORD len = sizeof(szPassword); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 1548615..5e09525 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1578,7 +1578,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenA(buffer)); buffer[0] = 0; flags = 0; @@ -1592,7 +1592,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenA(buffer)); } static void test_InternetGetConnectedStateExW(void) @@ -1667,7 +1667,7 @@ static void test_InternetGetConnectedStateExW(void) res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); buffer[0] = 0; flags = 0; @@ -1681,7 +1681,7 @@ static void test_InternetGetConnectedStateExW(void) res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); } /* ############################### */

1 0

André Hentschel : Add WWN 379
by Jeremy Newman Nov. 10, 2014

Nov. 10, 2014

Module: website Branch: master Commit: 680a724a5b9d43fc2614bf949656c0f026328627 URL: http://source.winehq.org/git/website.git/?a=commit;h=680a724a5b9d43fc2614bf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 10 23:24:57 2014 +0100 Add WWN 379 --- news/de/2014111001.xml | 10 + news/en/2014111001.xml | 10 + wwn/en/wn20141110_379.xml | 666 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 686 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=680a724a5b9d43fc26…

1 0

Rosanne DiMesio : Ubuntu download: Correct Ubuntu downloads instructions
by Jeremy Newman Nov. 10, 2014

Nov. 10, 2014

Module: website Branch: master Commit: 12827e3b0d4ba1fc1a13a27c3a1c1cb25cd79df1 URL: http://source.winehq.org/git/website.git/?a=commit;h=12827e3b0d4ba1fc1a13a2… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Nov 10 10:01:07 2014 -0600 Ubuntu download: Correct Ubuntu downloads instructions Revises instructions to no longer identify the PPA as WineHQ's and to clarify the support status of Ubuntu derivatives. Fixes bugs 34299 and 33549. --- templates/en/download/ubuntu.template | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/templates/en/download/ubuntu.template b/templates/en/download/ubuntu.template index 8ae3f9d..0fbd4d1 100644 --- a/templates/en/download/ubuntu.template +++ b/templates/en/download/ubuntu.template @@ -2,16 +2,18 @@  <h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> -Wine for Ubuntu and Ubuntu derivatives +Wine for Ubuntu and Ubuntu flavors <a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> -<p>Ubuntu and Ubuntu derivatives (such as Kubuntu) obtain software from +<p>Ubuntu and Ubuntu flavors (such as Kubuntu) obtain software from <i>packages</i> which are stored in <i>repositories</i>. Ubuntu's default -repository includes Wine, however if you want to stay up to date with the -latest Wine package you can use WineHQ's by following these instructions. +repository includes a Wine package built from the stable branch, however if you want to stay up to date with the +latest development release you can obtain it by following these instructions. </p> -<h2>Adding the WineHQ PPA Repository:</h2> +<p><b>Ubuntu Derivatives:</b> These packages and instructions are designed for Ubuntu and <a href="http://wiki.ubuntu.com/UbuntuFlavors">recognized flavors</a>. Users of Ubuntu derivatives are welcome to use these packages, but should keep in mind that problems caused by differences between the derivative distro and mainline Ubuntu are neither Wine bugs nor packaging bugs, and should be reported to the distro in question.</p> + +<h2>Adding the PPA Repository:</h2> <p>Open the Software Sources menu by launching the <b>Ubuntu Software Center</b> and selecting <b>Edit->Software Sources</b>. Choose the <b>Other @@ -33,7 +35,7 @@ for you, then you may not want to use these beta packages.</i></p> <h2>Installing Wine:</h2> -<p>Once you have added the WineHQ PPA Repository, you are ready to install.</p> +<p>Once you have added the repository, you are ready to install.</p> <p><i>To get the most recent Wine 1.7 beta, <a href="apt://wine1.7">click this link to install the wine1.7 package</a>.</i></p> @@ -49,8 +51,8 @@ The built in update manager will not switch the Wine repository automatically. <h2>Alternative Command Line Instructions for Installing Wine:</h2> -<p>It is also possible to add the Wine PPA and install via the terminal. This -may be useful on Kubuntu, Xubuntu, and other Ubuntu derivatives.</p> +<p>It is also possible to add the PPA and install via the terminal. This +may be useful on Ubuntu flavors and derivatives.</p> <p><i>sudo add-apt-repository ppa:ubuntu-wine/ppa</i></p>

1 0

Julian Rüger : German translation for release 1.7.30
by Jeremy Newman Nov. 10, 2014

Nov. 10, 2014

Module: website Branch: master Commit: 5e5924965be4ed954ef2bfc1a76c64dc61a1991a URL: http://source.winehq.org/git/website.git/?a=commit;h=5e5924965be4ed954ef2bf… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 10 12:21:49 2014 +0100 German translation for release 1.7.30 --- news/de/2014103101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014103101.xml b/news/de/2014103101.xml new file mode 100644 index 0000000..1eb06b7 --- /dev/null +++ b/news/de/2014103101.xml @@ -0,0 +1,16 @@ +<news> +<date>31. Oktober 2014</date> +<title>Wine 1.7.30 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.7.30 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.7.30">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Mehr Unterstützung für Schriftarten in DirectWrite.</li> + <li>Verbesserte ATL-Thunk-Unterstützung.</li> + <li>Einige zusätzliche C-Laufzeitfunktionen.</li> + <li>Regedit Import/Export-Korrekturen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.30.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Piotr Caban : msvcp110: Add codecvt::length export.
by Alexandre Julliard Nov. 10, 2014

Nov. 10, 2014

Module: wine Branch: master Commit: 688d4140a7b90ca4029ec3c6b27600a567ec1deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=688d4140a7b90ca4029ec3c6b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 7 13:20:50 2014 +0100 msvcp110: Add codecvt::length export. --- dlls/msvcp110/msvcp110.spec | 36 ++++++++++++++++++------------------ dlls/msvcp70/msvcp70.spec | 7 ++++--- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 6d3118a..a2c5ac9 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2120,15 +2120,15 @@ @ cdecl -arch=arm ?do_is@?$ctype(a)_W@std@@MBA_NF_W(a)Z(ptr long long) ctype_wchar_do_is_ch @ thiscall -arch=i386 ?do_is@?$ctype(a)_W@std@@MBE_NF_W(a)Z(ptr long long) ctype_wchar_do_is_ch @ cdecl -arch=win64 ?do_is@?$ctype(a)_W@std@@MEBA_NF_W(a)Z(ptr long long) ctype_wchar_do_is_ch -@ stub -arch=arm ?do_length@?$codecvt(a)DDH@std@@MBAHAAHPBD1I(a)Z -@ stub -arch=i386 ?do_length@?$codecvt(a)DDH@std@@MBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEAHPEBD1_K(a)Z -@ stub -arch=arm ?do_length@?$codecvt(a)GDH@std@@MBAHAAHPBD1I(a)Z -@ stub -arch=i386 ?do_length@?$codecvt(a)GDH@std@@MBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?do_length@?$codecvt(a)GDH@std@@MEBAHAEAHPEBD1_K(a)Z -@ stub -arch=arm ?do_length@?$codecvt(a)_WDH@std@@MBAHAAHPBD1I(a)Z -@ stub -arch=i386 ?do_length@?$codecvt(a)_WDH@std@@MBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?do_length@?$codecvt(a)_WDH@std@@MEBAHAEAHPEBD1_K(a)Z +@ cdecl -arch=arm ?do_length@?$codecvt(a)DDH@std@@MBAHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_do_length +@ thiscall -arch=i386 ?do_length@?$codecvt(a)DDH@std@@MBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_do_length +@ cdecl -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_char_do_length +@ cdecl -arch=arm ?do_length@?$codecvt(a)GDH@std@@MBAHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length +@ thiscall -arch=i386 ?do_length@?$codecvt(a)GDH@std@@MBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length +@ cdecl -arch=win64 ?do_length@?$codecvt(a)GDH@std@@MEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_do_length +@ cdecl -arch=arm ?do_length@?$codecvt(a)_WDH@std@@MBAHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length +@ thiscall -arch=i386 ?do_length@?$codecvt(a)_WDH@std@@MBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length +@ cdecl -arch=win64 ?do_length@?$codecvt(a)_WDH@std@@MEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_do_length @ cdecl -arch=arm ?do_max_length@?$codecvt(a)GDH@std@@MBAHXZ(ptr) codecvt_wchar_do_max_length @ thiscall -arch=i386 ?do_max_length@?$codecvt(a)GDH@std@@MBEHXZ(ptr) codecvt_wchar_do_max_length @ cdecl -arch=win64 ?do_max_length@?$codecvt(a)GDH@std@@MEBAHXZ(ptr) codecvt_wchar_do_max_length @@ -2846,15 +2846,15 @@ @ cdecl -arch=arm ?iword(a)ios_base@std@@QAAAAJH(a)Z(ptr long) ios_base_iword @ thiscall -arch=i386 ?iword(a)ios_base@std@@QAEAAJH(a)Z(ptr long) ios_base_iword @ cdecl -arch=win64 ?iword(a)ios_base@std@@QEAAAEAJH(a)Z(ptr long) ios_base_iword -@ stub -arch=arm ?length@?$codecvt(a)DDH@std@@QBAHAAHPBD1I(a)Z -@ stub -arch=i386 ?length@?$codecvt(a)DDH@std@@QBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?length@?$codecvt(a)DDH@std@@QEBAHAEAHPEBD1_K(a)Z -@ stub -arch=arm ?length@?$codecvt(a)GDH@std@@QBAHAAHPBD1I(a)Z -@ stub -arch=i386 ?length@?$codecvt(a)GDH@std@@QBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?length@?$codecvt(a)GDH@std@@QEBAHAEAHPEBD1_K(a)Z -@ stub -arch=arm ?length@?$codecvt(a)_WDH@std@@QBAHAAHPBD1I(a)Z -@ stub -arch=i386 ?length@?$codecvt(a)_WDH@std@@QBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?length@?$codecvt(a)_WDH@std@@QEBAHAEAHPEBD1_K(a)Z +@ cdecl -arch=arm ?length@?$codecvt(a)DDH@std@@QBAHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_length +@ thiscall -arch=i386 ?length@?$codecvt(a)DDH@std@@QBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_length +@ cdecl -arch=win64 ?length@?$codecvt(a)DDH@std@@QEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_char_length +@ cdecl -arch=arm ?length@?$codecvt(a)GDH@std@@QBAHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_length +@ thiscall -arch=i386 ?length@?$codecvt(a)GDH@std@@QBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_length +@ cdecl -arch=win64 ?length@?$codecvt(a)GDH@std@@QEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_length +@ cdecl -arch=arm ?length@?$codecvt(a)_WDH@std@@QBAHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_length +@ thiscall -arch=i386 ?length@?$codecvt(a)_WDH@std@@QBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_length +@ cdecl -arch=win64 ?length@?$codecvt(a)_WDH@std@@QEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_length @ cdecl -arch=arm ?max_length(a)codecvt_base@std@@QBAHXZ(ptr) codecvt_base_max_length @ thiscall -arch=i386 ?max_length(a)codecvt_base@std@@QBEHXZ(ptr) codecvt_base_max_length @ cdecl -arch=win64 ?max_length(a)codecvt_base@std@@QEBAHXZ(ptr) codecvt_base_max_length diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index f2022dd..749e64a 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -2855,11 +2855,12 @@ @ cdecl -arch=win64 ?do_is@?$ctype(a)_W@std@@MEBAPEB_WPEB_W0PEAF(a)Z(ptr ptr ptr ptr) ctype_wchar_do_is @ thiscall -arch=i386 ?do_is@?$ctype(a)_W@std@@MBE_NF_W(a)Z(ptr long long) ctype_wchar_do_is_ch @ cdecl -arch=win64 ?do_is@?$ctype(a)_W@std@@MEBA_NF_W(a)Z(ptr long long) ctype_wchar_do_is_ch -@ stub -arch=win32 ?do_length@?$codecvt(a)DDH@std@@MBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEAHPEBD1_K(a)Z +@ thiscall -arch=i386 ?do_length@?$codecvt(a)DDH@std@@MBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_do_length +@ cdecl -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_char_do_length @ thiscall -arch=win32 ?do_length@?$codecvt(a)DDH@std@@MBEHABHPBD1I(a)Z(ptr ptr str str long) codecvt_char_do_length @ cdecl -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEBHPEBD1_K(a)Z(ptr ptr str str long) codecvt_char_do_length -@ stub -arch=win32 ?do_length@?$codecvt(a)GDH@std@@MBEHAAHPBD1I(a)Z +@ thiscall -arch=i386 ?do_length@?$codecvt(a)GDH@std@@MBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length +@ cdecl -arch=win64 ?do_length@?$codecvt(a)GDH@std@@MEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_do_length @ thiscall -arch=win32 ?do_length@?$codecvt(a)GDH@std@@MBEHABHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length @ cdecl -arch=win64 ?do_length@?$codecvt(a)GDH@std@@MEBAHAEBHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_do_length @ thiscall -arch=win32 ?do_length@?$codecvt(a)_WDH@std@@MBEHABHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length

1 0

YongHao Hu : msvcp90: Add std_Ctraits::Isnan implementation.
by Alexandre Julliard Nov. 10, 2014

Nov. 10, 2014

Module: wine Branch: master Commit: 6fe4d9e71ba0e9adfca240eeffea5720f03afef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe4d9e71ba0e9adfca240eef… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Nov 8 10:15:21 2014 +0800 msvcp90: Add std_Ctraits::Isnan implementation. --- dlls/msvcp70/msvcp70.spec | 6 +++--- dlls/msvcp71/msvcp71.spec | 6 +++--- dlls/msvcp80/msvcp80.spec | 6 +++--- dlls/msvcp90/math.c | 9 +++++++++ dlls/msvcp90/msvcp90.spec | 6 +++--- dlls/msvcp90/tests/misc.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 69 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 749e64a..7067efa 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -2103,9 +2103,9 @@ @ stub ?_Isinf@?$_Ctraits(a)M@std@@SA_NM(a)Z @ stub ?_Isinf@?$_Ctraits(a)N@std@@SA_NN(a)Z @ stub ?_Isinf@?$_Ctraits(a)O@std@@SA_NO(a)Z -@ stub ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z -@ stub ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z -@ stub ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z +@ cdecl ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z(float) std_Ctraits_float__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z(double) std_Ctraits_double__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z(double) std_Ctraits_long_double__Isnan @ stub -arch=win32 ?_Loc_atexit(a)std@@YA_NP6AXXZ(a)Z @ stub -arch=win32 ?_Makpat@?$_Mpunct(a)D@std@@AAEXAAUpattern(a)money_base@2(a)III@Z @ stub -arch=win64 ?_Makpat@?$_Mpunct(a)D@std@@AEAAXAEAUpattern(a)money_base@2(a)III@Z diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 1b56e17..0bac67c 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2300,9 +2300,9 @@ @ stub ?_Isinf@?$_Ctraits(a)M@std@@SA_NM(a)Z @ stub ?_Isinf@?$_Ctraits(a)N@std@@SA_NN(a)Z @ stub ?_Isinf@?$_Ctraits(a)O@std@@SA_NO(a)Z -@ stub ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z -@ stub ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z -@ stub ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z +@ cdecl ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z(float) std_Ctraits_float__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z(double) std_Ctraits_double__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z(double) std_Ctraits_long_double__Isnan @ thiscall -arch=win32 ?_Lock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_streambuf_char__Lock @ cdecl -arch=win64 ?_Lock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) basic_streambuf_char__Lock @ thiscall -arch=win32 ?_Lock@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAEXXZ(ptr) basic_streambuf_wchar__Lock diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 31e5e60..1165491 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2557,9 +2557,9 @@ @ stub ?_Isinf@?$_Ctraits(a)M@std@@SA_NM(a)Z @ stub ?_Isinf@?$_Ctraits(a)N@std@@SA_NN(a)Z @ stub ?_Isinf@?$_Ctraits(a)O@std@@SA_NO(a)Z -@ stub ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z -@ stub ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z -@ stub ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z +@ cdecl ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z(float) std_Ctraits_float__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z(double) std_Ctraits_double__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z(double) std_Ctraits_long_double__Isnan @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win32 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 7ea6b69..439865a 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -815,6 +815,15 @@ std_Ctraits * __thiscall std_Ctraits_op_assign( std_Ctraits *this, std_Ctraits * return this; } +/* ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z -> public: static bool __cdecl std::_Ctraits<float>::_Isnan(float) */ +BOOLEAN __cdecl std_Ctraits_float__Isnan( float x ) { return _isnan(x); } + +/* ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z -> public: static bool __cdecl std::_Ctraits<double>::_Isnan(double) */ +BOOLEAN __cdecl std_Ctraits_double__Isnan( double x ) { return _isnan(x); } + +/* ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z -> public: static bool __cdecl std::_Ctraits<long double>::_Isnan(long double) */ +BOOLEAN __cdecl std_Ctraits_long_double__Isnan( LDOUBLE x ) { return _isnan(x); } + /* ?atan2@?$_Ctraits(a)M@std@@SAMMM(a)Z -> public: static float __cdecl std::_Ctraits<float>::atan2(float,float) */ float __cdecl std_Ctraits_float_atan2( float y, float x ) { return atan2f( y, x ); } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 5271737..edb984b 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2878,9 +2878,9 @@ @ stub ?_Isinf@?$_Ctraits(a)M@std@@SA_NM(a)Z @ stub ?_Isinf@?$_Ctraits(a)N@std@@SA_NN(a)Z @ stub ?_Isinf@?$_Ctraits(a)O@std@@SA_NO(a)Z -@ stub ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z -@ stub ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z -@ stub ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z +@ cdecl ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z(float) std_Ctraits_float__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z(double) std_Ctraits_double__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z(double) std_Ctraits_long_double__Isnan @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win32 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 26cafc9..a4e07d7 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -19,6 +19,7 @@ #include <stdio.h> #include <locale.h> #include <wctype.h> +#include <math.h> #include <float.h> #include <errno.h> @@ -26,6 +27,8 @@ #include <winbase.h> #include "wine/test.h" +typedef double LDOUBLE; /* long double is just a double */ + typedef struct { LCID handle; unsigned page; @@ -110,6 +113,10 @@ static void (__thiscall *p_basic_ostringstream_char_dtor)(/*basic_ostringstream_ static void (__thiscall *p_basic_ostringstream_char_vbase_dtor)(/*basic_ostringstream_char*/void*); static void (__thiscall *p_basic_ios_char_dtor)(/*basic_ios_char*/void*); +static BOOL (__cdecl *p_std_Ctraits_float__Isnan)(float); +static BOOL (__cdecl *p_std_Ctraits_double__Isnan)(double); +static BOOL (__cdecl *p_std_Ctraits_long_double__Isnan)(LDOUBLE); + static complex_float* (__thiscall *p_complex_float_ctor)(complex_float*, const float*, const float*); static complex_float* (__cdecl *p_complex_float_add)(complex_float*, const complex_float*, const complex_float*); static complex_float* (__cdecl *p_complex_float_div)(complex_float*, const complex_float*, const complex_float*); @@ -216,6 +223,11 @@ static BOOL init(void) SET(p_wctrans, "wctrans"); SET(p_towctrans, "towctrans"); SET(basic_ostringstream_char_vbtable, "??_8?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B@"); + + SET(p_std_Ctraits_float__Isnan, "?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z"); + SET(p_std_Ctraits_double__Isnan, "?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z"); + SET(p_std_Ctraits_long_double__Isnan, "?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z"); + if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z"); @@ -688,6 +700,41 @@ static BOOL almost_eq(float f1, float f2) return f1 < 0.0001; } +static void test_Ctraits_math_functions(void) +{ + BYTE ret; + + ret = p_std_Ctraits_float__Isnan(0.0); + ok(ret == FALSE, "ret = %d\n", ret); + + ret = p_std_Ctraits_float__Isnan(0.0 / 0.0); + ok(ret == TRUE, "ret = %d\n", ret); + + ret = p_std_Ctraits_float__Isnan(1.0 / 0.0); + ok(ret == FALSE, "ret = %d\n", ret); + + ret = p_std_Ctraits_float__Isnan(-1.0 / 0.0); + ok(ret == FALSE, "ret = %d\n", ret); + + ret = p_std_Ctraits_float__Isnan(log(-1.0)); + ok(ret == TRUE, "ret = %d\n", ret); + + ret = p_std_Ctraits_float__Isnan(sqrt(-1.0)); + ok(ret == TRUE, "ret = %d\n", ret); + + ret = p_std_Ctraits_double__Isnan(3.14159 / 0.0); + ok(ret == FALSE, "ret = %d\n", ret); + + ret = p_std_Ctraits_double__Isnan(log(-3.14159)); + ok(ret == TRUE, "ret = %d\n", ret); + + ret = p_std_Ctraits_long_double__Isnan(3.14159 / 0.0); + ok(ret == FALSE, "ret = %d\n", ret); + + ret = p_std_Ctraits_long_double__Isnan(sqrt(-3.14159)); + ok(ret == TRUE, "ret = %d\n", ret); +} + static void test_complex(void) { complex_float c1, c2, c3; @@ -935,6 +982,7 @@ START_TEST(misc) test_virtual_call(); test_virtual_base_dtors(); test_allocator_char(); + test_Ctraits_math_functions(); test_complex(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0