[mU] API_CALL更名为OS_API_CALL，意义更明确些

Author: baritono

Include/mU/Exceptions.h

@@ -86,17 +86,17 @@ namespace mU
 	};
 
 #ifdef _WIN32
-#define API_CALL(api_func, ...)			\
+#define OS_API_CALL(api_func, ...)			\
 	if (!api_func(__VA_ARGS__))			\
 		throw SystemError();
-#define API_CALL_R(r, api_func, ...)	\
+#define OS_API_CALL_R(r, api_func, ...)	\
 	if (!(r = api_func(__VA_ARGS__)))	\
 		throw SystemError();
 #else
-#define API_CALL(api_func, ...) 		\
+#define OS_API_CALL(api_func, ...) 		\
 	if (api_func(__VA_ARGS__) == -1)	\
 		throw SystemError();
-#define API_CALL_R(r, api_func, ...)		\
+#define OS_API_CALL_R(r, api_func, ...)		\
 	if ((r = api_func(__VA_ARGS__)) == -1)	\
 		throw SystemError();
 #endif

Kernel/path.cpp

@@ -18,23 +18,23 @@ struct cmodule_t : obj_t
 wstring Path()					// FIXME: behavior change, now may throw, check callers
 {
 	static wchar buf[MAX_PATH];
-	API_CALL(GetModuleFileNameW,NULL,buf,MAX_PATH);
+	OS_API_CALL(GetModuleFileNameW,NULL,buf,MAX_PATH);
 	wcsrchr(buf,L'\\')[1] = 0;
 	return buf;	// TODO: cache this result
 }
 
 var Install(const wstring &x)	// FIXME: behavior change, now may throw, check callers
 {
 	auto_ptr<cmodule_t> r (new cmodule_t);
-	API_CALL_R(r->rep, LoadLibraryW, x.c_str());
+	OS_API_CALL_R(r->rep, LoadLibraryW, x.c_str());
 	if(r->rep) return r.release();
 	return 0;
 }
 
 bool Uninstall(Var x)			// FIXME: behavior change, now may throw, check callers
 {
 	BOOL r;
-	API_CALL_R(r,FreeLibrary,dynamic_cast<cmodule_t*>(x)->rep);
+	OS_API_CALL_R(r,FreeLibrary,dynamic_cast<cmodule_t*>(x)->rep);
 	return r == TRUE;
 }
 
@@ -48,7 +48,7 @@ bool Run(const wstring &x)		// FIXME: behavior change, now may throw, check call
 	ZeroMemory( &pi, sizeof(pi) );
 
 	// Start the child process.
-	API_CALL(CreateProcessW,
+	OS_API_CALL(CreateProcessW,
 		NULL,	// No module name (use command line)
 		// FIXME: 应该创建一个长为32768的buffer来转储，而不是使用const_cast
 		const_cast<wchar*>(x.c_str()),	// Command line
@@ -63,11 +63,11 @@ bool Run(const wstring &x)		// FIXME: behavior change, now may throw, check call
 	);
 
 	// Wait until child process exits.
-	API_CALL(WaitForSingleObject, pi.hProcess, INFINITE );
+	OS_API_CALL(WaitForSingleObject, pi.hProcess, INFINITE );
 
 	// Close process and thread handles.
-	API_CALL(CloseHandle, pi.hProcess );
-	API_CALL(CloseHandle, pi.hThread );
+	OS_API_CALL(CloseHandle, pi.hProcess );
+	OS_API_CALL(CloseHandle, pi.hThread );
 	return true;
 }