October 2017 - Wine-commits

Andrey Gusev : ntdll: Remove redundant comparison.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: 4895156369d2d90caa70449f98cf72eff2790767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4895156369d2d90caa70449f9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Oct 12 16:14:53 2017 +0300 ntdll: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loadorder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index 401d256..157d2cb 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -253,7 +253,7 @@ static void init_load_order(void) entry = strW.Buffer; while (*entry) { - while (*entry && *entry == ';') entry++; + while (*entry == ';') entry++; if (!*entry) break; next = strchrW( entry, ';' ); if (next) *next++ = 0;

1 0

Jacek Caban : mshtml: Simplify IHTMLElement::click implementation.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: 353d9d826a4b625c45dbeb634385920c7b3ac5f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=353d9d826a4b625c45dbeb634… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 12 14:26:57 2017 +0200 mshtml: Simplify IHTMLElement::click implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 1 - dlls/mshtml/htmlbody.c | 1 - dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlelem.c | 14 +++++++++++++- dlls/mshtml/htmlevent.c | 16 ---------------- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlform.c | 1 - dlls/mshtml/htmlframe.c | 1 - dlls/mshtml/htmlhead.c | 1 - dlls/mshtml/htmliframe.c | 1 - dlls/mshtml/htmlimg.c | 1 - dlls/mshtml/htmlinput.c | 21 --------------------- dlls/mshtml/htmllink.c | 1 - dlls/mshtml/htmlobject.c | 1 - dlls/mshtml/htmloption.c | 1 - dlls/mshtml/htmlscript.c | 1 - dlls/mshtml/htmlselect.c | 1 - dlls/mshtml/htmlstyleelem.c | 1 - dlls/mshtml/htmltable.c | 1 - dlls/mshtml/htmltablecell.c | 1 - dlls/mshtml/htmltablerow.c | 1 - dlls/mshtml/htmltextarea.c | 1 - dlls/mshtml/mshtml_private.h | 1 - 23 files changed, 13 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=353d9d826a4b625c45dbe…

1 0

Jacek Caban : mshtml/tests: Use winetest.js in events.html.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: 1824f67a06854a3863ceea26bfa2d0874c8e5acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1824f67a06854a3863ceea26b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 12 14:27:08 2017 +0200 mshtml/tests: Use winetest.js in events.html. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 8d5fcc3..638545c 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -1,16 +1,11 @@ <html> <head> +<script src="winetest.js" type="text/javascript"></script> +</head> +<head> <script> var testevent_divid2_called = false, testevent_document_called = false, cnt=0; -function ok(b,m) { - return external.ok(b, m); -} - -function broken(expr) { - return external.broken(expr); -} - function ondataavailable_test() { var evobj, div, b = false; @@ -130,7 +125,7 @@ function test_insert_script() { ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); if(e.readyState === "complete") { ok(readystatechange_log === "append,complete", "readystatechange_log = " + readystatechange_log); - external.reportSuccess(); + reportSuccess(); } } @@ -202,7 +197,7 @@ img.src = "http://test.winehq.org/tests/winehq_snapshot/index_files/winehq_logo_ var img_onload_called = false; img.onload = function() { - external.trace("img.onload"); + trace("img.onload"); img_onload_called = true; } </script> @@ -242,7 +237,7 @@ function extern_res_script_readystatechange() { if(elem.readyState != "loading") extern_res_script_rs += elem.readyState + extern_cnt + ","; else - external.trace("Got loading readyState from external res script."); + trace("Got loading readyState from external res script."); } function http_script_readystatechange() {

1 0

Jacek Caban : mshtml/tests: Added script event argument test.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: fa942235114985fe181c4398027a745dcf132bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa942235114985fe181c43980… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 12 14:27:24 2017 +0200 mshtml/tests: Added script event argument test. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 4 +++- dlls/mshtml/tests/winetest.js | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 638545c..cb726c1 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -95,9 +95,11 @@ function test_handler_this() { } function registerHandler(name, target) { - var b = target.attachEvent("onclick", function() { + var b = target.attachEvent("onclick", function(event_arg) { ok(this === window, "this !== window"); calls.push(name+"*"); + with(todo_wine) + ok(event_arg != window.event, "event_arg == window.event"); }); ok(b, "attachEvent failed"); } diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index 29bdaab..3f1b38b 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -51,3 +51,9 @@ function win_skip(m) { function reportSuccess() { external.reportSuccess(); } + +var todo_wine = { + ok: function(b,m) { + return external.todo_wine_ok(b,m); + } +};

1 0

Henri Verbeet : d3d10: Release the device reference in d3d10_stateblock_Release().
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: dc0310c0296c7589564090fca858cfd158e5944d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0310c0296c7589564090fca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 12 16:17:09 2017 +0200 d3d10: Release the device reference in d3d10_stateblock_Release(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/stateblock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index d0efc52..470d325 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -274,6 +274,7 @@ static ULONG STDMETHODCALLTYPE d3d10_stateblock_Release(ID3D10StateBlock *iface) if (!refcount) { stateblock_cleanup(stateblock); + ID3D10Device_Release(stateblock->device); HeapFree(GetProcessHeap(), 0, stateblock); }

1 0

Henri Verbeet : d3d11: Increment the device reference count in d3d11_input_layout_AddRef().
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: 2e877152de1aee128968f8525e5d0b73f43010c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e877152de1aee128968f8525… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 12 16:17:10 2017 +0200 d3d11: Increment the device reference count in d3d11_input_layout_AddRef(). Since we release it in d3d11_input_layout_Release(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/inputlayout.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 2f194e0..784779c 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -134,6 +134,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_AddRef(ID3D11InputLayout *ifac if (refcount == 1) { + ID3D11Device_AddRef(layout->device); wined3d_mutex_lock(); wined3d_vertex_declaration_incref(layout->wined3d_decl); wined3d_mutex_unlock();

1 0

Nikolay Sivov : gdiplus/metafile: Implement EmfPlusRecordTypeObject for image attributes object.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: 825f393299393321f3ed6631b9f8e6b6c37f4d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825f393299393321f3ed6631b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 12 13:44:29 2017 +0300 gdiplus/metafile: Implement EmfPlusRecordTypeObject for image attributes object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 28 +++++++++++ dlls/gdiplus/image.c | 19 +------ dlls/gdiplus/metafile.c | 112 +++++++++++++++++++++++++++++++++++------ 3 files changed, 126 insertions(+), 33 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 566092e..d6ccb95 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -121,6 +121,7 @@ extern GpStatus METAFILE_DrawImagePointsRect(GpMetafile* metafile, GpImage *imag extern GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) DECLSPEC_HIDDEN; extern GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) DECLSPEC_HIDDEN; +extern void METAFILE_Free(GpMetafile *metafile) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; @@ -371,6 +372,32 @@ struct GpImage{ LONG busy; }; +#define EmfPlusObjectTableSize 64 + +typedef enum EmfPlusObjectType +{ + ObjectTypeInvalid, + ObjectTypeBrush, + ObjectTypePen, + ObjectTypePath, + ObjectTypeRegion, + ObjectTypeImage, + ObjectTypeFont, + ObjectTypeStringFormat, + ObjectTypeImageAttributes, + ObjectTypeCustomLineCap, + ObjectTypeMax = ObjectTypeCustomLineCap, +} EmfPlusObjectType; + +/* Deserialized EmfPlusObject record. */ +struct emfplus_object { + EmfPlusObjectType type; + union { + GpImageAttributes *image_attributes; + void *object; + } u; +}; + struct GpMetafile{ GpImage image; GpRectF bounds; @@ -404,6 +431,7 @@ struct GpMetafile{ GpRegion *base_clip; /* clip region in device space for all metafile output */ GpRegion *clip; /* clip region within the metafile */ struct list containers; + struct emfplus_object objtable[EmfPlusObjectTableSize]; }; struct GpBitmap{ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 80ad65f..c0b54d0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2085,24 +2085,7 @@ static GpStatus free_image_data(GpImage *image) heap_free(((GpBitmap*)image)->prop_item); } else if (image->type == ImageTypeMetafile) - { - GpMetafile *metafile = (GpMetafile*)image; - heap_free(metafile->comment_data); - DeleteEnhMetaFile(CloseEnhMetaFile(metafile->record_dc)); - if (!metafile->preserve_hemf) - DeleteEnhMetaFile(metafile->hemf); - if (metafile->record_graphics) - { - WARN("metafile closed while recording\n"); - /* not sure what to do here; for now just prevent the graphics from functioning or using this object */ - metafile->record_graphics->image = NULL; - metafile->record_graphics->busy = TRUE; - } - if (metafile->record_stream) - { - IStream_Release(metafile->record_stream); - } - } + METAFILE_Free((GpMetafile *)image); else { WARN("invalid image: %p\n", image); diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ecfbab2..78ea854 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -297,20 +297,6 @@ typedef struct EmfPlusImageAttributes DWORD Reserved2; } EmfPlusImageAttributes; -typedef enum ObjectType -{ - ObjectTypeInvalid, - ObjectTypeBrush, - ObjectTypePen, - ObjectTypePath, - ObjectTypeRegion, - ObjectTypeImage, - ObjectTypeFont, - ObjectTypeStringFormat, - ObjectTypeImageAttributes, - ObjectTypeCustomLineCap, -} ObjectType; - typedef struct EmfPlusObject { EmfPlusRecordHeader Header; @@ -370,9 +356,52 @@ typedef struct EmfPlusFillPath } data; } EmfPlusFillPath; +static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) +{ + struct emfplus_object *object = &metafile->objtable[id]; + + switch (object->type) + { + case ObjectTypeInvalid: + break; + case ObjectTypeImageAttributes: + GdipDisposeImageAttributes(object->u.image_attributes); + break; + default: + FIXME("not implemented for object type %u.\n", object->type); + return; + } + + object->type = ObjectTypeInvalid; + object->u.object = NULL; +} + +void METAFILE_Free(GpMetafile *metafile) +{ + unsigned int i; + + heap_free(metafile->comment_data); + DeleteEnhMetaFile(CloseEnhMetaFile(metafile->record_dc)); + if (!metafile->preserve_hemf) + DeleteEnhMetaFile(metafile->hemf); + if (metafile->record_graphics) + { + WARN("metafile closed while recording\n"); + /* not sure what to do here; for now just prevent the graphics from functioning or using this object */ + metafile->record_graphics->image = NULL; + metafile->record_graphics->busy = TRUE; + } + + if (metafile->record_stream) + IStream_Release(metafile->record_stream); + + for (i = 0; i < sizeof(metafile->objtable)/sizeof(metafile->objtable[0]); i++) + metafile_free_object_table_entry(metafile, i); +} + static DWORD METAFILE_AddObjectId(GpMetafile *metafile) { - return (metafile->next_object_id++) % 64; + return (metafile->next_object_id++) % EmfPlusObjectTableSize; } static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void **result) @@ -1407,6 +1436,55 @@ static GpStatus METAFILE_PlaybackUpdateWorldTransform(GpMetafile *metafile) return stat; } +static void metafile_set_object_table_entry(GpMetafile *metafile, BYTE id, BYTE type, void *object) +{ + metafile_free_object_table_entry(metafile, id); + metafile->objtable[id].type = type; + metafile->objtable[id].u.object = object; +} + +static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT data_size, const BYTE *record_data) +{ + BYTE type = (flags >> 8) & 0xff; + BYTE id = flags & 0xff; + void *object = NULL; + GpStatus status; + + if (type > ObjectTypeMax || id >= EmfPlusObjectTableSize) + return InvalidParameter; + + switch (type) + { + case ObjectTypeImageAttributes: + { + EmfPlusImageAttributes *data = (EmfPlusImageAttributes *)record_data; + GpImageAttributes *attributes = NULL; + + if (data_size != sizeof(*data)) + return InvalidParameter; + + if ((status = GdipCreateImageAttributes(&attributes)) != Ok) + return status; + + status = GdipSetImageAttributesWrapMode(attributes, data->WrapMode, *(DWORD *)&data->ClampColor, + !!data->ObjectClamp); + if (status == Ok) + object = attributes; + else + GdipDisposeImageAttributes(attributes); + break; + } + default: + FIXME("not implemented for object type %d.\n", type); + return NotImplemented; + } + + if (status == Ok) + metafile_set_object_table_entry(metafile, id, type, object); + + return status; +} + GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, EmfPlusRecordType recordType, UINT flags, UINT dataSize, GDIPCONST BYTE *data) { @@ -1852,6 +1930,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return GdipSetSmoothingMode(real_metafile->playback_graphics, (flags >> 1) & 0xff); } + case EmfPlusRecordTypeObject: + { + return METAFILE_PlaybackObject(real_metafile, flags, dataSize, data); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Bernhard Übelacker : advapi32: Fix ChangeServiceConfig2 when given a null description.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: de7220e2553764afd5cf8d463110d4ec5b1a6696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7220e2553764afd5cf8d463… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Wed Oct 11 15:36:16 2017 +0200 advapi32: Fix ChangeServiceConfig2 when given a null description. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 66 +++++++++++++++++++++++++++++++++++++++++++ programs/services/rpc.c | 3 ++ 2 files changed, 69 insertions(+) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index ab7ae2e..405cef7 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -36,6 +36,7 @@ static const CHAR spooler[] = "Spooler"; /* Should be available on all platforms static CHAR selfname[MAX_PATH]; static BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID); +static BOOL (WINAPI *pChangeServiceConfig2W)(SC_HANDLE,DWORD,LPVOID); static BOOL (WINAPI *pEnumServicesStatusExA)(SC_HANDLE, SC_ENUM_TYPE, DWORD, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD, LPDWORD, LPCSTR); @@ -57,6 +58,7 @@ static void init_function_pointers(void) HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); pChangeServiceConfig2A = (void*)GetProcAddress(hadvapi32, "ChangeServiceConfig2A"); + pChangeServiceConfig2W = (void*)GetProcAddress(hadvapi32, "ChangeServiceConfig2W"); pEnumServicesStatusExA= (void*)GetProcAddress(hadvapi32, "EnumServicesStatusExA"); pEnumServicesStatusExW= (void*)GetProcAddress(hadvapi32, "EnumServicesStatusExW"); pGetSecurityInfo = (void *)GetProcAddress(hadvapi32, "GetSecurityInfo"); @@ -1954,6 +1956,7 @@ static void test_queryconfig2(void) DWORD expected, needed; BYTE buffer[MAX_PATH]; LPSERVICE_DESCRIPTIONA pConfig = (LPSERVICE_DESCRIPTIONA)buffer; + LPSERVICE_DESCRIPTIONW pConfigW = (LPSERVICE_DESCRIPTIONW)buffer; SERVICE_PRESHUTDOWN_INFO preshutdown_info; static const CHAR servicename [] = "Winetest"; static const CHAR displayname [] = "Winetest dummy service"; @@ -1961,6 +1964,9 @@ static void test_queryconfig2(void) static const CHAR dependencies[] = "Master1\0Master2\0+MasterGroup1\0"; static const CHAR password [] = ""; static const CHAR description [] = "Description"; + static const CHAR description_empty[] = ""; + static const WCHAR descriptionW [] = {'D','e','s','c','r','i','p','t','i','o','n','W',0}; + static const WCHAR descriptionW_empty[] = {0}; if(!pQueryServiceConfig2A) { @@ -2121,6 +2127,66 @@ static void test_queryconfig2(void) ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer, needed,&needed); ok(ret, "expected QueryServiceConfig2W to succeed\n"); + pConfig->lpDescription = (LPSTR)description; + ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2A to succeed\n"); + + pConfig->lpDescription = NULL; + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfig->lpDescription && !strcmp(description, pConfig->lpDescription), + "expected lpDescription to be %s, got %s\n", description, pConfig->lpDescription); + + pConfig->lpDescription = NULL; + ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2A to succeed\n"); + + pConfig->lpDescription = NULL; + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfig->lpDescription && !strcmp(description, pConfig->lpDescription), + "expected lpDescription to be %s, got %s\n", description, pConfig->lpDescription); + + pConfig->lpDescription = (LPSTR)description_empty; + ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2A to succeed\n"); + + pConfig->lpDescription = (void*)0xdeadbeef; + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(!pConfig->lpDescription, + "expected lpDescription to be null, got %s\n", pConfig->lpDescription); + + pConfigW->lpDescription = (LPWSTR)descriptionW; + ret = pChangeServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2W to succeed\n"); + + pConfigW->lpDescription = NULL; + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfigW->lpDescription && !lstrcmpW(descriptionW, pConfigW->lpDescription), + "expected lpDescription to be %s, got %s\n", wine_dbgstr_w(descriptionW), wine_dbgstr_w(pConfigW->lpDescription)); + + pConfigW->lpDescription = NULL; + ret = pChangeServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2W to succeed\n"); + + pConfigW->lpDescription = NULL; + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfigW->lpDescription && !lstrcmpW(descriptionW, pConfigW->lpDescription), + "expected lpDescription to be %s, got %s\n", wine_dbgstr_w(descriptionW), wine_dbgstr_w(pConfigW->lpDescription)); + + pConfigW->lpDescription = (LPWSTR)descriptionW_empty; + ret = pChangeServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2W to succeed\n"); + + pConfigW->lpDescription = (void*)0xdeadbeef; + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(!pConfigW->lpDescription, + "expected lpDescription to be null, got %s\n", wine_dbgstr_w(pConfigW->lpDescription)); + SetLastError(0xdeadbeef); ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, (LPBYTE)&preshutdown_info, sizeof(preshutdown_info), &needed); diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 8c95b7e..4435af9 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -826,6 +826,9 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI { WCHAR *descr = NULL; + if (!config.u.descr->lpDescription) + break; + if (config.u.descr->lpDescription[0]) { if (!(descr = strdupW( config.u.descr->lpDescription )))

1 0

Francois Gouget : testbot: Queued Tasks are not supposed to have a child process.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: tools Branch: master Commit: 97299c59adcb1dc5cdb7c0e666184a24d4c54841 URL: http://source.winehq.org/git/tools.git/?a=commit;h=97299c59adcb1dc5cdb7c0e6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 11 16:17:33 2017 +0200 testbot: Queued Tasks are not supposed to have a child process. So just silently unset ChildPid in Task::UpdateStatus() if needed, like we do for the tasks in other states that should not have a child process. Since they are queued they will get run later on anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Tasks.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index b4298fb..3dd5f13 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -159,7 +159,7 @@ sub UpdateStatus($$) if (defined $self->ChildPid && !kill(0, $self->ChildPid) && $! == ESRCH) { $self->ChildPid(undef); - if ($Status eq "queued" || $Status eq "running") + if ($Status eq "running") { my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $OldUMask = umask(002);

1 0

Francois Gouget : testbot: Fix Tasks to not use WineTestBot::Log.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: tools Branch: master Commit: 1d497afe25f3f633134e2a491b65af62cc0aa83e URL: http://source.winehq.org/git/tools.git/?a=commit;h=1d497afe25f3f633134e2a49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 11 16:15:30 2017 +0200 testbot: Fix Tasks to not use WineTestBot::Log. The perl modules should return error messages to the callers and let them deal with logging. So don't import WineTestBot::Log globally to ensure any logging really is deliberate. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Tasks.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 3dd5f13..401e275 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -40,7 +40,6 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Steps; use WineTestBot::WineTestBotObjects; -use WineTestBot::Log; use vars qw(@ISA @EXPORT); @@ -109,6 +108,7 @@ sub Run($$) } elsif (!$Pid) { + require WineTestBot::Log; # Capture Perl errors in the task's generic error log my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $TaskDir = "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; @@ -124,12 +124,11 @@ sub Run($$) } else { - LogMsg "unable to redirect stderr to '$TaskDir/err': $!\n"; + WineTestBot::Log::LogMsg("unable to redirect stderr to '$TaskDir/err': $!\n"); } $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; exec("$BinDir/${ProjectName}$RunScript", "--log-only", $JobId, $StepNo, $TaskNo) or - require WineTestBot::Log; WineTestBot::Log::LogMsg("Unable to exec ${ProjectName}$RunScript: $!\n"); exit(1); } @@ -173,7 +172,8 @@ sub UpdateStatus($$) umask($OldUMask); # This probably indicates a bug in the task script. # Don't requeue the task to avoid an infinite loop. - LogMsg "Child process for task $JobId/$StepNo/$TaskNo died unexpectedly\n"; + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Child process for task $JobId/$StepNo/$TaskNo died unexpectedly\n"); $self->Status("boterror"); $Status = "boterror";

1 0