Skip to content

Variable CLR host DLL path #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
breyed wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Variable CLR host DLL path #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions Distribution/wwDotnetBridge.PRG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ SET PROCEDURE TO wwDotnetBridge ADDITIVE
#DEFINE IS_WESTWIND .F.
#DEFINE IS_LEGACY .T.

PUBLIC WWC_CLR_HOSTDLL
#IF IS_WESTWIND
#DEFINE WWC_CLR_HOSTDLL wwipstuff.dll
WWC_CLR_HOSTDLL="wwipstuff.dll"

*** Other dependencies
* .NET Runtime 4.0+ or .NET Core 5+
Expand All @@ -16,7 +17,7 @@ SET PROCEDURE TO wwDotnetBridge ADDITIVE
* wwDotnetBridge.dll
* NewtonSoft.Json.dll - ToJson()/FromJson() only
#ELSE
#DEFINE WWC_CLR_HOSTDLL clrhost.dll
WWC_CLR_HOSTDLL="clrhost.dll"

*** Other dependencies
* .NET Runtime 4.0+ or .NET Core 5+
Expand Down Expand Up @@ -195,7 +196,7 @@ IF VARTYPE(this.oDotNetBridge) != "O"
#ENDIF

*** Load by filename - assumes the wwDotNetBridge.dll is in the Fox path
DECLARE Integer ClrCreateInstanceFrom IN WWC_CLR_HOSTDLL string, string, string@, integer@
DECLARE Integer ClrCreateInstanceFrom IN (m.WWC_CLR_HOSTDLL) string, string, string@, integer@
lcError = SPACE(2048)
lnSize = 0
lnDispHandle = ClrCreateInstanceFrom(FULLPATH("wwDotNetBridge.dll"),;
Expand Down Expand Up @@ -241,7 +242,7 @@ ENDFUNC
*** Return: nothing
************************************************************************
PROTECTED FUNCTION SetClrVersion(lcVersion)
DECLARE Integer SetClrVersion IN WWC_CLR_HOSTDLL AS SetClrVersionApi string
DECLARE Integer SetClrVersion IN (m.WWC_CLR_HOSTDLL) AS SetClrVersionApi string
SetClrVersionApi(lcVersion)
ENDFUNC
* SetClrVersion
Expand All @@ -259,7 +260,7 @@ ENDFUNC
FUNCTION Unload()
IF VARTYPE(this.oDotNetBridge) == "O"
this.oDotNetBridge = NULL
DECLARE Integer ClrUnload IN WWC_CLR_HOSTDLL
DECLARE Integer ClrUnload IN (m.WWC_CLR_HOSTDLL)
ClrUnload()
ENDIF
ENDFUNC
Expand Down Expand Up @@ -1433,7 +1434,7 @@ ENDFUNC
*!* FUNCTION CreateClrInstance(lcLibrary,lcClass,lcError)
*!* LOCAL lnDispHandle, lnSize

*!* DECLARE Integer ClrCreateInstance IN WWC_CLR_HOSTDLL string, string, string@, integer@
*!* DECLARE Integer ClrCreateInstance IN (m.WWC_CLR_HOSTDLL) string, string, string@, integer@

*!* lcError = SPACE(2048)
*!* lnSize = 0
Expand Down Expand Up @@ -2006,7 +2007,7 @@ IF VARTYPE(this.oDotNetBridge) != "O"
ENDIF

*** Load by filename - assumes the wwDotNetBridge.dll is in the Fox path
DECLARE Integer CoreClrCreateInstanceFrom IN WWC_CLR_HOSTDLL string, string, string@, integer@
DECLARE Integer CoreClrCreateInstanceFrom IN (m.WWC_CLR_HOSTDLL) string, string, string@, integer@
lcError = SPACE(2048)
lnSize = LEN(lcError)
lnDispHandle = CoreClrCreateInstanceFrom(lcRuntimePath,lcVersion,@lcError,@lnSize)
Expand Down Expand Up @@ -2054,7 +2055,7 @@ ENDFUNC
FUNCTION Unload()
IF VARTYPE(this.oDotNetBridge) == "O"
this.oDotNetBridge = NULL
DECLARE Integer CoreClrUnload IN WWC_CLR_HOSTDLL
DECLARE Integer CoreClrUnload IN (m.WWC_CLR_HOSTDLL)
CoreClrUnload()
ENDIF
ENDFUNC
Expand Down