winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2009
----- 2025 -----
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
866 discussions
Start a n
N
ew thread
Nikolay Sivov : comctl32/monthcal: Use a style we're caching already.
by Alexandre Julliard
24 Sep '09
24 Sep '09
Module: wine Branch: master Commit: e430838e29393f84b18962c15148e783f3e10b71 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e430838e29393f84b18962c15…
Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 24 03:23:27 2009 +0400 comctl32/monthcal: Use a style we're caching already. --- dlls/comctl32/monthcal.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 7ad2d40..972c680 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -371,8 +371,7 @@ static void paint_button (const MONTHCAL_INFO *infoPtr, HDC hdc, BOOL btnNext, stateNum += 1; else { - DWORD dwStyle = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE); - if (dwStyle & WS_DISABLED) stateNum += 2; + if (infoPtr->dwStyle & WS_DISABLED) stateNum += 2; } DrawThemeBackground (theme, hdc, SBP_ARROWBTN, states[stateNum], r, NULL); } @@ -383,8 +382,7 @@ static void paint_button (const MONTHCAL_INFO *infoPtr, HDC hdc, BOOL btnNext, style |= DFCS_PUSHED; else { - DWORD dwStyle = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE); - if (dwStyle & WS_DISABLED) style |= DFCS_INACTIVE; + if (infoPtr->dwStyle & WS_DISABLED) style |= DFCS_INACTIVE; } DrawFrameControl(hdc, r, DFC_SCROLL, style); @@ -415,7 +413,6 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT WCHAR buf1[20]; WCHAR buf2[32]; COLORREF oldTextColor, oldBkColor; - DWORD dwStyle = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE); RECT rcTemp; RECT rcDay; /* used in MONTHCAL_CalcDayRect() */ SYSTEMTIME localtime; @@ -560,7 +557,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT if((infoPtr->currentMonth==infoPtr->todaysDate.wMonth) && (day==infoPtr->todaysDate.wDay) && (infoPtr->currentYear == infoPtr->todaysDate.wYear)) { - if(!(dwStyle & MCS_NOTODAYCIRCLE)) + if(!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) MONTHCAL_CircleDay(infoPtr, hdc, day, infoPtr->currentMonth); } } @@ -582,7 +579,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT if((infoPtr->currentMonth==infoPtr->todaysDate.wMonth) && (day==infoPtr->todaysDate.wDay) && (infoPtr->currentYear == infoPtr->todaysDate.wYear)) - if(!(dwStyle & MCS_NOTODAYCIRCLE)) + if(!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) MONTHCAL_CircleDay(infoPtr, hdc, day, infoPtr->currentMonth); } mask<<=1; @@ -623,8 +620,8 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT /* draw `today' date if style allows it, and draw a circle before today's * date if necessary */ - if(!(dwStyle & MCS_NOTODAY)) { - if(!(dwStyle & MCS_NOTODAYCIRCLE)) { + if(!(infoPtr->dwStyle & MCS_NOTODAY)) { + if(!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) { /*day is the number of days from nextmonth we put on the calendar */ MONTHCAL_CircleDay(infoPtr, hdc, day+MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear), @@ -650,7 +647,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT } /*eventually draw week numbers*/ - if(dwStyle & MCS_WEEKNUMBERS) { + if(infoPtr->dwStyle & MCS_WEEKNUMBERS) { /* display weeknumbers*/ int mindays; @@ -747,7 +744,7 @@ MONTHCAL_GetMinReqRect(const MONTHCAL_INFO *infoPtr, LPRECT lpRect) lpRect->top = infoPtr->title.top; lpRect->right = infoPtr->title.right; lpRect->bottom = infoPtr->todayrect.bottom; - AdjustWindowRect(lpRect, GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE), FALSE); + AdjustWindowRect(lpRect, infoPtr->dwStyle, FALSE); TRACE("%s\n", wine_dbgstr_rect(lpRect));
1
0
0
0
Nikolay Sivov : comctl32/monthcal: Move helper parameter cast to winproc, remove dead parameter check code.
by Alexandre Julliard
24 Sep '09
24 Sep '09
Module: wine Branch: master Commit: 6fd4ba34a396ab896de70800979ff7c7cc5238a4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6fd4ba34a396ab896de708009…
Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 24 03:02:31 2009 +0400 comctl32/monthcal: Move helper parameter cast to winproc, remove dead parameter check code. --- dlls/comctl32/monthcal.c | 216 ++++++++++++++++++++-------------------------- 1 files changed, 93 insertions(+), 123 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=6fd4ba34a396ab896de70…
1
0
0
0
Nikolay Sivov : comctl32/listview: Skip icon spacing tests when unsupported .
by Alexandre Julliard
24 Sep '09
24 Sep '09
Module: wine Branch: master Commit: d7117d312db7fbb68f2b193a478d3bdc44555445 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d7117d312db7fbb68f2b193a4…
Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 24 00:15:51 2009 +0400 comctl32/listview: Skip icon spacing tests when unsupported. --- dlls/comctl32/tests/listview.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 554c94c..31b09a3 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3,6 +3,7 @@ * * Copyright 2006 Mike McCormack for CodeWeavers * Copyright 2007 George Gov + * Copyright 2009 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1606,6 +1607,13 @@ static void test_icon_spacing(void) "Expected %d, got %d\n", MAKELONG(w, h), r); r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(25, 35)); + if (r == 0) + { + /* version 4.0 */ + win_skip("LVM_SETICONSPACING unimplemented. Skipping.\n"); + DestroyWindow(hwnd); + return; + } expect(MAKELONG(20,30), r); r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(-1,-1));
1
0
0
0
Nikolay Sivov : comctl32/listview: Skip some header tests on version 4. 0 module.
by Alexandre Julliard
24 Sep '09
24 Sep '09
Module: wine Branch: master Commit: 5e3c9925f8999a03e5e64a270495b73dd0b4acb6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5e3c9925f8999a03e5e64a270…
Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 24 00:04:01 2009 +0400 comctl32/listview: Skip some header tests on version 4.0 module. --- dlls/comctl32/tests/listview.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index cd79fd5..554c94c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1289,6 +1289,15 @@ static void test_create(void) hList = CreateWindow("MyListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0); ok((HIMAGELIST)SendMessage(hList, LVM_GETIMAGELIST, 0, 0) == test_create_imagelist, "Image list not obtained\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + + if (!IsWindow(hHeader)) + { + /* version 4.0 */ + win_skip("LVM_GETHEADER not implemented. Skipping.\n"); + DestroyWindow(hList); + return; + } + ok(IsWindow(hHeader) && IsWindowVisible(hHeader), "Listview not in report mode\n"); ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList);
1
0
0
0
Alexandre Julliard : ntdll: Move creation of the CPU-specific registry keys to wineboot.
by Alexandre Julliard
24 Sep '09
24 Sep '09
Module: wine Branch: master Commit: a022062cab2f927d6f027c1ae36238b21782fe70 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a022062cab2f927d6f027c1ae…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 24 14:22:57 2009 +0200 ntdll: Move creation of the CPU-specific registry keys to wineboot. --- dlls/ntdll/nt.c | 156 ------------------------------------------ programs/wineboot/wineboot.c | 122 +++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 156 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=a022062cab2f927d6f027…
1
0
0
0
Jacek Caban : jscript: Throw type error from call and apply functions.
by Alexandre Julliard
24 Sep '09
24 Sep '09
Module: wine Branch: master Commit: 7f2d50f3445e30453d26fc5a7c21d9fb32f4cf2b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7f2d50f3445e30453d26fc5a7…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 24 00:45:42 2009 +0200 jscript: Throw type error from call and apply functions. --- dlls/jscript/function.c | 13 ++++--------- dlls/jscript/tests/api.js | 8 ++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 88bf9c3..cbdc08b 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -416,13 +416,10 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI TRACE("\n"); - if(!(function = function_from_vdisp(jsthis))) { - FIXME("dispex is not a function\n"); - return E_FAIL; - } + if(!(function = function_this(jsthis))) + return throw_type_error(ctx, ei, IDS_NOT_FUNC, NULL); argc = arg_cnt(dp); - if(argc) { hres = to_object(ctx, get_arg(dp,0), &this_obj); if(FAILED(hres)) @@ -471,10 +468,8 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS TRACE("\n"); - if(!(function = function_from_vdisp(jsthis))) { - FIXME("dispex is not a function\n"); - return E_FAIL; - } + if(!(function = function_this(jsthis))) + return throw_type_error(ctx, ei, IDS_NOT_FUNC, NULL); argc = arg_cnt(dp); if(argc) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 5b215f5..2e4b0aa 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1688,6 +1688,14 @@ function testArrayThis(func) { testArrayThis("toString"); +function testFunctionThis(func) { + testThisExcept(Function.prototype[func], -2146823286); +} + +testFunctionThis("toString"); +testFunctionThis("call"); +testFunctionThis("apply"); + function testArrayHostThis(func) { exception_test(function() { Array.prototype[func].call(testObj); }, "TypeError", -2146823274); }
1
0
0
0
Jacek Caban : jscript: Added Object. toString implementation for variable object.
by Alexandre Julliard
24 Sep '09
24 Sep '09
Module: wine Branch: master Commit: 52ac3b3bf02792c998cc8687de43e0d8ab107074 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=52ac3b3bf02792c998cc8687d…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 24 00:45:21 2009 +0200 jscript: Added Object.toString implementation for variable object. --- dlls/jscript/object.c | 2 +- dlls/jscript/tests/api.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index f5bc455..8dbae52 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -51,7 +51,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D static const WCHAR regexpW[] = {'R','e','g','E','x','p',0}; static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; /* Keep in sync with jsclass_t enum */ - static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, errorW, + static const WCHAR *names[] = {objectW, arrayW, booleanW, dateW, errorW, functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW}; TRACE("\n"); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index aed26ec..5b215f5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -88,7 +88,11 @@ ok(tmp.f() === "[object RegExp]", "tmp.f() = " + tmp.f()); (tmp = new String).f = Object.prototype.toString; ok(tmp.f() === "[object String]", "tmp.f() = " + tmp.f()); tmp = Object.prototype.toString.call(testObj); -ok(tmp === "[object Object]", "'' + new Object() = " + tmp); +ok(tmp === "[object Object]", "toString.call(testObj) = " + tmp); +tmp = Object.prototype.toString.call(this); +ok(tmp === "[object Object]", "toString.call(this) = " + tmp); +(function () { tmp = Object.prototype.toString.call(arguments); })(); +ok(tmp === "[object Object]", "toString.call(arguments) = " + tmp); ok(Object(1) instanceof Number, "Object(1) is not instance of Number"); ok(Object("") instanceof String, "Object('') is not instance of String");
1
0
0
0
Jacek Caban : jscript: Throw type error fot Array.toString with wrong 'this ' call.
by Alexandre Julliard
24 Sep '09
24 Sep '09
Module: wine Branch: master Commit: c168918d7534e641f71e1972eaf2ca54be72b137 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c168918d7534e641f71e1972e…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 24 00:45:00 2009 +0200 jscript: Throw type error fot Array.toString with wrong 'this' call. --- dlls/jscript/array.c | 6 +--- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 63 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 1fa20fe..941e414 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -936,10 +936,8 @@ static HRESULT Array_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI TRACE("\n"); array = array_this(jsthis); - if(!array) { - FIXME("not Array object\n"); - return E_FAIL; - } + if(!array) + return throw_type_error(ctx, ei, IDS_ARRAY_EXPECTED, NULL); return array_join(ctx, &array->dispex, array->length, default_separatorW, retv, ei, sp); } diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 79921b4..7962ad3 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -41,4 +41,5 @@ STRINGTABLE DISCARDABLE IDS_JSCRIPT_EXPECTED "JScript object expected" IDS_REGEXP_SYNTAX_ERROR "Syntax error in regular expression" IDS_INVALID_LENGTH "Array length must be a finite positive integer" + IDS_ARRAY_EXPECTED "Array object expected" } diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 81cd74d..fcebcb9 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -37,3 +37,4 @@ #define IDS_JSCRIPT_EXPECTED 0x1396 #define IDS_REGEXP_SYNTAX_ERROR 0x1399 #define IDS_INVALID_LENGTH 0x13A5 +#define IDS_ARRAY_EXPECTED 0x13A7 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1c2f56b..aed26ec 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1621,6 +1621,69 @@ exception_test(function() {eval("'unterminated")}, "SyntaxError", -2146827273); exception_test(function() {eval("nonexistingfunc()")}, "TypeError", -2146823281); exception_test(function() {RegExp(/a/, "g");}, "RegExpError", -2146823271); +function testThisExcept(func, number) { + exception_test(function() {func.call(new Object())}, "TypeError", number); +} + +function testBoolThis(func) { + testThisExcept(Boolean.prototype[func], -2146823278); +} + +testBoolThis("toString"); +testBoolThis("valueOf"); + +function testDateThis(func) { + testThisExcept(Date.prototype[func], -2146823282); +} + +testDateThis("getDate"); +testDateThis("getDay"); +testDateThis("getFullYear"); +testDateThis("getHours"); +testDateThis("getMilliseconds"); +testDateThis("getMinutes"); +testDateThis("getMonth"); +testDateThis("getSeconds"); +testDateThis("getTime"); +testDateThis("getTimezoneOffset"); +testDateThis("getUTCDate"); +testDateThis("getUTCDay"); +testDateThis("getUTCFullYear"); +testDateThis("getUTCHours"); +testDateThis("getUTCMilliseconds"); +testDateThis("getUTCMinutes"); +testDateThis("getUTCMonth"); +testDateThis("getUTCSeconds"); +testDateThis("setDate"); +testDateThis("setFullYear"); +testDateThis("setHours"); +testDateThis("setMilliseconds"); +testDateThis("setMinutes"); +testDateThis("setMonth"); +testDateThis("setSeconds"); +testDateThis("setTime"); +testDateThis("setUTCDate"); +testDateThis("setUTCFullYear"); +testDateThis("setUTCHours"); +testDateThis("setUTCMilliseconds"); +testDateThis("setUTCMinutes"); +testDateThis("setUTCMonth"); +testDateThis("setUTCSeconds"); +testDateThis("toDateString"); +testDateThis("toLocaleDateString"); +testDateThis("toLocaleString"); +testDateThis("toLocaleTimeString"); +testDateThis("toString"); +testDateThis("toTimeString"); +testDateThis("toUTCString"); +testDateThis("valueOf"); + +function testArrayThis(func) { + testThisExcept(Array.prototype[func], -2146823257); +} + +testArrayThis("toString"); + function testArrayHostThis(func) { exception_test(function() { Array.prototype[func].call(testObj); }, "TypeError", -2146823274); }
1
0
0
0
Jacek Caban : jscript: Fixed to_object for NULL IDispatch.
by Alexandre Julliard
24 Sep '09
24 Sep '09
Module: wine Branch: master Commit: a8c7e97d0a20ad55640939edb380e1ab4a499d8f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a8c7e97d0a20ad55640939edb…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 24 00:44:30 2009 +0200 jscript: Fixed to_object for NULL IDispatch. --- dlls/jscript/jsutils.c | 14 ++++++++++++-- dlls/jscript/tests/lang.js | 5 +++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index c4e3df2..80cce59 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -603,8 +603,18 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) *disp = (IDispatch*)_IDispatchEx_(dispex); break; case VT_DISPATCH: - IDispatch_AddRef(V_DISPATCH(v)); - *disp = V_DISPATCH(v); + if(V_DISPATCH(v)) { + IDispatch_AddRef(V_DISPATCH(v)); + *disp = V_DISPATCH(v); + }else { + DispatchEx *obj; + + hres = create_object(ctx, NULL, &obj); + if(FAILED(hres)) + return hres; + + *disp = (IDispatch*)_IDispatchEx_(obj); + } break; case VT_BOOL: hres = create_bool(ctx, V_BOOL(v), &dispex); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index eed0589..353dcd7 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -948,6 +948,11 @@ ok(!nullDisp === true, "!nullDisp = " + !nullDisp); ok(String(nullDisp) === "null", "String(nullDisp) = " + String(nullDisp)); ok(nullDisp != new Object(), "nullDisp == new Object()"); ok(new Object() != nullDisp, "new Object() == nullDisp"); +ok((typeof Object(nullDisp)) === "object", "typeof Object(nullDisp) !== 'object'"); +tmp = getVT(Object(nullDisp)); +ok(tmp === "VT_DISPATCH", "getVT(Object(nullDisp) = " + tmp); +tmp = Object(nullDisp).toString(); +ok(tmp === "[object Object]", "Object(nullDisp).toString() = " + tmp); function do_test() {} function nosemicolon() {} nosemicolon();
1
0
0
0
Jörg Höhle : mciwave: Require at least 16 bytes in the WAVE fmt file header.
by Alexandre Julliard
24 Sep '09
24 Sep '09
Module: wine Branch: master Commit: 1a6aa9630571e10f94b69352d80f4c289485168e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1a6aa9630571e10f94b69352d…
Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Sep 24 08:22:43 2009 +0200 mciwave: Require at least 16 bytes in the WAVE fmt file header. --- dlls/mciwave/mciwave.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index c533e85..66af58a 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -255,7 +255,7 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) wmw->lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); if (!wmw->lpWaveFormat) return MMSYSERR_NOMEM; r = mmioRead(wmw->hFile, (HPSTR)wmw->lpWaveFormat, mmckInfo.cksize); - if (r < sizeof(WAVEFORMAT)) + if (r < sizeof(PCMWAVEFORMAT)) return MCIERR_INVALID_FILE; TRACE("wFormatTag=%04X !\n", wmw->lpWaveFormat->wFormatTag);
1
0
0
0
← Newer
1
...
20
21
22
23
24
25
26
...
87
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
Results per page:
10
25
50
100
200