kernel32: Fix naming/spelling/typo of macro to HasOverlappedIoCompleted().

Andreas Mohr andi at lisas.de
Fri Jul 25 12:11:08 CDT 2014


Howdy again,

submitting a simple change, not compile-tested
(well, not with a Wine build that is)...

Greetings,

Andreas Mohr
-------------- next part --------------
From 12c055b19812a99a3e16a9ad6193f47b0fcf0e83 Mon Sep 17 00:00:00 2001
From: Andreas Mohr <andim2 at users.sf.net>
Date: Fri, 25 Jul 2014 18:49:50 +0200
Subject: kernel32: Fix naming/spelling/typo of macro to
 HasOverlappedIoCompleted().

Originally added by
    Date:   Sun Jan 7 21:45:18 2001 +0000
        Implemented HasOverlappedCompleted macro.

I believe this to be a simple naming mistake,
since the original Windows macro is said
to be a simple high-performance check, too,
so there should be no compat reason to keep this macro different,
via custom name.

Found during foreign-source builds (~= standard "winelib" case).
---
 include/winbase.h            | 2 +-
 programs/services/services.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/winbase.h b/include/winbase.h
index a269833..3cbddc6 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -2071,7 +2071,7 @@ WINBASEAPI VOID        WINAPI GlobalUnfix(HGLOBAL);
 WINBASEAPI BOOL        WINAPI GlobalUnlock(HGLOBAL);
 WINBASEAPI BOOL        WINAPI GlobalUnWire(HGLOBAL);
 WINBASEAPI LPVOID      WINAPI GlobalWire(HGLOBAL);
-#define                       HasOverlappedCompleted(lpOverlapped) ((lpOverlapped)->Internal != STATUS_PENDING)
+#define                       HasOverlappedIoCompleted(lpOverlapped) ((lpOverlapped)->Internal != STATUS_PENDING)
 WINBASEAPI LPVOID      WINAPI HeapAlloc(HANDLE,DWORD,SIZE_T) __WINE_ALLOC_SIZE(3);
 WINBASEAPI SIZE_T      WINAPI HeapCompact(HANDLE,DWORD);
 WINBASEAPI HANDLE      WINAPI HeapCreate(DWORD,SIZE_T,SIZE_T);
diff --git a/programs/services/services.c b/programs/services/services.c
index 632d92a..54d9e89 100644
--- a/programs/services/services.c
+++ b/programs/services/services.c
@@ -751,7 +751,7 @@ static BOOL service_send_start_message(struct service_entry *service, HANDLE pro
             handles[1] = process_handle;
             if (WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ) != WAIT_OBJECT_0)
                 CancelIo( service->control_pipe );
-            if (!HasOverlappedCompleted( &overlapped ))
+            if (!HasOverlappedIoCompleted( &overlapped ))
             {
                 WINE_ERR( "service %s failed to start\n", wine_dbgstr_w( service->name ));
                 return FALSE;
-- 
1.8.3.1



More information about the wine-patches mailing list