Marcus Meissner : kernel32: Skip modem status tests if GetModemStatus failed.

Alexandre Julliard julliard at wine.codeweavers.com
Mon May 21 09:40:20 CDT 2007


Module: wine
Branch: master
Commit: b45367347abbe11b33f16761b947f10595546875
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b45367347abbe11b33f16761b947f10595546875

Author: Marcus Meissner <marcus at jet.franken.de>
Date:   Sun May 20 23:30:11 2007 +0200

kernel32: Skip modem status tests if GetModemStatus failed.

---

 dlls/kernel32/tests/comm.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c
index 9866521..01ba2b9 100644
--- a/dlls/kernel32/tests/comm.c
+++ b/dlls/kernel32/tests/comm.c
@@ -1413,6 +1413,7 @@ static void  test_WaitRing(HANDLE hcom)
     HANDLE alarmThread;
     DWORD args[3], defaultStat;
     DWORD alarmThreadId, before, after, after1, diff, success, err, written, evtmask=0;
+    BOOL ret;
 
     ok(GetCommState(hcom, &dcb), "GetCommState failed\n");
     if (dcb.fDtrControl == DTR_CONTROL_DISABLE)
@@ -1421,7 +1422,11 @@ static void  test_WaitRing(HANDLE hcom)
 	return;
     }
     args[0]= TIMEOUT >>1;
-    ok(GetCommModemStatus(hcom, &defaultStat), "GetCommModemStatus failed\n");
+    ok((ret = GetCommModemStatus(hcom, &defaultStat)), "GetCommModemStatus failed\n");
+    if (!ret) {
+	skip("modem status failed -> skip.\n");
+	return;
+    }
     if(defaultStat & MS_RING_ON)
 	args[1] = CLRDTR;
     else




More information about the wine-cvs mailing list