March 2008 - Wine-commits - list.winehq.org

Andrew Talbot : shell32: Assign to structs instead of using memcpy.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 2cce0040a01e9574db88ff248de6ffa1e31f1a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cce0040a01e9574db88ff248… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 17 21:36:59 2008 +0000 shell32: Assign to structs instead of using memcpy. --- dlls/shell32/cpanelfolder.c | 4 ++-- dlls/shell32/folders.c | 2 +- dlls/shell32/pidl.c | 2 +- dlls/shell32/recyclebin.c | 2 +- dlls/shell32/shelllink.c | 4 ++-- dlls/shell32/shfldr_unixfs.c | 2 +- dlls/shell32/shlexec.c | 2 +- dlls/shell32/shlfileop.c | 4 ++-- dlls/shell32/shlfsbind.c | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index fb6672d..85c8974 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -997,7 +997,7 @@ static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LP MultiByteToWideChar(CP_ACP, 0, pcpanel->szName+pcpanel->offsDispName, -1, params, MAX_PATH); - memcpy(&sei_tmp, psei, sizeof(sei_tmp)); + sei_tmp = *psei; sei_tmp.lpFile = path; sei_tmp.lpParameters = params; sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST; @@ -1078,7 +1078,7 @@ static HRESULT WINAPI IShellExecuteHookA_fnExecute(IShellExecuteHookA* iface, LP lstrcatA(path, "\" "); lstrcatA(path, pcpanel->szName+pcpanel->offsDispName); - memcpy(&sei_tmp, psei, sizeof(sei_tmp)); + sei_tmp = *psei; sei_tmp.lpFile = path; sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST; diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 2119905..8766c50 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -554,7 +554,7 @@ static HRESULT WINAPI IEIPersistFile_fnGetClassID( if (lpClassId==NULL) return E_POINTER; - memcpy(lpClassId, &StdFolderID, sizeof(StdFolderID)); + *lpClassId = StdFolderID; return S_OK; } diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index e369574..25602ae 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1444,7 +1444,7 @@ LPITEMIDLIST _ILCreateGuid(PIDLTYPE type, REFIID guid) { LPPIDLDATA pData = _ILGetDataPointer(pidlOut); - memcpy(&(pData->u.guid.guid), guid, sizeof(GUID)); + pData->u.guid.guid = *guid; TRACE("-- create GUID-pidl %s\n", debugstr_guid(&(pData->u.guid.guid))); } diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 6c26e3d..fef478d 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -332,7 +332,7 @@ static HRESULT WINAPI RecycleBin_GetClassID(IPersistFolder2 *This, CLSID *pClass TRACE("(%p, %p)\n", This, pClassID); if (This == NULL || pClassID == NULL) return E_INVALIDARG; - memcpy(pClassID, &CLSID_RecycleBin, sizeof(CLSID)); + *pClassID = CLSID_RecycleBin; return S_OK; } diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 6e9ac70..be83e76 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -320,7 +320,7 @@ static HRESULT ShellLink_GetClassID( IShellLinkImpl *This, CLSID *pclsid ) { TRACE("%p %p\n", This, pclsid); - memcpy( pclsid, &CLSID_ShellLink, sizeof (CLSID) ); + *pclsid = CLSID_ShellLink; return S_OK; } @@ -1079,7 +1079,7 @@ static HRESULT WINAPI IPersistStream_fnSave( memset(&header, 0, sizeof(header)); header.dwSize = sizeof(header); header.fStartup = This->iShowCmd; - memcpy(&header.MagicGuid, &CLSID_ShellLink, sizeof(header.MagicGuid) ); + header.MagicGuid = CLSID_ShellLink; header.wHotKey = This->wHotKey; header.nIcon = This->iIcoNdx; diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 5f30cd9..6bc47fa 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1459,7 +1459,7 @@ static HRESULT WINAPI UnixFolder_IPersistFolder3_GetClassID(IPersistFolder3* ifa if (!pClassID) return E_INVALIDARG; - memcpy(pClassID, This->m_pCLSID, sizeof(CLSID)); + *pClassID = *This->m_pCLSID; return S_OK; } diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index f562bc6..794d0bd 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1470,7 +1470,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) BOOL appKnownSingular = FALSE; /* make a local copy of the LPSHELLEXECUTEINFO structure and work with this from now on */ - memcpy(&sei_tmp, sei, sizeof(sei_tmp)); + sei_tmp = *sei; TRACE("mask=0x%08x hwnd=%p verb=%s file=%s parm=%s dir=%s show=0x%08x class=%s\n", sei_tmp.fMask, sei_tmp.hwnd, debugstr_w(sei_tmp.lpVerb), diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 0d9f737..61d7ab0 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1112,7 +1112,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST PathCombineW(szFrom, feFrom->szFullPath, wildCardFiles); szFrom[lstrlenW(szFrom) + 1] = '\0'; - memcpy(&fileOp, op->req, sizeof(fileOp)); + fileOp = *op->req; fileOp.pFrom = szFrom; fileOp.pTo = szTo; fileOp.fFlags &= ~FOF_MULTIDESTFILES; /* we know we're copying to one dir */ @@ -1373,7 +1373,7 @@ static void move_dir_to_dir(LPSHFILEOPSTRUCTW lpFileOp, const FILE_ENTRY *feFrom lstrcpyW(szTo, szDestPath); szTo[lstrlenW(szDestPath) + 1] = '\0'; - memcpy(&fileOp, lpFileOp, sizeof(fileOp)); + fileOp = *lpFileOp; fileOp.pFrom = szFrom; fileOp.pTo = szTo; diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index c50e74c..aa4ce97 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -207,7 +207,7 @@ static HRESULT WINAPI IFileSystemBindData_fnGetFindData( if (!pfd) return E_INVALIDARG; - memcpy(pfd, &This->findFile, sizeof(WIN32_FIND_DATAW)); + *pfd = This->findFile; return NOERROR; } @@ -218,7 +218,7 @@ static HRESULT WINAPI IFileSystemBindData_fnSetFindData( TRACE("(%p), %p\n", This, pfd); if (pfd) - memcpy(&This->findFile, pfd, sizeof(WIN32_FIND_DATAW)); + This->findFile = *pfd; else memset(&This->findFile, 0, sizeof(WIN32_FIND_DATAW)); return NOERROR;

1 0

Andrew Talbot : shdocvw: Assign to structs instead of using memcpy.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: f0dd3efe1456d82f556188ca94aa292a9a7079c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0dd3efe1456d82f556188ca9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 17 21:36:56 2008 +0000 shdocvw: Assign to structs instead of using memcpy. --- dlls/shdocvw/classinfo.c | 2 +- dlls/shdocvw/client.c | 2 +- dlls/shdocvw/events.c | 4 ++-- dlls/shdocvw/oleobject.c | 8 ++++---- dlls/shdocvw/shlinstobj.c | 2 +- dlls/shdocvw/webbrowser.c | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/shdocvw/classinfo.c b/dlls/shdocvw/classinfo.c index e5435df..f054398 100644 --- a/dlls/shdocvw/classinfo.c +++ b/dlls/shdocvw/classinfo.c @@ -72,7 +72,7 @@ static HRESULT WINAPI ProvideClassInfo_GetGUID(IProvideClassInfo2 *iface, if (dwGuidKind != GUIDKIND_DEFAULT_SOURCE_DISP_IID) { WARN("Wrong GUID type: %d\n", dwGuidKind); - memcpy(pGUID, &IID_NULL, sizeof(GUID)); + *pGUID = IID_NULL; return E_FAIL; } diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index c74918a..14a7f90 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -222,7 +222,7 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface, *ppDoc = NULL; GetClientRect(This->hwnd, lprcPosRect); - memcpy(lprcClipRect, lprcPosRect, sizeof(RECT)); + *lprcClipRect = *lprcPosRect; lpFrameInfo->cb = sizeof(*lpFrameInfo); lpFrameInfo->fMDIApp = FALSE; diff --git a/dlls/shdocvw/events.c b/dlls/shdocvw/events.c index f12ff95..2fba55c 100644 --- a/dlls/shdocvw/events.c +++ b/dlls/shdocvw/events.c @@ -166,7 +166,7 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *i TRACE("(%p)->(%p)\n", This, pIID); - memcpy(pIID, &This->iid, sizeof(IID)); + *pIID = This->iid; return S_OK; } @@ -279,7 +279,7 @@ static void ConnectionPoint_Create(REFIID riid, ConnectionPoint **cp, ret->sinks_size = 0; ret->container = container; - memcpy(&ret->iid, riid, sizeof(IID)); + ret->iid = *riid; *cp = ret; } diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 8d05b77..b8ed625 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -481,7 +481,7 @@ static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, TRACE("(%p)->(%x %p)\n", This, dwDrawAspect, psizel); /* Tests show that dwDrawAspect is ignored */ - memcpy(&This->extent, psizel, sizeof(SIZEL)); + This->extent = *psizel; return S_OK; } @@ -492,7 +492,7 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, TRACE("(%p)->(%x, %p)\n", This, dwDrawAspect, psizel); /* Tests show that dwDrawAspect is ignored */ - memcpy(psizel, &This->extent, sizeof(SIZEL)); + *psizel = This->extent; return S_OK; } @@ -631,10 +631,10 @@ static HRESULT WINAPI OleInPlaceObject_SetObjectRects(IOleInPlaceObject *iface, TRACE("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); - memcpy(&This->pos_rect, lprcPosRect, sizeof(RECT)); + This->pos_rect = *lprcPosRect; if(lprcClipRect) - memcpy(&This->clip_rect, lprcClipRect, sizeof(RECT)); + This->clip_rect = *lprcClipRect; if(This->shell_embedding_hwnd) { SetWindowPos(This->shell_embedding_hwnd, NULL, diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index eaca590..d272c91 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -326,7 +326,7 @@ static HRESULT InstanceObjectFactory_Constructor(REFCLSID rclsid, IPropertyBag * if (pInstanceObjectFactory) { pInstanceObjectFactory->lpIClassFactoryVtbl = &InstanceObjectFactory_IClassFactoryVtbl; pInstanceObjectFactory->m_cRef = 0; - memcpy(&pInstanceObjectFactory->m_clsidInstance, rclsid, sizeof(CLSID)); + pInstanceObjectFactory->m_clsidInstance = *rclsid; pInstanceObjectFactory->m_pPropertyBag = pPropertyBag; IPropertyBag_AddRef(pPropertyBag); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index db6bea6..df8012b 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -344,7 +344,7 @@ static HRESULT WINAPI WebBrowser_put_Left(IWebBrowser2 *iface, long Left) if(!This->inplace) return E_UNEXPECTED; - memcpy(&rect, &This->pos_rect, sizeof(RECT)); + rect = This->pos_rect; rect.left = Left; /* We don't really change the window position here. @@ -372,7 +372,7 @@ static HRESULT WINAPI WebBrowser_put_Top(IWebBrowser2 *iface, long Top) if(!This->inplace) return E_UNEXPECTED; - memcpy(&rect, &This->pos_rect, sizeof(RECT)); + rect = This->pos_rect; rect.top = Top; /* We don't really change the window position here. @@ -400,9 +400,9 @@ static HRESULT WINAPI WebBrowser_put_Width(IWebBrowser2 *iface, long Width) if(!This->inplace) return E_UNEXPECTED; - memcpy(&rect, &This->pos_rect, sizeof(RECT)); + rect = This->pos_rect; rect.right = rect.left+Width; - + /* We don't really change the window size here. * We just notify the embedder that he should do so. */ return IOleInPlaceSite_OnPosRectChange(This->inplace, &rect); @@ -428,7 +428,7 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, long Height) if(!This->inplace) return E_UNEXPECTED; - memcpy(&rect, &This->pos_rect, sizeof(RECT)); + rect = This->pos_rect; rect.bottom = rect.top+Height; /* We don't really change the window size here.

1 0

H. Verbeet : server: Don't drop the SE_GROUP_LOGON_ID attribute.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 3120c0861c16aebade2fc1a7a3be84c62a6ff728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3120c0861c16aebade2fc1a7a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 17 17:55:17 2008 +0100 server: Don't drop the SE_GROUP_LOGON_ID attribute. --- server/token.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/token.c b/server/token.c index 387163b..72b3e29 100644 --- a/server/token.c +++ b/server/token.c @@ -466,7 +466,7 @@ static struct token *create_token( unsigned primary, const SID *user, memcpy( &group->sid, groups[i].Sid, FIELD_OFFSET( SID, SubAuthority[((const SID *)groups[i].Sid)->SubAuthorityCount] ) ); group->enabled = TRUE; group->def = TRUE; - group->logon = FALSE; + group->logon = (groups[i].Attributes & SE_GROUP_LOGON_ID) ? TRUE : FALSE; group->mandatory = (groups[i].Attributes & SE_GROUP_MANDATORY) ? TRUE : FALSE; group->owner = groups[i].Attributes & SE_GROUP_OWNER ? TRUE : FALSE; group->resource = FALSE; @@ -1295,6 +1295,7 @@ DECL_HANDLER(get_token_groups) if (group->owner) *attr_ptr |= SE_GROUP_OWNER; if (group->deny_only) *attr_ptr |= SE_GROUP_USE_FOR_DENY_ONLY; if (group->resource) *attr_ptr |= SE_GROUP_RESOURCE; + if (group->logon) *attr_ptr |= SE_GROUP_LOGON_ID; memcpy(sid_ptr, &group->sid, FIELD_OFFSET(SID, SubAuthority[group->sid.SubAuthorityCount]));

1 0

Maarten Lankhorst : winmm: Fix midi deadlock by not holding lock on release .
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 15907b5035ea7f03b369a0463ab1f6ac2b24704e URL: http://source.winehq.org/git/wine.git/?a=commit;h=15907b5035ea7f03b369a0463… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Mar 17 13:15:42 2008 -0700 winmm: Fix midi deadlock by not holding lock on release. --- dlls/winmm/mci.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index b7b5ac2..c792d18 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1767,19 +1767,25 @@ static DWORD MCI_Close(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms TRACE("(%04x, %08X, %p)\n", wDevID, dwParam, lpParms); if (wDevID == MCI_ALL_DEVICE_ID) { - LPWINE_MCIDRIVER next; - - EnterCriticalSection(&WINMM_cs); /* FIXME: shall I notify once after all is done, or for * each of the open drivers ? if the latest, which notif * to return when only one fails ? */ - for (wmd = MciDrivers; wmd; ) { - next = wmd->lpNext; - MCI_Close(wmd->wDeviceID, dwParam, lpParms); - wmd = next; + while (MciDrivers) { + /* Retrieve the device ID under lock, but send the message without, + * the driver might be calling some winmm functions from another + * thread before being fully stopped. + */ + EnterCriticalSection(&WINMM_cs); + if (!MciDrivers) + { + LeaveCriticalSection(&WINMM_cs); + break; + } + wDevID = MciDrivers->wDeviceID; + LeaveCriticalSection(&WINMM_cs); + MCI_Close(wDevID, dwParam, lpParms); } - LeaveCriticalSection(&WINMM_cs); return 0; }

1 0

Francois Gouget : winetest: More clearly identify todo tests as items that need to be fixed.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: tools Branch: master Commit: 2910ab92709a522a33e3818203172336e49ee099 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2910ab92709a522a33e38182… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 17 12:29:42 2008 +0100 winetest: More clearly identify todo tests as items that need to be fixed. --- winetest/gather | 15 +++++++++------ winetest/summary.css | 5 +++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/winetest/gather b/winetest/gather index 86e92ab..a2b578d 100755 --- a/winetest/gather +++ b/winetest/gather @@ -286,7 +286,7 @@ print OUT <<"EOF"; Some tests <span class="result mixed">fail</span> in some reports<br> Some tests <span class="result fail">fail</span> in all reports<br> This <span class="result pass also-skip">border</span> signals that some tests are skipped<br> - This <span class="result pass also-todo">border</span> signals that the implementation needs some work + This <span class="result pass also-todo">border</span> and this <span class="result todo">background</span> signal that the implementation needs some work </p> <h1>Main summary for build <a href="$url">$build</a></h1> <table class="report"> @@ -346,15 +346,16 @@ EOF >.</a></td> EOF } else { - my $class = $error?"fail":"pass"; + my $class = $error?"fail":$todo?"todo":"pass"; $class .= " also-skip" if ($skipped); $class .= " also-todo" if ($todo); + my $msg=$todo ? ($error ? "$error+$todo" : $todo) : $error; print OUT <<"EOF"; <td class="result $class"><a href="$file" title="$count tests, $todo TODO, $error errors, $skipped skipped" onMouseOver="refresh('$testname','$groupname $report->{tag}',$count,$todo,$error,$skipped);" - >$error</a></td> + >$msg</a></td> EOF } } @@ -375,8 +376,9 @@ EOF my $href = "href=\"#group_$group->{name}:$testname\""; if (exists $group->{extrema}->{$testname}) { my ($min,$max) = @{$group->{extrema}->{$testname}}; - my $class = $min==0?($max==0?"pass":"mixed"):"fail"; - $class .= " also-todo" if (exists $group->{todo}->{$testname}); + my $todo=$group->{todo}->{$testname}; + my $class = $min?"fail":$max?"mixed":$todo?"todo":"pass"; + $class .= " also-todo" if ($todo); $class .= " also-skip" if (exists $group->{skipped}->{$testname}); my $title = ""; if ($min) @@ -386,10 +388,11 @@ EOF $title.="\""; } my $errors = $min==$max?$min:"$min to $max"; + my $msg=$todo ? ($max ? "$max+$todo" : $todo) : $max; print OUT <<"EOF"; <td class="result $class"><a $href$title onMouseOver="refresh('$testname','$group->{name}','-','-','$errors');" - >$max</a></td> + >$msg</a></td> EOF } else { print OUT " <td class=\"note\"><a $href>.</a></td>\n"; diff --git a/winetest/summary.css b/winetest/summary.css index 187af79..a7b4e31 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -23,6 +23,11 @@ h3, p.legend { border-left-color: #ffff40; border-right-color: #ffff40; } +.todo { + background-color: #ff9b49; + border-left-color: #ff9b49; + border-right-color: #ff9b49; +} .fail { background-color: #ff5050; border-left-color: #ff5050;

1 0

Francois Gouget : winetest: Show the number of errors and then the number of todo tests.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: tools Branch: master Commit: 5ec71d34a33298eb6592de93e9d2c75510ec1093 URL: http://source.winehq.org/git/tools.git/?a=commit;h=5ec71d34a33298eb6592de93… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 17 12:32:13 2008 +0100 winetest: Show the number of errors and then the number of todo tests. --- winetest/gather | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/gather b/winetest/gather index a2b578d..b502345 100755 --- a/winetest/gather +++ b/winetest/gather @@ -353,7 +353,7 @@ EOF print OUT <<"EOF"; <td class="result $class"><a href="$file" - title="$count tests, $todo TODO, $error errors, $skipped skipped" + title="$count tests, $error errors, $todo todos, $skipped skips" onMouseOver="refresh('$testname','$groupname $report->{tag}',$count,$todo,$error,$skipped);" >$msg</a></td> EOF

1 0

Francois Gouget : winetest: Issue a better description than '.' for the special failure modes. Write them as a note so they stand out better.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: tools Branch: master Commit: f921868fedfb78a3ad6139c06cb0b940fa5d3e35 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f921868fedfb78a3ad6139c0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 17 12:32:27 2008 +0100 winetest: Issue a better description than '.' for the special failure modes. Write them as a note so they stand out better. --- winetest/gather | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/winetest/gather b/winetest/gather index b502345..ee49f4a 100755 --- a/winetest/gather +++ b/winetest/gather @@ -329,21 +329,21 @@ sub singletest($$$) { EOF } elsif ($count eq "winetest crash") { print OUT <<"EOF"; - <td class="result fail also-skip"><a + <td class="note"><a title="Test did not run as winetest crashed" - >.</a></td> + >winetest</a></td> EOF } elsif ($count eq "file limit") { print OUT <<"EOF"; - <td class="result fail also-skip"><a + <td class="note"><a title="Test is missing because of a partial report file" - >.</a></td> + >truncated</a></td> EOF } elsif ($count eq "test missing") { print OUT <<"EOF"; - <td class="result fail also-skip"><a + <td class="note"><a title="Test did not run for an unknown reason" - >.</a></td> + >not run</a></td> EOF } else { my $class = $error?"fail":$todo?"todo":"pass";

1 0

Francois Gouget : winetest: Link individual group results straight to the relevant line in the platform table .
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: tools Branch: master Commit: e8948ce5c6604cef381e8b4a59a7a7efb48d2c81 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e8948ce5c6604cef381e8b4a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 17 12:17:43 2008 +0100 winetest: Link individual group results straight to the relevant line in the platform table. --- winetest/gather | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index 8ec43bd..5c9d393 100755 --- a/winetest/gather +++ b/winetest/gather @@ -372,7 +372,7 @@ EOF } elsif (@{$group->{reports}} == 1) { singletest($group->{reports}->[0], $testname, $group->{name}); } else { - my $href = "href=\"#group_$group->{name}\""; + my $href = "href=\"#group_$group->{name}:$testname\""; if (exists $group->{extrema}->{$testname}) { my ($min,$max) = @{$group->{extrema}->{$testname}}; my $todos = (exists $group->{todo}->{$testname})?"todo_":""; @@ -450,7 +450,7 @@ EOF print OUT <<"EOF"; <tr> <td class="test"> - <a href="$alltests{$testname}">$testname</a></td> + <a href="$alltests{$testname}" name="group_$group->{name}:$testname">$testname</a></td> EOF foreach my $report (@{$group->{reports}}) { singletest($report, $testname, $group->{name});

1 0

Francois Gouget : winetest: Specify multiple classes for result cells, instead of having one class for every possible error / todo / skip combination.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: tools Branch: master Commit: f168fda4c999a58a5742be3ebeb618386fb6313e URL: http://source.winehq.org/git/tools.git/?a=commit;h=f168fda4c999a58a5742be3e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 17 12:24:16 2008 +0100 winetest: Specify multiple classes for result cells, instead of having one class for every possible error / todo / skip combination. --- winetest/gather | 30 +++++++++++++++--------------- winetest/summary.css | 34 ++++++++++++++++++++++------------ 2 files changed, 37 insertions(+), 27 deletions(-) diff --git a/winetest/gather b/winetest/gather index 5c9d393..86e92ab 100755 --- a/winetest/gather +++ b/winetest/gather @@ -282,11 +282,11 @@ print OUT <<"EOF"; </tr> </table> <h3>Legend</h3> -<p class="legend">All tests <span class="pass">pass</span> in all reports<br> - Some tests <span class="mixed">fail</span> in some reports<br> - Some tests <span class="fail">fail</span> in all reports<br> - This <span class="skip_pass">border</span> signals that some tests are skipped<br> - This <span class="todo_pass">border</span> signals that the implementation needs some work +<p class="legend">All tests <span class="result pass">pass</span> in all reports<br> + Some tests <span class="result mixed">fail</span> in some reports<br> + Some tests <span class="result fail">fail</span> in all reports<br> + This <span class="result pass also-skip">border</span> signals that some tests are skipped<br> + This <span class="result pass also-todo">border</span> signals that the implementation needs some work </p> <h1>Main summary for build <a href="$url">$build</a></h1> <table class="report"> @@ -323,34 +323,34 @@ sub singletest($$$) { $dll.=".dll" if ($dll !~ /\./); my $href=(-r "$datadir/$build/$file") ? "href=\"$file\"" : ""; print OUT <<"EOF"; - <td class="skip_pass"><a $href + <td class="result pass also-skip"><a title="No tests run as $dll is not present on this system" >n/a</a></td> EOF } elsif ($count eq "winetest crash") { print OUT <<"EOF"; - <td class="skip_fail"><a + <td class="result fail also-skip"><a title="Test did not run as winetest crashed" >.</a></td> EOF } elsif ($count eq "file limit") { print OUT <<"EOF"; - <td class="skip_fail"><a + <td class="result fail also-skip"><a title="Test is missing because of a partial report file" >.</a></td> EOF } elsif ($count eq "test missing") { print OUT <<"EOF"; - <td class="skip_fail"><a + <td class="result fail also-skip"><a title="Test did not run for an unknown reason" >.</a></td> EOF } else { my $class = $error?"fail":"pass"; - my $skip = $skipped?"skip_":""; - my $todos = $todo?"todo_":""; + $class .= " also-skip" if ($skipped); + $class .= " also-todo" if ($todo); print OUT <<"EOF"; - <td class="$todos$skip$class"><a + <td class="result $class"><a href="$file" title="$count tests, $todo TODO, $error errors, $skipped skipped" onMouseOver="refresh('$testname','$groupname $report->{tag}',$count,$todo,$error,$skipped);" @@ -375,9 +375,9 @@ EOF my $href = "href=\"#group_$group->{name}:$testname\""; if (exists $group->{extrema}->{$testname}) { my ($min,$max) = @{$group->{extrema}->{$testname}}; - my $todos = (exists $group->{todo}->{$testname})?"todo_":""; - my $skip = (exists $group->{skipped}->{$testname})?"skip_":""; my $class = $min==0?($max==0?"pass":"mixed"):"fail"; + $class .= " also-todo" if (exists $group->{todo}->{$testname}); + $class .= " also-skip" if (exists $group->{skipped}->{$testname}); my $title = ""; if ($min) { @@ -387,7 +387,7 @@ EOF } my $errors = $min==$max?$min:"$min to $max"; print OUT <<"EOF"; - <td class="$todos$skip$class"><a $href$title + <td class="result $class"><a $href$title onMouseOver="refresh('$testname','$group->{name}','-','-','$errors');" >$max</a></td> EOF diff --git a/winetest/summary.css b/winetest/summary.css index 269f80c..187af79 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -7,27 +7,35 @@ body { h3, p.legend { text-align: center; } +.result { + border-left-width: thick; + border-left-style: solid; + border-right-width: thick; + border-right-style: solid; +} .pass { background-color: #60ff60; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-color: #60ff60; + border-left-color: #60ff60; + border-right-color: #60ff60; } .mixed { background-color: #ffff40; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-color: #ffff40; + border-left-color: #ffff40; + border-right-color: #ffff40; } .fail { background-color: #ff5050; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-color: #ff5050; + border-left-color: #ff5050; + border-right-color: #ff5050; } +.also-todo { + border-left-color: #ff9b49; +} +.also-skip { + border-right-color: #0070ff; +} + +/* Styles kept for compatibility with old reports */ .vis_pass { background-color: #60ff60; border-right-style: solid; @@ -116,6 +124,8 @@ h3, p.legend { border-left-color: #ff9b49; border-right-color: #0070ff; } +/* End of legacy styles */ + td { text-align: center; }

1 0

Francois Gouget : winetest: Make sure the 'name' attribute does not start with a digit so it is compatible with the 'id' one. This fixes an HTML warning on pages containing multiple 2000 or 2003 reports .
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: tools Branch: master Commit: 785cb32228093c0b5688bdd2ca3bda9b26196140 URL: http://source.winehq.org/git/tools.git/?a=commit;h=785cb32228093c0b5688bdd2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 17 12:17:17 2008 +0100 winetest: Make sure the 'name' attribute does not start with a digit so it is compatible with the 'id' one. This fixes an HTML warning on pages containing multiple 2000 or 2003 reports. --- winetest/gather | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/winetest/gather b/winetest/gather index b0e4d7d..8ec43bd 100755 --- a/winetest/gather +++ b/winetest/gather @@ -226,7 +226,7 @@ foreach my $group (@groups) { if (exists $group->{reports}) { my $report_count = @{$group->{reports}}; if ($report_count > 1) { - $header .= " <th><a href=\"#$group->{name}\">$group->{name}<br><small>$report_count reports</small></a></th>\n"; + $header .= " <th><a href=\"#group_$group->{name}\">$group->{name}<br><small>$report_count reports</small></a></th>\n"; } else { my $report = $group->{reports}->[0]; # If dllinfo.txt exist we use a different layout (new style report) @@ -372,7 +372,7 @@ EOF } elsif (@{$group->{reports}} == 1) { singletest($group->{reports}->[0], $testname, $group->{name}); } else { - my $href = "href=\"#$group->{name}\""; + my $href = "href=\"#group_$group->{name}\""; if (exists $group->{extrema}->{$testname}) { my ($min,$max) = @{$group->{extrema}->{$testname}}; my $todos = (exists $group->{todo}->{$testname})?"todo_":""; @@ -428,7 +428,7 @@ EOF print OUT <<"EOF"; <hr> -<h2><a name="$group->{name}">$group->{name} differences</a></h2> +<h2><a name="group_$group->{name}">$group->{name} differences</a></h2> <table class="report"> <thead> <tr>

1 0