date:20190319

[ros-diffs] [reactos] 01/01: [SYSDM] Add some strings that will be used in the user profile dialog.

2019-03-19 Thread Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71f84a3b130b7e10596946d6e4589be9ed5a3c77

commit 71f84a3b130b7e10596946d6e4589be9ed5a3c77
Author: Eric Kohl 
AuthorDate: Tue Mar 19 23:17:12 2019 +0100
Commit: Eric Kohl 
CommitDate: Tue Mar 19 23:19:41 2019 +0100

[SYSDM] Add some strings that will be used in the user profile dialog.
---
 dll/cpl/sysdm/lang/bg-BG.rc |  5 +
 dll/cpl/sysdm/lang/cs-CZ.rc |  5 +
 dll/cpl/sysdm/lang/da-DK.rc |  5 +
 dll/cpl/sysdm/lang/de-DE.rc |  5 +
 dll/cpl/sysdm/lang/el-GR.rc |  5 +
 dll/cpl/sysdm/lang/en-US.rc |  5 +
 dll/cpl/sysdm/lang/es-ES.rc |  5 +
 dll/cpl/sysdm/lang/fr-FR.rc |  5 +
 dll/cpl/sysdm/lang/he-IL.rc |  5 +
 dll/cpl/sysdm/lang/hu-HU.rc |  5 +
 dll/cpl/sysdm/lang/id-ID.rc |  5 +
 dll/cpl/sysdm/lang/it-IT.rc |  5 +
 dll/cpl/sysdm/lang/ja-JP.rc |  5 +
 dll/cpl/sysdm/lang/nl-NL.rc |  5 +
 dll/cpl/sysdm/lang/no-NO.rc |  5 +
 dll/cpl/sysdm/lang/pl-PL.rc |  5 +
 dll/cpl/sysdm/lang/ro-RO.rc |  5 +
 dll/cpl/sysdm/lang/ru-RU.rc |  5 +
 dll/cpl/sysdm/lang/sk-SK.rc |  5 +
 dll/cpl/sysdm/lang/sq-AL.rc |  5 +
 dll/cpl/sysdm/lang/sv-SE.rc |  5 +
 dll/cpl/sysdm/lang/tr-TR.rc |  5 +
 dll/cpl/sysdm/lang/uk-UA.rc |  5 +
 dll/cpl/sysdm/lang/zh-CN.rc |  5 +
 dll/cpl/sysdm/lang/zh-TW.rc |  5 +
 dll/cpl/sysdm/resource.h| 45 +
 26 files changed, 150 insertions(+), 20 deletions(-)

diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc
index fb37dd5cda..b8c362698f 100644
--- a/dll/cpl/sysdm/lang/bg-BG.rc
+++ b/dll/cpl/sysdm/lang/bg-BG.rc
@@ -295,6 +295,11 @@ BEGIN
 IDS_USERPROFILE_TYPE "Вид"
 IDS_USERPROFILE_STATUS "Състояние"
 IDS_USERPROFILE_MODIFIED "Изменен"
+IDS_USERPROFILE_LOCAL "Local"
+IDS_USERPROFILE_ROAMING "Roaming"
+IDS_USERPROFILE_MANDATORY "Mandatory"
+IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's 
profile?"
+IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete"
 IDS_MESSAGEBOXTITLE "Приложение за таблото за управление на уредбата"
 IDS_WARNINITIALSIZE "Въведете числена стойност за началния размер на 
страниращия файл."
 IDS_WARNMAXIMUMSIZE "Въведете числена стойност за върховия размер на 
страниращия файл."
diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc
index 3837c27381..d49c90479d 100644
--- a/dll/cpl/sysdm/lang/cs-CZ.rc
+++ b/dll/cpl/sysdm/lang/cs-CZ.rc
@@ -300,6 +300,11 @@ BEGIN
 IDS_USERPROFILE_TYPE "Typ"
 IDS_USERPROFILE_STATUS "Stav"
 IDS_USERPROFILE_MODIFIED "Upraveno"
+IDS_USERPROFILE_LOCAL "Local"
+IDS_USERPROFILE_ROAMING "Roaming"
+IDS_USERPROFILE_MANDATORY "Mandatory"
+IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's 
profile?"
+IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete"
 IDS_MESSAGEBOXTITLE "Systémový aplet kontrolních panelů"
 IDS_WARNINITIALSIZE "Zadejte číselnou hodnotu pro počáteční velikost 
stránkovacího souboru."
 IDS_WARNMAXIMUMSIZE "Zadejte číselnou hodnotu pro maximální velikost 
stránkovacího souboru."
diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc
index 103e281508..f1de9a57c0 100644
--- a/dll/cpl/sysdm/lang/da-DK.rc
+++ b/dll/cpl/sysdm/lang/da-DK.rc
@@ -295,6 +295,11 @@ BEGIN
 IDS_USERPROFILE_TYPE "Type"
 IDS_USERPROFILE_STATUS "Status"
 IDS_USERPROFILE_MODIFIED "Modified"
+IDS_USERPROFILE_LOCAL "Local"
+IDS_USERPROFILE_ROAMING "Roaming"
+IDS_USERPROFILE_MANDATORY "Mandatory"
+IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's 
profile?"
+IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete"
 IDS_MESSAGEBOXTITLE "System control panel applet"
 IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the 
paging file."
 IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the 
paging file."
diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc
index 823c372bd5..e36fe0d2ac 100644
--- a/dll/cpl/sysdm/lang/de-DE.rc
+++ b/dll/cpl/sysdm/lang/de-DE.rc
@@ -304,6 +304,11 @@ BEGIN
 IDS_USERPROFILE_TYPE "Typ"
 IDS_USERPROFILE_STATUS "Status"
 IDS_USERPROFILE_MODIFIED "Geändert"
+IDS_USERPROFILE_LOCAL "Lokal"
+IDS_USERPROFILE_ROAMING "Servergespeichert"
+IDS_USERPROFILE_MANDATORY "Obligatorisch"
+IDS_USERPROFILE_CONFIRM_DELETE "Soll das Profil für folgenden Benutzer 
gelöscht werden: %s?"
+IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Löschen bestätigen"
 IDS_MESSAGEBOXTITLE "Systemsteuerungsoption ""System"""
 IDS_WARNINITIALSIZE "Geben Sie einen numerischen Wert für die Anfangsgröße 
der Auslagerungsdatei an."
 IDS_WARNMAXIMUMSIZE "Geben Sie einen numerischen Wert für die Maximalgröße 
der Auslagerungsdatei an."
diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc
index e39ca8b53a..0ce6b37bfa 100644
--- a/dll/cpl/sysdm/lang/el-GR.rc
+++

[ros-diffs] [reactos] 01/01: [MSI] Allow to pass product key validation check

2019-03-19 Thread Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e05f5509c4baa4df9d543620d5da9552c18f25f

commit 8e05f5509c4baa4df9d543620d5da9552c18f25f
Author: Stanislav Motylkov 
AuthorDate: Mon Mar 18 01:14:46 2019 +0300
Commit: Hermès BÉLUSCA - MAÏTO 
CommitDate: Tue Mar 19 23:05:57 2019 +0100

[MSI] Allow to pass product key validation check

CORE-14710 CORE-15864
---
 dll/win32/msi/action.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c
index 3909246869..0eef96a89c 100644
--- a/dll/win32/msi/action.c
+++ b/dll/win32/msi/action.c
@@ -7448,7 +7448,11 @@ UINT msi_validate_product_id( MSIPACKAGE *package )
 if (key && template)
 {
 FIXME( "partial stub: template %s key %s\n", debugstr_w(template), 
debugstr_w(key) );
+#ifdef __REACTOS__
+WARN("Product key validation HACK, see CORE-14710\n");
+#else
 r = msi_set_property( package->db, szProductID, key, -1 );
+#endif
 }
 msi_free( template );
 msi_free( key );

[ros-diffs] [reactos] 01/01: [SAMSRV] Update Chinese translation

2019-03-19 Thread Luo Yufan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4785291ff3b1616e2ad8ac4b796a4659a3256add

commit 4785291ff3b1616e2ad8ac4b796a4659a3256add
Author: Luo Yufan 
AuthorDate: Mon Mar 18 21:42:36 2019 +0800
Commit: Hermès BÉLUSCA - MAÏTO 
CommitDate: Tue Mar 19 23:05:34 2019 +0100

[SAMSRV] Update Chinese translation
---
 dll/win32/samsrv/lang/zh-CN.rc |  9 +
 dll/win32/samsrv/lang/zh-TW.rc | 15 ---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dll/win32/samsrv/lang/zh-CN.rc b/dll/win32/samsrv/lang/zh-CN.rc
index a15600a36d..e5d863d33a 100644
--- a/dll/win32/samsrv/lang/zh-CN.rc
+++ b/dll/win32/samsrv/lang/zh-CN.rc
@@ -1,4 +1,5 @@
 /* Simplified Chinese translation by Henry Tang Ih 2015 
(henryta...@hotmail.com) */
+/* Improved by Luo Yufan 2019  */
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
@@ -10,11 +11,11 @@ BEGIN
 IDS_ALIAS_ADMINISTRATORS_NAME "管理员"
 IDS_ALIAS_ADMINISTRATORS_COMMENT "管理员可以无限制地访问计算机或域。"
 IDS_ALIAS_GUESTS_NAME "来宾"
-IDS_ALIAS_GUESTS_COMMENT "来宾在默认情况下享有同样的权利的用户组的成员。"
-IDS_ALIAS_POWER_USERS_NAME "超级用户"
-IDS_ALIAS_POWER_USERS_COMMENT "超级用户有大多数行政权利有一些限制条件。"
+IDS_ALIAS_GUESTS_COMMENT "来宾在默认情况下权限与“用户”组相同。"
+IDS_ALIAS_POWER_USERS_NAME "高级用户"
+IDS_ALIAS_POWER_USERS_COMMENT "高级用户拥有大多数管理权限，但存在一些限制。"
 IDS_ALIAS_USERS_NAME "用户"
-IDS_ALIAS_USERS_COMMENT "防止用户进行全系统更改。"
+IDS_ALIAS_USERS_COMMENT "防止用户进行对系统进行全面更改。"
 /*
  * ATTENTION: 
  *   If you translate the administrator account name, keep 
IDS_USER_ADMINISTRATOR_NAME and
diff --git a/dll/win32/samsrv/lang/zh-TW.rc b/dll/win32/samsrv/lang/zh-TW.rc
index 1621bd6b51..01d85d0935 100644
--- a/dll/win32/samsrv/lang/zh-TW.rc
+++ b/dll/win32/samsrv/lang/zh-TW.rc
@@ -1,4 +1,5 @@
 /* Traditional Chinese translation by Henry Tang Ih 2016 
(henryta...@hotmail.com) */
+/* Improved by Luo Yufan 2019  */
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
@@ -8,20 +9,20 @@ BEGIN
 IDS_GROUP_NONE_NAME "無"
 IDS_GROUP_NONE_COMMENT "普通使用者"
 IDS_ALIAS_ADMINISTRATORS_NAME "管理員"
-IDS_ALIAS_ADMINISTRATORS_COMMENT "管理員可以無限制地訪問電腦或域。"
+IDS_ALIAS_ADMINISTRATORS_COMMENT "管理員可以無限制地訪問電腦或網域。"
 IDS_ALIAS_GUESTS_NAME "來賓"
-IDS_ALIAS_GUESTS_COMMENT "來賓在默認情況下享有同樣的權利的使用者組的成員。"
-IDS_ALIAS_POWER_USERS_NAME "超級使用者"
-IDS_ALIAS_POWER_USERS_COMMENT "超級使用者有大多數行政權利有一些限制條件。"
+IDS_ALIAS_GUESTS_COMMENT "來賓在預設情況下權限與[使用者]群組相同，"
+IDS_ALIAS_POWER_USERS_NAME "進階使用者"
+IDS_ALIAS_POWER_USERS_COMMENT "進階使用者擁有大多數管理權限，但存在一些限制。"
 IDS_ALIAS_USERS_NAME "使用者"
-IDS_ALIAS_USERS_COMMENT "防止使用者進行全系統更改。"
+IDS_ALIAS_USERS_COMMENT "防止使用者對系統進行全面變更。"
 /*
  * ATTENTION: 
  *   If you translate the administrator account name, keep 
IDS_USER_ADMINISTRATOR_NAME and
  *   syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized.
  */
 IDS_USER_ADMINISTRATOR_NAME "Administrator"
-IDS_USER_ADMINISTRATOR_COMMENT "用於管理電腦或域的內建帳戶。"
+IDS_USER_ADMINISTRATOR_COMMENT "用於管理電腦或網域的內建帳戶。"
 IDS_USER_GUEST_NAME "來賓"
-IDS_USER_GUEST_COMMENT "來賓訪問電腦或域的內建帳戶。"
+IDS_USER_GUEST_COMMENT "用於來賓存取電腦或網域的內建帳戶。"
 END

[ros-diffs] [reactos] 01/01: [RICHED20] Simplify MSVC thiscall & stdcall wrappers.

2019-03-19 Thread Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49fbaa758e2bbd42572dc4b85d922527f65a12f8

commit 49fbaa758e2bbd42572dc4b85d922527f65a12f8
Author: Thomas Faber 
AuthorDate: Sat Feb 2 15:52:13 2019 +0100
Commit: Thomas Faber 
CommitDate: Tue Mar 19 21:19:20 2019 +0100

[RICHED20] Simplify MSVC thiscall & stdcall wrappers.

Imports Wine commit b64511c00a5.
---
 dll/win32/riched20/CMakeLists.txt  |   4 --
 dll/win32/riched20/msvc-thiscall.c | 121 ---
 dll/win32/riched20/msvc.h  | 143 -
 dll/win32/riched20/txthost.c   |  23 ++
 dll/win32/riched20/txtsrv.c|  12 
 5 files changed, 35 insertions(+), 268 deletions(-)

diff --git a/dll/win32/riched20/CMakeLists.txt 
b/dll/win32/riched20/CMakeLists.txt
index 36f96fe924..d7ed37de70 100644
--- a/dll/win32/riched20/CMakeLists.txt
+++ b/dll/win32/riched20/CMakeLists.txt
@@ -25,10 +25,6 @@ list(APPEND SOURCE
 writer.c
 precomp.h)
 
-if(MSVC AND (ARCH STREQUAL "i386"))
-list(APPEND SOURCE msvc-thiscall.c)
-endif()
-
 list(APPEND riched20_rc_deps
 ${CMAKE_CURRENT_SOURCE_DIR}/riched_tom.rgs
 ${CMAKE_CURRENT_BINARY_DIR}/riched_tom.tlb)
diff --git a/dll/win32/riched20/msvc-thiscall.c 
b/dll/win32/riched20/msvc-thiscall.c
deleted file mode 100644
index 21669a604b..00
--- a/dll/win32/riched20/msvc-thiscall.c
+++ /dev/null
@@ -1,121 +0,0 @@
-#include "editor.h"
-
-#define DEFINE_THISCALL_WRAPPER(func,args) \
-typedef struct {int x[args/4];} _tag_##func; \
-void __stdcall func(_tag_##func p1); \
-__declspec(naked) void __thiscall_##func(_tag_##func p1) \
-{ \
-__asm pop eax \
-__asm push ecx \
-__asm push eax \
-__asm jmp func \
-}
-
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetDC,4)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxReleaseDC,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowScrollBar,12)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxEnableScrollBar,12)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollRange,20)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollPos,16)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxInvalidateRect,12)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxViewChange,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxCreateCaret,16)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowCaret,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCaretPos,12)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetTimer,12)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxKillTimer,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScrollWindowEx,32)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCapture,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetFocus,4)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCursor,12)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScreenToClient,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxClientToScreen,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxActivate,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxDeactivate,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetClientRect,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetViewInset,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetCharFormat,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetParaFormat,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSysColor,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetBackStyle,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetMaxLength,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetScrollBars,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPasswordChar,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetAcceleratorPos,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetExtent,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxCharFormatChange,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxParaFormatChange,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits,12)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxNotify,12)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmGetContext,4)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmReleaseContext,8)
-DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8)
-
-#define DEFINE_STDCALL_WRAPPER(num,func,args) \
-__declspec(naked) void __stdcall_##func(_tag_##func p1) \
-{ \
-__asm pop eax \
-__asm pop ecx \
-__asm push eax \
-__asm mov eax, [ecx] \
-__asm jmp dword ptr [eax + 4*num] \
-}
-
-DEFINE_STDCALL_WRAPPER(3,ITextHostImpl_TxGetDC,4)
-DEFINE_STDCALL_WRAPPER(4,ITextHostImpl_TxReleaseDC,8)
-DEFINE_STDCALL_WRAPPER(5,ITextHostImpl_TxShowScrollBar,12)
-DEFINE_STDCALL_WRAPPER(6,ITextHostImpl_TxEnableScrollBar,12)
-DEFINE_STDCALL_WRAPPER(7,ITextHostImpl_TxSetScrollRange,20)
-DEFINE_STDCALL_WRAPPER(8,ITextHostImpl_TxSetScrollPos,16)
-DEFINE_STDCALL_WRAPPER(9,ITextHostImpl_TxInvalidateRect,12)
-DEFINE_STDCALL_WRAPPER(10,ITextHostImpl_TxViewChange,8)
-DEFINE_STDCALL_WRAPPER(11,ITextHostImpl_TxCreateCaret,16)
-DEFINE_STDCALL_WRAPPER(12,ITextHostImpl_TxShowCaret,8)
-DEFINE_STDCALL_WRAPPER(13,ITextHostImpl_TxSetCaretPos,12)

[ros-diffs] [reactos] 01/01: [SYSDM] Add some strings that will be used in the user profile dialog.

[ros-diffs] [reactos] 01/01: [MSI] Allow to pass product key validation check

[ros-diffs] [reactos] 01/01: [SAMSRV] Update Chinese translation

[ros-diffs] [reactos] 01/01: [RICHED20] Simplify MSVC thiscall & stdcall wrappers.

4 matches

Site Navigation

Mail list logo

Footer information