[ros-diffs] [spetreolle] 56391: [ADVAPI32/SERVICES] Fix changing a service description in (R)ChangeServiceConfig2W. Fixes bad service description in Vmware Tools.

Author: spetreolle
Date: Mon Apr 23 00:17:01 2012
New Revision: 56391

URL: http://svn.reactos.org/svn/reactos?rev=56391&view=rev
Log:
[ADVAPI32/SERVICES]
Fix changing a service description in (R)ChangeServiceConfig2W.

Fixes bad service description in Vmware Tools.

Modified:
    trunk/reactos/base/system/services/rpcserver.c
    trunk/reactos/dll/win32/advapi32/service/scm.c

Modified: trunk/reactos/base/system/services/rpcserver.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcser...
==============================================================================
--- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Mon Apr 23 00:17:01 2012
@@ -4775,7 +4775,6 @@
         LPSERVICE_DESCRIPTIONW lpServiceDescription;

lpServiceDescription = (LPSERVICE_DESCRIPTIONW)Info.psd;
-        lpServiceDescription->lpDescription = (LPWSTR)((ULONG_PTR)lpServiceDescription + sizeof(LPSERVICE_DESCRIPTIONW));

if (lpServiceDescription != NULL &&
             lpServiceDescription->lpDescription != NULL)

Modified: trunk/reactos/dll/win32/advapi32/service/scm.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service/...
==============================================================================
--- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Mon Apr 23 00:17:01 2012
@@ -229,7 +229,7 @@
     switch (dwInfoLevel)
     {
         case SERVICE_CONFIG_DESCRIPTION:
-            Info.psd = (LPSERVICE_DESCRIPTIONW)&lpInfo;
+            Info.psd = (LPSERVICE_DESCRIPTIONW)lpInfo;
             break;

case SERVICE_CONFIG_FAILURE_ACTIONS:
@@ -543,7 +543,7 @@
     LPCSTR lpStr;

TRACE("CreateServiceA() called\n");
-    TRACE("%p %s %s\n", hSCManager, 
+    TRACE("%p %s %s\n", hSCManager,
           lpServiceName, lpDisplayName);

if (!hSCManager)
@@ -631,7 +631,7 @@
     LPCWSTR lpStr;

TRACE("CreateServiceW() called\n");
-    TRACE("%p %S %S\n", hSCManager, 
+    TRACE("%p %S %S\n", hSCManager,
           lpServiceName, lpDisplayName);

if (!hSCManager)