Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [STOBJECT] Revert b7c3398 because it was not the cause of the original problem I wanted to fix (notify structure not completely zeroed-out on the receiver side of the notification).
by Hermès Bélusca-Maïto 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5de33ab010f3cb3ab495c… commit 5de33ab010f3cb3ab495cd1f5cfde60a0257d61d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 4 02:23:28 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 4 02:23:28 2018 +0100 [STOBJECT] Revert b7c3398 because it was not the cause of the original problem I wanted to fix (notify structure not completely zeroed-out on the receiver side of the notification). --- dll/shellext/stobject/csystray.cpp | 5 ++--- dll/shellext/stobject/hotplug.cpp | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp index f75f25d54c..89bd5c5ac0 100644 --- a/dll/shellext/stobject/csystray.cpp +++ b/dll/shellext/stobject/csystray.cpp @@ -121,12 +121,11 @@ HRESULT CSysTray::ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, LR *--*/ HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip, DWORD dwstate) { - NOTIFYICONDATA nim; + NOTIFYICONDATA nim = { 0 }; TRACE("NotifyIcon code=%d, uId=%d, hIcon=%p, szTip=%S\n", code, uId, hIcon, szTip); - ZeroMemory(&nim, sizeof(nim)); - nim.cbSize = sizeof(nim); + nim.cbSize = sizeof(NOTIFYICONDATA); nim.uFlags = NIF_MESSAGE | NIF_ICON | NIF_STATE | NIF_TIP; nim.hIcon = hIcon; nim.uID = uId; diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp index 9550d23960..5c6d3099a8 100644 --- a/dll/shellext/stobject/hotplug.cpp +++ b/dll/shellext/stobject/hotplug.cpp @@ -100,10 +100,8 @@ HRESULT EnumHotpluggedDevices(CSimpleArray<DEVINST> &devList) *--*/ HRESULT NotifyBalloon(CSysTray* pSysTray, LPCWSTR szTitle = NULL, LPCWSTR szInfo = NULL, UINT uId = ID_ICON_HOTPLUG) { - NOTIFYICONDATA nim; - - ZeroMemory(&nim, sizeof(nim)); - nim.cbSize = sizeof(nim); + NOTIFYICONDATA nim = { 0 }; + nim.cbSize = sizeof(NOTIFYICONDATA); nim.uID = uId; nim.hWnd = pSysTray->GetHWnd();

1 0

05/05: [EXPLORER] Don't use deprecated StrNCpy function but use the string-safe StringCchCopy instead. Also fix a copy-paste error in the _countofs.
by Hermès Bélusca-Maïto 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04498f3eb52a7d5f960d0… commit 04498f3eb52a7d5f960d096f53be8808dc68dd93 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 4 01:56:11 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 4 01:57:05 2018 +0100 [EXPLORER] Don't use deprecated StrNCpy function but use the string-safe StringCchCopy instead. Also fix a copy-paste error in the _countofs. --- base/shell/explorer/syspager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 4656d8f6fa..9ba0f2fc99 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -107,8 +107,8 @@ private: Info(InternalIconData * source) { pSource = source; - StrNCpy(szInfo, source->szInfo, _countof(szInfo)); - StrNCpy(szInfoTitle, source->szInfoTitle, _countof(szInfoTitle)); + StringCchCopy(szInfo, _countof(szInfo), source->szInfo); + StringCchCopy(szInfoTitle, _countof(szInfoTitle), source->szInfoTitle); uIcon = source->dwInfoFlags & NIIF_ICON_MASK; if (source->dwInfoFlags == NIIF_USER) uIcon = reinterpret_cast<WPARAM>(source->hIcon); @@ -775,8 +775,8 @@ BOOL CNotifyToolbar::AddButton(_In_ CONST NOTIFYICONDATA *iconData) if (iconData->uFlags & NIF_INFO) { // NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always. - StrNCpy(notifyItem->szInfo, iconData->szInfo, _countof(notifyItem->szInfo)); - StrNCpy(notifyItem->szInfoTitle, iconData->szInfoTitle, _countof(notifyItem->szInfo)); + StringCchCopy(notifyItem->szInfo, _countof(notifyItem->szInfo), iconData->szInfo); + StringCchCopy(notifyItem->szInfoTitle, _countof(notifyItem->szInfoTitle), iconData->szInfoTitle); notifyItem->dwInfoFlags = iconData->dwInfoFlags; notifyItem->uTimeout = iconData->uTimeout; } @@ -913,8 +913,8 @@ BOOL CNotifyToolbar::UpdateButton(_In_ CONST NOTIFYICONDATA *iconData) if (iconData->uFlags & NIF_INFO) { // NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always. - StrNCpy(notifyItem->szInfo, iconData->szInfo, _countof(notifyItem->szInfo)); - StrNCpy(notifyItem->szInfoTitle, iconData->szInfoTitle, _countof(notifyItem->szInfo)); + StringCchCopy(notifyItem->szInfo, _countof(notifyItem->szInfo), iconData->szInfo); + StringCchCopy(notifyItem->szInfoTitle, _countof(notifyItem->szInfoTitle), iconData->szInfoTitle); notifyItem->dwInfoFlags = iconData->dwInfoFlags; notifyItem->uTimeout = iconData->uTimeout; }

1 0

04/05: [STOBJECT] Fully zero-out the full NOTIFYICONDATA structure (it wasn't zeroed out correctly in MSVC build).
by Hermès Bélusca-Maïto 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7c3398f95d0aa54f2b5b… commit b7c3398f95d0aa54f2b5bd1acae0bef496af7e29 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 4 01:54:55 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 4 01:57:02 2018 +0100 [STOBJECT] Fully zero-out the full NOTIFYICONDATA structure (it wasn't zeroed out correctly in MSVC build). --- dll/shellext/stobject/csystray.cpp | 5 +++-- dll/shellext/stobject/hotplug.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp index 89bd5c5ac0..f75f25d54c 100644 --- a/dll/shellext/stobject/csystray.cpp +++ b/dll/shellext/stobject/csystray.cpp @@ -121,11 +121,12 @@ HRESULT CSysTray::ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, LR *--*/ HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip, DWORD dwstate) { - NOTIFYICONDATA nim = { 0 }; + NOTIFYICONDATA nim; TRACE("NotifyIcon code=%d, uId=%d, hIcon=%p, szTip=%S\n", code, uId, hIcon, szTip); - nim.cbSize = sizeof(NOTIFYICONDATA); + ZeroMemory(&nim, sizeof(nim)); + nim.cbSize = sizeof(nim); nim.uFlags = NIF_MESSAGE | NIF_ICON | NIF_STATE | NIF_TIP; nim.hIcon = hIcon; nim.uID = uId; diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp index 5c6d3099a8..9550d23960 100644 --- a/dll/shellext/stobject/hotplug.cpp +++ b/dll/shellext/stobject/hotplug.cpp @@ -100,8 +100,10 @@ HRESULT EnumHotpluggedDevices(CSimpleArray<DEVINST> &devList) *--*/ HRESULT NotifyBalloon(CSysTray* pSysTray, LPCWSTR szTitle = NULL, LPCWSTR szInfo = NULL, UINT uId = ID_ICON_HOTPLUG) { - NOTIFYICONDATA nim = { 0 }; - nim.cbSize = sizeof(NOTIFYICONDATA); + NOTIFYICONDATA nim; + + ZeroMemory(&nim, sizeof(nim)); + nim.cbSize = sizeof(nim); nim.uID = uId; nim.hWnd = pSysTray->GetHWnd();

1 0

03/05: [NETSHELL] Don't use hardcoded values.
by Hermès Bélusca-Maïto 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af4bdd4388746333b584b… commit af4bdd4388746333b584b3c996e8f580e3701094 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 4 01:53:24 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 4 01:56:59 2018 +0100 [NETSHELL] Don't use hardcoded values. --- dll/shellext/netshell/lanstatusui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index 599eb22841..6cfd065b46 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -232,7 +232,7 @@ UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext) nid.cbSize = sizeof(nid); nid.uID = pContext->uID; nid.hWnd = pContext->hwndStatusDlg; - nid.uVersion = 3; + nid.uVersion = NOTIFYICON_VERSION; if (pContext->pNet->GetProperties(&pProperties) == S_OK) { @@ -1041,7 +1041,7 @@ CLanStatus::InitializeNetTaskbarNotifications() nid.cbSize = sizeof(nid); nid.uID = Index++; nid.uFlags = NIF_MESSAGE; - nid.uVersion = 3; + nid.uVersion = NOTIFYICON_VERSION; nid.uCallbackMessage = WM_SHOWSTATUSDLG; nid.hWnd = hwndDlg;

1 0

02/05: [SHELL32] Fix copy-pasta.
by Hermès Bélusca-Maïto 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ecabcce59d7c773d9d9d… commit 5ecabcce59d7c773d9d9d24f718b242892203b47 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 4 01:52:50 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 4 01:56:56 2018 +0100 [SHELL32] Fix copy-pasta. --- dll/win32/shell32/systray.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/systray.cpp b/dll/win32/shell32/systray.cpp index 435411a172..aa07708d4d 100644 --- a/dll/win32/shell32/systray.cpp +++ b/dll/win32/shell32/systray.cpp @@ -125,7 +125,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW pnid) { WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n", pnid->cbSize, NOTIFYICONDATAW_V1_SIZE); - cbSize = NOTIFYICONDATAA_V1_SIZE; + cbSize = NOTIFYICONDATAW_V1_SIZE; } else cbSize = pnid->cbSize;

1 0

01/05: [PSDK] Fix NOTIFYICONDATA structure; add NOTIFYICONDATA_V3_SIZE definitions.
by Hermès Bélusca-Maïto 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d2139b7d8b9f8e36e070… commit 9d2139b7d8b9f8e36e07059b9ff8ee65ef5f29df Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 4 01:51:46 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 4 01:56:53 2018 +0100 [PSDK] Fix NOTIFYICONDATA structure; add NOTIFYICONDATA_V3_SIZE definitions. --- sdk/include/psdk/shellapi.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/include/psdk/shellapi.h b/sdk/include/psdk/shellapi.h index 5845c2a9bb..2e26e59868 100644 --- a/sdk/include/psdk/shellapi.h +++ b/sdk/include/psdk/shellapi.h @@ -217,8 +217,6 @@ typedef struct _NOTIFYICONDATAA { } DUMMYUNIONNAME; CHAR szInfoTitle[64]; DWORD dwInfoFlags; -#else - CHAR szTip[64]; #endif #if (NTDDI_VERSION >= NTDDI_WINXP) GUID guidItem; @@ -236,7 +234,7 @@ typedef struct _NOTIFYICONDATAW { UINT uCallbackMessage; HICON hIcon; #if (NTDDI_VERSION < NTDDI_WIN2K) - CHAR szTip[64]; + WCHAR szTip[64]; #endif #if (NTDDI_VERSION >= NTDDI_WIN2K) WCHAR szTip[128]; @@ -249,14 +247,12 @@ typedef struct _NOTIFYICONDATAW { } DUMMYUNIONNAME; WCHAR szInfoTitle[64]; DWORD dwInfoFlags; -#else - WCHAR szTip[64]; #endif #if (NTDDI_VERSION >= NTDDI_WINXP) GUID guidItem; #endif #if (NTDDI_VERSION >= NTDDI_VISTA) - HICON hBalloonIcon; + HICON hBalloonIcon; #endif } NOTIFYICONDATAW,*PNOTIFYICONDATAW; @@ -264,6 +260,8 @@ typedef struct _NOTIFYICONDATAW { #define NOTIFYICONDATAW_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAW, szTip[64]) #define NOTIFYICONDATAA_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAA, guidItem) #define NOTIFYICONDATAW_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAW, guidItem) +#define NOTIFYICONDATAA_V3_SIZE FIELD_OFFSET(NOTIFYICONDATAA, hBalloonIcon) +#define NOTIFYICONDATAW_V3_SIZE FIELD_OFFSET(NOTIFYICONDATAW, hBalloonIcon) #if WINVER >= 0x400 typedef struct _DRAGINFOA { @@ -612,6 +610,7 @@ DoEnvironmentSubstW( #ifdef UNICODE #define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE #define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE +#define NOTIFYICONDATA_V3_SIZE NOTIFYICONDATAW_V3_SIZE typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA; typedef DRAGINFOW DRAGINFO,*LPDRAGINFO; typedef SHELLEXECUTEINFOW SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO; @@ -639,6 +638,7 @@ typedef LPSHNAMEMAPPINGW LPSHNAMEMAPPING; #else #define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAA_V1_SIZE #define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAA_V2_SIZE +#define NOTIFYICONDATA_V3_SIZE NOTIFYICONDATAA_V3_SIZE typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA; typedef DRAGINFOA DRAGINFO,*LPDRAGINFO; typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;

1 0

01/01: [ROSLOAD]: Begin target preparation code. 1/104.
by Alex Ionescu 03 Feb '18

03 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=adcb9bd1753c355beff07… commit adcb9bd1753c355beff0779d3a43deb5a6240081 Author: Alex Ionescu <aionescu(a)gmail.com> AuthorDate: Sat Feb 3 15:52:31 2018 -0800 Commit: Alex Ionescu <aionescu(a)gmail.com> CommitDate: Sat Feb 3 15:52:35 2018 -0800 [ROSLOAD]: Begin target preparation code. 1/104. [ROSLOAD]: Stubs for OslFatalErrorEx, OslAbortBoot. OslpSanitizeLoadOptionsString, OslpSanitizeStringOptions [ROSLOAD]: Implement OslBlStatusErrorHandler, OslpRemoveInternalApplicationOptions [ROSLOAD]: Begin work on OslPrepareTarget. Small misc. fixes. [BOOTLIB]: Extend BlStatusError to handle a custom status error handler. --- boot/environ/app/rosload/rosload.c | 291 ++++++++++++++++++++++++++++++++++++- boot/environ/include/bl.h | 16 +- boot/environ/lib/misc/debug.c | 31 ++++ boot/environ/lib/misc/image.c | 6 +- boot/environ/lib/mm/pagealloc.c | 2 +- 5 files changed, 334 insertions(+), 12 deletions(-) diff --git a/boot/environ/app/rosload/rosload.c b/boot/environ/app/rosload/rosload.c index 67568f5289..65ec28b2bf 100644 --- a/boot/environ/app/rosload/rosload.c +++ b/boot/environ/app/rosload/rosload.c @@ -18,7 +18,7 @@ OslArchTransferToKernel ( /* DATA VARIABLES ************************************************************/ -LOADER_PARAMETER_BLOCK OslLoaderBlock; +PLOADER_PARAMETER_BLOCK OslLoaderBlock; PVOID OslEntryPoint; PVOID UserSharedAddress; ULONGLONG ArchXCr0BitsToClear; @@ -27,15 +27,296 @@ BOOLEAN BdDebugAfterExitBootServices; KDESCRIPTOR OslKernelGdt; KDESCRIPTOR OslKernelIdt; +ULONG_PTR OslImcHiveHandle; +ULONG_PTR OslMachineHiveHandle; +ULONG_PTR OslElamHiveHandle; +ULONG_PTR OslSystemHiveHandle; + +PBL_DEVICE_DESCRIPTOR OslLoadDevice; +PCHAR OslLoadOptions; +PWCHAR OslSystemRoot; + +LIST_ENTRY OslFreeMemoryDesctiptorsList; +LIST_ENTRY OslFinalMemoryMap; +LIST_ENTRY OslCoreExtensionSubGroups[2]; +LIST_ENTRY OslLoadedFirmwareDriverList; + +BL_BUFFER_DESCRIPTOR OslFinalMemoryMapDescriptorsBuffer; + +GUID OslApplicationIdentifier; + +ULONG OslResetBootStatus; +BOOLEAN OslImcProcessingValid; +ULONG OslFreeMemoryDesctiptorsListSize; +PVOID OslMemoryDescriptorBuffer; + /* FUNCTIONS *****************************************************************/ +VOID +OslFatalErrorEx ( + _In_ ULONG ErrorCode, + _In_ ULONG Parameter1, + _In_ ULONG_PTR Parameter2, + _In_ ULONG_PTR Parameter3 + ) +{ + /* For now just do this */ + BlStatusPrint(L"FATAL ERROR IN ROSLOAD: %lx\n", ErrorCode); +} + +VOID +OslAbortBoot ( + _In_ NTSTATUS Status + ) +{ + /* For now just do this */ + BlStatusPrint(L"BOOT ABORTED: %lx\n", Status); +} + +NTSTATUS +OslBlStatusErrorHandler ( + _In_ ULONG ErrorCode, + _In_ ULONG Parameter1, + _In_ ULONG_PTR Parameter2, + _In_ ULONG_PTR Parameter3, + _In_ ULONG_PTR Parameter4 + ) +{ + /* We only filter error code 4 */ + if (ErrorCode != 4) + { + return STATUS_NOT_IMPLEMENTED; + } + + /* Handle error 4 as a fatal error 3 internally */ + OslFatalErrorEx(3, Parameter1, Parameter2, Parameter3); + return STATUS_SUCCESS; +} + +VOID +OslpSanitizeLoadOptionsString ( + _In_ PWCHAR OptionString, + _In_ PWCHAR SanitizeString + ) +{ + /* TODO */ + return; +} + +VOID +OslpSanitizeStringOptions ( + _In_ PBL_BCD_OPTION BcdOptions + ) +{ + /* TODO */ + return; +} + +NTSTATUS +OslpRemoveInternalApplicationOptions ( + VOID + ) +{ + PWCHAR LoadString; + NTSTATUS Status; + + /* Assume success */ + Status = STATUS_SUCCESS; + + /* Remove attempts to disable integrity checks or ELAM driver load */ + BlRemoveBootOption(BlpApplicationEntry.BcdData, + BcdLibraryBoolean_DisableIntegrityChecks); + BlRemoveBootOption(BlpApplicationEntry.BcdData, + BcdOSLoaderBoolean_DisableElamDrivers); + + /* Get the command-line parameters, if any */ + Status = BlGetBootOptionString(BlpApplicationEntry.BcdData, + BcdLibraryString_LoadOptionsString, + &LoadString); + if (NT_SUCCESS(Status)) + { + /* Conver to upper case */ + _wcsupr(LoadString); + + /* Remove the existing one */ + //BlRemoveBootOption(BlpApplicationEntry.BcdData, + // BcdLibraryString_LoadOptionsString); + + /* Sanitize strings we don't want */ + OslpSanitizeLoadOptionsString(LoadString, L"DISABLE_INTEGRITY_CHECKS"); + OslpSanitizeLoadOptionsString(LoadString, L"NOINTEGRITYCHECKS"); + OslpSanitizeLoadOptionsString(LoadString, L"DISABLEELAMDRIVERS"); + + /* Add the sanitized one back */ + //Status = BlAppendBootOptionsString(&BlpApplicationEntry, + // BcdLibraryString_LoadOptionsString, + // LoadString); + + /* Free the original BCD one */ + BlMmFreeHeap(LoadString); + } + + /* One more pass for secure-boot options */ + OslpSanitizeStringOptions(BlpApplicationEntry.BcdData); + + /* All good */ + return Status; +} + NTSTATUS OslPrepareTarget ( _Out_ PULONG ReturnFlags, _Out_ PBOOLEAN Jump ) { - return STATUS_NOT_IMPLEMENTED; + PGUID AppId; + NTSTATUS Status; + PBL_DEVICE_DESCRIPTOR OsDevice; + PWCHAR SystemRoot; + SIZE_T RootLength, RootLengthWithSep; + ULONG i; + ULONG64 StartPerf, EndPerf; + + /* Assume no flags */ + *ReturnFlags = 0; + + /* Make all registry handles invalid */ + OslImcHiveHandle = -1; + OslMachineHiveHandle = -1; + OslElamHiveHandle = -1; + OslSystemHiveHandle = -1; + + /* Initialize memory lists */ + InitializeListHead(&OslFreeMemoryDesctiptorsList); + InitializeListHead(&OslFinalMemoryMap); + InitializeListHead(&OslLoadedFirmwareDriverList); + for (i = 0; i < RTL_NUMBER_OF(OslCoreExtensionSubGroups); i++) + { + InitializeListHead(&OslCoreExtensionSubGroups[i]); + } + + /* Initialize the memory map descriptor buffer */ + RtlZeroMemory(&OslFinalMemoryMapDescriptorsBuffer, + sizeof(OslFinalMemoryMapDescriptorsBuffer)); + + /* Initialize general pointers */ + OslLoadDevice = NULL; + OslLoadOptions = NULL; + OslSystemRoot = NULL; + OslLoaderBlock = NULL; + OslMemoryDescriptorBuffer = NULL; + + /* Initialize general variables */ + OslResetBootStatus = 0; + OslImcProcessingValid = FALSE; + OslFreeMemoryDesctiptorsListSize = 0; + + /* Capture the current TSC */ + StartPerf = BlArchGetPerformanceCounter(); + +#ifdef BL_TPM_SUPPORT + BlpSbdiCurrentApplicationType = 0x10200003; +#endif + + /* Register an error handler */ + BlpStatusErrorHandler = OslBlStatusErrorHandler; + + /* Get the application identifier and save it */ + AppId = BlGetApplicationIdentifier(); + if (AppId) + { + OslApplicationIdentifier = *AppId; + } + + /* Enable tracing */ +#ifdef BL_ETW_SUPPORT + TraceLoggingRegister(&TlgOslBootProviderProv); +#endif + + /* Remove dangerous BCD options */ + Status = OslpRemoveInternalApplicationOptions(); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Get the OS device */ + Status = BlGetBootOptionDevice(BlpApplicationEntry.BcdData, + BcdOSLoaderDevice_OSDevice, + &OsDevice, + 0); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* If the OS device is the boot device, use the one provided by bootlib */ + if (OsDevice->DeviceType == BootDevice) + { + OsDevice = BlpBootDevice; + } + + /* Save it as a global for later */ + OslLoadDevice = OsDevice; + + /* Get the system root */ + Status = BlGetBootOptionString(BlpApplicationEntry.BcdData, + BcdOSLoaderString_SystemRoot, + &SystemRoot); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + EfiPrintf(L"System root: %s\r\n", SystemRoot); + + /* Get the system root length and make sure it's slash-terminated */ + RootLength = wcslen(SystemRoot); + if (SystemRoot[RootLength - 1] == OBJ_NAME_PATH_SEPARATOR) + { + /* Perfect, set it */ + OslSystemRoot = SystemRoot; + } + else + { + /* Allocate a new buffer large enough to contain the slash */ + RootLengthWithSep = RootLength + sizeof(OBJ_NAME_PATH_SEPARATOR); + OslSystemRoot = BlMmAllocateHeap(RootLengthWithSep * sizeof(WCHAR)); + if (!OslSystemRoot) + { + /* Bail out if we're out of memory */ + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Make a copy of the path, adding the separator */ + wcscpy(OslSystemRoot, SystemRoot); + wcscat(OslSystemRoot, L"\\"); + + /* Free the original one from the BCD library */ + BlMmFreeHeap(SystemRoot); + } + + Status = STATUS_NOT_IMPLEMENTED; + + /* Printf perf */ + EndPerf = BlArchGetPerformanceCounter(); + EfiPrintf(L"Delta: %lld\r\n", EndPerf - StartPerf); + +Quickie: +#if BL_BITLOCKER_SUPPORT + /* Destroy the RNG/AES library for BitLocker */ + SymCryptRngAesUninstantiate(); +#endif + + /* Abort the boot */ + OslAbortBoot(Status); + + /* This is a failure path, so never do the jump */ + *Jump = FALSE; + + /* Return error code */ + return Status; } NTSTATUS @@ -132,11 +413,11 @@ OslExecuteTransition ( } /* Setup Firmware for Phase 1 */ - Status = OslFwpKernelSetupPhase1(&OslLoaderBlock); + Status = OslFwpKernelSetupPhase1(OslLoaderBlock); if (NT_SUCCESS(Status)) { /* Setup kernel for Phase 2 */ - Status = OslArchKernelSetup(2, &OslLoaderBlock); + Status = OslArchKernelSetup(2, OslLoaderBlock); if (NT_SUCCESS(Status)) { #ifdef BL_KD_SUPPORT @@ -144,7 +425,7 @@ OslExecuteTransition ( BlBdStop(); #endif /* Jump to the kernel entrypoint */ - OslArchTransferToKernel(&OslLoaderBlock, OslEntryPoint); + OslArchTransferToKernel(OslLoaderBlock, OslEntryPoint); /* Infinite loop if we got here */ for (;;); diff --git a/boot/environ/include/bl.h b/boot/environ/include/bl.h index 40d11895c2..0e31deb8e9 100644 --- a/boot/environ/include/bl.h +++ b/boot/environ/include/bl.h @@ -742,6 +742,15 @@ typedef BOOLEAN _Out_opt_ PULONG CacheAttributes ); +typedef NTSTATUS +(*PBL_STATUS_ERROR_HANDLER) ( + _In_ ULONG ErrorCode, + _In_ ULONG Parameter1, + _In_ ULONG_PTR Parameter2, + _In_ ULONG_PTR Parameter3, + _In_ ULONG_PTR Parameter4 + ); + /* DATA STRUCTURES ***********************************************************/ typedef struct _BL_LIBRARY_PARAMETERS @@ -1277,12 +1286,12 @@ typedef struct _BL_IMAGE_APPLICATION_ENTRY ULONG ImageSize; } BL_IMAGE_APPLICATION_ENTRY, *PBL_IMAGE_APPLICATION_ENTRY; -typedef struct _BL_IMAGE_PARAMETERS +typedef struct _BL_BUFFER_DESCRIPTOR { PVOID Buffer; ULONG ActualSize; ULONG BufferSize; -} BL_IMAGE_PARAMETERS, *PBL_IMAGE_PARAMETERS; +} BL_BUFFER_DESCRIPTOR, *PBL_BUFFER_DESCRIPTOR; typedef struct _BL_DEFERRED_FONT_FILE { @@ -2287,7 +2296,7 @@ BlMmRemoveBadMemory ( NTSTATUS BlMmGetMemoryMap ( _In_ PLIST_ENTRY MemoryMap, - _In_ PBL_IMAGE_PARAMETERS MemoryParameters, + _In_ PBL_BUFFER_DESCRIPTOR MemoryParameters, _In_ ULONG WhichTypes, _In_ ULONG Flags ); @@ -2831,5 +2840,6 @@ extern PBL_MM_RELOCATE_SELF_MAP BlMmRelocateSelfMap; extern PBL_MM_FLUSH_TLB BlMmFlushTlb; extern PBL_MM_MOVE_VIRTUAL_ADDRESS_RANGE BlMmMoveVirtualAddressRange; extern PBL_MM_ZERO_VIRTUAL_ADDRESS_RANGE BlMmZeroVirtualAddressRange; +extern PBL_STATUS_ERROR_HANDLER BlpStatusErrorHandler; #endif diff --git a/boot/environ/lib/misc/debug.c b/boot/environ/lib/misc/debug.c index a4c82e2cb0..b38a29f192 100644 --- a/boot/environ/lib/misc/debug.c +++ b/boot/environ/lib/misc/debug.c @@ -16,6 +16,8 @@ CHAR AnsiBuffer[1024]; BOOLEAN BdDebuggerNotPresent; BOOLEAN BdSubsystemInitialized; BOOLEAN BdArchBlockDebuggerOperation; +BOOLEAN BlpStatusErrorInProgress; +PBL_STATUS_ERROR_HANDLER BlpStatusErrorHandler; /* FUNCTIONS *****************************************************************/ @@ -124,6 +126,35 @@ BlStatusError ( _In_ ULONG_PTR Parameter4 ) { + NTSTATUS Status; + + /* Is this a non-boot error? */ + if (ErrorCode != 1) + { + /* Is one already ongoing? */ + if (!BlpStatusErrorInProgress) + { + /* Do we have a custom error handler registered? */ + if (BlpStatusErrorHandler) + { + /* Call it, making sure to avoid recursion */ + BlpStatusErrorInProgress = TRUE; + Status = BlpStatusErrorHandler(ErrorCode, + Parameter1, + Parameter2, + Parameter3, + Parameter4); + BlpStatusErrorInProgress = FALSE; + + /* If the error handler consumed the error, we're done */ + if (NT_SUCCESS(Status)) + { + return; + } + } + } + } + /* Check if the boot debugger is enabled */ if (BlBdDebuggerEnabled()) { diff --git a/boot/environ/lib/misc/image.c b/boot/environ/lib/misc/image.c index 4073eae3e9..29fdb9def9 100644 --- a/boot/environ/lib/misc/image.c +++ b/boot/environ/lib/misc/image.c @@ -1654,7 +1654,7 @@ ImgpCopyApplicationBootDevice ( NTSTATUS ImgpInitializeBootApplicationParameters ( - _In_ PBL_IMAGE_PARAMETERS ImageParameters, + _In_ PBL_BUFFER_DESCRIPTOR ImageParameters, _In_ PBL_APPLICATION_ENTRY AppEntry, _In_ PVOID ImageBase, _In_ ULONG ImageSize @@ -1662,7 +1662,7 @@ ImgpInitializeBootApplicationParameters ( { NTSTATUS Status; PIMAGE_NT_HEADERS NtHeaders; - BL_IMAGE_PARAMETERS MemoryParameters; + BL_BUFFER_DESCRIPTOR MemoryParameters; LIST_ENTRY MemoryList; PBL_FIRMWARE_DESCRIPTOR FirmwareParameters; PBL_DEVICE_DESCRIPTOR BootDevice; @@ -1841,7 +1841,7 @@ ImgArchEfiStartBootApplication ( PVOID BootData; PIMAGE_NT_HEADERS NtHeaders; PVOID NewStack, NewGdt, NewIdt; - BL_IMAGE_PARAMETERS Parameters; + BL_BUFFER_DESCRIPTOR Parameters; /* Read the current IDT and GDT */ _sgdt(&Gdt.Limit); diff --git a/boot/environ/lib/mm/pagealloc.c b/boot/environ/lib/mm/pagealloc.c index f39904d9c9..fc42077ce5 100644 --- a/boot/environ/lib/mm/pagealloc.c +++ b/boot/environ/lib/mm/pagealloc.c @@ -1221,7 +1221,7 @@ MmPapFreePages ( NTSTATUS BlMmGetMemoryMap ( _In_ PLIST_ENTRY MemoryMap, - _In_ PBL_IMAGE_PARAMETERS MemoryParameters, + _In_ PBL_BUFFER_DESCRIPTOR MemoryParameters, _In_ ULONG WhichTypes, _In_ ULONG Flags )

1 0

03/03: [RAPPS] Remove trailing spaces.
by Hermès Bélusca-Maïto 03 Feb '18

03 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b777fd133808ef4488f6… commit 3b777fd133808ef4488f61b085be34ef4f89e448 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Feb 3 23:42:46 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 3 23:43:56 2018 +0100 [RAPPS] Remove trailing spaces. --- base/applications/rapps/CMakeLists.txt | 2 +- base/applications/rapps/available.cpp | 6 +++--- base/applications/rapps/gui.cpp | 4 ++-- base/applications/rapps/include/available.h | 2 +- base/applications/rapps/include/crichedit.h | 2 +- base/applications/rapps/include/defines.h | 2 +- base/applications/rapps/include/resource.h | 2 +- base/applications/rapps/include/winmain.h | 2 +- base/applications/rapps/lang/en-US.rc | 2 +- base/applications/rapps/lang/ro-RO.rc | 2 +- base/applications/rapps/loaddlg.cpp | 4 ++-- base/applications/rapps/misc.cpp | 2 +- base/applications/rapps/unattended.cpp | 8 ++++---- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/base/applications/rapps/CMakeLists.txt b/base/applications/rapps/CMakeLists.txt index 82ade46cc7..cdbb6f97dc 100644 --- a/base/applications/rapps/CMakeLists.txt +++ b/base/applications/rapps/CMakeLists.txt @@ -35,7 +35,7 @@ list(APPEND SOURCE add_definitions( -DUSE_CERT_PINNING -D_ATL_NO_EXCEPTIONS) - + file(GLOB_RECURSE rapps_rc_deps res/*.*) add_rc_deps(rapps.rc ${rapps_rc_deps}) add_executable(rapps ${SOURCE} rapps.rc) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 19101cef14..04e5005e5a 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -204,7 +204,7 @@ inline BOOL CAvailableApplicationInfo::GetString(LPCWSTR lpKeyName, ATL::CString } return TRUE; } -// CAvailableApplicationInfo +// CAvailableApplicationInfo // AvailableStrings AvailableStrings::AvailableStrings() @@ -352,8 +352,8 @@ BOOL CAvailableApps::Enum(INT EnumType, AVAILENUMPROC lpEnumProc) m_InfoList.AddTail(Info); skip_if_cached: - if (EnumType == Info->m_Category - || EnumType == ENUM_ALL_AVAILABLE + if (EnumType == Info->m_Category + || EnumType == ENUM_ALL_AVAILABLE || (EnumType == ENUM_CAT_SELECTED && Info->m_IsSelected)) { Info->RefreshAppInfo(); diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index cae703f9a9..4a3e2794b3 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -668,7 +668,7 @@ public: const INT m_Width; const INT m_Height; - CSearchBar() : m_Width(200), m_Height(22) + CSearchBar() : m_Width(200), m_Height(22) { } @@ -1613,7 +1613,7 @@ private: m_ListView->DeleteAllItems(); - // Create new ImageList + // Create new ImageList hImageListView = ImageList_Create(LISTVIEW_ICON_SIZE, LISTVIEW_ICON_SIZE, GetSystemColorDepth() | ILC_MASK, diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index adf4c73aec..782f960be8 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -1,7 +1,7 @@ #pragma once #include <windef.h> -#include <atlstr.h> +#include <atlstr.h> #include <atlsimpcoll.h> #include <atlcoll.h> diff --git a/base/applications/rapps/include/crichedit.h b/base/applications/rapps/include/crichedit.h index ca6eaee255..3b34fde3f4 100644 --- a/base/applications/rapps/include/crichedit.h +++ b/base/applications/rapps/include/crichedit.h @@ -22,7 +22,7 @@ class CRichEdit : if ((dwEffects == CFM_LINK) && !PathIsURLW(lpszText)) { // if text is not an URL, no styling is used - SetRangeFormatting(Len, Len + InsertedTextLen, 0); + SetRangeFormatting(Len, Len + InsertedTextLen, 0); } else { diff --git a/base/applications/rapps/include/defines.h b/base/applications/rapps/include/defines.h index 159bcdc504..31feb26828 100644 --- a/base/applications/rapps/include/defines.h +++ b/base/applications/rapps/include/defines.h @@ -23,7 +23,7 @@ #include <ndk/rtlfuncs.h> #include <atlcoll.h> #include <atlsimpcoll.h> -#include <atlstr.h> +#include <atlstr.h> #include <rappsmsg.h> #include "resource.h" diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index b035f02807..6e768227fa 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -173,7 +173,7 @@ #define IDS_CAT_VIDEO 714 /* App installation status */ -#define IDS_STATUS_INSTALLED 800 +#define IDS_STATUS_INSTALLED 800 #define IDS_STATUS_NOTINSTALLED 801 #define IDS_STATUS_DOWNLOADED 802 #define IDS_STATUS_UPDATE_AVAILABLE 803 diff --git a/base/applications/rapps/include/winmain.h b/base/applications/rapps/include/winmain.h index 50a12e8413..bee3b96492 100644 --- a/base/applications/rapps/include/winmain.h +++ b/base/applications/rapps/include/winmain.h @@ -31,5 +31,5 @@ extern SETTINGS_INFO SettingsInfo; VOID SaveSettings(HWND hwnd); VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo); -// integrity.cpp +// integrity.cpp BOOL VerifyInteg(LPCWSTR lpSHA1Hash, LPCWSTR lpFileName); diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index af79001c77..3ecbc2c081 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -91,7 +91,7 @@ BEGIN END IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Downloading %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 30129d1c71..8d2d4f55e1 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -212,7 +212,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Pachetul nu poate fi descărcat! Verificați conexiunea de Internet!" IDS_UNABLE_TO_REMOVE "Datele de registru pentru acest program nu au putut fi eliminate!" IDS_UNABLE_TO_INSTALL "Programul de instalare nu poate fi executat!" - IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eșuat." + IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eșuat." IDS_INTEG_CHECK_TITLE "Integritatea pachetului în verificare…" IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandată." IDS_INTERRUPTED_DOWNLOAD "Descărcarea a fost întreruptă. Verificați conexiunea la Internet." diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index ba3e714012..d9d5aec84a 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -428,7 +428,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w if (Item) { // initialize the default values for our nifty progress bar - // and subclass it so that it learns to print a status text + // and subclass it so that it learns to print a status text SendMessageW(Item, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); SendMessageW(Item, PBM_SETPOS, 0, 0); @@ -705,7 +705,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) case 0: // preconfig hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); break; - case 1: // direct (no proxy) + case 1: // direct (no proxy) hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); break; case 2: // use proxy diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index afd134899c..1a527317af 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -215,7 +215,7 @@ BOOL ExtractFilesFromCab(LPCWSTR lpCabName, LPCWSTR lpOutputPath) SESSION Dest; HRESULT Result; fnExtract pfnExtract; - + hCabinetDll = LoadLibraryW(L"cabinet.dll"); if (hCabinetDll) { diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index 08587bb4e2..06f8537999 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -30,9 +30,9 @@ BOOL UseCmdParameters(LPWSTR lpCmdLine) for (INT i = 1; i < argc; ++i) { arrNames.Add(argv[i]); - } - } - else + } + } + else if (!StrCmpW(argv[0], CMD_KEY_SETUP)) { HINF InfHandle = SetupOpenInfFileW(argv[1], NULL, INF_STYLE_WIN4, NULL); @@ -70,6 +70,6 @@ BOOL UseCmdParameters(LPWSTR lpCmdLine) CDownloadManager::DownloadListOfApplications(arrAppInfo, TRUE); return TRUE; } - + return FALSE; }

1 0

02/03: [RAPPS] Remove deprecated TODO; use _countof() where needed.
by Hermès Bélusca-Maïto 03 Feb '18

03 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26ac8ac81e875db08c306… commit 26ac8ac81e875db08c306d95a0c7175323e84a69 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Feb 3 23:40:58 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 3 23:43:53 2018 +0100 [RAPPS] Remove deprecated TODO; use _countof() where needed. --- base/applications/rapps/gui.cpp | 1 - base/applications/rapps/loaddlg.cpp | 2 +- base/applications/rapps/misc.cpp | 2 +- base/applications/rapps/splitter.cpp | 2 -- base/applications/rapps/unattended.cpp | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 4118acbca5..cae703f9a9 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -145,7 +145,6 @@ class CAvailableAppView szLoadedAInfoText.LoadStringW(IDS_AINFO_LANGUAGES); - //TODO: replace those hardcoded strings if (Info->HasNativeLanguage()) { szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_AVAILABLE_TRANSLATION); diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 155241bc82..ba3e714012 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -444,7 +444,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w DownloadsListView.LoadList(AppsToInstallList); // Get a dlg string for later use - GetWindowTextW(Dlg, szCaption, MAX_PATH); + GetWindowTextW(Dlg, szCaption, _countof(szCaption)); // Hide a placeholder from displaying szTempCaption = szCaption; diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index b1c2938b6b..afd134899c 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -225,7 +225,7 @@ BOOL ExtractFilesFromCab(LPCWSTR lpCabName, LPCWSTR lpOutputPath) ZeroMemory(&Dest, sizeof(Dest)); WideCharToMultiByte(CP_ACP, 0, lpOutputPath, -1, Dest.Destination, MAX_PATH, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, lpCabName, -1, szCabName, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, lpCabName, -1, szCabName, _countof(szCabName), NULL, NULL); Dest.Operation = EXTRACT_FILLFILELIST; Result = pfnExtract(&Dest, szCabName); diff --git a/base/applications/rapps/splitter.cpp b/base/applications/rapps/splitter.cpp index edf44cea4b..d1f1bb0080 100644 --- a/base/applications/rapps/splitter.cpp +++ b/base/applications/rapps/splitter.cpp @@ -147,7 +147,6 @@ CreateHSplitBar(HWND hwnd) hInst, NULL); - if (hHSplitter == NULL) { /* TODO: Show error message */ @@ -288,7 +287,6 @@ CreateVSplitBar(HWND hwnd) hInst, NULL); - if (!hVSplitter) { /* TODO: Show error message */ diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index b785b9a6a3..08587bb4e2 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -47,7 +47,7 @@ BOOL UseCmdParameters(LPWSTR lpCmdLine) WCHAR szName[MAX_PATH]; do { - if (SetupGetStringFieldW(&Context, 1, szName, MAX_PATH, NULL)) + if (SetupGetStringFieldW(&Context, 1, szName, _countof(szName), NULL)) { arrNames.Add(szName); }

1 0

01/03: [RAPPS] Usability fixes.
by Hermès Bélusca-Maïto 03 Feb '18

03 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f5fe9410430c05eca883… commit 3f5fe9410430c05eca883102869952d59932e522 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Feb 3 23:40:11 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 3 23:43:47 2018 +0100 [RAPPS] Usability fixes. --- base/applications/rapps/aboutdlg.cpp | 3 ++- base/applications/rapps/lang/bg-BG.rc | 8 ++++---- base/applications/rapps/lang/cs-CZ.rc | 8 ++++---- base/applications/rapps/lang/de-DE.rc | 8 ++++---- base/applications/rapps/lang/en-US.rc | 8 ++++---- base/applications/rapps/lang/es-ES.rc | 8 ++++---- base/applications/rapps/lang/fr-FR.rc | 16 ++++++++-------- base/applications/rapps/lang/he-IL.rc | 8 ++++---- base/applications/rapps/lang/it-IT.rc | 8 ++++---- base/applications/rapps/lang/ja-JP.rc | 8 ++++---- base/applications/rapps/lang/no-NO.rc | 8 ++++---- base/applications/rapps/lang/pl-PL.rc | 8 ++++---- base/applications/rapps/lang/pt-BR.rc | 8 ++++---- base/applications/rapps/lang/ro-RO.rc | 8 ++++---- base/applications/rapps/lang/ru-RU.rc | 8 ++++---- base/applications/rapps/lang/sk-SK.rc | 8 ++++---- base/applications/rapps/lang/sq-AL.rc | 8 ++++---- base/applications/rapps/lang/sv-SE.rc | 8 ++++---- base/applications/rapps/lang/tr-TR.rc | 8 ++++---- base/applications/rapps/lang/uk-UA.rc | 8 ++++---- base/applications/rapps/lang/zh-CN.rc | 8 ++++---- base/applications/rapps/lang/zh-TW.rc | 8 ++++---- 22 files changed, 90 insertions(+), 89 deletions(-) diff --git a/base/applications/rapps/aboutdlg.cpp b/base/applications/rapps/aboutdlg.cpp index 4e57924beb..0758009b94 100644 --- a/base/applications/rapps/aboutdlg.cpp +++ b/base/applications/rapps/aboutdlg.cpp @@ -10,7 +10,8 @@ static INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) { - if (Msg == WM_COMMAND && LOWORD(wParam) == IDOK) + if ((Msg == WM_COMMAND) && + (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)) { return EndDialog(hDlg, LOWORD(wParam)); } diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index b9fb94f09f..e23799f519 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -78,7 +78,7 @@ BEGIN LTEXT "No proxy for", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Подразбирано", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "Добре", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "Добре", IDOK, 116, 195, 60, 14 PUSHBUTTON "Отказ", IDCANCEL, 181, 195, 60, 14 END @@ -90,7 +90,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "Слагане от оптичен носител", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Сваляне и слагане", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "Добре", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "Добре", IDOK, 86, 78, 60, 14 PUSHBUTTON "Отказ", IDCANCEL, 150, 78, 60, 14 END @@ -109,9 +109,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "За" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Управителят за приложожения на РеактОС\nВъзпроизводствени права (C) 2009\nДмитрий Чапъйшев (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 150, 39 - PUSHBUTTON "Затваряне", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Управителят за приложожения на РеактОС\nВъзпроизводствени права (C) 2009\nДмитрий Чапъйшев (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 150, 39 + DEFPUSHBUTTON "Затваряне", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 52ad40bdd2..19945538c3 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -79,7 +79,7 @@ BEGIN LTEXT "Nepoužívat pro", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Výchozí", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 PUSHBUTTON "Storno", IDCANCEL, 181, 195, 60, 14 END @@ -91,7 +91,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Instalovat z média (CD nebo DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Stáhnout a instalovat", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 PUSHBUTTON "Storno", IDCANCEL, 150, 78, 60, 14 END @@ -110,9 +110,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "O programu" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Správce aplikací\nCopyright (C) 2009\nDmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Zavřít", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "ReactOS Správce aplikací\nCopyright (C) 2009\nDmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Zavřít", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index dc99a4584d..923787d607 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -74,7 +74,7 @@ BEGIN LTEXT "Kein Proxy", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Vorgabe", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 181, 195, 60, 14 END @@ -86,7 +86,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Installation von einem Datenträger (CD oder DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "Herunterla&den und installieren", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 150, 78, 60, 14 END @@ -105,9 +105,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "Über" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS-Anwendungsmanager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Schließen", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "ReactOS-Anwendungsmanager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Schließen", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 82a6aa0937..af79001c77 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -74,7 +74,7 @@ BEGIN LTEXT "No proxy for", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 PUSHBUTTON "Cancel", IDCANCEL, 181, 195, 60, 14 END @@ -86,7 +86,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14 END @@ -105,9 +105,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "About" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Close", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Close", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 97bf043e33..015ad42745 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -77,7 +77,7 @@ BEGIN LTEXT "Sin proxy para:", -1, 125, 154, 50, 8, SS_RIGHT EDITTEXT IDC_NO_PROXY_FOR, 177, 153, 61, 14, ES_AUTOHSCROLL PUSHBUTTON "Por defecto", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "Aceptar", IDOK, 116, 180, 60, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 116, 180, 60, 14 PUSHBUTTON "Cancelar", IDCANCEL, 181, 180, 60, 14 END @@ -89,7 +89,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Instalar desde un disco (CD o DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Descargar e instalar", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "Aceptar", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 86, 78, 60, 14 PUSHBUTTON "Cancelar", IDCANCEL, 150, 78, 60, 14 END @@ -108,9 +108,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "Acerca de" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Administrador de aplicaciones de ReactOS\nCopyright (C) 2009\nCreado por Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Cerrar", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Administrador de aplicaciones de ReactOS\nCopyright (C) 2009\nCreado por Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Cerrar", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 59b9291ce1..9c0b5777f4 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -74,7 +74,7 @@ BEGIN LTEXT "Pas de proxy pour", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Par défaut", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "Accepter", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "Accepter", IDOK, 116, 195, 60, 14 PUSHBUTTON "Annuler", IDCANCEL, 181, 195, 60, 14 END @@ -86,7 +86,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Installer à partir d'un disque (CD ou DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Télécharger et installer", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "Accepter", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "Accepter", IDOK, 86, 78, 60, 14 PUSHBUTTON "Annuler", IDCANCEL, 150, 78, 60, 14 END @@ -105,9 +105,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "À propos" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\npar Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Fermer", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\npar Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Fermer", IDOK, 133, 46, 50, 14 END STRINGTABLE @@ -209,8 +209,8 @@ BEGIN IDS_INTERRUPTED_DOWNLOAD "Le téléchargement a été interrompu. Vérifiez votre connexion à Internet." IDS_UNABLE_TO_WRITE "Impossible d'écrire sur le disque. Votre disque pourrait être plein." IDS_SELECT_ALL "Sélectionner/Désélectionner tout" - IDS_INSTALL_SELECTED "Installer les sélectionnés" - IDS_SELECTEDFORINST "Selected for installation" + IDS_INSTALL_SELECTED "Installer la sélection" + IDS_SELECTEDFORINST "Sélectionnées pour installation" END STRINGTABLE @@ -238,8 +238,8 @@ BEGIN IDS_LANGUAGE_NO_TRANSLATION "Supporte d'autres langues" IDS_LANGUAGE_ENGLISH_TRANSLATION "Supporte l'Anglais" IDS_LANGUAGE_SINGLE "Langue unique" - IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)" - IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)" + IDS_LANGUAGE_MORE_PLACEHOLDER " (+ %d de plus)" + IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+ %d disponibles)" END STRINGTABLE diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index c348a7aa7a..3b09f0931e 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -77,7 +77,7 @@ BEGIN LTEXT "ללא פרוקסי עבור:", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "ברירת מחדל", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "אישור", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "אישור", IDOK, 116, 195, 60, 14 PUSHBUTTON "ביטול", IDCANCEL, 181, 195, 60, 14 END @@ -90,7 +90,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "התקן מתוך דיסק (CD או DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "הורד והתקן", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "אישור", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "אישור", IDOK, 86, 78, 60, 14 PUSHBUTTON "ביטול", IDCANCEL, 150, 78, 60, 14 END @@ -111,9 +111,9 @@ EXSTYLE WS_EX_LAYOUTRTL CAPTION "אודות" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "סגירה", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "סגירה", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 739f9312cc..316d1c90a5 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -74,7 +74,7 @@ BEGIN LTEXT "Ignora proxy per:", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Predefiniti", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 PUSHBUTTON "Annulla", IDCANCEL, 181, 195, 60, 14 END @@ -86,7 +86,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Installa da un disco (CD o DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Scarica e installa", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 PUSHBUTTON "Annulla", IDCANCEL, 150, 78, 60, 14 END @@ -105,9 +105,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "Informazioni" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Gestione applicazioni di ReactOS \nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Chiudi", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Gestione applicazioni di ReactOS \nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Chiudi", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 7b5df0b7c8..75459912d7 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -74,7 +74,7 @@ BEGIN LTEXT "No proxy for", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "デフォルト", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 PUSHBUTTON "キャンセル", IDCANCEL, 181, 195, 60, 14 END @@ -86,7 +86,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "ディスクからインストール (CD や DVD)(&I)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "ダウンロードしてインストール(&D)", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 PUSHBUTTON "キャンセル", IDCANCEL, 150, 78, 60, 14 END @@ -105,9 +105,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "バージョン情報" FONT 9, "MS UI Gothic" BEGIN - LTEXT "ReactOS アプリケーションマネージャ\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "閉じる", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "ReactOS アプリケーションマネージャ\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "閉じる", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index aa7bbb1bb8..2799009115 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -74,7 +74,7 @@ BEGIN LTEXT "No proxy for", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 PUSHBUTTON "Cancel", IDCANCEL, 181, 195, 60, 14 END @@ -86,7 +86,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14 END @@ -105,9 +105,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "Om" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Programbehandler\nEnerett (C) 2009\nav Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Lukk", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "ReactOS Programbehandler\nEnerett (C) 2009\nav Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Lukk", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 9dc447ce66..4fb36efac6 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -82,7 +82,7 @@ BEGIN LTEXT "Bez proxy dla", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Domyślne", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 PUSHBUTTON "Anuluj", IDCANCEL, 181, 195, 60, 14 END @@ -94,7 +94,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Zainstaluj z dysku (CD lub DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Pobierz i zainstaluj", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 PUSHBUTTON "Anuluj", IDCANCEL, 150, 78, 60, 14 END @@ -113,9 +113,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "O programie" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Menedżer aplikacji ReactOS\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Zamknij", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Menedżer aplikacji ReactOS\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Zamknij", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 47e495d390..3e40ea0377 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -76,7 +76,7 @@ BEGIN LTEXT "No proxy for", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Padrão", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 PUSHBUTTON "Cancelar", IDCANCEL, 181, 195, 60, 14 END @@ -88,7 +88,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Instalar com uma mídia (CD ou DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Baixar e instalar", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 PUSHBUTTON "Cancelar", IDCANCEL, 150, 78, 60, 14 END @@ -107,9 +107,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "Sobre" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Central de Aplicativos ReactOS\nCopyright (C) 2009\npor Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Fechar", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Central de Aplicativos ReactOS\nCopyright (C) 2009\npor Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Fechar", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 7fa8a95972..30129d1c71 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -83,7 +83,7 @@ BEGIN LTEXT "excepție pentru", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "I&mplicite", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "Con&firmă", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "Con&firmă", IDOK, 116, 195, 60, 14 PUSHBUTTON "A&nulează", IDCANCEL, 181, 195, 60, 14 END @@ -95,7 +95,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "Instalea&ză de pe un disc (CD sau DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Descarcă și instalează", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "Con&firmă", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "Con&firmă", IDOK, 86, 78, 60, 14 PUSHBUTTON "A&nulează", IDCANCEL, 150, 78, 60, 14 END @@ -114,9 +114,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "Despre gestionarul de programe" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Gestionar de programe ReactOS\nDrept de autor (C) 2009\nde către Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Î&nchide", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Gestionar de programe ReactOS\nDrept de autor (C) 2009\nde către Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Î&nchide", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 5f0788c9b6..85f31871a8 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -74,7 +74,7 @@ BEGIN LTEXT "Исключения", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "По умолчанию", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 PUSHBUTTON "Отмена", IDCANCEL, 181, 195, 60, 14 END @@ -86,7 +86,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Установить с диска", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Скачать и установить", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 PUSHBUTTON "Отмена", IDCANCEL, 150, 78, 60, 14 END @@ -105,9 +105,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "О программе" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Менеджер приложений ReactOS\nАвторские права (C) 2009\nДмитрий Чапышев (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Закрыть", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Менеджер приложений ReactOS\nАвторские права (C) 2009\nДмитрий Чапышев (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Закрыть", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index fa324aaf4a..e8233ee617 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -79,7 +79,7 @@ BEGIN LTEXT "No proxy for", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Predvolené", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 PUSHBUTTON "Zrušiť", IDCANCEL, 181, 195, 60, 14 END @@ -91,7 +91,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Inštalovať z disku (CD alebo DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Stiahnuť a inštalovať", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 PUSHBUTTON "Zrušiť", IDCANCEL, 150, 78, 60, 14 END @@ -110,9 +110,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "Čo je Manažér aplikácií systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Manažér aplikácií systému ReactOS\nAutorské práva (C) 2009\nod Dmitry Chapyshev (dmitry(a)reactos.org)\nPreklad: Mário Kačmár (kario(a)szm.sk)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Zavrieť", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Manažér aplikácií systému ReactOS\nAutorské práva (C) 2009\nod Dmitry Chapyshev (dmitry(a)reactos.org)\nPreklad: Mário Kačmár (kario(a)szm.sk)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Zavrieť", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 1656ce58e5..2415b5d685 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -78,7 +78,7 @@ BEGIN LTEXT "No proxy for", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Parazgjedhur", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 PUSHBUTTON "Anulo", IDCANCEL, 181, 195, 60, 14 END @@ -90,7 +90,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Instalo nga nje disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "Shkarko dhe instalo", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 PUSHBUTTON "Anulo", IDCANCEL, 150, 78, 60, 14 END @@ -109,9 +109,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "Rreth" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nnga Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Close", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nnga Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Close", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index 4bfaa9a23c..df91a696f0 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -81,7 +81,7 @@ BEGIN LTEXT "No proxy for", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Standard", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 PUSHBUTTON "Avbryt", IDCANCEL, 181, 195, 60, 14 END @@ -93,7 +93,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Installera från disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Ladda ner och installera", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 PUSHBUTTON "Avbryt", IDCANCEL, 150, 78, 60, 14 END @@ -112,9 +112,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "Om" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Programhanterare\nCopyright (C) 2009\nav Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Stäng", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "ReactOS Programhanterare\nCopyright (C) 2009\nav Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Stäng", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 86f8fbba8a..b389825f20 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -76,7 +76,7 @@ BEGIN LTEXT "Şunun İçin Vekil Sunucu Yok", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Ön Tanımlılar", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "Tamam", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "Tamam", IDOK, 116, 195, 60, 14 PUSHBUTTON "İptal", IDCANCEL, 181, 195, 60, 14 END @@ -88,7 +88,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Bir Diskten (CD'den veyâ DVD'den) Kur", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&İndir ve Kur", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "Tamam", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "Tamam", IDOK, 86, 78, 60, 14 PUSHBUTTON "İptal", IDCANCEL, 150, 78, 60, 14 END @@ -107,9 +107,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "Üzerine" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Uygulama Yöneticisi\nTelif Hakkı: 2009\nDmitry Chapyshev (dmitry(a)reactos.org) ile.", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Tamam", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "ReactOS Uygulama Yöneticisi\nTelif Hakkı: 2009\nDmitry Chapyshev (dmitry(a)reactos.org) ile.", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Tamam", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index 97aa1a6f27..b75be5cedd 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -82,7 +82,7 @@ BEGIN LTEXT "Виключення", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Стандартно", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 PUSHBUTTON "Скасувати", IDCANCEL, 181, 195, 60, 14 END @@ -94,7 +94,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "&Встановити з диску", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Завантажити та встановити", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 PUSHBUTTON "Скасувати", IDCANCEL, 150, 78, 60, 14 END @@ -113,9 +113,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "Про програму…" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Менеджер додатків ReactOS\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Закрити", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Менеджер додатків ReactOS\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "Закрити", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 2ab1e036dd..88e6b28b14 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -76,7 +76,7 @@ BEGIN LTEXT "没有代理", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "缺省", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "确定", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "确定", IDOK, 116, 195, 60, 14 PUSHBUTTON "取消", IDCANCEL, 181, 195, 60, 14 END @@ -88,7 +88,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "从磁盘安装 (CD 或 DVD)(&I)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "下载并安装(&D)", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "确定", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "确定", IDOK, 86, 78, 60, 14 PUSHBUTTON "取消", IDCANCEL, 150, 78, 60, 14 END @@ -107,9 +107,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "关于" FONT 9, "宋体" BEGIN - LTEXT "ReactOS 程序管理器版权所有 (C) 2009\n作者 Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "关闭", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "ReactOS 程序管理器版权所有 (C) 2009\n作者 Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "关闭", IDOK, 133, 46, 50, 14 END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 2636d7e4a1..12bcc373f7 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -76,7 +76,7 @@ BEGIN LTEXT "沒有代理", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "預設", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 - PUSHBUTTON "確定", IDOK, 116, 195, 60, 14 + DEFPUSHBUTTON "確定", IDOK, 116, 195, 60, 14 PUSHBUTTON "取消", IDCANCEL, 181, 195, 60, 14 END @@ -88,7 +88,7 @@ BEGIN LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "從存儲裝置安裝 (CD 或 DVD)(&I)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "下載並安裝(&D)", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "確定", IDOK, 86, 78, 60, 14 + DEFPUSHBUTTON "確定", IDOK, 86, 78, 60, 14 PUSHBUTTON "取消", IDCANCEL, 150, 78, 60, 14 END @@ -107,9 +107,9 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "關於" FONT 9, "新細明體" BEGIN - LTEXT "ReactOS 程式管理器版權所有 (C) 2009\n作者 Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "關閉", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "ReactOS 程式管理器版權所有 (C) 2009\n作者 Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + DEFPUSHBUTTON "關閉", IDOK, 133, 46, 50, 14 END STRINGTABLE

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