Merge jv
authorHG Automerge
Tue, 17 Jan 2017 11:18:09 +0000
branchjv
changeset 21287 38f177ccece5
parent 21286 4be14939730c (current diff)
parent 21257 0f40f3a0508c (diff)
child 21288 886dc134d57e
Merge
Win32OperatingSystem.st
--- a/.hgtags	Mon Jan 16 19:56:32 2017 +0000
+++ b/.hgtags	Tue Jan 17 11:18:09 2017 +0000
@@ -10,6 +10,7 @@
 2e7fc0e4df9bba4892506790d0041601b9d0aa9b expecco_2_8_0a
 2e7fc0e4df9bba4892506790d0041601b9d0aa9b expecco_2_8_0b
 32b2b8791d17cdddb1a2db5660362643c60baa79 expecco_2_7_1
+36a0e5430705676f255ad1d04eb3cd5a7e2c09ac expecco_2_11_0
 373af30a15cafccd184b57b8492979e1969af65f rel3_4_1_1
 3816e831f5f3ed00876f38adbfaf1a25ad010ed7 rel2_10_8_6_last_before_vmData_change
 3a98fb1116bfbe6d245769532b7a38bb08e6d9ef expeccoNET_1_5_1rc1
@@ -53,7 +54,6 @@
 983d045c17f5f23c4d5b7e3644ec8921f68c11d8 rel2_10_8_5
 a5aa551f9b6ba0f59b7050cdf26a247f473b5e3c expeccoNET_1_7_0_0
 a7ae2d96849615e5d3a46f24faf788506428db65 dtm2_1
-a7c819d80c1ac90e60e3e5e197f89eab5c15ce4e expecco_2_10_1
 a811aef4aaf57908662de58120b05de02f38dd01 expecco_ALM_1_9_5
 a811aef4aaf57908662de58120b05de02f38dd01 expecco_ALM_1_9_6
 aa0aadd112add654df30c7777082b54ce4bae4af expeccoALM_1_9_0_1
--- a/Win32OperatingSystem.st	Mon Jan 16 19:56:32 2017 +0000
+++ b/Win32OperatingSystem.st	Tue Jan 17 11:18:09 2017 +0000
@@ -12220,17 +12220,17 @@
             }
         }
 
-        if (res == numHandles) {
-            // vmwait() added an IRQ event to the handles, and this one has been triggered
-            if (1 /* @global(InfoPrinting) == true */) {
-                console_fprintf(stderr, "Win32OS [info]: plugIn event has been handled\n");
+        if ((res < 0) || (res >= numHandles)) {
+            if (res == numHandles) {
+                // vmwait() added an IRQ event to the handles, and this one has been triggered
+                if (1 /* @global(InfoPrinting) == true */) {
+                    console_fprintf(stderr, "Win32OS [info]: plugIn event has been handled\n");
+                }
+            } else {
+                console_printf("- res=%d error1 %d\n", res, GetLastError());
             }
             goto done;
         }
-        if ((res < 0) || (res >= numHandles)) {
-            console_printf("- res=%d error1 %d\n", res, GetLastError());
-            goto done;
-        }
 
         idx = retArray[res];
         cntAll++;
@@ -12374,6 +12374,8 @@
      or not supported by OS
     "
     ^ self primitiveFailed
+
+    "Modified: / 15-01-2017 / 03:04:41 / stefan"
 !
 
 setBlocking:aBoolean on:fd