Commit 1d785798 authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard

schedsvc/tests: Fix compilation with recent gcc/clang versions.

parent 6ba6aac5
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define JOB_ADD_CURRENT_DATE 0x08 #define JOB_ADD_CURRENT_DATE 0x08
#define JOB_NONINTERACTIVE 0x10 #define JOB_NONINTERACTIVE 0x10
extern handle_t rpc_handle; extern handle_t atsvc_handle;
static int test_failures, test_skipped; static int test_failures, test_skipped;
...@@ -69,7 +69,7 @@ START_TEST(atsvcapi) ...@@ -69,7 +69,7 @@ START_TEST(atsvcapi)
hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str);
ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr);
hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); hr = RpcBindingFromStringBindingA(binding_str, &atsvc_handle);
ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr);
hr = RpcStringFreeA(&binding_str); hr = RpcStringFreeA(&binding_str);
ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr); ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr);
...@@ -173,7 +173,7 @@ skip_tests_delete: ...@@ -173,7 +173,7 @@ skip_tests_delete:
skip_tests: skip_tests:
SetUnhandledExceptionFilter(old_exception_filter); SetUnhandledExceptionFilter(old_exception_filter);
hr = RpcBindingFree(&rpc_handle); hr = RpcBindingFree(&atsvc_handle);
ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr);
} }
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "wine/test.h" #include "wine/test.h"
extern handle_t rpc_handle; extern handle_t schrpc_handle;
static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs)
{ {
...@@ -103,7 +103,7 @@ START_TEST(rpcapi) ...@@ -103,7 +103,7 @@ START_TEST(rpcapi)
hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str);
ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr);
hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); hr = RpcBindingFromStringBindingA(binding_str, &schrpc_handle);
ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr);
hr = RpcStringFreeA(&binding_str); hr = RpcStringFreeA(&binding_str);
ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr); ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr);
...@@ -537,7 +537,7 @@ todo_wine ...@@ -537,7 +537,7 @@ todo_wine
MIDL_user_free(path); MIDL_user_free(path);
} }
hr = RpcBindingFree(&rpc_handle); hr = RpcBindingFree(&schrpc_handle);
ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr);
} }
......
...@@ -3843,7 +3843,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V ...@@ -3843,7 +3843,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V
DWORD len; DWORD len;
HRESULT hr; HRESULT hr;
RPC_WSTR binding_str; RPC_WSTR binding_str;
extern handle_t rpc_handle; extern handle_t schrpc_handle;
TRACE("%p,%s,%s,%s,%s\n", iface, debugstr_variant(&server), debugstr_variant(&user), TRACE("%p,%s,%s,%s,%s\n", iface, debugstr_variant(&server), debugstr_variant(&user),
debugstr_variant(&domain), debugstr_variant(&password)); debugstr_variant(&domain), debugstr_variant(&password));
...@@ -3882,7 +3882,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V ...@@ -3882,7 +3882,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V
hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str);
if (hr != RPC_S_OK) return hr; if (hr != RPC_S_OK) return hr;
hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); hr = RpcBindingFromStringBindingW(binding_str, &schrpc_handle);
RpcStringFreeW(&binding_str); RpcStringFreeW(&binding_str);
if (hr != RPC_S_OK) return hr; if (hr != RPC_S_OK) return hr;
......
...@@ -23,7 +23,7 @@ import "ocidl.idl"; ...@@ -23,7 +23,7 @@ import "ocidl.idl";
[ [
uuid(1ff70682-0a51-30e8-076d-740be8cee98b), uuid(1ff70682-0a51-30e8-076d-740be8cee98b),
implicit_handle(handle_t rpc_handle), implicit_handle(handle_t atsvc_handle),
version(1.0), version(1.0),
pointer_default(unique) pointer_default(unique)
] ]
......
...@@ -26,7 +26,7 @@ import "ocidl.idl"; ...@@ -26,7 +26,7 @@ import "ocidl.idl";
[ [
uuid(86d35949-83c9-4044-b424-db363231fd0c), uuid(86d35949-83c9-4044-b424-db363231fd0c),
implicit_handle(handle_t rpc_handle), implicit_handle(handle_t schrpc_handle),
version(1.0), version(1.0),
pointer_default(unique) pointer_default(unique)
] ]
......
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