February 2020 - Wine-devel - list.winehq.org

[tools] testbot/LogUtils: Deduplicate the latest WineTest reports.
by Francois Gouget 24 Feb '20

24 Feb '20

There is no need to keep old logs if they don't contain errors that are already present in the latest one. It cuts down on the number of reports that test results need to be compared to to detect new failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I don't expect much deduplicating to happen initially because there are too many "always new" errors. testbot/bin/UpdateTaskLogs | 21 +++++-- testbot/lib/WineTestBot/LogUtils.pm | 95 ++++++++++++++++++++++++++++- 2 files changed, 107 insertions(+), 9 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 49f3c2e817..94adf422db 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -210,6 +210,9 @@ sub BuildErrorsCache($$$$;$) return CreateLogErrorsCache($LogInfo, $Task); } +# The list of files in latest/. This includes files deleted for redundancy. +my %LatestFiles; + sub DoUpdateLatestReport($$$) { my ($Task, $ReportName, $SrcReportPath) = @_; @@ -218,6 +221,8 @@ sub DoUpdateLatestReport($$$) my $SrcIsRef = ($SrcReportPath =~ /-job\d+-/); my $RefReportName = $SrcIsRef ? basename($SrcReportPath) : $Task->GetRefReportName($ReportName); + return 0 if ($LatestFiles{$RefReportName}); + $LatestFiles{$RefReportName} = 1; my $Rc = 0; my $LatestReportPath = "$DataDir/latest/$RefReportName"; @@ -519,14 +524,18 @@ sub ProcessLatestReports() { $Rc += Delete("$LatestReportPath.errors", "orphaned"); } - elsif (!-f "$LatestReportPath.errors") + else { - # Build the missing .errors file - my $ErrMessage = BuildErrorsCache("$DataDir/latest", $RefReportName, 1, 0); - if (defined $ErrMessage) + $LatestFiles{$RefReportName} = 1; + if (!-f "$LatestReportPath.errors") { - Error "$ErrMessage\n"; - $Rc = 1; + # Build the missing .errors file + my $ErrMessage = BuildErrorsCache("$DataDir/latest", $RefReportName, 1, 0); + if (defined $ErrMessage) + { + Error "$ErrMessage\n"; + $Rc = 1; + } } } } diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index f7b6f42513..e309753188 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1028,9 +1028,9 @@ sub MarkAllErrorsAsNew($) =item C<_GetLineKey()> -This is a helper for TagNewErrors(). It reformats the log lines so they -can meaningfully be compared to the reference log even if line numbers change, -etc. +This is a helper for _DeduplicateLatestReport() and TagNewErrors(). It +reformats the log lines so they can meaningfully be compared to the reference +log even if line numbers change, etc. =back =cut @@ -1244,6 +1244,92 @@ sub SnapshotLatestReport($$) return \@ErrMessages; } +sub _IsReportRedundant($$) +{ + my ($RefInfo, $LogInfo) = @_; + + return undef if (($RefInfo->{ErrCount} || 0) < ($LogInfo->{ErrCount} || 0)); + return 1 if (($LogInfo->{ErrCount} || 0) == 0); + + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) + { + my $LogGroup = $LogInfo->{ErrGroups}->{$GroupName}; + my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; + return undef if (!$RefGroup); + + my $Diff = Algorithm::Diff->new($RefGroup->{Errors}, $LogGroup->{Errors}, + { keyGen => \&_GetLineKey }); + while ($Diff->Next()) + { + # Same() > 0 => Items(2) > 0 despite there being no new lines + if (!$Diff->Same() and $Diff->Items(2) > 0) + { + # This old log has errors not present in the latest one so keep it + return undef; + } + } + } + + return 1; +} + +sub _DeduplicateLatestReport($) +{ + my ($RefReportName) = @_; + + my $LatestGlob = $RefReportName; + $LatestGlob =~ s/-job\d+-/-job*-/; + my @LatestPaths = glob("$DataDir/latest/$LatestGlob"); + return undef if (@LatestPaths <= 1); + + my $RefReportPath = "$DataDir/latest/$RefReportName"; + my $RefInfo = LoadLogErrors($RefReportPath); + return $RefInfo->{BadLog} if (defined $RefInfo->{BadLog}); + + my %LatestAges; + foreach my $LogPath (@LatestPaths) + { + $LatestAges{$LogPath} = -M $LogPath || 0; + } + my $RefAge = $LatestAges{$RefReportPath}; + + my $ErrMessage; + my $ReportRE = $RefReportName; + $ReportRE =~ s/^([a-zA-Z0-9_]+)-job\d+-([a-zA-Z0-9_]+)$/\\Q$1\\E-job[0-9]+-\\Q$2/; + foreach my $LogPath (sort { $LatestAges{$a} <=> $LatestAges{$b} } @LatestPaths) + { + my $LogName = basename($LogPath); + next if ($LogName eq $RefReportName); + next if ($LogName !~ /^($ReportRE)$/); + $LogName = $1; # untaint + $LogPath = "$DataDir/latest/$LogName"; + + my $LogInfo = LoadLogErrors($LogPath); + if (defined $LogInfo->{BadLog}) + { + # Take note of the error but continue to try deduplicating + $ErrMessage = $LogInfo->{BadLog}; + next; + } + if ($RefAge < $LatestAges{$LogPath}) + { + if (_IsReportRedundant($RefInfo, $LogInfo)) + { + unlink $LogPath, "$LogPath.errors"; + } + } + else + { + if (_IsReportRedundant($LogInfo, $RefInfo)) + { + unlink $RefReportPath, "$RefReportPath.errors"; + last; + } + } + } + return $ErrMessage; +} + sub UpdateLatestReport($$) { my ($RefReportName, $SrcReportPath) = @_; @@ -1262,6 +1348,9 @@ sub UpdateLatestReport($$) } } + my $ErrMessage = _DeduplicateLatestReport($RefReportName); + push @ErrMessages, $ErrMessage if (defined $ErrMessage); + return \@ErrMessages; } -- 2.20.1

1 0

[PATCH 3/3] Added #defines for SETITEMDATA indent storage
by Dirk Niggemann 24 Feb '20

24 Feb '20

--- dlls/comdlg32/filedlg31.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 43dbf7f9af..0d9293421a 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -43,6 +43,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #define BUFFILE 512 #define BUFFILEALLOC 512 * sizeof(WCHAR) +#define FLAG_FLDR_OPEN 0x10000 +#define INDENT_MASK 0xffff + static const WCHAR FILE_star[] = {'*','.','*', 0}; static const WCHAR FILE_bslash[] = {'\\', 0}; static const WCHAR FILE_specc[] = {'%','c',':', 0}; @@ -206,9 +209,8 @@ static LRESULT FD31_Directory( HWND hdlg, LPCWSTR filespec, int pos, int indent, else lstrcpyW( buffer , entry.cFileName ); if (!long_names) CharLowerW( buffer ); - /* pos = LISTBOX_FindFileStrPos( descr, buffer ); */ SendMessageW(hdlg, LB_INSERTSTRING, pos+n, (LPARAM)buffer); - SendMessageW(hdlg, LB_SETITEMDATA, pos+n, curropen == (pos+n) ? indent | 0x10000 : indent); + SendMessageW(hdlg, LB_SETITEMDATA, pos+n, curropen == (pos+n) ? indent | FLAG_FLDR_OPEN : indent); if (ret <= maxinsert) maxinsert++; else maxinsert = ret; n++; } @@ -267,7 +269,7 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath, WCHAR * sepptr; UINT n = 0; WCHAR pathcomp[BUFFILE]; - SendMessageW(hdlg, LB_RESETCONTENT, 0, 0); + SendMessageW(hdlg, LB_RESETCONTENT, 0, 0); while (dir) { sepptr = wcschr(dir, FILE_bslash[0]); @@ -285,9 +287,9 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath, dir = (sepptr) ? (sepptr + 1) : 0; /* last entry sets open folder if -1 */ if (curropen == -1 && !dir) - SendMessageW(hdlg, LB_SETITEMDATA, n, n | 0x10000 ); + SendMessageW(hdlg, LB_SETITEMDATA, n, n | FLAG_FLDR_OPEN ); else - SendMessageW(hdlg, LB_SETITEMDATA, n,n == curropen ? n | 0x10000 : n); + SendMessageW(hdlg, LB_SETITEMDATA, n,n == curropen ? n | FLAG_FLDR_OPEN : n); n++; } FD31_Directory(hdlg, buffer, n, n, curropen, TRUE); @@ -307,9 +309,9 @@ static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, COLORREF oldText = 0, oldBk = 0; ULONG indent = 0; - if (lpdis->itemData) + if (lpdis->itemData) { - indent = lpdis->itemData & 0xffff; + indent = lpdis->itemData & INDENT_MASK; } if (lpdis->CtlType == ODT_LISTBOX && lpdis->CtlID == lst1) { @@ -365,7 +367,7 @@ static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, SetBkColor( lpdis->hDC, oldBk ); SetTextColor( lpdis->hDC, oldText ); } - if (lpdis->itemData & 0x10000) + if (lpdis->itemData & FLAG_FLDR_OPEN) DrawIconEx( lpdis->hDC, lpdis->rcItem.left + indent*indentWidth, lpdis->rcItem.top, hFolder2, 16, 16, 0, 0, DI_NORMAL ); else DrawIconEx( lpdis->hDC, lpdis->rcItem.left + indent*indentWidth, lpdis->rcItem.top, hFolder, 16, 16, 0, 0, DI_NORMAL ); @@ -508,7 +510,7 @@ static LRESULT FD31_DirListDblClick( FD31_DATA *lfs ) if (lRet == LB_ERR) return TRUE; pstr = heap_alloc(BUFFILEALLOC); SendDlgItemMessageW(hWnd, lst2, LB_GETTEXT, lRet, (LPARAM)pstr); - currindent = SendDlgItemMessageW(hWnd, lst2, LB_GETITEMDATA, lRet, 0) & 0xffff; + currindent = SendDlgItemMessageW(hWnd, lst2, LB_GETITEMDATA, lRet, 0) & INDENT_MASK; lfs->curropen = currindent; lstrcpyW( tmpstr, pstr ); /* get the selected directory in tmpstr */ @@ -521,7 +523,7 @@ static LRESULT FD31_DirListDblClick( FD31_DATA *lfs ) while (n >= 0) { SendDlgItemMessageW(hWnd, lst2, LB_GETTEXT, n, (LPARAM)pstr); - indent = SendDlgItemMessageW(hWnd, lst2, LB_GETITEMDATA, n, 0) & 0xffff; + indent = SendDlgItemMessageW(hWnd, lst2, LB_GETITEMDATA, n, 0) & INDENT_MASK; if (indent < currindent) { lstrcpyW(tmpstr2, pstr); @@ -1178,7 +1180,7 @@ static LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) if (ofn->Flags & OFN_HIDEREADONLY) ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE); if (lfs->hook) - return FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); + return FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); return TRUE; } -- 2.17.2 (Apple Git-113)

1 0

[PATCH 2/3] Remove curropen variable from DrawItem function
by Dirk Niggemann 24 Feb '20

24 Feb '20

--- dlls/comdlg32/filedlg31.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 0e8f316f52..43dbf7f9af 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -300,7 +300,7 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath, * FD31_WMDrawItem [internal] */ static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, - int savedlg, int curropen, const DRAWITEMSTRUCT *lpdis) + int savedlg, const DRAWITEMSTRUCT *lpdis) { WCHAR *str; HICON hIcon; @@ -1225,7 +1225,7 @@ static INT_PTR CALLBACK FD31_FileOpenDlgProc(HWND hWnd, UINT wMsg, return FD31_WMMeasureItem( lParam ); case WM_DRAWITEM: - return FD31_WMDrawItem( hWnd, wParam, lParam, !lfs->open, lfs->curropen, (DRAWITEMSTRUCT *)lParam ); + return FD31_WMDrawItem( hWnd, wParam, lParam, !lfs->open, (DRAWITEMSTRUCT *)lParam ); case WM_COMMAND: return FD31_WMCommand( hWnd, lParam, HIWORD(wParam), LOWORD(wParam), lfs ); -- 2.17.2 (Apple Git-113)

1 0

[PATCH 1/3] comdlg32.dll - Make old-style OpenFileName() function display directory tree in the directory listbox, without square brackets around directory names. This matches the functionality for this listbox in winXP, 7 and 10. Also display open folder icon for selected folder.
by Dirk Niggemann 23 Feb '20

23 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48589 Signed-off=-by: Dirk Niggemann <dirk.niggemann(a)gmail.com> --- dlls/comdlg32/filedlg31.c | 155 ++++++++++++++++++++++++++++++++------ 1 file changed, 131 insertions(+), 24 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 53ef3eeb48..0e8f316f52 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -48,6 +48,7 @@ static const WCHAR FILE_bslash[] = {'\\', 0}; static const WCHAR FILE_specc[] = {'%','c',':', 0}; static const int fldrHeight = 16; static const int fldrWidth = 20; +static const int indentWidth = 5; static HICON hFolder = 0; static HICON hFolder2 = 0; @@ -70,6 +71,7 @@ typedef struct tagFD31_DATA LPOPENFILENAMEW ofnW; /* pointer either to the original structure or a W copy for A/16 API */ LPOPENFILENAMEA ofnA; /* original structure if 32bits ansi dialog */ + UINT curropen; /* position of currenly open folder */ } FD31_DATA, *PFD31_DATA; /*********************************************************************** @@ -170,12 +172,60 @@ static LPCWSTR FD31_GetFileType(LPCWSTR cfptr, LPCWSTR fptr, const WORD index) return FILE_star; /* FIXME */ } + +/*********************************************************************** + * FD31_Directory + */ +static LRESULT FD31_Directory( HWND hdlg, LPCWSTR filespec, int pos, int indent, int curropen, BOOL long_names ) +{ + HANDLE handle; + LRESULT ret = LB_OKAY; + WIN32_FIND_DATAW entry; + LRESULT maxinsert = LB_ERR; + int n = 0; + + /* scan directory */ + if ((handle = FindFirstFileW(filespec, &entry)) == INVALID_HANDLE_VALUE) + { + int le = GetLastError(); + if ((le != ERROR_NO_MORE_FILES) && (le != ERROR_FILE_NOT_FOUND)) return LB_ERR; + } + else + { + do + { + WCHAR buffer[270]; + if (entry.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + static const WCHAR dotW[] = { '.',0 }; + static const WCHAR dotdotW[] = { '.', '.', 0 }; + if ( !lstrcmpW( entry.cFileName, dotW ) ) continue; + if ( !lstrcmpW( entry.cFileName, dotdotW ) ) continue; + if (!long_names && entry.cAlternateFileName[0]) + lstrcpyW( buffer, entry.cAlternateFileName ); + else + lstrcpyW( buffer , entry.cFileName ); + if (!long_names) CharLowerW( buffer ); + /* pos = LISTBOX_FindFileStrPos( descr, buffer ); */ + SendMessageW(hdlg, LB_INSERTSTRING, pos+n, (LPARAM)buffer); + SendMessageW(hdlg, LB_SETITEMDATA, pos+n, curropen == (pos+n) ? indent | 0x10000 : indent); + if (ret <= maxinsert) maxinsert++; else maxinsert = ret; + n++; + } + } while (FindNextFileW( handle, &entry )); + FindClose( handle ); + } + return ret; +} + /*********************************************************************** * FD31_ScanDir [internal] */ -static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) +static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath, + int curropen) { WCHAR buffer[BUFFILE]; + WCHAR currpath[BUFFILE]; HWND hdlg; LRESULT lRet = TRUE; HCURSOR hCursorWait, oldCursor; @@ -183,6 +233,7 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) TRACE("Trying to change to %s\n", debugstr_w(newPath)); if ( newPath[0] && !SetCurrentDirectoryW( newPath )) return FALSE; + GetCurrentDirectoryW(BUFFILE, currpath); /* get the list of spec files */ lstrcpynW(buffer, FD31_GetFileType(ofn->lpstrCustomFilter, @@ -211,9 +262,35 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) /* list of directories */ lstrcpyW(buffer, FILE_star); - - if (GetDlgItem(hWnd, lst2) != 0) { - lRet = DlgDirListW(hWnd, buffer, lst2, stc1, DDL_EXCLUSIVE | DDL_DIRECTORY); + if ((hdlg = GetDlgItem(hWnd, lst2)) != 0) { + WCHAR * dir = currpath; + WCHAR * sepptr; + UINT n = 0; + WCHAR pathcomp[BUFFILE]; + SendMessageW(hdlg, LB_RESETCONTENT, 0, 0); + while (dir) + { + sepptr = wcschr(dir, FILE_bslash[0]); + if (sepptr) *sepptr = 0; + if (!*dir) + { + dir = (sepptr) ? (sepptr + 1) : 0; + continue; + } + lstrcpyW(pathcomp, dir); + if( dir[lstrlenW(dir) -1] == ':' ) + lstrcatW(pathcomp, FILE_bslash); + TRACE("Using path comp %s\n", debugstr_w(pathcomp)); + SendMessageW(hdlg, LB_INSERTSTRING, n, (LPARAM)pathcomp); + dir = (sepptr) ? (sepptr + 1) : 0; + /* last entry sets open folder if -1 */ + if (curropen == -1 && !dir) + SendMessageW(hdlg, LB_SETITEMDATA, n, n | 0x10000 ); + else + SendMessageW(hdlg, LB_SETITEMDATA, n,n == curropen ? n | 0x10000 : n); + n++; + } + FD31_Directory(hdlg, buffer, n, n, curropen, TRUE); } SetCursor(oldCursor); return lRet; @@ -223,12 +300,17 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) * FD31_WMDrawItem [internal] */ static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, - int savedlg, const DRAWITEMSTRUCT *lpdis) + int savedlg, int curropen, const DRAWITEMSTRUCT *lpdis) { WCHAR *str; HICON hIcon; COLORREF oldText = 0, oldBk = 0; + ULONG indent = 0; + if (lpdis->itemData) + { + indent = lpdis->itemData & 0xffff; + } if (lpdis->CtlType == ODT_LISTBOX && lpdis->CtlID == lst1) { if (!(str = heap_alloc(BUFFILEALLOC))) return FALSE; @@ -271,7 +353,7 @@ static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, oldBk = SetBkColor( lpdis->hDC, GetSysColor( COLOR_HIGHLIGHT ) ); oldText = SetTextColor( lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT)); } - ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + fldrWidth, + ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + fldrWidth + indent*indentWidth, lpdis->rcItem.top + 1, ETO_OPAQUE | ETO_CLIPPED, &(lpdis->rcItem), str, lstrlenW(str), NULL); @@ -283,7 +365,10 @@ static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, SetBkColor( lpdis->hDC, oldBk ); SetTextColor( lpdis->hDC, oldText ); } - DrawIconEx( lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hFolder, 16, 16, 0, 0, DI_NORMAL ); + if (lpdis->itemData & 0x10000) + DrawIconEx( lpdis->hDC, lpdis->rcItem.left + indent*indentWidth, lpdis->rcItem.top, hFolder2, 16, 16, 0, 0, DI_NORMAL ); + else + DrawIconEx( lpdis->hDC, lpdis->rcItem.left + indent*indentWidth, lpdis->rcItem.top, hFolder, 16, 16, 0, 0, DI_NORMAL ); heap_free(str); return TRUE; } @@ -408,30 +493,50 @@ static void FD31_UpdateFileTitle(const FD31_DATA *lfs) /*********************************************************************** * FD31_DirListDblClick [internal] */ -static LRESULT FD31_DirListDblClick( const FD31_DATA *lfs ) +static LRESULT FD31_DirListDblClick( FD31_DATA *lfs ) { LONG lRet; + LONG currindent; HWND hWnd = lfs->hwnd; LPWSTR pstr; WCHAR tmpstr[BUFFILE]; + WCHAR tmpstr2[BUFFILE]; + int n, indent; /* get the raw string (with brackets) */ lRet = SendDlgItemMessageW(hWnd, lst2, LB_GETCURSEL, 0, 0); if (lRet == LB_ERR) return TRUE; pstr = heap_alloc(BUFFILEALLOC); - SendDlgItemMessageW(hWnd, lst2, LB_GETTEXT, lRet, - (LPARAM)pstr); + SendDlgItemMessageW(hWnd, lst2, LB_GETTEXT, lRet, (LPARAM)pstr); + currindent = SendDlgItemMessageW(hWnd, lst2, LB_GETITEMDATA, lRet, 0) & 0xffff; + lfs->curropen = currindent; lstrcpyW( tmpstr, pstr ); - heap_free(pstr); /* get the selected directory in tmpstr */ if (tmpstr[0] == '[') { tmpstr[lstrlenW(tmpstr) - 1] = 0; lstrcpyW(tmpstr,tmpstr+1); } + n = lRet -1; + while (n >= 0) + { + SendDlgItemMessageW(hWnd, lst2, LB_GETTEXT, n, (LPARAM)pstr); + indent = SendDlgItemMessageW(hWnd, lst2, LB_GETITEMDATA, n, 0) & 0xffff; + if (indent < currindent) + { + lstrcpyW(tmpstr2, pstr); + lstrcatW(tmpstr2, FILE_bslash); + lstrcatW(tmpstr2, tmpstr); + lstrcpyW(tmpstr, tmpstr2); + currindent = indent; + } + n--; + } + heap_free(pstr); lstrcatW(tmpstr, FILE_bslash); + TRACE("%s\n",debugstr_w(tmpstr)); - FD31_ScanDir(lfs->ofnW, hWnd, tmpstr); + FD31_ScanDir(lfs->ofnW, hWnd, tmpstr, lfs->curropen); /* notify the app */ if (lfs->hook) { @@ -485,7 +590,8 @@ static LRESULT FD31_TestPath( const FD31_DATA *lfs, LPWSTR path ) LPWSTR pBeginFileName, pstr2; WCHAR tmpstr2[BUFFILE]; - pBeginFileName = wcsrchr(path, '\\'); + TRACE("initial path=%s\n", debugstr_w(path)); + pBeginFileName = wcsrchr(path, FILE_bslash[0]); if (pBeginFileName == NULL) pBeginFileName = wcsrchr(path, ':'); @@ -506,19 +612,18 @@ static LRESULT FD31_TestPath( const FD31_DATA *lfs, LPWSTR path ) TRACE("path=%s, tmpstr2=%s\n", debugstr_w(path), debugstr_w(tmpstr2)); SetDlgItemTextW( hWnd, edt1, tmpstr2 ); - FD31_ScanDir(lfs->ofnW, hWnd, path); + FD31_ScanDir(lfs->ofnW, hWnd, path, lfs->curropen); return (lfs->ofnW->Flags & OFN_NOVALIDATE) != 0; } /* no wildcards, we might have a directory or a filename */ /* try appending a wildcard and reading the directory */ - pstr2 = path + lstrlenW(path); if (pBeginFileName == NULL || *(pBeginFileName + 1) != 0) lstrcatW(path, FILE_bslash); /* if ScanDir succeeds, we have changed the directory */ - if (FD31_ScanDir(lfs->ofnW, hWnd, path)) + if (FD31_ScanDir(lfs->ofnW, hWnd, path, lfs->curropen)) return FALSE; /* and path is not a valid file name */ /* if not, this must be a filename */ @@ -533,7 +638,7 @@ static LRESULT FD31_TestPath( const FD31_DATA *lfs, LPWSTR path ) lstrcpynW(tmpstr2, pBeginFileName + 1, ARRAY_SIZE(tmpstr2)); /* Should we MessageBox() if this fails? */ - if (!FD31_ScanDir(lfs->ofnW, hWnd, path)) + if (!FD31_ScanDir(lfs->ofnW, hWnd, path, lfs->curropen)) { return FALSE; } @@ -571,7 +676,10 @@ static LRESULT FD31_Validate( const FD31_DATA *lfs, LPCWSTR path, UINT control, if (control != lst1) { if (!FD31_TestPath( lfs, filename) ) + { + TRACE ("not in file list %s\n", debugstr_w(filename)); return FALSE; + } } FD31_UpdateResult(lfs, filename); @@ -658,7 +766,7 @@ static LRESULT FD31_FileTypeChange( const FD31_DATA *lfs ) * FD31_WMCommand [internal] */ static LRESULT FD31_WMCommand( HWND hWnd, LPARAM lParam, UINT notification, - UINT control, const FD31_DATA *lfs ) + UINT control, FD31_DATA *lfs ) { switch (control) { @@ -951,7 +1059,7 @@ static PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, BOOL IsUnicode) } lfs->lbselchstring = RegisterWindowMessageA(LBSELCHSTRINGA); lfs->fileokstring = RegisterWindowMessageA(FILEOKSTRINGA); - + lfs->curropen = 0; return lfs; } @@ -972,7 +1080,6 @@ static LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) ofn = lfs->ofnW; TRACE("flags=%x initialdir=%s\n", ofn->Flags, debugstr_w(ofn->lpstrInitialDir)); - SetWindowTextW( hWnd, ofn->lpstrTitle ); /* read custom filter information */ if (ofn->lpstrCustomFilter) @@ -1048,9 +1155,9 @@ static LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) } else *tmpstr = 0; - if (!FD31_ScanDir(ofn, hWnd, tmpstr)) { + if (!FD31_ScanDir(ofn, hWnd, tmpstr, -1)) { *tmpstr = 0; - if (!FD31_ScanDir(ofn, hWnd, tmpstr)) + if (!FD31_ScanDir(ofn, hWnd, tmpstr, -1)) WARN("Couldn't read initial directory %s!\n", debugstr_w(tmpstr)); } /* select current drive in combo 2, omit missing drives */ @@ -1071,7 +1178,7 @@ static LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) if (ofn->Flags & OFN_HIDEREADONLY) ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE); if (lfs->hook) - return FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); + return FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); return TRUE; } @@ -1118,7 +1225,7 @@ static INT_PTR CALLBACK FD31_FileOpenDlgProc(HWND hWnd, UINT wMsg, return FD31_WMMeasureItem( lParam ); case WM_DRAWITEM: - return FD31_WMDrawItem( hWnd, wParam, lParam, !lfs->open, (DRAWITEMSTRUCT *)lParam ); + return FD31_WMDrawItem( hWnd, wParam, lParam, !lfs->open, lfs->curropen, (DRAWITEMSTRUCT *)lParam ); case WM_COMMAND: return FD31_WMCommand( hWnd, lParam, HIWORD(wParam), LOWORD(wParam), lfs ); -- 2.17.2 (Apple Git-113)

1 1

[PATCH] winecfg: Add Downloads and Templates to shell folders UI interface.
by Olivier F. R. Dierick 23 Feb '20

23 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48484 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> --- programs/winecfg/theme.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index dffe186..b38b2ff 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -716,12 +716,16 @@ struct ShellFolderInfo { char szLinkTarget[FILENAME_MAX]; /* in unix locale */ }; +#define CSIDL_DOWNLOADS 0x0047 + static struct ShellFolderInfo asfiInfo[] = { { CSIDL_DESKTOP, "" }, { CSIDL_PERSONAL, "" }, { CSIDL_MYPICTURES, "" }, { CSIDL_MYMUSIC, "" }, - { CSIDL_MYVIDEO, "" } + { CSIDL_MYVIDEO, "" }, + { CSIDL_DOWNLOADS, "" }, + { CSIDL_TEMPLATES, "" } }; static struct ShellFolderInfo *psfiSelected = NULL; -- 2.1.4

1 0

[PATCH v2 1/6] d3d8: Retrieve pixel shader constants from the primary stateblock.
by Zebediah Figura 23 Feb '20

23 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/device.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 957f663174..d9f914f125 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3298,19 +3298,22 @@ static HRESULT WINAPI d3d8_device_SetPixelShaderConstant(IDirect3DDevice8 *iface } static HRESULT WINAPI d3d8_device_GetPixelShaderConstant(IDirect3DDevice8 *iface, - DWORD start_register, void *data, DWORD count) + DWORD start_idx, void *constants, DWORD count) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; + const struct wined3d_vec4 *src; - TRACE("iface %p, start_register %u, data %p, count %u.\n", - iface, start_register, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); + + if (!constants || start_idx >= WINED3D_MAX_PS_CONSTS_F || count > WINED3D_MAX_PS_CONSTS_F - start_idx) + return WINED3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_f(device->wined3d_device, start_register, count, data); + src = wined3d_stateblock_get_state(device->state)->ps_consts_f; + memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetPixelShaderFunction(IDirect3DDevice8 *iface, -- 2.25.0

3 12

[PATCH] kernel32/tests: Simplify the name of the test unit for child processes.
by Francois Gouget 22 Feb '20

22 Feb '20

The official name (shown by --list) has no path nor extension. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 68 +++++++++++++++++----------------- dlls/kernel32/tests/toolhelp.c | 2 +- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 323f8092d72..8e80bdba3a9 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -613,7 +613,7 @@ static void test_Startup(void) startup.wShowWindow = SW_SHOWNORMAL; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -653,7 +653,7 @@ static void test_Startup(void) startup.dwFillAttribute = 0xA55A; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -693,7 +693,7 @@ static void test_Startup(void) startup.dwFillAttribute = 0xA55A; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -733,7 +733,7 @@ static void test_Startup(void) startup.dwFillAttribute = 0xA55A; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -773,7 +773,7 @@ static void test_Startup(void) startup.dwFillAttribute = 0xA55A; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -815,7 +815,7 @@ static void test_Startup(void) startup.dwFillAttribute = 0xA55A; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -855,7 +855,7 @@ static void test_Startup(void) startup.dwFillAttribute = 0xA55A; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -897,7 +897,7 @@ static void test_CommandLine(void) /* the basics */ get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\" \"C:\\Program Files\\my nice app.exe\" \"\"\"\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\" \"C:\\Program Files\\my nice app.exe\" \"\"\"\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -921,7 +921,7 @@ static void test_CommandLine(void) /* test main()'s quotes handling */ get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\" \"a\\\"b\\\\\" c\\\" d", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -942,7 +942,7 @@ static void test_CommandLine(void) /* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0]*/ get_file_name(resfile); /* Use exename to avoid buffer containing things like 'C:' */ - sprintf(buffer, "./%s tests/process.c dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); + sprintf(buffer, "./%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -959,7 +959,7 @@ static void test_CommandLine(void) get_file_name(resfile); /* Use exename to avoid buffer containing things like 'C:' */ - sprintf(buffer, ".\\%s tests/process.c dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); + sprintf(buffer, ".\\%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -980,8 +980,8 @@ static void test_CommandLine(void) *(lpFilePart -1 ) = 0; p = strrchr(fullpath, '\\'); /* Use exename to avoid buffer containing things like 'C:' */ - if (p) sprintf(buffer, "..%s/%s tests/process.c dump \"%s\" \"a\\\"b\\\\\" c\\\" d", p, exename, resfile); - else sprintf(buffer, "./%s tests/process.c dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); + if (p) sprintf(buffer, "..%s/%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", p, exename, resfile); + else sprintf(buffer, "./%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -1006,7 +1006,7 @@ static void test_CommandLine(void) /* Use exename to avoid buffer containing things like 'C:' */ if (p) sprintf(buffer, "..%s/%s", p, exename); else sprintf(buffer, "./%s", exename); - sprintf(buffer2, "dummy tests/process.c dump \"%s\" \"a\\\"b\\\\\" c\\\" d", resfile); + sprintf(buffer2, "dummy process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(buffer, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -1016,7 +1016,7 @@ static void test_CommandLine(void) WritePrivateProfileStringA(NULL, NULL, NULL, resfile); CloseHandle(info.hThread); CloseHandle(info.hProcess); - sprintf(buffer, "tests/process.c dump %s", resfile); + sprintf(buffer, "process dump %s", resfile); okChildString("Arguments", "argvA0", "dummy"); okChildString("Arguments", "CommandLineA", buffer2); okChildStringWA("Arguments", "CommandLineW", buffer2); @@ -1106,7 +1106,7 @@ static void test_Directory(void) /* the basics */ get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); GetWindowsDirectoryA( windir, sizeof(windir) ); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, windir, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ @@ -1152,7 +1152,7 @@ static void test_Toolhelp(void) startup.wShowWindow = SW_SHOWNORMAL; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess failed\n"); ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); CloseHandle(info.hProcess); @@ -1170,7 +1170,7 @@ static void test_Toolhelp(void) DeleteFileA(resfile); get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c nested \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process nested \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess failed\n"); ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -1323,7 +1323,7 @@ static void test_Environment(void) /* the basics */ get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -1342,7 +1342,7 @@ static void test_Environment(void) /* the basics */ get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); child_env_len = 0; ptr = env; @@ -1410,7 +1410,7 @@ static void test_SuspendFlag(void) startup.wShowWindow = SW_SHOWNORMAL; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(GetExitCodeThread(info.hThread, &exit_status) && exit_status == STILL_ACTIVE, "thread still running\n"); @@ -1460,7 +1460,7 @@ static void test_DebuggingFlag(void) startup.wShowWindow = SW_SHOWNORMAL; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &startup, &info), "CreateProcess\n"); /* get all startup events up to the entry point break exception */ @@ -1558,7 +1558,7 @@ static void test_Console(void) cpOut = GetConsoleOutputCP(); get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\" console", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\" console", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ @@ -1672,7 +1672,7 @@ static void test_Console(void) startup.hStdError = hChildOutInh; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\" stdhandle", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\" stdhandle", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(CloseHandle(hChildInInh), "Closing handle\n"); ok(CloseHandle(hChildOutInh), "Closing handle\n"); @@ -1712,7 +1712,7 @@ static void test_ExitCode(void) startup.wShowWindow = SW_SHOWNORMAL; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\" exit_code", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\" exit_code", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ @@ -2418,7 +2418,7 @@ static void _create_process(int line, const char *command, LPPROCESS_INFORMATION char buffer[MAX_PATH + 19]; STARTUPINFOA si = {0}; - sprintf(buffer, "\"%s\" tests/process.c %s", selfname, command); + sprintf(buffer, "\"%s\" process %s", selfname, command); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, pi); ok_(__FILE__, line)(ret, "CreateProcess error %u\n", GetLastError()); @@ -2842,7 +2842,7 @@ static void test_jobInheritance(HANDLE job) return; } - sprintf(buffer, "\"%s\" tests/process.c %s", selfname, "exit"); + sprintf(buffer, "\"%s\" process %s", selfname, "exit"); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcessA error %u\n", GetLastError()); @@ -2874,7 +2874,7 @@ static void test_BreakawayOk(HANDLE job) return; } - sprintf(buffer, "\"%s\" tests/process.c %s", selfname, "exit"); + sprintf(buffer, "\"%s\" process %s", selfname, "exit"); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); ok(!ret, "CreateProcessA expected failure\n"); @@ -2943,7 +2943,7 @@ static void test_StartupNoConsole(void) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -2975,7 +2975,7 @@ static void test_DetachConsoleHandles(void) startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); startup.hStdError = GetStdHandle(STD_ERROR_HANDLE); get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -3404,7 +3404,7 @@ static void test_DetachStdHandles(void) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, resfile); SetStdHandle(STD_INPUT_HANDLE, htemp); SetStdHandle(STD_OUTPUT_HANDLE, htemp); @@ -3889,7 +3889,7 @@ void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); - sprintf(buffer, "\"%s\" tests/process.c parent %u %p", selfname, 255, read_pipe); + sprintf(buffer, "\"%s\" process parent %u %p", selfname, 255, read_pipe); #if 0 /* Crashes on some Windows installations, otherwise successfully creates process. */ @@ -3977,7 +3977,7 @@ void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); } - sprintf(buffer, "\"%s\" tests/process.c parent %u %p", selfname, level + 1, read_pipe); + sprintf(buffer, "\"%s\" process parent %u %p", selfname, level + 1, read_pipe); ret = CreateProcessA(NULL, buffer, NULL, NULL, level == 1, level == 1 ? EXTENDED_STARTUPINFO_PRESENT : 0, NULL, NULL, (STARTUPINFOA *)&si, &info); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); @@ -4043,7 +4043,7 @@ START_TEST(process) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, myARGV[3]); + sprintf(buffer, "\"%s\" process dump \"%s\"", selfname, myARGV[3]); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess failed\n"); CloseHandle(info.hProcess); CloseHandle(info.hThread); diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index eb9a6759914..159d71a20cd 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -325,7 +325,7 @@ START_TEST(toolhelp) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - sprintf(buffer, "%s tests/toolhelp.c %lu %lu", selfname, (DWORD_PTR)ev1, (DWORD_PTR)ev2); + sprintf(buffer, "%s toolhelp %lu %lu", selfname, (DWORD_PTR)ev1, (DWORD_PTR)ev2); ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to be initialized */ w = WaitForSingleObject(ev1, WAIT_TIME); -- 2.20.1

2 3

[PATCH 1/5] mp3dmod: Implement IMediaObject::GetStreamCount().
by Zebediah Figura 22 Feb '20

22 Feb '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mp3dmod/mp3dmod.c | 6 ++++-- dlls/mp3dmod/tests/mp3dmod.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index c9da2b8a354..1f3b0126b8e 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -136,9 +136,11 @@ static ULONG WINAPI MediaObject_Release(IMediaObject *iface) static HRESULT WINAPI MediaObject_GetStreamCount(IMediaObject *iface, DWORD *input, DWORD *output) { - FIXME("(%p)->(%p, %p) stub!\n", iface, input, output); + TRACE("iface %p, input %p, output %p.\n", iface, input, output); - return E_NOTIMPL; + *input = *output = 1; + + return S_OK; } static HRESULT WINAPI MediaObject_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 75fd0e2c407..33cc6f3754d 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -286,6 +286,24 @@ static void test_aggregation(void) ok(hr == E_NOINTERFACE, "got %#x\n", hr); } +static void test_stream_info(void) +{ + DWORD input_count, output_count, flags; + IMediaObject *dmo; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaObject, (void **)&dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaObject_GetStreamCount(dmo, &input_count, &output_count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(input_count == 1, "Got input count %u.\n", input_count); + ok(output_count == 1, "Got output count %u.\n", output_count); + + IMediaObject_Release(dmo); +} + START_TEST(mp3dmod) { IMediaObject *dmo; @@ -304,6 +322,7 @@ START_TEST(mp3dmod) test_convert(); test_aggregation(); + test_stream_info(); CoUninitialize(); } -- 2.25.0

1 4

[PATCH] ntdll: Partially implement JobObjectBasicAccountingInformation.
by Derek Lesho 22 Feb '20

22 Feb '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 9 +++++++++ dlls/ntdll/sync.c | 20 +++++++++++++++++--- server/process.c | 14 ++++++++++++++ server/protocol.def | 8 ++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 323f8092d7..421d030e63 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2543,6 +2543,7 @@ static void test_QueryInformationJobObject(void) PJOBOBJECT_BASIC_PROCESS_ID_LIST pid_list = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)buf; JOBOBJECT_EXTENDED_LIMIT_INFORMATION ext_limit_info; JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit_info = &ext_limit_info.BasicLimitInformation; + JOBOBJECT_BASIC_ACCOUNTING_INFORMATION basic_accounting_info; DWORD dwret, ret_len; PROCESS_INFORMATION pi[2]; HANDLE job; @@ -2647,6 +2648,14 @@ static void test_QueryInformationJobObject(void) ok(ret_len == sizeof(ext_limit_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len); expect_eq_d(0, basic_limit_info->LimitFlags); + /* test JobObjectBasicAccountingInformation */ + ret = pQueryInformationJobObject(job, JobObjectBasicAccountingInformation, &basic_accounting_info, + sizeof(basic_accounting_info), &ret_len); + ok(ret, "QueryInformationJobObject error %u\n", GetLastError()); + ok(ret_len == sizeof(basic_accounting_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len); + expect_eq_d(3, basic_accounting_info.TotalProcesses); + expect_eq_d(2, basic_accounting_info.ActiveProcesses); + TerminateProcess(pi[0].hProcess, 0); CloseHandle(pi[0].hProcess); CloseHandle(pi[0].hThread); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 2b5b6ce44a..d6f00237a5 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -694,7 +694,9 @@ NTSTATUS WINAPI NtTerminateJobObject( HANDLE handle, NTSTATUS status ) NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS class, PVOID info, ULONG len, PULONG ret_len ) { - FIXME( "stub: %p %u %p %u %p\n", handle, class, info, len, ret_len ); + NTSTATUS ret; + + TRACE( "semi-stub: %p %u %p %u %p\n", handle, class, info, len, ret_len ); if (class >= MaxJobObjectInfoClass) return STATUS_INVALID_PARAMETER; @@ -708,9 +710,21 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c return STATUS_INFO_LENGTH_MISMATCH; accounting = (JOBOBJECT_BASIC_ACCOUNTING_INFORMATION *)info; - memset(accounting, 0, sizeof(*accounting)); + + SERVER_START_REQ(get_job_info) + { + req->handle = wine_server_obj_handle( handle ); + if ((ret = wine_server_call( req ) == STATUS_SUCCESS)) + { + memset(accounting, 0, sizeof(*accounting)); + accounting->TotalProcesses = reply->total_processes; + accounting->ActiveProcesses = reply->active_processes; + } + } + SERVER_END_REQ; + if (ret_len) *ret_len = sizeof(*accounting); - return STATUS_SUCCESS; + return ret; } case JobObjectBasicProcessIdList: diff --git a/server/process.c b/server/process.c index 73984f363f..8a1edfeac9 100644 --- a/server/process.c +++ b/server/process.c @@ -156,6 +156,7 @@ struct job struct object obj; /* object header */ struct list process_list; /* list of all processes */ int num_processes; /* count of running processes */ + int assign_counter; /* Number of processes which have been assigned */ unsigned int limit_flags; /* limit flags */ int terminating; /* job is terminating */ int signaled; /* job is signaled */ @@ -198,6 +199,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ /* initialize it if it didn't already exist */ list_init( &job->process_list ); job->num_processes = 0; + job->assign_counter = 0; job->limit_flags = 0; job->terminating = 0; job->signaled = 0; @@ -240,6 +242,7 @@ static void add_job_process( struct job *job, struct process *process ) process->job = (struct job *)grab_object( job ); list_add_tail( &job->process_list, &process->job_entry ); job->num_processes++; + job->assign_counter++; add_job_completion( job, JOB_OBJECT_MSG_NEW_PROCESS, get_process_id(process) ); } @@ -1715,6 +1718,17 @@ DECL_HANDLER(process_in_job) release_object( process ); } +/* retrieve information about a job */ +DECL_HANDLER(get_job_info) +{ + struct job *job = get_job_obj( current->process, req->handle, JOB_OBJECT_QUERY ); + + reply->total_processes = job->assign_counter; + reply->active_processes = job->num_processes; + + release_object( job ); +} + /* terminate all processes associated with the job */ DECL_HANDLER(terminate_job) { diff --git a/server/protocol.def b/server/protocol.def index 6c44b2b43f..3956a2815d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3938,6 +3938,14 @@ struct handle_info client_ptr_t key; /* key to send with completion messages */ @END +/* Retrieve information about a job */ +(a)REQ(get_job_info) + obj_handle_t handle; +(a)REPLY + unsigned int total_processes; + unsigned int active_processes; +(a)END + /* Terminate all processes associated with the job */ @REQ(terminate_job) -- 2.25.1

2 1

[PATCH] include: Add new corecrt_wctype file.
by Jacek Caban 22 Feb '20

22 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wctype.h | 49 +++++++++++++++++++++++++++++++++ include/msvcrt/ctype.h | 35 +---------------------- include/msvcrt/wchar.h | 38 +------------------------ 3 files changed, 51 insertions(+), 71 deletions(-) create mode 100644 include/msvcrt/corecrt_wctype.h

2 1