UPDATE 20170905

@@ -212,10 +212,14 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
 							g_pMainDlg->myscanimei2 == CString(a_imei_ary2))
 						{
 							UpdateUIMsg("IMEI matches successfully!!!");
+		                    spNextStage = SP_END_STAGE;
+							iRet = META_SUCCESS;
 						}
 						else
 						{
 							UpdateUIMsg("IMEI wrong!!!");
+		                    spNextStage = SP_END_STAGE;
+							iRet = META_FAILED;
 						}
 					
                 }
@@ -223,6 +227,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
                 {
                     UpdateUIMsg("IMEI failed to read");
                     spNextStage = SP_END_STAGE;
+					iRet = META_FAILED;
                 }
             }
             break;

@@ -6,7 +6,8 @@
 --------------------Configuration: SN Writer - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "D:\temp\RSPE2E7.tmp" with contents
+Creating command line "rc.exe /l 0x409 /fo"Debug/SN Writer.res" /d "_DEBUG" /d "_AFXDLL" "D:\work\SN_TOOL_SRC\InterlockingTool\SN Writer.rc"" 
+Creating temporary file "D:\temp\RSPEC40.tmp" with contents
 [
 shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Security/lib/*.lib" "./mtklib/SNFstream/lib/*.lib" "./mtklib/DebugTrace/lib/*.lib" "./mtklib/usbswitchtool/lib/*.lib" /nologo /subsystem:windows /incremental:yes /pdb:"Output/IMEI_Check_tool.pdb" /debug /machine:I386 /out:"Output/IMEI_Check_tool.exe" /pdbtype:sept 
 .\Debug\Common.obj
@@ -33,10 +34,10 @@ shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Secur
 .\Debug\StdAfx.obj
 ".\Debug\SN Writer.res"
 ]
-Creating command line "link.exe @D:\temp\RSPE2E7.tmp"
+Creating command line "link.exe @D:\temp\RSPEC40.tmp"
 <h3>Output Window</h3>
+Compiling resources...
 Linking...
-   Creating library Output/IMEI_Check_tool.lib and object Output/IMEI_Check_tool.exp
 
 
 

@@ -209,7 +209,7 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
     WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "SN Writer"
-FONT 9, "΢ÈíÑźÚ", 0, 0, 0x1
+FONT 9, "΢ÈíÑźÚ"
 BEGIN
     EDITTEXT        IDC_IMEI1_FROM_SCAN,44,15,109,12,ES_AUTOHSCROLL
     EDITTEXT        IDC_IMEI2_FROM_SCAN,44,33,109,12,ES_AUTOHSCROLL
@@ -220,7 +220,8 @@ BEGIN
     LTEXT           "",IDC_STATIC_IMEI1,46,65,109,12,SS_SUNKEN
     LTEXT           "",IDC_STATIC_IMEI2,46,84,109,12,SS_CENTERIMAGE | 
                     SS_SUNKEN
-    DEFPUSHBUTTON   "",IDC_BTN_SYSCONFIG,262,62,9,8,NOT WS_TABSTOP
+    DEFPUSHBUTTON   "",IDC_BTN_SYSCONFIG,262,62,9,8,NOT WS_VISIBLE | NOT 
+                    WS_TABSTOP
     DEFPUSHBUTTON   "",IDC_BTN_QUIT,262,71,9,8,NOT WS_VISIBLE | NOT 
                     WS_TABSTOP
     LTEXT           "Total:",IDC_STATIC,7,105,22,8
@@ -228,7 +229,7 @@ BEGIN
     LTEXT           "Fail:",IDC_STATIC,129,105,18,10
     COMBOBOX        IDC_COMBO_COMPORT,262,83,16,51,CBS_DROPDOWNLIST | 
                     CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL
-    CONTROL         133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,167,56,93,45
+    CONTROL         133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,167,53,93,45
     GROUPBOX        "IMEI form Scan",IDC_STATIC,0,2,282,45
     LTEXT           "",IDC_COUNT_TOTAL,32,105,29,8,SS_SUNKEN
     LTEXT           "",IDC_COUNT_PASS,90,105,32,8,SS_SUNKEN
@@ -304,7 +305,7 @@ BEGIN
     LTEXT           "SPMeta DLL 1345.01",IDC_SPMETADLL_VERSION,42,40,104,8
     LTEXT           "Copyright(C) 2004-2010 MediaTek Inc. All rights reserved.",
                     IDC_STATIC,42,58,170,8
-    ICON            IDR_MAINFRAME,IDC_STATIC,13,12,20,20
+    ICON            128,IDC_STATIC,13,12,20,20
 END
 
 IDD_IDENTIFY_VERIFY_DIALOG DIALOG DISCARDABLE  0, 0, 187, 61
@@ -570,15 +571,6 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME           ICON    DISCARDABLE     "res\\idr_main.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // Bitmap
 //