Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [COMDLG32] Save open/save location by extension (#1514)
by Katayama Hirofumi MZ 27 Apr '19

27 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a7d8112c368926a7a9a8… commit 6a7d8112c368926a7a9a8b246bf36b7617947a66 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 27 23:02:34 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 27 23:02:34 2019 +0900 [COMDLG32] Save open/save location by extension (#1514) Use the proper open/save initial folder for comdlg32.GetOpenFileName and comdlg32.GetSaveFileName. CORE-7114 --- dll/win32/comdlg32/filedlg.c | 267 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 267 insertions(+) diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index e3d6c284e2..eed9f59ded 100644 --- a/dll/win32/comdlg32/filedlg.c +++ b/dll/win32/comdlg32/filedlg.c @@ -211,6 +211,10 @@ static void FILEDLG95_LOOKIN_Clean(HWND hwnd); static void FILEDLG95_MRU_load_filename(LPWSTR stored_path); static WCHAR FILEDLG95_MRU_get_slot(LPCWSTR module_name, LPWSTR stored_path, PHKEY hkey_ret); static void FILEDLG95_MRU_save_filename(LPCWSTR filename); +#ifdef __REACTOS__ +static void FILEDLG95_MRU_load_ext(LPWSTR stored_path, size_t cchMax, LPCWSTR defext); +static void FILEDLG95_MRU_save_ext(LPCWSTR filename); +#endif /* Miscellaneous tool functions */ static HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPWSTR lpstrFileName); @@ -1754,6 +1758,26 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) } } +#ifdef __REACTOS__ + if (!handledPath && (!fodInfos->initdir || !*fodInfos->initdir)) + { + /* 2.5. Win2000+: Recently used defext */ + if (win2000plus) { + fodInfos->initdir = heap_alloc(MAX_PATH * sizeof(WCHAR)); + fodInfos->initdir[0] = '\0'; + + FILEDLG95_MRU_load_ext(fodInfos->initdir, MAX_PATH, fodInfos->defext); + + if (fodInfos->initdir[0] && PathIsDirectoryW(fodInfos->initdir)) { + handledPath = TRUE; + } else { + heap_free(fodInfos->initdir); + fodInfos->initdir = NULL; + } + } + } +#endif + if (!handledPath && (!fodInfos->initdir || !*fodInfos->initdir)) { /* 3. All except w2k+: if filename contains a path use it */ @@ -2457,6 +2481,246 @@ static void FILEDLG95_MRU_load_filename(LPWSTR stored_path) FILEDLG95_MRU_get_slot(module_name, stored_path, NULL); TRACE("got MRU path: %s\n", wine_dbgstr_w(stored_path)); } +#ifdef __REACTOS__ +static const WCHAR s_subkey[] = +{ + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s', + 'i','o','n','\\','E','x','p','l','o','r','e','r','\\','C','o','m','D','l','g', + '3','2','\\','O','p','e','n','S','a','v','e','M','R','U',0 +}; +static const WCHAR s_szAst[] = { '*', 0 }; + +typedef INT (CALLBACK *MRUStringCmpFnW)(LPCWSTR lhs, LPCWSTR rhs); +typedef INT (CALLBACK *MRUBinaryCmpFn)(LPCVOID lhs, LPCVOID rhs, DWORD length); + +/* https://docs.microsoft.com/en-us/windows/desktop/shell/mruinfo */ +typedef struct tagMRUINFOW +{ + DWORD cbSize; + UINT uMax; + UINT fFlags; + HKEY hKey; + LPCWSTR lpszSubKey; + union + { + MRUStringCmpFnW string_cmpfn; + MRUBinaryCmpFn binary_cmpfn; + } u; +} MRUINFOW, *LPMRUINFOW; + +/* flags for MRUINFOW.fFlags */ +#define MRU_STRING 0x0000 +#define MRU_BINARY 0x0001 +#define MRU_CACHEWRITE 0x0002 + +static HINSTANCE s_hComCtl32 = NULL; + +/* comctl32.400: CreateMRUListW */ +typedef HANDLE (WINAPI *CREATEMRULISTW)(const MRUINFOW *); +static CREATEMRULISTW s_pCreateMRUListW = NULL; + +/* comctl32.401: AddMRUStringW */ +typedef INT (WINAPI *ADDMRUSTRINGW)(HANDLE, LPCWSTR); +static ADDMRUSTRINGW s_pAddMRUStringW = NULL; + +/* comctl32.402: FindMRUStringW */ +typedef INT (WINAPI *FINDMRUSTRINGW)(HANDLE, LPCWSTR, LPINT); +static FINDMRUSTRINGW s_pFindMRUStringW = NULL; + +/* comctl32.403: EnumMRUListW */ +typedef INT (WINAPI *ENUMMRULISTW)(HANDLE, INT, LPVOID, DWORD); +static ENUMMRULISTW s_pEnumMRUListW = NULL; + +/* comctl32.152: FreeMRUList */ +typedef void (WINAPI *FREEMRULIST)(HANDLE); +static FREEMRULIST s_pFreeMRUList = NULL; + +static BOOL FILEDLG_InitMRUList(void) +{ + if (s_hComCtl32) + return TRUE; + + s_hComCtl32 = GetModuleHandleA("comctl32"); + if (!s_hComCtl32) + return FALSE; + + s_pCreateMRUListW = (CREATEMRULISTW)GetProcAddress(s_hComCtl32, (LPCSTR)400); + s_pAddMRUStringW = (ADDMRUSTRINGW)GetProcAddress(s_hComCtl32, (LPCSTR)401); + s_pFindMRUStringW = (FINDMRUSTRINGW)GetProcAddress(s_hComCtl32, (LPCSTR)402); + s_pEnumMRUListW = (ENUMMRULISTW)GetProcAddress(s_hComCtl32, (LPCSTR)403); + s_pFreeMRUList = (FREEMRULIST)GetProcAddress(s_hComCtl32, (LPCSTR)152); + if (!s_pCreateMRUListW || + !s_pAddMRUStringW || + !s_pFindMRUStringW || + !s_pEnumMRUListW || + !s_pFreeMRUList) + { + s_hComCtl32 = NULL; + return FALSE; + } + + return TRUE; +} + +static BOOL ExtIsPicture(LPCWSTR ext) +{ + static const WCHAR s_image_exts[][6] = + { + { 'b','m','p',0 }, + { 'd','i','b',0 }, + { 'j','p','g',0 }, + { 'j','p','e','g',0 }, + { 'j','p','e',0 }, + { 'j','f','i','f',0 }, + { 'p','n','g',0 }, + { 'g','i','f',0 }, + { 't','i','f',0 }, + { 't','i','f','f',0 } + }; + size_t i; + + for (i = 0; i < ARRAY_SIZE(s_image_exts); ++i) + { + if (lstrcmpiW(ext, s_image_exts[i]) == 0) + { + return TRUE; + } + } + return FALSE; +} + +static void FILEDLG95_MRU_load_ext(LPWSTR stored_path, size_t cchMax, LPCWSTR defext) +{ + HKEY hOpenSaveMRT = NULL; + LONG result; + MRUINFOW mi; + HANDLE hList; + WCHAR szText[MAX_PATH]; + INT ret = 0; + + stored_path[0] = 0; + + if (!defext || !*defext || !FILEDLG_InitMRUList()) + { + return; + } + + if (*defext == '.') + ++defext; + + result = RegOpenKeyW(HKEY_CURRENT_USER, s_subkey, &hOpenSaveMRT); + if (!result && hOpenSaveMRT) + { + ZeroMemory(&mi, sizeof(mi)); + mi.cbSize = sizeof(mi); + mi.uMax = 26; + mi.fFlags = MRU_STRING; + mi.hKey = hOpenSaveMRT; + mi.lpszSubKey = defext; + mi.u.string_cmpfn = lstrcmpiW; + hList = (*s_pCreateMRUListW)(&mi); + if (hList) + { + ret = (*s_pEnumMRUListW)(hList, 0, szText, sizeof(szText)); + if (ret > 0) + { + lstrcpynW(stored_path, szText, cchMax); + PathRemoveFileSpecW(stored_path); + } + (*s_pFreeMRUList)(hList); + } + + if (stored_path[0] == 0) + { + mi.cbSize = sizeof(mi); + mi.uMax = 26; + mi.fFlags = MRU_STRING; + mi.hKey = hOpenSaveMRT; + mi.lpszSubKey = s_szAst; + mi.u.string_cmpfn = lstrcmpiW; + hList = (*s_pCreateMRUListW)(&mi); + if (hList) + { + ret = (*s_pEnumMRUListW)(hList, 0, szText, sizeof(szText)); + if (ret > 0) + { + lstrcpynW(stored_path, szText, cchMax); + PathRemoveFileSpecW(stored_path); + } + (*s_pFreeMRUList)(hList); + } + } + + RegCloseKey(hOpenSaveMRT); + } + + if (stored_path[0] == 0) + { + LPITEMIDLIST pidl; + if (ExtIsPicture(defext)) + { + SHGetSpecialFolderLocation(NULL, CSIDL_MYPICTURES, &pidl); + } + else + { + SHGetSpecialFolderLocation(NULL, CSIDL_MYDOCUMENTS, &pidl); + } + SHGetPathFromIDListW(pidl, stored_path); + ILFree(pidl); + } +} + +static void FILEDLG95_MRU_save_ext(LPCWSTR filename) +{ + HKEY hOpenSaveMRT = NULL; + LONG result; + MRUINFOW mi; + HANDLE hList; + LPCWSTR defext = PathFindExtensionW(filename); + + if (!defext || !*defext || !FILEDLG_InitMRUList()) + { + return; + } + + if (*defext == '.') + ++defext; + + result = RegOpenKeyW(HKEY_CURRENT_USER, s_subkey, &hOpenSaveMRT); + if (!result && hOpenSaveMRT) + { + ZeroMemory(&mi, sizeof(mi)); + mi.cbSize = sizeof(mi); + mi.uMax = 26; + mi.fFlags = MRU_STRING; + mi.hKey = hOpenSaveMRT; + mi.lpszSubKey = defext; + mi.u.string_cmpfn = lstrcmpiW; + hList = (*s_pCreateMRUListW)(&mi); + if (hList) + { + (*s_pAddMRUStringW)(hList, filename); + (*s_pFreeMRUList)(hList); + } + + mi.cbSize = sizeof(mi); + mi.uMax = 26; + mi.fFlags = MRU_STRING; + mi.hKey = hOpenSaveMRT; + mi.lpszSubKey = s_szAst; + mi.u.string_cmpfn = lstrcmpiW; + hList = (*s_pCreateMRUListW)(&mi); + if (hList) + { + (*s_pAddMRUStringW)(hList, filename); + (*s_pFreeMRUList)(hList); + } + + RegCloseKey(hOpenSaveMRT); + } +} +#endif void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) { @@ -2930,6 +3194,9 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) goto ret; FILEDLG95_MRU_save_filename(lpstrPathAndFile); +#ifdef __REACTOS__ + FILEDLG95_MRU_save_ext(lpstrPathAndFile); +#endif TRACE("close\n"); FILEDLG95_Clean(hwnd);

1 0

[reactos] 01/01: [SDK][INCLUDE] Use FALSE for BOOL in msgdump.h
by Katayama Hirofumi MZ 27 Apr '19

27 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cc2169556503252e1884… commit 3cc2169556503252e188447b230f381287dd1138 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 27 22:06:37 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Apr 27 22:06:37 2019 +0900 [SDK][INCLUDE] Use FALSE for BOOL in msgdump.h --- sdk/include/reactos/msgdump.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h index 5d476024cb..209ce545fe 100644 --- a/sdk/include/reactos/msgdump.h +++ b/sdk/include/reactos/msgdump.h @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2018 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #ifndef _INC_MSGDUMP -#define _INC_MSGDUMP 3 /* Version 3 */ +#define _INC_MSGDUMP 4 /* Version 4 */ /* * NOTE: MD_msgdump function in this file provides Win32API message dump feature. @@ -1791,7 +1791,7 @@ MD_Edit_OnSetReadOnly(HWND hwnd, BOOL fReadOnly) { MSGDUMP_TPRINTF(TEXT("%sEM_SETREADONLY(hwnd:%p, fReadOnly:%d)\n"), MSGDUMP_PREFIX, (void *)hwnd, fReadOnly); - return 0; + return FALSE; } static __inline void MSGDUMP_API @@ -2399,7 +2399,7 @@ MD_ComboBox_OnShowDropDown(HWND hwnd, BOOL fShow) { MSGDUMP_TPRINTF(TEXT("%sCB_SHOWDROPDOWN(hwnd:%p, fShow:%d)\n"), MSGDUMP_PREFIX, (void *)hwnd, fShow); - return 0; + return FALSE; } static __inline INT_PTR MSGDUMP_API @@ -2608,7 +2608,7 @@ MD_ScrollBar_OnGetScrollInfo(HWND hwnd, LPSCROLLINFO lpsi) { MSGDUMP_TPRINTF(TEXT("%sSBM_GETSCROLLINFO(hwnd:%p, lpsi:%p)\n"), MSGDUMP_PREFIX, (void *)hwnd, (void *)lpsi); - return 0; + return FALSE; } static __inline BOOL MSGDUMP_API @@ -2616,7 +2616,7 @@ MD_ScrollBar_OnGetScrollBarInfo(HWND hwnd, LPSCROLLBARINFO lpsbi) { MSGDUMP_TPRINTF(TEXT("%sSBM_GETSCROLLBARINFO(hwnd:%p, lpsbi:%p)\n"), MSGDUMP_PREFIX, (void *)hwnd, (void *)lpsbi); - return 0; + return FALSE; } static __inline LRESULT MSGDUMP_API

1 0

[reactos] 01/01: [CMAKE] Fix LINK_DEPENDS usage
by Timo Kreuzer 27 Apr '19

27 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fad4b34db7b61af39bf0f… commit fad4b34db7b61af39bf0f0efac624c6e0d5cda19 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Apr 27 11:26:03 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Apr 27 14:29:33 2019 +0200 [CMAKE] Fix LINK_DEPENDS usage Up to CMake 3.3 LINK_DEPENDS was ignored in non-Makefile generators. See also http://www.cmake.org/pipermail/cmake/2010-May/037206.html. Since CMake 3.4 it is no longer ignored, but requires CMP0005 policy to be set to NEW and it requires a full path which was already correctly used on GCC, but not on MSVC builds. --- sdk/cmake/gcc.cmake | 3 --- sdk/cmake/msvc.cmake | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 220e868067..71971f2b6f 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -467,8 +467,5 @@ endmacro() function(add_linker_script _target _linker_script_file) get_filename_component(_file_full_path ${_linker_script_file} ABSOLUTE) add_target_link_flags(${_target} "-Wl,-T,${_file_full_path}") - - # Unfortunately LINK_DEPENDS is ignored in non-Makefile generators (for now...) - # See also http://www.cmake.org/pipermail/cmake/2010-May/037206.html add_target_property(${_target} LINK_DEPENDS ${_file_full_path}) endfunction() diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index e3319a1eee..f7dc1544ce 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -612,9 +612,6 @@ function(add_linker_script _target _linker_script_file) # add_custom_target("${_target}_${_file_name}" ALL DEPENDS ${_generated_file}) # add_dependencies(${_target} "${_target}_${_file_name}") add_target_link_flags(${_target} "@${_generated_file}") - - # Unfortunately LINK_DEPENDS is ignored in non-Makefile generators (for now...) - # See also http://www.cmake.org/pipermail/cmake/2010-May/037206.html - add_target_property(${_target} LINK_DEPENDS ${_generated_file}) + add_target_property(${_target} LINK_DEPENDS ${_file_full_path}) endif() endfunction()

1 0

[reactos] 01/01: [CMAKE] Use new policies for CMP0005 and CMP0018 (#1481)
by Andrew Cook 27 Apr '19

27 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=716613cddc8039eff5f09… commit 716613cddc8039eff5f095051dc9a79727a25e73 Author: Andrew Cook <ariscop(a)gmail.com> AuthorDate: Sat Apr 27 19:33:37 2019 +1000 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Apr 27 11:33:37 2019 +0200 [CMAKE] Use new policies for CMP0005 and CMP0018 (#1481) * [CMAKE] Fix for CMP0018 The new behaviour lets us explicitly disabling position independent code, avoiding the need to change undocumented variables * LINK_DEPENDS is semicolon separated * [CMAKE] Fix for CMP0005 it seems impossible to have cmake correct escape PROXY_CLSID_IS so move it to the header --- CMakeLists.txt | 11 +++-------- dll/win32/urlmon/CMakeLists.txt | 3 +-- dll/win32/urlmon/urlmon_main.h | 4 ++++ sdk/cmake/compilerflags.cmake | 2 +- sdk/cmake/gcc.cmake | 12 ------------ 5 files changed, 9 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b66140da1..48b3b18a48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,12 +6,6 @@ if(NOT CMAKE_VERSION MATCHES "ReactOS") message(WARNING "Building with \"${CMAKE_COMMAND}\", which is not the custom CMake included in RosBE, might cause build issues...") endif() -# Don't escape preprocessor definition values added via add_definitions -cmake_policy(SET CMP0005 OLD) - -# Honor CMAKE_SHARED_LIBRARY_<Lang>_FLAGS variable. -cmake_policy(SET CMP0018 OLD) - if(POLICY CMP0058) # Ninja requires custom command byproducts to be explicit cmake_policy(SET CMP0058 OLD) @@ -34,6 +28,7 @@ set(CMAKE_SHARED_MODULE_PREFIX "") set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE) set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) set(CMAKE_COLOR_MAKEFILE OFF) +set(CMAKE_POSITION_INDEPENDENT_CODE OFF) #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) if(NOT DEFINED NEW_STYLE_BUILD) @@ -65,8 +60,8 @@ include(sdk/cmake/compilerflags.cmake) add_definitions(-D__REACTOS__) # Double escape, since CMake unescapes before putting it on the command-line, where it's unescaped again by GCC/CL. -add_definitions(-DREACTOS_SOURCE_DIR="\\\"${REACTOS_SOURCE_DIR}\\\"") -add_definitions(-DREACTOS_BINARY_DIR="\\\"${REACTOS_BINARY_DIR}\\\"") +add_definitions(-DREACTOS_SOURCE_DIR="${REACTOS_SOURCE_DIR}") +add_definitions(-DREACTOS_BINARY_DIR="${REACTOS_BINARY_DIR}") # There doesn't seem to be a standard for __FILE__ being relative or absolute, so detect it at runtime. file(RELATIVE_PATH _PATH_PREFIX ${REACTOS_BINARY_DIR} ${REACTOS_SOURCE_DIR}) diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt index 6c7938ff35..ef9c5377ab 100644 --- a/dll/win32/urlmon/CMakeLists.txt +++ b/dll/win32/urlmon/CMakeLists.txt @@ -4,8 +4,7 @@ add_definitions( -D_URLMON_ -DENTRY_PREFIX=URLMON_ -DPROXY_DELEGATION - -DWINE_REGISTER_DLL - -DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}") + -DWINE_REGISTER_DLL) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(urlmon.dll urlmon.spec ADD_IMPORTLIB) diff --git a/dll/win32/urlmon/urlmon_main.h b/dll/win32/urlmon/urlmon_main.h index 39dbe2f572..e28b351cb3 100644 --- a/dll/win32/urlmon/urlmon_main.h +++ b/dll/win32/urlmon/urlmon_main.h @@ -24,6 +24,10 @@ #define COBJMACROS +#ifdef __REACTOS__ +#define PROXY_CLSID_IS {0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}} +#endif + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/sdk/cmake/compilerflags.cmake b/sdk/cmake/compilerflags.cmake index 3928b793f3..669a4ff1df 100644 --- a/sdk/cmake/compilerflags.cmake +++ b/sdk/cmake/compilerflags.cmake @@ -5,7 +5,7 @@ # while others require space-separated strings. The function has a list of # properties of the former variety and handles the values accordingly function(add_target_property _module _propname) - list(APPEND _list_properties COMPILE_DEFINITIONS INCLUDE_DIRECTORIES) + list(APPEND _list_properties COMPILE_DEFINITIONS INCLUDE_DIRECTORIES LINK_DEPENDS) set(_newvalue "") get_target_property(_oldvalue ${_module} ${_propname}) if(_oldvalue) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 8ecc06b710..220e868067 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -61,10 +61,6 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang") set(CMAKE_CXX_COMPILE_OPTIONS_PIC "") set(CMAKE_C_COMPILE_OPTIONS_PIE "") set(CMAKE_CXX_COMPILE_OPTIONS_PIE "") - set(CMAKE_SHARED_LIBRARY_C_FLAGS "") - set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "") - set(CMAKE_SHARED_MODULE_C_FLAGS "") - set(CMAKE_SHARED_MODULE_CXX_FLAGS "") set(CMAKE_ASM_FLAGS_DEBUG "") set(CMAKE_C_FLAGS_DEBUG "") set(CMAKE_CXX_FLAGS_DEBUG "") @@ -103,14 +99,6 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Release") endif() endif() -# For some reason, cmake sets -fPIC, and we don't want it -if(DEFINED CMAKE_SHARED_LIBRARY_ASM_FLAGS) - string(REPLACE "-fPIC" "" CMAKE_SHARED_LIBRARY_ASM_FLAGS ${CMAKE_SHARED_LIBRARY_ASM_FLAGS}) -endif() -if(DEFINED CMAKE_SHARED_MODULE_ASM_FLAGS) - string(REPLACE "-fPIC" "" CMAKE_SHARED_MODULE_ASM_FLAGS ${CMAKE_SHARED_MODULE_ASM_FLAGS}) -endif() - # Tuning if(ARCH STREQUAL "i386") add_compile_flags("-march=${OARCH} -mtune=${TUNE}")

1 0

[reactos] 01/01: [SDK][INCLUDE] small fix for msgdump.h
by Katayama Hirofumi MZ 27 Apr '19

27 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3af58ea993a76c2bbaf53… commit 3af58ea993a76c2bbaf532b318238f761c0b0fe8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 27 18:30:29 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Apr 27 18:30:29 2019 +0900 [SDK][INCLUDE] small fix for msgdump.h --- sdk/include/reactos/msgdump.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h index f69fd4a68d..5d476024cb 100644 --- a/sdk/include/reactos/msgdump.h +++ b/sdk/include/reactos/msgdump.h @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2018 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #ifndef _INC_MSGDUMP -#define _INC_MSGDUMP 2 /* Version 2 */ +#define _INC_MSGDUMP 3 /* Version 3 */ /* * NOTE: MD_msgdump function in this file provides Win32API message dump feature. @@ -28,7 +28,7 @@ #endif #ifndef MSGDUMP_PREFIX - #define MSGDUMP_PREFIX "" + #define MSGDUMP_PREFIX TEXT("") #endif /* MD_msgdump function */ @@ -1620,6 +1620,7 @@ MD_Edit_OnScroll(HWND hwnd, INT nScroll) { MSGDUMP_TPRINTF(TEXT("%sEM_SCROLL(hwnd:%p, nScroll:%d)\n"), MSGDUMP_PREFIX, (void *)hwnd, nScroll); + return 0; } static __inline BOOL MSGDUMP_API @@ -1689,6 +1690,7 @@ MD_Edit_OnGetThumb(HWND hwnd) { MSGDUMP_TPRINTF(TEXT("%sEM_GETTHUMB(hwnd:%p)\n"), MSGDUMP_PREFIX, (void *)hwnd); + return 0; } static __inline INT MSGDUMP_API @@ -1789,6 +1791,7 @@ MD_Edit_OnSetReadOnly(HWND hwnd, BOOL fReadOnly) { MSGDUMP_TPRINTF(TEXT("%sEM_SETREADONLY(hwnd:%p, fReadOnly:%d)\n"), MSGDUMP_PREFIX, (void *)hwnd, fReadOnly); + return 0; } static __inline void MSGDUMP_API @@ -2349,6 +2352,7 @@ MD_ComboBox_OnInsertString(HWND hwnd, INT index, LPCTSTR lpsz) else MSGDUMP_TPRINTF(TEXT("%sCB_INSERTSTRING(hwnd:%p, index:%d, lpsz:%hs)\n"), MSGDUMP_PREFIX, (void *)hwnd, index, (LPCSTR)lpsz); + return 0; } static __inline void MSGDUMP_API

1 0

[reactos] 01/01: [WIN32SS][NTGDI] Use UNICODE_NULL for consistency
by Katayama Hirofumi MZ 27 Apr '19

27 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=39312ba688ab7a78c4470… commit 39312ba688ab7a78c4470fa1c72e0efedae0f15f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 27 16:17:37 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Apr 27 16:17:37 2019 +0900 [WIN32SS][NTGDI] Use UNICODE_NULL for consistency --- win32ss/gdi/ntgdi/freetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 18f9ef9f74..7d19d159f8 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -2822,7 +2822,7 @@ GetFontFamilyInfoForSubstitutes(const LOGFONTW *LogFont, &Win32Process->PrivateFontListHead); IntUnLockProcessPrivateFonts(Win32Process); - if (LogFont->lfFaceName[0]) + if (LogFont->lfFaceName[0] != UNICODE_NULL) { /* it's already matched to the exact name and charset if the name was specified at here, then so don't scan more for another name */ @@ -4487,7 +4487,7 @@ GetFontPenalty(const LOGFONTW * LogFont, ActualNameW = (WCHAR*)((ULONG_PTR)Otm + (ULONG_PTR)Otm->otmpFamilyName); - if (LogFont->lfFaceName[0]) + if (LogFont->lfFaceName[0] != UNICODE_NULL) { BOOL Found = FALSE;

1 0

[reactos] 01/01: [WIN32SS][NTGDI] FireFox checkmark fix CORE-15303 (#1535)
by Katayama Hirofumi MZ 27 Apr '19

27 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19fc9415bfc811c6c0eef… commit 19fc9415bfc811c6c0eef197f72d8bdffcfedba2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 27 09:38:01 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 27 09:38:01 2019 +0900 [WIN32SS][NTGDI] FireFox checkmark fix CORE-15303 (#1535) The font size was a bit larger than expected. FireFox will show checkmarks correctly in View menu. CORE-15303 --- win32ss/gdi/ntgdi/freetype.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index ae6feb006a..18f9ef9f74 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -3312,10 +3312,7 @@ IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight) FontGDI->EmHeight = min(FontGDI->EmHeight, USHORT_MAX); FontGDI->Magic = FONTGDI_MAGIC; - if (lfHeight > 0) - EmHeight64 = (FontGDI->EmHeight << 6) + 31; - else - EmHeight64 = (FontGDI->EmHeight << 6); + EmHeight64 = (FontGDI->EmHeight << 6); req.type = FT_SIZE_REQUEST_TYPE_NOMINAL; req.width = 0;

1 0

[reactos] 01/01: [POWERCFG] Show the name of the power scheme in the delete confirmation message box
by Eric Kohl 26 Apr '19

26 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a24e9799ea3060a4118d… commit 9a24e9799ea3060a4118d5eadb37b0c3f60826da Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Apr 26 23:12:36 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Apr 26 23:12:36 2019 +0200 [POWERCFG] Show the name of the power scheme in the delete confirmation message box --- dll/cpl/powercfg/lang/bg-BG.rc | 2 +- dll/cpl/powercfg/lang/cs-CZ.rc | 2 +- dll/cpl/powercfg/lang/de-DE.rc | 2 +- dll/cpl/powercfg/lang/el-GR.rc | 2 +- dll/cpl/powercfg/lang/en-US.rc | 2 +- dll/cpl/powercfg/lang/es-ES.rc | 2 +- dll/cpl/powercfg/lang/fr-FR.rc | 2 +- dll/cpl/powercfg/lang/he-IL.rc | 2 +- dll/cpl/powercfg/lang/id-ID.rc | 2 +- dll/cpl/powercfg/lang/it-IT.rc | 2 +- dll/cpl/powercfg/lang/ja-JP.rc | 2 +- dll/cpl/powercfg/lang/nl-NL.rc | 2 +- dll/cpl/powercfg/lang/no-NO.rc | 2 +- dll/cpl/powercfg/lang/pl-PL.rc | 2 +- dll/cpl/powercfg/lang/ro-RO.rc | 2 +- dll/cpl/powercfg/lang/ru-RU.rc | 2 +- dll/cpl/powercfg/lang/sk-SK.rc | 2 +- dll/cpl/powercfg/lang/sq-AL.rc | 2 +- dll/cpl/powercfg/lang/th-TH.rc | 2 +- dll/cpl/powercfg/lang/tr-TR.rc | 2 +- dll/cpl/powercfg/lang/uk-UA.rc | 2 +- dll/cpl/powercfg/lang/zh-CN.rc | 2 +- dll/cpl/powercfg/lang/zh-TW.rc | 6 +++--- dll/cpl/powercfg/powercfg.h | 1 + dll/cpl/powercfg/powershemes.c | 10 ++++++---- 25 files changed, 32 insertions(+), 29 deletions(-) diff --git a/dll/cpl/powercfg/lang/bg-BG.rc b/dll/cpl/powercfg/lang/bg-BG.rc index ae60c96ae0..08e2a23a79 100644 --- a/dll/cpl/powercfg/lang/bg-BG.rc +++ b/dll/cpl/powercfg/lang/bg-BG.rc @@ -136,6 +136,6 @@ BEGIN IDS_TIMEOUT14 "След 4 часа" IDS_TIMEOUT15 "След 5 часа" IDS_TIMEOUT16 "Никога" - IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme: ""%s""?" IDS_DEL_SCHEME_TITLE "Delete Scheme" END diff --git a/dll/cpl/powercfg/lang/cs-CZ.rc b/dll/cpl/powercfg/lang/cs-CZ.rc index b82dd59e7c..693691dd85 100644 --- a/dll/cpl/powercfg/lang/cs-CZ.rc +++ b/dll/cpl/powercfg/lang/cs-CZ.rc @@ -136,6 +136,6 @@ BEGIN IDS_TIMEOUT14 "Po 4 hodinách" IDS_TIMEOUT15 "Po 5 hodinách" IDS_TIMEOUT16 "Nikdy" - IDS_DEL_SCHEME "Opravdu si přejete smazat toto schéma napájení?" + IDS_DEL_SCHEME "Opravdu si přejete smazat toto schéma napájení: ""%s""?" IDS_DEL_SCHEME_TITLE "Smazat schéma" END diff --git a/dll/cpl/powercfg/lang/de-DE.rc b/dll/cpl/powercfg/lang/de-DE.rc index 048e176f30..e39538f5ce 100644 --- a/dll/cpl/powercfg/lang/de-DE.rc +++ b/dll/cpl/powercfg/lang/de-DE.rc @@ -138,6 +138,6 @@ BEGIN IDS_TIMEOUT14 "Nach 4 Stunden" IDS_TIMEOUT15 "Nach 5 Stunden" IDS_TIMEOUT16 "Nie" - IDS_DEL_SCHEME "Sind Sie sich sicher, dass Sie das Energieschema löschen wollen?" + IDS_DEL_SCHEME "Soll folgendes Energieschema gelöscht werden: ""%s""?" IDS_DEL_SCHEME_TITLE "Schema löschen" END diff --git a/dll/cpl/powercfg/lang/el-GR.rc b/dll/cpl/powercfg/lang/el-GR.rc index c82db41027..5db1535555 100644 --- a/dll/cpl/powercfg/lang/el-GR.rc +++ b/dll/cpl/powercfg/lang/el-GR.rc @@ -138,6 +138,6 @@ BEGIN IDS_TIMEOUT14 "σε 4 ώρες" IDS_TIMEOUT15 "σε 5 ώρες" IDS_TIMEOUT16 "Ποτέ" - IDS_DEL_SCHEME "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτόν τον συνδιασμό τροφοδοσίας;" + IDS_DEL_SCHEME "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτόν τον συνδιασμό τροφοδοσίας: ""%s""" IDS_DEL_SCHEME_TITLE "Διαγραφή συνδιασμού" END diff --git a/dll/cpl/powercfg/lang/en-US.rc b/dll/cpl/powercfg/lang/en-US.rc index 98787b8e04..3de63ad589 100644 --- a/dll/cpl/powercfg/lang/en-US.rc +++ b/dll/cpl/powercfg/lang/en-US.rc @@ -136,6 +136,6 @@ BEGIN IDS_TIMEOUT14 "After 4 hours" IDS_TIMEOUT15 "After 5 hours" IDS_TIMEOUT16 "Never" - IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme: ""%s""?" IDS_DEL_SCHEME_TITLE "Delete Scheme" END diff --git a/dll/cpl/powercfg/lang/es-ES.rc b/dll/cpl/powercfg/lang/es-ES.rc index 235cbb87b1..1ce2f75af3 100644 --- a/dll/cpl/powercfg/lang/es-ES.rc +++ b/dll/cpl/powercfg/lang/es-ES.rc @@ -138,6 +138,6 @@ BEGIN IDS_TIMEOUT14 "Tras 4 horas" IDS_TIMEOUT15 "Tras 5 horas" IDS_TIMEOUT16 "Nunca" - IDS_DEL_SCHEME "¿Está seguro de que desea eliminar la combinación de energía?" + IDS_DEL_SCHEME "¿Está seguro de que desea eliminar la combinación de energía: ""%s""?" IDS_DEL_SCHEME_TITLE "Eliminar combinación" END diff --git a/dll/cpl/powercfg/lang/fr-FR.rc b/dll/cpl/powercfg/lang/fr-FR.rc index cd4cee33ff..cd2b5be88f 100644 --- a/dll/cpl/powercfg/lang/fr-FR.rc +++ b/dll/cpl/powercfg/lang/fr-FR.rc @@ -138,6 +138,6 @@ BEGIN IDS_TIMEOUT14 "Après 4 heures" IDS_TIMEOUT15 "Après 5 heures" IDS_TIMEOUT16 "Jamais" - IDS_DEL_SCHEME "Êtes-vous sûr de vouloir supprimer le profil d'alimentation ?" + IDS_DEL_SCHEME "Êtes-vous sûr de vouloir supprimer le profil d'alimentation: ""%s"" ?" IDS_DEL_SCHEME_TITLE "Supprimer le profil" END diff --git a/dll/cpl/powercfg/lang/he-IL.rc b/dll/cpl/powercfg/lang/he-IL.rc index bc19075558..6fbce224fb 100644 --- a/dll/cpl/powercfg/lang/he-IL.rc +++ b/dll/cpl/powercfg/lang/he-IL.rc @@ -138,6 +138,6 @@ BEGIN IDS_TIMEOUT14 "אחרי 4 שעות" IDS_TIMEOUT15 "אחרי 5 דקות" IDS_TIMEOUT16 "אף פעם" - IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme: ""%s""?" IDS_DEL_SCHEME_TITLE "מחק ערכה" END diff --git a/dll/cpl/powercfg/lang/id-ID.rc b/dll/cpl/powercfg/lang/id-ID.rc index 9d3a6008e4..f5f1718d1a 100644 --- a/dll/cpl/powercfg/lang/id-ID.rc +++ b/dll/cpl/powercfg/lang/id-ID.rc @@ -138,6 +138,6 @@ BEGIN IDS_TIMEOUT14 "Setelah 4 jam" IDS_TIMEOUT15 "Setelah 5 jam" IDS_TIMEOUT16 "Tidak pernah" - IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme: ""%s""?" IDS_DEL_SCHEME_TITLE "Delete Scheme" END diff --git a/dll/cpl/powercfg/lang/it-IT.rc b/dll/cpl/powercfg/lang/it-IT.rc index c83c60afb7..be2159ea7f 100644 --- a/dll/cpl/powercfg/lang/it-IT.rc +++ b/dll/cpl/powercfg/lang/it-IT.rc @@ -136,6 +136,6 @@ BEGIN IDS_TIMEOUT14 "Dopo 4 ore" IDS_TIMEOUT15 "Dopo 5 ore" IDS_TIMEOUT16 "Mai" - IDS_DEL_SCHEME "Siete sicuro di voler cancellare lo schema?" + IDS_DEL_SCHEME "Siete sicuro di voler cancellare lo schema: ""%s""?" IDS_DEL_SCHEME_TITLE "Cancellazione schema" END diff --git a/dll/cpl/powercfg/lang/ja-JP.rc b/dll/cpl/powercfg/lang/ja-JP.rc index f866df9a20..51fd7a89ac 100644 --- a/dll/cpl/powercfg/lang/ja-JP.rc +++ b/dll/cpl/powercfg/lang/ja-JP.rc @@ -138,6 +138,6 @@ BEGIN IDS_TIMEOUT14 "4 時間後" IDS_TIMEOUT15 "5 時間後" IDS_TIMEOUT16 "なし" - IDS_DEL_SCHEME "この電源設定を削除しますか?" + IDS_DEL_SCHEME "この電源設定を削除しますか: ""%s""?" IDS_DEL_SCHEME_TITLE "電源設定の削除" END diff --git a/dll/cpl/powercfg/lang/nl-NL.rc b/dll/cpl/powercfg/lang/nl-NL.rc index 474b01ca92..7795ae4ac6 100644 --- a/dll/cpl/powercfg/lang/nl-NL.rc +++ b/dll/cpl/powercfg/lang/nl-NL.rc @@ -136,6 +136,6 @@ BEGIN IDS_TIMEOUT14 "Na 4 uur" IDS_TIMEOUT15 "Na 5 uur" IDS_TIMEOUT16 "Nooit" - IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme: ""%s""?" IDS_DEL_SCHEME_TITLE "Delete Scheme" END diff --git a/dll/cpl/powercfg/lang/no-NO.rc b/dll/cpl/powercfg/lang/no-NO.rc index f1bcc58a49..e2b03d65b4 100644 --- a/dll/cpl/powercfg/lang/no-NO.rc +++ b/dll/cpl/powercfg/lang/no-NO.rc @@ -138,6 +138,6 @@ BEGIN IDS_TIMEOUT14 "Etter 4 timer" IDS_TIMEOUT15 "Etter 5 timer" IDS_TIMEOUT16 "Aldri" - IDS_DEL_SCHEME "Er du sikker på at du vil slette strømplanen?" + IDS_DEL_SCHEME "Er du sikker på at du vil slette strømplanen: ""%s""?" IDS_DEL_SCHEME_TITLE "Slett planen" END diff --git a/dll/cpl/powercfg/lang/pl-PL.rc b/dll/cpl/powercfg/lang/pl-PL.rc index 7d62650f5b..99f7fa8be3 100644 --- a/dll/cpl/powercfg/lang/pl-PL.rc +++ b/dll/cpl/powercfg/lang/pl-PL.rc @@ -144,6 +144,6 @@ BEGIN IDS_TIMEOUT14 "Po 4 godzinach" IDS_TIMEOUT15 "Po 5 godzinach" IDS_TIMEOUT16 "Nigdy" - IDS_DEL_SCHEME "Czy na pewno chcesz skasować schemat oszczędzania energii?" + IDS_DEL_SCHEME "Czy na pewno chcesz skasować schemat oszczędzania energii: ""%s""?" IDS_DEL_SCHEME_TITLE "Skasuj schemat" END diff --git a/dll/cpl/powercfg/lang/ro-RO.rc b/dll/cpl/powercfg/lang/ro-RO.rc index 96ddcc1b80..91d767fe02 100644 --- a/dll/cpl/powercfg/lang/ro-RO.rc +++ b/dll/cpl/powercfg/lang/ro-RO.rc @@ -141,6 +141,6 @@ BEGIN IDS_TIMEOUT14 "după 4 ore" IDS_TIMEOUT15 "după 5 ore" IDS_TIMEOUT16 "dezactivată" - IDS_DEL_SCHEME "Sigur doriți eliminarea aceastui regim de consum energetic?" + IDS_DEL_SCHEME "Sigur doriți eliminarea aceastui regim de consum energetic: ""%s""?" IDS_DEL_SCHEME_TITLE "Eliminarea regumului de consum" END diff --git a/dll/cpl/powercfg/lang/ru-RU.rc b/dll/cpl/powercfg/lang/ru-RU.rc index 135dbab350..2f33e3156b 100644 --- a/dll/cpl/powercfg/lang/ru-RU.rc +++ b/dll/cpl/powercfg/lang/ru-RU.rc @@ -138,6 +138,6 @@ BEGIN IDS_TIMEOUT14 "через 4 часа" IDS_TIMEOUT15 "через 5 часов" IDS_TIMEOUT16 "никогда" - IDS_DEL_SCHEME "Вы уверены, что хотите удалить схему питания?" + IDS_DEL_SCHEME "Вы уверены, что хотите удалить схему питания: ""%s""?" IDS_DEL_SCHEME_TITLE "Удалить Схему" END diff --git a/dll/cpl/powercfg/lang/sk-SK.rc b/dll/cpl/powercfg/lang/sk-SK.rc index 181f8c6115..1fad264770 100644 --- a/dll/cpl/powercfg/lang/sk-SK.rc +++ b/dll/cpl/powercfg/lang/sk-SK.rc @@ -144,6 +144,6 @@ BEGIN IDS_TIMEOUT14 "Po 4 hodinách" IDS_TIMEOUT15 "Po 5 hodinách" IDS_TIMEOUT16 "Nikdy" - IDS_DEL_SCHEME "Ste si istý, že chcete vymazať schému napájania?" + IDS_DEL_SCHEME "Ste si istý, že chcete vymazať schému napájania: ""%s""?" IDS_DEL_SCHEME_TITLE "Vymazať schému" END diff --git a/dll/cpl/powercfg/lang/sq-AL.rc b/dll/cpl/powercfg/lang/sq-AL.rc index 1c789f0e77..19cd847868 100644 --- a/dll/cpl/powercfg/lang/sq-AL.rc +++ b/dll/cpl/powercfg/lang/sq-AL.rc @@ -141,6 +141,6 @@ BEGIN IDS_TIMEOUT14 "Pas 4 hours" IDS_TIMEOUT15 "Pas 5 hours" IDS_TIMEOUT16 "Kurrë" - IDS_DEL_SCHEME "Jeni te sigurte qe doni te fshini skemën energjise?" + IDS_DEL_SCHEME "Jeni te sigurte qe doni te fshini skemën energjise: ""%s""?" IDS_DEL_SCHEME_TITLE "Fshij Skemen" END diff --git a/dll/cpl/powercfg/lang/th-TH.rc b/dll/cpl/powercfg/lang/th-TH.rc index f86dc26a45..7bed2d3467 100644 --- a/dll/cpl/powercfg/lang/th-TH.rc +++ b/dll/cpl/powercfg/lang/th-TH.rc @@ -136,6 +136,6 @@ BEGIN IDS_TIMEOUT14 "หลังจาก 4 ชั่วโมง" IDS_TIMEOUT15 "หลังจาก 5 ชั่วโมง" IDS_TIMEOUT16 "ไม่ตั้งค่า" - IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme: ""%s""?" IDS_DEL_SCHEME_TITLE "Delete Scheme" END diff --git a/dll/cpl/powercfg/lang/tr-TR.rc b/dll/cpl/powercfg/lang/tr-TR.rc index a83ffb64f9..bd6c81844f 100644 --- a/dll/cpl/powercfg/lang/tr-TR.rc +++ b/dll/cpl/powercfg/lang/tr-TR.rc @@ -138,6 +138,6 @@ BEGIN IDS_TIMEOUT14 "4 Saat Sonra" IDS_TIMEOUT15 "5 Saat Sonra" IDS_TIMEOUT16 "Hiçbir Zaman" - IDS_DEL_SCHEME "Güç düzenini silmek istediğinizden emin misiniz?" + IDS_DEL_SCHEME "Güç düzenini silmek istediğinizden emin misiniz: ""%s""?" IDS_DEL_SCHEME_TITLE "Düzeni Sil" END diff --git a/dll/cpl/powercfg/lang/uk-UA.rc b/dll/cpl/powercfg/lang/uk-UA.rc index ce9465ec4f..488c42f468 100644 --- a/dll/cpl/powercfg/lang/uk-UA.rc +++ b/dll/cpl/powercfg/lang/uk-UA.rc @@ -144,6 +144,6 @@ BEGIN IDS_TIMEOUT14 "через 4 години" IDS_TIMEOUT15 "через 5 годин" IDS_TIMEOUT16 "ніколи" - IDS_DEL_SCHEME "Ви дійсно бажаєте видалити схему керування електроживленням?" + IDS_DEL_SCHEME "Ви дійсно бажаєте видалити схему керування електроживленням: ""%s""?" IDS_DEL_SCHEME_TITLE "Видалення схеми" END diff --git a/dll/cpl/powercfg/lang/zh-CN.rc b/dll/cpl/powercfg/lang/zh-CN.rc index f185feb1af..43155283b9 100644 --- a/dll/cpl/powercfg/lang/zh-CN.rc +++ b/dll/cpl/powercfg/lang/zh-CN.rc @@ -138,6 +138,6 @@ BEGIN IDS_TIMEOUT14 "4 小时之后" IDS_TIMEOUT15 "5 小时之后" IDS_TIMEOUT16 "从不" - IDS_DEL_SCHEME "您确定要删除电源使用方案吗?" + IDS_DEL_SCHEME "您确定要删除电源使用方案吗: ""%s""?" IDS_DEL_SCHEME_TITLE "删除方案" END diff --git a/dll/cpl/powercfg/lang/zh-TW.rc b/dll/cpl/powercfg/lang/zh-TW.rc index d09d1bba83..cf8c9e2e2c 100644 --- a/dll/cpl/powercfg/lang/zh-TW.rc +++ b/dll/cpl/powercfg/lang/zh-TW.rc @@ -110,8 +110,8 @@ BEGIN IDS_PERCENT "%i%%" IDS_SOUND "聲音" IDS_TEXT "文本" - IDS_CONFIG1 "爲 %i 設置電源使用方案" - IDS_CONFIG2 "%i 的高級設置" + IDS_CONFIG1 "爲 %s 設置電源使用方案" + IDS_CONFIG2 "%s 的高級設置" IDS_NOACTION "無操作" IDS_PowerActionNone1 "無動作" IDS_PowerActionUnknown "未知" @@ -138,6 +138,6 @@ BEGIN IDS_TIMEOUT14 "4 小時之後" IDS_TIMEOUT15 "5 小時之後" IDS_TIMEOUT16 "從不" - IDS_DEL_SCHEME "您確定要刪除電源使用方案嗎?" + IDS_DEL_SCHEME "您確定要刪除電源使用方案嗎: ""%s""?" IDS_DEL_SCHEME_TITLE "刪除方案" END diff --git a/dll/cpl/powercfg/powercfg.h b/dll/cpl/powercfg/powercfg.h index 29011c67af..0e7317030c 100644 --- a/dll/cpl/powercfg/powercfg.h +++ b/dll/cpl/powercfg/powercfg.h @@ -17,6 +17,7 @@ #include <shlwapi.h> #include <powrprof.h> #include <ndk/rtlfuncs.h> +#include <strsafe.h> #include "resource.h" diff --git a/dll/cpl/powercfg/powershemes.c b/dll/cpl/powercfg/powershemes.c index fa5fbd73ac..4fff28a279 100644 --- a/dll/cpl/powercfg/powershemes.c +++ b/dll/cpl/powercfg/powershemes.c @@ -560,9 +560,10 @@ Pos_SaveData(HWND hwndDlg) static BOOL DelScheme(HWND hwnd) { + WCHAR szTitleBuffer[256]; + WCHAR szRawBuffer[256], szCookedBuffer[512]; INT iCurSel; HWND hList; - TCHAR szBuf[1024], szBufT[1024]; PPOWER_SCHEME pScheme; hList = GetDlgItem(hwnd, IDC_ENERGYLIST); @@ -577,10 +578,11 @@ DelScheme(HWND hwnd) if (pScheme == (PPOWER_SCHEME)CB_ERR) return FALSE; - LoadString(hApplet, IDS_DEL_SCHEME_TITLE, szBufT, sizeof(szBufT) / sizeof(TCHAR)); - LoadString(hApplet, IDS_DEL_SCHEME, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + LoadStringW(hApplet, IDS_DEL_SCHEME_TITLE, szTitleBuffer, ARRAYSIZE(szTitleBuffer)); + LoadStringW(hApplet, IDS_DEL_SCHEME, szRawBuffer, ARRAYSIZE(szRawBuffer)); + StringCchPrintfW(szCookedBuffer, ARRAYSIZE(szCookedBuffer), szRawBuffer, pScheme->pszName); - if (MessageBox(hwnd, szBuf, szBufT, MB_YESNO | MB_ICONQUESTION) == IDYES) + if (MessageBoxW(hwnd, szCookedBuffer, szTitleBuffer, MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2) == IDYES) { UINT Current;

1 0

[reactos] 01/01: [POWERCFG] Some small cleanup
by Eric Kohl 26 Apr '19

26 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7251020e418357ae8020d… commit 7251020e418357ae8020dffe8ba9abc68116e184 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Apr 26 21:51:48 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Apr 26 21:52:30 2019 +0200 [POWERCFG] Some small cleanup - Rename IDC_HYBERNATE... to IDC_HIBERNATE... - Rename IDS_PORCENT to IDS_PERCENT - Replace %1 by %s in IDS_CONFIG1 and IDS_CONFIG2 --- dll/cpl/powercfg/alarms.c | 4 ++-- dll/cpl/powercfg/lang/bg-BG.rc | 12 ++++++------ dll/cpl/powercfg/lang/cs-CZ.rc | 12 ++++++------ dll/cpl/powercfg/lang/de-DE.rc | 10 +++++----- dll/cpl/powercfg/lang/el-GR.rc | 12 ++++++------ dll/cpl/powercfg/lang/en-US.rc | 12 ++++++------ dll/cpl/powercfg/lang/es-ES.rc | 12 ++++++------ dll/cpl/powercfg/lang/fr-FR.rc | 12 ++++++------ dll/cpl/powercfg/lang/he-IL.rc | 12 ++++++------ dll/cpl/powercfg/lang/id-ID.rc | 12 ++++++------ dll/cpl/powercfg/lang/it-IT.rc | 12 ++++++------ dll/cpl/powercfg/lang/ja-JP.rc | 12 ++++++------ dll/cpl/powercfg/lang/nl-NL.rc | 12 ++++++------ dll/cpl/powercfg/lang/no-NO.rc | 12 ++++++------ dll/cpl/powercfg/lang/pl-PL.rc | 12 ++++++------ dll/cpl/powercfg/lang/ro-RO.rc | 12 ++++++------ dll/cpl/powercfg/lang/ru-RU.rc | 12 ++++++------ dll/cpl/powercfg/lang/sk-SK.rc | 12 ++++++------ dll/cpl/powercfg/lang/sq-AL.rc | 12 ++++++------ dll/cpl/powercfg/lang/th-TH.rc | 12 ++++++------ dll/cpl/powercfg/lang/tr-TR.rc | 12 ++++++------ dll/cpl/powercfg/lang/uk-UA.rc | 12 ++++++------ dll/cpl/powercfg/lang/zh-CN.rc | 12 ++++++------ dll/cpl/powercfg/lang/zh-TW.rc | 8 ++++---- dll/cpl/powercfg/powershemes.c | 32 ++++++++++++++++---------------- dll/cpl/powercfg/resource.h | 8 ++++---- 26 files changed, 157 insertions(+), 157 deletions(-) diff --git a/dll/cpl/powercfg/alarms.c b/dll/cpl/powercfg/alarms.c index f9c5100060..0782a1508a 100644 --- a/dll/cpl/powercfg/alarms.c +++ b/dll/cpl/powercfg/alarms.c @@ -32,7 +32,7 @@ Ala_InitData(HWND hwndDlg) CheckDlgButton(hwndDlg, IDC_ALARM1, gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].Enable ? BST_CHECKED : BST_UNCHECKED); - if (LoadString(hApplet, IDS_PROCENT, szTemp, MAX_PATH)) + if (LoadString(hApplet, IDS_PERCENT, szTemp, MAX_PATH)) { _stprintf(szBatteryLevel, szTemp, gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel); SetDlgItemText(hwndDlg, IDC_ALARMVALUE1, szBatteryLevel); @@ -100,7 +100,7 @@ Ala_InitData(HWND hwndDlg) CheckDlgButton(hwndDlg, IDC_ALARM2, gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].Enable ? BST_CHECKED : BST_UNCHECKED); - if (LoadString(hApplet, IDS_PROCENT, szTemp, MAX_PATH)) + if (LoadString(hApplet, IDS_PERCENT, szTemp, MAX_PATH)) { _stprintf(szBatteryLevel, szTemp, gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel); SetDlgItemText(hwndDlg, IDC_ALARMVALUE2, szBatteryLevel); diff --git a/dll/cpl/powercfg/lang/bg-BG.rc b/dll/cpl/powercfg/lang/bg-BG.rc index 3298fcf429..ae60c96ae0 100644 --- a/dll/cpl/powercfg/lang/bg-BG.rc +++ b/dll/cpl/powercfg/lang/bg-BG.rc @@ -26,9 +26,9 @@ BEGIN LTEXT "Системата из&чаква:", IDC_STANDBY, 15, 180, 80, 10 COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Системата за&спива:", IDC_HYBERNATE, 15, 195, 80, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Системата за&спива:", IDC_HIBERNATE, 15, 195, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 @@ -105,11 +105,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Захранване" IDS_CPLDESCRIPTION_1 "Настройка на енергоспестяването на компютъра." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Звук" IDS_TEXT "Текст" - IDS_CONFIG1 "Настройки за захранваща наредба %1" - IDS_CONFIG2 "Разширени настройки за %1" + IDS_CONFIG1 "Настройки за захранваща наредба %s" + IDS_CONFIG2 "Разширени настройки за %s" IDS_NOACTION "Не прави нищо" IDS_PowerActionNone1 "Бездействие" IDS_PowerActionUnknown "Неизвестно" diff --git a/dll/cpl/powercfg/lang/cs-CZ.rc b/dll/cpl/powercfg/lang/cs-CZ.rc index 04b16ccf1e..b82dd59e7c 100644 --- a/dll/cpl/powercfg/lang/cs-CZ.rc +++ b/dll/cpl/powercfg/lang/cs-CZ.rc @@ -26,9 +26,9 @@ BEGIN LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Režim spánku:", IDC_HYBERNATE, 13, 212, 84, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Režim spánku:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 @@ -105,11 +105,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Možnosti napájení" IDS_CPLDESCRIPTION_1 "Nastaví možnosti napájení a šetření energií pro tento počítač." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Zvuk" IDS_TEXT "Text" - IDS_CONFIG1 "Nastavení pro schéma napájení %1" - IDS_CONFIG2 "Pokročilá nastavení pro %1" + IDS_CONFIG1 "Nastavení pro schéma napájení %s" + IDS_CONFIG2 "Pokročilá nastavení pro %s" IDS_NOACTION "Nedělat nic" IDS_PowerActionNone1 "Žádná akce" IDS_PowerActionUnknown "Neznámý" diff --git a/dll/cpl/powercfg/lang/de-DE.rc b/dll/cpl/powercfg/lang/de-DE.rc index f43cd83713..048e176f30 100644 --- a/dll/cpl/powercfg/lang/de-DE.rc +++ b/dll/cpl/powercfg/lang/de-DE.rc @@ -28,9 +28,9 @@ BEGIN LTEXT "&Standby:", IDC_STANDBY, 15, 180, 55, 10 COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Ruhezustand:", IDC_HYBERNATE, 15, 195, 55, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Ruhezustand:", IDC_HIBERNATE, 15, 195, 55, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 @@ -107,10 +107,10 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Energie" IDS_CPLDESCRIPTION_1 "Konfiguriert die Energiespareinstellungen für den Computer." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Klang" IDS_TEXT "Text" - IDS_CONFIG1 "Einstellungen für Energieschema %s." + IDS_CONFIG1 "Einstellungen für Energieschema ""%s""" IDS_CONFIG2 "Erweiterte Einstellungen für %s." IDS_NOACTION "Nichts unternehmen" IDS_PowerActionNone1 "Keine Aktion" diff --git a/dll/cpl/powercfg/lang/el-GR.rc b/dll/cpl/powercfg/lang/el-GR.rc index 5afeb86999..c82db41027 100644 --- a/dll/cpl/powercfg/lang/el-GR.rc +++ b/dll/cpl/powercfg/lang/el-GR.rc @@ -28,9 +28,9 @@ BEGIN LTEXT "Σύστημα σε α&ναμονή:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Σύστημα σε α&δράνεια:", IDC_HYBERNATE, 13, 212, 84, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Σύστημα σε α&δράνεια:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 @@ -107,11 +107,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Επιλογές Ενέργειας" IDS_CPLDESCRIPTION_1 "Ρύθμιση χαρακτηριστικών εξοικονόμησης ενέργειας." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Ήχος" IDS_TEXT "Κείμενο" - IDS_CONFIG1 "Ρυθμίσεις του συνδιασμού τροφοδοσίας %1" - IDS_CONFIG2 "Ειδικές ρυθμίσεις του συνδιασμού %1" + IDS_CONFIG1 "Ρυθμίσεις του συνδιασμού τροφοδοσίας %s" + IDS_CONFIG2 "Ειδικές ρυθμίσεις του συνδιασμού %s" IDS_NOACTION "Καμία ενέργεια" IDS_PowerActionNone1 "Να μη γίνεται καμία ενέργεια" IDS_PowerActionUnknown "Unknown" diff --git a/dll/cpl/powercfg/lang/en-US.rc b/dll/cpl/powercfg/lang/en-US.rc index d3f4a37d14..98787b8e04 100644 --- a/dll/cpl/powercfg/lang/en-US.rc +++ b/dll/cpl/powercfg/lang/en-US.rc @@ -26,9 +26,9 @@ BEGIN LTEXT "System s&tandby:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "System &hibernates:", IDC_HYBERNATE, 13, 212, 84, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System &hibernates:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 @@ -105,11 +105,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Power Options" IDS_CPLDESCRIPTION_1 "Configure energy-saving settings for your computer." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Sound" IDS_TEXT "Text" - IDS_CONFIG1 "Settings for %1 power scheme" - IDS_CONFIG2 "Advanced settings for %1" + IDS_CONFIG1 "Settings for %s power scheme" + IDS_CONFIG2 "Advanced settings for %s" IDS_NOACTION "Do nothing" IDS_PowerActionNone1 "No action" IDS_PowerActionUnknown "Unknown" diff --git a/dll/cpl/powercfg/lang/es-ES.rc b/dll/cpl/powercfg/lang/es-ES.rc index 4a943b2ff1..235cbb87b1 100644 --- a/dll/cpl/powercfg/lang/es-ES.rc +++ b/dll/cpl/powercfg/lang/es-ES.rc @@ -28,9 +28,9 @@ BEGIN LTEXT "&Suspender el equipo:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "El sistema &hiberna:", IDC_HYBERNATE, 13, 212, 84, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "El sistema &hiberna:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 262, 237 @@ -107,11 +107,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Opciones de energía" IDS_CPLDESCRIPTION_1 "Configura los parámetros de ahorro de energía de su equipo." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Sonido" IDS_TEXT "Texto" - IDS_CONFIG1 "Configuración para la combinación de energía %1" - IDS_CONFIG2 "Opciones avanzadas para %1" + IDS_CONFIG1 "Configuración para la combinación de energía %s" + IDS_CONFIG2 "Opciones avanzadas para %s" IDS_NOACTION "No hacer nada" IDS_PowerActionNone1 "No hacer nada" IDS_PowerActionUnknown "desconocido" diff --git a/dll/cpl/powercfg/lang/fr-FR.rc b/dll/cpl/powercfg/lang/fr-FR.rc index f0fe50b47a..cd4cee33ff 100644 --- a/dll/cpl/powercfg/lang/fr-FR.rc +++ b/dll/cpl/powercfg/lang/fr-FR.rc @@ -28,9 +28,9 @@ BEGIN LTEXT "Mode s&tandby :", IDC_STANDBY, 15, 180, 80, 10 COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Mise en veille du système :", IDC_HYBERNATE, 15, 195, 80, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Mise en veille du système :", IDC_HIBERNATE, 15, 195, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 @@ -107,11 +107,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Options d'alimentation" IDS_CPLDESCRIPTION_1 "Configure les Options d'alimentation de votre ordinateur." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Son" IDS_TEXT "Texte" - IDS_CONFIG1 "Réglages pour le profil d'alimentation %1" - IDS_CONFIG2 "Réglages avancés pour %1" + IDS_CONFIG1 "Réglages pour le profil d'alimentation %s" + IDS_CONFIG2 "Réglages avancés pour %s" IDS_NOACTION "Ne rien faire" IDS_PowerActionNone1 "Pas d'action" IDS_PowerActionUnknown "Inconnue" diff --git a/dll/cpl/powercfg/lang/he-IL.rc b/dll/cpl/powercfg/lang/he-IL.rc index be3e1dbe80..bc19075558 100644 --- a/dll/cpl/powercfg/lang/he-IL.rc +++ b/dll/cpl/powercfg/lang/he-IL.rc @@ -28,9 +28,9 @@ BEGIN LTEXT "מצב המתנה:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "מצב שינה:", IDC_HYBERNATE, 13, 212, 84, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "מצב שינה:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 @@ -107,11 +107,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "אפשרויות צריכת חשמל" IDS_CPLDESCRIPTION_1 "Configure energy-saving settings for your computer." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "קול" IDS_TEXT "טקסט" - IDS_CONFIG1 "Settings for %1 power scheme" - IDS_CONFIG2 "אפשרויות מתקדמות ל %1" + IDS_CONFIG1 "Settings for %s power scheme" + IDS_CONFIG2 "אפשרויות מתקדמות ל %s" IDS_NOACTION "אל תעשה דבר" IDS_PowerActionNone1 "שום פעולה" IDS_PowerActionUnknown "לא ידוע" diff --git a/dll/cpl/powercfg/lang/id-ID.rc b/dll/cpl/powercfg/lang/id-ID.rc index 53f39e5088..9d3a6008e4 100644 --- a/dll/cpl/powercfg/lang/id-ID.rc +++ b/dll/cpl/powercfg/lang/id-ID.rc @@ -28,9 +28,9 @@ BEGIN LTEXT "Sistem s&tandby:", IDC_STANDBY, 15, 180, 80, 10 COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Sistem &hibernasi:", IDC_HYBERNATE, 15, 195, 80, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Sistem &hibernasi:", IDC_HIBERNATE, 15, 195, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 @@ -107,11 +107,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Opsi Tenaga" IDS_CPLDESCRIPTION_1 "Mengkonfigurasi setelan hemat-energi untuk komputer anda." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Suara" IDS_TEXT "Teks" - IDS_CONFIG1 "Menyetel untuk %1 skema tenaga" - IDS_CONFIG2 "Setelan Lanjutan untuk %1" + IDS_CONFIG1 "Menyetel untuk %s skema tenaga" + IDS_CONFIG2 "Setelan Lanjutan untuk %s" IDS_NOACTION "Tidak melakukan apapun" IDS_PowerActionNone1 "Tidak ada aksi" IDS_PowerActionUnknown "Tidak dikenal" diff --git a/dll/cpl/powercfg/lang/it-IT.rc b/dll/cpl/powercfg/lang/it-IT.rc index f4ef40507a..c83c60afb7 100644 --- a/dll/cpl/powercfg/lang/it-IT.rc +++ b/dll/cpl/powercfg/lang/it-IT.rc @@ -26,9 +26,9 @@ BEGIN LTEXT "Standby:", IDC_STANDBY, 16, 178, 80, 10 COMBOBOX IDC_STANDBYACLIST, 101, 176, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 176, 176, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Sospensione:", IDC_HYBERNATE, 16, 193, 80, 10 - COMBOBOX IDC_HYBERNATEACLIST, 101, 191, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 176, 191, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Sospensione:", IDC_HIBERNATE, 16, 193, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 101, 191, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 176, 191, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 @@ -105,11 +105,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Opzioni di risparmio energetico" IDS_CPLDESCRIPTION_1 "Configura le impostazioni per il risparmio enegetico su questo computer." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Suoni" IDS_TEXT "Testo" - IDS_CONFIG1 "Impostazioni per lo schema %1 " - IDS_CONFIG2 "Impostazioni avanzate per %1" + IDS_CONFIG1 "Impostazioni per lo schema %s" + IDS_CONFIG2 "Impostazioni avanzate per %s" IDS_NOACTION "Nessuna azione" IDS_PowerActionNone1 "Nessuna azione" IDS_PowerActionUnknown "Sconosciuto" diff --git a/dll/cpl/powercfg/lang/ja-JP.rc b/dll/cpl/powercfg/lang/ja-JP.rc index c6bc176ee3..f866df9a20 100644 --- a/dll/cpl/powercfg/lang/ja-JP.rc +++ b/dll/cpl/powercfg/lang/ja-JP.rc @@ -28,9 +28,9 @@ BEGIN LTEXT "システムスタンバイ(&T):", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "システムを休止状態にする(&H):", IDC_HYBERNATE, 13, 212, 84, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "システムを休止状態にする(&H):", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 @@ -107,11 +107,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "電源オプション" IDS_CPLDESCRIPTION_1 "コンピュータの省電力設定を構成します。" - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "音" IDS_TEXT "テキスト" - IDS_CONFIG1 "[%1] の電源設定" - IDS_CONFIG2 "%1の詳細設定" + IDS_CONFIG1 "[%s] の電源設定" + IDS_CONFIG2 "%sの詳細設定" IDS_NOACTION "何もしない" IDS_PowerActionNone1 "何もしない" IDS_PowerActionUnknown "不明" diff --git a/dll/cpl/powercfg/lang/nl-NL.rc b/dll/cpl/powercfg/lang/nl-NL.rc index 40ae774858..474b01ca92 100644 --- a/dll/cpl/powercfg/lang/nl-NL.rc +++ b/dll/cpl/powercfg/lang/nl-NL.rc @@ -26,9 +26,9 @@ BEGIN LTEXT "Op stand-&by:", IDC_STANDBY, 15, 180, 80, 10 COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "In slaapstand:", IDC_HYBERNATE, 15, 195, 80, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "In slaapstand:", IDC_HIBERNATE, 15, 195, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 @@ -105,11 +105,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Energie opties" IDS_CPLDESCRIPTION_1 "Configure energy-saving settings for your computer." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Sound" IDS_TEXT "Text" - IDS_CONFIG1 "Settings for %1 power scheme" - IDS_CONFIG2 "Advanced settings for %1" + IDS_CONFIG1 "Settings for %s power scheme" + IDS_CONFIG2 "Advanced settings for %s" IDS_NOACTION "Doe niets" IDS_PowerActionNone1 "Geen actie" IDS_PowerActionUnknown "Onbekend" diff --git a/dll/cpl/powercfg/lang/no-NO.rc b/dll/cpl/powercfg/lang/no-NO.rc index 5bf6ac64e6..f1bcc58a49 100644 --- a/dll/cpl/powercfg/lang/no-NO.rc +++ b/dll/cpl/powercfg/lang/no-NO.rc @@ -28,9 +28,9 @@ BEGIN LTEXT "System h&vilemodus:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "System &dvalemodus:", IDC_HYBERNATE, 13, 212, 84, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System &dvalemodus:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 @@ -107,11 +107,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Strømvalg" IDS_CPLDESCRIPTION_1 "Konfigurere energi-sparing innstillinger for din datamaskin." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Lyd" IDS_TEXT "Tekst" - IDS_CONFIG1 "Innstillinger for %1 strømplan" - IDS_CONFIG2 "Avanserte innstillinger for %1" + IDS_CONFIG1 "Innstillinger for %s strømplan" + IDS_CONFIG2 "Avanserte innstillinger for %s" IDS_NOACTION "Ikke gjør noe" IDS_PowerActionNone1 "Ingen handling" IDS_PowerActionUnknown "Ukjent" diff --git a/dll/cpl/powercfg/lang/pl-PL.rc b/dll/cpl/powercfg/lang/pl-PL.rc index d8659f742e..7d62650f5b 100644 --- a/dll/cpl/powercfg/lang/pl-PL.rc +++ b/dll/cpl/powercfg/lang/pl-PL.rc @@ -34,9 +34,9 @@ BEGIN LTEXT "System w stan &czuwania:", IDC_STANDBY, 15, 177, 90, 10 COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "System &hibernuje:", IDC_HYBERNATE, 15, 192, 80, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System &hibernuje:", IDC_HIBERNATE, 15, 192, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 @@ -113,11 +113,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Opcje zasilania" IDS_CPLDESCRIPTION_1 "Konfiguracja ustawień oszczędzania energii dla Twojego komputera." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Dźwięk" IDS_TEXT "Tekst" - IDS_CONFIG1 "Ustawienia dla schematu %1" - IDS_CONFIG2 "Zaawansowane ustawienia dla %1" + IDS_CONFIG1 "Ustawienia dla schematu %s" + IDS_CONFIG2 "Zaawansowane ustawienia dla %s" IDS_NOACTION "Nie rób nic" IDS_PowerActionNone1 "Brak akcji" IDS_PowerActionUnknown "Nieznana" diff --git a/dll/cpl/powercfg/lang/ro-RO.rc b/dll/cpl/powercfg/lang/ro-RO.rc index 3ea75dbd4c..96ddcc1b80 100644 --- a/dll/cpl/powercfg/lang/ro-RO.rc +++ b/dll/cpl/powercfg/lang/ro-RO.rc @@ -31,9 +31,9 @@ BEGIN LTEXT "Starea de &veghe:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Hibernarea:", IDC_HYBERNATE, 13, 212, 84, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Hibernarea:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 @@ -110,11 +110,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Alimentare" IDS_CPLDESCRIPTION_1 "Configurarea metodelor de economisire a consumului de energie al calculatorului." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "sonoră" IDS_TEXT "text" - IDS_CONFIG1 "Configurare regim %1" - IDS_CONFIG2 "Opțiuni avansate pentru %1" + IDS_CONFIG1 "Configurare regim %s" + IDS_CONFIG2 "Opțiuni avansate pentru %s" IDS_NOACTION "nespecificată" IDS_PowerActionNone1 "acțiune nespecificată" IDS_PowerActionUnknown "acțiune necunoscută" diff --git a/dll/cpl/powercfg/lang/ru-RU.rc b/dll/cpl/powercfg/lang/ru-RU.rc index a3ea57aa42..135dbab350 100644 --- a/dll/cpl/powercfg/lang/ru-RU.rc +++ b/dll/cpl/powercfg/lang/ru-RU.rc @@ -28,9 +28,9 @@ BEGIN LTEXT "&Ждущий режим через:", IDC_STANDBY, 15, 177, 80, 10 COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "С&пящий режим через:", IDC_HYBERNATE, 15, 192, 80, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "С&пящий режим через:", IDC_HIBERNATE, 15, 192, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 @@ -107,11 +107,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Электропитание" IDS_CPLDESCRIPTION_1 "Настройка параметров энергосбережения для компьютера." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Звук" IDS_TEXT "Текст" - IDS_CONFIG1 "Параметры схемы %1" - IDS_CONFIG2 "Дополнительные параметры схемы %1" + IDS_CONFIG1 "Параметры схемы %s" + IDS_CONFIG2 "Дополнительные параметры схемы %s" IDS_NOACTION "Не делать ничего" IDS_PowerActionNone1 "Действие не требуется" IDS_PowerActionUnknown "Нет данных" diff --git a/dll/cpl/powercfg/lang/sk-SK.rc b/dll/cpl/powercfg/lang/sk-SK.rc index 8a013f1be7..181f8c6115 100644 --- a/dll/cpl/powercfg/lang/sk-SK.rc +++ b/dll/cpl/powercfg/lang/sk-SK.rc @@ -34,9 +34,9 @@ BEGIN LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Režim dl&hodobého spánku:", IDC_HYBERNATE, 13, 210, 84, 18 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Režim dl&hodobého spánku:", IDC_HIBERNATE, 13, 210, 84, 18 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 @@ -113,11 +113,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Možnosti napájania" IDS_CPLDESCRIPTION_1 "Konfiguruje nastavenia úspory energie Vášho počítača." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Zvuk" IDS_TEXT "Text" - IDS_CONFIG1 "Nastavenie pre schému napájania %1" - IDS_CONFIG2 "Rozšírené nastavenie pre %1" + IDS_CONFIG1 "Nastavenie pre schému napájania %s" + IDS_CONFIG2 "Rozšírené nastavenie pre %s" IDS_NOACTION "Do nothing" IDS_PowerActionNone1 "No action" IDS_PowerActionUnknown "Neznáme" diff --git a/dll/cpl/powercfg/lang/sq-AL.rc b/dll/cpl/powercfg/lang/sq-AL.rc index abd1c737e7..1c789f0e77 100644 --- a/dll/cpl/powercfg/lang/sq-AL.rc +++ b/dll/cpl/powercfg/lang/sq-AL.rc @@ -31,9 +31,9 @@ BEGIN LTEXT "Sistemi gatishmërisë:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Sistemi &hibernates:", IDC_HYBERNATE, 13, 212, 84, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Sistemi &hibernates:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 @@ -110,11 +110,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Opsionet e energjisë" IDS_CPLDESCRIPTION_1 "Konfiguro parametrat e kursimit të energjisë për kompjuterin tuaj." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Zëri" IDS_TEXT "Teksti" - IDS_CONFIG1 "Konfigurimet për %1 skema energjise" - IDS_CONFIG2 "Konfigurimet Avancuara për %1" + IDS_CONFIG1 "Konfigurimet për %s skema energjise" + IDS_CONFIG2 "Konfigurimet Avancuara për %s" IDS_NOACTION "Mos bëj gjë" IDS_PowerActionNone1 "Asnjë veprim" IDS_PowerActionUnknown "i panjohur" diff --git a/dll/cpl/powercfg/lang/th-TH.rc b/dll/cpl/powercfg/lang/th-TH.rc index e4a1ce2360..f86dc26a45 100644 --- a/dll/cpl/powercfg/lang/th-TH.rc +++ b/dll/cpl/powercfg/lang/th-TH.rc @@ -26,9 +26,9 @@ BEGIN LTEXT "System s&tandby:", IDC_STANDBY, 15, 180, 80, 10 COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "System &hibernates:", IDC_HYBERNATE, 15, 195, 80, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System &hibernates:", IDC_HIBERNATE, 15, 195, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 @@ -105,11 +105,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "ตัวเลือกค่าพลังงาน" IDS_CPLDESCRIPTION_1 "ปรับค่าพลังงาน-กำลังบันทึกการตั้งค่าให้กับคอมพิวเตอร์ของคุณ" - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "เสียง" IDS_TEXT "ข้อความ" - IDS_CONFIG1 "ตั้งค่าให้กับ %1 ค่าพลังงาน" - IDS_CONFIG2 "การตั้งค่าแบบขั้นสูงเป็น %1" + IDS_CONFIG1 "ตั้งค่าให้กับ %s ค่าพลังงาน" + IDS_CONFIG2 "การตั้งค่าแบบขั้นสูงเป็น %s" IDS_NOACTION "ไม่เปลี่ยนค่า" IDS_PowerActionNone1 "ไม่เปลี่ยนค่า" IDS_PowerActionUnknown "ไม่ทราบ" diff --git a/dll/cpl/powercfg/lang/tr-TR.rc b/dll/cpl/powercfg/lang/tr-TR.rc index 30b50671d7..a83ffb64f9 100644 --- a/dll/cpl/powercfg/lang/tr-TR.rc +++ b/dll/cpl/powercfg/lang/tr-TR.rc @@ -28,9 +28,9 @@ BEGIN LTEXT "&Dizgeyi Uykuya Geçir:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "D&izgeyi Anıkta Beklet:", IDC_HYBERNATE, 13, 212, 84, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "D&izgeyi Anıkta Beklet:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 @@ -107,11 +107,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Güç Seçenekleri" IDS_CPLDESCRIPTION_1 "Bilgisayarınız için erke tutumu ayarlarını yapılandırır." - IDS_PROCENT "%%%i" + IDS_PERCENT "%%%i" IDS_SOUND "Ses" IDS_TEXT "Metin" - IDS_CONFIG1 "%1 Güç Düzeni İçin Ayarlar" - IDS_CONFIG2 "%1 İçin Gelişmiş Ayarlar" + IDS_CONFIG1 "%s Güç Düzeni İçin Ayarlar" + IDS_CONFIG2 "%s İçin Gelişmiş Ayarlar" IDS_NOACTION "Bir Şey Yapma" IDS_PowerActionNone1 "Eylem Yok" IDS_PowerActionUnknown "Bilinmiyor" diff --git a/dll/cpl/powercfg/lang/uk-UA.rc b/dll/cpl/powercfg/lang/uk-UA.rc index b8e8571313..ce9465ec4f 100644 --- a/dll/cpl/powercfg/lang/uk-UA.rc +++ b/dll/cpl/powercfg/lang/uk-UA.rc @@ -34,9 +34,9 @@ BEGIN LTEXT "Ре&жим очікування:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "С&плячий режим:", IDC_HYBERNATE, 13, 212, 84, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "С&плячий режим:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 @@ -113,11 +113,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Електроживлення" IDS_CPLDESCRIPTION_1 "Налаштування параметрів енергозбереження для комп'ютера." - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "Звук" IDS_TEXT "Текст" - IDS_CONFIG1 "Налаштування схеми живлення %1" - IDS_CONFIG2 "Додаткові налаштування для %1" + IDS_CONFIG1 "Налаштування схеми живлення %s" + IDS_CONFIG2 "Додаткові налаштування для %s" IDS_NOACTION "Не робити нічого" IDS_PowerActionNone1 "Дія не потрібна" IDS_PowerActionUnknown "Немає даних" diff --git a/dll/cpl/powercfg/lang/zh-CN.rc b/dll/cpl/powercfg/lang/zh-CN.rc index fef416c1ad..f185feb1af 100644 --- a/dll/cpl/powercfg/lang/zh-CN.rc +++ b/dll/cpl/powercfg/lang/zh-CN.rc @@ -28,9 +28,9 @@ BEGIN LTEXT "系统待机(&T):", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "系统休眠(&H):", IDC_HYBERNATE, 13, 212, 84, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "系统休眠(&H):", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 @@ -107,11 +107,11 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "电源选项" IDS_CPLDESCRIPTION_1 "配置计算机的节能设置。" - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "声音" IDS_TEXT "文本" - IDS_CONFIG1 "为 %i 设置电源使用方案" - IDS_CONFIG2 "%i 的高级设置" + IDS_CONFIG1 "为 %s 设置电源使用方案" + IDS_CONFIG2 "%s 的高级设置" IDS_NOACTION "无操作" IDS_PowerActionNone1 "无动作" IDS_PowerActionUnknown "未知" diff --git a/dll/cpl/powercfg/lang/zh-TW.rc b/dll/cpl/powercfg/lang/zh-TW.rc index 2fe976ece7..d09d1bba83 100644 --- a/dll/cpl/powercfg/lang/zh-TW.rc +++ b/dll/cpl/powercfg/lang/zh-TW.rc @@ -28,9 +28,9 @@ BEGIN LTEXT "系統待機(&T):", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "系統休眠(&H):", IDC_HYBERNATE, 13, 212, 84, 10 - COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "系統休眠(&H):", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 @@ -107,7 +107,7 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "電源選項" IDS_CPLDESCRIPTION_1 "配置電腦的節能設置。" - IDS_PROCENT "%i%%" + IDS_PERCENT "%i%%" IDS_SOUND "聲音" IDS_TEXT "文本" IDS_CONFIG1 "爲 %i 設置電源使用方案" diff --git a/dll/cpl/powercfg/powershemes.c b/dll/cpl/powercfg/powershemes.c index dd839bbe0f..fa5fbd73ac 100644 --- a/dll/cpl/powercfg/powershemes.c +++ b/dll/cpl/powercfg/powershemes.c @@ -191,9 +191,9 @@ Pos_InitData( { MoveWindow(GetDlgItem(hwndDlg, IDC_STANDBY),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left,rectCtl.bottom-rectCtl.top,FALSE); } - if (GetWindowRect(GetDlgItem(hwndDlg, IDC_HYBERNATE),&rectCtl)) + if (GetWindowRect(GetDlgItem(hwndDlg, IDC_HIBERNATE),&rectCtl)) { - MoveWindow(GetDlgItem(hwndDlg, IDC_HYBERNATE),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left,rectCtl.bottom-rectCtl.top,FALSE); + MoveWindow(GetDlgItem(hwndDlg, IDC_HIBERNATE),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left,rectCtl.bottom-rectCtl.top,FALSE); } if (GetWindowRect(GetDlgItem(hwndDlg, IDC_MONITORDCLIST),&rectCtl2)) { @@ -210,9 +210,9 @@ Pos_InitData( { MoveWindow(GetDlgItem(hwndDlg, IDC_STANDBYACLIST),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left-moveright,rectCtl.bottom-rectCtl.top,FALSE); } - if (GetWindowRect(GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST),&rectCtl)) + if (GetWindowRect(GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST),&rectCtl)) { - MoveWindow(GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left-moveright,rectCtl.bottom-rectCtl.top,FALSE); + MoveWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left-moveright,rectCtl.bottom-rectCtl.top,FALSE); } } if (GetWindowRect(GetDlgItem(hwndDlg, IDC_GRPDETAIL),&rectCtl)) @@ -241,7 +241,7 @@ Pos_InitData( ShowWindow(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), SW_HIDE); ShowWindow(GetDlgItem(hwndDlg, IDC_DISKDCLIST), SW_HIDE); ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEDCLIST), SW_HIDE); } if (!(spc.SystemS1 || spc.SystemS2 || spc.SystemS3)) @@ -253,9 +253,9 @@ Pos_InitData( if (!spc.HiberFilePresent) { - ShowWindow(GetDlgItem(hwndDlg, IDC_HYBERNATE), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_HIBERNATE), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEDCLIST), SW_HIDE); } return TRUE; @@ -349,7 +349,7 @@ LoadConfig( if (Sec[i] == pp->mach.DozeS4TimeoutAc) { - SendDlgItemMessage(hwndDlg, IDC_HYBERNATEACLIST, + SendDlgItemMessage(hwndDlg, IDC_HIBERNATEACLIST, CB_SETCURSEL, i, (LPARAM)0); @@ -357,7 +357,7 @@ LoadConfig( if (Sec[i] == pp->mach.DozeS4TimeoutDc) { - SendDlgItemMessage(hwndDlg, IDC_HYBERNATEDCLIST, + SendDlgItemMessage(hwndDlg, IDC_HIBERNATEDCLIST, CB_SETCURSEL, i, (LPARAM)0); @@ -394,7 +394,7 @@ Pos_InitPage(HWND hwndDlg) break; case 4: - hwnd = GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST); + hwnd = GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST); imin = IDS_TIMEOUT3; break; @@ -414,7 +414,7 @@ Pos_InitPage(HWND hwndDlg) break; case 8: - hwnd = GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST); + hwnd = GetDlgItem(hwndDlg, IDC_HIBERNATEDCLIST); imin = IDS_TIMEOUT3; break; @@ -534,7 +534,7 @@ Pos_SaveData(HWND hwndDlg) pScheme->PowerPolicy.user.IdleTimeoutDc = Sec[tmp]; } - tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_HYBERNATEACLIST, + tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_HIBERNATEACLIST, CB_GETCURSEL, 0, (LPARAM)0); @@ -543,7 +543,7 @@ Pos_SaveData(HWND hwndDlg) pScheme->PowerPolicy.mach.DozeS4TimeoutAc = Sec[tmp]; } - tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_HYBERNATEDCLIST, + tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_HIBERNATEDCLIST, CB_GETCURSEL, 0, (LPARAM)0); @@ -758,8 +758,8 @@ PowerSchemesDlgProc( case IDC_DISKDCLIST: case IDC_STANDBYACLIST: case IDC_STANDBYDCLIST: - case IDC_HYBERNATEACLIST: - case IDC_HYBERNATEDCLIST: + case IDC_HIBERNATEACLIST: + case IDC_HIBERNATEDCLIST: if (HIWORD(wParam) == CBN_SELCHANGE) { PropSheet_Changed(GetParent(hwndDlg), hwndDlg); diff --git a/dll/cpl/powercfg/resource.h b/dll/cpl/powercfg/resource.h index adc5e9c3d3..e6f5d6574f 100644 --- a/dll/cpl/powercfg/resource.h +++ b/dll/cpl/powercfg/resource.h @@ -5,7 +5,7 @@ /* Set default to IDI_AC */ #define IDC_CPLICON_1 IDI_AC -#define IDS_PROCENT 49 +#define IDS_PERCENT 49 #define IDS_SOUND 50 #define IDS_TEXT 51 #define IDS_CONFIG1 53 @@ -67,9 +67,9 @@ #define IDC_DISKACLIST 216 #define IDC_DISKDCLIST 217 #define IDC_DISK 218 -#define IDC_HYBERNATEACLIST 219 -#define IDC_HYBERNATEDCLIST 220 -#define IDC_HYBERNATE 221 +#define IDC_HIBERNATEACLIST 219 +#define IDC_HIBERNATEDCLIST 220 +#define IDC_HIBERNATE 221 #define IDC_STANDBY 211 #define IDC_MONITOR 212

1 0

[reactos] 01/01: [WIN32SS][NTGDI] Keep FontSubstitutes enumeration CORE-15785 (#1532)
by Katayama Hirofumi MZ 26 Apr '19

26 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae8417fd9068dd32ec180… commit ae8417fd9068dd32ec180636117bba1dc0603325 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 26 21:56:36 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 26 21:56:36 2019 +0900 [WIN32SS][NTGDI] Keep FontSubstitutes enumeration CORE-15785 (#1532) Fix CORE-15785. When LOGFONT.lfFaceName[0] == 0, then enumeration of font substitutes had failed. CORE-15785 --- win32ss/gdi/ntgdi/freetype.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index a613a9f265..ae6feb006a 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -2821,7 +2821,13 @@ GetFontFamilyInfoForSubstitutes(const LOGFONTW *LogFont, GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount, &Win32Process->PrivateFontListHead); IntUnLockProcessPrivateFonts(Win32Process); - break; + + if (LogFont->lfFaceName[0]) + { + /* it's already matched to the exact name and charset if the name + was specified at here, then so don't scan more for another name */ + break; + } } return TRUE;

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