# revisions: 33019,33125,33126

git-svn-id: branches/fixes_3_0@33766 -
This commit is contained in:
marco 2016-05-23 18:50:22 +00:00
parent 99a9e1fd62
commit bec1fe819d
7 changed files with 109 additions and 6 deletions

6
.gitattributes vendored
View File

@ -1924,8 +1924,6 @@ packages/fcl-base/examples/intl/restest.pb.po svneol=native#text/plain
packages/fcl-base/examples/intl/restest.ru.mo -text
packages/fcl-base/examples/intl/restest.ru.po svneol=native#text/plain
packages/fcl-base/examples/intl/resttest.po svneol=native#text/plain
packages/fcl-base/examples/ipcclient.pp svneol=native#text/plain
packages/fcl-base/examples/ipcserver.pp svneol=native#text/plain
packages/fcl-base/examples/isockcli.pp svneol=native#text/plain
packages/fcl-base/examples/isocksvr.pp svneol=native#text/plain
packages/fcl-base/examples/istream.pp svneol=native#text/plain
@ -2553,6 +2551,10 @@ packages/fcl-process/examples/demoproject.res -text
packages/fcl-process/examples/demoruncommand.lpi svneol=native#text/plain
packages/fcl-process/examples/demoruncommand.pp svneol=native#text/plain
packages/fcl-process/examples/echoparams.pp svneol=native#text/plain
packages/fcl-process/examples/ipcclient.lpi svneol=native#text/plain
packages/fcl-process/examples/ipcclient.pp svneol=native#text/plain
packages/fcl-process/examples/ipcserver.lpi svneol=native#text/plain
packages/fcl-process/examples/ipcserver.pp svneol=native#text/plain
packages/fcl-process/fpmake.pp svneol=native#text/plain
packages/fcl-process/src/amicommon/pipes.inc svneol=native#text/plain
packages/fcl-process/src/amicommon/process.inc svneol=native#text/plain

View File

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<General>
<Flags>
<MainUnitHasCreateFormStatements Value="False"/>
<MainUnitHasTitleStatement Value="False"/>
<UseDefaultCompilerOptions Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="ipcclient"/>
<UseAppBundle Value="False"/>
<ResourceType Value="res"/>
</General>
<i18n>
<EnableI18N LFM="False"/>
</i18n>
<VersionInfo>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="1">
<Item1 Name="Default" Default="True"/>
</BuildModes>
<PublishOptions>
<Version Value="2"/>
</PublishOptions>
<RunParams>
<local>
<FormatVersion Value="1"/>
</local>
</RunParams>
<Units Count="1">
<Unit0>
<Filename Value="ipcclient.pp"/>
<IsPartOfProject Value="True"/>
</Unit0>
</Units>
</ProjectOptions>
<CompilerOptions>
<Version Value="11"/>
<Target>
<Filename Value="ipcclient"/>
</Target>
<SearchPaths>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
</CompilerOptions>
</CONFIG>

View File

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<General>
<Flags>
<MainUnitHasCreateFormStatements Value="False"/>
<MainUnitHasTitleStatement Value="False"/>
<UseDefaultCompilerOptions Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="ipcserver"/>
<UseAppBundle Value="False"/>
<ResourceType Value="res"/>
</General>
<i18n>
<EnableI18N LFM="False"/>
</i18n>
<VersionInfo>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="1">
<Item1 Name="Default" Default="True"/>
</BuildModes>
<PublishOptions>
<Version Value="2"/>
</PublishOptions>
<RunParams>
<local>
<FormatVersion Value="1"/>
</local>
</RunParams>
<Units Count="1">
<Unit0>
<Filename Value="ipcserver.pp"/>
<IsPartOfProject Value="True"/>
</Unit0>
</Units>
</ProjectOptions>
<CompilerOptions>
<Version Value="11"/>
<Target>
<Filename Value="ipcserver"/>
</Target>
<SearchPaths>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
</CompilerOptions>
</CONFIG>

View File

@ -1,6 +1,6 @@
{$mode objfpc}
{$h+}
program ipccerver;
program ipcserver;
{$APPTYPE CONSOLE}

View File

@ -294,6 +294,7 @@ Var
B : Boolean;
begin
Inherited;
B:=FActive;
if B then
begin

View File

@ -190,7 +190,7 @@ end;
MsgWndProc
---------------------------------------------------------------------}
function MsgWndProc(Window: HWND; uMsg: UINT; wParam: WPARAM; lParam: LPARAM): LRESULT; stdcall;
function MsgWndProc(Window: HWND; uMsg: UINT; wParam: WPARAM; lParam: LPARAM): LRESULT; {$ifdef wince}cdecl;{$else}stdcall;{$endif}
Var
Server: TWinMsgServerComm;
Msg: TMsg;
@ -202,7 +202,7 @@ begin
// Post WM_USER to wake up GetMessage call.
PostMessage(Window, WM_USER, 0, 0);
// Read message data and add to message queue.
Server:=TWinMsgServerComm(GetWindowLongPtr(Window,GWL_USERDATA));
Server:=TWinMsgServerComm({$ifdef wince}GetWindowLong{$else}GetWindowLongPtr{$endif}(Window,GWL_USERDATA));
if Assigned(Server) then
begin
Msg.Message:=uMsg;
@ -246,7 +246,7 @@ begin
PWideChar(aWindowName), WS_POPUP {!0}, 0, 0, 0, 0, 0, 0, HInstance, nil);
if (Result=0) then
Owner.DoError(SErrFailedToCreateWindow,[aWindowName]);
SetWindowLongPtr(Result,GWL_USERDATA,PtrInt(Self));
{$ifdef wince}SetWindowLong{$else}SetWindowLongPtr{$endif}(Result,GWL_USERDATA,PtrInt(Self));
end;
constructor TWinMsgServerComm.Create(AOwner: TSimpleIPCServer);