Changeset 10185 for trunk/src/kernel32

Timestamp:

Jul 28, 2003, 1:35:32 PM (22 years ago)

Author:

sandervl

Message:

Updates

Location:

trunk/src/kernel32

Files:

• hmcomm.cpp (modified) (16 diffs)
• kernelrsrc.orc (modified) (2 diffs)
• message.cpp (modified) (7 diffs)
• overlappedio.cpp (modified) (2 diffs)

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.39 2003-05-23 13:53:43 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.40 2003-07-28 11:35:31 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 #include <os2win.h>
 #include <string.h>
+#include <stdio.h>
 #include <handlemanager.h>
 #include "handlenames.h"
@@ -64 +65 @@
 static char *DebugCommEvent(DWORD dwEvents);
 static char *DebugModemStatus(DWORD dwModemStatus);
+#ifdef DEBUG_COMOUTPUT
+static FILE *comlog = NULL;
+#endif
 #endif
 //******************************************************************************
@@ -117 +121 @@
     HandleNamesAddSymbolicLink("AUX:",       "COM1");
     HandleNamesAddSymbolicLink("\\\\.\\AUX", "COM1");
+#ifdef DEBUG_COMOUTPUT
+    comlog = fopen("comlog", "w");
+#endif
 }
 
@@ -229 +236 @@
             return rc;
         }
+
         rc = SetBaud(pHMHandleData,9600);
         dprintf(("Init Baud to 9600 rc = %d",rc));
@@ -328 +336 @@
 
     *lpdwResult = (ret) ? ulBytesRead : 0;
-    dprintf2(("KERNEL32: CommReadIOHandler %d bytes read", *lpdwResult));
+    dprintf(("KERNEL32: CommReadIOHandler %d bytes read", *lpdwResult));
 
     if(ret == FALSE) {
@@ -335 +343 @@
     else {
 #ifdef DEBUG
+        if(ulBytesRead < qInfo.cch) {
+            dprintf(("WARNING: Not all data removed from queue!!"));
+        }
         dprintf2(("%d Bytes read:", ulBytesRead));
         for(int i=0;i<min(ulBytesRead, 16);i++) {
@@ -372 +383 @@
     dprintf2(("KERNEL32:CommWriteIOHandler %d byte(s) written", *lpdwResult));
 
+    if(ulBytesWritten != lpRequest->nNumberOfBytes) {
+        dprintf(("WARNING: ulBytesWritten (%d) != lpRequest->nNumberOfBytes (%d)", ulBytesWritten, lpRequest->nNumberOfBytes));
+    }
     if(ret == FALSE) {
        dprintf(("!ERROR!: CommWriteIOHandler failed with rc %d", GetLastError()));
@@ -432 +446 @@
         dwEvent |= (COMEvt&0x0100)? EV_RING:0;
  
+#ifdef DEBUG
+        if(dwEvent & EV_ERR) {
+            ULONG COMErr = 0;
+
+            rc = OSLibDosDevIOCtl( pHMHandleData->hHMHandle,
+                    IOCTL_ASYNC,
+                    ASYNC_GETCOMMERROR,
+                    0,0,0,
+                    &COMErr,2,&ulLen);
+
+            dprintf(("!!!!!!!----> ERROR OCCURRED (EV_ERR) reason %x <-----!!!!!", COMErr));
+
+        }
+#endif
         if((dwEvent & EV_RXCHAR) && (dwMask & EV_RXCHAR)) 
         {
@@ -509 +537 @@
     }
 
+#ifdef DEBUG
+    dprintf2(("WriteFile: bytes to write:"));
+    for(int i=0;i<min(nNumberOfBytesToWrite, 16);i++) {
+        dprintf2(("%x %c", ((char *)lpBuffer)[i], ((char *)lpBuffer)[i]));
+    }
+#endif
+
     if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) {
         return pDevData->iohandler->WriteFile(pHMHandleData->hWin32Handle, lpBuffer, nNumberOfBytesToWrite,
@@ -517 +552 @@
                         &ulBytesWritten);
 
-    if(lpNumberOfBytesWritten) {
+    if(lpNumberOfBytesWritten) { 
        *lpNumberOfBytesWritten = (ret) ? ulBytesWritten : 0;
        dprintf2(("KERNEL32:HMDeviceCommClass::WriteFile %d byte(s) written", *lpNumberOfBytesWritten));
@@ -593 +628 @@
         *lpNumberOfBytesRead = (ret) ? ulBytesRead : 0;
         dprintf2(("KERNEL32:HMDeviceCommClass::ReadFile %d bytes read", *lpNumberOfBytesRead));
+        if(qInfo.cch > ulBytesRead) {
+            dprintf(("Warning: more bytes available!!"));
+        }
     }
     if(ret == FALSE) {
@@ -599 +637 @@
 #ifdef DEBUG
     else {
+        int i;
         dprintf2(("%d Bytes read:", ulBytesRead));
-        for(int i=0;i<min(ulBytesRead, 16);i++) {
+#ifdef DEBUG_COMOUTPUT
+        char *tmp = (char *)malloc(ulBytesRead+1);
+        memcpy(tmp, lpBuffer, ulBytesRead);
+        tmp[ulBytesRead] = 0;
+        dprintf2(("RF: %s", tmp));
+        WORD sel = RestoreOS2FS();
+        for(i=0;i<ulBytesRead;i++) {
+            fprintf(comlog, "%c", tmp[i]);
+        }
+        SetFS(sel);
+        free(tmp);
+#endif
+        for(i=0;i<ulBytesRead;i++) {
             dprintf2(("%x %c", ((char *)lpBuffer)[i], ((char *)lpBuffer)[i]));
         }
@@ -893 +944 @@
   if(lpdwErrors == NULL) 
      lpdwErrors = &dwError;
-
+ 
   dprintf(("HMDeviceCommClass::ClearCommError"));
   ulLen = sizeof(USHORT);
@@ -908 +959 @@
   *lpdwErrors |= (COMErr & 0x0008)?CE_FRAME:0;
 
+  dprintf(("Error %x", *lpdwErrors));
   if(lpcst)
   {
@@ -1530 +1582 @@
     pCurDCB->XoffChar           = XoffChar;
     pCurDCB->ErrorChar          = ErrorChar;
+
+    dprintf(("OS/2 DCB:\n"
+             " WriteTimeout           : %d\n"
+             " ReadTimeout            : %d\n"
+             " CtlHandshake           : 0x%x\n"
+             " FlowReplace            : 0x%x\n"
+             " Timeout                : 0x%x\n"
+             " Error replacement Char : 0x%x\n"
+             " Break replacement Char : 0x%x\n"
+             " XON Char               : 0x%x\n"
+             " XOFF Char              : 0x%x\n",
+             os2dcb.usWriteTimeout,
+             os2dcb.usReadTimeout,
+             os2dcb.fbCtlHndShake,
+             os2dcb.fbFlowReplace,
+             os2dcb.fbTimeOut,
+             os2dcb.bErrorReplacementChar,
+             os2dcb.bBreakReplacementChar,
+             os2dcb.bXONChar,
+             os2dcb.bXOFFChar));
+
   }
 

trunk/src/kernel32/kernelrsrc.orc

@@ -1 @@
-/* $Id: kernelrsrc.orc,v 1.3 2002-02-07 16:34:52 sandervl Exp $ */
+/* $Id: kernelrsrc.orc,v 1.4 2003-07-28 11:35:31 sandervl Exp $ */
 
 #include "winuser.h"
@@ -42 +42 @@
 
 #include "nls\locale_rc.rc"
+#include "messages\winerr_enu.mc.rc"

trunk/src/kernel32/message.cpp

@@ -1 @@
-/* $Id: message.cpp,v 1.13 2000-10-20 11:46:47 sandervl Exp $ */
+/* $Id: message.cpp,v 1.14 2003-07-28 11:35:31 sandervl Exp $ */
 
 /*
@@ -60 +60 @@
         DWORD   offset;
     } *se;
-    struct      _stringentry {
-        WORD    len;
-        WORD    unknown;
-        CHAR    str[1];
-    } *stre;
+    MESSAGE_RESOURCE_ENTRY *stre;
 
     /*FIXME: I am not sure about the '1' ... But I've only seen those entries*/
@@ -78 +74 @@
     for (i=nrofentries;i--;) {
         if ((id>=se->firstentry) && (id<=se->lastentry)) {
-            stre = (struct _stringentry*)(p+se->offset);
+            stre = (PMESSAGE_RESOURCE_ENTRY)(p+se->offset);
             id  -= se->firstentry;
             break;
@@ -87 +83 @@
         return 0;
     for (i=id;i--;) {
-        if (!(slen=stre->len))
+        if (!(slen=stre->Length))
                 return 0;
-        stre = (struct _stringentry*)(((char*)stre)+slen);
+        stre = (PMESSAGE_RESOURCE_ENTRY)(((char*)stre)+slen);
     }
-    slen=stre->len;
+    slen=stre->Length;
 
     i = min(buflen - 1, slen);
@@ -97 +93 @@
         return slen; /* different to LoadString */
     if (i>0) {
-        strncpy(buffer,stre->str,i);
-        buffer[i]=0;
+        if (stre->Flags & MESSAGE_RESOURCE_UNICODE)
+            WideCharToMultiByte( CP_ACP, 0, (LPWSTR)stre->Text, -1, buffer, i, NULL, NULL );
+        else
+            lstrcpynA(buffer, (LPSTR)stre->Text, i);
+        buffer[i]=0;
     } else {
         if (buflen>1) {
@@ -166 +165 @@
    if (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)
    {
-      from = (char*)HeapAlloc( GetProcessHeap(),0,200 );
-      sprintf(from,"Systemmessage, messageid = 0x%08lx\n",dwMessageId);
+      INT bufsize;
+      HMODULE hmodule;
+
+      hmodule = GetModuleHandleA("kernel32");
+      bufsize=LoadMessageA(hmodule,dwMessageId,dwLanguageId,NULL,100);
+      if (bufsize)
+      {
+        from = (char*)HeapAlloc( GetProcessHeap(), 0, bufsize + 1 );
+        LoadMessageA(hmodule,dwMessageId,dwLanguageId,from,bufsize+1);
+      }
    }
 
@@ -415 +422 @@
    if (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)
    {
-      /* gather information from system message tables ... */
-      from = (char*)HeapAlloc( GetProcessHeap(),0,200 );
-      sprintf(from,"Systemmessage, messageid = 0x%08lx\n",dwMessageId);
+      INT bufsize;
+      HMODULE hmodule;
+
+      hmodule = GetModuleHandleA("kernel32");
+      bufsize=LoadMessageA(hmodule,dwMessageId,dwLanguageId,NULL,100);
+      if (bufsize)
+      {
+        from = (char*)HeapAlloc( GetProcessHeap(), 0, bufsize + 1 );
+        LoadMessageA(hmodule,dwMessageId,dwLanguageId,from,bufsize+1);
+      }
    }
 

trunk/src/kernel32/overlappedio.cpp

@@ -1 @@
-/* $Id: overlappedio.cpp,v 1.20 2002-10-10 16:28:40 sandervl Exp $ */
+/* $Id: overlappedio.cpp,v 1.21 2003-07-28 11:35:32 sandervl Exp $ */
 
 /*
@@ -87 +87 @@
         threadparam->lpOverlappedObj = this;
         hThreadWrite = ::CreateThread(NULL, 32*1024, OverlappedIOThread, (LPVOID)threadparam, 0, &dwThreadId);
+        SetThreadPriority(hThreadWrite, THREAD_PRIORITY_TIME_CRITICAL);
         if(hThreadWrite) {//thread uses this object; keep reference count to avoid premature destruction
             AddRef();