Bläddra i källkod

1、GetCurrentDirectory返回的是当前进程的父进程目录,如果没有父进程返回自己目录;
改用回GetModuleFileName,避免使用其他程序打开时出现问题;

scbc.sat2 5 år sedan
förälder
incheckning
e0a62fdecd

+ 5 - 0
SATHelper/SATHelper/SATHelper.cpp

@@ -128,8 +128,13 @@ BOOL CSATHelperApp::InitInstance()
 	TCHAR szExt[MAX_PATH] = { 0 };
 	::GetModuleFileName(NULL, Global::g_szCurModulePath, sizeof(Global::g_szCurModulePath) / sizeof(TCHAR));
 	_tsplitpath_s(Global::g_szCurModulePath, szDrive, szDir, Global::g_szFna, szExt);
+#ifdef _DEBUG
 	::GetCurrentDirectory(MAX_PATH, Global::g_szCurModuleDir);
 	_tcscat_s(Global::g_szCurModuleDir, _T("\\"));
+#else
+	_tcscpy_s(Global::g_szCurModuleDir, szDrive);
+	_tcscat_s(Global::g_szCurModuleDir, szDir);
+#endif
 #endif
 
 #if 1

+ 8 - 8
SATHelper/SATHelper/SATHelper.rc

@@ -53,11 +53,11 @@ BEGIN
     "\r\n"
     "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)\r\n"
     "LANGUAGE 4, 2\r\n"
-    "#include ""res\\SATHelper.rc2""  // 闂?Microsoft Visual C++ 缂傚倹鐗炵欢顐︽儍閸曨喚銈繝?\n"
-    "#include ""l.CHS\\afxres.rc""      // 闁哄秴娲ら崳顖滅磼閸曨亝顐?\n"
-    "#include ""l.CHS\\afxprint.rc""    // 闁瑰灚鎸稿畵?闁瑰灚鎸稿畵鍐╋紣閸曨噮娼旈悹褍瀚花?\n"
+    "#include ""res\\SATHelper.rc2""  // 闂?Microsoft Visual C++ 缂傚倸鍊归悧鐐垫椤愶附鍎嶉柛鏇ㄥ枤閵堫偅绻?\n"
+    "#include ""l.CHS\\afxres.rc""      // 闂佸搫绉村ú銈夊闯椤栨粎纾奸柛鏇ㄤ簼椤?\n"
+    "#include ""l.CHS\\afxprint.rc""    // 闂佺懓鐏氶幐绋跨暤?闂佺懓鐏氶幐绋跨暤閸愨晪绱i柛鏇ㄥ櫘濞兼棃鎮硅鐎氼厾鑺?\n"
     "#if !defined(_AFXDLL)\r\n"
-    "#include ""l.CHS\\afxribbon.rc""        // MFC 闁告梻鍠曢崗姗€宕犻崫鍕闁硅矇鍐ㄧ厬闁哄銈囥偒婵?\n"
+    "#include ""l.CHS\\afxribbon.rc""        // MFC 闂佸憡姊婚崰鏇㈠礂濮椻偓瀹曠娀宕崟顒€顏梺纭呯焽閸愩劎鍘梺鍝勵棥閵堝洢鍋掑┑?\n"
     "#endif\r\n"
     "#endif\r\n"
     "\0"
@@ -485,15 +485,15 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "080404B0"
+        BLOCK "080404b0"
         BEGIN
-            VALUE "CompanyName", "TODO:  <公司名>"
+            VALUE "CompanyName", "自动化测试小组"
             VALUE "FileDescription", "SATHelper"
             VALUE "FileVersion", "1.0.0.1"
             VALUE "InternalName", "SATHelper.exe"
-            VALUE "LegalCopyright", "TODO:  (C) <公司名>。  保留所有权利。"
+            VALUE "LegalCopyright", "自动化测试小组。  保留所有权利。"
             VALUE "OriginalFilename", "SATHelper.exe"
-            VALUE "ProductName", "TODO:  <产品名>"
+            VALUE "ProductName", "自动化测试运行平台"
             VALUE "ProductVersion", "1.0.0.1"
         END
     END

+ 1 - 0
SATHelper/SATHelper/SATHelper.vcxproj

@@ -155,6 +155,7 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>

+ 166 - 0
SATHelper/SATHelper/resource.h

@@ -0,0 +1,166 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ 生成的包含文件。
+// 供 SATHelper.rc 使用
+//
+#define IDD_ABOUTBOX                    100
+#define IDP_OLE_INIT_FAILED             100
+#define IDB_WRITESMALL                  110
+#define IDB_WRITELARGE                  111
+#define IDB_MAIN                        112
+#define IDB_BUTTONS                     113
+#define IDB_FILELARGE                   114
+#define IDB_FILESMALL                   115
+#define IDR_POPUP_EDIT                  119
+#define ID_STATUSBAR_PANE1              120
+#define ID_STATUSBAR_PANE2              121
+#define IDS_STATUS_PANE1                122
+#define IDS_STATUS_PANE2                123
+#define IDR_MAINFRAME                   128
+#define IDR_MAINFRAME_256               129
+#define IDR_SATHelperTYPE               130
+#define ID_WINDOW_MANAGER               131
+#define ID_VIEW_FILEVIEW                133
+#define ID_VIEW_CLASSVIEW               134
+#define ID_PROPERTIES                   135
+#define ID_OPEN                         136
+#define ID_OPEN_WITH                    137
+#define ID_DUMMY_COMPILE                138
+#define ID_CLASS_ADD_MEMBER_FUNCTION    139
+#define ID_CLASS_ADD_MEMBER_VARIABLE    140
+#define ID_CLASS_DEFINITION             141
+#define ID_CLASS_PROPERTIES             142
+#define ID_NEW_FOLDER                   143
+#define ID_SORT_MENU                    144
+#define ID_SORTING_GROUPBYTYPE          145
+#define ID_SORTING_SORTALPHABETIC       146
+#define ID_SORTING_SORTBYTYPE           147
+#define ID_SORTING_SORTBYACCESS         148
+#define ID_VIEW_OUTPUTWND               149
+#define ID_VIEW_PROPERTIESWND           150
+#define IDR_PASTE_MENU                  151
+#define ID_SORTPROPERTIES               151
+#define IDR_WINDOWS_MENU                152
+#define ID_PROPERTIES1                  152
+#define ID_PROPERTIES2                  153
+#define ID_EXPAND_ALL                   154
+#define IDS_FILE_VIEW                   155
+#define IDS_CLASS_VIEW                  156
+#define IDS_OUTPUT_WND                  157
+#define IDS_PROPERTIES_WND              158
+#define IDI_FILE_VIEW                   161
+#define IDI_FILE_VIEW_HC                162
+#define IDI_CLASS_VIEW                  163
+#define IDI_CLASS_VIEW_HC               164
+#define IDI_OUTPUT_WND                  165
+#define IDI_OUTPUT_WND_HC               166
+#define IDI_PROPERTIES_WND              167
+#define IDI_PROPERTIES_WND_HC           168
+#define IDR_EXPLORER                    169
+#define IDB_EXPLORER_24                 170
+#define IDR_SORT                        171
+#define IDB_SORT_24                     172
+#define IDR_POPUP_SORT                  173
+#define IDR_POPUP_EXPLORER              174
+#define IDB_FILE_VIEW                   175
+#define IDB_FILE_VIEW_24                176
+#define IDB_CLASS_VIEW                  177
+#define IDB_CLASS_VIEW_24               178
+#define IDR_MENU_IMAGES                 179
+#define IDB_MENU_IMAGES_24              180
+#define ID_TOOLS_MACRO                  181
+#define IDR_OUTPUT_POPUP                182
+#define IDR_PROPERTIES                  183
+#define IDB_PROPERTIES_HC               184
+#define ID_VIEW_NAVIGATION              185
+#define IDB_NAVIGATION_LARGE            186
+#define IDB_NAVIGATION_LARGE_HC         187
+#define IDB_PAGES                       188
+#define IDB_PAGES_HC                    189
+#define IDB_PAGES_SMALL                 190
+#define IDB_PAGES_SMALL_HC              191
+#define IDR_THEME_MENU                  200
+#define ID_SET_STYLE                    201
+#define ID_VIEW_APPLOOK_WIN_2000        205
+#define ID_VIEW_APPLOOK_OFF_XP          206
+#define ID_VIEW_APPLOOK_WIN_XP          207
+#define ID_VIEW_APPLOOK_OFF_2003        208
+#define ID_VIEW_APPLOOK_VS_2005         209
+#define ID_VIEW_APPLOOK_VS_2008         210
+#define ID_VIEW_APPLOOK_OFF_2007_BLUE   215
+#define ID_VIEW_APPLOOK_OFF_2007_BLACK  216
+#define ID_VIEW_APPLOOK_OFF_2007_SILVER 217
+#define ID_VIEW_APPLOOK_OFF_2007_AQUA   218
+#define ID_VIEW_APPLOOK_WINDOWS_7       219
+#define ID_TOOLS_OPTIONS                220
+#define ID_VIEW_CAPTION_BAR             221
+#define IDB_INFO                        230
+#define IDS_CAPTION_BUTTON              231
+#define IDS_CAPTION_BUTTON_TIP          232
+#define IDS_CAPTION_TEXT                233
+#define IDS_CAPTION_IMAGE_TIP           234
+#define IDS_CAPTION_IMAGE_TEXT          235
+#define IDS_MYCALENDARS                 250
+#define IDS_CALENDAR                    251
+#define IDS_SHORTCUTS                   252
+#define IDS_FOLDERS                     253
+#define IDS_OUTLOOKBAR                  258
+#define IDS_BUILD_TAB                   300
+#define IDS_DEBUG_TAB                   301
+#define IDS_FIND_TAB                    302
+#define IDS_EXPLORER                    305
+#define IDS_EDIT_MENU                   306
+#define IDR_RIBBON                      307
+#define IDB_CHECKED                     310
+#define IDB_UNCHECKED                   311
+#define DLG_DEVICEMANAGER               312
+#define DLG_UB530VIEW                   314
+#define IDC_COMBO1                      1000
+#define IDC_COMBO2                      1001
+#define IDC_CHECK1                      1002
+#define IDC_CHECK2                      1003
+#define IDC_BUTTON1                     1004
+#define IDC_BUTTON2                     1005
+#define IDC_EDIT1                       1006
+#define ID_WRITE_PASTEASHYPERLINK       32770
+#define ID_TRAYMENU_RECONNECT           32771
+#define ID_TRAYMENU_EXIT                32772
+#define ID_CHECK_HDMI                   32773
+#define ID_CHECK_YCBCR                  32773
+#define ID_CHECK_DVID                   32774
+#define ID_CHECK_DVIA                   32774
+#define ID_CHECK_COMPOSITE              32775
+#define ID_CHECK_SVIDEO                 32776
+#define ID_CHECK_SDI                    32777
+#define ID_CHECK_AUTO                   32778
+#define ID_EDIT_SOUND_LEVEL             32781
+#define ID_CHECK_FULL_CUT               32782
+#define ID_CHECK_FORMAT_MP4             32786
+#define ID_BUTTON7                      32788
+#define ID_CUT_BMP                      32790
+#define ID_CUT_JPG                      32791
+#define ID_START_RECORD                 32792
+#define ID_STOP_RECORD                  32793
+#define ID_SPIN3                        32794
+#define ID_CHECK_VERTICALLY             32796
+#define ID_CHECK_HORIONTAL              32797
+#define ID_BUTTON4                      32803
+#define ID_CHECK_SUPORT_GPU             32804
+#define ID_CHECK_FORMAT_AVI             32805
+#define ID_BUTTON6                      32805
+#define BTN_HAD_SOUND                   32807
+#define ID_COMBO_PRODUCT                32808
+#define ID_COMBO_UI                     32809
+#define ID_COMBOX_OCR                   32810
+#define ID_EDIT_COUNT                   32811
+#define BTN_DEF_SOUND                   32812
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        316
+#define _APS_NEXT_COMMAND_VALUE         32813
+#define _APS_NEXT_CONTROL_VALUE         1007
+#define _APS_NEXT_SYMED_VALUE           310
+#endif
+#endif