Skip to content

Commit b4136c8

Browse files
committed
can build project and package for windows with inspector working in editor
1 parent cf436ae commit b4136c8

File tree

5 files changed

+28
-14
lines changed

5 files changed

+28
-14
lines changed

Source/JavascriptConsole/Private/JavascriptCommandExecutor.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ bool FJavascriptCommandExecutor::CacheJavascriptContext()
112112
{
113113
// Use Editor context only
114114
const auto JavascriptContext = IJavascriptEditorModule::Get().GetJavascriptContext();
115-
TargetContext = JavascriptContext->ContextId;
115+
if (JavascriptContext)
116+
{
117+
TargetContext = JavascriptContext->ContextId;
118+
}
116119
}
117120

118121
if (TargetContext.IsValid())

Source/JavascriptWebSocket/JavascriptWebSocket.Build.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ private void HackWebSocketIncludeDir(String WebsocketPath, ReadOnlyTargetRules T
4646
bHasZlib = true;
4747

4848
}
49-
else if (Target.Platform == UnrealTargetPlatform.Linux)
50-
{
51-
PlatformSubdir = Path.Combine(PlatformSubdir, Target.Architecture);
52-
}
49+
// else if (Target.Platform == UnrealTargetPlatform.Linux)
50+
// {
51+
// PlatformSubdir = Path.Combine(PlatformSubdir, Target.Architecture);
52+
// }
5353

5454
PrivateDependencyModuleNames.Add("libWebSockets");
5555

Source/V8/Private/Inspector.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,13 @@ class FInspector : public IJavascriptInspector, public FTickableAnyObject, publi
473473
{
474474
static FName NAME_Javascript("Javascript");
475475

476+
/*
477+
* Crash at if (!maybe_console.IsEmpty())
478+
* when inspector is enabled!
479+
*/
480+
return;
481+
482+
476483
if (Category != NAME_Javascript)
477484
{
478485
HandleScope handle_scope(isolate_);

Source/V8/Private/JavascriptContext_Private.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
#include "../../Launch/Resources/Version.h"
3333

34+
3435
using namespace v8;
3536

3637
static const int kContextEmbedderDataIndex = 0;
@@ -1947,8 +1948,11 @@ class FJavascriptContextImplementation : public FJavascriptContext
19471948
auto Function = *FuncIt;
19481949

19491950
// Parse all function parameters.
1950-
uint8* Parms = (uint8*)FMemory_Alloca(Function->ParmsSize);
1951-
FMemory::Memzero(Parms, Function->ParmsSize);
1951+
TArray<uint8> Parms = TArray<uint8>();// = (uint8*)FMemory_Alloca(Function->ParmsSize);
1952+
//FMemory::Memzero(Parms, Function->ParmsSize);
1953+
Parms.SetNumUninitialized(Function->ParmsSize);
1954+
FMemory::Memzero(Parms.GetData(), Parms.Num());
1955+
19521956

19531957
bool bHasDefault = false;
19541958
TArray<FString> Parameters, ParametersWithDefaults;
@@ -1963,7 +1967,7 @@ class FJavascriptContextImplementation : public FJavascriptContext
19631967
if (!MetadataCppDefaultValue.IsEmpty())
19641968
{
19651969
const uint32 ExportFlags = PPF_None;
1966-
auto Buffer = It->ContainerPtrToValuePtr<uint8>(Parms);
1970+
auto Buffer = It->ContainerPtrToValuePtr<uint8>(Parms.GetData());
19671971

19681972
#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 1
19691973
const TCHAR* Result = It->ImportText_Direct(*MetadataCppDefaultValue, Buffer, nullptr, ExportFlags);
@@ -1974,7 +1978,7 @@ class FJavascriptContextImplementation : public FJavascriptContext
19741978
if (Result)
19751979
{
19761980
bHasDefault = true;
1977-
auto DefaultValue = Environment->ReadProperty(isolate(), Property, Parms, FNoPropertyOwner());
1981+
auto DefaultValue = Environment->ReadProperty(isolate(), Property, Parms.GetData(), FNoPropertyOwner());
19781982
{
19791983
auto ctx = context();
19801984
Context::Scope context_scope(ctx);
@@ -1989,7 +1993,7 @@ class FJavascriptContextImplementation : public FJavascriptContext
19891993
}
19901994
}
19911995

1992-
It->DestroyValue_InContainer(Parms);
1996+
//It->DestroyValue_InContainer(Parms);
19931997
}
19941998
}
19951999
Parameters.Add(Parameter);

Source/V8/V8.Build.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ private void HackWebSocketIncludeDir(String WebsocketPath, ReadOnlyTargetRules T
8383
bHasZlib = true;
8484

8585
}
86-
else if (Target.Platform == UnrealTargetPlatform.Linux)
87-
{
88-
PlatformSubdir = Path.Combine(PlatformSubdir, Target.Architecture);
89-
}
86+
// else if (Target.Platform == UnrealTargetPlatform.Linux)
87+
// {
88+
// PlatformSubdir = Path.Combine(PlatformSubdir, Target.Architecture);
89+
// }
9090

9191
PrivateDependencyModuleNames.Add("libWebSockets");
9292

0 commit comments

Comments
 (0)