Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:52:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix gdb2 and regexpl warnings under gcc 4.4.0

Browse source 
svn path=/trunk/; revision=42968
This commit is contained in:
Stefan Ginsberg 2009-08-30 15:35:14 +00:00
parent a8d673a487
commit a557cda82c
8 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rosapps/applications/devutils/gdb2/gdb2.cpp
View file

@ -177,6 +177,7 @@ void PrepAndLaunchRedirectedChild(HANDLE hChildStdOut,
{ {
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
STARTUPINFO si; STARTUPINFO si;
static CHAR Title[] = "debugged program console";
// Set up the start up info struct. // Set up the start up info struct.
ZeroMemory(&si,sizeof(STARTUPINFO)); ZeroMemory(&si,sizeof(STARTUPINFO));
@ -185,7 +186,7 @@ void PrepAndLaunchRedirectedChild(HANDLE hChildStdOut,
si.hStdOutput = hChildStdOut; si.hStdOutput = hChildStdOut;
si.hStdInput = hChildStdIn; si.hStdInput = hChildStdIn;
si.hStdError = hChildStdErr; si.hStdError = hChildStdErr;
si.lpTitle = "debugged program console"; si.lpTitle = Title;
// Use this if you want to hide the child: // Use this if you want to hide the child:
// si.wShowWindow = SW_HIDE; // si.wShowWindow = SW_HIDE;
// Note that dwFlags must include STARTF_USESHOWWINDOW if you want to // Note that dwFlags must include STARTF_USESHOWWINDOW if you want to

6
rosapps/applications/sysutils/regexpl/Console.cpp
View file

@ -220,7 +220,7 @@ unsigned int CConsole::GetTabWidth()
return TAB_WIDTH; return TAB_WIDTH;
} }
BOOL CConsole::SetTitle(TCHAR *p) BOOL CConsole::SetTitle(const TCHAR *p)
{ {
return SetConsoleTitle(p); return SetConsoleTitle(p);
} }
@ -640,7 +640,7 @@ Paste:
m_pchBuffer[dwLastCharOffset] = 0; // terminate string in buffer m_pchBuffer[dwLastCharOffset] = 0; // terminate string in buffer
ret = Write(m_pchBuffer); ret = Write(m_pchBuffer);
m_History.AddHistoryLine(m_pchBuffer); m_History.AddHistoryLine(m_pchBuffer);
TCHAR *strLF = _T("\n"); static TCHAR strLF[] = _T("\n");
ret = Write(strLF); ret = Write(strLF);
break; break;
} }
@ -1008,7 +1008,7 @@ void CConsole::BeginScrollingOperation()
m_Lines = 0; m_Lines = 0;
} }
BOOL CConsole::WriteString(TCHAR *pchString, COORD Position) BOOL CConsole::WriteString(const TCHAR *pchString, COORD Position)
{ {
CHAR_INFO ciBuffer[256]; CHAR_INFO ciBuffer[256];
int nSize = _tcslen(pchString); int nSize = _tcslen(pchString);

4
rosapps/applications/sysutils/regexpl/Console.h
View file

@ -25,7 +25,7 @@ public:
// BOOL SetInputMode(DWORD dwMode); // BOOL SetInputMode(DWORD dwMode);
BOOL SetTextAttribute(WORD wAttributes); BOOL SetTextAttribute(WORD wAttributes);
BOOL GetTextAttribute(WORD& rwAttributes); BOOL GetTextAttribute(WORD& rwAttributes);
BOOL SetTitle(TCHAR *p); BOOL SetTitle(const TCHAR *p);
BOOL Write(const TCHAR *p, DWORD dwChars = 0); BOOL Write(const TCHAR *p, DWORD dwChars = 0);
CConsole(); CConsole();
virtual ~CConsole(); virtual ~CConsole();
@ -38,7 +38,7 @@ private:
COORD m_BufferSize; COORD m_BufferSize;
WORD m_wAttributes; WORD m_wAttributes;
SHORT m_Lines; SHORT m_Lines;
BOOL WriteString(TCHAR *pchString, COORD Position); BOOL WriteString(const TCHAR *pchString, COORD Position);
BOOL WriteChar(TCHAR ch); BOOL WriteChar(TCHAR ch);
BOOL m_blnInsetMode; // TRUE - insert, FALSE - overwrite BOOL m_blnInsetMode; // TRUE - insert, FALSE - overwrite
DWORD m_dwInsertModeCursorHeight; DWORD m_dwInsertModeCursorHeight;

2
rosapps/applications/sysutils/regexpl/RegistryKey.cpp
View file

@ -27,7 +27,7 @@
#include "ph.h" #include "ph.h"
#include "RegistryKey.h" #include "RegistryKey.h"
static TCHAR *g_ppszHiveNames[] = static const TCHAR *g_ppszHiveNames[] =
{ {
_T("HKEY_CLASSES_ROOT"), _T("HKEY_CLASSES_ROOT"),
_T("HKEY_CURRENT_USER"), _T("HKEY_CURRENT_USER"),

4
rosapps/applications/sysutils/regexpl/RegistryTree.cpp
View file

@ -95,7 +95,7 @@ BOOL CRegistryTree::ChangeCurrentKey(const TCHAR *pszRelativePath)
GotoRoot(); // This is full absolute path. GotoRoot(); // This is full absolute path.
// split path to key names. // split path to key names.
TCHAR *pszSeps = _T("\\"); const TCHAR *pszSeps = _T("\\");
// Make buffer and copy relative path into it. // Make buffer and copy relative path into it.
TCHAR *pszBuffer = new TCHAR[_tcslen(pszRelativePath)+1]; TCHAR *pszBuffer = new TCHAR[_tcslen(pszRelativePath)+1];
@ -124,7 +124,7 @@ BOOL CRegistryTree::ChangeCurrentKey(const TCHAR *pszRelativePath)
} }
} }
TCHAR *pszNewKey = _tcstok(pszBuffer,pszSeps); const TCHAR *pszNewKey = _tcstok(pszBuffer,pszSeps);
if ((!pszNewKey)&&((*pszRelativePath != _T('\\'))||(*(pszRelativePath+1) != 0))) if ((!pszNewKey)&&((*pszRelativePath != _T('\\'))||(*(pszRelativePath+1) != 0)))
{ {

3
rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp
View file

@ -93,6 +93,7 @@ CheckValueArgument:
CRegistryKey Key; CRegistryKey Key;
TCHAR *pszValueNamePattern; TCHAR *pszValueNamePattern;
const TCHAR *pszEmpty = _T("");
const TCHAR *pszPath; const TCHAR *pszPath;
if (blnHelp) if (blnHelp)
@ -115,7 +116,7 @@ CheckValueArgument:
} }
else else
{ {
pszValueNamePattern = _T(""); pszValueNamePattern = (TCHAR*)pszEmpty;
pszPath = _T("."); pszPath = _T(".");
} }

3
rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp
View file

@ -209,6 +209,7 @@ CheckValueArgument:
CRegistryKey Key; CRegistryKey Key;
TCHAR *pszValueName; TCHAR *pszValueName;
const TCHAR *pszEmpty = _T("");
const TCHAR *pszPath; const TCHAR *pszPath;
if (blnHelp) if (blnHelp)
@ -241,7 +242,7 @@ CheckValueArgument:
} }
else else
{ {
pszValueName = _T(""); pszValueName = (TCHAR*)pszEmpty;
pszPath = _T("."); pszPath = _T(".");
} }

3
rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp
View file

@ -122,6 +122,7 @@ CheckValueArgument:
CRegistryKey Key; CRegistryKey Key;
TCHAR *pchValueName; TCHAR *pchValueName;
const TCHAR *pszEmpty = _T("");
const TCHAR *pszPath; const TCHAR *pszPath;
if (blnHelp) if (blnHelp)
@ -154,7 +155,7 @@ CheckValueArgument:
} }
else else
{ {
pchValueName = _T(""); pchValueName = (TCHAR*)pszEmpty;
pszPath = _T("."); pszPath = _T(".");
} }