--- np2/win9x/toolwin.cpp 2003/10/30 22:33:34 1.10 +++ np2/win9x/toolwin.cpp 2005/02/07 14:46:14 1.16 @@ -2,18 +2,23 @@ #include "strres.h" #include "resource.h" #include "np2.h" +#include "winloc.h" #include "dosio.h" #include "soundmng.h" #include "sysmng.h" #include "menu.h" #include "toolwin.h" #include "ini.h" +#include "np2class.h" #include "dialog.h" #include "dialogs.h" #include "pccore.h" #include "diskdrv.h" +extern WINLOCEX np2_winlocexallwin(HWND base); + + enum { IDC_TOOLHDDACC = 0, IDC_TOOLFDD1ACC, @@ -30,10 +35,10 @@ enum { IDC_BASE = 3000, - IDC_SKINSEL = 3100, - IDC_SKINDEF = 3101, - IDC_SKINMRU = 3102, - IDC_TOOLCLOSE = IDC_SKINMRU + SKINMRU_MAX + IDM_SKINSEL = 3100, + IDM_SKINDEF = 3101, + IDM_SKINMRU = 3102, + IDM_TOOLCLOSE = IDM_SKINMRU + SKINMRU_MAX }; enum { @@ -63,10 +68,11 @@ const char *text; typedef struct { HWND hwnd; + WINLOCEX wlex; HBITMAP hbmp; - BYTE fddaccess[2]; - BYTE hddaccess; - BYTE _padding; + UINT8 fddaccess[2]; + UINT8 hddaccess; + UINT8 _padding; int winflg; int wingx; int wingy; @@ -83,8 +89,8 @@ typedef struct { } TOOLWIN; enum { - GTWL_FOCUS = 0, - GTWL_SIZE = 4 + GTWL_FOCUS = NP2GWL_SIZE + 0, + GTWL_SIZE = NP2GWL_SIZE + 4 }; NP2TOOL np2tool; @@ -97,10 +103,10 @@ static TOOLWIN toolwin; typedef struct { WORD idc; - BYTE *counter; + UINT8 *counter; } DISKACC; -static const BYTE fddlist[FDDLIST_DRV] = { +static const UINT8 fddlist[FDDLIST_DRV] = { IDC_TOOLFDD1LIST, IDC_TOOLFDD2LIST}; static const DISKACC diskacc[3] = { @@ -123,7 +129,7 @@ static HBITMAP skinload(const char *path toolskin.color1 = 0x600000; toolskin.color2 = 0xff0000; if (path) { - ini_read(path, skintitle, skinini1, sizeof(skinini1)/sizeof(INITBL)); + ini_read(path, skintitle, skinini1, NELEMENTS(skinini1)); } if (toolskin.main[0]) { ZeroMemory(subitem, sizeof(defsubitem)); @@ -136,7 +142,7 @@ static HBITMAP skinload(const char *path CopyMemory(subitem, defsubitem, sizeof(defsubitem)); } if (path) { - ini_read(path, skintitle, skinini2, sizeof(skinini2)/sizeof(INITBL)); + ini_read(path, skintitle, skinini2, NELEMENTS(skinini2)); } if (toolskin.main[0]) { milstr_ncpy(fname, path, sizeof(fname)); @@ -174,17 +180,12 @@ static void calctextsize(char *path, int file_cutname(path); file_cutseparator(path); file_cutname(path); + file_cutseparator(path); l = strlen(path); - if (l > 1) { - l -= 1; - if (milstr_kanji2nd(p, l - 1)) { - l--; - } + work[0] = '\0'; + if (l) { + milstr_ncpy(work, str_browse, sizeof(work)); } - else { - l = 0; - } - milstr_ncpy(work, str_browse, sizeof(work)); milstr_ncat(work, p + l, sizeof(work)); GetTextExtentPoint32(hdc, work, strlen(work), &tail); pos = 0; @@ -299,7 +300,7 @@ static void remakefddlist(HWND hwnd, TOO setlist(hwnd, fdd, sel); } -static void accdraw(HWND hWnd, BYTE count) { +static void accdraw(HWND hWnd, UINT8 count) { HDC hdc; PAINTSTRUCT ps; @@ -382,11 +383,6 @@ static LRESULT CALLBACK twsub(HWND hWnd, else if (msg == WM_SETFOCUS) { SetWindowLong(GetParent(hWnd), GTWL_FOCUS, idc); } - else if (msg == WM_SYSKEYDOWN) { - if (((short)wp == VK_SPACE) && (lp & 0x20000000)) { - return(SendMessage(GetParent(hWnd), msg, wp, lp)); - } - } return(CallWindowProc(toolwin.subproc[idc], hWnd, msg, wp, lp)); } @@ -556,12 +552,12 @@ const char *base; const char *file[SKINMRU_MAX]; ret = CreatePopupMenu(); - AppendMenu(ret, MF_STRING, IDC_SKINSEL, str_skinsel); + AppendMenu(ret, MF_STRING, IDM_SKINSEL, str_skinsel); AppendMenu(ret, MF_SEPARATOR, 0, NULL); base = np2tool.skin; flag = (base[0] == '\0')?MF_CHECKED:0; - AppendMenu(ret, MF_STRING + flag, IDC_SKINDEF, str_skindef); + AppendMenu(ret, MF_STRING + flag, IDM_SKINDEF, str_skindef); for (cnt=0; cntright - rect->left; - winly = rect->bottom - rect->top; - - if ((winlx > (workrc.right - workrc.left)) || - (winly > (workrc.bottom - workrc.top))) { - return; - } - - if (toolwin.winflg & 0x03) { - toolwin.wingx += rect->left - toolwin.wintx; - rect->left = toolwin.wintx; - if ((toolwin.wingx >= SNAPDOTREL) || (toolwin.wingx <= -SNAPDOTREL)) { - toolwin.winflg &= ~0x03; - rect->left += toolwin.wingx; - toolwin.wingx = 0; - } - rect->right = rect->left + winlx; - } - if (toolwin.winflg & 0x0c) { - toolwin.wingy += rect->top - toolwin.winty; - rect->top = toolwin.winty; - if ((toolwin.wingy >= SNAPDOTREL) || (toolwin.wingy <= -SNAPDOTREL)) { - toolwin.winflg &= ~0x0c; - rect->top += toolwin.wingy; - toolwin.wingy = 0; - } - rect->bottom = rect->top + winly; - } - - connectx = ((rect->right >= mainrc.left) && (rect->left <= mainrc.right)); - connecty = ((rect->bottom >= mainrc.top) && (rect->top <= mainrc.bottom)); - if ((!connectx) || (!connecty)) { - if (toolwin.winflg & 0x01) { - toolwin.winflg &= ~0x01; - rect->left += toolwin.wingx; - rect->right = rect->left + winlx; - toolwin.wingx = 0; - } - if (toolwin.winflg & 0x04) { - toolwin.winflg &= ~0x04; - rect->top += toolwin.wingy; - rect->bottom = rect->top + winly; - toolwin.wingy = 0; - } - } - - do { - changes = FALSE; - if ((!(toolwin.winflg & 0x01)) && - (rect->bottom >= mainrc.top) && (rect->top <= mainrc.bottom)) { - do { - d = rect->left - mainrc.right; - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - break; - } - d = rect->right - mainrc.left; - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - break; - } - if ((rect->bottom == mainrc.top) || - (rect->top == mainrc.bottom)) { - d = rect->left - mainrc.left; - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - break; - } - d = rect->right - mainrc.right; - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - break; - } - } - } while(0); - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - toolwin.winflg |= 0x01; - rect->left -= d; - rect->right = rect->left + winlx; - toolwin.wingx = d; - toolwin.wintx = rect->left; - changes = TRUE; - } - } - if (!(toolwin.winflg & 0x03)) { - do { - d = rect->left - workrc.left; - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - break; - } - d = rect->right - workrc.right; - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - break; - } - } while(0); - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - toolwin.winflg |= 0x02; - rect->left -= d; - rect->right = rect->left + winlx; - toolwin.wingx = d; - toolwin.wintx = rect->left; - changes = TRUE; - } - } - - if ((!(toolwin.winflg & 0x04)) && - (rect->right >= mainrc.left) && (rect->left <= mainrc.right)) { - do { - d = rect->top - mainrc.bottom; - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - break; - } - d = rect->bottom - mainrc.top; - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - break; - } - if ((rect->right == mainrc.left) || - (rect->left == mainrc.right)) { - d = rect->top - mainrc.top; - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - break; - } - d = rect->bottom - mainrc.bottom; - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - break; - } - } - } while(0); - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - toolwin.winflg |= 0x04; - rect->top -= d; - rect->bottom = rect->top + winly; - toolwin.wingy = d; - toolwin.winty = rect->top; - changes = TRUE; - } - } - if (!(toolwin.winflg & 0x0c)) { - do { - d = rect->top - workrc.top; - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - break; - } - d = rect->bottom - workrc.bottom; - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - break; - } - } while(0); - if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) { - toolwin.winflg |= 0x08; - rect->top -= d; - rect->bottom = rect->top + winly; - toolwin.wingy = d; - toolwin.winty = rect->top; - changes = TRUE; - } - } - } while(changes); + winlocex_move(wlex); + winlocex_destroy(wlex); } @@ -818,48 +634,53 @@ static void movingproc(RECT *rect) { static void openpopup(HWND hWnd, LPARAM lp) { HMENU hMenu; + HMENU mainmenu; POINT pt; hMenu = CreatePopupMenu(); + if (!winui_en) { + mainmenu = np2class_gethmenu(hWndMain); + menu_addmenubar(hMenu, mainmenu); + } AppendMenu(hMenu, MF_POPUP, (UINT)createskinmenu(), str_toolskin); AppendMenu(hMenu, MF_SEPARATOR, 0, NULL); - AppendMenu(hMenu, MF_STRING, IDC_TOOLCLOSE, str_toolclose); + AppendMenu(hMenu, MF_STRING, IDM_TOOLCLOSE, str_toolclose); pt.x = LOWORD(lp); pt.y = HIWORD(lp); ClientToScreen(hWnd, &pt); TrackPopupMenu(hMenu, TPM_LEFTALIGN, pt.x, pt.y, 0, hWnd, NULL); - ModifyMenu(hMenu, 0, MF_BYPOSITION | MF_POPUP, (UINT)0, str_toolskin); DestroyMenu(hMenu); } static LRESULT CALLBACK twproc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { - HMENU hMenu; - BOOL r; - UINT idc; + HMENU hMenu; + BOOL r; + UINT idc; + WINLOCEX wlex; switch(msg) { case WM_CREATE: + np2class_wmcreate(hWnd); + ModifyMenu(np2class_gethmenu(hWnd), 0, MF_BYPOSITION | MF_POPUP, + (UINT)createskinmenu(), str_toolskin); hMenu = GetSystemMenu(hWnd, FALSE); InsertMenu(hMenu, 0, MF_BYPOSITION | MF_POPUP, (UINT)createskinmenu(), str_toolskin); InsertMenu(hMenu, 1, MF_BYPOSITION | MF_SEPARATOR, 0, NULL); - SetWindowLong(hWnd, GWL_STYLE, - GetWindowLong(hWnd, GWL_STYLE) & (~WS_CAPTION)); - SetWindowPos(hWnd, 0, 0, 0, 0, 0, - SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER); + np2class_windowtype(hWnd, (np2tool.type & 1) << 1); toolwincreate(hWnd); break; case WM_SYSCOMMAND: switch(wp) { - case IDC_SKINSEL: - case IDC_SKINDEF: - case IDC_SKINMRU + 0: - case IDC_SKINMRU + 1: - case IDC_SKINMRU + 2: - case IDC_SKINMRU + 3: + case IDM_SKINSEL: + case IDM_SKINDEF: + case IDM_SKINMRU + 0: + case IDM_SKINMRU + 1: + case IDM_SKINMRU + 2: + case IDM_SKINMRU + 3: return(SendMessage(hWnd, WM_COMMAND, wp, lp)); default: @@ -876,9 +697,9 @@ static LRESULT CALLBACK twproc(HWND hWnd break; case IDC_BASE + IDC_TOOLFDD1BROWSE: - soundmng_disable(SNDPROC_TOOL); - dialog_changefdd(hWnd, 0); - soundmng_enable(SNDPROC_TOOL); + if (!winui_en) { + SendMessage(hWndMain, WM_COMMAND, IDM_FDD1OPEN, 0); + } break; case IDC_BASE + IDC_TOOLFDD1EJECT: @@ -893,9 +714,9 @@ static LRESULT CALLBACK twproc(HWND hWnd break; case IDC_BASE + IDC_TOOLFDD2BROWSE: - soundmng_disable(SNDPROC_TOOL); - dialog_changefdd(hWnd, 1); - soundmng_enable(SNDPROC_TOOL); + if (!winui_en) { + SendMessage(hWndMain, WM_COMMAND, IDM_FDD2OPEN, 0); + } break; case IDC_BASE + IDC_TOOLFDD2EJECT: @@ -904,15 +725,19 @@ static LRESULT CALLBACK twproc(HWND hWnd break; case IDC_BASE + IDC_TOOLRESET: - SendMessage(hWndMain, WM_COMMAND, IDM_RESET, 0); - SetForegroundWindow(hWndMain); + if (!winui_en) { + SendMessage(hWndMain, WM_COMMAND, IDM_RESET, 0); + SetForegroundWindow(hWndMain); + } break; case IDC_BASE + IDC_TOOLPOWER: - SendMessage(hWndMain, WM_CLOSE, 0, 0L); + if (!winui_en) { + SendMessage(hWndMain, WM_CLOSE, 0, 0L); + } break; - case IDC_SKINSEL: + case IDM_SKINSEL: soundmng_disable(SNDPROC_TOOL); r = dlgs_selectfile(hWnd, &skinui, np2tool.skin, sizeof(np2tool.skin), NULL); @@ -922,24 +747,30 @@ static LRESULT CALLBACK twproc(HWND hWnd } break; - case IDC_SKINDEF: + case IDM_SKINDEF: np2tool.skin[0] = '\0'; skinchange(hWnd); break; - case IDC_SKINMRU + 0: - case IDC_SKINMRU + 1: - case IDC_SKINMRU + 2: - case IDC_SKINMRU + 3: + case IDM_SKINMRU + 0: + case IDM_SKINMRU + 1: + case IDM_SKINMRU + 2: + case IDM_SKINMRU + 3: file_cpyname(np2tool.skin, - np2tool.skinmru[LOWORD(wp) - IDC_SKINMRU], + np2tool.skinmru[LOWORD(wp) - IDM_SKINMRU], sizeof(np2tool.skin)); skinchange(hWnd); break; - case IDC_TOOLCLOSE: + case IDM_TOOLCLOSE: SendMessage(hWnd, WM_CLOSE, 0, 0); break; + + default: + if (!winui_en) { + return(SendMessage(hWndMain, msg, wp, lp)); + } + break; } break; @@ -951,17 +782,13 @@ static LRESULT CALLBACK twproc(HWND hWnd } return(0); } - break; + return(SendMessage(hWndMain, msg, wp, lp)); - case WM_SYSKEYDOWN: // ALT+SPACEを自前処理 - if (((short)wp == VK_SPACE) && (lp & 0x20000000)) { - POINT pt; - pt.x = 0; - pt.y = 0; - ClientToScreen(hWnd, &pt); - return(SendMessage(hWnd, 0x313, 0, MAKELPARAM(pt.x, pt.y))); + case WM_KEYUP: + if ((short)wp == VK_TAB) { + return(0); } - break; + return(SendMessage(hWndMain, msg, wp, lp)); case WM_PAINT: toolwinpaint(hWnd); @@ -981,15 +808,18 @@ static LRESULT CALLBACK twproc(HWND hWnd case WM_ENTERSIZEMOVE: soundmng_disable(SNDPROC_TOOL); - movingstart(); + winlocex_destroy(toolwin.wlex); + toolwin.wlex = np2_winlocexallwin(hWnd); break; - case WM_EXITSIZEMOVE: - soundmng_enable(SNDPROC_TOOL); + case WM_MOVING: + winlocex_moving(toolwin.wlex, (RECT *)lp); break; - case WM_MOVING: - movingproc((RECT *)lp); + case WM_EXITSIZEMOVE: + winlocex_destroy(toolwin.wlex); + toolwin.wlex = NULL; + soundmng_enable(SNDPROC_TOOL); break; case WM_MOVE: @@ -1004,24 +834,37 @@ static LRESULT CALLBACK twproc(HWND hWnd break; case WM_CLOSE: - xmenu_settoolwin(0); + sysmenu_settoolwin(0); sysmng_update(SYS_UPDATEOSCFG); DestroyWindow(hWnd); break; case WM_DESTROY: + np2class_wmdestroy(hWnd); toolwindestroy(); toolwin.hwnd = NULL; break; case WM_LBUTTONDOWN: - SendMessage(hWnd, WM_NCLBUTTONDOWN, HTCAPTION, 0L); + if (np2tool.type & 1) { + return(SendMessage(hWnd, WM_NCLBUTTONDOWN, HTCAPTION, 0L)); + } break; case WM_RBUTTONDOWN: openpopup(hWnd, lp); break; + case WM_LBUTTONDBLCLK: + np2tool.type ^= 1; + wlex = np2_winlocexallwin(hWndMain); + winlocex_setholdwnd(wlex, hWnd); + np2class_windowtype(hWnd, (np2tool.type & 1) << 1); + winlocex_move(wlex); + winlocex_destroy(wlex); + sysmng_update(SYS_UPDATEOSCFG); + break; + default: return(DefWindowProc(hWnd, msg, wp, lp)); } @@ -1032,7 +875,7 @@ BOOL toolwin_initapp(HINSTANCE hInstance WNDCLASS wc; - wc.style = CS_HREDRAW | CS_VREDRAW; + wc.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; wc.lpfnWndProc = twproc; wc.cbClsExtra = 0; wc.cbWndExtra = GTWL_SIZE; @@ -1040,12 +883,12 @@ BOOL toolwin_initapp(HINSTANCE hInstance wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON2)); wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); - wc.lpszMenuName = NULL; + wc.lpszMenuName = MAKEINTRESOURCE(IDR_TOOLWIN); wc.lpszClassName = np2toolclass; return(RegisterClass(&wc)); } -void toolwin_open(void) { +void toolwin_create(void) { HBITMAP hbmp; BITMAP bmp; @@ -1061,16 +904,18 @@ void toolwin_open(void) { } GetObject(hbmp, sizeof(BITMAP), &bmp); toolwin.hbmp = hbmp; - hWnd = CreateWindow(np2toolclass, np2tooltitle, WS_SYSMENU, + hWnd = CreateWindow(np2toolclass, np2tooltitle, + WS_SYSMENU | WS_MINIMIZEBOX, np2tool.posx, np2tool.posy, bmp.bmWidth, bmp.bmHeight, NULL, NULL, hInst, NULL); + winloc_setclientsize(hWnd, bmp.bmWidth, bmp.bmHeight); toolwin.hwnd = hWnd; if (hWnd == NULL) { goto twope_err2; } UpdateWindow(hWnd); - ShowWindow(hWnd, SW_SHOW); + ShowWindow(hWnd, SW_SHOWNOACTIVATE); SetForegroundWindow(hWndMain); return; @@ -1078,120 +923,24 @@ twope_err2: DeleteObject(hbmp); twope_err1: - xmenu_settoolwin(0); + sysmenu_settoolwin(0); sysmng_update(SYS_UPDATEOSCFG); return; } -void toolwin_close(void) { +void toolwin_destroy(void) { if (toolwin.hwnd) { DestroyWindow(toolwin.hwnd); } } -void toolwin_movingstart(void) { +HWND toolwin_gethwnd(void) { - RECT mainrc; - RECT toolrc; - UINT connect; - - if (toolwin.hwnd == NULL) { - return; - } - GetWindowRect(hWndMain, &mainrc); - GetWindowRect(toolwin.hwnd, &toolrc); - connect = 0; - if ((toolrc.bottom >= mainrc.top) && (toolrc.top <= mainrc.bottom)) { - if (toolrc.right == mainrc.left) { - connect += 0x01; - } - else if (toolrc.left == mainrc.right) { - connect += 0x02; - } - else if (toolrc.left == mainrc.left) { - connect += 0x03; - } - else if (toolrc.right == mainrc.right) { - connect += 0x04; - } - } - if ((toolrc.right >= mainrc.left) && (toolrc.left <= mainrc.right)) { - if (toolrc.bottom == mainrc.top) { - connect += 1 << 4; - } - else if (toolrc.top == mainrc.bottom) { - connect += 2 << 4; - } - else if (toolrc.top == mainrc.top) { - connect += 3 << 4; - } - else if (toolrc.bottom == mainrc.bottom) { - connect += 4 << 4; - } - } - toolwin.parentcn = connect; - toolwin.parentx = mainrc.left; - toolwin.parenty = mainrc.top; -} - -void toolwin_movingend(void) { - - UINT connect; - RECT mainrc; - RECT toolrc; - int cx; - int cy; - - connect = toolwin.parentcn; - toolwin.parentcn = 0; - if ((toolwin.hwnd == NULL) || (!connect)) { - return; - } - GetWindowRect(hWndMain, &mainrc); - GetWindowRect(toolwin.hwnd, &toolrc); - cx = toolrc.right - toolrc.left; - cy = toolrc.bottom - toolrc.top; - toolrc.left += mainrc.left - toolwin.parentx; - toolrc.top += mainrc.top - toolwin.parenty; - switch(connect & 0x0f) { - case 1: - toolrc.left = mainrc.left - cx; - break; - - case 2: - toolrc.left = mainrc.right; - break; - - case 3: - toolrc.left = mainrc.left; - break; - - case 4: - toolrc.left = mainrc.right - cx; - break; - } - switch((connect >> 4) & 0x0f) { - case 1: - toolrc.top = mainrc.top - cy; - break; - - case 2: - toolrc.top = mainrc.bottom; - break; - - case 3: - toolrc.top = mainrc.top; - break; - - case 4: - toolrc.top = mainrc.bottom - cy; - break; - } - MoveWindow(toolwin.hwnd, toolrc.left, toolrc.top, cx, cy, TRUE); + return(toolwin.hwnd); } -void toolwin_setfdd(BYTE drv, const char *name) { +void toolwin_setfdd(UINT8 drv, const char *name) { TOOLFDD *fdd; char *q; @@ -1234,7 +983,7 @@ void toolwin_setfdd(BYTE drv, const char } } -static void setdiskacc(UINT num, BYTE count) { +static void setdiskacc(UINT num, UINT8 count) { const DISKACC *acc; HWND sub; @@ -1242,7 +991,7 @@ const DISKACC *acc; if (toolwin.hwnd == NULL) { return; } - if (num < (sizeof(diskacc)/sizeof(DISKACC))) { + if (num < NELEMENTS(diskacc)) { acc = diskacc + num; sub = NULL; if (*(acc->counter) == 0) { @@ -1255,23 +1004,23 @@ const DISKACC *acc; } } -void toolwin_fddaccess(BYTE drv) { +void toolwin_fddaccess(UINT8 drv) { if (drv < 2) { setdiskacc(drv, 20); } } -void toolwin_hddaccess(BYTE drv) { +void toolwin_hddaccess(UINT8 drv) { setdiskacc(2, 10); } -void toolwin_draw(BYTE frame) { +void toolwin_draw(UINT8 frame) { const DISKACC *acc; const DISKACC *accterm; - BYTE counter; + UINT8 counter; HWND sub; if (toolwin.hwnd == NULL) { @@ -1281,7 +1030,7 @@ const DISKACC *accterm; frame = 1; } acc = diskacc; - accterm = acc + (sizeof(diskacc)/sizeof(DISKACC)); + accterm = acc + NELEMENTS(diskacc); while(acc < accterm) { counter = *acc->counter; if (counter) { @@ -1308,6 +1057,7 @@ static const char ini_title[] = "NP2 too static const INITBL iniitem[] = { {"WindposX", INITYPE_SINT32, &np2tool.posx, 0}, {"WindposY", INITYPE_SINT32, &np2tool.posy, 0}, + {"WindType", INITYPE_BOOL, &np2tool.type, 0}, {"SkinFile", INITYPE_STR, np2tool.skin, MAX_PATH}, {"SkinMRU0", INITYPE_STR, np2tool.skinmru[0], MAX_PATH}, {"SkinMRU1", INITYPE_STR, np2tool.skinmru[1], MAX_PATH}, @@ -1337,8 +1087,9 @@ void toolwin_readini(void) { ZeroMemory(&np2tool, sizeof(np2tool)); np2tool.posx = CW_USEDEFAULT; np2tool.posy = CW_USEDEFAULT; + np2tool.type = 1; initgetfile(path, sizeof(path)); - ini_read(path, ini_title, iniitem, sizeof(iniitem)/sizeof(INITBL)); + ini_read(path, ini_title, iniitem, NELEMENTS(iniitem)); } void toolwin_writeini(void) { @@ -1346,6 +1097,6 @@ void toolwin_writeini(void) { char path[MAX_PATH]; initgetfile(path, sizeof(path)); - ini_write(path, ini_title, iniitem, sizeof(iniitem)/sizeof(INITBL)); + ini_write(path, ini_title, iniitem, NELEMENTS(iniitem)); }