1
0
Fork 0

PROJECT: AStyle

This commit is contained in:
mrexodia 2016-06-23 19:10:04 +02:00
parent 7f171bdd6b
commit 02a58ab83e
No known key found for this signature in database
GPG Key ID: D72F9A4FAA0073B4
3 changed files with 55 additions and 53 deletions

View File

@ -1,18 +1,19 @@
#include <string> #include <string>
#include "resource1.h" // String resources #include "resource1.h" // String resources
inline std::wstring _LoadResString(UINT uID) { inline std::wstring _LoadResString(UINT uID)
wchar_t* p = nullptr; {
int len = ::LoadStringW(NULL, uID, reinterpret_cast<LPWSTR>(&p), 0); wchar_t* p = nullptr;
if(len > 0) int len = ::LoadStringW(NULL, uID, reinterpret_cast<LPWSTR>(&p), 0);
{ if(len > 0)
return std::wstring(p, len); {
} return std::wstring(p, len);
else }
{ else
return std::wstring(); {
} return std::wstring();
} }
}
#define LoadResString(uID) _LoadResString(uID).c_str()
#define LoadResString(uID) _LoadResString(uID).c_str()

View File

@ -1,34 +1,34 @@
//{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}}
// //
// //
// //
#define IDS_ERROR 105 #define IDS_ERROR 105
#define IDS_ERRORGETTINGMODULEPATH 106 #define IDS_ERRORGETTINGMODULEPATH 106
#define IDS_QUESTION 107 #define IDS_QUESTION 107
#define IDS_ASKSHELLEXT 108 #define IDS_ASKSHELLEXT 108
#define IDS_ASKDESKTOPSHORTCUT 109 #define IDS_ASKDESKTOPSHORTCUT 109
#define IDS_DONE 110 #define IDS_DONE 110
#define IDS_NEWCFGWRITTEN 111 #define IDS_NEWCFGWRITTEN 111
#define IDS_INVDPATH32 112 #define IDS_INVDPATH32 112
#define IDS_INVDPATH64 113 #define IDS_INVDPATH64 113
#define IDS_INVDPE 114 #define IDS_INVDPE 114
#define IDS_FILEERR 115 #define IDS_FILEERR 115
#define IDS_SHORTCUTDESC 116 #define IDS_SHORTCUTDESC 116
#define IDS_ASKADMIN 117 #define IDS_ASKADMIN 117
#define IDS_REGCREATEKEYFAIL 118 #define IDS_REGCREATEKEYFAIL 118
#define IDS_REGSETVALUEEXFAIL 119 #define IDS_REGSETVALUEEXFAIL 119
#define IDS_REGOPENKEYFAIL 120 #define IDS_REGOPENKEYFAIL 120
#define IDS_BRIDGEINITERR 121 #define IDS_BRIDGEINITERR 121
#define IDS_SHELLEXTDBG 122 #define IDS_SHELLEXTDBG 122
#define IDS_BRIDGESTARTERR 126 #define IDS_BRIDGESTARTERR 126
// Next default values for new objects // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101 #define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif
#endif #endif

View File

@ -431,7 +431,8 @@ void CPUDisassembly::setupRightClickContextMenu()
const char* shortcutTable[] = {nullptr, "ActionTreatSelectionAsByte", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, const char* shortcutTable[] = {nullptr, "ActionTreatSelectionAsByte", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
"ActionTreatSelectionAsASCII", "ActionTreatSelectionAsUNICODE", nullptr, "ActionTreatSelectionAsASCII", "ActionTreatSelectionAsUNICODE", nullptr,
nullptr, nullptr, nullptr}; nullptr, nullptr, nullptr
};
ENCODETYPE enctypeTable[] = {enc_code, enc_byte, enc_word, enc_dword, enc_fword, enc_qword, enc_tbyte, enc_oword, enc_middle, ENCODETYPE enctypeTable[] = {enc_code, enc_byte, enc_word, enc_dword, enc_fword, enc_qword, enc_tbyte, enc_oword, enc_middle,
enc_real4, enc_real8, enc_real10 , enc_middle, enc_real4, enc_real8, enc_real10 , enc_middle,