--- np2/win9x/resource.h 2007/10/26 22:48:28 1.29 +++ np2/win9x/resource.h 2007/12/28 20:36:40 1.32 @@ -46,10 +46,13 @@ #define IDR_SCSIMENU 233 #define IDR_PXMENU 241 #define IDR_WAVEREC 251 -#define IDR_CPUSAVE 252 -#define IDR_TOOLWIN 301 -#define IDR_KEYDISP 302 -#define IDR_VIEW 303 +#define IDR_CPUSAVE16 252 +#define IDR_CPUSAVE32 253 +#define IDR_CLOSE 301 +#define IDR_TOOLWIN 311 +#define IDR_KEYDISP 321 +#define IDR_VIEW 331 +#define IDR_TRACE 341 #define IDC_BASECLOCK 11101 #define IDC_MULTIPLE 11102 #define IDC_CLOCKMSG 11103 @@ -252,46 +255,132 @@ #define IDC_MORE 17103 #define IDC_NP2INFO 17104 #define IDC_NP2STR 17105 -#define IDS_HDD 30001 -#define IDS_FONTTITLE 30101 -#define IDS_FONTEXT 30102 -#define IDS_FONTFILTER 30103 -#define IDS_BMPTITLE 30111 -#define IDS_BMPEXT 30112 -#define IDS_BMPFILTER1 30113 -#define IDS_BMPFILTER4 30114 -#define IDS_BMPFILTER8 30115 -#define IDS_BMPFILTER24 30116 -#define IDS_MIMPITITLE 30121 -#define IDS_MIMPIEXT 30122 -#define IDS_MIMPIFILTER 30123 -#define IDS_FDDTITLE 30131 -#define IDS_FDDEXT 30132 -#define IDS_FDDFILTER 30133 -#define IDS_HDDTITLE 30141 -#define IDS_HDDEXT 30142 -#define IDS_HDDFILTER 30143 -#define IDS_SASITITLE 30144 -#define IDS_ISOTITLE 30151 -#define IDS_ISOEXT 30152 -#define IDS_ISOFILTER 30153 -#define IDS_SCSITITLE 30161 -#define IDS_SCSIEXT 30162 -#define IDS_SCSIFILTER 30163 -#define IDS_NEWDISKTITLE 30171 -#define IDS_NEWDISKEXT 30172 -#define IDS_NEWDISKFILTER 30173 -#define IDS_NEWDISKFILTER2 30174 -#define IDS_S98TITLE 30181 -#define IDS_S98EXT 30182 -#define IDS_S98FILTER 30183 -#define IDS_WAVETITLE 30191 -#define IDS_WAVEEXT 30192 -#define IDS_WAVEFILTER 30193 -#define IDS_ZOOM_NONE 30201 -#define IDS_ZOOM_FIXEDASPECT 30202 -#define IDS_ZOOM_ADJUSTASPECT 30203 -#define IDS_ZOOM_FULL 30204 +#define IDC_TOOL_HDDACC 18001 +#define IDC_TOOL_FDD1ACC 18002 +#define IDC_TOOL_FDD1LIST 18003 +#define IDC_TOOL_FDD1BROWSE 18004 +#define IDC_TOOL_FDD1EJECT 18005 +#define IDC_TOOL_FDD2ACC 18006 +#define IDC_TOOL_FDD2LIST 18007 +#define IDC_TOOL_FDD2BROWSE 18008 +#define IDC_TOOL_FDD2EJECT 18009 +#define IDC_TOOL_RESET 18010 +#define IDC_TOOL_POWER 18011 +#define IDS_APP_NAME2 30001 +#define IDS_APP_NAME21 30002 +#define IDS_FILENAME_HELP 30003 +#define IDS_FONTFACE 30011 +#define IDS_PFONTFACE 30012 +#define IDS_FONTFACE_PRIMARY 30013 +#define IDS_PFONTFACE_PRIMARY 30014 +#define IDS_FONTFACE_SECONDARY 30015 +#define IDS_PFONTFACE_SECONDARY 30016 +#define IDS_CAPTION_TOOL 30021 +#define IDS_CAPTION_KEYDISP 30022 +#define IDS_CAPTION_SOFTKEY 30023 +#define IDS_HDD 30031 +#define IDS_SCREENOPTION 30041 +#define IDS_SOUNDOPTION 30042 +#define IDS_SERIALOPTION 30043 +#define IDS_CAPTION_FDD1 30051 +#define IDS_CAPTION_FDD2 30052 +#define IDS_CAPTION_FDD3 30053 +#define IDS_CAPTION_FDD4 30054 +#define IDS_CAPTION_SEPALATOR 30055 +#define IDS_CAPTION_FRAME 30056 +#define IDS_CAPTION_CLOCK 30057 +#define IDS_ERROR_DIRECTDRAW 30061 +#define IDS_CONFIRM_RESET 30062 +#define IDS_CONFIRM_EXIT 30063 +#define IDS_CONFIRM_RESUME 30064 +#define IDS_ERROR_RESUME 30065 +#define IDS_NONCONNECT 30101 +#define IDS_1 30111 +#define IDS_1HALF 30112 +#define IDS_2 30113 +#define IDS_INT0 30141 +#define IDS_INT1 30142 +#define IDS_INT2 30143 +#define IDS_INT3 30144 +#define IDS_INT41 30145 +#define IDS_INT42 30146 +#define IDS_INT5 30147 +#define IDS_INT6 30148 +#define IDS_C8000 30159 +#define IDS_CC000 30163 +#define IDS_D0000 30167 +#define IDS_D4000 30171 +#define IDS_COM1 30191 +#define IDS_COM2 30192 +#define IDS_COM3 30193 +#define IDS_COM4 30194 +#define IDS_MIDI 30195 +#define IDS_2_0MHZ 30201 +#define IDS_2_5MHZ 30202 +#define IDS_CLOCKFORMAT 30203 +#define IDS_HDDSIZERANGE 30211 +#define IDS_ZOOM_NONE 30301 +#define IDS_ZOOM_FIXEDASPECT 30302 +#define IDS_ZOOM_ADJUSTASPECT 30303 +#define IDS_ZOOM_FULL 30304 +#define IDS_0088 30401 +#define IDS_0188 30402 +#define IDS_0288 30403 +#define IDS_0388 30404 +#define IDS_0X 30411 +#define IDS_1X 30412 +#define IDS_2X 30413 +#define IDS_3X 30414 +#define IDS_4X 30415 +#define IDS_5X 30416 +#define IDS_6X 30417 +#define IDS_7X 30418 +#define IDS_PARITY_NONE 30501 +#define IDS_PARITY_ODD 30502 +#define IDS_PARITY_EVEN 30503 +#define IDS_SYNC 30511 +#define IDS_ASYNC 30512 +#define IDS_ASYNC16X 30513 +#define IDS_ASYNC64X 30514 +#define IDS_FONTTITLE 31001 +#define IDS_FONTEXT 31002 +#define IDS_FONTFILTER 31003 +#define IDS_BMPTITLE 31011 +#define IDS_BMPEXT 31012 +#define IDS_BMPFILTER1 31013 +#define IDS_BMPFILTER4 31014 +#define IDS_BMPFILTER8 31015 +#define IDS_BMPFILTER24 31016 +#define IDS_MIMPITITLE 31021 +#define IDS_MIMPIEXT 31022 +#define IDS_MIMPIFILTER 31023 +#define IDS_FDDTITLE 31031 +#define IDS_FDDEXT 31032 +#define IDS_FDDFILTER 31033 +#define IDS_HDDTITLE 31041 +#define IDS_HDDEXT 31042 +#define IDS_HDDFILTER 31043 +#define IDS_SASITITLE 31044 +#define IDS_IDETITLE 31045 +#define IDS_ISOTITLE 31051 +#define IDS_ISOEXT 31052 +#define IDS_ISOFILTER 31053 +#define IDS_SCSITITLE 31061 +#define IDS_SCSIEXT 31062 +#define IDS_SCSIFILTER 31063 +#define IDS_NEWDISKTITLE 31071 +#define IDS_NEWDISKEXT 31072 +#define IDS_NEWDISKFILTER 31073 +#define IDS_NEWDISKFILTER2 31074 +#define IDS_S98TITLE 31081 +#define IDS_S98EXT 31082 +#define IDS_S98FILTER 31083 +#define IDS_WAVETITLE 31091 +#define IDS_WAVEEXT 31092 +#define IDS_WAVEFILTER 31093 +#define IDS_SKINTITLE 31101 +#define IDS_SKINEXT 31102 +#define IDS_SKINFILTER 31103 #define IDM_TOOLWIN 40001 #define IDM_KEYDISP 40002 #define IDM_SOFTKBD 40003 @@ -443,7 +532,14 @@ #define IDM_ABOUT 40713 #define IDM_ALTENTER 40721 #define IDM_ALTF4 40722 -#define IDM_SKIN 41001 +#define IDM_CLOSE 41001 +#define IDM_TOOL_SKIN 41101 +#define IDM_TOOL_SKINSEL 41111 +#define IDM_TOOL_SKINDEF 41112 +#define IDM_TOOL_SKINMRU 41151 +#define IDM_TOOL_SKINMRU1 41152 +#define IDM_TOOL_SKINMRU2 41153 +#define IDM_TOOL_SKINMRU3 41154 #define IDM_KDISPFM 42001 #define IDM_KDISPMIDI 42002 #define IDM_VIEWWINNEW 43001 @@ -467,6 +563,11 @@ #define IDM_BIOS 43033 #define IDM_ITF 43034 #define IDM_A20LINE 43035 +#define IDM_TRACE_TRACE 43101 +#define IDM_TRACE_VERBOSE 43102 +#define IDM_TRACE_ENABLE 43103 +#define IDM_TRACE_FILEOUT 43104 +#define IDM_TRACE_CLEAR 43105 // Next default values for new objects //