cleanup

Author: hiddenalpha

src/main/cpp/windows/jssc.cpp

@@ -252,29 +252,40 @@ JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_writeBytes
     OVERLAPPED *overlapped = new OVERLAPPED();
     overlapped->hEvent = CreateEventA(NULL, true, false, NULL);
     DWORD err = 0;
-    if(WriteFile(hComm, jBuffer, (DWORD)env->GetArrayLength(buffer), &lpNumberOfBytesWritten, overlapped)){
-        returnValue = lpNumberOfBytesWritten;
-    }else{
+    do{
+        err = !WriteFile(hComm, jBuffer, (DWORD)env->GetArrayLength(buffer), &lpNumberOfBytesWritten, overlapped);
+        if( !err ){ /* successfully written. we're already done. */
+            returnValue = lpNumberOfBytesWritten;
+            break;
+        }
         err = GetLastError();
-        if( err == ERROR_IO_PENDING ){
-            if(WaitForSingleObject(overlapped->hEvent, INFINITE) == WAIT_OBJECT_0){
-                if(GetOverlappedResult(hComm, overlapped, &lpNumberOfBytesTransferred, false)){
-                    returnValue = lpNumberOfBytesTransferred;
-                }
-            }else{
-                err = GetLastError();
-            }
+        if( err != ERROR_IO_PENDING ){
+            break; /* some unknown error occurred. Go reporting it. */
         }
-    }
+        /* our write above was async (IO_PENDING). So it was only fired off, but
+         * we do not know the result yet. Therefore we've to wait for the result. */
+        if( WaitForSingleObject(overlapped->hEvent, INFINITE) != WAIT_OBJECT_0 ){
+            /* too bad :( wait failed. */
+            err = GetLastError();
+            break;
+        }
+        /* waited successfully. Time to get the result. */
+        if( GetOverlappedResult(hComm, overlapped, &lpNumberOfBytesTransferred, false) ){
+            /* we know the result now */
+            returnValue = lpNumberOfBytesTransferred;
+            err = 0;
+        }else{ /* GetOverlappedResult has failed :( */
+            err = GetLastError();
+        }
+    }while(0);
     env->ReleaseByteArrayElements(buffer, jBuffer, 0);
     CloseHandle(overlapped->hEvent);
     delete overlapped;
-    if( returnValue < 0 ){
+    if( err ){
         char emsg[128];
-        snprintf(emsg, sizeof emsg, "Error %d. Details: https://learn.microsoft.com/en-us/windows/win32/debug/system-error-codes#system-error-codes", err);
+        snprintf(emsg, sizeof emsg, "Error %d: https://learn.microsoft.com/en-us/windows/win32/debug/system-error-codes#system-error-codes", err);
         jobject *exClz = env->FindClass("jssc/SerialPortException");
         if( exClz ) env->ThrowNew(exClz, emsg);
-        return 0;
     }
     return returnValue;
 }

src/main/java/jssc/SerialPort.java

@@ -411,15 +411,10 @@ public boolean setDTR(boolean enabled) throws SerialPortException {
      */
     @Deprecated
     public boolean writeBytes1(byte[] buffer) throws SerialPortException {
-        checkPortOpened("writeBytes()");
         /* Delegate to new method and translate result to what original method
          * did return. */
-        try{
-            int numWrittenBytes = writeBytes(buffer);
-            return numWrittenBytes == buffer.length;
-        } catch(IOException ex) {
-            throw SerialPortException.wrapNativeException(ex, this, "writeBytes1");
-        }
+        int numWrittenBytes = writeBytes(buffer);
+        return numWrittenBytes == buffer.length;
     }
 
     /**