Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [WIN32SS][COMCTL32] Fix button text Y positioning (#766)
by Katayama Hirofumi MZ 09 Sep '18

09 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a244e4f6ddbfee4f66e3e… commit a244e4f6ddbfee4f66e3e1ea5b9f48e09465dbc1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 10 00:37:37 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 9 17:37:37 2018 +0200 [WIN32SS][COMCTL32] Fix button text Y positioning (#766) Fixes the vertical position of button text. CORE-14906 --- dll/win32/comctl32/button.c | 4 ++++ win32ss/user/user32/controls/button.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c index bc9336d705..813aa7455d 100644 --- a/dll/win32/comctl32/button.c +++ b/dll/win32/comctl32/button.c @@ -1273,7 +1273,11 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc) { case DT_TOP: r.top++; r.bottom++; break; case DT_VCENTER: n = r.bottom - r.top; +#ifdef __REACTOS__ + r.top = rc->top + ((rc->bottom - 1 - rc->top) - n) / 2; +#else r.top = rc->top + ((rc->bottom - rc->top) - n) / 2; +#endif r.bottom = r.top + n; break; case DT_BOTTOM: n = r.bottom - r.top; r.bottom = rc->bottom - 1; diff --git a/win32ss/user/user32/controls/button.c b/win32ss/user/user32/controls/button.c index 2538a9847b..6e7d70e77e 100644 --- a/win32ss/user/user32/controls/button.c +++ b/win32ss/user/user32/controls/button.c @@ -832,7 +832,11 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc) { case DT_TOP: r.top++; r.bottom++; break; case DT_VCENTER: n = r.bottom - r.top; +#ifdef __REACTOS__ + r.top = rc->top + ((rc->bottom - 1 - rc->top) - n) / 2; +#else r.top = rc->top + ((rc->bottom - rc->top) - n) / 2; +#endif r.bottom = r.top + n; break; case DT_BOTTOM: n = r.bottom - r.top; r.bottom = rc->bottom - 1;

1 0

01/01: [NETAPI32] Implement NetGroupAddUser and NetGroupDelUser
by Eric Kohl 09 Sep '18

09 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d645f62fe7baff3c5e0f… commit 2d645f62fe7baff3c5e0f215f439000441f5cb5d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 9 17:33:03 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 9 17:35:18 2018 +0200 [NETAPI32] Implement NetGroupAddUser and NetGroupDelUser --- dll/win32/netapi32/group.c | 31 ------ dll/win32/netapi32/group_new.c | 231 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 231 insertions(+), 31 deletions(-) diff --git a/dll/win32/netapi32/group.c b/dll/win32/netapi32/group.c index b87ab9b83c..efb46e86c1 100644 --- a/dll/win32/netapi32/group.c +++ b/dll/win32/netapi32/group.c @@ -22,37 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32); -/************************************************************ - * NetGroupAddUser (NETAPI32.@) - * - */ -NET_API_STATUS -WINAPI -NetGroupAddUser(IN LPCWSTR servername, - IN LPCWSTR groupname, - IN LPCWSTR username) -{ - FIXME("(%s, %s, %s) stub!\n", debugstr_w(servername), - debugstr_w(groupname), debugstr_w(username)); - return ERROR_ACCESS_DENIED; -} - - -/************************************************************ - * NetGroupDelUser (NETAPI32.@) - * - */ -NET_API_STATUS -WINAPI -NetGroupDelUser(IN LPCWSTR servername, - IN LPCWSTR groupname, - IN LPCWSTR username) -{ - FIXME("(%s, %s, %s) stub!\n", debugstr_w(servername), - debugstr_w(groupname), debugstr_w(username)); - return ERROR_ACCESS_DENIED; -} - /************************************************************ * NetGroupGetUsers (NETAPI32.@) diff --git a/dll/win32/netapi32/group_new.c b/dll/win32/netapi32/group_new.c index 7a9d27185b..743e685c94 100644 --- a/dll/win32/netapi32/group_new.c +++ b/dll/win32/netapi32/group_new.c @@ -443,6 +443,122 @@ done: } +NET_API_STATUS +WINAPI +NetGroupAddUser( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR groupname, + _In_ LPCWSTR username) +{ + UNICODE_STRING ServerName; + UNICODE_STRING GroupName; + UNICODE_STRING UserName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE GroupHandle = NULL; + PULONG RelativeIds = NULL; + PSID_NAME_USE Use = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("NetGroupAddUser(%s, %s, %s)\n", + debugstr_w(servername), debugstr_w(groupname), debugstr_w(username)); + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&GroupName, groupname); + + RtlInitUnicodeString(&UserName, username); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Acount Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the group account */ + ApiStatus = OpenGroupByName(DomainHandle, + &GroupName, + GROUP_ADD_MEMBER, + &GroupHandle, + NULL); + if (ApiStatus != NERR_Success) + { + ERR("OpenGroupByName failed (ApiStatus %lu)\n", ApiStatus); + if (ApiStatus == ERROR_NONE_MAPPED) + ApiStatus = NERR_GroupNotFound; + goto done; + } + + Status = SamLookupNamesInDomain(DomainHandle, + 1, + &UserName, + &RelativeIds, + &Use); + if (!NT_SUCCESS(Status)) + { + ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Fail, if it is not a user account */ + if (Use[0] != SidTypeUser) + { + ERR("Object is not a user!\n"); + ApiStatus = NERR_GroupNotFound; + goto done; + } + + Status = SamAddMemberToGroup(GroupHandle, + RelativeIds[0], + 0); + if (!NT_SUCCESS(Status)) + { + ERR("SamAddMemberToGroup failed (Status %lu)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + +done: + if (RelativeIds != NULL) + SamFreeMemory(RelativeIds); + + if (Use != NULL) + SamFreeMemory(Use); + + if (GroupHandle != NULL) + SamCloseHandle(GroupHandle); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; +} + + NET_API_STATUS WINAPI NetGroupDel( @@ -526,6 +642,121 @@ done: } +NET_API_STATUS +WINAPI +NetGroupDelUser( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR groupname, + _In_ LPCWSTR username) +{ + UNICODE_STRING ServerName; + UNICODE_STRING GroupName; + UNICODE_STRING UserName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE GroupHandle = NULL; + PULONG RelativeIds = NULL; + PSID_NAME_USE Use = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("NetGroupDelUser(%s, %s, %s)\n", + debugstr_w(servername), debugstr_w(groupname), debugstr_w(username)); + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&GroupName, groupname); + + RtlInitUnicodeString(&UserName, username); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Acount Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the group account */ + ApiStatus = OpenGroupByName(DomainHandle, + &GroupName, + GROUP_REMOVE_MEMBER, + &GroupHandle, + NULL); + if (ApiStatus != NERR_Success) + { + ERR("OpenGroupByName failed (ApiStatus %lu)\n", ApiStatus); + if (ApiStatus == ERROR_NONE_MAPPED) + ApiStatus = NERR_GroupNotFound; + goto done; + } + + Status = SamLookupNamesInDomain(DomainHandle, + 1, + &UserName, + &RelativeIds, + &Use); + if (!NT_SUCCESS(Status)) + { + ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Fail, if it is not a user account */ + if (Use[0] != SidTypeUser) + { + ERR("Object is not a user!\n"); + ApiStatus = NERR_GroupNotFound; + goto done; + } + + Status = SamRemoveMemberFromGroup(GroupHandle, + RelativeIds[0]); + if (!NT_SUCCESS(Status)) + { + ERR("SamRemoveMemberFromGroup failed (Status %lu)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + +done: + if (RelativeIds != NULL) + SamFreeMemory(RelativeIds); + + if (Use != NULL) + SamFreeMemory(Use); + + if (GroupHandle != NULL) + SamCloseHandle(GroupHandle); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; +} + + NET_API_STATUS WINAPI NetGroupEnum(

1 0

01/01: [SETUP][REACTOS] Added Vietnamese translation. (#716)
by Nguyễn Thanh Sơn 09 Sep '18

09 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f47d0023b71cb9ea02059… commit f47d0023b71cb9ea0205905a814bead1fab80bec Author: Nguyễn Thanh Sơn <41716684+Dummynosrev(a)users.noreply.github.com> AuthorDate: Sun Sep 9 22:34:21 2018 +0700 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 9 17:34:21 2018 +0200 [SETUP][REACTOS] Added Vietnamese translation. (#716) --- base/setup/reactos/lang/vi-VN.rc | 137 +++++++++++++++++++++++++++++++++++++++ base/setup/reactos/reactos.rc | 5 +- 2 files changed, 141 insertions(+), 1 deletion(-) diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc new file mode 100644 index 0000000000..02eb29a8e9 --- /dev/null +++ b/base/setup/reactos/lang/vi-VN.rc @@ -0,0 +1,137 @@ +LANGUAGE LANG_VIETNAMESE, SUBLANG_VIETNAMESE_VIETNAM + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Cài đặt ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Chào mừng đến với Trình hướng dẫn thiết lập ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Bạn chưa thể cài đặt ReactOS trực tiếp tư đĩa CD này được! Xin hãy khởi động lại máy tính của bạn từ đĩa CD trên để cài đặt ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Ấn Hoàn tất để thoát trình Thiết lập.", IDC_STATIC, 115, 169, 195, 17 +END + +IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Cài đặt ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + AUTORADIOBUTTON "Cài đặt ReactOS", IDC_INSTALL, 7, 7, 277, 10 + LTEXT "Cài đặt một bản sao mới của ReactOS. Tùy chọn này sẽ không giữ lại các thư mục,tập tin và chương trình của bạn. Bạn có thể thực hiện những thay đổi cho các ổ đĩa và những phần phân chia trong ổ đĩa.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Cập nhật hay sửa chữa ReactOS", IDC_UPDATE, 7, 50, 277, 10 + LTEXT "Cập nhật hay sửa chữa một bản sao đã cài đặt của ReactOS. Tùy chọn này sẽ giữ lại các tập tin, cài đặt và chương trình của bạn. Tùy chọn này chỉ dùng được nếu ReactOS đã được cài đặt trên máy tinh này.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Ấn Tiếp để tiếp tục.", IDC_STATIC, 7, 128, 297, 8 +END + +IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Cài đặt ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Máy tính:", IDC_STATIC, 20, 15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + LTEXT "Màn hình:", IDC_STATIC, 20, 35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + LTEXT "Bàn phím:", IDC_STATIC, 20, 55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + LTEXT "Ấn Tiếp để thiết lập thiết bị cài đặt.", IDC_STATIC, 7, 128, 297, 8 +END + +IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Cài đặt ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&Tạo", IDC_PARTCREATE, 7, 122, 50, 14 + PUSHBUTTON "&Xóa", IDC_PARTDELETE, 63, 122, 50, 14 + PUSHBUTTON "P&hần mềm", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED + PUSHBUTTON "&Tùy chọn nâng cao...", IDC_PARTMOREOPTS, 230, 122, 80, 14 +/* LTEXT "Ấn Tiếp để kiểm tra phần tóm lượct.", IDC_STATIC, 7, 128, 277, 8 */ +END + +IDD_PARTITION DIALOGEX 0, 0, 145, 90 +STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +CAPTION "Phân chia ổ cứng" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13 + CONTROL "Tạo và định dạng phần ổ cứng", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 + LTEXT "Kích cỡ:", IDC_STATIC, 13, 24, 27, 9 + EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP + LTEXT "GB", IDC_UNIT, 117, 24, 14, 9 + LTEXT "Loại định dạng:", IDC_STATIC, 13, 46, 42, 9 + CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50 + PUSHBUTTON "&Đồng ý", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Hủy", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP +END + +IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +CAPTION "Tùy chọn phân chia ổ đĩa nâng cao" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Thư mục cài đặt", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 + EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE + CONTROL "Cài đặt Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 + CONTROL "Cài boot loader trên ổ cứng (MBR-MasterBootRecord- và VBR-VolumeBootRecord)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 + CONTROL "Cài boot loader (chỉ VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 + CONTROL "Không cài bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 + PUSHBUTTON "&Đồng ý", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Hủy", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE +END + +IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Cài đặt ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ấn Tiếp để băt đầu quá trình cài đặt.", IDC_STATIC, 7, 128, 303, 8 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Cài đặt ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cài đặt các tập tin...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 7, 120, 303, 8 +END + +IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Đang hoàn tất cài đặt Reactos" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bạn đã hoàn thành giai đoạn đầu của việc thiết lập ReactOS.", IDC_STATIC, 115, 50, 195, 10 + LTEXT "bạn Khi bạn ấn Hoàn tất,máy tính của bạn sẽ khởi động lại.", IDC_STATIC, 115, 80, 195, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Nếu ổ đĩa của bạn còn chứa dĩa CD cài đặt, hãy lấy nó ra. Sau đó, ấn Hoàn tất để khởi động lại máy tính của bạn.", IDC_STATIC, 115, 169, 195, 17 +END + +STRINGTABLE +BEGIN + IDS_TYPETITLE "Chào mừng tới trình Thiết lập ReactOS" + IDS_TYPESUBTITLE "Chọn kiểu thiết lập." + IDS_DEVICETITLE "Thiết lập các thiết bị cơ bản" + IDS_DEVICESUBTITLE "Chọn những cài đặt cho màn hình và bàn phím." + IDS_DRIVETITLE "Thiết lập phần ổ cứng để cài đặt và thư mục hệ thống" + IDS_DRIVESUBTITLE "Chuẩn bị phần ổ cứng, thư mục hệ thống và boot loader." + IDS_PROCESSTITLE "Thiết lập phần ổ cứng, sao chép tập tin và thiết lập hệ thống" + IDS_PROCESSSUBTITLE "Tạo và định dạng phần ổ đĩa, sao chép thư mục, cài đặt và thiết lập boot loader" + IDS_RESTARTTITLE "Giai đoạn đầu của việc thiết lập đã hoàn tất" + IDS_RESTARTSUBTITLE "Giai đoạn đầu của việc thiết lập đã được hoàn thành, khởi động lại máy tính để tiếp tuc với giai đoạn hai" + IDS_SUMMARYTITLE "Tóm lược quá trình cài đặt" + IDS_SUMMARYSUBTITLE "Liệt kê các thuộc tính đã lựa chọn nhằm kiểm lại trước khi áp dụng vào thiết bị được chọn" + IDS_ABORTSETUP "ReactOS vẵn chưa được hoàn tất cài đặt trên máy tính của bạn. Nếu bây giờ bạn hủy trình Thiết lập, lần tới ban sẽ cần phải chạy lại trình Thiết lập để cài đặt ReactOS. Bạn thực sự muốn bỏ?" + IDS_ABORTSETUP2 "Hủy bỏ trình Thiết lập?" + IDS_NO_TXTSETUP_SIF "Không thể tìm được tập tin 'txtsetup.sif'\ntrình Thiết lập không thể tiếp tục" + IDS_CAPTION "Cài đặt ReactOS" +END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Tên" + IDS_PARTITION_SIZE "Kích cỡ" + IDS_PARTITION_TYPE "Loại định dạng" +END diff --git a/base/setup/reactos/reactos.rc b/base/setup/reactos/reactos.rc index 633cfc4561..e20f4a6ab0 100644 --- a/base/setup/reactos/reactos.rc +++ b/base/setup/reactos/reactos.rc @@ -92,9 +92,12 @@ IDB_HEADER BITMAP "res/header.bmp" #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_VI_VN + #include "lang/vi-VN.rc" +#endif #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif \ No newline at end of file +#endif

1 0

01/01: [USETUP] Update French translation.
by Hermès Bélusca-Maïto 09 Sep '18

09 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=320e0d01aeaadbe8c21e6… commit 320e0d01aeaadbe8c21e6b53c5ade2a7b74069f0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 9 17:24:38 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 9 17:24:38 2018 +0200 [USETUP] Update French translation. --- base/setup/usetup/lang/fr-FR.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index fc2780e433..51456c43d9 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1797,7 +1797,7 @@ MUI_STRING frFRStrings[] = {STRING_REBOOTCOMPUTER2, " ENTR�E = Red�marrer l'ordinateur"}, {STRING_REBOOTPROGRESSBAR, - " Your computer will reboot in %li second(s)... "}, + " Votre ordinateur va red�marrer dans %li seconde(s)... "}, {STRING_CONSOLEFAIL1, "Impossible d'ouvrir la console\r\n\r\n"}, {STRING_CONSOLEFAIL2,

1 0

01/01: [USETUP] Implement the shutdown timeout progress bar. (#833)
by Bișoc George 09 Sep '18

09 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5c0bfacf1374abf34abb… commit e5c0bfacf1374abf34abbaf75047149a6252ca5e Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Aug 22 11:10:18 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 9 17:17:16 2018 +0200 [USETUP] Implement the shutdown timeout progress bar. (#833) - Add the MUI ID resource. - Implement the shutdown timeout progress bar function and the TimeOut string handler. - Add the resource string to other resource languages. --- base/setup/usetup/lang/bg-BG.h | 2 + base/setup/usetup/lang/bn-BD.h | 2 + base/setup/usetup/lang/cs-CZ.h | 2 + base/setup/usetup/lang/da-DK.h | 2 + base/setup/usetup/lang/de-DE.h | 2 + base/setup/usetup/lang/el-GR.h | 2 + base/setup/usetup/lang/en-US.h | 2 + base/setup/usetup/lang/es-ES.h | 2 + base/setup/usetup/lang/et-EE.h | 2 + base/setup/usetup/lang/fr-FR.h | 2 + base/setup/usetup/lang/he-IL.h | 2 + base/setup/usetup/lang/it-IT.h | 2 + base/setup/usetup/lang/ja-JP.h | 2 + base/setup/usetup/lang/lt-LT.h | 2 + base/setup/usetup/lang/ms-MY.h | 2 + base/setup/usetup/lang/nl-NL.h | 2 + base/setup/usetup/lang/pl-PL.h | 2 + base/setup/usetup/lang/pt-BR.h | 2 + base/setup/usetup/lang/ro-RO.h | 2 + base/setup/usetup/lang/ru-RU.h | 2 + base/setup/usetup/lang/sk-SK.h | 2 + base/setup/usetup/lang/sq-AL.h | 2 + base/setup/usetup/lang/sv-SE.h | 2 + base/setup/usetup/lang/tr-TR.h | 2 + base/setup/usetup/lang/uk-UA.h | 2 + base/setup/usetup/mui.h | 1 + base/setup/usetup/usetup.c | 215 +++++++++++++++++++++++++++++++++++++---- 27 files changed, 246 insertions(+), 20 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index c85d48cc86..b6366eac4e 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1792,6 +1792,8 @@ MUI_STRING bgBGStrings[] = " ��⮢�..."}, {STRING_REBOOTCOMPUTER2, " ENTER = �१��᪠�� "}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "�⢠�ﭥ� �� ꧬ��\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index fcc483b7d3..5a4d7786e1 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1777,6 +1777,8 @@ MUI_STRING bnBDStrings[] = " Done..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Reboot computer"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Unable to open the console\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 790fbfc6e6..4359652d37 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1785,6 +1785,8 @@ MUI_STRING csCZStrings[] = " Hotovo..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Restartovat po��ta�"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Nelze otev��t konzoli\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index f6029f6613..febfb2b68d 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1791,6 +1791,8 @@ MUI_STRING daDKStrings[] = " Udf�rt..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Genstart"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Kunne ikke �bne konsollen\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 9ddac46c7f..fda98fbce0 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1781,6 +1781,8 @@ MUI_STRING deDEStrings[] = " Fertig..."}, {STRING_REBOOTCOMPUTER2, " EINGABETASTE = Computer neu starten"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Konsole konnte nicht ge�ffnet werden\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 034b895f90..58e624f0c3 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1796,6 +1796,8 @@ MUI_STRING elGRStrings[] = " ��韞��..."}, {STRING_REBOOTCOMPUTER2, " ENTER = ��夞�� "}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "��礘�� 梘\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 216df8fc3b..9f3a6334e5 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1777,6 +1777,8 @@ MUI_STRING enUSStrings[] = " Done..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Reboot computer"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Unable to open the console\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 2bf3418b58..e52c7a56ad 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1781,6 +1781,8 @@ MUI_STRING esESStrings[] = " Terminado..."}, {STRING_REBOOTCOMPUTER2, " INTRO = Reiniciar el equipo"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "No se pudo abrir la consola\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index b21105d6c2..ee47d0ec84 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1777,6 +1777,8 @@ MUI_STRING etEEStrings[] = " Valmis..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Taask�ivita arvuti"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Konsooli ei �nnestunud avada\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 7f11d9ba68..fc2780e433 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1796,6 +1796,8 @@ MUI_STRING frFRStrings[] = " Termin�..."}, {STRING_REBOOTCOMPUTER2, " ENTR�E = Red�marrer l'ordinateur"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Impossible d'ouvrir la console\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index e48da925d2..686ed20ed8 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1779,6 +1779,8 @@ MUI_STRING heILStrings[] = " ��..."}, {STRING_REBOOTCOMPUTER2, " ENTER = �� "}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Unable to open the console\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index ad3c98b991..9fcaf4c6af 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1784,6 +1784,8 @@ MUI_STRING itITStrings[] = " Fatto..."}, {STRING_REBOOTCOMPUTER2, " INVIO = Riavvia il computer"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Impossibile aprire la console\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 1000261c0d..d30be1487d 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1781,6 +1781,8 @@ MUI_STRING jaJPStrings[] = " ��خ�..."}, {STRING_REBOOTCOMPUTER2, " ENTER = ��߭�� ޳"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "�ݿ�٦ �� ޷Ͼ�\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 9a90a8dbab..697b19ff67 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1787,6 +1787,8 @@ MUI_STRING ltLTStrings[] = " Done..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Reboot computer"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Unable to open the console\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index b4eceeb2f2..2da4e91f0f 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1666,6 +1666,8 @@ MUI_STRING msMYStrings[] = " Siap..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Memulakan semuala komputer"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Tidak dapat membuka konsol\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index c25d939dad..9f080ce4c2 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1807,6 +1807,8 @@ MUI_STRING nlNLStrings[] = " Voltooid..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Computer opnieuw opstarten"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Kan console niet openen.\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 384da7a97a..b1381bcac1 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1788,6 +1788,8 @@ MUI_STRING plPLStrings[] = " Uko�czone..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Restart komputera"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Otwarcie konsoli nieudane\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index e1cd55e159..4372dc3761 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1811,6 +1811,8 @@ MUI_STRING ptBRStrings[] = " Pronto..."}, {STRING_REBOOTCOMPUTER2, " ENTER=Reiniciar"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "N�o foi poss�vel abrir o console\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 67a8b312b7..ea86f5a9cd 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1831,6 +1831,8 @@ MUI_STRING roROStrings[] = " Terminat!"}, {STRING_REBOOTCOMPUTER2, " ENTER = Repornire calculator"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "E�ec la deschiderea consolei\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 6d087dfafd..32b7821193 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1778,6 +1778,8 @@ MUI_STRING ruRUStrings[] = " ��襭�..."}, {STRING_REBOOTCOMPUTER2, " ENTER = ��१��㧪�"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "�� 㤠�� ᮫�\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 35682911ce..be99ea5586 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1791,6 +1791,8 @@ MUI_STRING skSKStrings[] = " Hotovo..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Re�tart po��ta�a"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Nemo�no otvori� konzolu\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 021f11ad8c..bf157a9bda 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1784,6 +1784,8 @@ MUI_STRING sqALStrings[] = " Mbaruam..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Ristarto kompjuterin"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "N� pamundesi p�r t� hapur konsollin\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 2dafaf3602..38e766f447 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1787,6 +1787,8 @@ MUI_STRING svSEStrings[] = " F�rdigt..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Starta om datorn"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Det g�r inte �ppna Konsollen\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 59b9d13b2f..be2ce60cf5 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1758,6 +1758,8 @@ MUI_STRING trTRStrings[] = " Bitti..."}, {STRING_REBOOTCOMPUTER2, " Giri� = Bilgisayar� Yeniden Ba�lat"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "Konsol a��lam�yor.\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index b0b6d53e97..7f693079b8 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1787,6 +1787,8 @@ MUI_STRING ukUAStrings[] = " ��⮢�..."}, {STRING_REBOOTCOMPUTER2, " ENTER = ��१��⠦�� '��"}, + {STRING_REBOOTPROGRESSBAR, + " Your computer will reboot in %li second(s)... "}, {STRING_CONSOLEFAIL1, "�� i�� ᮫�\r\n\r\n"}, {STRING_CONSOLEFAIL2, diff --git a/base/setup/usetup/mui.h b/base/setup/usetup/mui.h index 0219cde43a..707bb80076 100644 --- a/base/setup/usetup/mui.h +++ b/base/setup/usetup/mui.h @@ -159,3 +159,4 @@ MUIGetString( #define STRING_MB 54 #define STRING_GB 55 #define STRING_ADDKBLAYOUTS 56 +#define STRING_REBOOTPROGRESSBAR 64 diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 1a7940c6e3..102db35f6d 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -4502,6 +4502,195 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) } +/** + * @name ProgressTimeOutStringHandler + * + * Handles the generation (displaying) of the timeout + * countdown to the screen dynamically. + * + * @param Bar + * A pointer to a progress bar. + * + * @param AlwaysUpdate + * Constantly update the progress bar (boolean type). + * + * @param Buffer + * A pointer to a string buffer. + * + * @param cchBufferSize + * The buffer's size in number of characters. + * + * @return + * TRUE or FALSE on function termination. + * + */ +static +BOOLEAN NTAPI +ProgressTimeOutStringHandler( + IN PPROGRESSBAR Bar, + IN BOOLEAN AlwaysUpdate, + OUT PSTR Buffer, + IN SIZE_T cchBufferSize) +{ + ULONG OldProgress = Bar->Progress; + + if (Bar->StepCount == 0) + { + Bar->Progress = 0; + } + else + { + Bar->Progress = Bar->StepCount - Bar->CurrentStep; + } + + /* Build the progress string if it has changed */ + if (Bar->ProgressFormatText && + (AlwaysUpdate || (Bar->Progress != OldProgress))) + { + RtlStringCchPrintfA(Buffer, cchBufferSize, + Bar->ProgressFormatText, Bar->Progress); + + return TRUE; + } + + return FALSE; +} + +/** + * @name ProgressCountdown + * + * Displays and draws a red-coloured progress bar with a countdown. + * When the timeout is reached, the flush page is displayed for reboot. + * + * @param Ir + * A pointer to an input keyboard record. + * + * @param TimeOut + * Initial countdown value in seconds. + * + * @return + * Nothing. + * + */ +static VOID +ProgressCountdown( + IN PINPUT_RECORD Ir, + IN LONG TimeOut) +{ + NTSTATUS Status; + ULONG StartTime; + LONG TimeElapsed; + LONG TimerValue = TimeOut, OldTimerValue; + LARGE_INTEGER Timeout; + PPROGRESSBAR ProgressBar; + BOOLEAN RefreshProgress = TRUE; + + /* Bail out if the timeout is already zero */ + if (TimeOut <= 0) + return; + + /* Create the timeout progress bar and set it up */ + ProgressBar = CreateProgressBarEx(13, + 26, + xScreen - 13, + yScreen - 20, + 10, + 24, + TRUE, + FOREGROUND_RED | BACKGROUND_BLUE, + TimerValue, + NULL, + MUIGetString(STRING_REBOOTPROGRESSBAR), + ProgressTimeOutStringHandler); + + StartTime = NtGetTickCount(); + CONSOLE_Flush(); + + OldTimerValue = TimerValue; + while (TRUE) + { + /* Decrease the timer */ + + /* + * Compute how much time the previous operations took. + * This allows us in particular to take account for any time + * elapsed if something slowed down. + */ + TimeElapsed = NtGetTickCount() - StartTime; + if (TimeElapsed >= 1000) + { + /* Increase StartTime by steps of 1 second */ + TimeElapsed /= 1000; + StartTime += (1000 * TimeElapsed); + + if (TimeElapsed <= TimerValue) + TimerValue -= TimeElapsed; + else + TimerValue = 0; + + RefreshProgress = TRUE; + } + + if (RefreshProgress) + { + ProgressSetStep(ProgressBar, OldTimerValue - TimerValue); + RefreshProgress = FALSE; + } + + /* Stop when the timer reaches zero */ + if (TimerValue <= 0) + break; + + /* Check for user key presses */ + + /* + * If the timer is used, use a passive wait of maximum 1 second + * while monitoring for incoming console input events, so that + * we are still able to display the timing count. + */ + + /* Wait a maximum of 1 second for input events */ + TimeElapsed = NtGetTickCount() - StartTime; + if (TimeElapsed < 1000) + { + /* Convert the time to NT Format */ + Timeout.QuadPart = (1000 - TimeElapsed) * -10000LL; + Status = NtWaitForSingleObject(StdInput, FALSE, &Timeout); + } + else + { + Status = STATUS_TIMEOUT; + } + + /* Check whether the input event has been signaled, or a timeout happened */ + if (Status == STATUS_TIMEOUT) + { + continue; + } + if (Status != STATUS_WAIT_0) + { + /* An error happened, bail out */ + DPRINT1("NtWaitForSingleObject() failed, Status 0x%08lx\n", Status); + break; + } + + /* Check for an ENTER key press */ + while (CONSOLE_ConInKeyPeek(Ir)) + { + if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ + { + /* Found it, stop waiting */ + goto Exit; + } + } + } + +Exit: + /* Destroy the progress bar and quit */ + DestroyProgressBar(ProgressBar); +} + + /* * Displays the QuitPage. * @@ -4572,15 +4761,9 @@ QuitPage(PINPUT_RECORD Ir) CONSOLE_SetStatusText(MUIGetString(STRING_REBOOTCOMPUTER2)); - while (TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return FLUSH_PAGE; - } - } + /* Wait for maximum 15 seconds or an ENTER key before quitting */ + ProgressCountdown(Ir, 15); + return FLUSH_PAGE; } @@ -4602,19 +4785,11 @@ SuccessPage(PINPUT_RECORD Ir) MUIDisplayPage(SUCCESS_PAGE); if (IsUnattendedSetup) - { return FLUSH_PAGE; - } - while (TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return FLUSH_PAGE; - } - } + /* Wait for maximum 15 seconds or an ENTER key before quitting */ + ProgressCountdown(Ir, 15); + return FLUSH_PAGE; }

1 0

01/01: [NTOSKRNL] Move data mapping implementation to an internel helper
by Pierre Schweitzer 09 Sep '18

09 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02da7b452c413c05d6863… commit 02da7b452c413c05d6863b03eb2d2479d25060d4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 9 11:14:42 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 9 14:02:13 2018 +0200 [NTOSKRNL] Move data mapping implementation to an internel helper --- ntoskrnl/cc/pin.c | 58 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index d96c64bc2f..3c8747e76b 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -31,12 +31,10 @@ ULONG CcPinReadNoWait = 0; /* FUNCTIONS *****************************************************************/ -/* - * @implemented - */ +static BOOLEAN NTAPI -CcMapData ( +CcpMapData( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -53,19 +51,6 @@ CcMapData ( LONGLONG ROffset; KIRQL OldIrql; - DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %lu, Flags 0x%lx," - " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, - Length, Flags, pBcb, pBuffer); - - if (Flags & MAP_WAIT) - { - ++CcMapDataWait; - } - else - { - ++CcMapDataNoWait; - } - ReadOffset = FileOffset->QuadPart; ASSERT(FileObject); @@ -160,11 +145,44 @@ CcMapData ( InsertTailList(&SharedCacheMap->BcbList, &iBcb->BcbEntry); KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); - CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> TRUE Bcb=%p\n", - FileObject, FileOffset, Length, Flags, iBcb); return TRUE; } +/* + * @implemented + */ +BOOLEAN +NTAPI +CcMapData ( + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG Flags, + OUT PVOID *pBcb, + OUT PVOID *pBuffer) +{ + BOOLEAN Ret; + + DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %lu, Flags 0x%lx," + " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, + Length, Flags, pBcb, pBuffer); + + if (Flags & MAP_WAIT) + { + ++CcMapDataWait; + } + else + { + ++CcMapDataNoWait; + } + + Ret = CcpMapData(FileObject, FileOffset, Length, Flags, pBcb, pBuffer); + + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> %d Bcb=%p\n", + FileObject, FileOffset, Length, Flags, Ret, *pBcb); + return Ret; +} + /* * @unimplemented */ @@ -246,7 +264,7 @@ CcPinRead ( } /* Map first */ - if (!CcMapData(FileObject, FileOffset, Length, Flags, Bcb, Buffer)) + if (!CcpMapData(FileObject, FileOffset, Length, Flags, Bcb, Buffer)) { return FALSE; }

1 0

01/01: [NETAPI32] Implement NetGroupSetInfo
by Eric Kohl 09 Sep '18

09 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df0137a1694a24291594c… commit df0137a1694a24291594cf3b9aa58168bcd45c9f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 9 13:39:01 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 9 13:39:01 2018 +0200 [NETAPI32] Implement NetGroupSetInfo --- dll/win32/netapi32/group.c | 18 --- dll/win32/netapi32/group_new.c | 255 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 254 insertions(+), 19 deletions(-) diff --git a/dll/win32/netapi32/group.c b/dll/win32/netapi32/group.c index 75c03697bc..b87ab9b83c 100644 --- a/dll/win32/netapi32/group.c +++ b/dll/win32/netapi32/group.c @@ -76,24 +76,6 @@ NetGroupGetUsers(IN LPCWSTR servername, } -/************************************************************ - * NetGroupSetInfo (NETAPI32.@) - * - */ -NET_API_STATUS -WINAPI -NetGroupSetInfo(IN LPCWSTR servername, - IN LPCWSTR groupname, - IN DWORD level, - IN LPBYTE buf, - OUT LPDWORD parm_err) -{ - FIXME("(%s, %s, %d, %p, %p) stub!\n", debugstr_w(servername), - debugstr_w(groupname), level, buf, parm_err); - return ERROR_ACCESS_DENIED; -} - - /************************************************************ * NetGroupSetUsers (NETAPI32.@) * diff --git a/dll/win32/netapi32/group_new.c b/dll/win32/netapi32/group_new.c index 7adb98b01c..7a9d27185b 100644 --- a/dll/win32/netapi32/group_new.c +++ b/dll/win32/netapi32/group_new.c @@ -272,7 +272,7 @@ NetGroupAdd( _In_opt_ LPCWSTR servername, _In_ DWORD level, _In_ LPBYTE buf, - _Out_ LPDWORD parm_err) + _Out_opt_ LPDWORD parm_err) { GROUP_ADM_COMMENT_INFORMATION AdminComment; GROUP_ATTRIBUTE_INFORMATION AttributeInfo; @@ -875,4 +875,257 @@ done: return ApiStatus; } + +NET_API_STATUS +WINAPI +NetGroupSetInfo( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR groupname, + _In_ DWORD level, + _In_ LPBYTE buf, + _Out_opt_ LPDWORD parm_err) +{ + UNICODE_STRING ServerName; + UNICODE_STRING GroupName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE GroupHandle = NULL; + GROUP_NAME_INFORMATION GroupNameInfo; + GROUP_ADM_COMMENT_INFORMATION AdminCommentInfo; + GROUP_ATTRIBUTE_INFORMATION AttributeInfo; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("NetGroupSetInfo(%s, %s, %d, %p, %p)\n", + debugstr_w(servername), debugstr_w(groupname), level, buf, parm_err); + + if (parm_err != NULL) + *parm_err = PARM_ERROR_NONE; + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&GroupName, groupname); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Acount Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the group */ + ApiStatus = OpenGroupByName(DomainHandle, + &GroupName, + GROUP_WRITE_ACCOUNT, + &GroupHandle, + NULL); + if (ApiStatus != NERR_Success) + { + WARN("OpenGroupByName failed (ApiStatus %lu)\n", ApiStatus); + if (ApiStatus == ERROR_NONE_MAPPED) + ApiStatus = NERR_GroupNotFound; + goto done; + } + + switch (level) + { + case 0: + /* Set the group name */ + RtlInitUnicodeString(&GroupNameInfo.Name, + ((PGROUP_INFO_0)buf)->grpi0_name); + + Status = SamSetInformationGroup(GroupHandle, + GroupNameInformation, + &GroupNameInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationGroup failed (ApiStatus %lu)\n", ApiStatus); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + break; + + case 1: + /* Set the group name */ + RtlInitUnicodeString(&GroupNameInfo.Name, + ((PGROUP_INFO_1)buf)->grpi1_name); + + Status = SamSetInformationGroup(GroupHandle, + GroupNameInformation, + &GroupNameInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationGroup failed (ApiStatus %lu)\n", ApiStatus); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Set the admin comment */ + RtlInitUnicodeString(&AdminCommentInfo.AdminComment, + ((PGROUP_INFO_1)buf)->grpi1_comment); + + Status = SamSetInformationGroup(GroupHandle, + GroupAdminCommentInformation, + &AdminCommentInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationGroup failed (ApiStatus %lu)\n", ApiStatus); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + break; + + case 2: + /* Set the group name */ + RtlInitUnicodeString(&GroupNameInfo.Name, + ((PGROUP_INFO_2)buf)->grpi2_name); + + Status = SamSetInformationGroup(GroupHandle, + GroupNameInformation, + &GroupNameInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationGroup failed (ApiStatus %lu)\n", ApiStatus); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Set the admin comment */ + RtlInitUnicodeString(&AdminCommentInfo.AdminComment, + ((PGROUP_INFO_2)buf)->grpi2_comment); + + Status = SamSetInformationGroup(GroupHandle, + GroupAdminCommentInformation, + &AdminCommentInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationGroup failed (ApiStatus %lu)\n", ApiStatus); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Set the attributes */ + AttributeInfo.Attributes = ((PGROUP_INFO_2)buf)->grpi2_attributes; + + Status = SamSetInformationGroup(GroupHandle, + GroupAttributeInformation, + &AttributeInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationGroup failed (ApiStatus %lu)\n", ApiStatus); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + break; + + case 3: + /* Set the group name */ + RtlInitUnicodeString(&GroupNameInfo.Name, + ((PGROUP_INFO_3)buf)->grpi3_name); + + Status = SamSetInformationGroup(GroupHandle, + GroupNameInformation, + &GroupNameInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationGroup failed (ApiStatus %lu)\n", ApiStatus); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Set the admin comment */ + RtlInitUnicodeString(&AdminCommentInfo.AdminComment, + ((PGROUP_INFO_3)buf)->grpi3_comment); + + Status = SamSetInformationGroup(GroupHandle, + GroupAdminCommentInformation, + &AdminCommentInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationGroup failed (ApiStatus %lu)\n", ApiStatus); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Set the attributes */ + AttributeInfo.Attributes = ((PGROUP_INFO_3)buf)->grpi3_attributes; + + Status = SamSetInformationGroup(GroupHandle, + GroupAttributeInformation, + &AttributeInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationGroup failed (ApiStatus %lu)\n", ApiStatus); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + break; + + case 1002: + /* Set the admin comment */ + RtlInitUnicodeString(&AdminCommentInfo.AdminComment, + ((PGROUP_INFO_1002)buf)->grpi1002_comment); + + Status = SamSetInformationGroup(GroupHandle, + GroupAdminCommentInformation, + &AdminCommentInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationGroup failed (ApiStatus %lu)\n", ApiStatus); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + break; + + case 1005: + /* Set the attributes */ + AttributeInfo.Attributes = ((PGROUP_INFO_1005)buf)->grpi1005_attributes; + + Status = SamSetInformationGroup(GroupHandle, + GroupAttributeInformation, + &AttributeInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationGroup failed (ApiStatus %lu)\n", ApiStatus); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + break; + + default: + ApiStatus = ERROR_INVALID_LEVEL; + goto done; + } + +done: + if (GroupHandle != NULL) + SamCloseHandle(GroupHandle); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; +} + /* EOF */

1 0

01/01: [NETAPI32] Implement NetGroupAdd and NetGroupDel
by Eric Kohl 09 Sep '18

09 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c48d09d19a683576c21d4… commit c48d09d19a683576c21d4e1f45ea53f7d0d8c68f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 9 11:52:08 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 9 11:52:44 2018 +0200 [NETAPI32] Implement NetGroupAdd and NetGroupDel --- dll/win32/netapi32/group.c | 32 ----- dll/win32/netapi32/group_new.c | 262 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 261 insertions(+), 33 deletions(-) diff --git a/dll/win32/netapi32/group.c b/dll/win32/netapi32/group.c index 7139f1b3b6..75c03697bc 100644 --- a/dll/win32/netapi32/group.c +++ b/dll/win32/netapi32/group.c @@ -22,23 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32); -/************************************************************ - * NetGroupAdd (NETAPI32.@) - * - */ -NET_API_STATUS -WINAPI -NetGroupAdd(IN LPCWSTR servername, - IN DWORD level, - IN LPBYTE buf, - OUT LPDWORD parm_err) -{ - FIXME("(%s, %d, %p, %p) stub!\n", debugstr_w(servername), - level, buf, parm_err); - return ERROR_ACCESS_DENIED; -} - - /************************************************************ * NetGroupAddUser (NETAPI32.@) * @@ -55,21 +38,6 @@ NetGroupAddUser(IN LPCWSTR servername, } -/************************************************************ - * NetGroupDel (NETAPI32.@) - * - */ -NET_API_STATUS -WINAPI -NetGroupDel(IN LPCWSTR servername, - IN LPCWSTR groupname) -{ - FIXME("(%s, %s) stub!\n", debugstr_w(servername), - debugstr_w(groupname)); - return ERROR_ACCESS_DENIED; -} - - /************************************************************ * NetGroupDelUser (NETAPI32.@) * diff --git a/dll/win32/netapi32/group_new.c b/dll/win32/netapi32/group_new.c index 7e4f9ef0a1..7adb98b01c 100644 --- a/dll/win32/netapi32/group_new.c +++ b/dll/win32/netapi32/group_new.c @@ -226,7 +226,7 @@ OpenGroupByName( &Use); if (!NT_SUCCESS(Status)) { - ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status); + WARN("SamLookupNamesInDomain failed (Status %08lx)\n", Status); return NetpNtStatusToApiStatus(Status); } @@ -266,6 +266,266 @@ done: /* PUBLIC FUNCTIONS **********************************************************/ +NET_API_STATUS +WINAPI +NetGroupAdd( + _In_opt_ LPCWSTR servername, + _In_ DWORD level, + _In_ LPBYTE buf, + _Out_ LPDWORD parm_err) +{ + GROUP_ADM_COMMENT_INFORMATION AdminComment; + GROUP_ATTRIBUTE_INFORMATION AttributeInfo; + UNICODE_STRING ServerName; + UNICODE_STRING GroupName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE GroupHandle = NULL; + PWSTR Name = NULL; + PWSTR Comment = NULL; + ULONG Attributes = 0; + ULONG RelativeId; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("NetGroupAdd(%s, %d, %p, %p)\n", + debugstr_w(servername), level, buf, parm_err); + + /* Initialize the Server name*/ + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + /* Initialize the Alias name*/ + switch (level) + { + case 0: + Name = ((PGROUP_INFO_0)buf)->grpi0_name; + Comment = NULL; + Attributes = 0; + break; + + case 1: + Name = ((PGROUP_INFO_1)buf)->grpi1_name; + Comment = ((PGROUP_INFO_1)buf)->grpi1_comment; + Attributes = 0; + break; + + case 2: + Name = ((PGROUP_INFO_2)buf)->grpi2_name; + Comment = ((PGROUP_INFO_2)buf)->grpi2_comment; + Attributes = ((PGROUP_INFO_2)buf)->grpi2_attributes; + break; + + case 3: + Name = ((PGROUP_INFO_3)buf)->grpi3_name; + Comment = ((PGROUP_INFO_3)buf)->grpi3_comment; + Attributes = ((PGROUP_INFO_3)buf)->grpi3_attributes; + break; + + default: + return ERROR_INVALID_LEVEL; + } + + RtlInitUnicodeString(&GroupName, Name); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the account domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_CREATE_GROUP | DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Try to open the group account */ + ApiStatus = OpenGroupByName(DomainHandle, + &GroupName, + GROUP_READ_INFORMATION, + &GroupHandle, + NULL); + if (ApiStatus == NERR_Success) + { + ERR("OpenGroupByName: Group %wZ already exists!\n", &GroupName); + + SamCloseHandle(GroupHandle); + ApiStatus = ERROR_GROUP_EXISTS; + goto done; + } + + ApiStatus = NERR_Success; + + /* Create the group */ + Status = SamCreateGroupInDomain(DomainHandle, + &GroupName, + DELETE | GROUP_WRITE_ACCOUNT, + &GroupHandle, + &RelativeId); + if (!NT_SUCCESS(Status)) + { + ERR("SamCreateGroupInDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + TRACE("Created group \"%wZ\" (RID: %lu)\n", &GroupName, RelativeId); + + /* Set the admin comment */ + if (level == 1 || level == 2 || level == 3) + { + RtlInitUnicodeString(&AdminComment.AdminComment, Comment); + + Status = SamSetInformationGroup(GroupHandle, + GroupAdminCommentInformation, + &AdminComment); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationAlias failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + + /* Delete the Alias if the Comment could not be set */ + SamDeleteGroup(GroupHandle); + + goto done; + } + } + + /* Set the attributes */ + if (level == 2 || level == 3) + { + AttributeInfo.Attributes = Attributes; + + Status = SamSetInformationGroup(GroupHandle, + GroupAttributeInformation, + &AttributeInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationAlias failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + + /* Delete the Alias if the Attributes could not be set */ + SamDeleteGroup(GroupHandle); + + goto done; + } + } + +done: + if (GroupHandle != NULL) + { + if (ApiStatus != NERR_Success) + SamDeleteGroup(GroupHandle); + else + SamCloseHandle(GroupHandle); + } + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; +} + + +NET_API_STATUS +WINAPI +NetGroupDel( + _In_opt_ LPCWSTR servername, + _In_ IN LPCWSTR groupname) +{ + UNICODE_STRING ServerName; + UNICODE_STRING GroupName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE GroupHandle = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("NetGroupDel(%s, %s)\n", + debugstr_w(servername), debugstr_w(groupname)); + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&GroupName, groupname); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Acount Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the group */ + ApiStatus = OpenGroupByName(DomainHandle, + &GroupName, + DELETE, + &GroupHandle, + NULL); + if (ApiStatus != NERR_Success) + { + ERR("OpenGroupByName failed (ApiStatus %lu)\n", ApiStatus); + if (ApiStatus == ERROR_NONE_MAPPED) + ApiStatus = NERR_GroupNotFound; + goto done; + } + + /* Delete the group */ + Status = SamDeleteGroup(GroupHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamDeleteGroup failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + +done: + if (GroupHandle != NULL) + SamCloseHandle(GroupHandle); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; +} + + NET_API_STATUS WINAPI NetGroupEnum(

1 0

01/01: [USBHUB_NEW][USBPORT] Fix buffer size calculation for multi-sz values in IRP_MN_QUERY_ID.
by Vadim Galyant 09 Sep '18

09 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3baf43c5def76d2b30bc3… commit 3baf43c5def76d2b30bc32f5792c110c3e90e686 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Sat Sep 8 20:52:06 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 9 11:24:48 2018 +0200 [USBHUB_NEW][USBPORT] Fix buffer size calculation for multi-sz values in IRP_MN_QUERY_ID. Also fix some copypasta'd DPRINTs. --- drivers/usb/usbhub_new/pnp.c | 8 ++++---- drivers/usb/usbport/pnp.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/usb/usbhub_new/pnp.c b/drivers/usb/usbhub_new/pnp.c index 16cd2b17b9..c1862574b0 100644 --- a/drivers/usb/usbhub_new/pnp.c +++ b/drivers/usb/usbhub_new/pnp.c @@ -1649,7 +1649,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, DeviceDescriptor->idProduct); } - Length = sizeof(Buffer) - (Remaining - sizeof(UNICODE_NULL)); + Length = sizeof(Buffer) - (Remaining - 2 * sizeof(UNICODE_NULL)); Id = ExAllocatePoolWithTag(PagedPool, Length, USB_HUB_TAG); @@ -1662,7 +1662,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, if (PortExtension->PortPdoFlags & USBHUB_PDO_FLAG_INIT_PORT_FAILED) { - DPRINT("USBH_PdoQueryId: BusQueryInstanceID - %S\n", Id); + DPRINT("USBH_PdoQueryId: BusQueryHardwareID - %S\n", Id); } else { @@ -1766,7 +1766,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, InterfaceDescriptor->bInterfaceClass); } - Length = sizeof(Buffer) - (Remaining - sizeof(UNICODE_NULL)); + Length = sizeof(Buffer) - (Remaining - 2 * sizeof(UNICODE_NULL)); Id = ExAllocatePoolWithTag(PagedPool, Length, USB_HUB_TAG); @@ -1779,7 +1779,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, if (PortExtension->PortPdoFlags & USBHUB_PDO_FLAG_INIT_PORT_FAILED) { - DPRINT("USBH_PdoQueryId: BusQueryInstanceID - %S\n", Id); + DPRINT("USBH_PdoQueryId: BusQueryCompatibleID - %S\n", Id); } else { diff --git a/drivers/usb/usbport/pnp.c b/drivers/usb/usbport/pnp.c index 4e7a545b27..545b75e820 100644 --- a/drivers/usb/usbport/pnp.c +++ b/drivers/usb/usbport/pnp.c @@ -1493,7 +1493,7 @@ USBPORT_GetDeviceHwIds(IN PDEVICE_OBJECT FdoDevice, L"USB\\ROOT_HUB"); } - Length = (sizeof(Buffer) - Remaining + sizeof(UNICODE_NULL)); + Length = (sizeof(Buffer) - Remaining + 2 * sizeof(UNICODE_NULL)); /* for debug only */ if (FALSE)

1 0

01/01: [NETAPI] Implement NetGroupGetInfo
by Eric Kohl 09 Sep '18

09 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9da3c50bea58d0c1bf0d… commit a9da3c50bea58d0c1bf0d2925a90cb449cd2a38c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 9 09:40:11 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 9 09:40:11 2018 +0200 [NETAPI] Implement NetGroupGetInfo --- dll/win32/netapi32/group.c | 17 ----- dll/win32/netapi32/group_new.c | 163 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 18 deletions(-) diff --git a/dll/win32/netapi32/group.c b/dll/win32/netapi32/group.c index cac6be73b0..7139f1b3b6 100644 --- a/dll/win32/netapi32/group.c +++ b/dll/win32/netapi32/group.c @@ -86,23 +86,6 @@ NetGroupDelUser(IN LPCWSTR servername, } -/************************************************************ - * NetGroupGetInfo (NETAPI32.@) - * - */ -NET_API_STATUS -WINAPI -NetGroupGetInfo(IN LPCWSTR servername, - IN LPCWSTR groupname, - IN DWORD level, - OUT LPBYTE *bufptr) -{ - FIXME("(%s, %s, %d, %p) stub!\n", debugstr_w(servername), - debugstr_w(groupname), level, bufptr); - return ERROR_ACCESS_DENIED; -} - - /************************************************************ * NetGroupGetUsers (NETAPI32.@) * diff --git a/dll/win32/netapi32/group_new.c b/dll/win32/netapi32/group_new.c index 5fa38313cf..7e4f9ef0a1 100644 --- a/dll/win32/netapi32/group_new.c +++ b/dll/win32/netapi32/group_new.c @@ -192,7 +192,7 @@ done: static VOID FreeGroupInfo( - PGROUP_GENERAL_INFORMATION GroupInfo) + _In_ PGROUP_GENERAL_INFORMATION GroupInfo) { if (GroupInfo->Name.Buffer != NULL) SamFreeMemory(GroupInfo->Name.Buffer); @@ -204,6 +204,66 @@ FreeGroupInfo( } +static +NET_API_STATUS +OpenGroupByName( + _In_ SAM_HANDLE DomainHandle, + _In_ PUNICODE_STRING GroupName, + _In_ ULONG DesiredAccess, + _Out_ PSAM_HANDLE GroupHandle, + _Out_ PULONG RelativeId) +{ + PULONG RelativeIds = NULL; + PSID_NAME_USE Use = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + /* Get the RID for the given user name */ + Status = SamLookupNamesInDomain(DomainHandle, + 1, + GroupName, + &RelativeIds, + &Use); + if (!NT_SUCCESS(Status)) + { + ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status); + return NetpNtStatusToApiStatus(Status); + } + + /* Fail, if it is not an alias account */ + if (Use[0] != SidTypeGroup) + { + ERR("Object is not a group!\n"); + ApiStatus = NERR_GroupNotFound; + goto done; + } + + /* Open the alias account */ + Status = SamOpenGroup(DomainHandle, + DesiredAccess, + RelativeIds[0], + GroupHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenGroup failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + if (RelativeId != NULL) + *RelativeId = RelativeIds[0]; + +done: + if (RelativeIds != NULL) + SamFreeMemory(RelativeIds); + + if (Use != NULL) + SamFreeMemory(Use); + + return ApiStatus; +} + + /* PUBLIC FUNCTIONS **********************************************************/ NET_API_STATUS @@ -454,4 +514,105 @@ done: return ApiStatus; } + +NET_API_STATUS +WINAPI +NetGroupGetInfo( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR groupname, + _In_ DWORD level, + _Out_ LPBYTE *bufptr) +{ + UNICODE_STRING ServerName; + UNICODE_STRING GroupName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE GroupHandle = NULL; + PGROUP_GENERAL_INFORMATION GroupInfo = NULL; + PVOID Buffer = NULL; + ULONG RelativeId; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("NetGroupGetInfo(%s, %s, %d, %p)\n", + debugstr_w(servername), debugstr_w(groupname), level, bufptr); + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&GroupName, groupname); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Acount Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the group account in the account domain */ + ApiStatus = OpenGroupByName(DomainHandle, + &GroupName, + GROUP_READ_INFORMATION, + &GroupHandle, + &RelativeId); + if (ApiStatus != NERR_Success) + { + ERR("OpenGroupByName failed (ApiStatus %lu)\n", ApiStatus); + if (ApiStatus == ERROR_NONE_MAPPED) + ApiStatus = NERR_GroupNotFound; + goto done; + } + + Status = SamQueryInformationGroup(GroupHandle, + GroupGeneralInformation, + (PVOID *)&GroupInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamQueryInformationGroup failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + ApiStatus = BuildGroupInfoBuffer(GroupInfo, + level, + RelativeId, + &Buffer); + if (ApiStatus != NERR_Success) + goto done; + +done: + if (GroupInfo != NULL) + FreeGroupInfo(GroupInfo); + + if (GroupHandle != NULL) + SamCloseHandle(GroupHandle); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + *bufptr = (LPBYTE)Buffer; + + return ApiStatus; +} + /* EOF */

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