CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

+ fix: minor "clean code" issues

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-05-16 00:57:06 +02:00
parent b352544a5d
commit 3a6bbfd88a
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
language/common_res.h
View File

@ -1,3 +1,5 @@
#ifndef _COMMON_RES_H_
#define _COMMON_RES_H_
//{{NO_DEPENDENCIES}}
// common language (MUI) defines
//
@ -256,3 +258,5 @@
#define IDM_HELP_ADMINEXE 40603
#define IDM_HELP_UPDATEWEBSITE 40604
#define IDM_EDIT_INSERT_GUID 40605
#endif

2
src/Helpers.c
View File

@ -278,7 +278,7 @@ DWORD GetLastErrorToMsgBox(LPWSTR lpszFunction, DWORD dwErrID)
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL,
dwErrID,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // g_iPrefLngLocID ?
(LPTSTR)&lpMsgBuf,
0, NULL);

9
src/Notepad3.c
View File

@ -132,6 +132,7 @@ bool g_bSaveFindReplace;
bool g_bFindReplCopySelOrClip = true;
WCHAR g_tchPrefLngLocName[MINI_BUFFER];
LANGID g_iPrefLngLocID = 1033; // en-US
HMODULE g_hLngResContainer = NULL;
static WCHAR* const g_tchAvailableLanguages = L"af-AF fr-FR de-DE es-ES en-UK";
static LANGID const g_iAvailableLanguages[5] = { 1078, 1036, 1031, 3082, 2057 };
@ -661,22 +662,22 @@ int WINAPI WinMain(HINSTANCE hInstance,HINSTANCE hPrevInst,LPSTR lpCmdLine,int n
// ----------------------------------------------------
// MultiLingual
//
LANGID langID = GetUserDefaultUILanguage();
g_iPrefLngLocID = GetUserDefaultUILanguage();
bool bPrefLngNotAvail = false;
if (StringCchLenW(g_tchPrefLngLocName, COUNTOF(g_tchPrefLngLocName)) > 0)
{
DWORD dwLangID = 0;
GetLocaleInfoEx(g_tchPrefLngLocName, LOCALE_ILANGUAGE | LOCALE_RETURN_NUMBER, (LPWSTR)&dwLangID, sizeof(DWORD));
langID = (LANGID)dwLangID;
g_iPrefLngLocID = (LANGID)dwLangID;
}
g_hLngResContainer = _LoadLanguageResources(langID);
g_hLngResContainer = _LoadLanguageResources(g_iPrefLngLocID);
if (!g_hLngResContainer) // fallback en-US (1033)
{
g_hLngResContainer = g_hInstance;
if (langID != 1033) { bPrefLngNotAvail = true; }
if (g_iPrefLngLocID != 1033) { bPrefLngNotAvail = true; }
}
// ----------------------------------------------------

1
src/resource.h
View File

@ -178,7 +178,6 @@
#define ___SCI_CMD__SCEN_CHANGE___ 768
#define IDS_READONLY 10005
#define IDS_STATUS_DOCLINE 10006
#define IDS_STATUS_DOCCOLUMN 10007