Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[chorns] 15268: Update installation instructions
by chorns＠svn.reactos.com 13 May '05

13 May '05

Update installation instructions Modified: branches/xmlbuildsystem/reactos/INSTALL _____ Modified: branches/xmlbuildsystem/reactos/INSTALL --- branches/xmlbuildsystem/reactos/INSTALL 2005-05-13 19:17:44 UTC (rev 15267) +++ branches/xmlbuildsystem/reactos/INSTALL 2005-05-13 19:47:30 UTC (rev 15268) @@ -7,67 +7,72 @@ 2. Building ReactOS -To build from Windows run 'make' (wihout the quotes) from the top directory. -To build from unix, edit rules.mak and change the PREFIX variable to the -correct value for your cross-compiler. Run 'export HOST=mingw32-linux' to -tell the ReactOS build system that it is building ReactOS on a linux machine. -Now run 'make'. +2.1 Building the binaries +To build ReactOS run 'make' (wihout the quotes) if you are building on Linux +or 'mingw32-make' if you are building on Windows (or ReactOS) from the top +directory. + +2.2 Building a bootable CD image + +To build a bootable CD image run 'make bootcd' (wihout the quotes) if you are +building on Linux or 'mingw32-make bootcd' if you are building on Windows (or +ReactOS) from the top directory. This will create a CD image with a filename, +ReactOS.iso, in the top directory. + + 3. Installation -The system can only be installed on the first partition on the first harddisk. -The partition must be formatted as FAT16 or FAT32. The system can only be -started from DOS and not from a Windows DOS-prompt. +ReactOS can only be installed on a machine that has a FAT16 or FAT32 partition +as the active (bootable) partition. The partition on which ReactOS is to be +installed (which may or may not be the bootable partition) must also be +formatted as FAT16 or FAT32. ReactOS Setup can format the partitions if +needed. -ReactOS can be installed from the source distribution or from the binary +ReactOS can be installed from the source distribution or from the bootable CD distribution. The two ways to install ReactOS are explained below. 3.1 Installation from sources -To install ReactOS after building it, type 'make install'. This will create -the directory 'reactos' in the top directory. Copy this directory to the root -of your first partition on your first harddisk. This is usually c:\ on a -Windows machine. +If you don't have an existing ReactOS installation you want to upgrade, then +build a bootable CD as described above. Burn the CD image, boot from it, and +follow the instructions to install ReactOS. -If you don't want to copy the files manually every time you run a 'make install', -you can specify the directory where the files are to be copied to during -installation. +If you have an existing ReactOS installation you want to upgrade, then to +install ReactOS after building it, type 'make install' or +'mingw32-make install'. This will create the directory 'reactos' in the top +directory. Copy the contents of this directory over the existing installation. -In rules.mak find the variable INSTALL_DIR and change the assigned value to the -name of the directory where the files are to be copied to. If you are using -Windows this could be: +If you don't want to copy the files manually every time you run a +'make install' or 'mingw32-make install', then you can specify the directory +where the files are to be copied to during installation. - INSTALL_DIR = c:\reactos +Set the ROS_INSTALL environment variable. If you are on Windows this could be +done by: -If you are on linux this could be: + set ROS_INSTALL=c:\reactos - INSTALL_DIR = /mnt/windows/reactos +If you are on Linux this could be done by: -Save the changes to rules.mak and run 'make install' to install the files to -the new location. If you don't want to change rules.mak, you can specify the -installtion directory when invoking make. Run -'make INSTALL_DIR=c:\reactos install' to install to c:\reactos. + export ROS_INSTALL=/mnt/windows/reactos +Now run 'make install' or 'mingw32-make install' to install the files to the +new location. -3.2 Installation from binany distribution -To install ReactOS from the binary distribution, extract the archive contents -to c:\reactos. Remember to extract the files with full paths. +3.2 Installation from bootable CD distribution +To install ReactOS from the bootable CD distribution, extract the archive +contents. Then burn the CD image, boot from it, and follow instructions. -4. Booting ReactOS -Startup in DOS mode. 'cd' to c:\reactos and type 'boot' and press <enter>. -A simple shell is started where you can use simple commands like 'cd' and 'dir'. - - 5. Help If you run into problems or have suggestions for making ReactOS better, please -surf to the address below and subscribe to one or more of the mailing lists. +visit the address below and subscribe to one or more of the mailing lists. -http://www.reactos.com/index.php?tab=discussion&section=lists +http://www.reactos.com/en/content/view/full/66 ReactOS Development Team

1 0

[chorns] 15267: Support compilerflag within IFs
by chorns＠svn.reactos.com 13 May '05

13 May '05

Support compilerflag within IFs Modified: branches/xmlbuildsystem/reactos/ntoskrnl/rtl/misc.c Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/compilerflag.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/if.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp _____ Modified: branches/xmlbuildsystem/reactos/ntoskrnl/rtl/misc.c --- branches/xmlbuildsystem/reactos/ntoskrnl/rtl/misc.c 2005-05-13 19:01:46 UTC (rev 15266) +++ branches/xmlbuildsystem/reactos/ntoskrnl/rtl/misc.c 2005-05-13 19:17:44 UTC (rev 15267) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-13 19:01:46 UTC (rev 15266) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-13 19:17:44 UTC (rev 15267) @@ -393,6 +393,15 @@ fMakefile, "PROJECT_CFLAGS %s", assignmentOperation ); + + for ( i = 0; i < data.compilerFlags.size(); i++ ) + { + fprintf ( + fMakefile, + " %s", + data.compilerFlags[i]->flag.c_str() ); + } + for ( i = 0; i < data.includes.size(); i++ ) { fprintf ( @@ -432,7 +441,7 @@ prop.value.c_str() ); } - if ( data.includes.size() || data.defines.size() ) + if ( data.includes.size() || data.defines.size() || data.compilerFlags.size() ) { GenerateProjectCFlagsMacro ( assignmentOperation, data ); @@ -443,6 +452,7 @@ If& rIf = *data.ifs[i]; if ( rIf.data.defines.size() || rIf.data.includes.size() + || rIf.data.compilerFlags.size() || rIf.data.ifs.size() ) { fprintf ( _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-13 19:01:46 UTC (rev 15266) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-13 19:17:44 UTC (rev 15267) @@ -562,7 +562,6 @@ return parameters; } - string MingwModuleHandler::GenerateCompilerParametersFromVector ( const vector<CompilerFlag*>& compilerFlags ) const { @@ -618,8 +617,7 @@ MingwModuleHandler::GenerateMacro ( const char* assignmentOperation, const string& macro, - const IfableData& data, - const vector<CompilerFlag*>* compilerFlags ) + const IfableData& data ) { size_t i; @@ -629,16 +627,13 @@ macro.c_str(), assignmentOperation ); - if ( compilerFlags != NULL ) + string compilerParameters = GenerateCompilerParametersFromVector ( data.compilerFlags ); + if ( compilerParameters.size () > 0 ) { - string compilerParameters = GenerateCompilerParametersFromVector ( *compilerFlags ); - if ( compilerParameters.size () > 0 ) - { - fprintf ( - fMakefile, - " %s", - compilerParameters.c_str () ); - } + fprintf ( + fMakefile, + " %s", + compilerParameters.c_str () ); } for ( i = 0; i < data.includes.size(); i++ ) @@ -668,21 +663,18 @@ MingwModuleHandler::GenerateMacros ( const char* assignmentOperation, const IfableData& data, - const vector<CompilerFlag*>* compilerFlags, const vector<LinkerFlag*>* linkerFlags ) { size_t i; - if ( data.includes.size () > 0 || data.defines.size () > 0 ) + if ( data.includes.size () > 0 || data.defines.size () > 0 || data.compilerFlags.size () > 0 ) { GenerateMacro ( assignmentOperation, cflagsMacro, - data, - compilerFlags ); + data ); GenerateMacro ( assignmentOperation, windresflagsMacro, - data, - compilerFlags ); + data ); } if ( linkerFlags != NULL ) @@ -721,6 +713,7 @@ || rIf.data.includes.size() || rIf.data.libraries.size() || rIf.data.files.size() + || rIf.data.compilerFlags.size() || rIf.data.ifs.size() ) { fprintf ( @@ -731,7 +724,6 @@ GenerateMacros ( "+=", rIf.data, - NULL, NULL ); fprintf ( fMakefile, @@ -744,7 +736,6 @@ MingwModuleHandler::GenerateObjectMacros ( const char* assignmentOperation, const IfableData& data, - const vector<CompilerFlag*>* compilerFlags, const vector<LinkerFlag*>* linkerFlags ) { size_t i; @@ -794,6 +785,7 @@ || rIf.data.includes.size() || rIf.data.libraries.size() || rIf.data.files.size() + || rIf.data.compilerFlags.size() || rIf.data.ifs.size() ) { fprintf ( @@ -804,7 +796,6 @@ GenerateObjectMacros ( "+=", rIf.data, - NULL, NULL ); fprintf ( fMakefile, @@ -1531,7 +1522,6 @@ GenerateObjectMacros ( "=", module.non_if_data, - &module.compilerFlags, &module.linkerFlags ); // future references to the macro will be to get its values @@ -1561,7 +1551,6 @@ GenerateMacros ( "=", module.non_if_data, - &module.compilerFlags, &module.linkerFlags ); if ( module.importLibrary ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-13 19:01:46 UTC (rev 15266) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-13 19:17:44 UTC (rev 15267) @@ -109,15 +109,12 @@ std::string GenerateLinkerParameters () const; void GenerateMacro ( const char* assignmentOperation, const std::string& macro, - const IfableData& data, - const std::vector<CompilerFlag*>* compilerFlags ); + const IfableData& data ); void GenerateMacros ( const char* op, const IfableData& data, - const std::vector<CompilerFlag*>* compilerFlags, const std::vector<LinkerFlag*>* linkerFlags ); void GenerateObjectMacros ( const char* assignmentOperation, const IfableData& data, - const std::vector<CompilerFlag*>* compilerFlags, const std::vector<LinkerFlag*>* linkerFlags ); std::string GenerateGccIncludeParameters () const; std::string GenerateGccParameters () const; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/compilerflag.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/compilerflag.cpp 2005-05-13 19:01:46 UTC (rev 15266) +++ branches/xmlbuildsystem/reactos/tools/rbuild/compilerflag.cpp 2005-05-13 19:17:44 UTC (rev 15267) @@ -32,11 +32,6 @@ void CompilerFlag::Initialize () { -} - -void -CompilerFlag::ProcessXML () -{ if (node.value.size () == 0) { throw InvalidBuildFileException ( @@ -45,3 +40,8 @@ } flag = node.value; } + +void +CompilerFlag::ProcessXML () +{ +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-05-13 19:01:46 UTC (rev 15266) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-05-13 19:17:44 UTC (rev 15267) @@ -100,6 +100,8 @@ delete libraries[i]; for ( i = 0; i < properties.size(); i++ ) delete properties[i]; + for ( i = 0; i < compilerFlags.size(); i++ ) + delete compilerFlags[i]; for ( i = 0; i < ifs.size(); i++ ) delete ifs[i]; } @@ -117,6 +119,8 @@ libraries[i]->ProcessXML (); for ( i = 0; i < properties.size(); i++ ) properties[i]->ProcessXML (); + for ( i = 0; i < compilerFlags.size(); i++ ) + compilerFlags[i]->ProcessXML (); for ( i = 0; i < ifs.size (); i++ ) ifs[i]->ProcessXML (); } @@ -390,7 +394,11 @@ } else if ( e.name == "compilerflag" ) { - compilerFlags.push_back ( new CompilerFlag ( project, this, e ) ); + CompilerFlag* pCompilerFlag = new CompilerFlag ( project, this, e ); + if ( pIf ) + pIf->data.compilerFlags.push_back ( pCompilerFlag ); + else + non_if_data.compilerFlags.push_back ( pCompilerFlag ); subs_invalid = true; } else if ( e.name == "linkerflag" ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-05-13 19:01:46 UTC (rev 15266) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-05-13 19:17:44 UTC (rev 15267) @@ -285,6 +285,15 @@ non_if_data.defines.push_back ( define ); subs_invalid = true; } + else if ( e.name == "compilerflag" ) + { + CompilerFlag* pCompilerFlag = new CompilerFlag ( *this, e ); + if ( pIf ) + pIf->data.compilerFlags.push_back ( pCompilerFlag ); + else + non_if_data.compilerFlags.push_back ( pCompilerFlag ); + subs_invalid = true; + } else if ( e.name == "linkerflag" ) { linkerFlags.push_back ( new LinkerFlag ( *this, e ) ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-05-13 19:01:46 UTC (rev 15266) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-05-13 19:17:44 UTC (rev 15267) @@ -73,6 +73,7 @@ std::vector<Define*> defines; std::vector<Library*> libraries; std::vector<Property*> properties; + std::vector<CompilerFlag*> compilerFlags; std::vector<If*> ifs; ~IfableData(); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-05-13 19:01:46 UTC (rev 15266) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-05-13 19:17:44 UTC (rev 15267) @@ -310,7 +310,7 @@ None. Elements: - define, directory, file, if, include, property. + compilerflag, define, directory, file, if, include, property. Importlibrary element _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h --- branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-05-13 19:01:46 UTC (rev 15266) +++ branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-05-13 19:17:44 UTC (rev 15267) @@ -97,6 +97,9 @@ { public: void Run (); +private: + void TestProjectIf ( Project& project ); + void TestModuleIf ( Project& project ); }; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/if.xml --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/if.xml 2005-05-13 19:01:46 UTC (rev 15266) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/if.xml 2005-05-13 19:17:44 UTC (rev 15267) @@ -1,7 +1,11 @@ <?xml version="1.0" ?> <project name="Project" makefile="Makefile"> + <if property="VAR1" value="value1"> + <compilerflag>compilerflag1</compilerflag> + </if> <module name="module1" type="buildtool"> - <if property="VAR1" value="value1"> + <if property="VAR2" value="value2"> + <compilerflag>compilerflag2</compilerflag> <file>file1.c</file> </if> <file>file2.c</file> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp 2005-05-13 19:01:46 UTC (rev 15266) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp 2005-05-13 19:17:44 UTC (rev 15267) @@ -2,18 +2,29 @@ using std::string; -void IfTest::Run() +void +IfTest::TestProjectIf ( Project& project ) { - string projectFilename ( RBUILD_BASE "tests/data/if.xml" ); - Project project ( projectFilename ); + ARE_EQUAL ( 1, project.non_if_data.ifs.size () ); + If& if1 = *project.non_if_data.ifs[0]; + ARE_EQUAL ( "VAR1", if1.property ); + ARE_EQUAL ( "value1", if1.value ); + ARE_EQUAL ( 1, if1.data.compilerFlags.size () ); + CompilerFlag& compilerFlag1 = *if1.data.compilerFlags[0]; + ARE_EQUAL( "compilerflag1", compilerFlag1.flag ); +} + +void +IfTest::TestModuleIf ( Project& project ) +{ ARE_EQUAL ( 1, project.modules.size () ); Module& module1 = *project.modules[0]; ARE_EQUAL ( 1, module1.non_if_data.ifs.size () ); If& if1 = *module1.non_if_data.ifs[0]; - ARE_EQUAL ( "VAR1", if1.property ); - ARE_EQUAL ( "value1", if1.value ); + ARE_EQUAL ( "VAR2", if1.property ); + ARE_EQUAL ( "value2", if1.value ); ARE_EQUAL ( 1, if1.data.files.size () ); File& file1 = *if1.data.files[0]; @@ -22,4 +33,18 @@ ARE_EQUAL ( 1, module1.non_if_data.files.size () ); File& file2 = *module1.non_if_data.files[0]; ARE_EQUAL( SSEP "file2.c", file2.name ); + + ARE_EQUAL ( 1, if1.data.compilerFlags.size () ); + CompilerFlag& compilerFlag2 = *if1.data.compilerFlags[0]; + ARE_EQUAL( "compilerflag2", compilerFlag2.flag ); } + +void +IfTest::Run () +{ + string projectFilename ( RBUILD_BASE "tests/data/if.xml" ); + Project project ( projectFilename ); + + TestProjectIf ( project ); + TestModuleIf ( project ); +}

1 0

[chorns] 15266: Cleanup template configuration file
by chorns＠svn.reactos.com 13 May '05

13 May '05

Cleanup template configuration file Modified: branches/xmlbuildsystem/reactos/config.template.xml _____ Modified: branches/xmlbuildsystem/reactos/config.template.xml --- branches/xmlbuildsystem/reactos/config.template.xml 2005-05-13 17:11:16 UTC (rev 15265) +++ branches/xmlbuildsystem/reactos/config.template.xml 2005-05-13 19:01:46 UTC (rev 15266) @@ -1,67 +1,39 @@  -<property name="ARCH" value="i386" /> -  +<property name="ARCH" value="i386" /> -<property name="OARCH" value="i486" />  + Which CPU ReactOS should be optimized for. Specify one of: + i486, i586, pentium, pentium2, pentum3, pentium4, athlon-xp, athlon-mp, + k6-2 - - - +<property name="OARCH" value="i486" /> -  +<property name="KDBG" value="0" /> -<property name="OPTIMIZED" value="0" /> -  - -<property name="MP" value="0" /> - - - - -<property name="ACPI" value="0" /> - - - - -<property name="_3GB" value="1" /> - - - +<property name="DBG" value="0" />

1 0

[mf] 15265: display free and total disk space
by mf＠svn.reactos.com 13 May '05

13 May '05

display free and total disk space Modified: trunk/reactos/subsys/system/winefile/de.rc Modified: trunk/reactos/subsys/system/winefile/en.rc Modified: trunk/reactos/subsys/system/winefile/resource.h Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-05-13 15:35:55 UTC (rev 15264) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-05-13 17:11:16 UTC (rev 15265) @@ -207,4 +207,6 @@ IDS_COL_LINKS "Links" IDS_COL_ATTR "Attribute" IDS_COL_SEC "Sicherheit" + + IDS_FREE_SPACE_FMT "%s von %s frei" } _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-05-13 15:35:55 UTC (rev 15264) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-05-13 17:11:16 UTC (rev 15265) @@ -210,4 +210,6 @@ IDS_COL_LINKS "Links" IDS_COL_ATTR "Attributes" IDS_COL_SEC "Security" + + IDS_FREE_SPACE_FMT "%s of %s free" } _____ Modified: trunk/reactos/subsys/system/winefile/resource.h --- trunk/reactos/subsys/system/winefile/resource.h 2005-05-13 15:35:55 UTC (rev 15264) +++ trunk/reactos/subsys/system/winefile/resource.h 2005-05-13 17:11:16 UTC (rev 15265) @@ -102,6 +102,7 @@ #define IDS_COL_LINKS 1216 #define IDS_COL_ATTR 1217 #define IDS_COL_SEC 1218 +#define IDS_FREE_SPACE_FMT 1219 /* range for drive bar command ids: 0x9000..0x90FF */ _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-13 15:35:55 UTC (rev 15264) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-13 17:11:16 UTC (rev 15265) @@ -2446,6 +2446,40 @@ } +static void format_bytes(LPTSTR buffer, LONGLONG bytes) +{ + const static TCHAR sFmtGB[] = {'%', '.', '1', 'f', ' ', 'G', 'B', '\0'}; + const static TCHAR sFmtMB[] = {'%', '.', '1', 'f', ' ', 'M', 'B', '\0'}; + const static TCHAR sFmtkB[] = {'%', '.', '1', 'f', ' ', 'k', 'B', '\0'}; + + float fBytes = (float)bytes; + + if (bytes >= 1073741824) // 1 GB + _stprintf(buffer, sFmtGB, fBytes/1073741824.f+.5f); + else if (bytes >= 1048576) // 1 MB + _stprintf(buffer, sFmtMB, fBytes/1048576.f+.5f); + else if (bytes >= 1024) // 1 kB + _stprintf(buffer, sFmtMB, fBytes/1024.f+.5f); + else + _stprintf(buffer, sLongNumFmt, bytes); +} + +static void set_space_status() +{ + ULARGE_INTEGER ulFreeBytesToCaller, ulTotalBytes, ulFreeBytes; + TCHAR fmt[64], b1[64], b2[64], buffer[BUFFER_LEN]; + + if (GetDiskFreeSpaceEx(NULL, &ulFreeBytesToCaller, &ulTotalBytes, &ulFreeBytes)) { + format_bytes(b1, ulFreeBytesToCaller.QuadPart); + format_bytes(b2, ulTotalBytes.QuadPart); + _stprintf(buffer, RS(fmt,IDS_FREE_SPACE_FMT), b1, b2); + } else + _tcscpy(buffer, sQMarks); + + SendMessage(Globals.hstatusbar, SB_SETTEXT, 0, (LPARAM)buffer); +} + + static WNDPROC g_orgTreeWndProc; static void create_tree_window(HWND parent, Pane* pane, int id, int id_header) @@ -2755,13 +2789,13 @@ #endif ) LineTo(dis->hDC, x, dis->rcItem.bottom); - +/*@@ if (entry->down && entry->expanded) { x += IMAGE_WIDTH+TREE_LINE_DX; MoveToEx(dis->hDC, x, dis->rcItem.top+IMAGE_HEIGHT, 0); LineTo(dis->hDC, x, dis->rcItem.bottom); } - +*/ SelectClipRgn(dis->hDC, hrgn_org); if (hrgn_org) DeleteObject(hrgn_org); /* SelectObject(dis->hDC, holdPen); */ @@ -3299,7 +3333,8 @@ SetWindowText(child->hwnd, path); if (path[0]) - SetCurrentDirectory(path); + if (SetCurrentDirectory(path)) + set_space_status(); } @@ -3728,7 +3763,8 @@ #endif /* _NO_EXTENSIONS */ case WM_SETFOCUS: - SetCurrentDirectory(child->path); + if (SetCurrentDirectory(child->path)) + set_space_status(); SetFocus(child->focus_pane? child->right.hwnd: child->left.hwnd); break;

1 0

[mf] 15264: adjustments for GCC and MinGW
by mf＠svn.reactos.com 13 May '05

13 May '05

adjustments for GCC and MinGW Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-13 15:32:04 UTC (rev 15263) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-13 15:35:55 UTC (rev 15264) @@ -2013,28 +2013,32 @@ case ID_CONNECT_NETWORK_DRIVE: { DWORD ret = WNetConnectionDialog(hwnd, RESOURCETYPE_DISK); - if (ret!=NO_ERROR && ret!=(DWORD)-1) + if (ret!=NO_ERROR && ret!=(DWORD)-1) { if (ret == ERROR_EXTENDED_ERROR) display_network_error(hwnd); else display_error(hwnd, ret); + } break;} case ID_DISCONNECT_NETWORK_DRIVE: { DWORD ret = WNetDisconnectDialog(hwnd, RESOURCETYPE_DISK); - if (ret!=NO_ERROR && ret!=(DWORD)-1) + if (ret!=NO_ERROR && ret!=(DWORD)-1) { if (ret == ERROR_EXTENDED_ERROR) display_network_error(hwnd); else display_error(hwnd, ret); + } break;} +#ifndef __MINGW32__ /* SHFormatDrive missing in MinGW (as of 13.5.2005) */ case ID_FORMAT_DISK: { UINT sem_org = SetErrorMode(0); /* Get the current Error Mode settings. */ SetErrorMode(sem_org & ~SEM_FAILCRITICALERRORS); /* Force O/S to handle */ SHFormatDrive(hwnd, 0 /* A: */, SHFMT_ID_DEFAULT, 0); SetErrorMode(sem_org); /* Put it back the way it was. */ break;} +#endif case ID_HELP: WinHelp(hwnd, RS(b1,IDS_WINEFILE), HELP_INDEX, 0);

1 0

[mf] 15263: - error handling for network connection dialogs
by mf＠svn.reactos.com 13 May '05

13 May '05

- error handling for network connection dialogs - implement "format disk" dialog Modified: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/cz.rc Modified: trunk/reactos/subsys/system/winefile/de.rc Modified: trunk/reactos/subsys/system/winefile/en.rc Modified: trunk/reactos/subsys/system/winefile/es.rc Modified: trunk/reactos/subsys/system/winefile/fr.rc Modified: trunk/reactos/subsys/system/winefile/hu.rc Modified: trunk/reactos/subsys/system/winefile/it.rc Modified: trunk/reactos/subsys/system/winefile/nl.rc Modified: trunk/reactos/subsys/system/winefile/pt.rc Modified: trunk/reactos/subsys/system/winefile/resource.h Modified: trunk/reactos/subsys/system/winefile/ru.rc Modified: trunk/reactos/subsys/system/winefile/si.rc Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/zh.rc _____ Modified: trunk/reactos/subsys/system/winefile/Sv.rc --- trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-13 15:32:04 UTC (rev 15263) @@ -59,7 +59,7 @@ MENUITEM "&Kopiera disk...", 201 MENUITEM "&Namnge disk...", 202 MENUITEM SEPARATOR - MENUITEM "&Formatera disk...", 203 + MENUITEM "&Formatera disk...", ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "&Skapa systemdisk...", -1 /*TODO*/ #endif _____ Modified: trunk/reactos/subsys/system/winefile/cz.rc --- trunk/reactos/subsys/system/winefile/cz.rc 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/cz.rc 2005-05-13 15:32:04 UTC (rev 15263) @@ -58,7 +58,7 @@ MENUITEM "&KopÝrovat disk..." , 201 MENUITEM "&Jmenovka disk..." , 202 MENUITEM SEPARATOR - MENUITEM "&Formßtovat disk..." , 203 + MENUITEM "&Formßtovat disk..." , ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "&Vytvo°it systemov² disk...", -1 /*TODO*/ #endif _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-05-13 15:32:04 UTC (rev 15263) @@ -56,7 +56,7 @@ MENUITEM "Datentrõger &kopieren..." , 201 MENUITEM "Datentrõger &benennen..." , 202 MENUITEM SEPARATOR - MENUITEM "Datentrõger &formatieren..." , 203 + MENUITEM "Datentrõger &formatieren..." , ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "...", -1 /*TODO*/ #endif _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-05-13 15:32:04 UTC (rev 15263) @@ -60,7 +60,7 @@ MENUITEM "&Copy Disk..." , 201 MENUITEM "&Label Disk..." , 202 MENUITEM SEPARATOR - MENUITEM "&Format Disk..." , 203 + MENUITEM "&Format Disk..." , ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "&Make System Disk...", -1 /*TODO*/ #endif _____ Modified: trunk/reactos/subsys/system/winefile/es.rc --- trunk/reactos/subsys/system/winefile/es.rc 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/es.rc 2005-05-13 15:32:04 UTC (rev 15263) @@ -56,7 +56,7 @@ MENUITEM "&Copiar disco..." , 201 MENUITEM "E&tiquetar disco..." , 202 MENUITEM SEPARATOR - MENUITEM "&Formatear disco..." , 203 + MENUITEM "&Formatear disco..." , ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "&Hacer disco de sistema...", -1 /*@@ */ #endif _____ Modified: trunk/reactos/subsys/system/winefile/fr.rc --- trunk/reactos/subsys/system/winefile/fr.rc 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/fr.rc 2005-05-13 15:32:04 UTC (rev 15263) @@ -59,7 +59,7 @@ MENUITEM "&Copier Disque..." , 201 MENUITEM "&Nommer Disque..." , 202 MENUITEM SEPARATOR - MENUITEM "&Formater Disque..." , 203 + MENUITEM "&Formater Disque..." , ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "CrÚer un disque *systÞme...", -1 /*@@ */ #endif _____ Modified: trunk/reactos/subsys/system/winefile/hu.rc --- trunk/reactos/subsys/system/winefile/hu.rc 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/hu.rc 2005-05-13 15:32:04 UTC (rev 15263) @@ -59,7 +59,7 @@ MENUITEM "Lemez &mßsolßsa..." , 201 MENUITEM "&Lemezcimke..." , 202 MENUITEM SEPARATOR - MENUITEM "&Formatßlßs..." , 203 + MENUITEM "&Formatßlßs..." , ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "&Rendszerlemez kÚszÝtÚse...", -1 /*@@ */ #endif _____ Modified: trunk/reactos/subsys/system/winefile/it.rc --- trunk/reactos/subsys/system/winefile/it.rc 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/it.rc 2005-05-13 15:32:04 UTC (rev 15263) @@ -59,7 +59,7 @@ MENUITEM "&Copia Disco..." , 201 MENUITEM "&Etichetta Disco..." , 202 MENUITEM SEPARATOR - MENUITEM "&Formatta Disco..." , 203 + MENUITEM "&Formatta Disco..." , ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "&Crea Disco di Sistema...", -1 /*@@ */ #endif _____ Modified: trunk/reactos/subsys/system/winefile/nl.rc --- trunk/reactos/subsys/system/winefile/nl.rc 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/nl.rc 2005-05-13 15:32:04 UTC (rev 15263) @@ -55,7 +55,7 @@ MENUITEM "Disk &kopiÙren..." , 201 MENUITEM "Disklabel maken..." , 202 MENUITEM SEPARATOR - MENUITEM "Disk &formatteren..." , 203 + MENUITEM "Disk &formatteren..." , ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "Systeemdisk maken...", -1 /*@@ */ #endif _____ Modified: trunk/reactos/subsys/system/winefile/pt.rc --- trunk/reactos/subsys/system/winefile/pt.rc 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/pt.rc 2005-05-13 15:32:04 UTC (rev 15263) @@ -58,7 +58,7 @@ MENUITEM "&Copiar disco..." , 201 MENUITEM "&Nomear disco..." , 202 MENUITEM SEPARATOR - MENUITEM "&Formatar disco..." , 203 + MENUITEM "&Formatar disco..." , ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "&Gerar disco de sistema...", -1 /*@@ */ #endif @@ -186,7 +186,7 @@ MENUITEM "&Copiar disco..." , 201 MENUITEM "&Nomear disco..." , 202 MENUITEM SEPARATOR - MENUITEM "&Formatar disco..." , 203 + MENUITEM "&Formatar disco..." , ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "&Gerar disco de sistema...", -1 /*@@ */ #endif _____ Modified: trunk/reactos/subsys/system/winefile/resource.h --- trunk/reactos/subsys/system/winefile/resource.h 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/resource.h 2005-05-13 15:32:04 UTC (rev 15263) @@ -43,6 +43,7 @@ #define ID_EXECUTE 105 #define ID_FILE_MOVE 106 #define ID_FILE_EXIT 115 +#define ID_FORMAT_DISK 203 #define ID_CONNECT_NETWORK_DRIVE 252 #define ID_DISCONNECT_NETWORK_DRIVE 253 #define ID_VIEW_NAME 401 _____ Modified: trunk/reactos/subsys/system/winefile/ru.rc --- trunk/reactos/subsys/system/winefile/ru.rc 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/ru.rc 2005-05-13 15:32:04 UTC (rev 15263) @@ -55,7 +55,7 @@ MENUITEM "&?¯´Þ¯ÔÓ?³ õÞ±Û..." , 201 MENUITEM "&?Õ?ÛÓ ?¯ýÓ..." , 202 MENUITEM SEPARATOR - MENUITEM "&È¯ýÓ?Þ¯ÔÓ?³..." , 203 + MENUITEM "&È¯ýÓ?Þ¯ÔÓ?³..." , ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "&Ð¯þõÓ?³ ±Þ±?ÕýÝ¹Ú õÞ±Û...", -1 /*@@ */ #endif _____ Modified: trunk/reactos/subsys/system/winefile/si.rc --- trunk/reactos/subsys/system/winefile/si.rc 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/si.rc 2005-05-13 15:32:04 UTC (rev 15263) @@ -56,7 +56,7 @@ MENUITEM "&Copy Disk..." , 201 MENUITEM "&Label Disk..." , 202 MENUITEM SEPARATOR - MENUITEM "&Format Disk..." , 203 + MENUITEM "&Format Disk..." , ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "&Make System Disk...", -1 /*@@ */ #endif _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-13 15:32:04 UTC (rev 15263) @@ -260,6 +260,17 @@ } +/* display network error message using WNetGetLastError() */ +static void display_network_error(HWND hwnd) +{ + TCHAR msg[BUFFER_LEN], provider[BUFFER_LEN], b2[BUFFER_LEN]; + DWORD error; + + if (WNetGetLastError(&error, msg, BUFFER_LEN, provider, BUFFER_LEN) == NO_ERROR) + MessageBox(hwnd, msg, RS(b2,IDS_WINEFILE), MB_OK); +} + + /* allocate and initialise a directory entry */ static Entry* alloc_entry() { @@ -2000,14 +2011,31 @@ } break;} - case ID_CONNECT_NETWORK_DRIVE: - WNetConnectionDialog(hwnd, RESOURCETYPE_DISK); - break; + case ID_CONNECT_NETWORK_DRIVE: { + DWORD ret = WNetConnectionDialog(hwnd, RESOURCETYPE_DISK); + if (ret!=NO_ERROR && ret!=(DWORD)-1) + if (ret == ERROR_EXTENDED_ERROR) + display_network_error(hwnd); + else + display_error(hwnd, ret); + break;} - case ID_DISCONNECT_NETWORK_DRIVE: - WNetDisconnectDialog(hwnd, RESOURCETYPE_DISK); - break; + case ID_DISCONNECT_NETWORK_DRIVE: { + DWORD ret = WNetDisconnectDialog(hwnd, RESOURCETYPE_DISK); + if (ret!=NO_ERROR && ret!=(DWORD)-1) + if (ret == ERROR_EXTENDED_ERROR) + display_network_error(hwnd); + else + display_error(hwnd, ret); + break;} + case ID_FORMAT_DISK: { + UINT sem_org = SetErrorMode(0); /* Get the current Error Mode settings. */ + SetErrorMode(sem_org & ~SEM_FAILCRITICALERRORS); /* Force O/S to handle */ + SHFormatDrive(hwnd, 0 /* A: */, SHFMT_ID_DEFAULT, 0); + SetErrorMode(sem_org); /* Put it back the way it was. */ + break;} + case ID_HELP: WinHelp(hwnd, RS(b1,IDS_WINEFILE), HELP_INDEX, 0); break; _____ Modified: trunk/reactos/subsys/system/winefile/zh.rc --- trunk/reactos/subsys/system/winefile/zh.rc 2005-05-13 14:53:40 UTC (rev 15262) +++ trunk/reactos/subsys/system/winefile/zh.rc 2005-05-13 15:32:04 UTC (rev 15263) @@ -56,7 +56,7 @@ MENUITEM "©?Íãú¿&Cú®..." , 201 MENUITEM "?³?¹ú¿&Lú®..." , 202 MENUITEM SEPARATOR - MENUITEM "©±?¢?»ú¿&ú®..." , 203 + MENUITEM "©±?¢?»ú¿&ú®..." , ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "¢¿?ó¤Á????ú¿&Mú®...", -1 /*@@ */ #endif

1 0

[mf] 15262: malloc.h include
by mf＠svn.reactos.com 13 May '05

13 May '05

malloc.h include Modified: trunk/reactos/subsys/system/winefile/winefile.h _____ Modified: trunk/reactos/subsys/system/winefile/winefile.h --- trunk/reactos/subsys/system/winefile/winefile.h 2005-05-13 14:48:10 UTC (rev 15261) +++ trunk/reactos/subsys/system/winefile/winefile.h 2005-05-13 14:53:40 UTC (rev 15262) @@ -46,7 +46,7 @@ #include <locale.h> #include <time.h> -#ifdef _MSC_VER +#ifndef __WINE__ #include <malloc.h> /* for alloca() */ #endif

1 0

[mf] 15261: implement network connect and disconnect dialogs
by mf＠svn.reactos.com 13 May '05

13 May '05

implement network connect and disconnect dialogs Modified: trunk/reactos/subsys/system/winefile/Makefile Modified: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/cz.rc Modified: trunk/reactos/subsys/system/winefile/de.rc Modified: trunk/reactos/subsys/system/winefile/en.rc Modified: trunk/reactos/subsys/system/winefile/es.rc Modified: trunk/reactos/subsys/system/winefile/fr.rc Modified: trunk/reactos/subsys/system/winefile/hu.rc Modified: trunk/reactos/subsys/system/winefile/it.rc Modified: trunk/reactos/subsys/system/winefile/nl.rc Modified: trunk/reactos/subsys/system/winefile/pt.rc Modified: trunk/reactos/subsys/system/winefile/resource.h Modified: trunk/reactos/subsys/system/winefile/ru.rc Modified: trunk/reactos/subsys/system/winefile/si.rc Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/winefile.dsp Modified: trunk/reactos/subsys/system/winefile/zh.rc _____ Modified: trunk/reactos/subsys/system/winefile/Makefile --- trunk/reactos/subsys/system/winefile/Makefile 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/Makefile 2005-05-13 14:48:10 UTC (rev 15261) @@ -28,7 +28,8 @@ comdlg32.a \ ole32.a \ oleaut32.a \ - shell32.a + shell32.a \ + mpr.a TARGET_GCCLIBS := uuid _____ Modified: trunk/reactos/subsys/system/winefile/Sv.rc --- trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-13 14:48:10 UTC (rev 15261) @@ -64,8 +64,8 @@ MENUITEM "&Skapa systemdisk...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "Anslut &Nõtverksenhet", 252 - MENUITEM "&Koppla ifrÕn Nõtverksenhet", 253 + MENUITEM "Anslut &Nõtverksenhet", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Koppla ifrÕn Nõtverksenhet", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Dela ut...", 254 MENUITEM "&Ta bort utdelning...", 255 _____ Modified: trunk/reactos/subsys/system/winefile/cz.rc --- trunk/reactos/subsys/system/winefile/cz.rc 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/cz.rc 2005-05-13 14:48:10 UTC (rev 15261) @@ -63,8 +63,8 @@ MENUITEM "&Vytvo°it systemov² disk...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "P°ipojit &sÝØovÚ za°ÝzenÝ" , 252 - MENUITEM "&Odpojit &sÝØovÚ za°ÝzenÝ" , 253 + MENUITEM "P°ipojit &sÝØovÚ za°ÝzenÝ" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Odpojit &sÝØovÚ za°ÝzenÝ" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "SdÝlet jako..." , 254 MENUITEM "&Odstranit sdÝlenÝ..." , 255 _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-05-13 14:48:10 UTC (rev 15261) @@ -61,8 +61,8 @@ MENUITEM "...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "Netzwerklaufwerk &verbinden..." , 252 - MENUITEM "Netzwerklaufwerk &trennen..." , 253 + MENUITEM "Netzwerklaufwerk &verbinden..." , ID_CONNECT_NETWORK_DRIVE + MENUITEM "Netzwerklaufwerk &trennen..." , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "F&reigeben als..." , 254 MENUITEM "Freigabe been&den..." , 255 _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-05-13 14:48:10 UTC (rev 15261) @@ -65,8 +65,8 @@ MENUITEM "&Make System Disk...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "Connect &Network Drive" , 252 - MENUITEM "&Disconnect Network Drive" , 253 + MENUITEM "Connect &Network Drive" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Disconnect Network Drive" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Share as..." , 254 MENUITEM "&Remove Share..." , 255 _____ Modified: trunk/reactos/subsys/system/winefile/es.rc --- trunk/reactos/subsys/system/winefile/es.rc 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/es.rc 2005-05-13 14:48:10 UTC (rev 15261) @@ -61,8 +61,8 @@ MENUITEM "&Hacer disco de sistema...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "C&onectar unidad de red" , 252 - MENUITEM "&Desconectar unidad de red" , 253 + MENUITEM "C&onectar unidad de red" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Desconectar unidad de red" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Co&mpartir como..." , 254 MENUITEM "&Eliminar compartido..." , 255 _____ Modified: trunk/reactos/subsys/system/winefile/fr.rc --- trunk/reactos/subsys/system/winefile/fr.rc 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/fr.rc 2005-05-13 14:48:10 UTC (rev 15261) @@ -64,8 +64,8 @@ MENUITEM "CrÚer un disque *systÞme...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Connecter un lecteur &rÚseau" , 252 - MENUITEM "&DÚconnecter un lecteur rÚseau" , 253 + MENUITEM "Connecter un lecteur &rÚseau" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&DÚconnecter un lecteur rÚseau" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "&Partager..." , 254 MENUITEM "Cesser de parta&ger" , 255 _____ Modified: trunk/reactos/subsys/system/winefile/hu.rc --- trunk/reactos/subsys/system/winefile/hu.rc 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/hu.rc 2005-05-13 14:48:10 UTC (rev 15261) @@ -64,8 +64,8 @@ MENUITEM "&Rendszerlemez kÚszÝtÚse...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "&Hßl¾zati meghajt¾ csatlakoztatßsa" , 252 - MENUITEM "Hßl¾zati meghajt¾ levßlasztßsa" , 253 + MENUITEM "&Hßl¾zati meghajt¾ csatlakoztatßsa" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "Hßl¾zati meghajt¾ levßlasztßsa" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Megosztßs..." , 254 MENUITEM "Megosztßs &megsz³ntetÚse..." , 255 _____ Modified: trunk/reactos/subsys/system/winefile/it.rc --- trunk/reactos/subsys/system/winefile/it.rc 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/it.rc 2005-05-13 14:48:10 UTC (rev 15261) @@ -64,8 +64,8 @@ MENUITEM "&Crea Disco di Sistema...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Connetti & Drive di Rete" , 252 - MENUITEM "&Disconnetti Drive di Rete" , 253 + MENUITEM "Connetti & Drive di Rete" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Disconnetti Drive di Rete" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Condividi come..." , 254 MENUITEM "&Rimuovi condivisione..." , 255 _____ Modified: trunk/reactos/subsys/system/winefile/nl.rc --- trunk/reactos/subsys/system/winefile/nl.rc 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/nl.rc 2005-05-13 14:48:10 UTC (rev 15261) @@ -60,8 +60,8 @@ MENUITEM "Systeemdisk maken...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Verbinding &maken met netwerkchijf" , 252 - MENUITEM "Verbinding &verbreken met netwerkschijf" , 253 + MENUITEM "Verbinding &maken met netwerkchijf" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "Verbinding &verbreken met netwerkschijf" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Schijf &delen..." , 254 MENUITEM "Delen &ongedaan maken..." , 255 _____ Modified: trunk/reactos/subsys/system/winefile/pt.rc --- trunk/reactos/subsys/system/winefile/pt.rc 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/pt.rc 2005-05-13 14:48:10 UTC (rev 15261) @@ -63,8 +63,8 @@ MENUITEM "&Gerar disco de sistema...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Conecta&r unidade de rede" , 252 - MENUITEM "&Desconectar unidade de rede" , 253 + MENUITEM "Conecta&r unidade de rede" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Desconectar unidade de rede" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "C&ompartilhar como..." , 254 MENUITEM "&Remover compartilhamento..." , 255 @@ -191,8 +191,8 @@ MENUITEM "&Gerar disco de sistema...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Conecta&r unidade de rede" , 252 - MENUITEM "&Desconectar unidade de rede" , 253 + MENUITEM "Conecta&r unidade de rede" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Desconectar unidade de rede" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "&Partilhar como..." , 254 MENUITEM "&Remover partilha..." , 255 _____ Modified: trunk/reactos/subsys/system/winefile/resource.h --- trunk/reactos/subsys/system/winefile/resource.h 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/resource.h 2005-05-13 14:48:10 UTC (rev 15261) @@ -43,6 +43,8 @@ #define ID_EXECUTE 105 #define ID_FILE_MOVE 106 #define ID_FILE_EXIT 115 +#define ID_CONNECT_NETWORK_DRIVE 252 +#define ID_DISCONNECT_NETWORK_DRIVE 253 #define ID_VIEW_NAME 401 #define ID_VIEW_ALL_ATTRIBUTES 402 #define ID_VIEW_SELECTED_ATTRIBUTES 403 _____ Modified: trunk/reactos/subsys/system/winefile/ru.rc --- trunk/reactos/subsys/system/winefile/ru.rc 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/ru.rc 2005-05-13 14:48:10 UTC (rev 15261) @@ -60,8 +60,8 @@ MENUITEM "&Ð¯þõÓ?³ ±Þ±?ÕýÝ¹Ú õÞ±Û...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "¤¯õÛÙ?&¸Þ?³ ±Õ?ÕÔ¯Ú õÞ±Û" , 252 - MENUITEM "??Û&Ù?¸Þ?³ ±Õ?ÕÔ¯Ú õÞ±Û" , 253 + MENUITEM "¤¯õÛÙ?&¸Þ?³ ±Õ?ÕÔ¯Ú õÞ±Û" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "??Û&Ù?¸Þ?³ ±Õ?ÕÔ¯Ú õÞ±Û" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "ÐõÕÙÓ?³ ¯&ß¨Þý ÛÓÛ..." , 254 MENUITEM "&ÃÓÛ¹?³ ¯ß¨ÞÚ õ¯±?¾´..." , 255 _____ Modified: trunk/reactos/subsys/system/winefile/si.rc --- trunk/reactos/subsys/system/winefile/si.rc 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/si.rc 2005-05-13 14:48:10 UTC (rev 15261) @@ -61,8 +61,8 @@ MENUITEM "&Make System Disk...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "Connect &Network Drive" , 252 - MENUITEM "&Disconnect Network Drive" , 253 + MENUITEM "Connect &Network Drive" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Disconnect Network Drive" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Share as..." , 254 MENUITEM "&Remove Share..." , 255 _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-13 14:48:10 UTC (rev 15261) @@ -2000,6 +2000,14 @@ } break;} + case ID_CONNECT_NETWORK_DRIVE: + WNetConnectionDialog(hwnd, RESOURCETYPE_DISK); + break; + + case ID_DISCONNECT_NETWORK_DRIVE: + WNetDisconnectDialog(hwnd, RESOURCETYPE_DISK); + break; + case ID_HELP: WinHelp(hwnd, RS(b1,IDS_WINEFILE), HELP_INDEX, 0); break; _____ Modified: trunk/reactos/subsys/system/winefile/winefile.dsp --- trunk/reactos/subsys/system/winefile/winefile.dsp 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/winefile.dsp 2005-05-13 14:48:10 UTC (rev 15261) @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib mpr.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept !ELSEIF "$(CFG)" == "winefile - Win32 Unicode Debug" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib mpr.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept !ELSEIF "$(CFG)" == "winefile - Win32 UNICODE Release" @@ -108,7 +108,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib mpr.lib /nologo /subsystem:windows /machine:I386 !ELSEIF "$(CFG)" == "winefile - Win32 Release" @@ -135,7 +135,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib mpr.lib /nologo /subsystem:windows /machine:I386 !ENDIF _____ Modified: trunk/reactos/subsys/system/winefile/zh.rc --- trunk/reactos/subsys/system/winefile/zh.rc 2005-05-13 14:21:37 UTC (rev 15260) +++ trunk/reactos/subsys/system/winefile/zh.rc 2005-05-13 14:48:10 UTC (rev 15261) @@ -61,8 +61,8 @@ MENUITEM "¢¿?ó¤Á????ú¿&Mú®...", -1 /*@@ */ #endif MENUITEM SEPARATOR - MENUITEM "?¼¢Ë?°?þÃ²Â»ã¸ú¿&Nú®" , 252 - MENUITEM "Â¤?¬?°?þÃ²Â»ã¸?¼¢Ëú¿&Dú®" , 253 + MENUITEM "?¼¢Ë?°?þÃ²Â»ã¸ú¿&Nú®" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "Â¤?¬?°?þÃ²Â»ã¸?¼¢Ëú¿&Dú®" , ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "??¤Ý?¬..." , 254 MENUITEM "?¥?²??¤Ýú¿&Rú®..." , 255

1 0

[mf] 15260: display source path in "move file" dialog
by mf＠svn.reactos.com 13 May '05

13 May '05

display source path in "move file" dialog Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-13 10:27:19 UTC (rev 15259) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-13 14:21:37 UTC (rev 15260) @@ -1645,6 +1645,7 @@ switch(nmsg) { case WM_INITDIALOG: SetWindowLong(hwnd, GWL_USERDATA, lparam); + SetWindowText(GetDlgItem(hwnd, 201), (LPCTSTR)lparam); return 1; case WM_COMMAND: { @@ -3713,9 +3714,11 @@ case ID_FILE_MOVE: { TCHAR new_name[BUFFER_LEN], old_name[BUFFER_LEN]; - int len; + int len, ret; - int ret = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_SELECT_DESTINATION), hwnd, DestinationDlgProc, (LPARAM)new_name); + get_path(pane->cur, new_name); + + ret = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_SELECT_DESTINATION), hwnd, DestinationDlgProc, (LPARAM)new_name); if (ret != IDOK) break; @@ -3723,12 +3726,10 @@ get_path(pane->cur->up, old_name); len = lstrlen(old_name); - if (old_name[len-1]!='\\' && old_name[len-1]!='/') { + if (old_name[len-1]!='\\' && old_name[len-1]!='/') old_name[len++] = '/'; - old_name[len] = '\n'; - } - lstrcpy(&old_name[len], new_name); + lstrcpy(old_name+len, new_name); lstrcpy(new_name, old_name); }

1 0

[mf] 15259: fix comment, declare parameter type as constant
by mf＠svn.reactos.com 13 May '05

13 May '05

fix comment, declare parameter type as constant Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-13 09:35:15 UTC (rev 15258) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-13 10:27:19 UTC (rev 15259) @@ -188,13 +188,13 @@ } -#define LOCAL_ALLOC(s) HeapAlloc(GetProcessHeap(), 0, s) -#define LOCAL_FREE(p) HeapFree(GetProcessHeap(), 0, p) +#define TMP_ALLOC(s) HeapAlloc(GetProcessHeap(), 0, s) +#define TMP_FREE(p) HeapFree(GetProcessHeap(), 0, p) #else -#define LOCAL_ALLOC(s) alloca(s) -#define LOCAL_FREE(p) +#define TMP_ALLOC(s) alloca(s) +#define TMP_FREE(p) #endif @@ -837,7 +837,7 @@ } -static Entry* find_entry_shell(Entry* dir, LPITEMIDLIST pidl) +static Entry* find_entry_shell(Entry* dir, LPCITEMIDLIST pidl) { Entry* entry; @@ -874,7 +874,7 @@ if (!pidl->mkid.cb) break; - /* copy first element of item idlist -> could be replaced by SHBindToParent() */ + /* copy first element of item idlist */ next_pidl = (*Globals.iMalloc->lpVtbl->Alloc)(Globals.iMalloc, pidl->mkid.cb+sizeof(USHORT)); memcpy(next_pidl, pidl, pidl->mkid.cb); ((LPITEMIDLIST)((LPBYTE)next_pidl+pidl->mkid.cb))->mkid.cb = 0; @@ -1208,7 +1208,7 @@ len++; if (len) { - array = (Entry**) LOCAL_ALLOC(len*sizeof(Entry*)); + array = (Entry**) TMP_ALLOC(len*sizeof(Entry*)); p = array; for(entry=dir->down; entry; entry=entry->next) @@ -1224,7 +1224,7 @@ (*p)->next = 0; - LOCAL_FREE(array); + TMP_FREE(array); } }

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
82
Older →

Jump to page:

2026

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 2005