Detlef Riekenberg : kernel32/tests: Fix a declaration and use skip for the message.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jan 22 07:05:22 CST 2007


Module: wine
Branch: master
Commit: fb9df99dc0a6fc920fe625311316a3802b9edaef
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fb9df99dc0a6fc920fe625311316a3802b9edaef

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Sat Jan 20 12:38:14 2007 +0100

kernel32/tests: Fix a declaration and use skip for the message.

---

 dlls/kernel32/tests/process.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index 8e782f1..162a622 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -33,8 +33,9 @@
 
 static HINSTANCE hkernel32;
 static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD);
-static LPVOID (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD);
+static BOOL   (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD);
 
+/* ############################### */
 static char     base[MAX_PATH];
 static char     selfname[MAX_PATH];
 static char*    exename;
@@ -1302,8 +1303,11 @@ static void test_OpenProcess(void)
     MEMORY_BASIC_INFORMATION info;
     SIZE_T dummy, read_bytes;
 
-    /* Not implemented in all windows versions */
-    if ((!pVirtualAllocEx) || (!pVirtualFreeEx)) return;
+    /* not exported in all windows versions */
+    if ((!pVirtualAllocEx) || (!pVirtualFreeEx)) {
+        skip("VirtualAllocEx not found\n");
+        return;
+    }
 
     /* without PROCESS_VM_OPERATION */
     hproc = OpenProcess(PROCESS_ALL_ACCESS & ~PROCESS_VM_OPERATION, FALSE, GetCurrentProcessId());
@@ -1315,7 +1319,7 @@ static void test_OpenProcess(void)
     if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {   /* Win9x */
         CloseHandle(hproc);
-        trace("VirtualAllocEx is not implemented, skipping the test\n");
+        skip("VirtualAllocEx not implemented\n");
         return;
     }
     ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %d\n", GetLastError());




More information about the wine-cvs mailing list