Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 70622: [BOOTLIB]: Fix build
by ion＠svn.reactos.org 20 Jan '16

20 Jan '16

Author: ion Date: Wed Jan 20 01:29:59 2016 New Revision: 70622 URL: http://svn.reactos.org/svn/reactos?rev=70622&view=rev Log: [BOOTLIB]: Fix build Modified: trunk/reactos/boot/environ/lib/misc/image.c Modified: trunk/reactos/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/imag… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] Wed Jan 20 01:29:59 2016 @@ -922,6 +922,17 @@ } NTSTATUS +ImgArchEfiStartBootApplication ( + _In_ PBL_APPLICATION_ENTRY AppEntry, + _In_ PVOID ImageBase, + _In_ ULONG ImageSize, + _In_ PBL_RETURN_ARGUMENTS ReturnArguments + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS BlImgStartBootApplication ( _In_ ULONG AppHandle, _Inout_opt_ PBL_RETURN_ARGUMENTS ReturnArguments

1 0

[ion] 70621: [BOOTLIB]: Rough sketches of BlImgLoadBootApplication, BlImgStartBootApplication, BlImgUnLoadBootApplication.
by ion＠svn.reactos.org 20 Jan '16

20 Jan '16

Author: ion Date: Wed Jan 20 01:28:50 2016 New Revision: 70621 URL: http://svn.reactos.org/svn/reactos?rev=70621&view=rev Log: [BOOTLIB]: Rough sketches of BlImgLoadBootApplication, BlImgStartBootApplication, BlImgUnLoadBootApplication. Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/include/bcd.h trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/bootlib.c trunk/reactos/boot/environ/lib/misc/image.c trunk/reactos/boot/environ/lib/platform/time.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Wed Jan 20 01:28:50 2016 @@ -1083,30 +1083,6 @@ return STATUS_SUCCESS; } -VOID -BlImgQueryCodeIntegrityBootOptions ( - _In_ PBL_LOADED_APPLICATION_ENTRY ApplicationEntry, - _Out_ PBOOLEAN IntegrityChecksDisabled, - _Out_ PBOOLEAN TestSigningEnabled - ) -{ - - NTSTATUS Status; - BOOLEAN Value; - - /* Check if /DISABLEINTEGRITYCHECKS is on */ - Status = BlGetBootOptionBoolean(ApplicationEntry->BcdData, - BcdLibraryBoolean_DisableIntegrityChecks, - &Value); - *IntegrityChecksDisabled = NT_SUCCESS(Status) && (Value); - - /* Check if /TESTSIGNING is on */ - Status = BlGetBootOptionBoolean(ApplicationEntry->BcdData, - BcdLibraryBoolean_AllowPrereleaseSignatures, - &Value); - *TestSigningEnabled = NT_SUCCESS(Status) && (Value); -} - NTSTATUS BmFwVerifySelfIntegrity ( VOID @@ -2212,38 +2188,6 @@ return STATUS_SUCCESS; } -/* MOVE TO IMAGe.C */ -NTSTATUS -BlImgLoadBootApplication ( - _In_ PBL_LOADED_APPLICATION_ENTRY BootEntry, - _Out_ PHANDLE AppHandle - ) -{ - EfiPrintf(L"Loading application %p\r\n", BootEntry); - - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -BlImgStartBootApplication ( - _In_ HANDLE AppHandle, - _Inout_ PBL_RETURN_ARGUMENTS ReturnArguments - ) -{ - EfiPrintf(L"Starting application %p\r\n", AppHandle); - - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -BlImgUnloadBootApplication ( - _In_ HANDLE AppHandle - ) -{ - EfiPrintf(L"Unloading application %p\r\n", AppHandle); - - return STATUS_NOT_IMPLEMENTED; -} NTSTATUS BmpTransferExecution ( @@ -2257,7 +2201,7 @@ PBL_DEVICE_DESCRIPTOR AppDevice; BL_RETURN_ARGUMENTS ReturnArgs; BOOLEAN AdvancedOptions; - HANDLE AppHandle; + ULONG AppHandle; Status = BlGetBootOptionString(BootEntry->BcdData, BcdLibraryString_ApplicationPath, Modified: trunk/reactos/boot/environ/include/bcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bcd.h… ============================================================================== --- trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] Wed Jan 20 01:28:50 2016 @@ -94,6 +94,7 @@ BcdLibraryInteger_GraphicsResolution = 0x15000052, BcdLibraryInteger_DisplayMessage = 0x15000065, /* Undocumented */ BcdLibraryInteger_DisplayMessageOverride = 0x15000066, /* Undocumented */ + BcdLibraryInteger_UndocumentedMagic = 0x15000075, /* Undocumented magic */ BcdLibraryBoolean_RestartOnFailure = 0x16000053, BcdLibraryBoolean_GraphicsForceHighestMode = 0x16000054, BcdLibraryBoolean_IsolatedExecutionContext = 0x16000060, Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Wed Jan 20 01:28:50 2016 @@ -1139,6 +1139,13 @@ PWCHAR FileName; } BL_IMG_FILE, *PBL_IMG_FILE; +typedef struct _BL_IMAGE_APPLICATION_ENTRY +{ + PBL_APPLICATION_ENTRY AppEntry; + PVOID ImageBase; + ULONG ImageSize; +} BL_IMAGE_APPLICATION_ENTRY, *PBL_IMAGE_APPLICATION_ENTRY; + typedef struct _BL_DEFERRED_FONT_FILE { LIST_ENTRY ListEntry; @@ -1464,6 +1471,11 @@ VOID ); +ULONGLONG +BlTimeQueryPerformanceCounter ( + _Out_opt_ PLARGE_INTEGER Frequency + ); + /* RESOURCE LOCALE INTERNATIONALIZATION ROUTINES *****************************/ NTSTATUS @@ -2134,6 +2146,30 @@ BlImgFindSection ( _In_ PVOID ImageBase, _In_ ULONG ImageSize + ); + +NTSTATUS +BlImgLoadBootApplication ( + _In_ PBL_LOADED_APPLICATION_ENTRY BootEntry, + _Out_ PULONG AppHandle + ); + +NTSTATUS +BlImgStartBootApplication ( + _In_ ULONG AppHandle, + _Inout_ PBL_RETURN_ARGUMENTS ReturnArguments + ); + +NTSTATUS +BlImgUnloadBootApplication ( + _In_ ULONG AppHandle + ); + +VOID +BlImgQueryCodeIntegrityBootOptions ( + _In_ PBL_LOADED_APPLICATION_ENTRY ApplicationEntry, + _Out_ PBOOLEAN IntegrityChecksDisabled, + _Out_ PBOOLEAN TestSigning ); /* FILE I/O ROUTINES *********************************************************/ @@ -2453,4 +2489,7 @@ extern PVOID DspLocalInputConsole; extern WCHAR BlScratchBuffer[8192]; extern BL_MEMORY_DESCRIPTOR_LIST MmMdlUnmappedAllocated; +extern ULONGLONG BlpTimePerformanceFrequency; +extern LIST_ENTRY RegisteredFileSystems; + #endif Modified: trunk/reactos/boot/environ/lib/bootlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/bootlib.c… ============================================================================== --- trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] Wed Jan 20 01:28:50 2016 @@ -49,9 +49,11 @@ PBL_MEMORY_DATA MemoryData; PBL_APPLICATION_ENTRY AppEntry; PBL_FIRMWARE_DESCRIPTOR FirmwareDescriptor; - ULONG_PTR ParamPointer = (ULONG_PTR)BootAppParameters; + LARGE_INTEGER BootFrequency; + ULONG_PTR ParamPointer; /* Validate correct Boot Application data */ + ParamPointer = (ULONG_PTR)BootAppParameters; if (!(BootAppParameters) || (BootAppParameters->Signature[0] != BOOT_APPLICATION_SIGNATURE_1) || (BootAppParameters->Signature[1] != BOOT_APPLICATION_SIGNATURE_2) || @@ -131,18 +133,16 @@ return Status; } -#if 0 /* Modern systems have an undocumented BCD system for the boot frequency */ Status = BlGetBootOptionInteger(BlpApplicationEntry.BcdData, 0x15000075, - &BootFrequency); - if (NT_SUCCESS(Status) && (BootFrequency)) + (PULONGLONG)&BootFrequency.QuadPart); + if (NT_SUCCESS(Status) && (BootFrequency.QuadPart)) { /* Use it if present */ - BlpTimePerformanceFrequency = BootFrequency; + BlpTimePerformanceFrequency = BootFrequency.QuadPart; } else -#endif { /* Use the TSC for calibration */ Status = BlpTimeCalibratePerformanceCounter(); Modified: trunk/reactos/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/imag… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] Wed Jan 20 01:28:50 2016 @@ -9,6 +9,13 @@ /* INCLUDES ******************************************************************/ #include "bl.h" +#include <bcd.h> + +/* DATA VARIABLES ************************************************************/ + +ULONG IapAllocatedTableEntries; +ULONG IapTableEntries; +PVOID* IapImageTable; /* FUNCTIONS *****************************************************************/ @@ -186,6 +193,17 @@ /* Return the final status */ return Status; +} + +NTSTATUS +BlImgUnallocateImageBuffer ( + _In_ PVOID ImageBase, + _In_ ULONG ImageSize, + _In_ ULONG ImageFlags + ) +{ + EfiPrintf(L"leaking the shit out of %p\r\n", ImageBase); + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -591,3 +609,436 @@ return FoundSection; } +VOID +BlImgQueryCodeIntegrityBootOptions ( + _In_ PBL_LOADED_APPLICATION_ENTRY ApplicationEntry, + _Out_ PBOOLEAN IntegrityChecksDisabled, + _Out_ PBOOLEAN TestSigning + ) +{ + + NTSTATUS Status; + BOOLEAN Value; + + /* Check if /DISABLEINTEGRITYCHECKS is on */ + Status = BlGetBootOptionBoolean(ApplicationEntry->BcdData, + BcdLibraryBoolean_DisableIntegrityChecks, + &Value); + *IntegrityChecksDisabled = NT_SUCCESS(Status) && (Value); + + /* Check if /TESTSIGNING is on */ + Status = BlGetBootOptionBoolean(ApplicationEntry->BcdData, + BcdLibraryBoolean_AllowPrereleaseSignatures, + &Value); + *TestSigning = NT_SUCCESS(Status) && (Value); +} + +NTSTATUS +BlImgUnLoadImage ( + _In_ PVOID ImageBase, + _In_ ULONG ImageSize, + _In_ ULONG ImageFlags + ) +{ + /* Check for missing parameters */ + if (!(ImageSize) || !(ImageBase)) + { + /* Bail out */ + return STATUS_INVALID_PARAMETER; + } + + /* Unallocate the image buffer */ + return BlImgUnallocateImageBuffer(ImageBase, ImageSize, ImageFlags); +} + +NTSTATUS +BlImgLoadPEImageEx ( + _In_ ULONG DeviceId, + _In_ BL_MEMORY_TYPE MemoryType, + _In_ PWCHAR Path, + _Out_ PVOID* ImageBase, + _Out_ PULONG ImageSize, + _Out_ PVOID Hash, + _In_ ULONG Flags + ) +{ + EfiPrintf(L"PE not implemented\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BlImgLoadBootApplication ( + _In_ PBL_LOADED_APPLICATION_ENTRY BootEntry, + _Out_ PULONG AppHandle + ) +{ + NTSTATUS Status; + PULONGLONG AllowedList; + ULONGLONG AllowedCount; + ULONG i; + LARGE_INTEGER Frequency; + PVOID UnlockCode; + PBL_DEVICE_DESCRIPTOR Device, BitLockerDevice; + ULONG DeviceId; + PWCHAR Path; + PBL_APPLICATION_ENTRY AppEntry; + PBL_IMG_FILE ImageFile; + PVOID ImageBase; + ULONG ImageSize; + BOOLEAN DisableIntegrity, TestSigning; + UCHAR Hash[64]; + ULONG Flags; + ULONG ListSize; + PBL_IMAGE_APPLICATION_ENTRY ImageAppEntry; + + BitLockerDevice = NULL; + UnlockCode = NULL; + ImageFile = NULL; + DeviceId = -1; + Device = NULL; + ImageAppEntry = NULL; + Path = NULL; + ImageSize = 0; + ImageBase = NULL; + + EfiPrintf(L"Loading application %p\r\n", BootEntry); + + Status = BlpGetBootOptionIntegerList(BootEntry->BcdData, + BcdLibraryIntegerList_AllowedInMemorySettings, + &AllowedList, + &AllowedCount, + TRUE); + if (Status == STATUS_SUCCESS) + { + for (i = 0; i < AllowedCount; i++) + { + if (AllowedList[i] == BcdLibraryInteger_UndocumentedMagic) + { + BlTimeQueryPerformanceCounter(&Frequency); + BlAppendBootOptionInteger(BootEntry, + BcdLibraryInteger_UndocumentedMagic, + Frequency.QuadPart); + } + } + } + +#if BL_BITLOCKER_SUPPORT + Status = BlFveSecureBootUnlockBootDevice(BootEntry, &BitLockerDevice, &UnlockCode); +#else + Status = STATUS_SUCCESS; +#endif + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + Status = BlGetBootOptionDevice(BootEntry->BcdData, BcdLibraryDevice_ApplicationDevice, &Device, NULL); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + Status = BlGetBootOptionString(BootEntry->BcdData, BcdLibraryString_ApplicationPath, &Path); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + Status = BlpDeviceOpen(Device, BL_DEVICE_READ_ACCESS, 0, &DeviceId); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + BlImgQueryCodeIntegrityBootOptions(BootEntry, &DisableIntegrity, &TestSigning); + +#if BL_TPM_SUPPORT + RtlZeroMemory(&Context, sizeof(Context); + Context.BootEntry = BootEntry; + BlEnNotifyEvent(0x10000003, &Context); +#endif + + Flags = 0; + if (!DisableIntegrity) + { + Flags = 0x8070; + } + + Status = BlImgLoadPEImageEx(DeviceId, BlLoaderMemory, Path, &ImageBase, &ImageSize, Hash, Flags); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + +#if BL_KD_SUPPORT + if (BdDebugTransitions) + { + BdForceDebug = 1; + Status = BlBdInitialize(); + if (NT_SUCCESS(Status)) + { + if (BlBdDebuggerEnabled()) + { + BdDebuggerNotPresent = FALSE; + RtlInitUnicodeString(&PathString, Path); + BlBdLoadImageSymbols(&PathString, ImageBase); + } + } + } +#endif + +#if BL_BITLOCKER_SUPPORT + Status = BlSecureBootCheckPolicyOnFveDevice(BitLockerDevice); +#else + Status = STATUS_SUCCESS; +#endif + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + +#if BL_BITLOCKER_SUPPORT + Status = BlFveSecureBootCheckpointBootApp(BootEntry, BitLockerDevice, Hash, UnlockCode); +#else +Status = STATUS_SUCCESS; +#endif + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + ListSize = BlGetBootOptionListSize(BootEntry->BcdData); + + AppEntry = BlMmAllocateHeap(ListSize + sizeof(*AppEntry)); + if (!AppEntry) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + RtlZeroMemory(AppEntry, sizeof(AppEntry)); + + strcpy(AppEntry->Signature, "BTAPENT"); + AppEntry->Guid = BootEntry->Guid; + AppEntry->Flags = BootEntry->Flags; + RtlCopyMemory(&AppEntry->BcdData, BootEntry->BcdData, ListSize); + + + ImageAppEntry = BlMmAllocateHeap(sizeof(*ImageAppEntry)); + ImageAppEntry->ImageBase = ImageBase; + ImageAppEntry->ImageSize = ImageSize; + ImageAppEntry->AppEntry = AppEntry; + + if (!IapTableEntries) + { + IapAllocatedTableEntries = 0; + IapTableEntries = 2; + IapImageTable = BlMmAllocateHeap(IapTableEntries * sizeof(PVOID)); + if (!IapImageTable) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + RtlZeroMemory(IapImageTable, sizeof(IapTableEntries * sizeof(PVOID))); + } + + Status = BlTblSetEntry(&IapImageTable, + &IapTableEntries, + ImageAppEntry, + AppHandle, + TblDoNotPurgeEntry); + +Quickie: + if (DeviceId != 1) + { + BlDeviceClose(DeviceId); + } + + if (Device) + { + BlMmFreeHeap(Device); + } + + if (Path) + { + BlMmFreeHeap(Path); + } + + if (BitLockerDevice) + { + BlMmFreeHeap(BitLockerDevice); + } + + if (UnlockCode) + { + BlMmFreeHeap(UnlockCode); + } + + if (NT_SUCCESS(Status)) + { + IapAllocatedTableEntries++; + } + else + { + if (ImageBase) + { + BlImgUnLoadImage(ImageBase, ImageSize, 0); + } + + if (AppEntry) + { + BlMmFreeHeap(AppEntry); + } + + if (ImageFile) + { + BlMmFreeHeap(ImageFile); + } + + if (!(IapAllocatedTableEntries) && (IapImageTable)) + { + BlMmFreeHeap(IapImageTable); + IapTableEntries = 0; + IapImageTable = NULL; + } + } + + return Status; +} + +NTSTATUS +BlpPdParseReturnArguments ( + _In_ PBL_RETURN_ARGUMENTS ReturnArguments + ) +{ + if (ReturnArguments->DataPage == 0) + { + return STATUS_SUCCESS; + } + + EfiPrintf(L"Return arguments not supported\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BlImgStartBootApplication ( + _In_ ULONG AppHandle, + _Inout_opt_ PBL_RETURN_ARGUMENTS ReturnArguments + ) +{ + PBL_IMAGE_APPLICATION_ENTRY ImageAppEntry; + BL_RETURN_ARGUMENTS LocalReturnArgs; + PBL_FILE_SYSTEM_ENTRY FileSystem; + PLIST_ENTRY NextEntry, ListHead; + NTSTATUS Status; + + if (!ReturnArguments) + { + LocalReturnArgs.Version = 1; + LocalReturnArgs.Status = STATUS_SUCCESS; + LocalReturnArgs.Flags = 0; + LocalReturnArgs.DataPage = 0; + LocalReturnArgs.DataSize = 0; + + ReturnArguments = &LocalReturnArgs; + } + + + if (IapTableEntries <= AppHandle) + { + return STATUS_INVALID_PARAMETER; + } + + ImageAppEntry = IapImageTable[AppHandle]; + if (!ImageAppEntry) + { + return STATUS_INVALID_PARAMETER; + } + + ListHead = &RegisteredFileSystems; + NextEntry = RegisteredFileSystems.Flink; + while (NextEntry != ListHead) + { + FileSystem = CONTAINING_RECORD(NextEntry, BL_FILE_SYSTEM_ENTRY, ListEntry); + + if (FileSystem->PurgeCallback) + { + FileSystem->PurgeCallback(); + } + + NextEntry = NextEntry->Flink; + } + + /* TODO */ + //BlockIoPurgeCache(); + + Status = ImgArchEfiStartBootApplication(ImageAppEntry->AppEntry, + ImageAppEntry->ImageBase, + ImageAppEntry->ImageSize, + ReturnArguments); + + BlpPdParseReturnArguments(ReturnArguments); + +#if BL_BITLOCKER_SUPPORT + FvebpCheckAllPartitions(TRUE); +#endif + +#if BL_TPM_SUPPORT + BlEnNotifyEvent(0x10000005, NULL); +#endif + + /* TODO */ + //BlpDisplayReinitialize(); + + /* TODO */ + //BlpLogInitialize(); + + return Status; +} + +NTSTATUS +BlImgUnloadBootApplication ( + _In_ ULONG AppHandle + ) +{ + PBL_IMAGE_APPLICATION_ENTRY ImageAppEntry; // esi@2 + NTSTATUS Status; + + if (IapTableEntries <= AppHandle) + { + return STATUS_INVALID_PARAMETER; + } + + ImageAppEntry = IapImageTable[AppHandle]; + if (!ImageAppEntry) + { + return STATUS_INVALID_PARAMETER; + } + + Status = BlImgUnLoadImage(ImageAppEntry->ImageBase, + ImageAppEntry->ImageSize, + 0); + if (NT_SUCCESS(Status)) + { + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_MEMORY_NOT_ALLOCATED; + } + + BlMmFreeHeap(ImageAppEntry->AppEntry); + BlMmFreeHeap(ImageAppEntry); + + IapImageTable[AppHandle] = NULL; + + if (!(--IapAllocatedTableEntries)) + { + BlMmFreeHeap(IapImageTable); + IapImageTable = NULL; + IapTableEntries = 0; + } + + return Status; +} Modified: trunk/reactos/boot/environ/lib/platform/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/platform/… ============================================================================== --- trunk/reactos/boot/environ/lib/platform/time.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/platform/time.c [iso-8859-1] Wed Jan 20 01:28:50 2016 @@ -87,3 +87,19 @@ /* On other systems, compute it */ return BlpTimeMeasureTscFrequency(); } + +ULONGLONG +BlTimeQueryPerformanceCounter ( + _Out_opt_ PLARGE_INTEGER Frequency + ) +{ + /* Check if caller wants frequency */ + if (Frequency) + { + /* Return it */ + Frequency->QuadPart = BlpTimePerformanceFrequency; + } + + /* Return the TSC value */ + return __rdtsc(); +};

1 0

[akhaldi] 70620: [0.4.0] * Merge the win32k fixes by Timo in revisions 70482, 70485, 70486 and 70487. CORE-10807
by akhaldi＠svn.reactos.org 19 Jan '16

19 Jan '16

Author: akhaldi Date: Tue Jan 19 21:57:30 2016 New Revision: 70620 URL: http://svn.reactos.org/svn/reactos?rev=70620&view=rev Log: [0.4.0] * Merge the win32k fixes by Timo in revisions 70482, 70485, 70486 and 70487. CORE-10807 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/bitmaps.c branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/bitmaps.h branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/dibobj.c branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/palette.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 19 21:57:30 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 19 21:57:30 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606 Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Tue Jan 19 21:57:30 2016 @@ -42,15 +42,15 @@ return GreSetObjectOwner(hbmp, ulOwner); } -static -int +BOOL NTAPI UnsafeSetBitmapBits( - PSURFACE psurf, - IN ULONG cjBits, - IN PVOID pvBits) -{ - PUCHAR pjDst, pjSrc; + _Inout_ PSURFACE psurf, + _In_ ULONG cjBits, + _In_ const VOID *pvBits) +{ + PUCHAR pjDst; + const UCHAR *pjSrc; LONG lDeltaDst, lDeltaSrc; ULONG nWidth, nHeight, cBitsPixel; NT_ASSERT(psurf->flags & API_BITMAP); @@ -69,7 +69,7 @@ /* Make sure the buffer is large enough*/ if (cjBits < (lDeltaSrc * nHeight)) - return 0; + return FALSE; while (nHeight--) { @@ -79,7 +79,7 @@ pjDst += lDeltaDst; } - return 1; + return TRUE; } HBITMAP Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/bitmaps.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/bitmaps.h [iso-8859-1] Tue Jan 19 21:57:30 2016 @@ -43,3 +43,10 @@ IN FLONG fl, IN UINT cjMaxBits, IN HANDLE hcmXform); + +BOOL +NTAPI +UnsafeSetBitmapBits( + _Inout_ PSURFACE psurf, + _In_ ULONG cjBits, + _In_ const VOID *pvBits); Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Tue Jan 19 21:57:30 2016 @@ -261,16 +261,10 @@ PPALETTE ppalDIB = 0; ULONG cjSizeImage; - if (!bmi) return 0; - - /* Check if the header provided an image size */ - if (bmi->bmiHeader.biSizeImage != 0) - { - /* Use the given size */ - cjSizeImage = bmi->bmiHeader.biSizeImage; - } - /* Otherwise check for uncompressed formats */ - else if ((bmi->bmiHeader.biCompression == BI_RGB) || + if (!bmi || !Bits) return 0; + + /* Check for uncompressed formats */ + if ((bmi->bmiHeader.biCompression == BI_RGB) || (bmi->bmiHeader.biCompression == BI_BITFIELDS)) { /* Calculate the image size */ @@ -278,6 +272,12 @@ ScanLines, bmi->bmiHeader.biBitCount); } + /* Check if the header provided an image size */ + else if (bmi->bmiHeader.biSizeImage != 0) + { + /* Use the given size */ + cjSizeImage = bmi->bmiHeader.biSizeImage; + } else { /* Compressed format without a size. This is invalid. */ @@ -286,9 +286,9 @@ } /* Check if the size that we have is ok */ - if (cjSizeImage > cjMaxBits) - { - DPRINT1("Size too large! cjSizeImage = %lu, cjMaxBits = %lu\n", + if ((cjSizeImage > cjMaxBits) || (cjSizeImage == 0)) + { + DPRINT1("Invalid bitmap size! cjSizeImage = %lu, cjMaxBits = %lu\n", cjSizeImage, cjMaxBits); return 0; } @@ -340,8 +340,6 @@ rcDst.right = psurfDst->SurfObj.sizlBitmap.cx; ptSrc.x = 0; ptSrc.y = 0; - - NT_ASSERT(psurfSrc->SurfObj.cjBits <= cjMaxBits); result = IntEngCopyBits(&psurfDst->SurfObj, &psurfSrc->SurfObj, @@ -1456,6 +1454,11 @@ PBYTE safeBits = NULL; HBITMAP hbmResult = NULL; + if (pjInit == NULL) + { + fInit &= ~CBM_INIT; + } + if(pjInit && (fInit & CBM_INIT)) { if (cjMaxBits == 0) return NULL; Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Tue Jan 19 21:57:30 2016 @@ -786,9 +786,6 @@ { PPALETTE palPtr; UINT pal_entries; - HDC hDC; - PDC dc; - PWND Wnd; const PALETTEENTRY *pptr = PaletteColors; palPtr = PALETTE_ShareLockPalette(hPal); @@ -816,6 +813,16 @@ PALETTE_ShareUnlockPalette(palPtr); +#if 0 +/* FIXME: This is completely broken! We cannot call UserGetDesktopWindow + without first acquiring the USER lock. But the whole process here is + screwed anyway. Instead of messing with the desktop DC, we need to + check, whether the palette is associated with a PDEV and whether that + PDEV supports palette operations. Then we need to call pfnDrvSetPalette. + But since IntGdiRealizePalette() is not even implemented for direct DCs, + we can as well just do nothing, that will at least not ASSERT! + I leave the whole thing here, to scare people away, who want to "fix" it. */ + /* Immediately apply the new palette if current window uses it */ Wnd = UserGetDesktopWindow(); hDC = UserGetWindowDC(Wnd); @@ -831,6 +838,7 @@ DC_UnlockDc(dc); } UserReleaseDC(Wnd,hDC, FALSE); +#endif // 0 } return ret; }

1 0

[pschweitzer] 70619: [MPR] Import Wine commits: - 39ec97ea9dcba270bbea31a7eaa7b842bf1beb1f, Implement WNetAddConnectionA(), WNetAddConnection2A(), WNetAddConnection3A(). - 092c60e98cec9956127145f7c...
by pschweitzer＠svn.reactos.org 19 Jan '16

19 Jan '16

Author: pschweitzer Date: Tue Jan 19 18:39:18 2016 New Revision: 70619 URL: http://svn.reactos.org/svn/reactos?rev=70619&view=rev Log: [MPR] Import Wine commits: - 39ec97ea9dcba270bbea31a7eaa7b842bf1beb1f, Implement WNetAddConnectionA(), WNetAddConnection2A(), WNetAddConnection3A(). - 092c60e98cec9956127145f7c8a5db88082ce7d2, Implement WNetAddConnectionW(), WNetAddConnection2W(), WNetAddConnection3W(). CORE-10032 ROSAPPS-303 Modified: trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Tue Jan 19 18:39:18 2016 @@ -1477,11 +1477,12 @@ DWORD WINAPI WNetAddConnectionA( LPCSTR lpRemoteName, LPCSTR lpPassword, LPCSTR lpLocalName ) { - FIXME( "(%s, %p, %s): stub\n", - debugstr_a(lpRemoteName), lpPassword, debugstr_a(lpLocalName) ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + NETRESOURCEA resourcesA; + + memset(&resourcesA, 0, sizeof(resourcesA)); + resourcesA.lpRemoteName = (LPSTR)lpRemoteName; + resourcesA.lpLocalName = (LPSTR)lpLocalName; + return WNetUseConnectionA(NULL, &resourcesA, lpPassword, NULL, 0, NULL, 0, NULL); } /********************************************************************* @@ -1490,11 +1491,12 @@ DWORD WINAPI WNetAddConnectionW( LPCWSTR lpRemoteName, LPCWSTR lpPassword, LPCWSTR lpLocalName ) { - FIXME( "(%s, %p, %s): stub\n", - debugstr_w(lpRemoteName), lpPassword, debugstr_w(lpLocalName) ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + NETRESOURCEW resourcesW; + + memset(&resourcesW, 0, sizeof(resourcesW)); + resourcesW.lpRemoteName = (LPWSTR)lpRemoteName; + resourcesW.lpLocalName = (LPWSTR)lpLocalName; + return WNetUseConnectionW(NULL, &resourcesW, lpPassword, NULL, 0, NULL, 0, NULL); } /********************************************************************* @@ -1504,11 +1506,8 @@ LPCSTR lpPassword, LPCSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %s, 0x%08X): stub\n", - lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + return WNetUseConnectionA(NULL, lpNetResource, lpPassword, lpUserID, dwFlags, + NULL, 0, NULL); } /********************************************************************* @@ -1518,11 +1517,8 @@ LPCWSTR lpPassword, LPCWSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %s, 0x%08X): stub\n", - lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + return WNetUseConnectionW(NULL, lpNetResource, lpPassword, lpUserID, dwFlags, + NULL, 0, NULL); } /********************************************************************* @@ -1532,11 +1528,8 @@ LPCSTR lpPassword, LPCSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %p, %s, 0x%08X), stub\n", - hwndOwner, lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + return WNetUseConnectionA(hwndOwner, lpNetResource, lpPassword, lpUserID, + dwFlags, NULL, 0, NULL); } /********************************************************************* @@ -1546,11 +1539,8 @@ LPCWSTR lpPassword, LPCWSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %p, %s, 0x%08X), stub\n", - hwndOwner, lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + return WNetUseConnectionW(hwndOwner, lpNetResource, lpPassword, lpUserID, + dwFlags, NULL, 0, NULL); } /*****************************************************************

1 0

[ion] 70618: [BOOTMGR]: Support for launching a recovery sequence. [BOOTMGR]: Stub support for boot errors. [BOOTMGR]: Stubplement support for device creation for boot applications (only for fully ...
by ion＠svn.reactos.org 19 Jan '16

19 Jan '16

Author: ion Date: Tue Jan 19 18:21:54 2016 New Revision: 70618 URL: http://svn.reactos.org/svn/reactos?rev=70618&view=rev Log: [BOOTMGR]: Support for launching a recovery sequence. [BOOTMGR]: Stub support for boot errors. [BOOTMGR]: Stubplement support for device creation for boot applications (only for fully specified devices) [BOOTMGR]: Implement support for execution transfer, including recovery mode/sequence. [BOOTMGR]: Implement support for launching a boot entry. [BOOTLIB]: Support for EFI Firmware device enumeration, driver attachment, and comparison. [BOOTLIB]: Support for appending BOOLEAN or INTEGER BCD options. Next step is the PE loader. Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/include/bcd.h trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/firmware/efi/firmware.c trunk/reactos/boot/environ/lib/io/device.c trunk/reactos/boot/environ/lib/misc/bcdopt.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Tue Jan 19 18:21:54 2016 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING.ARM in the top level directory * PROJECT: ReactOS UEFI Boot Manager - * FILE: boot/environ/app/bootmgr/bootmgr.c + * FILE: boot/environ/app/bootmgr/bootmgr.cla * PURPOSE: Boot Manager Entrypoint * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) */ @@ -2033,13 +2033,562 @@ BmpLaunchBootEntry ( _In_ PBL_LOADED_APPLICATION_ENTRY BootEntry, _Out_ PULONG EntryIndex, - _In_ ULONG Unknown, + _In_ ULONG LaunchCode, _In_ BOOLEAN LaunchWinRe - ) -{ - EfiPrintf(L"Boot launch not yet implemented\r\n"); - EfiStall(1000000000); + ); + +NTSTATUS +BmLaunchRecoverySequence ( + _In_ PBL_LOADED_APPLICATION_ENTRY BootEntry, + _In_ ULONG LaunchCode + ) +{ + NTSTATUS Status; + PBL_LOADED_APPLICATION_ENTRY RecoveryEntry; + HANDLE BcdHandle; + PGUID RecoverySequence; + ULONG Count, i, RecoveryIndex, SequenceCount; + PBL_LOADED_APPLICATION_ENTRY* Sequence; + + RecoveryIndex = 0; + Sequence = NULL; + RecoverySequence = NULL; + Count = 0; + BcdHandle = NULL; + + Status = BmOpenDataStore(&BcdHandle); + if (NT_SUCCESS(Status)) + { + Status = BlGetBootOptionGuidList(BootEntry->BcdData, + BcdLibraryObjectList_RecoverySequence, + &RecoverySequence, + &SequenceCount); + if (NT_SUCCESS(Status)) + { + Status = BmGetBootSequence(BcdHandle, + RecoverySequence, + SequenceCount, + BL_APPLICATION_ENTRY_RECOVERY, + &Sequence, + &Count); + if (NT_SUCCESS(Status)) + { + if (BcdHandle) + { + BmCloseDataStore(BcdHandle); + } + + for (i = 0; i < Count; ++i) + { + if (LaunchCode == 2 || LaunchCode == 5) + { + BlRemoveBootOption(Sequence[i]->BcdData, BcdLibraryInteger_DisplayMessageOverride); + BlAppendBootOptionInteger(Sequence[i], + BcdLibraryInteger_DisplayMessageOverride, + 4); + } + else if (LaunchCode == 3) + { + BlRemoveBootOption(Sequence[i]->BcdData, BcdLibraryInteger_DisplayMessageOverride); + BlAppendBootOptionInteger(Sequence[i], + BcdLibraryInteger_DisplayMessageOverride, + 10); + } + + Status = BmpLaunchBootEntry(Sequence[i], NULL, LaunchCode, FALSE); + if (!NT_SUCCESS(Status)) + { + break; + } + } + } + + if (Sequence) + { + for (RecoveryIndex = 0; RecoveryIndex < Count; RecoveryIndex++) + { + RecoveryEntry = Sequence[RecoveryIndex]; + if (RecoveryEntry) + { + BlDestroyBootEntry(RecoveryEntry); + } + } + BlMmFreeHeap(Sequence); + } + } + + if (RecoverySequence) + { + BlMmFreeHeap(RecoverySequence); + } + } + + return Status; +} + +ULONG +BmDisplayDumpError ( + _In_ PBL_LOADED_APPLICATION_ENTRY BootEntry, + _In_ ULONG LaunchCode + ) +{ + ULONG BootError; + NTSTATUS Status; + BOOLEAN Restart, NoError; + + BootError = 1; + + Status = BlGetBootOptionBoolean(BlpApplicationEntry.BcdData, + BcdLibraryBoolean_RestartOnFailure, + &Restart); + if ((NT_SUCCESS(Status)) && (Restart)) + { + return BootError; + } + + Status = BlGetBootOptionBoolean(BlpApplicationEntry.BcdData, + BcdBootMgrBoolean_NoErrorDisplay, + &NoError); + if ((NT_SUCCESS(Status)) && (NoError)) + { + return BootError; + } + + if (BmpInternalBootError) + { + return (ULONG)BmpInternalBootError; // ??? + } + + EfiPrintf(L"Error menu not yet implemented\r\n"); + return BootError; +} + +NTSTATUS +BmpCreateDevices ( + _In_ PBL_LOADED_APPLICATION_ENTRY BootEntry + ) +{ + ULONG NextOffset, DataOffset, ListOffset; + PBL_BCD_OPTION Option, ListOption; + BcdElementType ElementType; + PBCD_DEVICE_OPTION BcdDevice; + + NextOffset = 0; + do + { + Option = (PBL_BCD_OPTION)((ULONG_PTR)BootEntry->BcdData + NextOffset); + NextOffset = Option->NextEntryOffset; + + if (Option->Empty) + { + continue; + } + + ElementType.PackedValue = Option->Type; + if (ElementType.Format != BCD_TYPE_DEVICE) + { + continue; + } + + DataOffset = Option->DataOffset; + + BcdDevice = (PBCD_DEVICE_OPTION)((ULONG_PTR)BootEntry->BcdData + DataOffset); + if (!(BcdDevice->DeviceDescriptor.Flags & 1)) + { + continue; + } + + ListOption = NULL; + ListOffset = Option->ListOffset; + if (Option->ListOffset) + { + ListOption = (PBL_BCD_OPTION)((ULONG_PTR)BootEntry->BcdData + ListOffset); + } + + EfiPrintf(L"Unspecified devices not yet supported: %p\r\n", ListOption); + return STATUS_NOT_SUPPORTED; + } while (NextOffset != 0); + + return STATUS_SUCCESS; +} + +/* MOVE TO IMAGe.C */ +NTSTATUS +BlImgLoadBootApplication ( + _In_ PBL_LOADED_APPLICATION_ENTRY BootEntry, + _Out_ PHANDLE AppHandle + ) +{ + EfiPrintf(L"Loading application %p\r\n", BootEntry); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BlImgStartBootApplication ( + _In_ HANDLE AppHandle, + _Inout_ PBL_RETURN_ARGUMENTS ReturnArguments + ) +{ + EfiPrintf(L"Starting application %p\r\n", AppHandle); + + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BlImgUnloadBootApplication ( + _In_ HANDLE AppHandle + ) +{ + EfiPrintf(L"Unloading application %p\r\n", AppHandle); + + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BmpTransferExecution ( + _In_ PBL_LOADED_APPLICATION_ENTRY BootEntry, + _Out_ PULONG LaunchCode, + _Out_ PBOOLEAN Recover + ) +{ + PWCHAR AppPath; + NTSTATUS Status; + PBL_DEVICE_DESCRIPTOR AppDevice; + BL_RETURN_ARGUMENTS ReturnArgs; + BOOLEAN AdvancedOptions; + HANDLE AppHandle; + + Status = BlGetBootOptionString(BootEntry->BcdData, + BcdLibraryString_ApplicationPath, + &AppPath); + if (!NT_SUCCESS(Status)) + { + AppPath = NULL; + } + + if (BootEntry->Flags & BL_APPLICATION_ENTRY_STARTUP) + { +#if BL_NET_SUPPORT + Status = BlNetSoftReboot(BootEntry); +#else + EfiPrintf(L"Net boot not supported\r\n"); + Status = STATUS_NOT_SUPPORTED; +#endif + goto Quickie; + } + + do + { + Status = BlImgLoadBootApplication(BootEntry, &AppHandle); + if (Status == STATUS_NOT_FOUND) + { + Status = BlGetBootOptionDevice(BootEntry->BcdData, + BcdLibraryDevice_ApplicationDevice, + &AppDevice, + NULL); + if (NT_SUCCESS(Status)) + { + Status = BlFwEnumerateDevice(AppDevice); + } + + if (!NT_SUCCESS(Status)) + { + BmFatalErrorEx(2, (ULONG_PTR)AppPath, Status, 0, 0); + goto Quickie; + } + + Status = BlImgLoadBootApplication(BootEntry, &AppHandle); + } + + if (Status == STATUS_CANCELLED) + { + if ((BmGetBootMenuPolicy(BootEntry) != MenuPolicyStandard) || + !(MiscGetBootOption(BootEntry->BcdData, + BcdLibraryObjectList_RecoverySequence))) + { + goto Quickie; + } + + *LaunchCode = 4; + *Recover = TRUE; + goto Quickie; + } + + if (Status == 0xC0210000) + { + *LaunchCode = 4; + *Recover = TRUE; + goto Quickie; + } + + if (!NT_SUCCESS(Status)) + { + BmFatalErrorEx(2, (ULONG_PTR)AppPath, Status, 0, 0); + goto Quickie; + } + + RtlZeroMemory(&ReturnArgs, sizeof(ReturnArgs)); + //BmpLogApplicationLaunchEvent(&BootEntry->Guid, AppPath); + + Status = BlImgStartBootApplication(AppHandle, &ReturnArgs); + +#if BL_BITLOCKER_SUPPORT + BlFveSecureBootCheckpointAppReturn(BootEntry, &ReturnArgs); +#endif + + //BlBsdLogEntry(1, 0x12, &BootEntry->Guid, 0x14); + + BlImgUnloadBootApplication(AppHandle); + + } while (Status != 0xC0000453); + + *Recover = TRUE; + if (ReturnArgs.Flags & 1) + { + Status = BlGetBootOptionBoolean(BootEntry->BcdData, + BcdLibraryBoolean_DisplayAdvancedOptions, + &AdvancedOptions); + if ((NT_SUCCESS(Status)) && (AdvancedOptions)) + { + *LaunchCode = 2; + } + else + { + *LaunchCode = 1; + } + } + else if (ReturnArgs.Flags & 4) + { + *LaunchCode = 1; + } + else if (ReturnArgs.Flags & 8) + { + *LaunchCode = 5; + } + else if (ReturnArgs.Flags & 0x10) + { + *LaunchCode = 6; + } + else if (ReturnArgs.Flags & 0x20) + { + *LaunchCode = 7; + } + else if (ReturnArgs.Flags & 0x40) + { + *Recover = FALSE; + BmFatalErrorEx(11, Status, 0, 0, 0); + } + +Quickie: + if (AppPath) + { + BlMmFreeHeap(AppPath); + } + + return Status; +} + +NTSTATUS +BmpLaunchBootEntry ( + _In_ PBL_LOADED_APPLICATION_ENTRY BootEntry, + _Out_ PULONG EntryIndex, + _In_ ULONG LaunchCode, + _In_ BOOLEAN LaunchWinRe + ) +{ + HANDLE BcdHandle; + NTSTATUS Status; + GUID ObjectId; + BOOLEAN DoRecovery, AutoRecovery, DoRestart, RestartOnFailure; + ULONG ErrorCode; + BOOLEAN AdvancedOneTime, EditOneTime, Recover; + + if (BootEntry->Flags & BL_APPLICATION_ENTRY_WINLOAD) + { + if (MiscGetBootOption(BootEntry->BcdData, BcdOSLoaderBoolean_AdvancedOptionsOneTime)) + { + BcdHandle = NULL; + Status = BmOpenDataStore(BcdHandle); + if (NT_SUCCESS(Status)) + { + ObjectId = BootEntry->Guid; + BmPurgeOption(BcdHandle, &ObjectId, BcdOSLoaderBoolean_AdvancedOptionsOneTime); + BmCloseDataStore(BcdHandle); + } + } + if (MiscGetBootOption(BootEntry->BcdData, BcdOSLoaderBoolean_OptionsEditOneTime)) + { + BcdHandle = NULL; + Status = BmOpenDataStore(BcdHandle); + if (NT_SUCCESS(Status)) + { + ObjectId = BootEntry->Guid; + BmPurgeOption(BcdHandle, &ObjectId, BcdOSLoaderBoolean_OptionsEditOneTime); + BmCloseDataStore(BcdHandle); + } + } + } + +TryAgain: + DoRecovery = FALSE; + Recover = FALSE; + BmpSelectedBootEntry = BootEntry; + + Status = BmpCreateDevices(BootEntry); + if (!NT_SUCCESS(Status)) + { + if (!LaunchWinRe) + { + return Status; + } + + LaunchCode = 2; + goto Quickie; + } + + if (BootEntry->Flags & BL_APPLICATION_ENTRY_WINLOAD) + { + Status = BlGetBootOptionBoolean(BootEntry->BcdData, BcdOSLoaderBoolean_AdvancedOptionsOneTime, &AdvancedOneTime); + if (NT_SUCCESS(Status)) + { + if (AdvancedOneTime) + { + BlAppendBootOptionBoolean(BootEntry, BcdLibraryBoolean_DisplayAdvancedOptions); + } + else + { + BlRemoveBootOption(BootEntry->BcdData, BcdLibraryBoolean_DisplayAdvancedOptions); + } + + BlRemoveBootOption(BootEntry->BcdData, BcdOSLoaderBoolean_AdvancedOptionsOneTime); + } + + Status = BlGetBootOptionBoolean(BootEntry->BcdData, BcdOSLoaderBoolean_OptionsEditOneTime, &EditOneTime); + if (NT_SUCCESS(Status)) + { + if (AdvancedOneTime) + { + BlAppendBootOptionBoolean(BootEntry, BcdLibraryBoolean_DisplayOptionsEdit); + } + else + { + BlRemoveBootOption(BootEntry->BcdData, BcdLibraryBoolean_DisplayOptionsEdit); + } + + BlRemoveBootOption(BootEntry->BcdData, BcdOSLoaderBoolean_OptionsEditOneTime); + } + } + + Status = BmpTransferExecution(BootEntry, &LaunchCode, &Recover); + if (!LaunchWinRe) + { + return Status; + } + + DoRecovery = Recover; + + if (((NT_SUCCESS(Status)) || (Status == STATUS_CANCELLED)) && !(Recover)) + { + return Status; + } + + if (!Recover) + { + LaunchCode = 2; + goto Quickie; + } + +Quickie: + if (MiscGetBootOption(BootEntry->BcdData, BcdLibraryObjectList_RecoverySequence)) + { + if ((LaunchCode == 3) || (LaunchCode == 5) || (LaunchCode == 6)) + { + Status = BlGetBootOptionBoolean(BootEntry->BcdData, BcdLibraryBoolean_AutoRecoveryEnabled, &AutoRecovery); + if (NT_SUCCESS(Status)) + { + DoRecovery = AutoRecovery; + } + } + } + else + { + DoRecovery = FALSE; + } + + RestartOnFailure = FALSE; + BlGetBootOptionBoolean(BlpApplicationEntry.BcdData, BcdLibraryBoolean_RestartOnFailure, &RestartOnFailure); + DoRestart = RestartOnFailure ? FALSE : DoRecovery; + while (1) + { + if (DoRestart) + { + if (AutoRecovery) + { + //BlFveRegisterBootEntryForTrustedWimBoot(BootEntry, TRUE); + } + + Status = BmLaunchRecoverySequence(BootEntry, LaunchCode); + + if (AutoRecovery) + { + //BlFveRegisterBootEntryForTrustedWimBoot(BootEntry, FALSE); + AutoRecovery = FALSE; + } + + if (NT_SUCCESS(Status)) + { + return STATUS_SUCCESS; + } + + BlRemoveBootOption(BootEntry->BcdData, BcdLibraryObjectList_RecoverySequence); + } + + if (!BmpInternalBootError) + { + BmFatalErrorEx(4, Status, 0, 0, 0); + } + + ErrorCode = BmDisplayDumpError(BootEntry, LaunchCode); + BmErrorPurge(); + + switch (ErrorCode) + { + case 6: + goto TryAgain; + case 5: + break; + case 4: + return STATUS_CANCELLED; + case 3: + Status = BmOpenDataStore(BcdHandle); + if (NT_SUCCESS(Status)) + { + Status = BmProcessCustomAction(BcdHandle, NULL); + } + if (BcdHandle) + { + BmCloseDataStore(BcdHandle); + } + return Status; + case 7: + BlAppendBootOptionBoolean(BootEntry, BcdOSLoaderBoolean_AdvancedOptionsOneTime); + goto TryAgain; + case 8: + BlAppendBootOptionBoolean(BootEntry, BcdOSLoaderBoolean_OptionsEditOneTime); + goto TryAgain; + case 2: + DoRestart = TRUE; + LaunchCode = 1; + goto TryAgain; + default: + return STATUS_CANCELLED; + } + } + + + + return STATUS_SUCCESS; } /*++ Modified: trunk/reactos/boot/environ/include/bcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bcd.h… ============================================================================== --- trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] Tue Jan 19 18:21:54 2016 @@ -92,6 +92,8 @@ BcdLibraryInteger_FveBandId = 0x1500004C, BcdLibraryBoolean_ConsoleExtendedInput = 0x16000050, BcdLibraryInteger_GraphicsResolution = 0x15000052, + BcdLibraryInteger_DisplayMessage = 0x15000065, /* Undocumented */ + BcdLibraryInteger_DisplayMessageOverride = 0x15000066, /* Undocumented */ BcdLibraryBoolean_RestartOnFailure = 0x16000053, BcdLibraryBoolean_GraphicsForceHighestMode = 0x16000054, BcdLibraryBoolean_IsolatedExecutionContext = 0x16000060, @@ -151,6 +153,7 @@ BcdOSLoaderInteger_DriverLoadFailurePolicy = 0x250000c1, BcdOSLoaderInteger_BootMenuPolicy = 0x250000C2, BcdOSLoaderBoolean_AdvancedOptionsOneTime = 0x260000C3, + BcdOSLoaderBoolean_OptionsEditOneTime = 0x260000C4, /* Undocumented */ BcdOSLoaderInteger_BootStatusPolicy = 0x250000E0, BcdOSLoaderBoolean_DisableElamDrivers = 0x260000E1, BcdOSLoaderInteger_HypervisorLaunchType = 0x250000F0, Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Tue Jan 19 18:21:54 2016 @@ -77,6 +77,7 @@ #define BL_APPLICATION_ENTRY_BOOTMGR 0x1000 #define BL_APPLICATION_ENTRY_DISPLAY_ORDER 0x800000 #define BL_APPLICATION_ENTRY_FIXED_SEQUENCE 0x20000000 +#define BL_APPLICATION_ENTRY_RECOVERY 0x40000000 #define BL_CONTEXT_PAGING_ON 1 #define BL_CONTEXT_INTERRUPTS_ON 2 @@ -110,6 +111,8 @@ #define BL_FS_REGISTER_AT_HEAD_FLAG 1 #define BL_BLOCK_DEVICE_REMOVABLE_FLAG 0x01 +#define BL_BLOCK_DEVICE_PRESENT_FLAG 0x02 +#define BL_BLOCK_DEVICE_VIRTUAL_FLAG 0x04 #define BL_MEMORY_CLASS_SHIFT 28 @@ -685,7 +688,9 @@ { ULONG Version; NTSTATUS Status; - ULONG ReturnArgumentData[5]; + ULONG Flags; + ULONGLONG DataSize; + ULONGLONG DataPage; } BL_RETURN_ARGUMENTS, *PBL_RETURN_ARGUMENTS; typedef struct _BL_MEMORY_DESCRIPTOR @@ -794,8 +799,10 @@ LARGE_INTEGER ImageSize; ULONG ImageOffset; } RamDisk; + + ULONG File; // unknown for now }; -} BL_LOCAL_DEVICE; +} BL_LOCAL_DEVICE, *PBL_LOCAL_DEVICE; typedef struct _BL_DEVICE_DESCRIPTOR { @@ -1317,6 +1324,11 @@ ); NTSTATUS +BlFwEnumerateDevice ( + _In_ PBL_DEVICE_DESCRIPTOR Device + ); + +NTSTATUS EfiAllocatePages ( _In_ ULONG Type, _In_ ULONG Pages, @@ -1774,6 +1786,19 @@ BlCopyBootOptions ( _In_ PBL_BCD_OPTION OptionList, _Out_ PBL_BCD_OPTION *CopiedOptions + ); + +NTSTATUS +BlAppendBootOptionBoolean ( + _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, + _In_ ULONG OptionId + ); + +NTSTATUS +BlAppendBootOptionInteger ( + _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, + _In_ ULONG OptionId, + _In_ ULONGLONG Value ); NTSTATUS @@ -2140,6 +2165,14 @@ _In_ PWCHAR FileName, _In_ ULONG Flags, _Out_ PULONG FileId + ); + +/* BLOCK I/O ROUTINES *******************************************************/ + +NTSTATUS +BlockIoEfiCompareDevice ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ EFI_HANDLE Handle ); /* INPUT CONSOLE ROUTINES ****************************************************/ Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… ============================================================================== --- trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] Tue Jan 19 18:21:54 2016 @@ -1047,6 +1047,42 @@ /* Call the EFI runtime */ EfiRT->ResetSystem(ResetType, EFI_SUCCESS, 0, NULL); +} + +NTSTATUS +EfiConnectController ( + _In_ EFI_HANDLE ControllerHandle + ) +{ + BL_ARCH_MODE OldMode; + EFI_STATUS EfiStatus; + + /* Is this EFI 1.02? */ + if (EfiST->Hdr.Revision == EFI_1_02_SYSTEM_TABLE_REVISION) + { + /* This function didn't exist back then */ + return STATUS_NOT_SUPPORTED; + } + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return STATUS_NOT_IMPLEMENTED; + } + + /* Make the EFI call */ + EfiStatus = EfiBS->ConnectController(ControllerHandle, NULL, NULL, TRUE); + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } + + /* Convert the error to an NTSTATUS */ + return EfiGetNtStatusCode(EfiStatus); } NTSTATUS @@ -1748,6 +1784,91 @@ return Status; } +NTSTATUS +BlFwEnumerateDevice ( + _In_ PBL_DEVICE_DESCRIPTOR Device + ) +{ + NTSTATUS Status; + ULONG PathProtocols, BlockProtocols; + EFI_HANDLE* PathArray; + EFI_HANDLE* BlockArray; + + /* Initialize locals */ + BlockArray = NULL; + PathArray = NULL; + PathProtocols = 0; + BlockProtocols = 0; + + /* Enumeration only makes sense on disks or partitions */ + if ((Device->DeviceType != DiskDevice) && + (Device->DeviceType != LegacyPartitionDevice) && + (Device->DeviceType != PartitionDevice)) + { + return STATUS_NOT_SUPPORTED; + } + + /* Enumerate the list of device paths */ + Status = EfiLocateHandleBuffer(ByProtocol, + &EfiDevicePathProtocol, + &PathProtocols, + &PathArray); + if (NT_SUCCESS(Status)) + { + /* Loop through each one */ + Status = STATUS_NOT_FOUND; + while (PathProtocols) + { + /* Attempt to connect the driver for this device epath */ + Status = EfiConnectController(PathArray[--PathProtocols]); + if (NT_SUCCESS(Status)) + { + /* Now enumerate any block I/O devices the driver added */ + Status = EfiLocateHandleBuffer(ByProtocol, + &EfiBlockIoProtocol, + &BlockProtocols, + &BlockArray); + if (!NT_SUCCESS(Status)) + { + break; + } + + /* Loop through each one */ + while (BlockProtocols) + { + /* Check if one of the new devices is the one we want */ + Status = BlockIoEfiCompareDevice(Device, + BlockArray[--BlockProtocols]); + if (NT_SUCCESS(Status)) + { + /* Yep, all done */ + goto Quickie; + } + } + + /* Move on to the next device path */ + BlMmFreeHeap(BlockArray); + BlockArray = NULL; + } + } + } + +Quickie: + /* We're done -- free the array of device path protocols, if any */ + if (PathArray) + { + BlMmFreeHeap(PathArray); + } + + /* We're done -- free the array of block I/O protocols, if any */ + if (BlockArray) + { + BlMmFreeHeap(BlockArray); + } + + /* Return if we found the device or not */ + return Status; +} /*++ * @name EfiGetEfiStatusCode Modified: trunk/reactos/boot/environ/lib/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/device… ============================================================================== --- trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] Tue Jan 19 18:21:54 2016 @@ -371,7 +371,7 @@ ) { PBL_BLOCK_DEVICE BlockDevice; - PVOID ReadBuffer; // edi@1 + PVOID ReadBuffer; ULONGLONG OffsetEnd, AlignedOffsetEnd, Offset; NTSTATUS Status; @@ -532,24 +532,32 @@ PBL_BLOCK_DEVICE BlockDevice; NTSTATUS Status; + /* Get the device-specific data, which is our block device descriptor */ BlockDevice = DeviceEntry->DeviceSpecificData; + /* Make sure that the buffer and size is valid */ Status = BlockIopBlockInformationCheck(BlockDevice, &Size, BytesRead, &Size); if (NT_SUCCESS(Status)) { - if (BlockDevice->DeviceFlags & 4) - { + /* Check if this is a virtual device or a physical device */ + if (BlockDevice->DeviceFlags & BL_BLOCK_DEVICE_VIRTUAL_FLAG) + { + /* Do a virtual read or write */ Status = BlockIopReadWriteVirtualDevice(DeviceEntry, Buffer, Size, 0, BytesRead); } else { + /* Do a physical read or write */ Status = BlockIopReadPhysicalDevice(DeviceEntry, Buffer, Size, BytesRead); } } else if (BytesRead) { + /* We failed, if the caller wanted bytes read, return 0 */ *BytesRead = 0; } + + /* Return back to the caller */ return Status; } @@ -564,16 +572,25 @@ BlockDevice = DeviceEntry->DeviceSpecificData; - Offset = DeviceInformation->BlockDeviceInfo.Block * BlockDevice->BlockSize + DeviceInformation->BlockDeviceInfo.Offset; + /* Take the current block number and block-offset and conver to full offset */ + Offset = DeviceInformation->BlockDeviceInfo.Block * BlockDevice->BlockSize + + DeviceInformation->BlockDeviceInfo.Offset; + + /* Make sure that the full offset is still within the bounds of the device */ if (Offset > ((BlockDevice->LastBlock + 1) * BlockDevice->BlockSize - 1)) { - EfiPrintf(L"Invalid offset\r\n"); + EfiPrintf(L"Offset out of bounds\r\n"); return STATUS_INVALID_PARAMETER; } + /* Convery the full raw offset into a block number and block-offset */ BlockDevice->Block = Offset / BlockDevice->BlockSize; BlockDevice->Offset = Offset % BlockDevice->BlockSize; + + /* Return the unknown */ BlockDevice->Unknown = DeviceInformation->BlockDeviceInfo.Unknown; + + /* All done */ return STATUS_SUCCESS; } @@ -583,13 +600,12 @@ _Out_ PBL_DEVICE_INFORMATION DeviceInformation ) { - PBL_BLOCK_DEVICE BlockDevice; - - BlockDevice = DeviceEntry->DeviceSpecificData; - + /* Copy the device speciifc data into the block device information */ RtlCopyMemory(&DeviceInformation->BlockDeviceInfo, - BlockDevice, - sizeof(DeviceInformation->BlockDeviceInfo)); + DeviceEntry->DeviceSpecificData, + sizeof(DeviceInformation->BlockDeviceInfo)); + + /* Hardcode the device type */ DeviceInformation->DeviceType = DiskDevice; return STATUS_SUCCESS; } @@ -732,22 +748,28 @@ ) { NTSTATUS Status; - BL_DEVICE_INFORMATION DeviceInformation; - - Status = BlDeviceGetInformation(DeviceId, &DeviceInformation); + BL_DEVICE_INFORMATION DeviceInfo; + + /* Get the current block and offset */ + Status = BlDeviceGetInformation(DeviceId, &DeviceInfo); if (!NT_SUCCESS(Status)) { return Status; } - DeviceInformation.BlockDeviceInfo.Block = Offset / DeviceInformation.BlockDeviceInfo.BlockSize; - DeviceInformation.BlockDeviceInfo.Offset = Offset % DeviceInformation.BlockDeviceInfo.BlockSize; - Status = BlDeviceSetInformation(DeviceId, &DeviceInformation); + /* Get the block and block-offset based on the new raw offset */ + DeviceInfo.BlockDeviceInfo.Block = Offset / DeviceInfo.BlockDeviceInfo.BlockSize; + DeviceInfo.BlockDeviceInfo.Offset = Offset % DeviceInfo.BlockDeviceInfo.BlockSize; + + /* Update the block and offset */ + Status = BlDeviceSetInformation(DeviceId, &DeviceInfo); if (NT_SUCCESS(Status)) { + /* Now issue a read, with this block and offset configured */ Status = BlDeviceRead(DeviceId, Buffer, Size, BytesRead); } + /* All good, return the caller */ return Status; } @@ -828,7 +850,7 @@ } if (Media->MediaPresent) { - BlockDevice->DeviceFlags |= 2; + BlockDevice->DeviceFlags |= BL_BLOCK_DEVICE_PRESENT_FLAG; } /* No clue */ @@ -1212,6 +1234,158 @@ } NTSTATUS +BlockIoEfiCompareDevice ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ EFI_HANDLE Handle + ) +{ + PBL_LOCAL_DEVICE LocalDeviceInfo, EfiLocalDeviceInfo; + PBL_DEVICE_ENTRY DeviceEntry; + PBL_DEVICE_DESCRIPTOR EfiDevice; + NTSTATUS Status; + + DeviceEntry = NULL; + + /* Check if no device was given */ + if (!Device) + { + /* Fail the comparison */ + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Check if this is a local disk device */ + if (Device->DeviceType != DiskDevice) + { + /* Nope -- is it a partition device? */ + if ((Device->DeviceType != LegacyPartitionDevice) && + (Device->DeviceType != PartitionDevice)) + { + /* Nope, so we can't compare */ + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* If so, return the device information for the parent disk */ + LocalDeviceInfo = &Device->Partition.Disk; + } + else + { + /* Just return the disk information itself */ + LocalDeviceInfo = &Device->Local; + } + + /* Create an EFI device entry for the EFI device handle */ + Status = BlockIoEfiCreateDeviceEntry(&DeviceEntry, Handle); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Read the descriptor and assume failure for now */ + EfiDevice = DeviceEntry->DeviceDescriptor; + Status = STATUS_UNSUCCESSFUL; + + /* Check if the EFI device is a disk */ + if (EfiDevice->DeviceType != DiskDevice) + { + /* Nope, is it a partition? */ + if ((EfiDevice->DeviceType != LegacyPartitionDevice) && + (EfiDevice->DeviceType != PartitionDevice)) + { + /* Neither, invalid handle so bail out */ + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Yes, so get the information of the parent disk */ + EfiLocalDeviceInfo = &EfiDevice->Partition.Disk; + } + else + { + /* It's a disk, so get the disk information itself */ + EfiLocalDeviceInfo = &EfiDevice->Local; + } + + /* Are the two devices the same type? */ + if (EfiLocalDeviceInfo->Type != LocalDeviceInfo->Type) + { + /* Nope, that was easy */ + goto Quickie; + } + + /* Yes, what kind of device is the EFI side? */ + switch (EfiLocalDeviceInfo->Type) + { + case LocalDevice: + + /* Local hard drive, compare the signature */ + if (RtlCompareMemory(&EfiLocalDeviceInfo->HardDisk, + &LocalDeviceInfo->HardDisk, + sizeof(LocalDeviceInfo->HardDisk)) == + sizeof(LocalDeviceInfo->HardDisk)) + { + Status = STATUS_SUCCESS; + } + break; + + case FloppyDevice: + case CdRomDevice: + + /* Removable floppy or CD, compare the disk number */ + if (RtlCompareMemory(&EfiLocalDeviceInfo->FloppyDisk, + &LocalDeviceInfo->FloppyDisk, + sizeof(LocalDeviceInfo->FloppyDisk)) == + sizeof(LocalDeviceInfo->FloppyDisk)) + { + Status = STATUS_SUCCESS; + } + break; + + case RamDiskDevice: + + /* RAM disk, compare the size and base information */ + if (RtlCompareMemory(&EfiLocalDeviceInfo->RamDisk, + &LocalDeviceInfo->RamDisk, + sizeof(LocalDeviceInfo->RamDisk)) == + sizeof(LocalDeviceInfo->RamDisk)) + { + Status = STATUS_SUCCESS; + } + break; + + case FileDevice: + + /* File, compare the file identifier */ + if (RtlCompareMemory(&EfiLocalDeviceInfo->File, + &LocalDeviceInfo->File, + sizeof(LocalDeviceInfo->File)) == + sizeof(LocalDeviceInfo->File)) + { + Status = STATUS_SUCCESS; + } + break; + + /* Something else we don't support */ + default: + break; + } + +Quickie: + /* All done, did we have an EFI device entry? */ + if (DeviceEntry) + { + /* Free it, since we only needed it locally for comparison */ + BlMmFreeHeap(DeviceEntry->DeviceDescriptor); + BlockIopFreeAllocations(DeviceEntry->DeviceSpecificData); + BlMmFreeHeap(DeviceEntry); + } + + /* Return back to the caller */ + return Status; +} + +NTSTATUS BlockIoFirmwareOpen ( _In_ PBL_DEVICE_DESCRIPTOR Device, _In_ PBL_BLOCK_DEVICE BlockIoDevice Modified: trunk/reactos/boot/environ/lib/misc/bcdopt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcdo… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcdopt.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcdopt.c [iso-8859-1] Tue Jan 19 18:21:54 2016 @@ -622,6 +622,69 @@ } NTSTATUS +BlAppendBootOptionBoolean ( + _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, + _In_ ULONG OptionId + ) +{ + NTSTATUS Status; + PBL_BCD_OPTION Option; + + /* Allocate space for the entry -- remember BOOLEANs are USHORTs in BCD */ + Option = BlMmAllocateHeap(sizeof(*Option) + sizeof(USHORT)); + if (!Option) + { + return STATUS_NO_MEMORY; + } + + /* Initialize it and set the boolean to TRUE */ + RtlZeroMemory(Option, sizeof(*Option) + sizeof(USHORT)); + Option->DataSize = sizeof(USHORT); + Option->Type = OptionId; + Option->DataOffset = sizeof(*Option); + *(PBOOLEAN)(Option + 1) = TRUE; + + /* Append it */ + Status = BlAppendBootOptions(AppEntry, Option); + + /* We're all done, free our initial option */ + BlMmFreeHeap(Option); + return Status; +} + +NTSTATUS +BlAppendBootOptionInteger ( + _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, + _In_ ULONG OptionId, + _In_ ULONGLONG Value + ) +{ + NTSTATUS Status; + PBL_BCD_OPTION Option; + + /* Allocate space for the entry */ + Option = BlMmAllocateHeap(sizeof(*Option) + sizeof(Value)); + if (!Option) + { + return STATUS_NO_MEMORY; + } + + /* Initialize it and set the integer to the given value */ + RtlZeroMemory(Option, sizeof(*Option) + sizeof(Value)); + Option->DataSize = sizeof(Value); + Option->Type = OptionId; + Option->DataOffset = sizeof(*Option); + *(PULONGLONG)(Option + 1) = Value; + + /* Append it */ + Status = BlAppendBootOptions(AppEntry, Option); + + /* We're all done, free our initial option */ + BlMmFreeHeap(Option); + return Status; +} + +NTSTATUS BlAppendBootOptionString ( _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, _In_ PWCHAR OptionString

1 0

[akhaldi] 70617: [0.4.0] * Merge Erdem Ersoy's Turkish translation update in r70616 except mmc and userinit. CORE-10805
by akhaldi＠svn.reactos.org 18 Jan '16

18 Jan '16

Author: akhaldi Date: Mon Jan 18 19:25:52 2016 New Revision: 70617 URL: http://svn.reactos.org/svn/reactos?rev=70617&view=rev Log: [0.4.0] * Merge Erdem Ersoy's Turkish translation update in r70616 except mmc and userinit. CORE-10805 Modified: branches/ros-branch-0_4_0/reactos/base/applications/calc/lang/tr-TR.rc branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/lang/tr-TR.rc branches/ros-branch-0_4_0/reactos/base/applications/games/spider/lang/tr-TR.rc branches/ros-branch-0_4_0/reactos/base/applications/games/winmine/lang/tr-TR.rc branches/ros-branch-0_4_0/reactos/base/applications/magnify/lang/tr-TR.rc branches/ros-branch-0_4_0/reactos/base/applications/mplay32/lang/tr-TR.rc branches/ros-branch-0_4_0/reactos/base/applications/mspaint/lang/tr-TR.rc branches/ros-branch-0_4_0/reactos/base/applications/notepad/lang/tr-TR.rc branches/ros-branch-0_4_0/reactos/base/applications/rapps/lang/tr-TR.rc branches/ros-branch-0_4_0/reactos/base/applications/rapps_new/lang/tr-TR.rc branches/ros-branch-0_4_0/reactos/base/applications/regedit/lang/tr-TR.rc branches/ros-branch-0_4_0/reactos/base/applications/taskmgr/lang/tr-TR.rc branches/ros-branch-0_4_0/reactos/base/applications/wordpad/lang/tr-TR.rc branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/lang/tr-TR.rc Modified: branches/ros-branch-0_4_0/reactos/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/calc/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/calc/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -327,8 +327,8 @@ BEGIN POPUP "&DÃ¼zen" BEGIN - MENUITEM "&ÃoÄalt\tCtrl+C", IDM_EDIT_COPY - MENUITEM "&YapÄ±ÅtÄ±r\tCtrl+V", IDM_EDIT_PASTE + MENUITEM "&ÃoÄalt\tDenetim+C", IDM_EDIT_COPY + MENUITEM "&YapÄ±ÅtÄ±r\tDenetim+V", IDM_EDIT_PASTE END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN @@ -336,14 +336,14 @@ MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC MENUITEM "&DÃ¶nÃ¼ÅtÃ¼rme", IDM_VIEW_CONVERSION MENUITEM SEPARATOR - MENUITEM "&OnaltÄ±lÄ±k\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "O&nluk\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "&Sekizlik\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "&Ä°kilik\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "D&erece\tF2", IDM_VIEW_DEG, CHECKED - MENUITEM "&Radyan\tF3", IDM_VIEW_RAD, CHECKED - MENUITEM "&Gradyan\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM "&OnaltÄ±lÄ±k\tÄ°5", IDM_VIEW_HEX, CHECKED + MENUITEM "O&nluk\tÄ°6", IDM_VIEW_DEC, CHECKED + MENUITEM "&Sekizlik\tÄ°7", IDM_VIEW_OCT, CHECKED + MENUITEM "&Ä°kilik\tÄ°8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "D&erece\tÄ°2", IDM_VIEW_DEG, CHECKED + MENUITEM "&Radyan\tÄ°3", IDM_VIEW_RAD, CHECKED + MENUITEM "&Gradyan\tÄ°4", IDM_VIEW_GRAD, CHECKED MENUITEM SEPARATOR MENUITEM "B&asamaklarÄ± TakÄ±mla", IDM_VIEW_GROUP, CHECKED END @@ -359,8 +359,8 @@ BEGIN POPUP "&DÃ¼zen" BEGIN - MENUITEM "&ÃoÄalt\tCtrl+C", IDM_EDIT_COPY - MENUITEM "&YapÄ±ÅtÄ±r\tCtrl+V", IDM_EDIT_PASTE + MENUITEM "&ÃoÄalt\tDenetim+C", IDM_EDIT_COPY + MENUITEM "&YapÄ±ÅtÄ±r\tDenetim+V", IDM_EDIT_PASTE END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN @@ -368,15 +368,15 @@ MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC MENUITEM "&DÃ¶nÃ¼ÅtÃ¼rme", IDM_VIEW_CONVERSION MENUITEM SEPARATOR - MENUITEM "&OnaltÄ±lÄ±k\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "O&nluk\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "&Sekizlik\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "&Ä°kilik\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "DÃ¶&rtlÃ¼ SÃ¶zcÃ¼k\tF12", IDM_VIEW_QWORD, CHECKED - MENUITEM "Ä°&kili SÃ¶zcÃ¼k\tF2", IDM_VIEW_DWORD, CHECKED - MENUITEM "SÃ¶&zcÃ¼k\tF3", IDM_VIEW_WORD, CHECKED - MENUITEM "&Ãoklu\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM "&OnaltÄ±lÄ±k\tÄ°5", IDM_VIEW_HEX, CHECKED + MENUITEM "O&nluk\tÄ°6", IDM_VIEW_DEC, CHECKED + MENUITEM "&Sekizlik\tÄ°7", IDM_VIEW_OCT, CHECKED + MENUITEM "&Ä°kilik\tÄ°8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "DÃ¶&rtlÃ¼ SÃ¶zcÃ¼k\tÄ°12", IDM_VIEW_QWORD, CHECKED + MENUITEM "Ä°&kili SÃ¶zcÃ¼k\tÄ°2", IDM_VIEW_DWORD, CHECKED + MENUITEM "SÃ¶&zcÃ¼k\tÄ°3", IDM_VIEW_WORD, CHECKED + MENUITEM "&Ãoklu\tÄ°4", IDM_VIEW_BYTE, CHECKED MENUITEM SEPARATOR MENUITEM "B&asamaklarÄ± TakÄ±mla", IDM_VIEW_GROUP, CHECKED END @@ -392,8 +392,8 @@ BEGIN POPUP "&DÃ¼zen" BEGIN - MENUITEM "&ÃoÄalt\tCtrl+C", IDM_EDIT_COPY - MENUITEM "&YapÄ±ÅtÄ±r\tCtrl+V", IDM_EDIT_PASTE + MENUITEM "&ÃoÄalt\tDenetim+C", IDM_EDIT_COPY + MENUITEM "&YapÄ±ÅtÄ±r\tDenetim+V", IDM_EDIT_PASTE END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN Modified: branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -3,7 +3,7 @@ * LICENSE: Freeware, permission to use under Public Domain * FILE: base/applications/games/solitaire/lang/tr-TR.rc * PURPOSE: Turkish Resource File for ReactOS Solitaire - * TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -69,7 +69,7 @@ BEGIN POPUP "&Oyun" BEGIN - MENUITEM "&DaÄÄ±t\tF2", IDM_GAME_NEW + MENUITEM "&DaÄÄ±t\tÄ°2", IDM_GAME_NEW MENUITEM SEPARATOR MENUITEM "D&esteler...", IDM_GAME_DECK MENUITEM "&SeÃ§enekler...", IDM_GAME_OPTIONS @@ -78,7 +78,7 @@ END POPUP "&YardÄ±m" BEGIN - MENUITEM "&Ä°Ã§indekiler\tF1", IDM_HELP_CONTENTS + MENUITEM "&Ä°Ã§indekiler\tÄ°1", IDM_HELP_CONTENTS MENUITEM "&Ãzerine...", IDM_HELP_ABOUT END END Modified: branches/ros-branch-0_4_0/reactos/base/applications/games/spider/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/games/spider/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/games/spider/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -3,7 +3,7 @@ * LICENSE: See COPYING in top level directory * FILE: base/applications/games/spider/lang/tr-TR.rc * PURPOSE: Turkish Resource File for ReactOS Spider Solitaire - * TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -60,7 +60,7 @@ BEGIN POPUP "&Oyun" BEGIN - MENUITEM "&DaÄÄ±t\tF2", IDM_GAME_NEW + MENUITEM "&DaÄÄ±t\tÄ°2", IDM_GAME_NEW MENUITEM SEPARATOR MENUITEM "D&esteler...", IDM_GAME_DECK MENUITEM SEPARATOR @@ -68,7 +68,7 @@ END POPUP "&YardÄ±m" BEGIN - MENUITEM "&Ä°Ã§indekiler\tF1", IDM_HELP_CONTENTS + MENUITEM "&Ä°Ã§indekiler\tÄ°1", IDM_HELP_CONTENTS MENUITEM "&Ãzerine...", IDM_HELP_ABOUT END END Modified: branches/ros-branch-0_4_0/reactos/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/games/winmine/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/games/winmine/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -1,4 +1,4 @@ -/* TRANSLATORS: 2006 Fatih AÅÄ±cÄ±, 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATORS: 2006 Fatih AÅÄ±cÄ±, 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -13,7 +13,7 @@ BEGIN POPUP "&SeÃ§enekler" BEGIN - MENUITEM "&Yeni Oyun\tF2", IDM_NEW + MENUITEM "&Yeni Oyun\tÄ°2", IDM_NEW MENUITEM SEPARATOR MENUITEM "&Soru Ä°miyle Ä°mleme", IDM_MARKQ MENUITEM SEPARATOR @@ -22,7 +22,7 @@ MENUITEM "&Usta", IDM_EXPERT MENUITEM "&HusÃ»sÃ®...", IDM_CUSTOM MENUITEM SEPARATOR - MENUITEM "&ÃÄ±kÄ±Å\tAlt+X", IDM_EXIT + MENUITEM "&ÃÄ±kÄ±Å\tSeÃ§enek+X", IDM_EXIT END POPUP "&YardÄ±m" BEGIN Modified: branches/ros-branch-0_4_0/reactos/base/applications/magnify/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/magnify/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/magnify/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/magnify/lang/tr-TR.rc * PURPOSE: Turkish Resource File for RecatOS Magnifier - * TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * TRANSLATOR: 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -41,7 +41,7 @@ CAPTION "SeÃ§enekler" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "&ÃÄ±kÄ±Å", IDOK, 96, 161, 50, 14 + DEFPUSHBUTTON "Tamam", IDOK, 96, 161, 50, 14 PUSHBUTTON "&YardÄ±m", IDC_BUTTON_HELP, 38, 161, 50, 14 LTEXT "&BÃ¼yÃ¼tme DÃ¼zeyi:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 72, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP Modified: branches/ros-branch-0_4_0/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -6,17 +6,17 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&AÃ§...\tCtrl+O", IDM_OPEN_FILE - MENUITEM "&Kapat\tCtrl+W", IDM_CLOSE_FILE + MENUITEM "&AÃ§...\tDenetim+O", IDM_OPEN_FILE + MENUITEM "&Kapat\tDenetim+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", IDM_EXIT END POPUP "&Oynat" BEGIN - MENUITEM "&Oynat ya da Duraklat\tCtrl+P", IDC_PLAY - MENUITEM "&Durdur\tCtrl+S", IDC_STOP + MENUITEM "&Oynat ya da Duraklat\tDenetim+P", IDC_PLAY + MENUITEM "&Durdur\tDenetim+S", IDC_STOP MENUITEM SEPARATOR - MENUITEM "&Yinele\tCtrl+T", IDM_REPEAT + MENUITEM "&Yinele\tDenetim+T", IDM_REPEAT END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN Modified: branches/ros-branch-0_4_0/reactos/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -3,7 +3,7 @@ * LICENSE: LGPL * FILE: base/applications/mspaint/lang/tr-TR.rc * PURPOSE: Turkish Resource file for ReactOS Paint - * TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -12,40 +12,40 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&Yeni\tCtrl+N", IDM_FILENEW - MENUITEM "&AÃ§...\tCtrl+O", IDM_FILEOPEN - MENUITEM "&Sakla\tCtrl+S", IDM_FILESAVE + MENUITEM "&Yeni\tDenetim+N", IDM_FILENEW + MENUITEM "&AÃ§...\tDenetim+O", IDM_FILEOPEN + MENUITEM "&Sakla\tDenetim+S", IDM_FILESAVE MENUITEM "Ay&rÄ± Sakla...", IDM_FILESAVEAS MENUITEM SEPARATOR MENUITEM "Sayfa GÃ¶rÃ¼nÃ¼mÃ¼", IDM_FILEPAGEVIEW MENUITEM "Sayfa Ayarla...", IDM_FILEPAGESETUP - MENUITEM "YazdÄ±r...\tCtrl+P", IDM_FILEPRINT + MENUITEM "YazdÄ±r...\tDenetim+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "&DÃ¶Åeyerek Duvar KaÄÄ±dÄ± Yap", IDM_FILEASWALLPAPERPLANE MENUITEM "&Ortalayarak Duvar KaÄÄ±dÄ± Yap", IDM_FILEASWALLPAPERCENTERED MENUITEM "&Uzatarak Duvar KaÄÄ±dÄ± Yap", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR - MENUITEM "&ÃÄ±kÄ±Å\tAlt+F4", IDM_FILEEXIT + MENUITEM "&ÃÄ±kÄ±Å\tSeÃ§enek+F4", IDM_FILEEXIT END POPUP "&DÃ¼zen" BEGIN - MENUITEM "&Geri Al\tCtrl+Z", IDM_EDITUNDO - MENUITEM "&Yinele\tCtrl+Y", IDM_EDITREDO - MENUITEM SEPARATOR - MENUITEM "&Kes\tCtrl+X", IDM_EDITCUT - MENUITEM "Ã&oÄalt\tCtrl+C", IDM_EDITCOPY - MENUITEM "Y&apÄ±ÅtÄ±r\tCtrl+V", IDM_EDITPASTE - MENUITEM "&SeÃ§imi Sil\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Geri Al\tDenetim+Z", IDM_EDITUNDO + MENUITEM "&Yinele\tDenetim+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "&Kes\tDenetim+X", IDM_EDITCUT + MENUITEM "Ã&oÄalt\tDenetim+C", IDM_EDITCOPY + MENUITEM "Y&apÄ±ÅtÄ±r\tDenetim+V", IDM_EDITPASTE + MENUITEM "&SeÃ§imi Sil\tSil", IDM_EDITDELETESELECTION MENUITEM "S&eÃ§imi Evir", IDM_EDITINVERTSELECTION - MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§\tDenetim+A", IDM_EDITSELECTALL MENUITEM SEPARATOR MENUITEM "Se&Ã§imi Åuraya ÃoÄalt...", IDM_EDITCOPYTO MENUITEM "&Åuradan YapÄ±ÅtÄ±r...", IDM_EDITPASTEFROM END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN - MENUITEM "&AraÃ§ ÃubuÄu\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED - MENUITEM "&Renklik\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "&AraÃ§ ÃubuÄu\tDenetim+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "&Renklik\tDenetim+L", IDM_VIEWCOLORPALETTE, CHECKED MENUITEM "&Durum ÃubuÄu", IDM_VIEWSTATUSBAR, CHECKED MENUITEM "&Metin ÃubuÄu", IDM_FORMATICONBAR, CHECKED, GRAYED MENUITEM SEPARATOR @@ -62,19 +62,19 @@ MENUITEM "%800", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "K&Ä±lavuzu GÃ¶ster\tCtrl+G", IDM_VIEWSHOWGRID + MENUITEM "K&Ä±lavuzu GÃ¶ster\tDenetim+G", IDM_VIEWSHOWGRID MENUITEM "K&Ã¼Ã§Ã¼ÄÃ¼nÃ¼ GÃ¶ster", IDM_VIEWSHOWMINIATURE END - MENUITEM "&TÃ¼m GÃ¶rÃ¼ntÃ¼lÃ¼k\tCtrl+F", IDM_VIEWFULLSCREEN + MENUITEM "&TÃ¼m GÃ¶rÃ¼ntÃ¼lÃ¼k\tDenetim+F", IDM_VIEWFULLSCREEN END POPUP "&Resim" BEGIN - MENUITEM "&DÃ¶ndÃ¼r ya da Evir...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Yeniden BoyutlandÄ±r veyÃ¢ EÄ...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&DÃ¶ndÃ¼r ya da Evir...\tDenetim+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Yeniden BoyutlandÄ±r veyÃ¢ EÄ...\tDenetim+W", IDM_IMAGESTRETCHSKEW MENUITEM "&KÄ±rp", IDM_IMAGECROP - MENUITEM "&Renkleri Evir\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "&Ãz Nitelikler...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "R&esmi ArÄ±t\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Renkleri Evir\tDenetim+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Ãz Nitelikler...\tDenetim+E", IDM_IMAGEATTRIBUTES + MENUITEM "R&esmi ArÄ±t\tDenetim+Ãst Damga+N", IDM_IMAGEDELETEIMAGE MENUITEM "D&onuk Ãiz", IDM_IMAGEDRAWOPAQUE END POPUP "R&enkler" Modified: branches/ros-branch-0_4_0/reactos/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -1,4 +1,4 @@ -/* TRANSLATORS: 2012 Arda TanrÄ±kulu (ardatan) (ardatanrikulu(a)gmail.com), 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATORS: 2012 Arda TanrÄ±kulu (ardatan) (ardatanrikulu(a)gmail.com), 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -24,32 +24,32 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&Yeni\tCtrl+N", CMD_NEW - MENUITEM "&AÃ§...\tCtrl+O", CMD_OPEN - MENUITEM "&Sakla\tCtrl+S", CMD_SAVE + MENUITEM "&Yeni\tDenetim+N", CMD_NEW + MENUITEM "&AÃ§...\tDenetim+O", CMD_OPEN + MENUITEM "&Sakla\tDenetim+S", CMD_SAVE MENUITEM "Ay&rÄ± Sakla...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "Say&fa Ayarla...", CMD_PAGE_SETUP - MENUITEM "Ya&zdÄ±r...\tCtrl+P", CMD_PRINT + MENUITEM "Ya&zdÄ±r...\tDenetim+P", CMD_PRINT MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", CMD_EXIT END POPUP "&DÃ¼zen" BEGIN - MENUITEM "&Geri Al\tCtrl+Z", CMD_UNDO + MENUITEM "&Geri Al\tDenetim+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "&Kes\tCtrl+X", CMD_CUT - MENUITEM "&ÃoÄalt\tCtrl+C", CMD_COPY - MENUITEM "&YapÄ±ÅtÄ±r\tCtrl+V", CMD_PASTE - MENUITEM "&Sil\tDel", CMD_DELETE + MENUITEM "&Kes\tDenetim+X", CMD_CUT + MENUITEM "&ÃoÄalt\tDenetim+C", CMD_COPY + MENUITEM "&YapÄ±ÅtÄ±r\tDenetim+V", CMD_PASTE + MENUITEM "&Sil\tSil", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "&Bul...\tCtrl+F", CMD_SEARCH - MENUITEM "S&onrakini Bul\tF3", CMD_SEARCH_NEXT - MENUITEM "&DeÄiÅtir...\tCtrl+H", CMD_REPLACE - MENUITEM "G&it...\tCtrl+G", CMD_GOTO + MENUITEM "&Bul...\tDenetim+F", CMD_SEARCH + MENUITEM "S&onrakini Bul\tÄ°3", CMD_SEARCH_NEXT + MENUITEM "&DeÄiÅtir...\tDenetim+H", CMD_REPLACE + MENUITEM "G&it...\tDenetim+G", CMD_GOTO MENUITEM SEPARATOR - MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Åimdiki ZamÃ¢nÄ± Koy\tF5", CMD_TIME_DATE + MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§\tDenetim+A", CMD_SELECT_ALL + MENUITEM "&Åimdiki ZamÃ¢nÄ± Koy\tÄ°5", CMD_TIME_DATE END POPUP "&BiÃ§im" BEGIN Modified: branches/ros-branch-0_4_0/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -12,19 +12,19 @@ END POPUP "Y&azÄ±lÄ±m" BEGIN - MENUITEM "&Kur\tCtrl+Enter", ID_INSTALL - MENUITEM "K&aldÄ±r\tCtrl+Del", ID_UNINSTALL + MENUITEM "&Kur\tDenetim+GiriÅ", ID_INSTALL + MENUITEM "K&aldÄ±r\tDenetim+Sil", ID_UNINSTALL MENUITEM "&DeÄiÅtir", ID_MODIFY MENUITEM SEPARATOR MENUITEM "&GiriÅi DeÄer Defteri'nden KaldÄ±r", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "&Yenile\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tCtrl+F5", ID_RESETDB + MENUITEM "&Yenile\tÄ°5", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tDenetim+Ä°5", ID_RESETDB END POPUP "&YardÄ±m" BEGIN - MENUITEM "&YardÄ±m\tF1", ID_HELP, GRAYED + MENUITEM "&YardÄ±m\tÄ°1", ID_HELP, GRAYED MENUITEM "&Ãzerine...", ID_ABOUT END END @@ -42,15 +42,15 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "&Kur\tCtrl+Enter", ID_INSTALL - MENUITEM "K&aldÄ±r\tCtrl+Del", ID_UNINSTALL + MENUITEM "&Kur\tDenetim+GiriÅ", ID_INSTALL + MENUITEM "K&aldÄ±r\tDenetim+Sil", ID_UNINSTALL MENUITEM "&DeÄiÅtir", ID_MODIFY MENUITEM SEPARATOR MENUITEM "&GiriÅi DeÄer Defteri'nden KaldÄ±r", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "&Yenile\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tCtrl+F5", ID_RESETDB + MENUITEM "&Yenile\tÄ°5", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tDenetim+Ä°5", ID_RESETDB END END Modified: branches/ros-branch-0_4_0/reactos/base/applications/rapps_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/rapps_new/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/rapps_new/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -12,19 +12,19 @@ END POPUP "Y&azÄ±lÄ±m" BEGIN - MENUITEM "&Kur\tCtrl+Enter", ID_INSTALL - MENUITEM "K&aldÄ±r\tCtrl+Del", ID_UNINSTALL + MENUITEM "&Kur\tDenetim+GiriÅ", ID_INSTALL + MENUITEM "K&aldÄ±r\tDenetim+Sil", ID_UNINSTALL MENUITEM "&DeÄiÅtir", ID_MODIFY MENUITEM SEPARATOR MENUITEM "&GiriÅi DeÄer Defteri'nden KaldÄ±r", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "&Yenile\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tCtrl+F5", ID_RESETDB + MENUITEM "&Yenile\tÄ°5", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tDenetim+Ä°5", ID_RESETDB END POPUP "&YardÄ±m" BEGIN - MENUITEM "&YardÄ±m\tF1", ID_HELP, GRAYED + MENUITEM "&YardÄ±m\tÄ°1", ID_HELP, GRAYED MENUITEM "&Ãzerine...", ID_ABOUT END END @@ -42,15 +42,15 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "&Kur\tCtrl+Enter", ID_INSTALL - MENUITEM "K&aldÄ±r\tCtrl+Del", ID_UNINSTALL + MENUITEM "&Kur\tDenetim+GiriÅ", ID_INSTALL + MENUITEM "K&aldÄ±r\tDenetim+Sil", ID_UNINSTALL MENUITEM "&DeÄiÅtir", ID_MODIFY MENUITEM SEPARATOR MENUITEM "&GiriÅi DeÄer Defteri'nden KaldÄ±r", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "&Yenile\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tCtrl+F5", ID_RESETDB + MENUITEM "&Yenile\tÄ°5", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tDenetim+Ä°5", ID_RESETDB END END Modified: branches/ros-branch-0_4_0/reactos/base/applications/regedit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/regedit/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/regedit/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -39,7 +39,7 @@ MENUITEM "A&Ädaki DeÄer Defteri'ne BaÄlan...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "AÄ&daki DeÄer Defteri'ne BaÄlantÄ±yÄ± Kes...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR - MENUITEM "Ya&zdÄ±r...\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM "Ya&zdÄ±r...\tDenetim+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", ID_REGISTRY_EXIT END @@ -60,13 +60,13 @@ MENUITEM SEPARATOR MENUITEM "&Ä°zinler...", ID_EDIT_PERMISSIONS MENUITEM SEPARATOR - MENUITEM "&Sil\tDel", ID_EDIT_DELETE + MENUITEM "&Sil\tSil", ID_EDIT_DELETE MENUITEM "&AdÄ±nÄ± DeÄiÅtir", ID_EDIT_RENAME MENUITEM SEPARATOR MENUITEM "Di&zin Yolunu ÃoÄalt", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&Bul...\tCtrl+F", ID_EDIT_FIND - MENUITEM "S&onrakini Bul\tF3", ID_EDIT_FINDNEXT + MENUITEM "&Bul...\tDenetim+F", ID_EDIT_FIND + MENUITEM "S&onrakini Bul\tÄ°3", ID_EDIT_FINDNEXT END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN @@ -74,7 +74,7 @@ MENUITEM SEPARATOR MENUITEM "&BÃ¶l", ID_VIEW_SPLIT MENUITEM SEPARATOR - MENUITEM "&Yenile\tF5", ID_VIEW_REFRESH + MENUITEM "&Yenile\tÄ°5", ID_VIEW_REFRESH END POPUP "Y&er Ä°mleri" BEGIN @@ -83,7 +83,7 @@ END POPUP "&YardÄ±m" BEGIN - MENUITEM "&YardÄ±m KonularÄ±\tF1", ID_HELP_HELPTOPICS + MENUITEM "&YardÄ±m KonularÄ±\tÄ°1", ID_HELP_HELPTOPICS MENUITEM SEPARATOR MENUITEM "&DeÄer Defteri DÃ¼zenleyicisi Ãzerine...", ID_HELP_ABOUT END @@ -96,7 +96,7 @@ MENUITEM "&DeÄiÅtir...", ID_EDIT_MODIFY MENUITEM "&Ä°kili Veriyi DeÄiÅtir...", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR - MENUITEM "&Sil\tDel", ID_EDIT_DELETE + MENUITEM "&Sil\tSil", ID_EDIT_DELETE MENUITEM "&AdÄ±nÄ± DeÄiÅtir", ID_EDIT_RENAME END POPUP "" Modified: branches/ros-branch-0_4_0/reactos/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -55,8 +55,8 @@ MENUITEM "&Kapat", ID_SHUTDOWN_POWEROFF MENUITEM "&Yeniden BaÅlat", ID_SHUTDOWN_REBOOT MENUITEM """%s"" &Oturumunu Kapat", ID_SHUTDOWN_LOGOFF - MENUITEM "Ku&llanÄ±cÄ± DeÄiÅtir\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "&BilgisayarÄ± Kilitle\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "Ku&llanÄ±cÄ± DeÄiÅtir\tROS+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "&BilgisayarÄ± Kilitle\tROS+L", ID_SHUTDOWN_LOCKCOMPUTER MENUITEM "Ba&ÄlantÄ±yÄ± Kes", ID_SHUTDOWN_DISCONNECT, GRAYED MENUITEM "B&ilgisayarÄ± ÃÄ±kar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END Modified: branches/ros-branch-0_4_0/reactos/base/applications/wordpad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/wordpad/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/wordpad/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -1,7 +1,7 @@ /* * Turkish Resources for ReactOS Wordpad * - * Copyrights: 2006 Fatih AÅÄ±cÄ± (fasici(a)linux-sevenler.org), 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * Copyrights: 2006 Fatih AÅÄ±cÄ± (fasici(a)linux-sevenler.org), 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,12 +24,12 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&Yeni...\tCtrl+N", ID_FILE_NEW - MENUITEM "&AÃ§...\tCtrl+O", ID_FILE_OPEN - MENUITEM "&Sakla\tCtrl+S", ID_FILE_SAVE + MENUITEM "&Yeni...\tDenetim+N", ID_FILE_NEW + MENUITEM "&AÃ§...\tDenetim+O", ID_FILE_OPEN + MENUITEM "&Sakla\tDenetim+S", ID_FILE_SAVE MENUITEM "Ay&rÄ± Sakla...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "Ya&zdÄ±r...\tCtrl+P", ID_PRINT + MENUITEM "Ya&zdÄ±r...\tDenetim+P", ID_PRINT MENUITEM "Yaz&dÄ±rma Ãn Ä°zlemesi...", ID_PREVIEW MENUITEM "Say&fa Ayarla...", ID_PRINTSETUP MENUITEM SEPARATOR @@ -37,18 +37,18 @@ END POPUP "&DÃ¼zen" BEGIN - MENUITEM "&Geri Al\tCtrl+Z", ID_EDIT_UNDO - MENUITEM "&Yinele\tCtrl+Y", ID_EDIT_REDO - MENUITEM SEPARATOR - MENUITEM "&Kes\tCtrl+X", ID_EDIT_CUT - MENUITEM "&ÃoÄalt\tCtrl+C", ID_EDIT_COPY - MENUITEM "Y&apÄ±ÅtÄ±r\tCtrl+V", ID_EDIT_PASTE - MENUITEM "&Sil\tDel", ID_EDIT_CLEAR - MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§\tCtrl+A", ID_EDIT_SELECTALL - MENUITEM SEPARATOR - MENUITEM "&Bul...\tCtrl+F", ID_FIND - MENUITEM "S&onrakini Bul\tF3", ID_FIND_NEXT - MENUITEM "&DeÄiÅtir...\tCtrl+H", ID_REPLACE + MENUITEM "&Geri Al\tDenetim+Z", ID_EDIT_UNDO + MENUITEM "&Yinele\tDenetim+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&Kes\tDenetim+X", ID_EDIT_CUT + MENUITEM "&ÃoÄalt\tDenetim+C", ID_EDIT_COPY + MENUITEM "Y&apÄ±ÅtÄ±r\tDenetim+V", ID_EDIT_PASTE + MENUITEM "&Sil\tSil", ID_EDIT_CLEAR + MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§\tDenetim+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&Bul...\tDenetim+F", ID_FIND + MENUITEM "S&onrakini Bul\tÄ°3", ID_FIND_NEXT + MENUITEM "&DeÄiÅtir...\tDenetim+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "Ya&lnÄ±zca Okunur", ID_EDIT_READONLY MENUITEM "D&eÄiÅtirilmiÅ", ID_EDIT_MODIFIED @@ -83,13 +83,13 @@ MENUITEM "&Sekme DuraklarÄ±...", ID_TABSTOPS POPUP "&Arka Plan" BEGIN - MENUITEM "&Dizge Rengi\tCtrl+1", ID_BACK_1 - MENUITEM "&SarÄ±mtÄ±rak\tCtrl+2", ID_BACK_2 + MENUITEM "&Dizge Rengi\tDenetim+1", ID_BACK_1 + MENUITEM "&SarÄ±mtÄ±rak\tDenetim+2", ID_BACK_2 END END POPUP "&YardÄ±m" BEGIN - MENUITEM "&ReactOS Wordpad Ãzerine...", ID_ABOUT + MENUITEM "&ReactOS Wordpad Ãzerine...", ID_ABOUT END END Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:25:52 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2014, 2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2014-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -23,7 +23,7 @@ IDS_EMF_FILE "EMF Resmi" IDS_GIF_FILE "GIF Resmi" IDS_JPG_FILE "JPEG Resmi" - IDS_BMP_FILE "Bitmap Resmi" + IDS_BMP_FILE "Bit EÅlem Resmi" IDS_PNG_FILE "PNG Resmi" IDS_TIF_FILE "TIF Resmi" IDS_WMF_FILE "WMF Resmi"

1 0

[akhaldi] 70616: [TRANSLATIONS] Turkish translation update by Erdem Ersoy. CORE-10805
by akhaldi＠svn.reactos.org 18 Jan '16

18 Jan '16

Author: akhaldi Date: Mon Jan 18 19:20:44 2016 New Revision: 70616 URL: http://svn.reactos.org/svn/reactos?rev=70616&view=rev Log: [TRANSLATIONS] Turkish translation update by Erdem Ersoy. CORE-10805 Modified: trunk/reactos/base/applications/calc/lang/tr-TR.rc trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc trunk/reactos/base/applications/games/spider/lang/tr-TR.rc trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc trunk/reactos/base/applications/magnify/lang/tr-TR.rc trunk/reactos/base/applications/mmc/lang/tr-TR.rc trunk/reactos/base/applications/mplay32/lang/tr-TR.rc trunk/reactos/base/applications/mspaint/lang/tr-TR.rc trunk/reactos/base/applications/notepad/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc trunk/reactos/base/applications/regedit/lang/tr-TR.rc trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc trunk/reactos/base/applications/wordpad/lang/tr-TR.rc trunk/reactos/base/system/userinit/lang/tr-TR.rc trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc Modified: trunk/reactos/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -327,8 +327,8 @@ BEGIN POPUP "&DÃ¼zen" BEGIN - MENUITEM "&ÃoÄalt\tCtrl+C", IDM_EDIT_COPY - MENUITEM "&YapÄ±ÅtÄ±r\tCtrl+V", IDM_EDIT_PASTE + MENUITEM "&ÃoÄalt\tDenetim+C", IDM_EDIT_COPY + MENUITEM "&YapÄ±ÅtÄ±r\tDenetim+V", IDM_EDIT_PASTE END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN @@ -336,14 +336,14 @@ MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC MENUITEM "&DÃ¶nÃ¼ÅtÃ¼rme", IDM_VIEW_CONVERSION MENUITEM SEPARATOR - MENUITEM "&OnaltÄ±lÄ±k\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "O&nluk\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "&Sekizlik\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "&Ä°kilik\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "D&erece\tF2", IDM_VIEW_DEG, CHECKED - MENUITEM "&Radyan\tF3", IDM_VIEW_RAD, CHECKED - MENUITEM "&Gradyan\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM "&OnaltÄ±lÄ±k\tÄ°5", IDM_VIEW_HEX, CHECKED + MENUITEM "O&nluk\tÄ°6", IDM_VIEW_DEC, CHECKED + MENUITEM "&Sekizlik\tÄ°7", IDM_VIEW_OCT, CHECKED + MENUITEM "&Ä°kilik\tÄ°8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "D&erece\tÄ°2", IDM_VIEW_DEG, CHECKED + MENUITEM "&Radyan\tÄ°3", IDM_VIEW_RAD, CHECKED + MENUITEM "&Gradyan\tÄ°4", IDM_VIEW_GRAD, CHECKED MENUITEM SEPARATOR MENUITEM "B&asamaklarÄ± TakÄ±mla", IDM_VIEW_GROUP, CHECKED END @@ -359,8 +359,8 @@ BEGIN POPUP "&DÃ¼zen" BEGIN - MENUITEM "&ÃoÄalt\tCtrl+C", IDM_EDIT_COPY - MENUITEM "&YapÄ±ÅtÄ±r\tCtrl+V", IDM_EDIT_PASTE + MENUITEM "&ÃoÄalt\tDenetim+C", IDM_EDIT_COPY + MENUITEM "&YapÄ±ÅtÄ±r\tDenetim+V", IDM_EDIT_PASTE END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN @@ -368,15 +368,15 @@ MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC MENUITEM "&DÃ¶nÃ¼ÅtÃ¼rme", IDM_VIEW_CONVERSION MENUITEM SEPARATOR - MENUITEM "&OnaltÄ±lÄ±k\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "O&nluk\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "&Sekizlik\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "&Ä°kilik\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "DÃ¶&rtlÃ¼ SÃ¶zcÃ¼k\tF12", IDM_VIEW_QWORD, CHECKED - MENUITEM "Ä°&kili SÃ¶zcÃ¼k\tF2", IDM_VIEW_DWORD, CHECKED - MENUITEM "SÃ¶&zcÃ¼k\tF3", IDM_VIEW_WORD, CHECKED - MENUITEM "&Ãoklu\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM "&OnaltÄ±lÄ±k\tÄ°5", IDM_VIEW_HEX, CHECKED + MENUITEM "O&nluk\tÄ°6", IDM_VIEW_DEC, CHECKED + MENUITEM "&Sekizlik\tÄ°7", IDM_VIEW_OCT, CHECKED + MENUITEM "&Ä°kilik\tÄ°8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "DÃ¶&rtlÃ¼ SÃ¶zcÃ¼k\tÄ°12", IDM_VIEW_QWORD, CHECKED + MENUITEM "Ä°&kili SÃ¶zcÃ¼k\tÄ°2", IDM_VIEW_DWORD, CHECKED + MENUITEM "SÃ¶&zcÃ¼k\tÄ°3", IDM_VIEW_WORD, CHECKED + MENUITEM "&Ãoklu\tÄ°4", IDM_VIEW_BYTE, CHECKED MENUITEM SEPARATOR MENUITEM "B&asamaklarÄ± TakÄ±mla", IDM_VIEW_GROUP, CHECKED END @@ -392,8 +392,8 @@ BEGIN POPUP "&DÃ¼zen" BEGIN - MENUITEM "&ÃoÄalt\tCtrl+C", IDM_EDIT_COPY - MENUITEM "&YapÄ±ÅtÄ±r\tCtrl+V", IDM_EDIT_PASTE + MENUITEM "&ÃoÄalt\tDenetim+C", IDM_EDIT_COPY + MENUITEM "&YapÄ±ÅtÄ±r\tDenetim+V", IDM_EDIT_PASTE END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN Modified: trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -3,7 +3,7 @@ * LICENSE: Freeware, permission to use under Public Domain * FILE: base/applications/games/solitaire/lang/tr-TR.rc * PURPOSE: Turkish Resource File for ReactOS Solitaire - * TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -69,7 +69,7 @@ BEGIN POPUP "&Oyun" BEGIN - MENUITEM "&DaÄÄ±t\tF2", IDM_GAME_NEW + MENUITEM "&DaÄÄ±t\tÄ°2", IDM_GAME_NEW MENUITEM SEPARATOR MENUITEM "D&esteler...", IDM_GAME_DECK MENUITEM "&SeÃ§enekler...", IDM_GAME_OPTIONS @@ -78,7 +78,7 @@ END POPUP "&YardÄ±m" BEGIN - MENUITEM "&Ä°Ã§indekiler\tF1", IDM_HELP_CONTENTS + MENUITEM "&Ä°Ã§indekiler\tÄ°1", IDM_HELP_CONTENTS MENUITEM "&Ãzerine...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/games/spider/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -3,7 +3,7 @@ * LICENSE: See COPYING in top level directory * FILE: base/applications/games/spider/lang/tr-TR.rc * PURPOSE: Turkish Resource File for ReactOS Spider Solitaire - * TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -60,7 +60,7 @@ BEGIN POPUP "&Oyun" BEGIN - MENUITEM "&DaÄÄ±t\tF2", IDM_GAME_NEW + MENUITEM "&DaÄÄ±t\tÄ°2", IDM_GAME_NEW MENUITEM SEPARATOR MENUITEM "D&esteler...", IDM_GAME_DECK MENUITEM SEPARATOR @@ -68,7 +68,7 @@ END POPUP "&YardÄ±m" BEGIN - MENUITEM "&Ä°Ã§indekiler\tF1", IDM_HELP_CONTENTS + MENUITEM "&Ä°Ã§indekiler\tÄ°1", IDM_HELP_CONTENTS MENUITEM "&Ãzerine...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -1,4 +1,4 @@ -/* TRANSLATORS: 2006 Fatih AÅÄ±cÄ±, 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATORS: 2006 Fatih AÅÄ±cÄ±, 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -13,7 +13,7 @@ BEGIN POPUP "&SeÃ§enekler" BEGIN - MENUITEM "&Yeni Oyun\tF2", IDM_NEW + MENUITEM "&Yeni Oyun\tÄ°2", IDM_NEW MENUITEM SEPARATOR MENUITEM "&Soru Ä°miyle Ä°mleme", IDM_MARKQ MENUITEM SEPARATOR @@ -22,7 +22,7 @@ MENUITEM "&Usta", IDM_EXPERT MENUITEM "&HusÃ»sÃ®...", IDM_CUSTOM MENUITEM SEPARATOR - MENUITEM "&ÃÄ±kÄ±Å\tAlt+X", IDM_EXIT + MENUITEM "&ÃÄ±kÄ±Å\tSeÃ§enek+X", IDM_EXIT END POPUP "&YardÄ±m" BEGIN Modified: trunk/reactos/base/applications/magnify/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/magnify/lang/tr-TR.rc * PURPOSE: Turkish Resource File for RecatOS Magnifier - * TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * TRANSLATOR: 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -41,7 +41,7 @@ CAPTION "SeÃ§enekler" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "&ÃÄ±kÄ±Å", IDOK, 96, 161, 50, 14 + DEFPUSHBUTTON "Tamam", IDOK, 96, 161, 50, 14 PUSHBUTTON "&YardÄ±m", IDC_BUTTON_HELP, 38, 161, 50, 14 LTEXT "&BÃ¼yÃ¼tme DÃ¼zeyi:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 72, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP Modified: trunk/reactos/base/applications/mmc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -6,10 +6,10 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&Yeni\tCtrl+N", IDM_FILE_NEW - MENUITEM "Open\tStrg+O", IDM_FILE_OPEN + MENUITEM "&Yeni\tDenetim+N", IDM_FILE_NEW + MENUITEM "&AÃ§\tDenetim+O", IDM_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "&ÃÄ±kÄ±Å\tAlt+F4", IDM_FILE_EXIT + MENUITEM "&ÃÄ±kÄ±Å\tSeÃ§enek+Ä°4", IDM_FILE_EXIT END POPUP "&YardÄ±m" BEGIN @@ -21,12 +21,12 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&Yeni\tCtrl+N", IDM_FILE_NEW - MENUITEM "Open\tStrg+O", IDM_FILE_OPEN - MENUITEM "Save", IDM_FILE_SAVE - MENUITEM "Save as...", IDM_FILE_SAVEAS + MENUITEM "&Yeni\tDenetim+N", IDM_FILE_NEW + MENUITEM "&AÃ§\tDenetim+O", IDM_FILE_OPEN + MENUITEM "&Sakla", IDM_FILE_SAVE + MENUITEM "Ay&rÄ± Sakla...", IDM_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&ÃÄ±kÄ±Å\tAlt+F4", IDM_FILE_EXIT + MENUITEM "&ÃÄ±kÄ±Å\tSeÃ§enek+Ä°4", IDM_FILE_EXIT END POPUP "&Pencereler" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -6,17 +6,17 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&AÃ§...\tCtrl+O", IDM_OPEN_FILE - MENUITEM "&Kapat\tCtrl+W", IDM_CLOSE_FILE + MENUITEM "&AÃ§...\tDenetim+O", IDM_OPEN_FILE + MENUITEM "&Kapat\tDenetim+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", IDM_EXIT END POPUP "&Oynat" BEGIN - MENUITEM "&Oynat ya da Duraklat\tCtrl+P", IDC_PLAY - MENUITEM "&Durdur\tCtrl+S", IDC_STOP + MENUITEM "&Oynat ya da Duraklat\tDenetim+P", IDC_PLAY + MENUITEM "&Durdur\tDenetim+S", IDC_STOP MENUITEM SEPARATOR - MENUITEM "&Yinele\tCtrl+T", IDM_REPEAT + MENUITEM "&Yinele\tDenetim+T", IDM_REPEAT END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -3,7 +3,7 @@ * LICENSE: LGPL * FILE: base/applications/mspaint/lang/tr-TR.rc * PURPOSE: Turkish Resource file for ReactOS Paint - * TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -12,40 +12,40 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&Yeni\tCtrl+N", IDM_FILENEW - MENUITEM "&AÃ§...\tCtrl+O", IDM_FILEOPEN - MENUITEM "&Sakla\tCtrl+S", IDM_FILESAVE + MENUITEM "&Yeni\tDenetim+N", IDM_FILENEW + MENUITEM "&AÃ§...\tDenetim+O", IDM_FILEOPEN + MENUITEM "&Sakla\tDenetim+S", IDM_FILESAVE MENUITEM "Ay&rÄ± Sakla...", IDM_FILESAVEAS MENUITEM SEPARATOR MENUITEM "Sayfa GÃ¶rÃ¼nÃ¼mÃ¼", IDM_FILEPAGEVIEW MENUITEM "Sayfa Ayarla...", IDM_FILEPAGESETUP - MENUITEM "YazdÄ±r...\tCtrl+P", IDM_FILEPRINT + MENUITEM "YazdÄ±r...\tDenetim+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "&DÃ¶Åeyerek Duvar KaÄÄ±dÄ± Yap", IDM_FILEASWALLPAPERPLANE MENUITEM "&Ortalayarak Duvar KaÄÄ±dÄ± Yap", IDM_FILEASWALLPAPERCENTERED MENUITEM "&Uzatarak Duvar KaÄÄ±dÄ± Yap", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR - MENUITEM "&ÃÄ±kÄ±Å\tAlt+F4", IDM_FILEEXIT + MENUITEM "&ÃÄ±kÄ±Å\tSeÃ§enek+F4", IDM_FILEEXIT END POPUP "&DÃ¼zen" BEGIN - MENUITEM "&Geri Al\tCtrl+Z", IDM_EDITUNDO - MENUITEM "&Yinele\tCtrl+Y", IDM_EDITREDO - MENUITEM SEPARATOR - MENUITEM "&Kes\tCtrl+X", IDM_EDITCUT - MENUITEM "Ã&oÄalt\tCtrl+C", IDM_EDITCOPY - MENUITEM "Y&apÄ±ÅtÄ±r\tCtrl+V", IDM_EDITPASTE - MENUITEM "&SeÃ§imi Sil\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Geri Al\tDenetim+Z", IDM_EDITUNDO + MENUITEM "&Yinele\tDenetim+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "&Kes\tDenetim+X", IDM_EDITCUT + MENUITEM "Ã&oÄalt\tDenetim+C", IDM_EDITCOPY + MENUITEM "Y&apÄ±ÅtÄ±r\tDenetim+V", IDM_EDITPASTE + MENUITEM "&SeÃ§imi Sil\tSil", IDM_EDITDELETESELECTION MENUITEM "S&eÃ§imi Evir", IDM_EDITINVERTSELECTION - MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§\tDenetim+A", IDM_EDITSELECTALL MENUITEM SEPARATOR MENUITEM "Se&Ã§imi Åuraya ÃoÄalt...", IDM_EDITCOPYTO MENUITEM "&Åuradan YapÄ±ÅtÄ±r...", IDM_EDITPASTEFROM END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN - MENUITEM "&AraÃ§ ÃubuÄu\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED - MENUITEM "&Renklik\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "&AraÃ§ ÃubuÄu\tDenetim+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "&Renklik\tDenetim+L", IDM_VIEWCOLORPALETTE, CHECKED MENUITEM "&Durum ÃubuÄu", IDM_VIEWSTATUSBAR, CHECKED MENUITEM "&Metin ÃubuÄu", IDM_FORMATICONBAR, CHECKED, GRAYED MENUITEM SEPARATOR @@ -62,19 +62,19 @@ MENUITEM "%800", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "K&Ä±lavuzu GÃ¶ster\tCtrl+G", IDM_VIEWSHOWGRID + MENUITEM "K&Ä±lavuzu GÃ¶ster\tDenetim+G", IDM_VIEWSHOWGRID MENUITEM "K&Ã¼Ã§Ã¼ÄÃ¼nÃ¼ GÃ¶ster", IDM_VIEWSHOWMINIATURE END - MENUITEM "&TÃ¼m GÃ¶rÃ¼ntÃ¼lÃ¼k\tCtrl+F", IDM_VIEWFULLSCREEN + MENUITEM "&TÃ¼m GÃ¶rÃ¼ntÃ¼lÃ¼k\tDenetim+F", IDM_VIEWFULLSCREEN END POPUP "&Resim" BEGIN - MENUITEM "&DÃ¶ndÃ¼r ya da Evir...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Yeniden BoyutlandÄ±r veyÃ¢ EÄ...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&DÃ¶ndÃ¼r ya da Evir...\tDenetim+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Yeniden BoyutlandÄ±r veyÃ¢ EÄ...\tDenetim+W", IDM_IMAGESTRETCHSKEW MENUITEM "&KÄ±rp", IDM_IMAGECROP - MENUITEM "&Renkleri Evir\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "&Ãz Nitelikler...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "R&esmi ArÄ±t\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Renkleri Evir\tDenetim+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Ãz Nitelikler...\tDenetim+E", IDM_IMAGEATTRIBUTES + MENUITEM "R&esmi ArÄ±t\tDenetim+Ãst Damga+N", IDM_IMAGEDELETEIMAGE MENUITEM "D&onuk Ãiz", IDM_IMAGEDRAWOPAQUE END POPUP "R&enkler" Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -1,4 +1,4 @@ -/* TRANSLATORS: 2012 Arda TanrÄ±kulu (ardatan) (ardatanrikulu(a)gmail.com), 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATORS: 2012 Arda TanrÄ±kulu (ardatan) (ardatanrikulu(a)gmail.com), 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -24,32 +24,32 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&Yeni\tCtrl+N", CMD_NEW - MENUITEM "&AÃ§...\tCtrl+O", CMD_OPEN - MENUITEM "&Sakla\tCtrl+S", CMD_SAVE + MENUITEM "&Yeni\tDenetim+N", CMD_NEW + MENUITEM "&AÃ§...\tDenetim+O", CMD_OPEN + MENUITEM "&Sakla\tDenetim+S", CMD_SAVE MENUITEM "Ay&rÄ± Sakla...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "Say&fa Ayarla...", CMD_PAGE_SETUP - MENUITEM "Ya&zdÄ±r...\tCtrl+P", CMD_PRINT + MENUITEM "Ya&zdÄ±r...\tDenetim+P", CMD_PRINT MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", CMD_EXIT END POPUP "&DÃ¼zen" BEGIN - MENUITEM "&Geri Al\tCtrl+Z", CMD_UNDO + MENUITEM "&Geri Al\tDenetim+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "&Kes\tCtrl+X", CMD_CUT - MENUITEM "&ÃoÄalt\tCtrl+C", CMD_COPY - MENUITEM "&YapÄ±ÅtÄ±r\tCtrl+V", CMD_PASTE - MENUITEM "&Sil\tDel", CMD_DELETE + MENUITEM "&Kes\tDenetim+X", CMD_CUT + MENUITEM "&ÃoÄalt\tDenetim+C", CMD_COPY + MENUITEM "&YapÄ±ÅtÄ±r\tDenetim+V", CMD_PASTE + MENUITEM "&Sil\tSil", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "&Bul...\tCtrl+F", CMD_SEARCH - MENUITEM "S&onrakini Bul\tF3", CMD_SEARCH_NEXT - MENUITEM "&DeÄiÅtir...\tCtrl+H", CMD_REPLACE - MENUITEM "G&it...\tCtrl+G", CMD_GOTO + MENUITEM "&Bul...\tDenetim+F", CMD_SEARCH + MENUITEM "S&onrakini Bul\tÄ°3", CMD_SEARCH_NEXT + MENUITEM "&DeÄiÅtir...\tDenetim+H", CMD_REPLACE + MENUITEM "G&it...\tDenetim+G", CMD_GOTO MENUITEM SEPARATOR - MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Åimdiki ZamÃ¢nÄ± Koy\tF5", CMD_TIME_DATE + MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§\tDenetim+A", CMD_SELECT_ALL + MENUITEM "&Åimdiki ZamÃ¢nÄ± Koy\tÄ°5", CMD_TIME_DATE END POPUP "&BiÃ§im" BEGIN Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -12,19 +12,19 @@ END POPUP "Y&azÄ±lÄ±m" BEGIN - MENUITEM "&Kur\tCtrl+Enter", ID_INSTALL - MENUITEM "K&aldÄ±r\tCtrl+Del", ID_UNINSTALL + MENUITEM "&Kur\tDenetim+GiriÅ", ID_INSTALL + MENUITEM "K&aldÄ±r\tDenetim+Sil", ID_UNINSTALL MENUITEM "&DeÄiÅtir", ID_MODIFY MENUITEM SEPARATOR MENUITEM "&GiriÅi DeÄer Defteri'nden KaldÄ±r", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "&Yenile\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tCtrl+F5", ID_RESETDB + MENUITEM "&Yenile\tÄ°5", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tDenetim+Ä°5", ID_RESETDB END POPUP "&YardÄ±m" BEGIN - MENUITEM "&YardÄ±m\tF1", ID_HELP, GRAYED + MENUITEM "&YardÄ±m\tÄ°1", ID_HELP, GRAYED MENUITEM "&Ãzerine...", ID_ABOUT END END @@ -42,15 +42,15 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "&Kur\tCtrl+Enter", ID_INSTALL - MENUITEM "K&aldÄ±r\tCtrl+Del", ID_UNINSTALL + MENUITEM "&Kur\tDenetim+GiriÅ", ID_INSTALL + MENUITEM "K&aldÄ±r\tDenetim+Sil", ID_UNINSTALL MENUITEM "&DeÄiÅtir", ID_MODIFY MENUITEM SEPARATOR MENUITEM "&GiriÅi DeÄer Defteri'nden KaldÄ±r", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "&Yenile\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tCtrl+F5", ID_RESETDB + MENUITEM "&Yenile\tÄ°5", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tDenetim+Ä°5", ID_RESETDB END END Modified: trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -12,19 +12,19 @@ END POPUP "Y&azÄ±lÄ±m" BEGIN - MENUITEM "&Kur\tCtrl+Enter", ID_INSTALL - MENUITEM "K&aldÄ±r\tCtrl+Del", ID_UNINSTALL + MENUITEM "&Kur\tDenetim+GiriÅ", ID_INSTALL + MENUITEM "K&aldÄ±r\tDenetim+Sil", ID_UNINSTALL MENUITEM "&DeÄiÅtir", ID_MODIFY MENUITEM SEPARATOR MENUITEM "&GiriÅi DeÄer Defteri'nden KaldÄ±r", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "&Yenile\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tCtrl+F5", ID_RESETDB + MENUITEM "&Yenile\tÄ°5", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tDenetim+Ä°5", ID_RESETDB END POPUP "&YardÄ±m" BEGIN - MENUITEM "&YardÄ±m\tF1", ID_HELP, GRAYED + MENUITEM "&YardÄ±m\tÄ°1", ID_HELP, GRAYED MENUITEM "&Ãzerine...", ID_ABOUT END END @@ -42,15 +42,15 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "&Kur\tCtrl+Enter", ID_INSTALL - MENUITEM "K&aldÄ±r\tCtrl+Del", ID_UNINSTALL + MENUITEM "&Kur\tDenetim+GiriÅ", ID_INSTALL + MENUITEM "K&aldÄ±r\tDenetim+Sil", ID_UNINSTALL MENUITEM "&DeÄiÅtir", ID_MODIFY MENUITEM SEPARATOR MENUITEM "&GiriÅi DeÄer Defteri'nden KaldÄ±r", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "&Yenile\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tCtrl+F5", ID_RESETDB + MENUITEM "&Yenile\tÄ°5", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Ya&zÄ±lÄ±m Veri TabanÄ±nÄ± Yenile\tDenetim+Ä°5", ID_RESETDB END END Modified: trunk/reactos/base/applications/regedit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -39,7 +39,7 @@ MENUITEM "A&Ädaki DeÄer Defteri'ne BaÄlan...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "AÄ&daki DeÄer Defteri'ne BaÄlantÄ±yÄ± Kes...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR - MENUITEM "Ya&zdÄ±r...\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM "Ya&zdÄ±r...\tDenetim+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", ID_REGISTRY_EXIT END @@ -60,13 +60,13 @@ MENUITEM SEPARATOR MENUITEM "&Ä°zinler...", ID_EDIT_PERMISSIONS MENUITEM SEPARATOR - MENUITEM "&Sil\tDel", ID_EDIT_DELETE + MENUITEM "&Sil\tSil", ID_EDIT_DELETE MENUITEM "&AdÄ±nÄ± DeÄiÅtir", ID_EDIT_RENAME MENUITEM SEPARATOR MENUITEM "Di&zin Yolunu ÃoÄalt", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&Bul...\tCtrl+F", ID_EDIT_FIND - MENUITEM "S&onrakini Bul\tF3", ID_EDIT_FINDNEXT + MENUITEM "&Bul...\tDenetim+F", ID_EDIT_FIND + MENUITEM "S&onrakini Bul\tÄ°3", ID_EDIT_FINDNEXT END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN @@ -74,7 +74,7 @@ MENUITEM SEPARATOR MENUITEM "&BÃ¶l", ID_VIEW_SPLIT MENUITEM SEPARATOR - MENUITEM "&Yenile\tF5", ID_VIEW_REFRESH + MENUITEM "&Yenile\tÄ°5", ID_VIEW_REFRESH END POPUP "Y&er Ä°mleri" BEGIN @@ -83,7 +83,7 @@ END POPUP "&YardÄ±m" BEGIN - MENUITEM "&YardÄ±m KonularÄ±\tF1", ID_HELP_HELPTOPICS + MENUITEM "&YardÄ±m KonularÄ±\tÄ°1", ID_HELP_HELPTOPICS MENUITEM SEPARATOR MENUITEM "&DeÄer Defteri DÃ¼zenleyicisi Ãzerine...", ID_HELP_ABOUT END @@ -96,7 +96,7 @@ MENUITEM "&DeÄiÅtir...", ID_EDIT_MODIFY MENUITEM "&Ä°kili Veriyi DeÄiÅtir...", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR - MENUITEM "&Sil\tDel", ID_EDIT_DELETE + MENUITEM "&Sil\tSil", ID_EDIT_DELETE MENUITEM "&AdÄ±nÄ± DeÄiÅtir", ID_EDIT_RENAME END POPUP "" Modified: trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -55,8 +55,8 @@ MENUITEM "&Kapat", ID_SHUTDOWN_POWEROFF MENUITEM "&Yeniden BaÅlat", ID_SHUTDOWN_REBOOT MENUITEM """%s"" &Oturumunu Kapat", ID_SHUTDOWN_LOGOFF - MENUITEM "Ku&llanÄ±cÄ± DeÄiÅtir\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "&BilgisayarÄ± Kilitle\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "Ku&llanÄ±cÄ± DeÄiÅtir\tROS+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "&BilgisayarÄ± Kilitle\tROS+L", ID_SHUTDOWN_LOCKCOMPUTER MENUITEM "Ba&ÄlantÄ±yÄ± Kes", ID_SHUTDOWN_DISCONNECT, GRAYED MENUITEM "B&ilgisayarÄ± ÃÄ±kar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END Modified: trunk/reactos/base/applications/wordpad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -1,7 +1,7 @@ /* * Turkish Resources for ReactOS Wordpad * - * Copyrights: 2006 Fatih AÅÄ±cÄ± (fasici(a)linux-sevenler.org), 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * Copyrights: 2006 Fatih AÅÄ±cÄ± (fasici(a)linux-sevenler.org), 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,12 +24,12 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&Yeni...\tCtrl+N", ID_FILE_NEW - MENUITEM "&AÃ§...\tCtrl+O", ID_FILE_OPEN - MENUITEM "&Sakla\tCtrl+S", ID_FILE_SAVE + MENUITEM "&Yeni...\tDenetim+N", ID_FILE_NEW + MENUITEM "&AÃ§...\tDenetim+O", ID_FILE_OPEN + MENUITEM "&Sakla\tDenetim+S", ID_FILE_SAVE MENUITEM "Ay&rÄ± Sakla...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "Ya&zdÄ±r...\tCtrl+P", ID_PRINT + MENUITEM "Ya&zdÄ±r...\tDenetim+P", ID_PRINT MENUITEM "Yaz&dÄ±rma Ãn Ä°zlemesi...", ID_PREVIEW MENUITEM "Say&fa Ayarla...", ID_PRINTSETUP MENUITEM SEPARATOR @@ -37,18 +37,18 @@ END POPUP "&DÃ¼zen" BEGIN - MENUITEM "&Geri Al\tCtrl+Z", ID_EDIT_UNDO - MENUITEM "&Yinele\tCtrl+Y", ID_EDIT_REDO - MENUITEM SEPARATOR - MENUITEM "&Kes\tCtrl+X", ID_EDIT_CUT - MENUITEM "&ÃoÄalt\tCtrl+C", ID_EDIT_COPY - MENUITEM "Y&apÄ±ÅtÄ±r\tCtrl+V", ID_EDIT_PASTE - MENUITEM "&Sil\tDel", ID_EDIT_CLEAR - MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§\tCtrl+A", ID_EDIT_SELECTALL - MENUITEM SEPARATOR - MENUITEM "&Bul...\tCtrl+F", ID_FIND - MENUITEM "S&onrakini Bul\tF3", ID_FIND_NEXT - MENUITEM "&DeÄiÅtir...\tCtrl+H", ID_REPLACE + MENUITEM "&Geri Al\tDenetim+Z", ID_EDIT_UNDO + MENUITEM "&Yinele\tDenetim+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&Kes\tDenetim+X", ID_EDIT_CUT + MENUITEM "&ÃoÄalt\tDenetim+C", ID_EDIT_COPY + MENUITEM "Y&apÄ±ÅtÄ±r\tDenetim+V", ID_EDIT_PASTE + MENUITEM "&Sil\tSil", ID_EDIT_CLEAR + MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§\tDenetim+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&Bul...\tDenetim+F", ID_FIND + MENUITEM "S&onrakini Bul\tÄ°3", ID_FIND_NEXT + MENUITEM "&DeÄiÅtir...\tDenetim+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "Ya&lnÄ±zca Okunur", ID_EDIT_READONLY MENUITEM "D&eÄiÅtirilmiÅ", ID_EDIT_MODIFIED @@ -83,13 +83,13 @@ MENUITEM "&Sekme DuraklarÄ±...", ID_TABSTOPS POPUP "&Arka Plan" BEGIN - MENUITEM "&Dizge Rengi\tCtrl+1", ID_BACK_1 - MENUITEM "&SarÄ±mtÄ±rak\tCtrl+2", ID_BACK_2 + MENUITEM "&Dizge Rengi\tDenetim+1", ID_BACK_1 + MENUITEM "&SarÄ±mtÄ±rak\tDenetim+2", ID_BACK_2 END END POPUP "&YardÄ±m" BEGIN - MENUITEM "&ReactOS Wordpad Ãzerine...", ID_ABOUT + MENUITEM "&ReactOS Wordpad Ãzerine...", ID_ABOUT END END Modified: trunk/reactos/base/system/userinit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -1,47 +1,47 @@ -/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "ReactOS LiveCD" +CAPTION "ReactOS ÃalÄ±Åan CD" FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "Dil:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "DÃ¼Äme TakÄ±mÄ± DÃ¼zeni:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + LTEXT "Dilinizi ve dÃ¼Äme takÄ±mÄ± dizininizi seÃ§iniz ve sÃ¼rdÃ¼rmek iÃ§in Ä°leri'ye tÄ±klayÄ±nÄ±z.", IDC_STATIC, 7, 152, 300, 8 GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 - DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + DEFPUSHBUTTON "Ä°leri", IDOK, 205, 172, 50, 14 + PUSHBUTTON "Ä°ptal", IDCANCEL, 260, 172, 50, 14 END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "ReactOS LiveCD" +CAPTION "ReactOS ÃalÄ±Åan CD" FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + DEFPUSHBUTTON "&ReactOS ÃalÄ±Åan CD'yi ÃalÄ±ÅtÄ±r", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "R&eactOS'u Kur", IDC_INSTALL, 71, 130, 175, 21 LTEXT "", IDC_STATIC, 7, 152, 300, 8 GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 - PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + PUSHBUTTON "Geri", IDOK, 205, 172, 50, 14 + PUSHBUTTON "Ä°ptal", IDCANCEL, 260, 172, 50, 14 END STRINGTABLE BEGIN IDS_SHELL_FAIL "Userinit, kabuÄu baÅlatmada baÅarÄ±sÄ±z oldu!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_INSTALLER_FAIL "Userinit, Kur'u baÅlatmada baÅarÄ±sÄ±z oldu!\n" END STRINGTABLE BEGIN - IDS_SPAIN "Spanish (Spain)" + IDS_SPAIN "Ä°spanyolca (Ä°spanya)" END Modified: trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc [iso-8859-1] Mon Jan 18 19:20:44 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2014, 2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2014-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -23,7 +23,7 @@ IDS_EMF_FILE "EMF Resmi" IDS_GIF_FILE "GIF Resmi" IDS_JPG_FILE "JPEG Resmi" - IDS_BMP_FILE "Bitmap Resmi" + IDS_BMP_FILE "Bit EÅlem Resmi" IDS_PNG_FILE "PNG Resmi" IDS_TIF_FILE "TIF Resmi" IDS_WMF_FILE "WMF Resmi"

1 0

[ion] 70615: [BOOTMGR]: Implement support for getting the default boot entry, the current boot menu policy, and finish implementation of getting the selected boot entry. [BOOTMGR]: Stubplement supp...
by ion＠svn.reactos.org 18 Jan '16

18 Jan '16

Author: ion Date: Mon Jan 18 18:16:49 2016 New Revision: 70615 URL: http://svn.reactos.org/svn/reactos?rev=70615&view=rev Log: [BOOTMGR]: Implement support for getting the default boot entry, the current boot menu policy, and finish implementation of getting the selected boot entry. [BOOTMGR]: Stubplement support for catching keystrokes right before boot (such as F8, F10). No key input is actually read. Boot Manager now attempts to load the winload entry as part of BmpLaunchBootEntry. Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/include/bcd.h trunk/reactos/boot/environ/include/bl.h Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Mon Jan 18 18:16:49 2016 @@ -32,6 +32,10 @@ PWCHAR ParentFileName = L""; BOOLEAN BmDisplayStateCached; +PBL_LOADED_APPLICATION_ENTRY* BmpFailedBootEntries; +PBL_LOADED_APPLICATION_ENTRY BmpSelectedBootEntry; +BOOLEAN BmBootEntryOverridePresent; +BOOLEAN BmpDisplayBootMenu; /* FUNCTIONS *****************************************************************/ @@ -1652,10 +1656,186 @@ return Status; } +VOID +BmpGetDefaultBootEntry ( + _In_ PBL_LOADED_APPLICATION_ENTRY* Sequence, + _In_ ULONG Count, + _Out_ PBL_LOADED_APPLICATION_ENTRY* DefaultEntry, + _Out_ PULONG DefaultIndex + ) +{ + GUID DefaultObject; + NTSTATUS Status; + ULONG BootIndex; + + /* Assume no default */ + *DefaultEntry = *Sequence; + *DefaultIndex = 0; + + /* Nothing to do if there's just one entry */ + if (Count == 1) + { + return; + } + + /* Get the default object, bail out if there isn't one */ + Status = BlGetBootOptionGuid(BlpApplicationEntry.BcdData, + BcdBootMgrObject_DefaultObject, + &DefaultObject); + if (!(NT_SUCCESS(Status)) || !(Count)) + { + return; + } + + /* Scan the boot sequence */ + for (BootIndex = 0; BootIndex < Count; BootIndex++) + { + /* Find one that matches the default */ + if (RtlEqualMemory(&Sequence[BootIndex]->Guid, + &DefaultObject, + sizeof(GUID))) + { + /* Return it */ + *DefaultEntry = Sequence[BootIndex]; + *DefaultIndex = BootIndex; + return; + } + } +} + +BL_MENU_POLICY +BmGetBootMenuPolicy ( + _In_ PBL_LOADED_APPLICATION_ENTRY BootEntry + ) +{ + NTSTATUS Status; + BOOLEAN EmsEnabled; + ULONGLONG BootMenuPolicy; + ULONG OptionId; + + /* Check if EMS is enabled */ + Status = BlGetBootOptionBoolean(BlpApplicationEntry.BcdData, + BcdOSLoaderBoolean_EmsEnabled, + &EmsEnabled); + if ((NT_SUCCESS(Status)) && (EmsEnabled)) + { + /* No boot menu */ + return MenuPolicyLegacy; + } + + /* Check what entry we are looking at */ + if (!BootEntry) + { + /* No entry, pick the selected one */ + BootEntry = BmpSelectedBootEntry; + } + + /* Do we still not have an entry? */ + if (!BootEntry) + { + /* Show the menu */ + return MenuPolicyStandard; + } + + /* Check if this is an OS loader */ + BootMenuPolicy = 0; + if (BootEntry->Flags & BL_APPLICATION_ENTRY_WINLOAD) + { + /* Use the correct option ID */ + OptionId = BcdOSLoaderInteger_BootMenuPolicy; + } + else + { + /* Check if this is an OS resumer */ + if (!(BootEntry->Flags & BL_APPLICATION_ENTRY_WINRESUME)) + { + /* Nope, so no reason for a menu */ + return MenuPolicyLegacy; + } + + /* Use the correct opetion ID */ + OptionId = BcdResumeInteger_BootMenuPolicy; + } + + /* Check the option ID for the boot menu policy */ + Status = BlGetBootOptionInteger(BootEntry->BcdData, + OptionId, + &BootMenuPolicy); + if (NT_SUCCESS(Status)) + { + /* We have one, return it */ + return BootMenuPolicy; + } + + /* No policy, so assume no menu */ + return MenuPolicyLegacy; +} + +VOID +BmDisplayGetBootMenuStatus ( + _Out_ PL_MENU_STATUS MenuStatus + ) +{ + /* For now, don't support key input at all */ + MenuStatus->AsULong = 0; + MenuStatus->OemKey = UNICODE_NULL; + MenuStatus->BootIndex = -1; +} + +NTSTATUS +BmProcessCustomAction ( + _In_ HANDLE BcdHandle, + _In_ PWCHAR ActionKey + ) +{ + EfiPrintf(L"Custom actions not yet handled\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +VOID +BmpProcessBootEntry ( + _In_ HANDLE BcdHandle, + _In_ PBL_LOADED_APPLICATION_ENTRY BootEntry, + _Out_ PBOOLEAN ExitBootManager + ) +{ + BL_MENU_STATUS MenuStatus; + + /* Don't exit */ + *ExitBootManager = FALSE; + + /* If the legacy menu must be shown, or if we have a boot entry */ + if ((BmGetBootMenuPolicy(BootEntry) != MenuPolicyStandard) || (BootEntry)) + { + /* Check if any key has been presseed */ + BmDisplayGetBootMenuStatus(&MenuStatus); + if (MenuStatus.AnyKey) + { + /* Was the exit key pressed? */ + if (MenuStatus.Exit) + { + /* Don't display a menu, and exit */ + *ExitBootManager = TRUE; + BmpDisplayBootMenu = FALSE; + } + else if (MenuStatus.OemKey) + { + /* Process the OEM key action */ + BmProcessCustomAction(BcdHandle, &MenuStatus.KeyValue); + } + else + { + /* Process other keys */ + EfiPrintf(L"TODO\r\n"); + } + } + } +} + NTSTATUS BmpGetSelectedBootEntry ( _In_ HANDLE BcdHandle, - _Out_ PBL_LOADED_APPLICATION_ENTRY *SelectedBootEntry, + _Out_ PBL_LOADED_APPLICATION_ENTRY* SelectedBootEntry, _Out_ PULONG EntryIndex, _Out_ PBOOLEAN ExitBootManager ) @@ -1663,7 +1843,9 @@ NTSTATUS Status; PBL_LOADED_APPLICATION_ENTRY* Sequence; PBL_LOADED_APPLICATION_ENTRY Entry, SelectedEntry; - ULONG Count, BootIndex; + ULONG Count, BootIndex, SelectedIndex; + // BOOLEAN FoundFailedEntry; + ULONGLONG Timeout; /* Initialize locals */ BootIndex = 0; @@ -1688,7 +1870,128 @@ goto Quickie; } - EfiPrintf(L"Boot selection not yet implemented. %d entries found\r\n", Count); + /* Check if we don't yet have an array of failed boot entries */ + if (!BmpFailedBootEntries) + { + /* Allocate it */ + BmpFailedBootEntries = BlMmAllocateHeap(Count); + if (BmpFailedBootEntries) + { + /* Zero it out */ + RtlZeroMemory(BmpFailedBootEntries, Count); + } + } + + /* Check if we have a hardcoded boot override */ + if (BmBootEntryOverridePresent) + { + EfiPrintf(L"Hard-coded boot override mode not supported\r\n"); + } + + /* Log the OS count */ + //BlLogEtwWrite(BOOT_BOOTMGR_MULTI_OS_COUNT); + + /* Check if the display is already active and cached */ + if (!BmDisplayStateCached) + { + /* Check if we should display a boot menu */ + Status = BlGetBootOptionBoolean(BlpApplicationEntry.BcdData, + BcdBootMgrBoolean_DisplayBootMenu, + &BmpDisplayBootMenu); + if (!NT_SUCCESS(Status)) + { + /* Assume not */ + BmpDisplayBootMenu = FALSE; + } + } + + /* Check if there's only one entry to boot anyway */ + if (Count == 1) + { + /* Read it */ + SelectedEntry = *Sequence; + + /* Process it */ + BmpProcessBootEntry(BcdHandle, SelectedEntry, ExitBootManager); + + /* Check if we're not displaying a boot menu */ + if (!BmpDisplayBootMenu) + { + /* Now we are */ + BmpDisplayBootMenu = TRUE; + + /* Return the entry and its index back */ + *EntryIndex = 0; + *SelectedBootEntry = SelectedEntry; + Status = STATUS_SUCCESS; + goto Quickie; + } + } + else + { + /* Get the default boot entry */ + BmpGetDefaultBootEntry(Sequence, Count, &SelectedEntry, &SelectedIndex); + + /* Check if we have a failed boot entry array allocated */ + //FoundFailedEntry = FALSE; + if (BmpFailedBootEntries) + { + /* Check if the default entry failed to boot */ + if (BmpFailedBootEntries[SelectedIndex]) + { + /* Loop through the current boot sequence */ + for (SelectedIndex = 0; SelectedIndex < Count; SelectedIndex++) + { + /* Check if there's no sequence for this index, or it failed */ + while (!(Sequence[SelectedIndex]) || + (BmpFailedBootEntries[SelectedIndex])) + { + /* Remember that this is a failed entry */ + SelectedEntry = Sequence[SelectedIndex]; + //FoundFailedEntry = TRUE; + BmpDisplayBootMenu = FALSE; + } + } + } + } + + /* Check if the entry is an OS loader */ + if (SelectedEntry->Flags & BL_APPLICATION_ENTRY_WINLOAD) + { + // todo + EfiPrintf(L"todo path\r\n"); + } + + /* Check if there's no timeout */ + Status = BlGetBootOptionInteger(BlpApplicationEntry.BcdData, + BcdBootMgrInteger_Timeout, + &Timeout); + if ((NT_SUCCESS(Status) && !(Timeout))) + { + /* There isn't, so just process the default entry right away */ + BmpProcessBootEntry(BcdHandle, SelectedEntry, ExitBootManager); + + /* Check if we're not displaying a boot menu */ + if (!BmpDisplayBootMenu) + { + /* Now we are */ + BmpDisplayBootMenu = TRUE; + + /* Return the entry and its index back */ + *EntryIndex = 0; + *SelectedBootEntry = SelectedEntry; + Status = STATUS_SUCCESS; + goto Quickie; + } + + /* Remove the timeout for this boot instance */ + BlRemoveBootOption(BlpApplicationEntry.BcdData, + BcdBootMgrInteger_Timeout); + } + } + + /* Here is where we display the menu and list of tools */ + EfiPrintf(L"Tool selection not yet implemented\r\n"); EfiStall(10000000); *SelectedBootEntry = NULL; @@ -1735,6 +2038,7 @@ ) { EfiPrintf(L"Boot launch not yet implemented\r\n"); + EfiStall(1000000000); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/boot/environ/include/bcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bcd.h… ============================================================================== --- trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] Mon Jan 18 18:16:49 2016 @@ -191,6 +191,15 @@ BcdBootMgrBoolean_PersistBootSequence = 0x26000031 } BcdBootMgrElementTypes; +typedef enum _BcdResumeElementTypes { + Reserved1 = 0x21000001, + Reserved2 = 0x22000002, + BcdResumeBoolean_UseCustomSettings = 0x26000003, + BcdResumeDevice_AssociatedOsDevice = 0x21000005, + BcdResumeBoolean_DebugOptionEnabled = 0x26000006, + BcdResumeInteger_BootMenuPolicy = 0x25000008 +} BcdResumeElementTypes; + /* Undocumented */ typedef enum BcdStartupElementTypes { Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Mon Jan 18 18:16:49 2016 @@ -161,6 +161,12 @@ Yellow, White } BL_COLOR, *PBL_COLOR; + +typedef enum _BL_MENU_POLICY +{ + MenuPolicyLegacy = 0, + MenuPolicyStandard = 1 +} BL_MENU_POLICY; typedef enum _BL_MEMORY_DESCRIPTOR_TYPE { @@ -728,6 +734,25 @@ GUID Guid; PBL_BCD_OPTION BcdData; } BL_LOADED_APPLICATION_ENTRY, *PBL_LOADED_APPLICATION_ENTRY; + +typedef struct _BL_MENU_STATUS +{ + union + { + struct + { + ULONG AnyKey : 1; + ULONG AdvancedOptions : 1; + ULONG BootOptions : 1; + ULONG OemKey : 1; + ULONG Exit : 1; + ULONG Reserved : 27; + }; + ULONG AsULong; + }; + ULONG BootIndex; + WCHAR KeyValue; +} BL_MENU_STATUS, *PL_MENU_STATUS; typedef struct _BL_HARDDISK_DEVICE {

1 0

[ion] 70614: [HIVEBCD]: Fix wrong element type for application device element. [BOOTMGR]: Implement boot sequence population. We correctly detect our winload.efi entry in the BCD hive. [BOOTMGR]: D...
by ion＠svn.reactos.org 18 Jan '16

18 Jan '16

Author: ion Date: Mon Jan 18 16:54:44 2016 New Revision: 70614 URL: http://svn.reactos.org/svn/reactos?rev=70614&view=rev Log: [HIVEBCD]: Fix wrong element type for application device element. [BOOTMGR]: Implement boot sequence population. We correctly detect our winload.efi entry in the BCD hive. [BOOTMGR]: Document more application entry flags. [BOOTLIB]: Document and implement BCD object description parsing. Based off BCD Reference Guide / Geoff Chappel's website. [BOOTLIB]: Add support for appending a boot option to an entry. Modified: trunk/reactos/boot/bootdata/hivebcd.inf trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/include/bcd.h trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/misc/bcd.c trunk/reactos/boot/environ/lib/misc/bcdopt.c trunk/reactos/boot/environ/lib/misc/bootreg.c Modified: trunk/reactos/boot/bootdata/hivebcd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivebcd.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivebcd.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivebcd.inf [iso-8859-1] Mon Jan 18 16:54:44 2016 @@ -22,7 +22,7 @@ ; ReactOS Boot Loader ; BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Description","Type",0x00010001,0x10200003 ; identifier={winload} -BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\11000011","Element",0x1,\ ; device=boot +BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\11000001","Element",0x1,\ ; device=boot 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 05,00,00,00,\ 00,00,00,00,\ @@ -45,7 +45,7 @@ ; ReactOS Memory Tester ; BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Description","Type",0x00010001,0x10200005 ; identifier={memdiag} -BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\11000011","Element",0x1,\ ; device=boot +BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\11000001","Element",0x1,\ ; device=boot 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 05,00,00,00,\ 00,00,00,00,\ Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Mon Jan 18 16:54:44 2016 @@ -121,7 +121,6 @@ /* Start going through each option */ PreviousOption = NULL; Option = Options; - EfiPrintf(L"BCD Options found: %d\r\n", ElementCount); for (i = 0; i < ElementCount; i++) { /* Read the header and type */ @@ -1231,6 +1230,40 @@ } NTSTATUS +BmGetEntryDescription ( + _In_ HANDLE BcdHandle, + _In_ PGUID ObjectId, + _Out_ PBCD_OBJECT_DESCRIPTION Description + ) +{ + NTSTATUS Status; + HANDLE ObjectHandle; + + /* Open the BCD object */ + Status = BcdOpenObject(BcdHandle, ObjectId, &ObjectHandle); + if (NT_SUCCESS(Status)) + { + /* Make sure the caller passed this argument in */ + if (!Description) + { + /* Fail otherwise */ + Status = STATUS_INVALID_PARAMETER; + } + else + { + /* Query the description from the BCD interface */ + Status = BiGetObjectDescription(ObjectHandle, Description); + } + + /* Close the object key */ + BiCloseKey(ObjectHandle); + } + + /* Return the result back */ + return Status; +} + +NTSTATUS BmpPopulateBootEntryList ( _In_ HANDLE BcdHandle, _In_ PGUID SequenceList, @@ -1239,10 +1272,211 @@ _Out_ PULONG SequenceCount ) { - EfiPrintf(L"Boot population not yet supported\r\n"); - *SequenceCount = 0; - *BootSequence = NULL; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + ULONG BootIndex, i, OptionSize; + PBL_LOADED_APPLICATION_ENTRY BootEntry; + PBL_BCD_OPTION Options; + BCD_OBJECT_DESCRIPTION Description; + BcdObjectType ObjectType; + BOOLEAN HavePath, IsWinPe, SoftReboot; + PWCHAR LoaderPath; + + /* Initialize locals */ + Options = NULL; + BootIndex = 0; + Status = STATUS_NOT_FOUND; + + /* Loop through every element in the sequence */ + for (i = 0; i < *SequenceCount; i++) + { + /* Assume failure */ + BootEntry = NULL; + + /* Get the options for the sequence element */ + Status = BmGetOptionList(BcdHandle, SequenceList, &Options); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"option list failed: %lx\r\n", Status); + goto LoopQuickie; + } + + /* Make sure there's at least a path and description */ + if (!(MiscGetBootOption(Options, BcdLibraryDevice_ApplicationDevice)) || + !(MiscGetBootOption(Options, BcdLibraryString_Description))) + { + Status = STATUS_UNSUCCESSFUL; + EfiPrintf(L"missing list failed: %lx\r\n", Status); + goto LoopQuickie; + } + + /* Get the size of the BCD options and allocate a large enough entry */ + OptionSize = BlGetBootOptionListSize(Options); + BootEntry = BlMmAllocateHeap(sizeof(*BootEntry) + OptionSize); + if (!BootEntry) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Save it as part of the sequence */ + BootSequence[BootIndex] = BootEntry; + + /* Initialize it, and copy the BCD data */ + RtlZeroMemory(BootEntry, sizeof(*BootEntry)); + BootEntry->Guid = *SequenceList; + BootEntry->BcdData = (PBL_BCD_OPTION)(BootEntry + 1); + BootEntry->Flags = Flags; + RtlCopyMemory(BootEntry->BcdData, Options, OptionSize); + + /* Get the object descriptor to find out what kind of entry it is */ + Status = BmGetEntryDescription(BcdHandle, + &BootEntry->Guid, + &Description); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"missing desc failed: %lx\r\n", Status); + goto LoopQuickie; + } + + /* Check if a path was given or not */ + HavePath = MiscGetBootOption(Options, BcdLibraryString_ApplicationPath) ? + TRUE : FALSE; + + /* Now select based on what type of object this is -- must be an app */ + ObjectType.PackedValue = Description.Type; + if (ObjectType.Application.ObjectCode == BCD_OBJECT_TYPE_APPLICATION) + { + /* Then select based on what kind of app it is */ + switch (ObjectType.Application.ApplicationCode) + { + /* Another boot manager */ + case BCD_APPLICATION_TYPE_BOOTMGR: + BootEntry->Flags |= BCD_APPLICATION_TYPE_BOOTMGR; + break; + + /* An OS loader */ + case BCD_APPLICATION_TYPE_OSLOADER: + BootEntry->Flags |= BL_APPLICATION_ENTRY_WINLOAD; + + /* Do we have a path for it? */ + if (!HavePath) + { + /* We'll try to make one up. Is this WinPE? */ + IsWinPe = FALSE; + Status = BlGetBootOptionBoolean(Options, + BcdOSLoaderBoolean_WinPEMode, + &IsWinPe); + if (!(NT_SUCCESS(Status)) && (Status != STATUS_NOT_FOUND)) + { + goto Quickie; + } + + /* Use the appropriate path for WinPE or local install */ + LoaderPath = IsWinPe ? + L"\\Windows\\System32\\boot\\winload.efi" : + L"\\Windows\\System32\\winload.efi"; + + /* Add the path to the boot entry */ + Status = BlAppendBootOptionString(BootEntry, LoaderPath); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* We have a path now */ + HavePath = TRUE; + } + break; + + /* A hibernate-resume application */ + case BCD_APPLICATION_TYPE_RESUME: + BootEntry->Flags |= BL_APPLICATION_ENTRY_WINRESUME; + break; + + /* An older OS NTLDR */ + case BCD_APPLICATION_TYPE_NTLDR: + BootEntry->Flags |= BL_APPLICATION_ENTRY_NTLDR; + break; + + /* An older OS SETUPLDR */ + case BCD_APPLICATION_TYPE_SETUPLDR: + BootEntry->Flags |= BL_APPLICATION_ENTRY_SETUPLDR; + break; + + /* A 3rd party/Win9x boot sector */ + case BCD_APPLICATION_TYPE_BOOTSECTOR: + BootEntry->Flags |= BL_APPLICATION_ENTRY_BOOTSECTOR; + break; + + /* Something else entirely */ + default: + break; + } + } + + /* We better have a path by now */ + if (!HavePath) + { + Status = STATUS_UNSUCCESSFUL; + goto LoopQuickie; + } + + /* Check if this is a real mode startup.com */ + if ((ObjectType.Application.ObjectCode == BCD_OBJECT_TYPE_APPLICATION) && + (ObjectType.Application.ImageCode = BCD_IMAGE_TYPE_REAL_MODE) && + (ObjectType.Application.ApplicationCode == BCD_APPLICATION_TYPE_STARTUPCOM)) + { + /* Check if PXE soft reboot will occur */ + Status = BlGetBootOptionBoolean(Options, + BcdStartupBoolean_PxeSoftReboot, + &SoftReboot); + if ((NT_SUCCESS(Status)) && (SoftReboot)) + { + /* Then it's a valid startup.com entry */ + BootEntry->Flags |= BL_APPLICATION_ENTRY_STARTUP; + } + } + +LoopQuickie: + /* All done with this entry -- did we have BCD options? */ + if (Options) + { + /* Free them, they're part of the entry now */ + BlMmFreeHeap(Options); + Options = NULL; + } + + /* Did we fail anywhere? */ + if (!NT_SUCCESS(Status)) + { + /* Yep -- did we fail with an active boot entry? */ + if (BootEntry) + { + /* Destroy it */ + BlDestroyBootEntry(BootEntry); + BootSequence[BootIndex] = NULL; + } + } + else + { + /* It worked, so populate the next index now */ + BootIndex++; + } + + /* And move to the next GUID in the sequence list */ + SequenceList++; + } + +Quickie: + /* All done now -- did we have any BCD options? */ + if (Options) + { + /* Free them */ + BlMmFreeHeap(Options); + } + + /* Return the status */ + return Status; } NTSTATUS @@ -1363,7 +1597,7 @@ /* Populate the list of bootable entries */ Status = BmpPopulateBootEntryList(BcdHandle, DisplayOrder, - 0x800000, + BL_APPLICATION_ENTRY_DISPLAY_ORDER, Sequence, &BcdCount); if (!NT_SUCCESS(Status)) @@ -1454,7 +1688,8 @@ goto Quickie; } - EfiPrintf(L"Boot selection not yet implemented\r\n"); + EfiPrintf(L"Boot selection not yet implemented. %d entries found\r\n", Count); + EfiStall(10000000); *SelectedBootEntry = NULL; Quickie: @@ -1772,7 +2007,7 @@ Status = BmGetBootSequence(BcdHandle, SequenceList, SequenceListCount, - 0x20000000, + BL_APPLICATION_ENTRY_FIXED_SEQUENCE, &BootSequence, &SequenceCount); if (NT_SUCCESS(Status)) Modified: trunk/reactos/boot/environ/include/bcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bcd.h… ============================================================================== --- trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] Mon Jan 18 16:54:44 2016 @@ -25,6 +25,25 @@ #define BCD_TYPE_INTEGER 0x05 #define BCD_TYPE_BOOLEAN 0x06 #define BCD_TYPE_INTEGER_LIST 0x07 + +#define BCD_IMAGE_TYPE_FIRMWARE 0x01 +#define BCD_IMAGE_TYPE_BOOT_APP 0x02 +#define BCD_IMAGE_TYPE_NTLDR 0x03 +#define BCD_IMAGE_TYPE_REAL_MODE 0x04 + +#define BCD_APPLICATION_TYPE_FWBOOTMGR 0x01 +#define BCD_APPLICATION_TYPE_BOOTMGR 0x02 +#define BCD_APPLICATION_TYPE_OSLOADER 0x03 +#define BCD_APPLICATION_TYPE_RESUME 0x04 +#define BCD_APPLICATION_TYPE_MEMDIAG 0x05 +#define BCD_APPLICATION_TYPE_NTLDR 0x06 +#define BCD_APPLICATION_TYPE_SETUPLDR 0x07 +#define BCD_APPLICATION_TYPE_BOOTSECTOR 0x08 +#define BCD_APPLICATION_TYPE_STARTUPCOM 0x09 + +#define BCD_OBJECT_TYPE_APPLICATION 0x01 +#define BCD_OBJECT_TYPE_INHEREIT 0x02 +#define BCD_OBJECT_TYPE_DEVICE 0x03 typedef enum BcdLibraryElementTypes { @@ -172,13 +191,20 @@ BcdBootMgrBoolean_PersistBootSequence = 0x26000031 } BcdBootMgrElementTypes; +/* Undocumented */ +typedef enum BcdStartupElementTypes +{ + BcdStartupBoolean_PxeSoftReboot = 0x26000001, + BcdStartupString_PxeApplicationName = 0x22000002, +} BcdStartupElementTypes; + /* DATA STRUCTURES ***********************************************************/ typedef struct { union { - ULONG PackedValue; + ULONG PackedValue; struct { ULONG SubType : 24; @@ -188,6 +214,36 @@ }; } BcdElementType; +typedef struct +{ + union + { + ULONG PackedValue; + union + { + struct + { + ULONG ApplicationCode : 20; + ULONG ImageCode : 4; + ULONG Reserved : 4; + ULONG ObjectCode : 4; + } Application; + struct + { + ULONG Value : 20; + ULONG ClassCode : 4; + ULONG Reserved : 4; + ULONG ObjectCode : 4; + } Inherit; + struct + { + ULONG Reserved:28; + ULONG ObjectCode : 4; + } Device; + }; + }; +} BcdObjectType; + typedef struct _BCD_ELEMENT_HEADER { ULONG Version; @@ -214,6 +270,12 @@ GUID AssociatedEntry; BL_DEVICE_DESCRIPTOR DeviceDescriptor; } BCD_DEVICE_OPTION, *PBCD_DEVICE_OPTION; + +typedef struct _BCD_OBJECT_DESCRIPTION +{ + ULONG Valid; + ULONG Type; +} BCD_OBJECT_DESCRIPTION, *PBCD_OBJECT_DESCRIPTION;; /* FUNCTIONS ******************************************************************/ @@ -260,4 +322,10 @@ _Out_ PULONG ElementCount ); +NTSTATUS +BiGetObjectDescription ( + _In_ HANDLE ObjectHandle, + _Out_ PBCD_OBJECT_DESCRIPTION Description + ); + #endif Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Mon Jan 18 16:54:44 2016 @@ -66,8 +66,17 @@ #define BL_APPLICATION_ENTRY_FLAG_NO_GUID 0x01 #define BL_APPLICATION_ENTRY_BCD_OPTIONS_INTERNAL 0x02 +#define BL_APPLICATION_ENTRY_WINLOAD 0x04 +#define BL_APPLICATION_ENTRY_STARTUP 0x08 #define BL_APPLICATION_ENTRY_REBOOT_ON_ERROR 0x20 +#define BL_APPLICATION_ENTRY_NTLDR 0x40 #define BL_APPLICATION_ENTRY_BCD_OPTIONS_EXTERNAL 0x80 +#define BL_APPLICATION_ENTRY_WINRESUME 0x100 +#define BL_APPLICATION_ENTRY_SETUPLDR 0x200 +#define BL_APPLICATION_ENTRY_BOOTSECTOR 0x400 +#define BL_APPLICATION_ENTRY_BOOTMGR 0x1000 +#define BL_APPLICATION_ENTRY_DISPLAY_ORDER 0x800000 +#define BL_APPLICATION_ENTRY_FIXED_SEQUENCE 0x20000000 #define BL_CONTEXT_PAGING_ON 1 #define BL_CONTEXT_INTERRUPTS_ON 2 @@ -1743,6 +1752,12 @@ ); NTSTATUS +BlAppendBootOptionString ( + _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, + _In_ PWCHAR OptionString + ); + +NTSTATUS BlAppendBootOptions ( _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, _In_ PBL_BCD_OPTION Options @@ -1784,7 +1799,6 @@ BiGetRegistryValue ( _In_ HANDLE KeyHandle, _In_ PWCHAR ValueName, - _In_ PWCHAR KeyName, _In_ ULONG Type, _Out_ PVOID* Buffer, _Out_ PULONG ValueLength Modified: trunk/reactos/boot/environ/lib/misc/bcd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcd.… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] Mon Jan 18 16:54:44 2016 @@ -881,7 +881,6 @@ /* Read the appropriate registry value type for this element */ Status = BiGetRegistryValue(ElementHandle, L"Element", - NULL, BiConvertElementFormatToValueType( ElementType.Format), &RegistryElementData, @@ -1177,6 +1176,69 @@ } NTSTATUS +BiGetObjectDescription ( + _In_ HANDLE ObjectHandle, + _Out_ PBCD_OBJECT_DESCRIPTION Description + ) +{ + NTSTATUS Status; + HANDLE DescriptionHandle; + PULONG Data; + ULONG Length; + + /* Initialize locals */ + Data = NULL; + DescriptionHandle = NULL; + + /* Open the description key */ + Status = BiOpenKey(ObjectHandle, L"Description", &DescriptionHandle); + if (NT_SUCCESS(Status)) + { + /* It exists */ + Description->Valid = TRUE; + + /* Read the type */ + Length = 0; + Status = BiGetRegistryValue(DescriptionHandle, + L"Type", + REG_DWORD, + (PVOID*)&Data, + &Length); + if (NT_SUCCESS(Status)) + { + /* Make sure it's the length we expected it to be */ + if (Length == sizeof(Data)) + { + /* Return the type that is stored there */ + Description->Type = *Data; + } + else + { + /* Invalid type value */ + Status = STATUS_OBJECT_TYPE_MISMATCH; + } + } + } + + /* Did we have a handle open? */ + if (DescriptionHandle) + { + /* Close it */ + BiCloseKey(DescriptionHandle); + } + + /* Did we have data allocated? */ + if (Data) + { + /* Free it */ + BlMmFreeHeap(Data); + } + + /* Return back to caller */ + return Status; +} + +NTSTATUS BcdEnumerateAndUnpackElements ( _In_ HANDLE BcdHandle, _In_ HANDLE ObjectHandle, Modified: trunk/reactos/boot/environ/lib/misc/bcdopt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcdo… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcdopt.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcdopt.c [iso-8859-1] Mon Jan 18 16:54:44 2016 @@ -622,6 +622,53 @@ } NTSTATUS +BlAppendBootOptionString ( + _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, + _In_ PWCHAR OptionString + ) +{ + NTSTATUS Status; + ULONG StringSize; + PBL_BCD_OPTION Option; + + /* Get the length in bytes */ + Status = RtlULongLongToULong(wcslen(OptionString) * sizeof(WCHAR), + &StringSize); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Add a NULL-terminator */ + Status = RtlULongAdd(StringSize, sizeof(UNICODE_NULL), &StringSize); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Allocate space for the entry */ + Option = BlMmAllocateHeap(sizeof(*Option) + StringSize); + if (!Option) + { + return STATUS_NO_MEMORY; + } + + /* Initialize it and copy the string value */ + RtlZeroMemory(Option, sizeof(*Option) + StringSize); + Option->DataSize = StringSize; + Option->Type = BcdLibraryString_ApplicationPath; + Option->DataOffset = sizeof(*Option); + wcsncpy((PWCHAR)Option + 1, OptionString, StringSize / sizeof(WCHAR)); + + /* Append it */ + Status = BlAppendBootOptions(AppEntry, Option); + + /* We're all done, free our initial option */ + BlMmFreeHeap(Option); + return Status; +} + +NTSTATUS BlAppendBootOptions ( _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, _In_ PBL_BCD_OPTION Options Modified: trunk/reactos/boot/environ/lib/misc/bootreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/boot… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bootreg.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bootreg.c [iso-8859-1] Mon Jan 18 16:54:44 2016 @@ -655,7 +655,6 @@ BiGetRegistryValue ( _In_ HANDLE KeyHandle, _In_ PWCHAR ValueName, - _In_ PWCHAR KeyName, _In_ ULONG Type, _Out_ PVOID* Buffer, _Out_ PULONG ValueLength

1 0

[akhaldi] 70613: [0.4.0] * And of course we need Hermès' lovely New Year celebration in r70477 ;)
by akhaldi＠svn.reactos.org 18 Jan '16

18 Jan '16

Author: akhaldi Date: Mon Jan 18 13:17:43 2016 New Revision: 70613 URL: http://svn.reactos.org/svn/reactos?rev=70613&view=rev Log: [0.4.0] * And of course we need Hermès' lovely New Year celebration in r70477 ;) Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/dll/win32/msgina/resources/reactos.bmp branches/ros-branch-0_4_0/reactos/dll/win32/msgina/resources/reactos.svg branches/ros-branch-0_4_0/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake branches/ros-branch-0_4_0/reactos/include/reactos/version.h.cmake branches/ros-branch-0_4_0/reactos/ntoskrnl/inbv/logo/1.bmp Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 18 13:17:43 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 18 13:17:43 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606 Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msgina/resources/reactos.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msgina/resources/reactos.svg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/msgina/resources/reactos.svg [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/msgina/resources/reactos.svg [iso-8859-1] Mon Jan 18 13:17:43 2016 @@ -1930,7 +1930,7 @@ x="5.59375" y="1047.7255" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright Â© 1996-2015 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright Â© 1996-2016 ReactOS Team & Contributors</tspan></text> <g transform="matrix(0.16958533,0,0,0.16958533,89.849943,981.79073)" id="g15501"> Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… ============================================================================== --- branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake [iso-8859-1] Mon Jan 18 13:17:43 2016 @@ -19,7 +19,7 @@ set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "0") -set(COPYRIGHT_YEAR "2015") +set(COPYRIGHT_YEAR "2016") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) set(KERNEL_VERSION_BUILD_TYPE "") Modified: branches/ros-branch-0_4_0/reactos/include/reactos/version.h.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… ============================================================================== --- branches/ros-branch-0_4_0/reactos/include/reactos/version.h.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/include/reactos/version.h.cmake [iso-8859-1] Mon Jan 18 13:17:43 2016 @@ -25,7 +25,6 @@ /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ #define KERNEL_VERSION_BUILD_TYPE "@KERNEL_VERSION_BUILD_TYPE@" - #endif /* EOF */ Modified: branches/ros-branch-0_4_0/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/ntoskr… ============================================================================== Binary files - no diff available.

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