wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

André Hentschel : winex11.drv: Quiet a noisy FIXME.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: c7089361b2e565f3c0a48c53627aef2a7180549c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7089361b2e565f3c0a48c536… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 25 22:26:07 2011 +0100 winex11.drv: Quiet a noisy FIXME. --- dlls/winex11.drv/bitblt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 7d37d76..523d999 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1311,7 +1311,8 @@ static BOOL client_side_dib_copy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc } if (dstDib.dsBm.bmBitsPixel <= 8) { - FIXME("potential optimization: client-side color-index mode DIB copy\n"); + static BOOL fixme_once; + if(!fixme_once++) FIXME("potential optimization: client-side color-index mode DIB copy\n"); return FALSE; } if (!(srcDib.dsBmih.biCompression == BI_BITFIELDS &&

1 0

Peter Urbanec : comctl32/tests: Enable statusbar tooltip tests.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 193d13c421a51c1232c791119397d73ffbfefb89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=193d13c421a51c1232c791119… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Sat Feb 26 04:03:33 2011 +1100 comctl32/tests: Enable statusbar tooltip tests. --- dlls/comctl32/tests/status.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 920d969..c46b614 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -261,7 +261,7 @@ static void test_status_control(void) char ch; char chstr[10] = "Inval id"; - hWndStatus = create_status_control(WS_VISIBLE, 0); + hWndStatus = create_status_control(WS_VISIBLE | SBT_TOOLTIPS, 0); /* Divide into parts and set text */ r = SendMessage(hWndStatus, SB_SETPARTS, 3, (LPARAM)nParts); @@ -400,15 +400,12 @@ static void test_status_control(void) expect(FALSE,r); /* Set the ToolTip text */ - todo_wine - { - SendMessage(hWndStatus, SB_SETTIPTEXT, 0,(LPARAM) "Tooltip Text"); - lstrcpyA(charArray, "apple"); - SendMessage(hWndStatus, SB_GETTIPTEXT, MAKEWPARAM (0, 20),(LPARAM) charArray); - ok(strcmp(charArray,"Tooltip Text") == 0 || - broken(!strcmp(charArray, "apple")), /* win95 */ - "Expected Tooltip Text, got %s\n", charArray); - } + SendMessage(hWndStatus, SB_SETTIPTEXT, 0,(LPARAM) "Tooltip Text"); + lstrcpyA(charArray, "apple"); + SendMessage(hWndStatus, SB_GETTIPTEXT, MAKEWPARAM (0, 20),(LPARAM) charArray); + ok(strcmp(charArray,"Tooltip Text") == 0 || + broken(!strcmp(charArray, "apple")), /* win95 */ + "Expected Tooltip Text, got %s\n", charArray); /* Make simple */ SendMessage(hWndStatus, SB_SIMPLE, TRUE, 0);

1 0

Peter Urbanec : comctl32: Use signed indices, so that the number of parts can be set to zero.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 4f77b0037215559d573a6c11e62c6993c7f30e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f77b0037215559d573a6c11e… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Sat Feb 26 04:03:30 2011 +1100 comctl32: Use signed indices, so that the number of parts can be set to zero. --- dlls/comctl32/status.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index eeaf299..d670370 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -661,7 +661,7 @@ static BOOL STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) { STATUSWINDOWPART *tmp; - UINT i, oldNumParts; + INT i, oldNumParts; TRACE("(%d,%p)\n", count, parts); @@ -693,7 +693,7 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) infoPtr->parts[i].x = parts[i]; if (infoPtr->hwndToolTip) { - UINT nTipCount; + INT nTipCount; TTTOOLINFOW ti; ZeroMemory (&ti, sizeof(TTTOOLINFOW));

1 0

André Hentschel : msvcrt: Implement _wfindnext64.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: e165464eea243012af3a6945eeb017fc01078d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e165464eea243012af3a6945e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 26 19:49:51 2011 +0100 msvcrt: Implement _wfindnext64. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 19 +++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 7 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 54a8024..608bfc6 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1344,7 +1344,7 @@ @ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 -@ stub _wfindnext64 +@ cdecl _wfindnext64(long ptr) msvcrt._wfindnext64 @ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index e378340..b83ce7f 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -625,7 +625,7 @@ @ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64 @ cdecl _wfindfirsti64(wstr ptr) msvcrt._wfindfirsti64 @ cdecl _wfindnext(long ptr) msvcrt._wfindnext -@ stub _wfindnext64 +@ cdecl _wfindnext64(long ptr) msvcrt._wfindnext64 @ cdecl _wfindnexti64(long ptr) msvcrt._wfindnexti64 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index ec8cddd..648802a 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -621,7 +621,7 @@ @ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64 @ cdecl _wfindfirsti64(wstr ptr) msvcrt._wfindfirsti64 @ cdecl _wfindnext(long ptr) msvcrt._wfindnext -@ stub _wfindnext64 +@ cdecl _wfindnext64(long ptr) msvcrt._wfindnext64 @ cdecl _wfindnexti64(long ptr) msvcrt._wfindnexti64 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e2b1bec..58b855c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1197,7 +1197,7 @@ @ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 -@ stub _wfindnext64 +@ cdecl _wfindnext64(long ptr) msvcrt._wfindnext64 @ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 576149d..d76acc8 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1184,7 +1184,7 @@ @ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 -@ stub _wfindnext64 +@ cdecl _wfindnext64(long ptr) msvcrt._wfindnext64 @ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 8fcff3d..a5c4974 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -560,6 +560,25 @@ int CDECL MSVCRT__findnext64(long hand, struct MSVCRT__finddata64_t * ft) } /********************************************************************* + * _wfindnext64 (MSVCRT.@) + * + * Unicode version of _wfindnext64. + */ +int CDECL MSVCRT__wfindnext64(MSVCRT_intptr_t hand, struct MSVCRT__wfinddata64_t * ft) +{ + WIN32_FIND_DATAW find_data; + + if (!FindNextFileW((HANDLE)hand, &find_data)) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } + + msvcrt_wfttofd64(&find_data,ft); + return 0; +} + +/********************************************************************* * _findnext64i32 (MSVCRT.@) * * 64-bit/32-bit version of _findnext. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index cc40817..c7f2120 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1116,7 +1116,7 @@ @ cdecl _wfindfirsti64(wstr ptr) MSVCRT__wfindfirsti64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 @ cdecl _wfindnext(long ptr) MSVCRT__wfindnext -# stub _wfindnext64 +@ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 @ cdecl _wfindnexti64(long ptr) MSVCRT__wfindnexti64 @ cdecl _wfopen(wstr wstr) MSVCRT__wfopen

1 0

André Hentschel : msvcrt: Implement _wfindfirst64.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 1601a264e8b4b8470ddd39578afc895051506bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1601a264e8b4b8470ddd39578… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 26 19:49:21 2011 +0100 msvcrt: Implement _wfindfirst64. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 7 files changed, 47 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 13f4d19..54a8024 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1340,7 +1340,7 @@ @ cdecl _wfdopen(long wstr) msvcrt._wfdopen @ stub _wfindfirst32 @ stub _wfindfirst32i64 -@ stub _wfindfirst64 +@ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index c03b43d..e378340 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -622,7 +622,7 @@ @ cdecl _wexecvpe(wstr ptr ptr) msvcrt._wexecvpe @ cdecl _wfdopen(long wstr) msvcrt._wfdopen @ cdecl _wfindfirst(wstr ptr) msvcrt._wfindfirst -@ stub _wfindfirst64 +@ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64 @ cdecl _wfindfirsti64(wstr ptr) msvcrt._wfindfirsti64 @ cdecl _wfindnext(long ptr) msvcrt._wfindnext @ stub _wfindnext64 diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 58597c3..ec8cddd 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -618,7 +618,7 @@ @ varargs _wexecvpe(wstr ptr ptr) msvcrt._wexecvpe @ cdecl _wfdopen(long wstr) msvcrt._wfdopen @ cdecl _wfindfirst(wstr ptr) msvcrt._wfindfirst -@ stub _wfindfirst64 +@ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64 @ cdecl _wfindfirsti64(wstr ptr) msvcrt._wfindfirsti64 @ cdecl _wfindnext(long ptr) msvcrt._wfindnext @ stub _wfindnext64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index aca11e7..e2b1bec 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1193,7 +1193,7 @@ @ cdecl _wfdopen(long wstr) msvcrt._wfdopen @ stub _wfindfirst32 @ stub _wfindfirst32i64 -@ stub _wfindfirst64 +@ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b269b87..576149d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1180,7 +1180,7 @@ @ cdecl _wfdopen(long wstr) msvcrt._wfdopen @ stub _wfindfirst32 @ stub _wfindfirst32i64 -@ stub _wfindfirst64 +@ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 1e8fd8d..8fcff3d 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -116,6 +116,26 @@ static void msvcrt_fttofd64( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata strcpy(ft->name, fd->cFileName); } +/* INTERNAL: Translate WIN32_FIND_DATAW to wfinddata64_t */ +static void msvcrt_wfttofd64( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfinddata64_t* ft) +{ + DWORD dw; + + if (fd->dwFileAttributes == FILE_ATTRIBUTE_NORMAL) + ft->attrib = 0; + else + ft->attrib = fd->dwFileAttributes; + + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftCreationTime, &dw ); + ft->time_create = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastAccessTime, &dw ); + ft->time_access = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastWriteTime, &dw ); + ft->time_write = dw; + ft->size = ((__int64)fd->nFileSizeHigh) << 32 | fd->nFileSizeLow; + strcpyW(ft->name, fd->cFileName); +} + /* INTERNAL: Translate WIN32_FIND_DATAA to finddata64i32_t */ static void msvcrt_fttofd64i32( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata64i32_t* ft) { @@ -369,6 +389,27 @@ MSVCRT_intptr_t CDECL MSVCRT__findfirst64(const char * fspec, struct MSVCRT__fin } /********************************************************************* + * _wfindfirst64 (MSVCRT.@) + * + * Unicode version of _findfirst64. + */ +MSVCRT_intptr_t CDECL MSVCRT__wfindfirst64(const MSVCRT_wchar_t * fspec, struct MSVCRT__wfinddata64_t* ft) +{ + WIN32_FIND_DATAW find_data; + HANDLE hfind; + + hfind = FindFirstFileW(fspec, &find_data); + if (hfind == INVALID_HANDLE_VALUE) + { + msvcrt_set_errno(GetLastError()); + return -1; + } + msvcrt_wfttofd64(&find_data,ft); + TRACE(":got handle %p\n",hfind); + return (MSVCRT_intptr_t)hfind; +} + +/********************************************************************* * _findfirst64i32 (MSVCRT.@) * * 64-bit/32-bit version of _findfirst. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f1e3259..cc40817 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1112,7 +1112,7 @@ @ cdecl _wexecvpe(wstr ptr ptr) @ cdecl _wfdopen(long wstr) MSVCRT__wfdopen @ cdecl _wfindfirst(wstr ptr) MSVCRT__wfindfirst -# stub _wfindfirst64 +@ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirsti64(wstr ptr) MSVCRT__wfindfirsti64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 @ cdecl _wfindnext(long ptr) MSVCRT__wfindnext

1 0

André Hentschel : ntoskrnl.exe: Be more verbose in MmGetSystemRoutineAddress.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 13fc9ce134f86b19814ba1fea494d73d5b853034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fc9ce134f86b19814ba1fea… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 25 17:50:44 2011 +0100 ntoskrnl.exe: Be more verbose in MmGetSystemRoutineAddress. --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4f70b98..27c5f7a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1523,7 +1523,10 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) RtlFreeAnsiString( &routineNameA ); } - TRACE( "%s -> %p\n", debugstr_us(SystemRoutineName), pFunc ); + if (pFunc) + TRACE( "%s -> %p\n", debugstr_us(SystemRoutineName), pFunc ); + else + FIXME( "%s not found\n", debugstr_us(SystemRoutineName) ); return pFunc; }

1 0

Jacek Caban : mshtml: Added onsubmit and event canceling tests.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 3091f3464e67a13c75b395d1e704208aee9fb72c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3091f3464e67a13c75b395d1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 28 13:14:32 2011 +0100 mshtml: Added onsubmit and event canceling tests. --- dlls/mshtml/tests/events.c | 172 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 171 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index b883f8b..65cf886 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Jacek Caban for CodeWeavers + * Copyright 2008-2011 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -64,6 +64,7 @@ DEFINE_EXPECT(div_onclick); DEFINE_EXPECT(div_onclick_attached); DEFINE_EXPECT(timeout); DEFINE_EXPECT(doccp_onclick); +DEFINE_EXPECT(doccp_onclick_cancel); DEFINE_EXPECT(div_onclick_disp); DEFINE_EXPECT(iframe_onreadystatechange_loading); DEFINE_EXPECT(iframe_onreadystatechange_interactive); @@ -71,6 +72,10 @@ DEFINE_EXPECT(iframe_onreadystatechange_complete); DEFINE_EXPECT(iframedoc_onreadystatechange); DEFINE_EXPECT(img_onload); DEFINE_EXPECT(input_onfocus); +DEFINE_EXPECT(form_onsubmit); +DEFINE_EXPECT(form_onclick); +DEFINE_EXPECT(submit_onclick); +DEFINE_EXPECT(submit_onclick_attached); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; @@ -104,6 +109,12 @@ static const char img_doc_str[] = static const char input_doc_str[] = "<html><body><input id=\"inputid\"></input></body></html>"; +static const char form_doc_str[] = + "<html><body><form id=\"formid\" method=\"post\" action=\"about:blank\">" + "<input type=\"text\" value=\"test\" name=\"i\"/>" + "<input type=\"submit\" id=\"submitid\" />" + "</form></body></html>"; + static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -921,6 +932,59 @@ static HRESULT WINAPI input_onfocus(IDispatchEx *iface, DISPID id, LCID lcid, WO EVENT_HANDLER_FUNC_OBJ(input_onfocus); +static HRESULT WINAPI form_onsubmit(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(form_onsubmit); + test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("FORM"); + + V_VT(pvarRes) = VT_BOOL; + V_BOOL(pvarRes) = VARIANT_FALSE; + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(form_onsubmit); + +static HRESULT WINAPI form_onclick(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(form_onclick); + test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); + + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(form_onclick); + +static HRESULT WINAPI submit_onclick(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(submit_onclick); + test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("INPUT"); + + V_VT(pvarRes) = VT_BOOL; + V_BOOL(pvarRes) = VARIANT_FALSE; + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(submit_onclick); + +static HRESULT WINAPI submit_onclick_attached(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(submit_onclick_attached); + test_attached_event_args(id, wFlags, pdp, pvarRes, pei); + test_event_src("INPUT"); + + V_VT(pvarRes) = VT_BOOL; + V_BOOL(pvarRes) = VARIANT_FALSE; + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(submit_onclick_attached); + static HRESULT WINAPI iframedoc_onreadystatechange(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1087,6 +1151,26 @@ static HRESULT WINAPI doccp(IDispatchEx *iface, DISPID dispIdMember, CONNECTION_POINT_OBJ(doccp, DIID_HTMLDocumentEvents); +static HRESULT WINAPI doccp_onclick_cancel(IDispatchEx *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) +{ + switch(dispIdMember) { + case DISPID_HTMLDOCUMENTEVENTS_ONCLICK: + CHECK_EXPECT(doccp_onclick_cancel); + test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr); + V_VT(pVarResult) = VT_BOOL; + V_BOOL(pVarResult) = VARIANT_FALSE; + break; + default: + ok(0, "unexpected call %d\n", dispIdMember); + return E_NOTIMPL; + } + + return S_OK; +} + +CONNECTION_POINT_OBJ(doccp_onclick_cancel, DIID_HTMLDocumentEvents); + static HRESULT WINAPI timeoutFunc_Invoke(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) @@ -1512,6 +1596,91 @@ static void test_focus(IHTMLDocument2 *doc) IHTMLElement2_Release(elem2); } +static void test_submit(IHTMLDocument2 *doc) +{ + IHTMLElement *elem, *submit; + IHTMLFormElement *form; + VARIANT v; + DWORD cp_cookie; + HRESULT hres; + + elem = get_elem_id(doc, "formid"); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&form_onclick_obj; + hres = IHTMLElement_put_onclick(elem, v); + ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFormElement, (void**)&form); + IHTMLElement_Release(elem); + ok(hres == S_OK, "Could not get IHTMLFormElement iface: %08x\n", hres); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&form_onsubmit_obj; + hres = IHTMLFormElement_put_onsubmit(form, v); + ok(hres == S_OK, "put_onsubmit failed: %08x\n", hres); + + IHTMLFormElement_Release(form); + + submit = get_elem_id(doc, "submitid"); + + SET_EXPECT(form_onclick); + SET_EXPECT(form_onsubmit); + hres = IHTMLElement_click(submit); + ok(hres == S_OK, "click failed: %08x\n", hres); + CHECK_CALLED(form_onclick); + CHECK_CALLED(form_onsubmit); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&submit_onclick_obj; + hres = IHTMLElement_put_onclick(submit, v); + ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + + SET_EXPECT(form_onclick); + SET_EXPECT(submit_onclick); + hres = IHTMLElement_click(submit); + ok(hres == S_OK, "click failed: %08x\n", hres); + CHECK_CALLED(form_onclick); + CHECK_CALLED(submit_onclick); + + elem_attach_event((IUnknown*)submit, "onclick", (IDispatch*)&submit_onclick_attached_obj); + + SET_EXPECT(form_onclick); + SET_EXPECT(submit_onclick); + SET_EXPECT(submit_onclick_attached); + hres = IHTMLElement_click(submit); + ok(hres == S_OK, "click failed: %08x\n", hres); + CHECK_CALLED(form_onclick); + CHECK_CALLED(submit_onclick); + CHECK_CALLED(submit_onclick_attached); + + V_VT(&v) = VT_NULL; + hres = IHTMLElement_put_onclick(submit, v); + ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + + SET_EXPECT(form_onclick); + SET_EXPECT(submit_onclick_attached); + hres = IHTMLElement_click(submit); + ok(hres == S_OK, "click failed: %08x\n", hres); + CHECK_CALLED(form_onclick); + CHECK_CALLED(submit_onclick_attached); + + elem_detach_event((IUnknown*)submit, "onclick", (IDispatch*)&submit_onclick_attached_obj); + + cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_onclick_cancel_obj); + + SET_EXPECT(form_onclick); + SET_EXPECT(doccp_onclick_cancel); + hres = IHTMLElement_click(submit); + ok(hres == S_OK, "click failed: %08x\n", hres); + CHECK_CALLED(form_onclick); + CHECK_CALLED(doccp_onclick_cancel); + + unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); + + IHTMLElement_Release(submit); +} + static void test_timeout(IHTMLDocument2 *doc) { IHTMLWindow3 *win3; @@ -2153,6 +2322,7 @@ START_TEST(events) run_test(readystate_doc_str, test_onreadystatechange); run_test(img_doc_str, test_imgload); run_test(input_doc_str, test_focus); + run_test(form_doc_str, test_submit); DestroyWindow(container_hwnd); CoUninitialize();

1 0

Jacek Caban : mshtml: Added support for canceling default event behavior.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 5055caa8fa7681be60875bd3e4432248501ada40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5055caa8fa7681be60875bd3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 28 13:14:17 2011 +0100 mshtml: Added support for canceling default event behavior. --- dlls/mshtml/htmlevent.c | 125 ++++++++++++++++++++++++++++++---------------- 1 files changed, 81 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5055caa8fa7681be60875…

1 0

Jacek Caban : mshtml: Fixed memory leak.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 650feb0380fa0fbe76262d3da04eaa44fd229c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=650feb0380fa0fbe76262d3da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 28 13:13:59 2011 +0100 mshtml: Fixed memory leak. --- dlls/mshtml/htmlform.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 0f77d28..e53dbc0 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -174,6 +174,7 @@ static HRESULT WINAPI HTMLFormElement_get_action(IHTMLFormElement *iface, BSTR * hres = E_FAIL; } + nsAString_Finish(&action_str); return hres; }

1 0

Jacek Caban : mshtml: Added IHTMLFormElement::onsubmit implementation.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: f4c4a94618b4d50c5478bb53b42736741d3be109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c4a94618b4d50c5478bb53b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 28 13:13:49 2011 +0100 mshtml: Added IHTMLFormElement::onsubmit implementation. --- dlls/mshtml/htmlevent.c | 7 ++++++- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlform.c | 13 +++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c8dad46..9092b65 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -107,6 +107,9 @@ static const WCHAR onresizeW[] = {'o','n','r','e','s','i','z','e',0}; static const WCHAR selectstartW[] = {'s','e','l','e','c','t','s','t','a','r','t',0}; static const WCHAR onselectstartW[] = {'o','n','s','e','l','e','c','t','s','t','a','r','t',0}; +static const WCHAR submitW[] = {'s','u','b','m','i','t',0}; +static const WCHAR onsubmitW[] = {'o','n','s','u','b','m','i','t',0}; + static const WCHAR HTMLEventsW[] = {'H','T','M','L','E','v','e','n','t','s',0}; static const WCHAR KeyboardEventW[] = {'K','e','y','b','o','a','r','d','E','v','e','n','t',0}; static const WCHAR MouseEventW[] = {'M','o','u','s','e','E','v','e','n','t',0}; @@ -180,7 +183,9 @@ static const event_info_t event_info[] = { {resizeW, onresizeW, EVENTT_NONE, DISPID_EVMETH_ONRESIZE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {selectstartW, onselectstartW, EVENTT_MOUSE, DISPID_EVMETH_ONSELECTSTART, - 0} + 0}, + {submitW, onsubmitW, EVENTT_HTML, DISPID_EVMETH_ONSUBMIT, + EVENT_DEFAULTLISTENER|EVENT_BUBBLE} }; static const eventid_t node_handled_list[] = { EVENTID_LOAD }; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 6089504..a1b3c74 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -38,6 +38,7 @@ typedef enum { EVENTID_READYSTATECHANGE, EVENTID_RESIZE, EVENTID_SELECTSTART, + EVENTID_SUBMIT, EVENTID_LAST } eventid_t; diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 3dff376..0f77d28 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -28,6 +28,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -323,15 +324,19 @@ static HRESULT WINAPI HTMLFormElement_get_name(IHTMLFormElement *iface, BSTR *p) static HRESULT WINAPI HTMLFormElement_put_onsubmit(IHTMLFormElement *iface, VARIANT v) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->(v)\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->element.node, EVENTID_SUBMIT, &v); } static HRESULT WINAPI HTMLFormElement_get_onsubmit(IHTMLFormElement *iface, VARIANT *p) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->element.node, EVENTID_SUBMIT, p); } static HRESULT WINAPI HTMLFormElement_put_onreset(IHTMLFormElement *iface, VARIANT v)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2011