1
0
mirror of https://github.com/hashcat/hashcat.git synced 2025-07-13 01:58:10 +00:00

Remove coreclock frequency returned back from OpenCL runtime (always wrong since GTX5xx) - we now have a better reading in status display

Only adjust screen width on windows, not height
This commit is contained in:
jsteube 2016-05-28 18:05:04 +02:00
parent 3227ef167e
commit 1b05d09327

View File

@ -5338,7 +5338,7 @@ static uint generate_bitmaps (const uint digests_cnt, const uint dgst_size, cons
*/ */
#ifdef _WIN #ifdef _WIN
void SetConsoleWindowSize (const int x, const int y) void SetConsoleWindowSize (const int x)
{ {
HANDLE h = GetStdHandle (STD_OUTPUT_HANDLE); HANDLE h = GetStdHandle (STD_OUTPUT_HANDLE);
@ -5350,18 +5350,13 @@ void SetConsoleWindowSize (const int x, const int y)
SMALL_RECT *sr = &bufferInfo.srWindow; SMALL_RECT *sr = &bufferInfo.srWindow;
sr->Left = 0;
sr->Top = 0;
sr->Right = MAX (sr->Right, x - 1); sr->Right = MAX (sr->Right, x - 1);
sr->Bottom = MAX (sr->Bottom, y - 1);
COORD co; COORD co;
co.X = sr->Right + 1; co.X = sr->Right + 1;
co.Y = sr->Bottom + 1; co.Y = sr->Bottom + 1;
co.Y = MAX (co.Y, 1337);
if (!SetConsoleScreenBufferSize (h, co)) return; if (!SetConsoleScreenBufferSize (h, co)) return;
if (!SetConsoleWindowInfo (h, TRUE, sr)) return; if (!SetConsoleWindowInfo (h, TRUE, sr)) return;
@ -5371,7 +5366,7 @@ void SetConsoleWindowSize (const int x, const int y)
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
#ifdef _WIN #ifdef _WIN
SetConsoleWindowSize (132, 44); SetConsoleWindowSize (132);
#endif #endif
/** /**
@ -13741,12 +13736,11 @@ int main (int argc, char **argv)
{ {
if (device_param->skipped == 0) if (device_param->skipped == 0)
{ {
log_info ("Device #%u: %s, %lu/%lu MB allocatable, %dMhz, %uMCU", log_info ("Device #%u: %s, %lu/%lu MB allocatable, %uMCU",
device_id + 1, device_id + 1,
device_name, device_name,
(unsigned int) (device_maxmem_alloc / 1024 / 1024), (unsigned int) (device_maxmem_alloc / 1024 / 1024),
(unsigned int) (device_global_mem / 1024 / 1024), (unsigned int) (device_global_mem / 1024 / 1024),
(unsigned int) (device_maxclock_frequency),
(unsigned int) device_processors); (unsigned int) device_processors);
} }
else else