mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-16 08:11:46 -06:00
4.25 beta
This commit is contained in:
Igor Pavlov
committed by
Kornel Lesiński
Kornel Lesiński
parent
47f4915611
commit
af1fe52701
@@ -693,8 +693,14 @@ DWORD CThreadBenchmark::Process()
|
||||
NWindows::NCOM::CPropVariant properties[kNumProps];
|
||||
properties[0] = UInt32(dictionarySize);
|
||||
properties[1] = bool(multiThread);
|
||||
RINOK(setCoderProperties->SetCoderProperties(propIDs,
|
||||
properties, kNumProps));
|
||||
HRESULT res = setCoderProperties->SetCoderProperties(propIDs,
|
||||
properties, kNumProps);
|
||||
if (res != S_OK)
|
||||
{
|
||||
// SyncInfo->Pause();
|
||||
MessageBox(0, NError::MyFormatMessage(res), TEXT("7-Zip"), MB_ICONERROR);
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
if (propStream)
|
||||
|
||||
16
7zip/FileManager/Resource/BenchmarkDialog/StdAfx.h
Executable file
16
7zip/FileManager/Resource/BenchmarkDialog/StdAfx.h
Executable file
@@ -0,0 +1,16 @@
|
||||
// stdafx.h
|
||||
|
||||
#ifndef __STDAFX_H
|
||||
#define __STDAFX_H
|
||||
|
||||
#define _WIN32_WINNT 0x0400
|
||||
|
||||
// it's for Windows NT supporting (MENUITEMINFOW)
|
||||
#define WINVER 0x0400
|
||||
|
||||
#include <windows.h>
|
||||
#include <commctrl.h>
|
||||
|
||||
#include "Common/NewHandler.h"
|
||||
|
||||
#endif
|
||||
@@ -1,7 +1,3 @@
|
||||
//{{NO_DEPENDENCIES}}
|
||||
// Microsoft Developer Studio generated include file.
|
||||
// Used by resource.rc
|
||||
//
|
||||
#define IDD_DIALOG_BENCHMARK 800
|
||||
#define IDC_BUTTON_STOP 1001
|
||||
#define IDC_BUTTON_RESTART 1002
|
||||
@@ -36,14 +32,3 @@
|
||||
#define IDC_BENCHMARK_ERRORS_VALUE 1065
|
||||
#define IDC_BENCHMARK_PASSES 1066
|
||||
#define IDC_BENCHMARK_PASSES_VALUE 1067
|
||||
|
||||
// Next default values for new objects
|
||||
//
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
#ifndef APSTUDIO_READONLY_SYMBOLS
|
||||
#define _APS_NEXT_RESOURCE_VALUE 157
|
||||
#define _APS_NEXT_COMMAND_VALUE 40001
|
||||
#define _APS_NEXT_CONTROL_VALUE 1070
|
||||
#define _APS_NEXT_SYMED_VALUE 101
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -1,149 +1,87 @@
|
||||
//Microsoft Developer Studio generated resource script.
|
||||
//
|
||||
#include "resource.h"
|
||||
#include "../../../GuiCommon.rc"
|
||||
|
||||
#define APSTUDIO_READONLY_SYMBOLS
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 2 resource.
|
||||
//
|
||||
#include "afxres.h"
|
||||
#define xSize2 210
|
||||
#define ySize2 228
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
#define xSize (xSize2 + marg + marg)
|
||||
#define ySize (ySize2 + marg + marg)
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Russian resources
|
||||
#define bXPos1 (xSize - marg - bXSize)
|
||||
#define bXPos2 (bXPos1 - 10 - bXSize)
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
|
||||
#pragma code_page(1251)
|
||||
#endif //_WIN32
|
||||
#define bYPos (ySize - marg - bYSize)
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// TEXTINCLUDE
|
||||
//
|
||||
#define gSize 160
|
||||
#define gSpace 24
|
||||
|
||||
1 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"resource.h\0"
|
||||
END
|
||||
#define g0XSize 75
|
||||
#define g1XSize 44
|
||||
#define g1XPos (marg + g0XSize)
|
||||
|
||||
2 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"#include ""afxres.h""\r\n"
|
||||
"\0"
|
||||
END
|
||||
#define g10XPos (marg + marg)
|
||||
#define gRatingSize 51
|
||||
#define gSpeedSize 64
|
||||
#define gRatingPos (xSize - marg - marg - gRatingSize)
|
||||
#define gSpeedPos (gRatingPos - gSpeedSize)
|
||||
#define gLabelSize (gSpeedPos - g10XPos)
|
||||
#define gTotalRatingSize (gRatingSize + marg + marg)
|
||||
#define gTotalRatingPos (xSize - marg - gTotalRatingSize)
|
||||
|
||||
3 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"\0"
|
||||
END
|
||||
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
#endif // Russian resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#define g2XSize 58
|
||||
#define g3XSize 36
|
||||
#define g3XPos (marg + g2XSize)
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// English (U.S.) resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Dialog
|
||||
//
|
||||
|
||||
IDD_DIALOG_BENCHMARK DIALOG DISCARDABLE 0, 0, 219, 242
|
||||
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
|
||||
WS_CAPTION | WS_SYSMENU
|
||||
IDD_DIALOG_BENCHMARK DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE | WS_MINIMIZEBOX
|
||||
CAPTION "Benchmark"
|
||||
FONT 8, "MS Shell Dlg"
|
||||
MY_FONT
|
||||
BEGIN
|
||||
PUSHBUTTON "&Restart",IDC_BUTTON_RESTART,151,7,62,14
|
||||
PUSHBUTTON "&Stop",IDC_BUTTON_STOP,151,27,62,14
|
||||
PUSHBUTTON "&Help",IDHELP,82,221,62,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,151,221,62,14
|
||||
LTEXT "&Dictionary size:",IDC_BENCHMARK_DICTIONARY,7,8,75,8
|
||||
COMBOBOX IDC_BENCHMARK_COMBO_DICTIONARY,88,7,44,140,
|
||||
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Memory usage:",IDC_BENCHMARK_MEMORY,7,25,75,8
|
||||
LTEXT "0 MB",IDC_BENCHMARK_MEMORY_VALUE,88,25,44,8
|
||||
CONTROL "Multi-threading",IDC_BENCHMARK_MULTITHREADING,"Button",
|
||||
BS_AUTOCHECKBOX | WS_TABSTOP,7,41,75,10
|
||||
RTEXT "Speed",IDC_BENCHMARK_SPEED_LABEL,82,53,64,8
|
||||
RTEXT "Rating",IDC_BENCHMARK_RATING_LABEL,151,53,51,8
|
||||
GROUPBOX "Compressing",IDC_BENCHMARK_COMPRESSING,7,64,205,40
|
||||
LTEXT "Current",IDC_BENCHMARK_CURRENT,17,76,65,8
|
||||
RTEXT "100 KB/s",IDC_BENCHMARK_COMPRESSING_SPEED,82,76,64,8
|
||||
RTEXT "0",IDC_BENCHMARK_COMPRESSING_RATING,151,76,51,8
|
||||
LTEXT "Resulting",IDC_BENCHMARK_RESULTING,17,89,65,8
|
||||
RTEXT "100 KB/s",IDC_BENCHMARK_COMPRESSING_SPEED2,82,89,64,8
|
||||
RTEXT "0",IDC_BENCHMARK_COMPRESSING_RATING2,151,89,51,8
|
||||
GROUPBOX "Decompressing",IDC_BENCHMARK_DECOMPRESSING,7,111,205,40
|
||||
LTEXT "Current",IDC_BENCHMARK_CURRENT2,17,123,65,8
|
||||
RTEXT "100 KB/s",IDC_BENCHMARK_DECOMPRESSING_SPEED,82,123,64,8
|
||||
RTEXT "0",IDC_BENCHMARK_DECOMPRESSING_RATING,151,123,51,8
|
||||
LTEXT "Resulting",IDC_BENCHMARK_RESULTING2,17,136,65,8
|
||||
RTEXT "100 KB/s",IDC_BENCHMARK_DECOMPRESSING_SPEED2,82,136,64,
|
||||
8
|
||||
RTEXT "0",IDC_BENCHMARK_DECOMPRESSING_RATING2,151,136,51,8
|
||||
GROUPBOX "Total Rating",IDC_BENCHMARK_TOTAL_RATING,137,162,75,38
|
||||
RTEXT "0",IDC_BENCHMARK_TOTAL_RATING_VALUE,146,180,56,8
|
||||
LTEXT "Elapsed time:",IDC_BENCHMARK_ELAPSED,7,163,58,8
|
||||
RTEXT "00:00:00",IDC_BENCHMARK_ELAPSED_VALUE,65,163,36,8
|
||||
LTEXT "Size:",IDC_BENCHMARK_SIZE,7,176,58,8
|
||||
RTEXT "0",IDC_BENCHMARK_SIZE_VALUE,65,176,36,8
|
||||
LTEXT "Passes:",IDC_BENCHMARK_PASSES,7,189,58,8
|
||||
RTEXT "0",IDC_BENCHMARK_PASSES_VALUE,65,189,36,8
|
||||
LTEXT "Errors:",IDC_BENCHMARK_ERRORS,7,202,58,8
|
||||
RTEXT "0",IDC_BENCHMARK_ERRORS_VALUE,65,202,36,8
|
||||
PUSHBUTTON "&Restart", IDC_BUTTON_RESTART, bXPos1, marg, bXSize, bYSize
|
||||
PUSHBUTTON "&Stop", IDC_BUTTON_STOP, bXPos1, 27, bXSize, bYSize
|
||||
|
||||
PUSHBUTTON "&Help", IDHELP, bXPos2, bYPos, bXSize,bYSize
|
||||
PUSHBUTTON "Cancel", IDCANCEL, bXPos1, bYPos, bXSize, bYSize
|
||||
|
||||
LTEXT "&Dictionary size:", IDC_BENCHMARK_DICTIONARY, marg, marg + 1, g0XSize, 8
|
||||
COMBOBOX IDC_BENCHMARK_COMBO_DICTIONARY, g1XPos, marg, g1XSize, 140, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Memory usage:", IDC_BENCHMARK_MEMORY, marg, 25, g0XSize, 8
|
||||
LTEXT "0 MB", IDC_BENCHMARK_MEMORY_VALUE, g1XPos,25,g1XSize,8
|
||||
CONTROL "Multi-threading", IDC_BENCHMARK_MULTITHREADING, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
|
||||
marg, 41, g0XSize, 10
|
||||
|
||||
RTEXT "Speed", IDC_BENCHMARK_SPEED_LABEL, gSpeedPos, 53, gSpeedSize, 8
|
||||
RTEXT "Rating", IDC_BENCHMARK_RATING_LABEL, gRatingPos, 53, gRatingSize, 8
|
||||
|
||||
GROUPBOX "Compressing", IDC_BENCHMARK_COMPRESSING, marg, 64, xSize2, 40
|
||||
|
||||
LTEXT "Current", IDC_BENCHMARK_CURRENT, g10XPos, 76, gLabelSize, 8
|
||||
RTEXT "100 KB/s", IDC_BENCHMARK_COMPRESSING_SPEED, gSpeedPos, 76, gSpeedSize, 8
|
||||
RTEXT "0", IDC_BENCHMARK_COMPRESSING_RATING, gRatingPos, 76, gRatingSize, 8
|
||||
|
||||
LTEXT "Resulting", IDC_BENCHMARK_RESULTING, g10XPos, 89, gLabelSize, 8
|
||||
RTEXT "100 KB/s", IDC_BENCHMARK_COMPRESSING_SPEED2, gSpeedPos, 89, gSpeedSize, 8
|
||||
RTEXT "0", IDC_BENCHMARK_COMPRESSING_RATING2, gRatingPos, 89, gRatingSize, 8
|
||||
|
||||
GROUPBOX "Decompressing", IDC_BENCHMARK_DECOMPRESSING, marg, 111, xSize2, 40
|
||||
|
||||
LTEXT "Current", IDC_BENCHMARK_CURRENT2, g10XPos, 123, gLabelSize, 8
|
||||
RTEXT "100 KB/s", IDC_BENCHMARK_DECOMPRESSING_SPEED, gSpeedPos, 123, gSpeedSize, 8
|
||||
RTEXT "0", IDC_BENCHMARK_DECOMPRESSING_RATING, gRatingPos, 123, gRatingSize, 8
|
||||
|
||||
LTEXT "Resulting", IDC_BENCHMARK_RESULTING2, g10XPos, 136, gLabelSize, 8
|
||||
RTEXT "100 KB/s", IDC_BENCHMARK_DECOMPRESSING_SPEED2, gSpeedPos, 136, gSpeedSize, 8
|
||||
RTEXT "0", IDC_BENCHMARK_DECOMPRESSING_RATING2, gRatingPos, 136, gRatingSize, 8
|
||||
|
||||
GROUPBOX "Total Rating", IDC_BENCHMARK_TOTAL_RATING, gTotalRatingPos, 163, gTotalRatingSize, 38
|
||||
RTEXT "0", IDC_BENCHMARK_TOTAL_RATING_VALUE, gRatingPos, 181, gRatingSize, 8
|
||||
|
||||
LTEXT "Elapsed time:", IDC_BENCHMARK_ELAPSED, marg, 163, g2XSize, 8
|
||||
LTEXT "Size:", IDC_BENCHMARK_SIZE, marg, 176, g2XSize, 8
|
||||
LTEXT "Passes:", IDC_BENCHMARK_PASSES, marg, 189, g2XSize, 8
|
||||
LTEXT "Errors:", IDC_BENCHMARK_ERRORS, marg, 202, g2XSize, 8
|
||||
RTEXT "00:00:00", IDC_BENCHMARK_ELAPSED_VALUE, g3XPos, 163, g3XSize, 8
|
||||
RTEXT "0", IDC_BENCHMARK_SIZE_VALUE, g3XPos, 176, g3XSize, 8
|
||||
RTEXT "0", IDC_BENCHMARK_PASSES_VALUE, g3XPos, 189, g3XSize, 8
|
||||
RTEXT "0", IDC_BENCHMARK_ERRORS_VALUE, g3XPos, 202, g3XSize, 8
|
||||
END
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// DESIGNINFO
|
||||
//
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
GUIDELINES DESIGNINFO DISCARDABLE
|
||||
BEGIN
|
||||
IDD_DIALOG_BENCHMARK, DIALOG
|
||||
BEGIN
|
||||
LEFTMARGIN, 7
|
||||
RIGHTMARGIN, 212
|
||||
VERTGUIDE, 17
|
||||
VERTGUIDE, 65
|
||||
VERTGUIDE, 82
|
||||
VERTGUIDE, 88
|
||||
VERTGUIDE, 101
|
||||
VERTGUIDE, 132
|
||||
VERTGUIDE, 146
|
||||
VERTGUIDE, 151
|
||||
VERTGUIDE, 202
|
||||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 235
|
||||
HORZGUIDE, 24
|
||||
HORZGUIDE, 53
|
||||
HORZGUIDE, 76
|
||||
HORZGUIDE, 89
|
||||
HORZGUIDE, 123
|
||||
HORZGUIDE, 136
|
||||
END
|
||||
END
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
#endif // English (U.S.) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user