--- np2/win9x/juliet.cpp 2004/02/03 08:24:40 1.4 +++ np2/win9x/juliet.cpp 2005/02/07 14:46:14 1.6 @@ -60,7 +60,7 @@ static _ROMEO romeo = {NULL}; // 自前で検索する(矢野さん方式) #define PCIBUSDEVFUNC(b, d, f) (((b) << 8) | ((d) << 3) | (f)) -#define DEVVEND(v, d) ((v) | ((d) << 16)) +#define DEVVEND(v, d) ((ULONG)((v) | ((d) << 16))) static ULONG searchRomeo(void) { @@ -103,14 +103,14 @@ const DLLPROC *dterm; } romeo.mod = mod; d = dllproc; - dterm = d + sizeof(dllproc)/sizeof(DLLPROC); + dterm = d + NELEMENTS(dllproc); while(d < dterm) { proc = (long)GetProcAddress(mod, d->symbol); if (proc == (long)NULL) { MessageBox(NULL, "0", "?", MB_OK); goto jini_err2; } - *(long *)(((BYTE *)&romeo) + (d->addr)) = proc; + *(long *)(((UINT8 *)&romeo) + (d->addr)) = proc; d++; }