Ros-diffs

ros-diffs@reactos.org

81390 discussions

04/05: [MAINTAINERS] Define who can be maintainer and how to be added to the file
by Pierre Schweitzer 12 Sep '18

12 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e516c2950b84d54ff66ba… commit e516c2950b84d54ff66ba795956a1080fa06ea43 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Sep 10 18:47:29 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Sep 12 08:13:28 2018 +0200 [MAINTAINERS] Define who can be maintainer and how to be added to the file --- MAINTAINERS | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 934c42fe86..eb7763219b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9,6 +9,7 @@ area of ReactOS. Being a maintainer means the following: - that person has good knownledge in the area - that person is able to enforce consistency in the area - that person may be available for giving help in the area + - that person has push access on the repository Being a maintainer does not mean the following: - that person is dedicated to the area - that person is working full-time on the area/on ReactOS @@ -25,7 +26,8 @@ from all the listed reviewers. Also, when submitted a pull request on GitHub, rules defined in CONTRIBUTING.md apply. And if the maintainer is not available and reviewers approved the pull request, developers feeling confident -can merge the pull request. +can merge the pull request. Note that reviewers do not necessarily +have push access to the repository. When submitting a bug report on Jira, if you want to be sure to have a developer with skills in that area, write @nick from M people. @@ -37,6 +39,10 @@ managing local patches. He is not here to upstream code on your behalf. As responsible, he may refuse a local patch if you did not try to upstream your changes. +If you want to get listed in that file, either put yourself in the +file and push it, or open a pull request. You can also ask a person +who has push access to add yourself. + This file uses a similar format to the Linux kernel MAINTAINERS file. Descriptions of section entries used here: M: Primary maintainer. Assign them pull requests

1 0

03/05: [MAINTAINERS] Add myself.
by Mark Jansen 12 Sep '18

12 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=09bffcab1e373606dcb5e… commit 09bffcab1e373606dcb5e1350a4672d6e2f3fcbe Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Sep 8 13:49:20 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Sep 12 08:13:28 2018 +0200 [MAINTAINERS] Add myself. Also add Pierre to ntdll --- MAINTAINERS | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 1b6338d117..934c42fe86 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -63,6 +63,18 @@ ACPICA Library S: Upstream F: drivers/bus/acpi/acpica/ +Apisets + M: learn-more, learn_more, Mark Jansen + S: Maintained + F: dll/apisets + +Application Compatibility subystem + M: learn-more, learn_more, Mark Jansen + S: Maintained + F: dll/appcompat + F: dll/shellext/acppage + F: ntoskrnl/ps/apphelp.c + Cache Manager M: HeisSpiter, Pierre Schweitzer S: Maintained @@ -74,6 +86,7 @@ Cache Manager Rewrite CMake Build Scripts M: + R: learn-more, learn_more, Mark Jansen R: ThFabba, Thomas Faber S: Maintained F: sdk/cmake/ @@ -120,12 +133,15 @@ Network File Systems kernel libraries NTDLL M: + R: HeisSpiter, Pierre Schweitzer + R: learn-more, learn_more, Mark Jansen R: ThFabba, Thomas Faber S: Maintained F: dll/ntdll/ ReactOS API Tests M: + R: learn-more, learn_more, Mark Jansen R: ThFabba, Thomas Faber S: Maintained F: modules/rostests/apitests/ @@ -142,10 +158,17 @@ ROS internals tools Run-Time Library (RTL) M: + R: learn-more, learn_more, Mark Jansen R: ThFabba, Thomas Faber S: Maintained F: sdk/lib/rtl/ +Shell Extensions + M: + R: learn-more, learn_more, Mark Jansen + S: Maintained + F: dll/shellext + Upstream File Systems M: HeisSpiter, Pierre Schweitzer S: Upstream

1 0

02/05: [MAINTAINERS] Add myself.
by Thomas Faber 12 Sep '18

12 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af4ae5e65815a6fd182b3… commit af4ae5e65815a6fd182b3b3455a1a3c6a788efbd Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Sep 8 12:10:53 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Sep 12 08:13:28 2018 +0200 [MAINTAINERS] Add myself. Also add Pierre to the kernel as a whole, at his request. Also fix a typo in "Abandoned". --- MAINTAINERS | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ea1ab51212..1b6338d117 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -51,15 +51,35 @@ Descriptions of section entries used here: this area C: Comments +ACPI + M: + R: ThFabba, Thomas Faber + S: Maintained + F: drivers/bus/acpi/ + F: hal/halx86/acpi/ + +ACPICA Library + M: ThFabba, Thomas Faber + S: Upstream + F: drivers/bus/acpi/acpica/ + Cache Manager M: HeisSpiter, Pierre Schweitzer S: Maintained F: ntoskrnl/cc/ Cache Manager Rewrite - S: Abandonned + S: Abandoned F: ntoskrnl/cache/ +CMake Build Scripts + M: + R: ThFabba, Thomas Faber + S: Maintained + F: sdk/cmake/ + F: */CMakeLists.txt + F: */*.cmake + File Systems M: HeisSpiter, Pierre Schweitzer S: Maintained @@ -73,11 +93,24 @@ File Systems Run Time Library F: ntoskrnl/fsrtl/ F: sdk/lib/drivers/ntoskrnl_vista/fsrtl.c -IO Manager +HID Drivers + M: + R: ThFabba, Thomas Faber + S: Maintained + F: drivers/hid/ + +Kernel M: R: HeisSpiter, Pierre Schweitzer + R: ThFabba, Thomas Faber S: Maintained - F: ntoskrnl/io/iomgr/ + F: ntoskrnl/ + +Network Drivers + M: + R: ThFabba, Thomas Faber + S: Maintained + F: drivers/network/ Network File Systems kernel libraries M: HeisSpiter, Pierre Schweitzer @@ -85,11 +118,34 @@ Network File Systems kernel libraries F: sdk/lib/drivers/rdbsslib/ F: sdk/lib/drivers/rxce/ +NTDLL + M: + R: ThFabba, Thomas Faber + S: Maintained + F: dll/ntdll/ + +ReactOS API Tests + M: + R: ThFabba, Thomas Faber + S: Maintained + F: modules/rostests/apitests/ + +ReactOS Kernel-Mode Tests + M: ThFabba, Thomas Faber + S: Maintained + F: modules/rostests/kmtests/ + ROS internals tools M: HeisSpiter, Pierre Schweitzer S: Maintained F: modules/rosapps/applications/rosinternals/ +Run-Time Library (RTL) + M: + R: ThFabba, Thomas Faber + S: Maintained + F: sdk/lib/rtl/ + Upstream File Systems M: HeisSpiter, Pierre Schweitzer S: Upstream @@ -108,6 +164,13 @@ Upstream File Systems F: sdk/lib/fslib/ext2lib/ F: sdk/lib/fslib/vfatlib/check/ +USB Drivers + M: ThFabba, Thomas Faber + S: Maintained + F: drivers/usb/ + F: sdk/lib/drivers/libusb/ + F: sdk/include/reactos/drivers/usbport/ + Virtual CD-ROM M: HeisSpiter, Pierre Schweitzer S: Maintained @@ -129,3 +192,9 @@ Windows Network File Systems functions M: HeisSpiter, Pierre Schweitzer S: Upstream F: dll/win32/mpr/wnet.c + +Wine Tests + M: + R: ThFabba, Thomas Faber + S: Upstream + F: modules/rostests/winetests/

1 0

01/05: Add a maintainers file
by Pierre Schweitzer 12 Sep '18

12 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8ce91e7168aa16ca71f4… commit a8ce91e7168aa16ca71f456556da35ae0f64eaa7 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 8 11:14:56 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Sep 12 08:13:28 2018 +0200 Add a maintainers file --- MAINTAINERS | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS new file mode 100644 index 0000000000..ea1ab51212 --- /dev/null +++ b/MAINTAINERS @@ -0,0 +1,131 @@ + List of maintainers for the ReactOS project + +This file purpose is to give newcomers to the projet the responsible +developers when submitting a pull request on GitHub, or opening a bug +report on Jira. + +This file will notably establish who is responsible for a specific +area of ReactOS. Being a maintainer means the following: + - that person has good knownledge in the area + - that person is able to enforce consistency in the area + - that person may be available for giving help in the area +Being a maintainer does not mean the following: + - that person is dedicated to the area + - that person is working full-time on the area/on ReactOS + - that person is paid + - that person is always available + +We have no supported (paid) areas in ReactOS. + +When submitting a pull request on GitHub and looking for reviewers, +look at that file and ask for a review from some of the people (M, R +- the most recently active in the area) listed in the matching area, +also, assign the pull request to the M person. Don't ask for a review +from all the listed reviewers. +Also, when submitted a pull request on GitHub, rules defined in +CONTRIBUTING.md apply. And if the maintainer is not available and +reviewers approved the pull request, developers feeling confident +can merge the pull request. +When submitting a bug report on Jira, if you want to be sure to have +a developer with skills in that area, write @nick from M people. + +There should be one and only one primary maintainer per area. + +In case of 3rd party code (also refered as upstream), the maintainer +is responsible of updating periodically the source code and of +managing local patches. He is not here to upstream code on your behalf. +As responsible, he may refuse a local patch if you did not try to +upstream your changes. + +This file uses a similar format to the Linux kernel MAINTAINERS file. +Descriptions of section entries used here: + M: Primary maintainer. Assign them pull requests + Use the GitHub, Jira, Real Name format for entry, squash if + some are overlapping + R: Reviewers. Ask them for review on pull requests + S: Status, one of the following: + Maintained: Someone is handling that area + Upstream: This is 3rd party code, synced in our tree + Abandoned: No one is handling that code anymore + F: Files. Directories, files (wildcards allowed) covered in + this area + C: Comments + +Cache Manager + M: HeisSpiter, Pierre Schweitzer + S: Maintained + F: ntoskrnl/cc/ + +Cache Manager Rewrite + S: Abandonned + F: ntoskrnl/cache/ + +File Systems + M: HeisSpiter, Pierre Schweitzer + S: Maintained + F: drivers/filesystems/ + F: sdk/lib/fslib/ + C: Also see "Upstream File Systems" + +File Systems Run Time Library + M: HeisSpiter, Pierre Schweitzer + S: Maintained + F: ntoskrnl/fsrtl/ + F: sdk/lib/drivers/ntoskrnl_vista/fsrtl.c + +IO Manager + M: + R: HeisSpiter, Pierre Schweitzer + S: Maintained + F: ntoskrnl/io/iomgr/ + +Network File Systems kernel libraries + M: HeisSpiter, Pierre Schweitzer + S: Maintained + F: sdk/lib/drivers/rdbsslib/ + F: sdk/lib/drivers/rxce/ + +ROS internals tools + M: HeisSpiter, Pierre Schweitzer + S: Maintained + F: modules/rosapps/applications/rosinternals/ + +Upstream File Systems + M: HeisSpiter, Pierre Schweitzer + S: Upstream + F: base/services/nfsd/ + F: dll/np/nfs/ + F: dll/shellext/shellbtrfs/ + F: drivers/filesystems/btrfs/ + F: drivers/filesystems/cdfs/ + F: drivers/filesystems/ext2/ + F: drivers/filesystems/fastfat_new/ + F: drivers/filesystems/ffs/ + F: drivers/filesystems/nfs/ + F: drivers/filesystems/reiserfs/ + F: media/doc/README.FSD + F: sdk/lib/fslib/btrfslib/ + F: sdk/lib/fslib/ext2lib/ + F: sdk/lib/fslib/vfatlib/check/ + +Virtual CD-ROM + M: HeisSpiter, Pierre Schweitzer + S: Maintained + F: modules/rosapps/applications/cmdutils/vcdcli/ + F: modules/rosapps/drivers/vcdrom/ + +Virtual Floppy Disk + M: HeisSpiter, Pierre Schweitzer + S: Upstream + F: modules/rosapps/applications/cmdutils/vfdcmd/ + F: modules/rosapps/drivers/vfd/ + +Win32 file functions + M: HeisSpiter, Pierre Schweitzer + S: Maintained + F: dll/win32/kernel32/client/file/ + +Windows Network File Systems functions + M: HeisSpiter, Pierre Schweitzer + S: Upstream + F: dll/win32/mpr/wnet.c

1 0

01/01: [NETAPI32] Implement NetLogonGetTimeServiceParentDomain
by Eric Kohl 11 Sep '18

11 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0b5050089270375e4df0… commit e0b5050089270375e4df0c8949e50020d94e6809 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Sep 11 15:02:19 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Sep 11 15:02:19 2018 +0200 [NETAPI32] Implement NetLogonGetTimeServiceParentDomain --- dll/win32/netapi32/netapi32.spec | 2 +- dll/win32/netapi32/netlogon.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dll/win32/netapi32/netapi32.spec b/dll/win32/netapi32/netapi32.spec index d00d2f4162..3b476e94b1 100644 --- a/dll/win32/netapi32/netapi32.spec +++ b/dll/win32/netapi32/netapi32.spec @@ -173,7 +173,7 @@ @ stdcall NetLocalGroupGetMembers(wstr wstr long ptr long ptr ptr ptr) @ stdcall NetLocalGroupSetInfo(wstr wstr long ptr ptr) @ stdcall NetLocalGroupSetMembers(wstr wstr long ptr long) -@ stub NetLogonGetTimeServiceParentDomain +@ stdcall NetLogonGetTimeServiceParentDomain(wstr ptr ptr) @ stdcall NetLogonSetServiceBits(wstr long long) @ stdcall NetMessageBufferSend(wstr wstr wstr ptr long) @ stdcall NetMessageNameAdd(wstr wstr) diff --git a/dll/win32/netapi32/netlogon.c b/dll/win32/netapi32/netlogon.c index 1133d5769d..d4b939109f 100644 --- a/dll/win32/netapi32/netlogon.c +++ b/dll/win32/netapi32/netlogon.c @@ -652,6 +652,34 @@ NetGetDCName( } +NET_API_STATUS +WINAPI +NetLogonGetTimeServiceParentDomain( + _In_ LPWSTR ServerName, + _Out_ LPWSTR *DomainName, + _Out_ LPBOOL PdcSameSite) +{ + NET_API_STATUS Status; + + TRACE("NetLogonGetTimeServiceParentDomain(%s, %p, %p)\n", + debugstr_w(ServerName), DomainName, PdcSameSite); + + RpcTryExcept + { + Status = NetrLogonGetTimeServiceParentDomain(ServerName, + DomainName, + PdcSameSite); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + NTSTATUS WINAPI NetLogonSetServiceBits(

1 0

03/03: [WINLOGON] On logoff, also disconnect from any remote location
by Pierre Schweitzer 11 Sep '18

11 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbff9a30461c71e408468… commit cbff9a30461c71e408468a54353775266ebb1314 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Sep 11 08:15:37 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Sep 11 08:30:31 2018 +0200 [WINLOGON] On logoff, also disconnect from any remote location This avoids keeping connections open and reopening them as soon as the user reopens their session. This fixes network shared being duplicated each time session is reopened. CORE-15012 --- base/system/winlogon/CMakeLists.txt | 2 +- base/system/winlogon/sas.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/base/system/winlogon/CMakeLists.txt b/base/system/winlogon/CMakeLists.txt index 8610bbfc91..64d3fef8b5 100644 --- a/base/system/winlogon/CMakeLists.txt +++ b/base/system/winlogon/CMakeLists.txt @@ -22,6 +22,6 @@ add_rc_deps(winlogon.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/winlogon.ico) add_executable(winlogon ${SOURCE} winlogon.rc) target_link_libraries(winlogon wine) set_module_type(winlogon win32gui) -add_importlibs(winlogon user32 advapi32 userenv secur32 rpcrt4 msvcrt kernel32 ntdll) +add_importlibs(winlogon user32 advapi32 userenv secur32 rpcrt4 mpr msvcrt kernel32 ntdll) add_pch(winlogon winlogon.h SOURCE) add_cd_file(TARGET winlogon DESTINATION reactos/system32 FOR all) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index e56ba639e7..d914bebefc 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -657,6 +657,9 @@ LogoffShutdownThread( ret = 0; } + /* Cancel all the user connections */ + WNetClearConnections(0); + if (LSData->Session->UserToken) RevertToSelf();

1 0

02/03: [SDK] Add WNetClearConnections() in the headers for undocumented stuff
by Pierre Schweitzer 11 Sep '18

11 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f5da265c87c32524db45… commit 6f5da265c87c32524db4557a86a5d27815538aa3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Sep 11 08:14:50 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Sep 11 08:30:31 2018 +0200 [SDK] Add WNetClearConnections() in the headers for undocumented stuff CORE-15012 --- sdk/include/reactos/undocuser.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index 5e2074a217..aadeb667b9 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -378,6 +378,9 @@ BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah); BOOL WINAPI UnregisterUserApiHook(VOID); +/* WNET undocumented functions */ +DWORD WINAPI WNetClearConnections(DWORD dwUnknown); + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

1 0

01/03: [MPR] Implement WNetClearConnections()
by Pierre Schweitzer 11 Sep '18

11 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf0112a6e6ce8f2a576c8… commit cf0112a6e6ce8f2a576c840f04964aecbff04f23 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Sep 11 08:08:56 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Sep 11 08:30:23 2018 +0200 [MPR] Implement WNetClearConnections() This has been submitted upstream. CORE-15012 --- dll/win32/mpr/mpr.spec | 1 + dll/win32/mpr/wnet.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/dll/win32/mpr/mpr.spec b/dll/win32/mpr/mpr.spec index ec17ebdb24..b75900bafd 100644 --- a/dll/win32/mpr/mpr.spec +++ b/dll/win32/mpr/mpr.spec @@ -55,6 +55,7 @@ @ stdcall WNetCancelConnection2W(wstr long long) @ stdcall WNetCancelConnectionA(str long) @ stdcall WNetCancelConnectionW(wstr long) +@ stdcall WNetClearConnections(long) @ stdcall WNetCloseEnum(long) @ stdcall WNetConnectionDialog1A(ptr) @ stdcall WNetConnectionDialog1W(ptr) diff --git a/dll/win32/mpr/wnet.c b/dll/win32/mpr/wnet.c index 82c9302849..75d6aef987 100644 --- a/dll/win32/mpr/wnet.c +++ b/dll/win32/mpr/wnet.c @@ -2646,6 +2646,64 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, return err; } +#ifdef __REACTOS__ +/***************************************************************** + * WNetClearConnections [MPR.@] + */ +DWORD WINAPI WNetClearConnections ( DWORD unknown ) +{ + HANDLE connected; + DWORD ret, size, count; + NETRESOURCEW * resources, * iter; + + ret = WNetOpenEnumW(RESOURCE_CONNECTED, RESOURCETYPE_ANY, 0, NULL, &connected); + if (ret != WN_SUCCESS) + { + if (ret != WN_NO_NETWORK) + { + return ret; + } + + /* Means no provider, then, clearing is OK */ + return WN_SUCCESS; + } + + size = 0x1000; + resources = HeapAlloc(GetProcessHeap(), 0, size); + if (!resources) + { + WNetCloseEnum(connected); + return WN_OUT_OF_MEMORY; + } + + do + { + size = 0x1000; + count = -1; + + memset(resources, 0, size); + ret = WNetEnumResourceW(connected, &count, resources, &size); + if (ret == WN_SUCCESS || ret == WN_MORE_DATA) + { + iter = resources; + for (; count; count--) + { + WNetCancelConnection2W(iter->lpLocalName, 0, TRUE); + + iter++; + } + } + else + break; + } while (ret != WN_NO_MORE_ENTRIES); + + HeapFree(GetProcessHeap(), 0, resources); + WNetCloseEnum(connected); + + return ret; +} +#endif + /*

1 0

01/01: [NETAPI32] Implement NetGroupGetUsers
by Eric Kohl 10 Sep '18

10 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74620c94d33e51c2e0249… commit 74620c94d33e51c2e02496ed70143a373fc82f8f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Sep 10 22:04:53 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Sep 10 22:05:49 2018 +0200 [NETAPI32] Implement NetGroupGetUsers --- dll/win32/netapi32/group.c | 22 ---- dll/win32/netapi32/group_new.c | 267 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 267 insertions(+), 22 deletions(-) diff --git a/dll/win32/netapi32/group.c b/dll/win32/netapi32/group.c index efb46e86c1..b252111b3c 100644 --- a/dll/win32/netapi32/group.c +++ b/dll/win32/netapi32/group.c @@ -23,28 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32); -/************************************************************ - * NetGroupGetUsers (NETAPI32.@) - * - */ -NET_API_STATUS -WINAPI -NetGroupGetUsers(IN LPCWSTR servername, - IN LPCWSTR groupname, - IN DWORD level, - OUT LPBYTE *bufptr, - IN DWORD prefmaxlen, - OUT LPDWORD entriesread, - OUT LPDWORD totalentries, - IN OUT PDWORD_PTR resume_handle) -{ - FIXME("(%s, %s, %d, %p, %d, %p, %p, %p) stub!\n", debugstr_w(servername), - debugstr_w(groupname), level, bufptr, prefmaxlen, entriesread, - totalentries, resume_handle); - return ERROR_ACCESS_DENIED; -} - - /************************************************************ * NetGroupSetUsers (NETAPI32.@) * diff --git a/dll/win32/netapi32/group_new.c b/dll/win32/netapi32/group_new.c index 743e685c94..dbf5a3bdf6 100644 --- a/dll/win32/netapi32/group_new.c +++ b/dll/win32/netapi32/group_new.c @@ -32,6 +32,21 @@ typedef struct _ENUM_CONTEXT ENUM_PHASE Phase; } ENUM_CONTEXT, *PENUM_CONTEXT; +typedef struct _USER_ENUM_CONTEXT +{ + SAM_HANDLE ServerHandle; + SAM_HANDLE DomainHandle; + SAM_HANDLE GroupHandle; + + ULONG MemberCount; + PULONG MemberIds; + PULONG Attributes; + PUNICODE_STRING Names; + + ULONG Start; + ULONG Count; +} USER_ENUM_CONTEXT, *PUSER_ENUM_CONTEXT; + /* FUNCTIONS *****************************************************************/ @@ -1107,6 +1122,258 @@ done: } +NET_API_STATUS +WINAPI +NetGroupGetUsers( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR groupname, + _In_ DWORD level, + _Out_ LPBYTE *bufptr, + _In_ DWORD prefmaxlen, + _Out_ LPDWORD entriesread, + _Out_ LPDWORD totalentries, + _Inout_ PDWORD_PTR resume_handle) +{ + UNICODE_STRING ServerName; + UNICODE_STRING GroupName; + PGROUP_USERS_INFO_0 UserInfo0; + PGROUP_USERS_INFO_1 UserInfo1; + PUSER_ENUM_CONTEXT EnumContext = NULL; + PVOID Buffer = NULL; + ULONG i, idx, Size; + PWSTR Ptr; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("NetGroupGetUsers(%s, %s, %d, %p, %d, %p, %p, %p)\n", + debugstr_w(servername), debugstr_w(groupname), level, bufptr, + prefmaxlen, entriesread, totalentries, resume_handle); + + *entriesread = 0; + *totalentries = 0; + *bufptr = NULL; + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&GroupName, groupname); + + if (resume_handle != NULL && *resume_handle != 0) + { + EnumContext = (PUSER_ENUM_CONTEXT)*resume_handle; + } + else + { + ApiStatus = NetApiBufferAllocate(sizeof(ENUM_CONTEXT), (PVOID*)&EnumContext); + if (ApiStatus != NERR_Success) + goto done; + + EnumContext->MemberCount = 0; + EnumContext->MemberIds = NULL; + EnumContext->Attributes = NULL; + EnumContext->Names = NULL; + EnumContext->Start = 0; + EnumContext->Count = 0; + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &EnumContext->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(EnumContext->ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LOOKUP, + &EnumContext->DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the group account */ + ApiStatus = OpenGroupByName(EnumContext->DomainHandle, + &GroupName, + GROUP_LIST_MEMBERS, + &EnumContext->GroupHandle, + NULL); + if (ApiStatus != NERR_Success) + { + ERR("OpenGroupByName failed (ApiStatus %lu)\n", ApiStatus); + if (ApiStatus == ERROR_NONE_MAPPED) + ApiStatus = NERR_GroupNotFound; + goto done; + } + + /* Get the group members */ + Status = SamGetMembersInGroup(EnumContext->GroupHandle, + &EnumContext->MemberIds, + &EnumContext->Attributes, + &EnumContext->MemberCount); + if (!NT_SUCCESS(Status)) + { + ERR("SamGetMembersInGroup failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + if (EnumContext->MemberCount > 0) + { + /* Get all member names */ + Status = SamLookupIdsInDomain(EnumContext->DomainHandle, + EnumContext->MemberCount, + EnumContext->MemberIds, + &EnumContext->Names, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamLookupIdsInDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + } + } + + /* Calculate the required buffer size */ + Size = 0; + if (prefmaxlen == -1) + { + Size = EnumContext->MemberCount * + ((level == 0) ? sizeof(GROUP_USERS_INFO_0) : sizeof(GROUP_USERS_INFO_1)); + for (i = EnumContext->Start; i < EnumContext->MemberCount; i++) + Size += EnumContext->Names[i].Length + sizeof(WCHAR); + + EnumContext->Count = EnumContext->MemberCount; + } + else + { + for (i = EnumContext->Start; i < EnumContext->MemberCount; i++) + { + Size += (level == 0) ? sizeof(GROUP_USERS_INFO_0) : sizeof(GROUP_USERS_INFO_1); + Size += EnumContext->Names[i].Length + sizeof(WCHAR); + + EnumContext->Count++; + + if (Size >= prefmaxlen) + break; + } + } + + TRACE("Buffer size: %lu\n", Size); + + /* Allocate and clear the buffer */ + ApiStatus = NetApiBufferAllocate(Size, &Buffer); + if (ApiStatus != NERR_Success) + goto done; + + ZeroMemory(Buffer, Size); + + /* Fill the buffer */ + if (level == 0) + Ptr = (PWCHAR)((LONG_PTR)Buffer + EnumContext->Count * sizeof(GROUP_USERS_INFO_0)); + else + Ptr = (PWCHAR)((LONG_PTR)Buffer + EnumContext->Count * sizeof(GROUP_USERS_INFO_1)); + + for (i = 0; i < EnumContext->Count; i++) + { + idx = EnumContext->Start + i; + + if (level == 0) + { + UserInfo0 = (PGROUP_USERS_INFO_0)Buffer; + + UserInfo0[i].grui0_name = Ptr; + + memcpy(UserInfo0[i].grui0_name, + EnumContext->Names[idx].Buffer, + EnumContext->Names[idx].Length); + UserInfo0[i].grui0_name[EnumContext->Names[idx].Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (PWSTR)((ULONG_PTR)Ptr + EnumContext->Names[idx].Length + sizeof(WCHAR)); + } + else + { + UserInfo1 = (PGROUP_USERS_INFO_1)Buffer; + + UserInfo1[i].grui1_name = Ptr; + + memcpy(UserInfo1[i].grui1_name, + EnumContext->Names[idx].Buffer, + EnumContext->Names[idx].Length); + UserInfo1[i].grui1_name[EnumContext->Names[idx].Length / sizeof(WCHAR)] = UNICODE_NULL; + + UserInfo1[i].grui1_attributes = EnumContext->Attributes[idx]; + + Ptr = (PWSTR)((ULONG_PTR)Ptr + EnumContext->Names[idx].Length + sizeof(WCHAR)); + } + } + + /* Set the new start index */ + EnumContext->Start += EnumContext->Count; + + /* Only return ERROR_MORE_DATA if we are not done yet */ + if (EnumContext->MemberCount > EnumContext->Start) + ApiStatus = ERROR_MORE_DATA; + else + ApiStatus = NERR_Success; + +done: + if (EnumContext != NULL) + { + *entriesread = EnumContext->Count; + *totalentries = EnumContext->MemberCount; + } + + if (resume_handle == NULL || ApiStatus != ERROR_MORE_DATA) + { + if (EnumContext != NULL) + { + if (EnumContext->Names != NULL) + { + for (i = 0; i < EnumContext->MemberCount; i++) + SamFreeMemory(EnumContext->Names[i].Buffer); + + SamFreeMemory(EnumContext->Names); + } + + if (EnumContext->Attributes != NULL) + SamFreeMemory(EnumContext->Attributes); + + if (EnumContext->MemberIds != NULL) + SamFreeMemory(EnumContext->MemberIds); + + + if (EnumContext->GroupHandle != NULL) + SamCloseHandle(EnumContext->GroupHandle); + + if (EnumContext->DomainHandle != NULL) + SamCloseHandle(EnumContext->DomainHandle); + + if (EnumContext->ServerHandle != NULL) + SamCloseHandle(EnumContext->ServerHandle); + + NetApiBufferFree(EnumContext); + EnumContext = NULL; + } + } + + *bufptr = (LPBYTE)Buffer; + + if (resume_handle != NULL) + *resume_handle = (DWORD_PTR)EnumContext; + + return ApiStatus; +} + + NET_API_STATUS WINAPI NetGroupSetInfo(

1 0

01/01: [FREETYPE] Fix Regression "Monospaced font in LibreOffice" CORE-15018
by Joachim Henze 10 Sep '18

10 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31c981c02a8c1aa2d686e… commit 31c981c02a8c1aa2d686e2efc0a1debecd16ffa8 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Sep 10 17:51:59 2018 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Sep 10 17:51:59 2018 +0200 [FREETYPE] Fix Regression "Monospaced font in LibreOffice" CORE-15018 LibreOffice started to show GUI in a mono-spaced font after 0.4.10-dev-466-g 35f62fc5ba0b69e7335ff41400cb3b45660f4557 We can fix this by partial revert as proposed by Katayama Hirofumi MZ, who was author of those changes as well. We revert the changes in penalty system here. --- win32ss/gdi/ntgdi/freetype.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index e172c5c537..12c88143e9 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -4274,7 +4274,7 @@ GetFontPenalty(const LOGFONTW * LogFont, Byte = (LogFont->lfPitchAndFamily & 0x0F); if (Byte == DEFAULT_PITCH) Byte = VARIABLE_PITCH; - if ((Byte & FIXED_PITCH) || (Byte & MONO_FONT)) + if (Byte == FIXED_PITCH) { if (TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH) { @@ -4284,7 +4284,7 @@ GetFontPenalty(const LOGFONTW * LogFont, Penalty += 15000; } } - if (Byte & VARIABLE_PITCH) + if (Byte == VARIABLE_PITCH) { if (!(TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH)) { @@ -4335,37 +4335,12 @@ GetFontPenalty(const LOGFONTW * LogFont, Byte = (LogFont->lfPitchAndFamily & 0xF0); if (Byte != FF_DONTCARE) { - if (Byte & FF_MODERN) - { - if (TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH) - { - /* FixedPitch Penalty 15000 */ - /* Requested a fixed pitch font, but the candidate is a - variable pitch font. */ - Penalty += 15000; - } - } - - if ((Byte & FF_ROMAN) || (Byte & FF_SWISS)) - { - if (!(TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH)) - { - /* PitchVariable Penalty 350 */ - /* Requested a variable pitch font, but the candidate is not a - variable pitch font. */ - Penalty += 350; - } - } - -#define FF_MASK (FF_DECORATIVE | FF_SCRIPT | FF_SWISS) - if ((Byte & FF_MASK) != (TM->tmPitchAndFamily & FF_MASK)) + if (Byte != (TM->tmPitchAndFamily & 0xF0)) { /* Family Penalty 9000 */ /* Requested a family, but the candidate's family is different. */ Penalty += 9000; } -#undef FF_MASK - if ((TM->tmPitchAndFamily & 0xF0) == FF_DONTCARE) { /* FamilyUnknown Penalty 8000 */

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