修改密码错误提示

Lsamien · Mar 7, 2022 · 1365042 · 1365042
1 parent 00f4d4b
commit 1365042
Show file tree

Hide file tree

Showing 7 changed files with 12,323 additions and 21,560 deletions.
diff --git a/LSCrypt/LSCrypt.h b/LSCrypt/LSCrypt.h
@@ -7,8 +7,8 @@
 /* at Tue Jan 19 11:14:07 2038
  */
 /* Compiler settings for LSCrypt.idl:
- Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.01.0626 
- protocol : all , ms_ext, c_ext, robust
+ Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.01.0626 
+ protocol : dce , ms_ext, c_ext, robust
  error checks: allocation ref bounds_check enum stub_data 
  VC __declspec() decoration level: 
  __declspec(uuid()), __declspec(selectany), __declspec(novtable)

diff --git a/LSCrypt/LSCrypt.map b/LSCrypt/LSCrypt.map
diff --git a/LSCrypt/PasswordDlg.cpp b/LSCrypt/PasswordDlg.cpp
@@ -7,7 +7,6 @@
 
 
 extern HINSTANCE g_hInst;
-#define BITMAP_LOGO TEXT("EA_key3.0_Logo.bmp")
 
 CPasswordDlg::CPasswordDlg(int nMode, HWND hwndParent)
 {
@@ -16,19 +15,7 @@ CPasswordDlg::CPasswordDlg(int nMode, HWND hwndParent)
  m_hWnd = NULL;
  memset(m_password, 0, sizeof(m_password));
 
- TCHAR szBitmapPath[MAX_PATH] = {0};
-
- lstrcpy(szBitmapPath,pExt->m_szDllDir);
- lstrcat(szBitmapPath,BITMAP_LOGO);
-
- if (GetFileAttributes(szBitmapPath) == (DWORD)INVALID_HANDLE_VALUE)
- {
- m_hBitmapLogo = (HBITMAP)LoadBitmap(g_hInst,MAKEINTRESOURCE(IDB_LOGO));
- }
- else
- {
- m_hBitmapLogo = (HBITMAP)LoadImage(g_hInst,szBitmapPath,IMAGE_BITMAP,0,0,LR_LOADFROMFILE);
- }
+ m_hBitmapLogo = (HBITMAP)LoadBitmap(g_hInst, MAKEINTRESOURCE(IDB_LOGO));
 
 }
 

diff --git a/LSCrypt/ProgressDlg.cpp b/LSCrypt/ProgressDlg.cpp
@@ -488,7 +488,7 @@ bool CProgressDlg::OnError(WPARAM wParam, LPARAM lParam)
  break;
  case LSC_ERR_DECRYPT_FILE_FORMAT:
  //解密文件格式错误, 通常是解密时, 输入的文件是未加密过的或密码错误
- ::MessageBoxW(m_hWnd,szDecryptError, PROJECT_NAME, MB_ICONWARNING);
+ ::MessageBoxW(m_hWnd,L"解密文件格式错误, 通常是解密时, 输入的文件是未加密过的或密码错误", PROJECT_NAME, MB_ICONWARNING);
  //取消任务
  AbortTask();
  break;

diff --git a/LSCrypt/res/logo.bmp b/LSCrypt/res/logo.bmp
diff --git a/LSCryptGUI/main.cpp b/LSCryptGUI/main.cpp
@@ -48,6 +48,41 @@ static void OnSurfaceReady(LCUI_Event e, void* arg)
 
 int main(int argc, char** argv)
 {
+ if (!LoadDLL())
+ {
+ return 0;
+ }
+
+ char file[MAX_PATH];
+ char* pCmdLine = NULL;
+ char* pFile = NULL;
+
+ file[0] = 0;
+
+ //文件路径形式, 如(包括双引号): "C:\\123.UFC" 
+ if (argc>1)
+ {
+ pCmdLine = argv[1];
+ pFile = file;
+ if (*pCmdLine == '\"') pCmdLine++;
+ while (*pCmdLine && *pCmdLine != '\"')
+ {
+ *pFile++ = *pCmdLine++;
+ }
+ *pFile = '\0';
+
+ //IsFileExists(file);
+ if (file[0]/* && IsFileExists(file)*/)
+ {
+ //解密文件
+ if (LoadDLL())
+ fnDllOpenCrypt(AnsiToUnicode(file));
+ return FALSE;
+ }
+ }
+
+
+
  LCUI_Widget root, pack;
 
  LCUI_Init();

diff --git a/include/LSCryptinc.h b/include/LSCryptinc.h
@@ -67,5 +67,15 @@ static void UnLoadDLL()
 // LPWSTR lpAutoFileOut, int nAutoFileOut, DWORD *pLastSystemError);
 //DWORD __declspec(dllimport) DllEncrypt(const char *password, const wchar_t *file, pfnEn_DeCallback pCallback, 
 // LPWSTR lpAutoFileOut, int nAutoFileOut, DWORD *pLastSystemError);
-
+static wchar_t* AnsiToUnicode(const char* szStr)
+{
+ int nLen = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szStr, -1, NULL, 0);
+ if (nLen == 0)
+ {
+ return NULL;
+ }
+ wchar_t* pResult = new wchar_t[nLen];
+ MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szStr, -1, pResult, nLen);
+ return pResult;
+}
 #endif //_LS_CRYPT_H__