sync rostests to r44455

[reactos.git] / rostests / winetests / netapi32 / apibuf.c

diff --git a/rostests/winetests/netapi32/apibuf.c b/rostests/winetests/netapi32/apibuf.c
index 5589c18..de8613b 100644 (file)
--- a/rostests/winetests/netapi32/apibuf.c
+++ b/rostests/winetests/netapi32/apibuf.c
@@ -42,30 +42,29 @@ static void run_apibuf_tests(void)
     NET_API_STATUS res;
 
     /* test normal logic */
-    ok(pNetApiBufferAllocate(1024, (LPVOID *)&p) == NERR_Success,
+    ok(pNetApiBufferAllocate(1024, &p) == NERR_Success,
        "Reserved memory\n");
     ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size\n");
     ok(dwSize >= 1024, "The size is correct\n");
 
-    ok(pNetApiBufferReallocate(p, 1500, (LPVOID *) &p) == NERR_Success,
+    ok(pNetApiBufferReallocate(p, 1500, &p) == NERR_Success,
        "Reallocated\n");
     ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size\n");
     ok(dwSize >= 1500, "The size is correct\n");
 
     ok(pNetApiBufferFree(p) == NERR_Success, "Freed\n");
 
-    ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size\n");
     ok(pNetApiBufferSize(NULL, &dwSize) == ERROR_INVALID_PARAMETER, "Error for NULL pointer\n");
 
     /* border reallocate cases */
-    ok(pNetApiBufferReallocate(0, 1500, (LPVOID *) &p) == NERR_Success, "Reallocate with OldBuffer = NULL failed\n");
+    ok(pNetApiBufferReallocate(0, 1500, &p) == NERR_Success, "Reallocate with OldBuffer = NULL failed\n");
     ok(p != NULL, "No memory got allocated\n");
-    ok(pNetApiBufferAllocate(1024, (LPVOID *)&p) == NERR_Success, "Memory not reserved\n");
-    ok(pNetApiBufferReallocate(p, 0, (LPVOID *) &p) == NERR_Success, "Not freed\n");
+    ok(pNetApiBufferAllocate(1024, &p) == NERR_Success, "Memory not reserved\n");
+    ok(pNetApiBufferReallocate(p, 0, &p) == NERR_Success, "Not freed\n");
     ok(p == NULL, "Pointer not cleared\n");
     
     /* 0-length buffer */
-    ok(pNetApiBufferAllocate(0, (LPVOID *)&p) == NERR_Success,
+    ok(pNetApiBufferAllocate(0, &p) == NERR_Success,
        "Reserved memory\n");
     ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size\n");
     ok(dwSize < 0xFFFFFFFF, "The size of the 0-length buffer\n");
@@ -74,13 +73,13 @@ static void run_apibuf_tests(void)
     /* NULL-Pointer */
     /* NT: ERROR_INVALID_PARAMETER, lasterror is untouched) */
     SetLastError(0xdeadbeef);
-    res = pNetApiBufferAllocate(0, (LPVOID *)NULL);
+    res = pNetApiBufferAllocate(0, NULL);
     ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef),
         "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with "
         "0xdeadbeef)\n", res, GetLastError());
 
     SetLastError(0xdeadbeef);
-    res = pNetApiBufferAllocate(1024, (LPVOID *)NULL);    
+    res = pNetApiBufferAllocate(1024, NULL);
     ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef),
         "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with "
         "0xdeadbeef)\n", res, GetLastError());
@@ -98,7 +97,7 @@ START_TEST(apibuf)
     if (pNetApiBufferAllocate && pNetApiBufferFree && pNetApiBufferReallocate && pNetApiBufferSize)
         run_apibuf_tests();
     else
-        skip("Needed functions are not available\n");
+        win_skip("Needed functions are not available\n");
 
     FreeLibrary(hnetapi32);
 }