diff --git a/dlls/commdlg/cdlg_xx.rc b/dlls/commdlg/cdlg_xx.rc index ed78bcf37dc..d861a3750d6 100644 --- a/dlls/commdlg/cdlg_xx.rc +++ b/dlls/commdlg/cdlg_xx.rc @@ -417,3 +417,327 @@ PD32_LANDSCAPE ICON '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07' '07 07 07 07 07 07' } + + +/* BINRES folder.ico */ +FOLDER ICON +{ + '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' + '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' + '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' + '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' + 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' + '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '88 88 88 88 88 88 88 88 88 88 88 88 00 00 00 00' + '87 77 77 77 77 77 77 77 77 77 77 78 00 00 00 88' + '77 77 77 77 77 77 77 77 77 77 77 78 00 00 00 87' + '77 77 77 77 77 77 77 77 77 77 77 78 00 00 00 87' + '78 77 77 77 77 77 77 77 77 77 77 78 00 00 00 87' + '8F BB 88 B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' + '8F 8B 8B B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' + '8F 88 B8 8B B8 BB 88 B8 8B B8 77 78 00 00 00 87' + '8F 88 B8 8B B8 BB 88 B8 8B B8 77 78 00 00 00 87' + '8F BB 8B B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' + '8F 8B 8B B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' + '8F 88 B8 8B B8 BB 88 B8 8B B8 77 78 00 00 00 87' + '8F 88 B8 8B B8 BB 88 B8 8B B8 77 78 00 00 00 87' + '8F 8B 8B B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' + '8F BB 8B B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' + '8F 88 B8 8B B8 BB 88 B8 8B B8 77 78 00 00 00 87' + '8F 88 B8 8B B8 BB 88 B8 8B B8 77 78 00 00 00 87' + '8F 8B 8B B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' + '8F BB 88 B8 8B 88 B8 8B B8 8B 77 78 00 00 00 87' + '8F FF FF FF FF FF FF FF FF F8 77 78 00 00 00 87' + '8F FF FF FF FF FF FF FF FF FF 77 78 00 00 00 87' + '8B 88 B8 88 88 88 88 88 88 88 77 88 00 00 00 87' + '7B 88 B8 8B B8 BB 77 77 77 77 78 80 00 00 00 88' + '87 BB 8B B8 8B B7 88 88 88 88 88 80 00 00 00 00' + '87 BB 8B B8 8B 77 80 00 00 00 00 00 00 00 00 00' + '88 77 77 77 77 88 80 00 00 00 00 00 00 00 00 00' + '08 77 77 77 77 80 00 00 00 00 00 00 00 00 00 00' + '08 88 88 88 88 80 00 00 00 00 00 00 00 00 00 00' + '08 88 88 88 88 80 00 00 00 00 00 00 00 00 FF FF' + 'FF FF FF FF FF FF FF FF FF FF F0 00 00 0F F0 00' + '00 0F C0 00 00 0F C0 00 00 0F C0 00 00 0F C0 00' + '00 0F C0 00 00 0F C0 00 00 0F C0 00 00 0F C0 00' + '00 0F C0 00 00 0F C0 00 00 0F C0 00 00 0F C0 00' + '00 0F C0 00 00 0F C0 00 00 0F C0 00 00 0F C0 00' + '00 0F C0 00 00 0F C0 00 00 0F C0 00 00 0F C0 00' + '00 0F C0 00 00 1F C0 00 00 1F F0 00 7F FF F0 00' + '7F FF F8 01 FF FF F8 01 FF FF F8 01 FF FF' +} + + +/* BINRES folder2.ico */ +FOLDER2 ICON +{ + '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' + '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' + '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' + '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' + 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' + '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 08 88 88 88 88 88 88 88 88 88 88 88 00 00 00' + '00 08 77 77 77 77 77 77 77 77 77 77 78 00 00 00' + '08 88 77 77 77 77 77 77 77 77 77 77 78 00 00 00' + '08 77 77 77 77 77 77 77 77 77 77 77 78 00 00 00' + '08 77 88 77 77 77 77 77 77 77 77 77 78 00 00 00' + '08 78 F8 B8 8B 88 BB 8B B8 8B 77 77 78 00 00 00' + '88 88 88 B8 8B 88 BB 8B B8 8B 77 77 78 00 00 00' + '87 8F BB 8B B8 BB 88 B8 8B B8 77 77 78 00 00 00' + '87 8F B8 8B B8 BB 88 B8 8B 88 77 77 78 00 00 00' + '87 8F 8B B8 8B 88 BB 8B B8 87 77 77 78 00 00 88' + '88 88 8B B8 8B 88 BB 8B B8 77 77 77 78 00 00 87' + '8F 88 B8 8B B8 BB 88 B8 8B 77 77 77 78 00 00 87' + '8F F8 B8 8B 88 8B 88 B8 8B 77 77 77 78 00 00 87' + '8F FF FF FF FF FF FF FF 87 77 77 77 78 00 00 87' + '88 88 88 88 88 88 88 88 87 77 77 77 78 00 00 87' + '77 77 77 77 77 77 77 77 77 77 B3 77 78 00 00 87' + '77 77 77 77 77 77 77 77 77 77 BB 77 78 00 00 88' + '77 88 77 B7 7B 77 B7 77 B7 7B 77 77 78 00 00 00' + '87 8F 73 B7 7B 77 BB 7B B7 8B 87 77 78 00 00 00' + '87 8F B7 7B B7 BB 78 88 F8 FF 88 77 78 00 00 00' + '87 8F B7 7B B7 BB 78 FF FF FF F8 77 78 00 00 00' + '87 88 73 B7 7B 77 88 88 88 88 87 77 88 00 00 00' + '87 88 77 B7 7B 78 88 77 77 77 77 78 00 00 00 00' + '88 88 88 88 88 88 88 88 88 88 88 88 00 00 00 00' + '08 88 FF FF FF F8 78 00 00 00 00 00 00 00 00 00' + '08 88 88 88 88 88 88 00 00 00 00 00 00 00 00 00' + '00 08 77 77 77 77 80 00 00 00 00 00 00 00 00 00' + '00 08 88 88 88 88 80 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF' + 'FF FF FE 00 00 03 FE 00 00 03 F8 00 00 03 F8 00' + '00 03 F8 00 00 03 F8 00 00 03 F0 00 00 03 F0 00' + '00 03 F0 00 00 03 F0 00 00 03 C0 00 00 03 C0 00' + '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' + '00 03 C0 00 00 03 C0 00 00 03 F0 00 00 03 F0 00' + '00 03 F0 00 00 03 F0 00 00 03 F0 00 00 0F F0 00' + '00 0F F8 00 3F FF F8 00 3F FF FE 00 7F FF FE 00' + '7F FF FF FF FF FF FF FF FF FF FF FF FF FF' +} + + +/* BINRES floppy.ico */ +FLOPPY ICON +{ + '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' + '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' + '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' + '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' + 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' + '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 77' + '77 77 77 77 77 77 77 77 77 77 77 77 77 88 07 11' + '11 11 11 11 11 11 11 11 11 11 11 11 11 78 07 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 78 07 07' + '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 07' + '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 07' + '88 87 7A 77 88 88 88 77 00 78 88 87 70 78 07 07' + '88 87 AA A8 88 88 88 87 00 78 88 87 70 78 07 08' + '88 88 AA A8 88 88 88 87 00 78 88 87 70 78 07 08' + '88 88 AA A8 88 88 88 87 00 78 88 87 70 78 07 08' + '88 88 AA A8 88 88 88 87 00 78 88 87 70 78 07 08' + '88 88 88 88 88 88 88 88 77 88 88 87 70 78 07 08' + '88 88 88 77 77 77 77 77 78 88 88 87 70 78 07 08' + '88 88 87 00 00 00 00 00 78 88 88 87 70 78 07 08' + '88 88 87 00 00 00 00 00 07 88 88 87 70 78 07 08' + '77 77 70 00 00 00 00 00 07 77 77 87 70 78 07 08' + '70 00 00 00 00 00 00 00 00 00 07 87 70 78 07 08' + '77 77 70 00 00 00 00 00 07 77 77 87 70 78 07 08' + '88 88 87 00 00 00 00 00 07 88 88 87 70 78 07 08' + '88 88 87 77 77 77 77 77 78 88 88 87 70 78 07 08' + '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 07' + '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 78 07 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 78 08 77' + '77 77 77 77 77 77 77 77 77 77 77 77 77 88 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF' + 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' + 'FF FF 80 00 00 00 80 00 00 00 80 00 00 00 80 00' + '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' + '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' + '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' + '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' + '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' + '00 00 FF FF FF FF FF FF FF FF FF FF FF FF' +} + + +/* BINRES cdrom.ico */ +CDROM ICON +{ + '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' + '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' + '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' + '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' + 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' + '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' + '00 00 00 81 00 00 00 00 18 00 00 00 00 00 00 00' + '00 08 88 83 33 37 77 77 77 77 80 00 00 00 00 00' + '00 08 77 7B BB 88 88 88 70 00 70 00 00 00 00 00' + '08 88 77 78 BB 88 88 88 77 77 78 80 00 00 00 00' + '08 87 A6 EE 8B 88 88 88 87 77 77 80 00 00 00 00' + '88 77 AA EE 8B 88 88 88 88 88 77 78 00 00 00 00' + '87 BB AA AE 8B 88 88 88 88 88 77 17 00 00 00 88' + '87 BB AA AE EB 88 88 88 88 88 87 07 00 00 00 88' + '77 BB BA AE E8 88 88 88 88 88 87 07 00 00 00 87' + '77 BB BB AE EE 88 88 88 88 88 87 07 88 00 00 87' + '7B BB BB B7 EE 88 88 88 88 88 88 77 78 00 00 87' + '7B BB BB BB 8E 8F FF F8 88 88 88 87 08 00 00 87' + '7B BB BB BB 8E 77 78 88 88 88 88 87 08 00 00 87' + '78 88 88 88 87 70 07 78 F8 88 88 87 08 00 00 87' + '78 88 88 88 77 00 00 78 F8 88 88 87 08 00 00 87' + '78 88 88 88 70 00 00 08 F8 88 88 87 08 00 00 87' + '78 88 88 88 70 00 00 08 F8 88 88 87 08 00 00 87' + '78 88 88 88 77 00 00 78 88 88 88 87 08 00 00 87' + '78 88 88 88 87 70 07 78 88 88 88 87 08 00 00 87' + '78 88 88 88 88 77 77 88 88 BB BB B3 08 00 00 87' + '78 88 88 88 88 88 88 8E EB BB BB B3 08 00 00 88' + '88 88 88 88 88 88 88 8E E8 BB BB 33 78 00 00 88' + '87 88 88 88 88 88 88 8A AE 8B B3 07 88 00 00 00' + '87 88 88 88 88 88 88 8A AE E8 B3 07 00 00 00 00' + '87 88 88 88 88 88 88 8A AE EE B3 07 00 00 00 00' + '87 88 88 88 88 88 88 87 AE EE 73 17 00 00 00 00' + '88 87 88 88 88 88 88 8B BA EE 63 78 00 00 00 00' + '08 87 88 88 88 88 88 8B BA 66 67 80 00 00 00 00' + '08 88 77 78 88 88 88 8B B2 26 78 80 00 00 00 00' + '00 08 77 78 88 88 88 8B 30 00 70 00 00 00 00 00' + '00 08 88 87 77 77 77 77 77 77 80 00 00 00 00 00' + '00 08 88 87 77 77 77 77 78 88 80 00 00 00 FF C0' + '03 FF FE 00 00 7F FE 00 00 7F F8 00 00 1F F8 00' + '00 1F F0 00 00 0F F0 00 00 0F C0 00 00 0F C0 00' + '00 0F C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' + '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' + '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' + '00 03 C0 00 00 03 C0 00 00 03 F0 00 00 0F F0 00' + '00 0F F0 00 00 0F F0 00 00 0F F8 00 00 1F F8 00' + '00 1F FE 00 00 7F FE 00 00 7F FE 00 00 7F' +} + + +/* BINRES hdisk.ico */ +HDISK ICON +{ + '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' + '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' + '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' + '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' + 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' + '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 77' + '77 77 77 77 77 77 77 77 77 77 77 77 77 88 07 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 78 07 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 78 07 07' + '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 07' + '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 07' + '88 88 88 88 88 88 88 88 7A AA 78 87 70 78 07 08' + '88 88 88 88 88 88 88 88 8A AA 88 87 70 78 07 08' + '88 88 88 88 88 88 88 88 8A AA 88 87 70 78 07 08' + '88 88 88 88 88 88 88 88 8A AA 88 87 70 78 07 07' + '88 88 88 88 88 88 88 88 7A AA 78 87 70 78 07 07' + '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 07' + '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 07' + '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' + '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' + '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' + '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' + '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' + '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' + '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' + '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' + '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' + '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 07' + '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 78 07 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 78 08 77' + '77 77 77 77 77 77 77 77 77 77 77 77 77 88 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF' + 'FF FF FF FF FF FF FF FF FF FF 80 00 00 00 80 00' + '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' + '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' + '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' + '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' + '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' + '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' + '00 00 FF FF FF FF FF FF FF FF FF FF FF FF' +} + + +/* BINRES network.ico */ +NETWORK ICON +{ + '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' + '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' + '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' + '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' + 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' + '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 87 77 77 78 00 00 00 00 00 00 00 00' + '00 00 00 00 70 00 00 07 00 00 00 00 00 00 00 87' + '77 77 77 77 73 37 30 07 77 77 77 77 78 00 00 85' + '00 00 00 00 3B 88 B3 00 00 00 00 00 58 00 00 87' + '00 00 00 00 3B B8 B3 00 00 00 00 00 78 00 00 87' + '77 77 77 77 7B BB B3 07 77 77 77 77 78 00 00 88' + '88 88 88 88 8B BB B3 07 88 88 88 88 88 00 00 88' + '88 88 88 88 88 88 33 78 88 88 88 88 88 00 00 00' + '00 00 00 00 00 87 07 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 77 07 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 70 07 00 00 00 00 00 00 00 00 00' + '87 77 77 77 77 00 00 77 77 77 77 80 00 00 00 00' + '70 00 00 00 00 00 00 00 00 00 07 80 00 00 00 88' + '70 77 77 77 77 77 77 77 77 70 07 78 00 00 00 87' + '77 88 88 88 88 88 88 88 88 87 77 07 00 00 00 87' + '78 8F FF FF FF FF FF FF FF 88 77 07 88 00 00 87' + '78 88 88 88 88 88 88 88 88 88 77 77 78 00 00 87' + '78 77 77 77 77 77 77 77 77 88 77 70 08 00 00 87' + '78 88 88 88 88 88 88 88 88 88 77 70 08 00 00 87' + '78 88 88 88 88 88 88 88 88 88 77 70 08 00 00 87' + '78 88 88 88 88 88 88 88 87 88 77 70 08 00 00 87' + '78 88 88 88 88 88 88 88 8A 78 77 70 08 00 00 87' + '88 88 88 88 88 88 88 88 88 88 77 70 08 00 00 87' + '8F FF FF FF FF FF FF FF FF FF 87 70 08 00 00 88' + '88 FF FF FF FF FF FF FF FF FF 87 70 08 00 00 88' + '88 88 88 88 88 88 88 88 88 88 87 70 08 00 00 00' + '87 88 88 88 88 88 88 88 88 88 88 77 58 00 00 00' + '88 87 77 77 77 77 77 77 77 77 77 77 78 00 00 00' + '08 87 77 77 77 77 77 77 77 77 77 78 00 00 00 00' + '08 88 88 88 88 88 88 88 88 88 88 88 00 00 00 00' + '08 88 88 88 88 88 88 88 88 88 88 88 00 00 FF FF' + 'FF FF FF F0 0F FF FF F0 0F FF C0 00 00 03 C0 00' + '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' + '00 03 FF FC 3F FF FF FC 3F FF FF FC 3F FF F0 00' + '00 1F F0 00 00 1F C0 00 00 0F C0 00 00 0F C0 00' + '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' + '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' + '00 03 C0 00 00 03 C0 00 00 03 F0 00 00 03 F0 00' + '00 03 F8 00 00 0F F8 00 00 0F F8 00 00 0F' +} diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c index c6468f12142..fad9bcdf3e0 100644 --- a/dlls/commdlg/filedlg.c +++ b/dlls/commdlg/filedlg.c @@ -93,12 +93,18 @@ static BOOL FileDlg_Init(void) CURSORICONINFO *fldrInfo; if (!initialized) { - if (!hFolder) hFolder = LoadIconA(0, MAKEINTRESOURCEA(OIC_FOLDER)); - if (!hFolder2) hFolder2 = LoadIconA(0, MAKEINTRESOURCEA(OIC_FOLDER2)); - if (!hFloppy) hFloppy = LoadIconA(0, MAKEINTRESOURCEA(OIC_FLOPPY)); - if (!hHDisk) hHDisk = LoadIconA(0, MAKEINTRESOURCEA(OIC_HDISK)); - if (!hCDRom) hCDRom = LoadIconA(0, MAKEINTRESOURCEA(OIC_CDROM)); - if (!hNet) hNet = LoadIconA(0, MAKEINTRESOURCEA(OIC_NETWORK)); + HINSTANCE inst = GetModuleHandleA( "comdlg32.dll" ); + if (!inst) + { + ERR( "cannot get comdlg32.dll instance\n" ); + return FALSE; + } + if (!hFolder) hFolder = LoadIconA( inst, "FOLDER" ); + if (!hFolder2) hFolder2 = LoadIconA( inst, "FOLDER2" ); + if (!hFloppy) hFloppy = LoadIconA( inst, "FLOPPY" ); + if (!hHDisk) hHDisk = LoadIconA( inst, "HDISK" ); + if (!hCDRom) hCDRom = LoadIconA( inst, "CDROM" ); + if (!hNet) hNet = LoadIconA( inst, "NETWORK" ); if (hFolder == 0 || hFolder2 == 0 || hFloppy == 0 || hHDisk == 0 || hCDRom == 0 || hNet == 0) { diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 6c1f2e271ba..3fb6d4d4068 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -754,7 +754,7 @@ BOOL WINAPI ShellAboutA( HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff, info.szApp = szApp; info.szOtherStuff = szOtherStuff; info.hIcon = hIcon; - if (!hIcon) info.hIcon = LoadIconA( 0, MAKEINTRESOURCEA(OIC_WINEICON) ); + if (!hIcon) info.hIcon = LoadIconA( 0, IDI_WINLOGOA ); return DialogBoxIndirectParamA( GetWindowLongA( hWnd, GWL_HINSTANCE ), template, hWnd, AboutDlgProc, (LPARAM)&info ); } @@ -780,7 +780,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, info.szApp = HEAP_strdupWtoA( GetProcessHeap(), 0, szApp ); info.szOtherStuff = HEAP_strdupWtoA( GetProcessHeap(), 0, szOtherStuff ); info.hIcon = hIcon; - if (!hIcon) info.hIcon = LoadIconA( 0, MAKEINTRESOURCEA(OIC_WINEICON) ); + if (!hIcon) info.hIcon = LoadIconA( 0, IDI_WINLOGOA ); ret = DialogBoxIndirectParamA( GetWindowLongA( hWnd, GWL_HINSTANCE ), template, hWnd, AboutDlgProc, (LPARAM)&info ); HeapFree( GetProcessHeap(), 0, (LPSTR)info.szApp ); diff --git a/dlls/user/resources/user32_cursors.rc b/dlls/user/resources/user32_cursors.rc index 62c3033a4b1..75b3a3f6aa9 100644 --- a/dlls/user/resources/user32_cursors.rc +++ b/dlls/user/resources/user32_cursors.rc @@ -31,79 +31,79 @@ OCR_NORMAL CURSOR /* BINRES ocr_ibeam.cur */ OCR_IBEAM CURSOR { - '00 00 02 00 01 00 20 20 00 00 04 00 09 00 30 01' + '00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 1E F0 00 00 11 10 00 00 1E F0 00 00 02' + '80 00 00 02 80 00 00 02 80 00 00 02 80 00 00 02' + '80 00 00 02 80 00 00 02 80 00 00 02 80 00 00 02' + '80 00 00 02 80 00 00 02 80 00 00 02 80 00 00 02' + '80 00 00 1E F0 00 00 11 10 00 00 1E F0 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 F7 80 00 00 88 80' - '00 00 F7 80 00 00 14 00 00 00 14 00 00 00 14 00' - '00 00 14 00 00 00 14 00 00 00 14 00 00 00 14 00' - '00 00 14 00 00 00 14 00 00 00 14 00 00 00 14 00' - '00 00 14 00 00 00 14 00 00 00 F7 80 00 00 88 80' - '00 00 F7 80 00 00 FF FF FF FF FF FF FF FF FF FF' + '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF E1 0F FF FF E0 0F FF FF E0 0F FF FF FC' + '7F FF FF FC 7F FF FF FC 7F FF FF FC 7F FF FF FC' + '7F FF FF FC 7F FF FF FC 7F FF FF FC 7F FF FF FC' + '7F FF FF FC 7F FF FF FC 7F FF FF FC 7F FF FF FC' + '7F FF FF E0 0F FF FF E0 0F FF FF E1 0F FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF 08 7F FF FF 00 7F' - 'FF FF 00 7F FF FF E3 FF FF FF E3 FF FF FF E3 FF' - 'FF FF E3 FF FF FF E3 FF FF FF E3 FF FF FF E3 FF' - 'FF FF E3 FF FF FF E3 FF FF FF E3 FF FF FF E3 FF' - 'FF FF E3 FF FF FF E3 FF FF FF 00 7F FF FF 00 7F' - 'FF FF 08 7F FF FF' + 'FF FF FF FF FF FF' } /* BINRES ocr_wait.cur */ OCR_WAIT CURSOR { - '00 00 02 00 01 00 20 20 00 00 07 00 0D 00 30 01' + '00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 3F F8 00 00 00 00 00 00 15 50 00 00 1A B0' - '00 00 1D 70 00 00 1E F0 00 00 1F F0 00 00 0E E0' - '00 00 07 C0 00 00 03 80 00 00 01 00 00 00 01 00' - '00 00 01 00 00 00 03 80 00 00 06 C0 00 00 0D 60' - '00 00 1A B0 00 00 15 50 00 00 1F B0 00 00 1F F0' - '00 00 1F F0 00 00 00 00 00 00 3F F8 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 3F F8 00 00 00' + '00 00 00 15 50 00 00 1A B0 00 00 1D 70 00 00 1E' + 'F0 00 00 1F F0 00 00 0E E0 00 00 07 C0 00 00 03' + '80 00 00 01 00 00 00 01 00 00 00 03 80 00 00 06' + 'C0 00 00 0D 60 00 00 1A B0 00 00 15 50 00 00 1F' + 'B0 00 00 1F F0 00 00 1F F0 00 00 00 00 00 00 3F' + 'F8 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF 00 01 FF FF 00 01' - 'FF FF 00 01 FF FF 80 03 FF FF 80 03 FF FF 80 03' - 'FF FF 80 03 FF FF 80 03 FF FF 80 03 FF FF C0 07' - 'FF FF E0 0F FF FF F0 1F FF FF F8 3F FF FF F8 3F' - 'FF FF F8 3F FF FF F0 1F FF FF E0 0F FF FF C0 07' - 'FF FF 80 03 FF FF 80 03 FF FF 80 03 FF FF 80 03' - 'FF FF 80 03 FF FF 80 03 FF FF 00 01 FF FF 00 01' - 'FF FF 00 01 FF FF' + 'FF FF FF FF FF FF FF 00 01 FF FF 00 01 FF FF 00' + '01 FF FF C0 07 FF FF C0 07 FF FF C0 07 FF FF C0' + '07 FF FF C0 07 FF FF C0 07 FF FF E0 0F FF FF F0' + '1F FF FF F8 3F FF FF F8 3F FF FF F0 1F FF FF E0' + '0F FF FF C0 07 FF FF C0 07 FF FF C0 07 FF FF C0' + '07 FF FF C0 07 FF FF C0 07 FF FF 00 01 FF FF 00' + '01 FF FF 00 01 FF FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF FF FF FF' } /* BINRES ocr_cross.cur */ OCR_CROSS CURSOR { - '00 00 02 00 01 00 20 20 00 00 09 00 09 00 30 01' + '00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 02 80 00 00 02 80 00 00 02 80 00 00 02' + '80 00 00 02 80 00 00 02 80 00 00 02 80 00 00 02' + '80 00 03 FE FF 80 00 00 00 00 03 FE FF 80 00 02' + '80 00 00 02 80 00 00 02 80 00 00 02 80 00 00 02' + '80 00 00 02 80 00 00 02 80 00 00 02 80 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 A0 00 00 00 A0' - '00 00 00 A0 00 00 00 A0 00 00 00 A0 00 00 00 A0' - '00 00 00 A0 00 00 00 A0 00 00 FF BF E0 00 00 00' - '00 00 FF BF E0 00 00 A0 00 00 00 A0 00 00 00 A0' - '00 00 00 A0 00 00 00 A0 00 00 00 A0 00 00 00 A0' - '00 00 00 A0 00 00 FF FF FF FF FF FF FF FF FF FF' + '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF FC 7F FF FF FC 7F FF FF FC 7F FF FF FC' + '7F FF FF FC 7F FF FF FC 7F FF FF FC 7F FF FF FC' + '7F FF FC 00 00 7F FC 00 00 7F FC 00 00 7F FF FC' + '7F FF FF FC 7F FF FF FC 7F FF FF FC 7F FF FF FC' + '7F FF FF FC 7F FF FF FC 7F FF FF FC 7F FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF FF 1F FF FF FF 1F' - 'FF FF FF 1F FF FF FF 1F FF FF FF 1F FF FF FF 1F' - 'FF FF FF 1F FF FF FF 1F FF FF 00 00 1F FF 00 00' - '1F FF 00 00 1F FF FF 1F FF FF FF 1F FF FF FF 1F' - 'FF FF FF 1F FF FF FF 1F FF FF FF 1F FF FF FF 1F' - 'FF FF FF 1F FF FF' + 'FF FF FF FF FF FF' } /* BINRES ocr_up.cur */ @@ -135,27 +135,27 @@ OCR_UP CURSOR /* BINRES ocr_size.cur */ OCR_SIZE CURSOR { - '00 00 02 00 01 00 20 20 00 00 0B 00 0B 00 30 01' + '00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' + '00 00 00 02 80 00 00 04 40 00 00 08 20 00 00 10' + '10 00 00 1E F0 00 00 62 8C 00 00 A2 8A 00 01 22' + '89 00 02 3E F8 80 04 00 00 40 02 3E F8 80 01 22' + '89 00 00 A2 8A 00 00 62 8C 00 00 1E F0 00 00 10' + '10 00 00 08 20 00 00 04 40 00 00 02 80 00 00 01' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 18 00 00 00 3C' - '00 00 00 7E 00 00 00 FF 00 00 00 18 00 00 00 18' - '00 00 00 18 00 00 08 18 10 00 18 18 18 00 38 18' - '1C 00 7F FF FE 00 7F FF FE 00 38 18 1C 00 18 18' - '18 00 08 18 10 00 00 18 00 00 00 18 00 00 00 18' - '00 00 00 FF 00 00 00 7E 00 00 00 3C 00 00 00 18' '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FE' + 'FF FF FF FC 7F FF FF F8 3F FF FF F0 1F FF FF E0' + '0F FF FF E0 0F FF FF 9C 73 FF FF 1C 71 FF FE 1C' + '70 FF FC 00 00 7F F8 00 00 3F FC 00 00 7F FE 1C' + '70 FF FF 1C 71 FF FF 9C 73 FF FF E0 0F FF FF E0' + '0F FF FF F0 1F FF FF F8 3F FF FF FC 7F FF FF FE' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF E7 FF FF FF C3 FF FF FF 81' - 'FF FF FF 00 FF FF FE 00 7F FF FE 00 7F FF FF C3' - 'FF FF F3 C3 CF FF E3 C3 C7 FF C3 C3 C3 FF 80 00' - '01 FF 00 00 00 FF 00 00 00 FF 80 00 01 FF C3 C3' - 'C3 FF E3 C3 C7 FF F3 C3 CF FF FF C3 FF FF FE 00' - '7F FF FE 00 7F FF FF 00 FF FF FF 81 FF FF FF C3' - 'FF FF FF E7 FF FF' + 'FF FF FF FF FF FF' } /* BINRES ocr_icon.cur */ @@ -187,157 +187,157 @@ OCR_ICON CURSOR /* BINRES ocr_sizenwse.cur */ OCR_SIZENWSE CURSOR { - '00 00 02 00 01 00 20 20 00 00 06 00 06 00 30 01' + '00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 FE 00 00 00' + '82 00 00 00 42 00 00 00 22 00 00 00 52 00 00 00' + 'AA 00 00 01 46 00 00 02 80 00 00 C5 00 00 00 AA' + '00 00 00 94 00 00 00 88 00 00 00 84 00 00 00 82' + '00 00 00 FE 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 03 F0 00 00 01 F0 00 00 00 F0' - '00 00 01 F0 00 00 03 B0 00 00 47 10 00 00 6E 00' - '00 00 7C 00 00 00 78 00 00 00 7C 00 00 00 7E 00' '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF FF FF FF FF FF FF FF FF FF 01 FF FF FF' + '01 FF FF FF 81 FF FF FF C1 FF FF FF 81 FF FF FF' + '11 FF FF FE 39 FF FF FC 7F FF FF 38 FF FF FF 11' + 'FF FF FF 03 FF FF FF 07 FF FF FF 03 FF FF FF 01' + 'FF FF FF 01 FF FF FF FF FF FF FF FF FF FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF F8 0F FF FF F8 07 FF FF FC 07 FF FF FE 07' - 'FF FF FC 07 FF FF 38 07 FF FF 10 47 FF FF 00 E7' - 'FF FF 01 FF FF FF 03 FF FF FF 01 FF FF FF 00 FF' - 'FF FF 80 FF FF FF' + 'FF FF FF FF FF FF' } /* BINRES ocr_sizenesw.cur */ OCR_SIZENESW CURSOR { - '00 00 02 00 01 00 20 20 00 00 06 00 06 00 30 01' + '00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 FE 00 00 00 82' + '00 00 00 84 00 00 00 88 00 00 00 94 00 00 00 AA' + '00 00 00 C5 00 00 00 02 80 00 00 01 46 00 00 00' + 'AA 00 00 00 52 00 00 00 22 00 00 00 42 00 00 00' + '82 00 00 00 FE 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 7E 00 00 00 7C 00 00 00 78 00' - '00 00 7C 00 00 00 6E 00 00 00 47 10 00 00 03 B0' - '00 00 01 F0 00 00 00 F0 00 00 01 F0 00 00 03 F0' '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF FF FF FF FF FF FF FF FF 01 FF FF FF 01' + 'FF FF FF 03 FF FF FF 07 FF FF FF 03 FF FF FF 11' + 'FF FF FF 38 FF FF FF FC 7F FF FF FE 39 FF FF FF' + '11 FF FF FF 81 FF FF FF C1 FF FF FF 81 FF FF FF' + '01 FF FF FF 01 FF FF FF FF FF FF FF FF FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF 80 FF FF FF 00 FF FF FF 01 FF FF FF 03 FF' - 'FF FF 01 FF FF FF 00 E7 FF FF 10 47 FF FF 38 07' - 'FF FF FC 07 FF FF FE 07 FF FF FC 07 FF FF F8 07' - 'FF FF F8 0F FF FF' + 'FF FF FF FF FF FF' } /* BINRES ocr_sizewe.cur */ OCR_SIZEWE CURSOR { - '00 00 02 00 01 00 20 20 00 00 07 00 04 00 30 01' + '00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 60 0C 00 00 A0 0A 00 01 20' + '09 00 02 3F F8 80 04 00 00 40 02 3F F8 80 01 20' + '09 00 00 A0 0A 00 00 60 0C 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 08 10 00 00 18 18 00 00 38 1C 00 00 7F FE' - '00 00 7F FE 00 00 38 1C 00 00 18 18 00 00 08 10' '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF FF FF FF FF 9F F3 FF FF 1F F1 FF FE 1F' + 'F0 FF FC 00 00 7F F8 00 00 3F FC 00 00 7F FE 1F' + 'F0 FF FF 1F F1 FF FF 9F F3 FF FF FF FF FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF F3 CF' - 'FF FF E3 C7 FF FF C3 C3 FF FF 80 01 FF FF 00 00' - 'FF FF 00 00 FF FF 80 01 FF FF C3 C3 FF FF E3 C7' - 'FF FF F3 CF FF FF' + 'FF FF FF FF FF FF' } /* BINRES ocr_sizens.cur */ OCR_SIZENS CURSOR { - '00 00 02 00 01 00 20 20 00 00 04 00 07 00 30 01' + '00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' + '00 00 00 02 80 00 00 04 40 00 00 08 20 00 00 10' + '10 00 00 1E F0 00 00 02 80 00 00 02 80 00 00 02' + '80 00 00 02 80 00 00 02 80 00 00 02 80 00 00 02' + '80 00 00 02 80 00 00 02 80 00 00 1E F0 00 00 10' + '10 00 00 08 20 00 00 04 40 00 00 02 80 00 00 01' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 0C 00 00 00 1E 00' - '00 00 3F 00 00 00 7F 80 00 00 0C 00 00 00 0C 00' - '00 00 0C 00 00 00 0C 00 00 00 0C 00 00 00 0C 00' - '00 00 7F 80 00 00 3F 00 00 00 1E 00 00 00 0C 00' '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FE' + 'FF FF FF FC 7F FF FF F8 3F FF FF F0 1F FF FF E0' + '0F FF FF E0 0F FF FF FC 7F FF FF FC 7F FF FF FC' + '7F FF FF FC 7F FF FF FC 7F FF FF FC 7F FF FF FC' + '7F FF FF FC 7F FF FF FC 7F FF FF E0 0F FF FF E0' + '0F FF FF F0 1F FF FF F8 3F FF FF FC 7F FF FF FE' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF F3 FF FF FF E1 FF FF FF C0 FF' - 'FF FF 80 7F FF FF 00 3F FF FF 00 3F FF FF E1 FF' - 'FF FF E1 FF FF FF E1 FF FF FF E1 FF FF FF 00 3F' - 'FF FF 00 3F FF FF 80 7F FF FF C0 FF FF FF E1 FF' - 'FF FF F3 FF FF FF' + 'FF FF FF FF FF FF' } /* BINRES ocr_sizeall.cur */ OCR_SIZEALL CURSOR { - '00 00 02 00 01 00 20 20 00 00 0B 00 0B 00 30 01' + '00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' + '00 00 00 02 80 00 00 04 40 00 00 08 20 00 00 10' + '10 00 00 1E F0 00 00 62 8C 00 00 A2 8A 00 01 22' + '89 00 02 3E F8 80 04 00 00 40 02 3E F8 80 01 22' + '89 00 00 A2 8A 00 00 62 8C 00 00 1E F0 00 00 10' + '10 00 00 08 20 00 00 04 40 00 00 02 80 00 00 01' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 18 00 00 00 3C' - '00 00 00 7E 00 00 00 FF 00 00 00 18 00 00 00 18' - '00 00 00 18 00 00 08 18 10 00 18 18 18 00 38 18' - '1C 00 7F FF FE 00 7F FF FE 00 38 18 1C 00 18 18' - '18 00 08 18 10 00 00 18 00 00 00 18 00 00 00 18' - '00 00 00 FF 00 00 00 7E 00 00 00 3C 00 00 00 18' '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FE' + 'FF FF FF FC 7F FF FF F8 3F FF FF F0 1F FF FF E0' + '0F FF FF E0 0F FF FF 9C 73 FF FF 1C 71 FF FE 1C' + '70 FF FC 00 00 7F F8 00 00 3F FC 00 00 7F FE 1C' + '70 FF FF 1C 71 FF FF 9C 73 FF FF E0 0F FF FF E0' + '0F FF FF F0 1F FF FF F8 3F FF FF FC 7F FF FF FE' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF E7 FF FF FF C3 FF FF FF 81' - 'FF FF FF 00 FF FF FE 00 7F FF FE 00 7F FF FF C3' - 'FF FF F3 C3 CF FF E3 C3 C7 FF C3 C3 C3 FF 80 00' - '01 FF 00 00 00 FF 00 00 00 FF 80 00 01 FF C3 C3' - 'C3 FF E3 C3 C7 FF F3 C3 CF FF FF C3 FF FF FE 00' - '7F FF FE 00 7F FF FF 00 FF FF FF 81 FF FF FF C3' - 'FF FF FF E7 FF FF' + 'FF FF FF FF FF FF' } /* BINRES ocr_no.cur */ OCR_NO CURSOR { - '00 00 02 00 01 00 20 20 00 00 09 00 09 00 30 01' + '00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 07' + 'E0 00 00 18 18 00 00 20 04 00 00 43 C2 00 00 8C' + '31 00 01 10 20 80 01 20 44 80 02 20 8C 40 02 41' + '12 40 02 42 22 40 02 44 42 40 02 48 82 40 02 31' + '04 40 01 22 04 80 01 04 08 80 00 8C 31 00 00 43' + 'C2 00 00 20 04 00 00 18 18 00 00 07 E0 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 01 F8 00 00 06 06 00 00 08 01' - '00 00 10 F0 80 00 23 0C 40 00 44 08 20 00 48 11' - '20 00 88 23 10 00 90 44 90 00 90 88 90 00 91 10' - '90 00 92 20 90 00 8C 41 10 00 48 81 20 00 41 02' - '20 00 23 0C 40 00 10 F0 80 00 08 01 00 00 06 06' - '00 00 01 F8 00 00 FF FF FF FF FF FF FF FF FF FF' + '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF F8' + '1F FF FF E0 07 FF FF C0 03 FF FF 80 01 FF FF 03' + 'C0 FF FE 0F C0 7F FE 1F 80 7F FC 1F 00 3F FC 3E' + '0C 3F FC 3C 1C 3F FC 38 3C 3F FC 30 7C 3F FC 00' + 'F8 3F FE 01 F8 7F FE 03 F0 7F FF 03 C0 FF FF 80' + '01 FF FF C0 03 FF FF E0 07 FF FF F8 1F FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FE 07 FF FF F8 01 FF FF F0 00' - 'FF FF E0 00 7F FF C0 F0 3F FF 83 F0 1F FF 87 E0' - '1F FF 07 C0 0F FF 0F 83 0F FF 0F 07 0F FF 0E 0F' - '0F FF 0C 1F 0F FF 00 3E 0F FF 80 7E 1F FF 80 FC' - '1F FF C0 F0 3F FF E0 00 7F FF F0 00 FF FF F8 01' - 'FF FF FE 07 FF FF' + 'FF FF FF FF FF FF' } /* BINRES ocr_hand.cur */ @@ -418,32 +418,6 @@ OCR_HELP CURSOR '1F FF 7F FF FF FF' } -/* BINRES ocr_bummer.cur */ -OCR_BUMMER CURSOR -{ - '00 00 02 00 01 00 20 20 00 00 0F 00 12 00 30 01' - '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 20 00' - '00 10 20 00 00 10 60 00 00 18 7C 00 00 78 03 80' - '03 80 00 70 1C 00 00 01 E0 00 00 0E 00 00 00 71' - '1C 00 63 8F E3 98 7C 0F E0 78 30 0C 60 10 60 3C' - '78 18 00 FC 7E 00 01 FC 7F 00 01 FE FF 00 01 C7' - 'C7 00 01 83 83 00 00 83 82 00 00 83 82 00 00 87' - 'C2 00 00 CF E6 00 00 7F FC 00 00 1F F0 00 00 0F' - 'E0 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF DF FF FF EF 8F FF' - 'FF C7 8F FF FF C7 03 FF FF 83 00 7F FC 03 80 0F' - 'E0 07 FC 00 00 7F FF 80 03 FF FF 80 03 FF 9C 00' - '00 67 00 00 00 03 00 60 0C 03 83 C0 07 87 0F 01' - '01 C3 9E 01 00 E7 FC 01 00 7F FC 00 00 7F FC 00' - '00 7F FC 38 38 7F FE 38 38 FF FE 38 38 FF FE 30' - '18 FF FE 00 00 FF FF 00 01 FF FF 80 03 FF FF E0' - '0F FF FF F0 1F FF' -} - /* BINRES ocr_dragobject.cur */ OCR_DRAGOBJECT CURSOR { diff --git a/dlls/user/resources/user32_icons.rc b/dlls/user/resources/user32_icons.rc index 3f0787cdb98..3dbd42f125c 100644 --- a/dlls/user/resources/user32_icons.rc +++ b/dlls/user/resources/user32_icons.rc @@ -272,116 +272,8 @@ OIC_NOTE ICON } -/* BINRES oic_portrait.ico */ -OIC_PORTRAIT ICON -{ - '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' - '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' - '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' - 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' - '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' - '77 77 77 77 77 77 77 77 77 77 77 77 70 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 70 00 00 00' - '88 88 88 88 88 88 88 88 88 88 88 80 70 00 00 00' - '8C CC 8C C8 C8 C8 C8 C8 CC 8C 8C 80 70 00 00 00' - '88 88 88 88 88 88 88 88 88 88 88 80 70 00 00 00' - '8C 8C 8C C8 C8 CC 8C C8 C8 CC 8C 80 70 00 00 00' - '88 88 88 88 88 88 88 88 88 88 88 80 70 00 00 00' - '8C C8 C8 CC C8 CC 8C 8C C8 CC CC 80 70 00 00 00' - '88 88 88 88 88 88 88 88 88 88 88 80 70 00 00 00' - '8C CC 8C CC 8C 8C C8 C8 CC 8C CC 80 70 00 00 00' - '88 88 88 88 88 88 88 88 88 88 88 80 70 00 00 00' - '8C 8C 8C C8 CC 8C 8C C8 CC 8C 8C 80 70 00 00 00' - '88 88 88 88 88 88 88 88 88 88 88 80 70 00 00 00' - '8C 8C 8C C8 C8 CC 8C C8 C8 CC 8C 80 70 00 00 00' - '88 88 88 88 88 88 88 88 88 88 88 80 70 00 00 00' - '8C C8 C8 CC C8 CC 8C 8C C8 CC CC 80 70 00 00 00' - '88 88 88 88 88 88 88 88 88 88 88 80 70 00 00 00' - '8C CC 8C CC 8C 8C C8 C8 CC 8C CC 80 70 00 00 00' - '88 88 88 88 88 88 88 88 88 88 88 80 70 00 00 00' - '8C 8C 8C C8 CC 8C 8C C8 CC 8C 8C 80 70 00 00 00' - '88 88 88 88 88 88 88 88 88 88 88 80 70 00 00 00' - '88 8C C8 C8 CC 8C 8C 8C CC 8C 8C 80 70 00 00 00' - '88 88 88 88 88 88 88 88 88 88 88 80 70 00 00 00' - '80 00 00 88 88 88 88 88 88 88 88 80 70 00 00 00' - '88 08 88 08 88 88 88 88 88 88 88 80 70 00 00 00' - '88 08 88 08 88 88 88 88 80 00 00 00 00 00 00 00' - '88 00 00 88 88 88 88 88 80 FF FF 00 00 00 00 00' - '88 08 88 08 88 88 88 88 80 FF F0 00 00 00 00 00' - '88 08 88 08 88 88 88 88 80 FF 00 00 00 00 00 00' - '80 00 00 88 88 88 88 88 80 F0 00 00 00 00 00 00' - '88 88 88 88 88 88 88 88 80 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 F0 00' - '00 07 E0 00 00 07 E0 00 00 07 E0 00 00 07 E0 00' - '00 07 E0 00 00 07 E0 00 00 07 E0 00 00 07 E0 00' - '00 07 E0 00 00 07 E0 00 00 07 E0 00 00 07 E0 00' - '00 07 E0 00 00 07 E0 00 00 07 E0 00 00 07 E0 00' - '00 07 E0 00 00 07 E0 00 00 07 E0 00 00 07 E0 00' - '00 07 E0 00 00 07 E0 00 00 07 E0 00 00 07 E0 00' - '00 07 E0 00 00 0F E0 00 00 1F E0 00 00 3F E0 00' - '00 7F E0 00 00 FF E0 00 01 FF E0 00 03 FF' -} - - -/* BINRES oic_landscape.ico */ -OIC_LANDSCAPE ICON -{ - '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' - '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' - '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' - 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' - '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 07 00 00 88' - '88 88 88 88 88 88 88 88 88 88 88 88 07 00 00 8C' - 'C8 C8 CC C8 CC CC 8C C8 CC 8C CC C8 07 00 00 88' - '88 88 88 88 88 88 88 88 88 88 88 88 07 00 00 8C' - 'CC 8C CC 8C 8C C8 CC 8C 8C C8 CC C8 07 00 00 88' - '88 88 88 88 88 88 88 88 88 88 88 88 07 00 00 8C' - '8C 8C C8 CC 8C C8 C8 CC 8C C8 C8 C8 07 00 00 88' - '88 88 88 88 88 88 88 88 88 88 88 88 07 00 00 88' - '8C C8 C8 CC 8C CC 8C C8 CC C8 C8 C8 07 00 00 88' - '88 88 88 88 88 88 88 88 88 88 88 88 07 00 00 80' - '00 00 88 88 88 88 88 88 88 88 88 88 07 00 00 88' - '08 88 08 88 88 88 88 88 88 88 88 88 07 00 00 88' - '08 88 08 88 88 88 88 88 88 00 00 00 00 00 00 88' - '00 00 88 88 88 88 88 88 88 0F FF F0 00 00 00 88' - '08 88 08 88 88 88 88 88 88 0F FF 00 00 00 00 88' - '08 88 08 88 88 88 88 88 88 0F F0 00 00 00 00 80' - '00 00 88 88 88 88 88 88 88 0F 00 00 00 00 00 88' - '88 88 88 88 88 88 88 88 88 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF' - 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF C0 00 00 03 80 00' - '00 03 80 00 00 03 80 00 00 03 80 00 00 03 80 00' - '00 03 80 00 00 03 80 00 00 03 80 00 00 03 80 00' - '00 03 80 00 00 03 80 00 00 03 80 00 00 03 80 00' - '00 07 80 00 00 0F 80 00 00 1F 80 00 00 3F 80 00' - '00 7F 80 00 00 FF 80 00 01 FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF' -} - - -/* BINRES oic_wineicon.ico */ -OIC_WINEICON ICON +/* BINRES oic_winlogo.ico */ +OIC_WINLOGO ICON { '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' @@ -432,327 +324,3 @@ OIC_WINEICON ICON '00 07 E0 00 00 03 C0 00 00 01 FE 00 00 1F FE FE' 'FE 87 FF DF EF 0F FF FD FF CF FF 6F BB A7' } - - -/* BINRES oic_folder.ico */ -OIC_FOLDER ICON -{ - '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' - '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' - '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' - 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' - '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '88 88 88 88 88 88 88 88 88 88 88 88 00 00 00 00' - '87 77 77 77 77 77 77 77 77 77 77 78 00 00 00 88' - '77 77 77 77 77 77 77 77 77 77 77 78 00 00 00 87' - '77 77 77 77 77 77 77 77 77 77 77 78 00 00 00 87' - '78 77 77 77 77 77 77 77 77 77 77 78 00 00 00 87' - '8F BB 88 B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' - '8F 8B 8B B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' - '8F 88 B8 8B B8 BB 88 B8 8B B8 77 78 00 00 00 87' - '8F 88 B8 8B B8 BB 88 B8 8B B8 77 78 00 00 00 87' - '8F BB 8B B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' - '8F 8B 8B B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' - '8F 88 B8 8B B8 BB 88 B8 8B B8 77 78 00 00 00 87' - '8F 88 B8 8B B8 BB 88 B8 8B B8 77 78 00 00 00 87' - '8F 8B 8B B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' - '8F BB 8B B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' - '8F 88 B8 8B B8 BB 88 B8 8B B8 77 78 00 00 00 87' - '8F 88 B8 8B B8 BB 88 B8 8B B8 77 78 00 00 00 87' - '8F 8B 8B B8 8B 88 BB 8B B8 8B 77 78 00 00 00 87' - '8F BB 88 B8 8B 88 B8 8B B8 8B 77 78 00 00 00 87' - '8F FF FF FF FF FF FF FF FF F8 77 78 00 00 00 87' - '8F FF FF FF FF FF FF FF FF FF 77 78 00 00 00 87' - '8B 88 B8 88 88 88 88 88 88 88 77 88 00 00 00 87' - '7B 88 B8 8B B8 BB 77 77 77 77 78 80 00 00 00 88' - '87 BB 8B B8 8B B7 88 88 88 88 88 80 00 00 00 00' - '87 BB 8B B8 8B 77 80 00 00 00 00 00 00 00 00 00' - '88 77 77 77 77 88 80 00 00 00 00 00 00 00 00 00' - '08 77 77 77 77 80 00 00 00 00 00 00 00 00 00 00' - '08 88 88 88 88 80 00 00 00 00 00 00 00 00 00 00' - '08 88 88 88 88 80 00 00 00 00 00 00 00 00 FF FF' - 'FF FF FF FF FF FF FF FF FF FF F0 00 00 0F F0 00' - '00 0F C0 00 00 0F C0 00 00 0F C0 00 00 0F C0 00' - '00 0F C0 00 00 0F C0 00 00 0F C0 00 00 0F C0 00' - '00 0F C0 00 00 0F C0 00 00 0F C0 00 00 0F C0 00' - '00 0F C0 00 00 0F C0 00 00 0F C0 00 00 0F C0 00' - '00 0F C0 00 00 0F C0 00 00 0F C0 00 00 0F C0 00' - '00 0F C0 00 00 1F C0 00 00 1F F0 00 7F FF F0 00' - '7F FF F8 01 FF FF F8 01 FF FF F8 01 FF FF' -} - - -/* BINRES oic_folder2.ico */ -OIC_FOLDER2 ICON -{ - '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' - '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' - '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' - 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' - '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 08 88 88 88 88 88 88 88 88 88 88 88 00 00 00' - '00 08 77 77 77 77 77 77 77 77 77 77 78 00 00 00' - '08 88 77 77 77 77 77 77 77 77 77 77 78 00 00 00' - '08 77 77 77 77 77 77 77 77 77 77 77 78 00 00 00' - '08 77 88 77 77 77 77 77 77 77 77 77 78 00 00 00' - '08 78 F8 B8 8B 88 BB 8B B8 8B 77 77 78 00 00 00' - '88 88 88 B8 8B 88 BB 8B B8 8B 77 77 78 00 00 00' - '87 8F BB 8B B8 BB 88 B8 8B B8 77 77 78 00 00 00' - '87 8F B8 8B B8 BB 88 B8 8B 88 77 77 78 00 00 00' - '87 8F 8B B8 8B 88 BB 8B B8 87 77 77 78 00 00 88' - '88 88 8B B8 8B 88 BB 8B B8 77 77 77 78 00 00 87' - '8F 88 B8 8B B8 BB 88 B8 8B 77 77 77 78 00 00 87' - '8F F8 B8 8B 88 8B 88 B8 8B 77 77 77 78 00 00 87' - '8F FF FF FF FF FF FF FF 87 77 77 77 78 00 00 87' - '88 88 88 88 88 88 88 88 87 77 77 77 78 00 00 87' - '77 77 77 77 77 77 77 77 77 77 B3 77 78 00 00 87' - '77 77 77 77 77 77 77 77 77 77 BB 77 78 00 00 88' - '77 88 77 B7 7B 77 B7 77 B7 7B 77 77 78 00 00 00' - '87 8F 73 B7 7B 77 BB 7B B7 8B 87 77 78 00 00 00' - '87 8F B7 7B B7 BB 78 88 F8 FF 88 77 78 00 00 00' - '87 8F B7 7B B7 BB 78 FF FF FF F8 77 78 00 00 00' - '87 88 73 B7 7B 77 88 88 88 88 87 77 88 00 00 00' - '87 88 77 B7 7B 78 88 77 77 77 77 78 00 00 00 00' - '88 88 88 88 88 88 88 88 88 88 88 88 00 00 00 00' - '08 88 FF FF FF F8 78 00 00 00 00 00 00 00 00 00' - '08 88 88 88 88 88 88 00 00 00 00 00 00 00 00 00' - '00 08 77 77 77 77 80 00 00 00 00 00 00 00 00 00' - '00 08 88 88 88 88 80 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF' - 'FF FF FE 00 00 03 FE 00 00 03 F8 00 00 03 F8 00' - '00 03 F8 00 00 03 F8 00 00 03 F0 00 00 03 F0 00' - '00 03 F0 00 00 03 F0 00 00 03 C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 03 F0 00 00 03 F0 00' - '00 03 F0 00 00 03 F0 00 00 03 F0 00 00 0F F0 00' - '00 0F F8 00 3F FF F8 00 3F FF FE 00 7F FF FE 00' - '7F FF FF FF FF FF FF FF FF FF FF FF FF FF' -} - - -/* BINRES oic_floppy.ico */ -OIC_FLOPPY ICON -{ - '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' - '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' - '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' - 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' - '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 88 07 11' - '11 11 11 11 11 11 11 11 11 11 11 11 11 78 07 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 78 07 07' - '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 07' - '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 07' - '88 87 7A 77 88 88 88 77 00 78 88 87 70 78 07 07' - '88 87 AA A8 88 88 88 87 00 78 88 87 70 78 07 08' - '88 88 AA A8 88 88 88 87 00 78 88 87 70 78 07 08' - '88 88 AA A8 88 88 88 87 00 78 88 87 70 78 07 08' - '88 88 AA A8 88 88 88 87 00 78 88 87 70 78 07 08' - '88 88 88 88 88 88 88 88 77 88 88 87 70 78 07 08' - '88 88 88 77 77 77 77 77 78 88 88 87 70 78 07 08' - '88 88 87 00 00 00 00 00 78 88 88 87 70 78 07 08' - '88 88 87 00 00 00 00 00 07 88 88 87 70 78 07 08' - '77 77 70 00 00 00 00 00 07 77 77 87 70 78 07 08' - '70 00 00 00 00 00 00 00 00 00 07 87 70 78 07 08' - '77 77 70 00 00 00 00 00 07 77 77 87 70 78 07 08' - '88 88 87 00 00 00 00 00 07 88 88 87 70 78 07 08' - '88 88 87 77 77 77 77 77 78 88 88 87 70 78 07 08' - '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 07' - '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 78 07 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 78 08 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 88 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF' - 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF 80 00 00 00 80 00 00 00 80 00 00 00 80 00' - '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' - '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' - '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' - '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' - '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' - '00 00 FF FF FF FF FF FF FF FF FF FF FF FF' -} - - -/* BINRES oic_cdrom.ico */ -OIC_CDROM ICON -{ - '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' - '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' - '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' - 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' - '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' - '00 00 00 81 00 00 00 00 18 00 00 00 00 00 00 00' - '00 08 88 83 33 37 77 77 77 77 80 00 00 00 00 00' - '00 08 77 7B BB 88 88 88 70 00 70 00 00 00 00 00' - '08 88 77 78 BB 88 88 88 77 77 78 80 00 00 00 00' - '08 87 A6 EE 8B 88 88 88 87 77 77 80 00 00 00 00' - '88 77 AA EE 8B 88 88 88 88 88 77 78 00 00 00 00' - '87 BB AA AE 8B 88 88 88 88 88 77 17 00 00 00 88' - '87 BB AA AE EB 88 88 88 88 88 87 07 00 00 00 88' - '77 BB BA AE E8 88 88 88 88 88 87 07 00 00 00 87' - '77 BB BB AE EE 88 88 88 88 88 87 07 88 00 00 87' - '7B BB BB B7 EE 88 88 88 88 88 88 77 78 00 00 87' - '7B BB BB BB 8E 8F FF F8 88 88 88 87 08 00 00 87' - '7B BB BB BB 8E 77 78 88 88 88 88 87 08 00 00 87' - '78 88 88 88 87 70 07 78 F8 88 88 87 08 00 00 87' - '78 88 88 88 77 00 00 78 F8 88 88 87 08 00 00 87' - '78 88 88 88 70 00 00 08 F8 88 88 87 08 00 00 87' - '78 88 88 88 70 00 00 08 F8 88 88 87 08 00 00 87' - '78 88 88 88 77 00 00 78 88 88 88 87 08 00 00 87' - '78 88 88 88 87 70 07 78 88 88 88 87 08 00 00 87' - '78 88 88 88 88 77 77 88 88 BB BB B3 08 00 00 87' - '78 88 88 88 88 88 88 8E EB BB BB B3 08 00 00 88' - '88 88 88 88 88 88 88 8E E8 BB BB 33 78 00 00 88' - '87 88 88 88 88 88 88 8A AE 8B B3 07 88 00 00 00' - '87 88 88 88 88 88 88 8A AE E8 B3 07 00 00 00 00' - '87 88 88 88 88 88 88 8A AE EE B3 07 00 00 00 00' - '87 88 88 88 88 88 88 87 AE EE 73 17 00 00 00 00' - '88 87 88 88 88 88 88 8B BA EE 63 78 00 00 00 00' - '08 87 88 88 88 88 88 8B BA 66 67 80 00 00 00 00' - '08 88 77 78 88 88 88 8B B2 26 78 80 00 00 00 00' - '00 08 77 78 88 88 88 8B 30 00 70 00 00 00 00 00' - '00 08 88 87 77 77 77 77 77 77 80 00 00 00 00 00' - '00 08 88 87 77 77 77 77 78 88 80 00 00 00 FF C0' - '03 FF FE 00 00 7F FE 00 00 7F F8 00 00 1F F8 00' - '00 1F F0 00 00 0F F0 00 00 0F C0 00 00 0F C0 00' - '00 0F C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 03 F0 00 00 0F F0 00' - '00 0F F0 00 00 0F F0 00 00 0F F8 00 00 1F F8 00' - '00 1F FE 00 00 7F FE 00 00 7F FE 00 00 7F' -} - - -/* BINRES oic_hdisk.ico */ -OIC_HDISK ICON -{ - '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' - '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' - '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' - 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' - '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 88 07 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 78 07 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 78 07 07' - '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 07' - '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 07' - '88 88 88 88 88 88 88 88 7A AA 78 87 70 78 07 08' - '88 88 88 88 88 88 88 88 8A AA 88 87 70 78 07 08' - '88 88 88 88 88 88 88 88 8A AA 88 87 70 78 07 08' - '88 88 88 88 88 88 88 88 8A AA 88 87 70 78 07 07' - '88 88 88 88 88 88 88 88 7A AA 78 87 70 78 07 07' - '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 07' - '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 07' - '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' - '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' - '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' - '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' - '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' - '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' - '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' - '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' - '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 08' - '88 88 88 88 88 88 88 88 88 88 88 87 70 78 07 07' - '77 77 77 77 77 77 77 77 77 77 77 77 70 78 07 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 78 07 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 78 08 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 88 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF' - 'FF FF FF FF FF FF FF FF FF FF 80 00 00 00 80 00' - '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' - '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' - '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' - '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' - '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' - '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00' - '00 00 FF FF FF FF FF FF FF FF FF FF FF FF' -} - - -/* BINRES oic_network.ico */ -OIC_NETWORK ICON -{ - '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' - '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' - '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0' - 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' - '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 87 77 77 78 00 00 00 00 00 00 00 00' - '00 00 00 00 70 00 00 07 00 00 00 00 00 00 00 87' - '77 77 77 77 73 37 30 07 77 77 77 77 78 00 00 85' - '00 00 00 00 3B 88 B3 00 00 00 00 00 58 00 00 87' - '00 00 00 00 3B B8 B3 00 00 00 00 00 78 00 00 87' - '77 77 77 77 7B BB B3 07 77 77 77 77 78 00 00 88' - '88 88 88 88 8B BB B3 07 88 88 88 88 88 00 00 88' - '88 88 88 88 88 88 33 78 88 88 88 88 88 00 00 00' - '00 00 00 00 00 87 07 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 77 07 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 70 07 00 00 00 00 00 00 00 00 00' - '87 77 77 77 77 00 00 77 77 77 77 80 00 00 00 00' - '70 00 00 00 00 00 00 00 00 00 07 80 00 00 00 88' - '70 77 77 77 77 77 77 77 77 70 07 78 00 00 00 87' - '77 88 88 88 88 88 88 88 88 87 77 07 00 00 00 87' - '78 8F FF FF FF FF FF FF FF 88 77 07 88 00 00 87' - '78 88 88 88 88 88 88 88 88 88 77 77 78 00 00 87' - '78 77 77 77 77 77 77 77 77 88 77 70 08 00 00 87' - '78 88 88 88 88 88 88 88 88 88 77 70 08 00 00 87' - '78 88 88 88 88 88 88 88 88 88 77 70 08 00 00 87' - '78 88 88 88 88 88 88 88 87 88 77 70 08 00 00 87' - '78 88 88 88 88 88 88 88 8A 78 77 70 08 00 00 87' - '88 88 88 88 88 88 88 88 88 88 77 70 08 00 00 87' - '8F FF FF FF FF FF FF FF FF FF 87 70 08 00 00 88' - '88 FF FF FF FF FF FF FF FF FF 87 70 08 00 00 88' - '88 88 88 88 88 88 88 88 88 88 87 70 08 00 00 00' - '87 88 88 88 88 88 88 88 88 88 88 77 58 00 00 00' - '88 87 77 77 77 77 77 77 77 77 77 77 78 00 00 00' - '08 87 77 77 77 77 77 77 77 77 77 78 00 00 00 00' - '08 88 88 88 88 88 88 88 88 88 88 88 00 00 00 00' - '08 88 88 88 88 88 88 88 88 88 88 88 00 00 FF FF' - 'FF FF FF F0 0F FF FF F0 0F FF C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' - '00 03 FF FC 3F FF FF FC 3F FF FF FC 3F FF F0 00' - '00 1F F0 00 00 1F C0 00 00 0F C0 00 00 0F C0 00' - '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 03 F0 00 00 03 F0 00' - '00 03 F8 00 00 0F F8 00 00 0F F8 00 00 0F' -} diff --git a/include/winuser.h b/include/winuser.h index 8050f54b3ac..8a93f27a90c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -373,26 +373,20 @@ typedef struct #define OCR_NO 32648 #define OCR_HAND 32649 #define OCR_APPSTARTING 32650 -#ifdef __WINE__ -#define OCR_HELP 32651 /* only defined in wine */ -#define OCR_BUMMER 32652 +#define OCR_HELP 32651 + +/* only defined in wine (FIXME) */ #define OCR_DRAGOBJECT 32653 -#endif #define OIC_SAMPLE 32512 #define OIC_HAND 32513 #define OIC_QUES 32514 #define OIC_BANG 32515 #define OIC_NOTE 32516 -#define OIC_PORTRAIT 32517 -#define OIC_LANDSCAPE 32518 -#define OIC_WINEICON 32519 -#define OIC_FOLDER 32520 -#define OIC_FOLDER2 32521 -#define OIC_FLOPPY 32522 -#define OIC_CDROM 32523 -#define OIC_HDISK 32524 -#define OIC_NETWORK 32525 +#define OIC_WINLOGO 32517 +#define OIC_WARNING OIC_BANG +#define OIC_ERROR OIC_HAND +#define OIC_INFORMATION OIC_NOTE #define COLOR_SCROLLBAR 0 #define COLOR_BACKGROUND 1 @@ -2158,9 +2152,6 @@ typedef struct #define IDI_ERROR IDI_HAND #define IDI_INFORMATION IDI_ASTERISK -#define IDC_BUMMERA MAKEINTRESOURCEA(100) -#define IDC_BUMMERW MAKEINTRESOURCEW(100) -#define IDC_BUMMER WINELIB_NAME_AW(IDC_BUMMER) #define IDC_ARROWA MAKEINTRESOURCEA(32512) #define IDC_ARROWW MAKEINTRESOURCEW(32512) #define IDC_ARROW WINELIB_NAME_AW(IDC_ARROW) diff --git a/programs/clock/main.h b/programs/clock/main.h index 0cb56fa9686..00c4abc02b5 100644 --- a/programs/clock/main.h +++ b/programs/clock/main.h @@ -9,7 +9,7 @@ #define MAX_LANGUAGE_NUMBER (CL_LAST_LANGUAGE - CL_FIRST_LANGUAGE) #define HELPFILE "clock.hlp" -#define DEFAULTICON OIC_WINEICON +#define DEFAULTICON OIC_WINLOGO /* hide the following from winerc */ #ifndef RC_INVOKED diff --git a/programs/notepad/lcc.h b/programs/notepad/lcc.h index 686c374d315..fd2c8ff138a 100644 --- a/programs/notepad/lcc.h +++ b/programs/notepad/lcc.h @@ -16,7 +16,7 @@ #define INVALID_HANDLE_VALUE INVALID_HANDLE_VALUE #define WINE_RELEASE_INFO "Compiled using LCC" - #define OIC_WINEICON 0 + #define OIC_WINLOGO 0 #ifndef LCC_HASASSERT /* prevent multiple inclusion of assert methods */ diff --git a/programs/notepad/main.h b/programs/notepad/main.h index 2c65cd8d2ef..304491c7f95 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -11,7 +11,7 @@ #define HELPFILE "notepad.hlp" #define LOGPREFIX ".LOG" -#define DEFAULTICON OIC_WINEICON +#define DEFAULTICON OIC_WINLOGO /* hide the following from winerc */ #ifndef RC_INVOKED diff --git a/programs/progman/group.c b/programs/progman/group.c index d8cf17d05b4..0a623a78fa8 100644 --- a/programs/progman/group.c +++ b/programs/progman/group.c @@ -51,7 +51,7 @@ ATOM GROUP_RegisterGroupWinClass() class.cbClsExtra = 0; class.cbWndExtra = sizeof(LONG); class.hInstance = Globals.hInstance; - class.hIcon = LoadIcon (0, MAKEINTRESOURCE(OIC_WINEICON)); + class.hIcon = LoadIcon (0, IDI_WINLOGO); class.hCursor = LoadCursor (0, IDC_ARROW); class.hbrBackground = GetStockObject (WHITE_BRUSH); class.lpszMenuName = 0; diff --git a/programs/progman/progman.h b/programs/progman/progman.h index a36751880d8..ce5f19bd196 100644 --- a/programs/progman/progman.h +++ b/programs/progman/progman.h @@ -16,11 +16,7 @@ #include "windows.h" /* Fallback icon */ -#ifdef WINELIB -#define DEFAULTICON OIC_WINEICON -#else -#define DEFAULTICON OIC_LANDSCAPE -#endif +#define DEFAULTICON OIC_WINLOGO /* Icon index in M$ Window's progman.exe */ #define PROGMAN_ICON_INDEX 0 diff --git a/programs/progman/program.c b/programs/progman/program.c index 15346bed923..3937237d3f2 100644 --- a/programs/progman/program.c +++ b/programs/progman/program.c @@ -95,7 +95,7 @@ VOID PROGRAM_NewProgram(HLOCAL hGroup) &nCmdShow, MAX_PATHNAME_LEN)) return; - if (!hIcon) hIcon = LoadIcon(0, MAKEINTRESOURCE(OIC_WINEICON)); + if (!hIcon) hIcon = LoadIcon(0, IDI_WINLOGO); if (!PROGRAM_AddProgram(hGroup, hIcon, szName, 0, 0, szCmdLine, szIconFile, diff --git a/windows/nonclient.c b/windows/nonclient.c index 979daff515f..02dbfa21ea6 100644 --- a/windows/nonclient.c +++ b/windows/nonclient.c @@ -2907,7 +2907,7 @@ HICON16 NC_IconForWindow(WND *wndPtr) /* If there is no hIcon specified and this is a modal dialog, */ /* get the default one. */ if (!hIcon && (wndPtr->dwStyle & DS_MODALFRAME)) - hIcon = LoadImageA(0, MAKEINTRESOURCEA(OIC_WINEICON), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + hIcon = LoadImageA(0, IDI_WINLOGOA, IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); return hIcon; } diff --git a/windows/win.c b/windows/win.c index 24e60908438..a5c857813c1 100644 --- a/windows/win.c +++ b/windows/win.c @@ -3287,7 +3287,7 @@ DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj, return 0L; } - hBummer = LoadCursorA(0, IDC_BUMMERA); + hBummer = LoadCursorA(0, MAKEINTRESOURCEA(OCR_NO)); if( !hBummer || !wndPtr ) {