Changeset 22107 for branches/swt/testapp/apitest/src

Timestamp:

Dec 4, 2015, 2:12:34 PM (10 years ago)

Author:

rousseau

Message:

Added Change Application Type code [apitest]

Changes:
o Added change application type code

With this we have a very simple console-window and printf can be used.

o Added a little more documentation in the 'doc' directory
o Added stubs for the test-menu items
o Corrected 'ids.h' which was generated with tabs
o Added 'ApiTest.properties'
o Added 'fc.mnu' so pressing F2 in File Commander shows its User Menu

Location:

branches/swt/testapp/apitest/src

Files:

• PmApiTest.cpp (modified) (10 diffs)
• PmApiTest.def (modified) (1 diff)
• ids.h (modified) (1 diff)
• resource.rc (modified) (1 diff)

branches/swt/testapp/apitest/src/PmApiTest.cpp

@@ -3 +3 @@
 * PmApiTest.cpp                                                               *
 * --------------------------------------------------------------------------- *
-* This file is generated from an xmind-file !                                 *
-* It uses the newly designed transformation-sheet.                            *
-* While this sheet is still file-based, it will be moved to an Ant Property   *
-* later so it can be constructed from parts.                                  *
+* This is the PM version of the ApiTest program.                              *
+* It is used as a casco to construct the basic structure.                     *
+* Note that this is not the program of focus, that would be the Odin32 and    *
+* Win32 variants which will use the Odin32-API and will be added in upcoming  *
+* commits.                                                                    *
 \*****************************************************************************/
 
@@ -18 +19 @@
 
 /*
-// Include the Platform headers.
+// Include the Platform headers for OS/2.
 */
 #define     INCL_DOS
@@ -26 +27 @@
 
 /*
+// Module related include-files.
+*/
+#include    "ids.h"
+
+/*
 // Minimal Window Procedure.
 */
-MRESULT EXPENTRY    MyWindowProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) {
+MRESULT EXPENTRY    PmWindowProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) {
     /*
     // Local Variables follow here.
@@ -67 +73 @@
                     hwnd,                       // Owner (client-window)
                     HWND_TOP,                   // Z-order
-                    123,                        // Window ID
+                    ID_EXIT,                    // Window ID
                     NULL,                       // Control Data (none)
                     NULL                        // Presentation Parameters (none)
@@ -81 +87 @@
         case WM_COMMAND:
             switch (SHORT1FROMMP(mp1)) {
-                /* This is a message from our button, we post a message to close the window */
-                case 123:
+
+                /* Message from the button, we post a message to close the window */
+                case ID_EXIT:
                     WinPostMsg(hwnd, WM_CLOSE, NULL, NULL);
                     break;
+
+                /* Exit Message from the File Menu, forward it to ID_EXIT */
+                case ID_FILE_EXIT:
+                    WinPostMsg(hwnd, WM_COMMAND, (MPARAM) ID_EXIT, NULL);
+                    break;
+
+                /* Messages from the Test Menu */
+                case ID_TEST1:
+                    printf("WM_COMMAND received, id: %04d\n", SHORT1FROMMP(mp1));
+                    break;
+                case ID_TEST2:
+                    printf("WM_COMMAND received, id: %04d\n", SHORT1FROMMP(mp1));
+                    break;
+                case ID_TEST3:
+                    printf("WM_COMMAND received, id: %04d\n", SHORT1FROMMP(mp1));
+                    break;
+                case ID_TEST4:
+                    printf("WM_COMMAND received, id: %04d\n", SHORT1FROMMP(mp1));
+                    break;
+                case ID_TEST5:
+                    printf("WM_COMMAND received, id: %04d\n", SHORT1FROMMP(mp1));
+                    break;
+                case ID_TEST6:
+                    printf("WM_COMMAND received, id: %04d\n", SHORT1FROMMP(mp1));
+                    break;
+                case ID_TEST7:
+                    printf("WM_COMMAND received, id: %04d\n", SHORT1FROMMP(mp1));
+                    break;
+
             }
-            break;
+            break;  /*WM_COMMAND*/
 
         /*
@@ -157 +193 @@
 
 
-    /* Initialize the Graphics System */
+    /*
+    // Switch the process type to PM so the command line app can create PM
+    // windows. This makes it possible to use printf() to stdout.
+    */
+    do {
+        PTIB   ptib;
+        PPIB   ppib;
+        //break;
+        if(DosGetInfoBlocks(&ptib, &ppib) == 0) {
+            ppib->pib_ultype = 3;
+        }
+    } while (0);
+
+
+
+    /* Initialize the PM Graphics System */
     hab = WinInitialize(NULL);
 
@@ -164 +215 @@
 
     /* Register the class of the Main Window */
-    brc = WinRegisterClass(hab, pszClassClient, MyWindowProc, CS_SIZEREDRAW,  0);
+    brc = WinRegisterClass(hab, pszClassClient, PmWindowProc, CS_SIZEREDRAW,  0);
 
     /* Create the Main Window */
@@ -178 +229 @@
         &hwndClient         // Storage for Client Handle
     );
+
+
+
+    /*
+    // Show the handles of the windows created.
+    // The application has to be built as WINDOWCOMPAT and the code to change
+    // the application-type to PM has to be active.
+    */
+    do {
+        int delay = 1000;
+        int i = 0;
+        //break;
+        printf("hwndFrame=%08X\n", hwndFrame);
+        printf("hwndClient=%08X\n", hwndClient);
+        break;
+        for (i=5; i>0; i--) {
+            i > 1 ? printf("Pausing for %d seconds...\n", i) : printf("Pausing for %d second...\n", i);
+            DosSleep(delay);
+        }
+        printf("Continuing program...\n");
+    } while (0);
 
 
@@ -206 +278 @@
     brc = WinTerminate(hab);
 
+    /* App is terminating */
+    printf("PmApiTest is terminating...\n");
+
     /* Return our reply-code */
     return 0;
@@ -217 +292 @@
     printf("\n");
     printf("%s\n","###############################################################################");
-    printf("%s\n","# This is the PM version of ApiTest                      version.201511231348 #");
+    printf("%s\n","# This is the PM version of ApiTest                      version.201512030711 #");
     printf("%s\n","###############################################################################");
     printf("\n");
+    printf("%s\n","Switching to Graphical Mode with this Window as a Console Log...");
 
     /*

branches/swt/testapp/apitest/src/PmApiTest.def

@@ -6 +6 @@
 ;# which is to test Odin32 from Native PM.                                    #
 ;# This version has low development priority since it does not directly       #
-;# connection to SWT-OS2, which is the project depending on Odin32.           #
+;# connect to SWT-OS2, which is the project depending on Odin32.              #
 ;##############################################################################
 
-NAME            PmApiTest   WINDOWAPI
+
+NAME            PmApiTest   WINDOWCOMPAT
 DESCRIPTION     'A Program to test the Odin32 API from Native PM'
 

branches/swt/testapp/apitest/src/ids.h

@@ -5 +5 @@
 \*****************************************************************************/
 
-#ifndef         __IDS_H__
-#define         __IDS_H__
+#ifndef     __IDS_H__
+#define     __IDS_H__
 
-#define         IDR_MAINMENU    1
+#define     IDR_MAINMENU    1
 
-#define         IDM_FILE                1000
-#define         ID_FILE_EXIT    1001
+#define     IDM_FILE        1000
+#define     ID_FILE_EXIT    1001
 
-#define         IDM_TESTING             1100
-#define         ID_TEST1                1101
-#define         ID_TEST2                1102
-#define         ID_TEST3                1103
-#define         ID_TEST4                1104
-#define         ID_TEST5                1105
-#define         ID_TEST6                1106
-#define         ID_TEST7                1107
+#define     IDM_TESTING     1100
+#define     ID_TEST1        1101
+#define     ID_TEST2        1102
+#define     ID_TEST3        1103
+#define     ID_TEST4        1104
+#define     ID_TEST5        1105
+#define     ID_TEST6        1106
+#define     ID_TEST7        1107
 
-#define         IDM_HELP                1200
-#define         ID_HELP_ABOUT   1201
+#define     IDM_HELP        1200
+#define     ID_HELP_ABOUT   1201
 
-#endif
+#define     ID_EXIT         123
+
+#endif  /*__IDS_H__*/

branches/swt/testapp/apitest/src/resource.rc

@@ -11 +11 @@
 MENU IDR_MAINMENU PRELOAD
 BEGIN
-    SUBMENU "~File",            IDM_FILE
+    SUBMENU "~File",                IDM_FILE
     BEGIN
-        MENUITEM "E~xit",       ID_FILE_EXIT
+        MENUITEM "E~xit",           ID_FILE_EXIT
     END
-    SUBMENU "~Testing",         IDM_TESTING
+    SUBMENU "~Testing",             IDM_TESTING
     BEGIN
         MENUITEM "Test ~1",         ID_TEST1