diff options
| author | George Hazan <ghazan@miranda.im> | 2019-10-02 20:42:44 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-10-02 20:42:44 +0300 |
| commit | 7a948f1ef804ecd9971b0869e0591c22944fa6da (patch) | |
| tree | cdc2df2e2d5f186da4b8778b4e1c9e79013ff921 /plugins/HistoryPlusPlus | |
| parent | 9fe4e9044069e70b3f0e1df0e187f5ea43805ea1 (diff) | |
merge with SrmmLogContainer
Diffstat (limited to 'plugins/HistoryPlusPlus')
| -rw-r--r-- | plugins/HistoryPlusPlus/historypp.dpr | 8 | ||||
| -rw-r--r-- | plugins/HistoryPlusPlus/historypp.dproj | 32 | ||||
| -rw-r--r-- | plugins/HistoryPlusPlus/hpp_global.pas | 3 |
3 files changed, 25 insertions, 18 deletions
diff --git a/plugins/HistoryPlusPlus/historypp.dpr b/plugins/HistoryPlusPlus/historypp.dpr index a9843a5d2a..71841fb8bf 100644 --- a/plugins/HistoryPlusPlus/historypp.dpr +++ b/plugins/HistoryPlusPlus/historypp.dpr @@ -23,8 +23,6 @@ {.$RTTI EXPLICIT METHODS([]) PROPERTIES([]) FIELDS([])}
library historypp;
-{$IMAGEBASE $02630000}
-
{$R 'hpp_resource.res' 'hpp_resource.rc'}
{$R 'version.res'}
{$R 'hpp_opt_dialog.res' 'hpp_opt_dialog.rc'}
@@ -112,6 +110,9 @@ var HookMetaDefaultChanged,
HookPreshutdown: THandle;
+procedure RegisterHppLogger; stdcall; external AppDll;
+procedure UnregisterHppLogger; stdcall; external AppDll;
+
function OnModulesLoad(awParam:WPARAM; alParam:LPARAM):int; cdecl; forward;
function OnSettingsChanged(wParam: WPARAM; lParam: LPARAM): Integer; cdecl; forward;
function OnSmAddSettingsChanged(wParam: WPARAM; lParam: LPARAM): Integer; cdecl; forward;
@@ -499,6 +500,7 @@ function OnPreshutdown(wParam: WPARAM; lParam: LPARAM): Integer; cdecl; begin
Result := 0;
NotifyAllForms(HM_MIEV_PRESHUTDOWN,0,0);
+ UnregisterHppLogger;
end;
exports
@@ -509,6 +511,8 @@ exports begin
DisableThreadLibraryCalls(hInstance);
+ RegisterHppLogger;
+
PluginInfo.cbSize:= SizeOf(TPLUGININFOEX);
PluginInfo.shortName:= hppShortNameV;
PluginInfo.version:= hppVersion;
diff --git a/plugins/HistoryPlusPlus/historypp.dproj b/plugins/HistoryPlusPlus/historypp.dproj index fe85622dc8..4387bf178e 100644 --- a/plugins/HistoryPlusPlus/historypp.dproj +++ b/plugins/HistoryPlusPlus/historypp.dproj @@ -114,31 +114,31 @@ <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
<DCC_UnitSearchPath>..\..\include\delphi;..\..\plugins\ExternalAPI\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <DCC_BplOutput>..\..\bin15\Debug\Plugins\</DCC_BplOutput>
+ <DCC_BplOutput>..\..\bin16\Debug\Plugins\</DCC_BplOutput>
<BRCC_OutputDir>..\..\bin15\temp\res\</BRCC_OutputDir>
- <DCC_ExeOutput>..\..\bin15\Debug\Plugins\</DCC_ExeOutput>
+ <DCC_ExeOutput>..\..\bin16\Debug\Plugins\</DCC_ExeOutput>
<VerInfo_Locale>1033</VerInfo_Locale>
- <DCC_DcpOutput>..\..\bin15\Debug\Obj\hpp\</DCC_DcpOutput>
+ <DCC_DcpOutput>..\..\bin16\Debug\Obj\hpp\</DCC_DcpOutput>
<Manifest_File>None</Manifest_File>
- <DCC_DcuOutput>..\..\bin15\Debug\Obj\hpp\</DCC_DcuOutput>
+ <DCC_DcuOutput>..\..\bin16\Debug\Obj\hpp\</DCC_DcuOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
- <Debugger_CWD>D:\Myranda\bin15\Debug64</Debugger_CWD>
+ <Debugger_CWD>D:\Myranda\bin16\Debug64</Debugger_CWD>
<DCC_DebugDCUs>true</DCC_DebugDCUs>
- <Debugger_HostApplication>D:\Myranda\bin15\Debug64\Miranda64.exe</Debugger_HostApplication>
+ <Debugger_HostApplication>D:\Myranda\bin16\Debug64\Miranda64.exe</Debugger_HostApplication>
<BRCC_OutputDir>..\..\bin15\temp\res\</BRCC_OutputDir>
- <DCC_ExeOutput>..\..\bin15\Debug64\Plugins\</DCC_ExeOutput>
- <DCC_BplOutput>..\..\bin15\Debug64\Plugins\</DCC_BplOutput>
- <DCC_DcuOutput>..\..\bin15\Debug64\Obj\hpp\</DCC_DcuOutput>
- <DCC_DcpOutput>..\..\bin15\Debug64\Obj\hpp\</DCC_DcpOutput>
+ <DCC_ExeOutput>..\..\bin16\Debug64\Plugins\</DCC_ExeOutput>
+ <DCC_BplOutput>..\..\bin16\Debug64\Plugins\</DCC_BplOutput>
+ <DCC_DcuOutput>..\..\bin16\Debug64\Obj\hpp\</DCC_DcuOutput>
+ <DCC_DcpOutput>..\..\bin16\Debug64\Obj\hpp\</DCC_DcpOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
- <DCC_BplOutput>..\..\bin15\Debug\Plugins\</DCC_BplOutput>
- <DCC_ExeOutput>..\..\bin15\Debug\Plugins\</DCC_ExeOutput>
- <DCC_DcpOutput>..\..\bin15\Debug\Obj\hpp\</DCC_DcpOutput>
- <DCC_DcuOutput>..\..\bin15\Debug\Obj\hpp\</DCC_DcuOutput>
- <Debugger_CWD>W:\miranda-ng\bin15\Debug</Debugger_CWD>
- <Debugger_HostApplication>W:\miranda-ng\bin15\Debug\Miranda32.exe</Debugger_HostApplication>
+ <DCC_BplOutput>..\..\bin16\Debug\Plugins\</DCC_BplOutput>
+ <DCC_ExeOutput>..\..\bin16\Debug\Plugins\</DCC_ExeOutput>
+ <DCC_DcpOutput>..\..\bin16\Debug\Obj\hpp\</DCC_DcpOutput>
+ <DCC_DcuOutput>..\..\bin16\Debug\Obj\hpp\</DCC_DcuOutput>
+ <Debugger_CWD>W:\miranda-ng\bin16\Debug</Debugger_CWD>
+ <Debugger_HostApplication>W:\miranda-ng\bin16\Debug\Miranda32.exe</Debugger_HostApplication>
<DCC_DebugDCUs>true</DCC_DebugDCUs>
</PropertyGroup>
<ItemGroup>
diff --git a/plugins/HistoryPlusPlus/hpp_global.pas b/plugins/HistoryPlusPlus/hpp_global.pas index 38ae093051..9bae1efa3c 100644 --- a/plugins/HistoryPlusPlus/hpp_global.pas +++ b/plugins/HistoryPlusPlus/hpp_global.pas @@ -580,6 +580,9 @@ var begin
WSize := (Length(WideStr)+1)*SizeOf(WideChar);
if WSize = SizeOf(WideChar) then exit;
+ if CodePage = 1200 then
+ CodePage := CP_ACP;
+
AnsiStr := WideToAnsiString(WideStr,CodePage);
ASize := Length(AnsiStr)+1;
OpenClipboard(Handle);
|