--- np2/win9x/debuguty/viewreg.cpp	2005/02/09 20:11:36	1.8
+++ np2/win9x/debuguty/viewreg.cpp	2005/03/20 08:58:19	1.9
@@ -15,7 +15,7 @@ static void viewreg_paint(NP2VIEW_T *vie
 
 	LONG		y;
 	DWORD		pos;
-	OEMCHAR		str[128];
+	TCHAR		str[128];
 	HFONT		hfont;
 	I286STAT	*r;
 
@@ -51,26 +51,26 @@ static void viewreg_paint(NP2VIEW_T *vie
 	for (y=0; y<rc->bottom && pos<4; y+=16, pos++) {
 		switch(pos) {
 			case 0:
-				OEMSPRINTF(str, OEMTEXT("AX=%.4x  BX=%.4x  CX=%.4x  DX=%.4x"),
+				wsprintf(str, _T("AX=%.4x  BX=%.4x  CX=%.4x  DX=%.4x"),
 								r->r.w.ax, r->r.w.bx, r->r.w.cx, r->r.w.dx);
 				break;
 
 			case 1:
-				OEMSPRINTF(str, OEMTEXT("SP=%.4x  BP=%.4x  SI=%.4x  DI=%.4x"),
+				wsprintf(str, _T("SP=%.4x  BP=%.4x  SI=%.4x  DI=%.4x"),
 								r->r.w.sp, r->r.w.bp, r->r.w.si, r->r.w.di);
 				break;
 
 			case 2:
-				OEMSPRINTF(str, OEMTEXT("CS=%.4x  DS=%.4x  ES=%.4x  SS=%.4x"),
+				wsprintf(str, _T("CS=%.4x  DS=%.4x  ES=%.4x  SS=%.4x"),
 								r->r.w.cs, r->r.w.ds, r->r.w.es, r->r.w.ss);
 				break;
 
 			case 3:
-				OEMSPRINTF(str, OEMTEXT("IP=%.4x   %s"),
+				wsprintf(str, _T("IP=%.4x   %s"),
 								r->r.w.ip, debugsub_flags(r->r.w.flag));
 				break;
 		}
-		TextOut(hdc, 0, y, str, OEMSTRLEN(str));
+		TextOut(hdc, 0, y, str, lstrlen(str));
 	}
 	DeleteObject(SelectObject(hdc, hfont));
 }
@@ -79,7 +79,7 @@ static void viewreg_paint(NP2VIEW_T *vie
 
 	LONG		y;
 	DWORD		pos;
-	OEMCHAR		str[128];
+	TCHAR		str[128];
 	HFONT		hfont;
 	I386STAT	*r;
 
@@ -115,7 +115,7 @@ static void viewreg_paint(NP2VIEW_T *vie
 	for (y=0; y<rc->bottom && pos<4; y+=16, pos++) {
 		switch(pos) {
 			case 0:
-				OEMSPRINTF(str, OEMTEXT("EAX=%.8x EBX=%.8x ECX=%.8x EDX=%.8x"),
+				wsprintf(str, _T("EAX=%.8x EBX=%.8x ECX=%.8x EDX=%.8x"),
 								r->cpu_regs.reg[CPU_EAX_INDEX].d,
 								r->cpu_regs.reg[CPU_EBX_INDEX].d,
 								r->cpu_regs.reg[CPU_ECX_INDEX].d,
@@ -123,7 +123,7 @@ static void viewreg_paint(NP2VIEW_T *vie
 				break;
 
 			case 1:
-				OEMSPRINTF(str, OEMTEXT("ESP=%.8x EBP=%.8x ESI=%.8x EDI=%.8x"),
+				wsprintf(str, _T("ESP=%.8x EBP=%.8x ESI=%.8x EDI=%.8x"),
 								r->cpu_regs.reg[CPU_ESP_INDEX].d,
 								r->cpu_regs.reg[CPU_EBP_INDEX].d,
 								r->cpu_regs.reg[CPU_ESI_INDEX].d,
@@ -131,7 +131,7 @@ static void viewreg_paint(NP2VIEW_T *vie
 				break;
 
 			case 2:
-				OEMSPRINTF(str, OEMTEXT("CS=%.4x DS=%.4x ES=%.4x FS=%.4x GS=%.4x SS=%.4x"),
+				wsprintf(str, _T("CS=%.4x DS=%.4x ES=%.4x FS=%.4x GS=%.4x SS=%.4x"),
 								r->cpu_regs.sreg[CPU_CS_INDEX],
 								r->cpu_regs.sreg[CPU_DS_INDEX],
 								r->cpu_regs.sreg[CPU_ES_INDEX],
@@ -141,12 +141,12 @@ static void viewreg_paint(NP2VIEW_T *vie
 				break;
 
 			case 3:
-				OEMSPRINTF(str, OEMTEXT("EIP=%.8x   %s"),
+				wsprintf(str, _T("EIP=%.8x   %s"),
 								r->cpu_regs.eip.d,
 								debugsub_flags(r->cpu_regs.eflags.d));
 				break;
 		}
-		TextOut(hdc, 0, y, str, strlen(str));
+		TextOut(hdc, 0, y, str, lstrlen(str));
 	}
 	DeleteObject(SelectObject(hdc, hfont));
 }