May 2010 - Wine-commits - list.winehq.org

Mike Kaplinskiy : server: Move socket async activation to sock_poll_event.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 42debac149148a6436e129932e173666056a873a URL: http://source.winehq.org/git/wine.git/?a=commit;h=42debac149148a6436e129932… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat May 15 01:18:20 2010 -0400 server: Move socket async activation to sock_poll_event. --- dlls/ws2_32/tests/sock.c | 8 ++++---- server/async.c | 6 ++++++ server/file.h | 1 + server/sock.c | 36 ++++++++++++++++++------------------ 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 882bf22..6356d9f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3133,10 +3133,10 @@ static void test_events(int useMessages) ok(ret == 2, "Failed to send buffer %d err %d\n", ret, GetLastError()); broken_seq[0] = read_read_seq; /* win9x */ broken_seq[1] = NULL; - if (useMessages) /* we like to erase pmask in server, so we have varying behavior here */ - todo_wine ok_event_seq(src, hEvent, empty_seq, broken_seq, 0); - else - ok_event_seq(src, hEvent, empty_seq, broken_seq, 0); + /* we like to erase pmask in server, so we have varying behavior here * + * it is only fixed for now because we refuse to send notifications with + * any kind of asyncs requests running */ + ok_event_seq(src, hEvent, empty_seq, broken_seq, 0); dwRet = WaitForSingleObject(ov.hEvent, 100); ok(dwRet == WAIT_OBJECT_0, "Failed to wait for recv message: %d - %d\n", dwRet, GetLastError()); diff --git a/server/async.c b/server/async.c index 73cd76d..dd28dff 100644 --- a/server/async.c +++ b/server/async.c @@ -276,6 +276,12 @@ void async_set_result( struct object *obj, unsigned int status, unsigned int tot } } +/* check if there are any queued async operations */ +int async_queued( struct async_queue *queue ) +{ + return queue && list_head( &queue->queue ); +} + /* check if an async operation is waiting to be alerted */ int async_waiting( struct async_queue *queue ) { diff --git a/server/file.h b/server/file.h index 03cea89..9a348bf 100644 --- a/server/file.h +++ b/server/file.h @@ -146,6 +146,7 @@ extern struct async *create_async( struct thread *thread, struct async_queue *qu extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, unsigned int total, client_ptr_t apc ); +extern int async_queued( struct async_queue *queue ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); extern int async_wake_up_by( struct async_queue *queue, struct process *process, diff --git a/server/sock.c b/server/sock.c index d2348e4..34ec176 100644 --- a/server/sock.c +++ b/server/sock.c @@ -255,28 +255,14 @@ static int sock_reselect( struct sock *sock ) } /* wake anybody waiting on the socket event or send the associated message */ -static void sock_wake_up( struct sock *sock, int pollev ) +static void sock_wake_up( struct sock *sock ) { unsigned int events = sock->pmask & sock->mask; int i; - int async_active = 0; - - if ( pollev & (POLLIN|POLLPRI|POLLERR|POLLHUP) && async_waiting( sock->read_q )) - { - if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); - async_wake_up( sock->read_q, STATUS_ALERTED ); - async_active = 1; - } - if ( pollev & (POLLOUT|POLLERR|POLLHUP) && async_waiting( sock->write_q )) - { - if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); - async_wake_up( sock->write_q, STATUS_ALERTED ); - async_active = 1; - } /* Do not signal events if there are still pending asynchronous IO requests */ /* We need this to delay FD_CLOSE events until all pending overlapped requests are processed */ - if ( !events || async_active ) return; + if ( !events || async_queued( sock->read_q ) || async_queued( sock->write_q ) ) return; if (sock->event) { @@ -437,7 +423,21 @@ static void sock_poll_event( struct fd *fd, int event ) } /* wake up anyone waiting for whatever just happened */ - if ( sock->pmask & sock->mask || sock->flags & WSA_FLAG_OVERLAPPED ) sock_wake_up( sock, event ); + sock_wake_up( sock ); + + if ( sock->flags & WSA_FLAG_OVERLAPPED ) + { + if ( event & (POLLIN|POLLPRI|POLLERR|POLLHUP) && async_waiting( sock->read_q )) + { + if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); + async_wake_up( sock->read_q, STATUS_ALERTED ); + } + if ( event & (POLLOUT|POLLERR|POLLHUP) && async_waiting( sock->write_q )) + { + if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); + async_wake_up( sock->write_q, STATUS_ALERTED ); + } + } /* if anyone is stupid enough to wait on the socket object itself, * maybe we should wake them up too, just in case? */ @@ -876,7 +876,7 @@ DECL_HANDLER(set_socket_event) it is possible that FD_CONNECT or FD_ACCEPT network events has happened before a WSAEventSelect() was done on it. (when dealing with Asynchronous socket) */ - if (sock->pmask & sock->mask) sock_wake_up( sock, pollev ); + sock_wake_up( sock ); if (old_event) release_object( old_event ); /* we're through with it */ release_object( &sock->obj );

1 0

Henri Verbeet : wined3d: Remove some unused winetexturestates elements.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 498664af3a8981b58321a8c2337e9a42e5da87a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=498664af3a8981b58321a8c23… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 17 11:14:46 2010 +0200 wined3d: Remove some unused winetexturestates elements. --- dlls/wined3d/basetexture.c | 3 --- dlls/wined3d/wined3d_private.h | 5 +---- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 0c4f684..dcdb039 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -299,9 +299,6 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac gl_tex->states[WINED3DTEXSTA_MAXMIPLEVEL] = 0; gl_tex->states[WINED3DTEXSTA_MAXANISOTROPY] = 1; gl_tex->states[WINED3DTEXSTA_SRGBTEXTURE] = 0; - gl_tex->states[WINED3DTEXSTA_ELEMENTINDEX] = 0; - gl_tex->states[WINED3DTEXSTA_DMAPOFFSET] = 0; - gl_tex->states[WINED3DTEXSTA_TSSADDRESSW] = WINED3DTADDRESS_WRAP; IWineD3DBaseTexture_SetDirty(iface, TRUE); isNewTexture = TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 179b4c4..3c9c2e5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1821,10 +1821,7 @@ typedef enum winetexturestates { WINED3DTEXSTA_MAXMIPLEVEL = 7, WINED3DTEXSTA_MAXANISOTROPY = 8, WINED3DTEXSTA_SRGBTEXTURE = 9, - WINED3DTEXSTA_ELEMENTINDEX = 10, - WINED3DTEXSTA_DMAPOFFSET = 11, - WINED3DTEXSTA_TSSADDRESSW = 12, - MAX_WINETEXTURESTATES = 13, + MAX_WINETEXTURESTATES = 10, } winetexturestates; enum WINED3DSRGB

1 0

Henri Verbeet : wined3d: Add support for ARB_shadow.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 29b13f75cc9bb6faf3260e06f31118fb74e8381d URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b13f75cc9bb6faf3260e06f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 17 11:14:47 2010 +0200 wined3d: Add support for ARB_shadow. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eb5a16d..a0dca9f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -74,6 +74,7 @@ static const struct { {"GL_ARB_shader_objects", ARB_SHADER_OBJECTS, 0 }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD, 0 }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100, 0 }, + {"GL_ARB_shadow", ARB_SHADOW, 0 }, {"GL_ARB_sync", ARB_SYNC, 0 }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP, 0 }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0fd7fb0..4ece7e7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1754,6 +1754,7 @@ typedef enum wined3d_gl_extension ARB_SHADER_OBJECTS, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, + ARB_SHADOW, ARB_SYNC, ARB_TEXTURE_BORDER_CLAMP, ARB_TEXTURE_COMPRESSION, @@ -2404,6 +2405,14 @@ typedef unsigned int GLhandleARB; #define GL_SHADING_LANGUAGE_VERSION_ARB 0x8b8c #endif +/* GL_ARB_shadow */ +#ifndef GL_ARB_shadow +#define GL_ARB_shadow 1 +#define GL_TEXTURE_COMPARE_MODE_ARB 0x884c +#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884d +#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884e +#endif + /* GL_ARB_sync */ #ifndef GL_ARB_sync #define GL_ARB_sync 1

1 0

Henri Verbeet : wined3d: Add support for shadow samplers.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 79145e215b6a8327945414ebf97d3ae014600fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79145e215b6a8327945414ebf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 17 11:14:48 2010 +0200 wined3d: Add support for shadow samplers. --- dlls/wined3d/basetexture.c | 19 +++ dlls/wined3d/directx.c | 5 + dlls/wined3d/glsl_shader.c | 326 ++++++++++++++++++++++++++-------------- dlls/wined3d/shader.c | 3 + dlls/wined3d/surface.c | 7 + dlls/wined3d/utils.c | 35 +++-- dlls/wined3d/wined3d_private.h | 5 +- 7 files changed, 274 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79145e215b6a832794541…

1 0

Henri Verbeet : d3d8/tests: Add a shadow sampler test.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: fabc7ecd97e44620466b219ddc83b004d9bb5031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabc7ecd97e44620466b219dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 17 11:14:49 2010 +0200 d3d8/tests: Add a shadow sampler test. --- dlls/d3d8/tests/visual.c | 214 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 214 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fabc7ecd97e44620466b2…

1 0

Henri Verbeet : d3d9/tests: Add a shadow sampler test.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 123bfa20f56f5923e6256cd3cfb15c3379783ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123bfa20f56f5923e6256cd3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 17 11:14:50 2010 +0200 d3d9/tests: Add a shadow sampler test. --- dlls/d3d9/tests/visual.c | 203 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 203 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=123bfa20f56f5923e6256…

1 0

Piotr Caban : wininet: Fix dwStatusInfoLength value in INTERNET_SendCallback.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: a298415bbe444751a1c668dda0873a47274a8406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a298415bbe444751a1c668dda… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 11:54:29 2010 +0200 wininet: Fix dwStatusInfoLength value in INTERNET_SendCallback. --- dlls/wininet/utility.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 66fbecd..0639f40 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -307,6 +307,7 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, case INTERNET_STATUS_CONNECTING_TO_SERVER: case INTERNET_STATUS_CONNECTED_TO_SERVER: lpvNewInfo = heap_strdupAtoW(lpvStatusInfo); + dwStatusInfoLength *= sizeof(WCHAR); break; case INTERNET_STATUS_RESOLVING_NAME: case INTERNET_STATUS_REDIRECT: @@ -325,6 +326,7 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, case INTERNET_STATUS_RESOLVING_NAME: case INTERNET_STATUS_REDIRECT: lpvNewInfo = heap_strdupWtoA(lpvStatusInfo); + dwStatusInfoLength /= sizeof(WCHAR); break; } }

1 0

Piotr Caban : wininet: Deal with reading over the end in NETCON_recv.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: c6097cafddd118baf83eb65a97a9d9805521b118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6097cafddd118baf83eb65a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 11:55:24 2010 +0200 wininet: Deal with reading over the end in NETCON_recv. --- dlls/wininet/netconnection.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c2560b5..bb89517 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -134,6 +134,7 @@ MAKE_FUNCPTR(SSL_shutdown); MAKE_FUNCPTR(SSL_write); MAKE_FUNCPTR(SSL_read); MAKE_FUNCPTR(SSL_pending); +MAKE_FUNCPTR(SSL_get_error); MAKE_FUNCPTR(SSL_get_ex_new_index); MAKE_FUNCPTR(SSL_get_ex_data); MAKE_FUNCPTR(SSL_set_ex_data); @@ -392,6 +393,7 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNSSL(SSL_write); DYNSSL(SSL_read); DYNSSL(SSL_pending); + DYNSSL(SSL_get_error); DYNSSL(SSL_get_ex_new_index); DYNSSL(SSL_get_ex_data); DYNSSL(SSL_set_ex_data); @@ -772,6 +774,12 @@ DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int { #ifdef SONAME_LIBSSL *recvd = pSSL_read(connection->ssl_s, buf, len); + + /* Check if EOF was received */ + if(!*recvd && (pSSL_get_error(connection->ssl_s, *recvd)==SSL_ERROR_ZERO_RETURN + || pSSL_get_error(connection->ssl_s, *recvd)==SSL_ERROR_SYSCALL)) + return ERROR_SUCCESS; + return *recvd > 0 ? ERROR_SUCCESS : ERROR_INTERNET_CONNECTION_ABORTED; #else return ERROR_NOT_SUPPORTED;

1 0

Alexandre Julliard : gdi32: Pre-multiply RGB values by alpha for subpixel font rendering.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: aff0eac21b7d66a0ba4869cade6368a988ab34ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff0eac21b7d66a0ba4869cad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 17 14:25:14 2010 +0200 gdi32: Pre-multiply RGB values by alpha for subpixel font rendering. --- dlls/gdi32/freetype.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c384218..129245a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5044,19 +5044,22 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, { for ( x = 0; x < src_width / hmul; x++ ) { + unsigned int alpha = (src[hmul * x + rgb_interval * 0] + + src[hmul * x + rgb_interval * 1] + + src[hmul * x + rgb_interval * 2]) / 3; if ( rgb ) { - dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 0] << 16) | - ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | - ((unsigned int)src[hmul * x + rgb_interval * 2] << 0) | - ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; + dst[x] = ((src[hmul * x + rgb_interval * 0] * alpha / 255) << 16) | + ((src[hmul * x + rgb_interval * 1] * alpha / 255) << 8) | + ((src[hmul * x + rgb_interval * 2] * alpha / 255) << 0) | + (alpha << 24); } else { - dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 2] << 16) | - ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | - ((unsigned int)src[hmul * x + rgb_interval * 0] << 0) | - ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; + dst[x] = ((src[hmul * x + rgb_interval * 2] * alpha / 255) << 16) | + ((src[hmul * x + rgb_interval * 1] * alpha / 255) << 8) | + ((src[hmul * x + rgb_interval * 0] * alpha / 255) << 0) | + (alpha << 24); } } src += src_pitch * vmul;

1 0

Piotr Caban : msvcrt: Added $I10_OUTPUT implementation.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 4aee4c7d1c1be70103ce7f5a46e16ecce0041b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aee4c7d1c1be70103ce7f5a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 14 12:14:12 2010 +0200 msvcrt: Added $I10_OUTPUT implementation. --- dlls/msvcrt/main.c | 12 ------ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/misc.c | 89 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 186 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 272ba71..4ae52c7 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -123,15 +123,3 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } - -/********************************************************************* - * $I10_OUTPUT (MSVCRT.@) - * Function not really understood but needed to make the DLL work - */ -void CDECL MSVCRT_I10_OUTPUT(void) -{ - /* FIXME: This is probably data, not a function */ - /* no it is a function. I10 is an Int of 10 bytes */ - /* also known as 80 bit floating point (long double */ - /* for some compilers, not MSVC) */ -} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c7d6654..1bf3f6d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1,6 +1,6 @@ # msvcrt.dll - MS VC++ Run Time Library -@ cdecl $I10_OUTPUT() MSVCRT_I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long long ptr) MSVCRT_I10_OUTPUT @ cdecl -i386 -norelay ??0__non_rtti_object@@QAE(a)ABV0@@Z(ptr) __thiscall_MSVCRT___non_rtti_object_copy_ctor @ cdecl -i386 -norelay ??0__non_rtti_object@@QAE(a)PBD@Z(ptr) __thiscall_MSVCRT___non_rtti_object_ctor @ cdecl -i386 -norelay ??0bad_cast@@AAE(a)PBQBD@Z(ptr) __thiscall_MSVCRT_bad_cast_ctor diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 21dc29f..8c99399 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -26,6 +26,7 @@ #include "wine/port.h" #include <stdlib.h> +#include <stdio.h> #include <math.h> #include <limits.h> #include <errno.h> @@ -669,3 +670,98 @@ int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str, memcpy(str, pos, buffer-pos+65); return 0; } + +#define I10_OUTPUT_MAX_PREC 21 +/* Internal structure used by $I10_OUTPUT */ +struct _I10_OUTPUT_DATA { + short pos; + char sign; + BYTE len; + char str[I10_OUTPUT_MAX_PREC+1]; /* add space for '\0' */ +}; + +/********************************************************************* + * $I10_OUTPUT (MSVCRT.@) + * ld - long double to be printed to data + * prec - precision of part, we're interested in + * flag - 0 for first prec digits, 1 for fractional part + * data - data to be populated + * + * return value + * 0 if given double is NaN or INF + * 1 otherwise + * + * FIXME + * Native sets last byte of data->str to '0' or '9', I don't know what + * it means. Current implementation sets it always to '0'. + */ +int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld, int prec, int flag, struct _I10_OUTPUT_DATA *data) +{ + static const char inf_str[] = "1#INF"; + static const char nan_str[] = "1#QNAN"; + + double d = ld.x; + char format[8]; + char buf[I10_OUTPUT_MAX_PREC+9]; /* 9 = strlen("0.e+0000") + '\0' */ + char *p; + + TRACE("(%lf %d %x %p)\n", d, prec, flag, data); + + if(d<0) { + data->sign = '-'; + d = -d; + } else + data->sign = ' '; + + if(isinf(d)) { + data->pos = 1; + data->len = 5; + memcpy(data->str, inf_str, sizeof(inf_str)); + + return 0; + } + + if(isnan(d)) { + data->pos = 1; + data->len = 6; + memcpy(data->str, nan_str, sizeof(nan_str)); + + return 0; + } + + if(flag&1) { + int exp = 1+floor(log10(d)); + + prec += exp; + if(exp < 0) + prec--; + } + prec--; + + if(prec+1 > I10_OUTPUT_MAX_PREC) + prec = I10_OUTPUT_MAX_PREC-1; + else if(prec < 0) { + d = 0.0; + prec = 0; + } + + sprintf(format, "%%.%dle", prec); + sprintf(buf, format, d); + + buf[1] = buf[0]; + data->pos = atoi(buf+prec+3); + if(buf[1] != '0') + data->pos++; + + for(p = buf+prec+1; p>buf+1 && *p=='0'; p--); + data->len = p-buf; + + memcpy(data->str, buf+1, data->len); + data->str[data->len] = '\0'; + + if(buf[1]!='0' && prec-data->len+1>0) + memcpy(data->str+data->len+1, buf+data->len+1, prec-data->len+1); + + return 1; +} +#undef I10_OUTPUT_MAX_PREC diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index d8b1b88..68f47f8 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -24,6 +24,7 @@ static int (__cdecl *prand_s)(unsigned int *); static int (__cdecl *memcpy_s)(void *, MSVCRT_size_t, void*, MSVCRT_size_t); +static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); static void init(void) { @@ -31,6 +32,7 @@ static void init(void) prand_s = (void *)GetProcAddress(hmod, "rand_s"); memcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); + pI10_OUTPUT = (void*)GetProcAddress(hmod, "$I10_OUTPUT"); } static void test_rand_s(void) @@ -104,10 +106,97 @@ static void test_memcpy_s(void) ok(dest[0] == '\0', "dest[0] != \'\\0\'\n"); } +typedef struct _I10_OUTPUT_data { + short pos; + char sign; + BYTE len; + char str[100]; +} I10_OUTPUT_data; + +typedef struct _I10_OUTPUT_test { + long double d; + int size; + int flags; + + I10_OUTPUT_data out; + int ret; + const char *remain; +} I10_OUTPUT_test; + +static const I10_OUTPUT_test I10_OUTPUT_tests[] = { + /* arg3 = 0 */ + { 0.0, 10, 0, {0, ' ', 1, "0"}, 1, "" }, + { 1.0, 10, 0, {1, ' ', 1, "1"}, 1, "000000009" }, + { -1.0, 10, 0, {1, '-', 1, "1"}, 1, "000000009" }, + { 1.23, 10, 0, {1, ' ', 3, "123"}, 1, "0000009" }, + { 1e13, 10, 0, {14, ' ', 1, "1"}, 1, "000000009" }, + { 1e30, 30, 0, {31, ' ', 21, "100000000000000001988"}, 1, "" }, + { 1e-13, 10, 0, {-12, ' ', 1, "1"}, 1, "000000000" }, + { 0.25, 10, 0, {0, ' ', 2, "25"}, 1, "00000000" }, + { 1.0000001, 10, 0, {1, ' ', 8, "10000001"}, 1, "00" }, + /* arg3 = 1 */ + { 0.0, 10, 1, {0, ' ', 1, "0"}, 1, "" }, + { 1.0, 10, 1, {1, ' ', 1, "1"}, 1, "0000000009" }, + { -1.0, 10, 1, {1, '-', 1, "1"}, 1, "0000000009" }, + { 1.23, 10, 1, {1, ' ', 3, "123"}, 1, "00000009" }, + { 1e13, 10, 1, {14, ' ', 1, "1"}, 1, "00000000000000000009" }, + { 1e30, 30, 1, {31, ' ', 21, "100000000000000001988"}, 1, "" }, + { 1e-13, 10, 1, {0, ' ', 1, "0"}, 1, "" }, + { 1e-7, 10, 1, {-6, ' ', 1, "1"}, 1, "09" }, + { 0.25, 10, 1, {0, ' ', 2, "25"}, 1, "00000000" }, + { 1.0000001, 10, 1, {1, ' ', 8, "10000001"}, 1, "000" }, + /* too small buffer */ + { 0.0, 0, 0, {0, ' ', 1, "0"}, 1, "" }, + { 0.0, 0, 1, {0, ' ', 1, "0"}, 1, "" }, + { 123.0, 2, 0, {3, ' ', 2, "12"}, 1, "" }, + { 123.0, 0, 0, {0, ' ', 1, "0"}, 1, "" }, + { 123.0, 2, 1, {3, ' ', 3, "123"}, 1, "09" }, + { 0.99, 1, 0, {1, ' ', 1, "1"}, 1, "" }, + { 1264567.0, 2, 0, {7, ' ', 2, "13"}, 1, "" }, + { 1264567.0, 2, 1, {7, ' ', 7, "1264567"}, 1, "00" }, + { 1234567891.0, 2, 1, {10, ' ', 10, "1234567891"}, 1, "09" } +}; + +static void test_I10_OUTPUT(void) +{ + I10_OUTPUT_data out; + int i, j, ret; + + if(!pI10_OUTPUT) { + win_skip("I10_OUTPUT not available\n"); + return; + } + + for(i=0; i<sizeof(I10_OUTPUT_tests)/sizeof(I10_OUTPUT_test); i++) { + memset(out.str, '#', sizeof(out.str)); + + ret = pI10_OUTPUT(I10_OUTPUT_tests[i].d, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out); + ok(ret == I10_OUTPUT_tests[i].ret, "%d: ret = %d\n", i, ret); + ok(out.pos == I10_OUTPUT_tests[i].out.pos, "%d: out.pos = %hd\n", i, out.pos); + ok(out.sign == I10_OUTPUT_tests[i].out.sign, "%d: out.size = %c\n", i, out.sign); + ok(out.len == I10_OUTPUT_tests[i].out.len, "%d: out.len = %d\n", i, (int)out.len); + ok(!strcmp(out.str, I10_OUTPUT_tests[i].out.str), "%d: out.str = %s\n", i, out.str); + + j = strlen(I10_OUTPUT_tests[i].remain); + if(j && I10_OUTPUT_tests[i].remain[j-1]=='9') + todo_wine ok(!strncmp(out.str+out.len+1, I10_OUTPUT_tests[i].remain, j), + "%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1); + else + ok(!strncmp(out.str+out.len+1, I10_OUTPUT_tests[i].remain, j), + "%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1); + + + for(j=out.len+strlen(I10_OUTPUT_tests[i].remain)+1; j<sizeof(out.str); j++) + if(out.str[j] != '#') + ok(0, "%d: out.str[%d] = %c (expected \'#\')\n", i, j, out.str[j]); + } +} + START_TEST(misc) { init(); test_rand_s(); test_memcpy_s(); + test_I10_OUTPUT(); }

1 0