August 2016 - Wine-Commits - list.winehq.org

Hans Leidekker : webservices/tests: Add some tests for WsSetWriterPosition.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 9c5b9399fc04ad93fdf31e8cda5431fa6170a0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c5b9399fc04ad93fdf31e8cd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 10 13:13:53 2016 +0200 webservices/tests: Add some tests for WsSetWriterPosition. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 3343ae5..65828a4 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1576,6 +1576,7 @@ static void test_WsGetWriterPosition(void) static void test_WsSetWriterPosition(void) { + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; WS_HEAP *heap; WS_XML_WRITER *writer; WS_XML_BUFFER *buf1, *buf2; @@ -1617,6 +1618,29 @@ static void test_WsSetWriterPosition(void) hr = WsSetWriterPosition( writer, &pos, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); + hr = WsSetOutputToBuffer( writer, buf1, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* try to write at non-final position */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + pos.buffer = pos.node = NULL; + hr = WsGetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos.buffer == buf1, "wrong buffer\n" ); + ok( pos.node != NULL, "node not set\n" ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_buffer( buf1, "<t/>", __LINE__ ); + + hr = WsSetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeWriter( writer ); WsFreeHeap( heap ); }

1 0

Nikolay Sivov : comctl32/treeview: Fix item dragging and selection for TVS_FULLROWSELECT style.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: af02e1082818a45a135a32686c77b84f0c699f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af02e1082818a45a135a32686… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 10 15:11:02 2016 +0300 comctl32/treeview: Fix item dragging and selection for TVS_FULLROWSELECT style. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index dc31a9b..55e22e2 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4197,9 +4197,9 @@ TREEVIEW_LButtonDoubleClick(TREEVIEW_INFO *infoPtr, LPARAM lParam) static LRESULT TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) { + BOOL do_track, do_select, bDoLabelEdit; HWND hwnd = infoPtr->hwnd; TVHITTESTINFO ht; - BOOL bTrack, bDoLabelEdit; /* If Edit control is active - kill it and return. * The best way to do it is to set focus to itself. @@ -4219,15 +4219,32 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) TRACE("item %d\n", TREEVIEW_GetItemIndex(infoPtr, ht.hItem)); /* update focusedItem and redraw both items */ - if(ht.hItem && (ht.flags & TVHT_ONITEM)) + if (ht.hItem) { - infoPtr->focusedItem = ht.hItem; - TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); - TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem); + BOOL do_focus; + + if (TREEVIEW_IsFullRowSelect(infoPtr)) + do_focus = ht.flags & (TVHT_ONITEMINDENT | TVHT_ONITEM | TVHT_ONITEMRIGHT); + else + do_focus = ht.flags & TVHT_ONITEM; + + if (do_focus) + { + infoPtr->focusedItem = ht.hItem; + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem); + } } - bTrack = (ht.flags & TVHT_ONITEM) - && !(infoPtr->dwStyle & TVS_DISABLEDRAGDROP); + if (!(infoPtr->dwStyle & TVS_DISABLEDRAGDROP)) + { + if (TREEVIEW_IsFullRowSelect(infoPtr)) + do_track = ht.flags & (TVHT_ONITEMINDENT | TVHT_ONITEM | TVHT_ONITEMRIGHT); + else + do_track = ht.flags & TVHT_ONITEM; + } + else + do_track = FALSE; /* * If the style allows editing and the node is already selected @@ -4237,16 +4254,15 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) (ht.flags & TVHT_ONITEMLABEL) && (infoPtr->selectedItem == ht.hItem); /* Send NM_CLICK right away */ - if (!bTrack) - if (TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) - goto setfocus; + if (!do_track && TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) + goto setfocus; if (ht.flags & TVHT_ONITEMBUTTON) { TREEVIEW_Toggle(infoPtr, ht.hItem, TRUE); goto setfocus; } - else if (bTrack) + else if (do_track) { /* if TREEVIEW_TrackMouse == 1 dragging occurred and the cursor left the dragged item's rectangle */ if (TREEVIEW_TrackMouse(infoPtr, ht.pt)) { @@ -4268,9 +4284,14 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } } - if (bTrack && TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) + if (do_track && TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) goto setfocus; + if (TREEVIEW_IsFullRowSelect(infoPtr)) + do_select = ht.flags & (TVHT_ONITEMINDENT | TVHT_ONITEMICON | TVHT_ONITEMLABEL | TVHT_ONITEMRIGHT); + else + do_select = ht.flags & (TVHT_ONITEMICON | TVHT_ONITEMLABEL); + if (bDoLabelEdit) { if (infoPtr->Timer & TV_EDIT_TIMER_SET) @@ -4279,7 +4300,7 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) SetTimer(hwnd, TV_EDIT_TIMER, GetDoubleClickTime(), 0); infoPtr->Timer |= TV_EDIT_TIMER_SET; } - else if (ht.flags & (TVHT_ONITEMICON|TVHT_ONITEMLABEL)) /* select the item if the hit was inside of the icon or text */ + else if (do_select) { TREEVIEW_ITEM *selection = infoPtr->selectedItem;

1 0

Józef Kucia : wined3d: Do not enable blending for edge/line antialiasing.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: eaa20836d245782d60b944a765cdbd966eccd281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa20836d245782d60b944a76… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 10 11:38:42 2016 +0200 wined3d: Do not enable blending for edge/line antialiasing. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 4 +-- dlls/d3d11/tests/d3d11.c | 4 +-- dlls/d3d8/tests/visual.c | 4 +-- dlls/d3d9/tests/visual.c | 4 +-- dlls/ddraw/tests/ddraw2.c | 4 +-- dlls/ddraw/tests/ddraw4.c | 4 +-- dlls/ddraw/tests/ddraw7.c | 4 +-- dlls/wined3d/state.c | 67 +++++++++++++++++++++---------------------- 8 files changed, 46 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaa20836d245782d60b94…

1 0

Hans Leidekker : webservices/tests: Add tests for WsSetHeader.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 31d8d19890ddb98c6459cdf42dcd86175257bb8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d8d19890ddb98c6459cdf42… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 10 13:13:57 2016 +0200 webservices/tests: Add tests for WsSetHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/msg.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 24ec0bd..ea44c07 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -523,6 +523,74 @@ static void test_WsWriteBody(void) WsFreeWriter( writer ); } +static void test_WsSetHeader(void) +{ + static const char expected[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<a:Action s:mustUnderstand=\"1\">action</a:Action></s:Header>" + "<s:Body/></s:Envelope>"; + static const char expected2[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<a:Action s:mustUnderstand=\"1\">action2</a:Action></s:Header>" + "<s:Body/></s:Envelope>"; + static const WCHAR action[] = {'a','c','t','i','o','n',0}; + static const WS_XML_STRING action2 = {7, (BYTE *)"action2"}; + HRESULT hr; + WS_MESSAGE *msg; + WS_XML_WRITER *writer; + const WCHAR *ptr = action; + + hr = WsSetHeader( NULL, 0, 0, 0, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetHeader( msg, 0, 0, 0, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, + sizeof(ptr), NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetHeader( msg, 0, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, + sizeof(ptr), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, expected, 250, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + + /* called after WsWriteEnvelopeStart */ + hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &action2, + sizeof(action2), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, expected, 250, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + WsFreeMessage( msg ); + WsFreeWriter( writer ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -532,4 +600,5 @@ START_TEST(msg) test_WsWriteEnvelopeStart(); test_WsWriteEnvelopeEnd(); test_WsWriteBody(); + test_WsSetHeader(); }

1 0

Michael Stefaniuc : comctl32/tests: Use todo_wine_if().
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 6531b9b8af2abd2e14ffd19f552f861abcb3c471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6531b9b8af2abd2e14ffd19f5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 10 13:08:35 2016 +0200 comctl32/tests: Use todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index efad00a..7dcdadb 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1235,11 +1235,8 @@ static DWORD tbsize_alt_numtests = 0; EqualRect(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton))) { \ win_skip("Alternate rect found\n"); \ tbsize_alt_numtests++; \ - } else if (!(mask&1)) { \ + } else todo_wine_if(mask&1) \ check_rect("button = %d, tbsize_numtests = %d", rc, res->prcButtons[i], i, tbsize_numtests); \ - } else {\ - todo_wine { check_rect("button = %d, tbsize_numtests = %d", rc, res->prcButtons[i], i, tbsize_numtests); } \ - } \ mask >>= 1; \ } \ tbsize_numtests++; \

1 0

Michael Stefaniuc : user32/tests: Remove an identical if/else branch.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: d8a970f94a0b4084d1d1adb4faaf3afbf9ed5e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a970f94a0b4084d1d1adb4f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 10 13:05:46 2016 +0200 user32/tests: Remove an identical if/else branch. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index c90bac9..d63a0f6 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2511,12 +2511,6 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok(!lstrcmpW((WCHAR*)buffer, cmd_w), "Expected %s, msg_index=%d\n", wine_dbgstr_w(cmd_w), msg_index); } - else if (unicode_client) - { - ok(size == size_w_to_a, "Wrong size %d/%d, msg_index=%d\n", size, size_w_to_a, msg_index); - ok(!lstrcmpA((CHAR*)buffer, test_cmd_w_to_a), "Expected %s, got %s, msg_index=%d\n", - test_cmd_w_to_a, buffer, msg_index); - } else { ok(size == size_w_to_a, "Wrong size %d/%d, msg_index=%d\n",

1 0

Daniel Lehman : ntdll: Call __finally blocks in __C_specific_handler.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 0b6e5fae743a8fa096b8ad898ccace9de0776702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b6e5fae743a8fa096b8ad898… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Aug 2 23:52:12 2016 -0700 ntdll: Call __finally blocks in __C_specific_handler. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 009505f..4c88536 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -81,6 +81,7 @@ typedef EXCEPTION_DISPOSITION (WINAPI *PEXCEPTION_ROUTINE)( EXCEPTION_RECORD *re ULONG64 frame, CONTEXT *context, struct _DISPATCHER_CONTEXT *dispatch ); +typedef void (WINAPI *TERMINATION_HANDLER)( ULONG flags, ULONG64 frame ); typedef struct _DISPATCHER_CONTEXT { @@ -3733,8 +3734,32 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, TRACE( "%p %lx %p %p\n", rec, frame, context, dispatch ); if (TRACE_ON(seh)) dump_scope_table( dispatch->ImageBase, table ); - if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) /* FIXME */ + if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + { + for (i = 0; i < table->Count; i++) + { + if (context->Rip >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && + context->Rip < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) + { + TERMINATION_HANDLER handler; + + if (table->ScopeRecord[i].JumpTarget) continue; + + if (rec->ExceptionFlags & EH_TARGET_UNWIND && + dispatch->TargetIp >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && + dispatch->TargetIp < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) + { + break; + } + + handler = (TERMINATION_HANDLER)(dispatch->ImageBase + table->ScopeRecord[i].HandlerAddress); + + TRACE( "calling __finally %p frame %lx\n", handler, frame ); + handler( 1, frame ); + } + } return ExceptionContinueSearch; + } for (i = 0; i < table->Count; i++) {

1 0

Iván Matellanes : msvcirt: Add stub for class iostream.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: adf3763e466761e88c6df41602a685df4db99e32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf3763e466761e88c6df4160… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Aug 9 19:16:02 2016 +0100 msvcirt: Add stub for class iostream. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 125 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 38 +++++++------- dlls/msvcrt20/msvcrt20.spec | 38 +++++++------- dlls/msvcrt40/msvcrt40.spec | 38 +++++++------- 4 files changed, 182 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adf3763e466761e88c6df…

1 0

Sebastian Lackner : advapi32: Validate received service name.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 7a200887bb9a455b83b462060b290e6a5a9db225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a200887bb9a455b83b462060… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 10 08:31:34 2016 +0200 advapi32: Validate received service name. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 0eb0a47..273e7c7 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -424,7 +424,8 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) { service_data *service; service_start_info info; - WCHAR *data = NULL; + BYTE *data = NULL; + WCHAR *name; BOOL r; DWORD data_size = 0, count, result; @@ -460,16 +461,24 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) } } - /* find the service */ + /* validate service name */ + name = (WCHAR *)data; + if (!info.name_size || data_size < info.name_size * sizeof(WCHAR) || name[info.name_size - 1]) + { + ERR( "got request without valid service name\n" ); + result = ERROR_INVALID_PARAMETER; + goto done; + } - if (!(service = find_service_by_name( data ))) + /* find the service */ + if (!(service = find_service_by_name( name ))) { - FIXME( "got request %u for unknown service %s\n", info.cmd, debugstr_w(data)); + FIXME( "got request %u for unknown service %s\n", info.cmd, debugstr_w(name)); result = ERROR_INVALID_PARAMETER; goto done; } - TRACE( "got request %u for service %s\n", info.cmd, debugstr_w(data) ); + TRACE( "got request %u for service %s\n", info.cmd, debugstr_w(name) ); /* handle the request */ switch (info.cmd) @@ -477,12 +486,12 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) case WINESERV_STARTINFO: if (!service->handle) { - if (!(service->handle = OpenServiceW( disp->manager, data, SERVICE_SET_STATUS )) || - !(service->full_access_handle = OpenServiceW( disp->manager, data, + if (!(service->handle = OpenServiceW( disp->manager, name, SERVICE_SET_STATUS )) || + !(service->full_access_handle = OpenServiceW( disp->manager, name, GENERIC_READ|GENERIC_WRITE ))) - FIXME( "failed to open service %s\n", debugstr_w(data) ); + FIXME( "failed to open service %s\n", debugstr_w(name) ); } - result = service_handle_start(service, data, data_size / sizeof(WCHAR)); + result = service_handle_start(service, (WCHAR *)data, data_size / sizeof(WCHAR)); break; case WINESERV_SENDCONTROL: result = service_handle_control(service, info.control);

1 0

Sebastian Lackner : services: Preparation to allow arbitrary data in service RPC messages.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 5f2b96b859d1087557949d855d6fd0e68b128a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2b96b859d1087557949d855… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 10 08:30:29 2016 +0200 services: Preparation to allow arbitrary data in service RPC messages. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/svcctl.idl | 2 +- programs/services/rpc.c | 4 ++-- programs/services/services.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index cadc5fd..98412d6 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -46,7 +46,7 @@ typedef struct service_start_info_t DWORD total_size; /* total request size */ DWORD name_size; /* size of name in data buffer */ DWORD control; /* control code */ - WCHAR data[1]; + BYTE data[1]; } service_start_info; [ diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 3ebf378..54947c6 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1046,14 +1046,14 @@ static BOOL process_send_control(struct process_entry *process, const WCHAR *nam BOOL r; /* calculate how much space we need to send the startup info */ - len = strlenW(name) + 1; + len = (strlenW(name) + 1) * sizeof(WCHAR); ssi = HeapAlloc(GetProcessHeap(),0,FIELD_OFFSET(service_start_info, data[len])); ssi->cmd = WINESERV_SENDCONTROL; ssi->control = dwControl; ssi->total_size = FIELD_OFFSET(service_start_info, data[len]); ssi->name_size = strlenW(name) + 1; - strcpyW(ssi->data, name); + strcpyW((WCHAR *)ssi->data, name); r = process_send_command(process, ssi, ssi->total_size, result); HeapFree( GetProcessHeap(), 0, ssi ); diff --git a/programs/services/services.c b/programs/services/services.c index ae5da2b..8e49906 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -861,17 +861,17 @@ static BOOL process_send_start_message(struct process_entry *process, const WCHA len = strlenW(name) + 1; for (i=0; i<argc; i++) len += strlenW(argv[i])+1; - len++; + len = (len + 1) * sizeof(WCHAR); ssi = HeapAlloc(GetProcessHeap(),0,FIELD_OFFSET(service_start_info, data[len])); ssi->cmd = WINESERV_STARTINFO; ssi->control = 0; ssi->total_size = FIELD_OFFSET(service_start_info, data[len]); ssi->name_size = strlenW(name) + 1; - strcpyW(ssi->data, name); + strcpyW((WCHAR *)ssi->data, name); /* copy service args into a single buffer*/ - p = &ssi->data[ssi->name_size]; + p = (WCHAR *)&ssi->data[ssi->name_size * sizeof(WCHAR)]; for (i=0; i<argc; i++) { strcpyW(p, argv[i]);

1 0