9.349.34

1 files changed, 62 insertions, 59 deletions

diff --git a/CPP/7zip/UI/GUI/BenchmarkDialogRes.h b/CPP/7zip/UI/GUI/BenchmarkDialogRes.h
index cf009df3..7dd6d031 100755..100644
--- a/CPP/7zip/UI/GUI/BenchmarkDialogRes.h
+++ b/CPP/7zip/UI/GUI/BenchmarkDialogRes.h
@@ -1,59 +1,62 @@
-#define IDD_DIALOG_BENCHMARK            550
-#define IDD_DIALOG_BENCHMARK_2          650
-#define IDD_DIALOG_BENCHMARK_TOTAL      750
-#define IDD_DIALOG_BENCHMARK_TOTAL_2    750
-#define IDC_BUTTON_STOP                 1001
-#define IDC_BUTTON_RESTART              1002
-#define IDC_BENCHMARK_DICTIONARY        1010
-#define IDC_BENCHMARK_COMBO_DICTIONARY  1011
-#define IDC_BENCHMARK_MEMORY            1012
-#define IDC_BENCHMARK_MEMORY_VALUE      1013
-#define IDC_BENCHMARK_NUM_THREADS       1014
-#define IDC_BENCHMARK_COMBO_NUM_THREADS 1015
-#define IDC_BENCHMARK_HARDWARE_THREADS  1016
-
-#define IDC_BENCHMARK_SPEED_LABEL       1020
-#define IDC_BENCHMARK_RATING_LABEL      1021
-#define IDC_BENCHMARK_COMPRESSING       1022
-#define IDC_BENCHMARK_DECOMPRESSING     1023
-#define IDC_BENCHMARK_CURRENT           1024
-#define IDC_BENCHMARK_RESULTING         1025
-#define IDC_BENCHMARK_CURRENT2          1026
-#define IDC_BENCHMARK_RESULTING2        1027
-#define IDC_BENCHMARK_USAGE_LABEL       1028
-#define IDC_BENCHMARK_RPU_LABEL         1029
-
-#define IDC_BENCHMARK_COMPRESSING_SPEED 1030
-#define IDC_BENCHMARK_COMPRESSING_SPEED2 1031
-#define IDC_BENCHMARK_COMPRESSING_RATING 1032
-#define IDC_BENCHMARK_COMPRESSING_RATING2 1033
-#define IDC_BENCHMARK_COMPRESSING_USAGE 1034
-#define IDC_BENCHMARK_COMPRESSING_USAGE2 1035
-#define IDC_BENCHMARK_COMPRESSING_RPU 1036
-#define IDC_BENCHMARK_COMPRESSING_RPU2 1037
-
-
-#define IDC_BENCHMARK_DECOMPRESSING_SPEED 1040
-#define IDC_BENCHMARK_DECOMPRESSING_SPEED2 1041
-#define IDC_BENCHMARK_DECOMPRESSING_RATING 1042
-#define IDC_BENCHMARK_DECOMPRESSING_RATING2 1043
-#define IDC_BENCHMARK_DECOMPRESSING_USAGE 1044
-#define IDC_BENCHMARK_DECOMPRESSING_USAGE2 1045
-#define IDC_BENCHMARK_DECOMPRESSING_RPU 1046
-#define IDC_BENCHMARK_DECOMPRESSING_RPU2 1047
-
-
-#define IDC_BENCHMARK_TOTAL_RATING      1050
-
-#define IDC_BENCHMARK_TOTAL_RATING_VALUE 1051
-#define IDC_BENCHMARK_TOTAL_RPU_VALUE 1052
-#define IDC_BENCHMARK_TOTAL_USAGE_VALUE 1053
-
-#define IDC_BENCHMARK_ELAPSED           1060
-#define IDC_BENCHMARK_ELAPSED_VALUE     1061
-#define IDC_BENCHMARK_SIZE              1062
-#define IDC_BENCHMARK_SIZE_VALUE        1063
-#define IDC_BENCHMARK_PASSES            1066
-#define IDC_BENCHMARK_PASSES_VALUE      1067
-
-#define IDC_BENCHMARK2_EDIT 1090
+#define IDD_BENCH         7600
+#define IDD_BENCH_2      17600
+#define IDD_BENCH_TOTAL 7699
+
+#define IDE_BENCH2_EDIT            100
+
+#define IDC_BENCH_DICTIONARY       101
+#define IDT_BENCH_MEMORY_VAL       102
+#define IDC_BENCH_NUM_THREADS      103
+#define IDT_BENCH_HARDWARE_THREADS 104
+
+#define IDT_BENCH_COMPRESS_SPEED1  110
+#define IDT_BENCH_COMPRESS_SPEED2  111
+#define IDT_BENCH_COMPRESS_RATING1 112
+#define IDT_BENCH_COMPRESS_RATING2 113
+#define IDT_BENCH_COMPRESS_USAGE1  114
+#define IDT_BENCH_COMPRESS_USAGE2  115
+#define IDT_BENCH_COMPRESS_RPU1    116
+#define IDT_BENCH_COMPRESS_RPU2    117
+
+#define IDT_BENCH_DECOMPR_SPEED1   118
+#define IDT_BENCH_DECOMPR_SPEED2   119
+#define IDT_BENCH_DECOMPR_RATING1  120
+#define IDT_BENCH_DECOMPR_RATING2  121
+#define IDT_BENCH_DECOMPR_USAGE1   122
+#define IDT_BENCH_DECOMPR_USAGE2   123
+#define IDT_BENCH_DECOMPR_RPU1     124
+#define IDT_BENCH_DECOMPR_RPU2     125
+
+#define IDT_BENCH_TOTAL_RATING_VAL 130
+#define IDT_BENCH_TOTAL_RPU_VAL    131
+#define IDT_BENCH_TOTAL_USAGE_VAL  133
+
+#define IDT_BENCH_ELAPSED_VAL      140
+#define IDT_BENCH_SIZE_VAL         141
+#define IDT_BENCH_PASSES_VAL       142
+
+
+#define IDB_STOP                 442
+#define IDB_RESTART              443
+
+#define IDT_BENCH_DICTIONARY    4006
+#define IDT_BENCH_NUM_THREADS   4009
+
+#define IDT_BENCH_SIZE          1007
+#define IDT_BENCH_ELAPSED       3900
+#define IDT_BENCH_SPEED         3903
+
+#define IDT_BENCH_MEMORY        7601
+
+#define IDG_BENCH_COMPRESSING   7602
+#define IDG_BENCH_DECOMPRESSING 7603
+#define IDG_BENCH_TOTAL_RATING  7605
+
+#define IDT_BENCH_RATING_LABEL  7604
+#define IDT_BENCH_CURRENT       7606
+#define IDT_BENCH_RESULTING     7607
+#define IDT_BENCH_USAGE_LABEL   7608
+#define IDT_BENCH_RPU_LABEL     7609
+#define IDT_BENCH_PASSES        7610
+#define IDT_BENCH_CURRENT2     (7606+50)
+#define IDT_BENCH_RESULTING2   (7607+50)