Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 22508: implement IDL compilation, generation of client/server stubs and creating import library of it hurray :-)
by janderwald＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: janderwald Date: Fri Jun 23 00:49:18 2006 New Revision: 22508 URL: http://svn.reactos.ru/svn/reactos?rev=22508&view=rev Log: implement IDL compilation, generation of client/server stubs and creating import library of it hurray :-) Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Fri Jun 23 00:49:18 2006 @@ -75,7 +75,7 @@ vector<string> imports; string module_type = GetExtension(module.GetTargetName()); - bool lib = (module.type == ObjectLibrary) || (module_type == ".lib") || (module_type == ".a"); + bool lib = (module.type == ObjectLibrary) || (module.type == RpcClient) ||(module.type == RpcServer) || (module_type == ".lib") || (module_type == ".a"); bool dll = (module_type == ".dll") || (module_type == ".cpl"); bool exe = (module_type == ".exe") || (module_type == ".scr"); bool sys = (module_type == ".sys"); @@ -532,9 +532,23 @@ fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); if (source_file.find(".idl") != string::npos) { - fprintf ( OUT, "\t\t\t\t\t\tName=\"VCMIDLTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tHeaderFileName=\"$(InputName).h\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tOutputDirectory=\"$(IntDir)\"/>\r\n" ); + string src = source_file.substr (0, source_file.find(".idl")); + + if ( src.find (".\\") != string::npos ) + src.erase (0, 2); + + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); + + if ( module.type == RpcClient ) + fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"midl.exe /cstub %s.c /header %s.h "$(InputPath)" /out "$(IntDir)"", src.c_str (), src.c_str () ); + else + fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"midl.exe /sstub %s.c /header %s.h "$(InputPath)" /out "$(IntDir)"", src.c_str (), src.c_str () ); + + fprintf ( OUT, "
"); + fprintf ( OUT, "cl.exe /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WIN32_WINNT=0x502" /D "_UNICODE" /D "UNICODE" /Gm /EHsc /RTC1 /MDd /Fo"$(IntDir)\\%s.obj" /W3 /c /Wp64 /ZI /TC "$(IntDir)\\%s.c" /nologo /errorReport:prompt", src.c_str (), src.c_str () ); + fprintf ( OUT, "
"); + fprintf ( OUT, "lib.exe /OUT:"$(OutDir)\\%s.lib" "$(IntDir)\\%s.obj"
\"\r\n", module.name.c_str (), src.c_str () ); + fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(IntDir)\\$(InputName).obj\"/>\r\n" ); } else if ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's')) {

1 0

[greatlrd] 22507: bugfix from w3seek : bug 1474 : NTMARTA: GetExplicitEntriesFromAcl should return valid information for NULL-ACLs
by greatlrd＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: greatlrd Date: Fri Jun 23 00:34:23 2006 New Revision: 22507 URL: http://svn.reactos.ru/svn/reactos?rev=22507&view=rev Log: bugfix from w3seek : bug 1474 : NTMARTA: GetExplicitEntriesFromAcl should return valid information for NULL-ACLs Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.c… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Fri Jun 23 00:34:23 2006 @@ -1154,9 +1154,14 @@ } else { - *pcCountOfExplicitEntries = 0; - *pListOfExplicitEntries = NULL; - } + goto EmptyACL; + } + } + else + { +EmptyACL: + *pcCountOfExplicitEntries = 0; + *pListOfExplicitEntries = NULL; } /* restore the last error code */

1 0

[greatlrd] 22506: Bugfix from w3seek : bug 1614 Fix resource leak in NtRemoveIoCompletion
by greatlrd＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: greatlrd Date: Fri Jun 23 00:30:49 2006 New Revision: 22506 URL: http://svn.reactos.ru/svn/reactos?rev=22506&view=rev Log: Bugfix from w3seek : bug 1614 Fix resource leak in NtRemoveIoCompletion Modified: trunk/reactos/ntoskrnl/io/iocomp.c Modified: trunk/reactos/ntoskrnl/io/iocomp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/iocomp.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/io/iocomp.c (original) +++ trunk/reactos/ntoskrnl/io/iocomp.c Fri Jun 23 00:30:49 2006 @@ -279,7 +279,7 @@ _SEH_TRY { *IoCompletionHandle = hIoCompletionHandle; - } _SEH_HANDLE { + } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { Status = _SEH_GetExceptionCode(); } _SEH_END; @@ -332,7 +332,7 @@ _SEH_TRY { *IoCompletionHandle = hIoCompletionHandle; - } _SEH_HANDLE { + } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { Status = _SEH_GetExceptionCode(); } _SEH_END; @@ -393,7 +393,7 @@ *ResultLength = sizeof(IO_COMPLETION_BASIC_INFORMATION); } - } _SEH_HANDLE { + } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { Status = _SEH_GetExceptionCode(); } _SEH_END; @@ -472,34 +472,40 @@ /* Get the Packet Data */ Packet = CONTAINING_RECORD(ListEntry, IO_COMPLETION_PACKET, ListEntry); - _SEH_TRY { - - /* Check if this is piggybacked on an IRP */ - if (Packet->PacketType == IrpCompletionPacket) - { - /* Get the IRP */ - PIRP Irp = NULL; - Irp = CONTAINING_RECORD(ListEntry, IRP, Tail.Overlay.ListEntry); - - /* Return values to user */ + /* Check if this is piggybacked on an IRP */ + if (Packet->PacketType == IrpCompletionPacket) + { + /* Get the IRP */ + PIRP Irp = NULL; + Irp = CONTAINING_RECORD(ListEntry, IRP, Tail.Overlay.ListEntry); + + /* Return values to user */ + _SEH_TRY { + *CompletionKey = Irp->Tail.CompletionKey; *CompletionContext = Irp->Overlay.AsynchronousParameters.UserApcContext; *IoStatusBlock = Packet->IoStatus; - IoFreeIrp(Irp); - } - else - { - /* This is a user-mode generated or API generated mini-packet */ + } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { + + Status = _SEH_GetExceptionCode(); + } _SEH_END; + + IoFreeIrp(Irp); + } + else + { + /* This is a user-mode generated or API generated mini-packet */ + _SEH_TRY { + *CompletionKey = Packet->Key; *CompletionContext = Packet->Context; *IoStatusBlock = Packet->IoStatus; - IopFreeIoCompletionPacket(Packet); - } - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - } _SEH_END; + } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { + Status = _SEH_GetExceptionCode(); + } _SEH_END; + + IopFreeIoCompletionPacket(Packet); + } } /* Dereference the Object */

1 0

[janderwald] 22505: remove targets
by janderwald＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: janderwald Date: Thu Jun 22 23:15:37 2006 New Revision: 22505 URL: http://svn.reactos.ru/svn/reactos?rev=22505&view=rev Log: remove targets Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/Makefile?rev=22505&r1=22504… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Thu Jun 22 23:15:37 2006 @@ -431,84 +431,10 @@ $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 msvc -.PHONY: msvc6_clean -msvc6_clean: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs6.00 msvc - -.PHONY: msvc7_clean -msvc7_clean: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.00 msvc - -.PHONY: msvc71_clean -msvc71_clean: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.10 msvc - -.PHONY: msvc8_clean -msvc8_clean: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs8.00 msvc - .PHONY: msvc_clean msvc_clean: $(RBUILD_TARGET) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c msvc - -.PHONY: msvc_clean_all -msvc_clean_all: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs6.00 msvc - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.00 msvc - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.10 msvc - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs8.10 msvc - -.PHONY: msvc7_install_debug -msvc7_install_debug: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcdebug msvc - -.PHONY: msvc7_install_release -msvc7_install_release: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcrelease msvc - -.PHONY: msvc7_install_speed -msvc7_install_speed: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcspeed msvc - -.PHONY: msvc71_install_debug -msvc71_install_debug: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcdebug msvc - -.PHONY: msvc71_install_release -msvc71_install_release: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcrelease msvc - - -.PHONY: msvc71_install_speed -msvc71_install_speed: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcspeed msvc - -.PHONY: msvc8_install_debug -msvc8_install_debug: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcdebug msvc - -.PHONY: msvc8_install_release -msvc8_install_release: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcrelease msvc - -.PHONY: msvc8_install_speed -msvc8_install_speed: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcspeed msvc .PHONY: makefile_auto_clean makefile_auto_clean:

1 0

[janderwald] 22504: apply changes to msvc_clean target
by janderwald＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: janderwald Date: Thu Jun 22 23:09:46 2006 New Revision: 22504 URL: http://svn.reactos.ru/svn/reactos?rev=22504&view=rev Log: apply changes to msvc_clean target Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/m… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Thu Jun 22 23:09:46 2006 @@ -296,18 +296,33 @@ string basepath = module.GetBasePath (); string vcdir = _get_vc_dir (); size_t i; - string intenv = Environment::GetIntermediatePath () + "\\" + basepath + "\\" + vcdir + "\\"; - string outenv = Environment::GetOutputPath () + "\\" + basepath + "\\" + vcdir + "\\"; + string intenv = Environment::GetIntermediatePath () + "\\" + basepath + "\\"; + string outenv = Environment::GetOutputPath () + "\\" + basepath + "\\"; + + if ( configuration.UseVSVersionInPath ) + { + intenv += vcdir + "\\"; + outenv += vcdir + "\\"; + } + string dbg = vcdir.substr ( 0, 3 ); vector<string> cfgs; - cfgs.push_back ( intenv + "Debug" ); - cfgs.push_back ( intenv + "Release" ); - cfgs.push_back ( intenv + "Speed" ); - cfgs.push_back ( outenv + "Debug" ); - cfgs.push_back ( outenv + "Release" ); - cfgs.push_back ( outenv + "Speed" ); - + + if ( configuration.UseVSConfigurationInPath ) + { + cfgs.push_back ( intenv + "Debug" ); + cfgs.push_back ( intenv + "Release" ); + cfgs.push_back ( intenv + "Speed" ); + cfgs.push_back ( outenv + "Debug" ); + cfgs.push_back ( outenv + "Release" ); + cfgs.push_back ( outenv + "Speed" ); + } + else + { + cfgs.push_back ( intenv ); + cfgs.push_back ( outenv ); + } vector<const IfableData*> ifs_list; ifs_list.push_back ( &module.project.non_if_data ); @@ -371,8 +386,12 @@ _get_object_files ( module, out ); for ( size_t j = 0; j < out.size (); j++) + { + //printf("Cleaning file %s\n", out[j].c_str () ); remove ( out[j].c_str () ); - } + } + } + string filename_sln = ProjectNode.name + ".sln"; string filename_dsw = ProjectNode.name + ".dsw";

1 0

[janderwald] 22503: * make intermediate / outpath optional * if u want to continue using vc specific path / configuration add flag -vo{version|configuration}
by janderwald＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: janderwald Date: Thu Jun 22 22:50:00 2006 New Revision: 22503 URL: http://svn.reactos.ru/svn/reactos?rev=22503&view=rev Log: * make intermediate / outpath optional * if u want to continue using vc specific path / configuration add flag -vo{version|configuration} Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/configuration.cpp trunk/reactos/tools/rbuild/rbuild.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Thu Jun 22 22:50:00 2006 @@ -85,7 +85,9 @@ string outenv = Environment::GetOutputPath (); string outdir; string intdir; - + string vcdir; + + if ( intenv == "obj-i386" ) intdir = path_basedir + "obj-i386"; /* append relative dir from project dir */ else @@ -96,6 +98,10 @@ else outdir = outenv; + if ( configuration.UseVSVersionInPath ) + { + vcdir = "\\" + _get_vc_dir(); + } // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? bool console = exe && (module.type == Win32CUI); @@ -220,8 +226,18 @@ fprintf ( OUT, "\t\t<Configuration\r\n" ); fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.name.c_str() ); - fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s\\%s\\%s\"\r\n", outdir.c_str (), module.GetBasePath ().c_str (), _get_vc_dir().c_str (), cfg.name.c_str() ); - fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s\\%s\\%s\"\r\n", intdir.c_str (), module.GetBasePath ().c_str (), _get_vc_dir().c_str (), cfg.name.c_str() ); + + if ( configuration.UseVSConfigurationInPath ) + { + fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s%s\\%s\"\r\n", outdir.c_str (), module.GetBasePath ().c_str (), vcdir.c_str (), cfg.name.c_str() ); + fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s%s\\%s\"\r\n", intdir.c_str (), module.GetBasePath ().c_str (), vcdir.c_str (), cfg.name.c_str() ); + } + else + { + fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s%s\"\r\n", outdir.c_str (), module.GetBasePath ().c_str (), vcdir.c_str () ); + fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s%s\"\r\n", intdir.c_str (), module.GetBasePath ().c_str (), vcdir.c_str () ); + } + fprintf ( OUT, "\t\t\tConfigurationType=\"%d\"\r\n", exe ? 1 : dll ? 2 : lib ? 4 : -1 ); fprintf ( OUT, "\t\t\tCharacterSet=\"2\">\r\n" ); Modified: trunk/reactos/tools/rbuild/configuration.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/configuration.… ============================================================================== --- trunk/reactos/tools/rbuild/configuration.cpp (original) +++ trunk/reactos/tools/rbuild/configuration.cpp Thu Jun 22 22:50:00 2006 @@ -30,6 +30,8 @@ MakeHandlesInstallDirectories = false; GenerateProxyMakefilesInSourceTree = false; InstallFiles = false; + UseVSConfigurationInPath = false; + UseVSVersionInPath = false; } Configuration::~Configuration () Modified: trunk/reactos/tools/rbuild/rbuild.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/rbuild.cpp?rev… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.cpp (original) +++ trunk/reactos/tools/rbuild/rbuild.cpp Thu Jun 22 22:50:00 2006 @@ -86,6 +86,8 @@ char switchChar2, char* switchStart ) { + string temp; + switch ( switchChar2 ) { case 's': @@ -111,6 +113,19 @@ case 'c': configuration.VSConfigurationType = string (&switchStart[3]); configuration.InstallFiles = true; + break; + case 'o': + if ( strlen ( switchStart ) <= 3 ) + { + printf ( "Invalid switch\n" ); + return false; + } + temp = string (&switchStart[3]); + if ( temp.find ("configuration") != string::npos ) + configuration.UseVSConfigurationInPath = true; + + if ( temp.find ("version") != string::npos ) + configuration.UseVSVersionInPath = true; break; default: printf ( "Unknown switch -d%c\n", @@ -238,6 +253,7 @@ printf ( " -ps Generate proxy makefiles in source tree instead of the output.\n" ); printf ( " tree.\n" ); printf ( " -vs{version} Version of MS VS project files. Default is %s.\n", MS_VS_DEF_VERSION ); + printf ( " -vo{version|configuration} Adds subdirectory path to the default Intermediate-Outputdirectory.\n" ); printf ( "\n" ); printf ( " buildsystem Target build system. Can be one of:\n" ); Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=2… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Thu Jun 22 22:50:00 2006 @@ -142,6 +142,8 @@ std::string CheckDependenciesForModuleOnlyModule; std::string VSProjectVersion; std::string VSConfigurationType; + bool UseVSVersionInPath; + bool UseVSConfigurationInPath; bool MakeHandlesInstallDirectories; bool GenerateProxyMakefilesInSourceTree; bool InstallFiles;

1 0

[gedmurphy] 22502: - split the code up into logical files and reformat - more code for NTP time setting - many other code improvements
by gedmurphy＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: gedmurphy Date: Thu Jun 22 21:13:29 2006 New Revision: 22502 URL: http://svn.reactos.ru/svn/reactos?rev=22502&view=rev Log: - split the code up into logical files and reformat - more code for NTP time setting - many other code improvements Added: trunk/reactos/dll/cpl/timedate/dateandtime.c trunk/reactos/dll/cpl/timedate/internettime.c trunk/reactos/dll/cpl/timedate/timezone.c Modified: trunk/reactos/dll/cpl/timedate/Cz.rc trunk/reactos/dll/cpl/timedate/De.rc trunk/reactos/dll/cpl/timedate/Dk.rc trunk/reactos/dll/cpl/timedate/En.rc trunk/reactos/dll/cpl/timedate/Es.rc trunk/reactos/dll/cpl/timedate/Fr.rc trunk/reactos/dll/cpl/timedate/Gr.rc trunk/reactos/dll/cpl/timedate/Hu.rc trunk/reactos/dll/cpl/timedate/It.rc trunk/reactos/dll/cpl/timedate/Ja.rc trunk/reactos/dll/cpl/timedate/Nl.rc trunk/reactos/dll/cpl/timedate/Pl.rc trunk/reactos/dll/cpl/timedate/Ru.rc trunk/reactos/dll/cpl/timedate/Sv.rc trunk/reactos/dll/cpl/timedate/clock.c trunk/reactos/dll/cpl/timedate/monthcal.c trunk/reactos/dll/cpl/timedate/ntpclient.c trunk/reactos/dll/cpl/timedate/resource.h trunk/reactos/dll/cpl/timedate/timedate.c trunk/reactos/dll/cpl/timedate/timedate.h trunk/reactos/dll/cpl/timedate/timedate.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/timedate/Cz.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Cz.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/De.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/Dk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Dk.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/En.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/Es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Es.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Fr.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/Gr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Gr.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Hu.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/It.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/It.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/Ja.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Ja.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Nl.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/Pl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Pl.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Ru.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/Sv.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Sv.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/clock.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/clock.c?re… Added: trunk/reactos/dll/cpl/timedate/dateandtime.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/dateandtim… Added: trunk/reactos/dll/cpl/timedate/internettime.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/internetti… Modified: trunk/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/monthcal.c… Modified: trunk/reactos/dll/cpl/timedate/ntpclient.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/ntpclient.… Modified: trunk/reactos/dll/cpl/timedate/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/resource.h… Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.c… Modified: trunk/reactos/dll/cpl/timedate/timedate.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.h… Modified: trunk/reactos/dll/cpl/timedate/timedate.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.r… Added: trunk/reactos/dll/cpl/timedate/timezone.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timezone.c…

1 0

[cwittich] 22501: -some translations: GreatLordish -> English
by cwittich＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: cwittich Date: Thu Jun 22 16:53:54 2006 New Revision: 22501 URL: http://svn.reactos.ru/svn/reactos?rev=22501&view=rev Log: -some translations: GreatLordish -> English Modified: trunk/tools/Qemu GUI/Qemu GUI.suo trunk/tools/Qemu GUI/frmMain.cs Modified: trunk/tools/Qemu GUI/Qemu GUI.suo URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Qemu%20GUI.suo?rev… ============================================================================== Binary files - no diff available. Modified: trunk/tools/Qemu GUI/frmMain.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.cs?rev=225… ============================================================================== --- trunk/tools/Qemu GUI/frmMain.cs (original) +++ trunk/tools/Qemu GUI/frmMain.cs Thu Jun 22 16:53:54 2006 @@ -127,25 +127,25 @@ private ComboBox cboVDKDrive; private ComboBox cboMachine; private Label lblImageSizeMB; - private GroupBox groupBox3; + private GroupBox grpNetwork; private GroupBox groupBox1; private NumericUpDown numericUpDown9; private NumericUpDown numericUpDown10; private NumericUpDown numericUpDown11; private NumericUpDown numericUpDown12; - private Label label3; + private Label lblGateway; private NumericUpDown numericUpDown5; private NumericUpDown numericUpDown6; private NumericUpDown numericUpDown7; private NumericUpDown numericUpDown8; - private Label label2; + private Label lblNetmask; private NumericUpDown numericUpDown4; private NumericUpDown numericUpDown3; private NumericUpDown numericUpDown2; private NumericUpDown numericUpDown1; - private Label label1; - private RadioButton radioButton2; - private RadioButton radioButton1; + private Label lblIP; + private RadioButton optStaticIP; + private RadioButton optDHCP; private QEmu qemu; public frmMain() @@ -277,6 +277,25 @@ this.button20 = new System.Windows.Forms.Button(); this.chkVBE30 = new System.Windows.Forms.CheckBox(); this.tabNetwork = new System.Windows.Forms.TabPage(); + this.grpNetwork = new System.Windows.Forms.GroupBox(); + this.numericUpDown9 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown10 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown11 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown12 = new System.Windows.Forms.NumericUpDown(); + this.lblGateway = new System.Windows.Forms.Label(); + this.numericUpDown5 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown6 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown7 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown8 = new System.Windows.Forms.NumericUpDown(); + this.lblNetmask = new System.Windows.Forms.Label(); + this.numericUpDown4 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown3 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); + this.lblIP = new System.Windows.Forms.Label(); + this.optStaticIP = new System.Windows.Forms.RadioButton(); + this.optDHCP = new System.Windows.Forms.RadioButton(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); this.tabPaths = new System.Windows.Forms.TabPage(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.txtQEmuPath = new System.Windows.Forms.TextBox(); @@ -293,25 +312,6 @@ this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.btnLoad = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.radioButton1 = new System.Windows.Forms.RadioButton(); - this.radioButton2 = new System.Windows.Forms.RadioButton(); - this.label1 = new System.Windows.Forms.Label(); - this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown3 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown4 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown5 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown6 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown7 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown8 = new System.Windows.Forms.NumericUpDown(); - this.label2 = new System.Windows.Forms.Label(); - this.numericUpDown9 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown10 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown11 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown12 = new System.Windows.Forms.NumericUpDown(); - this.label3 = new System.Windows.Forms.Label(); this.grpMachine.SuspendLayout(); this.HardDisk2.SuspendLayout(); this.tabMisc.SuspendLayout(); @@ -342,22 +342,22 @@ this.grpParallel.SuspendLayout(); this.groupBox16.SuspendLayout(); this.tabNetwork.SuspendLayout(); - this.tabPaths.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.tabAbout.SuspendLayout(); - this.groupBox3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).BeginInit(); + this.grpNetwork.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); + this.tabPaths.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.tabAbout.SuspendLayout(); this.SuspendLayout(); // // grpMachine @@ -1346,7 +1346,7 @@ // // tabNetwork // - this.tabNetwork.Controls.Add(this.groupBox3); + this.tabNetwork.Controls.Add(this.grpNetwork); this.tabNetwork.Controls.Add(this.groupBox1); this.tabNetwork.Location = new System.Drawing.Point(4, 22); this.tabNetwork.Name = "tabNetwork"; @@ -1354,6 +1354,355 @@ this.tabNetwork.TabIndex = 7; this.tabNetwork.Text = "Network"; this.tabNetwork.UseVisualStyleBackColor = true; + // + // grpNetwork + // + this.grpNetwork.Controls.Add(this.numericUpDown9); + this.grpNetwork.Controls.Add(this.numericUpDown10); + this.grpNetwork.Controls.Add(this.numericUpDown11); + this.grpNetwork.Controls.Add(this.numericUpDown12); + this.grpNetwork.Controls.Add(this.lblGateway); + this.grpNetwork.Controls.Add(this.numericUpDown5); + this.grpNetwork.Controls.Add(this.numericUpDown6); + this.grpNetwork.Controls.Add(this.numericUpDown7); + this.grpNetwork.Controls.Add(this.numericUpDown8); + this.grpNetwork.Controls.Add(this.lblNetmask); + this.grpNetwork.Controls.Add(this.numericUpDown4); + this.grpNetwork.Controls.Add(this.numericUpDown3); + this.grpNetwork.Controls.Add(this.numericUpDown2); + this.grpNetwork.Controls.Add(this.numericUpDown1); + this.grpNetwork.Controls.Add(this.lblIP); + this.grpNetwork.Controls.Add(this.optStaticIP); + this.grpNetwork.Controls.Add(this.optDHCP); + this.grpNetwork.Location = new System.Drawing.Point(222, 3); + this.grpNetwork.Name = "grpNetwork"; + this.grpNetwork.Size = new System.Drawing.Size(235, 195); + this.grpNetwork.TabIndex = 1; + this.grpNetwork.TabStop = false; + this.grpNetwork.Text = "Network"; + // + // numericUpDown9 + // + this.numericUpDown9.Location = new System.Drawing.Point(173, 157); + this.numericUpDown9.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown9.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown9.Name = "numericUpDown9"; + this.numericUpDown9.Size = new System.Drawing.Size(46, 20); + this.numericUpDown9.TabIndex = 27; + this.numericUpDown9.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown10 + // + this.numericUpDown10.Location = new System.Drawing.Point(121, 157); + this.numericUpDown10.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown10.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown10.Name = "numericUpDown10"; + this.numericUpDown10.Size = new System.Drawing.Size(46, 20); + this.numericUpDown10.TabIndex = 26; + this.numericUpDown10.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown11 + // + this.numericUpDown11.Location = new System.Drawing.Point(69, 157); + this.numericUpDown11.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown11.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown11.Name = "numericUpDown11"; + this.numericUpDown11.Size = new System.Drawing.Size(46, 20); + this.numericUpDown11.TabIndex = 25; + this.numericUpDown11.Value = new decimal(new int[] { + 168, + 0, + 0, + 0}); + // + // numericUpDown12 + // + this.numericUpDown12.Location = new System.Drawing.Point(17, 157); + this.numericUpDown12.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown12.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown12.Name = "numericUpDown12"; + this.numericUpDown12.Size = new System.Drawing.Size(46, 20); + this.numericUpDown12.TabIndex = 24; + this.numericUpDown12.Value = new decimal(new int[] { + 192, + 0, + 0, + 0}); + // + // lblGateway + // + this.lblGateway.AutoSize = true; + this.lblGateway.Location = new System.Drawing.Point(14, 141); + this.lblGateway.Name = "lblGateway"; + this.lblGateway.Size = new System.Drawing.Size(49, 13); + this.lblGateway.TabIndex = 23; + this.lblGateway.Text = "Gateway"; + // + // numericUpDown5 + // + this.numericUpDown5.Location = new System.Drawing.Point(173, 115); + this.numericUpDown5.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown5.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown5.Name = "numericUpDown5"; + this.numericUpDown5.Size = new System.Drawing.Size(46, 20); + this.numericUpDown5.TabIndex = 22; + this.numericUpDown5.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown6 + // + this.numericUpDown6.Location = new System.Drawing.Point(121, 115); + this.numericUpDown6.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown6.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown6.Name = "numericUpDown6"; + this.numericUpDown6.Size = new System.Drawing.Size(46, 20); + this.numericUpDown6.TabIndex = 21; + this.numericUpDown6.Value = new decimal(new int[] { + 255, + 0, + 0, + 0}); + // + // numericUpDown7 + // + this.numericUpDown7.Location = new System.Drawing.Point(69, 115); + this.numericUpDown7.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown7.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown7.Name = "numericUpDown7"; + this.numericUpDown7.Size = new System.Drawing.Size(46, 20); + this.numericUpDown7.TabIndex = 20; + this.numericUpDown7.Value = new decimal(new int[] { + 255, + 0, + 0, + 0}); + // + // numericUpDown8 + // + this.numericUpDown8.Location = new System.Drawing.Point(17, 115); + this.numericUpDown8.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown8.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown8.Name = "numericUpDown8"; + this.numericUpDown8.Size = new System.Drawing.Size(46, 20); + this.numericUpDown8.TabIndex = 19; + this.numericUpDown8.Value = new decimal(new int[] { + 255, + 0, + 0, + 0}); + // + // lblNetmask + // + this.lblNetmask.AutoSize = true; + this.lblNetmask.Location = new System.Drawing.Point(14, 97); + this.lblNetmask.Name = "lblNetmask"; + this.lblNetmask.Size = new System.Drawing.Size(75, 13); + this.lblNetmask.TabIndex = 18; + this.lblNetmask.Text = "Network mask"; + // + // numericUpDown4 + // + this.numericUpDown4.Location = new System.Drawing.Point(173, 74); + this.numericUpDown4.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown4.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown4.Name = "numericUpDown4"; + this.numericUpDown4.Size = new System.Drawing.Size(46, 20); + this.numericUpDown4.TabIndex = 17; + this.numericUpDown4.Value = new decimal(new int[] { + 20, + 0, + 0, + 0}); + // + // numericUpDown3 + // + this.numericUpDown3.Location = new System.Drawing.Point(121, 74); + this.numericUpDown3.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown3.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown3.Name = "numericUpDown3"; + this.numericUpDown3.Size = new System.Drawing.Size(46, 20); + this.numericUpDown3.TabIndex = 16; + this.numericUpDown3.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown2 + // + this.numericUpDown2.Location = new System.Drawing.Point(69, 74); + this.numericUpDown2.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown2.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown2.Name = "numericUpDown2"; + this.numericUpDown2.Size = new System.Drawing.Size(46, 20); + this.numericUpDown2.TabIndex = 15; + this.numericUpDown2.Value = new decimal(new int[] { + 168, + 0, + 0, + 0}); + // + // numericUpDown1 + // + this.numericUpDown1.Location = new System.Drawing.Point(17, 74); + this.numericUpDown1.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown1.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown1.Name = "numericUpDown1"; + this.numericUpDown1.Size = new System.Drawing.Size(46, 20); + this.numericUpDown1.TabIndex = 14; + this.numericUpDown1.Value = new decimal(new int[] { + 192, + 0, + 0, + 0}); + // + // lblIP + // + this.lblIP.AutoSize = true; + this.lblIP.Location = new System.Drawing.Point(14, 58); + this.lblIP.Name = "lblIP"; + this.lblIP.Size = new System.Drawing.Size(58, 13); + this.lblIP.TabIndex = 2; + this.lblIP.Text = "IP Address"; + // + // optStaticIP + // + this.optStaticIP.AutoSize = true; + this.optStaticIP.Location = new System.Drawing.Point(121, 29); + this.optStaticIP.Name = "optStaticIP"; + this.optStaticIP.Size = new System.Drawing.Size(65, 17); + this.optStaticIP.TabIndex = 1; + this.optStaticIP.TabStop = true; + this.optStaticIP.Text = "Static IP"; + this.optStaticIP.UseVisualStyleBackColor = true; + // + // optDHCP + // + this.optDHCP.AutoSize = true; + this.optDHCP.Checked = true; + this.optDHCP.Location = new System.Drawing.Point(17, 29); + this.optDHCP.Name = "optDHCP"; + this.optDHCP.Size = new System.Drawing.Size(77, 17); + this.optDHCP.TabIndex = 0; + this.optDHCP.TabStop = true; + this.optDHCP.Text = "Use DHCP"; + this.optDHCP.UseVisualStyleBackColor = true; + // + // groupBox1 + // + this.groupBox1.Location = new System.Drawing.Point(3, 3); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(213, 195); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Buildin Server"; // // tabPaths // @@ -1484,354 +1833,6 @@ this.btnSave.TabIndex = 6; this.btnSave.Text = "Save"; this.btnSave.Click += new System.EventHandler(this.btnSave_Click); - // - // groupBox1 - // - this.groupBox1.Location = new System.Drawing.Point(13, 13); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(200, 176); - this.groupBox1.TabIndex = 0; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Buildin Server"; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.numericUpDown9); - this.groupBox3.Controls.Add(this.numericUpDown10); - this.groupBox3.Controls.Add(this.numericUpDown11); - this.groupBox3.Controls.Add(this.numericUpDown12); - this.groupBox3.Controls.Add(this.label3); - this.groupBox3.Controls.Add(this.numericUpDown5); - this.groupBox3.Controls.Add(this.numericUpDown6); - this.groupBox3.Controls.Add(this.numericUpDown7); - this.groupBox3.Controls.Add(this.numericUpDown8); - this.groupBox3.Controls.Add(this.label2); - this.groupBox3.Controls.Add(this.numericUpDown4); - this.groupBox3.Controls.Add(this.numericUpDown3); - this.groupBox3.Controls.Add(this.numericUpDown2); - this.groupBox3.Controls.Add(this.numericUpDown1); - this.groupBox3.Controls.Add(this.label1); - this.groupBox3.Controls.Add(this.radioButton2); - this.groupBox3.Controls.Add(this.radioButton1); - this.groupBox3.Location = new System.Drawing.Point(231, 13); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(214, 176); - this.groupBox3.TabIndex = 1; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Network Config"; - // - // radioButton1 - // - this.radioButton1.AutoSize = true; - this.radioButton1.Location = new System.Drawing.Point(6, 19); - this.radioButton1.Name = "radioButton1"; - this.radioButton1.Size = new System.Drawing.Size(77, 17); - this.radioButton1.TabIndex = 0; - this.radioButton1.TabStop = true; - this.radioButton1.Text = "Use DHCP"; - this.radioButton1.UseVisualStyleBackColor = true; - // - // radioButton2 - // - this.radioButton2.AutoSize = true; - this.radioButton2.Location = new System.Drawing.Point(101, 19); - this.radioButton2.Name = "radioButton2"; - this.radioButton2.Size = new System.Drawing.Size(65, 17); - this.radioButton2.TabIndex = 1; - this.radioButton2.TabStop = true; - this.radioButton2.Text = "Static IP"; - this.radioButton2.UseVisualStyleBackColor = true; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(6, 51); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(52, 13); - this.label1.TabIndex = 2; - this.label1.Text = "IP Adress"; - // - // numericUpDown1 - // - this.numericUpDown1.Location = new System.Drawing.Point(6, 67); - this.numericUpDown1.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numericUpDown1.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDown1.Name = "numericUpDown1"; - this.numericUpDown1.Size = new System.Drawing.Size(46, 20); - this.numericUpDown1.TabIndex = 14; - this.numericUpDown1.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // numericUpDown2 - // - this.numericUpDown2.Location = new System.Drawing.Point(58, 67); - this.numericUpDown2.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numericUpDown2.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDown2.Name = "numericUpDown2"; - this.numericUpDown2.Size = new System.Drawing.Size(46, 20); - this.numericUpDown2.TabIndex = 15; - this.numericUpDown2.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // numericUpDown3 - // - this.numericUpDown3.Location = new System.Drawing.Point(110, 67); - this.numericUpDown3.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numericUpDown3.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDown3.Name = "numericUpDown3"; - this.numericUpDown3.Size = new System.Drawing.Size(46, 20); - this.numericUpDown3.TabIndex = 16; - this.numericUpDown3.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // numericUpDown4 - // - this.numericUpDown4.Location = new System.Drawing.Point(162, 67); - this.numericUpDown4.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numericUpDown4.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDown4.Name = "numericUpDown4"; - this.numericUpDown4.Size = new System.Drawing.Size(46, 20); - this.numericUpDown4.TabIndex = 17; - this.numericUpDown4.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // numericUpDown5 - // - this.numericUpDown5.Location = new System.Drawing.Point(162, 108); - this.numericUpDown5.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numericUpDown5.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDown5.Name = "numericUpDown5"; - this.numericUpDown5.Size = new System.Drawing.Size(46, 20); - this.numericUpDown5.TabIndex = 22; - this.numericUpDown5.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // numericUpDown6 - // - this.numericUpDown6.Location = new System.Drawing.Point(110, 108); - this.numericUpDown6.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numericUpDown6.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDown6.Name = "numericUpDown6"; - this.numericUpDown6.Size = new System.Drawing.Size(46, 20); - this.numericUpDown6.TabIndex = 21; - this.numericUpDown6.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // numericUpDown7 - // - this.numericUpDown7.Location = new System.Drawing.Point(58, 108); - this.numericUpDown7.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numericUpDown7.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDown7.Name = "numericUpDown7"; - this.numericUpDown7.Size = new System.Drawing.Size(46, 20); - this.numericUpDown7.TabIndex = 20; - this.numericUpDown7.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // numericUpDown8 - // - this.numericUpDown8.Location = new System.Drawing.Point(6, 108); - this.numericUpDown8.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numericUpDown8.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDown8.Name = "numericUpDown8"; - this.numericUpDown8.Size = new System.Drawing.Size(46, 20); - this.numericUpDown8.TabIndex = 19; - this.numericUpDown8.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(6, 92); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(75, 13); - this.label2.TabIndex = 18; - this.label2.Text = "Network mask"; - // - // numericUpDown9 - // - this.numericUpDown9.Location = new System.Drawing.Point(162, 150); - this.numericUpDown9.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numericUpDown9.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDown9.Name = "numericUpDown9"; - this.numericUpDown9.Size = new System.Drawing.Size(46, 20); - this.numericUpDown9.TabIndex = 27; - this.numericUpDown9.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // numericUpDown10 - // - this.numericUpDown10.Location = new System.Drawing.Point(110, 150); - this.numericUpDown10.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numericUpDown10.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDown10.Name = "numericUpDown10"; - this.numericUpDown10.Size = new System.Drawing.Size(46, 20); - this.numericUpDown10.TabIndex = 26; - this.numericUpDown10.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // numericUpDown11 - // - this.numericUpDown11.Location = new System.Drawing.Point(58, 150); - this.numericUpDown11.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numericUpDown11.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDown11.Name = "numericUpDown11"; - this.numericUpDown11.Size = new System.Drawing.Size(46, 20); - this.numericUpDown11.TabIndex = 25; - this.numericUpDown11.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // numericUpDown12 - // - this.numericUpDown12.Location = new System.Drawing.Point(6, 150); - this.numericUpDown12.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numericUpDown12.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDown12.Name = "numericUpDown12"; - this.numericUpDown12.Size = new System.Drawing.Size(46, 20); - this.numericUpDown12.TabIndex = 24; - this.numericUpDown12.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(6, 134); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(43, 13); - this.label3.TabIndex = 23; - this.label3.Text = "Getway"; // // frmMain // @@ -1888,25 +1889,25 @@ this.grpParallel.ResumeLayout(false); this.groupBox16.ResumeLayout(false); this.tabNetwork.ResumeLayout(false); + this.grpNetwork.ResumeLayout(false); + this.grpNetwork.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); this.tabPaths.ResumeLayout(false); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); this.tabAbout.ResumeLayout(false); this.tabAbout.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown7)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown12)).EndInit(); this.ResumeLayout(false); }

1 0

[jimtabor] 22500: Wine port WM_SETREDRAW.
by jimtabor＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: jimtabor Date: Thu Jun 22 16:32:52 2006 New Revision: 22500 URL: http://svn.reactos.ru/svn/reactos?rev=22500&view=rev Log: Wine port WM_SETREDRAW. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/de… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Thu Jun 22 16:32:52 2006 @@ -196,12 +196,25 @@ VOID DefWndSetRedraw(HWND hWnd, WPARAM wParam) { - if ((BOOL) wParam && 0 == (GetWindowLong(hWnd, GWL_STYLE) & WS_VISIBLE)) - { - ShowWindow(hWnd, SW_NORMAL); - } - - UNIMPLEMENTED; + LONG Style = GetWindowLong(hWnd, GWL_STYLE); + /* Content can be redrawn after a change. */ + if (wParam) + { + if (!(Style & WS_VISIBLE)) /* Not Visible */ + { + SetWindowLong(hWnd, GWL_STYLE, WS_VISIBLE); + } + } + else /* Content cannot be redrawn after a change. */ + { + if (Style & WS_VISIBLE) /* Visible */ + { + RedrawWindow( hWnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE ); + Style &= ~WS_VISIBLE; + SetWindowLong(hWnd, GWL_STYLE, Style); /* clear bits */ + } + } + return; }

1 0

[navaraf] 22499: Fix bug introduced in r21635.
by navaraf＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: navaraf Date: Thu Jun 22 16:14:41 2006 New Revision: 22499 URL: http://svn.reactos.ru/svn/reactos?rev=22499&view=rev Log: Fix bug introduced in r21635. Modified: trunk/reactos/base/applications/screensavers/matrix/config.c trunk/reactos/base/applications/screensavers/matrix/settings.c Modified: trunk/reactos/base/applications/screensavers/matrix/config.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/config.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/config.c Thu Jun 22 16:14:41 2006 @@ -69,7 +69,7 @@ prevheight = GetSystemMetrics(SM_CYSCREEN) / GLYPH_HEIGHT + 1; //Add any saved messages to the combo box - for(index = 0; index <= g_nNumMessages; index++) + for(index = 0; index < g_nNumMessages; index++) { if(lstrlen(g_szMessages[index]) > 0) SendDlgItemMessage(hwnd, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM)g_szMessages[index]); Modified: trunk/reactos/base/applications/screensavers/matrix/settings.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/settings.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/settings.c Thu Jun 22 16:14:41 2006 @@ -98,6 +98,7 @@ { /* built-in coded message for first run */ lstrcpyn(g_szMessages[0], _T("ReactOS"), MAXMSG_LENGTH); + ++g_nNumMessages; } RegCloseKey(hkey);

1 0

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