[PATCH v2] win32: remove handling for impossible cases in win32_pthread_join

From: AZero13 via GitGitGadget <gitgitgadget@gmail.com>
Date: Nov 18, 2025, 15:45 UTC
Message-ID: <pull.2102.v2.git.git.1763480720264.gitgitgadget@gmail.com>
In-Reply-To: <pull.2102.git.git.1763427606138.gitgitgadget@gmail.com>

From: Greg Funni <gfunni234@gmail.com>

WAIT_FAILED is the only real possible error here.

WAIT_TIMEOUT would not be returned as the INFINITE is given to the call.

WAIT_ABANDONED would be returned if the handle pointed to a mutex object that was not released by the thread that owned the mutex object before the owning thread terminated.

WAIT_IO_COMPLETION would not be returned because we pass FALSE so the wait is not alertable.

Signed-off-by: Greg Funni <gfunni234@gmail.com>
---
    win32: remove handling for impossible cases in win32_pthread_join
    
    WAIT_FAILED is the only real possible error here.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2102%2FAZero13%2Fpatch-1-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2102/AZero13/patch-1-v2
Pull-Request: https://github.com/git/git/pull/2102

Range-diff vs v1:

 1:  73fae07514 ! 1:  e0d6b15093 win32: remove handling for impossible cases in win32_pthread_join
     @@
       ## Metadata ##
     -Author: AZero13 <gfunni234@gmail.com>
     +Author: Greg Funni <gfunni234@gmail.com>
      
       ## Commit message ##
          win32: remove handling for impossible cases in win32_pthread_join
      
          WAIT_FAILED is the only real possible error here.
      
     +    WAIT_TIMEOUT would not be returned as the INFINITE
     +    is given to the call.
     +
     +    WAIT_ABANDONED would be returned if the handle
     +    pointed to a mutex object that was not released
     +    by the thread that owned the mutex object before
     +    the owning thread terminated.
     +
     +    WAIT_IO_COMPLETION would not be returned because
     +    we pass FALSE so the wait is not alertable.
     +
          Signed-off-by: Greg Funni <gfunni234@gmail.com>
      
       ## compat/win32/pthread.c ##

 compat/win32/pthread.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/compat/win32/pthread.c b/compat/win32/pthread.c
index 58980a529c..54c43b4146 100644
--- a/compat/win32/pthread.c
+++ b/compat/win32/pthread.c
@@ -37,20 +37,14 @@ int pthread_create(pthread_t *thread, const void *attr UNUSED,
 
 int win32_pthread_join(pthread_t *thread, void **value_ptr)
 {
-	DWORD result = WaitForSingleObject(thread->handle, INFINITE);
-	switch (result) {
-	case WAIT_OBJECT_0:
-		if (value_ptr)
-			*value_ptr = thread->arg;
-		CloseHandle(thread->handle);
-		return 0;
-	case WAIT_ABANDONED:
-		CloseHandle(thread->handle);
-		return EINVAL;
-	default:
-		/* the wait failed, so do not detach */
+	if (WaitForSingleObjectEx(thread->handle, INFINITE, FALSE) == WAIT_FAILED)
 		return err_win_to_posix(GetLastError());
-	}
+
+	if (value_ptr)
+		*value_ptr = thread->arg;
+
+	CloseHandle(thread->handle);
+	return 0;
 }
 
 pthread_t pthread_self(void)

base-commit: 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed

-- 
gitgitgadget