wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

Piotr Caban : user32: Don' t fail on windows without menu bar in DrawMenuBar.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: 55ff0661038da271d92b5951a62f66e898b8cba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ff0661038da271d92b5951a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 10 14:50:33 2014 +0200 user32: Don't fail on windows without menu bar in DrawMenuBar. --- dlls/user32/menu.c | 17 +++++++++-------- dlls/user32/tests/menu.c | 2 -- dlls/user32/tests/msg.c | 11 +++++++++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 8bb508d..4a49ce6 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4360,17 +4360,18 @@ HMENU WINAPI GetSubMenu( HMENU hMenu, INT nPos ) BOOL WINAPI DrawMenuBar( HWND hWnd ) { LPPOPUPMENU lppop; - HMENU hMenu = GetMenu(hWnd); + HMENU hMenu; - if (!WIN_ALLOWED_MENU(GetWindowLongW( hWnd, GWL_STYLE ))) + if (!IsWindow( hWnd )) return FALSE; - if (!hMenu || !(lppop = MENU_GetMenu( hMenu ))) return FALSE; - lppop->Height = 0; /* Make sure we call MENU_MenuBarCalcSize */ - lppop->hwndOwner = hWnd; - SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | - SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); - return TRUE; + if ((hMenu = GetMenu( hWnd )) && (lppop = MENU_GetMenu( hMenu ))) { + lppop->Height = 0; /* Make sure we call MENU_MenuBarCalcSize */ + lppop->hwndOwner = hWnd; + } + + return SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | + SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); } /*********************************************************************** diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 7cab0a0..5fbe317 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -425,9 +425,7 @@ static void test_menu_locked_by_window(void) ok(ret, "DestroyMenu failed with error %d\n", GetLastError()); ret = DrawMenuBar(hwnd); - todo_wine { ok(ret, "DrawMenuBar failed with error %d\n", GetLastError()); - } ret = IsMenu(GetMenu(hwnd)); ok(!ret || broken(ret) /* nt4 */, "Menu handle should have been destroyed\n"); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7053ead..a209492 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4819,13 +4819,19 @@ static void test_messages(void) after_end_dialog = FALSE; test_def_id = FALSE; - hwnd = CreateWindowExA(0, "TestDialogClass", NULL, WS_POPUP, + hwnd = CreateWindowExA(0, "TestDialogClass", NULL, WS_POPUP|WS_CHILD, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL); ok(hwnd != 0, "Failed to create custom dialog window\n"); flush_sequence(); trace("call ShowWindow(%p, SW_SHOW)\n", hwnd); ShowWindow(hwnd, SW_SHOW); ok_sequence(WmShowCustomDialogSeq, "ShowCustomDialog", TRUE); + + flush_events(); + flush_sequence(); + ok(DrawMenuBar(hwnd), "DrawMenuBar failed: %d\n", GetLastError()); + flush_events(); + ok_sequence(WmDrawMenuBarSeq, "DrawMenuBar", FALSE); DestroyWindow(hwnd); flush_sequence(); @@ -4836,7 +4842,8 @@ static void test_messages(void) flush_sequence(); /* Message sequence for SetMenu */ - ok(!DrawMenuBar(hwnd), "DrawMenuBar should return FALSE for a window without a menu\n"); + ok(!DrawMenuBar(hwnd), "DrawMenuBar should return FALSE for a destroyed window\n"); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "last error is %d\n", GetLastError()); ok_sequence(WmEmptySeq, "DrawMenuBar for a window without a menu", FALSE); hmenu = CreateMenu();

1 0

Alexandre Julliard : user32: Cache the server queue mask on the client side and reset them when they have changed.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: b04585164881de5f05d3897eb61005ba43d0b8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b04585164881de5f05d3897eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 16:29:18 2014 +0200 user32: Cache the server queue mask on the client side and reset them when they have changed. --- dlls/user32/message.c | 63 +++++++++++++++++++++++++++++++++----------- dlls/user32/user_private.h | 4 ++- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index e5dfa3e..1e93c8d 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2778,6 +2778,11 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags if (res) { HeapFree( GetProcessHeap(), 0, buffer ); + if (res == STATUS_PENDING) + { + thread_info->wake_mask = changed_mask & (QS_SENDMESSAGE | QS_SMRESULT); + thread_info->changed_mask = changed_mask; + } if (res != STATUS_BUFFER_OVERFLOW) return FALSE; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ))) return FALSE; continue; @@ -3001,6 +3006,7 @@ static HANDLE get_server_queue_handle(void) */ static void wait_message_reply( UINT flags ) { + struct user_thread_info *thread_info = get_user_thread_info(); HANDLE server_queue = get_server_queue_handle(); for (;;) @@ -3017,6 +3023,8 @@ static void wait_message_reply( UINT flags ) } SERVER_END_REQ; + thread_info->wake_mask = thread_info->changed_mask = 0; + if (wake_bits & QS_SMRESULT) return; /* got a result */ if (wake_bits & QS_SENDMESSAGE) { @@ -3029,6 +3037,43 @@ static void wait_message_reply( UINT flags ) } } + +/*********************************************************************** + * wait_objects + * + * Wait for multiple objects including the server queue, with specific queue masks. + */ +static DWORD wait_objects( DWORD count, const HANDLE *handles, DWORD timeout, + DWORD wake_mask, DWORD changed_mask, DWORD flags ) +{ + struct user_thread_info *thread_info = get_user_thread_info(); + DWORD ret; + + assert( count ); /* we must have at least the server queue */ + + flush_window_surfaces( TRUE ); + + if (thread_info->wake_mask != wake_mask || thread_info->changed_mask != changed_mask) + { + SERVER_START_REQ( set_queue_mask ) + { + req->wake_mask = wake_mask; + req->changed_mask = changed_mask; + req->skip_wait = 0; + wine_server_call( req ); + } + SERVER_END_REQ; + thread_info->wake_mask = wake_mask; + thread_info->changed_mask = changed_mask; + } + + ret = wow_handlers.wait_message( count, handles, timeout, changed_mask, flags ); + + if (ret != WAIT_TIMEOUT) thread_info->wake_mask = thread_info->changed_mask = 0; + return ret; +} + + /*********************************************************************** * put_message_in_queue * @@ -3771,8 +3816,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT while (!peek_message( msg, hwnd, first, last, PM_REMOVE | (mask << 16), mask )) { - flush_window_surfaces( TRUE ); - wow_handlers.wait_message( 1, &server_queue, INFINITE, mask, 0 ); + wait_objects( 1, &server_queue, INFINITE, mask & (QS_SENDMESSAGE | QS_SMRESULT), mask, 0 ); } check_for_driver_events( msg->message ); @@ -4093,23 +4137,12 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, return WAIT_FAILED; } - flush_window_surfaces( TRUE ); - - /* set the queue mask */ - SERVER_START_REQ( set_queue_mask ) - { - req->wake_mask = (flags & MWMO_INPUTAVAILABLE) ? mask : 0; - req->changed_mask = mask; - req->skip_wait = 0; - wine_server_call( req ); - } - SERVER_END_REQ; - /* add the queue to the handle list */ for (i = 0; i < count; i++) handles[i] = pHandles[i]; handles[count] = get_server_queue_handle(); - return wow_handlers.wait_message( count+1, handles, timeout, mask, flags ); + return wait_objects( count+1, handles, timeout, + (flags & MWMO_INPUTAVAILABLE) ? mask : 0, mask, flags ); } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index a20dd2a..f2345e8 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -172,6 +172,8 @@ struct wm_char_mapping_data struct user_thread_info { HANDLE server_queue; /* Handle to server-side queue */ + DWORD wake_mask; /* Current queue wake mask */ + DWORD changed_mask; /* Current queue changed mask */ WORD recursion_count; /* SendMessage recursion counter */ WORD message_count; /* Get/PeekMessage loop counter */ BOOL hook_unicode; /* Is current hook unicode? */ @@ -188,7 +190,7 @@ struct user_thread_info HWND msg_window; /* HWND_MESSAGE parent window */ RAWINPUT *rawinput; - ULONG pad[8]; /* Available for more data */ + ULONG pad[6]; /* Available for more data */ }; struct hook_extra_info

1 0

Alexandre Julliard : Revert "server: Restore the masks from the previous get_message when a wait is satisfied. "
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: 202d91e5516766a859775801cca593595cc69767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=202d91e5516766a859775801c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 15:49:06 2014 +0200 Revert "server: Restore the masks from the previous get_message when a wait is satisfied." This reverts commit f846312f46bab8dc373a8fd98fdef9c3aebe8ee0. The masks will be stored on the client side instead. --- server/queue.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/server/queue.c b/server/queue.c index d919f01..1954886 100644 --- a/server/queue.c +++ b/server/queue.c @@ -117,10 +117,8 @@ struct msg_queue struct fd *fd; /* optional file descriptor to poll */ unsigned int wake_bits; /* wakeup bits */ unsigned int wake_mask; /* wakeup mask */ - unsigned int wake_get_msg; /* wakeup mask of last get_message */ unsigned int changed_bits; /* changed wakeup bits */ unsigned int changed_mask; /* changed wakeup mask */ - unsigned int changed_get_msg; /* changed wakeup mask of last get_message */ int paint_count; /* pending paint messages count */ int hotkey_count; /* pending hotkey messages count */ int quit_message; /* is there a pending quit message? */ @@ -279,10 +277,8 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ queue->fd = NULL; queue->wake_bits = 0; queue->wake_mask = 0; - queue->wake_get_msg = 0; queue->changed_bits = 0; queue->changed_mask = 0; - queue->changed_get_msg = 0; queue->paint_count = 0; queue->hotkey_count = 0; queue->quit_message = 0; @@ -931,8 +927,8 @@ static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entr static void msg_queue_satisfied( struct object *obj, struct wait_queue_entry *entry ) { struct msg_queue *queue = (struct msg_queue *)obj; - queue->wake_mask = queue->wake_get_msg; - queue->changed_mask = queue->changed_get_msg; + queue->wake_mask = 0; + queue->changed_mask = 0; } static void msg_queue_destroy( struct object *obj ) @@ -2201,11 +2197,7 @@ DECL_HANDLER(set_queue_mask) if (is_signaled( queue )) { /* if skip wait is set, do what would have been done in the subsequent wait */ - if (req->skip_wait) - { - queue->wake_mask = queue->wake_get_msg; - queue->changed_mask = queue->changed_get_msg; - } + if (req->skip_wait) queue->wake_mask = queue->changed_mask = 0; else wake_up( &queue->obj, 0 ); } } @@ -2377,7 +2369,6 @@ DECL_HANDLER(get_message) if (!queue) return; queue->last_get_msg = current_time; - queue->wake_get_msg = queue->changed_get_msg = 0; if (!filter) filter = QS_ALLINPUT; /* first check for sent messages */ @@ -2449,8 +2440,8 @@ DECL_HANDLER(get_message) } if (get_win == -1 && current->process->idle_event) set_event( current->process->idle_event ); - queue->wake_mask = queue->wake_get_msg = req->wake_mask; - queue->changed_mask = queue->changed_get_msg = req->changed_mask; + queue->wake_mask = req->wake_mask; + queue->changed_mask = req->changed_mask; set_error( STATUS_PENDING ); /* FIXME */ }

1 0

Dmitry Timoshkov : oleaut32: Fix loading of an empty picture from a non-statable stream.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: 5fc94f0adc8c9e2ec54f4ff5935aaf9b6cd44b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc94f0adc8c9e2ec54f4ff59… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:03:17 2014 +0900 oleaut32: Fix loading of an empty picture from a non-statable stream. --- dlls/oleaut32/olepicture.c | 7 ++++++- dlls/oleaut32/tests/olepicture.c | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 6e4a737..599042c 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1390,12 +1390,17 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) } headerread += xread; xread = 0; - + if (!memcmp(&(header[0]),"lt\0\0", 4) && (statfailed || (header[1] + headerread <= statstg.cbSize.QuadPart))) { if (toread != 0 && toread != header[1]) FIXME("varying lengths of image data (prev=%u curr=%u), only last one will be used\n", toread, header[1]); toread = header[1]; + if (statfailed) + { + statstg.cbSize.QuadPart = header[1] + 8; + statfailed = FALSE; + } if (toread == 0) break; } else { if (!memcmp(&(header[0]), "GIF8", 4) || /* GIF header */ diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 6861603..46dd05f 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1226,9 +1226,7 @@ static void test_load_save_empty_picture(void) pic = NULL; hr = pOleLoadPicture(stream, 0, FALSE, &IID_IPicture, (void **)&pic); -todo_wine ok(hr == S_OK, "OleLoadPicture error %#x\n", hr); -todo_wine ok(pic != NULL,"picture should not be not NULL\n"); if (pic != NULL) {

1 0

Dmitry Timoshkov : oleaut32/tests: Add a test for loading an empty picture from a non-statable stream.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: f20045c28ed593aa62dfdba52150272123a70c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20045c28ed593aa62dfdba52… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:03:09 2014 +0900 oleaut32/tests: Add a test for loading an empty picture from a non-statable stream. --- dlls/oleaut32/tests/olepicture.c | 56 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 26395b9..6861603 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1157,7 +1157,8 @@ static void test_load_save_empty_picture(void) HGLOBAL hmem; DWORD *mem; IPersistStream *src_stream; - IStream *dst_stream; + IStream *dst_stream, *stream; + LARGE_INTEGER offset; HRESULT hr; memset(&pic, 0, sizeof(pic)); @@ -1192,10 +1193,59 @@ static void test_load_save_empty_picture(void) GlobalUnlock(hmem); IPersistStream_Release(src_stream); + IPicture_Release(pic); + + /* first with statable and seekable stream */ + offset.QuadPart = 0; + hr = IStream_Seek(dst_stream, offset, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek %#x\n", hr); + + pic = NULL; + hr = pOleLoadPicture(dst_stream, 0, FALSE, &IID_IPicture, (void **)&pic); + ok(hr == S_OK, "OleLoadPicture error %#x\n", hr); + ok(pic != NULL,"picture should not be not NULL\n"); + if (pic != NULL) + { + type = -1; + hr = IPicture_get_Type(pic, &type); + ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(type == PICTYPE_NONE,"expected picture type PICTYPE_NONE, got %d\n", type); + + handle = (OLE_HANDLE)0xdeadbeef; + hr = IPicture_get_Handle(pic, &handle); + ok(hr == S_OK,"get_Handle error %#8x\n", hr); + ok(!handle, "get_Handle returned wrong handle %#x\n", handle); + + IPicture_Release(pic); + } IStream_Release(dst_stream); - GlobalFree(hmem); - IPicture_Release(pic); + /* again with non-statable and non-seekable stream */ + stream = NoStatStream_Construct(hmem); + ok(stream != NULL, "failed to create empty image stream\n"); + + pic = NULL; + hr = pOleLoadPicture(stream, 0, FALSE, &IID_IPicture, (void **)&pic); +todo_wine + ok(hr == S_OK, "OleLoadPicture error %#x\n", hr); +todo_wine + ok(pic != NULL,"picture should not be not NULL\n"); + if (pic != NULL) + { + type = -1; + hr = IPicture_get_Type(pic, &type); + ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(type == PICTYPE_NONE,"expected picture type PICTYPE_NONE, got %d\n", type); + + handle = (OLE_HANDLE)0xdeadbeef; + hr = IPicture_get_Handle(pic, &handle); + ok(hr == S_OK,"get_Handle error %#8x\n", hr); + ok(!handle, "get_Handle returned wrong handle %#x\n", handle); + + IPicture_Release(pic); + } + /* Non-statable impl always deletes on release */ + IStream_Release(stream); } START_TEST(olepicture)

1 0

Dmitry Timoshkov : taskschd: Add support for registering a task with NULL name in the root folder.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: 39c1c9c262725fef9a8e8d0af744389eea668c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=39c1c9c262725fef9a8e8d0af… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:41:45 2014 +0900 taskschd: Add support for registering a task with NULL name in the root folder. Because server receives full task name it can't autogenerate a name in a non-root folder. --- dlls/taskschd/regtask.c | 20 ++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 7 +------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 5e9d5d3..10562fe 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -313,8 +313,21 @@ HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinit RegisteredTask *regtask; HRESULT hr; - full_name = get_full_path(path, name); - if (!full_name) return E_OUTOFMEMORY; + if (!name) + { + if (!create) return E_INVALIDARG; + + /* NULL task name is allowed only in the root folder */ + if (path[0] != '\\' || path[1]) + return E_INVALIDARG; + + full_name = NULL; + } + else + { + full_name = get_full_path(path, name); + if (!full_name) return E_OUTOFMEMORY; + } regtask = heap_alloc(sizeof(*regtask)); if (!regtask) @@ -337,6 +350,9 @@ HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinit SysFreeString(xml); return hr; } + + heap_free(full_name); + full_name = heap_strdupW(actual_path); MIDL_user_free(actual_path); } else diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index b3fe9ea..6751f62 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -851,7 +851,6 @@ todo_wine IRegisteredTask_Release(task2); hr = ITaskFolder_GetTask(root, NULL, &task1); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = ITaskFolder_GetTask(root, Wine_Task1, NULL); @@ -929,10 +928,8 @@ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_RegisterTask(root, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); -todo_wine ok(hr == S_OK, "RegisterTask error %#x\n", hr); -if (hr == S_OK) -{ + hr = IRegisteredTask_get_Name(task1, &bstr); ok(hr == S_OK, "get_Name error %#x\n", hr); hr = IIDFromString(bstr, &iid); @@ -942,10 +939,8 @@ if (hr == S_OK) hr = ITaskFolder_DeleteTask(root, bstr, 0); ok(hr == S_OK, "DeleteTask error %#x\n", hr); -} hr = ITaskFolder_RegisterTask(folder, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); ITaskFolder_Release(folder);

1 0

Dmitry Timoshkov : taskschd/tests: Add a test for registering a task with NULL name in a not root folder.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: adc60c779f785df9f4c46537321336904ddf26a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc60c779f785df9f4c465373… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:41:39 2014 +0900 taskschd/tests: Add a test for registering a task with NULL name in a not root folder. --- dlls/taskschd/tests/scheduler.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 17501ad..b3fe9ea 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -931,8 +931,8 @@ todo_wine hr = ITaskFolder_RegisterTask(root, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); todo_wine ok(hr == S_OK, "RegisterTask error %#x\n", hr); - /* FIXME: Remove once implemented */ - if (hr != S_OK) goto failed; +if (hr == S_OK) +{ hr = IRegisteredTask_get_Name(task1, &bstr); ok(hr == S_OK, "get_Name error %#x\n", hr); hr = IIDFromString(bstr, &iid); @@ -942,8 +942,12 @@ todo_wine hr = ITaskFolder_DeleteTask(root, bstr, 0); ok(hr == S_OK, "DeleteTask error %#x\n", hr); +} + + hr = ITaskFolder_RegisterTask(folder, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); -failed: ITaskFolder_Release(folder); hr = ITaskFolder_DeleteFolder(root, Wine, 0);

1 0

Dmitry Timoshkov : schedsvc: Add support for generating new task name in SchRpcRegisterTask.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: a484dadf4a6521dcb57c26b7e0bf767aa4166783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a484dadf4a6521dcb57c26b7e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:41:33 2014 +0900 schedsvc: Add support for generating new task name in SchRpcRegisterTask. --- dlls/schedsvc/Makefile.in | 2 +- dlls/schedsvc/schedsvc.c | 44 ++++++++++++++++++++++++++---------------- dlls/schedsvc/tests/rpcapi.c | 4 ---- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/schedsvc/Makefile.in b/dlls/schedsvc/Makefile.in index d1ee5c3..32ee4e3 100644 --- a/dlls/schedsvc/Makefile.in +++ b/dlls/schedsvc/Makefile.in @@ -1,5 +1,5 @@ MODULE = schedsvc.dll -IMPORTS = rpcrt4 advapi32 +IMPORTS = rpcrt4 advapi32 ole32 C_SRCS = \ schedsvc.c \ diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 5ce7d1d..3f11d16 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -180,27 +180,37 @@ HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD fl /* FIXME: assume that validation is performed on the client side */ if (flags & TASK_VALIDATE_ONLY) return S_OK; - if (!path) + if (path) { - FIXME("NULL name is not supported\n"); - return E_INVALIDARG; - } - - full_name = get_full_name(path, &relative_path); - if (!full_name) return E_OUTOFMEMORY; + full_name = get_full_name(path, &relative_path); + if (!full_name) return E_OUTOFMEMORY; - if (strchrW(path, '\\') || strchrW(path, '/')) - { - WCHAR *p = strrchrW(full_name, '/'); - if (!p) p = strrchrW(full_name, '\\'); - *p = 0; - hr = create_directory(full_name); - if (hr != S_OK && hr != HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) + if (strchrW(path, '\\') || strchrW(path, '/')) { - heap_free(full_name); - return hr; + WCHAR *p = strrchrW(full_name, '/'); + if (!p) p = strrchrW(full_name, '\\'); + *p = 0; + hr = create_directory(full_name); + if (hr != S_OK && hr != HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) + { + heap_free(full_name); + return hr; + } + *p = '\\'; } - *p = '\\'; + } + else + { + IID iid; + WCHAR uuid_str[39]; + + UuidCreate(&iid); + StringFromGUID2(&iid, uuid_str, 39); + + full_name = get_full_name(uuid_str, &relative_path); + if (!full_name) return E_OUTOFMEMORY; + /* skip leading '\' */ + relative_path++; } switch (flags & (TASK_CREATE | TASK_UPDATE)) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index beaf7da..b3007f7 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -521,17 +521,13 @@ todo_wine path = NULL; info = NULL; hr = SchRpcRegisterTask(NULL, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); -todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!info, "expected NULL, info %p\n", info); -if (hr == S_OK) -{ hr = IIDFromString(path, &iid); ok(hr == S_OK, "IIDFromString(%s) error %#x\n", wine_dbgstr_w(path), hr); hr = SchRpcDelete(path, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); MIDL_user_free(path); -} hr = RpcBindingFree(&rpc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr);

1 0

Dmitry Timoshkov : schedsvc/tests: Add a test for NULL task name passed to SchRpcRegisterTask.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: af0ede42d597e29f8526dd57c451490a9c717e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0ede42d597e29f8526dd57c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:41:27 2014 +0900 schedsvc/tests: Add a test for NULL task name passed to SchRpcRegisterTask. --- dlls/schedsvc/schedsvc.c | 6 ++++++ dlls/schedsvc/tests/Makefile.in | 2 +- dlls/schedsvc/tests/rpcapi.c | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index eb84998..5ce7d1d 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -180,6 +180,12 @@ HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD fl /* FIXME: assume that validation is performed on the client side */ if (flags & TASK_VALIDATE_ONLY) return S_OK; + if (!path) + { + FIXME("NULL name is not supported\n"); + return E_INVALIDARG; + } + full_name = get_full_name(path, &relative_path); if (!full_name) return E_OUTOFMEMORY; diff --git a/dlls/schedsvc/tests/Makefile.in b/dlls/schedsvc/tests/Makefile.in index f671f85..cd56fde 100644 --- a/dlls/schedsvc/tests/Makefile.in +++ b/dlls/schedsvc/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = schedsvc.dll -IMPORTS = rpcrt4 +IMPORTS = rpcrt4 ole32 C_SRCS = \ rpcapi.c diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 02f6882..beaf7da 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -99,6 +99,7 @@ START_TEST(rpcapi) TASK_NAMES names; unsigned char *binding_str; PTOP_LEVEL_EXCEPTION_FILTER old_exception_filter; + IID iid; hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); @@ -517,6 +518,21 @@ todo_wine hr = SchRpcDelete(Wine, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + path = NULL; + info = NULL; + hr = SchRpcRegisterTask(NULL, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); +todo_wine + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(!info, "expected NULL, info %p\n", info); +if (hr == S_OK) +{ + hr = IIDFromString(path, &iid); + ok(hr == S_OK, "IIDFromString(%s) error %#x\n", wine_dbgstr_w(path), hr); + hr = SchRpcDelete(path, 0); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + MIDL_user_free(path); +} + hr = RpcBindingFree(&rpc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); }

1 0

Dmitry Timoshkov : taskschd: Add invalid parameter check to IRegisteredTask:: get_State and IRegisteredTask::get_Enabled.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: ea248186b35796e733e1246759a0b89967cf6a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea248186b35796e733e124675… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:41:22 2014 +0900 taskschd: Add invalid parameter check to IRegisteredTask::get_State and IRegisteredTask::get_Enabled. --- dlls/taskschd/regtask.c | 4 ++++ dlls/taskschd/tests/scheduler.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index e224b3e..5e9d5d3 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -157,6 +157,8 @@ static HRESULT WINAPI regtask_get_State(IRegisteredTask *iface, TASK_STATE *stat TRACE("%p,%p\n", iface, state); + if (!state) return E_POINTER; + return SchRpcGetTaskInfo(regtask->path, SCH_FLAG_STATE, &enabled, state); } @@ -168,6 +170,8 @@ static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL * TRACE("%p,%p\n", iface, v_enabled); + if (!v_enabled) return E_POINTER; + hr = SchRpcGetTaskInfo(regtask->path, 0, &enabled, &state); if (hr == S_OK) *v_enabled = enabled ? VARIANT_TRUE : VARIANT_FALSE; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index e54e6ee..17501ad 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -909,6 +909,11 @@ todo_wine todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + hr = IRegisteredTask_get_State(task2, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + hr = IRegisteredTask_get_Enabled(task2, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + IRegisteredTask_Release(task2); hr = ITaskFolder_DeleteTask(folder, NULL, 0);

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2014