Fixed structures

Added requestid to loaded handled

Author: trueromanus

src/EmptyFlow.SciterAPI/Client/SciterAPIGlobalCallbacks.cs

@@ -19,7 +19,7 @@ public class SciterAPIGlobalCallbacks {
 		private Dictionary<string, Func<string, byte[]>> m_protocolHandlers = new Dictionary<string, Func<string, byte[]>> ();
 
 		[DynamicDependency ( DynamicallyAccessedMemberTypes.All, typeof ( SciterAPIGlobalCallbacks ) )]
-		private Action<string, uint, uint> m_loadedDataAction;
+		private Action<string, uint, uint, nint> m_loadedDataAction;
 
 		[DynamicDependency ( DynamicallyAccessedMemberTypes.All, typeof ( SciterAPIGlobalCallbacks ) )]
 		private Action m_engineDestroyedAction;
@@ -48,7 +48,7 @@ public SciterAPIGlobalCallbacks ( SciterAPIHost host ) {
 			m_sciterHostCallback = SciterHostCallback;
 		}
 
-		public Action<string, uint, uint> LoadedDataAction {
+		public Action<string, uint, uint, nint> LoadedDataAction {
 			get => m_loadedDataAction;
 			set => m_loadedDataAction = value;
 		}
@@ -113,7 +113,7 @@ private uint SciterHostCallback ( IntPtr pns, IntPtr callbackParam ) {
 					return OnLoadData ( loadDataStructure );
 				case SciterCallbackNotificationCode.SC_DATA_LOADED:
 					var loadedDataStructure = Marshal.PtrToStructure<SciterCallbackNotificationLoadedData> ( pns );
-					m_loadedDataAction ( loadedDataStructure.uri, loadedDataStructure.status, loadedDataStructure.dataSize );
+					m_loadedDataAction ( loadedDataStructure.uri, loadedDataStructure.status, loadedDataStructure.dataSize, loadedDataStructure.requestId );
 					return 0;
 				case SciterCallbackNotificationCode.SC_ATTACH_BEHAVIOR:
 					var behaviourStructure = Marshal.PtrToStructure<SciterCallbackNotificationAttachBehaviour> ( pns );
@@ -157,8 +157,8 @@ private uint OnLoadData ( SciterCallbackNotificationLoadData loadDataStruct ) {
 			return (uint) LoadDataReturnCode.LOAD_OK; // in this case we don't need override load something
 		}
 
-		private void EmptyLoadedDataAction ( string uri, uint status, uint dataSize ) {
-			Console.WriteLine ( $"{uri} - {status}({dataSize})" );
+		private void EmptyLoadedDataAction ( string uri, uint status, uint dataSize, nint request ) {
+			Console.WriteLine ( $"{uri}, size: {dataSize}" );
 		}
 
 		private void EmptyAction () {

src/EmptyFlow.SciterAPI/Client/SciterAPIHost.cs

@@ -195,9 +195,15 @@ public void PrepareRequestApi () {
 			m_requestApi = Marshal.PtrToStructure<RequestApiStruct> ( pointer );
 		}
 
+		public void Initialization () {
+			m_basicApi.SciterExec ( ApplicationCommand.SCITER_APP_INIT, nint.Zero, nint.Zero );
+		}
+
 		public int Process () {
 			if (m_mainWindow != nint.Zero) ShowWindow ( m_mainWindow );
 
+			Initialization ();
+
 			// run loop for waiting close all windows
 			var code = m_basicApi.SciterExec ( ApplicationCommand.SCITER_APP_LOOP, nint.Zero, nint.Zero );
 

src/EmptyFlow.SciterAPI/EmptyFlow.SciterAPI.csproj

@@ -21,22 +21,9 @@
 		<Version>1.2.6.0</Version>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 		<PackageReleaseNotes>
-			SciterAPIHost.GetNodeType get node type
-			SciterAPIHost.GetNodeText get node text
-			SciterAPIHost.SetNodeText set node text
-			SciterAPIHost.NodeParent get node parent
-			SciterAPIHost.NodeNthChild get nth child of node
-			SciterAPIHost.NodeChildrenCount get children count
-			SciterAPIHost.NodeCastFromElement cast element to node
-			SciterAPIHost.NodeCastToElement cast node to element
-			SciterAPIHost.NodeInsert insert node to another node
-			SciterAPIHost.NodeCreateTextNode create text node
-			SciterAPIHost.NodeCreateCommentNode create comment node
-			SciterValue.ToBoolean convert to C# boolean value
-			From many methods Graphics API removed redundant check
-			SciterAPIHost.GraphicsPath create path
-			SciterAPIHost.GraphicsDrawPath draw path
-			SciterAPIHost.GraphicsFillMode set fill mode
+			SciterAPIHost.Initialization for run initialization
+			SciterCallbackNotificationLoadedData fix structure
+			SciterCallbackNotificationLoadData fix structure
 		</PackageReleaseNotes>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>

src/EmptyFlow.SciterAPI/Structs/SciterCallbackNotificationLoadData.cs

@@ -1,17 +1,18 @@
 using System.Runtime.InteropServices;
 
 namespace EmptyFlow.SciterAPI {
-    [StructLayout ( LayoutKind.Sequential )]
-    public struct SciterCallbackNotificationLoadData { // original name LPSCN_LOAD_DATA
-        public SciterCallbackNotificationCode code;
-        public IntPtr hwnd; /**< [in] HWINDOW of the window this callback was attached to.*/
-        [MarshalAs ( UnmanagedType.LPWStr )] public string uri; // [in] Zero terminated string, fully qualified uri, for example "http://server/folder/file.ext".*/
-        IntPtr outData; // [in,out] pointer to loaded data to return. if data exists in the cache then this field contain pointer to it
-        uint outDataSize; // [in,out] loaded data size to return.
-        uint dataType; // [in] SciterResourceType
-        IntPtr requestId; // [in] request handle that can be used with sciter-x-request API */
-        IntPtr principal; // Element
-        IntPtr initiator; // Initiator
-    }
+
+	[StructLayout ( LayoutKind.Sequential )]
+	public struct SciterCallbackNotificationLoadData { // original name LPSCN_LOAD_DATA
+		public SciterCallbackNotificationCode code;
+		public nint hwnd; /**< [in] HWINDOW of the window this callback was attached to.*/
+		[MarshalAs ( UnmanagedType.LPWStr )] public string uri; // [in] Zero terminated string, fully qualified uri, for example "http://server/folder/file.ext".*/
+		public nint outData; // [in,out] pointer to loaded data to return. if data exists in the cache then this field contain pointer to it
+		public uint outDataSize; // [in,out] loaded data size to return.
+		public uint dataType; // [in] SciterResourceType
+		public nint requestId; // [in] request handle that can be used with sciter-x-request API */
+		public nint principal; // Element
+		public nint initiator; // Initiator
+	}
 
 }

src/EmptyFlow.SciterAPI/Structs/SciterCallbackNotificationLoadedData.cs

@@ -4,13 +4,13 @@ namespace EmptyFlow.SciterAPI {
     [StructLayout ( LayoutKind.Sequential )]
     public struct SciterCallbackNotificationLoadedData { // original name SCN_DATA_LOADED
         public SciterCallbackNotificationCode code;
-        public IntPtr hwnd; /**< [in] HWINDOW of the window this callback was attached to.*/
+        public nint hwnd; /**< [in] HWINDOW of the window this callback was attached to.*/
         [MarshalAs ( UnmanagedType.LPWStr )] public string uri; // [in] Zero terminated string, fully qualified uri, for example "http://server/folder/file.ext".*/
-        public IntPtr data; // [in] pointer to loaded data.
+        public nint data; // [in] pointer to loaded data.
         public uint dataSize; // [in] loaded data size (in bytes).
         public uint dataType; // [in] SciterResourceType
         public uint status; // [in] status = 0 (dataSize == 0) - unknown error. status = 100..505 - http response status, Note: 200 - OK! status > 12000 - wininet error code, see ERROR_INTERNET_*** in wininet.h
-        public uint requestId; // [in] request handle that can be used with sciter-x-request API
+        public nint requestId; // [in] request handle that can be used with sciter-x-request API
     }
 
 }