Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 26591: Win32k/Gdi32 - Remove NtGdiCreateD/IC, it served us well. - Add a note to NtGdiCreateEnhMetaFile.
by jimtabor＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: jimtabor Date: Mon Apr 30 18:33:10 2007 New Revision: 26591 URL: http://svn.reactos.org/svn/reactos?rev=26591&view=rev Log: Win32k/Gdi32 - Remove NtGdiCreateD/IC, it served us well. - Add a note to NtGdiCreateEnhMetaFile. Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/metafile.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Mon Apr 30 18:33:10 2007 @@ -127,25 +127,6 @@ LPINT Buffer ); -/* Use NtGdiOpenDCW */ -HDC -NTAPI -NtGdiCreateDC( - PUNICODE_STRING Driver, - PUNICODE_STRING Device, - PUNICODE_STRING Output, - CONST PDEVMODEW InitData -); - -HDC -NTAPI -NtGdiCreateIC( - PUNICODE_STRING Driver, - PUNICODE_STRING Device, - PUNICODE_STRING Output, - CONST PDEVMODEW DevMode -); - /* Use NtGdiAddFontResourceW */ int STDCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Apr 30 18:33:10 2007 @@ -930,136 +930,6 @@ } return hNewDC; -} - -HDC STDCALL -NtGdiCreateDC(PUNICODE_STRING Driver, - PUNICODE_STRING Device, - PUNICODE_STRING Output, - CONST PDEVMODEW InitData) -{ - UNICODE_STRING SafeDriver, SafeDevice; - DEVMODEW SafeInitData; - HDC Ret; - NTSTATUS Status = STATUS_SUCCESS; - - if(InitData) - { - _SEH_TRY - { - ProbeForRead(InitData, - sizeof(DEVMODEW), - 1); - RtlCopyMemory(&SafeInitData, - InitData, - sizeof(DEVMODEW)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } - /* FIXME - InitData can have some more bytes! */ - } - - if(Driver) - { - Status = IntSafeCopyUnicodeString(&SafeDriver, Driver); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } - } - - if(Device) - { - Status = IntSafeCopyUnicodeString(&SafeDevice, Device); - if(!NT_SUCCESS(Status)) - { - /* FIXME workaround for a real bug */ - // RtlFreeUnicodeString(&SafeDriver); - // SetLastNtError(Status); - // DPRINT1("fail3\n"); - // return NULL; - Device = NULL; - } - } - - Ret = IntGdiCreateDC(NULL == Driver ? NULL : &SafeDriver, - NULL == Device ? NULL : &SafeDevice, NULL, - NULL == InitData ? NULL : &SafeInitData, FALSE); - - return Ret; -} - -HDC STDCALL -NtGdiCreateIC(PUNICODE_STRING Driver, - PUNICODE_STRING Device, - PUNICODE_STRING Output, - CONST PDEVMODEW InitData) -{ - UNICODE_STRING SafeDriver, SafeDevice; - DEVMODEW SafeInitData; - HDC Ret; - NTSTATUS Status = STATUS_SUCCESS; - - if(InitData) - { - _SEH_TRY - { - ProbeForRead(InitData, - sizeof(DEVMODEW), - 1); - RtlCopyMemory(&SafeInitData, - InitData, - sizeof(DEVMODEW)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } - /* FIXME - InitData can have some more bytes! */ - } - - if(Driver) - { - Status = IntSafeCopyUnicodeString(&SafeDriver, Driver); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } - } - - if(Device) - { - Status = IntSafeCopyUnicodeString(&SafeDevice, Device); - if(!NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(&SafeDriver); - SetLastNtError(Status); - return NULL; - } - } - - Ret = IntGdiCreateDC(NULL == Driver ? NULL : &SafeDriver, - NULL == Device ? NULL : &SafeDevice, NULL, - NULL == InitData ? NULL : &SafeInitData, TRUE); - - return Ret; } HDC STDCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/metafile.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/metafile.c Mon Apr 30 18:33:10 2007 @@ -280,7 +280,11 @@ UNIMPLEMENTED; return 0; } - +// +// +// Rewrite is in progress, this function is subject to change at any time. +// 04/30/2007 +// HDC STDCALL NtGdiCreateEnhMetaFile(HDC hDCRef, @@ -301,8 +305,15 @@ * Shall we create hdc NtGdiHdcCompatible hdc ?? */ UNICODE_STRING DriverName; - RtlInitUnicodeString(&DriverName, L"DISPLAY"); - tempHDC = NtGdiCreateDC(&DriverName, NULL, NULL, NULL); //IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); + RtlInitUnicodeString(&DriverName, L"DISPLAY"); + //IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); + tempHDC = NtGdiOpenDCW( &DriverName, + NULL, + NULL, + 0, // DCW 0 and ICW 1. + NULL, + (PVOID) NULL, + (PVOID) NULL ); } GDIOBJ_SetOwnership(GdiHandleTable, tempHDC, PsGetCurrentProcess()); Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Mon Apr 30 18:33:10 2007 @@ -25,7 +25,6 @@ NtGdiCreateColorSpace 1 NtGdiCreateCompatibleBitmap 3 NtGdiCreateCompatibleDC 1 -NtGdiCreateDC 4 NtGdiCreateDIBitmap 6 NtGdiCreateDIBBrush 6 NtGdiCreateDIBSection 9 @@ -35,7 +34,6 @@ NtGdiCreateEnhMetaFile 4 NtGdiCreateHalftonePalette 1 NtGdiCreateHatchBrushInternal 3 -NtGdiCreateIC 4 NtGdiCreateMetaFile 1 NtGdiCreatePalette 1 NtGdiCreatePatternBrushInternal 3

1 0

[cwittich] 26590: add a FORCE_CPP condition to the C::B backend - sometimes the g++ compiler finds some errors in the C code which cc doesn't
by cwittich＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: cwittich Date: Mon Apr 30 16:01:14 2007 New Revision: 26590 URL: http://svn.reactos.org/svn/reactos?rev=26590&view=rev Log: add a FORCE_CPP condition to the C::B backend - sometimes the g++ compiler finds some errors in the C code which cc doesn't Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Mon Apr 30 16:01:14 2007 @@ -703,10 +703,14 @@ fprintf ( OUT, "\t\t</Build>\r\n" ); +#ifdef FORCE_CPP + CompilerVar = "CPP" +#else if ( module.cplusplus ) CompilerVar = "CPP"; else CompilerVar = "CC"; +#endif /* header files */ for ( i = 0; i < header_files.size(); i++ )

1 0

[ekohl] 26589: Remove "Properties for" from caption.
by ekohl＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: ekohl Date: Mon Apr 30 15:22:07 2007 New Revision: 26589 URL: http://svn.reactos.org/svn/reactos?rev=26589&view=rev Log: Remove "Properties for" from caption. Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.c (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.c Mon Apr 30 15:22:07 2007 @@ -273,7 +273,7 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; + psh.dwFlags = PSH_PROPSHEETPAGE; psh.hwndParent = NULL; psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));

1 0

[tkreuzer] 26588: - Add Alex' test for GetObject (word alignment check) - change TEST macro a little for better output
by tkreuzer＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: tkreuzer Date: Mon Apr 30 14:44:18 2007 New Revision: 26588 URL: http://svn.reactos.org/svn/reactos?rev=26588&view=rev Log: - Add Alex' test for GetObject (word alignment check) - change TEST macro a little for better output Modified: trunk/rostests/win32/gdi32/gditest.h trunk/rostests/win32/gdi32/tests/CreateCompatibleDC.c trunk/rostests/win32/gdi32/tests/CreatePen.c trunk/rostests/win32/gdi32/tests/GetObject.c trunk/rostests/win32/gdi32/tests/GetStockObject.c trunk/rostests/win32/gdi32/tests/SelectObject.c trunk/rostests/win32/gdi32/tests/SetDCPenColor.c trunk/rostests/win32/gdi32/tests/SetSysColors.c Modified: trunk/rostests/win32/gdi32/gditest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/gditest.h?rev… ============================================================================== --- trunk/rostests/win32/gdi32/gditest.h (original) +++ trunk/rostests/win32/gdi32/gditest.h Mon Apr 30 14:44:18 2007 @@ -16,7 +16,7 @@ (*passed)++;\ } else {\ (*failed)++;\ - printf("Test failed in file %s line %d\n", __FILE__, __LINE__);\ + printf("Test failed in %s:%d (%s)\n", __FILE__, __LINE__, #x);\ }; #define GDI_HANDLE_INDEX_MASK 0x00003fff // (GDI_HANDLE_COUNT - 1) Modified: trunk/rostests/win32/gdi32/tests/CreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/CreateC… ============================================================================== --- trunk/rostests/win32/gdi32/tests/CreateCompatibleDC.c (original) +++ trunk/rostests/win32/gdi32/tests/CreateCompatibleDC.c Mon Apr 30 14:44:18 2007 @@ -1,3 +1,5 @@ +#line 1 "CreateCompatibleDC.c" + #include "..\gditest.h" BOOL Test_CreateCompatibleDC(INT* passed, INT* failed) Modified: trunk/rostests/win32/gdi32/tests/CreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/CreateP… ============================================================================== --- trunk/rostests/win32/gdi32/tests/CreatePen.c (original) +++ trunk/rostests/win32/gdi32/tests/CreatePen.c Mon Apr 30 14:44:18 2007 @@ -1,3 +1,5 @@ +#line 1 "CreatePen.c" + #include "..\gditest.h" BOOL Modified: trunk/rostests/win32/gdi32/tests/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/GetObje… ============================================================================== --- trunk/rostests/win32/gdi32/tests/GetObject.c (original) +++ trunk/rostests/win32/gdi32/tests/GetObject.c Mon Apr 30 14:44:18 2007 @@ -1,8 +1,18 @@ +#line 1 "GetObject.c" + #include "..\gditest.h" BOOL Test_General(INT* passed, INT* failed) { + struct + { + LOGBRUSH logbrush; + BYTE additional[5]; + } TestStruct; + PLOGBRUSH plogbrush; + HBRUSH hBrush; + /* Test null pointer and invalid handles */ SetLastError(ERROR_SUCCESS); TEST(GetObjectA(0, 0, NULL) == 0); @@ -40,6 +50,15 @@ SetLastError(ERROR_SUCCESS); TEST(GetObjectW((HANDLE)GDI_OBJECT_TYPE_ENHMETAFILE, 0, NULL) == 0); TEST(GetLastError() == ERROR_INVALID_HANDLE); + + /* Test need of alignment */ + hBrush = GetStockObject(WHITE_BRUSH); + plogbrush = (PVOID)((ULONG_PTR)&TestStruct.logbrush); + TEST(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == sizeof(LOGBRUSH)); + plogbrush = (PVOID)((ULONG_PTR)&TestStruct.logbrush + 2); + TEST(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == sizeof(LOGBRUSH)); + plogbrush = (PVOID)((ULONG_PTR)&TestStruct.logbrush + 1); + TEST(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == 0); return TRUE; } @@ -383,7 +402,7 @@ TEST(GetLastError() == ERROR_INVALID_HANDLE); DeleteObject(hRgn); - Test_Font(passed, failed); +// Test_Font(passed, failed); Test_Colorspace(passed, failed); Test_General(passed, failed); Test_Bitmap(passed, failed); @@ -391,7 +410,7 @@ Test_Palette(passed, failed); Test_Brush(passed, failed); Test_Pen(passed, failed); -// Test_ExtPpen(passed, failed); // not implemented yet in ROS +// Test_ExtPen(passed, failed); // not implemented yet in ROS Test_MetaDC(passed, failed); return TRUE; Modified: trunk/rostests/win32/gdi32/tests/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/GetStoc… ============================================================================== --- trunk/rostests/win32/gdi32/tests/GetStockObject.c (original) +++ trunk/rostests/win32/gdi32/tests/GetStockObject.c Mon Apr 30 14:44:18 2007 @@ -1,3 +1,5 @@ +#line 1 "GetStockObject.c" + #include "..\gditest.h" BOOL Test_GetStockObject(INT* passed, INT* failed) Modified: trunk/rostests/win32/gdi32/tests/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/SelectO… ============================================================================== --- trunk/rostests/win32/gdi32/tests/SelectObject.c (original) +++ trunk/rostests/win32/gdi32/tests/SelectObject.c Mon Apr 30 14:44:18 2007 @@ -1,3 +1,5 @@ +#line 1 "SelectObject.c" + #include "..\gditest.h" BOOL Test_SelectObject(INT* passed, INT* failed) Modified: trunk/rostests/win32/gdi32/tests/SetDCPenColor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/SetDCPe… ============================================================================== --- trunk/rostests/win32/gdi32/tests/SetDCPenColor.c (original) +++ trunk/rostests/win32/gdi32/tests/SetDCPenColor.c Mon Apr 30 14:44:18 2007 @@ -1,3 +1,5 @@ +#line 1 "SetDCPenColor.c" + #include "..\gditest.h" BOOL Test_SetDCPenColor(INT* passed, INT* failed) Modified: trunk/rostests/win32/gdi32/tests/SetSysColors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/SetSysC… ============================================================================== --- trunk/rostests/win32/gdi32/tests/SetSysColors.c (original) +++ trunk/rostests/win32/gdi32/tests/SetSysColors.c Mon Apr 30 14:44:18 2007 @@ -1,3 +1,5 @@ +#line 1 "SetSysColors.c" + #include "..\gditest.h" #define NUM_SYSCOLORS 31

1 0

[tkreuzer] 26587: Sorry Alex, my fault. NtGdiExtGetObjectW *does* need a WORD alignment.
by tkreuzer＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: tkreuzer Date: Mon Apr 30 13:33:11 2007 New Revision: 26587 URL: http://svn.reactos.org/svn/reactos?rev=26587&view=rev Log: Sorry Alex, my fault. NtGdiExtGetObjectW *does* need a WORD alignment. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Apr 30 13:33:11 2007 @@ -1888,7 +1888,7 @@ _SEH_TRY { // Probe the buffer and copy it - ProbeForWrite(lpBuffer, cbCopyCount, 1); + ProbeForWrite(lpBuffer, cbCopyCount, sizeof(WORD)); RtlCopyMemory(lpBuffer, &Object, cbCopyCount); } _SEH_HANDLE

1 0

[gedmurphy] 26586: move rbuild project back to 7.1
by gedmurphy＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: gedmurphy Date: Mon Apr 30 12:58:53 2007 New Revision: 26586 URL: http://svn.reactos.org/svn/reactos?rev=26586&view=rev Log: move rbuild project back to 7.1 Modified: trunk/reactos/tools/rbuild/rbuild.sln trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/tools/rbuild/rbuild.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.sln?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.sln (original) +++ trunk/reactos/tools/rbuild/rbuild.sln Mon Apr 30 12:58:53 2007 @@ -1,19 +1,21 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcproj", "{D9305AFB-499E-49F1-A865-99DD7E19E762}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug|Win32.ActiveCfg = Debug|Win32 - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug|Win32.Build.0 = Debug|Win32 - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release|Win32.ActiveCfg = Release|Win32 - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release|Win32.Build.0 = Release|Win32 + GlobalSection(ProjectConfiguration) = postSolution + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug.ActiveCfg = Debug|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug.Build.0 = Debug|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release.ActiveCfg = Release|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection EndGlobal Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj Mon Apr 30 12:58:53 2007 @@ -1,195 +1,132 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8.00" + Version="7.10" Name="rbuild" - ProjectGUID="{D9305AFB-499E-49F1-A865-99DD7E19E762}" - > + SccProjectName="" + SccLocalPath=""> <Platforms> <Platform - Name="Win32" - /> + Name="Win32"/> </Platforms> - <ToolFiles> - </ToolFiles> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Release/rbuild.tlb" - HeaderFileName="" - /> + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="true" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" + StringPooling="TRUE" + RuntimeLibrary="4" + EnableFunctionLevelLinking="TRUE" + UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/rbuild.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" WarningLevel="3" - SuppressStartupBanner="true" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" OutputFile=".\Release/rbuild.exe" LinkIncremental="1" - SuppressStartupBanner="true" + SuppressStartupBanner="TRUE" ProgramDatabaseFile=".\Release/rbuild.pdb" SubSystem="1" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Release/rbuild.tlb" + HeaderFileName=""/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Debug/rbuild.tlb" - HeaderFileName="" - /> + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST" BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" + RuntimeLibrary="5" + UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/rbuild.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" - SuppressStartupBanner="true" + SuppressStartupBanner="TRUE" DebugInformationFormat="4" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" OutputFile=".\Debug/rbuild.exe" LinkIncremental="1" - SuppressStartupBanner="true" - GenerateDebugInformation="true" + SuppressStartupBanner="TRUE" + GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/rbuild.pdb" SubSystem="1" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Debug/rbuild.tlb" + HeaderFileName=""/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> @@ -197,1094 +134,872 @@ <Files> <Filter Name="backends" - > + Filter=""> <Filter Name="devcpp" - > - <File - RelativePath="backend\devcpp\devcpp.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + Filter=""> + <File + RelativePath="backend\devcpp\devcpp.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\devcpp\devcpp.h" - > + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\devcpp\devcpp.h"> </File> </Filter> <Filter Name="msvc" - > - <File - RelativePath="backend\msvc\genguid.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + Filter=""> + <File + RelativePath="backend\msvc\genguid.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\msvc.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\msvc.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\msvc.h" - > - </File> - <File - RelativePath="backend\msvc\msvcmaker.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\msvc.h"> + </File> + <File + RelativePath="backend\msvc\msvcmaker.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\vcprojmaker.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\vcprojmaker.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="mingw" - > - <File - RelativePath="backend\mingw\mingw.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + Filter=""> + <File + RelativePath="backend\mingw\mingw.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\mingw\mingw.h" - > - </File> - <File - RelativePath="backend\mingw\modulehandler.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\mingw\mingw.h"> + </File> + <File + RelativePath="backend\mingw\modulehandler.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\mingw\modulehandler.h" - > - </File> - <File - RelativePath="backend\mingw\pch_detection.h" - > - </File> - <File - RelativePath="backend\mingw\proxymakefile.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\mingw\modulehandler.h"> + </File> + <File + RelativePath="backend\mingw\pch_detection.h"> + </File> + <File + RelativePath="backend\mingw\proxymakefile.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="backend_sources" - > - <File - RelativePath="backend\backend.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + Filter=""> + <File + RelativePath="backend\backend.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="backend_headers" - > - <File - RelativePath="backend\backend.h" - > + Filter=""> + <File + RelativePath="backend\backend.h"> </File> </Filter> </Filter> <Filter Name="rbuild_sources" - > - <File - RelativePath="automaticdependency.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="bootstrap.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="cdfile.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="compilationunit.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="compilationunitsupportcode.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="compilerflag.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="configuration.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="define.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="directory.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="exception.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="filesupportcode.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="global.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="include.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="installfile.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="linkerflag.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="linkerscript.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="module.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="project.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="rbuild.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="stubbedcomponent.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="syssetupgenerator.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="testsupportcode.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="wineresource.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> + Filter=""> + <File + RelativePath="automaticdependency.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="bootstrap.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="cdfile.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="compilationunit.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="compilationunitsupportcode.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="compilerflag.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="configuration.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="define.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="directory.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="exception.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="filesupportcode.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="global.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="include.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="installfile.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="linkerflag.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="linkerscript.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="module.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="project.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="rbuild.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="stubbedcomponent.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="syssetupgenerator.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="testsupportcode.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="wineresource.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="rbuild_headers" - > - <File - RelativePath="exception.h" - > - </File> - <File - RelativePath="pch.h" - > - </File> - <File - RelativePath="rbuild.h" - > - </File> - <File - RelativePath="test.h" - > + Filter=""> + <File + RelativePath="exception.h"> + </File> + <File + RelativePath="pch.h"> + </File> + <File + RelativePath="rbuild.h"> + </File> + <File + RelativePath="test.h"> </File> </Filter> <Filter Name="inflib" - > - <File - RelativePath="..\..\lib\inflib\builddep.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infcommon.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infcore.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infget.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhost.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infhostgen.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostget.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostglue.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostput.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\inflib.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infpriv.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infput.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> + Filter=""> + <File + RelativePath="..\..\lib\inflib\builddep.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infcommon.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infcore.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infget.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhost.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infhostgen.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostget.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostglue.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostput.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\inflib.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infpriv.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infput.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="tools" - > - <File - RelativePath="..\ssprintf.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\ssprintf.h" - > - </File> - <File - RelativePath="..\xml.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\xml.h" - > + Filter=""> + <File + RelativePath="..\ssprintf.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\ssprintf.h"> + </File> + <File + RelativePath="..\xml.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\xml.h"> </File> </Filter> </Files>

1 0

[dgorbachev] 26585: Add a stub for TraceMessage.
by dgorbachev＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: dgorbachev Date: Mon Apr 30 12:42:04 2007 New Revision: 26585 URL: http://svn.reactos.org/svn/reactos?rev=26585&view=rev Log: Add a stub for TraceMessage. Added: trunk/reactos/dll/win32/advapi32/misc/trace.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/advapi32.rbuild Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def Mon Apr 30 12:42:04 2007 @@ -649,7 +649,7 @@ SystemFunction041@12 ;TraceEvent ;TraceEventInstance -;TraceMessage +TraceMessage ;TraceMessageVa TreeResetNamedSecurityInfoA@44 TreeResetNamedSecurityInfoW@44 Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild Mon Apr 30 12:42:04 2007 @@ -34,6 +34,7 @@ <file>msi.c</file> <file>shutdown.c</file> <file>sysfunc.c</file> + <file>trace.c</file> </compilationunit> </directory> <directory name="reg"> Added: trunk/reactos/dll/win32/advapi32/misc/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/trace.c (added) +++ trunk/reactos/dll/win32/advapi32/misc/trace.c Mon Apr 30 12:42:04 2007 @@ -1,0 +1,23 @@ +/* + * Advapi32.dll Event Tracing Functions + */ + +#include <advapi32.h> +#include <debug.h> + +/* + * @unimplemented + */ +ULONG CDECL +TraceMessage( + HANDLE SessionHandle, + ULONG MessageFlags, + LPGUID MessageGuid, + USHORT MessageNumber, + ...) +{ + DPRINT1("TraceMessage()\n"); + return ERROR_SUCCESS; +} + +/* EOF */

1 0

[dgorbachev] 26584: Add RtlDllShutdownInProgress().
by dgorbachev＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: dgorbachev Date: Mon Apr 30 12:41:42 2007 New Revision: 26584 URL: http://svn.reactos.org/svn/reactos?rev=26584&view=rev Log: Add RtlDllShutdownInProgress(). Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Mon Apr 30 12:41:42 2007 @@ -411,6 +411,7 @@ RtlDestroyProcessParameters@4 RtlDestroyQueryDebugBuffer@4 RtlDetermineDosPathNameType_U@4 +RtlDllShutdownInProgress@0 RtlDoesFileExists_U@4 RtlDosPathNameToNtPathName_U@16 RtlDosPathNameToRelativeNtPathName_U@16 Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c Mon Apr 30 12:41:42 2007 @@ -45,6 +45,7 @@ PLDR_DATA_TABLE_ENTRY Module; } TLS_DATA, *PTLS_DATA; +static BOOLEAN LdrpDllShutdownInProgress = FALSE; static PTLS_DATA LdrpTlsArray = NULL; static ULONG LdrpTlsCount = 0; static ULONG LdrpTlsSize = 0; @@ -2485,6 +2486,9 @@ DPRINT("LdrpDetachProcess() called for %wZ\n", &ExeModule->BaseDllName); + if (UnloadAll) + LdrpDllShutdownInProgress = TRUE; + CallingCount++; ModuleListHead = &NtCurrentPeb()->Ldr->InInitializationOrderModuleList; @@ -2617,6 +2621,15 @@ /* * @implemented */ +BOOLEAN NTAPI +RtlDllShutdownInProgress (VOID) +{ + return LdrpDllShutdownInProgress; +} + +/* + * @implemented + */ NTSTATUS NTAPI LdrShutdownProcess (VOID) {

1 0

[spetreolle] 26583: forgot this file
by spetreolle＠svn.reactos.org 29 Apr '07

29 Apr '07

Author: spetreolle Date: Mon Apr 30 01:32:27 2007 New Revision: 26583 URL: http://svn.reactos.org/svn/reactos?rev=26583&view=rev Log: forgot this file Modified: trunk/reactos/include/psdk/winnls.h Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h (original) +++ trunk/reactos/include/psdk/winnls.h Mon Apr 30 01:32:27 2007 @@ -598,6 +598,8 @@ BOOL WINAPI SetLocaleInfoA(LCID,LCTYPE,LPCSTR); BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR); BOOL WINAPI SetThreadLocale(LCID); +BOOL WINAPI SetUserDefaultLCID(LCID); +BOOL WINAPI SetUserDefaultUILanguage(LANGID); BOOL WINAPI SetUserGeoID(GEOID); int WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,int,LPSTR,int,LPCSTR,LPBOOL); #if (WINVER >= 0x0500)

1 0

[spetreolle] 26582: translate start menu & desktop links display 2nd stage install in system language original patch by Pierre Schweitzer
by spetreolle＠svn.reactos.org 29 Apr '07

29 Apr '07

Author: spetreolle Date: Mon Apr 30 01:29:41 2007 New Revision: 26582 URL: http://svn.reactos.org/svn/reactos?rev=26582&view=rev Log: translate start menu & desktop links display 2nd stage install in system language original patch by Pierre Schweitzer Modified: trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/resource.h trunk/reactos/dll/win32/syssetup/syssetup.rbuild Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def Mon Apr 30 01:29:41 2007 @@ -890,6 +890,8 @@ SetTimerQueueTimer@24 SetTimeZoneInformation@4 SetUnhandledExceptionFilter@4 +SetUserDefaultLCID@4 +SetUserDefaultUILanguage@4 SetUserGeoID@4 SetVDMCurrentDirectories@8 SetVolumeLabelA@8 Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild Mon Apr 30 01:29:41 2007 @@ -1,4 +1,4 @@ -<module name="kernel32_base" type="objectlibrary"> +<module name="kernel32_base" type="objectlibrary" allowwarnings="true"> <include base="kernel32_base">.</include> <include base="kernel32_base">include</include> <include base="ReactOS">include/reactos/subsys</include> Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c Mon Apr 30 01:29:41 2007 @@ -1574,6 +1574,42 @@ /* + * @implemented + */ +BOOL STDCALL +SetUserDefaultLCID(LCID lcid) +{ + NTSTATUS Status; + + Status = NtSetDefaultLocale(TRUE, lcid); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return 0; + } + return 1; +} + + +/* + * @implemented + */ +BOOL STDCALL +SetUserDefaultUILanguage(LANGID LangId) +{ + NTSTATUS Status; + + Status = NtSetDefaultUILanguage(LangId); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return 0; + } + return 1; +} + + +/* * @unimplemented */ BOOL Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Mon Apr 30 01:29:41 2007 @@ -49,6 +49,8 @@ #include "globals.h" #include "resource.h" +#include <debug.h> + DWORD WINAPI CMP_WaitNoPendingInstallEvents(DWORD dwTimeout); @@ -136,10 +138,11 @@ static BOOL -CreateShortcut(int csidl, LPCTSTR folder, LPCTSTR linkName, LPCTSTR command, UINT nIdTitle) +CreateShortcut(int csidl, LPCTSTR folder, UINT nIdName, LPCTSTR command, UINT nIdTitle) { TCHAR path[MAX_PATH]; TCHAR title[256]; + TCHAR name[256]; LPTSTR p = path; if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) @@ -152,7 +155,10 @@ } p = PathAddBackslash(p); - _tcscpy(p, linkName); + + if(!LoadString(hDllInstance, nIdName, name, 256)) + return FALSE; + _tcscpy(p, name); if (!LoadString(hDllInstance, nIdTitle, title, 256)) return FALSE; @@ -524,50 +530,52 @@ } CoInitialize(NULL); + SetUserDefaultLCID(GetSystemDefaultLCID()); + SetThreadLocale(GetSystemDefaultLCID()); /* create desktop shortcuts */ - CreateShortcut(CSIDL_DESKTOP, NULL, _T("Command Prompt.lnk"), _T("cmd.exe"), IDS_CMT_CMD); + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD); /* create program startmenu shortcuts */ - CreateShortcut(CSIDL_PROGRAMS, NULL, _T("ReactOS Explorer.lnk"), _T("explorer.exe"), IDS_CMT_EXPLORER); + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("explorer.exe"), IDS_CMT_EXPLORER); /* workaround to stop empty links for trunk builds */ if(GetSystemDirectory(szBuffer, MAX_PATH)) { _tcscpy(Path, szBuffer); if((_taccess(_tcscat(Path, _T("\\downloader.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, NULL, _T("Download !.lnk"), _T("downloader.exe"), IDS_CMT_DOWNLOADER); + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("downloader.exe"), IDS_CMT_DOWNLOADER); _tcscpy(Path, szBuffer); if((_taccess(_tcscat(Path, _T("\\getfirefox.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, NULL, _T("Get Firefox.lnk"), _T("getfirefox.exe"), IDS_CMT_GETFIREFOX); + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_FIREFOX, _T("getfirefox.exe"), IDS_CMT_GETFIREFOX); } /* create administritive tools startmenu shortcuts */ - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, _T("Service Manager.lnk"), _T("servman.exe"), IDS_CMT_SERVMAN); - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, _T("Device Manager.lnk"), _T("devmgmt.exe"), IDS_CMT_DEVMGMT); + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_SERVICE, _T("servman.exe"), IDS_CMT_SERVMAN); + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_DEVICE, _T("devmgmt.exe"), IDS_CMT_DEVMGMT); /* create and fill Accessories subfolder */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) { - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Calculator.lnk"), _T("calc.exe"), IDS_CMT_CALC); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Command Prompt.lnk"), _T("cmd.exe"), IDS_CMT_CMD); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Notepad.lnk"), _T("notepad.exe"), IDS_CMT_NOTEPAD); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("WordPad.lnk"), _T("wordpad.exe"), IDS_CMT_WORDPAD); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_CALC, _T("calc.exe"), IDS_CMT_CALC); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_NOTEPAD, _T("notepad.exe"), IDS_CMT_NOTEPAD); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_REGEDIT, _T("regedit.exe"), IDS_CMT_REGEDIT); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_WORDPAD, _T("wordpad.exe"), IDS_CMT_WORDPAD); if(GetSystemDirectory(szBuffer, MAX_PATH)) { _tcscpy(Path, szBuffer); if((_taccess(_tcscat(Path, _T("\\screenshot.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("SnapShot.lnk"), _T("screenshot.exe"), IDS_CMT_SCREENSHOT); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_SNAP, _T("screenshot.exe"), IDS_CMT_SCREENSHOT); } } /* create Games subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) { - CreateShortcut(CSIDL_PROGRAMS, sGames, _T("Solitaire.lnk"), _T("sol.exe"), IDS_CMT_SOLITAIRE); - CreateShortcut(CSIDL_PROGRAMS, sGames, _T("WineMine.lnk"), _T("winemine.exe"), IDS_CMT_WINEMINE); + CreateShortcut(CSIDL_PROGRAMS, sGames, IDS_SHORT_SOLITAIRE, _T("sol.exe"), IDS_CMT_SOLITAIRE); + CreateShortcut(CSIDL_PROGRAMS, sGames, IDS_SHORT_WINEMINE, _T("winemine.exe"), IDS_CMT_WINEMINE); } CoUninitialize(); Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc Mon Apr 30 01:29:41 2007 @@ -194,4 +194,20 @@ IDS_CMT_WINEMINE "WineMine" END +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_FIREFOX "Get Firefox.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Mon Apr 30 01:29:41 2007 @@ -219,4 +219,20 @@ IDS_REASON_UNKNOWN "Grund unbekannt" END +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_FIREFOX "Get Firefox.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Mon Apr 30 01:29:41 2007 @@ -220,4 +220,20 @@ IDS_REASON_UNKNOWN "" END +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_FIREFOX "Get Firefox.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Mon Apr 30 01:29:41 2007 @@ -200,4 +200,20 @@ IDS_PROCESSSUBTITLE "Process page subtitle" END +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_FIREFOX "Get Firefox.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Mon Apr 30 01:29:41 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 @@ -220,4 +220,20 @@ IDS_REASON_UNKNOWN "" END +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Invite de commandes.lnk" + IDS_SHORT_EXPLORER "Explorateur ReactOS.lnk" + IDS_SHORT_DOWNLOADER "Télécharger !.lnk" + IDS_SHORT_FIREFOX "Rélécharger FireFox.lnk" + IDS_SHORT_SERVICE "Gestionnaire de services.lnk" + IDS_SHORT_DEVICE "Gestionnaire de périphériques.lnk" + IDS_SHORT_CALC "Calculatrice.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "Capture d'écran.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc Mon Apr 30 01:29:41 2007 @@ -227,4 +227,20 @@ IDS_REASON_UNKNOWN "" END +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_FIREFOX "Get Firefox.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc Mon Apr 30 01:29:41 2007 @@ -1,221 +1,237 @@ -/* - * Copyright (C) 2007 Zaenal Mutaqin (Indonesian translation) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT - -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "This wizard installs ReactOS on your computer. The wizard "\ - "needs to gather some information about you and your computer "\ - "to set up ReactOS properly.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Click Next to continue with Setup.", IDC_STATIC, 115, 169, 195, 17 -END - - -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "The ReactOS developers would like to acknowledge the following Open Source projects, "\ - "(parts of) which were used to create ReactOS:", - IDC_STATIC,15,7,286,19 - LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | - LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS is licensed under the GPL, so if you want to reuse or redistribute "\ - "(parts of) it you must respect the GPL", - IDC_STATIC,15,110,227,19 - PUSHBUTTON "&View GPL...",IDC_VIEWGPL,251,110,50,19 - LTEXT "Click Next to continue with Setup.",IDC_STATIC,15,136, - 195,17 -END - - -IDD_OWNERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Type your full name and the name of your company or organization.", - IDC_STATIC, 54, 7, 242, 21 - LTEXT "Na&me:", IDC_STATIC, 54, 37, 44, 8 - EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Organization:", IDC_STATIC, 54, 57, 44, 8 - EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL -END - - -IDD_COMPUTERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Type a name for your computer that is 63 characters or less. "\ - "If you are on a network, your computer name must be unique.", - IDC_STATIC, 54, 7, 250, 24 - LTEXT "&Computer Name:", IDC_STATIC, 54, 38, 75, 8 - EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE - LTEXT "Setup will create a user account on your computer called Administrator. "\ - "You can use this account if you need full access to your computer.", - IDC_STATIC, 54, 57, 250, 25 - LTEXT "Type an Administrator Password that is 14 characters or less.", - IDC_STATIC, 54, 87, 250, 8 - LTEXT "&Administrator Password:", IDC_STATIC, 54, 104, 75, 8 - EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "C&onfirm Password:", IDC_STATIC, 54, 123, 75, 8 - EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD -END - - -IDD_LOCALEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Setup ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Lokal sistem harus sama bahasa dari aplikasi "\ - "yang ingin anda gunakan. Pengguna lokal mengontrol bagaimana "\ - "angka, kurs, dan tampilan tanggal.", IDC_STATIC, 53, 7, 253, 20 - LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "Untuk mengubah sistem atau setelan lokal pengguna, klik Kustomisasi.", - IDC_STATIC, 53, 60, 184, 8 - PUSHBUTTON "&Kustomisasi...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 - LTEXT "Tata letak keyboard mengontrol karakter yang muncul ketika anda ketik.", - IDC_STATIC, 53, 86, 253, 8 - LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "Untuk mengubah tata letak keyboard, klik Kustomisasi.", - IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "K&ustomisasi...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 -END - - -IDD_DATETIMEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Setup ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Tanggal dan Jam", IDC_STATIC, 53, 7, 253, 8 - CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", - DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 - CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", - DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 - LTEXT "Zonawaktu", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, - CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - AUTOCHECKBOX "Otomatis menyesuaikan waktu atas perubahan &daylight saving", - IDC_AUTODAYLIGHT, 53, 124, 201, 10 -END - - -IDD_PROCESSPAGE DIALOG 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Setup ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", - PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 -END - - -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Menyelesaikan Setup ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Menyelesaikan Bimbingan Setup ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Anda telah sukses menyelesaikan Setup ReactOS.\n\n" \ - "Saat anda mengklik Selesai, komputer anda akan dimulai lagi.", IDC_STATIC, 115, 40, 195, 100 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "Jika ada CD di dalam drive, keluarkan. Lalu, untuk memulai lagi "\ - "komputer anda, klik Selesai.", IDC_STATIC, 115, 169, 195, 17 -END - - -IDD_GPL DIALOG 0, 0, 333, 230 -STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "GNU General Public License" -FONT 8, "MS Shell Dlg" -BEGIN - EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | - ES_READONLY | WS_VSCROLL - DEFPUSHBUTTON "OK",IDOK,141,209,50,14 -END - - -STRINGTABLE -BEGIN - IDS_ACKTITLE "Pengakuan" - IDS_ACKSUBTITLE "Tempat berdisi ReactOS dan informasi lisensi" - IDS_OWNERTITLE "Personalisai Software anda" - IDS_OWNERSUBTITLE "Setup menggunakan informasi ini mengenai diri anda untuk mempersonalisasi ReactOS." - IDS_COMPUTERTITLE "Nama Komputer dan Kata sandi Administrator" - IDS_COMPUTERSUBTITLE "Anda harus menyediakan nama dan Kata sandi Administrator untuk komputer anda." - IDS_LOCALETITLE "Setelan Regional" - IDS_LOCALESUBTITLE "Anda bisa mengkustomisasi ReactOS untuk regional dan bahasa berbeda." - IDS_DATETIMETITLE "Tanggal dan Jam" - IDS_DATETIMESUBTITLE "Setel tanggal dan jam yang benar untuk komputer anda." - IDS_PROCESSTITLE "Judul halaman proses" - IDS_PROCESSSUBTITLE "Subjudul halaman proses" -END - -STRINGTABLE -BEGIN - IDS_CMT_WINEFILE "Jalankan Winefile" - IDS_CMT_IBROWSER "Jalankan iBrowser" - IDS_CMT_GETFIREFOX "Download/instalasi Firefox" - IDS_CMT_DOWNLOADER "Download dan instalasi berbagai aplikasi" -END - -STRINGTABLE -BEGIN - IDS_ACCESSORIES "Aksesoris" - IDS_CMT_CALC "Jalankan Kalkulator" - IDS_CMT_CMD "Buka prompt perintah" - IDS_CMT_EXPLORER "Jalankan Explorer" - IDS_CMT_NOTEPAD "Jalankan Editor Teks" - IDS_CMT_REGEDIT "Jalankan Editor Registri" - IDS_CMT_WORDPAD "Jalankan Editor Dokumen" - IDS_CMT_SCREENSHOT "Ambil foto layar" -END - -STRINGTABLE -BEGIN - IDS_GAMES "Games" - IDS_CMT_SOLITAIRE "Solitaire" - IDS_CMT_WINEMINE "WineMine" -END - -STRINGTABLE -BEGIN - IDS_REACTOS_SETUP "Setup ReactOS" - IDS_UNKNOWN_ERROR "Kesalahan tidak dikenal" - IDS_REGISTERING_COMPONENTS "Meregister komponen..." - IDS_LOADLIBRARY_FAILED "LoadLibrary gagal: " - IDS_GETPROCADDR_FAILED "GetProcAddr gagal: " - IDS_REGSVR_FAILED "DllRegisterServer gagal: " - IDS_DLLINSTALL_FAILED "DllInstall gagal: " - IDS_TIMEOUT "Kehabisan waktu selama registrasi" - IDS_REASON_UNKNOWN "" -END - -/* EOF */ +/* + * Copyright (C) 2007 Zaenal Mutaqin (Indonesian translation) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "This wizard installs ReactOS on your computer. The wizard "\ + "needs to gather some information about you and your computer "\ + "to set up ReactOS properly.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Click Next to continue with Setup.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The ReactOS developers would like to acknowledge the following Open Source projects, "\ + "(parts of) which were used to create ReactOS:", + IDC_STATIC,15,7,286,19 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOS is licensed under the GPL, so if you want to reuse or redistribute "\ + "(parts of) it you must respect the GPL", + IDC_STATIC,15,110,227,19 + PUSHBUTTON "&View GPL...",IDC_VIEWGPL,251,110,50,19 + LTEXT "Click Next to continue with Setup.",IDC_STATIC,15,136, + 195,17 +END + + +IDD_OWNERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Type your full name and the name of your company or organization.", + IDC_STATIC, 54, 7, 242, 21 + LTEXT "Na&me:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Organization:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Type a name for your computer that is 63 characters or less. "\ + "If you are on a network, your computer name must be unique.", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "&Computer Name:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + LTEXT "Setup will create a user account on your computer called Administrator. "\ + "You can use this account if you need full access to your computer.", + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Type an Administrator Password that is 14 characters or less.", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "&Administrator Password:", IDC_STATIC, 54, 104, 75, 8 + EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "C&onfirm Password:", IDC_STATIC, 54, 123, 75, 8 + EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_LOCALEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Setup ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Lokal sistem harus sama bahasa dari aplikasi "\ + "yang ingin anda gunakan. Pengguna lokal mengontrol bagaimana "\ + "angka, kurs, dan tampilan tanggal.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "Untuk mengubah sistem atau setelan lokal pengguna, klik Kustomisasi.", + IDC_STATIC, 53, 60, 184, 8 + PUSHBUTTON "&Kustomisasi...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "Tata letak keyboard mengontrol karakter yang muncul ketika anda ketik.", + IDC_STATIC, 53, 86, 253, 8 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "Untuk mengubah tata letak keyboard, klik Kustomisasi.", + IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "K&ustomisasi...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 +END + + +IDD_DATETIMEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Setup ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Tanggal dan Jam", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Zonawaktu", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "Otomatis menyesuaikan waktu atas perubahan &daylight saving", + IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + + +IDD_PROCESSPAGE DIALOG 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Setup ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Menyelesaikan Setup ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Menyelesaikan Bimbingan Setup ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Anda telah sukses menyelesaikan Setup ReactOS.\n\n" \ + "Saat anda mengklik Selesai, komputer anda akan dimulai lagi.", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "Jika ada CD di dalam drive, keluarkan. Lalu, untuk memulai lagi "\ + "komputer anda, klik Selesai.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_GPL DIALOG 0, 0, 333, 230 +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU General Public License" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,141,209,50,14 +END + + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Pengakuan" + IDS_ACKSUBTITLE "Tempat berdisi ReactOS dan informasi lisensi" + IDS_OWNERTITLE "Personalisai Software anda" + IDS_OWNERSUBTITLE "Setup menggunakan informasi ini mengenai diri anda untuk mempersonalisasi ReactOS." + IDS_COMPUTERTITLE "Nama Komputer dan Kata sandi Administrator" + IDS_COMPUTERSUBTITLE "Anda harus menyediakan nama dan Kata sandi Administrator untuk komputer anda." + IDS_LOCALETITLE "Setelan Regional" + IDS_LOCALESUBTITLE "Anda bisa mengkustomisasi ReactOS untuk regional dan bahasa berbeda." + IDS_DATETIMETITLE "Tanggal dan Jam" + IDS_DATETIMESUBTITLE "Setel tanggal dan jam yang benar untuk komputer anda." + IDS_PROCESSTITLE "Judul halaman proses" + IDS_PROCESSSUBTITLE "Subjudul halaman proses" +END + +STRINGTABLE +BEGIN + IDS_CMT_WINEFILE "Jalankan Winefile" + IDS_CMT_IBROWSER "Jalankan iBrowser" + IDS_CMT_GETFIREFOX "Download/instalasi Firefox" + IDS_CMT_DOWNLOADER "Download dan instalasi berbagai aplikasi" +END + +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Aksesoris" + IDS_CMT_CALC "Jalankan Kalkulator" + IDS_CMT_CMD "Buka prompt perintah" + IDS_CMT_EXPLORER "Jalankan Explorer" + IDS_CMT_NOTEPAD "Jalankan Editor Teks" + IDS_CMT_REGEDIT "Jalankan Editor Registri" + IDS_CMT_WORDPAD "Jalankan Editor Dokumen" + IDS_CMT_SCREENSHOT "Ambil foto layar" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Games" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "Setup ReactOS" + IDS_UNKNOWN_ERROR "Kesalahan tidak dikenal" + IDS_REGISTERING_COMPONENTS "Meregister komponen..." + IDS_LOADLIBRARY_FAILED "LoadLibrary gagal: " + IDS_GETPROCADDR_FAILED "GetProcAddr gagal: " + IDS_REGSVR_FAILED "DllRegisterServer gagal: " + IDS_DLLINSTALL_FAILED "DllInstall gagal: " + IDS_TIMEOUT "Kehabisan waktu selama registrasi" + IDS_REASON_UNKNOWN "" +END + +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_FIREFOX "Get Firefox.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END +/* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Mon Apr 30 01:29:41 2007 @@ -211,4 +211,20 @@ IDS_REASON_UNKNOWN "" END +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_FIREFOX "Get Firefox.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Mon Apr 30 01:29:41 2007 @@ -198,4 +198,20 @@ IDS_CMT_WINEMINE "WineMine" END +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_FIREFOX "Get Firefox.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nb… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc Mon Apr 30 01:29:41 2007 @@ -222,4 +222,20 @@ IDS_REASON_UNKNOWN "" END +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_FIREFOX "Get Firefox.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc Mon Apr 30 01:29:41 2007 @@ -198,4 +198,20 @@ IDS_CMT_WINEMINE "WineMine" END +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_FIREFOX "Get Firefox.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc Mon Apr 30 01:29:41 2007 @@ -1,226 +1,242 @@ -/* - * translated by Caemyr - */ -/* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL - - -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalator ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Witamy w programie instalacyjnym ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Ten program pomo¿e w instalacji systemu ReactOS. W tym celu "\ - "konieczne bêdzie zebranie informacji o twoim komputerze, by "\ - "prawid³owo skonfigurowaæ system operacyjny.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Nacinij Dalej by kontynuowaæ.", IDC_STATIC, 115, 169, 195, 17 -END - - -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalator ReactOS" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Twórcy ReactOS chcieliby podziêkowaæ nastêpuj¹cym projektom Open Source, "\ - "których to fragmenty zosta³y wykorzystane do stworzenia ReactOS:", - IDC_STATIC,15,7,286,19 - LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | - LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS oparty jest na licencji GPL, wieæ by w ca³oci lub czêciowo wykorzystaæ ród³a "\ - "ReactOS, musisz przestrzegaæ postanowieñ licencji.", - IDC_STATIC,15,110,227,19 - PUSHBUTTON "Poka¿ &GPL..",IDC_VIEWGPL,251,110,50,19 - LTEXT "Nacinij Dalej by kontynuowaæ.",IDC_STATIC,15,136, - 195,17 -END - - -IDD_OWNERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalator ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Podaj swoje imiê i nazwisko, a tak¿e nazwê twojej firmy b¹d organizacji.", - IDC_STATIC, 54, 7, 242, 21 - LTEXT "Na&zwa:", IDC_STATIC, 54, 37, 44, 8 - EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Organizacja:", IDC_STATIC, 54, 57, 44, 8 - EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL -END - - -IDD_COMPUTERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalator ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Podaj nazwê komputera, nie d³u¿sz¹ ni¿ 63 znaki. "\ - "Jeli chcesz pracowaæ w sieci, nazwa musi pozostaæ unikalna.", - IDC_STATIC, 54, 7, 250, 24 - LTEXT "&Nazwa komputera:", IDC_STATIC, 54, 38, 75, 8 - EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE - LTEXT "Program konfiguracyjny stworzy konto Administrator. "\ - "Dziêki niemu uzyskasz, w razie potrzeby, pe³en dostêp do systemu.", - IDC_STATIC, 54, 57, 250, 25 - LTEXT "Podaj Has³o Administratora, nie d³u¿sze ni¿ 14 znaków.", - IDC_STATIC, 54, 87, 250, 8 - LTEXT "&Has³o Administratora:", IDC_STATIC, 54, 104, 75, 8 - EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "&Potwierdzenie Has³a:", IDC_STATIC, 54, 123, 75, 8 - EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD -END - - -IDD_LOCALEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalator ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Lokalizacja systemu powinna byæ zgodna (jêzykowo) z aplikacjami, "\ - "których planujesz u¿ywaæ. Lokalizacja odpowiada równie¿ za wywietlanie "\ - "danych, liczb i walut.", IDC_STATIC, 53, 7, 253, 20 - LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "By zmieniæ lokalizacjê systemu, nacinij Ustaw.", - IDC_STATIC, 53, 60, 184, 8 - PUSHBUTTON "&Ustaw...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 - LTEXT "Uk;ad klawiatury decyduje o przyporzadkowaniu znaków pod klawisze.", - IDC_STATIC, 53, 86, 253, 8 - LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "Aby zmieniæ uk³ad klawiatury, nacinij Ustaw.", - IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "U&staw...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 -END - - -IDD_DATETIMEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalator ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Data i Czas", IDC_STATIC, 53, 7, 253, 8 - CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", - DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 - CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", - DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 - LTEXT "Strefa czasowa", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, - CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - AUTOCHECKBOX "Automatycznie ustaw zegar przy &Zmianie Czasu(DST)", - IDC_AUTODAYLIGHT, 53, 124, 201, 10 -END - - -IDD_PROCESSPAGE DIALOG 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalator ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", - PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 -END - - -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Zakoñczenie instalacji ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Konfiguracja ReactOS ukoñczona.", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "To ju¿ koniec ustawieñ ReactOS.\n\n" \ - "Teraz nacinij Koniec, by ponownie uruchomiæ komputer.", IDC_STATIC, 115, 40, 195, 100 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "Upewnij siê, czy w napêdach CD/DVD nie pozosta³ ¿aden nonik. "\ - "Jeli tak, to wyjmij go przed naciniêciem Koniec.", IDC_STATIC, 115, 169, 195, 17 -END - - -IDD_GPL DIALOG 0, 0, 333, 230 -STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Powszechna Licencja Publiczna GNU" -FONT 8, "MS Shell Dlg" -BEGIN - EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | - ES_READONLY | WS_VSCROLL - DEFPUSHBUTTON "OK",IDOK,141,209,50,14 -END - - -STRINGTABLE -BEGIN - IDS_ACKTITLE "Podziêkowania" - IDS_ACKSUBTITLE "Wszyscy, bez których nie by³oby ReactOS, a tak¿e informacje o Licencji " - IDS_OWNERTITLE "Personifikacja systemu" - IDS_OWNERSUBTITLE "Program konfiguracyjny wykorzysta te informacje do lepszego ustawienia systemu." - IDS_COMPUTERTITLE "Nazwa komputera i Has³o Administratora" - IDS_COMPUTERSUBTITLE "Musisz podaæ nazwê swojego komputera a tak¿e Has³o Administratora." - IDS_LOCALETITLE "Ustawienia Regionalne" - IDS_LOCALESUBTITLE "Mo¿esz ustawiæ ReactOS pod k¹tem jêzyka i sposobu wywietlania danych." - IDS_DATETIMETITLE "Data i Czas" - IDS_DATETIMESUBTITLE "Ustaw prawid³ow¹ datê i czas." - IDS_PROCESSTITLE "Tytu³ strony" - IDS_PROCESSSUBTITLE "Podtytu³ strony" -END - -STRINGTABLE -BEGIN - IDS_CMT_WINEFILE "Uruchom Winefile" - IDS_CMT_IBROWSER "Uruchom iBrowser" - IDS_CMT_GETFIREFOX "ci¹gnij/zainstaluj Firefoxa" - IDS_CMT_DOWNLOADER "ci¹gnij i zainstaluj inne aplikacje" -END - -STRINGTABLE -BEGIN - IDS_ACCESSORIES "Akcesoria" - IDS_CMT_CALC "Uruchom Kalkulator" - IDS_CMT_CMD "Uruchom konsolê" - IDS_CMT_EXPLORER "Uruchom Explorera" - IDS_CMT_NOTEPAD "Uruchom Edytor Tekstu" - IDS_CMT_REGEDIT "Uruchom Edytor Rejestru" - IDS_CMT_WORDPAD "Uruchom Wordpada" - IDS_CMT_SCREENSHOT "Zrzut ekranu" -END - -STRINGTABLE -BEGIN - IDS_GAMES "Gry" - IDS_CMT_SOLITAIRE "Pasjans" - IDS_CMT_WINEMINE "Saper" -END - -STRINGTABLE -BEGIN - IDS_REACTOS_SETUP "Ustawienia ReactOS" - IDS_UNKNOWN_ERROR "Nieznany b³¹d" - IDS_REGISTERING_COMPONENTS "Rejestracja sk³adników..." - IDS_LOADLIBRARY_FAILED "Nieudane LoadLibrary : " - IDS_GETPROCADDR_FAILED "Nieudane GetProcAddr : " - IDS_REGSVR_FAILED "Nieudane DllRegisterServer: " - IDS_DLLINSTALL_FAILED "Nieudane DllInstall: " - IDS_TIMEOUT "Up³yn¹³ czas rejestracji" - IDS_REASON_UNKNOWN "" -END - -/* EOF */ +/* + * translated by Caemyr + */ +/* + * Copyright (C) 2004 Filip Navara + * Copyright (C) 2004 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL + + +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Witamy w programie instalacyjnym ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Ten program pomo¿e w instalacji systemu ReactOS. W tym celu "\ + "konieczne bêdzie zebranie informacji o twoim komputerze, by "\ + "prawid³owo skonfigurowaæ system operacyjny.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Nacinij Dalej by kontynuowaæ.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Twórcy ReactOS chcieliby podziêkowaæ nastêpuj¹cym projektom Open Source, "\ + "których to fragmenty zosta³y wykorzystane do stworzenia ReactOS:", + IDC_STATIC,15,7,286,19 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOS oparty jest na licencji GPL, wieæ by w ca³oci lub czêciowo wykorzystaæ ród³a "\ + "ReactOS, musisz przestrzegaæ postanowieñ licencji.", + IDC_STATIC,15,110,227,19 + PUSHBUTTON "Poka¿ &GPL..",IDC_VIEWGPL,251,110,50,19 + LTEXT "Nacinij Dalej by kontynuowaæ.",IDC_STATIC,15,136, + 195,17 +END + + +IDD_OWNERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Podaj swoje imiê i nazwisko, a tak¿e nazwê twojej firmy b¹d organizacji.", + IDC_STATIC, 54, 7, 242, 21 + LTEXT "Na&zwa:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Organizacja:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Podaj nazwê komputera, nie d³u¿sz¹ ni¿ 63 znaki. "\ + "Jeli chcesz pracowaæ w sieci, nazwa musi pozostaæ unikalna.", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "&Nazwa komputera:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + LTEXT "Program konfiguracyjny stworzy konto Administrator. "\ + "Dziêki niemu uzyskasz, w razie potrzeby, pe³en dostêp do systemu.", + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Podaj Has³o Administratora, nie d³u¿sze ni¿ 14 znaków.", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "&Has³o Administratora:", IDC_STATIC, 54, 104, 75, 8 + EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "&Potwierdzenie Has³a:", IDC_STATIC, 54, 123, 75, 8 + EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_LOCALEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Lokalizacja systemu powinna byæ zgodna (jêzykowo) z aplikacjami, "\ + "których planujesz u¿ywaæ. Lokalizacja odpowiada równie¿ za wywietlanie "\ + "danych, liczb i walut.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "By zmieniæ lokalizacjê systemu, nacinij Ustaw.", + IDC_STATIC, 53, 60, 184, 8 + PUSHBUTTON "&Ustaw...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "Uk;ad klawiatury decyduje o przyporzadkowaniu znaków pod klawisze.", + IDC_STATIC, 53, 86, 253, 8 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "Aby zmieniæ uk³ad klawiatury, nacinij Ustaw.", + IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "U&staw...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 +END + + +IDD_DATETIMEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Data i Czas", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Strefa czasowa", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "Automatycznie ustaw zegar przy &Zmianie Czasu(DST)", + IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + + +IDD_PROCESSPAGE DIALOG 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Zakoñczenie instalacji ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Konfiguracja ReactOS ukoñczona.", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "To ju¿ koniec ustawieñ ReactOS.\n\n" \ + "Teraz nacinij Koniec, by ponownie uruchomiæ komputer.", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "Upewnij siê, czy w napêdach CD/DVD nie pozosta³ ¿aden nonik. "\ + "Jeli tak, to wyjmij go przed naciniêciem Koniec.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_GPL DIALOG 0, 0, 333, 230 +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Powszechna Licencja Publiczna GNU" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,141,209,50,14 +END + + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Podziêkowania" + IDS_ACKSUBTITLE "Wszyscy, bez których nie by³oby ReactOS, a tak¿e informacje o Licencji " + IDS_OWNERTITLE "Personifikacja systemu" + IDS_OWNERSUBTITLE "Program konfiguracyjny wykorzysta te informacje do lepszego ustawienia systemu." + IDS_COMPUTERTITLE "Nazwa komputera i Has³o Administratora" + IDS_COMPUTERSUBTITLE "Musisz podaæ nazwê swojego komputera a tak¿e Has³o Administratora." + IDS_LOCALETITLE "Ustawienia Regionalne" + IDS_LOCALESUBTITLE "Mo¿esz ustawiæ ReactOS pod k¹tem jêzyka i sposobu wywietlania danych." + IDS_DATETIMETITLE "Data i Czas" + IDS_DATETIMESUBTITLE "Ustaw prawid³ow¹ datê i czas." + IDS_PROCESSTITLE "Tytu³ strony" + IDS_PROCESSSUBTITLE "Podtytu³ strony" +END + +STRINGTABLE +BEGIN + IDS_CMT_WINEFILE "Uruchom Winefile" + IDS_CMT_IBROWSER "Uruchom iBrowser" + IDS_CMT_GETFIREFOX "ci¹gnij/zainstaluj Firefoxa" + IDS_CMT_DOWNLOADER "ci¹gnij i zainstaluj inne aplikacje" +END + +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Akcesoria" + IDS_CMT_CALC "Uruchom Kalkulator" + IDS_CMT_CMD "Uruchom konsolê" + IDS_CMT_EXPLORER "Uruchom Explorera" + IDS_CMT_NOTEPAD "Uruchom Edytor Tekstu" + IDS_CMT_REGEDIT "Uruchom Edytor Rejestru" + IDS_CMT_WORDPAD "Uruchom Wordpada" + IDS_CMT_SCREENSHOT "Zrzut ekranu" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Gry" + IDS_CMT_SOLITAIRE "Pasjans" + IDS_CMT_WINEMINE "Saper" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "Ustawienia ReactOS" + IDS_UNKNOWN_ERROR "Nieznany b³¹d" + IDS_REGISTERING_COMPONENTS "Rejestracja sk³adników..." + IDS_LOADLIBRARY_FAILED "Nieudane LoadLibrary : " + IDS_GETPROCADDR_FAILED "Nieudane GetProcAddr : " + IDS_REGSVR_FAILED "Nieudane DllRegisterServer: " + IDS_DLLINSTALL_FAILED "Nieudane DllInstall: " + IDS_TIMEOUT "Up³yn¹³ czas rejestracji" + IDS_REASON_UNKNOWN "" +END + +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_FIREFOX "Get Firefox.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END +/* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Mon Apr 30 01:29:41 2007 @@ -208,4 +208,20 @@ IDS_REASON_UNKNOWN "" END +STRINGTABLE +BEGIN + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_FIREFOX "Get Firefox.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" +END /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h (original) +++ trunk/reactos/dll/win32/syssetup/resource.h Mon Apr 30 01:29:41 2007 @@ -113,6 +113,20 @@ #define IDS_TIMEOUT 3307 #define IDS_REASON_UNKNOWN 3308 +#define IDS_SHORT_CMD 3400 +#define IDS_SHORT_EXPLORER 3401 +#define IDS_SHORT_DOWNLOADER 3402 +#define IDS_SHORT_FIREFOX 3403 +#define IDS_SHORT_SERVICE 3404 +#define IDS_SHORT_DEVICE 3405 +#define IDS_SHORT_CALC 3406 +#define IDS_SHORT_REGEDIT 3407 +#define IDS_SHORT_NOTEPAD 3408 +#define IDS_SHORT_WORDPAD 3409 +#define IDS_SHORT_SNAP 3410 +#define IDS_SHORT_SOLITAIRE 3411 +#define IDS_SHORT_WINEMINE 3412 + #define IDR_GPL 4000 #endif /* RESOURCE_H */ Modified: trunk/reactos/dll/win32/syssetup/syssetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rbuild (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rbuild Mon Apr 30 01:29:41 2007 @@ -1,9 +1,7 @@ -<module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}" installbase="system32" installname="syssetup.dll"> +<module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}" installbase="system32" installname="syssetup.dll" unicode="yes" allowwarnings="true"> <importlibrary definition="syssetup.def" /> <include base="syssetup">.</include> <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <define name="_SETUPAPI_VER">0x0501</define>

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