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

Piotr Caban : jscript: Throw SyntaxError in eval function.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 98223b96e74d9d7403b00ba4acd11c6ebf74f3e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98223b96e74d9d7403b00ba4a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 24 09:35:56 2009 +0200 jscript: Throw SyntaxError in eval function. --- dlls/jscript/error.c | 5 +++-- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 2 ++ dlls/jscript/jscript_En.rc | 1 + dlls/jscript/parser.y | 2 +- dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 1 + 7 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index fb37fba..25a3836 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -424,7 +424,8 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCH DispatchEx *err; HRESULT hres; - LoadStringW(jscript_hinstance, id, buf, sizeof(buf)/sizeof(WCHAR)); + buf[0] = '\0'; + LoadStringW(jscript_hinstance, id&0xFFFF, buf, sizeof(buf)/sizeof(WCHAR)); if(str) pos = strchrW(buf, '|'); if(pos) { @@ -435,7 +436,7 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCH WARN("%s\n", debugstr_w(buf)); - id |= 0x800A0000; + id |= JSCRIPT_ERROR; hres = create_error(ctx, constr, &id, buf, &err); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 1ec113d..7d59e19 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -330,7 +330,7 @@ static HRESULT JSGlobal_eval(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA hres = script_parse(dispex->ctx, V_BSTR(arg), NULL, &parser_ctx); if(FAILED(hres)) { WARN("parse (%s) failed: %08x\n", debugstr_w(V_BSTR(arg)), hres); - return hres; + return throw_syntax_error(dispex->ctx, ei, hres, NULL); } hres = exec_source(dispex->ctx->exec_ctx, parser_ctx, parser_ctx->source, ei, retv); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index f99299f..70c9fea 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -33,6 +33,8 @@ #include "wine/unicode.h" #include "wine/list.h" +#define JSCRIPT_ERROR 0x800A0000 + typedef struct _script_ctx_t script_ctx_t; typedef struct _exec_ctx_t exec_ctx_t; typedef struct _dispex_prop_t dispex_prop_t; diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index df8ee2f..154479a 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -26,6 +26,7 @@ STRINGTABLE DISCARDABLE IDS_INVALID_CALL_ARG "Invalid procedure call or argument" IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_ARG_NOT_OPT "Argument not optional" + IDS_SYNTAX_ERROR "Syntax error" IDS_NOT_FUNC "Function expected" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_NUM "Number expected" diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index d47d40d..adec6bc 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1568,7 +1568,7 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite return E_OUTOFMEMORY; parser_ctx->ref = 1; - parser_ctx->hres = E_FAIL; + parser_ctx->hres = JSCRIPT_ERROR|IDS_SYNTAX_ERROR; parser_ctx->is_html = delimiter && !strcmpiW(delimiter, html_tagW); parser_ctx->begin = parser_ctx->ptr = code; diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 0f5af9b..fd2cb82 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -22,6 +22,7 @@ #define IDS_INVALID_CALL_ARG 0x0005 #define IDS_NO_PROPERTY 0x01B6 #define IDS_ARG_NOT_OPT 0x01c1 +#define IDS_SYNTAX_ERROR 0x03EA #define IDS_NOT_FUNC 0x138A #define IDS_NOT_DATE 0x138E #define IDS_NOT_NUM 0x1389 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7428413..a71c0aa 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1317,5 +1317,6 @@ exception_test(function() {not_existing_variable.something();}, "TypeError", -21 exception_test(function() {arr.toString = Function.prototype.toString; arr.toString();}, "TypeError", -2146823286); exception_test(function() {date();}, "TypeError", -2146823286); exception_test(function() {arr();}, "TypeError", -2146823286); +exception_test(function() {eval("for(i=0;) {}");}, "SyntaxError", -2146827286); reportSuccess();

1 0

Alexandre Julliard : shell32/tests: Fix a couple of failures on Win9x and NT4.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: d1fbdbce3224f125cf36f1c851dd559bf55e0358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1fbdbce3224f125cf36f1c85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 24 11:44:41 2009 +0200 shell32/tests: Fix a couple of failures on Win9x and NT4. --- dlls/shell32/tests/shfldr_special.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 8c14e51..06533ba 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -46,7 +46,6 @@ static void test_parse_for_entire_network(void) LPITEMIDLIST pidl; DWORD attr = ~0; DWORD expected_attr; - DWORD alter_attr; hr = SHGetDesktopFolder(&psfDesktop); ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%x\n", hr); @@ -70,7 +69,9 @@ static void test_parse_for_entire_network(void) attr = ~0; hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, entire_network_path, &eaten, &pidl, &attr); - if (hr == HRESULT_FROM_WIN32(ERROR_BAD_NET_NAME) || hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)) + if (hr == HRESULT_FROM_WIN32(ERROR_BAD_NET_NAME) || + hr == HRESULT_FROM_WIN32(ERROR_NO_NET_OR_BAD_PATH) || + hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)) { win_skip("'EntireNetwork' is not available on Win9x, NT4 and Vista\n"); return; @@ -78,12 +79,12 @@ static void test_parse_for_entire_network(void) ok(hr == S_OK, "IShellFolder_ParseDisplayName failed with error 0x%x\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %u\n", eaten); - expected_attr = SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_STORAGEANCESTOR|SFGAO_HASPROPSHEET|SFGAO_CANLINK; - alter_attr = (expected_attr & (~SFGAO_STORAGEANCESTOR)) | SFGAO_STREAM; + expected_attr = SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_HASPROPSHEET|SFGAO_CANLINK; todo_wine - ok(attr == expected_attr || - attr == alter_attr, /* win2k */ - "attr should be 0x%x or 0x%x, not 0x%x\n", expected_attr, alter_attr, attr); + ok(attr == expected_attr || /* winme, nt4 */ + attr == (expected_attr | SFGAO_STREAM) || /* win2k */ + attr == (expected_attr | SFGAO_STORAGEANCESTOR), /* others */ + "attr should be 0x%x, not 0x%x\n", expected_attr, attr); ILFree(pidl); }

1 0

Andrew Talbot : ddraw: Constify some variables.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 99139d96718f2e5978555512bea9b08fa4b9305f URL: http://source.winehq.org/git/wine.git/?a=commit;h=99139d96718f2e5978555512b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jul 23 21:46:45 2009 +0100 ddraw: Constify some variables. --- dlls/ddraw/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 439e99f..360604e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5937,8 +5937,8 @@ static BOOL is_mip_level_subset(IDirectDrawSurfaceImpl *dest, static void copy_mipmap_chain(IDirect3DDeviceImpl *device, IDirectDrawSurfaceImpl *dest, IDirectDrawSurfaceImpl *src, - POINT *DestPoint, - RECT *SrcRect) + const POINT *DestPoint, + const RECT *SrcRect) { IDirectDrawSurfaceImpl *src_level, *dest_level; IDirectDrawSurface7 *temp;

1 0

Owen Rudge : winhlp32: Ensure Open dialog is modal.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 395acfc545413fc048b7532e11e6fc8f3ac1de9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=395acfc545413fc048b7532e1… Author: Owen Rudge <owen(a)owenrudge.net> Date: Thu Jul 23 17:18:57 2009 -0300 winhlp32: Ensure Open dialog is modal. --- programs/winhlp32/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 56244d3..4c2d1ff 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -167,7 +167,7 @@ BOOL WINHELP_GetOpenFileName(LPSTR lpszFile, int len) lpszFile[0]='\0'; openfilename.lStructSize = sizeof(OPENFILENAME); - openfilename.hwndOwner = NULL; + openfilename.hwndOwner = (Globals.active_win ? Globals.active_win->hMainWnd : 0); openfilename.hInstance = Globals.hInstance; openfilename.lpstrFilter = szzFilter; openfilename.lpstrCustomFilter = 0;

1 0

Nikolay Sivov : comctl32/listview: Don' t alter selection mark in LVM_SETITEMSTATE.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 59e59c6bf97540a1c8ca5c248a10b9114cce9608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e59c6bf97540a1c8ca5c248… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 23 23:50:12 2009 +0400 comctl32/listview: Don't alter selection mark in LVM_SETITEMSTATE. --- dlls/comctl32/listview.c | 33 --------------------------------- dlls/comctl32/tests/listview.c | 2 -- 2 files changed, 0 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4d27ba7..0713308 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8118,39 +8118,6 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE else bResult = LISTVIEW_SetItemT(infoPtr, &lvItem, TRUE); - /* - * Update selection mark - * - * Investigation on windows 2k showed that selection mark was updated - * whenever a new selection was made, but if the selected item was - * unselected it was not updated. - * - * we are probably still not 100% accurate, but this at least sets the - * proper selection mark when it is needed - */ - - if (bResult && (lvItem.state & lvItem.stateMask & LVIS_SELECTED) && - (infoPtr->nSelectionMark == -1)) - { - int i; - for (i = 0; i < infoPtr->nItemCount; i++) - { - if (infoPtr->uCallbackMask & LVIS_SELECTED) - { - if (LISTVIEW_GetItemState(infoPtr, i, LVIS_SELECTED)) - { - infoPtr->nSelectionMark = i; - break; - } - } - else if (ranges_contain(infoPtr->selectionRanges, i)) - { - infoPtr->nSelectionMark = i; - break; - } - } - } - return bResult; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 1a7e5d8..888b323 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1990,7 +1990,6 @@ static void test_multiselect(void) r = SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(3, r); r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); -todo_wine expect(-1, r); style = GetWindowLongPtrA(hwnd, GWL_STYLE); @@ -2022,7 +2021,6 @@ todo_wine r = SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(1, r); r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); -todo_wine expect(-1, r); /* try to select all on LVS_SINGLESEL */

1 0

Nikolay Sivov : comctl32/listview: Set LVIS_FOCUSED for all items with LVM_SETITEMSTATE not allowed.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 092263f051dca826c8b93fed26ee3dfe2b72a54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=092263f051dca826c8b93fed2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 23 23:48:23 2009 +0400 comctl32/listview: Set LVIS_FOCUSED for all items with LVM_SETITEMSTATE not allowed. --- dlls/comctl32/listview.c | 3 +++ dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 05c033e..4d27ba7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8108,6 +8108,9 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE if ((lvItem.state & lvItem.stateMask & LVIS_SELECTED) && (infoPtr->dwStyle & LVS_SINGLESEL)) return FALSE; + /* focus all isn't allowed */ + if (lvItem.state & lvItem.stateMask & LVIS_FOCUSED) return FALSE; + /* apply to all items */ for (lvItem.iItem = 0; lvItem.iItem < infoPtr->nItemCount; lvItem.iItem++) if (!LISTVIEW_SetItemT(infoPtr, &lvItem, TRUE)) bResult = FALSE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index bf87bca..1a7e5d8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2547,10 +2547,10 @@ static void test_ownerdata(void) item.state = LVIS_FOCUSED; g_dump_itemchanged = TRUE; res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); - todo_wine expect(FALSE, res); + expect(FALSE, res); g_dump_itemchanged = FALSE; ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, - "ownerdata focus all notification", TRUE); + "ownerdata focus all notification", FALSE); /* focus single item, remove all */ item.stateMask = LVIS_FOCUSED; item.state = LVIS_FOCUSED;

1 0

Nikolay Sivov : comctl32/listview: Handle NULL lParam in LVM_SETITEMSTATE.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 440218cfdea41a60b53822e2735afea74630b54e URL: http://source.winehq.org/git/wine.git/?a=commit;h=440218cfdea41a60b53822e27… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 23 23:46:22 2009 +0400 comctl32/listview: Handle NULL lParam in LVM_SETITEMSTATE. --- dlls/comctl32/listview.c | 1 + dlls/comctl32/tests/listview.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 73781b2..05c033e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10653,6 +10653,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_SetItemPosition(infoPtr, (INT)wParam, *((POINT*)lParam)); case LVM_SETITEMSTATE: + if (lParam == 0) return FALSE; return LISTVIEW_SetItemState(infoPtr, (INT)wParam, (LPLVITEMW)lParam); case LVM_SETITEMTEXTA: diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9e92202..bf87bca 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1963,6 +1963,10 @@ static void test_multiselect(void) item_count = (int)SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); expect(items,item_count); + /* try with NULL pointer */ + r = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)NULL); + expect(FALSE, r); + /* select all, check notifications */ ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED);

1 0

Nikolay Sivov : comctl32/listview: Additional tests for LVM_SETITEMSTATE for all items.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 9e222c6cbbb387afa037db04b195d8141f4a35ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e222c6cbbb387afa037db04b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 23 23:43:24 2009 +0400 comctl32/listview: Additional tests for LVM_SETITEMSTATE for all items. --- dlls/comctl32/tests/listview.c | 123 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 121 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6454187..9e92202 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -79,6 +79,8 @@ static const WCHAR testparentclassW[] = HWND hwndparent, hwndparentW; /* prevents edit box creation, LVN_BEGINLABELEDIT return value */ BOOL blockEdit; +/* dumps LVN_ITEMCHANGED message data */ +static BOOL g_dump_itemchanged; /* format reported to control: -1 falls to defproc, anything else returned */ INT notifyFormat; @@ -205,7 +207,20 @@ static const struct message ownderdata_select_focus_parent_seq[] = { { 0 } }; -static const struct message ownerdata_select_all_parent_seq[] = { +static const struct message ownerdata_setstate_all_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_defocus_all_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_GETDISPINFOA }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_deselect_all_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ODCACHEHINT }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, { 0 } }; @@ -328,6 +343,14 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP "BEGIN" : "END", pScroll->dx, pScroll->dy); } break; + case LVN_ITEMCHANGED: + if (g_dump_itemchanged) + { + NMLISTVIEW *nmlv = (NMLISTVIEW*)lParam; + trace("LVN_ITEMCHANGED: item=%d,new=%x,old=%x,changed=%x\n", + nmlv->iItem, nmlv->uNewState, nmlv->uOldState, nmlv->uChanged); + } + break; } break; } @@ -2457,12 +2480,108 @@ static void test_ownerdata(void) item.stateMask = LVIS_SELECTED; item.state = LVIS_SELECTED; + + g_dump_itemchanged = TRUE; res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); expect(TRUE, res); + g_dump_itemchanged = FALSE; - ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_select_all_parent_seq, + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_setstate_all_parent_seq, "ownerdata select all notification", TRUE); + /* select all again, note that all items are selected already */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_setstate_all_parent_seq, + "ownerdata select all notification", TRUE); + /* deselect all */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_SELECTED; + item.state = 0; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_deselect_all_parent_seq, + "ownerdata deselect all notification", TRUE); + + /* select one, then deselect all */ + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_SELECTED; + item.state = 0; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_deselect_all_parent_seq, + "ownerdata select all notification", TRUE); + + /* remove focused, try to focus all */ + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + item.stateMask = LVIS_FOCUSED; + item.state = 0; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + item.stateMask = LVIS_FOCUSED; + res = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); + expect(0, res); + /* setting all to focused returns failure value */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + todo_wine expect(FALSE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "ownerdata focus all notification", TRUE); + /* focus single item, remove all */ + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + res = SendMessage(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_FOCUSED; + item.state = 0; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_defocus_all_parent_seq, + "ownerdata remove focus all notification", TRUE); + /* set all cut */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_CUT; + item.state = LVIS_CUT; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_setstate_all_parent_seq, + "ownerdata cut all notification", TRUE); + /* all marked cut, try again */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_CUT; + item.state = LVIS_CUT; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_setstate_all_parent_seq, + "ownerdata cut all notification #2", TRUE); + DestroyWindow(hwnd); /* check notifications on LVM_GETITEM */

1 0

Hans Leidekker : wininet: Update Dutch translation.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 88813358429d36a58e1eef9bef111b854ae1fcf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88813358429d36a58e1eef9be… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 23 20:57:19 2009 +0200 wininet: Update Dutch translation. --- dlls/wininet/wininet_Nl.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Nl.rc b/dlls/wininet/wininet_Nl.rc index 017bce3..f0e891c 100644 --- a/dlls/wininet/wininet_Nl.rc +++ b/dlls/wininet/wininet_Nl.rc @@ -42,6 +42,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annuleren", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Authenticatie vereist" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Voer uw gebruikersnaam en wachtwoord in:", -1, 40, 6, 150, 15 + LTEXT "Server", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "Gebruikersnaam", -1, 40, 66, 50, 10 + LTEXT "Wachtwoord", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Wachtwoord opslaan (onveilig)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuleren", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "LAN Verbinding"

1 0

Hans Leidekker : wininet: Use a different pointer for the password in WININET_SetAuthorization.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 50761eac23204148a7fcb5af9b7d97cedacf91ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=50761eac23204148a7fcb5af9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 23 20:56:42 2009 +0200 wininet: Use a different pointer for the password in WININET_SetAuthorization. --- dlls/wininet/dialogs.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 7f150c7..d66e7e3 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -242,7 +242,7 @@ static BOOL WININET_SetAuthorization( HINTERNET hRequest, LPWSTR username, http_request_t *lpwhr; http_session_t *lpwhs; BOOL ret = FALSE; - LPWSTR p; + LPWSTR p, q; lpwhr = (http_request_t*) WININET_GetObject( hRequest ); if( !lpwhr ) @@ -259,8 +259,8 @@ static BOOL WININET_SetAuthorization( HINTERNET hRequest, LPWSTR username, if( !p ) goto done; - p = heap_strdupW(password); - if( !p ) + q = heap_strdupW(password); + if( !q ) { HeapFree(GetProcessHeap(), 0, username); goto done; @@ -274,7 +274,7 @@ static BOOL WININET_SetAuthorization( HINTERNET hRequest, LPWSTR username, hIC->lpszProxyUsername = p; HeapFree(GetProcessHeap(), 0, hIC->lpszProxyPassword); - hIC->lpszProxyPassword = p; + hIC->lpszProxyPassword = q; } else { @@ -282,7 +282,7 @@ static BOOL WININET_SetAuthorization( HINTERNET hRequest, LPWSTR username, lpwhs->lpszUserName = p; HeapFree(GetProcessHeap(), 0, lpwhs->lpszPassword); - lpwhs->lpszPassword = p; + lpwhs->lpszPassword = q; } ret = TRUE;

1 0