Author: janderwald
Date: Sun Jun 2 12:59:06 2013
New Revision: 59142
URL: http://svn.reactos.org/svn/reactos?rev=59142&view=rev
Log:
[UMPNPMGR]
- It is not an error when the client is already connected
- Fixes random driver installation failures
Modified:
trunk/reactos/base/services/umpnpmgr/umpnpmgr.c
Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump…
==============================================================================
--- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original)
+++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sun Jun 2 12:59:06 2013
@@ -2886,8 +2886,11 @@
/* Wait for the function to connect to our pipe */
if(!ConnectNamedPipe(hPipe, NULL))
{
- DPRINT1("ConnectNamedPipe failed with error %u\n", GetLastError());
- goto cleanup;
+ if (GetLastError() != ERROR_PIPE_CONNECTED)
+ {
+ DPRINT1("ConnectNamedPipe failed with error %u\n", GetLastError());
+ goto cleanup;
+ }
}
/* Pass the data. The following output is partly compatible to Windows XP SP2 (researched using a modified newdev.dll to log this stuff) */
Author: ekohl
Date: Sun Jun 2 10:45:48 2013
New Revision: 59140
URL: http://svn.reactos.org/svn/reactos?rev=59140&view=rev
Log:
[SAMSRV]
SamrDeleteAlias: Dereference the AliasHandle parameter properly. All SamrDelete functions use a pointer to the handle. The other SamrDelete functions do it right.
Modified:
trunk/reactos/dll/win32/samsrv/samrpc.c
Modified: trunk/reactos/dll/win32/samsrv/samrpc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?…
==============================================================================
--- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Jun 2 10:45:48 2013
@@ -4679,7 +4679,7 @@
NTSTATUS Status;
/* Validate the alias handle */
- Status = SampValidateDbObject(AliasHandle,
+ Status = SampValidateDbObject(*AliasHandle,
SamDbAliasObject,
DELETE,
&AliasObject);
Author: ekohl
Date: Sat Jun 1 23:42:01 2013
New Revision: 59138
URL: http://svn.reactos.org/svn/reactos?rev=59138&view=rev
Log:
[NETAPI32]
NetLocalGroupGetInfo: Fix a bug in the alias search code. The function should search the account domain if no alias was found in the builtin domain, instead of returning an error. Fail only if the desired alias can not be found in both domains.
Modified:
trunk/reactos/dll/win32/netapi32/local_group.c
Modified: trunk/reactos/dll/win32/netapi32/local_group.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g…
==============================================================================
--- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Sat Jun 1 23:42:01 2013
@@ -838,7 +838,7 @@
&GroupName,
ALIAS_READ_INFORMATION,
&AliasHandle);
- if (ApiStatus != NERR_Success)
+ if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED)
{
ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
goto done;
@@ -869,6 +869,8 @@
if (ApiStatus != NERR_Success)
{
ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus);
+ if (ApiStatus == ERROR_NONE_MAPPED)
+ ApiStatus = NERR_GroupNotFound;
goto done;
}
}