Changeset 29 for branches/1.0

Timestamp:

Apr 21, 2010, 7:37:01 PM (15 years ago)

Author:

herwigb

Message:

Implemented Find button, fixed length limit

Location:

branches/1.0/src

Files:

• build.cmd (modified) (1 diff)
• de/uni.dlg (modified) (1 diff)
• uni.c (modified) (5 diffs)
• uni.h (modified) (2 diffs)

branches/1.0/src/build.cmd

@@ -1 +1 @@
 @echo off
+echo Cleaning.
 @del uni.o
 @del uni.pdr
 @del .\de\uni.res
-echo Done cleaning.
-gcc -o utils.o utils.c -c>>build.log
+echo Done.
+echo Compiling.
+gcc -o utils.o utils.c -c>build.log
 gcc -o splpd.o splpd.c -c>>build.log
-gcc -o uni.o uni.c -c>build.log
-
-echo Done compiling.
+gcc -o uni.o uni.c -c>>build.log
+echo Done.
+echo Compiling resources.
 cd de
-RC -r uni.RC uni.RES 
+RC -r uni.RC uni.RES >>build.log
 cd ..
-echo Done compiling resource.
+echo Done.
+echo Linking.
 gcc -Zdll -Zbin-files -Zomf -o uni.pdr utils.o splpd.o uni.o uni.def .\de\uni.res >>build.log
-echo Done linking.
+echo Done.
+echo Attaching EAS.
 ea2 -e DEFAULT_PORT=UNI uni.pdr >>build.log
-echo Done attaching EA.
+echo Done.
 rem d:
 rem cd \OS2\DLL

branches/1.0/src/de/uni.dlg

@@ -26 +26 @@
         LTEXT           "Working directory:", DT_DIRECTORY, 13, 45, 203, 8
         ENTRYFIELD      "", ID_DIRECTORY, 15, 33, 200, 8, ES_MARGIN
-        PUSHBUTTON      "Find", PB_FIND, 13, 86, 62, 14, WS_DISABLED
+        PUSHBUTTON      "Find", DID_FIND, 13, 86, 62, 14
+        PUSHBUTTON      "Setup Wizard", DID_SETUPWIZARD, 155, 86, 62, 14
     END
 END

branches/1.0/src/uni.c

@@ -12 +12 @@
 #include    <stdio.h>
 #include    <stdlib.h>
+#include    <process.h>
 #include    "utils.h"
 
@@ -23 +24 @@
         CHAR        szTemp[ STR_LEN_PORTDESC ];
         CHAR        pwBuffer[256];
+        CHAR        setupwiz[256];
+        CHAR        setupparms[256];
         USHORT      i;
         ULONG       rc = 0;
         PUCHAR      token;
+        BOOL        ulResult = MBID_ERROR;
+        BOOL        fResult;
+        FILEDLG     fd;
+        CHAR        szMessage[ _MAX_PATH];
+        CHAR        szDrive[ _MAX_PATH];
+        CHAR        szDir[ _MAX_PATH];
+        PSZ         pszButtonCode;
 
         switch (msg)
@@ -31 +41 @@
                 case WM_INITDLG:
 //                      WinSendDlgItemMsg(hDlg,ID_BINARY,BM_SETCHECK,MPFROM2SHORT(1,0),NULL);
+                        WinSendDlgItemMsg(hDlg,ID_PROGRAM,   EM_SETTEXTLIMIT, MPFROMSHORT(128),NULL);
+                        WinSendDlgItemMsg(hDlg,ID_PARAMETERS,EM_SETTEXTLIMIT, MPFROMSHORT(128),NULL);
+                        WinSendDlgItemMsg(hDlg,ID_DIRECTORY, EM_SETTEXTLIMIT, MPFROMSHORT(128),NULL);
+
                         pUniData = (PUNIDATA)mp2;
                         WinSetWindowULong (hDlg, QWL_USER, (ULONG)pUniData);
@@ -158 +172 @@
                                         WinDismissDlg(hDlg, TRUE);
                                         break;
+                                case DID_FIND:
+                                        // setup data
+                                        memset( &fd, 0, sizeof( fd));
+                                        fd.cbSize    = sizeof( fd);
+                                        fd.fl        = FDS_CENTER | FDS_HELPBUTTON | FDS_OPEN_DIALOG;
+                                        fd.pszTitle  = "Find executable";
+                                        
+                                        WinQueryDlgItemText (hDlg, ID_PROGRAM, sizeof(szTemp), szTemp );
+                                        if (strlen(szTemp) > 0) {
+                                                _splitpath(szTemp, szDrive, szDir, NULL, NULL);
+                                                strncat(szDrive, szDir, strlen(szDir) -1);
+                                                strcat(szDrive,"\\*");
+                                                strcpy( fd.szFullFile,szDrive);
+                                        }
+                                        else strcpy( fd.szFullFile, "C:\\*");
+
+                                        // launch dialog
+                                        fResult = WinFileDlg( HWND_DESKTOP, hDlg, &fd);
+                                        if (!fResult)
+                                                sprintf( szMessage, "error launching WinFileDlg\n");
+                                        else if (fd.lReturn == DID_OK) {
+                                                WinSetDlgItemText(hDlg,ID_PROGRAM,fd.szFullFile);
+                                                _splitpath(fd.szFullFile, szDrive, szDir, NULL, NULL);
+                                                strncat(szDrive, szDir, strlen(szDir) -1);
+                                                WinSetDlgItemText(hDlg,ID_DIRECTORY,szDrive);
+                                        }
+                                        else
+                                            sprintf( szMessage, "error occurred!\n");
+                                        break;
+                                case DID_SETUPWIZARD:
+                                        // preliminary
+                                        WinDismissDlg(hDlg, TRUE);
+                                        sprintf(setupwiz,"unipdrcfg.exe");
+                                        rc = spawnlp(P_NOWAIT,setupwiz,setupwiz,pUniData->pszPortName,NULL);
+                                        // preliminary
+                                        WinDismissDlg(hDlg, TRUE);
+                                        break;
                                 case DID_CANCEL:
                                         WinDismissDlg(hDlg, MBID_CANCEL);
@@ -193 +244 @@
 }
 
+/*
+static ULONG _launchFileDlg( HWND hwnd, HWND hwndBubbleHelp)
+
+{
+         BOOL           ulResult = MBID_ERROR;
+         BOOL           fResult;
+         FILEDLG        fd;
+
+         CHAR           szMessage[ _MAX_PATH];
+         PSZ            pszButtonCode;
+
+// stop bubble help
+WtkDeactivateBubbleHelp( hwndBubbleHelp);
+
+do
+   {
+   // setup data
+   memset( &fd, 0, sizeof( fd));
+   fd.cbSize     = sizeof( fd);
+   fd.fl         = FDS_CENTER | FDS_HELPBUTTON | FDS_OPEN_DIALOG;
+   fd.pszTitle   = "System File test dialog";
+   strcpy( fd.szFullFile, "C:\\*");
+
+   // launch dialog
+   fResult = WinFileDlg( HWND_DESKTOP, hwnd, &fd);
+
+   if (!fResult)
+      sprintf( szMessage, "error launching WinFileDlg\n");
+   else if (fd.lReturn == DID_OK)
+      sprintf( szMessage, "file is: %s\n", fd.szFullFile);
+   else
+      sprintf( szMessage, "error occurred!\n");
+
+   switch (fd.lReturn)
+      {
+      case DID_OK:     pszButtonCode = "(DID_OK)";     break;
+      case DID_CANCEL: pszButtonCode = "(DID_CANCEL)"; break;
+      case DID_ERROR:  pszButtonCode = "(DID_ERROR)";  break;
+      default:         pszButtonCode = "";             break;
+      }
+
+   sprintf( &szMessage[ strlen( szMessage)],
+            "\015\015"
+            "return code is: %u %s\015"
+            "WinFileDlg error source code is: %u\015",
+            fd.lReturn, pszButtonCode, fd.lSRC);
+
+   WinMessageBox( HWND_DESKTOP, hwnd, szMessage, "File Dialog Result", 
+                  IDDLG_MSGBOX_RESULTFILEDLG, MB_MOVEABLE | MB_OK | MB_HELP);
+
+   // on error return error code
+   if (!fResult)
+      break;
+
+   // hand over result
+   ulResult = fd.lReturn;
+
+   } while (FALSE);
+
+
+// restart bubble help
+WtkActivateBubbleHelp( hwndBubbleHelp);
+return ulResult;
+}
+ */

branches/1.0/src/uni.h

@@ -44 +44 @@
 #define  INCL_DOSERRORS
 #define  INCL_WINHOOKS
+#define  INCL_WINSTDDLGS           /* CUA controls and dialogs */
 
 #include <os2.h>
@@ -239 +240 @@
 } PORTNAMES, *PPORTNAMES;
 
-#define GB_UNICFG                   206
-#define ID_PROGRAM                  210
-#define DT_PROGRAM                  211
-#define ID_PARAMETERS               212
-#define DT_PARAMETERS               213
-#define DT_DIRECTORY                214
-#define ID_DIRECTORY                215
-#define PB_FIND                     216
+#define GB_UNICFG                   201
+#define ID_PROGRAM                  202
+#define DT_PROGRAM                  203
+#define ID_PARAMETERS               204
+#define DT_PARAMETERS               205
+#define DT_DIRECTORY                206
+#define ID_DIRECTORY                207
+#define DID_FIND                    208
+#define DID_SETUPWIZARD             209