diff --git a/preload.js b/preload.js index 940df27..7cac9bb 100644 --- a/preload.js +++ b/preload.js @@ -48,10 +48,16 @@ powershell = (cmd, callback) => { tasklist = (callback) => { var tasklist = []; if (isWin) { - powershell("Get-Process -IncludeUserName | sort-object ws -descending | Select-Object ProcessName,Path,Description,WorkingSet,UserName | ConvertTo-Json", (stdout, stderr) => { - tasklist = JSON.parse(stdout); - callback(tasklist); - }); + exec('net session > NULL && echo 1 || echo 0', (err, stdout, stderr) => { + let isAdmin = parseInt(stdout), + IncludeUserName = isAdmin ? '-IncludeUserName' : '', + UserName = isAdmin ? ',UserName' : ''; + powershell(`Get-Process ${IncludeUserName} | sort-object ws -descending | Select-Object ProcessName,Path,Description,WorkingSet${UserName} | ConvertTo-Json`, (stdout, stderr) => { + stderr && dialog.showMessageBox(BrowserWindow.getFocusedWindow(), { type: 'error', title: '啊嘞?!', message: stderr }) + tasklist = JSON.parse(stdout); + callback(tasklist); + }); + }) } else { exec('ps -A -o pid -o %cpu -o %mem -o user -o comm | sed 1d | sort -rnk 3', (err, stdout, stderr) => { lines = stdout.split('\n'); diff --git a/releases/ProcessKiller-0.0.6.upx b/releases/ProcessKiller-0.0.6.upx index 35fdd7c..5ce25df 100644 Binary files a/releases/ProcessKiller-0.0.6.upx and b/releases/ProcessKiller-0.0.6.upx differ