Eric Pouech : icinfo: Compile the IcInfo program as a command-line app.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 15bcb63bca6ac74c2f4d4dbbc5bb449fd52f4cb8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=15bcb63bca6ac74c2f4d4dbbc5bb449fd52f4cb8

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Thu Nov  3 21:54:05 2011 +0100

icinfo: Compile the IcInfo program as a command-line app.

---

 programs/icinfo/Makefile.in |    2 +-
 programs/icinfo/icinfo.c    |   18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/programs/icinfo/Makefile.in b/programs/icinfo/Makefile.in
index 16a5bb7..cbd49f9 100644
--- a/programs/icinfo/Makefile.in
+++ b/programs/icinfo/Makefile.in
@@ -1,6 +1,6 @@
 EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = icinfo.exe
-APPMODE   = -mwindows
+APPMODE   = -mconsole
 IMPORTS   = msvfw32
 
 C_SRCS = icinfo.c
diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c
index 3b882ac..345f813 100644
--- a/programs/icinfo/icinfo.c
+++ b/programs/icinfo/icinfo.c
@@ -23,15 +23,21 @@
 #include "vfw.h"
 
 
-int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
+int main(int argc, char* argv[])
 {
-    int n=0,doabout=0,doconfigure=0;
+    int i, n=0,doabout=0,doconfigure=0;
     char	buf[128],type[5],handler[5];
 
-    if (strstr(cmdline,"-about"))
-    	doabout = 1;
-    if (strstr(cmdline,"-configure"))
-    	doconfigure = 1;
+    for (i = 1; i < argc; i++) {
+        if (!strcmp(argv[i], "-about"))
+            doabout = 1;
+        else if (!strcmp(argv[i], "-configure"))
+            doconfigure = 1;
+        else {
+            printf("Unknown option: %s\n", argv[i]);
+            return -1;
+        }
+    }
 
     printf("Currently installed Video Compressors:\n");
     while (1) {