Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[chorns] 15309: Install explorer.exe in C:\WINDOWS
by chorns＠svn.reactos.com 15 May '05

15 May '05

Install explorer.exe in C:\WINDOWS Modified: branches/xmlbuildsystem/reactos/subsys/system/explorer/explorer.xml _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/explorer/explorer.xml --- branches/xmlbuildsystem/reactos/subsys/system/explorer/explorer.xml 2005-05-15 13:20:45 UTC (rev 15308) +++ branches/xmlbuildsystem/reactos/subsys/system/explorer/explorer.xml 2005-05-15 13:21:54 UTC (rev 15309) @@ -1,4 +1,4 @@ -<module name="explorer" type="win32gui" installbase="system32" installname="explorer.exe"> +<module name="explorer" type="win32gui" installname="explorer.exe"> <linkerflag>-luuid</linkerflag> <linkerflag>-lstdc++</linkerflag> <linkerflag>-fexceptions</linkerflag>

1 0

[chorns] 15308: Support modules with no base install directory
by chorns＠svn.reactos.com 15 May '05

15 May '05

Support modules with no base install directory 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/module.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-15 12:13:17 UTC (rev 15307) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-15 13:20:45 UTC (rev 15308) @@ -241,9 +241,10 @@ string MingwBackend::AddDirectoryTarget ( const string& directory, - Directory* directoryTree ) + Directory* directoryTree ) { - directoryTree->Add ( directory.c_str() ); + if ( directory.length () > 0) + directoryTree->Add ( directory.c_str() ); return directoryTree->name; } @@ -775,7 +776,11 @@ const Module& module = *ProjectNode.modules[i]; if ( module.installName.length () > 0 ) { - string targetFilenameNoFixup = module.installBase + SSEP + module.installName; + string targetFilenameNoFixup; + if ( module.installBase.length () > 0 ) + targetFilenameNoFixup = module.installBase + SSEP + module.installName; + else + targetFilenameNoFixup = module.installName; string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( targetFilenameNoFixup ), installDirectory ); @@ -794,11 +799,16 @@ void MingwBackend::OutputInstallTarget ( const string& sourceFilename, - const string& targetFilename, - const string& targetDirectory ) + const string& targetFilename, + const string& targetDirectory ) { + string fullTargetFilename; + if ( targetDirectory.length () > 0) + fullTargetFilename = targetDirectory + SSEP + targetFilename; + else + fullTargetFilename = targetFilename; string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory ( - NormalizeFilename ( targetDirectory + SSEP + targetFilename ), + NormalizeFilename ( fullTargetFilename ), installDirectory ); string normalizedTargetDirectory = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( targetDirectory ), @@ -823,8 +833,8 @@ { const InstallFile& installfile = *ProjectNode.installfiles[i]; OutputInstallTarget ( installfile.GetPath (), - installfile.newname, - installfile.base ); + installfile.newname, + installfile.base ); } } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-15 12:13:17 UTC (rev 15307) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-15 13:20:45 UTC (rev 15308) @@ -110,7 +110,11 @@ /* This path already includes the generated files directory variable */ return file; else + { + if ( file == "" ) + return generatedFilesDirectory; return generatedFilesDirectory + SSEP + file; + } } /*static*/ Directory* @@ -2682,8 +2686,8 @@ void MingwLiveIsoModuleHandler::OutputCopyCommand ( const string& sourceFilename, - const string& targetFilename, - const string& targetDirectory ) + const string& targetFilename, + const string& targetDirectory ) { string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( targetDirectory + SSEP + targetFilename ), @@ -2698,7 +2702,7 @@ void MingwLiveIsoModuleHandler::OutputModuleCopyCommands ( string& livecdDirectory, - string& reactosDirectory ) + string& reactosDirectory ) { for ( size_t i = 0; i < module.project.modules.size (); i++ ) { @@ -2717,7 +2721,7 @@ void MingwLiveIsoModuleHandler::OutputNonModuleCopyCommands ( string& livecdDirectory, - string& reactosDirectory ) + string& reactosDirectory ) { for ( size_t i = 0; i < module.project.installfiles.size (); i++ ) { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-05-15 12:13:17 UTC (rev 15307) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-05-15 13:20:45 UTC (rev 15308) @@ -73,7 +73,7 @@ { size_t index = filename.find_last_of ( CSEP ); if ( index == string::npos ) - return filename; + return ""; else return filename.substr ( 0, index ); } @@ -81,6 +81,8 @@ string NormalizeFilename ( const string& filename ) { + if ( filename == "" ) + return ""; Path path; string normalizedPath = path.Fixup ( filename, true ); string relativeNormalizedPath = path.RelativeFromWorkingDirectory ( normalizedPath );

1 0

[mf] 15307: refresh available drive bar buttons after connecting to network drives or activating manual refresh
by mf＠svn.reactos.com 15 May '05

15 May '05

refresh available drive bar buttons after connecting to network drives or activating manual refresh 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-15 12:06:12 UTC (rev 15306) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-15 12:13:17 UTC (rev 15307) @@ -200,6 +200,7 @@ static void read_directory(Entry* dir, LPCTSTR path, SORT_ORDER sortOrder, HWND hwnd); static void set_curdir(ChildWnd* child, Entry* entry, int idx, HWND hwnd); static void refresh_child(ChildWnd* child); +static void refresh_drives(); static void get_path(Entry* dir, PTSTR path); LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam); @@ -1937,6 +1938,10 @@ free(child); break;} + case ID_REFRESH: + refresh_drives(); + break; + case ID_WINDOW_CASCADE: SendMessage(Globals.hmdiclient, WM_MDICASCADE, 0, 0); break; @@ -2029,7 +2034,9 @@ case ID_CONNECT_NETWORK_DRIVE: { DWORD ret = WNetConnectionDialog(hwnd, RESOURCETYPE_DISK); - if (ret!=NO_ERROR && ret!=(DWORD)-1) { + if (ret == NO_ERROR) + refresh_drives(); + else if (ret != (DWORD)-1) { if (ret == ERROR_EXTENDED_ERROR) display_network_error(hwnd); else @@ -2039,7 +2046,9 @@ case ID_DISCONNECT_NETWORK_DRIVE: { DWORD ret = WNetDisconnectDialog(hwnd, RESOURCETYPE_DISK); - if (ret!=NO_ERROR && ret!=(DWORD)-1) { + if (ret == NO_ERROR) + refresh_drives(); + else if (ret != (DWORD)-1) { if (ret == ERROR_EXTENDED_ERROR) display_network_error(hwnd); else @@ -3385,6 +3394,87 @@ } +static void create_drive_bar() +{ + TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}; + TCHAR b1[BUFFER_LEN]; + int btn = 1; + PTSTR p; + + GetLogicalDriveStrings(BUFFER_LEN, Globals.drives); + + Globals.hdrivebar = CreateToolbarEx(Globals.hMainWnd, WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, + IDW_DRIVEBAR, 2, Globals.hInstance, IDB_DRIVEBAR, &drivebarBtn, + 1, 16, 13, 16, 13, sizeof(TBBUTTON)); + +#ifndef _NO_EXTENSIONS +#ifdef __WINE__ + /* insert unix file system button */ + b1[0] = '/'; + b1[1] = '\0'; + b1[2] = '\0'; + SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b1); + + drivebarBtn.idCommand = ID_DRIVE_UNIX_FS; + SendMessage(Globals.hdrivebar, TB_INSERTBUTTON, btn++, (LPARAM)&drivebarBtn); + drivebarBtn.iString++; +#endif +#ifdef _SHELL_FOLDERS + /* insert shell namespace button */ + load_string(b1, IDS_SHELL); + b1[lstrlen(b1)+1] = '\0'; + SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b1); + + drivebarBtn.idCommand = ID_DRIVE_SHELL_NS; + SendMessage(Globals.hdrivebar, TB_INSERTBUTTON, btn++, (LPARAM)&drivebarBtn); + drivebarBtn.iString++; +#endif + + /* register windows drive root strings */ + SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)Globals.drives); +#endif + + drivebarBtn.idCommand = ID_DRIVE_FIRST; + + for(p=Globals.drives; *p; ) { +#ifdef _NO_EXTENSIONS + /* insert drive letter */ + TCHAR b[3] = {tolower(*p)}; + SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b); +#endif + switch(GetDriveType(p)) { + case DRIVE_REMOVABLE: drivebarBtn.iBitmap = 1; break; + case DRIVE_CDROM: drivebarBtn.iBitmap = 3; break; + case DRIVE_REMOTE: drivebarBtn.iBitmap = 4; break; + case DRIVE_RAMDISK: drivebarBtn.iBitmap = 5; break; + default:/*DRIVE_FIXED*/ drivebarBtn.iBitmap = 2; + } + + SendMessage(Globals.hdrivebar, TB_INSERTBUTTON, btn++, (LPARAM)&drivebarBtn); + drivebarBtn.idCommand++; + drivebarBtn.iString++; + + while(*p++); + } +} + +static void refresh_drives() +{ + RECT rect; + + /* destroy drive bar */ + DestroyWindow(Globals.hdrivebar); + Globals.hdrivebar = 0; + + /* re-create drive bar */ + create_drive_bar(); + + /* update window layout */ + GetClientRect(Globals.hMainWnd, &rect); + SendMessage(Globals.hMainWnd, WM_SIZE, 0, MAKELONG(rect.right, rect.bottom)); +} + + BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow) { HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, cmd, NULL/*parameters*/, NULL/*dir*/, nCmdShow); @@ -3845,6 +3935,7 @@ break;} case ID_REFRESH: + refresh_drives(); refresh_child(child); break; @@ -4153,6 +4244,7 @@ TCHAR path[MAX_PATH], b1[BUFFER_LEN]; ChildWnd* child; HMENU hMenuFrame, hMenuWindow; + TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; CLIENTCREATESTRUCT ccs; @@ -4184,71 +4276,10 @@ Globals.hMainWnd, 0, Globals.hInstance, &ccs); - { - TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; - int btn = 1; - PTSTR p; + CheckMenuItem(Globals.hMenuOptions, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_CHECKED); - Globals.hdrivebar = CreateToolbarEx(Globals.hMainWnd, WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, - IDW_DRIVEBAR, 2, Globals.hInstance, IDB_DRIVEBAR, &drivebarBtn, - 1, 16, 13, 16, 13, sizeof(TBBUTTON)); - CheckMenuItem(Globals.hMenuOptions, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_CHECKED); + create_drive_bar(); - GetLogicalDriveStrings(BUFFER_LEN, Globals.drives); - - drivebarBtn.fsStyle = BTNS_BUTTON; - -#ifndef _NO_EXTENSIONS -#ifdef __WINE__ - /* insert unix file system button */ - b1[0] = '/'; - b1[1] = '\0'; - b1[2] = '\0'; - SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b1); - - drivebarBtn.idCommand = ID_DRIVE_UNIX_FS; - SendMessage(Globals.hdrivebar, TB_INSERTBUTTON, btn++, (LPARAM)&drivebarBtn); - drivebarBtn.iString++; -#endif -#ifdef _SHELL_FOLDERS - /* insert shell namespace button */ - load_string(b1, IDS_SHELL); - b1[lstrlen(b1)+1] = '\0'; - SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b1); - - drivebarBtn.idCommand = ID_DRIVE_SHELL_NS; - SendMessage(Globals.hdrivebar, TB_INSERTBUTTON, btn++, (LPARAM)&drivebarBtn); - drivebarBtn.iString++; -#endif - - /* register windows drive root strings */ - SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)Globals.drives); -#endif - - drivebarBtn.idCommand = ID_DRIVE_FIRST; - - for(p=Globals.drives; *p; ) { -#ifdef _NO_EXTENSIONS - /* insert drive letter */ - TCHAR b[3] = {tolower(*p)}; - SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b); -#endif - switch(GetDriveType(p)) { - case DRIVE_REMOVABLE: drivebarBtn.iBitmap = 1; break; - case DRIVE_CDROM: drivebarBtn.iBitmap = 3; break; - case DRIVE_REMOTE: drivebarBtn.iBitmap = 4; break; - case DRIVE_RAMDISK: drivebarBtn.iBitmap = 5; break; - default:/*DRIVE_FIXED*/ drivebarBtn.iBitmap = 2; - } - - SendMessage(Globals.hdrivebar, TB_INSERTBUTTON, btn++, (LPARAM)&drivebarBtn); - drivebarBtn.idCommand++; - drivebarBtn.iString++; - - while(*p++); - } - } - { TBBUTTON toolbarBtns[] = { {0, 0, 0, BTNS_SEP, {0, 0}, 0, 0},

1 0

[chorns] 15306: Install .inf files in C:\WINDOWS\inf
by chorns＠svn.reactos.com 15 May '05

15 May '05

Install .inf files in C:\WINDOWS\inf Modified: branches/xmlbuildsystem/reactos/media/inf/inf.xml _____ Modified: branches/xmlbuildsystem/reactos/media/inf/inf.xml --- branches/xmlbuildsystem/reactos/media/inf/inf.xml 2005-05-15 12:04:02 UTC (rev 15305) +++ branches/xmlbuildsystem/reactos/media/inf/inf.xml 2005-05-15 12:06:12 UTC (rev 15306) @@ -1,4 +1,4 @@ -<installfile base="system32/inf">layout.inf</installfile> -<installfile base="system32/inf">NET_NIC.inf</installfile> -<installfile base="system32/inf">scsi.inf</installfile> -<installfile base="system32/inf">syssetup.inf</installfile> +<installfile base="inf">layout.inf</installfile> +<installfile base="inf">NET_NIC.inf</installfile> +<installfile base="inf">scsi.inf</installfile> +<installfile base="inf">syssetup.inf</installfile>

1 0

[chorns] 15305: Don't rename c_437.nls, c_1252.nls, and l_intl.nls on installation
by chorns＠svn.reactos.com 15 May '05

15 May '05

Don't rename c_437.nls, c_1252.nls, and l_intl.nls on installation Modified: branches/xmlbuildsystem/reactos/media/nls/nls.xml _____ Modified: branches/xmlbuildsystem/reactos/media/nls/nls.xml --- branches/xmlbuildsystem/reactos/media/nls/nls.xml 2005-05-15 11:58:48 UTC (rev 15304) +++ branches/xmlbuildsystem/reactos/media/nls/nls.xml 2005-05-15 12:04:02 UTC (rev 15305) @@ -4,7 +4,7 @@ <installfile base="system32">c_037.nls</installfile> <installfile base="system32">c_424.nls</installfile> -<installfile base="system32" newname="oem.nls">c_437.nls</installfile> +<installfile base="system32">c_437.nls</installfile> <installfile base="system32">c_500.nls</installfile> <installfile base="system32">c_737.nls</installfile> <installfile base="system32">c_775.nls</installfile> @@ -32,7 +32,7 @@ <installfile base="system32">c_1026.nls</installfile> <installfile base="system32">c_1250.nls</installfile> <installfile base="system32">c_1251.nls</installfile> -<installfile base="system32" newname="ansi.nls">c_1252.nls</installfile> +<installfile base="system32">c_1252.nls</installfile> <installfile base="system32">c_1253.nls</installfile> <installfile base="system32">c_1254.nls</installfile> <installfile base="system32">c_1255.nls</installfile> @@ -55,4 +55,4 @@ <installfile base="system32">c_28597.nls</installfile> <installfile base="system32">c_28598.nls</installfile> <installfile base="system32">c_28599.nls</installfile> -<installfile base="system32" newname="casemap.nls">l_intl.nls</installfile> +<installfile base="system32">l_intl.nls</installfile>

1 0

[chorns] 15304: Generate hooks and stubs for tests
by chorns＠svn.reactos.com 15 May '05

15 May '05

Generate hooks and stubs for tests Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml Modified: branches/xmlbuildsystem/reactos/lib/kernel32/tests/tests/CreateFile.c Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Added: branches/xmlbuildsystem/reactos/tools/rbuild/filesupportcode.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/stubbedcomponent.cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/testsupportcode.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/wineresource.cpp _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml --- branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml 2005-05-15 11:46:20 UTC (rev 15303) +++ branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml 2005-05-15 11:58:48 UTC (rev 15304) @@ -1,3 +1,19 @@ +<module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll"> + <importlibrary definition="kernel32.def" /> + <include base="kernel32">.</include> + <include base="kernel32">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_SEH_NO_NATIVE_NLG" /> + <define name="WINVER">0x0500</define> + <library>kernel32_base</library> + <library>pseh</library> + <library>rosrtl</library> + <library>ntdll</library> + <linkerflag>-lgcc</linkerflag> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> + <file>kernel32.rc</file> +</module> <module name="kernel32_base" type="objectlibrary"> <include base="kernel32_base">.</include> <include base="kernel32_base">include</include> @@ -104,24 +120,8 @@ <file>tls.c</file> </directory> </module> -<module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll"> - <importlibrary definition="kernel32.def" /> - <include base="kernel32">.</include> - <include base="kernel32">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_SEH_NO_NATIVE_NLG" /> - <define name="WINVER">0x0500</define> - <library>kernel32_base</library> - <library>pseh</library> - <library>rosrtl</library> - <library>ntdll</library> - <linkerflag>-lgcc</linkerflag> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> - <file>kernel32.rc</file> -</module>  +--> \ No newline at end of file _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/tests/tests/CreateFile.c --- branches/xmlbuildsystem/reactos/lib/kernel32/tests/tests/CreateFile.c 2005-05-15 11:46:20 UTC (rev 15303) +++ branches/xmlbuildsystem/reactos/lib/kernel32/tests/tests/CreateFile.c 2005-05-15 11:58:48 UTC (rev 15304) @@ -12,11 +12,11 @@ { LPCWSTR lpFileName; DWORD dwDesiredAccess; - DWORD dwShareMode; - LPSECURITY_ATTRIBUTES lpSecurityAttributes; - DWORD dwCreationDisposition; - DWORD dwFlagsAndAttributes; - HANDLE hTemplateFile; + DWORD dwShareMode; + LPSECURITY_ATTRIBUTES lpSecurityAttributes; + DWORD dwCreationDisposition; + DWORD dwFlagsAndAttributes; + HANDLE hTemplateFile; } CreateFile_PARAMETERS; typedef struct @@ -93,7 +93,7 @@ static HOOK NtCreateFileHooks[] = { {"NtCreateFile", MockNtCreateFile}, - NULL, NULL + {NULL, NULL} }; static void TestFile() _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-15 11:46:20 UTC (rev 15303) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-15 11:58:48 UTC (rev 15304) @@ -41,18 +41,6 @@ } -/* static */ string -Environment::GetVariable ( const string& name ) -{ - char* value = getenv ( name.c_str () ); - if ( value != NULL && strlen ( value ) > 0 ) - return ssprintf ( "%s", - value ); - else - return ""; -} - - Directory::Directory ( const string& name_ ) : name(name_) { @@ -131,45 +119,13 @@ return path; } -/* static */ string -Directory::GetEnvironmentVariablePathOrDefault ( const string& name, - const string& defaultValue ) -{ - const string& environmentVariableValue = Environment::GetVariable ( name ); - if ( environmentVariableValue.length () > 0 ) - return NormalizeFilename ( environmentVariableValue ); - else - return defaultValue; -} - -/* static */ string -Directory::GetIntermediatePath () -{ - return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE", - "obj-i386" ); -} - -/* static */ string -Directory::GetOutputPath () -{ - return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT", - "output-i386" ); -} - -/* static */ string -Directory::GetInstallPath () -{ - return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL", - "reactos" ); -} - void Directory::ResolveVariablesInPath ( char* buf, string path ) { - string s = ReplaceVariable ( "$(INTERMEDIATE)", GetIntermediatePath (), path ); - s = ReplaceVariable ( "$(OUTPUT)", GetOutputPath (), s ); - s = ReplaceVariable ( "$(INSTALL)", GetInstallPath (), s ); + string s = ReplaceVariable ( "$(INTERMEDIATE)", Environment::GetIntermediatePath (), path ); + s = ReplaceVariable ( "$(OUTPUT)", Environment::GetOutputPath (), s ); + s = ReplaceVariable ( "$(INSTALL)", Environment::GetInstallPath (), s ); strcpy ( buf, s.c_str () ); } @@ -217,7 +173,7 @@ void Directory::CreateRule ( FILE* f, - const string& parent ) + const string& parent ) { string path; @@ -356,6 +312,7 @@ GenerateDirectoryTargets (); GenerateDirectories (); UnpackWineResources (); + GenerateTestSupportCode (); CheckAutomaticDependencies (); CloseMakefile (); } @@ -641,7 +598,7 @@ string MingwBackend::GetBin2ResExecutable () { - return NormalizeFilename ( Directory::GetOutputPath () + SSEP + "tools/bin2res/bin2res" + EXEPOSTFIX ); + return NormalizeFilename ( Environment::GetOutputPath () + SSEP + "tools/bin2res/bin2res" + EXEPOSTFIX ); } void @@ -655,6 +612,15 @@ } void +MingwBackend::GenerateTestSupportCode () +{ + printf ( "Generating test support code..." ); + TestSupportCode testSupportCode ( ProjectNode ); + testSupportCode.GenerateTestSupportCode ( verbose ); + printf ( "done\n" ); +} + +void MingwBackend::CheckAutomaticDependencies () { printf ( "Checking automatic dependencies..." ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-15 11:46:20 UTC (rev 15303) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-15 11:58:48 UTC (rev 15304) @@ -18,13 +18,6 @@ typedef std::map<std::string,Directory*> directory_map; -class Environment -{ -public: - static std::string GetVariable ( const std::string& name ); -}; - - class Directory { public: @@ -37,17 +30,12 @@ std::string EscapeSpaces ( std::string path ); void CreateRule ( FILE* f, const std::string& parent ); - static std::string GetIntermediatePath (); - static std::string GetOutputPath (); - static std::string GetInstallPath (); private: bool mkdir_p ( const char* path ); std::string ReplaceVariable ( std::string name, std::string value, std::string path ); std::string GetEnvironmentVariable ( const std::string& name ); - static std::string GetEnvironmentVariablePathOrDefault ( const std::string& name, - const std::string& defaultValue ); void ResolveVariablesInPath ( char* buf, std::string path ); bool CreateDirectory ( std::string path ); @@ -92,6 +80,7 @@ void GenerateXmlBuildFilesMacro() const; std::string GetBin2ResExecutable (); void UnpackWineResources (); + void GenerateTestSupportCode (); void CheckAutomaticDependencies (); bool IncludeDirectoryTarget ( const std::string& directory ) const; bool TryToDetectThisCompiler ( const std::string& compiler ); _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/filesupportcode.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/filesupportcode.cpp 2005-05-15 11:46:20 UTC (rev 15303) +++ branches/xmlbuildsystem/reactos/tools/rbuild/filesupportcode.cpp 2005-05-15 11:58:48 UTC (rev 15304) @@ -0,0 +1,68 @@ +#include "pch.h" +#include <assert.h> + +#include "rbuild.h" + +using std::string; + +/* static */ void +FileSupportCode::WriteIfChanged ( char* outbuf, + string filename ) +{ + FILE* out; + unsigned int end; + char* cmpbuf; + unsigned int stat; + + out = fopen ( filename.c_str (), "rb" ); + if ( out == NULL ) + { + out = fopen ( filename.c_str (), "wb" ); + if ( out == NULL ) + throw AccessDeniedException ( filename ); + fputs ( outbuf, out ); + fclose ( out ); + return; + } + + fseek ( out, 0, SEEK_END ); + end = ftell ( out ); + cmpbuf = (char*) malloc ( end ); + if ( cmpbuf == NULL ) + { + fclose ( out ); + throw OutOfMemoryException (); + } + + fseek ( out, 0, SEEK_SET ); + stat = fread ( cmpbuf, 1, end, out ); + if ( stat != end ) + { + free ( cmpbuf ); + fclose ( out ); + throw AccessDeniedException ( filename ); + } + if ( end == strlen ( outbuf ) && memcmp ( cmpbuf, outbuf, end ) == 0 ) + { + free ( cmpbuf ); + fclose ( out ); + return; + } + + free ( cmpbuf ); + fclose ( out ); + out = fopen ( filename.c_str (), "wb" ); + if ( out == NULL ) + { + throw AccessDeniedException ( filename ); + } + + stat = fwrite ( outbuf, 1, strlen ( outbuf ), out); + if ( strlen ( outbuf ) != stat ) + { + fclose ( out ); + throw AccessDeniedException ( filename ); + } + + fclose ( out ); +} Property changes on: branches/xmlbuildsystem/reactos/tools/rbuild/filesupportcode.cpp ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-05-15 11:46:20 UTC (rev 15303) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-05-15 11:58:48 UTC (rev 15304) @@ -7,6 +7,50 @@ using std::string; using std::vector; +/* static */ string +Environment::GetVariable ( const string& name ) +{ + char* value = getenv ( name.c_str () ); + if ( value != NULL && strlen ( value ) > 0 ) + return ssprintf ( "%s", + value ); + else + return ""; +} + +/* static */ string +Environment::GetEnvironmentVariablePathOrDefault ( const string& name, + const string& defaultValue ) +{ + const string& environmentVariableValue = Environment::GetVariable ( name ); + if ( environmentVariableValue.length () > 0 ) + return NormalizeFilename ( environmentVariableValue ); + else + return defaultValue; +} + +/* static */ string +Environment::GetIntermediatePath () +{ + return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE", + "obj-i386" ); +} + +/* static */ string +Environment::GetOutputPath () +{ + return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT", + "output-i386" ); +} + +/* static */ string +Environment::GetInstallPath () +{ + return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL", + "reactos" ); +} + + Project::Project ( const string& filename ) : xmlfile (filename), node (NULL), @@ -42,68 +86,6 @@ } void -Project::WriteIfChanged ( char* outbuf, - string filename ) -{ - FILE* out; - unsigned int end; - char* cmpbuf; - unsigned int stat; - - out = fopen ( filename.c_str (), "rb" ); - if ( out == NULL ) - { - out = fopen ( filename.c_str (), "wb" ); - if ( out == NULL ) - throw AccessDeniedException ( filename ); - fputs ( outbuf, out ); - fclose ( out ); - return; - } - - fseek ( out, 0, SEEK_END ); - end = ftell ( out ); - cmpbuf = (char*) malloc ( end ); - if ( cmpbuf == NULL ) - { - fclose ( out ); - throw OutOfMemoryException (); - } - - fseek ( out, 0, SEEK_SET ); - stat = fread ( cmpbuf, 1, end, out ); - if ( stat != end ) - { - free ( cmpbuf ); - fclose ( out ); - throw AccessDeniedException ( filename ); - } - if ( end == strlen ( outbuf ) && memcmp ( cmpbuf, outbuf, end ) == 0 ) - { - free ( cmpbuf ); - fclose ( out ); - return; - } - - free ( cmpbuf ); - fclose ( out ); - out = fopen ( filename.c_str (), "wb" ); - if ( out == NULL ) - { - throw AccessDeniedException ( filename ); - } - - stat = fwrite ( outbuf, 1, strlen ( outbuf ), out); - if ( strlen ( outbuf ) != stat ) - { - fclose ( out ); - throw AccessDeniedException ( filename ); - } - - fclose ( out ); -} - -void Project::SetConfigurationOption ( char* s, string name, string* alternativeName ) @@ -161,7 +143,7 @@ s = s + sprintf ( s, "#endif /* __INCLUDE_CONFIG_H */\n" ); - WriteIfChanged ( buf, "include" SSEP "roscfg.h" ); + FileSupportCode::WriteIfChanged ( buf, "include" SSEP "roscfg.h" ); free ( buf ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-05-15 11:46:20 UTC (rev 15303) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-05-15 11:58:48 UTC (rev 15304) @@ -55,6 +55,7 @@ class CompilerFlag; class LinkerFlag; class Property; +class TestSupportCode; class WineResource; class AutomaticDependency; class Bootstrap; @@ -66,6 +67,25 @@ class SourceFileTest; + +class Environment +{ +public: + static std::string GetVariable ( const std::string& name ); + static std::string GetIntermediatePath (); + static std::string GetOutputPath (); + static std::string GetInstallPath (); + static std::string GetEnvironmentVariablePathOrDefault ( const std::string& name, + const std::string& defaultValue ); +}; + +class FileSupportCode +{ +public: + static void WriteIfChanged ( char* outbuf, + std::string filename ); +}; + class IfableData { public: @@ -110,8 +130,6 @@ std::string* alternativeName ); void SetConfigurationOption ( char* s, std::string name ); - void WriteIfChanged ( char* outbuf, - std::string filename ); void ReadXml (); void ProcessXMLSubElement ( const XMLElement& e, const std::string& path, @@ -422,6 +440,37 @@ }; +class TestSupportCode +{ +public: + const Project& project; + + TestSupportCode ( const Project& project ); + ~TestSupportCode (); + void GenerateTestSupportCode ( bool verbose ); +private: + bool IsTestModule ( const Module& module ); + void GenerateTestSupportCodeForModule ( Module& module, + bool verbose ); + std::string GetHooksFilename ( Module& module ); + char* WriteStubbedSymbolToHooksFile ( char* buffer, + const StubbedComponent& component, + const StubbedSymbol& symbol ); + char* WriteStubbedComponentToHooksFile ( char* buffer, + const StubbedComponent& component ); + void WriteHooksFile ( Module& module ); + std::string GetStubsFilename ( Module& module ); + char* WriteStubbedSymbolToStubsFile ( char* buffer, + const StubbedComponent& component, + const StubbedSymbol& symbol, + int stubIndex ); + char* WriteStubbedComponentToStubsFile ( char* buffer, + const StubbedComponent& component, + int* stubIndex ); + void WriteStubsFile ( Module& module ); +}; + + class WineResource { public: @@ -610,10 +659,13 @@ const XMLElement& node; std::string symbol; std::string newname; + std::string strippedName; StubbedSymbol ( const XMLElement& stubbedSymbolNode ); ~StubbedSymbol (); void ProcessXML(); +private: + std::string StripSymbol ( std::string symbol ); }; extern std::string _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-05-15 11:46:20 UTC (rev 15303) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-05-15 11:58:48 UTC (rev 15304) @@ -116,6 +116,7 @@ compilerflag.cpp \ define.cpp \ exception.cpp \ + filesupportcode.cpp \ include.cpp \ installfile.cpp \ linkerflag.cpp \ @@ -123,6 +124,7 @@ project.cpp \ ssprintf.cpp \ stubbedcomponent.cpp \ + testsupportcode.cpp \ wineresource.cpp \ XML.cpp \ ) @@ -230,6 +232,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)filesupportcode.o: $(RBUILD_BASE_)filesupportcode.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)include.o: $(RBUILD_BASE_)include.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ @@ -266,6 +272,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)testsupportcode.o: $(RBUILD_BASE_)testsupportcode.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)XML.o: $(RBUILD_BASE_)XML.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/stubbedcomponent.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/stubbedcomponent.cpp 2005-05-15 11:46:20 UTC (rev 15303) +++ branches/xmlbuildsystem/reactos/tools/rbuild/stubbedcomponent.cpp 2005-05-15 11:58:48 UTC (rev 15304) @@ -77,4 +77,23 @@ newname = att->value; else newname = symbol; + + strippedName = StripSymbol ( symbol ); } + +string +StubbedSymbol::StripSymbol ( string symbol ) +{ + size_t start = 0; + while ( start < symbol.length () && symbol[start] == '@') + start++; + size_t end = symbol.length () - 1; + while ( end > 0 && isdigit ( symbol[end] ) ) + end--; + if ( end > 0 and symbol[end] == '@' ) + end--; + if ( end > 0 ) + return symbol.substr ( start, end - start + 1 ); + else + return ""; +} _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/testsupportcode.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/testsupportcode.cpp 2005-05-15 11:46:20 UTC (rev 15303) +++ branches/xmlbuildsystem/reactos/tools/rbuild/testsupportcode.cpp 2005-05-15 11:58:48 UTC (rev 15304) @@ -0,0 +1,190 @@ +#include "pch.h" +#include <assert.h> + +#include "rbuild.h" + +using std::string; +using std::vector; + +TestSupportCode::TestSupportCode ( const Project& project ) + : project ( project ) +{ +} + +TestSupportCode::~TestSupportCode () +{ +} + +bool +TestSupportCode::IsTestModule ( const Module& module ) +{ + return module.type == Test; +} + +void +TestSupportCode::GenerateTestSupportCode ( bool verbose ) +{ + for ( size_t i = 0; i < project.modules.size (); i++ ) + { + if ( IsTestModule ( *project.modules[i] ) ) + { + GenerateTestSupportCodeForModule ( *project.modules[i], + verbose ); + } + } +} + +void +TestSupportCode::GenerateTestSupportCodeForModule ( Module& module, + bool verbose ) +{ + if ( verbose ) + { + printf ( "\nGenerating test support code for %s", + module.name.c_str () ); + } + + WriteHooksFile ( module ); + WriteStubsFile ( module ); +} + +string +TestSupportCode::GetHooksFilename ( Module& module ) +{ + return NormalizeFilename ( Environment::GetIntermediatePath () + SSEP + module.GetBasePath () + SSEP + "_hooks.c" ); +} + +char* +TestSupportCode::WriteStubbedSymbolToHooksFile ( char* buffer, + const StubbedComponent& component, + const StubbedSymbol& symbol ) +{ + buffer = buffer + sprintf ( buffer, + " {\"%s\", \"%s\", NULL, NULL, NULL},\n", + component.name.c_str (), + symbol.strippedName.c_str () ); + return buffer; +} + +char* +TestSupportCode::WriteStubbedComponentToHooksFile ( char* buffer, + const StubbedComponent& component ) +{ + for ( size_t i = 0; i < component.symbols.size () ; i++ ) + buffer = WriteStubbedSymbolToHooksFile ( buffer, + component, + *component.symbols[i] ); + return buffer; +} + +void +TestSupportCode::WriteHooksFile ( Module& module ) +{ + char* buf; + char* s; + + buf = (char*) malloc ( 50*1024 ); + if ( buf == NULL ) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "/* This file is automatically generated. */\n" ); + s = s + sprintf ( s, "#include <windows.h>\n" ); + s = s + sprintf ( s, "#include \"regtests.h\"\n" ); + s = s + sprintf ( s, "\n" ); + s = s + sprintf ( s, "API_DESCRIPTION ExternalDependencies[] =\n" ); + s = s + sprintf ( s, "{\n" ); + + int symbolCount = 0; + for ( size_t i = 0; i < module.stubbedComponents.size () ; i++ ) + { + s = WriteStubbedComponentToHooksFile ( s, + *module.stubbedComponents[i] ); + symbolCount += module.stubbedComponents[i]->symbols.size (); + } + + s = s + sprintf ( s, "};\n" ); + s = s + sprintf ( s, "\n" ); + s = s + sprintf ( s, "#define ExternalDependencyCount %d\n", symbolCount ); + s = s + sprintf ( s, "ULONG MaxExternalDependency = ExternalDependencyCount - 1;\n" ); + s = s + sprintf ( s, "\n" ); + + FileSupportCode::WriteIfChanged ( buf, GetHooksFilename ( module ) ); + + free ( buf ); +} + +string +TestSupportCode::GetStubsFilename ( Module& module ) +{ + return NormalizeFilename ( Environment::GetIntermediatePath () + SSEP + module.GetBasePath () + SSEP + "_stubs.S" ); +} + +char* +TestSupportCode::WriteStubbedSymbolToStubsFile ( char* buffer, + const StubbedComponent& component, + const StubbedSymbol& symbol, + int stubIndex ) +{ + buffer = buffer + sprintf ( buffer, + ".globl _%s\n", + symbol.symbol.c_str () ); + buffer = buffer + sprintf ( buffer, + "_%s:\n", + symbol.symbol.c_str () ); + buffer = buffer + sprintf ( buffer, + " pushl $%d\n", + stubIndex ); + buffer = buffer + sprintf ( buffer, + " jmp passthrough\n" ); + buffer = buffer + sprintf ( buffer, "\n" ); + return buffer; +} + +char* +TestSupportCode::WriteStubbedComponentToStubsFile ( char* buffer, + const StubbedComponent& component, + int* stubIndex ) +{ + for ( size_t i = 0; i < component.symbols.size () ; i++ ) + buffer = WriteStubbedSymbolToStubsFile ( buffer, + component, + *component.symbols[i], + (*stubIndex)++ ); + return buffer; +} + +void +TestSupportCode::WriteStubsFile ( Module& module ) +{ + char* buf; + char* s; + + buf = (char*) malloc ( 50*1024 ); + if ( buf == NULL ) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "/* This file is automatically generated. */\n" ); + s = s + sprintf ( s, "passthrough:\n" ); + s = s + sprintf ( s, " call _FrameworkGetHook@4\n" ); + s = s + sprintf ( s, " test %%eax, %%eax\n" ); + s = s + sprintf ( s, " je .return\n" ); + s = s + sprintf ( s, " jmp *%%eax\n" ); + s = s + sprintf ( s, ".return:\n" ); + s = s + sprintf ( s, " /* This will most likely corrupt the stack */\n" ); + s = s + sprintf ( s, " ret\n" ); + s = s + sprintf ( s, "\n" ); + + int stubIndex = 0; + for ( size_t i = 0; i < module.stubbedComponents.size () ; i++ ) + { + s = WriteStubbedComponentToStubsFile ( s, + *module.stubbedComponents[i], + &stubIndex ); + } + + FileSupportCode::WriteIfChanged ( buf, GetStubsFilename ( module ) ); + + free ( buf ); +} Property changes on: branches/xmlbuildsystem/reactos/tools/rbuild/testsupportcode.cpp ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/wineresource.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/wineresource.cpp 2005-05-15 11:46:20 UTC (rev 15303) +++ branches/xmlbuildsystem/reactos/tools/rbuild/wineresource.cpp 2005-05-15 11:58:48 UTC (rev 15304) @@ -82,7 +82,7 @@ if ( verbose ) { - printf ( "Unpacking resources for %s", + printf ( "\nUnpacking resources for %s", module.name.c_str () ); }

1 0

[mf] 15303: use the correct ids in options menu
by mf＠svn.reactos.com 15 May '05

15 May '05

use the correct ids in options menu Modified: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/cs.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/pl.rc Modified: trunk/reactos/subsys/system/winefile/pt.rc Modified: trunk/reactos/subsys/system/winefile/ru.rc Modified: trunk/reactos/subsys/system/winefile/si.rc 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-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -102,9 +102,9 @@ } POPUP "&Instõllningar" { - MENUITEM "&Bekrõftelse...", -1 + MENUITEM "&Bekrõftelse...", 501 MENUITEM "&Teckensnitt...", ID_SELECT_FONT - MENUITEM "&Konfigurera verktygsfõlt...", -1 + MENUITEM "&Konfigurera verktygsfõlt...", 512 MENUITEM SEPARATOR MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR, CHECKED MENUITEM "&Enhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED @@ -113,7 +113,7 @@ MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Minimera vid k÷rning" , -1 + MENUITEM "&Minimera vid k÷rning" , 504 MENUITEM "&Spara õndringar vid stõngning", 511 } _____ Modified: trunk/reactos/subsys/system/winefile/cs.rc --- trunk/reactos/subsys/system/winefile/cs.rc 2005-05-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/cs.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -101,9 +101,9 @@ } POPUP "&NastavenÝ" { - MENUITEM "&PotvrzovßnÝ..." , -1 + MENUITEM "&PotvrzovßnÝ..." , 501 MENUITEM "&PÝsmo..." , ID_SELECT_FONT - MENUITEM "Upravit panel &nßstroj¨..." , -1 + MENUITEM "Upravit panel &nßstroj¨..." , 512 MENUITEM SEPARATOR MENUITEM "&Panel nßstroj¨" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "&Panel za°ÝenÝ" , ID_VIEW_DRIVE_BAR, CHECKED @@ -112,7 +112,7 @@ MENUITEM "&Celaß obrazovka\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Minimalizovat p°i spuÜtýnÝ" , -1 + MENUITEM "&Minimalizovat p°i spuÜtýnÝ" , 504 MENUITEM "&Ulo×it nastavenÝ p°i vypnutÝ" , 511 } _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-05-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -100,9 +100,9 @@ } POPUP "&Optionen" { - MENUITEM "&Bestõtigen..." , -1 + MENUITEM "&Bestõtigen..." , 501 MENUITEM "Schrift&art..." , ID_SELECT_FONT - MENUITEM "Symbolleiste &definieren..." , -1 + MENUITEM "Symbolleiste &definieren..." , 512 MENUITEM SEPARATOR MENUITEM "Sy&mbolleiste" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "Lauf&werkleiste" , ID_VIEW_DRIVE_BAR, CHECKED @@ -111,7 +111,7 @@ MENUITEM "Vollb&ild\tStrg+Umschalt+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Symbol nach Programmstart" , -1 + MENUITEM "&Symbol nach Programmstart" , 504 MENUITEM "&Einstellungen beim Beenden speichern" , 511 } _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-05-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -103,9 +103,9 @@ } POPUP "&Options" { - MENUITEM "&Confirmation..." , -1 + MENUITEM "&Confirmation..." , 501 MENUITEM "&Font..." , ID_SELECT_FONT - MENUITEM "Customize Tool&bar..." , -1 + MENUITEM "Customize Tool&bar..." , 512 MENUITEM SEPARATOR MENUITEM "&Toolbar" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "&Drivebar" , ID_VIEW_DRIVE_BAR, CHECKED @@ -114,7 +114,7 @@ MENUITEM "F&ull Screen\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Minimize on run" , -1 + MENUITEM "&Minimize on run" , 504 MENUITEM "&Save settings on exit" , 511 } _____ Modified: trunk/reactos/subsys/system/winefile/es.rc --- trunk/reactos/subsys/system/winefile/es.rc 2005-05-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/es.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -99,9 +99,9 @@ } POPUP "&Opciones" { - MENUITEM "&Confirmaci¾n..." , -1 + MENUITEM "&Confirmaci¾n..." , 501 MENUITEM "&Fuente..." , ID_SELECT_FONT - MENUITEM "Personalizar barra &herramientas..." , -1 + MENUITEM "Personalizar barra &herramientas..." , 512 MENUITEM SEPARATOR MENUITEM "&Barra de herramientas" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "Barra de &unidades" , ID_VIEW_DRIVE_BAR, CHECKED @@ -110,7 +110,7 @@ MENUITEM "&Pantalla completa\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Minimizar al ejecutarse" , -1 + MENUITEM "&Minimizar al ejecutarse" , 504 MENUITEM "&Guardar opciones al salir" , 511 } _____ Modified: trunk/reactos/subsys/system/winefile/fr.rc --- trunk/reactos/subsys/system/winefile/fr.rc 2005-05-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/fr.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -102,9 +102,9 @@ } POPUP "&Options" { - MENUITEM "&Confirmation..." , -1 + MENUITEM "&Confirmation..." , 501 MENUITEM "&Police..." , ID_SELECT_FONT - MENUITEM "Personnaliser la &barre d'Outils..." , -1 + MENUITEM "Personnaliser la &barre d'Outils..." , 512 MENUITEM SEPARATOR MENUITEM "Barre d'&Outils" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "Barre de &Lecteur" , ID_VIEW_DRIVE_BAR, CHECKED @@ -113,7 +113,7 @@ MENUITEM "P&lein ?cran\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&RÚduire a l'utilisation" , -1 + MENUITEM "&RÚduire a l'utilisation" , 504 MENUITEM "&Enregistrer la configuration en quittant" , 511 } _____ Modified: trunk/reactos/subsys/system/winefile/hu.rc --- trunk/reactos/subsys/system/winefile/hu.rc 2005-05-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/hu.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -102,9 +102,9 @@ } POPUP "&BeßllÝtßsok" { - MENUITEM "&Meger§sÝtÚs..." , -1 - MENUITEM "&Bet¹kÚszlet..." , -1 - MENUITEM "E&gyedi eszk÷ztßr..." , -1 + MENUITEM "&Meger§sÝtÚs..." , 501 + MENUITEM "&Bet¹kÚszlet..." , ID_SELECT_FONT + MENUITEM "E&gyedi eszk÷ztßr..." , 512 MENUITEM SEPARATOR MENUITEM "&Eszk÷ztßr" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "&Lemeztßr" , ID_VIEW_DRIVE_BAR, CHECKED @@ -113,7 +113,7 @@ MENUITEM "&Teljes kÚperny§s\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "Programfuttatßs utßni &szimb¾lum" , -1 + MENUITEM "Programfuttatßs utßni &szimb¾lum" , 504 MENUITEM "Megsz³ntetÚs a tßrolßs vÚgÚn" , 511 } _____ Modified: trunk/reactos/subsys/system/winefile/it.rc --- trunk/reactos/subsys/system/winefile/it.rc 2005-05-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/it.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -102,9 +102,9 @@ } POPUP "&Opzioni" { - MENUITEM "&Confermazione..." , -1 + MENUITEM "&Confermazione..." , 501 MENUITEM "&Font..." , ID_SELECT_FONT - MENUITEM "&Personalizza barra degli strumenti..." , -1 + MENUITEM "&Personalizza barra degli strumenti..." , 512 MENUITEM SEPARATOR MENUITEM "&Barra degli strumenti" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "&Barra dei Drive" , ID_VIEW_DRIVE_BAR, CHECKED @@ -113,7 +113,7 @@ MENUITEM "A& tutto schermo\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Esegui minimizzato" , -1 + MENUITEM "&Esegui minimizzato" , 504 MENUITEM "&Salva impostazioni all'uscita" , 511 } _____ Modified: trunk/reactos/subsys/system/winefile/nl.rc --- trunk/reactos/subsys/system/winefile/nl.rc 2005-05-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/nl.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -98,9 +98,9 @@ } POPUP "&Opties" { - MENUITEM "&Bevestiging..." , -1 - MENUITEM "&Lettertype..." , -1 - MENUITEM "Gereedschappenbalk &aanpassen..." , -1 + MENUITEM "&Bevestiging..." , 501 + MENUITEM "&Lettertype..." , ID_SELECT_FONT + MENUITEM "Gereedschappenbalk &aanpassen..." , 512 MENUITEM SEPARATOR MENUITEM "&Gereedschappenbalk" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "&Schijvenbalk" , ID_VIEW_DRIVE_BAR, CHECKED @@ -109,7 +109,7 @@ MENUITEM "&Volledig scherm\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "Ge&minimaliseerd starten" , -1 + MENUITEM "Ge&minimaliseerd starten" , 504 MENUITEM "&Instellingen opslaan bij afsluiten" , 511 } _____ Modified: trunk/reactos/subsys/system/winefile/pl.rc --- trunk/reactos/subsys/system/winefile/pl.rc 2005-05-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/pl.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -102,9 +102,9 @@ } POPUP "&Opcje" { - MENUITEM "&Potwierdzenie..." , -1 + MENUITEM "&Potwierdzenie..." , 501 MENUITEM "&Czcionka..." , ID_SELECT_FONT - MENUITEM "&Ustawienia paska narzÛdzi..." , -1 + MENUITEM "&Ustawienia paska narzÛdzi..." , 512 MENUITEM SEPARATOR MENUITEM "Pasek &narzÛdzi" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "Pasek &dysk¾w" , ID_VIEW_DRIVE_BAR, CHECKED @@ -113,7 +113,7 @@ MENUITEM "Pe?ny &ekran\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Zminimalizuj przy starcie" , -1 + MENUITEM "&Zminimalizuj przy starcie" , 504 MENUITEM "Z&apisz ustawienia przed zako±czeniem" , 511 } _____ Modified: trunk/reactos/subsys/system/winefile/pt.rc --- trunk/reactos/subsys/system/winefile/pt.rc 2005-05-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/pt.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -101,9 +101,9 @@ } POPUP "&Opþ§es" { - MENUITEM "&ConfirmaþÒo..." , -1 + MENUITEM "&ConfirmaþÒo..." , 501 MENUITEM "&Fonte..." , ID_SELECT_FONT - MENUITEM "&Personalizar barra de ferramentas..." , -1 + MENUITEM "&Personalizar barra de ferramentas..." , 512 MENUITEM SEPARATOR MENUITEM "Barra d&e ferramentas" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "&Barra de unidades" , ID_VIEW_DRIVE_BAR, CHECKED @@ -112,7 +112,7 @@ MENUITEM "Tela Cheia\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Minimizar durante o uso" , -1 /* FIXME */ + MENUITEM "&Minimizar durante o uso" , 504 MENUITEM "&Salvar configuraþ§es ao sair" , 511 /* FIXME */ } @@ -229,9 +229,9 @@ } POPUP "&Opþ§es" { - MENUITEM "&ConfirmaþÒo..." , -1 + MENUITEM "&ConfirmaþÒo..." , 501 MENUITEM "&Fonte..." , ID_SELECT_FONT - MENUITEM "&Personalizar barra de ferramentas..." , -1 + MENUITEM "&Personalizar barra de ferramentas..." , 512 MENUITEM SEPARATOR MENUITEM "Barra d&e ferramentas" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "&Barra de unidades" , ID_VIEW_DRIVE_BAR, CHECKED @@ -240,7 +240,7 @@ MENUITEM "EcrÒ Complecto\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Minimizar durante o uso" , -1 + MENUITEM "&Minimizar durante o uso" , 504 MENUITEM "&Gravar configuraþ§es ao sair" , 511 } _____ Modified: trunk/reactos/subsys/system/winefile/ru.rc --- trunk/reactos/subsys/system/winefile/ru.rc 2005-05-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/ru.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -98,9 +98,9 @@ } POPUP "&?Ó±?¯ÚÛÞ" { - MENUITEM "¤¯õ&?ÔÕµõÕÝÞ ..." , -1 - MENUITEM "&ÏÞ¶?..." , -1 - MENUITEM "&?Ó±?¯Þ?³ ´ÓÝÕÙ³ ÞÝ±?¾ýÕÝ?¯Ô..." , -1 + MENUITEM "¤¯õ&?ÔÕµõÕÝÞ ..." , 501 + MENUITEM "&ÏÞ¶?..." , ID_SELECT_FONT + MENUITEM "&?Ó±?¯Þ?³ ´ÓÝÕÙ³ ÞÝ±?¾ýÕÝ?¯Ô..." , 512 MENUITEM SEPARATOR MENUITEM "&¤ÓÝÕÙ³ ÞÝ±?¾ýÕÝ?¯Ô" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "¤ÓÝÕÙ³ &õÞ±Û¯Ô" , ID_VIEW_DRIVE_BAR, CHECKED @@ -109,7 +109,7 @@ MENUITEM "¤&¯ÙÝ¹Ú ²ÛÓÝ\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&ÃÝÓ¸¯Û Ô ±´Þ±¯Û ´¯ÒÓýý" , -1 + MENUITEM "&ÃÝÓ¸¯Û Ô ±´Þ±¯Û ´¯ÒÓýý" , 504 MENUITEM "Ð¯&§ÓÝ ?³ ÝÓ±?¯ÚÛÞ ´Þ Ô¹§¯õÕ" , 511 } _____ Modified: trunk/reactos/subsys/system/winefile/si.rc --- trunk/reactos/subsys/system/winefile/si.rc 2005-05-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/si.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -99,9 +99,9 @@ } POPUP "&Options" { - MENUITEM "&Confirmation..." , -1 - MENUITEM "&Font..." , -1 - MENUITEM "Customize Tool&bar..." , -1 + MENUITEM "&Confirmation..." , 501 + MENUITEM "&Font..." , ID_SELECT_FONT + MENUITEM "Customize Tool&bar..." , 512 MENUITEM SEPARATOR MENUITEM "&Toolbar" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "&Drivebar" , ID_VIEW_DRIVE_BAR, CHECKED @@ -110,7 +110,7 @@ MENUITEM "F&ull Screen\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Minize on run" , -1 + MENUITEM "&Minize on run" , 504 MENUITEM "&Save settings on exit" , 511 } _____ Modified: trunk/reactos/subsys/system/winefile/zh.rc --- trunk/reactos/subsys/system/winefile/zh.rc 2005-05-15 11:10:32 UTC (rev 15302) +++ trunk/reactos/subsys/system/winefile/zh.rc 2005-05-15 11:46:20 UTC (rev 15303) @@ -99,9 +99,9 @@ } POPUP "Ðí¤¯ú¿&Oú®" { - MENUITEM "?ÀÂ¿À¢?¢ú¿&Cú®..." , -1 - MENUITEM "ÎÍ?Õú¿&Fú®..." , -1 - MENUITEM "Â¿Íã?ñ¥??§ú¿&Bú®..." , -1 + MENUITEM "?ÀÂ¿À¢?¢ú¿&Cú®..." , 501 + MENUITEM "ÎÍ?Õú¿&Fú®..." , ID_SELECT_FONT + MENUITEM "Â¿Íã?ñ¥??§ú¿&Bú®..." , 512 MENUITEM SEPARATOR MENUITEM "?ñ¥??§ú¿&Tú®" , ID_VIEW_TOOL_BAR, CHECKED MENUITEM "Ã²Â»ã¸?ð?Ýú¿&Dú®" , ID_VIEW_DRIVE_BAR, CHECKED @@ -110,7 +110,7 @@ MENUITEM "?½ã?ú¿&Uú®\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Symbol nach Programmstart" , -1 /*FIXME what's this? */ + MENUITEM "&Minimize on run" , 504 MENUITEM "&Einstellungen beim Beenden speichern" , 511 }

1 0

[mf] 15302: fix for window refresh in shell mode
by mf＠svn.reactos.com 15 May '05

15 May '05

fix for window refresh in shell mode 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-15 10:33:33 UTC (rev 15301) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-15 11:10:32 UTC (rev 15302) @@ -3366,8 +3366,16 @@ scan_entry(child, &child->root.entry, 0, child->hwnd); - entry = read_tree(&child->root, path, NULL, drv, child->sortOrder, child->hwnd); +#ifdef _SHELL_FOLDERS + if (child->root.entry.etype == ET_SHELL) + entry = read_tree(&child->root, NULL, get_path_pidl(path,child->hwnd), drv, child->sortOrder, child->hwnd); + else +#endif + entry = read_tree(&child->root, path, NULL, drv, child->sortOrder, child->hwnd); + if (!entry) + entry = &child->root.entry; + insert_entries(&child->left, child->root.entry.down, 0); set_curdir(child, entry, 0, child->hwnd);

1 0

[greatlrd] 15301: Partiy implement long filename support
by greatlrd＠svn.reactos.com 15 May '05

15 May '05

Partiy implement long filename support example filefilefile.txt can store now with cdmake but not filefilefiles.txt have not check why it say not a iso9660 name Modified: trunk/reactos/tools/cdmake/cdmake.c _____ Modified: trunk/reactos/tools/cdmake/cdmake.c --- trunk/reactos/tools/cdmake/cdmake.c 2005-05-15 09:55:56 UTC (rev 15300) +++ trunk/reactos/tools/cdmake/cdmake.c 2005-05-15 10:33:33 UTC (rev 15301) @@ -19,6 +19,10 @@ * - No Joliet file name validations * - Very bad ISO file name generation * + * + * convert long filename to iso9660 file name by Magnus Olsen + * magnus(a)greatlord.com + * * $Id$ */ @@ -546,8 +550,9 @@ const char *s = filename; char *t = d->name_on_cd; char *n = d->name; - int joliet_length; - + int joliet_length; + int filename_counter; + filename_counter = 1; while (*s != 0) { if (*s == '.') @@ -555,11 +560,11 @@ s++; break; } - + if ( (t-d->name_on_cd) < sizeof(d->name_on_cd)-1 ) *t++ = check_for_punctuation(*s, filename); else if (!joliet) - error_exit ( "'%s' is not ISO-9660, aborting...", filename ); + error_exit ("'%s' is not ISO-9660, aborting...", filename ); if ( (n-d->name) < sizeof(d->name)-1 ) *n++ = *s; else if (!joliet) @@ -597,9 +602,27 @@ } else d->flags = 0; - if ( cdname_exists ( d ) ) - error_exit ( "'%s' is a duplicate file name, aborting...", filename ); + filename_counter = 1; + while ( cdname_exists ( d ) ) + { + + // the file name must be least 8 char long + if (strlen(d->name_on_cd)<8) + error_exit ( "'%s' is a duplicate file name, aborting...", filename ); + + if ((d->name_on_cd[8] == '.') && (strlen(d->name_on_cd) < 13)) + error_exit ( "'%s' is a duplicate file name, aborting...", filename ); + + // max 255 times for equal short filename + if (filename_counter>255) error_exit ( "'%s' is a duplicate file name, aborting...", filename ); + d->name_on_cd[8] = '~'; + memset(&d->name_on_cd[9],0,5); + itoa(filename_counter, &d->name_on_cd[9],10); + filename_counter++; + + } + if ( joliet ) { joliet_length = strlen(filename); @@ -1641,4 +1664,5 @@ return 0; } + /* EOF */

1 0

[mf] 15300: ugly macro hack to use alloca() while keeping Wine's developers happy
by mf＠svn.reactos.com 15 May '05

15 May '05

ugly macro hack to use alloca() while keeping Wine's developers happy 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-15 09:41:00 UTC (rev 15299) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-15 09:55:56 UTC (rev 15300) @@ -188,13 +188,11 @@ } -#define TMP_ALLOC(s) HeapAlloc(GetProcessHeap(), 0, s) -#define TMP_FREE(p) HeapFree(GetProcessHeap(), 0, p) - #else -#define TMP_ALLOC(s) alloca(s) -#define TMP_FREE(p) + // ugly hack to use alloca() while keeping Wine's developers happy +#define HeapAlloc(h,f,s) alloca(s) +#define HeapFree(h,f,p) #endif @@ -1220,7 +1218,7 @@ len++; if (len) { - array = (Entry**) TMP_ALLOC(len*sizeof(Entry*)); + array = (Entry**) HeapAlloc(GetProcessHeap(), 0, len*sizeof(Entry*)); p = array; for(entry=dir->down; entry; entry=entry->next) @@ -1236,7 +1234,7 @@ (*p)->next = 0; - TMP_FREE(array); + HeapFree(GetProcessHeap(), 0, array); } }

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
82
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 2005