79563: [1/2] kernel32/tests: fix MSVC build in file.c and pipe.c

buildbot at kegel.com buildbot at kegel.com
Tue Oct 4 18:21:02 CDT 2011


This is an experimental automated build and test service.
Please feel free to ignore this email while we work the kinks out.

For more info about this message, see http://wiki.winehq.org/BuildBot

The Buildbot has detected a failed build on builder runtests-heaptest while building Wine.
Full details are available at: http://buildbot.kegel.com/builders/runtests-heaptest/builds/81 (though maybe not for long, as I'm still reinstalling the buildbot periodically while experimenting)
BUILD FAILED: failed git

Errors:
error: patch failed: dlls/kernel32/tests/file.c:38
error: dlls/kernel32/tests/file.c: patch does not apply
error: patch failed: dlls/kernel32/tests/pipe.c:36
error: dlls/kernel32/tests/pipe.c: patch does not apply

-------------- next part --------------
From: Thomas Faber <thfabba at gmx.de>
Subject: [1/2] kernel32/tests: fix MSVC build in file.c and pipe.c
Message-Id: <4E8B781E.8070901 at gmx.de>
Date: Tue, 04 Oct 2011 23:18:22 +0200

The calling convention belongs inside the parentheses for
function pointer types.

From 4de21f8322ce9cf061121d702b9626794fcd0c05 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thfabba at gmx.de>
Date: Tue, 4 Oct 2011 22:45:49 +0200
Subject: [1/2] kernel32/tests: fix MSVC build in file.c and pipe.c

---
 dlls/kernel32/tests/file.c |    2 +-
 dlls/kernel32/tests/pipe.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 3ed3f66..772e439 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -38,7 +38,7 @@ static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOI
 static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LPVOID);
 static UINT (WINAPI *pGetSystemWindowsDirectoryA)(LPSTR, UINT);
 static BOOL (WINAPI *pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD);
-static DWORD WINAPI (*pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData);
+static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData);
 
 /* keep filename and filenameW the same */
 static const char filename[] = "testfile.xxx";
diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
index 890a50e..ab85ad5 100644
--- a/dlls/kernel32/tests/pipe.c
+++ b/dlls/kernel32/tests/pipe.c
@@ -36,7 +36,7 @@
 static HANDLE alarm_event;
 static BOOL (WINAPI *pDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES,
                                         SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE);
-static DWORD WINAPI (*pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData);
+static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData);
 
 static BOOL user_apc_ran;
 static void CALLBACK user_apc(ULONG_PTR param)
-- 
1.7.3.4



More information about the wine-tests-results mailing list