Robert Shearman : advapi32: Fix the service function being called when extended is

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: cc5aceb4f0a0de8cd07b15b1181f86dbcdf66a82
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=cc5aceb4f0a0de8cd07b15b1...

Author: Robert Shearman 
Date:   Mon Jul  3 13:49:10 2006 +0100

advapi32: Fix the service function being called when extended is
either set or not set (reported by Andrey Turkin).

---

dlls/advapi32/service.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index 2ceb8a2..10b3c67 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -610,14 +610,14 @@ static BOOL service_handle_control(HANDL

if (service_accepts_control(service, dwControl))
     {
-        if (service->extended && service->handler.handler)
+        if (service->extended && service->handler.handler_ex)
         {
-            service->handler.handler(dwControl);
+            service->handler.handler_ex(dwControl, 0, NULL, service->context);
             ret = ERROR_SUCCESS;
         }
-        else if (service->handler.handler_ex)
+        else if (service->handler.handler)
         {
-            service->handler.handler_ex(dwControl, 0, NULL, service->context);
+            service->handler.handler(dwControl);
             ret = ERROR_SUCCESS;
         }
     }