[[ RefactorServer ]] Fixes CGI execution on Windows

livecodesebastien · livecodesebastien · commit 4cb2a763063b · 2014-06-16T17:37:16.000+01:00
diff --git a/engine/src/dskw32.cpp b/engine/src/dskw32.cpp
@@ -1657,7 +1657,7 @@ struct MCStdioFileHandle: public MCSystemFileHandle
 		if (!SetEndOfFile(m_handle))
 			return false;
 
-		return false;
+		return true;
 	}
 
 	virtual bool Sync(void)
@@ -1696,7 +1696,11 @@ struct MCStdioFileHandle: public MCSystemFileHandle
 		return IO_ERROR;
 	return IO_NORMAL;
 #endif /* MCS_flush_dsk_w32 */ //flush output buffer
-		if (FlushFileBuffers(m_handle) != NO_ERROR)
+		// SN-2014-06-16 
+		// It seems that FlushFileBuffers can return a non-zero value
+		// with no error declared...
+		if (FlushFileBuffers(m_handle) != NO_ERROR 
+				&& GetLastError() != NO_ERROR)
 			return false;
 
 		return true;
diff --git a/engine/src/srvsession.cpp b/engine/src/srvsession.cpp
@@ -386,6 +386,7 @@ bool MCSessionCreateSession(MCSessionIndexRef p_index, MCStringRef p_session_id,
 
 	MCAutoStringRef t_remote_addr_string;
 	char *t_remote_addr;
+	t_remote_addr = NULL;
 
 	if (MCS_getenv(MCSTR("REMOTE_ADDR"), &t_remote_addr_string))
 		MCCStringClone(MCStringGetCString(*t_remote_addr_string), t_remote_addr);
@@ -685,6 +686,7 @@ bool MCSessionGenerateID(MCStringRef &r_id)
 
 	MCAutoStringRef t_remote_addr_string;
 	char *t_remote_addr;
+	t_remote_addr = NULL;
 
 	if (MCS_getenv(MCSTR("REMOTE_ADDR"), &t_remote_addr_string))
 		MCCStringClone(MCStringGetCString(*t_remote_addr_string), t_remote_addr);
diff --git a/engine/src/srvwindows.cpp b/engine/src/srvwindows.cpp
@@ -1231,7 +1231,18 @@ bool MCS_isnan(double v)
 
 bool MCS_get_temporary_folder(MCStringRef &r_temp_folder)
 {
-	return MCsystem -> GetTemporaryFileName(r_temp_folder);
+	// MCS_get_temporay_folder is supposed to return an existing folder
+	// which is not the case with MCsystem -> GetTemporaryFilename
+//	  return MCsystem -> GetTemporaryFilename(r_temp_folder);
+	WCHAR t_tmpdir[MAX_PATH];
+	int32_t t_tmpdir_len = 0;
+	t_tmpdir_len = GetTempPathW(MAX_PATH, t_tmpdir);
+
+	MCAutoStringRef t_native_tmp, t_short_tmp;
+
+	return (MCStringCreateWithWString(t_tmpdir, &t_native_tmp)
+			&& MCsystem->PathFromNative(*t_native_tmp, &t_short_tmp)
+			&& MCS_longfilepath(*t_short_tmp, r_temp_folder));
 }
 
 bool MCS_create_temporary_file(MCStringRef p_path_string, MCStringRef p_prefix_string, IO_handle &r_file, MCStringRef &r_name_string)
@@ -1301,10 +1312,8 @@ bool MCS_create_temporary_file(MCStringRef p_path_string, MCStringRef p_prefix_s
 
 bool MCSystemLockFile(MCSystemFileHandle *p_file, bool p_shared, bool p_wait)
 {
-	// FRAGILE? In case p_file is a MCMemoryMappedFile, getFilePointer returns a char*...
-	int t_fd = fileno((FILE*)p_file->GetFilePointer());
-	
-	HANDLE t_fhandle = (HANDLE)_get_osfhandle(t_fd);
+	HANDLE t_fhandle;
+	t_fhandle = p_file->GetFilePointer();
 
 	bool t_success = true;
 
