[[ RefactorSyntax ]] Windows engine now runs without EP

livecodesebastien · livecodesebastien · commit 12b4bb44ccb1 · 2013-12-05T11:17:43.000Z
diff --git a/engine/kernel.vcproj b/engine/kernel.vcproj
@@ -699,14 +699,6 @@
 				RelativePath="src\date.h"
 				>
 			</File>
-			<File
-				RelativePath="src\execpt.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\execpt.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\executionerrors.h"
 				>
diff --git a/engine/src/dskw32.cpp b/engine/src/dskw32.cpp
@@ -1849,8 +1849,8 @@ struct MCWindowsDesktop: public MCSystemInterface, public MCWindowsSystemService
 			MCS_reset_time();
 		else
 			MClowrestimers = True;
-        MCExecPoint ep;
-        MCExecContext ctxt(ep);
+
+        MCExecContext ctxt(nil, nil, nil);
 		MCStringRef t_key;
 		t_key = MCSTR("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ProxyEnable");
         MCAutoStringRef t_type, t_error;
@@ -1867,7 +1867,7 @@ struct MCWindowsDesktop: public MCSystemInterface, public MCWindowsSystemService
 			if (!MCValueIsEmpty(*t_value2))
 			{
 				MCAutoStringRef t_http_proxy;
-				/* UNCHECKED */ ctxt . ConvertToStringRef(*t_value2, &t_http_proxy);
+				/* UNCHECKED */ ctxt . ConvertToString(*t_value2, &t_http_proxy);
 				MCValueAssign(MChttpproxy, *t_http_proxy);
 			}
 		}
@@ -1882,7 +1882,7 @@ struct MCWindowsDesktop: public MCSystemInterface, public MCWindowsSystemService
             if (!MCValueIsEmpty(*t_value3))
 			{
 				MCAutoStringRef t_host;
-                /* UNCHECKED */ ctxt . ConvertToStringRef(*t_value3, &t_host);
+                /* UNCHECKED */ ctxt . ConvertToString(*t_value3, &t_host);
                 MCStringRef t_key4;
                 t_key4 = MCSTR("HKEY_CURRENT_USER\\Software\\Netscape\\Netscape Navigator\\Proxy Information\\HTTP_ProxyPort");
                 MCAutoStringRef t_type4, t_error4;
@@ -3896,8 +3896,8 @@ bool MCU_path2native(MCStringRef p_path, MCStringRef& r_native_path)
             CloseHandle(piProcInfo.hProcess);
             CloseHandle(piProcInfo.hThread);
         }
-		MCExecPoint ep(nil, nil, nil);
-		MCExecContext ctxt(ep);
+
+		MCExecContext ctxt(nil, nil, nil);
         if (MCprocesses[index].retcode)
 			ctxt.SetTheResultToNumber((real64_t)MCprocesses[index].retcode);
         else
diff --git a/engine/src/objectpropsets.cpp b/engine/src/objectpropsets.cpp
@@ -166,7 +166,7 @@ bool MCObjectPropertySet::restrict(MCStringRef p_string)
     MCArrayRef t_new_props;
     if (!MCStringSplit(p_string, MCSTR("\n"), nil, kMCCompareExact, t_new_props))
         return false;
-    uint t_size;
+    uinteger_t t_size;
     t_size = MCArrayGetCount(t_new_props);
     for (index_t i = 0; i < t_size && t_success; i++)
     {
diff --git a/engine/src/w32dcs.cpp b/engine/src/w32dcs.cpp
@@ -22,6 +22,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "parsedef.h"
 
 //#include "execpt.h"
+#include "exec.h"
 #include "dispatch.h"
 #include "stack.h"
 #include "image.h"
@@ -186,8 +187,7 @@ Boolean MCScreenDC::open()
 	MChilitecolor.red = MChilitecolor.green = 0x0000;
 	MChilitecolor.blue = 0x8080;
 
-	MCExecPoint ep;
-    MCExecContext ctxt(ep);
+    MCExecContext ctxt(nil, nil, nil);
     MCStringRef t_key;
     t_key = MCSTR("HKEY_CURRENT_USER\\Control Panel\\Colors\\Hilight");
     MCAutoValueRef t_value;
diff --git a/engine/src/w32dcw32.cpp b/engine/src/w32dcw32.cpp
@@ -561,8 +561,7 @@ LRESULT CALLBACK MCWindowProc(HWND hwnd, UINT msg, WPARAM wParam,
 					t_result = 0;
 				else
 				{
-					MCExecPoint t_ep;
-                    MCExecContext ctxt(t_ep);
+                    MCExecContext ctxt(nil, nil, nil);
                     MCAutoValueRef t_value;
 					/* UNCHECKED */ MCresult -> eval(ctxt, &t_value);
                     MCAutoStringRef t_string;
diff --git a/engine/src/w32theme.cpp b/engine/src/w32theme.cpp
@@ -266,8 +266,7 @@ Boolean MCNativeTheme::load()
 	drawThemeBGEx = (DrawThemeBackgroundExPtr)GetProcAddress((HMODULE)mThemeDLL, "DrawThemeBackgroundEx");
 
 	uint2 i;
-    MCExecPoint ep;
-    MCExecContext ctxt(ep);
+    MCExecContext ctxt(nil, nil, nil);
 	for (i = 0; i < NMENUCOLORS; i++)
 	{
 		menucolors[i] = nil;

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ bool MCObjectPropertySet::restrict(MCStringRef p_string)`
`166`	`166`	`MCArrayRef t_new_props;`
`167`	`167`	`if (!MCStringSplit(p_string, MCSTR("\n"), nil, kMCCompareExact, t_new_props))`
`168`	`168`	`return false;`
`169`		`- uint t_size;`
	`169`	`+ uinteger_t t_size;`
`170`	`170`	`t_size = MCArrayGetCount(t_new_props);`
`171`	`171`	`for (index_t i = 0; i < t_size && t_success; i++)`
`172`	`172`	`{`
Original file line number	Diff line number	Diff line change
`@@ -266,8 +266,7 @@ Boolean MCNativeTheme::load()`
`266`	`266`	`drawThemeBGEx = (DrawThemeBackgroundExPtr)GetProcAddress((HMODULE)mThemeDLL, "DrawThemeBackgroundEx");`
`267`	`267`
`268`	`268`	`uint2 i;`
`269`		`- MCExecPoint ep;`
`270`		`- MCExecContext ctxt(ep);`
	`269`	`+ MCExecContext ctxt(nil, nil, nil);`
`271`	`270`	`for (i = 0; i < NMENUCOLORS; i++)`
`272`	`271`	`{`
`273`	`272`	`menucolors[i] = nil;`