重新提交

Author: Langji

Langji.Wke.CustomPage.pas

@@ -269,20 +269,20 @@ constructor TCustomWkePage.Create(AOwner: TComponent);
 
 destructor TCustomWkePage.Destroy;
 begin
+{
   try
     if Assigned(thewebview) then
       wkeDestroyWebWindow(thewebview);
-   // WkeFinalizeAndUnloadLib;
   except
-  end;
+  end;  }
   inherited;
 end;
 
 procedure TCustomWkePage.loaded;
 begin
   inherited;
-  if not (csDesigning in ComponentState) then
-    WkeLoadLibAndInit;
+//  if not (csDesigning in ComponentState) then
+//    WkeLoadLibAndInit;
 end;
 
 procedure TCustomWkePage.ShowWebPage;
@@ -629,10 +629,10 @@ function TWkePopupPage.GetSource: string;
 constructor TWkeGetSource.Create;
 begin
   Fwke := TWkePopupPage.Create(nil);
-  Fwke.WindowLeft :=-600;
-  Fwke.WindowTop :=- 480;
-  Fwke.WindowWidth :=600;
-  Fwke.WindowHeight :=480;
+  Fwke.WindowLeft := -600;
+  Fwke.WindowTop := -480;
+  Fwke.WindowWidth := 600;
+  Fwke.WindowHeight := 480;
   //FHeadless := false;
 end;
 
@@ -721,11 +721,15 @@ function GetSourceTextByWke(const Aurl: string; const AshowWindow, AHeadLess: Bo
 end;
 
 initialization
-  if DebugHook<>0 then
-  WkeLoadLibAndInit;
+  if DebugHook <> 0 then
+    WkeLoadLibAndInit;
+
 finalization
   if DebugHook <> 0 then
-  WkeFinalizeAndUnloadLib;
+  begin
+    if not wkeIsInDll then
+      WkeFinalizeAndUnloadLib;
+  end;
 
 end.
 

Langji.Wke.Reg.pas

@@ -5,6 +5,8 @@ interface
 
 procedure Register;
 
+{$R wkelogo.res}
+
 implementation
 
 procedure Register;

Langji.Wke.Webbrowser.pas

@@ -363,34 +363,23 @@ constructor TWkeWebBrowser.Create(AOwner: TComponent);
   FwkeUserAgent :=
     'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.1650.63 Safari/537.36 Langji.Wke 1.0';
   FPlatform := wp_Win32;
-
 end;
 
 destructor TWkeWebBrowser.Destroy;
 begin
-
-  if not Assigned(FwkeApp) then
+  if (not Assigned(FwkeApp)) and (not wkeIsInDll) then
   begin
-//    try
-//      if Assigned(thewebview) then
-//        wkeDestroyWebWindow(thewebview);
-//    except
-//
-//    end;
     if FIsmain then
       WkeFinalizeAndUnloadLib;
   end;
-
   inherited;
-
 end;
 
 procedure TWkeWebBrowser.CreateWindowHandle(const Params: TCreateParams);
 begin
   inherited;
   if (csDesigning in ComponentState) then
     exit;
-
   if not Assigned(FwkeApp) then
     Fismain := WkeLoadLibAndInit;
   if wkeLibHandle = 0 then
@@ -444,8 +433,8 @@ procedure TWkeWebBrowser.CreateWebView;
       wkeSetCookieJarPath(thewebview, PwideChar(FwkeCookiePath));
     wkeSetNavigationToNewWindowEnable(thewebview, FpopupEnabled);
 
-//    wkeset.mask := 4;
-//    wkeConfigure(@wkeset);
+    wkeset.mask := 4;
+    wkeConfigure(@wkeset);
     jsBindFunction('GetSource', DoGetSource, 1);
   end;
 end;
@@ -837,18 +826,15 @@ procedure TWkeWebBrowser.Stop;
 procedure TWkeWebBrowser.WM_SIZE(var msg: TMessage);
 begin
   inherited;
- // if Align = alClient then
-  begin
-    if Assigned(thewebview) then
-      thewebview.MoveWindow(0, 0, Width, Height);
-  end;
+  if Assigned(thewebview) then
+    thewebview.MoveWindow(0, 0, Width, Height);
+
 end;
 
 procedure TWkeWebBrowser.WndProc(var Msg: TMessage);
 var
   hndl: Hwnd;
 begin
-
   case Msg.Msg of
     WM_SETFOCUS:
       begin
@@ -883,7 +869,6 @@ destructor TWkeApp.Destroy;
   FWkeWebPages.Clear;
   FWkeWebPages.Free;
   WkeFinalizeAndUnloadLib;
-
   inherited;
 end;
 

Langji.Wke.lib.pas

@@ -10,6 +10,9 @@ interface
 var
   wkeLibHandle: THandle = 0;
   wkeLibFileName: string = 'wke.dll';
+  wkePluginDir:string ='';
+  wkeIsInDll:Boolean =false;
+
   wkeInitialize: procedure; cdecl;
   wkeInitializeEx: procedure(settings: PwkeSettings); cdecl;
   wkeConfigure: procedure(settings: PwkeSettings); cdecl;
@@ -293,6 +296,8 @@ function WkeLoadLibAndInit: boolean;
     if LoadWkeLibaraly() then
     begin
       wkeInitialize;
+      if wkePluginDir <>'' then       
+      wkeAddPluginDirectory(nil,PWideChar(WideString( wkePluginDir )) );
       result := true;
     end;
   end;

WkeForDelphi.dpk

@@ -25,6 +25,7 @@ package WkeForDelphi;
 {$IMAGEBASE $400000}
 {$DEFINE DEBUG}
 {$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'WKE FOR DELPHI BY LANGJI'}
 {$IMPLICITBUILD ON}
 
 requires