From 381af4ae02417c0340f940014934e1d4b013ea80 Mon Sep 17 00:00:00 2001 From: Robert Dickenson Date: Sun, 25 Aug 2002 06:47:16 +0000 Subject: [PATCH] Fixes for building with __MINGW32_VERSION 2.1 svn path=/trunk/; revision=3388 --- rosapps/Makefile | 1 + rosapps/calc/.cvsignore | 16 ++++++++++++ rosapps/cmd/.cvsignore | 17 ++++++++++++- rosapps/cmdutils/.cvsignore | 16 ++++++++++++ rosapps/cmdutils/touch/.cvsignore | 16 ++++++++++++ rosapps/control/.cvsignore | 16 ++++++++++++ rosapps/dflat32/.cvsignore | 16 ++++++++++++ rosapps/hcalc/.cvsignore | 16 ++++++++++++ rosapps/installapps.bat | 1 + rosapps/lib/dflat32/.cvsignore | 16 ++++++++++++ rosapps/mc/.cvsignore | 16 ++++++++++++ rosapps/mc/release/.cvsignore | 16 ++++++++++++ rosapps/net/arp/.cvsignore | 16 ++++++++++++ rosapps/net/finger/.cvsignore | 16 ++++++++++++ rosapps/net/ipconfig/.cvsignore | 16 ++++++++++++ rosapps/net/ipconfig/ipconfig.c | 36 +++++++++++++++++++-------- rosapps/net/ncftp/.cvsignore | 16 ++++++++++++ rosapps/net/ncftp/Strn/.cvsignore | 16 ++++++++++++ rosapps/net/ncftp/libncftp/.cvsignore | 16 ++++++++++++ rosapps/net/ncftp/ncftp/.cvsignore | 16 ++++++++++++ rosapps/net/ncftp/sio/.cvsignore | 16 ++++++++++++ rosapps/net/netstat/.cvsignore | 16 ++++++++++++ rosapps/net/niclist/.cvsignore | 16 ++++++++++++ rosapps/net/ping/.cvsignore | 16 ++++++++++++ rosapps/net/telnet/.cvsignore | 16 ++++++++++++ rosapps/net/telnet/src/.cvsignore | 16 ++++++++++++ rosapps/net/whois/.cvsignore | 16 ++++++++++++ rosapps/notevil/.cvsignore | 16 ++++++++++++ rosapps/regedit/.cvsignore | 16 ++++++++++++ rosapps/regedit/main.h | 2 +- rosapps/regedt32/.cvsignore | 16 ++++++++++++ rosapps/regedt32/main.h | 2 +- rosapps/regsvr32/.cvsignore | 16 ++++++++++++ rosapps/sysutils/.cvsignore | 16 ++++++++++++ rosapps/sysutils/regexpl/.cvsignore | 18 +++++++++++++- rosapps/sysutils/tlist/.cvsignore | 16 ++++++++++++ rosapps/taskmgr/.cvsignore | 16 ++++++++++++ rosapps/taskmgr/ApplicationPage.cpp | 10 ++++---- rosapps/taskmgr/ApplicationPage.h | 2 +- rosapps/taskmgr/GraphCtrl.h | 1 - rosapps/taskmgr/PerformancePage.h | 2 +- rosapps/taskmgr/ProcessPage.h | 2 +- rosapps/taskmgr/about.h | 2 +- rosapps/taskmgr/affinity.h | 2 +- rosapps/taskmgr/column.h | 2 +- rosapps/taskmgr/debug.h | 2 +- rosapps/taskmgr/endproc.h | 2 +- rosapps/taskmgr/font.h | 2 +- rosapps/taskmgr/graph.cpp | 10 ++++---- rosapps/taskmgr/graph.h | 2 +- rosapps/taskmgr/optnmenu.h | 8 +++--- rosapps/taskmgr/perfdata.cpp | 18 +++++++------- rosapps/taskmgr/perfdata.h | 2 +- rosapps/taskmgr/priority.h | 2 +- rosapps/taskmgr/proclist.h | 2 +- rosapps/taskmgr/trayicon.h | 2 +- rosapps/templates/mdi/.cvsignore | 16 ++++++++++++ rosapps/winfile/.cvsignore | 16 ++++++++++++ rosapps/winfile/main.h | 2 +- rosapps/winfile/network.h | 2 +- 60 files changed, 612 insertions(+), 56 deletions(-) create mode 100644 rosapps/calc/.cvsignore create mode 100644 rosapps/cmdutils/.cvsignore create mode 100644 rosapps/cmdutils/touch/.cvsignore create mode 100644 rosapps/control/.cvsignore create mode 100644 rosapps/dflat32/.cvsignore create mode 100644 rosapps/hcalc/.cvsignore create mode 100644 rosapps/lib/dflat32/.cvsignore create mode 100644 rosapps/mc/.cvsignore create mode 100644 rosapps/mc/release/.cvsignore create mode 100644 rosapps/net/arp/.cvsignore create mode 100644 rosapps/net/finger/.cvsignore create mode 100644 rosapps/net/ipconfig/.cvsignore create mode 100644 rosapps/net/ncftp/.cvsignore create mode 100644 rosapps/net/ncftp/Strn/.cvsignore create mode 100644 rosapps/net/ncftp/libncftp/.cvsignore create mode 100644 rosapps/net/ncftp/ncftp/.cvsignore create mode 100644 rosapps/net/ncftp/sio/.cvsignore create mode 100644 rosapps/net/netstat/.cvsignore create mode 100644 rosapps/net/niclist/.cvsignore create mode 100644 rosapps/net/ping/.cvsignore create mode 100644 rosapps/net/telnet/.cvsignore create mode 100644 rosapps/net/telnet/src/.cvsignore create mode 100644 rosapps/net/whois/.cvsignore create mode 100644 rosapps/notevil/.cvsignore create mode 100644 rosapps/regedit/.cvsignore create mode 100644 rosapps/regedt32/.cvsignore create mode 100644 rosapps/regsvr32/.cvsignore create mode 100644 rosapps/sysutils/.cvsignore create mode 100644 rosapps/sysutils/tlist/.cvsignore create mode 100644 rosapps/taskmgr/.cvsignore create mode 100644 rosapps/templates/mdi/.cvsignore create mode 100644 rosapps/winfile/.cvsignore diff --git a/rosapps/Makefile b/rosapps/Makefile index a9d7f99b01c..21b3a856a11 100644 --- a/rosapps/Makefile +++ b/rosapps/Makefile @@ -27,6 +27,7 @@ APPS = calc \ net\arp \ net\finger \ net\ipconfig \ + net\ipecho \ net\ncftp \ net\netstat \ net\niclist \ diff --git a/rosapps/calc/.cvsignore b/rosapps/calc/.cvsignore new file mode 100644 index 00000000000..b8b4afb7e30 --- /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 dcdb3693753..b8b4afb7e30 100644 --- 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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 8d860364e4e..6761d2af019 100644 --- 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\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 diff --git a/rosapps/lib/dflat32/.cvsignore b/rosapps/lib/dflat32/.cvsignore new file mode 100644 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 1aa8b3c648e..1e19a8c9bb3 100644 --- a/rosapps/net/ipconfig/ipconfig.c +++ b/rosapps/net/ipconfig/ipconfig.c @@ -55,25 +55,36 @@ TCHAR* GetNodeTypeName(int nNodeType) void ShowNetworkFixedInfo() { - FIXED_INFO FixedInfo; - ULONG OutBufLen = sizeof(FIXED_INFO); + FIXED_INFO* pFixedInfo = NULL; + ULONG OutBufLen = 0; 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) { - 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("\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) { @@ -199,6 +210,9 @@ void usage(void) 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; diff --git a/rosapps/net/ncftp/.cvsignore b/rosapps/net/ncftp/.cvsignore new file mode 100644 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 d956b9ca498..a0e9b28cdb0 100644 --- a/rosapps/regedit/main.h +++ b/rosapps/regedit/main.h @@ -79,7 +79,7 @@ extern TCHAR szTitle[]; extern TCHAR szFrameClass[]; extern TCHAR szChildClass[]; -#ifndef _MSC_VER +#if __MINGW32_MAJOR_VERSION == 1 typedef struct tagNMITEMACTIVATE{ NMHDR hdr; int iItem; diff --git a/rosapps/regedt32/.cvsignore b/rosapps/regedt32/.cvsignore new file mode 100644 index 00000000000..b8b4afb7e30 --- /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 ed8dff5e5fc..4f5c9568bc0 100644 --- a/rosapps/regedt32/main.h +++ b/rosapps/regedt32/main.h @@ -88,7 +88,7 @@ extern TCHAR szTitle[]; extern TCHAR szFrameClass[]; extern TCHAR szChildClass[]; -#ifndef _MSC_VER +#if __MINGW32_MAJOR_VERSION == 1 typedef struct tagNMITEMACTIVATE{ NMHDR hdr; int iItem; diff --git a/rosapps/regsvr32/.cvsignore b/rosapps/regsvr32/.cvsignore new file mode 100644 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 0f80c9e6c1f..13381c8ded6 100644 --- 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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 f6d714e2811..715f575dd2c 100644 --- 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 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) { @@ -972,7 +972,7 @@ void ApplicationPage_OnGotoProcess(void) LPAPPLICATION_PAGE_LIST_ITEM pAPLI = NULL; LV_ITEM item; int i; - NMHDR nmhdr; + //NMHDR nmhdr; for (i=0; i=0; i--) { } -} \ No newline at end of file +} diff --git a/rosapps/taskmgr/graph.h b/rosapps/taskmgr/graph.h index 0dfdf0a35f7..a6a9ae69bed 100644 --- 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); -#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 a50bdc28a57..4e13764446f 100644 --- a/rosapps/taskmgr/optnmenu.h +++ b/rosapps/taskmgr/optnmenu.h @@ -20,18 +20,16 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -// -// options.h // // 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); -#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 929fcf6664d..e1c921437a5 100644 --- a/rosapps/taskmgr/perfdata.cpp +++ b/rosapps/taskmgr/perfdata.cpp @@ -38,8 +38,8 @@ #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 @@ -62,8 +62,8 @@ BOOL PerfDataInitialize(void) 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); @@ -313,13 +313,13 @@ void PerfDataRefresh(void) 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); } diff --git a/rosapps/taskmgr/perfdata.h b/rosapps/taskmgr/perfdata.h index 537b163cc2a..10cb86beebc 100644 --- a/rosapps/taskmgr/perfdata.h +++ b/rosapps/taskmgr/perfdata.h @@ -409,4 +409,4 @@ ULONG PerfDataGetSystemHandleCount(void); ULONG PerfDataGetTotalThreadCount(void); -#endif // defined __PERFDATA_H +#endif // __PERFDATA_H diff --git a/rosapps/taskmgr/priority.h b/rosapps/taskmgr/priority.h index c0431f6ae62..0d91c080f0c 100644 --- 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); -#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 0abe87c8387..d7a8b6b2fe5 100644 --- 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; -#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 d013858f920..5c56c6dcbcc 100644 --- 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); -#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 index 00000000000..b8b4afb7e30 --- /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 index 00000000000..b8b4afb7e30 --- /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 dfa4608d2e8..a2ed6e40350 100644 --- a/rosapps/winfile/main.h +++ b/rosapps/winfile/main.h @@ -190,7 +190,7 @@ extern TCHAR szChildClass[]; void SetupStatusBar(BOOL bResize); void UpdateStatusBar(void); -#ifndef _MSC_VER +#if __MINGW32_MAJOR_VERSION == 1 typedef struct tagNMITEMACTIVATE{ NMHDR hdr; int iItem; diff --git a/rosapps/winfile/network.h b/rosapps/winfile/network.h index f90e02bcb8a..3d81f6eaf73 100644 --- a/rosapps/winfile/network.h +++ b/rosapps/winfile/network.h @@ -39,4 +39,4 @@ DWORD MapNetworkDrives(HWND hWnd, BOOL connect); }; #endif -#endif // __NETWORK_H__ \ No newline at end of file +#endif // __NETWORK_H__