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

Chris Robinson : wined3d: Decrement fbo_entry_count when one is removed from the list.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 12799db34926cbb32b190af56aa464e96cc2bc18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12799db34926cbb32b190af56… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun May 24 05:15:29 2009 -0700 wined3d: Decrement fbo_entry_count when one is removed from the list. --- dlls/wined3d/context.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 02215c8..8fb075d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -259,13 +259,14 @@ static void context_reuse_fbo_entry(IWineD3DDevice *iface, struct fbo_entry *ent } /* GL locking is done by the caller */ -static void context_destroy_fbo_entry(IWineD3DDeviceImpl *This, struct fbo_entry *entry) +static void context_destroy_fbo_entry(IWineD3DDeviceImpl *This, WineD3DContext *context, struct fbo_entry *entry) { if (entry->id) { TRACE("Destroy FBO %d\n", entry->id); context_destroy_fbo(This, &entry->id); } + --context->fbo_entry_count; list_remove(&entry->entry); HeapFree(GetProcessHeap(), 0, entry->render_targets); HeapFree(GetProcessHeap(), 0, entry); @@ -381,11 +382,12 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { for (i = 0; i < This->numContexts; ++i) { + WineD3DContext *context = This->contexts[i]; struct fbo_entry *entry, *entry2; ENTER_GL(); - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->contexts[i]->fbo_list, struct fbo_entry, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { BOOL destroyed = FALSE; UINT j; @@ -394,13 +396,13 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { if (entry->render_targets[j] == (IWineD3DSurface *)resource) { - context_destroy_fbo_entry(This, entry); + context_destroy_fbo_entry(This, context, entry); destroyed = TRUE; } } if (!destroyed && entry->depth_stencil == (IWineD3DSurface *)resource) - context_destroy_fbo_entry(This, entry); + context_destroy_fbo_entry(This, context, entry); } LEAVE_GL(); @@ -1053,7 +1055,7 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { ENTER_GL(); LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { - context_destroy_fbo_entry(This, entry); + context_destroy_fbo_entry(This, context, entry); } if (context->src_fbo) { TRACE("Destroy src FBO %d\n", context->src_fbo);

1 0

Piotr Caban : jscript: Added Math_SQRT2 implementation and tests.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 27f327aebc64e4e95c90e91c4625500b74a08174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f327aebc64e4e95c90e91c4… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun May 24 21:06:23 2009 +0200 jscript: Added Math_SQRT2 implementation and tests. --- dlls/jscript/math.c | 4 ++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index ac487d1..1157fed 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -120,8 +120,8 @@ static HRESULT Math_PI(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp static HRESULT Math_SQRT2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_SQRT2, flags, retv); } static HRESULT Math_SQRT1_2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 30f2017..a4dd9f5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -675,4 +675,9 @@ ok(Math.floor(Math.LN2*100) === 69, "Math.LN2 = " + Math.LN2); Math.LN2 = "test"; ok(Math.floor(Math.LN2*100) === 69, "modified Math.LN2 = " + Math.LN2); +ok(typeof(Math.SQRT2) === "number", "typeof(Math.SQRT2) = " + typeof(Math.SQRT2)); +ok(Math.floor(Math.SQRT2*100) === 141, "Math.SQRT2 = " + Math.SQRT2); +Math.SQRT2 = "test"; +ok(Math.floor(Math.SQRT2*100) === 141, "modified Math.SQRT2 = " + Math.SQRT2); + reportSuccess();

1 0

Piotr Caban : jscript: Added Math_SQRT1_2 implementations and tests.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: e4bc0def3be95a95d006da8dcb4a03d98966824f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4bc0def3be95a95d006da8dc… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun May 24 21:07:22 2009 +0200 jscript: Added Math_SQRT1_2 implementations and tests. --- dlls/jscript/math.c | 4 ++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 1157fed..f7cf3d1 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -127,8 +127,8 @@ static HRESULT Math_SQRT2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT Math_SQRT1_2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_SQRT1_2, flags, retv); } /* ECMA-262 3rd Edition 15.8.2.12 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a4dd9f5..71517cb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -680,4 +680,9 @@ ok(Math.floor(Math.SQRT2*100) === 141, "Math.SQRT2 = " + Math.SQRT2); Math.SQRT2 = "test"; ok(Math.floor(Math.SQRT2*100) === 141, "modified Math.SQRT2 = " + Math.SQRT2); +ok(typeof(Math.SQRT1_2) === "number", "typeof(Math.SQRT1_2) = " + typeof(Math.SQRT1_2)); +ok(Math.floor(Math.SQRT1_2*100) === 70, "Math.SQRT1_2 = " + Math.SQRT1_2); +Math.SQRT1_2 = "test"; +ok(Math.floor(Math.SQRT1_2*100) === 70, "modified Math.SQRT1_2 = " + Math.SQRT1_2); + reportSuccess();

1 0

Piotr Caban : jscript: Added Math_acos implementation and tests.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: b050c20638db462c67cf95b9cbef8b5a2482b6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b050c20638db462c67cf95b9c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon May 25 00:03:06 2009 +0200 jscript: Added Math_acos implementation and tests. --- dlls/jscript/math.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index f7cf3d1..99bd9f5 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -160,8 +160,22 @@ static HRESULT Math_abs(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d static HRESULT Math_acos(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, acos(num_val(&v))); + return S_OK; } static HRESULT Math_asin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 71517cb..a202fbd 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -626,6 +626,39 @@ tmp = Math.random(100); ok(typeof(tmp) == "number", "typeof(tmp) = " + typeof(tmp)); ok(0 <= tmp && tmp <= 1, "Math.random(100) = " + tmp); +tmp = Math.acos(0); +ok(Math.floor(tmp*100) === 157, "Math.acos(0) = " + tmp); + +tmp = Math.acos(1); +ok(Math.floor(tmp*100) === 0, "Math.acos(1) = " + tmp); + +tmp = Math.acos(-1); +ok(Math.floor(tmp*100) === 314, "Math.acos(-1) = " + tmp); + +tmp = Math.acos(Math.PI/4, 2); +ok(Math.floor(tmp*100) === 66, "Math.acos(Math.PI/4, 2) = " + tmp); + +tmp = Math.acos(true); +ok(Math.floor(tmp*100) === 0, "Math.acos(true) = " + tmp); + +tmp = Math.acos(false); +ok(Math.floor(tmp*100) === 157, "Math.acos(false) = " + tmp); + +tmp = Math.acos(1.1); +ok(isNaN(tmp), "Math.acos(1.1) is not NaN"); + +tmp = Math.acos(); +ok(isNaN(tmp), "Math.acos() is not NaN"); + +tmp = Math.acos(NaN); +ok(isNaN(tmp), "Math.acos(NaN) is not NaN"); + +tmp = Math.acos(Infinity); +ok(isNaN(tmp), "Math.acos(Infinity) is not NaN"); + +tmp = Math.acos(-Infinity); +ok(isNaN(tmp), "Math.acos(-Infinity) is not NaN"); + var func = function (a) { var a = 1; if(a) return;

1 0

Piotr Caban : jscript: Added Math_LN10 implementation and tests.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 1ef80d5cd20c08a72bec1cc297951c862f176573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef80d5cd20c08a72bec1cc29… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun May 24 21:06:50 2009 +0200 jscript: Added Math_LN10 implementation and tests. --- dlls/jscript/math.c | 4 ++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 99bd9f5..8f3cb03 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -105,8 +105,8 @@ static HRESULT Math_LN2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d static HRESULT Math_LN10(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_LN10, flags, retv); } /* ECMA-262 3rd Edition 15.8.1.6 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a202fbd..9976bb2 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -708,6 +708,11 @@ ok(Math.floor(Math.LN2*100) === 69, "Math.LN2 = " + Math.LN2); Math.LN2 = "test"; ok(Math.floor(Math.LN2*100) === 69, "modified Math.LN2 = " + Math.LN2); +ok(typeof(Math.LN10) === "number", "typeof(Math.LN10) = " + typeof(Math.LN10)); +ok(Math.floor(Math.LN10*100) === 230, "Math.LN10 = " + Math.LN10); +Math.LN10 = "test"; +ok(Math.floor(Math.LN10*100) === 230, "modified Math.LN10 = " + Math.LN10); + ok(typeof(Math.SQRT2) === "number", "typeof(Math.SQRT2) = " + typeof(Math.SQRT2)); ok(Math.floor(Math.SQRT2*100) === 141, "Math.SQRT2 = " + Math.SQRT2); Math.SQRT2 = "test";

1 0

Henri Verbeet : secur32: Initialize cbBuffer to 0 for NULL buffers.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: a1465ba45ff918b79c02c1d5ba14b0a51ccae4c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1465ba45ff918b79c02c1d5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 25 09:17:21 2009 +0200 secur32: Initialize cbBuffer to 0 for NULL buffers. This prevents schan_resize_current_buffer() from thinking there's a buffer. --- dlls/secur32/schannel.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index fbf2a62..8f127e6 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -619,7 +619,11 @@ static int schan_init_sec_ctx_get_next_buffer(const struct schan_transport *t, s idx = schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_EMPTY); if (idx != -1) s->desc->pBuffers[idx].BufferType = SECBUFFER_TOKEN; } - if (idx != -1 && !s->desc->pBuffers[idx].pvBuffer) s->allow_buffer_resize = TRUE; + if (idx != -1 && !s->desc->pBuffers[idx].pvBuffer) + { + s->desc->pBuffers[idx].cbBuffer = 0; + s->allow_buffer_resize = TRUE; + } } return idx; }

1 0

Alexandre Julliard : msvcrt: Add explicit 32- and 64-bit versions of the time functions.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 8408e3a9551475a06e25b470ca5201935bf03478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8408e3a9551475a06e25b470c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 23 11:06:29 2009 +0200 msvcrt: Add explicit 32- and 64-bit versions of the time functions. --- dlls/msvcrt/msvcrt.h | 18 ++-- dlls/msvcrt/msvcrt.spec | 16 +++ dlls/msvcrt/tests/headers.c | 15 ++- dlls/msvcrt/time.c | 245 +++++++++++++++++++++++++++++++++++++++---- include/msvcrt/crtdefs.h | 14 ++- include/msvcrt/sys/timeb.h | 22 ++++- include/msvcrt/time.h | 49 ++++++++-- include/msvcrt/wchar.h | 13 ++- 8 files changed, 346 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8408e3a9551475a06e25b…

1 0

Alexandre Julliard : msvcrt: Add explicit 32- and 64-bit versions of the utime functions.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 4a7b3460ef6eacc895e13b1bb35c8e6518f96fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7b3460ef6eacc895e13b1bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 23 11:10:05 2009 +0200 msvcrt: Add explicit 32- and 64-bit versions of the utime functions. --- dlls/msvcrt/file.c | 117 ++++++++++++++++++++++++++++++++++++------ dlls/msvcrt/msvcrt.h | 12 +++- dlls/msvcrt/msvcrt.spec | 6 ++ dlls/msvcrt/tests/headers.c | 9 ++- include/msvcrt/sys/utime.h | 29 ++++++++++- 5 files changed, 147 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7e1210c..dd15b5d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -141,6 +141,16 @@ static void msvcrt_stat64_to_stati64(const struct MSVCRT__stat64 *buf64, struct buf->st_ctime = buf64->st_ctime; } +static void time_to_filetime( MSVCRT___time64_t time, FILETIME *ft ) +{ + /* 1601 to 1970 is 369 years plus 89 leap days */ + static const __int64 secs_1601_to_1970 = ((369 * 365 + 89) * (__int64)86400); + + __int64 ticks = (time + secs_1601_to_1970) * 10000000; + ft->dwHighDateTime = ticks >> 32; + ft->dwLowDateTime = ticks; +} + static inline BOOL msvcrt_is_valid_fd(int fd) { return fd >= 0 && fd < MSVCRT_fdend && (MSVCRT_fdesc[fd].wxflag & WX_OPEN); @@ -1213,27 +1223,22 @@ int CDECL MSVCRT__fstat(int fd, struct MSVCRT__stat* buf) } /********************************************************************* - * _futime (MSVCRT.@) + * _futime64 (MSVCRT.@) */ -int CDECL _futime(int fd, struct MSVCRT__utimbuf *t) +int CDECL _futime64(int fd, struct MSVCRT___utimbuf64 *t) { HANDLE hand = msvcrt_fdtoh(fd); FILETIME at, wt; if (!t) { - MSVCRT_time_t currTime; - MSVCRT_time(&currTime); - RtlSecondsSince1970ToTime(currTime, (LARGE_INTEGER *)&at); - wt = at; + time_to_filetime( MSVCRT__time64(NULL), &at ); + wt = at; } else { - RtlSecondsSince1970ToTime(t->actime, (LARGE_INTEGER *)&at); - if (t->actime == t->modtime) - wt = at; - else - RtlSecondsSince1970ToTime(t->modtime, (LARGE_INTEGER *)&wt); + time_to_filetime( t->actime, &at ); + time_to_filetime( t->modtime, &wt ); } if (!SetFileTime(hand, NULL, &at, &wt)) @@ -1245,6 +1250,32 @@ int CDECL _futime(int fd, struct MSVCRT__utimbuf *t) } /********************************************************************* + * _futime32 (MSVCRT.@) + */ +int CDECL _futime32(int fd, struct MSVCRT___utimbuf32 *t) +{ + struct MSVCRT___utimbuf64 t64; + t64.actime = t->actime; + t64.modtime = t->modtime; + return _futime64( fd, &t64 ); +} + +/********************************************************************* + * _futime (MSVCRT.@) + */ +#ifdef _WIN64 +int CDECL _futime(int fd, struct MSVCRT___utimbuf64 *t) +{ + return _futime64( fd, t ); +} +#else +int CDECL _futime(int fd, struct MSVCRT___utimbuf32 *t) +{ + return _futime32( fd, t ); +} +#endif + +/********************************************************************* * _get_osfhandle (MSVCRT.@) */ MSVCRT_intptr_t CDECL _get_osfhandle(int fd) @@ -2053,15 +2084,15 @@ int CDECL MSVCRT__umask(int umask) } /********************************************************************* - * _utime (MSVCRT.@) + * _utime64 (MSVCRT.@) */ -int CDECL _utime(const char* path, struct MSVCRT__utimbuf *t) +int CDECL _utime64(const char* path, struct MSVCRT___utimbuf64 *t) { int fd = MSVCRT__open(path, MSVCRT__O_WRONLY | MSVCRT__O_BINARY); if (fd > 0) { - int retVal = _futime(fd, t); + int retVal = _futime64(fd, t); MSVCRT__close(fd); return retVal; } @@ -2069,15 +2100,41 @@ int CDECL _utime(const char* path, struct MSVCRT__utimbuf *t) } /********************************************************************* - * _wutime (MSVCRT.@) + * _utime32 (MSVCRT.@) + */ +int CDECL _utime32(const char* path, struct MSVCRT___utimbuf32 *t) +{ + struct MSVCRT___utimbuf64 t64; + t64.actime = t->actime; + t64.modtime = t->modtime; + return _utime64( path, &t64 ); +} + +/********************************************************************* + * _utime (MSVCRT.@) */ -int CDECL _wutime(const MSVCRT_wchar_t* path, struct MSVCRT__utimbuf *t) +#ifdef _WIN64 +int CDECL _utime(const char* path, struct MSVCRT___utimbuf64 *t) +{ + return _utime64( path, t ); +} +#else +int CDECL _utime(const char* path, struct MSVCRT___utimbuf32 *t) +{ + return _utime32( path, t ); +} +#endif + +/********************************************************************* + * _wutime64 (MSVCRT.@) + */ +int CDECL _wutime64(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf64 *t) { int fd = _wopen(path, MSVCRT__O_WRONLY | MSVCRT__O_BINARY); if (fd > 0) { - int retVal = _futime(fd, t); + int retVal = _futime64(fd, t); MSVCRT__close(fd); return retVal; } @@ -2085,6 +2142,32 @@ int CDECL _wutime(const MSVCRT_wchar_t* path, struct MSVCRT__utimbuf *t) } /********************************************************************* + * _wutime32 (MSVCRT.@) + */ +int CDECL _wutime32(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf32 *t) +{ + struct MSVCRT___utimbuf64 t64; + t64.actime = t->actime; + t64.modtime = t->modtime; + return _wutime64( path, &t64 ); +} + +/********************************************************************* + * _wutime (MSVCRT.@) + */ +#ifdef _WIN64 +int CDECL _wutime(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf64 *t) +{ + return _wutime64( path, t ); +} +#else +int CDECL _wutime(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf32 *t) +{ + return _wutime32( path, t ); +} +#endif + +/********************************************************************* * _write (MSVCRT.@) */ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 70ad8e2..c10c8d3 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -335,10 +335,16 @@ struct MSVCRT__wfinddatai64_t { MSVCRT_wchar_t name[260]; }; -struct MSVCRT__utimbuf +struct MSVCRT___utimbuf32 { - MSVCRT_time_t actime; - MSVCRT_time_t modtime; + MSVCRT___time32_t actime; + MSVCRT___time32_t modtime; +}; + +struct MSVCRT___utimbuf64 +{ + MSVCRT___time64_t actime; + MSVCRT___time64_t modtime; }; /* for FreeBSD */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 759d0c0..b56aba0 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -272,6 +272,8 @@ @ cdecl -ret64 _ftol() ntdll._ftol @ cdecl _fullpath(ptr str long) @ cdecl _futime(long ptr) +@ cdecl _futime32(long ptr) +@ cdecl _futime64(long ptr) @ cdecl _gcvt(double long str) @ cdecl _get_osfhandle(long) @ cdecl _get_sbh_threshold() @@ -521,6 +523,8 @@ @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock(long) +@ cdecl _utime32(str ptr) +@ cdecl _utime64(str ptr) @ cdecl _utime(str ptr) @ cdecl _vscprintf(str ptr) @ cdecl _vscwprintf(wstr ptr) @@ -608,6 +612,8 @@ @ cdecl _wtol(wstr) ntdll._wtol @ cdecl _wunlink(wstr) @ cdecl _wutime(wstr ptr) +@ cdecl _wutime32(wstr ptr) +@ cdecl _wutime64(wstr ptr) @ cdecl _y0(double) @ cdecl _y1(double) @ cdecl _yn(long double ) diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index 603134f..b9fdbd7 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -219,9 +219,12 @@ static void test_structs(void) CHECK_FIELD(_wfinddatai64_t, time_write); CHECK_FIELD(_wfinddatai64_t, size); CHECK_FIELD(_wfinddatai64_t, name[260]); - CHECK_STRUCT(_utimbuf); - CHECK_FIELD(_utimbuf, actime); - CHECK_FIELD(_utimbuf, modtime); + CHECK_STRUCT(__utimbuf32); + CHECK_FIELD(__utimbuf32, actime); + CHECK_FIELD(__utimbuf32, modtime); + CHECK_STRUCT(__utimbuf64); + CHECK_FIELD(__utimbuf64, actime); + CHECK_FIELD(__utimbuf64, modtime); CHECK_STRUCT(_stat); CHECK_FIELD(_stat, st_dev); CHECK_FIELD(_stat, st_ino); diff --git a/include/msvcrt/sys/utime.h b/include/msvcrt/sys/utime.h index 95b1f9b..014351b 100644 --- a/include/msvcrt/sys/utime.h +++ b/include/msvcrt/sys/utime.h @@ -31,15 +31,38 @@ struct _utimbuf time_t actime; time_t modtime; }; +struct __utimbuf32 +{ + __time32_t actime; + __time32_t modtime; +}; +struct __utimbuf64 +{ + __time64_t actime; + __time64_t modtime; +}; #endif /* _UTIMBUF_DEFINED */ #ifdef __cplusplus extern "C" { #endif -int __cdecl _futime(int,struct _utimbuf*); -int __cdecl _utime(const char*,struct _utimbuf*); -int __cdecl _wutime(const wchar_t*,struct _utimbuf*); +int __cdecl _futime32(int,struct __utimbuf32*); +int __cdecl _futime64(int,struct __utimbuf64*); +int __cdecl _utime32(const char*,struct __utimbuf32*); +int __cdecl _utime64(const char*,struct __utimbuf64*); +int __cdecl _wutime32(const wchar_t*,struct __utimbuf32*); +int __cdecl _wutime64(const wchar_t*,struct __utimbuf64*); + +#ifdef _USE_32BIT_TIME_T +static inline int _futime(int fd, struct _utimbuf *buf) { return _futime32(fd, (struct __utimbuf32*)buf); } +static inline int _utime(const char *s, struct _utimbuf *buf) { return _utime32(s, (struct __utimbuf32*)buf); } +static inline int _wutime(const wchar_t *s, struct _utimbuf *buf) { return _wutime32(s, (struct __utimbuf32*)buf); } +#else +static inline int _futime(int fd, struct _utimbuf *buf) { return _futime64(fd, (struct __utimbuf64*)buf); } +static inline int _utime(const char *s, struct _utimbuf *buf) { return _utime64(s, (struct __utimbuf64*)buf); } +static inline int _wutime(const wchar_t *s, struct _utimbuf *buf) { return _wutime64(s, (struct __utimbuf64*)buf); } +#endif #ifdef __cplusplus }

1 0

Alexandre Julliard : msvcrt: Fix the stat and finddata structures for 64-bit.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: ac760a47f3f27594bd3ace8853c6e34e94074ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac760a47f3f27594bd3ace885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 23 11:15:19 2009 +0200 msvcrt: Fix the stat and finddata structures for 64-bit. --- dlls/msvcrt/file.c | 10 +- dlls/msvcrt/msvcrt.h | 187 +++++++++++++++++++++++++++---------------- dlls/msvcrt/msvcrt.spec | 6 +- dlls/msvcrt/tests/headers.c | 57 ------------- 4 files changed, 126 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac760a47f3f27594bd3ac…

1 0

Alexandre Julliard : msvcrt/tests: Make all msvcrt function pointers cdecl.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 7e082f66082cba5a54e03f996c84e04dcd1990be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e082f66082cba5a54e03f996… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 23 11:21:28 2009 +0200 msvcrt/tests: Make all msvcrt function pointers cdecl. --- dlls/msvcrt/tests/cpp.c | 16 ++++++++-------- dlls/msvcrt/tests/data.c | 6 +++--- dlls/msvcrt/tests/heap.c | 10 +++++----- dlls/msvcrt/tests/printf.c | 6 +++--- dlls/msvcrt/tests/string.c | 12 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 9c9158d..d640d67 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -55,10 +55,10 @@ typedef struct __type_info /* Function pointers. We need to use these to call these funcs as __thiscall */ static HMODULE hMsvcrt; -static void* (*poperator_new)(unsigned int); -static void (*poperator_delete)(void*); -static void* (*pmalloc)(unsigned int); -static void (*pfree)(void*); +static void* (__cdecl *poperator_new)(unsigned int); +static void (__cdecl *poperator_delete)(void*); +static void* (__cdecl *pmalloc)(unsigned int); +static void (__cdecl *pfree)(void*); /* exception */ static void (WINAPI *pexception_ctor)(exception*,LPCSTR*); @@ -113,12 +113,12 @@ static int (WINAPI *ptype_info_opequals_equals)(type_info*,type_info*); static int (WINAPI *ptype_info_opnot_equals)(type_info*,type_info*); /* RTTI */ -static type_info* (*p__RTtypeid)(void*); -static void* (*p__RTCastToVoid)(void*); -static void* (*p__RTDynamicCast)(void*,int,void*,void*,int); +static type_info* (__cdecl *p__RTtypeid)(void*); +static void* (__cdecl *p__RTCastToVoid)(void*); +static void* (__cdecl *p__RTDynamicCast)(void*,int,void*,void*,int); /*Demangle*/ -static char* (*p__unDName)(char*,const char*,int,void*,void*,unsigned short int); +static char* (__cdecl *p__unDName)(char*,const char*,int,void*,void*,unsigned short int); /* _very_ early native versions have serious RTTI bugs, so we check */ diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index 01704ac..a27ca27 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -31,12 +31,12 @@ #include <process.h> #include <errno.h> -typedef void (*_INITTERMFUN)(void); -static void (*p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); +typedef void (__cdecl *_INITTERMFUN)(void); +static void (__cdecl *p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); static int callbacked; -static void initcallback(void) +static void __cdecl initcallback(void) { callbacked++; } diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 7d3db23..3587e0e 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -23,11 +23,11 @@ #include <errno.h> #include "wine/test.h" -static void (*p_aligned_free)(void*) = NULL; -static void * (*p_aligned_malloc)(size_t,size_t) = NULL; -static void * (*p_aligned_offset_malloc)(size_t,size_t,size_t) = NULL; -static void * (*p_aligned_realloc)(void*,size_t,size_t) = NULL; -static void * (*p_aligned_offset_realloc)(void*,size_t,size_t,size_t) = NULL; +static void (__cdecl *p_aligned_free)(void*) = NULL; +static void * (__cdecl *p_aligned_malloc)(size_t,size_t) = NULL; +static void * (__cdecl *p_aligned_offset_malloc)(size_t,size_t,size_t) = NULL; +static void * (__cdecl *p_aligned_realloc)(void*,size_t,size_t) = NULL; +static void * (__cdecl *p_aligned_offset_realloc)(void*,size_t,size_t,size_t) = NULL; static void test_aligned_malloc(unsigned int size, unsigned int alignment) { diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 66bab15..cea4db3 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -782,7 +782,7 @@ static void test_xcvt(void) } } -static int _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +static int __cdecl _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) { int ret; __ms_va_list valist; @@ -810,8 +810,8 @@ static void test_vsnwprintf(void) ok( !strcmp(buf, "onetwothree"), "got %s expected 'onetwothree'\n", buf ); } -static int (*p__vscprintf)(const char *format, __ms_va_list valist); -static int (*p__vscwprintf)(const wchar_t *format, __ms_va_list valist); +static int (__cdecl *p__vscprintf)(const char *format, __ms_va_list valist); +static int (__cdecl *p__vscwprintf)(const wchar_t *format, __ms_va_list valist); static int __cdecl _vscprintf_wrapper(const char *format, ...) { diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 3286e91..96bcb7f 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -45,12 +45,12 @@ static char *buf_to_string(const unsigned char *bin, int len, int nr) #define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } #define expect_bin(buf, value, len) { ok(memcmp((buf), value, len) == 0, "Binary buffer mismatch - expected %s, got %s\n", buf_to_string((unsigned char *)value, len, 1), buf_to_string((buf), len, 0)); } -static void* (*pmemcpy)(void *, const void *, size_t n); -static int* (*pmemcmp)(void *, const void *, size_t n); -static int (*pstrcpy_s)(char *dst, size_t len, const char *src); -static int (*pstrcat_s)(char *dst, size_t len, const char *src); -static int (*p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); -static int (*p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); +static void* (__cdecl *pmemcpy)(void *, const void *, size_t n); +static int* (__cdecl *pmemcmp)(void *, const void *, size_t n); +static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); +static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); +static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); +static int (__cdecl *p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); static int *p__mb_cur_max; static unsigned char *p_mbctype;

1 0