Module: wine Branch: master Commit: 006aadd3d2185c5d0d888fa623bf42999f424995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=006aadd3d2185c5d0d888fa623...
Author: Dmitry Timoshkov dmitry@baikal.ru Date: Thu Jan 16 18:01:59 2014 +0900
taskschd: Treat VT_BSTR/NULL or empty variant as NULL.
---
dlls/taskschd/task.c | 3 ++- dlls/taskschd/tests/scheduler.c | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 5ff3761..c8f8fdf 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -131,7 +131,8 @@ static HRESULT WINAPI TaskService_NewTask(ITaskService *iface, DWORD flags, ITas
static inline BOOL is_variant_null(const VARIANT *var) { - return V_VT(var) == VT_EMPTY || V_VT(var) == VT_NULL; + return V_VT(var) == VT_EMPTY || V_VT(var) == VT_NULL || + (V_VT(var) == VT_BSTR && (V_BSTR(var) == NULL || !*V_BSTR(var))); }
static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, VARIANT user, VARIANT domain, VARIANT password) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 12c89b6..152dd69 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -30,6 +30,7 @@
static void test_Connect(void) { + static WCHAR empty[] = { 0 }; static const WCHAR deadbeefW[] = { '0','.','0','.','0','.','0',0 }; WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len; @@ -75,13 +76,13 @@ static void test_Connect(void) hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); ok(hr == S_OK || hr == E_ACCESSDENIED /* not an administrator */, "Connect error %#x\n", hr); was_connected = hr == S_OK; - SysFreeString(V_BSTR(&v_comp)); - V_BSTR(&v_comp) = SysAllocString(deadbeefW);
+ V_BSTR(&v_comp) = SysAllocString(deadbeefW); hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); todo_wine ok(hr == HRESULT_FROM_WIN32(RPC_S_INVALID_NET_ADDR), "expected RPC_S_INVALID_NET_ADDR, got %#x\n", hr); + SysFreeString(V_BSTR(&v_comp));
vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); @@ -89,6 +90,15 @@ todo_wine ok(vbool == VARIANT_FALSE || (was_connected && vbool == VARIANT_TRUE), "Connect shouldn't trash an existing connection, got %d (was connected %d)\n", vbool, was_connected);
+ V_BSTR(&v_comp) = SysAllocString(empty); + hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); + ok(hr == S_OK, "Connect error %#x\n", hr); + SysFreeString(V_BSTR(&v_comp)); + + V_BSTR(&v_comp) = NULL; + hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); + ok(hr == S_OK, "Connect error %#x\n", hr); + hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); ok(hr == S_OK, "Connect error %#x\n", hr);
@@ -102,8 +112,6 @@ todo_wine ok(!lstrcmpW(comp_name, bstr), "compname %s != server name %s\n", wine_dbgstr_w(comp_name), wine_dbgstr_w(bstr)); SysFreeString(bstr);
- SysFreeString(V_BSTR(&v_comp)); - ITaskService_Release(service); }