paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 02:49:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix for Mantis #35964: reestablish pre r42594 behavior for WinCE as at least Windows Mobile does not support the required COM functions

Browse Source 
Note: in theory Windows CE *can* support these functions, but it dependends on the provider whether they're indeed supported (e.g. Windows Mobile does not). Probably this should be revisited once we support the "delayed" directive.

git-svn-id: trunk@42696 -
This commit is contained in:
svenbarth 2019-08-15 11:41:36 +00:00
parent 03cd0cce59
commit aa0422b2ed
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/winunits-base/src/comobj.pp
View File

@ -946,8 +946,13 @@ implementation
if printcom then if printcom then
WriteLn('LockServer: ', fLock); WriteLn('LockServer: ', fLock);
{$endif} {$endif}
{$ifndef wince}
Result := CoLockObjectExternal(Self, fLock, True); Result := CoLockObjectExternal(Self, fLock, True);
ComServer.CountObject(fLock); ComServer.CountObject(fLock);
{$else}
RunError(217);
Result:=0;
{$endif}
end; end;
@ -1018,7 +1023,9 @@ implementation
destructor TComObjectFactory.Destroy; destructor TComObjectFactory.Destroy;
begin begin
{$ifndef wince}
if fIsRegistered <> dword(-1) then CoRevokeClassObject(fIsRegistered); if fIsRegistered <> dword(-1) then CoRevokeClassObject(fIsRegistered);
{$endif}
ComClassManager.RemoveObjectFactory(Self); ComClassManager.RemoveObjectFactory(Self);
end; end;
@ -1050,9 +1057,13 @@ implementation
if printcom then if printcom then
WriteLn('TComObjectFactory.RegisterClassObject'); WriteLn('TComObjectFactory.RegisterClassObject');
{$endif} {$endif}
{$ifndef wince}
if FInstancing <> ciInternal then if FInstancing <> ciInternal then
OleCheck(CoRegisterClassObject(FClassID, Self, CLSCTX_LOCAL_SERVER, OleCheck(CoRegisterClassObject(FClassID, Self, CLSCTX_LOCAL_SERVER,
reg_flags(), @FIsRegistered)); reg_flags(), @FIsRegistered));
{$else}
RunError(217);
{$endif}
end; end;