[Scummvm-git-logs] scummvm master -> 62a614d3dd2bca9614f82c46f5705061c3b73281

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
62a614d3dd WINTERTMUTE: Allow properly return fail status from emulated external dll


Commit: 62a614d3dd2bca9614f82c46f5705061c3b73281
    https://github.com/scummvm/scummvm/commit/62a614d3dd2bca9614f82c46f5705061c3b73281
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-11-16T06:38:41+01:00

Commit Message:
WINTERTMUTE: Allow properly return fail status from emulated external dll

Changed paths:
    engines/wintermute/ext/externals.h


diff --git a/engines/wintermute/ext/externals.h b/engines/wintermute/ext/externals.h
index 2961dfea0b2..32f25665583 100644
--- a/engines/wintermute/ext/externals.h
+++ b/engines/wintermute/ext/externals.h
@@ -48,57 +48,39 @@ bool EmulateRoutineExternalCalls(BaseGame *, ScStack *, ScStack *, ScScript::TEx
 bool EmulateExternalCall(BaseGame *inGame, ScStack *stack, ScStack *thisStack, ScScript::TExternalFunction *function) {
 
 	if (strcmp(function->dll_name, "geturl.dll") == 0) {
-		if (!DID_FAIL(EmulateGetURLExternalCalls(inGame, stack, thisStack, function))) {
-			return STATUS_OK;
-		}
+		return EmulateGetURLExternalCalls(inGame, stack, thisStack, function);
 	}
 
 	if (strcmp(function->dll_name, "tools.dll") == 0) {
-		if (!DID_FAIL(EmulateToolsExternalCalls(inGame, stack, thisStack, function))) {
-			return STATUS_OK;
-		}
+		return EmulateToolsExternalCalls(inGame, stack, thisStack, function);
 	}
 
 	if (strcmp(function->dll_name, "img.dll") == 0) {
-		if (!DID_FAIL(EmulateImgExternalCalls(inGame, stack, thisStack, function))) {
-			return STATUS_OK;
-		}
+		return EmulateImgExternalCalls(inGame, stack, thisStack, function);
 	}
 
 	if (strcmp(function->dll_name, "shell32.dll") == 0) {
-		if (!DID_FAIL(EmulateShell32ExternalCalls(inGame, stack, thisStack, function))) {
-			return STATUS_OK;
-		}
+		return EmulateShell32ExternalCalls(inGame, stack, thisStack, function);
 	}
 
 	if (strcmp(function->dll_name, "installutil.dll") == 0) {
-		if (!DID_FAIL(EmulateInstallUtilExternalCalls(inGame, stack, thisStack, function))) {
-			return STATUS_OK;
-		}
+		return EmulateInstallUtilExternalCalls(inGame, stack, thisStack, function);
 	}
 
 	if (strcmp(function->dll_name, "dlltest.dll") == 0) {
-		if (!DID_FAIL(EmulateDLLTestExternalCalls(inGame, stack, thisStack, function))) {
-			return STATUS_OK;
-		}
+		return EmulateDLLTestExternalCalls(inGame, stack, thisStack, function);
 	}
 
 	if (strcmp(function->dll_name, "kernel32.dll") == 0) {
-		if (!DID_FAIL(EmulateKernel32ExternalCalls(inGame, stack, thisStack, function))) {
-			return STATUS_OK;
-		}
+		return EmulateKernel32ExternalCalls(inGame, stack, thisStack, function);
 	}
 
 	if (strcmp(function->dll_name, "httpconnect.dll") == 0) {
-		if (!DID_FAIL(EmulateHTTPConnectExternalCalls(inGame, stack, thisStack, function))) {
-			return STATUS_OK;
-		}
+		return EmulateHTTPConnectExternalCalls(inGame, stack, thisStack, function);
 	}
 
 	if (strcmp(function->dll_name, "routine.dll") == 0) {
-		if (!DID_FAIL(EmulateRoutineExternalCalls(inGame, stack, thisStack, function))) {
-			return STATUS_OK;
-		}
+		return EmulateRoutineExternalCalls(inGame, stack, thisStack, function);
 	}
 
 	warning("External function %s from %s library is not known by ScummVM", function->name, function->dll_name);