Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

02/09: [NTOSKRNL] Rename ExpCriticalWorkerThreads and ExpDelayedWorkerThreads (no p) to match Windows names and make them available for the whole kernel.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=853f04e6fc8b7a2560564… commit 853f04e6fc8b7a2560564e5e266a231c60109275 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Feb 7 17:51:35 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Feb 7 21:37:17 2018 +0100 [NTOSKRNL] Rename ExpCriticalWorkerThreads and ExpDelayedWorkerThreads (no p) to match Windows names and make them available for the whole kernel. --- ntoskrnl/ex/work.c | 8 ++++---- ntoskrnl/include/internal/ex.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/ex/work.c b/ntoskrnl/ex/work.c index a5cfe71909..731f442a85 100644 --- a/ntoskrnl/ex/work.c +++ b/ntoskrnl/ex/work.c @@ -35,8 +35,8 @@ EX_WORK_QUEUE ExWorkerQueue[MaximumWorkQueue]; /* Accounting of the total threads and registry hacked threads */ -ULONG ExpCriticalWorkerThreads; -ULONG ExpDelayedWorkerThreads; +ULONG ExCriticalWorkerThreads; +ULONG ExDelayedWorkerThreads; ULONG ExpAdditionalCriticalWorkerThreads; ULONG ExpAdditionalDelayedWorkerThreads; @@ -566,7 +566,7 @@ ExpInitializeWorkerThreads(VOID) { /* Create the thread */ ExpCreateWorkerThread(CriticalWorkQueue, FALSE); - ExpCriticalWorkerThreads++; + ExCriticalWorkerThreads++; } /* Create the built-in worker threads for the delayed queue */ @@ -574,7 +574,7 @@ ExpInitializeWorkerThreads(VOID) { /* Create the thread */ ExpCreateWorkerThread(DelayedWorkQueue, FALSE); - ExpDelayedWorkerThreads++; + ExDelayedWorkerThreads++; } /* Create the built-in worker thread for the hypercritical queue */ diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index 09ba4648df..053b8c813c 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -28,6 +28,8 @@ extern LIST_ENTRY ExpNonPagedLookasideListHead; extern LIST_ENTRY ExpPagedLookasideListHead; extern KSPIN_LOCK ExpNonPagedLookasideListLock; extern KSPIN_LOCK ExpPagedLookasideListLock; +extern ULONG ExCriticalWorkerThreads; +extern ULONG ExDelayedWorkerThreads; /* * NT/Cm Version Info variables

6 years, 7 months

01/09: [NTOSKRNL] Save system size on init in CcCapturedSystemSize

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee7b3b315d343e73ea0bb… commit ee7b3b315d343e73ea0bb6c130660bb67bc83667 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Feb 7 17:49:23 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Feb 7 21:37:17 2018 +0100 [NTOSKRNL] Save system size on init in CcCapturedSystemSize --- ntoskrnl/cc/view.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index cf2fc328b1..9344a97c8d 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -65,6 +65,7 @@ ULONG CcLazyWriteIos = 0; * - Spinlock when dealing with the deferred list * - List for "clean" shared cache maps * - One second delay for lazy writer + * - System size when system started */ ULONG CcDirtyPageThreshold = 0; ULONG CcTotalDirtyPages = 0; @@ -72,6 +73,7 @@ LIST_ENTRY CcDeferredWrites; KSPIN_LOCK CcDeferredWriteSpinLock; LIST_ENTRY CcCleanSharedCacheMapList; LARGE_INTEGER CcIdleDelay = RTL_CONSTANT_LARGE_INTEGER((LONGLONG)-1*1000*1000*10); +MM_SYSTEMSIZE CcCapturedSystemSize; /* Internal vars (ROS): * - Event to notify lazy writer to shutdown @@ -1447,7 +1449,8 @@ CcInitView ( KeInitializeEvent(&iLazyWriterNotify, NotificationEvent, FALSE); /* Define lazy writer threshold, depending on system type */ - switch (MmQuerySystemSize()) + CcCapturedSystemSize = MmQuerySystemSize(); + switch (CcCapturedSystemSize) { case MmSmallSystem: CcDirtyPageThreshold = MmNumberOfPhysicalPages / 8;

6 years, 7 months

01/01: [TRANSLATION] Simplified Chinese translation update for NETID and PING. (#369)

by Luo Yufan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19737a2cb9753c243e1ec… commit 19737a2cb9753c243e1ecb76d0b786d4522a2982 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Wed Feb 7 21:03:42 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Feb 7 14:03:42 2018 +0100 [TRANSLATION] Simplified Chinese translation update for NETID and PING. (#369) --- base/applications/network/ping/lang/zh-CN.rc | 70 +++++++++++----------- base/system/userinit/lang/zh-CN.rc | 5 +- base/system/winlogon/lang/zh-CN.rc | 3 +- dll/win32/netid/lang/zh-CN.rc | 9 +-- modules/rosapps/applications/winfile/lang/zh-CN.rc | 2 +- 5 files changed, 46 insertions(+), 43 deletions(-) diff --git a/base/applications/network/ping/lang/zh-CN.rc b/base/applications/network/ping/lang/zh-CN.rc index 62e11434b4..bb278cfbfd 100644 --- a/base/applications/network/ping/lang/zh-CN.rc +++ b/base/applications/network/ping/lang/zh-CN.rc @@ -1,7 +1,7 @@ /* * FILE: base/applications/network/ping/lang/zh-CN.rc * PURPOSE: Chinese (Simplified) translations for ReactOS Ping Command - * TRANSLATORS: + * TRANSLATORS: 2018 Luo Yufan (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -9,58 +9,58 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN IDS_USAGE "\n\ -Usage: ping [-t] [-a] [-n count] [-l size] [-f] [-i TTL] [-v TOS]\n\ +用法: ping [-t] [-a] [-n count] [-l size] [-f] [-i TTL] [-v TOS]\n\ [-w timeout] [-4] [-6] target\n\ \n\ Options:\n\ - -t Ping the specified host until stopped.\n\ - To see statistics and continue - type Control-Break;\n\ - To stop - type Control-C.\n\ - -a Resolve addresses to hostnames.\n\ - -n count Number of echo requests to send.\n\ - -l size Send buffer size.\n\ - -f Set Don't Fragment flag in packet (IPv4-only).\n\ - -i TTL Time To Live.\n\ - -v TOS Type Of Service (IPv4-only. This setting has been deprecated\n\ - and has no effect on the type of service field in the IP\n\ - Header).\n\ - -w timeout Timeout in milliseconds to wait for each reply.\n\ - -4 Force using IPv4.\n\ - -6 Force using IPv6.\n\ + -t Ping 指定的主机，直到停止。\n\ + 若要查看统计信息并继续操作，请键入 Ctrl+Break；\n\ + 若要停止，请键入 Ctrl+C。\n\ + -a 将地址解析为主机名。\n\ + -n count 要发送的回显请求数。\n\ + -l size 发送缓冲区大小。\n\ + -f 在数据包中设置“不分段”标记(仅适用于 IPv4)。\n\ + -i TTL 生存时间。\n\ + -v TOS 服务类型(仅适用于 IPv4。该设置已被弃用，\n\ + 对 IP 标头中的服务类型字段没有任何\n\ + 影响)。\n\ + -w timeout 等待每次回复的超时时间(毫秒)。\n\ + -4 强制使用 IPv4。\n\ + -6 强制使用 IPv6。\n\ \n" IDS_CTRL_BREAK "Control-Break\n" IDS_CTRL_C "Control-C\n" - IDS_NO_RESOURCES "Not enough resources available.\n" - IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %s.\n" - IDS_BAD_OPTION "Bad option %s.\n" - IDS_BAD_PARAMETER "Bad parameter %s.\n" + IDS_NO_RESOURCES "没有足够的可用资源。\n" + IDS_MISSING_ADDRESS "必须指定 IP 地址\n" + IDS_MISSING_VALUE "必须为选项 %s 提供值。\n" + IDS_BAD_OPTION "选项 %s 不正确。\n" + IDS_BAD_PARAMETER "错误的参数 %s.\n" IDS_BAD_VALUE "Bad value for option %s, valid range is from %u to %u.\n" IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" - IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_UNKNOWN_HOST "Ping 请求找不到主机 %s. 请检查该名称，然后重试。\n" IDS_PINGING_ADDRESS "\nPinging %s " IDS_PINGING_HOSTNAME "\nPinging %s [%s] " IDS_SOURCE_ADDRESS "from %s %s" - IDS_PING_SIZE "with %lu bytes of data:\n\n" - IDS_REPLY_FROM "Reply from %s: " - IDS_REPLY_BYTES "bytes=%d " - IDS_REPLY_TIME_MS "time=%lums " - IDS_REPLY_TIME_0MS "time<1ms " + IDS_PING_SIZE "具有 %lu 字节的数据:\n\n" + IDS_REPLY_FROM "来自 %s 的回复: " + IDS_REPLY_BYTES "字节=%d " + IDS_REPLY_TIME_MS "时间=%lums " + IDS_REPLY_TIME_0MS "时间<1ms " IDS_REPLY_TTL "TTL=%d\n" IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n" - IDS_REQUEST_TIMED_OUT "Request timed out.\n" - IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" + IDS_REQUEST_TIMED_OUT "请求超时。\n" + IDS_TTL_EXPIRED "TTL 传输中过期。\n" + IDS_TRANSMIT_FAILED "PING: 传输失败。(Error %u)\n" IDS_STATISTICS "\n\ -Ping statistics for %s:\n\ - Packets: Sent = %d, Received = %d, Lost %d (%d%% loss),\n" +%s 的 Ping 统计信息:\n\ + 数据包: 已发送 = %d, 已接收 = %d, 丢失 %d (%d%% 丢失),\n" - IDS_APPROXIMATE_RTT "Approximate round-trip time in milliseconds:\n\ - Minimum = %lums, Maximum = %lums, Average = %lums\n" + IDS_APPROXIMATE_RTT "往返行程的估计时间(以毫秒为单位):\n\ + 最短 = %lums, 最长 = %lums, 平均 = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" + IDS_WINSOCK_FAIL "无法初始化 Windows Sockets 接口: %i\n" END diff --git a/base/system/userinit/lang/zh-CN.rc b/base/system/userinit/lang/zh-CN.rc index 02affe3847..5535037c97 100644 --- a/base/system/userinit/lang/zh-CN.rc +++ b/base/system/userinit/lang/zh-CN.rc @@ -1,4 +1,5 @@ /* Simpified Chinese translation by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> 2011 */ +/* Improved by Luo Yufan (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -37,9 +38,9 @@ END STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit 无法启动外壳！" + IDS_SHELL_FAIL "Userinit 无法启动 Shell！" IDS_INSTALLER_FAIL "Userinit 启动安装程序失败！" - IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." + IDS_CANCEL_CONFIRM "你确定要退出 ReactOS LiveCD 吗?\n如果选择退出，您的计算机将重新启动。" END STRINGTABLE diff --git a/base/system/winlogon/lang/zh-CN.rc b/base/system/winlogon/lang/zh-CN.rc index 32f600750d..c1db1be5cb 100644 --- a/base/system/winlogon/lang/zh-CN.rc +++ b/base/system/winlogon/lang/zh-CN.rc @@ -1,4 +1,5 @@ /* Simplified Chinese translation by zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> */ +/* Improved by Luo Yufan (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -18,7 +19,7 @@ CAPTION "用户界面失败" FONT 9, "宋体" BEGIN LTEXT "加载登录用户界面的 DLL 文件 %s 失败。", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "请与系统管理员联系，以替换 DLL 文件，或还原原 DLL。", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + LTEXT "请与系统管理员联系，以替换 DLL 文件，或还原初始的 DLL。", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 DEFPUSHBUTTON "重新启动(&R)", 1, 80, 91, 68, 14 END diff --git a/dll/win32/netid/lang/zh-CN.rc b/dll/win32/netid/lang/zh-CN.rc index 91a5bf9f51..c6375a2095 100644 --- a/dll/win32/netid/lang/zh-CN.rc +++ b/dll/win32/netid/lang/zh-CN.rc @@ -1,4 +1,5 @@ /* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ +/* Improved by Luo Yufan (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -8,14 +9,14 @@ CAPTION "计算机名称" FONT 9, "宋体" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON - LTEXT "ReactOS 使用以下信息来标识您的计算机在网络上。", IDC_STATIC, 40, 5, 204, 20 + LTEXT "ReactOS 使用以下信息在网络中标识这台计算机。", IDC_STATIC, 40, 5, 204, 20 LTEXT "计算机描述:", IDC_STATIC, 6, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "完整的计算机名称:", IDC_STATIC, 6, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "工作组:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "要使用网络识别向导去加入域并创建本地用户，请单击""网络 ID"".", IDC_STATIC, 6, 113, 172, 24 + LTEXT "要使用网络识别向导去加入域并创建本地用户账户，请单击""网络 ID"".", IDC_STATIC, 6, 113, 172, 24 PUSHBUTTON "网络 ID...(&N)", IDC_NETWORK_ID, 190, 114, 58, 15 LTEXT "若要重命名此计算机或加入域，请单击""更改""。", IDC_STATIC, 6, 149, 170, 17 PUSHBUTTON "更改...(&C)", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 @@ -24,7 +25,7 @@ END IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "计算机名称更改" +CAPTION "计算机名更改" FONT 9, "宋体" BEGIN LTEXT "(此处显示消息)", 1017, 7, 5, 218, 30 @@ -37,7 +38,7 @@ BEGIN AUTORADIOBUTTON "域:(&D)", 1008, 17, 132, 192, 10, WS_GROUP AUTORADIOBUTTON "工作组:(&W)", 1004, 17, 161, 191, 10 EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP - PUSHBUTTON "找我的域名(&F)", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "查找我的域(&F)", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT DEFPUSHBUTTON "确定", 1, 121, 203, 50, 14, WS_GROUP PUSHBUTTON "取消", 2, 176, 203, 50, 14 diff --git a/modules/rosapps/applications/winfile/lang/zh-CN.rc b/modules/rosapps/applications/winfile/lang/zh-CN.rc index 2c578301e5..8ffb6344dc 100644 --- a/modules/rosapps/applications/winfile/lang/zh-CN.rc +++ b/modules/rosapps/applications/winfile/lang/zh-CN.rc @@ -69,7 +69,7 @@ IDM_WINEFILE MENU #endif MENUITEM SEPARATOR MENUITEM "连接网络驱动器(&N)", ID_CONNECT_NETWORK_DRIVE - MENUITEM "断开网络驱动器(&D)", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM "断开网络驱动器连接(&D)", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "共享为...", 254 MENUITEM "删除共享(&R)...", 255

6 years, 7 months

01/01: [SYSSETUP] Hackfix CORE-14228 Wine's comctl32 somehow fails to load an 24bpp image with ImageList_LoadImageW when crMask is CLR_NONE so use a color that doesn't exist in the bitmaps until comctl32 gets fixed.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e05f08be4e00d54048781… commit e05f08be4e00d5404878117c83b95280a4c14612 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Wed Feb 7 02:26:28 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Feb 7 02:26:28 2018 +0200 [SYSSETUP] Hackfix CORE-14228 Wine's comctl32 somehow fails to load an 24bpp image with ImageList_LoadImageW when crMask is CLR_NONE so use a color that doesn't exist in the bitmaps until comctl32 gets fixed. I prefer to add this silly hack in a non critical dll than make a hasty change in the critical comctl32 until some proper tests are written for this absurd failure. --- dll/win32/syssetup/wizard.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index b61347f8ec..9ef4fd755b 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -1623,17 +1623,17 @@ ThemePageDlgProc(HWND hwndDlg, case WM_INITDIALOG: { BUTTON_IMAGELIST imldata = {0, {0,10,0,10}, BUTTON_IMAGELIST_ALIGN_TOP}; - + /* Save pointer to the global setup data */ SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData); - - imldata.himl = ImageList_LoadImage(hDllInstance, MAKEINTRESOURCE(IDB_CLASSIC), 0, 0, CLR_NONE , IMAGE_BITMAP, LR_CREATEDIBSECTION); + + imldata.himl = ImageList_LoadImage(hDllInstance, MAKEINTRESOURCE(IDB_CLASSIC), 0, 0, 0x00FF00FF, IMAGE_BITMAP, LR_CREATEDIBSECTION); SendDlgItemMessage(hwndDlg, IDC_CLASSICSTYLE, BCM_SETIMAGELIST, 0, (LPARAM)&imldata); - imldata.himl = ImageList_LoadImage(hDllInstance, MAKEINTRESOURCE(IDB_LAUTUS), 0, 0, CLR_NONE , IMAGE_BITMAP, LR_CREATEDIBSECTION); + imldata.himl = ImageList_LoadImage(hDllInstance, MAKEINTRESOURCE(IDB_LAUTUS), 0, 0, 0x00FF00FF , IMAGE_BITMAP, LR_CREATEDIBSECTION); SendDlgItemMessage(hwndDlg, IDC_THEMEDSTYLE, BCM_SETIMAGELIST, 0, (LPARAM)&imldata); - + SendDlgItemMessage(hwndDlg, IDC_CLASSICSTYLE, BM_SETCHECK, BST_CHECKED, 0); break; }

6 years, 7 months

01/01: [SYSSETUP] Don't load ISOLATIONAWARE_MANIFEST_RESOURCE_ID manually Such a manifest is meant to be activated by the caller of the exports of the dll. This means that the user of syssetup which is setup.exe is the one that should do the proper handling of the manifests. Since setup.exe is the one that needs to do the right thing, add a CREATEPROCESS_MANIFEST_RESOURCE_ID to it and avoid dealing with ISOLATIONAWARE_MANIFEST_RESOURCE_ID altogether (which is supposed to be used by activating th

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=218b8eda92bc84be24a61… commit 218b8eda92bc84be24a61c055e567f95b5e5a16b Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Wed Feb 7 01:15:49 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Feb 7 01:15:49 2018 +0200 [SYSSETUP] Don't load ISOLATIONAWARE_MANIFEST_RESOURCE_ID manually Such a manifest is meant to be activated by the caller of the exports of the dll. This means that the user of syssetup which is setup.exe is the one that should do the proper handling of the manifests. Since setup.exe is the one that needs to do the right thing, add a CREATEPROCESS_MANIFEST_RESOURCE_ID to it and avoid dealing with ISOLATIONAWARE_MANIFEST_RESOURCE_ID altogether (which is supposed to be used by activating the activation context before calling the exports of the dll that has it). We don't really use ISOLATIONAWARE_MANIFEST_RESOURCE_ID correctly in any place in the tree so let's rely on CREATEPROCESS_MANIFEST_RESOURCE_ID for now. This fixes one part of CORE-14228 where no image was shown in the theme selector buttons. This happened because comctl32 was statically linked and calling ImageList_LoadImage ended up creating an image list with comctl32 v5. Then we passed this image list to a button created with comctl32 v6 and as a result the image list was unusable. This is yet another issue that needs to be addressed in the future. Namely, it seems that in windows comctl32 v6 can use image lists created by comctl32 v5 whereas we cannot. This fix is not a hack but cleverly works around these two bugs that need to be addressed some time in the future. CORE-14228 --- base/setup/setup/setup.rc | 3 +++ dll/win32/syssetup/syssetup.rc | 2 -- dll/win32/syssetup/wizard.c | 33 --------------------------------- 3 files changed, 3 insertions(+), 35 deletions(-) diff --git a/base/setup/setup/setup.rc b/base/setup/setup/setup.rc index b95b0681c6..f36359966c 100644 --- a/base/setup/setup/setup.rc +++ b/base/setup/setup/setup.rc @@ -1,4 +1,7 @@ +#include <winuser.h> + #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup" #define REACTOS_STR_INTERNAL_NAME "setup" #define REACTOS_STR_ORIGINAL_FILENAME "setup.exe" +#include <reactos/manifest_exe.rc> #include <reactos/version.rc> diff --git a/dll/win32/syssetup/syssetup.rc b/dll/win32/syssetup/syssetup.rc index bac2e57df0..041295dc4c 100644 --- a/dll/win32/syssetup/syssetup.rc +++ b/dll/win32/syssetup/syssetup.rc @@ -24,8 +24,6 @@ IDI_ICON3 ICON "resources/3.ico" IDI_ICON4 ICON "resources/4.ico" IDI_ICON5 ICON "resources/5.ico" -#include <reactos/manifest_dll.rc> - STRINGTABLE BEGIN IDS_ACKPROJECTS "Wine - http://www.winehq.org\nFreeType - http://www.freetype.org\nSYSLINUX - http://syslinux.zytor.com\nMinGW - http://www.mingw.org\nBochs - http://bochs.sourceforge.net\nQEMU - http://fabrice.bellard.free.fr/qemu\nMesa3D - http://www.mesa3d.org\nadns - http://www.gnu.org/software/adns\nICU - http://www.icu-project.org/\nGraphApp - http://enchantia.com/software/graphapp/\nExt2 - http://www.ext2fsd.com/\nGNU FreeFont - http://savannah.gnu.org/projects/freefont/\nDeja [...] diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 796476838f..b61347f8ec 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -2491,25 +2491,6 @@ ProcessUnattendSetup( typedef DWORD(WINAPI *PFNREQUESTWIZARDPAGES)(PDWORD, HPROPSHEETPAGE *, PSETUPDATA); -BOOL ActivateComctl32v6ActCtx(ULONG_PTR *cookie, HANDLE* hActCtx) -{ - ACTCTXW ActCtx = {sizeof(ACTCTX), ACTCTX_FLAG_RESOURCE_NAME_VALID}; - WCHAR fileBuffer[MAX_PATH]; - - *hActCtx = INVALID_HANDLE_VALUE; - - if (!GetModuleFileName(hDllInstance, fileBuffer, MAX_PATH)) - return FALSE; - - ActCtx.lpSource = fileBuffer; - ActCtx.lpResourceName = ISOLATIONAWARE_MANIFEST_RESOURCE_ID; - *hActCtx = CreateActCtx(&ActCtx); - if (*hActCtx == INVALID_HANDLE_VALUE) - return FALSE; - - return ActivateActCtx(*hActCtx, cookie); -} - VOID InstallWizard(VOID) { @@ -2523,9 +2504,6 @@ InstallWizard(VOID) HMODULE hNetShell = NULL; PFNREQUESTWIZARDPAGES pfn = NULL; DWORD dwPageCount = 8, dwNetworkPageCount = 0; - BOOL bActCtxActivated; - ULONG_PTR cookie; - HANDLE hActCtx; LogItem(L"BEGIN_SECTION", L"InstallWizard"); @@ -2543,11 +2521,6 @@ InstallWizard(VOID) goto done; } - /* Load and activate the act ctx for comctl32v6 now manually. - * Even if the exe of the process had a manifest, at the point of its launch - * the manifest of comctl32 wouldn't be installed so it wouldn't be loaded at all */ - bActCtxActivated = ActivateComctl32v6ActCtx(&cookie, &hActCtx); - hNetShell = LoadLibraryW(L"netshell.dll"); if (hNetShell != NULL) { @@ -2701,12 +2674,6 @@ done: if (hNetShell != NULL) FreeLibrary(hNetShell); - if (bActCtxActivated) - { - DeactivateActCtx(0, cookie); - ReleaseActCtx(hActCtx); - } - if (pSetupData != NULL) { DeleteObject(pSetupData->hBoldFont);

6 years, 7 months

01/01: [EXPLORER] Update all preview bitmaps showing notification area

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=579e1e6b24de8d3a25b92… commit 579e1e6b24de8d3a25b928d1f59b6ab3b53ed01b Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Feb 6 17:35:08 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Feb 6 17:35:08 2018 +0100 [EXPLORER] Update all preview bitmaps showing notification area To reflect recent changes in taskbar height, icon spacing, clock x and y margins. Also make sure all shots show the exact same time and choose a more localization agnostic time. --- base/shell/explorer/res/bmp/154.bmp | Bin 12838 -> 12838 bytes base/shell/explorer/res/bmp/155.bmp | Bin 12838 -> 12838 bytes base/shell/explorer/res/bmp/180.bmp | Bin 12838 -> 12838 bytes base/shell/explorer/res/bmp/181.bmp | Bin 12838 -> 12838 bytes base/shell/explorer/res/bmp/182.bmp | Bin 12838 -> 12838 bytes base/shell/explorer/res/bmp/183.bmp | Bin 12838 -> 12838 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/base/shell/explorer/res/bmp/154.bmp b/base/shell/explorer/res/bmp/154.bmp index 0bc115461e..ae0ba177f5 100644 Binary files a/base/shell/explorer/res/bmp/154.bmp and b/base/shell/explorer/res/bmp/154.bmp differ diff --git a/base/shell/explorer/res/bmp/155.bmp b/base/shell/explorer/res/bmp/155.bmp index c5824b4abf..4c9e1822d8 100644 Binary files a/base/shell/explorer/res/bmp/155.bmp and b/base/shell/explorer/res/bmp/155.bmp differ diff --git a/base/shell/explorer/res/bmp/180.bmp b/base/shell/explorer/res/bmp/180.bmp index 40042ddd41..2890a44076 100644 Binary files a/base/shell/explorer/res/bmp/180.bmp and b/base/shell/explorer/res/bmp/180.bmp differ diff --git a/base/shell/explorer/res/bmp/181.bmp b/base/shell/explorer/res/bmp/181.bmp index 7247b20fe4..461725b9c4 100644 Binary files a/base/shell/explorer/res/bmp/181.bmp and b/base/shell/explorer/res/bmp/181.bmp differ diff --git a/base/shell/explorer/res/bmp/182.bmp b/base/shell/explorer/res/bmp/182.bmp index f5039d18e8..07cb49445b 100644 Binary files a/base/shell/explorer/res/bmp/182.bmp and b/base/shell/explorer/res/bmp/182.bmp differ diff --git a/base/shell/explorer/res/bmp/183.bmp b/base/shell/explorer/res/bmp/183.bmp index 214213d448..0f7734cab4 100644 Binary files a/base/shell/explorer/res/bmp/183.bmp and b/base/shell/explorer/res/bmp/183.bmp differ

6 years, 7 months

01/01: [EXPLORER] Update classic/modern startmenu preview bitmaps

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd7eae67950099eddbfc3… commit bd7eae67950099eddbfc3465223f4b04e16fe5de Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Feb 6 14:48:43 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Feb 6 14:48:43 2018 +0100 [EXPLORER] Update classic/modern startmenu preview bitmaps To reflect our recent updates in banners and notification area. Also reduces explorer binary size by 214.016bytes. --- base/shell/explorer/res/bmp/170.bmp | Bin 162054 -> 55078 bytes base/shell/explorer/res/bmp/171.bmp | Bin 162054 -> 55078 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/base/shell/explorer/res/bmp/170.bmp b/base/shell/explorer/res/bmp/170.bmp index 9350839c52..108ad0cca3 100644 Binary files a/base/shell/explorer/res/bmp/170.bmp and b/base/shell/explorer/res/bmp/170.bmp differ diff --git a/base/shell/explorer/res/bmp/171.bmp b/base/shell/explorer/res/bmp/171.bmp index 5c17822cb4..1c6911e09b 100644 Binary files a/base/shell/explorer/res/bmp/171.bmp and b/base/shell/explorer/res/bmp/171.bmp differ

6 years, 7 months

01/01: [NTOSKRNL] Define the Mm global variables related to Cc on Mm init. This means that MmSystemCacheStart, MmSystemCacheEnd, MmSizeOfSystemCacheInPages have now a valid value. System cache is not used atm the moment though. MmMapViewInSystemCache() is to be implemented, and Cc is to be made aware of this.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d56a24908908b57485209… commit d56a24908908b574852091af0b8bd9dca7bc1165 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Feb 6 13:38:55 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Feb 6 13:41:23 2018 +0100 [NTOSKRNL] Define the Mm global variables related to Cc on Mm init. This means that MmSystemCacheStart, MmSystemCacheEnd, MmSizeOfSystemCacheInPages have now a valid value. System cache is not used atm the moment though. MmMapViewInSystemCache() is to be implemented, and Cc is to be made aware of this. CORE-14259 --- ntoskrnl/include/internal/i386/mm.h | 1 + ntoskrnl/mm/ARM3/mminit.c | 11 ++++++++++- ntoskrnl/mm/mminit.c | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/i386/mm.h b/ntoskrnl/include/internal/i386/mm.h index 7d5c5ed667..a77b92b9e3 100644 --- a/ntoskrnl/include/internal/i386/mm.h +++ b/ntoskrnl/include/internal/i386/mm.h @@ -20,6 +20,7 @@ #define HYPER_SPACE_END 0xC0BFFFFF #endif #define MI_SYSTEM_CACHE_WS_START (PVOID)0xC0C00000 +#define MI_SYSTEM_CACHE_START (PVOID)0xC1000000 #define MI_PAGED_POOL_START (PVOID)0xE1000000 #define MI_NONPAGED_POOL_END (PVOID)0xFFBE0000 #define MI_DEBUG_MAPPING (PVOID)0xFFBFF000 diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index 76d4a4bee8..eb625fcecb 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -240,8 +240,9 @@ PMMPTE MiHighestUserPxe; #endif /* These variables define the system cache address space */ -PVOID MmSystemCacheStart; +PVOID MmSystemCacheStart = MI_SYSTEM_CACHE_START; PVOID MmSystemCacheEnd; +ULONG MmSizeOfSystemCacheInPages; MMSUPPORT MmSystemCacheWs; // @@ -2494,6 +2495,14 @@ MmArmInitSystem(IN ULONG Phase, return FALSE; } + /* Define limits for system cache */ +#ifdef _M_AMD64 + MmSizeOfSystemCacheInPages = (MI_SYSTEM_CACHE_END - MI_SYSTEM_CACHE_START) / PAGE_SIZE; +#else + MmSizeOfSystemCacheInPages = ((ULONG_PTR)MI_PAGED_POOL_START - (ULONG_PTR)MI_SYSTEM_CACHE_START) / PAGE_SIZE; +#endif + MmSystemCacheEnd = (PVOID)((ULONG_PTR)MmSystemCacheStart + (MmSizeOfSystemCacheInPages * PAGE_SIZE) - 1); + /* Initialize the system cache */ //MiInitializeSystemCache(MmSystemCacheWsMinimum, MmAvailablePages); diff --git a/ntoskrnl/mm/mminit.c b/ntoskrnl/mm/mminit.c index 7f756cb778..e0166ee8fb 100644 --- a/ntoskrnl/mm/mminit.c +++ b/ntoskrnl/mm/mminit.c @@ -154,6 +154,9 @@ MiDbgDumpAddressSpace(VOID) DPRINT1(" 0x%p - 0x%p\t%s\n", HYPER_SPACE, HYPER_SPACE_END, "Hyperspace"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmSystemCacheStart, MmSystemCacheEnd, + "System Cache"); DPRINT1(" 0x%p - 0x%p\t%s\n", MmPagedPoolStart, (ULONG_PTR)MmPagedPoolStart + MmSizeOfPagedPoolInBytes,

6 years, 7 months

01/01: [RAPPS] Do not resize (hide) the treeview when minimizing.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64d32eab27ce87995e3dd… commit 64d32eab27ce87995e3ddd0dd487bfe6586eaef1 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Feb 6 00:02:17 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Feb 6 00:08:12 2018 +0100 [RAPPS] Do not resize (hide) the treeview when minimizing. --- base/applications/rapps/gui.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 4a3e2794b3..4ef3bd475c 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -939,6 +939,8 @@ private: VOID OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam) { + if (wParam == SIZE_MINIMIZED) + return; /* Size status bar */ m_StatusBar->SendMessage(WM_SIZE, 0, 0);

6 years, 7 months

01/01: [TRANSLATION] Romanian translation for FONTEXT and TIMEOUT (#363)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b718776768583be8eeab… commit 7b718776768583be8eeaba24a6628514d878af07 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Feb 5 18:57:39 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 5 18:57:39 2018 +0100 [TRANSLATION] Romanian translation for FONTEXT and TIMEOUT (#363) [FONTEXT]: At the moment there is a comment in the en-US.rc resource file that advises to not translate it. I only created this file as a basis for the future. The file will be updated later when there is the possibility for FONTEXT to be translated further. --- base/applications/cmdutils/timeout/lang/ro-RO.rc | 40 ++++++++++++++++++++++++ base/applications/cmdutils/timeout/timeout.rc | 3 ++ dll/shellext/fontext/fontext.rc | 3 ++ dll/shellext/fontext/lang/ro-RO.rc | 13 ++++++++ 4 files changed, 59 insertions(+) diff --git a/base/applications/cmdutils/timeout/lang/ro-RO.rc b/base/applications/cmdutils/timeout/lang/ro-RO.rc new file mode 100644 index 0000000000..b11dff1997 --- /dev/null +++ b/base/applications/cmdutils/timeout/lang/ro-RO.rc @@ -0,0 +1,40 @@ +/* + * PROJECT: ReactOS Timeout Utility + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Timeout Utility in Romanian language + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "Utilitatea Timeout de ReactOS\n\ +\n\ +TIMEOUT [/?] [/T] timp [/NOBREAK]\n\ +\n\ +Descriere:\n\ + Această utilitate așteaptă până când perioada de timp specificată (în secunde) a scurs,\n\ + sau după ce orice tastă a fost apăsată. Un parametru de a ignora o tastă apăsată este de asemenea\n\ + acceptată.\n\ +\n\ +Parametri:\n\ + /? Afișează această ecrană de ajutor.\n\ +\n\ + /T timp Specifică un număr în secunde pentru așteptare (-1 la 99999).\n\ + O valoare de -1 înseamnă că programul va aștepta până când o tastă va fi apăsată.\n\ + Rețineți că specificația ""/T"" este opțională, puteți să\n\ + specificați o valoare în timp fără aceasta.\n\ +\n\ + /NOBREAK Ignoră orice input de către tastatură cu excepția Ctrl+C.\n\ +" + IDS_ERROR_OUT_OF_RANGE "EROARE: Valoarea de timp trebuie să fie în acest câmp (-1 la 99999).\n" + IDS_ERROR_INVALID_HANDLE_VALUE "EROARE: Imposibil obținerea unui handle standard pentru consolă (eroare %lu).\n" + IDS_ERROR_READ_INPUT "EROARE: Imposibil citirea inputu-lui de către consolă (eroare %lu).\n" + IDS_ERROR_NO_TIMER_VALUE "EROARE: O valoare de timp trebuie să fie specificată (-1 la 99999).\n" + IDS_ERROR_ONE_TIME "EROARE: Doar o valoare de timp este necesară.\n" + IDS_NOBREAK_INPUT "Apasă Ctrl+C pentru a ieși..." + IDS_USER_INPUT "Apasă orice tastă pentru a continua..." + IDS_NOBREAK_INPUT_COUNT "Așteptând %d secunde, apasă Ctrl+C pentru a ieși..." + IDS_USER_INPUT_COUNT "Așteptând %d secunde, apasă orice tastă pentru a continua..." +END diff --git a/base/applications/cmdutils/timeout/timeout.rc b/base/applications/cmdutils/timeout/timeout.rc index e5156b41b1..a8e7440fe9 100644 --- a/base/applications/cmdutils/timeout/timeout.rc +++ b/base/applications/cmdutils/timeout/timeout.rc @@ -22,6 +22,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif diff --git a/dll/shellext/fontext/fontext.rc b/dll/shellext/fontext/fontext.rc index 67d6d4adb8..61f9904cd3 100644 --- a/dll/shellext/fontext/fontext.rc +++ b/dll/shellext/fontext/fontext.rc @@ -14,6 +14,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif diff --git a/dll/shellext/fontext/lang/ro-RO.rc b/dll/shellext/fontext/lang/ro-RO.rc new file mode 100644 index 0000000000..af1d14c65c --- /dev/null +++ b/dll/shellext/fontext/lang/ro-RO.rc @@ -0,0 +1,13 @@ +/* + * PROJECT: ReactOS Font Text + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Romanian translation for FONTEXT + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_REACTOS_FONTS_FOLDER "Folder-ul de fonturi de ReactOS" +END

6 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
23
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2018