Changeset 217

Timestamp:

Aug 30, 2002, 1:21:47 AM (23 years ago)

Author:

umoeller

Message:

Misc changes.

Location:

trunk

Files:

• include/helpers/winh.h (modified) (1 diff)
• src/helpers/dosh.c (modified) (2 diffs)
• src/helpers/except.c (modified) (3 diffs)
• src/helpers/procstat.c (modified) (2 diffs)
• src/helpers/winh.c (modified) (3 diffs)

trunk/include/helpers/winh.h

@@ -897 +897 @@
     VOID XWPENTRY winhSetNumLock(BOOL fState);
 
+    BOOL XWPENTRY winhSetClipboardText(HAB hab,
+                                       PCSZ pcsz,
+                                       ULONG cbSize);
+
     /*
      *@@ winhQueryScreenCX:

trunk/src/helpers/dosh.c

@@ -3749 +3749 @@
 
         // resolve DosPerfSysCall API entry
-        if (!(arc = DosLoadModule(NULL, 0, "DOSCALLS", &pPerfSys->hmod)))
+        if (!(arc = DosLoadModule(NULL,
+                                  0,
+                                  "DOSCALLS",
+                                  &pPerfSys->hmod)))
         {
             if (!(arc = DosQueryProcAddr(pPerfSys->hmod,
                                          976,
                                          "DosPerfSysCall",
-                                         (PFN*)(&pPerfSys->pDosPerfSysCall))))
+                                         (PFN*)&pPerfSys->pDosPerfSysCall)))
             {
                 // OK, we got the API: initialize!
-                if (!(arc = pPerfSys->pDosPerfSysCall(CMD_KI_ENABLE, 0, 0, 0)))
+                if (!(arc = pPerfSys->pDosPerfSysCall(CMD_KI_ENABLE,
+                                                      0,
+                                                      0,
+                                                      0)))
                 {
                     pPerfSys->fInitialized = TRUE;
@@ -3764 +3770 @@
                     if (!(arc = pPerfSys->pDosPerfSysCall(CMD_PERF_INFO,
                                                           0,
-                                                          (ULONG)(&pPerfSys->cProcessors),
+                                                          (ULONG)&pPerfSys->cProcessors,
                                                           0)))
                     {

trunk/src/helpers/except.c

@@ -451 +451 @@
  *@@changed V0.9.16 (2001-11-02) [pr]: make object display signed
  *@@changed V0.9.19 (2002-03-28) [umoeller]: added thread ordinal
+ *@@changed V0.9.21 (2002-08-28) [umoeller]: added OS revision to dump
  */
 
@@ -507 +508 @@
     // generic exception info
     DosQuerySysInfo(QSV_VERSION_MAJOR,      // 11
-                    QSV_VERSION_MINOR,      // 12
+                    QSV_VERSION_REVISION,   // 13 V0.9.21 (2002-08-28) [umoeller]
                     &aulBuf, sizeof(aulBuf));
     // Warp 3 is reported as 20.30
@@ -523 +524 @@
     }
     fprintf(file,
-            "Running OS/2 version: %u.%u (%s)\n",
+            "Running OS/2 version: %u.%u.%u (%s)\n",
             aulBuf[0],                      // major
             aulBuf[1],
+            aulBuf[2],              // revision V0.9.21 (2002-08-28) [umoeller]
             pcszVersion);
 

trunk/src/helpers/procstat.c

@@ -92 +92 @@
     APIRET arc = NO_ERROR;
     PQPROCSTAT16 pps = NULL;
-
-    /* PQPROCSTAT16 pps = (PQPROCSTAT16)malloc(0x8000);
-    if (!pps)
-        arc = ERROR_NOT_ENOUGH_MEMORY;
-    else */
 
     if (!ppps)
@@ -340 +335 @@
                   pProcess->ulType != 3;
                   pProcess = (PQPROCESS16)PTR(pProcess->ulThreadList,
-                             pProcess->usThreads * sizeof(QTHREAD16))
+                                              pProcess->usThreads * sizeof(QTHREAD16))
                 )
             {

trunk/src/helpers/winh.c

@@ -67 +67 @@
 #define INCL_WINCIRCULARSLIDER
 #define INCL_WINSTDFILE
+#define INCL_WINCLIPBOARD
 
 #define INCL_SPL
@@ -4705 +4706 @@
 
 /*
+ *@@ winhSetClipboardText:
+ *      sets the clipboard data to the given text,
+ *      replacing the current clipboard contents.
+ *
+ *@@added V0.9.21 (2002-08-28) [umoeller]
+ */
+
+BOOL winhSetClipboardText(HAB hab,
+                          PCSZ pcsz,
+                          ULONG cbSize)     // in: size of buffer INCLUDING null byte
+{
+    BOOL    fSuccess = FALSE;
+
+    if (WinOpenClipbrd(hab))
+    {
+        PSZ pszDest;
+        if (!DosAllocSharedMem((PVOID*)&pszDest,
+                               NULL,
+                               cbSize,
+                               PAG_WRITE | PAG_COMMIT | OBJ_GIVEABLE))
+        {
+            memcpy(pszDest,
+                   pcsz,
+                   cbSize);
+
+            WinEmptyClipbrd(hab);
+
+            fSuccess = WinSetClipbrdData(hab,       // anchor-block handle
+                                         (ULONG)pszDest, // pointer to text data
+                                         CF_TEXT,        // data is in text format
+                                         CFI_POINTER);   // passing a pointer
+
+            // PMREF says (implicitly) it is not necessary to call
+            // DosFreeMem. I hope that is correct.
+            // V0.9.19 (2002-06-02) [umoeller]
+        }
+
+        WinCloseClipbrd(hab);
+    }
+
+    return fSuccess;
+}
+
+/*
  *@@category: Helpers\PM helpers\Extended frame windows
  */
@@ -4953 +4998 @@
     {
         // allocate buffer
-        pObjClass = (POBJCLASS)malloc(ulSize+1);
+        pObjClass = (POBJCLASS)malloc(ulSize + 1);
         // and load the classes into it
         WinEnumObjectClasses(pObjClass, &ulSize);
     }
 
-    return ((PBYTE)pObjClass);
+    return (PBYTE)pObjClass;
 }