Changeset 1488 for trunk/dll/assoc.c

Timestamp:

Dec 22, 2009, 12:42:55 AM (16 years ago)

Author:

Gregg Young

Message:

Fixed commands so reordering them in commands.dat no longer changes their ID or hot key assignment; added 20 new hot keys; the environment information is now used when executing a command; some code clean up in command.c; added CheckExecutibleFlags to systemf.c the eliminate repetative code in assoc.c, command.c & cmdline.c

File:

• trunk/dll/assoc.c (modified) (7 diffs)

trunk/dll/assoc.c

@@ -21 +21 @@
   24 Aug 08 GKY Warn full drive on save of .DAT file; prevent loss of existing file
   15 Nov 09 GKY Add check for attempt to open zero byte file (avoids MMPM trying to play them)
+  21 Dec 09 GKY Added CheckExecutibleFlags to streamline code in command.c assoc.c & cmdline.c
 
 **************************************************************************************/
@@ -755 +756 @@
         }
         bstrip(temp.mask);
-        bstrip(temp.pszCmdLine);
-        if (WinQueryButtonCheckstate(hwnd, ASS_DEFAULT))
+        bstrip(temp.pszCmdLine);
+        temp.flags = CheckExecutibleFlags(hwnd, 1);
+        /*if (WinQueryButtonCheckstate(hwnd, ASS_DEFAULT))
           temp.flags = 0;
         else if (WinQueryButtonCheckstate(hwnd, ASS_FULLSCREEN))
@@ -771 +773 @@
           temp.flags |= DIEAFTER;
         if (WinQueryButtonCheckstate(hwnd, ASS_PROMPT))
-          temp.flags |= PROMPT;
+          temp.flags |= PROMPT;*/
         if (fCancelAction){
           fCancelAction = FALSE;
@@ -830 +832 @@
         }
         bstrip(temp.mask);
-        bstrip(temp.pszCmdLine);
-        if (WinQueryButtonCheckstate(hwnd, ASS_DEFAULT))
+        bstrip(temp.pszCmdLine);
+        temp.flags = CheckExecutibleFlags(hwnd, 1);
+        /*if (WinQueryButtonCheckstate(hwnd, ASS_DEFAULT))
           temp.flags = 0;
         else if (WinQueryButtonCheckstate(hwnd, ASS_FULLSCREEN))
@@ -846 +849 @@
           temp.flags |= DIEAFTER;
         if (WinQueryButtonCheckstate(hwnd, ASS_PROMPT))
-          temp.flags |= PROMPT;
+          temp.flags |= PROMPT;*/
         if (fCancelAction){
           fCancelAction = FALSE;
@@ -934 +937 @@
         }
         bstrip(temp.mask);
-        bstrip(temp.pszCmdLine);
-        if (WinQueryButtonCheckstate(hwnd, ASS_DEFAULT))
+        bstrip(temp.pszCmdLine);
+        temp.flags = CheckExecutibleFlags(hwnd, 1);
+        /*if (WinQueryButtonCheckstate(hwnd, ASS_DEFAULT))
           temp.flags = 0;
         else if (WinQueryButtonCheckstate(hwnd, ASS_FULLSCREEN))
@@ -950 +954 @@
           temp.flags |= DIEAFTER;
         if (WinQueryButtonCheckstate(hwnd, ASS_PROMPT))
-          temp.flags |= PROMPT;
+          temp.flags |= PROMPT;*/
         if (fCancelAction){
           fCancelAction = FALSE;