Echo / InterlockingTool · Commits

Commit 02d278294cf825bb43d20d0366fa34ec5b9e64d6

Authored by xiemeng
1 parent 5e27374c

UPDATE 20170905

Inline Side-by-side
Showing 3 changed files with 14 additions and 16 deletions
@@ -212,10 +212,14 @@ META_RESULT SmartPhoneSN::WriteNvramLoop() @@ -212,10 +212,14 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
212 g_pMainDlg->myscanimei2 == CString(a_imei_ary2)) 212 g_pMainDlg->myscanimei2 == CString(a_imei_ary2))
213 { 213 {
214 UpdateUIMsg("IMEI matches successfully!!!"); 214 UpdateUIMsg("IMEI matches successfully!!!");
  215 + spNextStage = SP_END_STAGE;
  216 + iRet = META_SUCCESS;
215 } 217 }
216 else 218 else
217 { 219 {
218 UpdateUIMsg("IMEI wrong!!!"); 220 UpdateUIMsg("IMEI wrong!!!");
  221 + spNextStage = SP_END_STAGE;
  222 + iRet = META_FAILED;
219 } 223 }
220 224
221 } 225 }
@@ -223,6 +227,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop() @@ -223,6 +227,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
223 { 227 {
224 UpdateUIMsg("IMEI failed to read"); 228 UpdateUIMsg("IMEI failed to read");
225 spNextStage = SP_END_STAGE; 229 spNextStage = SP_END_STAGE;
  230 + iRet = META_FAILED;
226 } 231 }
227 } 232 }
228 break; 233 break;
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
6 --------------------Configuration: SN Writer - Win32 Debug-------------------- 6 --------------------Configuration: SN Writer - Win32 Debug--------------------
7 </h3> 7 </h3>
8 <h3>Command Lines</h3> 8 <h3>Command Lines</h3>
9 -Creating temporary file "D:\temp\RSPE2E7.tmp" with contents 9 +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""
  10 +Creating temporary file "D:\temp\RSPEC40.tmp" with contents
10 [ 11 [
11 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 12 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
12 .\Debug\Common.obj 13 .\Debug\Common.obj
@@ -33,10 +34,10 @@ shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Secur @@ -33,10 +34,10 @@ shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Secur
33 .\Debug\StdAfx.obj 34 .\Debug\StdAfx.obj
34 ".\Debug\SN Writer.res" 35 ".\Debug\SN Writer.res"
35 ] 36 ]
36 -Creating command line "link.exe @D:\temp\RSPE2E7.tmp" 37 +Creating command line "link.exe @D:\temp\RSPEC40.tmp"
37 <h3>Output Window</h3> 38 <h3>Output Window</h3>
  39 +Compiling resources...
38 Linking... 40 Linking...
39 - Creating library Output/IMEI_Check_tool.lib and object Output/IMEI_Check_tool.exp  
40 41
41 42
42 43
@@ -209,7 +209,7 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | @@ -209,7 +209,7 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
209 WS_SYSMENU 209 WS_SYSMENU
210 EXSTYLE WS_EX_APPWINDOW 210 EXSTYLE WS_EX_APPWINDOW
211 CAPTION "SN Writer" 211 CAPTION "SN Writer"
212 -FONT 9, "΢ÈíÑźÚ", 0, 0, 0x1 212 +FONT 9, "΢ÈíÑźÚ"
213 BEGIN 213 BEGIN
214 EDITTEXT IDC_IMEI1_FROM_SCAN,44,15,109,12,ES_AUTOHSCROLL 214 EDITTEXT IDC_IMEI1_FROM_SCAN,44,15,109,12,ES_AUTOHSCROLL
215 EDITTEXT IDC_IMEI2_FROM_SCAN,44,33,109,12,ES_AUTOHSCROLL 215 EDITTEXT IDC_IMEI2_FROM_SCAN,44,33,109,12,ES_AUTOHSCROLL
@@ -220,7 +220,8 @@ BEGIN @@ -220,7 +220,8 @@ BEGIN
220 LTEXT "",IDC_STATIC_IMEI1,46,65,109,12,SS_SUNKEN 220 LTEXT "",IDC_STATIC_IMEI1,46,65,109,12,SS_SUNKEN
221 LTEXT "",IDC_STATIC_IMEI2,46,84,109,12,SS_CENTERIMAGE | 221 LTEXT "",IDC_STATIC_IMEI2,46,84,109,12,SS_CENTERIMAGE |
222 SS_SUNKEN 222 SS_SUNKEN
223 - DEFPUSHBUTTON "",IDC_BTN_SYSCONFIG,262,62,9,8,NOT WS_TABSTOP 223 + DEFPUSHBUTTON "",IDC_BTN_SYSCONFIG,262,62,9,8,NOT WS_VISIBLE | NOT
  224 + WS_TABSTOP
224 DEFPUSHBUTTON "",IDC_BTN_QUIT,262,71,9,8,NOT WS_VISIBLE | NOT 225 DEFPUSHBUTTON "",IDC_BTN_QUIT,262,71,9,8,NOT WS_VISIBLE | NOT
225 WS_TABSTOP 226 WS_TABSTOP
226 LTEXT "Total:",IDC_STATIC,7,105,22,8 227 LTEXT "Total:",IDC_STATIC,7,105,22,8
@@ -228,7 +229,7 @@ BEGIN @@ -228,7 +229,7 @@ BEGIN
228 LTEXT "Fail:",IDC_STATIC,129,105,18,10 229 LTEXT "Fail:",IDC_STATIC,129,105,18,10
229 COMBOBOX IDC_COMBO_COMPORT,262,83,16,51,CBS_DROPDOWNLIST | 230 COMBOBOX IDC_COMBO_COMPORT,262,83,16,51,CBS_DROPDOWNLIST |
230 CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL 231 CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL
231 - CONTROL 133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,167,56,93,45 232 + CONTROL 133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,167,53,93,45
232 GROUPBOX "IMEI form Scan",IDC_STATIC,0,2,282,45 233 GROUPBOX "IMEI form Scan",IDC_STATIC,0,2,282,45
233 LTEXT "",IDC_COUNT_TOTAL,32,105,29,8,SS_SUNKEN 234 LTEXT "",IDC_COUNT_TOTAL,32,105,29,8,SS_SUNKEN
234 LTEXT "",IDC_COUNT_PASS,90,105,32,8,SS_SUNKEN 235 LTEXT "",IDC_COUNT_PASS,90,105,32,8,SS_SUNKEN
@@ -304,7 +305,7 @@ BEGIN @@ -304,7 +305,7 @@ BEGIN
304 LTEXT "SPMeta DLL 1345.01",IDC_SPMETADLL_VERSION,42,40,104,8 305 LTEXT "SPMeta DLL 1345.01",IDC_SPMETADLL_VERSION,42,40,104,8
305 LTEXT "Copyright(C) 2004-2010 MediaTek Inc. All rights reserved.", 306 LTEXT "Copyright(C) 2004-2010 MediaTek Inc. All rights reserved.",
306 IDC_STATIC,42,58,170,8 307 IDC_STATIC,42,58,170,8
307 - ICON IDR_MAINFRAME,IDC_STATIC,13,12,20,20 308 + ICON 128,IDC_STATIC,13,12,20,20
308 END 309 END
309 310
310 IDD_IDENTIFY_VERIFY_DIALOG DIALOG DISCARDABLE 0, 0, 187, 61 311 IDD_IDENTIFY_VERIFY_DIALOG DIALOG DISCARDABLE 0, 0, 187, 61
@@ -570,15 +571,6 @@ END @@ -570,15 +571,6 @@ END
570 571
571 ///////////////////////////////////////////////////////////////////////////// 572 /////////////////////////////////////////////////////////////////////////////
572 // 573 //
573 -// Icon  
574 -//  
575 -  
576 -// Icon with lowest ID value placed first to ensure application icon  
577 -// remains consistent on all systems.  
578 -IDR_MAINFRAME ICON DISCARDABLE "res\\idr_main.ico"  
579 -  
580 -/////////////////////////////////////////////////////////////////////////////  
581 -//  
582 // Bitmap 574 // Bitmap
583 // 575 //
584 576
Please register or login to post a comment