Skip to content

W
wine-cw
Commit d6c94be7 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

rpcrt4/tests: Get rid of no longer needed win9x checks.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c99d14d0
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 40 deletions
dlls/rpcrt4/tests/ndr_marshall.c
View file @ d6c94be7
......@@ -2187,11 +2187,6 @@ static void test_conf_complex_array(void)
#endif
expected_length = (4 + memsrc.dim1 * (2 + memsrc.dim2)) * 4;
if (StubMsg.BufferLength == 96)
{
win_skip("Tests crash on Win9x, WinMe and NT4\n");
goto cleanup;
}
ok(StubMsg.BufferLength >= expected_length, "length %d\n", StubMsg.BufferLength);
/*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/
......@@ -2261,7 +2256,6 @@ static void test_conf_complex_array(void)
HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer);
cleanup:
for(i = 0; i < memsrc.dim1; i++)
HeapFree(GetProcessHeap(), 0, memsrc.array[i]);
HeapFree(GetProcessHeap(), 0, memsrc.array);
......@@ -2397,14 +2391,6 @@ static void test_NdrGetUserMarshalInfo(void)
unsigned char buffer[16];
void *rpc_channel_buffer = (void *)(ULONG_PTR)0xcafebabe;
RPC_MESSAGE rpc_msg;
RPC_STATUS (RPC_ENTRY *pNdrGetUserMarshalInfo)(ULONG *,ULONG,NDR_USER_MARSHAL_INFO *);
pNdrGetUserMarshalInfo = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "NdrGetUserMarshalInfo");
if (!pNdrGetUserMarshalInfo)
{
skip("NdrGetUserMarshalInfo not exported\n");
return;
}
/* unmarshall */
......@@ -2432,7 +2418,7 @@ static void test_NdrGetUserMarshalInfo(void)
memset(&umi, 0xaa, sizeof(umi));
status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status);
ok( umi.InformationLevel == 1,
"umi.InformationLevel was %u instead of 1\n",
......@@ -2466,7 +2452,7 @@ static void test_NdrGetUserMarshalInfo(void)
memset(&umi, 0xaa, sizeof(umi));
status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status);
ok( umi.InformationLevel == 1,
"umi.InformationLevel was %u instead of 1\n",
......@@ -2500,7 +2486,7 @@ static void test_NdrGetUserMarshalInfo(void)
memset(&umi, 0xaa, sizeof(umi));
status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status);
ok( umi.InformationLevel == 1,
"umi.InformationLevel was %u instead of 1\n",
......@@ -2534,7 +2520,7 @@ static void test_NdrGetUserMarshalInfo(void)
memset(&umi, 0xaa, sizeof(umi));
status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status);
ok( umi.InformationLevel == 1,
"umi.InformationLevel was %u instead of 1\n",
......@@ -2566,7 +2552,7 @@ static void test_NdrGetUserMarshalInfo(void)
umcb.CBType = USER_MARSHAL_CB_MARSHALL;
status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status);
ok( U1(umi).Level1.BufferSize == 0,
"umi.Level1.BufferSize was %u instead of 0\n",
......@@ -2575,22 +2561,22 @@ static void test_NdrGetUserMarshalInfo(void)
/* error conditions */
rpc_msg.BufferLength = 14;
status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
ok(status == ERROR_INVALID_USER_BUFFER,
"NdrGetUserMarshalInfo should have failed with ERROR_INVALID_USER_BUFFER instead of %d\n", status);
rpc_msg.BufferLength = 15;
status = pNdrGetUserMarshalInfo(&umcb.Flags, 9999, &umi);
status = NdrGetUserMarshalInfo(&umcb.Flags, 9999, &umi);
ok(status == RPC_S_INVALID_ARG,
"NdrGetUserMarshalInfo should have failed with RPC_S_INVALID_ARG instead of %d\n", status);
umcb.CBType = 9999;
status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status);
umcb.CBType = USER_MARSHAL_CB_MARSHALL;
umcb.Signature = 0;
status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi);
ok(status == RPC_S_INVALID_ARG,
"NdrGetUserMarshalInfo should have failed with RPC_S_INVALID_ARG instead of %d\n", status);
}
......
dlls/rpcrt4/tests/rpc_async.c
View file @ d6c94be7
......@@ -25,9 +25,6 @@
#include <rpc.h>
#include <rpcasync.h>
static RPC_STATUS (RPC_ENTRY *pRpcAsyncInitializeHandle)(PRPC_ASYNC_STATE,unsigned int);
static RPC_STATUS (RPC_ENTRY *pRpcAsyncGetCallStatus)(PRPC_ASYNC_STATE);
static void test_RpcAsyncInitializeHandle(void)
{
char buffer[256];
......@@ -36,15 +33,15 @@ static void test_RpcAsyncInitializeHandle(void)
int i;
void *unset_ptr;
status = pRpcAsyncInitializeHandle((PRPC_ASYNC_STATE)buffer, sizeof(buffer));
status = RpcAsyncInitializeHandle((PRPC_ASYNC_STATE)buffer, sizeof(buffer));
ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with large Size should have returned ERROR_INVALID_PARAMETER instead of %d\n", status);
status = pRpcAsyncInitializeHandle(&async, sizeof(async) - 1);
status = RpcAsyncInitializeHandle(&async, sizeof(async) - 1);
ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with small Size should have returned ERROR_INVALID_PARAMETER instead of %d\n", status);
memset(&async, 0xcc, sizeof(async));
memset(&unset_ptr, 0xcc, sizeof(unset_ptr));
status = pRpcAsyncInitializeHandle(&async, sizeof(async));
status = RpcAsyncInitializeHandle(&async, sizeof(async));
ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %d\n", status);
ok(async.Size == sizeof(async), "async.Size wrong: %d\n", async.Size);
......@@ -65,29 +62,21 @@ static void test_RpcAsyncGetCallStatus(void)
RPC_ASYNC_STATE async;
RPC_STATUS status;
status = pRpcAsyncInitializeHandle(&async, sizeof(async));
status = RpcAsyncInitializeHandle(&async, sizeof(async));
ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %d\n", status);
status = pRpcAsyncGetCallStatus(&async);
status = RpcAsyncGetCallStatus(&async);
todo_wine
ok(status == RPC_S_INVALID_BINDING, "RpcAsyncGetCallStatus should have returned RPC_S_INVALID_BINDING instead of %d\n", status);
memset(&async, 0, sizeof(async));
status = pRpcAsyncGetCallStatus(&async);
status = RpcAsyncGetCallStatus(&async);
todo_wine
ok(status == RPC_S_INVALID_BINDING, "RpcAsyncGetCallStatus should have returned RPC_S_INVALID_BINDING instead of %d\n", status);
}
START_TEST( rpc_async )
{
HMODULE hRpcRt4 = GetModuleHandleA("rpcrt4.dll");
pRpcAsyncInitializeHandle = (void *)GetProcAddress(hRpcRt4, "RpcAsyncInitializeHandle");
pRpcAsyncGetCallStatus = (void *)GetProcAddress(hRpcRt4, "RpcAsyncGetCallStatus");
if (!pRpcAsyncInitializeHandle || !pRpcAsyncGetCallStatus)
{
win_skip("asynchronous functions not available\n");
return;
}
test_RpcAsyncInitializeHandle();
test_RpcAsyncGetCallStatus();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment