diff options
| -rw-r--r-- | plugins/UserInfoEx/src/dlg_propsheet.cpp | 4 | ||||
| -rw-r--r-- | src/mir_core/mir_core_10.vcxproj | 4 | ||||
| -rw-r--r-- | src/mir_core/mir_core_12.vcxproj | 4 | ||||
| -rw-r--r-- | src/mir_core/src/commonheaders.h | 1 | ||||
| -rw-r--r-- | src/mir_core/src/icons.cpp | 4 | ||||
| -rw-r--r-- | src/mir_core/src/protos.cpp | 2 |
6 files changed, 14 insertions, 5 deletions
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index cda3ae98e7..a8d286eeed 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -715,8 +715,8 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar ShowWindow(GetDlgItem(hDlg, IDC_PAGETITLEBG2), !IsAeroMode());
// set icons
- SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon(ICO_COMMON_MAIN));
- SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIcon(ICO_COMMON_MAIN, 32));
+ SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon(ICO_COMMON_MAIN, false));
+ SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIcon(ICO_COMMON_MAIN, true));
DlgProc(hDlg, HM_RELOADICONS, NULL, NULL);
// load basic protocol for current contact (for faster load later on and better handling for owner protocol)
diff --git a/src/mir_core/mir_core_10.vcxproj b/src/mir_core/mir_core_10.vcxproj index df30bc9e90..ce4eb74f8c 100644 --- a/src/mir_core/mir_core_10.vcxproj +++ b/src/mir_core/mir_core_10.vcxproj @@ -175,6 +175,7 @@ <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>
+ <DelayLoadDLLs>mir_app.dll</DelayLoadDLLs>
</Link>
<CustomBuildStep>
<Command>
@@ -214,6 +215,7 @@ <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>
+ <DelayLoadDLLs>mir_app.dll</DelayLoadDLLs>
</Link>
<PreBuildEvent>
<Command>..\..\build\make_ver.bat</Command>
@@ -248,6 +250,7 @@ <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<AdditionalOptions>/PDBALTPATH:%_PDB% /ignore:4197</AdditionalOptions>
+ <DelayLoadDLLs>mir_app.dll</DelayLoadDLLs>
</Link>
<CustomBuildStep>
<Command>
@@ -290,6 +293,7 @@ <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<AdditionalOptions>/PDBALTPATH:%_PDB% /ignore:4197</AdditionalOptions>
+ <DelayLoadDLLs>mir_app.dll</DelayLoadDLLs>
</Link>
<PreBuildEvent>
<Command>..\..\build\make_ver.bat</Command>
diff --git a/src/mir_core/mir_core_12.vcxproj b/src/mir_core/mir_core_12.vcxproj index 1892d9c52f..a83072c7fd 100644 --- a/src/mir_core/mir_core_12.vcxproj +++ b/src/mir_core/mir_core_12.vcxproj @@ -184,6 +184,7 @@ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>
+ <DelayLoadDLLs>mir_app.dll</DelayLoadDLLs>
</Link>
<CustomBuildStep>
<Command>
@@ -223,6 +224,7 @@ <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>
+ <DelayLoadDLLs>mir_app.dll</DelayLoadDLLs>
</Link>
<PreBuildEvent>
<Command>..\..\build\make_ver.bat</Command>
@@ -257,6 +259,7 @@ <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>
+ <DelayLoadDLLs>mir_app.dll</DelayLoadDLLs>
</Link>
<CustomBuildStep>
<Command>
@@ -299,6 +302,7 @@ <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>
+ <DelayLoadDLLs>mir_app.dll</DelayLoadDLLs>
</Link>
<PreBuildEvent>
<Command>..\..\build\make_ver.bat</Command>
diff --git a/src/mir_core/src/commonheaders.h b/src/mir_core/src/commonheaders.h index f5497075a2..7bc862bfa0 100644 --- a/src/mir_core/src/commonheaders.h +++ b/src/mir_core/src/commonheaders.h @@ -57,6 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_protomod.h>
#include <m_protoint.h>
#include <m_skin.h>
+#include <m_icolib.h>
#include <m_netlib.h>
#include "miranda.h"
diff --git a/src/mir_core/src/icons.cpp b/src/mir_core/src/icons.cpp index fe3bb37319..cd85f31b06 100644 --- a/src/mir_core/src/icons.cpp +++ b/src/mir_core/src/icons.cpp @@ -46,7 +46,7 @@ MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char *szSection, IconIte sid.cx = sid.cy = pIcons[i].size;
sid.description.a = pIcons[i].szDescr;
sid.iDefaultIndex = -pIcons[i].defIconID;
- pIcons[i].hIcolib = (HANDLE)CallService("Skin2/Icons/AddIcon", hLangpack, (LPARAM)&sid);
+ pIcons[i].hIcolib = IcoLib_AddIcon(&sid, hLangpack);
}
}
@@ -71,6 +71,6 @@ MIR_CORE_DLL(void) Icon_RegisterT(HINSTANCE hInst, const TCHAR *szSection, IconI sid.cx = sid.cy = pIcons[i].size;
sid.description.t = pIcons[i].tszDescr;
sid.iDefaultIndex = -pIcons[i].defIconID;
- pIcons[i].hIcolib = (HANDLE)CallService("Skin2/Icons/AddIcon", hLangpack, (LPARAM)&sid);
+ pIcons[i].hIcolib = IcoLib_AddIcon(&sid, hLangpack);
}
}
diff --git a/src/mir_core/src/protos.cpp b/src/mir_core/src/protos.cpp index 051e5a9792..d643a811f4 100644 --- a/src/mir_core/src/protos.cpp +++ b/src/mir_core/src/protos.cpp @@ -104,7 +104,7 @@ MIR_CORE_DLL(void) ProtoConstructor(PROTO_INTERFACE *pThis, LPCSTR pszModuleName pThis->m_iVersion = 2;
pThis->m_iStatus = pThis->m_iDesiredStatus = ID_STATUS_OFFLINE;
pThis->m_szModuleName = mir_strdup(pszModuleName);
- pThis->m_hProtoIcon = (HANDLE)CallService("Skin2/Icons/IsManaged", (WPARAM)LoadSkinnedProtoIcon(pszModuleName, ID_STATUS_ONLINE), 0);
+ pThis->m_hProtoIcon = IcoLib_IsManaged(LoadSkinnedProtoIcon(pszModuleName, ID_STATUS_ONLINE));
pThis->m_tszUserName = mir_tstrdup(ptszUserName);
}
|