Fixes for building with __MINGW32_VERSION 2.1

svn path=/trunk/; revision=3388

diff --git a/rosapps/Makefile b/rosapps/Makefile
index a9d7f99..21b3a85 100644 (file)
--- a/rosapps/Makefile
+++ b/rosapps/Makefile
@@ -27,6 +27,7 @@ APPS =        calc \
        net\arp \
        net\finger \
        net\ipconfig \
        net\arp \
        net\finger \
        net\ipconfig \

+       net\ipecho \

        net\ncftp \
        net\netstat \
        net\niclist \
        net\ncftp \
        net\netstat \
        net\niclist \

diff --git a/rosapps/calc/.cvsignore b/rosapps/calc/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/calc/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/cmd/.cvsignore b/rosapps/cmd/.cvsignore
index dcdb369..b8b4afb 100644 (file)
--- a/rosapps/cmd/.cvsignore
+++ b/rosapps/cmd/.cvsignore
@@ -1 +1,16 @@
-cmd.coff
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/cmdutils/.cvsignore b/rosapps/cmdutils/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/cmdutils/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/cmdutils/touch/.cvsignore b/rosapps/cmdutils/touch/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/cmdutils/touch/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/control/.cvsignore b/rosapps/control/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/control/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/dflat32/.cvsignore b/rosapps/dflat32/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/dflat32/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/hcalc/.cvsignore b/rosapps/hcalc/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/hcalc/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/installapps.bat b/rosapps/installapps.bat
index 8d86036..6761d2a 100644 (file)
--- a/rosapps/installapps.bat
+++ b/rosapps/installapps.bat
@@ -24,6 +24,7 @@ copy net\arp\arp.exe                  %ROS_INSTALL%\bin
 copy net\echo\echo.exe                 %ROS_INSTALL%\bin
 copy net\finger\finger.exe             %ROS_INSTALL%\bin
 copy net\ipconfig\ipconfig.exe                 %ROS_INSTALL%\bin
 copy net\echo\echo.exe                 %ROS_INSTALL%\bin
 copy net\finger\finger.exe             %ROS_INSTALL%\bin
 copy net\ipconfig\ipconfig.exe                 %ROS_INSTALL%\bin

+copy net\ipecho\ipecho.exe             %ROS_INSTALL%\bin

 copy net\ncftp\ncftp.exe               %ROS_INSTALL%\bin
 copy net\netstat\netstat.exe           %ROS_INSTALL%\bin
 copy net\niclist\niclist.exe           %ROS_INSTALL%\bin
 copy net\ncftp\ncftp.exe               %ROS_INSTALL%\bin
 copy net\netstat\netstat.exe           %ROS_INSTALL%\bin
 copy net\niclist\niclist.exe           %ROS_INSTALL%\bin

diff --git a/rosapps/lib/dflat32/.cvsignore b/rosapps/lib/dflat32/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/lib/dflat32/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/mc/.cvsignore b/rosapps/mc/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/mc/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/mc/release/.cvsignore b/rosapps/mc/release/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/mc/release/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/arp/.cvsignore b/rosapps/net/arp/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/arp/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/finger/.cvsignore b/rosapps/net/finger/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/finger/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/ipconfig/.cvsignore b/rosapps/net/ipconfig/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/ipconfig/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/ipconfig/ipconfig.c b/rosapps/net/ipconfig/ipconfig.c
index 1aa8b3c..1e19a8c 100644 (file)
--- a/rosapps/net/ipconfig/ipconfig.c
+++ b/rosapps/net/ipconfig/ipconfig.c
@@ -55,25 +55,36 @@ TCHAR* GetNodeTypeName(int nNodeType)
 
 void ShowNetworkFixedInfo()
 {
 
 void ShowNetworkFixedInfo()
 {

-    FIXED_INFO FixedInfo;
-    ULONG OutBufLen = sizeof(FIXED_INFO);
+    FIXED_INFO* pFixedInfo = NULL;
+    ULONG OutBufLen = 0;

     DWORD result;
 
     DWORD result;
 

+    result = GetNetworkParams(NULL, &OutBufLen);
+    if (result == ERROR_BUFFER_OVERFLOW) {
+        pFixedInfo = (FIXED_INFO*)malloc(OutBufLen);
+        if (!pFixedInfo) {
+            _tprintf(_T("ERROR: failed to allocate 0x%08X bytes of memory\n"), OutBufLen);
+            return;
+        }
+    } else {
+        _tprintf(_T("ERROR: GetNetworkParams() failed to report required buffer size.\n"));
+        return;
+    }

 
 

-    result = GetNetworkParams(&FixedInfo, &OutBufLen);
+    result = GetNetworkParams(pFixedInfo, &OutBufLen);

     if (result == ERROR_SUCCESS) {
     if (result == ERROR_SUCCESS) {

-             printf("\tHostName. . . . . . . . . . . : %s\n",  FixedInfo.HostName);
-             printf("\tDomainName. . . . . . . . . . : %s\n",  FixedInfo.DomainName);
-        _tprintf(_T("\tNodeType. . . . . . . . . . . : %d (%s)\n"), FixedInfo.NodeType, GetNodeTypeName(FixedInfo.NodeType));
-             printf("\tScopeId . . . . . . . . . . . : %s\n",  FixedInfo.ScopeId);
-        _tprintf(_T("\tEnableRouting . . . . . . . . : %s\n"), FixedInfo.EnableRouting ? _T("yes") : _T("no"));
-        _tprintf(_T("\tEnableProxy . . . . . . . . . : %s\n"), FixedInfo.EnableProxy ? _T("yes") : _T("no"));
-        _tprintf(_T("\tEnableDns . . . . . . . . . . : %s\n"), FixedInfo.EnableDns ? _T("yes") : _T("no"));
+             printf("\tHostName. . . . . . . . . . . : %s\n",  pFixedInfo->HostName);
+             printf("\tDomainName. . . . . . . . . . : %s\n",  pFixedInfo->DomainName);
+        _tprintf(_T("\tNodeType. . . . . . . . . . . : %d (%s)\n"), pFixedInfo->NodeType, GetNodeTypeName(pFixedInfo->NodeType));
+             printf("\tScopeId . . . . . . . . . . . : %s\n",  pFixedInfo->ScopeId);
+        _tprintf(_T("\tEnableRouting . . . . . . . . : %s\n"), pFixedInfo->EnableRouting ? _T("yes") : _T("no"));
+        _tprintf(_T("\tEnableProxy . . . . . . . . . : %s\n"), pFixedInfo->EnableProxy ? _T("yes") : _T("no"));
+        _tprintf(_T("\tEnableDns . . . . . . . . . . : %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no"));

         _tprintf(_T("\n"));
         //_tprintf(_T("\n"), );
         //_tprintf(_T("GetNetworkParams() returned with %d\n"), pIfTable->NumAdapters);
 
         _tprintf(_T("\n"));
         //_tprintf(_T("\n"), );
         //_tprintf(_T("GetNetworkParams() returned with %d\n"), pIfTable->NumAdapters);
 

-//      _tprintf(_T("\tConnection specific DNS suffix: %s\n"), FixedInfo.EnableDns ? _T("yes") : _T("no"));
+//      _tprintf(_T("\tConnection specific DNS suffix: %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no"));

 
     } else {
         switch (result) {
 
     } else {
         switch (result) {


@@ -199,6 +210,9 @@ void usage(void)
 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {

+
+    // 10.0.0.100    // As of build 0.0.20 this is hardcoded in the ip stack
+

     if (argc > 1) {
         usage();
         return 1;
     if (argc > 1) {
         usage();
         return 1;

diff --git a/rosapps/net/ncftp/.cvsignore b/rosapps/net/ncftp/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/ncftp/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/ncftp/Strn/.cvsignore b/rosapps/net/ncftp/Strn/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/ncftp/Strn/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/ncftp/libncftp/.cvsignore b/rosapps/net/ncftp/libncftp/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/ncftp/libncftp/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/ncftp/ncftp/.cvsignore b/rosapps/net/ncftp/ncftp/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/ncftp/ncftp/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/ncftp/sio/.cvsignore b/rosapps/net/ncftp/sio/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/ncftp/sio/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/netstat/.cvsignore b/rosapps/net/netstat/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/netstat/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/niclist/.cvsignore b/rosapps/net/niclist/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/niclist/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/ping/.cvsignore b/rosapps/net/ping/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/ping/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/telnet/.cvsignore b/rosapps/net/telnet/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/telnet/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/telnet/src/.cvsignore b/rosapps/net/telnet/src/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/telnet/src/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/net/whois/.cvsignore b/rosapps/net/whois/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/net/whois/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/notevil/.cvsignore b/rosapps/notevil/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/notevil/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/regedit/.cvsignore b/rosapps/regedit/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/regedit/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/regedit/main.h b/rosapps/regedit/main.h
index d956b9c..a0e9b28 100644 (file)
--- a/rosapps/regedit/main.h
+++ b/rosapps/regedit/main.h
@@ -79,7 +79,7 @@ extern TCHAR szTitle[];
 extern TCHAR szFrameClass[];
 extern TCHAR szChildClass[];
 
 extern TCHAR szFrameClass[];
 extern TCHAR szChildClass[];
 

-#ifndef _MSC_VER
+#if __MINGW32_MAJOR_VERSION == 1

 typedef struct tagNMITEMACTIVATE{
     NMHDR   hdr;
     int     iItem;
 typedef struct tagNMITEMACTIVATE{
     NMHDR   hdr;
     int     iItem;

diff --git a/rosapps/regedt32/.cvsignore b/rosapps/regedt32/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/regedt32/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/regedt32/main.h b/rosapps/regedt32/main.h
index ed8dff5..4f5c956 100644 (file)
--- a/rosapps/regedt32/main.h
+++ b/rosapps/regedt32/main.h
@@ -88,7 +88,7 @@ extern TCHAR szTitle[];
 extern TCHAR szFrameClass[];
 extern TCHAR szChildClass[];
 
 extern TCHAR szFrameClass[];
 extern TCHAR szChildClass[];
 

-#ifndef _MSC_VER
+#if __MINGW32_MAJOR_VERSION == 1

 typedef struct tagNMITEMACTIVATE{
     NMHDR   hdr;
     int     iItem;
 typedef struct tagNMITEMACTIVATE{
     NMHDR   hdr;
     int     iItem;

diff --git a/rosapps/regsvr32/.cvsignore b/rosapps/regsvr32/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/regsvr32/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/sysutils/.cvsignore b/rosapps/sysutils/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/sysutils/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/sysutils/regexpl/.cvsignore b/rosapps/sysutils/regexpl/.cvsignore
index 0f80c9e..13381c8 100644 (file)
--- a/rosapps/sysutils/regexpl/.cvsignore
+++ b/rosapps/sysutils/regexpl/.cvsignore
@@ -1 +1,17 @@
-*.mak *.coff
+*.mak
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/sysutils/tlist/.cvsignore b/rosapps/sysutils/tlist/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/sysutils/tlist/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/taskmgr/.cvsignore b/rosapps/taskmgr/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/taskmgr/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/taskmgr/ApplicationPage.cpp b/rosapps/taskmgr/ApplicationPage.cpp
index f6d714e..715f575 100644 (file)
--- a/rosapps/taskmgr/ApplicationPage.cpp
+++ b/rosapps/taskmgr/ApplicationPage.cpp
@@ -69,10 +69,10 @@ void            ApplicationPageShowContextMenu1(void);
 void            ApplicationPageShowContextMenu2(void);
 int CALLBACK    ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
 
 void            ApplicationPageShowContextMenu2(void);
 int CALLBACK    ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
 

-void SwitchToThisWindow (
-HWND hWnd,   // Handle to the window that should be activated
-BOOL bRestore // Restore the window if it is minimized
-);
+//void SwitchToThisWindow (
+//HWND hWnd,   // Handle to the window that should be activated
+//BOOL bRestore // Restore the window if it is minimized
+//);

 
 LRESULT CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
 
 LRESULT CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {


@@ -972,7 +972,7 @@ void ApplicationPage_OnGotoProcess(void)
     LPAPPLICATION_PAGE_LIST_ITEM pAPLI = NULL;
     LV_ITEM item;
     int i;
     LPAPPLICATION_PAGE_LIST_ITEM pAPLI = NULL;
     LV_ITEM item;
     int i;

-    NMHDR nmhdr;
+    //NMHDR nmhdr;

 
     for (i=0; i<ListView_GetItemCount(hApplicationPageListCtrl); i++)
     {
 
     for (i=0; i<ListView_GetItemCount(hApplicationPageListCtrl); i++)
     {

diff --git a/rosapps/taskmgr/ApplicationPage.h b/rosapps/taskmgr/ApplicationPage.h
index 554e516..ef06ff6 100644 (file)
--- a/rosapps/taskmgr/ApplicationPage.h
+++ b/rosapps/taskmgr/ApplicationPage.h
@@ -47,4 +47,4 @@ void                          ApplicationPage_OnSwitchTo(void);
 void                           ApplicationPage_OnEndTask(void);
 void                           ApplicationPage_OnGotoProcess(void);
 
 void                           ApplicationPage_OnEndTask(void);
 void                           ApplicationPage_OnGotoProcess(void);
 

-#endif // defined __APPLICATIONPAGE_H
+#endif // __APPLICATIONPAGE_H

diff --git a/rosapps/taskmgr/GraphCtrl.h b/rosapps/taskmgr/GraphCtrl.h
index b903705..8a193b7 100644 (file)
--- a/rosapps/taskmgr/GraphCtrl.h
+++ b/rosapps/taskmgr/GraphCtrl.h
@@ -109,4 +109,3 @@ LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 
 
 #endif /* __GRAPH_CTRL_H__ */
 
 
 #endif /* __GRAPH_CTRL_H__ */

-/////////////////////////////////////////////////////////////////////////////

diff --git a/rosapps/taskmgr/PerformancePage.h b/rosapps/taskmgr/PerformancePage.h
index 3e5789f..13fd6df 100644 (file)
--- a/rosapps/taskmgr/PerformancePage.h
+++ b/rosapps/taskmgr/PerformancePage.h
@@ -32,4 +32,4 @@ void                          PerformancePage_OnViewShowKernelTimes(void);
 void                           PerformancePage_OnViewCPUHistoryOneGraphAll(void);
 void                           PerformancePage_OnViewCPUHistoryOneGraphPerCPU(void);
 
 void                           PerformancePage_OnViewCPUHistoryOneGraphAll(void);
 void                           PerformancePage_OnViewCPUHistoryOneGraphPerCPU(void);
 

-#endif // defined __PERFORMANCEPAGE_H
+#endif // __PERFORMANCEPAGE_H

diff --git a/rosapps/taskmgr/ProcessPage.h b/rosapps/taskmgr/ProcessPage.h
index 092da9a..393d4da 100644 (file)
--- a/rosapps/taskmgr/ProcessPage.h
+++ b/rosapps/taskmgr/ProcessPage.h
@@ -32,4 +32,4 @@ extern        HWND            hProcessPageShowAllProcessesButton;     // Process Show All Processes c
 LRESULT CALLBACK       ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 void                           RefreshProcessPage(void);
 
 LRESULT CALLBACK       ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 void                           RefreshProcessPage(void);
 

-#endif // defined __PROCESSPAGE_H
+#endif // __PROCESSPAGE_H

diff --git a/rosapps/taskmgr/about.h b/rosapps/taskmgr/about.h
index b721253..3bb7ef5 100644 (file)
--- a/rosapps/taskmgr/about.h
+++ b/rosapps/taskmgr/about.h
@@ -25,4 +25,4 @@
 
 void   OnAbout(void);
 
 
 void   OnAbout(void);
 

-#endif // defined __ABOUT_H
+#endif // __ABOUT_H

diff --git a/rosapps/taskmgr/affinity.h b/rosapps/taskmgr/affinity.h
index e0b7645..a77eb56 100644 (file)
--- a/rosapps/taskmgr/affinity.h
+++ b/rosapps/taskmgr/affinity.h
@@ -25,4 +25,4 @@
 
 void ProcessPage_OnSetAffinity(void);
 
 
 void ProcessPage_OnSetAffinity(void);
 

-#endif // __AFFINITY_H
\ No newline at end of file
+#endif // __AFFINITY_H

diff --git a/rosapps/taskmgr/column.h b/rosapps/taskmgr/column.h
index 4c414cd..139fe44 100644 (file)
--- a/rosapps/taskmgr/column.h
+++ b/rosapps/taskmgr/column.h
@@ -56,4 +56,4 @@ void AddColumns(void);
 void SaveColumnSettings(void);
 void UpdateColumnDataHints(void);
 
 void SaveColumnSettings(void);
 void UpdateColumnDataHints(void);
 

-#endif // __COlUMN_H
\ No newline at end of file
+#endif // __COLUMN_H

diff --git a/rosapps/taskmgr/debug.h b/rosapps/taskmgr/debug.h
index 35669d1..086410d 100644 (file)
--- a/rosapps/taskmgr/debug.h
+++ b/rosapps/taskmgr/debug.h
@@ -25,4 +25,4 @@
 
 void ProcessPage_OnDebug(void);
 
 
 void ProcessPage_OnDebug(void);
 

-#endif // __DEBUG_H
\ No newline at end of file
+#endif // __DEBUG_H

diff --git a/rosapps/taskmgr/endproc.h b/rosapps/taskmgr/endproc.h
index 931c087..a1f0df6 100644 (file)
--- a/rosapps/taskmgr/endproc.h
+++ b/rosapps/taskmgr/endproc.h
@@ -26,4 +26,4 @@
 void ProcessPage_OnEndProcess(void);
 void ProcessPage_OnEndProcessTree(void);
 
 void ProcessPage_OnEndProcess(void);
 void ProcessPage_OnEndProcessTree(void);
 

-#endif // __ENDPROC_H
\ No newline at end of file
+#endif // __ENDPROC_H

diff --git a/rosapps/taskmgr/font.h b/rosapps/taskmgr/font.h
index c41dd49..6a4dca0 100644 (file)
--- a/rosapps/taskmgr/font.h
+++ b/rosapps/taskmgr/font.h
@@ -25,4 +25,4 @@
 
 void   Font_DrawText(HDC hDC, LPCTSTR lpszText, int x, int y);
 
 
 void   Font_DrawText(HDC hDC, LPCTSTR lpszText, int x, int y);
 

-#endif // __FONT_H
\ No newline at end of file
+#endif // __FONT_H

diff --git a/rosapps/taskmgr/graph.cpp b/rosapps/taskmgr/graph.cpp
index 109f7e1..55f8899 100644 (file)
--- a/rosapps/taskmgr/graph.cpp
+++ b/rosapps/taskmgr/graph.cpp
@@ -185,15 +185,15 @@ void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd)
        //
        if (CpuUsage == 100)
        {
        //
        if (CpuUsage == 100)
        {

-               sprintf(Text, "%d%%", CpuUsage);
+               _stprintf(Text, _T("%d%%"), CpuUsage);

        }
        else if (CpuUsage < 10)
        {
        }
        else if (CpuUsage < 10)
        {

-               sprintf(Text, "  %d%%", CpuUsage);
+               _stprintf(Text, _T("  %d%%"), CpuUsage);

        }
        else
        {
        }
        else
        {

-               sprintf(Text, " %d%%", CpuUsage);
+               _stprintf(Text, _T(" %d%%"), CpuUsage);

        }
        
        //
        }
        
        //


@@ -351,7 +351,7 @@ void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd)
        CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK();
        CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK();
 
        CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK();
        CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK();
 

-       sprintf(Text, "%dK", CommitChargeTotal);
+       _stprintf(Text, _T("%dK"), CommitChargeTotal);

        
        //
        // Draw the font text onto the graph
        
        //
        // Draw the font text onto the graph


@@ -468,4 +468,4 @@ void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd)
        for (i=rcClient.right; i>=0; i--)
        {
        }
        for (i=rcClient.right; i>=0; i--)
        {
        }

-}
\ No newline at end of file
+}

diff --git a/rosapps/taskmgr/graph.h b/rosapps/taskmgr/graph.h
index 0dfdf0a..a6a9ae6 100644 (file)
--- a/rosapps/taskmgr/graph.h
+++ b/rosapps/taskmgr/graph.h
@@ -32,4 +32,4 @@ extern        LONG                            OldGraphWndProc;
 
 LRESULT CALLBACK       Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 
 LRESULT CALLBACK       Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 

-#endif // __GRAPH_H
\ No newline at end of file
+#endif // __GRAPH_H

diff --git a/rosapps/taskmgr/optnmenu.h b/rosapps/taskmgr/optnmenu.h
index a50bdc2..4e13764 100644 (file)
--- a/rosapps/taskmgr/optnmenu.h
+++ b/rosapps/taskmgr/optnmenu.h
@@ -20,18 +20,16 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
        
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
        

-//
-// options.h

 //
 // Menu item handlers for the options menu.
 //
 
 //
 // Menu item handlers for the options menu.
 //
 

-#ifndef __OPTIONS_H
-#define __OPTIONS_H
+#ifndef __OPTNMENU_H
+#define __OPTNMENU_H

 
 void TaskManager_OnOptionsAlwaysOnTop(void);
 void TaskManager_OnOptionsMinimizeOnUse(void);
 void TaskManager_OnOptionsHideWhenMinimized(void);
 void TaskManager_OnOptionsShow16BitTasks(void);
 
 
 void TaskManager_OnOptionsAlwaysOnTop(void);
 void TaskManager_OnOptionsMinimizeOnUse(void);
 void TaskManager_OnOptionsHideWhenMinimized(void);
 void TaskManager_OnOptionsShow16BitTasks(void);
 

-#endif // __OPTIONS_H
\ No newline at end of file
+#endif // __OPTNMENU_H

diff --git a/rosapps/taskmgr/perfdata.cpp b/rosapps/taskmgr/perfdata.cpp
index 929fcf6..e1c9214 100644 (file)
--- a/rosapps/taskmgr/perfdata.cpp
+++ b/rosapps/taskmgr/perfdata.cpp
@@ -38,8 +38,8 @@
 #include "perfdata.h"
 
 PROCNTQSI                                              NtQuerySystemInformation = NULL;
 #include "perfdata.h"
 
 PROCNTQSI                                              NtQuerySystemInformation = NULL;

-PROCGGR                                                        GetGuiResources = NULL;
-PROCGPIC                                               GetProcessIoCounters = NULL;
+PROCGGR                                                        pGetGuiResources = NULL;
+PROCGPIC                                               pGetProcessIoCounters = NULL;

 CRITICAL_SECTION                               PerfDataCriticalSection;
 PPERFDATA                                              pPerfDataOld = NULL;    // Older perf data (saved to establish delta values)
 PPERFDATA                                              pPerfData = NULL;               // Most recent copy of perf data
 CRITICAL_SECTION                               PerfDataCriticalSection;
 PPERFDATA                                              pPerfDataOld = NULL;    // Older perf data (saved to establish delta values)
 PPERFDATA                                              pPerfData = NULL;               // Most recent copy of perf data


@@ -62,8 +62,8 @@ BOOL PerfDataInitialize(void)
        LONG    status;
 
        NtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtQuerySystemInformation");
        LONG    status;
 
        NtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtQuerySystemInformation");

-       GetGuiResources = (PROCGGR)GetProcAddress(GetModuleHandle("user32.dll"), "GetGuiResources");
-       GetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandle("kernel32.dll"), "GetProcessIoCounters");
+       pGetGuiResources = (PROCGGR)GetProcAddress(GetModuleHandle("user32.dll"), "GetGuiResources");
+       pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandle("kernel32.dll"), "GetProcessIoCounters");

        
        InitializeCriticalSection(&PerfDataCriticalSection);
        
        
        InitializeCriticalSection(&PerfDataCriticalSection);
        


@@ -313,13 +313,13 @@ void PerfDataRefresh(void)
                                CloseHandle(hProcessToken);
                        }
                        
                                CloseHandle(hProcessToken);
                        }
                        

-                       if (GetGuiResources)
+                       if (pGetGuiResources)

                        {
                        {

-                               pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS);
-                               pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS);
+                               pPerfData[Idx].USERObjectCount = pGetGuiResources(hProcess, GR_USEROBJECTS);
+                               pPerfData[Idx].GDIObjectCount = pGetGuiResources(hProcess, GR_GDIOBJECTS);

                        }
                        }

-                       if (GetProcessIoCounters)
-                               GetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters);
+                       if (pGetProcessIoCounters)
+                               pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters);

                        
                        CloseHandle(hProcess);
                }
                        
                        CloseHandle(hProcess);
                }

diff --git a/rosapps/taskmgr/perfdata.h b/rosapps/taskmgr/perfdata.h
index 537b163..10cb86b 100644 (file)
--- a/rosapps/taskmgr/perfdata.h
+++ b/rosapps/taskmgr/perfdata.h
@@ -409,4 +409,4 @@ ULONG       PerfDataGetSystemHandleCount(void);
 
 ULONG  PerfDataGetTotalThreadCount(void);
 
 
 ULONG  PerfDataGetTotalThreadCount(void);
 

-#endif // defined __PERFDATA_H
+#endif // __PERFDATA_H

diff --git a/rosapps/taskmgr/priority.h b/rosapps/taskmgr/priority.h
index c0431f6..0d91c08 100644 (file)
--- a/rosapps/taskmgr/priority.h
+++ b/rosapps/taskmgr/priority.h
@@ -30,4 +30,4 @@ void ProcessPage_OnSetPriorityNormal(void);
 void ProcessPage_OnSetPriorityBelowNormal(void);
 void ProcessPage_OnSetPriorityLow(void);
 
 void ProcessPage_OnSetPriorityBelowNormal(void);
 void ProcessPage_OnSetPriorityLow(void);
 

-#endif // __PRIORITY_H
\ No newline at end of file
+#endif // __PRIORITY_H

diff --git a/rosapps/taskmgr/proclist.h b/rosapps/taskmgr/proclist.h
index 0abe87c..d7a8b6b 100644 (file)
--- a/rosapps/taskmgr/proclist.h
+++ b/rosapps/taskmgr/proclist.h
@@ -27,4 +27,4 @@ LRESULT CALLBACK      ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
 
 extern LONG            OldProcessListWndProc;
 
 
 extern LONG            OldProcessListWndProc;
 

-#endif // __PROCLIST_H
\ No newline at end of file
+#endif // __PROCLIST_H

diff --git a/rosapps/taskmgr/trayicon.h b/rosapps/taskmgr/trayicon.h
index d013858..5c56c6d 100644 (file)
--- a/rosapps/taskmgr/trayicon.h
+++ b/rosapps/taskmgr/trayicon.h
@@ -28,4 +28,4 @@ BOOL  TrayIcon_ShellAddTrayIcon(void);
 BOOL   TrayIcon_ShellRemoveTrayIcon(void);
 BOOL   TrayIcon_ShellUpdateTrayIcon(void);
 
 BOOL   TrayIcon_ShellRemoveTrayIcon(void);
 BOOL   TrayIcon_ShellUpdateTrayIcon(void);
 

-#endif // __TRAYICON_H
\ No newline at end of file
+#endif // __TRAYICON_H

diff --git a/rosapps/templates/mdi/.cvsignore b/rosapps/templates/mdi/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/templates/mdi/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/winfile/.cvsignore b/rosapps/winfile/.cvsignore
new file mode 100644 (file)
index 0000000..b8b4afb
--- /dev/null
+++ b/rosapps/winfile/.cvsignore
@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

diff --git a/rosapps/winfile/main.h b/rosapps/winfile/main.h
index dfa4608..a2ed6e4 100644 (file)
--- a/rosapps/winfile/main.h
+++ b/rosapps/winfile/main.h
@@ -190,7 +190,7 @@ extern TCHAR szChildClass[];
 void SetupStatusBar(BOOL bResize);
 void UpdateStatusBar(void);
 
 void SetupStatusBar(BOOL bResize);
 void UpdateStatusBar(void);
 

-#ifndef _MSC_VER
+#if __MINGW32_MAJOR_VERSION == 1

 typedef struct tagNMITEMACTIVATE{
     NMHDR   hdr;
     int     iItem;
 typedef struct tagNMITEMACTIVATE{
     NMHDR   hdr;
     int     iItem;

diff --git a/rosapps/winfile/network.h b/rosapps/winfile/network.h
index f90e02b..3d81f6e 100644 (file)
--- a/rosapps/winfile/network.h
+++ b/rosapps/winfile/network.h
@@ -39,4 +39,4 @@ DWORD MapNetworkDrives(HWND hWnd, BOOL connect);
 };
 #endif
 
 };
 #endif
 

-#endif // __NETWORK_H__
\ No newline at end of file
+#endif // __NETWORK_H__