FIX: fixing some of compilations issues like when compiling Rebol just as a library without the host part

Author: Oldes

make/msvc/Make-vs-project.r3

@@ -348,6 +348,9 @@ EndGlobal
 	<PreBuildEvent>
 	  <Command>prebuild64.bat</Command>
 	</PreBuildEvent>
+    <Manifest>
+      <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
+    </Manifest>
 	<PostBuildEvent>
       <Command>COPY /Y "$(TargetDir)$(ProjectName).exe" "$(ProjectDir)..\..\..\build\win-x64\$(ProjectName)_x64.exe"</Command>
       <Message>Copy resulted EXE</Message>
@@ -396,7 +399,7 @@ cd %~dp0
 pause}
 
 	rc-file: {
-IDI_APPICON ICON "../../r3.ico"
+101 ICON "../../r3.ico"
 
 1 VERSIONINFO
 FILEVERSION     3,0,0,0
@@ -424,27 +427,29 @@ END
 STRINGTABLE
 BEGIN
     101  "Rebol 3 (Oldes branch)"
-END}
+END
+}
 ]
 
 
+
+
 do %../../src/tools/file-base.r
 
-forall core     [change core join %../../../src/core/ core/1]
-forall os       [change os   join %../../../src/os/ os/1]
-forall os-win32 [change os-win32 join %../../../src/os/win32/ os-win32/1]
-core:     head core
-os:       head os
-os-win32: head os-win32
+forall core      [change core join %../../../src/core/ core/1]
+forall os        [change os   join %../../../src/os/     os/1]
+forall os-win32  [change os-win32  join %../../../src/os/win32/  os-win32/1]
+forall os-win32g [change os-win32g join %../../../src/os/win32/ os-win32g/1]
 
+probe core
 vs/Sources: compose/only [
 	"Source Core Files" (core)
-	"Source Host Files" (append os os-win32)
+	"Source Host Files" (union union os os-win32 os-win32g)
 ]
 vs/IncludePath-x86:
 vs/IncludePath-x64: "..\..\..\src\include;"
 vs/PreprocessorDefinitions-x86: {TO_WIN32;REB_CORE;REB_EXE;ENDIAN_LITTLE;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;USE_LZMA;}
-vs/PreprocessorDefinitions-x64: {TO_WIN32_X64;__LLP64__;REB_CORE;REB_EXE;ENDIAN_LITTLE;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;USE_LZMA;}
+vs/PreprocessorDefinitions-x64: {UNICODE;_UNICODE;ENDIAN_LITTLE;_CRT_SECURE_NO_WARNINGS;USE_MIDI_DEVICE;USE_PNG_CODEC;USE_JPG_CODEC;USE_LZMA;REB_EXE;TEST_EXTENSIONS;_DEBUG;NO_COMPOSITOR;TO_WIN32_X64;__LLP64__;_FILE_OFFSET_BITS=64;}
 vs/Prebuild-x86: {
 set REBOL=..\..\prebuild\r3-make-win.exe
 set T=../../../src/tools

src/core/n-data.c

@@ -1065,7 +1065,9 @@ static int Do_Ordinal(REBVAL *ds, REBINT n)
 	//gob = (VAL_EVENT_TYPE(val) == EVT_DROP_FILE) ? Gob_Root : VAL_EVENT_SER(val);
 	if (GET_FLAG(VAL_EVENT_FLAGS(val), EVF_HAS_DATA)) {
 		CLR_FLAG(VAL_EVENT_FLAGS(val), EVF_HAS_DATA);
-		gob = Gob_Root;
+#ifdef TO_WINDOWS
+		gob = OS_Get_Gob_Root();
+#endif
 	} else {
 		gob = VAL_EVENT_SER(val);
 	}

src/include/reb-config.h

@@ -168,6 +168,10 @@ These are now obsolete (as of A107) and should be removed:
 #define TO_ANY_LINUX
 #endif
 
+#ifdef TO_LINUX_MIPS
+#define TO_ANY_LINUX
+#endif
+
 #ifdef TO_ANY_LINUX
 #undef USE_MIDI_DEVICE          // Not implemented!
 #endif

src/mezz/view-funcs.r

@@ -98,7 +98,7 @@ view: func [
 					][
 						unhandle-events self
 						unview event/window
-						quit
+						;quit
 					]
 					;show event/window
 					none ; we handled it

src/os/win32/dev-midi.c

@@ -181,7 +181,7 @@ static void CALLBACK MidiInProc(HMIDIIN hMidiIn, UINT wMsg, DWORD dwInstance, DW
 		Midi_Push_Buffer(midi_port.inp_buffer, dwParam2);
 		evt.type = EVT_READ;
 		evt.data = dwParam1;
-		RL_UPDATE_EVENT(&evt);
+		RL_Update_Event(&evt);
 		break;
 #ifdef DEBUG_MIDI
 	case MIM_LONGDATA:
@@ -368,8 +368,8 @@ static void PrintMidiDevices()
 		}
 	}
 	if (device_in) {
-		midi_port->inp_buffer = RL_MAKE_STRING(MIDI_BUF_SIZE-1, FALSE); // allocate input binary ...
-		RL_PROTECT_GC(midi_port->inp_buffer, TRUE);     // ... and prevent it from GC
+		midi_port->inp_buffer = RL_Make_String(MIDI_BUF_SIZE-1, FALSE); // allocate input binary ...
+		RL_Protect_GC(midi_port->inp_buffer, TRUE);     // ... and prevent it from GC
 		midi_port->inp_buffer->size = MIDI_BUF_SIZE;    // ... and init it for use as circular buffer
 		midi_port->inp_buffer->rest = 0;                // rest is used as readers TAIL
 	}
@@ -392,7 +392,7 @@ static void PrintMidiDevices()
 		midiInClose(midi_port->inp_device);
 		midi_port->inp_device = NULL;
 	}
-	if (midi_port->inp_buffer) RL_PROTECT_GC(midi_port->inp_buffer, FALSE);
+	if (midi_port->inp_buffer) RL_Protect_GC(midi_port->inp_buffer, FALSE);
 	if (midi_port->out_device) {
 		midiOutClose(midi_port->out_device);
 		midi_port->out_device = NULL;
@@ -494,18 +494,18 @@ static void PrintMidiDevices()
 	nMidiDeviceNum = midiInGetNumDevs();
 	for (i = 0; i < nMidiDeviceNum; ++i) {
 		midiInGetDevCaps(i, &capsInp, sizeof(MIDIINCAPS));
-		arg.series = RL_ENCODE_UTF8_STRING(capsInp.szPname, wcslen(capsInp.szPname), TRUE, FALSE);
+		arg.series = RL_Encode_UTF8_String(capsInp.szPname, wcslen(capsInp.szPname), TRUE, FALSE);
 		arg.index = 0;
-		RL_SET_VALUE(VAL_SERIES(val), i, arg, RXT_STRING);
+		RL_Set_Value(VAL_SERIES(val), i, arg, RXT_STRING);
 	}
 	//output devices block
 	val = FRM_VALUES((REBSER*)req->data) + 2; 
 	nMidiDeviceNum = midiOutGetNumDevs();
 	for (i = 0; i < nMidiDeviceNum; ++i) {
 		midiOutGetDevCaps(i, &capsOut, sizeof(MIDIOUTCAPS));
-		arg.series = RL_ENCODE_UTF8_STRING(capsOut.szPname, wcslen(capsOut.szPname), TRUE, FALSE);
+		arg.series = RL_Encode_UTF8_String(capsOut.szPname, wcslen(capsOut.szPname), TRUE, FALSE);
 		arg.index = 0;
-		RL_SET_VALUE(VAL_SERIES(val), i, arg, RXT_STRING);
+		RL_Set_Value(VAL_SERIES(val), i, arg, RXT_STRING);
 	}
 	return DR_DONE;
 }

src/os/win32/host-compositor.c

@@ -50,6 +50,7 @@
 #endif
 #include "reb-host.h"
 #include "host-lib.h"
+#include "host-compositor.h"
 
 //***** Externs *****
 
@@ -61,23 +62,6 @@
 
 static REBXYF Zero_Pair = {0, 0};
 
-typedef struct rebol_compositor_ctx {
-	REBYTE    *wind_buffer;
-	REBXYI     wind_size;	
-	REBGOB    *wind_gob;
-	REBGOB    *root_gob;
-	HDC        wind_DC;
-	HBITMAP    back_buffer;
-	HDC        back_DC;
-	HRGN       win_clip;
-	HRGN       new_clip;
-	HRGN       old_clip;	
-	REBXYF     abs_offset;
-	HBRUSH     brush_DC;
-	BITMAPINFO bmpInfo;
-} REBCMP;
-
-
 /***********************************************************************
 **
 */ void* OS_Create_Compositor(REBGOB* rootGob, REBGOB* gob)
@@ -195,7 +179,7 @@ typedef struct rebol_compositor_ctx {
 		//make the new buffer actual
 		ctx->back_buffer = new_buffer;
 		ctx->back_DC = new_DC;
-		ctx->wind_buffer = new_bytes;
+		//ctx->wind_buffer = new_bytes;
 
 		//set window clip region
 //		SetRectRgn(ctx->win_clip, 0, 0, w, h);

src/os/win32/host-window.c

@@ -49,6 +49,7 @@
 
 #include "reb-host.h"
 #include "host-lib.h"
+#include "host-compositor.h"
 
 #define INCLUDE_EXT_DATA
 #include "host-ext-window.h"
@@ -96,6 +97,8 @@ static REBOOL Custom_Cursor = FALSE;
 
 static u32* window_ext_words;
 
+RL_LIB *RL; // Link back to reb-lib from embedded extensions
+
 //***** Globals *****//
 
 REBGOB *Gob_Root;				// Top level GOB (the screen)
@@ -212,6 +215,19 @@ REBINT window_scale;
 	return 0;
 }
 
+/***********************************************************************
+**
+*/	REBGOB* OS_Get_Gob_Root()
+/*
+**	Return gob root.
+**	Needed to map-event when event does not hold gob, but just data and 
+**	compiled as a standalone library (without host part)
+**
+***********************************************************************/
+{
+	return Gob_Root;
+}
+
 /***********************************************************************
 **
 */	void OS_Free_Window(REBGOB *gob)
@@ -880,7 +896,7 @@ REBINT window_scale;
 	{
 
 		REBD32 x, y;
-		u32 w = RL_FIND_WORD(window_ext_words, RXA_WORD(frm, 1));
+		u32 w = RL_Find_Word(window_ext_words, RXA_WORD(frm, 1));
 
 		if (RXA_TYPE(frm, 5) == RXT_INTEGER) {
 			display = RXA_INT32(frm, 5);
@@ -985,7 +1001,7 @@ REBINT window_scale;
 		break;
 
 	case CMD_WINDOW_INIT_WORDS:
-		window_ext_words = RL_MAP_WORDS(RXA_SERIES(frm, 1));
+		window_ext_words = RL_Map_Words(RXA_SERIES(frm, 1));
 		break;
 
 	case CMD_WINDOW_CURSOR:

src/tools/file-base.r

@@ -139,6 +139,8 @@ os: [
 	host-stdio.c
 	dev-net.c
 	dev-dns.c
+
+	host-ext-test.c
 ]
 
 os-win32: [
@@ -148,15 +150,16 @@ os-win32: [
 	dev-event.c
 	dev-clipboard.c
 	dev-midi.c
-]
 
-os-win32g: [
-	host-graphics.c
 	host-event.c
 	host-window.c
 	host-compositor.c
-	host-draw.c
-	host-text.c
+]
+
+os-win32g: [
+	;host-graphics.c
+	;host-draw.c
+	;host-text.c
 ]
 
 os-posix: [

src/tools/systems.r

@@ -73,7 +73,7 @@ linker-flags: [
 	LLOG:	"-llog"						; on Android, link with liblog.so
 	ARC:	"-arch i386"				; x86 32 bit architecture (OSX)
 	M32:	"-m32"						; use 32-bit memory model (Linux x64)
-	W32:	"-lwsock32 -lcomdlg32"
+	W32:	"-lwsock32 -lcomdlg32 -lgdi32 -lwinmm"
 	WIN:	"-mwindows"					; build as Windows GUI binary
 	CON:	"-mconsole"					; build as Windows Console binary
 	S4M:	"-Wl,--stack=4194300"