October 2009 - Wine-commits

Nikolay Sivov : comctl32/monthcal: Fix a nice typo in test message.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 9e75962ec51eeee9a3b6ff8e48a7beaf055203b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e75962ec51eeee9a3b6ff8e4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 01:02:10 2009 +0400 comctl32/monthcal: Fix a nice typo in test message. --- dlls/comctl32/tests/monthcal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 8234126..57142a6 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -383,7 +383,7 @@ static void test_monthcal(void) expect(1200, st[1].wMilliseconds); ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "No limits should be set\n"); - ok(st1[0].wYear != 2000, "Lover limit changed\n"); + ok(st1[0].wYear != 2000, "Lower limit changed\n"); /* invalid timestamp should be replaced with today data, except msecs */ expect(today.wHour, st1[1].wHour); expect(today.wMinute, st1[1].wMinute); @@ -407,10 +407,10 @@ static void test_monthcal(void) st[1].wMonth = 0; ok(!SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Should have failed to set limits\n"); ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "No limits should be set\n"); - ok(st1[0].wYear != 2000, "Lover limit changed\n"); + ok(st1[0].wYear != 2000, "Lower limit changed\n"); ok(!SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Should have failed to set MAX limit\n"); ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "No limits should be set\n"); - ok(st1[0].wYear != 2000, "Lover limit changed\n"); + ok(st1[0].wYear != 2000, "Lower limit changed\n"); GetSystemTime(&st[0]); st[0].wDay = 20;

1 0

Nikolay Sivov : comctl32/monthcal: Optimize WM_LBUTTONUP handler.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 71d4b5fcd4ae3f4fb107a7d2fbd876d6f7b9dd3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d4b5fcd4ae3f4fb107a7d2f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 01:20:48 2009 +0400 comctl32/monthcal: Optimize WM_LBUTTONUP handler. --- dlls/comctl32/monthcal.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a2c7aaa..21c72d1 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1,11 +1,12 @@ -/* Month calendar control - +/* + * Month calendar control * * Copyright 1998, 1999 Eric Kohl (ekohl(a)abo.rhein-zeitung.de) * Copyright 1999 Alex Priem (alexp(a)sci.kun.nl) * Copyright 1999 Chris Morgan <cmorgan(a)wpi.edu> and * James Abbatiello <abbeyj(a)wpi.edu> * Copyright 2000 Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> + * 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 @@ -1788,16 +1789,19 @@ static LRESULT MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) { NMHDR nmhdr; - BOOL redraw = FALSE; MCHITTESTINFO ht; DWORD hit; TRACE("\n"); if(infoPtr->status & (MC_PREVPRESSED | MC_NEXTPRESSED)) { + RECT *r; + KillTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER); + r = infoPtr->status & MC_PREVPRESSED ? &infoPtr->titlebtnprev : &infoPtr->titlebtnnext; infoPtr->status &= ~(MC_PREVPRESSED | MC_NEXTPRESSED); - redraw = TRUE; + + InvalidateRect(infoPtr->hwndSelf, r, FALSE); } ReleaseCapture(); @@ -1818,9 +1822,7 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) infoPtr->status = MC_SEL_LBUTUP; MONTHCAL_SetDayFocus(infoPtr, NULL); - if((hit == MCHT_CALENDARDATENEXT) || - (hit == MCHT_CALENDARDATEPREV) || - (hit == MCHT_CALENDARDATE)) + if((hit & MCHT_CALENDARDATE) == MCHT_CALENDARDATE) { SYSTEMTIME sel = infoPtr->curSel; @@ -1839,14 +1841,8 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) MONTHCAL_NotifySelectionChange(infoPtr); MONTHCAL_NotifySelect(infoPtr); - - return 0; } - /* redraw if necessary */ - if(redraw) - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - return 0; }

1 0

Nikolay Sivov : comctl32/monthcal: Update day of week properly while iterating with prev/ next buttons and hit testing.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 689a9eb5df3191eaf819c6e5a334ab508da6f758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=689a9eb5df3191eaf819c6e5a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 03:19:52 2009 +0400 comctl32/monthcal: Update day of week properly while iterating with prev/next buttons and hit testing. --- dlls/comctl32/monthcal.c | 70 +++++++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 21c72d1..5793ca5 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -382,6 +382,30 @@ int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year) DayOfWeekTable[month-1] + day ) % 7); } +/* properly updates date to point on next month */ +void inline MONTHCAL_GetNextMonth(SYSTEMTIME *date) +{ + if(++date->wMonth > 12) + { + date->wMonth = 1; + date->wYear++; + } + date->wDayOfWeek = MONTHCAL_CalculateDayOfWeek(date->wDay, date->wMonth, + date->wYear); +} + +/* properly updates date to point on prev month */ +void inline MONTHCAL_GetPrevMonth(SYSTEMTIME *date) +{ + if(--date->wMonth < 1) + { + date->wMonth = 12; + date->wYear--; + } + date->wDayOfWeek = MONTHCAL_CalculateDayOfWeek(date->wDay, date->wMonth, + date->wYear); +} + /* From a given point, calculate the row (weekpos), column(daypos) and day in the calendar. day== 0 mean the last day of tha last month */ @@ -1245,7 +1269,7 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) if(!curSel) return FALSE; if(infoPtr->dwStyle & MCS_MULTISELECT) return FALSE; - *curSel = infoPtr->minSel; + *curSel = infoPtr->curSel; TRACE("%d/%d/%d\n", curSel->wYear, curSel->wMonth, curSel->wDay); return TRUE; } @@ -1499,36 +1523,28 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) if(PtInRect(&infoPtr->days, lpht->pt)) { lpht->st.wYear = infoPtr->curSel.wYear; - if ( day < 1) + lpht->st.wMonth = infoPtr->curSel.wMonth; + if (day < 1) { retval = MCHT_CALENDARDATEPREV; - lpht->st.wMonth = infoPtr->curSel.wMonth - 1; - if (lpht->st.wMonth < 1) - { - lpht->st.wMonth = 12; - lpht->st.wYear--; - } - lpht->st.wDay = MONTHCAL_MonthLength(lpht->st.wMonth,lpht->st.wYear) + day; + MONTHCAL_GetPrevMonth(&lpht->st); + lpht->st.wDay = MONTHCAL_MonthLength(lpht->st.wMonth, lpht->st.wYear) + day; } - else if (day > MONTHCAL_MonthLength(infoPtr->curSel.wMonth,infoPtr->curSel.wYear)) + else if (day > MONTHCAL_MonthLength(infoPtr->curSel.wMonth, infoPtr->curSel.wYear)) { retval = MCHT_CALENDARDATENEXT; - lpht->st.wMonth = infoPtr->curSel.wMonth + 1; - if (lpht->st.wMonth > 12) - { - lpht->st.wMonth = 1; - lpht->st.wYear++; - } - lpht->st.wDay = day - MONTHCAL_MonthLength(infoPtr->curSel.wMonth,infoPtr->curSel.wYear); + MONTHCAL_GetNextMonth(&lpht->st); + lpht->st.wDay = day - MONTHCAL_MonthLength(infoPtr->curSel.wMonth, infoPtr->curSel.wYear); } else { retval = MCHT_CALENDARDATE; - lpht->st.wMonth = infoPtr->curSel.wMonth; - lpht->st.wDay = day; - lpht->st.wDayOfWeek = MONTHCAL_CalculateDayOfWeek(day,lpht->st.wMonth,lpht->st.wYear); + lpht->st.wDay = day; } + /* always update day of week */ + lpht->st.wDayOfWeek = MONTHCAL_CalculateDayOfWeek(day, lpht->st.wMonth, + lpht->st.wYear); goto done; - } + } if(PtInRect(&infoPtr->todayrect, lpht->pt)) { retval = MCHT_TODAYLINK; goto done; @@ -1575,11 +1591,7 @@ static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) TRACE("\n"); - next.wMonth++; - if(next.wMonth > 12) { - next.wYear++; - next.wMonth = 1; - } + MONTHCAL_GetNextMonth(&next); if(!MONTHCAL_IsDateInValidRange(infoPtr, &next)) return; @@ -1595,11 +1607,7 @@ static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) TRACE("\n"); - prev.wMonth--; - if(prev.wMonth < 1) { - prev.wYear--; - prev.wMonth = 12; - } + MONTHCAL_GetPrevMonth(&prev); if(!MONTHCAL_IsDateInValidRange(infoPtr, &prev)) return;

1 0

Nikolay Sivov : comctl32/monthcal: Recalculate control layout on MCS_WEEKNUMBERS style change.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 526e1d81a34c1baeb93558dc06d7ff44c176eac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=526e1d81a34c1baeb93558dc0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 03:50:02 2009 +0400 comctl32/monthcal: Recalculate control layout on MCS_WEEKNUMBERS style change. --- dlls/comctl32/monthcal.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5793ca5..5a34a37 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2191,6 +2191,10 @@ static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, infoPtr->dwStyle = lpss->styleNew; + /* make room for week numbers */ + if ((lpss->styleNew ^ lpss->styleOld) & MCS_WEEKNUMBERS) + MONTHCAL_UpdateSize(infoPtr); + return 0; }

1 0

Nikolay Sivov : comctl32/monthcal: Invalidate unconditonally on MCM_SETFIRSTDAYOFWEEK.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 41db6f8500c1a631ca1606220052c820200a6396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41db6f8500c1a631ca1606220… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 04:25:45 2009 +0400 comctl32/monthcal: Invalidate unconditonally on MCM_SETFIRSTDAYOFWEEK. --- dlls/comctl32/monthcal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5a34a37..893a505 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1138,6 +1138,8 @@ MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, INT day) infoPtr->firstDayHighWord = TRUE; } + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + return prev; }

1 0

Marcus Meissner : wpp: Fixed resource leakages (Coverity).
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 15968fadef203d45620709d341fc397841210b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=15968fadef203d45620709d34… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 7 08:59:22 2009 +0200 wpp: Fixed resource leakages (Coverity). --- libs/wpp/wpp.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index e6a1a83..afca1bb 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -216,12 +216,16 @@ int wpp_parse_temp( const char *input, const char *output_base, char **output_na if((fd = mkstemps( temp_name, 0 )) == -1) { ppy_error("Could not generate a temp name from %s\n", temp_name); + free( temp_name ); return 2; } if (!(output = fdopen(fd, "wt"))) { ppy_error("Could not open fd %s for writing\n", temp_name); + close( fd ); + unlink( temp_name ); + free( temp_name ); return 2; }

1 0

Henri Verbeet : d3d8: Get rid of the unused "return_data_buffer" in the stateblock tests.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 17909a0c521582e66fe0deea68486b986ec3c9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17909a0c521582e66fe0deea6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 09:02:54 2009 +0200 d3d8: Get rid of the unused "return_data_buffer" in the stateblock tests. --- dlls/d3d8/tests/stateblock.c | 40 ++++++---------------------------------- 1 files changed, 6 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 43c56cd..43996f6 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -437,11 +437,6 @@ struct shader_constant_arg BOOL pshader; }; -struct shader_constant_context -{ - struct shader_constant_data return_data_buffer; -}; - static const struct shader_constant_data shader_constant_poison_data = { {1.0f, 2.0f, 3.0f, 4.0f}, @@ -508,10 +503,7 @@ static void shader_constant_check_data(IDirect3DDevice8 *device, unsigned int ch static HRESULT shader_constant_setup_handler(struct state_test *test) { - struct shader_constant_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx)); - if (!ctx) return E_FAIL; - test->test_context = ctx; - + test->test_context = NULL; test->test_data_in = &shader_constant_test_data; test->test_data_out = &shader_constant_test_data; test->default_data = &shader_constant_default_data; @@ -522,7 +514,6 @@ static HRESULT shader_constant_setup_handler(struct state_test *test) static void shader_constant_teardown_handler(struct state_test *test) { - HeapFree(GetProcessHeap(), 0, test->test_context); } static void shader_constants_queue_test(struct state_test *test, const struct shader_constant_arg *test_arg) @@ -550,11 +541,6 @@ struct light_arg unsigned int idx; }; -struct light_context -{ - struct light_data return_data_buffer; -}; - static const struct light_data light_poison_data = { { @@ -731,10 +717,7 @@ static void light_check_data(IDirect3DDevice8 *device, unsigned int chain_stage, static HRESULT light_setup_handler(struct state_test *test) { - struct light_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx)); - if (!ctx) return E_FAIL; - test->test_context = ctx; - + test->test_context = NULL; test->test_data_in = &light_test_data_in; test->test_data_out = &light_test_data_out; test->default_data = &light_default_data; @@ -745,7 +728,6 @@ static HRESULT light_setup_handler(struct state_test *test) static void light_teardown_handler(struct state_test *test) { - HeapFree(GetProcessHeap(), 0, test->test_context); } static void lights_queue_test(struct state_test *test, const struct light_arg *test_arg) @@ -770,11 +752,6 @@ struct transform_data D3DMATRIX world255; }; -struct transform_context -{ - struct transform_data return_data_buffer; -}; - static const struct transform_data transform_default_data = { {{{ @@ -989,10 +966,7 @@ static void transform_check_data(IDirect3DDevice8 *device, unsigned int chain_st static HRESULT transform_setup_handler(struct state_test *test) { - struct transform_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx)); - if (!ctx) return E_FAIL; - test->test_context = ctx; - + test->test_context = NULL; test->test_data_in = &transform_test_data; test->test_data_out = &transform_test_data; test->default_data = &transform_default_data; @@ -1003,7 +977,6 @@ static HRESULT transform_setup_handler(struct state_test *test) static void transform_teardown_handler(struct state_test *test) { - HeapFree(GetProcessHeap(), 0, test->test_context); } static void transform_queue_test(struct state_test *test) @@ -1105,10 +1078,9 @@ struct render_state_arg struct render_state_context { - struct render_state_data return_data_buffer; - struct render_state_data default_data_buffer; - struct render_state_data test_data_buffer; - struct render_state_data poison_data_buffer; + struct render_state_data default_data_buffer; + struct render_state_data test_data_buffer; + struct render_state_data poison_data_buffer; }; static void render_state_set_handler(IDirect3DDevice8 *device, const struct state_test *test, const void *data)

1 0

Henri Verbeet : d3d9: Get rid of the unused "return_data_buffer" in the stateblock tests.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 063d3d181bc26c0a6599ed1765a072500683d5c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=063d3d181bc26c0a6599ed176… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 09:02:55 2009 +0200 d3d9: Get rid of the unused "return_data_buffer" in the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 31 +++---------------------------- 1 files changed, 3 insertions(+), 28 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 764e35b..5479bb8 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -437,11 +437,6 @@ struct shader_constant_arg BOOL pshader; }; -struct shader_constant_context -{ - struct shader_constant_data return_data_buffer; -}; - static const struct shader_constant_data shader_constant_poison_data = { {0x1337c0de, 0x1337c0de, 0x1337c0de, 0x1337c0de}, @@ -548,10 +543,7 @@ static void shader_constant_check_data(IDirect3DDevice9 *device, unsigned int ch static HRESULT shader_constant_setup_handler(struct state_test *test) { - struct shader_constant_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx)); - if (ctx == NULL) return E_FAIL; - test->test_context = ctx; - + test->test_context = NULL; test->test_data_in = &shader_constant_test_data; test->test_data_out = &shader_constant_test_data; test->default_data = &shader_constant_default_data; @@ -590,11 +582,6 @@ struct light_arg unsigned int idx; }; -struct light_context -{ - struct light_data return_data_buffer; -}; - static const struct light_data light_poison_data = { { @@ -771,10 +758,7 @@ static void light_check_data(IDirect3DDevice9 *device, unsigned int chain_stage, static HRESULT light_setup_handler(struct state_test *test) { - struct light_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx)); - if (ctx == NULL) return E_FAIL; - test->test_context = ctx; - + test->test_context = NULL; test->test_data_in = &light_test_data_in; test->test_data_out = &light_test_data_out; test->default_data = &light_default_data; @@ -810,11 +794,6 @@ struct transform_data D3DMATRIX world255; }; -struct transform_context -{ - struct transform_data return_data_buffer; -}; - static const struct transform_data transform_default_data = { {{{ @@ -1027,10 +1006,7 @@ static void transform_check_data(IDirect3DDevice9 *device, unsigned int chain_st static HRESULT transform_setup_handler(struct state_test *test) { - struct transform_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx)); - if (ctx == NULL) return E_FAIL; - test->test_context = ctx; - + test->test_context = NULL; test->test_data_in = &transform_test_data; test->test_data_out = &transform_test_data; test->default_data = &transform_default_data; @@ -1178,7 +1154,6 @@ struct render_state_arg struct render_state_context { - struct render_state_data return_data_buffer; struct render_state_data default_data_buffer; struct render_state_data test_data_buffer; struct render_state_data poison_data_buffer;

1 0

Alexandre Julliard : T-shirts announcement.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: website Branch: master Commit: 16de2d5363fb3c91776003ac69f34811251c0d4a URL: http://source.winehq.org/git/website.git/?a=commit;h=16de2d5363fb3c91776003… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 18:05:21 2009 +0200 T-shirts announcement. --- news/en/2009100601.xml | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/news/en/2009100601.xml b/news/en/2009100601.xml new file mode 100644 index 0000000..6483ab1 --- /dev/null +++ b/news/en/2009100601.xml @@ -0,0 +1,9 @@ +<news> +<date>October 6, 2009</date> +<title>Wine T-Shirts Available</title> +<body> +<p><a href="http://www.freewear.org">FreeWear.org</a> recently +<a href="http://www.winehq.org/pipermail/wine-devel/2009-September/078366.html">announced</a> +their first <a href="http://www.freewear.org/?page=list_items&org=Wine">Wine T-shirt</a>. +For each T-shirt sold they will donate 3€ to the Wine project. +</p></body></news>

1 0

Piotr Caban : jscript: Added Global.escape() implementation.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: de0a875146932f109ab170f177c808b45f732fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0a875146932f109ab170f17… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Oct 6 13:11:18 2009 +0200 jscript: Added Global.escape() implementation. --- dlls/jscript/global.c | 68 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 13 ++++++++ 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index bc39940..366d738 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -296,8 +296,72 @@ static HRESULT JSGlobal_Enumerator(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + BSTR ret, str; + const WCHAR *ptr; + DWORD len = 0, i, size; + char buf[4]; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) { + ret = SysAllocString(undefinedW); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + + return S_OK; + } + + hres = to_string(ctx, get_arg(dp, 0), ei, &str); + if(FAILED(hres)) + return hres; + + for(ptr=str; *ptr; ptr++) { + if(isalnumW(*ptr) || *ptr=='*' || *ptr=='@' || *ptr=='-' || *ptr=='_' + || *ptr=='+' || *ptr=='.' || *ptr=='/') + len++; + else { + size = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, NULL, 0, NULL, NULL)*3; + if(!size) { + FIXME("throw Error\n"); + return E_FAIL; + } + len += size; + } + } + + ret = SysAllocStringLen(NULL, len); + if(!ret) + return E_OUTOFMEMORY; + + len = 0; + for(ptr=str; *ptr; ptr++) { + if(isalnumW(*ptr) || *ptr=='*' || *ptr=='@' || *ptr=='-' || *ptr=='_' + || *ptr=='+' || *ptr=='.' || *ptr=='/') + ret[len++] = *ptr; + else { + size = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, buf, sizeof(buf), NULL, NULL); + for(i=0; i<size; i++) { + ret[len++] = '%'; + ret[len++] = int_to_char(buf[i] >> 4); + ret[len++] = int_to_char(buf[i] & 0xf); + } + } + } + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + else + SysFreeString(ret); + + return S_OK; } /* ECMA-262 3rd Edition 15.1.2.1 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ae118c2..268820c 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -58,6 +58,15 @@ ok(tmp === "undefined", "encodeURI() = " + tmp); tmp = encodeURI("abc", "test"); ok(tmp === "abc", "encodeURI('abc') = " + tmp); +tmp = escape("abc"); +ok(tmp === "abc", "escape('abc') = " + tmp); +tmp = escape(""); +ok(tmp === "", "escape('') = " + tmp); +tmp = escape("a1b c!d+e(a)*-_+./,"); +ok(tmp === "a1b%20c%21d+e(a)*-_+./%2C", "escape('a1b c!d+e(a)*-_+./,') = " + tmp); +tmp = escape(); +ok(tmp === "undefined", "escape() = " + tmp); + tmp = unescape("abc"); ok(tmp === "abc", "unescape('abc') = " + tmp); tmp = unescape(""); @@ -69,6 +78,10 @@ ok(tmp === "undefined", "unescape() = " + tmp); tmp = unescape("%54%65s%u0074"); ok(tmp === "Test", "unescape('%54%65s%u0074') = " + tmp); +tmp = "aA1~`!@#$%^&*()_+=-][{}';:/.,<>?\|"; +ok(escape(tmp) === "aA1%7E%60%21@%23%24%25%5E%26*%28%29_+%3D-%5D%5B%7B%7D%27%3B%3A/.%2C%3C%3E%3F%7C", "escape('" + tmp + "') = " + escape(tmp)); +ok(unescape(escape(tmp)) === tmp, "unescape(escape('" + tmp + "')) = " + unescape(escape(tmp))); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0