Fixes for building with __MINGW32_VERSION 2.1

svn path=/trunk/; revision=3388

rosapps/Makefile

@@ -27,6 +27,7 @@ APPS = 	calc \
 	net\arp \
 	net\finger \
 	net\ipconfig \
+	net\ipecho \
 	net\ncftp \
 	net\netstat \
 	net\niclist \

rosapps/calc/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/cmd/.cvsignore

@@ -1 +1,16 @@
-cmd.coff
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/cmdutils/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/cmdutils/touch/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/control/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/dflat32/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/hcalc/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

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

rosapps/lib/dflat32/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/mc/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/mc/release/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/net/arp/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/net/finger/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/net/ipconfig/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

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;

rosapps/net/ncftp/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

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

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

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

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

rosapps/net/netstat/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/net/niclist/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/net/ping/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/net/telnet/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

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

rosapps/net/whois/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/notevil/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/regedit/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

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;

rosapps/regedt32/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

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;

rosapps/regsvr32/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/sysutils/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

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

rosapps/sysutils/tlist/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/taskmgr/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

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<ListView_GetItemCount(hApplicationPageListCtrl); i++)
     {

rosapps/taskmgr/ApplicationPage.h

@@ -47,4 +47,4 @@ void				ApplicationPage_OnSwitchTo(void);
 void				ApplicationPage_OnEndTask(void);
 void				ApplicationPage_OnGotoProcess(void);
 
-#endif // defined __APPLICATIONPAGE_H
+#endif // __APPLICATIONPAGE_H

rosapps/taskmgr/GraphCtrl.h

@@ -109,4 +109,3 @@ LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 
 
 #endif /* __GRAPH_CTRL_H__ */
-/////////////////////////////////////////////////////////////////////////////

rosapps/taskmgr/PerformancePage.h

@@ -32,4 +32,4 @@ void				PerformancePage_OnViewShowKernelTimes(void);
 void				PerformancePage_OnViewCPUHistoryOneGraphAll(void);
 void				PerformancePage_OnViewCPUHistoryOneGraphPerCPU(void);
 
-#endif // defined __PERFORMANCEPAGE_H
+#endif // __PERFORMANCEPAGE_H

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);
 
-#endif // defined __PROCESSPAGE_H
+#endif // __PROCESSPAGE_H

rosapps/taskmgr/about.h

@@ -25,4 +25,4 @@
 
 void	OnAbout(void);
 
-#endif // defined __ABOUT_H
+#endif // __ABOUT_H

rosapps/taskmgr/affinity.h

@@ -25,4 +25,4 @@
 
 void ProcessPage_OnSetAffinity(void);
 
-#endif // __AFFINITY_H
+#endif // __AFFINITY_H

rosapps/taskmgr/column.h

@@ -56,4 +56,4 @@ void AddColumns(void);
 void SaveColumnSettings(void);
 void UpdateColumnDataHints(void);
 
-#endif // __COlUMN_H
+#endif // __COLUMN_H

rosapps/taskmgr/debug.h

@@ -25,4 +25,4 @@
 
 void ProcessPage_OnDebug(void);
 
-#endif // __DEBUG_H
+#endif // __DEBUG_H

rosapps/taskmgr/endproc.h

@@ -26,4 +26,4 @@
 void ProcessPage_OnEndProcess(void);
 void ProcessPage_OnEndProcessTree(void);
 
-#endif // __ENDPROC_H
+#endif // __ENDPROC_H

rosapps/taskmgr/font.h

@@ -25,4 +25,4 @@
 
 void	Font_DrawText(HDC hDC, LPCTSTR lpszText, int x, int y);
 
-#endif // __FONT_H
+#endif // __FONT_H

rosapps/taskmgr/graph.cpp

@@ -185,15 +185,15 @@ void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd)
 	//
 	if (CpuUsage == 100)
 	{
-		sprintf(Text, "%d%%", CpuUsage);
+		_stprintf(Text, _T("%d%%"), CpuUsage);
 	}
 	else if (CpuUsage < 10)
 	{
-		sprintf(Text, "  %d%%", CpuUsage);
+		_stprintf(Text, _T("  %d%%"), CpuUsage);
 	}
 	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();
 
-	sprintf(Text, "%dK", CommitChargeTotal);
+	_stprintf(Text, _T("%dK"), CommitChargeTotal);
 	
 	//
 	// 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--)
 	{
 	}
-}
+}

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
+#endif // __GRAPH_H

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
+#endif // __OPTNMENU_H

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);
 		}

rosapps/taskmgr/perfdata.h

@@ -409,4 +409,4 @@ ULONG	PerfDataGetSystemHandleCount(void);
 
 ULONG	PerfDataGetTotalThreadCount(void);
 
-#endif // defined __PERFDATA_H
+#endif // __PERFDATA_H

rosapps/taskmgr/priority.h

@@ -30,4 +30,4 @@ void ProcessPage_OnSetPriorityNormal(void);
 void ProcessPage_OnSetPriorityBelowNormal(void);
 void ProcessPage_OnSetPriorityLow(void);
 
-#endif // __PRIORITY_H
+#endif // __PRIORITY_H

rosapps/taskmgr/proclist.h

@@ -27,4 +27,4 @@ LRESULT CALLBACK	ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
 
 extern	LONG		OldProcessListWndProc;
 
-#endif // __PROCLIST_H
+#endif // __PROCLIST_H

rosapps/taskmgr/trayicon.h

@@ -28,4 +28,4 @@ BOOL	TrayIcon_ShellAddTrayIcon(void);
 BOOL	TrayIcon_ShellRemoveTrayIcon(void);
 BOOL	TrayIcon_ShellUpdateTrayIcon(void);
 
-#endif // __TRAYICON_H
+#endif // __TRAYICON_H

rosapps/templates/mdi/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

rosapps/winfile/.cvsignore

@@ -0,0 +1,16 @@
+*.sys
+*.exe
+*.dll
+*.cpl
+*.a
+*.o
+*.d
+*.coff
+*.dsp
+*.dsw
+*.aps
+*.ncb
+*.opt
+*.sym
+*.plg
+*.bak

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;

rosapps/winfile/network.h

@@ -39,4 +39,4 @@ DWORD MapNetworkDrives(HWND hWnd, BOOL connect);
 };
 #endif
 
-#endif // __NETWORK_H__
+#endif // __NETWORK_H__