WebSVN – userdetect2 – Diff – /trunk/UserDetect2/UD2_Obj.pas

   TUD2IdentificationEntry = class;
   TUD2Plugin = class(TObject)
   protected
     FDetectedIdentifications: TObjectList{<TUD2IdentificationEntry>};
+    FOSNotSupportedEnforced: boolean;
+    FPluginDLL: string;
+    FPluginGUIDSet: boolean;
+    FPluginGUID: TGUID;
+    FPluginName: WideString;
+    FPluginVendor: WideString;
+    FPluginVersion: WideString;
+    FIdentificationMethodName: WideString;
+    FAcceptsDynamicRequests: boolean;
+    FIdentificationProcedureStatusCode: UD2_STATUS;
+    FIdentificationProcedureStatusCodeDescribed: WideString;
+    FLoadingTime: Cardinal;
   public
     // This flag will be set if "AutoOSNotSupportedCompatibility" of the INI manifest had to be enforced/used
-    OSNotSupportedEnforced: boolean;
+    property OSNotSupportedEnforced: boolean read FOSNotSupportedEnforced;
-    // TODO: this stuff should be read-only...
+    // Data read from the DLL
-    PluginDLL: string;
+    property PluginDLL: string read FPluginDLL;
+    property PluginGUIDSet: boolean read FPluginGUIDSet;
-    PluginGUID: TGUID;
+    property PluginGUID: TGUID read FPluginGUID;
-    PluginName: WideString;
+    property PluginName: WideString read FPluginName;
-    PluginVendor: WideString;
+    property PluginVendor: WideString read FPluginVendor;
-    PluginVersion: WideString;
+    property PluginVersion: WideString read FPluginVersion;
-    IdentificationMethodName: WideString;
+    property IdentificationMethodName: WideString read FIdentificationMethodName;
-    AcceptsDynamicRequests: boolean;
+    property AcceptsDynamicRequests: boolean read FAcceptsDynamicRequests;
     // ONLY contains the non-failure status code of IdentificationStringW
-    IdentificationProcedureStatusCode: UD2_STATUS;
+    property IdentificationProcedureStatusCode: UD2_STATUS read FIdentificationProcedureStatusCode;
-    IdentificationProcedureStatusCodeDescribed: WideString;
+    property IdentificationProcedureStatusCodeDescribed: WideString read FIdentificationProcedureStatusCodeDescribed;
+    // How long did the plugin to load?
+    property LoadingTime: Cardinal read FLoadingTime;
-    Time: Cardinal;
     function PluginGUIDString: string;
     property DetectedIdentifications: TObjectList{<TUD2IdentificationEntry>} read FDetectedIdentifications;
     destructor Destroy; override;
     constructor Create;
     function AddIdentification(IdStr: WideString): TUD2IdentificationEntry;
-    function InvokeDynamicCheck(dynamicData: string; var outIDs: TArrayOfString): boolean; overload;
+    function InvokeDynamicCheck(dynamicData: WideString; var outIDs: TArrayOfString): boolean; overload;
-    function InvokeDynamicCheck(dynamicData: string): boolean; overload;
+    function InvokeDynamicCheck(dynamicData: WideString): boolean; overload;
-    function GetDynamicRequestResult(dynamicData: string): TArrayOfString;
+    function GetDynamicRequestResult(dynamicData: WideString): TArrayOfString;
     function EqualsMethodNameOrGuid(idMethodNameOrGUID: string): boolean;
   end;
   TUD2IdentificationEntry = class(TObject)
   private
     FIdentificationString: WideString;
     FPlugin: TUD2Plugin;
     FDynamicDataUsed: boolean;
-    FDynamicData: string;
+    FDynamicData: WideString;
   public
     property DynamicDataUsed: boolean read FDynamicDataUsed write FDynamicDataUsed;
-    property DynamicData: string read FDynamicData write FDynamicData;
+    property DynamicData: WideString read FDynamicData write FDynamicData;
     property IdentificationString: WideString read FIdentificationString;
     property Plugin: TUD2Plugin read FPlugin;
     procedure GetIdNames(sl: TStrings);
     constructor Create(AIdentificationString: WideString; APlugin: TUD2Plugin);
   end;
     useDynamicData: boolean;
     dynamicData: WideString;
     procedure Execute; override;
     function HandleDLL: boolean;
   public
-    pl: TUD2Plugin; // TODO: why do we need it?! can it be leaked if we use it for dynamic requests?
+    pl: TUD2Plugin;
     Errors: TStringList;
     ResultIdentifiers: TArrayOfString;
     constructor Create(Suspended: boolean; DLL: string; alngid: LANGID; useDynamicData: boolean; dynamicData: WideString);
     destructor Destroy; override;
   end;
 { TUD2Plugin }
 function TUD2Plugin.PluginGUIDString: string;
 begin
+  if PluginGUIDSet then
-  result := UpperCase(GUIDToString(PluginGUID));
+    result := UpperCase(GUIDToString(PluginGUID))
+  else
+    result := '';
 end;
 function TUD2Plugin.AddIdentification(IdStr: WideString): TUD2IdentificationEntry;
 begin
   result := TUD2IdentificationEntry.Create(IdStr, Self);
 begin
   inherited Create;
   FDetectedIdentifications := TObjectList{<TUD2IdentificationEntry>}.Create(true);
 end;
-function TUD2Plugin.InvokeDynamicCheck(dynamicData: string; var outIDs: TArrayOfString): boolean;
+function TUD2Plugin.InvokeDynamicCheck(dynamicData: WideString; var outIDs: TArrayOfString): boolean;
 var
   ude: TUD2IdentificationEntry;
   i: integer;
   id: string;
   l: integer;
     result := true;
   end;
 end;
-function TUD2Plugin.GetDynamicRequestResult(dynamicData: string): TArrayOfString;
+function TUD2Plugin.GetDynamicRequestResult(dynamicData: WideString): TArrayOfString;
 var
   lngID: LANGID;
   pll: TUD2PluginLoader;
 begin
   lngID := GetSystemDefaultLangID;
   pll := TUD2PluginLoader.Create(false, PluginDLL, lngid, true, dynamicData);
   try
     pll.WaitFor;
     result := pll.ResultIdentifiers;
+    if Assigned(pll.pl) then FreeAndNil(pll.pl);
   finally
     pll.Free;
   end;
 end;
 begin
   result := SameText(IdentificationMethodName, idMethodNameOrGUID) or
             SameText(GUIDToString(PluginGUID), idMethodNameOrGUID)
 end;
-function TUD2Plugin.InvokeDynamicCheck(dynamicData: string): boolean;
+function TUD2Plugin.InvokeDynamicCheck(dynamicData: WideString): boolean;
 var
   dummy: TArrayOfString;
 begin
   result := InvokeDynamicCheck(dynamicData, dummy)
 end;
 procedure TUD2.HandlePluginDir(APluginDir, AFileMask: string);
 Var
   SR: TSearchRec;
   path: string;
   pluginLoader: TUD2PluginLoader;
-  tob: TObjectList;
+  tob: TObjectList{<TUD2PluginLoader>};
   i: integer;
   {$IFDEF CHECK_FOR_SAME_PLUGIN_GUID}
   sPluginID, prevDLL: string;
   {$ENDIF}
   lngid: LANGID;
 resourcestring
   LNG_PLUGINS_SAME_GUID = 'Attention: The plugin "%s" and the plugin "%s" have the same identification GUID. The latter will not be loaded.';
 begin
-  tob := TObjectList.Create;
+  tob := TObjectList{<TUD2PluginLoader>}.Create;
   try
     tob.OwnsObjects := false;
     lngID := GetSystemDefaultLangID;
     for i := 0 to tob.count-1 do
     begin
       pluginLoader := tob.items[i] as TUD2PluginLoader;
       pluginLoader.WaitFor;
       Errors.AddStrings(pluginLoader.Errors);
-      {$IFDEF CHECK_FOR_SAME_PLUGIN_GUID}
       if Assigned(pluginLoader.pl) then
       begin
+        {$IFDEF CHECK_FOR_SAME_PLUGIN_GUID}
-        if not pluginLoader.pl.OSNotSupportedEnforced then
+        if pluginLoader.pl.PluginGUIDSet then
         begin
           sPluginID := GUIDToString(pluginLoader.pl.PluginGUID);
           prevDLL := FGUIDLookup.Values[sPluginID];
           if (prevDLL <> '') and (prevDLL <> pluginLoader.pl.PluginDLL) then
           begin
           else
           begin
             FGUIDLookup.Values[sPluginID] := pluginLoader.pl.PluginDLL;
             LoadedPlugins.Add(pluginLoader.pl);
           end;
+        end
+        else
+        begin
+          LoadedPlugins.Add(pluginLoader.pl);
         end;
-      end;
+        {$ELSE}
+        LoadedPlugins.Add(pluginLoader.pl);
-      {$ENDIF}
+        {$ENDIF}
+      end;
       pluginLoader.Free;
     end;
   finally
     tob.free;
   end;
 function TUD2.TaskExists(ShortTaskName: string): boolean;
 begin
   result := FIniFile.SectionExists(ShortTaskName);
 end;
-function TUD2.ReadMetatagString(ShortTaskName, MetatagName: string;
+function TUD2.ReadMetatagString(ShortTaskName, MetatagName: string; DefaultVal: string): string;
-  DefaultVal: string): string;
 begin
   result := IniFile.ReadString(ShortTaskName, MetatagName, DefaultVal);
 end;
-function TUD2.ReadMetatagBool(ShortTaskName, MetatagName: string;
+function TUD2.ReadMetatagBool(ShortTaskName, MetatagName: string; DefaultVal: string): boolean;
-  DefaultVal: string): boolean;
 begin
   // DefaultVal is a string, because we want to allow an empty string, in case the
   // user wishes an Exception in case the string is not a valid boolean string
   result := BetterInterpreteBool(IniFile.ReadString(ShortTaskName, MetatagName, DefaultVal));
 end;
       iniConfig := TIniFile.Create(sPluginConfigFile);
       try
         sOverrideGUID := iniConfig.ReadString('Compatibility', 'OverrideGUID', '');
         if sOverrideGUID <> '' then
         begin
+          pl.FPluginGUIDSet := true;
-          pl.PluginGUID := StringToGUID(sOverrideGUID);
+          pl.FPluginGUID := StringToGUID(sOverrideGUID);
           result := true;
         end;
       finally
         iniConfig.Free;
       end;
   end;
   procedure _OverwriteStatusToOSNotSupported;
   begin
     pl := TUD2Plugin.Create;
-    pl.PluginDLL := dllFile;
+    pl.FPluginDLL := dllFile;
     statusCode := UD2_STATUS_NOTAVAIL_OS_NOT_SUPPORTED;
-    pl.IdentificationProcedureStatusCode := statusCode;
+    pl.FIdentificationProcedureStatusCode := statusCode;
-    pl.IdentificationProcedureStatusCodeDescribed := _ErrorLookup(statusCode);
+    pl.FIdentificationProcedureStatusCodeDescribed := _ErrorLookup(statusCode);
-    (*
-    if not _ApplyCompatibilityGUID then
-    begin
-      CreateGUID(pl.PluginGUID); // to avoid the "double GUID" error
-    end;
-    *)
-    pl.OSNotSupportedEnforced := true; // to avoid the "double GUID" error
+    pl.FOSNotSupportedEnforced := true;
     result := true;
   end;
 resourcestring
   LNG_DLL_NOT_LOADED = 'Plugin DLL "%s" could not be loaded: %s';
           Errors.Add(Format(LNG_INVALID_PLUGIN, [dllFile]));
           Exit;
         end;
         pl := TUD2Plugin.Create;
-        pl.PluginDLL := dllFile;
+        pl.FPluginDLL := dllFile;
         @fDynamicIdentificationStringW := GetProcAddress(dllHandle, mnDynamicIdentificationStringW);
-        pl.AcceptsDynamicRequests := Assigned(fDynamicIdentificationStringW);
+        pl.FAcceptsDynamicRequests := Assigned(fDynamicIdentificationStringW);
         fIdentificationStringW := nil;
         if useDynamicData then
         begin
           if not pl.AcceptsDynamicRequests then
           begin
             // TODO xxx: Darf hier ein fataler Fehler entstehen, obwohl dieses Szenario nur durch die INI file auftreten kann?
-            // TODO (allgemein): In der Modulübersicht soll auch gezeigt werden, ob dieses Modul dynamischen Content erlaubt.
             // TODO (allgemein): doku
             Errors.Add(Format(LNG_METHOD_NOT_FOUND, [mnDynamicIdentificationStringW, dllFile]));
             Exit;
           end;
         end
           if not Assigned(fPluginIdentifier) then
           begin
             Errors.Add(Format(LNG_METHOD_NOT_FOUND, [mnPluginIdentifier, dllFile]));
             Exit;
           end;
+          pl.FPluginGUIDSet := true;
-          pl.PluginGUID := fPluginIdentifier();
+          pl.FPluginGUID := fPluginIdentifier();
         end;
         statusCode := fCheckLicense(nil);
         if statusCode.wCategory = UD2_STATUSCAT_FAILED then
         begin
           Exit;
         end;
         ZeroMemory(@buf, cchBufferSize);
         statusCode := fPluginNameW(@buf, cchBufferSize, lngID);
-             if statusCode.wCategory = UD2_STATUSCAT_SUCCESS   then pl.PluginName := PWideChar(@buf)
+             if statusCode.wCategory = UD2_STATUSCAT_SUCCESS   then pl.FPluginName := PWideChar(@buf)
-        else if statusCode.wCategory = UD2_STATUSCAT_NOT_AVAIL then pl.PluginName := ''
+        else if statusCode.wCategory = UD2_STATUSCAT_NOT_AVAIL then pl.FPluginName := ''
         else
         begin
           Errors.Add(Format(LNG_METHOD_FAILURE, [_ErrorLookup(statusCode), mnPluginNameW, dllFile]));
           Exit;
         end;
         ZeroMemory(@buf, cchBufferSize);
         statusCode := fPluginVendorW(@buf, cchBufferSize, lngID);
-             if statusCode.wCategory = UD2_STATUSCAT_SUCCESS   then pl.PluginVendor := PWideChar(@buf)
+             if statusCode.wCategory = UD2_STATUSCAT_SUCCESS   then pl.FPluginVendor := PWideChar(@buf)
-        else if statusCode.wCategory = UD2_STATUSCAT_NOT_AVAIL then pl.PluginVendor := ''
+        else if statusCode.wCategory = UD2_STATUSCAT_NOT_AVAIL then pl.FPluginVendor := ''
         else
         begin
           Errors.Add(Format(LNG_METHOD_FAILURE, [_ErrorLookup(statusCode), mnPluginVendorW, dllFile]));
           Exit;
         end;
         ZeroMemory(@buf, cchBufferSize);
         statusCode := fPluginVersionW(@buf, cchBufferSize, lngID);
-             if statusCode.wCategory = UD2_STATUSCAT_SUCCESS   then pl.PluginVersion := PWideChar(@buf)
+             if statusCode.wCategory = UD2_STATUSCAT_SUCCESS   then pl.FPluginVersion := PWideChar(@buf)
-        else if statusCode.wCategory = UD2_STATUSCAT_NOT_AVAIL then pl.PluginVersion := ''
+        else if statusCode.wCategory = UD2_STATUSCAT_NOT_AVAIL then pl.FPluginVersion := ''
         else
         begin
           Errors.Add(Format(LNG_METHOD_FAILURE, [_ErrorLookup(statusCode), mnPluginVersionW, dllFile]));
           Exit;
         end;
         ZeroMemory(@buf, cchBufferSize);
         statusCode := fIdentificationMethodNameW(@buf, cchBufferSize);
-             if statusCode.wCategory = UD2_STATUSCAT_SUCCESS   then pl.IdentificationMethodName := PWideChar(@buf)
+             if statusCode.wCategory = UD2_STATUSCAT_SUCCESS   then pl.FIdentificationMethodName := PWideChar(@buf)
-        else if statusCode.wCategory = UD2_STATUSCAT_NOT_AVAIL then pl.IdentificationMethodName := ''
+        else if statusCode.wCategory = UD2_STATUSCAT_NOT_AVAIL then pl.FIdentificationMethodName := ''
         else
         begin
           Errors.Add(Format(LNG_METHOD_FAILURE, [_ErrorLookup(statusCode), mnIdentificationMethodNameW, dllFile]));
           Exit;
         end;
         end
         else
         begin
           statusCode := fIdentificationStringW(@buf, cchBufferSize);
         end;
-        pl.IdentificationProcedureStatusCode := statusCode;
+        pl.FIdentificationProcedureStatusCode := statusCode;
-        pl.IdentificationProcedureStatusCodeDescribed := _ErrorLookup(statusCode);
+        pl.FIdentificationProcedureStatusCodeDescribed := _ErrorLookup(statusCode);
         if statusCode.wCategory = UD2_STATUSCAT_SUCCESS then
         begin
           sIdentifier := PWideChar(@buf);
           if UD2_STATUS_Equal(statusCode, UD2_STATUS_OK_MULTILINE, false) then
           begin
       if result then
       begin
         endtime := GetTickCount;
         time := endtime - starttime;
         if endtime < starttime then time := High(Cardinal) - time;
-        pl.time := time;
+        pl.FLoadingTime := time;
       end;
     end;
   except
     // TODO: when an exception happens in a cdecl DLL, then this code is somehow not
     // executed. Probably the memory is corrupted. Anyway, a cdecl DLL shall NEVER

Subversion Repositories userdetect2

userdetect2/trunk/UserDetect2/UD2_Obj.pas – Rev 86 → 87