Index: format.c
===================================================================
--- format.c	(revision 40342)
+++ format.c	(working copy)
@@ -55,6 +55,7 @@
 // Takes the win32 error code and prints the text version.
 //
 //----------------------------------------------------------------------
+#define LoadStringAndOem(HINSTANCE,UINT,LPSTR,int); LoadString(HINSTANCE,UINT,LPSTR,int);CharToOem(LPSTR, LPSTR);
 static VOID PrintWin32Error( LPTSTR Message, DWORD ErrorCode )
 {
 	LPTSTR lpMsgBuf;
@@ -171,7 +172,7 @@
 
 	case PROGRESS:
 		percent = (PDWORD) Argument;
-		LoadString( GetModuleHandle(NULL), STRING_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg, *percent);
 		break;
 
@@ -184,7 +185,7 @@
 		status = (PBOOLEAN) Argument;
 		if( *status == FALSE ) {
 
-			LoadString( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+			LoadStringAndOem( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 			_tprintf(szMsg);
 			Error = TRUE;
 		}
@@ -203,7 +204,7 @@
 	case UNKNOWND:
 	case STRUCTUREPROGRESS:
 	case CLUSTERSIZETOOSMALL:
-		LoadString( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg);
 		return FALSE;
 	}
@@ -261,7 +262,7 @@
 	BYTE dummy;
 	BOOLEAN lastestVersion;
 
-	LoadString( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+	LoadStringAndOem( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 	if (!LoadFMIFSEntryPoints())
 	{
 		_tprintf(szMsg, ProgramName, _T(""));
@@ -319,7 +320,7 @@
 	// Get function pointers
 	//
 	if( !LoadFMIFSEntryPoints()) {
-		LoadString( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg);
 		return -1;
 	}
@@ -329,7 +330,7 @@
 	//
 	if( (badArg = ParseCommandLine( argc, argv ))) {
 
-		LoadString( GetModuleHandle(NULL), STRING_UNKNOW_ARG, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_UNKNOW_ARG, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg, argv[badArg] );
 
 		Usage(argv[0]);
@@ -341,7 +342,7 @@
 	//
 	if( !Drive ) {
 
-		LoadString( GetModuleHandle(NULL), STRING_DRIVE_PARM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_DRIVE_PARM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg);
 		Usage( argv[0] );
 		return -1;
@@ -359,13 +360,13 @@
 	driveType = GetDriveType( RootDirectory );
 
 	if( driveType == 0 ) {
-		LoadString( GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		PrintWin32Error( szMsg, GetLastError());
 		return -1;
 	}
 
 	if( driveType != DRIVE_FIXED ) {
-		LoadString( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg, RootDirectory[0] );
 		_fgetts( input, sizeof(input)/2, stdin );
 
@@ -380,7 +381,7 @@
 						&serialNumber, &maxComponent, &flags,
 						fileSystem, sizeof(fileSystem)/2)) {
 
-		LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		PrintWin32Error( szMsg, GetLastError());
 		return -1;
 	}
@@ -390,11 +391,11 @@
 			&totalNumberOfBytes,
 			&totalNumberOfFreeBytes )) {
 
-		LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		PrintWin32Error( szMsg, GetLastError());
 		return -1;
 	}
-	LoadString( GetModuleHandle(NULL), STRING_FILESYSTEM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+	LoadStringAndOem( GetModuleHandle(NULL), STRING_FILESYSTEM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 	_tprintf(szMsg, fileSystem );
 
 	//
@@ -406,7 +407,7 @@
 
 			while(1 ) {
 
-				LoadString( GetModuleHandle(NULL), STRING_LABEL_NAME_EDIT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+				LoadStringAndOem( GetModuleHandle(NULL), STRING_LABEL_NAME_EDIT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 				_tprintf(szMsg, RootDirectory[0] );
 				_fgetts( input, sizeof(input)/2, stdin );
 				input[ _tcslen( input ) - 1] = 0;
@@ -415,15 +416,15 @@
 
 					break;
 				}
-				LoadString( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+				LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 				_tprintf(szMsg);
 			}
 		}
 
-		LoadString( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg, RootDirectory[0] );
 
-		LoadString( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 
 		while( 1 ) {
 			_fgetts( input, sizeof(input)/2, stdin );
@@ -441,7 +442,7 @@
 	//
 	if( !QuickFormat ) {
 
-		LoadString( GetModuleHandle(NULL), STRING_VERIFYING, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_VERIFYING, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 
 		if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) {
 
@@ -454,7 +455,7 @@
 		}
 	} else {
 
-		LoadString( GetModuleHandle(NULL), STRING_FAST_FMT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_FAST_FMT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) {
 
 			_tprintf(_T("%s %luM\n"),szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024)));
@@ -464,7 +465,7 @@
 			_tprintf(_T("%s %.2fM\n"),szMsg,
 				((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0));
 		}
-		LoadString( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg);
 	}
 
@@ -482,7 +483,7 @@
 			ClusterSize, FormatExCallback );
 #endif
 	if( Error ) return -1;
-	LoadString( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+	LoadStringAndOem( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 	_tprintf(szMsg);
 
 	//
@@ -497,7 +498,7 @@
 		if( !EnableVolumeCompression( RootDirectory, TRUE )) {
 #endif
 
-			LoadString( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+			LoadStringAndOem( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 			_tprintf(szMsg);
 		}
 	}
@@ -507,14 +508,14 @@
 	//
 	if( !GotALabel ) {
 
-		LoadString( GetModuleHandle(NULL), STRING_ENTER_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_ENTER_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg);
 		_fgetts( input, sizeof(LabelString)/2, stdin );
 
 		input[ _tcslen(input)-1] = 0;
 		if( !SetVolumeLabel( RootDirectory, input )) {
 
-			LoadString( GetModuleHandle(NULL), STRING_NO_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+			LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 			PrintWin32Error(szMsg, GetLastError());
 			return -1;
 		}
@@ -525,7 +526,7 @@
 						&serialNumber, &maxComponent, &flags,
 						fileSystem, sizeof(fileSystem)/2)) {
 
-		LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		PrintWin32Error( szMsg, GetLastError());
 		return -1;
 	}
@@ -538,12 +539,12 @@
 			&totalNumberOfBytes,
 			&totalNumberOfFreeBytes )) {
 
-		LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		PrintWin32Error(szMsg, GetLastError());
 		return -1;
 	}
 
-	LoadString( GetModuleHandle(NULL), STRING_FREE_SPACE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+	LoadStringAndOem( GetModuleHandle(NULL), STRING_FREE_SPACE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 	_tprintf(szMsg, totalNumberOfBytes.QuadPart, totalNumberOfFreeBytes.QuadPart );
 
 	//
@@ -554,11 +555,11 @@
 						&serialNumber, &maxComponent, &flags,
 						fileSystem, sizeof(fileSystem)/2)) {
 
-		LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		PrintWin32Error( szMsg, GetLastError());
 		return -1;
 	}
-	LoadString( GetModuleHandle(NULL), STRING_SERIAL_NUMBER, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+	LoadStringAndOem( GetModuleHandle(NULL), STRING_SERIAL_NUMBER, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 	_tprintf(szMsg, (unsigned int)(serialNumber >> 16),
 					(unsigned int)(serialNumber & 0xFFFF) );