Showing
2 changed files
with
5 additions
and
3 deletions
| @@ -577,6 +577,7 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) | @@ -577,6 +577,7 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) | ||
| 577 | ErrorReporter("file err!\r\n"); | 577 | ErrorReporter("file err!\r\n"); |
| 578 | return; | 578 | return; |
| 579 | } | 579 | } |
| 580 | + CloseHandle(g_appdata.hFileOfEarphoneBin); | ||
| 580 | SetWindowText(GetDlgItem(hWndDlg, IDC_BUTTON2_SEC_BINFILE), "下载软件"); | 581 | SetWindowText(GetDlgItem(hWndDlg, IDC_BUTTON2_SEC_BINFILE), "下载软件"); |
| 581 | } | 582 | } |
| 582 | if (g_appdata.DownloadReday == FALSE) | 583 | if (g_appdata.DownloadReday == FALSE) |
| @@ -661,11 +661,12 @@ char macid_company[3] = {0x0, 0x1, 0x2}; | @@ -661,11 +661,12 @@ char macid_company[3] = {0x0, 0x1, 0x2}; | ||
| 661 | 661 | ||
| 662 | 662 | ||
| 663 | //char *fData, | 663 | //char *fData, |
| 664 | -int fileCheck_fix_MACID(char *dataLen, const char macid_sub[3], const char macid_company[3]) | 664 | +int fileCheck_fix_MACID(DWORD dataLen, const char macid_sub[3], const char macid_company[3]) |
| 665 | { | 665 | { |
| 666 | int i; | 666 | int i; |
| 667 | int ret = FILE_CHCK_SUCCESSFUL; | 667 | int ret = FILE_CHCK_SUCCESSFUL; |
| 668 | char *p = g_appdata.BufEarphoneBin + MAC_ADDR_OFFSET + BAUDRATE_DET_DATA_LEN + HEADER_LEN; | 668 | char *p = g_appdata.BufEarphoneBin + MAC_ADDR_OFFSET + BAUDRATE_DET_DATA_LEN + HEADER_LEN; |
| 669 | + //char *p = g_appdata.BufEarphoneBin + MAC_ADDR_OFFSET + 0xB00 + 0x20; | ||
| 669 | U32 *p1 = (U32 *)g_appdata.BufEarphoneBin; | 670 | U32 *p1 = (U32 *)g_appdata.BufEarphoneBin; |
| 670 | unsigned char baaddr[6]; | 671 | unsigned char baaddr[6]; |
| 671 | BOOT_HEADER *p_header = (BOOT_HEADER *)(g_appdata.BufEarphoneBin + BAUDRATE_DET_DATA_LEN); | 672 | BOOT_HEADER *p_header = (BOOT_HEADER *)(g_appdata.BufEarphoneBin + BAUDRATE_DET_DATA_LEN); |
| @@ -906,7 +907,7 @@ DWORD WINAPI TransferThreadProc(LPVOID lpV) | @@ -906,7 +907,7 @@ DWORD WINAPI TransferThreadProc(LPVOID lpV) | ||
| 906 | /**********************check file*********************************/ | 907 | /**********************check file*********************************/ |
| 907 | //lpfileBuf = HeapAlloc(hDataHeap, 0, dwFileSize); | 908 | //lpfileBuf = HeapAlloc(hDataHeap, 0, dwFileSize); |
| 908 | pRead = g_appdata.BufEarphoneBin; | 909 | pRead = g_appdata.BufEarphoneBin; |
| 909 | - err = fileCheck_fix_MACID(dwFileSize, macid_sub, macid_company); | 910 | + err = fileCheck_fix_MACID(g_appdata.BinSizeFileEarphone, macid_sub, macid_company); |
| 910 | if (err == WRONG_FILE_FORMAT) | 911 | if (err == WRONG_FILE_FORMAT) |
| 911 | { | 912 | { |
| 912 | ErrorReporter("wrong file format!"); | 913 | ErrorReporter("wrong file format!"); |
| @@ -931,7 +932,7 @@ DWORD WINAPI TransferThreadProc(LPVOID lpV) | @@ -931,7 +932,7 @@ DWORD WINAPI TransferThreadProc(LPVOID lpV) | ||
| 931 | // inform writer thread that a file is about to be transferred | 932 | // inform writer thread that a file is about to be transferred |
| 932 | if (!fAborting) | 933 | if (!fAborting) |
| 933 | { | 934 | { |
| 934 | - if (!WriterAddNewNode(WRITE_FILESTART, dwFileSize, 0, NULL, NULL, NULL)) | 935 | + if (!WriterAddNewNode(WRITE_FILESTART, g_appdata.BinSizeFileEarphone, 0, NULL, NULL, NULL)) |
| 935 | fAborting = TRUE; | 936 | fAborting = TRUE; |
| 936 | } | 937 | } |
| 937 | OutputDebugString("Xfer: About to start sending data\n"); | 938 | OutputDebugString("Xfer: About to start sending data\n"); |
Please
register
or
login
to post a comment