diff options
Diffstat (limited to 'src/mir_core')
| -rw-r--r-- | src/mir_core/langpack.cpp | 9 | ||||
| -rw-r--r-- | src/mir_core/mir_core_10.vcxproj | 1 | ||||
| -rw-r--r-- | src/mir_core/mir_core_10.vcxproj.filters | 3 | ||||
| -rw-r--r-- | src/mir_core/mir_core_11.vcxproj | 1 | ||||
| -rw-r--r-- | src/mir_core/mir_core_11.vcxproj.filters | 3 | ||||
| -rw-r--r-- | src/mir_core/miranda.cpp | 5 |
6 files changed, 17 insertions, 5 deletions
diff --git a/src/mir_core/langpack.cpp b/src/mir_core/langpack.cpp index c3644f8a28..9c14f3cba6 100644 --- a/src/mir_core/langpack.cpp +++ b/src/mir_core/langpack.cpp @@ -455,8 +455,7 @@ MIR_CORE_DLL(void) TranslateMenu_LP(HMENU hMenu, int hLangpack) {
MUUID *uuid = Langpack_LookupUuid(hLangpack);
- MENUITEMINFO mii;
- mii.cbSize = MENUITEMINFO_V4_SIZE;
+ MENUITEMINFO mii = { sizeof(mii) };
for (int i = GetMenuItemCount(hMenu)-1; i >= 0; i--) {
TCHAR str[256];
mii.fMask = MIIM_TYPE|MIIM_SUBMENU;
@@ -470,9 +469,11 @@ MIR_CORE_DLL(void) TranslateMenu_LP(HMENU hMenu, int hLangpack) mii.dwTypeData = result;
mii.fMask = MIIM_TYPE;
SetMenuItemInfo(hMenu, i, TRUE, &mii);
- } }
+ }
+ }
- if (mii.hSubMenu != NULL) TranslateMenu_LP(mii.hSubMenu, hLangpack);
+ if (mii.hSubMenu != NULL)
+ TranslateMenu_LP(mii.hSubMenu, hLangpack);
}
}
diff --git a/src/mir_core/mir_core_10.vcxproj b/src/mir_core/mir_core_10.vcxproj index cc805973b3..e253fd9a91 100644 --- a/src/mir_core/mir_core_10.vcxproj +++ b/src/mir_core/mir_core_10.vcxproj @@ -117,6 +117,7 @@ <ClCompile Include="threads.cpp" />
<ClCompile Include="utf.cpp" />
<ClCompile Include="utils.cpp" />
+ <ClCompile Include="winver.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>mir_core</ProjectName>
diff --git a/src/mir_core/mir_core_10.vcxproj.filters b/src/mir_core/mir_core_10.vcxproj.filters index b4fe537533..6d507a6724 100644 --- a/src/mir_core/mir_core_10.vcxproj.filters +++ b/src/mir_core/mir_core_10.vcxproj.filters @@ -103,6 +103,9 @@ <ClCompile Include="mstring.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="winver.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="commonheaders.h">
diff --git a/src/mir_core/mir_core_11.vcxproj b/src/mir_core/mir_core_11.vcxproj index 42572f7442..b92519ea8a 100644 --- a/src/mir_core/mir_core_11.vcxproj +++ b/src/mir_core/mir_core_11.vcxproj @@ -112,6 +112,7 @@ <ClCompile Include="threads.cpp" />
<ClCompile Include="utf.cpp" />
<ClCompile Include="utils.cpp" />
+ <ClCompile Include="winver.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>mir_core</ProjectName>
diff --git a/src/mir_core/mir_core_11.vcxproj.filters b/src/mir_core/mir_core_11.vcxproj.filters index 0b660b44ed..e0db98f859 100644 --- a/src/mir_core/mir_core_11.vcxproj.filters +++ b/src/mir_core/mir_core_11.vcxproj.filters @@ -100,6 +100,9 @@ <ClCompile Include="mstring.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="winver.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="commonheaders.h">
diff --git a/src/mir_core/miranda.cpp b/src/mir_core/miranda.cpp index 103801995b..9ee5ed2b1a 100644 --- a/src/mir_core/miranda.cpp +++ b/src/mir_core/miranda.cpp @@ -33,6 +33,8 @@ void CheckLogs(); void InitLogs();
void UninitLogs();
+void InitWinver();
+
int hLangpack = 0;
HINSTANCE hInst = 0;
@@ -67,7 +69,7 @@ static void LoadCoreModule(void) icce.dwICC = ICC_WIN95_CLASSES | ICC_USEREX_CLASSES;
InitCommonControlsEx(&icce);
- hAPCWindow=CreateWindowEx(0, _T("ComboLBox"), NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
+ hAPCWindow = CreateWindowEx(0, _T("ComboLBox"), NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
SetClassLongPtr(hAPCWindow, GCL_STYLE, GetClassLongPtr(hAPCWindow, GCL_STYLE) | CS_DROPSHADOW);
DestroyWindow(hAPCWindow);
hAPCWindow = NULL;
@@ -85,6 +87,7 @@ static void LoadCoreModule(void) #endif
RecalculateTime = (void (*)()) GetProcAddress(mirInst, "RecalculateTime");
+ InitWinver();
InitPathUtils();
InitLogs();
InitialiseModularEngine();
|