diff --git a/DarkEdif/Bluewing Client/HTML5/Bluewing_Client.js b/DarkEdif/Bluewing Client/HTML5/Bluewing_Client.js index b0ec6d55..64a44c3b 100644 --- a/DarkEdif/Bluewing Client/HTML5/Bluewing_Client.js +++ b/DarkEdif/Bluewing Client/HTML5/Bluewing_Client.js @@ -139,7 +139,7 @@ globalThis['darkEdif'] = (globalThis['darkEdif'] && globalThis['darkEdif'].sdkVe this.numProps = headerDV.getUint16(4 + 4 + 4, true); // Skip past hash and hashTypes this.sizeBytes = headerDV.getUint32(4 + 4 + 4 + 4, true); // skip past numProps and pad - let editData = edPtrFile.readBuffer(this.sizeBytes - header.byteLength); + let editData = edPtrFile.readBuffer(this.sizeBytes - ext.ho.privateData - header.byteLength); this.chkboxes = editData.slice(0, Math.ceil(this.numProps / 8)); let that = this; let GetPropertyIndex = function(chkIDOrName) { diff --git a/DarkEdif/Bluewing Client/Wua/js/runtime/extensions/source/Bluewing_Client.js b/DarkEdif/Bluewing Client/Wua/js/runtime/extensions/source/Bluewing_Client.js index e511def6..44770b96 100644 --- a/DarkEdif/Bluewing Client/Wua/js/runtime/extensions/source/Bluewing_Client.js +++ b/DarkEdif/Bluewing Client/Wua/js/runtime/extensions/source/Bluewing_Client.js @@ -146,7 +146,7 @@ window['darkEdif'] = (window['darkEdif'] && window['darkEdif'].sdkVersion >= 19) this.numProps = headerDV.getUint16(4 + 4 + 4, true); // Skip past hash and hashTypes this.sizeBytes = headerDV.getUint32(4 + 4 + 4 + 4, true); // skip past numProps and pad - let editData = edPtrFile.readBuffer(this.sizeBytes - header.byteLength); + let editData = edPtrFile.readBuffer(this.sizeBytes - ext.ho.privateData - header.byteLength); this.chkboxes = editData.slice(0, Math.ceil(this.numProps / 8)); let that = this; let GetPropertyIndex = function(chkIDOrName) { diff --git a/DarkEdif/DarkEdif Template/HTML5/DarkEdif_Template.js b/DarkEdif/DarkEdif Template/HTML5/DarkEdif_Template.js index 83c116fd..bf380a4e 100644 --- a/DarkEdif/DarkEdif Template/HTML5/DarkEdif_Template.js +++ b/DarkEdif/DarkEdif Template/HTML5/DarkEdif_Template.js @@ -110,8 +110,10 @@ globalThis['darkEdif'] = (globalThis['darkEdif'] && globalThis['darkEdif'].sdkVe let editData = edPtrFile.readBuffer( this.sizeBytes - - // skip area between eHeader -> Props - (ext.ho.privateData - 20) - + // skip eHeader + ext.ho.privateData - + // cursor offset + 4 - // Skip DarkEdif header header.byteLength ); diff --git a/DarkEdif/DarkEdif Template/Wua/js/runtime/extensions/source/DarkEdif_Template.js b/DarkEdif/DarkEdif Template/Wua/js/runtime/extensions/source/DarkEdif_Template.js index 8d0dbb67..ccbe4e25 100644 --- a/DarkEdif/DarkEdif Template/Wua/js/runtime/extensions/source/DarkEdif_Template.js +++ b/DarkEdif/DarkEdif Template/Wua/js/runtime/extensions/source/DarkEdif_Template.js @@ -113,8 +113,10 @@ window['darkEdif'] = (window['darkEdif'] && window['darkEdif'].sdkVersion >= 20) let editData = edPtrFile.readBuffer( this.sizeBytes - - // skip area between eHeader -> Props - (ext.ho.privateData - 20) - + // skip eHeader + ext.ho.privateData - + // cursor offset + 4 - // Skip DarkEdif header header.byteLength ); diff --git a/DarkEdif/DarkScript/HTML5/DarkScript.js b/DarkEdif/DarkScript/HTML5/DarkScript.js index 2e480671..9fe039e2 100644 --- a/DarkEdif/DarkScript/HTML5/DarkScript.js +++ b/DarkEdif/DarkScript/HTML5/DarkScript.js @@ -119,7 +119,7 @@ class DarkEdif { this.numProps = headerDV.getUint16(4 + 4 + 4, true); // Skip past hash and hashTypes this.sizeBytes = headerDV.getUint32(4 + 4 + 4 + 4, true); // skip past numProps and pad - let editData = edPtrFile.readBuffer(this.sizeBytes - header.byteLength); + let editData = edPtrFile.readBuffer(this.sizeBytes - ext.ho.privateData - header.byteLength); this.chkboxes = editData.slice(0, Math.ceil(this.numProps / 8)); let that = this; let GetPropertyIndex = function (chkIDOrName) { diff --git a/DarkEdif/DarkScript/Wua/js/runtime/extensions/source/DarkScript.js b/DarkEdif/DarkScript/Wua/js/runtime/extensions/source/DarkScript.js index b3b124f5..0252f11f 100644 --- a/DarkEdif/DarkScript/Wua/js/runtime/extensions/source/DarkScript.js +++ b/DarkEdif/DarkScript/Wua/js/runtime/extensions/source/DarkScript.js @@ -100,7 +100,7 @@ window['darkEdif'] = (window['darkEdif'] && window['darkEdif'].sdkVersion >= 19) this.numProps = headerDV.getUint16(4 + 4 + 4, true); // Skip past hash and hashTypes this.sizeBytes = headerDV.getUint32(4 + 4 + 4 + 4, true); // skip past numProps and pad - let editData = edPtrFile.readBuffer(this.sizeBytes - header.byteLength); + let editData = edPtrFile.readBuffer(this.sizeBytes - ext.ho.privateData - header.byteLength); this.chkboxes = editData.slice(0, Math.ceil(this.numProps / 8)); let that = this; let GetPropertyIndex = function(chkIDOrName) {