Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[cfinck] 33387: Change the translation of the "Help" menu item to "?", so that the menu can be displayed in one line at a small window size. Also minor indentation fix See issue #2590 for more details.
by cfinck＠svn.reactos.org 09 May '08

09 May '08

Author: cfinck Date: Fri May 9 06:38:45 2008 New Revision: 33387 URL: http://svn.reactos.org/svn/reactos?rev=33387&view=rev Log: Change the translation of the "Help" menu item to "?", so that the menu can be displayed in one line at a small window size. Also minor indentation fix See issue #2590 for more details. Modified: trunk/reactos/base/applications/games/winemine/lang/el-GR.rc Modified: trunk/reactos/base/applications/games/winemine/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winemine/lang/el-GR.rc [iso-8859-1] Fri May 9 06:38:45 2008 @@ -12,7 +12,7 @@ IDM_WINEMINE MENU DISCARDABLE BEGIN POPUP "&Game" - BEGIN + BEGIN MENUITEM "&ÍÝï\tF2", IDM_NEW MENUITEM SEPARATOR MENUITEM "&Óçìåßùóç ìå åñùôçìáôéêü", IDM_MARKQ @@ -26,8 +26,8 @@ MENUITEM SEPARATOR MENUITEM "¸&îïäïò", IDM_EXIT END - POPUP "&Ðëçñïöïñßåò" - BEGIN + POPUP "&?" + BEGIN MENUITEM "&Ó÷åôéêÜ...", IDM_ABOUT END END

1 0

[dchapyshev] 33386: - Add some defines
by dchapyshev＠svn.reactos.org 09 May '08

09 May '08

Author: dchapyshev Date: Fri May 9 06:32:56 2008 New Revision: 33386 URL: http://svn.reactos.org/svn/reactos?rev=33386&view=rev Log: - Add some defines Modified: trunk/reactos/ntoskrnl/include/internal/kbd.h Modified: trunk/reactos/ntoskrnl/include/internal/kbd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kbd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kbd.h [iso-8859-1] Fri May 9 06:32:56 2008 @@ -104,11 +104,14 @@ #define WCH_DEAD 0xf001 #define WCH_LGTR 0xf002 -#define CAPSLOK 1 -#define SGCAPS 2 +#define CAPSLOK 1 +#define SGCAPS 2 #define CAPLOKALTGR 4 -#define KANALOK 8 -#define GRPSELTAP 0x80 +#define KANALOK 8 +#define GRPSELTAP 0x80 + +#define VK_ABNT_C1 0xC1 +#define VK_ABNT_C2 0xC2 #ifdef __cplusplus

1 0

[cwittich] 33385: add some initial xen support to sysreg (hack)
by cwittich＠svn.reactos.org 09 May '08

09 May '08

Author: cwittich Date: Fri May 9 05:39:51 2008 New Revision: 33385 URL: http://svn.reactos.org/svn/reactos?rev=33385&view=rev Log: add some initial xen support to sysreg (hack) Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/sysreg.rbuild Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] Fri May 9 05:39:51 2008 @@ -38,7 +38,7 @@ using std::vector; using System_::PipeReader; using System_::NamedPipeReader; -/* using System_::SymbolFile; */ +/* using System_::SymbolFile; */ using System_::FileReader; using System_::OsSupport; using System_::EnvironmentVariable; @@ -74,16 +74,16 @@ #endif //--------------------------------------------------------------------------------------- - RosBootTest::RosBootTest() : m_MaxTime(65), m_DelayRead(0) - { - - } - -//--------------------------------------------------------------------------------------- - RosBootTest::~RosBootTest() - { - - } + RosBootTest::RosBootTest() : m_MaxTime(65), m_DelayRead(0) + { + + } + +//--------------------------------------------------------------------------------------- + RosBootTest::~RosBootTest() + { + + } //--------------------------------------------------------------------------------------- bool RosBootTest::executeBootCmd() { @@ -124,13 +124,13 @@ void RosBootTest::delayRead() { if (m_DelayRead) - { - /// - /// delay reading until emulator is ready - /// + { + /// + /// delay reading until emulator is ready + /// OsSupport::delayExecution(m_DelayRead); - } + } } //--------------------------------------------------------------------------------------- void RosBootTest::getDefaultHDDImage(string & img) @@ -299,7 +299,7 @@ { pipe = "pipe:/tmp/qemu"; - m_Src = "/tmp/qemu"; + m_Src = "/tmp/qemu"; } qemudir = "/usr/share/qemu"; @@ -308,13 +308,13 @@ if (_mktemp(pipename)) { string temp = pipename; - pipe = "pipe:" + temp; - m_Src = "\\\\.\\pipe\\" + temp; + pipe = "pipe:" + temp; + m_Src = "\\\\.\\pipe\\" + temp; } else { - pipe = "pipe:qemu"; - m_Src = "\\\\.\\pipe\\qemu"; + pipe = "pipe:qemu"; + m_Src = "\\\\.\\pipe\\qemu"; } m_DebugPort = "pipe"; @@ -363,7 +363,7 @@ m_PidFile += "/pid.txt"; m_BootCmd += " -pidfile "; m_BootCmd += m_PidFile; - m_BootCmd += " -nographic"; + m_BootCmd += " -nographic"; #else if (hasQemuNoRebootOption()) @@ -376,12 +376,12 @@ //---------------------------------------------------------------------------------------- bool RosBootTest::extractPipeFromBootCmd() { - string::size_type pos = m_BootCmd.find("-serial pipe:"); + string::size_type pos = m_BootCmd.find("-serial pipe:"); if (pos == string::npos) { - /* no debug options provided */ - cerr << "Error: provided boot cmd does not specify a pipe debugging port" << endl; - return false; + /* no debug options provided */ + cerr << "Error: provided boot cmd does not specify a pipe debugging port" << endl; + return false; } string pipe = m_BootCmd.substr(pos + 13, m_BootCmd.size() - pos - 13); @@ -599,16 +599,16 @@ } } #ifdef __LINUX__ - if (mkfifo(m_Src.c_str(), 400)) - { + if (mkfifo(m_Src.c_str(), 400)) + { /* if (errno != EEXIST) { cerr <<"Error: mkfifo failed with " << errno << endl; } */ - return false; - } + return false; + } #endif if (m_PidFile.length () && isFileExisting(m_PidFile)) @@ -616,8 +616,6 @@ cerr << "Deleting pid file " << m_PidFile << endl; remove(m_PidFile.c_str ()); } - - cerr << "Opening Data Source:" << m_BootCmd << endl; m_DataSource = new NamedPipeReader(); @@ -630,65 +628,68 @@ return true; } - -//--------------------------------------------------------------------------------------- - bool RosBootTest::xenGetCaps() - { - FILE *fp; - int ch, i; - char buffer[2048]; - - fp = popen("xm info", "r"); - if (!fp) - { - cerr << "Error getting Xen caps." << endl; - return false; - } - for (i=0;(i<2049)&&(feof(fp) == 0 && ((ch = fgetc(fp)) != -1)); i++) - { - buffer[i] = (char) ch; - } - buffer[i] = '\0'; - pclose(fp); - - if (strstr(buffer, "hvm") == 0) - { - cerr << "No hvm support detected!" << endl; - return false; - } - else - { - return true; - } - - } - -//--------------------------------------------------------------------------------------- - bool RosBootTest::configureXen() - { - if (!xenGetCaps()) - { - return false; - } - - if (!isFileExisting(m_XenConfig)) - { - cerr << "Xen configuration file missing" << endl; - return false; - } - - m_BootCmd = m_EmuPath + "/xm create " + m_XenConfig; + +//--------------------------------------------------------------------------------------- + bool RosBootTest::xenGetCaps() + { + FILE *fp; + int ch, i; + char buffer[2048]; + + fp = popen("xm info", "r"); + if (!fp) + { + cerr << "Error getting Xen caps." << endl; + return false; + } + for (i=0;(i<2049)&&(feof(fp) == 0 && ((ch = fgetc(fp)) != -1)); i++) + { + buffer[i] = (char) ch; + } + buffer[i] = '\0'; + pclose(fp); + + if (strstr(buffer, "hvm") == 0) + { + cerr << "No hvm support detected!" << endl; + return false; + } + else + { + return true; + } + + } + +//--------------------------------------------------------------------------------------- + bool RosBootTest::configureXen() + { + if (!xenGetCaps()) + { + return false; + } + + if (!isFileExisting(m_XenConfig)) + { + cerr << "Xen configuration file missing" << endl; + return false; + } + + m_Src = "xm console reactos"; + + m_DataSource = new PipeReader(); + m_BootCmd = m_EmuPath + "/xm create " + m_XenConfig; if (!executeBootCmd()) - return false; - - return true; - } -//--------------------------------------------------------------------------------------- - bool RosBootTest::configureVmWare() - { + return false; + + return true; + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::configureVmWare() + { cerr << "VmWare is currently not yet supported" << endl; return false; - } + } //--------------------------------------------------------------------------------------- bool RosBootTest::readConfigurationValues(ConfigParser &conf_parser) { @@ -699,15 +700,14 @@ return false; } - if (m_EmuType == "xen") - { - if (!conf_parser.getStringValue(RosBootTest::XEN_CONFIG_FILE, m_XenConfig)) - { - cerr << "Error: XEN_CONFIG_FILE is not set" << endl; - return false; - } - } - + if (m_EmuType == EMU_TYPE_XEN) + { + if (!conf_parser.getStringValue(RosBootTest::XEN_CONFIG_FILE, m_XenConfig)) + { + cerr << "Error: XEN_CONFIG_FILE is not set" << endl; + return false; + } + } if (!conf_parser.getStringValue(RosBootTest::ROS_EMU_PATH, m_EmuPath)) { cerr << "Error: ROS_EMU_PATH_[LIN/WIN] is not set" << endl; @@ -728,7 +728,7 @@ conf_parser.getIntValue (RosBootTest::ROS_MAX_TIME, m_MaxTime); - conf_parser.getStringValue (RosBootTest::ROS_LOG_FILE, m_DebugFile); + conf_parser.getStringValue (RosBootTest::ROS_LOG_FILE, m_DebugFile); conf_parser.getStringValue (RosBootTest::ROS_SYM_DIR, m_SymDir); conf_parser.getIntValue (RosBootTest::ROS_DELAY_READ, m_DelayRead); conf_parser.getStringValue (RosBootTest::ROS_SYSREG_CHECKPOINT, m_Checkpoint); @@ -740,28 +740,35 @@ return true; } //--------------------------------------------------------------------------------------- - void RosBootTest::cleanup() - { + void RosBootTest::cleanup() + { m_DataSource->closeSource(); OsSupport::delayExecution(3); - if (m_Pid) - { - OsSupport::terminateProcess (m_Pid, 0); - } - delete m_DataSource; + if (m_EmuType == EMU_TYPE_XEN) + { + system("xm destroy reactos"); + } + else + { + if (m_Pid) + { + OsSupport::terminateProcess (m_Pid, 0); + } + } + delete m_DataSource; m_DataSource = NULL; if (m_PidFile.length ()) { remove(m_PidFile.c_str ()); } - } - -//--------------------------------------------------------------------------------------- - bool RosBootTest::execute(ConfigParser &conf_parser) - { - if (!readConfigurationValues(conf_parser)) + } + +//--------------------------------------------------------------------------------------- + bool RosBootTest::execute(ConfigParser &conf_parser) + { + if (!readConfigurationValues(conf_parser)) { return false; } @@ -819,52 +826,54 @@ * it exists */ - FILE * file = fopen(m_PidFile.c_str(), "r"); - if (!file) - { - cerr << "Error: failed to launch emulator" << endl; - cleanup(); - return false; - } - char buffer[128]; - if (!fread(buffer, 1, sizeof(buffer), file)) - { - cerr << "Error: pid file w/o pid!!! " << endl; + if (m_EmuType != EMU_TYPE_XEN) + { + FILE * file = fopen(m_PidFile.c_str(), "r"); + if (!file) + { + cerr << "Error: failed to launch emulator" << endl; + cleanup(); + return false; + } + char buffer[128]; + if (!fread(buffer, 1, sizeof(buffer), file)) + { + cerr << "Error: pid file w/o pid!!! " << endl; + fclose(file); + cleanup(); + return false; + } + m_Pid = atoi(buffer); fclose(file); - cleanup(); - return false; - } - m_Pid = atoi(buffer); - fclose(file); + } #endif OsSupport::cancelAlarms(); #ifdef __LINUX__ - //OsSupport::setAlarm (m_MaxTime, m_Pid); - //OsSupport::setAlarm(m_MaxTime, getpid()); + // OsSupport::setAlarm (m_MaxTime, m_Pid); + // OsSupport::setAlarm(m_MaxTime, getpid()); #else OsSupport::setAlarm (m_MaxTime, m_Pid); OsSupport::setAlarm(m_MaxTime, GetCurrentProcessId()); #endif bool ret = analyzeDebugData(); - cleanup(); + cleanup(); return ret; } //--------------------------------------------------------------------------------------- - void RosBootTest::dumpCheckpoints() - { - if (m_Checkpoints.size ()) - { - cerr << "Dumping list of checkpoints: "<< endl; - while(!m_Checkpoints.empty ()) - { - cerr << m_Checkpoints[0] << endl; - m_Checkpoints.erase (m_Checkpoints.begin ()); - - } - } - } + void RosBootTest::dumpCheckpoints() + { + if (m_Checkpoints.size ()) + { + cerr << "Dumping list of checkpoints: "<< endl; + while(!m_Checkpoints.empty ()) + { + cerr << m_Checkpoints[0] << endl; + m_Checkpoints.erase (m_Checkpoints.begin ()); + } + } + } //--------------------------------------------------------------------------------------- RosBootTest::DebugState RosBootTest::checkDebugData(vector<string> & debug_data) { Modified: trunk/reactos/tools/sysreg/sysreg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.rbuild… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/sysreg.rbuild [iso-8859-1] Fri May 9 05:39:51 2008 @@ -1,4 +1,5 @@ <?xml version="1.0"?> + <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="sysreg" type="buildtool"> <if property="HOST" value="mingw32-linux"> @@ -16,6 +17,7 @@ <file>env_var.cpp</file> <file>rosboot_test.cpp</file> <file>namedpipe_reader.cpp</file> + <file>pipe_reader.cpp</file> <file>sysreg.cpp</file> <file>file_reader.cpp</file> <file>os_support.cpp</file>

1 0

[fireball] 33384: - Revert 33366 for explorer too. Bugs in explorer should be fixed first.
by fireball＠svn.reactos.org 09 May '08

09 May '08

Author: fireball Date: Fri May 9 04:32:17 2008 New Revision: 33384 URL: http://svn.reactos.org/svn/reactos?rev=33384&view=rev Log: - Revert 33366 for explorer too. Bugs in explorer should be fixed first. Modified: trunk/reactos/base/shell/explorer/explorer.rbuild Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Fri May 9 04:32:17 2008 @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" unicode="yes"> +<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true"> <linkerflag>-fexceptions</linkerflag> <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <include base="explorer">.</include> + <define name="UNICODE" /> <define name="WIN32" /> <define name="_ROS_" /> <define name="_WIN32_IE">0x0600</define>

1 0

[gedmurphy] 33383: - revert r32389. It's both useless and incorrect. - thanks to shadowflare for noticing
by gedmurphy＠svn.reactos.org 09 May '08

09 May '08

Author: gedmurphy Date: Fri May 9 02:30:26 2008 New Revision: 33383 URL: http://svn.reactos.org/svn/reactos?rev=33383&view=rev Log: - revert r32389. It's both useless and incorrect. - thanks to shadowflare for noticing Modified: trunk/reactos/base/system/rundll32/rundll32.c Modified: trunk/reactos/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] Fri May 9 02:30:26 2008 @@ -303,32 +303,24 @@ } // Registers a minimal window class for passing to the dll function -ATOM RegisterBlankClass(HINSTANCE hInstance, HINSTANCE hPrevInstance) +BOOL RegisterBlankClass(HINSTANCE hInstance, HINSTANCE hPrevInstance) { WNDCLASSEX wcex; - ATOM Ret; - - if (!hPrevInstance) - { - wcex.cbSize = sizeof(WNDCLASSEX); - - wcex.style = 0; - wcex.lpfnWndProc = EmptyWindowProc; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = hInstance; - wcex.hIcon = 0; - wcex.hCursor = 0; - wcex.hbrBackground = 0; - wcex.lpszMenuName = 0; - wcex.lpszClassName = rundll32_wclass; - wcex.hIconSm = 0; - } - - Ret = RegisterClassEx(&wcex); - if (!Ret) return FALSE; - - return Ret; + + wcex.cbSize = sizeof(WNDCLASSEX); + wcex.style = 0; + wcex.lpfnWndProc = EmptyWindowProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = hInstance; + wcex.hIcon = 0; + wcex.hCursor = 0; + wcex.hbrBackground = 0; + wcex.lpszMenuName = 0; + wcex.lpszClassName = rundll32_wclass; + wcex.hIconSm = 0; + + return (RegisterClassEx(&wcex) != (ATOM)0); } int WINAPI _tWinMain(

1 0

[cfinck] 33382: Revert r33366 for regedit and compile it as Unicode with ANSI command line parsing again.. :-/ Changing everything internally to TCHAR would be like rewriting the app, because regedit even hardcodes string sizes in bytes and then memcmp's them... (see regproc.c:234) Compiling it ANSI-only also doesn't work, because the API's for ACL stuff are Unicode-only.
by cfinck＠svn.reactos.org 08 May '08

08 May '08

Author: cfinck Date: Thu May 8 14:19:22 2008 New Revision: 33382 URL: http://svn.reactos.org/svn/reactos?rev=33382&view=rev Log: Revert r33366 for regedit and compile it as Unicode with ANSI command line parsing again.. :-/ Changing everything internally to TCHAR would be like rewriting the app, because regedit even hardcodes string sizes in bytes and then memcmp's them... (see regproc.c:234) Compiling it ANSI-only also doesn't work, because the API's for ACL stuff are Unicode-only. Modified: trunk/reactos/base/applications/regedit/regedit.rbuild Modified: trunk/reactos/base/applications/regedit/regedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] Thu May 8 14:19:22 2008 @@ -1,8 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="regedit" type="win32gui" installname="regedit.exe" unicode="yes"> +<module name="regedit" type="win32gui" installname="regedit.exe"> <include base="regedit">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0600</define> <library>uuid</library>

1 0

[hpoussin] 33381: Fix compilation by using an unicode entrypoint
by hpoussin＠svn.reactos.org 08 May '08

08 May '08

Author: hpoussin Date: Thu May 8 13:42:29 2008 New Revision: 33381 URL: http://svn.reactos.org/svn/reactos?rev=33381&view=rev Log: Fix compilation by using an unicode entrypoint Modified: trunk/reactos/base/system/services/services.c Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Thu May 8 13:42:29 2008 @@ -293,10 +293,10 @@ int STDCALL -WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nShowCmd) +wWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + int nShowCmd) { HANDLE hScmStartEvent; HANDLE hEvent;

1 0

[hpoussin] 33380: Fix some various unicode problems
by hpoussin＠svn.reactos.org 08 May '08

08 May '08

Author: hpoussin Date: Thu May 8 13:26:15 2008 New Revision: 33380 URL: http://svn.reactos.org/svn/reactos?rev=33380&view=rev Log: Fix some various unicode problems Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c trunk/reactos/base/applications/sndvol32/sndvol32.c trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/setup/vmwinst/vmwinst.c trunk/reactos/base/system/lsass/lsass.c trunk/reactos/base/system/regsvr32/regsvr32.c trunk/reactos/base/system/rundll32/rundll32.c trunk/reactos/boot/freeldr/fdebug/fdebug.c Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -220,10 +220,10 @@ return 0; } -int APIENTRY WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) +int APIENTRY wWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + int nCmdShow) { INITCOMMONCONTROLSEX InitControls; Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -798,10 +798,10 @@ } int WINAPI -WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpszCmdLine, - int nCmdShow) +_tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpszCmdLine, + int nCmdShow) { MSG Msg; int Ret = 1; Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -185,7 +185,7 @@ return TRUE; } -INT main() +INT wmain() { WCHAR LogPath[MAX_PATH]; INT RetCode = 0; Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -2191,7 +2191,7 @@ int -main(int argc, char *argv[]) +wmain(int argc, WCHAR *argv[]) { DWORD dwError; Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -1030,9 +1030,9 @@ } int WINAPI -WinMain(HINSTANCE hInstance, +wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpszCmdLine, + LPWSTR lpszCmdLine, int nCmdShow) { Modified: trunk/reactos/base/system/lsass/lsass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.c?… ============================================================================== --- trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] (original) +++ trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -55,10 +55,10 @@ } INT WINAPI -WinMain( +wWinMain( IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, - IN LPSTR lpCmdLine, + IN LPWSTR lpCmdLine, IN INT nShowCmd) { NTSTATUS Status = STATUS_SUCCESS; Modified: trunk/reactos/base/system/regsvr32/regsvr32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv… ============================================================================== --- trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -247,10 +247,10 @@ _tprintf(_T("%s: %s\n\n"),lpTitle,lpMessage); } -int WINAPI WinMain( +int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLineA, + LPTSTR lpCmdLine, int nCmdShow ) { Modified: trunk/reactos/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -331,10 +331,10 @@ return Ret; } -int WINAPI WinMain( +int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLineA, + LPTSTR lpCmdLine, int nCmdShow ) { Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -39,10 +39,10 @@ VOID CheckLocalEchoMenuItem(BOOL Checked); VOID Rs232Thread(VOID* Parameter); -int APIENTRY WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) +int APIENTRY _tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) { // TODO: Place code here. MSG msg;

1 0

[cfinck] 33379: - Fix build by converting everything to use TCHAR's - Bugfix: Previously macros like "gotoroot=cd \" weren't passed correctly as we just used argv[1]. Now use GetCommandLine and pass the full command line. - Fix indentation
by cfinck＠svn.reactos.org 08 May '08

08 May '08

Author: cfinck Date: Thu May 8 13:11:56 2008 New Revision: 33379 URL: http://svn.reactos.org/svn/reactos?rev=33379&view=rev Log: - Fix build by converting everything to use TCHAR's - Bugfix: Previously macros like "gotoroot=cd \" weren't passed correctly as we just used argv[1]. Now use GetCommandLine and pass the full command line. - Fix indentation Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Thu May 8 13:11:56 2008 @@ -5,131 +5,135 @@ static VOID partstrlwr (LPTSTR str) { - LPTSTR c = str; - while (*c && !_istspace (*c) && *c != _T('=')) - { - *c = _totlower (*c); - c++; - } + LPTSTR c = str; + while (*c && !_istspace (*c) && *c != _T('=')) + { + *c = _totlower (*c); + c++; + } } static VOID PrintAlias (VOID) { - LPTSTR Aliases; - LPTSTR ptr; - DWORD len; + LPTSTR Aliases; + LPTSTR ptr; + DWORD len; - len = GetConsoleAliasesLength(_T("cmd.exe")); - if (len <= 0) - return; + len = GetConsoleAliasesLength(_T("cmd.exe")); + if (len <= 0) + return; - /* allocate memory for an extra \0 char to make parsing easier */ - ptr = HeapAlloc(GetProcessHeap(), 0, (len + sizeof(TCHAR))); - if (!ptr) - return; + /* allocate memory for an extra \0 char to make parsing easier */ + ptr = HeapAlloc(GetProcessHeap(), 0, (len + sizeof(TCHAR))); + if (!ptr) + return; - Aliases = ptr; + Aliases = ptr; - ZeroMemory(Aliases, len + sizeof(TCHAR)); + ZeroMemory(Aliases, len + sizeof(TCHAR)); - if (GetConsoleAliases(Aliases, len, _T("cmd.exe")) != 0) - { - while (*Aliases != '\0') - { - _tprintf(_T("%s\n"), Aliases); - Aliases = Aliases + lstrlen(Aliases); - Aliases++; - } - } - HeapFree(GetProcessHeap(), 0 , ptr); + if (GetConsoleAliases(Aliases, len, _T("cmd.exe")) != 0) + { + while (*Aliases != '\0') + { + _tprintf(_T("%s\n"), Aliases); + Aliases = Aliases + lstrlen(Aliases); + Aliases++; + } + } + HeapFree(GetProcessHeap(), 0 , ptr); } INT SetMacro (LPTSTR param) { - LPTSTR ptr; + LPTSTR ptr; - while (*param == _T(' ')) - param++; + while (*param == _T(' ')) + param++; - /* error if no '=' found */ - if ((ptr = _tcschr (param, _T('='))) == 0) - return 1; + /* error if no '=' found */ + if ((ptr = _tcschr (param, _T('='))) == 0) + return 1; - while (*param == _T(' ')) - param++; + while (*param == _T(' ')) + param++; - while (*ptr == _T(' ')) - ptr--; + while (*ptr == _T(' ')) + ptr--; - /* Split rest into name and substitute */ - *ptr++ = _T('\0'); + /* Split rest into name and substitute */ + *ptr++ = _T('\0'); - partstrlwr (param); + partstrlwr (param); - _tprintf(_T("%s, %s\n"), ptr, param); + _tprintf(_T("%s, %s\n"), ptr, param); - if (ptr[0] == _T('\0')) - AddConsoleAlias(param, NULL, _T("cmd.exe")); - else - AddConsoleAlias(param, ptr, _T("cmd.exe")); + if (ptr[0] == _T('\0')) + AddConsoleAlias(param, NULL, _T("cmd.exe")); + else + AddConsoleAlias(param, ptr, _T("cmd.exe")); - return 0; + return 0; } -static VOID ReadFromFile(LPSTR param) +static VOID ReadFromFile(LPTSTR param) { - FILE* fp; - char line[MAX_PATH]; -#ifdef UNICODE - WCHAR lineW[MAX_PATH]; -#endif + FILE* fp; + TCHAR line[MAX_PATH]; - /* FIXME */ - param += 11; + /* Skip the "/macrofile=" prefix */ + param += 11; - fp = fopen(param,"r"); - while ( fgets(line, MAX_PATH, fp) != NULL) - { -#ifdef UNICODE - MultiByteToWideChar(CP_ACP, 0, line, -1, lineW, MAX_PATH); - SetMacro(lineW); -#else - SetMacro(line); -#endif - } + fp = _tfopen(param, _T("r")); - fclose(fp); - return; + while ( _fgetts(line, MAX_PATH, fp) != NULL) + SetMacro(line); + + fclose(fp); + return; } int -main (int argc, char **argv) +_tmain (int argc, LPTSTR argv[]) { -#ifdef UNICODE - WCHAR lineW[MAX_PATH]; -#endif + if (argc < 2) + return 0; - if (argc < 2) - return 0; + if (argv[1][0] == '/') + { + if (_tcsnicmp(argv[1], _T("/macrofile"), 10) == 0) + ReadFromFile(argv[1]); + if (_tcscmp(argv[1], _T("/macros")) == 0) + PrintAlias(); + } + else + { + /* Get the full command line using GetCommandLine(). + We can't just pass argv[1] here, because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */ + TCHAR* szCommandLine = GetCommandLine(); - if (argv[1][0] == '/') - { - if (strnicmp(argv[1], "/macrofile", 10) == 0) - ReadFromFile(argv[1]); - if (stricmp(argv[1], "/macros") == 0) - PrintAlias(); - } - else - { -#ifdef UNICODE - MultiByteToWideChar(CP_ACP, 0, argv[1], -1, lineW, MAX_PATH); - SetMacro(lineW); -#else - SetMacro(argv[1]); -#endif - } + /* Skip the application name */ + if(*szCommandLine == '\"') + { + do + { + szCommandLine++; + } + while(*szCommandLine != '\"'); + } + else + { + do + { + szCommandLine++; + } + while(*szCommandLine != ' '); + } - return 0; + /* Skip the trailing quotation mark/whitespace and pass the command line to SetMacro */ + SetMacro(++szCommandLine); + } + + return 0; } -

1 0

[hpoussin] 33378: Use _tWinMain instead of WinMain, as msconfig.exe uses TCHAR in other places
by hpoussin＠svn.reactos.org 08 May '08

08 May '08

Author: hpoussin Date: Thu May 8 12:49:42 2008 New Revision: 33378 URL: http://svn.reactos.org/svn/reactos?rev=33378&view=rev Log: Use _tWinMain instead of WinMain, as msconfig.exe uses TCHAR in other places Modified: trunk/reactos/base/applications/msconfig/msconfig.c Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] Thu May 8 12:49:42 2008 @@ -204,10 +204,10 @@ return 0; } -int APIENTRY WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) +int APIENTRY _tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) { INITCOMMONCONTROLSEX InitControls;

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008