3 files changed, 21 insertions, 5 deletions
diff --git a/tools/qtestlib/wince/cetest/activesyncconnection.cpp b/tools/qtestlib/wince/cetest/activesyncconnection.cpp
index 76e4a41..99fac2c 100644
--- a/tools/qtestlib/wince/cetest/activesyncconnection.cpp
+++ b/tools/qtestlib/wince/cetest/activesyncconnection.cpp
@@ -382,6 +382,7 @@ bool ActiveSyncConnection::execute(QString program, QString arguments, int timeo
         BYTE* output;
         IRAPIStream *stream;
         int returned = 0;
+        DWORD error = 0;
         HRESULT res = CeRapiInvoke(dllLocation.utf16(), functionName.utf16(), 0, 0, &outputSize, &output, &stream, 0);
         if (S_OK != res) {
             if (S_OK != CeGetLastError())
@@ -416,9 +417,18 @@ bool ActiveSyncConnection::execute(QString program, QString arguments, int timeo
             if (S_OK != stream->Read(&returned, sizeof(returned), &written)) {
                 qWarning("   Could not access return value of process");
             }
-            result = true;
-        }
+            if (S_OK != stream->Read(&error, sizeof(error), &written)) {
+                qWarning("   Could not access error code");
+            }
 
+            if (error) {
+                qWarning() << "Error on target:" << strwinerror(error);
+                result = false;
+            }
+            else {
+                result = true;
+            }
+        }
 
         if (returnValue)
             *returnValue = returned;
diff --git a/tools/qtestlib/wince/remotelib/commands.cpp b/tools/qtestlib/wince/remotelib/commands.cpp
index 3aed2d6..f2176dd 100644
--- a/tools/qtestlib/wince/remotelib/commands.cpp
+++ b/tools/qtestlib/wince/remotelib/commands.cpp
@@ -56,6 +56,7 @@ int qRemoteLaunch(DWORD, BYTE*, DWORD*, BYTE**, IRAPIStream* stream)
     wchar_t* arguments = 0;
     int timeout = -1;
     int returnValue = -2;
+    DWORD error = 0;
 
     if (S_OK != stream->Read(&appLength, sizeof(appLength), &bytesRead))
         CLEAN_FAIL(-2);
@@ -74,11 +75,13 @@ int qRemoteLaunch(DWORD, BYTE*, DWORD*, BYTE**, IRAPIStream* stream)
     if (S_OK != stream->Read(&timeout, sizeof(timeout), &bytesRead))
         CLEAN_FAIL(-2);
 
-    bool result = qRemoteExecute(appName, arguments, &returnValue, timeout);
+    bool result = qRemoteExecute(appName, arguments, &returnValue, &error, timeout);
 
     if (timeout != 0) {
         if (S_OK != stream->Write(&returnValue, sizeof(returnValue), &bytesRead))
             CLEAN_FAIL(-4);
+        if (S_OK != stream->Write(&error, sizeof(error), &bytesRead))
+            CLEAN_FAIL(-5);
     }
     delete appName;
     delete arguments;
@@ -90,13 +93,16 @@ int qRemoteLaunch(DWORD, BYTE*, DWORD*, BYTE**, IRAPIStream* stream)
 }
 
 
-bool qRemoteExecute(const wchar_t* program, const wchar_t* arguments, int *returnValue, int timeout)
+bool qRemoteExecute(const wchar_t* program, const wchar_t* arguments, int *returnValue, DWORD* error, int timeout)
 {
+    *error = 0;
+
     if (!program)
         return false;
 
     PROCESS_INFORMATION pid;
     if (!CreateProcess(program, arguments, NULL, NULL, false, 0, NULL, NULL, NULL, &pid)) {
+        *error = GetLastError();
         wprintf(L"Could not launch: %s\n", program);
         return false;
     }
diff --git a/tools/qtestlib/wince/remotelib/commands.h b/tools/qtestlib/wince/remotelib/commands.h
index 9f0b2e3..5275f2c 100644
--- a/tools/qtestlib/wince/remotelib/commands.h
+++ b/tools/qtestlib/wince/remotelib/commands.h
@@ -45,7 +45,7 @@
 
 extern "C" {
     int __declspec(dllexport) qRemoteLaunch(DWORD, BYTE*, DWORD*, BYTE**, IRAPIStream*);
-    bool __declspec(dllexport) qRemoteExecute(const wchar_t* program, const wchar_t* arguments = NULL, int *returnValue = NULL , int timeout = -1);
+    bool __declspec(dllexport) qRemoteExecute(const wchar_t* program, const wchar_t* arguments = NULL, int *returnValue = NULL , DWORD* error = NULL, int timeout = -1);
 }
 
 #endif