Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/04: [LOADCONFIG_APITEST] Add apitest using the load config section For now, the only test is related to a user trace stack db. The entire test application is disabled for gcc, since it is unable to generate this load config info. The stacktrace test is disabled until it is implemented.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1e5bc3d7421ae47a623f… commit f1e5bc3d7421ae47a623ffcf7ecb07174a168f60 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 11 22:30:47 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Apr 17 17:47:09 2020 +0200 [LOADCONFIG_APITEST] Add apitest using the load config section For now, the only test is related to a user trace stack db. The entire test application is disabled for gcc, since it is unable to generate this load config info. The stacktrace test is disabled until it is implemented. --- modules/rostests/apitests/CMakeLists.txt | 5 + .../rostests/apitests/loadconfig/CMakeLists.txt | 12 ++ modules/rostests/apitests/loadconfig/common.c | 70 +++++++++ modules/rostests/apitests/loadconfig/loadconfig.h | 14 ++ modules/rostests/apitests/loadconfig/stacktrace.c | 166 +++++++++++++++++++++ modules/rostests/apitests/loadconfig/testlist.c | 12 ++ 6 files changed, 279 insertions(+) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index 752755a453f..abb0fb8209b 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -22,6 +22,11 @@ add_subdirectory(gdi32) add_subdirectory(gditools) add_subdirectory(iphlpapi) add_subdirectory(kernel32) +if(NOT GCC) + # gcc / binutils are unable to add an IMAGE_LOAD_CONFIG_DIRECTORY + # So maybe we should resuscitate sdk/tools/pefixup.c + add_subdirectory(loadconfig) +endif() add_subdirectory(localspl) add_subdirectory(mountmgr) add_subdirectory(msgina) diff --git a/modules/rostests/apitests/loadconfig/CMakeLists.txt b/modules/rostests/apitests/loadconfig/CMakeLists.txt new file mode 100644 index 00000000000..a09e73e90b1 --- /dev/null +++ b/modules/rostests/apitests/loadconfig/CMakeLists.txt @@ -0,0 +1,12 @@ + +list(APPEND SOURCE + common.c + stacktrace.c + loadconfig.h) + +add_executable(loadconfig_apitest ${SOURCE} testlist.c) +target_link_libraries(loadconfig_apitest wine ${PSEH_LIB}) +set_module_type(loadconfig_apitest win32cui) +add_importlibs(loadconfig_apitest msvcrt kernel32 ntdll) +add_pch(loadconfig_apitest loadconfig.h SOURCE) +add_rostests_file(TARGET loadconfig_apitest) diff --git a/modules/rostests/apitests/loadconfig/common.c b/modules/rostests/apitests/loadconfig/common.c new file mode 100644 index 00000000000..ab1a26a6250 --- /dev/null +++ b/modules/rostests/apitests/loadconfig/common.c @@ -0,0 +1,70 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: LOAD_CONFIG validation / registration + * COPYRIGHT: Copyright 2020 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "loadconfig.h" + + +// Tell the linker we want a LOAD_CONFIG +const IMAGE_LOAD_CONFIG_DIRECTORY _load_config_used = +{ + sizeof(IMAGE_LOAD_CONFIG_DIRECTORY), + 0, // TimeDateStamp + 0, // MajorVersion + 0, // MinorVersion + 0, // GlobalFlagsClear + FLG_USER_STACK_TRACE_DB, // GlobalFlagsSet + 0, // CriticalSectionDefaultTimeout + 0, // DeCommitFreeBlockThreshold + 0, // DeCommitTotalFreeThreshold + 0, // LockPrefixTable + 0, // MaximumAllocationSize + 0, // VirtualMemoryThreshold + 0, // ProcessHeapFlags + 0, // ProcessAffinityMask + 0, // CSDVersion + 0, // Reserved1 + 0, // EditList + 0, // SecurityCookie +}; + + +BOOL check_loadconfig() +{ + BOOL Result; + PPEB Peb = NtCurrentPeb(); + ULONG ConfigSize = 0; + ULONG MinimalSize; + PIMAGE_LOAD_CONFIG_DIRECTORY LoadConfig; + + // Validate the required flag for the 'stacktrace' test + ok(Peb->NtGlobalFlag & FLG_USER_STACK_TRACE_DB, "NtGlobalFlag: 0x%lx\n", Peb->NtGlobalFlag); + Result = (Peb->NtGlobalFlag & FLG_USER_STACK_TRACE_DB) != 0; + + // Now validate our LOAD_CONFIG entry + LoadConfig = (PIMAGE_LOAD_CONFIG_DIRECTORY)RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, + TRUE, + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, + &ConfigSize); + + MinimalSize = FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(LoadConfig->SecurityCookie); + if (!LoadConfig || ConfigSize < MinimalSize) + { + ok(0, "Invalid IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG: %p, %lu (%lu)\n", + LoadConfig, ConfigSize, MinimalSize); + } + else + { + ok(LoadConfig->GlobalFlagsSet & FLG_USER_STACK_TRACE_DB, + "Invalid GlobalFlagsSet: %lx\n", LoadConfig->GlobalFlagsSet); + ok(!(LoadConfig->GlobalFlagsClear & FLG_USER_STACK_TRACE_DB), + "Invalid GlobalFlagsClear: %lx\n", LoadConfig->GlobalFlagsClear); + ok(LoadConfig->Size == sizeof(IMAGE_LOAD_CONFIG_DIRECTORY), + "Unexpected size difference: %lu vs %u\n", LoadConfig->Size, sizeof(IMAGE_LOAD_CONFIG_DIRECTORY)); + } + + return Result; +} diff --git a/modules/rostests/apitests/loadconfig/loadconfig.h b/modules/rostests/apitests/loadconfig/loadconfig.h new file mode 100644 index 00000000000..ce2d2910230 --- /dev/null +++ b/modules/rostests/apitests/loadconfig/loadconfig.h @@ -0,0 +1,14 @@ +#pragma once + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <apitest.h> +#include <apitest_guard.h> +#include <ndk/ntndk.h> +#include <strsafe.h> + + +/* common.c */ +BOOL check_loadconfig(); diff --git a/modules/rostests/apitests/loadconfig/stacktrace.c b/modules/rostests/apitests/loadconfig/stacktrace.c new file mode 100644 index 00000000000..f233563f61b --- /dev/null +++ b/modules/rostests/apitests/loadconfig/stacktrace.c @@ -0,0 +1,166 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for RtlQueryProcessBackTraceInformation & RtlLogStackBackTrace + * COPYRIGHT: Copyright 2020 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "loadconfig.h" + + +// This test serves 2 purposes: +// 1. It tests RtlQueryProcessBackTraceInformation & RtlLogStackBackTrace +// 2. It tests the correct activation of IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG (see also common.c) + +NTSTATUS NTAPI RtlQueryProcessBackTraceInformation(IN OUT PRTL_DEBUG_INFORMATION Buffer); + + +// Seems that this struct is wrong in our sdk? +typedef struct _RTL_PROCESS_BACKTRACE_INFORMATION_32 +{ + PVOID SymbolicBackTrace; + ULONG TraceCount; + USHORT Index; + USHORT Depth; + PVOID BackTrace[32]; +} RTL_PROCESS_BACKTRACE_INFORMATION_32, *PRTL_PROCESS_BACKTRACE_INFORMATION_32; + + +static PVOID g_Call_Address; +static PVOID g_PreviousReturnAddress; + +__declspec(noinline) +PVOID GetFunctionAddress() +{ + return _ReturnAddress(); +} + +__declspec(noinline) +USHORT Call_Backtrace_2() +{ + USHORT Index; + Index = RtlLogStackBackTrace(); + ok(Index != 0, "RtlLogStackBackTrace failed\n"); + return Index; +} + + +__declspec(noinline) +USHORT Call_Backtrace_1() +{ + USHORT Index; + // It seems that the function calling RtlLogStackBackTrace is skipped, + // so we wrap it in a deeper nested function to be able to check it + g_Call_Address = GetFunctionAddress(); + g_PreviousReturnAddress = _ReturnAddress(); + Index = Call_Backtrace_2(); + return Index; +} + +static void Check_Stacktrace(PVOID* BackTrace, USHORT Depth) +{ + ok(Depth > 2, "Unexpected Depth: %lu\n", (ULONG)Depth); + if (Depth > 2) + { + ULONG_PTR EndAddress = ((ULONG_PTR)g_Call_Address + 0x20); + ok(BackTrace[0] >= g_Call_Address && (ULONG_PTR)BackTrace[0] < EndAddress, + "Unexpected return: %p, expected between %p and %p\n", BackTrace[0], g_Call_Address, (PVOID)EndAddress); + ok(BackTrace[1] == g_PreviousReturnAddress, "Unexpected return: %p, expected: %p\n", + BackTrace[1], g_PreviousReturnAddress); + } +} + +static void test_QueryBacktrace(PRTL_DEBUG_INFORMATION Buffer1, PRTL_DEBUG_INFORMATION Buffer2) +{ + NTSTATUS Status; + USHORT StackTrace; + PRTL_PROCESS_BACKTRACES Backtraces; + ULONG OldNumberOfBackTraces, n; + PRTL_PROCESS_BACKTRACE_INFORMATION_32 FirstBacktrace; + int found = 0; + + Status = RtlQueryProcessBackTraceInformation(Buffer1); + ok_hex(Status, STATUS_SUCCESS); + if (Status != STATUS_SUCCESS) + return; + + Backtraces = Buffer1->BackTraces; + ok(Backtraces != NULL, "No BackTraces\n"); + if (!Backtraces) + return; + + OldNumberOfBackTraces = Backtraces->NumberOfBackTraces; + // Capture a stacktrace + StackTrace = Call_Backtrace_1(); + + // Show that the old debugbuffer is not changed + ok(OldNumberOfBackTraces == Backtraces->NumberOfBackTraces, "Debug buffer changed! (%lu => %lu)\n", + OldNumberOfBackTraces, Backtraces->NumberOfBackTraces); + + // Ask for a new snapshot + Status = RtlQueryProcessBackTraceInformation(Buffer2); + ok_hex(Status, STATUS_SUCCESS); + if (Status != STATUS_SUCCESS) + return; + + Backtraces = Buffer2->BackTraces; + ok(Backtraces != NULL, "No BackTraces\n"); + if (!Backtraces) + return; + + ok(OldNumberOfBackTraces+1 == Backtraces->NumberOfBackTraces, "Stacktrace not added! (%lu => %lu)\n", + OldNumberOfBackTraces, Backtraces->NumberOfBackTraces); + + FirstBacktrace = (PRTL_PROCESS_BACKTRACE_INFORMATION_32)&Backtraces->BackTraces[0]; + trace("NumberOfBackTraces=%lu\n", Backtraces->NumberOfBackTraces); + for (n = 0; n < Backtraces->NumberOfBackTraces; ++n) + { + PRTL_PROCESS_BACKTRACE_INFORMATION_32 Info = FirstBacktrace + n; +#if 0 + USHORT j; + + trace("BackTraces[%02lu]->SymbolicBackTrace = %p\n", n, Info->SymbolicBackTrace); + trace("BackTraces[%02lu]->TraceCount = %lu\n", n, Info->TraceCount); + trace("BackTraces[%02lu]->Index = %lu\n", n, (ULONG)Info->Index); + trace("BackTraces[%02lu]->Depth = %lu\n", n, (ULONG)Info->Depth); + for (j = 0; j < Info->Depth; ++j) + { + trace("BackTraces[%02lu]->BackTrace[%02u] = %p\n", n, j, Info->BackTrace[j]); + } + trace("\n"); +#endif + if (Info->Index == StackTrace) + { + found = 1; + Check_Stacktrace(Info->BackTrace, Info->Depth); + } + } + ok(found, "Stacktrace not found :(\n"); +} + + +START_TEST(stacktrace) +{ + PRTL_DEBUG_INFORMATION Buffer1, Buffer2; + + if (!check_loadconfig()) + return; + + skip("QueryBacktrace not implemented yet\n"); + return; + + Buffer1 = RtlCreateQueryDebugBuffer(0, FALSE); + ok(Buffer1 != NULL, "Failed!\n"); + if (Buffer1) + { + Buffer2 = RtlCreateQueryDebugBuffer(0, FALSE); + ok(Buffer2 != NULL, "Failed!\n"); + if (Buffer2) + { + test_QueryBacktrace(Buffer1, Buffer2); + RtlDestroyQueryDebugBuffer(Buffer2); + } + + RtlDestroyQueryDebugBuffer(Buffer1); + } +} diff --git a/modules/rostests/apitests/loadconfig/testlist.c b/modules/rostests/apitests/loadconfig/testlist.c new file mode 100644 index 00000000000..7f585152fa6 --- /dev/null +++ b/modules/rostests/apitests/loadconfig/testlist.c @@ -0,0 +1,12 @@ + +#define STANDALONE +#include <apitest.h> + +extern void func_stacktrace(void); + +const struct test winetest_testlist[] = +{ + { "stacktrace", func_stacktrace }, + + { 0, 0 } +};

4 years, 8 months

[reactos] 01/01: [APITEST][NTDLL] Implement RtlGetNtProductType testcase (#2489)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d778d04a16a2cb67bef15… commit d778d04a16a2cb67bef1574b8272c6e4d91b75dd Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri Apr 17 12:47:09 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 17 13:47:09 2020 +0300 [APITEST][NTDLL] Implement RtlGetNtProductType testcase (#2489) --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../rostests/apitests/ntdll/RtlGetNtProductType.c | 97 ++++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 100 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 7da1843babe..d03b29806c9 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -56,6 +56,7 @@ list(APPEND SOURCE RtlGetFullPathName_UstrEx.c RtlGetLengthWithoutTrailingPathSeperators.c RtlGetLongestNtPathLength.c + RtlGetNtProductType.c RtlHandle.c RtlImageRvaToVa.c RtlIsNameLegalDOS8Dot3.c diff --git a/modules/rostests/apitests/ntdll/RtlGetNtProductType.c b/modules/rostests/apitests/ntdll/RtlGetNtProductType.c new file mode 100644 index 00000000000..7f148c13ebc --- /dev/null +++ b/modules/rostests/apitests/ntdll/RtlGetNtProductType.c @@ -0,0 +1,97 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for the RtlGetNtProductType API + * COPYRIGHT: Copyright 2020 Bișoc George <fraizeraust99 at gmail dot com> + */ + +#include "precomp.h" +#include <winbase.h> +#include <winreg.h> + +static +BOOLEAN +ReturnNtProduct(PDWORD ProductNtType) +{ + LONG Result; + HKEY Key; + WCHAR Data[20]; + DWORD Size = sizeof(Data); + + Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions", + 0, + KEY_QUERY_VALUE, + &Key); + if (Result != ERROR_SUCCESS) + { + *ProductNtType = 0; + return FALSE; + } + + Result = RegQueryValueExW(Key, + L"ProductType", + NULL, + NULL, + (PBYTE)&Data, + &Size); + if (Result != ERROR_SUCCESS) + { + RegCloseKey(Key); + *ProductNtType = 0; + return FALSE; + } + + if (wcscmp(Data, L"WinNT") == 0) + { + *ProductNtType = NtProductWinNt; + RegCloseKey(Key); + return TRUE; + } + + if (wcscmp(Data, L"LanmanNT") == 0) + { + *ProductNtType = NtProductLanManNt; + RegCloseKey(Key); + return TRUE; + } + + if (wcscmp(Data, L"ServerNT") == 0) + { + *ProductNtType = NtProductServer; + RegCloseKey(Key); + return TRUE; + } + + *ProductNtType = 0; + RegCloseKey(Key); + return FALSE; +} + +START_TEST(RtlGetNtProductType) +{ + BOOLEAN Ret; + DWORD ProductNtType; + NT_PRODUCT_TYPE ProductType = NtProductWinNt; + + /* + * Wrap the call in SEH. This ensures the testcase won't crash but also + * it proves to us that RtlGetNtProductType() throws an exception if a NULL + * argument is being passed to caller as output. + */ + StartSeh() + RtlGetNtProductType(NULL); + EndSeh(STATUS_ACCESS_VIOLATION); + + /* Query the product type normally from the Registry */ + Ret = ReturnNtProduct(&ProductNtType); + if (!Ret) + { + ok(Ret, "Failed to query the product type value!\n"); + } + + /* Now, get the product type from the NTDLL system call */ + Ret = RtlGetNtProductType(&ProductType); + ok(Ret == TRUE, "Expected a valid product type value (and TRUE as returned success code) but got %u as status.\n", Ret); + ok(ProductNtType == ProductType, "Expected the product type value to be the same but got %lu (original value pointed by RtlGetNtProductType() is %d).\n", ProductNtType, ProductType); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 76357f6ece6..7b3155314eb 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -55,6 +55,7 @@ extern void func_RtlGetFullPathName_Ustr(void); extern void func_RtlGetFullPathName_UstrEx(void); extern void func_RtlGetLengthWithoutTrailingPathSeperators(void); extern void func_RtlGetLongestNtPathLength(void); +extern void func_RtlGetNtProductType(void); extern void func_RtlHandle(void); extern void func_RtlImageRvaToVa(void); extern void func_RtlIsNameLegalDOS8Dot3(void); @@ -123,6 +124,7 @@ const struct test winetest_testlist[] = { "RtlGetFullPathName_UstrEx", func_RtlGetFullPathName_UstrEx }, { "RtlGetLengthWithoutTrailingPathSeperators", func_RtlGetLengthWithoutTrailingPathSeperators }, { "RtlGetLongestNtPathLength", func_RtlGetLongestNtPathLength }, + { "RtlGetNtProductType", func_RtlGetNtProductType }, { "RtlHandle", func_RtlHandle }, { "RtlImageRvaToVa", func_RtlImageRvaToVa }, { "RtlIsNameLegalDOS8Dot3", func_RtlIsNameLegalDOS8Dot3 },

4 years, 8 months

[reactos] 01/01: [UTILMAN] Move most of the code in a library (#2530)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=975d417b349b52a45773a… commit 975d417b349b52a45773ad3d114c6e72e6a58c67 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri Apr 17 12:42:47 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 17 13:42:47 2020 +0300 [UTILMAN] Move most of the code in a library (#2530) Windows XP and Server 2003 Utility Manager has a dedicated library for the resources and other stuff. Utility Manager is just a simple process that loads it. Hence create a library for the program, UManDlg.dll, and move the resources and other stuff there. In addition to that, use ExtractIconW to get the icon resource from the program (the DLL doesn't share icons by default) and remove the icon resource from the "About" dialog window. Also change the encoding type of other translation files to UTF-8 (which were previously set with UTF-8 with BOM). --- base/applications/utilman/CMakeLists.txt | 8 +- base/applications/utilman/NOTES.txt | 1 - base/applications/utilman/lang/en-US.rc | 49 +--------- base/applications/utilman/precomp.h | 94 +------------------ base/applications/utilman/resource.h | 40 +------- base/applications/utilman/umandlg/CMakeLists.txt | 15 +++ base/applications/utilman/{ => umandlg}/about.c | 17 ++-- .../utilman/{ => umandlg}/lang/en-US.rc | 9 +- .../utilman/{ => umandlg}/lang/es-ES.rc | 7 +- .../utilman/{ => umandlg}/lang/fr-FR.rc | 7 +- .../utilman/{ => umandlg}/lang/he-IL.rc | 7 +- .../utilman/{ => umandlg}/lang/it-IT.rc | 5 +- .../utilman/{ => umandlg}/lang/pl-PL.rc | 5 +- .../utilman/{ => umandlg}/lang/ro-RO.rc | 7 +- .../utilman/{ => umandlg}/lang/ru-RU.rc | 7 +- .../utilman/{ => umandlg}/lang/uk-UA.rc | 7 +- base/applications/utilman/{ => umandlg}/process.c | 6 +- base/applications/utilman/{ => umandlg}/registry.c | 4 +- base/applications/utilman/{ => umandlg}/resource.h | 7 +- .../utilman/{dialog.c => umandlg/umandlg.c} | 102 ++++++++++++--------- .../utilman/{precomp.h => umandlg/umandlg.h} | 15 +-- .../utilman/{utilman.rc => umandlg/umandlg.rc} | 14 ++- base/applications/utilman/umandlg/umandlg.spec | 1 + base/applications/utilman/utilman.c | 68 ++++++++++++++ base/applications/utilman/utilman.rc | 26 +----- 25 files changed, 213 insertions(+), 315 deletions(-) diff --git a/base/applications/utilman/CMakeLists.txt b/base/applications/utilman/CMakeLists.txt index 6f0addb1bd0..38dbb485018 100644 --- a/base/applications/utilman/CMakeLists.txt +++ b/base/applications/utilman/CMakeLists.txt @@ -1,14 +1,12 @@ list(APPEND SOURCE - dialog.c - process.c - about.c - registry.c + utilman.c precomp.h) add_rc_deps(utilman.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/utilman.ico) add_executable(utilman ${SOURCE} utilman.rc) set_module_type(utilman win32gui UNICODE) -add_importlibs(utilman comdlg32 user32 gdi32 advapi32 shell32 comctl32 msvcrt kernel32 ntdll) +add_importlibs(utilman user32 msvcrt kernel32 ntdll) add_pch(utilman precomp.h SOURCE) add_cd_file(TARGET utilman DESTINATION reactos/system32 FOR all) +add_subdirectory(umandlg) diff --git a/base/applications/utilman/NOTES.txt b/base/applications/utilman/NOTES.txt index 595c089ec1a..396f2f7eba7 100644 --- a/base/applications/utilman/NOTES.txt +++ b/base/applications/utilman/NOTES.txt @@ -7,5 +7,4 @@ Currently the application can manage the state of the accessibility tools howeve - The program can only control the launch/stopping states of accessibility tools, the code which manages the options for each utility is not implemented YET - Function helper which catches the Windows logo + U keys is not implemented YET - Registry configuration saver/loader is not implemented YET (XP's Utility Manager creates a key on HKEY_CURRENT_USER\Software\Microsoft with the name "Utility Manager" although the rest of other configuration values for utility options are stored elsewhere and I don't know exactly where are those) -- XP's and Server 2003's main Utility Manager implementation is compiled in a DLL (+ an executable which loads the DLL in question) whereas our Utility Manager is compiled as a whole executable - On Windows Vista and later, it complains for required elevation to open a process. We need to improve our process creation code and discard ShellExecuteW() \ No newline at end of file diff --git a/base/applications/utilman/lang/en-US.rc b/base/applications/utilman/lang/en-US.rc index 84c022811ba..cc74480f690 100644 --- a/base/applications/utilman/lang/en-US.rc +++ b/base/applications/utilman/lang/en-US.rc @@ -1,55 +1,14 @@ -/* +/* * PROJECT: ReactOS Utility Manager (Accessibility) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: English (United States of America) translation resource - * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + * COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com) */ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_MAIN_DIALOG DIALOGEX 0, 0, 284, 183 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Accessibility Utility Manager" -FONT 8, "MS Shell Dlg" -BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER - CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 - CONTROL "Start", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 - CONTROL "Stop", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 - CONTROL "Start automatically when I log in", IDC_START_LOG_IN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 101, 206, 14 - CONTROL "Start automatically when I lock my desktop", IDC_START_DESKTOP, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 118, 212, 14 - CONTROL "Start automatically when Utility Manager starts", IDC_START_UTILMAN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 134, 212, 13 - CONTROL "&OK", IDC_OK, "Button", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 161, 50, 14 - CONTROL "&Cancel", IDC_CANCEL, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 221, 161, 50, 14 - CONTROL "&Help", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 -END - -IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 -CAPTION "About Accessibility Utility Manager" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 - PUSHBUTTON "Close", IDOK, 75, 47, 44, 15 -END - -STRINGTABLE -BEGIN - IDS_OSK "On-Screen Keyboard" - IDS_MAGNIFIER "Magnifier" -END - -STRINGTABLE -BEGIN - IDS_NOTRUNNING "%s is not running" - IDS_RUNNING "%s is running" - IDS_GROUPBOX_OPTIONS_TITLE "Options for %s" -END - STRINGTABLE BEGIN - IDM_ABOUT "About Accessibility Utility Manager..." + IDS_FAIL_INIT "Failed to initialize the Utility Manager library! The error code is %lu." + IDS_FAIL_INIT_TITLE "Initialization failure" END diff --git a/base/applications/utilman/precomp.h b/base/applications/utilman/precomp.h index fcfe045ea47..b7edaa1d20d 100644 --- a/base/applications/utilman/precomp.h +++ b/base/applications/utilman/precomp.h @@ -10,13 +10,7 @@ /* INCLUDES ******************************************************************/ -#include <stdlib.h> #include <windows.h> -#include <commctrl.h> -#include <tlhelp32.h> -#include <windowsx.h> -#include <debug.h> -#include <wchar.h> #include <strsafe.h> #include "resource.h" @@ -27,93 +21,7 @@ /* TYPES **********************************************************************/ -typedef struct -{ - HINSTANCE hInstance; - HICON hIcon; - UINT_PTR iTimer; - INT iSelectedIndex; - HWND hDlgCtlStart; - HWND hDlgCtlStop; - HWND hListDlg; - HWND hMainDlg; - WCHAR szRunning[MAX_BUFFER]; - WCHAR szNotRunning[MAX_BUFFER]; - WCHAR szGrpBoxTitle[MAX_BUFFER]; -} UTILMAN_GLOBALS; - -typedef struct _UTILMAN_STATE -{ - LPCWSTR lpProgram; - UINT uNameId; - WCHAR szResource[MAX_BUFFER]; - BOOL bState; -} UTILMAN_STATE, *PUTILMAN_STATE; - -typedef struct _REGISTRY_SETTINGS -{ - /* Accessibility Registry settings */ - LPCWSTR wszAppPath; - DWORD dwAppType; - DWORD dwClientControlCode; - LPCWSTR wszAppName; - LPCWSTR wszErrorOnLaunch; - BOOL bHideClient; - BOOL bStartWithUtilman; - BOOL bStartWithROS; - LPCWSTR wszHungRespondAction; - DWORD dwHungTimeOut; - - /* Utility Manager Registry settings */ - BOOL bShowWarning; -} REGISTRY_SETTINGS, *PREGISTRY_SETTINGS; - -typedef struct _REGISTRY_DATA -{ - /* On-Screen Keyboard Registry data */ - LPCWSTR lpwsOskPath; - LPCWSTR lpwszOskDisplayName; - - /* Magnify Registry data */ - LPCWSTR lpwszMagnifyPath; - LPCWSTR lpwszMagnifyDisplayName; -} REGISTRY_DATA, *PREGISTRY_DATA; - -/* ENUMERATIONS ***************************************************************/ - -typedef enum _WRITE_REGISTRY -{ - REGISTRY_ACCESSIBILITY, - REGISTRY_UTILMAN -} WRITE_REGISTRY, *PWRITE_REGISTRY; - -/* DECLARATIONS ***************************************************************/ - -/* dialog.c */ -BOOL DlgInitHandler(HWND hDlg); -INT_PTR APIENTRY DlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); -INT ListBoxRefreshContents(VOID); -VOID CheckUtilityState(BOOL bUtilState); - -/* process.c */ -DWORD GetProcessID(IN LPCWSTR lpProcessName); -BOOL IsProcessRunning(IN LPCWSTR lpProcessName); -BOOL LaunchProcess(LPCWSTR lpProcessName); -BOOL CloseProcess(IN LPCWSTR lpProcessName); - -/* about.c */ -VOID ShowAboutDlg(HWND hDlgParent); -INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); - -/* registry.c */ -BOOL InitAppRegKey(IN HKEY hPredefinedKey, IN LPCWSTR lpwszSubKey, OUT PHKEY phKey, OUT LPDWORD lpdwDisposition); -BOOL QueryAppSettings(IN HKEY hKey, IN LPCWSTR lpwszSubKey, IN LPCWSTR lpwszRegValue, OUT PVOID ReturnedData, IN OUT LPDWORD lpdwSizeData); -BOOL SaveAppSettings(IN HKEY hKey, IN LPCWSTR lpwszRegValue, IN DWORD dwRegType, IN PVOID Data, IN DWORD cbSize); - -/* Struct variable declaration */ -extern UTILMAN_GLOBALS Globals; -extern REGISTRY_SETTINGS Settings; -extern REGISTRY_DATA RegData; +typedef BOOL (WINAPI *EXECDLGROUTINE)(VOID); #endif /* _UTILMAN_H */ diff --git a/base/applications/utilman/resource.h b/base/applications/utilman/resource.h index df93ab48ad9..9809573b021 100644 --- a/base/applications/utilman/resource.h +++ b/base/applications/utilman/resource.h @@ -2,7 +2,7 @@ * PROJECT: ReactOS Utility Manager (Accessibility) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Resource header file - * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + * COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com) */ #pragma once @@ -10,38 +10,8 @@ #define IDC_STATIC -1 /* Icon resource */ -#define IDI_ICON_UTILMAN 50 +#define IDI_ICON_UTILMAN 30 -/* List box resource */ -#define IDC_LISTBOX 60 - -/* Utility tools name strings */ -#define IDS_OSK 100 -#define IDS_MAGNIFIER 101 - -/* Utility state strings */ -#define IDS_NOTRUNNING 150 -#define IDS_RUNNING 151 - -/* Groupbox option title */ -#define IDC_GROUPBOX 200 -#define IDS_GROUPBOX_OPTIONS_TITLE 201 - -/* Button resources */ -#define IDC_START 300 -#define IDC_STOP 301 -#define IDC_OK 302 -#define IDC_CANCEL 303 -#define IDC_HELP_TOPICS 304 - -/* Checkbox resources */ -#define IDC_START_LOG_IN 400 -#define IDC_START_DESKTOP 401 -#define IDC_START_UTILMAN 402 - -/* System menu (About) resource */ -#define IDM_ABOUT 600 - -/* Main dialog resource */ -#define IDD_MAIN_DIALOG 1000 -#define IDD_ABOUT_DIALOG 1050 +/* Strings */ +#define IDS_FAIL_INIT 40 +#define IDS_FAIL_INIT_TITLE 41 diff --git a/base/applications/utilman/umandlg/CMakeLists.txt b/base/applications/utilman/umandlg/CMakeLists.txt new file mode 100644 index 00000000000..e2b0a0a9e4b --- /dev/null +++ b/base/applications/utilman/umandlg/CMakeLists.txt @@ -0,0 +1,15 @@ + +spec2def(umandlg.dll umandlg.spec) + +add_library(umandlg MODULE + about.c + process.c + registry.c + umandlg.c + umandlg.h + umandlg.rc + ${CMAKE_CURRENT_BINARY_DIR}/umandlg.def) + +set_module_type(umandlg win32dll UNICODE) +add_importlibs(umandlg comdlg32 user32 gdi32 advapi32 shell32 comctl32 msvcrt kernel32 ntdll) +add_cd_file(TARGET umandlg DESTINATION reactos/system32 FOR all) diff --git a/base/applications/utilman/about.c b/base/applications/utilman/umandlg/about.c similarity index 78% rename from base/applications/utilman/about.c rename to base/applications/utilman/umandlg/about.c index 805fde451f9..84615679c09 100644 --- a/base/applications/utilman/about.c +++ b/base/applications/utilman/umandlg/about.c @@ -1,13 +1,13 @@ /* - * PROJECT: ReactOS Utility Manager (Accessibility) + * PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: About dialog file - * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + * COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com) */ /* INCLUDES *******************************************************************/ -#include "precomp.h" +#include "umandlg.h" /* GLOBALS ********************************************************************/ @@ -43,12 +43,11 @@ INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) { case WM_INITDIALOG: { - Globals.hIcon = LoadImageW(Globals.hInstance, - MAKEINTRESOURCEW(IDI_ICON_UTILMAN), - IMAGE_ICON, - 0, - 0, - LR_DEFAULTSIZE); + WCHAR wszAppPath[MAX_BUFFER]; + + /* Extract the icon resource from the executable process */ + GetModuleFileNameW(NULL, wszAppPath, _countof(wszAppPath)); + Globals.hIcon = ExtractIconW(Globals.hInstance, wszAppPath, 0); /* Set the icon within the dialog's title bar */ if (Globals.hIcon) diff --git a/base/applications/utilman/lang/en-US.rc b/base/applications/utilman/umandlg/lang/en-US.rc similarity index 89% copy from base/applications/utilman/lang/en-US.rc copy to base/applications/utilman/umandlg/lang/en-US.rc index 84c022811ba..dcaa3a2395d 100644 --- a/base/applications/utilman/lang/en-US.rc +++ b/base/applications/utilman/umandlg/lang/en-US.rc @@ -1,8 +1,8 @@ -/* +/* * PROJECT: ReactOS Utility Manager (Accessibility) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: English (United States of America) translation resource - * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + * COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com) */ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -30,9 +30,8 @@ CAPTION "About Accessibility Utility Manager" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 + LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 PUSHBUTTON "Close", IDOK, 75, 47, 44, 15 END diff --git a/base/applications/utilman/lang/es-ES.rc b/base/applications/utilman/umandlg/lang/es-ES.rc similarity index 93% rename from base/applications/utilman/lang/es-ES.rc rename to base/applications/utilman/umandlg/lang/es-ES.rc index c72499b1d4d..8b7ade86373 100644 --- a/base/applications/utilman/lang/es-ES.rc +++ b/base/applications/utilman/umandlg/lang/es-ES.rc @@ -1,4 +1,4 @@ -/* +/* * PROJECT: ReactOS Utility Manager (Accessibility) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Spanish (Neutral) translation resource @@ -31,9 +31,8 @@ CAPTION "Acerca de las Herramientas de Accesibilidad" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 + LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 PUSHBUTTON "Cerrar", IDOK, 75, 47, 44, 15 END diff --git a/base/applications/utilman/lang/fr-FR.rc b/base/applications/utilman/umandlg/lang/fr-FR.rc similarity index 93% rename from base/applications/utilman/lang/fr-FR.rc rename to base/applications/utilman/umandlg/lang/fr-FR.rc index ef32c1d90d9..71368f2c0d2 100644 --- a/base/applications/utilman/lang/fr-FR.rc +++ b/base/applications/utilman/umandlg/lang/fr-FR.rc @@ -1,4 +1,4 @@ -/* +/* * PROJECT: ReactOS Utility Manager (Accessibility) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: French (France) translation resource @@ -30,9 +30,8 @@ CAPTION "A propos du gestionnaire d'utilitaires d'accessibilité" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 + LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 PUSHBUTTON "Close", IDOK, 75, 47, 44, 15 END diff --git a/base/applications/utilman/lang/he-IL.rc b/base/applications/utilman/umandlg/lang/he-IL.rc similarity index 93% rename from base/applications/utilman/lang/he-IL.rc rename to base/applications/utilman/umandlg/lang/he-IL.rc index 169f9ae00c0..4f381ba3530 100644 --- a/base/applications/utilman/lang/he-IL.rc +++ b/base/applications/utilman/umandlg/lang/he-IL.rc @@ -1,4 +1,4 @@ -/* +/* * PROJECT: ReactOS Utility Manager (Accessibility) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Hebrew (Israel) translation resource @@ -30,9 +30,8 @@ CAPTION "אודות מנהל כלי הנגישות" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "מנהל כלי הנגישות\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + LTEXT "מנהל כלי הנגישות\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 + LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 PUSHBUTTON "סגור", IDOK, 75, 47, 44, 15 END diff --git a/base/applications/utilman/lang/it-IT.rc b/base/applications/utilman/umandlg/lang/it-IT.rc similarity index 93% rename from base/applications/utilman/lang/it-IT.rc rename to base/applications/utilman/umandlg/lang/it-IT.rc index 9b4295c1153..b36ec0577e7 100644 --- a/base/applications/utilman/lang/it-IT.rc +++ b/base/applications/utilman/umandlg/lang/it-IT.rc @@ -30,9 +30,8 @@ CAPTION "Informazioni su Accessibilità Utility Manager" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "Accessibilità Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + LTEXT "Accessibilità Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 + LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 PUSHBUTTON "Chiudi", IDOK, 75, 47, 44, 15 END diff --git a/base/applications/utilman/lang/pl-PL.rc b/base/applications/utilman/umandlg/lang/pl-PL.rc similarity index 94% rename from base/applications/utilman/lang/pl-PL.rc rename to base/applications/utilman/umandlg/lang/pl-PL.rc index 8318b53a0f9..76d82e75514 100644 --- a/base/applications/utilman/lang/pl-PL.rc +++ b/base/applications/utilman/umandlg/lang/pl-PL.rc @@ -29,9 +29,8 @@ CAPTION "Menedżer narzędzi ułatwienia dostępu - informacje" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "Menedżer narzędzi ułatwienia dostępu\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + LTEXT "Menedżer narzędzi ułatwienia dostępu\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 + LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 PUSHBUTTON "Close", IDOK, 75, 47, 44, 15 END diff --git a/base/applications/utilman/lang/ro-RO.rc b/base/applications/utilman/umandlg/lang/ro-RO.rc similarity index 94% rename from base/applications/utilman/lang/ro-RO.rc rename to base/applications/utilman/umandlg/lang/ro-RO.rc index e6b3ba5de93..5cb51134aa2 100644 --- a/base/applications/utilman/lang/ro-RO.rc +++ b/base/applications/utilman/umandlg/lang/ro-RO.rc @@ -1,4 +1,4 @@ -/* +/* * PROJECT: ReactOS Utility Manager (Accessibility) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Romanian (Romania) translation resource @@ -30,9 +30,8 @@ CAPTION "Despre Managerul utilitare" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "Manager utilitare\nDrept de autor 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "Drept de autor 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + LTEXT "Manager utilitare\nDrept de autor 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 + LTEXT "Drept de autor 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 PUSHBUTTON "Închide", IDOK, 75, 47, 44, 15 END diff --git a/base/applications/utilman/lang/ru-RU.rc b/base/applications/utilman/umandlg/lang/ru-RU.rc similarity index 96% rename from base/applications/utilman/lang/ru-RU.rc rename to base/applications/utilman/umandlg/lang/ru-RU.rc index 9be0b4f2f35..c57d4be4169 100644 --- a/base/applications/utilman/lang/ru-RU.rc +++ b/base/applications/utilman/umandlg/lang/ru-RU.rc @@ -1,4 +1,4 @@ -/* +/* * PROJECT: ReactOS Utility Manager (Accessibility) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Russian (Russia) translation resource @@ -30,9 +30,8 @@ CAPTION "О программе" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "Диспетчер служебных программ\n© 2019 Джордж Бисок (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "© 2019 Гермес Белуска-Майто", IDC_STATIC, 48, 33, 150, 36 + LTEXT "Диспетчер служебных программ\n© 2019 Джордж Бисок (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 + LTEXT "© 2019 Гермес Белуска-Майто", IDC_STATIC, 10, 33, 150, 36 PUSHBUTTON "OK", IDOK, 75, 47, 44, 15 END diff --git a/base/applications/utilman/lang/uk-UA.rc b/base/applications/utilman/umandlg/lang/uk-UA.rc similarity index 96% rename from base/applications/utilman/lang/uk-UA.rc rename to base/applications/utilman/umandlg/lang/uk-UA.rc index d866adc140b..d13c862c279 100644 --- a/base/applications/utilman/lang/uk-UA.rc +++ b/base/applications/utilman/umandlg/lang/uk-UA.rc @@ -1,4 +1,4 @@ -/* +/* * PROJECT: ReactOS Utility Manager (Accessibility) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Ukrainian (Ukraine) translation resource @@ -30,9 +30,8 @@ CAPTION "Про программу" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "Диспетчер службових програм\n© 2019 Джордж Бісок (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "© 2019 Гермес Белуска-Майто", IDC_STATIC, 48, 33, 150, 36 + LTEXT "Диспетчер службових програм\n© 2019 Джордж Бісок (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 + LTEXT "© 2019 Гермес Белуска-Майто", IDC_STATIC, 10, 33, 150, 36 PUSHBUTTON "OK", IDOK, 75, 47, 44, 15 END diff --git a/base/applications/utilman/process.c b/base/applications/utilman/umandlg/process.c similarity index 96% rename from base/applications/utilman/process.c rename to base/applications/utilman/umandlg/process.c index 71e4c589360..c5444ff2883 100644 --- a/base/applications/utilman/process.c +++ b/base/applications/utilman/umandlg/process.c @@ -1,13 +1,13 @@ /* - * PROJECT: ReactOS Utility Manager (Accessibility) + * PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Process handling functions - * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + * COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com) */ /* INCLUDES *******************************************************************/ -#include "precomp.h" +#include "umandlg.h" /* FUNCTIONS ******************************************************************/ diff --git a/base/applications/utilman/registry.c b/base/applications/utilman/umandlg/registry.c similarity index 98% rename from base/applications/utilman/registry.c rename to base/applications/utilman/umandlg/registry.c index d7a31781260..bd96d3592a4 100644 --- a/base/applications/utilman/registry.c +++ b/base/applications/utilman/umandlg/registry.c @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Utility Manager (Accessibility) + * PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Registry functions for Utility Manager settings management * COPYRIGHT: Copyright 2020 Bișoc George (fraizeraust99 at gmail dot com) @@ -7,7 +7,7 @@ /* INCLUDES *******************************************************************/ -#include "precomp.h" +#include "umandlg.h" /* GLOBALS ********************************************************************/ diff --git a/base/applications/utilman/resource.h b/base/applications/utilman/umandlg/resource.h similarity index 85% copy from base/applications/utilman/resource.h copy to base/applications/utilman/umandlg/resource.h index df93ab48ad9..d980b983a7e 100644 --- a/base/applications/utilman/resource.h +++ b/base/applications/utilman/umandlg/resource.h @@ -1,17 +1,14 @@ /* - * PROJECT: ReactOS Utility Manager (Accessibility) + * PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Resource header file - * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + * COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com) */ #pragma once #define IDC_STATIC -1 -/* Icon resource */ -#define IDI_ICON_UTILMAN 50 - /* List box resource */ #define IDC_LISTBOX 60 diff --git a/base/applications/utilman/dialog.c b/base/applications/utilman/umandlg/umandlg.c similarity index 86% rename from base/applications/utilman/dialog.c rename to base/applications/utilman/umandlg/umandlg.c index 4ce74bfa7a6..694ae06c030 100644 --- a/base/applications/utilman/dialog.c +++ b/base/applications/utilman/umandlg/umandlg.c @@ -1,14 +1,14 @@ /* - * PROJECT: ReactOS Utility Manager (Accessibility) + * PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Main dialog code file - * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + * PURPOSE: Main DLL code file + * COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com) * Copyright 2019 Hermes Belusca-Maito */ /* INCLUDES *******************************************************************/ -#include "precomp.h" +#include "umandlg.h" /* GLOBALS ********************************************************************/ @@ -99,6 +99,7 @@ BOOL DlgInitHandler(IN HWND hDlg) INT PosX, PosY; RECT rc; WCHAR szAboutDlg[MAX_BUFFER]; + WCHAR wszAppPath[MAX_BUFFER]; HMENU hSysMenu; /* Save the dialog handle */ @@ -110,13 +111,9 @@ BOOL DlgInitHandler(IN HWND hDlg) PosY = (GetSystemMetrics(SM_CYSCREEN) - rc.bottom) / 2; SetWindowPos(hDlg, 0, PosX, PosY, 0, 0, SWP_NOZORDER | SWP_NOSIZE); - /* Load the icon resource */ - Globals.hIcon = LoadImageW(Globals.hInstance, - MAKEINTRESOURCEW(IDI_ICON_UTILMAN), - IMAGE_ICON, - 0, - 0, - LR_DEFAULTSIZE); + /* Extract the icon resource from the executable process */ + GetModuleFileNameW(NULL, wszAppPath, _countof(wszAppPath)); + Globals.hIcon = ExtractIconW(Globals.hInstance, wszAppPath, 0); /* Set the icon within the dialog's title bar */ if (Globals.hIcon) @@ -351,40 +348,21 @@ INT_PTR APIENTRY DlgProc( } /** - * @wWinMain + * @UManStartDlg * - * Application entry point. - * - * @param[in] hInstance - * Application instance. - * - * @param[in] hPrevInstance - * The previous instance of the application (not used). - * - * @param[in] pCmdLine - * Pointer to a command line argument (in wide string -- not used). - * - * @param[in] nCmdShow - * An integer served as a flag to note how the application will be shown (not used). + * Executes the dialog initialization mechanism and starts Utility Manager. + * The function is exported for use by the main process. * * @return - * Returns 0 to let the function terminating before it enters in the message loop. + * Returns TRUE when the operation has succeeded, FALSE otherwise. * */ -INT WINAPI wWinMain( - IN HINSTANCE hInstance, - IN HINSTANCE hPrevInstance, - IN LPWSTR pCmdLine, - IN INT nCmdShow) +BOOL WINAPI UManStartDlg(VOID) { HANDLE hMutex; DWORD dwError; INITCOMMONCONTROLSEX iccex; - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(pCmdLine); - UNREFERENCED_PARAMETER(nCmdShow); - /* Create a mutant object for the program. */ hMutex = CreateMutexW(NULL, FALSE, L"Utilman"); if (hMutex) @@ -399,7 +377,7 @@ INT WINAPI wWinMain( and mutex object. */ CloseHandle(hMutex); - return 0; + return FALSE; } } @@ -408,10 +386,6 @@ INT WINAPI wWinMain( iccex.dwICC = ICC_STANDARD_CLASSES | ICC_WIN95_CLASSES; InitCommonControlsEx(&iccex); - /* Initialize the globals */ - ZeroMemory(&Globals, sizeof(Globals)); - Globals.hInstance = hInstance; - LoadStringW(Globals.hInstance, IDS_RUNNING, Globals.szRunning, _countof(Globals.szRunning)); LoadStringW(Globals.hInstance, IDS_NOTRUNNING, @@ -423,7 +397,7 @@ INT WINAPI wWinMain( InitUtilsList(FALSE); /* Create the dialog box of the program */ - DialogBoxW(hInstance, + DialogBoxW(Globals.hInstance, MAKEINTRESOURCEW(IDD_MAIN_DIALOG), GetDesktopWindow(), DlgProc); @@ -434,5 +408,49 @@ INT WINAPI wWinMain( CloseHandle(hMutex); } - return 0; + return TRUE; +} + +/** + * @DllMain + * + * Core routine of the Utility Manager's library. + * + * @param[in] hDllInstance + * The entry point instance of the library. + * + * @param[in] fdwReason + * The reason argument to indicate the motive DllMain + * is being called. + * + * @param[in] lpvReserved + * Reserved. + * + * @return + * Returns TRUE when main call initialization has succeeded, FALSE + * otherwise. + * + */ +BOOL WINAPI DllMain(IN HINSTANCE hDllInstance, + IN DWORD fdwReason, + IN LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + { + /* We don't care for DLL_THREAD_ATTACH and DLL_THREAD_DETACH notifications */ + DisableThreadLibraryCalls(hDllInstance); + + /* Initialize the globals */ + ZeroMemory(&Globals, sizeof(Globals)); + Globals.hInstance = hDllInstance; + break; + } + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; } diff --git a/base/applications/utilman/precomp.h b/base/applications/utilman/umandlg/umandlg.h similarity index 91% copy from base/applications/utilman/precomp.h copy to base/applications/utilman/umandlg/umandlg.h index fcfe045ea47..d90b8520e26 100644 --- a/base/applications/utilman/precomp.h +++ b/base/applications/utilman/umandlg/umandlg.h @@ -1,12 +1,12 @@ /* - * PROJECT: ReactOS Utility Manager (Accessibility) + * PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Pre-compiled header file - * COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com) + * PURPOSE: DLL header file + * COPYRIGHT: Copyright 2020 Bișoc George (fraizeraust99 at gmail dot com) */ -#ifndef _UTILMAN_H -#define _UTILMAN_H +#ifndef _UMANDLG_H +#define _UMANDLG_H /* INCLUDES ******************************************************************/ @@ -89,11 +89,12 @@ typedef enum _WRITE_REGISTRY /* DECLARATIONS ***************************************************************/ -/* dialog.c */ +/* umandlg.c */ BOOL DlgInitHandler(HWND hDlg); INT_PTR APIENTRY DlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); INT ListBoxRefreshContents(VOID); VOID CheckUtilityState(BOOL bUtilState); +BOOL WINAPI UManStartDlg(VOID); /* process.c */ DWORD GetProcessID(IN LPCWSTR lpProcessName); @@ -115,6 +116,6 @@ extern UTILMAN_GLOBALS Globals; extern REGISTRY_SETTINGS Settings; extern REGISTRY_DATA RegData; -#endif /* _UTILMAN_H */ +#endif /* UMANDLG_H_ */ /* EOF */ diff --git a/base/applications/utilman/utilman.rc b/base/applications/utilman/umandlg/umandlg.rc similarity index 73% copy from base/applications/utilman/utilman.rc copy to base/applications/utilman/umandlg/umandlg.rc index 651652b8f4e..28c0ca16032 100644 --- a/base/applications/utilman/utilman.rc +++ b/base/applications/utilman/umandlg/umandlg.rc @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Utility Manager (Accessibility) + * PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Main resource file - * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + * PURPOSE: Main DLL resource file + * COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com) */ /* INCLUDES ******************************************************************/ @@ -13,13 +13,11 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Accessibility Utility Manager" -#define REACTOS_STR_INTERNAL_NAME "utilman" -#define REACTOS_STR_ORIGINAL_FILENAME "utilman.exe" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Accessibility Utility Manager Resources DLL" +#define REACTOS_STR_INTERNAL_NAME "UManDlg" +#define REACTOS_STR_ORIGINAL_FILENAME "UManDlg.dll" #include <reactos/version.rc> -IDI_ICON_UTILMAN ICON "res/utilman.ico" - #include <reactos/manifest_exe.rc> /* UTF-8 */ diff --git a/base/applications/utilman/umandlg/umandlg.spec b/base/applications/utilman/umandlg/umandlg.spec new file mode 100644 index 00000000000..e63c99b693b --- /dev/null +++ b/base/applications/utilman/umandlg/umandlg.spec @@ -0,0 +1 @@ +1 stdcall UManStartDlg() diff --git a/base/applications/utilman/utilman.c b/base/applications/utilman/utilman.c new file mode 100644 index 00000000000..a857b51eaa3 --- /dev/null +++ b/base/applications/utilman/utilman.c @@ -0,0 +1,68 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Main dialog code file + * COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com) + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +/* FUNCTIONS ******************************************************************/ + +/** + * @wWinMain + * + * Application entry point. + * + * @param[in] hInstance + * Application instance. + * + * @param[in] hPrevInstance + * The previous instance of the application (not used). + * + * @param[in] pCmdLine + * Pointer to a command line argument (in wide string -- not used). + * + * @param[in] nCmdShow + * An integer served as a flag to note how the application will be shown (not used). + * + * @return + * Returns 0 to let the function terminating before it enters in the message loop. + * + */ +INT WINAPI wWinMain(IN HINSTANCE hInstance, + IN HINSTANCE hPrevInstance, + IN LPWSTR pCmdLine, + IN INT nCmdShow) +{ + HMODULE hModule; + WCHAR wszFormat[MAX_BUFFER]; + WCHAR wszFailLoad[MAX_BUFFER]; + WCHAR wszTitle[MAX_BUFFER]; + EXECDLGROUTINE UManStartDlg; + + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(pCmdLine); + UNREFERENCED_PARAMETER(nCmdShow); + + /* Load the main resources module of Utility Manager */ + hModule = LoadLibraryW(L"UManDlg.dll"); + if (!hModule) + { + LoadStringW(hInstance, IDS_FAIL_INIT, wszFormat, _countof(wszFormat)); + LoadStringW(hInstance, IDS_FAIL_INIT_TITLE, wszTitle, _countof(wszTitle)); + + StringCchPrintfW(wszFailLoad, _countof(wszFailLoad), wszFormat, GetLastError()); + MessageBoxW(GetDesktopWindow(), wszFailLoad, wszTitle, MB_ICONERROR | MB_OK); + return -1; + } + + /* Get the function address and launch Utility Manager */ + UManStartDlg = (EXECDLGROUTINE)GetProcAddress(hModule, "UManStartDlg"); + UManStartDlg(); + + FreeLibrary(hModule); + return 0; +} diff --git a/base/applications/utilman/utilman.rc b/base/applications/utilman/utilman.rc index 651652b8f4e..c6991cbb79c 100644 --- a/base/applications/utilman/utilman.rc +++ b/base/applications/utilman/utilman.rc @@ -2,7 +2,7 @@ * PROJECT: ReactOS Utility Manager (Accessibility) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Main resource file - * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + * COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com) */ /* INCLUDES ******************************************************************/ @@ -28,29 +28,5 @@ IDI_ICON_UTILMAN ICON "res/utilman.ico" #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif -#ifdef LANGUAGE_ES_ES - #include "lang/es-ES.rc" -#endif -#ifdef LANGUAGE_FR_FR - #include "lang/fr-FR.rc" -#endif -#ifdef LANGUAGE_HE_IL - #include "lang/he-IL.rc" -#endif -#ifdef LANGUAGE_IT_IT - #include "lang/it-IT.rc" -#endif -#ifdef LANGUAGE_PL_PL - #include "lang/pl-PL.rc" -#endif -#ifdef LANGUAGE_RO_RO - #include "lang/ro-RO.rc" -#endif -#ifdef LANGUAGE_RU_RU - #include "lang/ru-RU.rc" -#endif -#ifdef LANGUAGE_UK_UA - #include "lang/uk-UA.rc" -#endif /* EOF */

4 years, 8 months

[reactos] 03/03: [COMCTL32] Implement a simple version of snap to grid for listview

by Charles Ambrye

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=963d39bf66a2d915e8a7b… commit 963d39bf66a2d915e8a7b619db6a948297e8a48f Author: Charles Ambrye <giawa(a)hotmail.com> AuthorDate: Wed Apr 15 09:02:00 2020 -0700 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Fri Apr 17 13:23:29 2020 +0300 [COMCTL32] Implement a simple version of snap to grid for listview --- dll/win32/comctl32/listview.c | 71 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index 3d04f103fb2..7a3eeec5404 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -2723,11 +2723,16 @@ static DWORD LISTVIEW_MapIndexToId(const LISTVIEW_INFO *infoPtr, INT iItem) * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure * [O] lpPos : will get the current icon position + * [I] nItem : item id to get position for * * RETURN: * None */ +#ifdef __REACTOS__ +static void LISTVIEW_NextIconPosTop(LISTVIEW_INFO *infoPtr, LPPOINT lpPos, INT nItem) +#else static void LISTVIEW_NextIconPosTop(LISTVIEW_INFO *infoPtr, LPPOINT lpPos) +#endif { INT nListWidth = infoPtr->rcList.right - infoPtr->rcList.left; @@ -2749,11 +2754,16 @@ static void LISTVIEW_NextIconPosTop(LISTVIEW_INFO *infoPtr, LPPOINT lpPos) * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure * [O] lpPos : will get the current icon position + * [I] nItem : item id to get position for * * RETURN: * None */ +#ifdef __REACTOS__ +static void LISTVIEW_NextIconPosLeft(LISTVIEW_INFO *infoPtr, LPPOINT lpPos, INT nItem) +#else static void LISTVIEW_NextIconPosLeft(LISTVIEW_INFO *infoPtr, LPPOINT lpPos) +#endif { INT nListHeight = infoPtr->rcList.bottom - infoPtr->rcList.top; @@ -2766,7 +2776,45 @@ static void LISTVIEW_NextIconPosLeft(LISTVIEW_INFO *infoPtr, LPPOINT lpPos) infoPtr->currIconPos.y = 0; } - + +#ifdef __REACTOS__ +/*** + * DESCRIPTION: + * Returns the grid position closest to the already placed icon. + * The returned position is not offset by Origin. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [O] lpPos : will get the current icon position + * [I] nItem : item id to get position for + * + * RETURN: + * None + */ +static void LISTVIEW_NextIconPosSnap(LISTVIEW_INFO *infoPtr, LPPOINT lpPos, INT nItem) +{ + INT nListHeight = infoPtr->rcList.bottom - infoPtr->rcList.top; + INT nListWidth = infoPtr->rcList.right - infoPtr->rcList.left; + INT nMaxColumns = nListWidth / infoPtr->nItemWidth; + INT nMaxRows = nListHeight / infoPtr->nItemHeight; + POINT oldPosition; + + // get the existing x and y position and then snap to the closest grid square + oldPosition.x = (LONG_PTR)DPA_GetPtr(infoPtr->hdpaPosX, nItem); + oldPosition.y = (LONG_PTR)DPA_GetPtr(infoPtr->hdpaPosY, nItem); + + // FIXME: This could should deal with multiple icons in the same grid square + // equivalent of max(0, round(oldPosition / itemSize) * itemSize), but without need for 'round' function + (*lpPos).x = max(0, oldPosition.x + (infoPtr->nItemWidth >> 1) - (oldPosition.x + (infoPtr->nItemWidth >> 1)) % infoPtr->nItemWidth); + (*lpPos).y = max(0, oldPosition.y + (infoPtr->nItemHeight >> 1) - (oldPosition.y + (infoPtr->nItemHeight >> 1)) % infoPtr->nItemHeight); + + // deal with any icons that have gone out of range + if ((*lpPos).x > nListWidth) (*lpPos).x = nMaxColumns * infoPtr->nItemWidth; + if ((*lpPos).y > nListHeight) (*lpPos).y = nMaxRows * infoPtr->nItemHeight; +} +#endif + + /*** * DESCRIPTION: * Moves an icon to the specified position. @@ -2819,7 +2867,11 @@ static BOOL LISTVIEW_MoveIconTo(const LISTVIEW_INFO *infoPtr, INT nItem, const P */ static BOOL LISTVIEW_Arrange(LISTVIEW_INFO *infoPtr, INT nAlignCode) { +#ifdef __REACTOS__ + void (*next_pos)(LISTVIEW_INFO *, LPPOINT, INT); +#else void (*next_pos)(LISTVIEW_INFO *, LPPOINT); +#endif POINT pos; INT i; @@ -2837,14 +2889,22 @@ static BOOL LISTVIEW_Arrange(LISTVIEW_INFO *infoPtr, INT nAlignCode) { case LVA_ALIGNLEFT: next_pos = LISTVIEW_NextIconPosLeft; break; case LVA_ALIGNTOP: next_pos = LISTVIEW_NextIconPosTop; break; +#ifdef __REACTOS__ + case LVA_SNAPTOGRID: next_pos = LISTVIEW_NextIconPosSnap; break; +#else case LVA_SNAPTOGRID: next_pos = LISTVIEW_NextIconPosTop; break; /* FIXME */ +#endif default: return FALSE; } infoPtr->currIconPos.x = infoPtr->currIconPos.y = 0; for (i = 0; i < infoPtr->nItemCount; i++) { - next_pos(infoPtr, &pos); +#ifdef __REACTOS__ + next_pos(infoPtr, &pos, i); +#else + next_pos(infoPtr, &pos); +#endif LISTVIEW_MoveIconTo(infoPtr, i, &pos, FALSE); } @@ -7978,10 +8038,17 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, { POINT pt; +#ifdef __REACTOS__ if (infoPtr->dwStyle & LVS_ALIGNLEFT) + LISTVIEW_NextIconPosLeft(infoPtr, &pt, nItem); + else + LISTVIEW_NextIconPosTop(infoPtr, &pt, nItem); +#else + if (infoPtr->dwStyle & LVS_ALIGNLEFT) LISTVIEW_NextIconPosLeft(infoPtr, &pt); else LISTVIEW_NextIconPosTop(infoPtr, &pt); +#endif LISTVIEW_MoveIconTo(infoPtr, nItem, &pt, TRUE); }

4 years, 8 months

[reactos] 02/03: [SHELL32] Pass LVA_SNAPTOGRID to listview when 'Line up Icons' is selected

by Charles Ambrye

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1bee97358e139fb2adc2e… commit 1bee97358e139fb2adc2e739af74c8fb2681ab56 Author: Charles Ambrye <giawa(a)hotmail.com> AuthorDate: Wed Apr 15 09:01:09 2020 -0700 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Fri Apr 17 13:23:29 2020 +0300 [SHELL32] Pass LVA_SNAPTOGRID to listview when 'Line up Icons' is selected --- dll/win32/shell32/CDefView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 48591cc3c71..608101cc1f5 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1768,7 +1768,7 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand break; case FCIDM_SHVIEW_SNAPTOGRID: - //FIXME + m_ListView.Arrange(LVA_SNAPTOGRID); break; case FCIDM_SHVIEW_AUTOARRANGE: if (GetAutoArrange() == S_OK)

4 years, 8 months

[reactos] 01/03: [COMCTL32] Do not allow user to move icons when in auto-arrange mode

by Charles Ambrye

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08364d08c73c5fd95b2c1… commit 08364d08c73c5fd95b2c1a8dacc983060d35e473 Author: Charles Ambrye <giawa(a)hotmail.com> AuthorDate: Wed Apr 15 08:59:18 2020 -0700 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Fri Apr 17 13:23:29 2020 +0300 [COMCTL32] Do not allow user to move icons when in auto-arrange mode --- dll/win32/comctl32/listview.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index ee2524faddf..3d04f103fb2 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -8992,6 +8992,12 @@ static BOOL LISTVIEW_SetItemPosition(LISTVIEW_INFO *infoPtr, INT nItem, const PO if (!pt || nItem < 0 || nItem >= infoPtr->nItemCount || !(infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON)) return FALSE; +#ifdef __REACTOS__ + /* FIXME: This should really call snap to grid if auto-arrange is enabled + and limit the size of the grid to nItemCount elements */ + if (is_autoarrange(infoPtr)) return FALSE; +#endif + Pt = *pt; LISTVIEW_GetOrigin(infoPtr, &Origin);

4 years, 8 months

[reactos] 01/01: [BROWSEUI] CORE-16810 de-DE Translation of "Search Results" titlebar

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b53e33554e7b99ae152c… commit 2b53e33554e7b99ae152c6ccfb00ff92538a8b7a Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Apr 17 09:43:40 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Apr 17 09:43:40 2020 +0200 [BROWSEUI] CORE-16810 de-DE Translation of "Search Results" titlebar --- dll/win32/browseui/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index 554fc03d709..99026200bed 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -346,7 +346,7 @@ END STRINGTABLE BEGIN - IDS_SEARCH_RESULTS "Search Results" + IDS_SEARCH_RESULTS "Suchergebnisse" IDS_SEARCHINVALID "'%1' ist kein gültiger Ordner." IDS_SEARCH_FOLDER "%s wird durchsucht" IDS_SEARCH_FILES_FOUND "%u Objekte gefunden"

4 years, 8 months

[reactos] 01/01: [NETID] Update Polish translation (#2559)

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c1c303b2f27531d2cd70… commit 3c1c303b2f27531d2cd70de4d0400ebaa9148e1f Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Thu Apr 16 23:25:03 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 16 23:25:03 2020 +0200 [NETID] Update Polish translation (#2559) Co-authored-by: Adam Słaboń <asaillen456esx(a)gmail.com> --- dll/win32/netid/lang/pl-PL.rc | 57 ++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/dll/win32/netid/lang/pl-PL.rc b/dll/win32/netid/lang/pl-PL.rc index 12c75f93ab5..22f412b1d39 100644 --- a/dll/win32/netid/lang/pl-PL.rc +++ b/dll/win32/netid/lang/pl-PL.rc @@ -4,7 +4,8 @@ * https://sourceforge.net/projects/reactospl * Translation update by Caemyr - Olaf Siejka (Apr, 2008) * UTF-8 conversion by Caemyr (May, 2011) - */ + * Updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (April, 2020) +*/ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -15,17 +16,17 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS używa następujących informacji do identyfikacji komputera w sieci", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Opis komputera:", IDC_STATIC, 6, 40, 70, 9 - EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Pełna nazwa komputera:", IDC_STATIC, 6, 68, 64, 9 - EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Grupa robocza:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 - EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Aby użyć Kreatora identyfikacji sieciowej do dołączenia do domeny i stworzyć lokalnego użytkownika, wciśnij ID sieciowe.", IDC_STATIC, 6, 108, 172, 24 - PUSHBUTTON "&ID sieciowe...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "Aby zmienić nazwę tego komputera lub przyłączyć się do grupy roboczej, kliknij przycisk Zmień.", IDC_STATIC, 6, 149, 170, 17 - PUSHBUTTON "Z&mień...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 - LTEXT "Uwaga: Tylko administratorzy mogą zmienić identyfikator tego komputera.", IDC_STATIC, 6, 179, 300, 9 + LTEXT "Opis komputera:", IDC_STATIC, 7, 35, 77, 8 + EDITTEXT IDC_COMPDESC, 94, 33, 155, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Pełna nazwa komputera:", IDC_STATIC, 7, 70, 80, 8 + EDITTEXT IDC_COMPUTERNAME, 94, 70, 155, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Grupa robocza:", IDC_WORKGROUPDOMAIN, 7, 85, 77, 8 + EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 94, 84, 155, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Aby użyć Kreatora identyfikacji sieciowej w celu przyłączenia się do domeny i utworzenia konta użytkownika lokalnego, kliknij przycisk Identyfikator sieciowy.", IDC_STATIC, 7, 100, 153, 32 + PUSHBUTTON "&Identyfikator sieciowy...", IDC_NETWORK_ID, 167, 100, 82, 14 + LTEXT "Aby zmienić nazwę tego komputera lub przyłączyć się do grupy roboczej, kliknij przycisk Zmień.", IDC_STATIC, 7, 149, 153, 26 + PUSHBUTTON "Z&mień...", IDC_NETWORK_PROPERTY, 167, 149, 82, 14 + LTEXT "Uwaga: Tylko administratorzy mogą zmienić identyfikator tego komputera.", IDC_STATIC, 6, 182, 300, 9 END IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 @@ -34,14 +35,14 @@ CAPTION "Zmiana nazwy komputera" FONT 8, "MS Shell Dlg" BEGIN LTEXT "(message goes here)", 1017, 7, 5, 218, 30 - LTEXT "&Nazwa komputera:", -1, 7, 41, 219, 8 + LTEXT "&Nazwa komputera:", -1, 7, 43, 219, 8 EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT LTEXT "Pełna nazwa komputera:", 1016, 7, 72, 218, 10 EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - PUSHBUTTON "&Więcej...", 1003, 150, 102, 75, 14 + PUSHBUTTON "&Więcej...", 1003, 170, 102, 50, 14 GROUPBOX "Należy do", 1018, 7, 119, 219, 73 - AUTORADIOBUTTON "&Domeny:", 1008, 17, 132, 192, 10, WS_GROUP - AUTORADIOBUTTON "&Grupy roboczej:", 1004, 17, 161, 191, 10 + AUTORADIOBUTTON "&Domena:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Grupa robocza:", 1004, 17, 161, 191, 10 EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP PUSHBUTTON "Wy&szukaj moją domenę", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT @@ -51,41 +52,41 @@ END IDD_PROPPAGEDNSANDNETBIOS DIALOGEX 0, 0, 266, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Sufiksy DNS i nazwa NetBIOS komputera" +CAPTION "Sufiksy domeny DNS i nazwa NetBIOS komputera" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Podstawowy sufiks DNS tego komputera:", -1, 7, 5, 253, 8 EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL AUTOCHECKBOX "&Zmień podstawowy sufiks DNS przy zmianie członkostwa domeny", 115, 11, 39, 250, 10 - LTEXT "&Nazwa komputera NetBIOS:", -1, 7, 57, 148, 8 + LTEXT "&Nazwa NetBIOS komputera:", -1, 7, 57, 148, 8 EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 PUSHBUTTON "Anuluj", 2, 209, 104, 50, 14 - LTEXT "Nazwa ta jest niezbędna przy pracy ze starszymi serwerami i usługami.", 13, 7, 88, 253, 8 + LTEXT "Nazwa ta jest niezbędna przy pracy ze starszymi komputerami i usługami.", 13, 7, 88, 253, 8 END STRINGTABLE BEGIN - 1 "* Nieznane *" + 1 "* Nieznany *" 2 "GRUPA ROBOCZA" - 3 "Podczas odczytywania informacji o członkowstwie w domenie, wystąpił błąd:" + 3 "Podczas próby odczytu informacji o członkowstwie w domenie, wystąpił następujący błąd:" 4 "Zmiana nazwy komputera" 5 "Grupa Robocza:" 6 "Domena:" - 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." - 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." - 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." - 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." + 7 "Nazwa domeny ""%1"" nie odpowiada internetowym specyfikacjom DNS (Domain Name Service), mimo że jest dozwoloną nazwą ReactOS. Musisz użyć serwera ReactOS DNS dla nazw niestandardowych." + 8 "Nazwa domeny ""%1"" nie jest poprawnie sformatowana. Kropki (.) są używane do oddzielenia domen. Nazwa każdej domeny jest ograniczona do 63 znaków. Przykład: domena-1.reactos.org." + 10 "Nowa nazwa komputera ""%1"" jest za długa. Nazwa nie może być dłuższa niż 63 znaków." + 11 "Wprowadzona nowa nazwa komputera nie jest sformatowana poprawnie. Standardowe nazwy mogą zawierać litery (a-z, A-Z), cyfry (0-9), i łączniki (-), ale nie mogą zawierać spacji ani kropek (.). Nazwa nie może składać się wyłącznie z cyfr." 22 "Witamy w grupie roboczej %1." 23 "Witamy w domenie %1." 24 "Musisz zrestartować komputer aby zmiany odniosły skutek." 25 "Możesz zmienić nazwę i członkostwo tego komputera. Zmiany mogą mieć wpływ na dostęp do zasobów sieciowych." 1021 "Uwaga: Tylko Administratorzy mogą zmieniać identyfikator tego komputera." 1022 "Uwaga: Identyfikator tego komputera nie został zmieniony, powód:" - 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1029 "Nowa nazwa komputera ""%1"" jest liczbą. Nazwa nie może być liczbą." 1030 "Nowa nazwa komputera ""%1"" zawiera niedozwolone znaki. Do niedozwolonych znaków należą ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / oraz ?" - 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." - 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." + 1031 "Pierwsza domena w nazwie domeny ""%1"" jest liczbą. Pierwsza domena nie może być liczbą." + 1032 "Nazwa domeny ""%1"" zawiera niedozwolone znaki. Standardowe nazwy DNS mogą zawierać litery (a-z, A-Z), cyfry (0-9), i myślniki, ale bez spacji. Kropki (.) są używane do oddzielania domen. Przykład: domena-1.reactos.org." 3210 "&Szczegóły >>" 3220 "<< &Szczegóły" 4000 "Informacja"

4 years, 8 months

[reactos] 01/01: [SHUTDOWN] Update Polish translation (#2557)

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eba6f7dad0ced45f41294… commit eba6f7dad0ced45f41294747f11405a761b21fc0 Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Thu Apr 16 21:48:16 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 16 21:48:16 2020 +0200 [SHUTDOWN] Update Polish translation (#2557) --- base/applications/shutdown/lang/pl-PL.rc | 41 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/base/applications/shutdown/lang/pl-PL.rc b/base/applications/shutdown/lang/pl-PL.rc index 799d99d7eff..4f3adea5ad2 100644 --- a/base/applications/shutdown/lang/pl-PL.rc +++ b/base/applications/shutdown/lang/pl-PL.rc @@ -1,34 +1,35 @@ /* * Translated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (May, 2014) + * Updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (April, 2020) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT /* Dialog */ -IDD_GUI DIALOGEX 0, 0, 240, 255 +IDD_GUI DIALOGEX 0, 0, 272, 270 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Zdalne zamknięcie systemu" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&OK", IDC_OK, 125, 232, 50, 14 - PUSHBUTTON "&Anuluj", IDC_CANCEL, 178, 232, 50, 14 - LTEXT "Ko&mputery:", IDC_STATIC, 9, 9, 35, 36 - LISTBOX IDC_COMPUTER_LIST, 8, 19, 162, 55 - PUSHBUTTON "&Dodaj...", IDC_ADD_SYSTEM, 179, 19, 50, 14 - PUSHBUTTON "&Usuń", IDC_REMOVE_SYSTEM, 179, 36, 50, 14, WS_DISABLED - PUSHBUTTON "&Przeglądaj...", IDC_BROWSE_SYSTEM, 179, 53, 50, 14 - LTEXT "Akcja", IDC_ACTION, 11, 81, 20, 14 - COMBOBOX IDC_ACTION_TYPE, 37, 79, 129, 14, WS_TABSTOP | CBS_DROPDOWN - CHECKBOX "Ostrzeż użytkowników", IDC_WARN_USERS, 175, 79, 55, 14, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "Wyświetlaj ostrzeżenie przez", IDC_SHOW_WARN_ONE, 11, 99, 65, 14 - EDITTEXT IDC_SHOW_WARN, 78, 97, 41, 14 - LTEXT "sekund(y)", IDC_SHOW_WARN_TWO, 124, 99, 32, 10 - GROUPBOX "Śledzenie zdarzeń zamknięcia systemu", IDC_STATIC, 5, 114, 224, 114 - LTEXT "Powód:", IDC_STATIC, 16, 130, 27, 8 - CHECKBOX "Planowane", IDC_PLANNED, 175, 130, 40, 12, BS_AUTOCHECKBOX | WS_TABSTOP - COMBOBOX IDC_REASON_CODE, 17, 142, 198, 13, WS_TABSTOP | CBS_DROPDOWN - LTEXT "Ko&mentarz:", IDC_COMMENT_CAPTION, 16, 159, 38, 8 - EDITTEXT IDC_COMMENT_TEXT, 17, 171, 198, 50, WS_VSCROLL + DEFPUSHBUTTON "&OK", IDC_OK, 160, 248, 47, 14 + PUSHBUTTON "&Anuluj", IDC_CANCEL, 212, 248, 47, 14 + LTEXT "Ko&mputery:", IDC_STATIC, 14, 2, 36, 8 + LISTBOX IDC_COMPUTER_LIST, 14, 14, 183, 43 + PUSHBUTTON "&Dodaj...", IDC_ADD_SYSTEM, 209, 12, 47, 14 + PUSHBUTTON "&Usuń", IDC_REMOVE_SYSTEM, 209, 28, 47, 14, WS_DISABLED + PUSHBUTTON "&Przeglądaj...", IDC_BROWSE_SYSTEM, 209, 44, 47, 14 + LTEXT "Akcja", IDC_ACTION, 14, 64, 20, 8 + COMBOBOX IDC_ACTION_TYPE, 14, 76, 140, 67, WS_TABSTOP | CBS_DROPDOWN + CHECKBOX "Ostrzeż użytkowników", IDC_WARN_USERS, 14, 95, 85, 14, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "Wyświetlaj ostrzeżenie przez", IDC_SHOW_WARN_ONE, 22, 108, 97, 8 + EDITTEXT IDC_SHOW_WARN, 121, 107, 28, 12 + LTEXT "sekund(y)", IDC_SHOW_WARN_TWO, 157, 109, 32, 8 + GROUPBOX "Śledzenie zdarzeń zamknięcia systemu", IDC_STATIC, 14, 125, 243, 120 + LTEXT "Powód:", IDC_STATIC, 21, 157, 27, 8 + CHECKBOX "Planowane", IDC_PLANNED, 196, 155, 51, 10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_REASON_CODE, 21, 168, 226, 105, WS_TABSTOP | CBS_DROPDOWN + LTEXT "Ko&mentarz:", IDC_COMMENT_CAPTION, 21, 205, 226, 8 + EDITTEXT IDC_COMMENT_TEXT, 21, 226, 216, 20, WS_VSCROLL END /* Information and error messages */

4 years, 8 months

[reactos] 01/01: [CHARMAP] Update Polish translation (#2555)

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=864271120d10e7182c4b6… commit 864271120d10e7182c4b668de3de28e3793f91fc Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Thu Apr 16 21:47:51 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 16 21:47:51 2020 +0200 [CHARMAP] Update Polish translation (#2555) --- base/applications/charmap/lang/pl-PL.rc | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/base/applications/charmap/lang/pl-PL.rc b/base/applications/charmap/lang/pl-PL.rc index f16fe535687..cba1a4abad9 100644 --- a/base/applications/charmap/lang/pl-PL.rc +++ b/base/applications/charmap/lang/pl-PL.rc @@ -4,40 +4,41 @@ * Updated by Olaf Siejka (May, 2011) * UTF-8 conversion by Caemyr (May, 2011) * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (August, 2011) + * Updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (April, 2020) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_CHARMAP DIALOGEX 6, 6, 292, 224 +IDD_CHARMAP DIALOGEX 6, 6, 294, 224 FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE BEGIN - LTEXT "Czci&onka:", IDC_STATIC, 6, 7, 28, 9 - COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | + LTEXT "Czci&onka:", IDC_STATIC, 7, 9, 32, 8 + COMBOBOX IDC_FONTCOMBO, 49, 7, 183, 60, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS - PUSHBUTTON "Pomo&c", IDC_CMHELP, 249, 5, 35, 13 + PUSHBUTTON "Pomo&c", IDC_CMHELP, 237, 7, 50, 14 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 - LTEXT "&Znaki do skopiowania:", IDC_STATIC, 6, 188, 70, 9 + LTEXT "&Znaki do skopiowania:", IDC_STATIC, 7, 190, 62, 17 CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | - WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 - DEFPUSHBUTTON "Wy&bierz", IDC_SELECT, 194, 186, 44, 13 - PUSHBUTTON "&Kopiuj", IDC_COPY, 242, 186, 44, 13, WS_DISABLED + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 76, 190, 103, 16 + DEFPUSHBUTTON "Wy&bierz", IDC_SELECT, 183, 190, 50, 14 + PUSHBUTTON "&Kopiuj", IDC_COPY, 237, 190, 50, 14, WS_DISABLED CONTROL "Widok zaawansowany", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX | - WS_TABSTOP, 8, 208, 95, 10 + WS_TABSTOP, 8, 210, 87, 10 END IDD_ADVANCED DIALOGEX 0, 0, 292, 64 STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Zestaw znaków:", IDC_STATIC, 8, 8, 53, 8 - COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Grupowanie według:", IDC_STATIC, 8, 28, 67, 8 - COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Szukaj", IDC_BUTTON_SEARCH, 200, 44, 50, 14 - EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL - LTEXT "Wyszukaj:", IDC_STATIC, 8, 48, 42, 8 + LTEXT "Zestaw znaków:", IDC_STATIC, 7, 8, 53, 8 + COMBOBOX IDC_COMBO_CHARSET, 76, 4, 103, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Grupowanie według:", IDC_STATIC, 7, 28, 67, 8 + COMBOBOX IDC_COMBO_GROUPBY, 76, 24, 103, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Wyszukaj", IDC_BUTTON_SEARCH, 183, 44, 50, 14 + EDITTEXT IDC_EDIT_SEARCH, 76, 44, 103, 14, ES_AUTOHSCROLL + LTEXT "Wyszukaj:", IDC_STATIC, 7, 48, 42, 8 LTEXT "Symbol Unicode:", IDC_STATIC, 200, 8, 30, 8 EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL END

4 years, 8 months

← Newer
1
...
20
21
22
23
24
25
26
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2020