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

Piotr Caban : jscript: Added Date_getFullYear and Date_getUTCFullYear implementation.
by Alexandre Julliard 10 Jun '09

10 Jun '09

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

Piotr Caban : jscript: Added Date_getMonth and Date_getUTCMonth implementation.
by Alexandre Julliard 10 Jun '09

10 Jun '09

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_getDate and Date_getUTCDate implementation.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 190ed2ef99bc5a20afc8a193d5b37588062bf01a URL: http://source.winehq.org/git/wine.git/?a=commit;h=190ed2ef99bc5a20afc8a193d… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jun 9 14:04:09 2009 +0200 jscript: Added Date_getDate and Date_getUTCDate implementation. --- dlls/jscript/date.c | 56 +++++++++++++++++++++++++++++++++++++++++--- dlls/jscript/tests/api.js | 4 +++ 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index d018a10..84d4170 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -182,6 +182,30 @@ static inline DOUBLE month_from_time(DOUBLE time) return 11; } +/* ECMA-262 3th Edition 15.9.1.5 */ +static inline DOUBLE date_from_time(DOUBLE time) +{ + int dwy = day_within_year(time); + int ily = in_leap_year(time); + int mft = month_from_time(time); + + if(isnan(time)) + return ret_nan(); + + if(mft==0) return dwy+1; + if(mft==1) return dwy-30; + if(mft==2) return dwy-58-ily; + if(mft==3) return dwy-89-ily; + if(mft==4) return dwy-119-ily; + if(mft==5) return dwy-150-ily; + if(mft==6) return dwy-180-ily; + if(mft==7) return dwy-211-ily; + if(mft==8) return dwy-242-ily; + if(mft==9) return dwy-272-ily; + if(mft==10) return dwy-303-ily; + return dwy-333-ily; +} + /* ECMA-262 3rd Edition 15.9.1.14 */ static inline DOUBLE time_clip(DOUBLE time) { @@ -363,18 +387,42 @@ static HRESULT Date_getUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPP return S_OK; } +/* ECMA-262 3th Edition 15.9.1.5 */ static HRESULT Date_getDate(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, date_from_time(time)); + } + return S_OK; } +/* ECMA-262 3th Edition 15.9.1.5 */ static HRESULT Date_getUTCDate(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, date_from_time(date->time)); + } + return S_OK; } static HRESULT Date_getDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1a10863..8616cc0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -948,16 +948,20 @@ 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()); +ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate()); 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()); 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()); +ok(date.getUTCDate() === 28, "date.getUTCDate() = " + date.getUTCDate()); 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(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_getDay and Date_getUTCDay implementation.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 28e033e359ce5a509bf148c45b7db2c8b85e9120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e033e359ce5a509bf148c45… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jun 9 14:05:23 2009 +0200 jscript: Added Date_getDay and Date_getUTCDay implementation. --- dlls/jscript/date.c | 41 +++++++++++++++++++++++++++++++++++++---- dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 84d4170..8056cc2 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -206,6 +206,15 @@ static inline DOUBLE date_from_time(DOUBLE time) return dwy-333-ily; } +/* ECMA-262 3th Edition 15.9.1.6 */ +static inline DOUBLE week_day(DOUBLE time) +{ + if(isnan(time)) + return ret_nan(); + + return (int)(day(time)+4) % 7; +} + /* ECMA-262 3rd Edition 15.9.1.14 */ static inline DOUBLE time_clip(DOUBLE time) { @@ -425,18 +434,42 @@ static HRESULT Date_getUTCDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA return S_OK; } +/* ECMA-262 3th Edition 15.9.1.6 */ static HRESULT Date_getDay(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, week_day(time)); + } + return S_OK; } +/* ECMA-262 3th Edition 15.9.1.6 */ static HRESULT Date_getUTCDay(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, week_day(date->time)); + } + return S_OK; } static HRESULT Date_getHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 8616cc0..2238a94 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -949,19 +949,23 @@ 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()); ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate()); +ok(date.getUTCDay() === 4, "date.getUTCDay() = " + date.getUTCDay()); 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.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()); 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(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Vladimir Pankratov : advpack: Add stub for ExtractFilesW.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 49cc1fa0ce176817e2267860de94ded919b78621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49cc1fa0ce176817e2267860d… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jun 9 22:15:12 2009 +0500 advpack: Add stub for ExtractFilesW. --- dlls/advpack/advpack.spec | 2 +- dlls/advpack/files.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 2ba1057..665d1e1 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -17,7 +17,7 @@ @ stdcall ExecuteCabW(ptr ptr ptr) @ stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA @ stdcall ExtractFilesA(str str long ptr ptr long) -# stdcall ExtractFilesW(wstr wstr long ptr ptr long) +@ stdcall ExtractFilesW(wstr wstr long ptr ptr long) @ stdcall ExtractFiles(str str long ptr ptr long) ExtractFilesA @ stdcall FileSaveMarkNotExistA(str str str) @ stdcall FileSaveMarkNotExistW(wstr wstr wstr) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 63f4080..216b863 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -749,6 +749,44 @@ done: } /*********************************************************************** + * ExtractFilesW (ADVPACK.@) + * + * Extracts the specified files from a cab archive into + * a destination directory. + * + * PARAMS + * CabName [I] Filename of the cab archive. + * ExpandDir [I] Destination directory for the extracted files. + * Flags [I] Reserved. + * FileList [I] Optional list of files to extract. See NOTES. + * LReserved [I] Reserved. Must be NULL. + * Reserved [I] Reserved. Must be 0. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * + * NOTES + * FileList is a colon-separated list of filenames. If FileList is + * non-NULL, only the files in the list will be extracted from the + * cab file, otherwise all files will be extracted. Any number of + * spaces, tabs, or colons can be before or after the list, but + * the list itself must only be separated by colons. + * + * BUGS + * Unimplemented. + */ +HRESULT WINAPI ExtractFilesW(LPCWSTR CabName, LPCWSTR ExpandDir, DWORD Flags, + LPCWSTR FileList, LPVOID LReserved, DWORD Reserved) +{ + + FIXME("(%s, %s, %d, %s, %p, %d) stub!\n", debugstr_w(CabName), debugstr_w(ExpandDir), + Flags, debugstr_w(FileList), LReserved, Reserved); + + return E_FAIL; +} + +/*********************************************************************** * FileSaveMarkNotExistA (ADVPACK.@) * * See FileSaveMarkNotExistW.

1 0

Huw Davies : oleaut32: TLibAttr. lcid is read from the second lcid field in the header. Confirmed by manually editing a tlb file.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 9da0b352f640f33da4ea8be36b5ddab48abef790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da0b352f640f33da4ea8be36… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 9 14:59:52 2009 +0100 oleaut32: TLibAttr.lcid is read from the second lcid field in the header. Confirmed by manually editing a tlb file. --- dlls/oleaut32/typelib.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5ddbe1b..10f5e23 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2872,13 +2872,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) /* TLIBATTR fields */ MSFT_ReadGuid(&pTypeLibImpl->LibAttr.guid, tlbHeader.posguid, &cx); - /* pTypeLibImpl->LibAttr.lcid = tlbHeader.lcid;*/ - /* Windows seems to have zero here, is this correct? */ - if(SUBLANGID(tlbHeader.lcid) == SUBLANG_NEUTRAL) - pTypeLibImpl->LibAttr.lcid = MAKELCID(MAKELANGID(PRIMARYLANGID(tlbHeader.lcid),0),0); - else - pTypeLibImpl->LibAttr.lcid = 0; - + pTypeLibImpl->LibAttr.lcid = tlbHeader.lcid2; pTypeLibImpl->LibAttr.syskind = tlbHeader.varflags & 0x0f; /* check the mask */ pTypeLibImpl->LibAttr.wMajorVerNum = LOWORD(tlbHeader.version); pTypeLibImpl->LibAttr.wMinorVerNum = HIWORD(tlbHeader.version);

1 0

Paul Vriens : riched32/tests: Fix some test failures on Win9x/WinME/NT4.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 8e0849f7a64eeb2348b9a75461386f73f2ad87b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0849f7a64eeb2348b9a7546… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 9 16:08:29 2009 +0200 riched32/tests: Fix some test failures on Win9x/WinME/NT4. --- dlls/riched32/tests/editor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 269a425..cb5db77 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -650,6 +650,7 @@ static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f, ft.chrg.cpMin = f->start; ft.chrg.cpMax = f->end; ft.lpstrText = f->needle; + ft.chrgText.cpMax = 0xdeadbeef; findloc = SendMessage(hwnd, EM_FINDTEXTEX, f->flags, (LPARAM) &ft); ok(findloc == f->expected_loc, "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", @@ -659,7 +660,8 @@ static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f, name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMin, f->expected_loc); expected_end_loc = ((f->expected_loc == -1) ? -1 : f->expected_loc + strlen(f->needle)); - ok(ft.chrgText.cpMax == expected_end_loc, + ok(ft.chrgText.cpMax == expected_end_loc || + broken(ft.chrgText.cpMin == -1 && ft.chrgText.cpMax == 0xdeadbeef), /* Win9x, WinME and NT4 */ "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d, expected %d\n", name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMax, expected_end_loc); }

1 0

Henri Verbeet : wined3d: Avoid comparing shader compile args if the relevant shader isn't present.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: a6dc31e442b23e5ee3b7bc98acc9a091a74d7279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6dc31e442b23e5ee3b7bc98a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 9 10:47:19 2009 +0200 wined3d: Avoid comparing shader compile args if the relevant shader isn't present. --- dlls/wined3d/glsl_shader.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6c0fd84..48c2c03 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3958,15 +3958,9 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use if(use_vs) { find_vs_compile_args((IWineD3DVertexShaderImpl*)This->stateBlock->vertexShader, This->stateBlock, &vs_compile_args); - } else { - /* FIXME: Do we really have to spend CPU cycles to generate a few zeroed bytes? */ - memset(&vs_compile_args, 0, sizeof(vs_compile_args)); } if(use_ps) { find_ps_compile_args((IWineD3DPixelShaderImpl*)This->stateBlock->pixelShader, This->stateBlock, &ps_compile_args); - } else { - /* FIXME: Do we really have to spend CPU cycles to generate a few zeroed bytes? */ - memset(&ps_compile_args, 0, sizeof(ps_compile_args)); } entry = get_glsl_program_entry(priv, vshader, pshader, &vs_compile_args, &ps_compile_args); if (entry) { @@ -4399,11 +4393,10 @@ static int glsl_program_key_compare(const void *key, const struct wine_rb_entry if (k->pshader > prog->pshader) return 1; else if (k->pshader < prog->pshader) return -1; - cmp = memcmp(&k->vs_args, &prog->vs_args, sizeof(prog->vs_args)); - if (cmp) return cmp; + if (k->vshader && (cmp = memcmp(&k->vs_args, &prog->vs_args, sizeof(prog->vs_args)))) return cmp; + if (k->pshader && (cmp = memcmp(&k->ps_args, &prog->ps_args, sizeof(prog->ps_args)))) return cmp; - cmp = memcmp(&k->ps_args, &prog->ps_args, sizeof(prog->ps_args)); - return cmp; + return 0; } static BOOL constant_heap_init(struct constant_heap *heap, unsigned int constant_count)

1 0

Henri Verbeet : wined3d: Simplify some code in set_glsl_shader_program().
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: fcf6a27a9b136b225cab1aac79c0a8445dfef280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf6a27a9b136b225cab1aac7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 9 10:47:20 2009 +0200 wined3d: Simplify some code in set_glsl_shader_program(). --- dlls/wined3d/glsl_shader.c | 61 +++++++++++++++---------------------------- 1 files changed, 21 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 48c2c03..a02f103 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3952,16 +3952,12 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use GLhandleARB reorder_shader_id = 0; unsigned int i; char glsl_name[8]; - GLhandleARB vshader_id, pshader_id; struct ps_compile_args ps_compile_args; struct vs_compile_args vs_compile_args; - if(use_vs) { - find_vs_compile_args((IWineD3DVertexShaderImpl*)This->stateBlock->vertexShader, This->stateBlock, &vs_compile_args); - } - if(use_ps) { - find_ps_compile_args((IWineD3DPixelShaderImpl*)This->stateBlock->pixelShader, This->stateBlock, &ps_compile_args); - } + if (vshader) find_vs_compile_args((IWineD3DVertexShaderImpl *)vshader, This->stateBlock, &vs_compile_args); + if (pshader) find_ps_compile_args((IWineD3DPixelShaderImpl *)pshader, This->stateBlock, &ps_compile_args); + entry = get_glsl_program_entry(priv, vshader, pshader, &vs_compile_args, &ps_compile_args); if (entry) { priv->glsl_program = entry; @@ -3986,14 +3982,10 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use /* Set the current program */ priv->glsl_program = entry; - if(use_vs) { - vshader_id = find_glsl_vshader((IWineD3DVertexShaderImpl *) vshader, &vs_compile_args); - } else { - vshader_id = 0; - } - /* Attach GLSL vshader */ - if (vshader_id) { + if (vshader) + { + GLhandleARB vshader_id = find_glsl_vshader((IWineD3DVertexShaderImpl *)vshader, &vs_compile_args); WORD map = ((IWineD3DBaseShaderImpl *)vshader)->baseShader.reg_maps.input_registers; char tmp_name[10]; @@ -4031,14 +4023,10 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use list_add_head(&((IWineD3DBaseShaderImpl *)vshader)->baseShader.linked_programs, &entry->vshader_entry); } - if(use_ps) { - pshader_id = find_glsl_pshader((IWineD3DPixelShaderImpl *) pshader, &ps_compile_args); - } else { - pshader_id = 0; - } - /* Attach GLSL pshader */ - if (pshader_id) { + if (pshader) + { + GLhandleARB pshader_id = find_glsl_pshader((IWineD3DPixelShaderImpl *)pshader, &ps_compile_args); TRACE("Attaching GLSL shader object %u to program %u\n", pshader_id, programId); GL_EXTCALL(glAttachObjectARB(programId, pshader_id)); checkGLcall("glAttachObjectARB"); @@ -4071,8 +4059,10 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use } if(pshader) { + char name[32]; + WORD map; + for(i = 0; i < ((IWineD3DPixelShaderImpl*)pshader)->numbumpenvmatconsts; i++) { - char name[32]; sprintf(name, "bumpenvmat%d", ((IWineD3DPixelShaderImpl*)pshader)->bumpenvmatconst[i].texunit); entry->bumpenvmat_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); sprintf(name, "luminancescale%d", ((IWineD3DPixelShaderImpl*)pshader)->luminanceconst[i].texunit); @@ -4080,17 +4070,14 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use sprintf(name, "luminanceoffset%d", ((IWineD3DPixelShaderImpl*)pshader)->luminanceconst[i].texunit); entry->luminanceoffset_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); } - } - if (use_ps && ps_compile_args.np2_fixup) { - char name[32]; - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { - if (ps_compile_args.np2_fixup & (1 << i)) { - sprintf(name, "PsamplerNP2Fixup%u", i); - entry->np2Fixup_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); - } else { - entry->np2Fixup_location[i] = -1; - } + map = ps_compile_args.np2_fixup; + for (i = 0; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; + + sprintf(name, "PsamplerNP2Fixup%u", i); + entry->np2Fixup_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); } } @@ -4120,14 +4107,8 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use * fixed function fragment processing setups. So once the program is linked these samplers * won't change. */ - if(vshader_id) { - /* Load vertex shader samplers */ - shader_glsl_load_vsamplers(gl_info, This->texUnitMap, programId); - } - if(pshader_id) { - /* Load pixel shader samplers */ - shader_glsl_load_psamplers(gl_info, This->texUnitMap, programId); - } + if (vshader) shader_glsl_load_vsamplers(gl_info, This->texUnitMap, programId); + if (pshader) shader_glsl_load_psamplers(gl_info, This->texUnitMap, programId); /* If the local constants do not have to be loaded with the environment constants, * load them now to have them hardcoded in the GLSL program. This saves some CPU cycles

1 0

Henri Verbeet : wined3d: Don' t modify the internal format in d3dfmt_get_conv().
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 08d95233e35d55966c0e2e23aeed015efb4b5af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d95233e35d55966c0e2e23a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 9 10:47:20 2009 +0200 wined3d: Don't modify the internal format in d3dfmt_get_conv(). For most conversions the internal format is irrelevant. Color key conversions are an exception, because they need to ensure an alpha channel is present. --- dlls/wined3d/surface.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2f5554f..4db01cd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1670,7 +1670,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } else if(!GL_SUPPORT(EXT_PALETTED_TEXTURE) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { *format = GL_ALPHA; - *internal = GL_RGBA; *type = GL_UNSIGNED_BYTE; *target_bpp = 1; } @@ -1729,7 +1728,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; *convert = CONVERT_V8U8; *format = GL_BGR; - *internal = GL_RGB8; *type = GL_UNSIGNED_BYTE; *target_bpp = 3; break; @@ -1743,7 +1741,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ /* Load it into unsigned R5G6B5, swap L and V channels, and revert that in the shader */ *target_bpp = 2; *format = GL_RGB; - *internal = GL_RGB5; *type = GL_UNSIGNED_SHORT_5_6_5; } break; @@ -1760,7 +1757,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ */ } else { *format = GL_BGRA; - *internal = GL_RGB8; *type = GL_UNSIGNED_INT_8_8_8_8_REV; } break; @@ -1769,7 +1765,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; *convert = CONVERT_Q8W8V8U8; *format = GL_BGRA; - *internal = GL_RGBA8; *type = GL_UNSIGNED_BYTE; *target_bpp = 4; break; @@ -1778,7 +1773,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; *convert = CONVERT_V16U16; *format = GL_BGR; - *internal = GL_RGB16_EXT; *type = GL_UNSIGNED_SHORT; *target_bpp = 6; break; @@ -1790,7 +1784,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ */ *convert = CONVERT_A4L4; *format = GL_LUMINANCE_ALPHA; - *internal = GL_LUMINANCE4_ALPHA4; *type = GL_UNSIGNED_BYTE; *target_bpp = 2; break; @@ -1798,7 +1791,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ case WINED3DFMT_R16G16_UNORM: *convert = CONVERT_G16R16; *format = GL_RGB; - *internal = GL_RGB16_EXT; *type = GL_UNSIGNED_SHORT; *target_bpp = 6; break; @@ -1806,7 +1798,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ case WINED3DFMT_R16G16_FLOAT: *convert = CONVERT_R16G16F; *format = GL_RGB; - *internal = GL_RGB16F_ARB; *type = GL_HALF_FLOAT_ARB; *target_bpp = 6; break; @@ -1814,7 +1805,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ case WINED3DFMT_R32G32_FLOAT: *convert = CONVERT_R32G32F; *format = GL_RGB; - *internal = GL_RGB32F_ARB; *type = GL_FLOAT; *target_bpp = 12; break;

1 0