--- np2/win9x/debuguty/viewmem.cpp	2003/12/12 01:04:41	1.3
+++ np2/win9x/debuguty/viewmem.cpp	2005/03/20 08:58:19	1.4
@@ -6,7 +6,7 @@
 #include	"cpucore.h"
 
 
-void viewmem_read(VIEWMEM_T *cfg, DWORD adrs, BYTE *buf, DWORD size) {
+void viewmem_read(VIEWMEM_T *cfg, UINT32 adrs, UINT8 *buf, UINT32 size) {
 
 	if (!size) {
 		return;
@@ -19,7 +19,7 @@ void viewmem_read(VIEWMEM_T *cfg, DWORD 
 			return;
 		}
 		else {
-			DWORD len;
+			UINT32 len;
 			len = 0xa4000 - adrs;
 			CopyMemory(buf, mem + adrs, len);
 			buf += len;
@@ -35,7 +35,7 @@ void viewmem_read(VIEWMEM_T *cfg, DWORD 
 			return;
 		}
 		else {
-			DWORD len;
+			UINT32 len;
 			len = 0xa5000 - adrs;
 			ZeroMemory(buf, len);
 			buf += len;
@@ -51,7 +51,7 @@ void viewmem_read(VIEWMEM_T *cfg, DWORD 
 			return;
 		}
 		else {
-			DWORD len;
+			UINT32 len;
 			len = 0xa8000 - adrs;
 			CopyMemory(buf, mem + adrs, len);
 			buf += len;
@@ -62,14 +62,14 @@ void viewmem_read(VIEWMEM_T *cfg, DWORD 
 
 	// Video Memory
 	if (adrs < 0xc0000) {
-		DWORD page;
+		UINT32 page;
 		page = ((cfg->vram)?VRAM_STEP:0);
 		if ((adrs + size) <= 0xc0000) {
 			CopyMemory(buf, mem + page + adrs, size);
 			return;
 		}
 		else {
-			DWORD len;
+			UINT32 len;
 			len = 0xc0000 - adrs;
 			CopyMemory(buf, mem + page + adrs, len);
 			buf += len;
@@ -85,7 +85,7 @@ void viewmem_read(VIEWMEM_T *cfg, DWORD 
 			return;
 		}
 		else {
-			DWORD len;
+			UINT32 len;
 			len = 0xe0000 - adrs;
 			CopyMemory(buf, mem + adrs, len);
 			buf += len;
@@ -96,14 +96,14 @@ void viewmem_read(VIEWMEM_T *cfg, DWORD 
 
 	// Video Memory
 	if (adrs < 0xe8000) {
-		DWORD page;
+		UINT32 page;
 		page = ((cfg->vram)?VRAM_STEP:0);
 		if ((adrs + size) <= 0xe8000) {
 			CopyMemory(buf, mem + page + adrs, size);
 			return;
 		}
 		else {
-			DWORD len;
+			UINT32 len;
 			len = 0xe8000 - adrs;
 			CopyMemory(buf, mem + page + adrs, len);
 			buf += len;
@@ -119,7 +119,7 @@ void viewmem_read(VIEWMEM_T *cfg, DWORD 
 			return;
 		}
 		else {
-			DWORD len;
+			UINT32 len;
 			len = 0x0f8000 - adrs;
 			CopyMemory(buf, mem + adrs, len);
 			buf += len;
@@ -130,14 +130,14 @@ void viewmem_read(VIEWMEM_T *cfg, DWORD 
 
 	// BIOS/ITF
 	if (adrs < 0x100000) {
-		DWORD page;
+		UINT32 page;
 		page = ((cfg->itf)?VRAM_STEP:0);
 		if ((adrs + size) <= 0x100000) {
 			CopyMemory(buf, mem + page + adrs, size);
 			return;
 		}
 		else {
-			DWORD len;
+			UINT32 len;
 			len = 0x100000 - adrs;
 			CopyMemory(buf, mem + page + adrs, len);
 			buf += len;
@@ -148,7 +148,7 @@ void viewmem_read(VIEWMEM_T *cfg, DWORD 
 
 	// HMA
 	if (adrs < 0x10fff0) {
-		DWORD adrs2;
+		UINT32 adrs2;
 		adrs2 = adrs & 0xffff;
 		adrs2 += ((cfg->A20)?VRAM_STEP:0);
 		if ((adrs + size) <= 0x10fff0) {
@@ -156,7 +156,7 @@ void viewmem_read(VIEWMEM_T *cfg, DWORD 
 			return;
 		}
 		else {
-			DWORD len;
+			UINT32 len;
 			len = 0x10fff0 - adrs;
 			CopyMemory(buf, mem + adrs2, len);
 			buf += len;