Chameleon

Chameleon Commit Details

Date:2018-10-14 19:42:52 (5 years 6 months ago)
Author:ErmaC
Commit:2910
Parents: 2909
Message:Added Mojave Icons detection.
Changes:
M/trunk/i386/boot2/gui.c
M/branches/ErmaC/Enoch/i386/boot2/gui.c

File differences

trunk/i386/boot2/gui.c
5151
5252
5353
54
55
5456
5557
5658
......
7476
7577
7678
79
80
7781
7882
7983
......
98102
99103
100104
105
106
107
101108
102109
110
111
103112
104113
105114
......
168177
169178
170179
180
181
171182
172183
173184
......
191202
192203
193204
205
206
194207
195208
196209
......
215228
216229
217230
231
232
233
218234
219235
236
237
220238
221239
222240
......
438456
439457
440458
459
460
441461
442462
443463
......
461481
462482
463483
484
485
464486
465487
466488
......
485507
486508
487509
510
511
512
488513
489514
515
516
490517
491518
492519
......
11571184
11581185
11591186
1160
1187
11611188
11621189
1190
1191
1192
1193
11631194
11641195
11651196
␉iDeviceGeneric_o,␊
␉iDeviceHFS,␊
␉iDeviceHFS_o,␊
␉iDeviceHFS_moj,␊
␉iDeviceHFS_moj_o,␊
␉iDeviceHFS_hsi,␊
␉iDeviceHFS_hsi_o,␊
␉iDeviceHFS_sie,␊
␊
␉iDeviceHFSRAID,␊
␉iDeviceHFSRAID_o,␊
␉iDeviceHFSRAID_moj,␊
␉iDeviceHFSRAID_moj_o,␊
␉iDeviceHFSRAID_hsi,␊
␉iDeviceHFSRAID_hsi_o,␊
␉iDeviceHFSRAID_sie,␊
␉iDeviceHFSRECOVERY,␊
␉iDeviceHFSRECOVERY_o,␊
␊
//␉iDeviceHFSINSTALLER,␊
//␉iDeviceHFSINSTALLER_o,␊
␊
␉iDeviceHFSFUSION,␊
␉iDeviceHFSFUSION_o,␊
␉iDeviceHFSFUSION_moj,␊
␉iDeviceHFSFUSION_moj_o,␊
␉iDeviceHFSFUSION_hsi,␊
␉iDeviceHFSFUSION_hsi_o,␊
␉iDeviceHFSFUSION_sie,␊
␉{.name = "device_generic_o", .image = NULL},␊
␉{.name = "device_hfsplus", .image = NULL},␊
␉{.name = "device_hfsplus_o", .image = NULL},␊
␉{.name = "device_hfsplus_moj", .image = NULL},␊
␉{.name = "device_hfsplus_moj_o", .image = NULL},␊
␉{.name = "device_hfsplus_hsi", .image = NULL},␊
␉{.name = "device_hfsplus_hsi_o", .image = NULL},␊
␉{.name = "device_hfsplus_sie", .image = NULL},␊
␊
␉{.name = "device_hfsraid", .image = NULL},␊
␉{.name = "device_hfsraid_o", .image = NULL},␊
␉{.name = "device_hfsraid_moj", .image = NULL},␊
␉{.name = "device_hfsraid_moj_o", .image = NULL},␊
␉{.name = "device_hfsraid_hsi", .image = NULL},␊
␉{.name = "device_hfsraid_hsi_o", .image = NULL},␊
␉{.name = "device_hfsraid_sie", .image = NULL},␊
␉{.name = "device_hfsplus_recovery", .image = NULL},␊
␉{.name = "device_hfsplus_recovery_o", .image = NULL},␊
␊
//␉{.name = "device_hfsplus_installer", .image = NULL},␊
//␉{.name = "device_hfsplus_installer_o", .image = NULL},␊
␊
␉{.name = "device_hfsfusion", .image = NULL},␊
␉{.name = "device_hfsfusion_o", .image = NULL},␊
␉{.name = "device_hfsfusion_moj", .image = NULL},␊
␉{.name = "device_hfsfusion_moj_o", .image = NULL},␊
␉{.name = "device_hfsfusion_hsi", .image = NULL},␊
␉{.name = "device_hfsfusion_hsi_o", .image = NULL},␊
␉{.name = "device_hfsfusion_sie", .image = NULL},␊
␉LOADPNG(device_hfsplus, iDeviceGeneric);␊
␉LOADPNG(device_hfsplus_o, iDeviceHFS);␊
␊
␉LOADPNG(device_hfsplus_moj, iDeviceHFS);␊
␉LOADPNG(device_hfsplus_moj_o, iDeviceHFS_moj);␊
␉LOADPNG(device_hfsplus_hsi, iDeviceHFS);␊
␉LOADPNG(device_hfsplus_hsi_o, iDeviceHFS_hsi);␊
␉LOADPNG(device_hfsplus_sie, iDeviceHFS);␊
␊
␉LOADPNG(device_hfsraid, iDeviceHFS);␊
␉LOADPNG(device_hfsraid_o, iDeviceHFSRAID);␊
␉LOADPNG(device_hfsraid_moj, iDeviceHFSRAID);␊
␉LOADPNG(device_hfsraid_moj_o, iDeviceHFSRAID_moj);␊
␉LOADPNG(device_hfsraid_hsi, iDeviceHFSRAID);␊
␉LOADPNG(device_hfsraid_hsi_o, iDeviceHFSRAID_hsi);␊
␉LOADPNG(device_hfsraid_sie, iDeviceHFSRAID);␊
␉LOADPNG(device_hfsplus_recovery, iDeviceHFS);␊
␉LOADPNG(device_hfsplus_recovery_o, iDeviceHFSRECOVERY);␊
␊
//␉LOADPNG(device_hfsplus_recovery, iDeviceHFS);␊
//␉LOADPNG(device_hfsplus_recovery_o, iDeviceHFSINSTALLER);␊
␊
␉LOADPNG(device_hfsfusion, iDeviceHFS);␊
␉LOADPNG(device_hfsfusion_o, iDeviceHFSFUSION);␊
␉LOADPNG(device_hfsfusion_moj, iDeviceHFSFUSION);␊
␉LOADPNG(device_hfsfusion_moj_o, iDeviceHFSFUSION_moj);␊
␉LOADPNG(device_hfsfusion_hsi, iDeviceHFSFUSION);␊
␉LOADPNG(device_hfsfusion_hsi_o, iDeviceHFSFUSION_hsi);␊
␉LOADPNG(device_hfsfusion_sie, iDeviceHFSFUSION);␊
␉␉␉␉␉␉␉␉break;␊
␉␉␉␉␉␉␉}␊
␉␉␉␉␉␉␉if (device->OSVersion[4] == '3') { // 10.13␊
␉␉␉␉␉␉␉␉devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_hsi : iDeviceHFS_hsi); // Sierra␊
␉␉␉␉␉␉␉␉devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_hsi : iDeviceHFS_hsi); // High Sierra␊
␉␉␉␉␉␉␉␉break;␊
␉␉␉␉␉␉␉}␊
␉␉␉␉␉␉␉if (device->OSVersion[4] == '4') { // 10.14␊
␉␉␉␉␉␉␉␉devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_moj : iDeviceHFS_moj); // Mojave␊
␉␉␉␉␉␉␉␉break;␊
␉␉␉␉␉␉␉}␊
␉␉␉␉␉␉default:␊
␉␉␉␉␉␉␉devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID : iDeviceHFS);␊
␉␉␉␉␉␉␉break;␊
branches/ErmaC/Enoch/i386/boot2/gui.c
5151
5252
5353
54
55
5456
5557
5658
......
7476
7577
7678
79
80
7781
7882
7983
......
98102
99103
100104
105
106
107
101108
102109
110
111
103112
104113
105114
......
168177
169178
170179
180
181
171182
172183
173184
......
191202
192203
193204
205
206
194207
195208
196209
......
215228
216229
217230
231
232
233
218234
219235
236
237
220238
221239
222240
......
438456
439457
440458
459
460
441461
442462
443463
......
461481
462482
463483
484
485
464486
465487
466488
......
485507
486508
487509
510
511
512
488513
489514
515
516
490517
491518
492519
......
11571184
11581185
11591186
1160
1187
11611188
11621189
1190
1191
1192
1193
11631194
11641195
11651196
␉iDeviceGeneric_o,␊
␉iDeviceHFS,␊
␉iDeviceHFS_o,␊
␉iDeviceHFS_moj,␊
␉iDeviceHFS_moj_o,␊
␉iDeviceHFS_hsi,␊
␉iDeviceHFS_hsi_o,␊
␉iDeviceHFS_sie,␊
␊
␉iDeviceHFSRAID,␊
␉iDeviceHFSRAID_o,␊
␉iDeviceHFSRAID_moj,␊
␉iDeviceHFSRAID_moj_o,␊
␉iDeviceHFSRAID_hsi,␊
␉iDeviceHFSRAID_hsi_o,␊
␉iDeviceHFSRAID_sie,␊
␉iDeviceHFSRECOVERY,␊
␉iDeviceHFSRECOVERY_o,␊
␊
//␉iDeviceHFSINSTALLER,␊
//␉iDeviceHFSINSTALLER_o,␊
␊
␉iDeviceHFSFUSION,␊
␉iDeviceHFSFUSION_o,␊
␉iDeviceHFSFUSION_moj,␊
␉iDeviceHFSFUSION_moj_o,␊
␉iDeviceHFSFUSION_hsi,␊
␉iDeviceHFSFUSION_hsi_o,␊
␉iDeviceHFSFUSION_sie,␊
␉{.name = "device_generic_o", .image = NULL},␊
␉{.name = "device_hfsplus", .image = NULL},␊
␉{.name = "device_hfsplus_o", .image = NULL},␊
␉{.name = "device_hfsplus_moj", .image = NULL},␊
␉{.name = "device_hfsplus_moj_o", .image = NULL},␊
␉{.name = "device_hfsplus_hsi", .image = NULL},␊
␉{.name = "device_hfsplus_hsi_o", .image = NULL},␊
␉{.name = "device_hfsplus_sie", .image = NULL},␊
␊
␉{.name = "device_hfsraid", .image = NULL},␊
␉{.name = "device_hfsraid_o", .image = NULL},␊
␉{.name = "device_hfsraid_moj", .image = NULL},␊
␉{.name = "device_hfsraid_moj_o", .image = NULL},␊
␉{.name = "device_hfsraid_hsi", .image = NULL},␊
␉{.name = "device_hfsraid_hsi_o", .image = NULL},␊
␉{.name = "device_hfsraid_sie", .image = NULL},␊
␉{.name = "device_hfsplus_recovery", .image = NULL},␊
␉{.name = "device_hfsplus_recovery_o", .image = NULL},␊
␊
//␉{.name = "device_hfsplus_installer", .image = NULL},␊
//␉{.name = "device_hfsplus_installer_o", .image = NULL},␊
␊
␉{.name = "device_hfsfusion", .image = NULL},␊
␉{.name = "device_hfsfusion_o", .image = NULL},␊
␉{.name = "device_hfsfusion_moj", .image = NULL},␊
␉{.name = "device_hfsfusion_moj_o", .image = NULL},␊
␉{.name = "device_hfsfusion_hsi", .image = NULL},␊
␉{.name = "device_hfsfusion_hsi_o", .image = NULL},␊
␉{.name = "device_hfsfusion_sie", .image = NULL},␊
␉LOADPNG(device_hfsplus, iDeviceGeneric);␊
␉LOADPNG(device_hfsplus_o, iDeviceHFS);␊
␊
␉LOADPNG(device_hfsplus_moj, iDeviceHFS);␊
␉LOADPNG(device_hfsplus_moj_o, iDeviceHFS_moj);␊
␉LOADPNG(device_hfsplus_hsi, iDeviceHFS);␊
␉LOADPNG(device_hfsplus_hsi_o, iDeviceHFS_hsi);␊
␉LOADPNG(device_hfsplus_sie, iDeviceHFS);␊
␊
␉LOADPNG(device_hfsraid, iDeviceHFS);␊
␉LOADPNG(device_hfsraid_o, iDeviceHFSRAID);␊
␉LOADPNG(device_hfsraid_moj, iDeviceHFSRAID);␊
␉LOADPNG(device_hfsraid_moj_o, iDeviceHFSRAID_moj);␊
␉LOADPNG(device_hfsraid_hsi, iDeviceHFSRAID);␊
␉LOADPNG(device_hfsraid_hsi_o, iDeviceHFSRAID_hsi);␊
␉LOADPNG(device_hfsraid_sie, iDeviceHFSRAID);␊
␉LOADPNG(device_hfsplus_recovery, iDeviceHFS);␊
␉LOADPNG(device_hfsplus_recovery_o, iDeviceHFSRECOVERY);␊
␊
//␉LOADPNG(device_hfsplus_recovery, iDeviceHFS);␊
//␉LOADPNG(device_hfsplus_recovery_o, iDeviceHFSINSTALLER);␊
␊
␉LOADPNG(device_hfsfusion, iDeviceHFS);␊
␉LOADPNG(device_hfsfusion_o, iDeviceHFSFUSION);␊
␉LOADPNG(device_hfsfusion_moj, iDeviceHFSFUSION);␊
␉LOADPNG(device_hfsfusion_moj_o, iDeviceHFSFUSION_moj);␊
␉LOADPNG(device_hfsfusion_hsi, iDeviceHFSFUSION);␊
␉LOADPNG(device_hfsfusion_hsi_o, iDeviceHFSFUSION_hsi);␊
␉LOADPNG(device_hfsfusion_sie, iDeviceHFSFUSION);␊
␉␉␉␉␉␉␉␉break;␊
␉␉␉␉␉␉␉}␊
␉␉␉␉␉␉␉if (device->OSVersion[4] == '3') { // 10.13␊
␉␉␉␉␉␉␉␉devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_hsi : iDeviceHFS_hsi); // Sierra␊
␉␉␉␉␉␉␉␉devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_hsi : iDeviceHFS_hsi); // High Sierra␊
␉␉␉␉␉␉␉␉break;␊
␉␉␉␉␉␉␉}␊
␉␉␉␉␉␉␉if (device->OSVersion[4] == '4') { // 10.14␊
␉␉␉␉␉␉␉␉devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_moj : iDeviceHFS_moj); // Mojave␊
␉␉␉␉␉␉␉␉break;␊
␉␉␉␉␉␉␉}␊
␉␉␉␉␉␉default:␊
␉␉␉␉␉␉␉devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID : iDeviceHFS);␊
␉␉␉␉␉␉␉break;␊

Archive Download the corresponding diff file

Revision: 2910