June 2009 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use the format info for doing compressed surface blits in BltFast().
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: e83fa982ca2b2686945f3cbeb0117a56703dc30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e83fa982ca2b2686945f3cbeb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 10 09:44:05 2009 +0200 wined3d: Use the format info for doing compressed surface blits in BltFast(). --- dlls/wined3d/surface_base.c | 46 +++++++++--------------------------------- 1 files changed, 10 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 50faf9a..407a6db 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1650,65 +1650,39 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst dEntry = This->resource.format_desc; } - /* Handle first the FOURCC surfaces... */ - if (sEntry->Flags & dEntry->Flags & WINED3DFMT_FLAG_FOURCC) + /* Handle compressed surfaces first... */ + if (sEntry->Flags & dEntry->Flags & WINED3DFMT_FLAG_COMPRESSED) { - UINT block_width; - UINT block_height; - UINT block_byte_size; UINT row_block_count; - TRACE("Fourcc -> Fourcc copy\n"); + TRACE("compressed -> compressed copy\n"); if (trans) - FIXME("trans arg not supported when a FOURCC surface is involved\n"); + FIXME("trans arg not supported when a compressed surface is involved\n"); if (dstx || dsty) FIXME("offset for destination surface is not supported\n"); if (Src->resource.format_desc->format != This->resource.format_desc->format) { - FIXME("FOURCC->FOURCC copy only supported for the same type of surface\n"); + FIXME("compressed -> compressed copy only supported for the same type of surface\n"); ret = WINED3DERR_WRONGTEXTUREFORMAT; goto error; } - if (This->resource.format_desc->format == WINED3DFMT_DXT1) - { - block_width = 4; - block_height = 4; - block_byte_size = 8; - } - else if (This->resource.format_desc->format == WINED3DFMT_DXT2 - || This->resource.format_desc->format == WINED3DFMT_DXT3 - || This->resource.format_desc->format == WINED3DFMT_DXT4 - || This->resource.format_desc->format == WINED3DFMT_DXT5) - { - block_width = 4; - block_height = 4; - block_byte_size = 16; - } - else - { - FIXME("Unsupported FourCC format %s.\n", debug_d3dformat(This->resource.format_desc->format)); - block_width = 1; - block_height = 1; - block_byte_size = This->resource.format_desc->byte_count; - } - - row_block_count = (w + block_width - 1) / block_width; - for (y = 0; y < h; y += block_height) + row_block_count = (w + dEntry->block_width - 1) / dEntry->block_width; + for (y = 0; y < h; y += dEntry->block_height) { - memcpy(dbuf, sbuf, row_block_count * block_byte_size); + memcpy(dbuf, sbuf, row_block_count * dEntry->block_byte_count); dbuf += dlock.Pitch; sbuf += slock.Pitch; } goto error; } - if ((sEntry->Flags & WINED3DFMT_FLAG_FOURCC) && !(dEntry->Flags & WINED3DFMT_FLAG_FOURCC)) + if ((sEntry->Flags & WINED3DFMT_FLAG_COMPRESSED) && !(dEntry->Flags & WINED3DFMT_FLAG_COMPRESSED)) { /* TODO: Use the libtxc_dxtn.so shared library to do * software decompression */ - ERR("DXTC decompression not supported by now\n"); + ERR("Software decompression not supported.\n"); goto error; }

1 0

Stefan Dösinger : wined3d: Store the bumpmap ARB constants in ARB structures.
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: 298bd3c50da3fd181ba73a5c139c45ef8d0db743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=298bd3c50da3fd181ba73a5c1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 14:14:12 2009 -0700 wined3d: Store the bumpmap ARB constants in ARB structures. --- dlls/wined3d/arb_program_shader.c | 149 +++++++++++++++++++++---------------- dlls/wined3d/glsl_shader.c | 31 +++----- dlls/wined3d/wined3d_private.h | 8 -- 3 files changed, 97 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=298bd3c50da3fd181ba73…

1 0

Henri Verbeet : wined3d: Round rows up to whole blocks for compressed surface blits in BltFast().
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: 9d71a5f1e09420bc91d1e5d167f3e5bc0fa97d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d71a5f1e09420bc91d1e5d16… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 10 09:44:04 2009 +0200 wined3d: Round rows up to whole blocks for compressed surface blits in BltFast(). --- dlls/wined3d/surface_base.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index d487f80..50faf9a 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1656,6 +1656,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst UINT block_width; UINT block_height; UINT block_byte_size; + UINT row_block_count; TRACE("Fourcc -> Fourcc copy\n"); if (trans) @@ -1692,9 +1693,10 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst block_byte_size = This->resource.format_desc->byte_count; } + row_block_count = (w + block_width - 1) / block_width; for (y = 0; y < h; y += block_height) { - memcpy(dbuf, sbuf, (w / block_width) * block_byte_size); + memcpy(dbuf, sbuf, row_block_count * block_byte_size); dbuf += dlock.Pitch; sbuf += slock.Pitch; }

1 0

Henri Verbeet : wined3d: Set explicitly sized internal formats for color key conversion in d3dfmt_get_conv ().
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: 5ac8a7b054e75912c9ca1e99d3de242e11ebfe51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac8a7b054e75912c9ca1e99d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 10 09:44:04 2009 +0200 wined3d: Set explicitly sized internal formats for color key conversion in d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 81c93e2..11e467b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1691,7 +1691,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if (colorkey_active) { *convert = CONVERT_CK_565; *format = GL_RGBA; - *internal = GL_RGBA; + *internal = GL_RGB5_A1; *type = GL_UNSIGNED_SHORT_5_5_5_1; } break; @@ -1700,7 +1700,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if (colorkey_active) { *convert = CONVERT_CK_5551; *format = GL_BGRA; - *internal = GL_RGBA; + *internal = GL_RGB5_A1; *type = GL_UNSIGNED_SHORT_1_5_5_5_REV; } break; @@ -1709,7 +1709,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if (colorkey_active) { *convert = CONVERT_CK_RGB24; *format = GL_RGBA; - *internal = GL_RGBA; + *internal = GL_RGBA8; *type = GL_UNSIGNED_INT_8_8_8_8; *target_bpp = 4; } @@ -1719,7 +1719,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if (colorkey_active) { *convert = CONVERT_RGB32_888; *format = GL_RGBA; - *internal = GL_RGBA; + *internal = GL_RGBA8; *type = GL_UNSIGNED_INT_8_8_8_8; } break;

1 0

Piotr Caban : jscript: Added Date_getHours and Date_getUTCHours implementation.
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: cfb7617688c1b255e3aeaa3caaad67dee4dd8365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb7617688c1b255e3aeaa3ca… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jun 9 15:39:18 2009 +0200 jscript: Added Date_getHours and Date_getUTCHours implementation. --- dlls/jscript/date.c | 42 ++++++++++++++++++++++++++++++++++++++---- dlls/jscript/tests/api.js | 6 +++++- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 8056cc2..1dd9b96 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -85,6 +85,7 @@ static const WCHAR setUTCFullYearW[] = {'s','e','t','U','T','C','F','u','l','l', /*ECMA-262 3th Edition 15.9.1.2 */ #define MS_PER_DAY 86400000 +#define MS_PER_HOUR 3600000 #define MS_PER_MINUTE 60000 /* ECMA-262 3th Edition 15.9.1.2 */ @@ -215,6 +216,15 @@ static inline DOUBLE week_day(DOUBLE time) return (int)(day(time)+4) % 7; } +/* ECMA-262 3th Edition 15.9.1.10 */ +static inline DOUBLE hour_from_time(DOUBLE time) +{ + if(isnan(time)) + return ret_nan(); + + return (int)floor(time/MS_PER_HOUR) % 24; +} + /* ECMA-262 3rd Edition 15.9.1.14 */ static inline DOUBLE time_clip(DOUBLE time) { @@ -472,18 +482,42 @@ static HRESULT Date_getUTCDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return S_OK; } +/* ECMA-262 3th Edition 15.9.1.10 */ static HRESULT Date_getHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + DOUBLE time = date->time - date->bias*MS_PER_MINUTE; + + num_set_val(retv, hour_from_time(time)); + } + return S_OK; } +/* ECMA-262 3th Edition 15.9.1.10 */ static HRESULT Date_getUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + num_set_val(retv, hour_from_time(date->time)); + } + return S_OK; } static HRESULT Date_getMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2238a94..ceb314f 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -950,22 +950,26 @@ ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullY ok(date.getUTCMonth() === 0, "date.getUTCMonth() = " + date.getUTCMonth()); ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate()); ok(date.getUTCDay() === 4, "date.getUTCDay() = " + date.getUTCDay()); +ok(date.getUTCHours() === 0, "date.getUTCHours() = " + date.getUTCHours()); date.setTime(60*24*60*60*1000); ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear()); ok(date.getUTCMonth() === 2, "date.getUTCMonth() = " + date.getUTCMonth()); ok(date.getUTCDate() === 2, "date.getUTCDate() = " + date.getUTCDate()); ok(date.getUTCDay() === 1, "date.getUTCDay() = " + date.getUTCDay()); -date.setTime(59*24*60*60*1000 + 4*365*24*60*60*1000); +ok(date.getUTCHours() === 0, "date.getUTCHours() = " + date.getUTCHours()); +date.setTime(59*24*60*60*1000 + 4*365*24*60*60*1000 + 1000*60*60); ok(date.getUTCFullYear() === 1974, "date.getUTCFullYear() = " + date.getUTCFullYear()); ok(date.getUTCMonth() === 1, "date.getUTCMonth() = " + date.getUTCMonth()); ok(date.getUTCMonth(123) === 1, "date.getUTCMonth() = " + date.getUTCMonth()); ok(date.getUTCDate() === 28, "date.getUTCDate() = " + date.getUTCDate()); ok(date.getUTCDay() === 4, "date.getUTCDay() = " + date.getUTCDay()); +ok(date.getUTCHours() === 1, "date.getUTCHours() = " + date.getUTCHours()); date.setTime(Infinity); ok(isNaN(date.getUTCFullYear()), "date.getUTCFullYear() is not NaN"); ok(isNaN(date.getUTCMonth()), "date.getUTCMonth() is not NaN"); ok(isNaN(date.getUTCDate()), "date.getUTCDate() is not NaN"); ok(isNaN(date.getUTCDay()), "date.getUTCDay() is not NaN"); +ok(isNaN(date.getUTCHours()), "date.getUTCHours() is not NaN"); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Piotr Caban : jscript: Added Date_getMonth and Date_getUTCMonth implementation.
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: 3f289de8a3325ab728d7d3052f326264e71edbbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f289de8a3325ab728d7d3052… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jun 9 14:02:42 2009 +0200 jscript: Added Date_getMonth and Date_getUTCMonth implementation. --- dlls/jscript/date.c | 90 +++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 5 ++ 2 files changed, 91 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 5b957f4..d018a10 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -87,6 +87,27 @@ static const WCHAR setUTCFullYearW[] = {'s','e','t','U','T','C','F','u','l','l', #define MS_PER_DAY 86400000 #define MS_PER_MINUTE 60000 +/* ECMA-262 3th Edition 15.9.1.2 */ +static inline DOUBLE day(DOUBLE time) +{ + return floor(time / MS_PER_DAY); +} + +/* ECMA-262 3th Edition 15.9.1.3 */ +static inline DOUBLE days_in_year(DOUBLE year) +{ + int y; + + if(year != (int)year) + return ret_nan(); + + y = year; + if(y%4 != 0) return 365; + if(y%100 != 0) return 366; + if(y%400 != 0) return 365; + return 366; +} + /* ECMA-262 3th Edition 15.9.1.3 */ static inline DOUBLE day_from_year(DOUBLE year) { @@ -124,6 +145,43 @@ static inline DOUBLE year_from_time(DOUBLE time) return y; } +/* ECMA-262 3th Edition 15.9.1.3 */ +static inline int in_leap_year(DOUBLE time) +{ + if(days_in_year(year_from_time(time))==366) + return 1; + return 0; +} + +/* ECMA-262 3th Edition 15.9.1.4 */ +static inline int day_within_year(DOUBLE time) +{ + return day(time) - day_from_year(year_from_time(time)); +} + +/* ECMA-262 3th Edition 15.9.1.4 */ +static inline DOUBLE month_from_time(DOUBLE time) +{ + int ily = in_leap_year(time); + int dwy = day_within_year(time); + + if(isnan(time)) + return ret_nan(); + + if(0<=dwy && dwy<31) return 0; + if(dwy < 59+ily) return 1; + if(dwy < 90+ily) return 2; + if(dwy < 120+ily) return 3; + if(dwy < 151+ily) return 4; + if(dwy < 181+ily) return 5; + if(dwy < 212+ily) return 6; + if(dwy < 243+ily) return 7; + if(dwy < 273+ily) return 8; + if(dwy < 304+ily) return 9; + if(dwy < 334+ily) return 10; + return 11; +} + /* ECMA-262 3rd Edition 15.9.1.14 */ static inline DOUBLE time_clip(DOUBLE time) { @@ -267,18 +325,42 @@ static HRESULT Date_getUTCFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DI return S_OK; } +/* ECMA-262 3th Edition 15.9.1.4 */ static HRESULT Date_getMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + DOUBLE time = date->time - date->bias*MS_PER_MINUTE; + + num_set_val(retv, month_from_time(time)); + } + return S_OK; } +/* ECMA-262 3th Edition 15.9.1.4 */ static HRESULT Date_getUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + num_set_val(retv, month_from_time(date->time)); + } + return S_OK; } static HRESULT Date_getDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a10665d..1a10863 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -947,12 +947,17 @@ ok(isNaN(date.setTime(NaN)), "date.setTime(NaN) is not NaN"); ok(date.setTime(0) === date.getTime(), "date.setTime(0) !== date.getTime()"); ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear()); +ok(date.getUTCMonth() === 0, "date.getUTCMonth() = " + date.getUTCMonth()); date.setTime(60*24*60*60*1000); ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear()); +ok(date.getUTCMonth() === 2, "date.getUTCMonth() = " + date.getUTCMonth()); date.setTime(59*24*60*60*1000 + 4*365*24*60*60*1000); ok(date.getUTCFullYear() === 1974, "date.getUTCFullYear() = " + date.getUTCFullYear()); +ok(date.getUTCMonth() === 1, "date.getUTCMonth() = " + date.getUTCMonth()); +ok(date.getUTCMonth(123) === 1, "date.getUTCMonth() = " + date.getUTCMonth()); date.setTime(Infinity); ok(isNaN(date.getUTCFullYear()), "date.getUTCFullYear() is not NaN"); +ok(isNaN(date.getUTCMonth()), "date.getUTCMonth() is not NaN"); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Piotr Caban : jscript: Added Date_getFullYear and Date_getUTCFullYear implementation.
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: 8427127bb976d8cd3114e8f245921f341ee9904a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8427127bb976d8cd3114e8f24… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jun 9 14:01:01 2009 +0200 jscript: Added Date_getFullYear and Date_getUTCFullYear implementation. --- dlls/jscript/date.c | 73 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 9 +++++ 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index e17ad26..5b957f4 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -83,6 +83,47 @@ static const WCHAR setUTCMonthW[] = {'s','e','t','U','T','C','M','o','n','t','h' static const WCHAR setFullYearW[] = {'s','e','t','F','u','l','l','Y','e','a','r',0}; static const WCHAR setUTCFullYearW[] = {'s','e','t','U','T','C','F','u','l','l','Y','e','a','r',0}; +/*ECMA-262 3th Edition 15.9.1.2 */ +#define MS_PER_DAY 86400000 +#define MS_PER_MINUTE 60000 + +/* ECMA-262 3th Edition 15.9.1.3 */ +static inline DOUBLE day_from_year(DOUBLE year) +{ + int y; + + if(year != (int)year) + return ret_nan(); + + y = year; + return 365*(y-1970) + floor((y-1969)/4) + - floor((y-1901)/100) + floor((y-1601)/400); +} + +/* ECMA-262 3th Edition 15.9.1.3 */ +static inline DOUBLE time_from_year(DOUBLE year) +{ + return MS_PER_DAY*day_from_year(year); +} + +/* ECMA-262 3th Edition 15.9.1.3 */ +static inline DOUBLE year_from_time(DOUBLE time) +{ + int y; + + if(isnan(time)) + return ret_nan(); + + y = 1970 + time/365.25/MS_PER_DAY; + + if(time_from_year(y) > time) + while(time_from_year(y) > time) y--; + else + while(time_from_year(y+1)<=time) y++; + + return y; +} + /* ECMA-262 3rd Edition 15.9.1.14 */ static inline DOUBLE time_clip(DOUBLE time) { @@ -188,18 +229,42 @@ static HRESULT Date_getTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return S_OK; } +/* ECMA-262 3th Edition 15.9.1.3 */ static HRESULT Date_getFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + DOUBLE time = date->time - date->bias*MS_PER_MINUTE; + + num_set_val(retv, year_from_time(time)); + } + return S_OK; } +/* ECMA-262 3th Edition 15.9.1.3 */ static HRESULT Date_getUTCFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + num_set_val(retv, year_from_time(date->time)); + } + return S_OK; } static HRESULT Date_getMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1f922b9..a10665d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -945,6 +945,15 @@ ok(date.setTime(123) === 123, "date.setTime(123) !== 123"); ok(date.setTime("123", NaN) === 123, "date.setTime(\"123\") !== 123"); ok(isNaN(date.setTime(NaN)), "date.setTime(NaN) is not NaN"); +ok(date.setTime(0) === date.getTime(), "date.setTime(0) !== date.getTime()"); +ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear()); +date.setTime(60*24*60*60*1000); +ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear()); +date.setTime(59*24*60*60*1000 + 4*365*24*60*60*1000); +ok(date.getUTCFullYear() === 1974, "date.getUTCFullYear() = " + date.getUTCFullYear()); +date.setTime(Infinity); +ok(isNaN(date.getUTCFullYear()), "date.getUTCFullYear() is not NaN"); + ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI); Math.PI = "test";

1 0

Andrew Talbot : comdlg32: Constify some variables.
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: 764974e59d4785e17ab4ffd91c9e3bda248e087e URL: http://source.winehq.org/git/wine.git/?a=commit;h=764974e59d4785e17ab4ffd91… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jun 9 22:41:27 2009 +0100 comdlg32: Constify some variables. --- dlls/comdlg32/filedlg.c | 2 +- dlls/comdlg32/printdlg.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 10fccc2..b820624 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3297,7 +3297,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) * Although shell32 is already linked the behaviour of exported StrRetToStrN * is dependent on whether emulated OS is unicode or not. */ -static HRESULT COMDLG32_StrRetToStrNW (LPWSTR dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl) +static HRESULT COMDLG32_StrRetToStrNW (LPWSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) { switch (src->uType) { diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 6726c6a..21366fd 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2364,7 +2364,7 @@ static inline BOOL is_metric(const pagesetup_data *data) return pagesetup_get_flags(data) & PSD_INHUNDREDTHSOFMILLIMETERS; } -static inline LONG tenths_mm_to_size(pagesetup_data *data, LONG size) +static inline LONG tenths_mm_to_size(const pagesetup_data *data, LONG size) { if (is_metric(data)) return 10 * size; @@ -2372,7 +2372,7 @@ static inline LONG tenths_mm_to_size(pagesetup_data *data, LONG size) return 10 * size * 100 / 254; } -static inline LONG thousandths_inch_to_size(pagesetup_data *data, LONG size) +static inline LONG thousandths_inch_to_size(const pagesetup_data *data, LONG size) { if (is_metric(data)) return size * 254 / 100; @@ -2537,7 +2537,7 @@ typedef enum } devnames_name; -static inline WORD get_devname_offset(DEVNAMES *dn, devnames_name which) +static inline WORD get_devname_offset(const DEVNAMES *dn, devnames_name which) { switch(which) { @@ -3010,7 +3010,7 @@ static void update_margin_edits(HWND hDlg, const pagesetup_data *data, WORD id) } } -static void margin_edit_notification(HWND hDlg, pagesetup_data *data, WORD msg, WORD id) +static void margin_edit_notification(HWND hDlg, const pagesetup_data *data, WORD msg, WORD id) { switch (msg) {

1 0

Vincent Povirk : gdiplus: Stub GdipSetPathGradientPresetBlend.
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: edce2c124af85b31f2accfca89e5236807ec6168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edce2c124af85b31f2accfca8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 9 12:11:38 2009 -0500 gdiplus: Stub GdipSetPathGradientPresetBlend. --- dlls/gdiplus/brush.c | 7 +++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 92052f7..824ece0 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1315,6 +1315,13 @@ GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient *brush, GDIPCONST RE return NotImplemented; } +GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient *brush, + GDIPCONST ARGB *blend, GDIPCONST REAL *pos, INT count) +{ + FIXME("(%p,%p,%p,%i): stub\n", brush, blend, pos, count); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, ARGB argb) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c658e00..72fdcb6 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -556,7 +556,7 @@ @ stdcall GdipSetPathGradientGammaCorrection(ptr long) @ stub GdipSetPathGradientLinearBlend @ stub GdipSetPathGradientPath -@ stub GdipSetPathGradientPresetBlend +@ stdcall GdipSetPathGradientPresetBlend(ptr ptr ptr long) @ stdcall GdipSetPathGradientSigmaBlend(ptr long long) @ stdcall GdipSetPathGradientSurroundColorsWithCount(ptr ptr ptr) @ stub GdipSetPathGradientTransform

1 0

André Hentschel : cryptui: Improve German translation.
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: 7db8ecb61101c747a92bd720030e78bdf208bd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7db8ecb61101c747a92bd7200… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 9 20:21:02 2009 +0200 cryptui: Improve German translation. --- dlls/cryptui/cryptui_De.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/cryptui/cryptui_De.rc b/dlls/cryptui/cryptui_De.rc index 3049f42..e9c8182 100644 --- a/dlls/cryptui/cryptui_De.rc +++ b/dlls/cryptui/cryptui_De.rc @@ -198,14 +198,14 @@ STYLE WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Anzeigen:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14, + COMBOBOX IDC_DETAIL_SELECT, 43,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 - PUSHBUTTON "&Eigenschaften bearbeiten...", IDC_EDITPROPERTIES,83,216,90,14 + PUSHBUTTON "&Eigenschaften bearbeiten...", IDC_EDITPROPERTIES,75,216,98,14 PUSHBUTTON "In &Datei kopieren...", IDC_EXPORT,177,216,70,14 END @@ -230,8 +230,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_USERNOTICE,"RichEdit20W", WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200 - PUSHBUTTON "Schließen", IDOK,103,216,70,14 - PUSHBUTTON "weitere &Informationen", IDC_CPS,177,216,70,14 + PUSHBUTTON "Schließen", IDOK,95,216,70,14 + PUSHBUTTON "weitere &Informationen", IDC_CPS,171,216,76,14 END IDD_CERT_PROPERTIES_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 @@ -239,7 +239,7 @@ CAPTION "Allgemein" STYLE WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Angezeigter &Name:", -1, 6,14,60,14 + LTEXT "&Name:", -1, 6,14,60,14 EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP LTEXT "&Beschreibung:", -1, 6,32,60,14 EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL @@ -253,7 +253,7 @@ BEGIN CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 24,100,220,90 - PUSHBUTTON "&Zweck hinzufügen...", IDC_ADD_PURPOSE,184,194,60,14 + PUSHBUTTON "&Zweck hinzufügen...", IDC_ADD_PURPOSE,173,194,71,14 END IDD_ADD_CERT_PURPOSE DIALOG DISCARDABLE 0,0,200,68 @@ -300,7 +300,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Dateiname:", -1, 21,1,195,10 EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP - PUSHBUTTON "D&rchsuchen...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 + PUSHBUTTON "D&urchsuchen...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 LTEXT "Hinweis: Es können mehrere Zertifikate in einer Datei folgender Formate gespeichert werden:", -1, 21,26,265,16 LTEXT "Syntaxstandard kryptografischer Meldungen /PKCS #7 Messages (.p7b)",

1 0