March 2018 - Wine-Commits - list.winehq.org

Michael Müller : mpr: Return correct error code for non network paths and REMOTE_NAME_INFO_LEVEL in WNetGetUniversalName.
by Alexandre Julliard March 14, 2018

March 14, 2018

Module: wine Branch: master Commit: 31e5b4e5ee385e3d955545fbfa8ec79b77819b2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=31e5b4e5ee385e3d955545fb… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 13 20:32:33 2018 -0500 mpr: Return correct error code for non network paths and REMOTE_NAME_INFO_LEVEL in WNetGetUniversalName. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/tests/mpr.c | 9 +++------ dlls/mpr/wnet.c | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 330e66b..041afbf 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -101,25 +101,23 @@ static void test_WNetGetRemoteName(void) info_size = sizeof(buffer); ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &info_size); - todo_wine{ if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); fail_size = 0; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); - todo_wine{ if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_BAD_VALUE || ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, NULL); todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); @@ -127,13 +125,12 @@ static void test_WNetGetRemoteName(void) ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, NULL, &info_size); - todo_wine { if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_BAD_POINTER || ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } fail_size = sizeof(driveA) / sizeof(char) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 7b24693..78759ec 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -2348,7 +2348,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel, break; } case REMOTE_NAME_INFO_LEVEL: - err = WN_NO_NETWORK; + err = WN_NOT_CONNECTED; break; default:

1 0

Dmitry Timoshkov : mstask: Reimplement ITask constructor using ITaskFolder methods.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: b4539f71367c8eebb38c3c02e7db027263c308e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4539f71367c8eebb38c3c02… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 13 16:04:07 2018 +0800 mstask: Reimplement ITask constructor using ITaskFolder methods. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/factory.c | 1 + dlls/mstask/mstask_main.c | 1 + dlls/mstask/mstask_private.h | 2 +- dlls/mstask/task.c | 50 +++++++++++++++++++++++++++++++------------- dlls/mstask/task_scheduler.c | 26 ++++++++++++++++------- dlls/mstask/task_trigger.c | 1 + 6 files changed, 59 insertions(+), 22 deletions(-) diff --git a/dlls/mstask/factory.c b/dlls/mstask/factory.c index 97a5113..260a930 100644 --- a/dlls/mstask/factory.c +++ b/dlls/mstask/factory.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "taskschd.h" #include "mstask.h" #include "mstask_private.h" #include "wine/debug.h" diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index bb19b89..eae8556 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "objbase.h" #include "rpcproxy.h" +#include "taskschd.h" #include "mstask.h" #include "mstask_private.h" #include "wine/debug.h" diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 9180e4a..511019d 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -26,6 +26,6 @@ extern ClassFactoryImpl MSTASK_ClassFactory DECLSPEC_HIDDEN; extern HRESULT TaskTriggerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; -extern HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT TaskConstructor(ITaskFolder *folder, const WCHAR *task_name, ITask **task, BOOL create) DECLSPEC_HIDDEN; #endif /* __MSTASK_PRIVATE_H__ */ diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 872e445b..095431c 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2008 Google (Roy Shea) + * Copyright (C) 2018 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "taskschd.h" #include "mstask.h" #include "mstask_private.h" #include "wine/debug.h" @@ -34,7 +36,7 @@ typedef struct ITask ITask_iface; IPersistFile IPersistFile_iface; LONG ref; - LPWSTR taskName; + IRegisteredTask *regtask; LPWSTR applicationName; LPWSTR parameters; LPWSTR comment; @@ -58,7 +60,6 @@ static void TaskDestructor(TaskImpl *This) HeapFree(GetProcessHeap(), 0, This->accountName); HeapFree(GetProcessHeap(), 0, This->comment); HeapFree(GetProcessHeap(), 0, This->parameters); - HeapFree(GetProcessHeap(), 0, This->taskName); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); } @@ -761,28 +762,49 @@ static const IPersistFileVtbl MSTASK_IPersistFileVtbl = MSTASK_IPersistFile_GetCurFile }; -HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) +HRESULT TaskConstructor(ITaskFolder *folder, const WCHAR *task_name, ITask **task, BOOL create) { TaskImpl *This; - int n; + IRegisteredTask *regtask; + BSTR bstr; + HRESULT hr; - TRACE("(%s, %p)\n", debugstr_w(pwszTaskName), ppObj); + TRACE("(%s, %p)\n", debugstr_w(task_name), task); + + bstr = SysAllocString(task_name); + if (!bstr) return E_OUTOFMEMORY; + + if (create) + { + static const char xml_tmplate[] = + "<?xml version=\"1.0\"?>\n" + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + "</Task>\n"; + WCHAR xmlW[sizeof(xml_tmplate)]; + VARIANT v_null; + + MultiByteToWideChar(CP_ACP, 0, xml_tmplate, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + + V_VT(&v_null) = VT_NULL; + hr = ITaskFolder_RegisterTask(folder, bstr, xmlW, TASK_CREATE | TASK_UPDATE, + v_null, v_null, TASK_LOGON_NONE, v_null, &regtask); + } + else + hr = ITaskFolder_GetTask(folder, bstr, &regtask); + SysFreeString(bstr); + if (hr != S_OK) return hr; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) + { + IRegisteredTask_Release(regtask); return E_OUTOFMEMORY; + } This->ITask_iface.lpVtbl = &MSTASK_ITaskVtbl; This->IPersistFile_iface.lpVtbl = &MSTASK_IPersistFileVtbl; This->ref = 1; - n = (lstrlenW(pwszTaskName) + 1) * sizeof(WCHAR); - This->taskName = HeapAlloc(GetProcessHeap(), 0, n); - if (!This->taskName) - { - HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; - } - lstrcpyW(This->taskName, pwszTaskName); + This->regtask = regtask; This->applicationName = NULL; This->parameters = NULL; This->comment = NULL; @@ -791,7 +813,7 @@ HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000; - *ppObj = &This->ITask_iface; + *task = &This->ITask_iface; InterlockedIncrement(&dll_ref); return S_OK; } diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 1ace4dd..e9b8727 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -37,6 +37,7 @@ typedef struct ITaskScheduler ITaskScheduler_iface; LONG ref; ITaskService *service; + ITaskFolder *root; } TaskSchedulerImpl; typedef struct @@ -58,6 +59,7 @@ static inline EnumWorkItemsImpl *impl_from_IEnumWorkItems(IEnumWorkItems *iface) static void TaskSchedulerDestructor(TaskSchedulerImpl *This) { TRACE("%p\n", This); + ITaskFolder_Release(This->root); ITaskService_Release(This->service); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); @@ -290,14 +292,15 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Delete( static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( ITaskScheduler* iface, - LPCWSTR pwszTaskName, + LPCWSTR task_name, REFCLSID rclsid, REFIID riid, - IUnknown **ppunk) + IUnknown **task) { - HRESULT hr; - TRACE("(%p, %s, %s, %s, %p)\n", iface, debugstr_w(pwszTaskName), - debugstr_guid(rclsid) ,debugstr_guid(riid), ppunk); + TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); + + TRACE("(%p, %s, %s, %s, %p)\n", iface, debugstr_w(task_name), + debugstr_guid(rclsid), debugstr_guid(riid), task); if (!IsEqualGUID(rclsid, &CLSID_CTask)) return CLASS_E_CLASSNOTAVAILABLE; @@ -305,8 +308,7 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( if (!IsEqualGUID(riid, &IID_ITask)) return E_NOINTERFACE; - hr = TaskConstructor(pwszTaskName, (LPVOID *)ppunk); - return hr; + return TaskConstructor(This->root, task_name, (ITask **)task, TRUE); } static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem( @@ -347,6 +349,7 @@ HRESULT TaskSchedulerConstructor(LPVOID *ppObj) { TaskSchedulerImpl *This; ITaskService *service; + ITaskFolder *root; VARIANT v_null; HRESULT hr; @@ -363,15 +366,24 @@ HRESULT TaskSchedulerConstructor(LPVOID *ppObj) return hr; } + hr = ITaskService_GetFolder(service, NULL, &root); + if (hr != S_OK) + { + ITaskService_Release(service); + return hr; + } + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) { + ITaskFolder_Release(root); ITaskService_Release(service); return E_OUTOFMEMORY; } This->ITaskScheduler_iface.lpVtbl = &MSTASK_ITaskSchedulerVtbl; This->service = service; + This->root = root; This->ref = 1; *ppObj = &This->ITaskScheduler_iface; diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 9475e56..56bfbed 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "objbase.h" #include "winternl.h" +#include "taskschd.h" #include "mstask.h" #include "mstask_private.h" #include "wine/debug.h"

1 0

Nikolay Sivov : wincodecs: Use bottom-up orientation in BMP encoder.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: f46235ce4f5a2cc7056f884e3415cd8908ef12ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f46235ce4f5a2cc7056f884e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 13 02:52:30 2018 +0300 wincodecs: Use bottom-up orientation in BMP encoder. 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/windowscodecs/bmpencode.c | 34 ++++++++++++++++++++++------------ dlls/windowscodecs/tests/converter.c | 1 - 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index afd0baf..97f30d7 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -244,8 +244,10 @@ static HRESULT WINAPI BmpFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) { BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + UINT dstbuffersize, bytesperrow, row; + BYTE *dst, *src; HRESULT hr; - WICRect rc; + TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); if (!This->initialized || !This->width || !This->height || !This->format) @@ -254,19 +256,27 @@ static HRESULT WINAPI BmpFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, hr = BmpFrameEncode_AllocateBits(This); if (FAILED(hr)) return hr; - rc.X = 0; - rc.Y = 0; - rc.Width = This->width; - rc.Height = lineCount; + bytesperrow = ((This->format->bpp * This->width) + 7) / 8; - hr = copy_pixels(This->format->bpp, pbPixels, This->width, lineCount, cbStride, - &rc, This->stride, This->stride*(This->height-This->lineswritten), - This->bits + This->stride*This->lineswritten); + if (This->stride < bytesperrow) + return E_INVALIDARG; - if (SUCCEEDED(hr)) - This->lineswritten += lineCount; + dstbuffersize = This->stride * (This->height - This->lineswritten); + if ((This->stride * (lineCount - 1)) + bytesperrow > dstbuffersize) + return E_INVALIDARG; - return hr; + src = pbPixels; + dst = This->bits + This->stride * (This->height - This->lineswritten - 1); + for (row = 0; row < lineCount; row++) + { + memcpy(dst, src, bytesperrow); + src += cbStride; + dst -= This->stride; + } + + This->lineswritten += lineCount; + + return S_OK; } static HRESULT WINAPI BmpFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, @@ -313,7 +323,7 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bih.bV5Size = info_size = sizeof(BITMAPINFOHEADER); bih.bV5Width = This->width; - bih.bV5Height = -This->height; /* top-down bitmap */ + bih.bV5Height = This->height; bih.bV5Planes = 1; bih.bV5BitCount = This->format->bpp; bih.bV5Compression = This->format->compression; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 472bee5..5f9f1d8 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -663,7 +663,6 @@ static void check_bmp_format(IStream *stream, const struct bitmap_data *data) ok(bih.biSize == sizeof(bih), "Unexpected header size %d.\n", bih.biSize); ok(bih.biWidth == data->width, "Unexpected bitmap width %d.\n", bih.biWidth); -todo_wine ok(bih.biHeight == data->height, "Unexpected bitmap height %d.\n", bih.biHeight); ok(bih.biPlanes == 1, "Unexpected planes count %d.\n", bih.biPlanes);

1 0

Andrew Eikum : winepulse: Wake all threads when operations are completed.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 2157afff48c773298ed1510441955f21687b5ede URL: https://source.winehq.org/git/wine.git/?a=commit;h=2157afff48c773298ed15104… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 13 12:57:04 2018 -0500 winepulse: Wake all threads when operations are completed. If threads A and B queue operations simultaneously, it would previously be possible for B's operation to complete and wake thread A from cond_wait, which would fail its condition check and then deadlock as only thread B is awoken when A's operation completes. This change wakes all threads waiting on the cond var, and each thread already checks its condition before choosing to continue. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 50b4188..32f7acb 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -260,7 +260,7 @@ static inline ACImpl *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface) * but that cannot be used because it uses pthread_create directly * * pa_threaded_mainloop_(un)lock -> pthread_mutex_(un)lock - * pa_threaded_mainloop_signal -> pthread_cond_signal + * pa_threaded_mainloop_signal -> pthread_cond_broadcast * pa_threaded_mainloop_wait -> pthread_cond_wait */ @@ -277,7 +277,7 @@ static DWORD CALLBACK pulse_mainloop_thread(void *tmp) { pulse_ml = pa_mainloop_new(); pa_mainloop_set_poll_func(pulse_ml, pulse_poll_func, NULL); pthread_mutex_lock(&pulse_lock); - pthread_cond_signal(&pulse_cond); + pthread_cond_broadcast(&pulse_cond); pa_mainloop_run(pulse_ml, &ret); pthread_mutex_unlock(&pulse_lock); pa_mainloop_free(pulse_ml); @@ -307,14 +307,14 @@ static void pulse_contextcallback(pa_context *c, void *userdata) WARN("Context failed: %s\n", pa_strerror(pa_context_errno(c))); break; } - pthread_cond_signal(&pulse_cond); + pthread_cond_broadcast(&pulse_cond); } static void pulse_stream_state(pa_stream *s, void *user) { pa_stream_state_t state = pa_stream_get_state(s); TRACE("Stream state changed to %i\n", state); - pthread_cond_signal(&pulse_cond); + pthread_cond_broadcast(&pulse_cond); } static const enum pa_channel_position pulse_pos_from_wfx[] = { @@ -632,7 +632,7 @@ static void dump_attr(const pa_buffer_attr *attr) { static void pulse_op_cb(pa_stream *s, int success, void *user) { TRACE("Success: %i\n", success); *(int*)user = success; - pthread_cond_signal(&pulse_cond); + pthread_cond_broadcast(&pulse_cond); } static void pulse_attr_update(pa_stream *s, void *user) {

1 0

Alistair Leslie-Hughes : msscript: Implement IScriptControl get/ set AllowUI.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: c21c8525f9e69cfd48906ecc33b909490bd82783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c21c8525f9e69cfd48906ecc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 12 22:08:09 2018 +0000 msscript: Implement IScriptControl get/set AllowUI. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 17 +++++++++++++---- dlls/msscript.ocx/tests/msscript.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 1f706f5..e8cde9d 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -89,6 +89,7 @@ struct ScriptControl { IOleClientSite *site; SIZEL extent; LONG timeout; + VARIANT_BOOL allow_ui; /* connection points */ ConnectionPoint *cp_list; @@ -816,15 +817,22 @@ static HRESULT WINAPI ScriptControl_put_Timeout(IScriptControl *iface, LONG time static HRESULT WINAPI ScriptControl_get_AllowUI(IScriptControl *iface, VARIANT_BOOL *p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + *p = This->allow_ui; + return S_OK; } static HRESULT WINAPI ScriptControl_put_AllowUI(IScriptControl *iface, VARIANT_BOOL allow_ui) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%x)\n", This, allow_ui); - return E_NOTIMPL; + TRACE("(%p)->(%x)\n", This, allow_ui); + + This->allow_ui = allow_ui; + return S_OK; } static HRESULT WINAPI ScriptControl_get_UseSafeSubset(IScriptControl *iface, VARIANT_BOOL *p) @@ -1882,6 +1890,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->timeout = 10000; script_control->view_sink_flags = 0; script_control->view_sink = NULL; + script_control->allow_ui = VARIANT_TRUE; ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 66e2611..576a6b1 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1227,6 +1227,33 @@ static void test_AddObject(void) SysFreeString(objname); } +static void test_AllowUI(void) +{ + IScriptControl *sc; + VARIANT_BOOL allow; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_AllowUI(sc, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IScriptControl_get_AllowUI(sc, &allow); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(allow == VARIANT_TRUE, "got %d\n", allow); + + hr = IScriptControl_put_AllowUI(sc, VARIANT_FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_AllowUI(sc, &allow); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(allow == VARIANT_FALSE, "got %d\n", allow); + + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -1253,6 +1280,7 @@ START_TEST(msscript) test_timeout(); test_Reset(); test_AddObject(); + test_AllowUI(); CoUninitialize(); }

1 0

Matteo Bruni : tools: Add d3dx11_xx to make_specfiles.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: abbe201a09ceb1904a431fd1c1e143c6088f60b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abbe201a09ceb1904a431fd1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 13 19:17:42 2018 +0100 tools: Add d3dx11_xx to make_specfiles. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_specfiles | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/make_specfiles b/tools/make_specfiles index 8df802f..da06330 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -92,6 +92,10 @@ my @dll_groups = "d3dx10_33", ], [ + "d3dx11_43", + "d3dx11_42", + ], + [ "xinput1_3", "xinput1_4", "xinput1_2",

1 0

Dmitry Timoshkov : mstask: Make each source file self-contained.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: eb408f2dd98ab9c27f45cdc18591911f6e8d9155 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb408f2dd98ab9c27f45cdc1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 13 16:04:01 2018 +0800 mstask: Make each source file self-contained. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/Makefile.in | 2 +- dlls/mstask/factory.c | 8 ++++++++ dlls/mstask/mstask_local.idl | 1 - dlls/mstask/mstask_main.c | 11 +++++++---- dlls/mstask/mstask_private.h | 10 ---------- dlls/mstask/task.c | 8 ++++++++ dlls/mstask/task_scheduler.c | 14 +++++++++++--- dlls/mstask/task_trigger.c | 7 +++++++ 8 files changed, 42 insertions(+), 19 deletions(-) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index 55ab76d..72a6db3 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -1,5 +1,5 @@ MODULE = mstask.dll -IMPORTS = uuid ole32 +IMPORTS = ole32 C_SRCS = \ factory.c \ diff --git a/dlls/mstask/factory.c b/dlls/mstask/factory.c index f85a5f9..97a5113 100644 --- a/dlls/mstask/factory.c +++ b/dlls/mstask/factory.c @@ -16,6 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "mstask.h" #include "mstask_private.h" #include "wine/debug.h" diff --git a/dlls/mstask/mstask_local.idl b/dlls/mstask/mstask_local.idl index 98e060c..bf49728 100644 --- a/dlls/mstask/mstask_local.idl +++ b/dlls/mstask/mstask_local.idl @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep ident #pragma makedep register #include "mstask.idl" diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index aa6693d..bb19b89 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -16,15 +16,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> +#include <stdarg.h> -#include "mstask_private.h" +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" #include "objbase.h" #include "rpcproxy.h" - +#include "mstask.h" +#include "mstask_private.h" #include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(mstask); static HINSTANCE hInst; diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 17c20fe..9180e4a 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -19,16 +19,6 @@ #ifndef __MSTASK_PRIVATE_H__ #define __MSTASK_PRIVATE_H__ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "mstask.h" - extern LONG dll_ref DECLSPEC_HIDDEN; typedef struct ClassFactoryImpl ClassFactoryImpl; diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 97ae8b7..872e445b 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -16,6 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "mstask.h" #include "mstask_private.h" #include "wine/debug.h" diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 1f367ed..1c2d227 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -16,7 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "corerror.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "objbase.h" +#include "mstask.h" #include "mstask_private.h" #include "wine/debug.h" @@ -268,8 +276,8 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Activate( { TRACE("%p, %s, %s, %p: stub\n", iface, debugstr_w(pwszName), debugstr_guid(riid), ppunk); - FIXME("Partial stub always returning COR_E_FILENOTFOUND\n"); - return COR_E_FILENOTFOUND; + FIXME("Partial stub always returning ERROR_FILE_NOT_FOUND\n"); + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } static HRESULT WINAPI MSTASK_ITaskScheduler_Delete( diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 448cf08..9475e56 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -17,7 +17,14 @@ */ #include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" #include "winternl.h" +#include "mstask.h" #include "mstask_private.h" #include "wine/debug.h"

1 0

Dmitry Timoshkov : mstask: Reimplement SetTargetComputer/ GetTargetComputer using ITaskService methods.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 9fd030941bb364b8db812d1bcabbedb952b73148 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fd030941bb364b8db812d1b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 13 16:04:03 2018 +0800 mstask: Reimplement SetTargetComputer/GetTargetComputer using ITaskService methods. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/Makefile.in | 2 +- dlls/mstask/task_scheduler.c | 89 +++++++++++++++++++++++++++----------------- 2 files changed, 55 insertions(+), 36 deletions(-) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index 72a6db3..d914666 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -1,5 +1,5 @@ MODULE = mstask.dll -IMPORTS = ole32 +IMPORTS = ole32 oleaut32 C_SRCS = \ factory.c \ diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 1c2d227..1ace4dd 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2008 Google (Roy Shea) + * Copyright (C) 2018 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +25,7 @@ #include "winbase.h" #include "initguid.h" #include "objbase.h" +#include "taskschd.h" #include "mstask.h" #include "mstask_private.h" #include "wine/debug.h" @@ -34,6 +36,7 @@ typedef struct { ITaskScheduler ITaskScheduler_iface; LONG ref; + ITaskService *service; } TaskSchedulerImpl; typedef struct @@ -55,6 +58,7 @@ static inline EnumWorkItemsImpl *impl_from_IEnumWorkItems(IEnumWorkItems *iface) static void TaskSchedulerDestructor(TaskSchedulerImpl *This) { TRACE("%p\n", This); + ITaskService_Release(This->service); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); } @@ -198,60 +202,56 @@ static ULONG WINAPI MSTASK_ITaskScheduler_Release( } static HRESULT WINAPI MSTASK_ITaskScheduler_SetTargetComputer( - ITaskScheduler* iface, - LPCWSTR pwszComputer) + ITaskScheduler *iface, LPCWSTR comp_name) { TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); - WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 3]; /* extra space for two '\' and a zero */ - DWORD len = MAX_COMPUTERNAME_LENGTH + 1; /* extra space for a zero */ - - TRACE("(%p)->(%s)\n", This, debugstr_w(pwszComputer)); - - /* NULL is an alias for the local computer */ - if (!pwszComputer) - return S_OK; + VARIANT v_null, v_comp; + HRESULT hr; - buffer[0] = '\\'; - buffer[1] = '\\'; - if (GetComputerNameW(buffer + 2, &len)) - { - if (!lstrcmpiW(buffer, pwszComputer) || /* full unc name */ - !lstrcmpiW(buffer + 2, pwszComputer)) /* name without backslash */ - return S_OK; - } + TRACE("(%p)->(%s)\n", This, debugstr_w(comp_name)); - FIXME("remote computer %s not supported\n", debugstr_w(pwszComputer)); - return HRESULT_FROM_WIN32(ERROR_BAD_NETPATH); + V_VT(&v_null) = VT_NULL; + V_VT(&v_comp) = VT_BSTR; + V_BSTR(&v_comp) = SysAllocString(comp_name); + hr = ITaskService_Connect(This->service, v_comp, v_null, v_null, v_null); + SysFreeString(V_BSTR(&v_comp)); + return hr; } static HRESULT WINAPI MSTASK_ITaskScheduler_GetTargetComputer( - ITaskScheduler* iface, - LPWSTR *ppwszComputer) + ITaskScheduler *iface, LPWSTR *comp_name) { TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); - LPWSTR buffer; - DWORD len = MAX_COMPUTERNAME_LENGTH + 1; /* extra space for the zero */ + BSTR bstr; + WCHAR *buffer; + HRESULT hr; - TRACE("(%p)->(%p)\n", This, ppwszComputer); + TRACE("(%p)->(%p)\n", This, comp_name); - if (!ppwszComputer) + if (!comp_name) return E_INVALIDARG; + hr = ITaskService_get_TargetServer(This->service, &bstr); + if (hr != S_OK) return hr; + /* extra space for two '\' and a zero */ - buffer = CoTaskMemAlloc((MAX_COMPUTERNAME_LENGTH + 3) * sizeof(WCHAR)); + buffer = CoTaskMemAlloc((SysStringLen(bstr) + 3) * sizeof(WCHAR)); if (buffer) { buffer[0] = '\\'; buffer[1] = '\\'; - if (GetComputerNameW(buffer + 2, &len)) - { - *ppwszComputer = buffer; - return S_OK; - } - CoTaskMemFree(buffer); + lstrcpyW(buffer + 2, bstr); + *comp_name = buffer; + hr = S_OK; } - *ppwszComputer = NULL; - return HRESULT_FROM_WIN32(GetLastError()); + else + { + *comp_name = NULL; + hr = E_OUTOFMEMORY; + } + + SysFreeString(bstr); + return hr; } static HRESULT WINAPI MSTASK_ITaskScheduler_Enum( @@ -346,13 +346,32 @@ static const ITaskSchedulerVtbl MSTASK_ITaskSchedulerVtbl = HRESULT TaskSchedulerConstructor(LPVOID *ppObj) { TaskSchedulerImpl *This; + ITaskService *service; + VARIANT v_null; + HRESULT hr; + TRACE("(%p)\n", ppObj); + hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); + if (hr != S_OK) return hr; + + V_VT(&v_null) = VT_NULL; + hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); + if (hr != S_OK) + { + ITaskService_Release(service); + return hr; + } + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) + { + ITaskService_Release(service); return E_OUTOFMEMORY; + } This->ITaskScheduler_iface.lpVtbl = &MSTASK_ITaskSchedulerVtbl; + This->service = service; This->ref = 1; *ppObj = &This->ITaskScheduler_iface;

1 0

Andrey Gusev : ext-ms-win-dwmapi-ext-l1-1-0: Add dll.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 294560c1a3fbac9eb68a500effda2470af34bb40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=294560c1a3fbac9eb68a500e… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Mar 13 15:44:31 2018 +0200 ext-ms-win-dwmapi-ext-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-dwmapi-ext-l1-1-0/Makefile.in | 1 + dlls/ext-ms-win-dwmapi-ext-l1-1-0/ext-ms-win-dwmapi-ext-l1-1-0.spec | 4 ++++ tools/make_specfiles | 4 ++++ 5 files changed, 12 insertions(+) diff --git a/configure b/configure index d3293c4..1606c2f 100755 --- a/configure +++ b/configure @@ -1242,6 +1242,7 @@ enable_evr enable_explorerframe enable_ext_ms_win_authz_context_l1_1_0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 +enable_ext_ms_win_dwmapi_ext_l1_1_0 enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 @@ -18604,6 +18605,7 @@ wine_fn_config_makefile dlls/explorerframe enable_explorerframe wine_fn_config_makefile dlls/explorerframe/tests enable_tests wine_fn_config_makefile dlls/ext-ms-win-authz-context-l1-1-0 enable_ext_ms_win_authz_context_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-domainjoin-netjoin-l1-1-0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-dwmapi-ext-l1-1-0 enable_ext_ms_win_dwmapi_ext_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 diff --git a/configure.ac b/configure.ac index fb0014b..88e62b2 100644 --- a/configure.ac +++ b/configure.ac @@ -3239,6 +3239,7 @@ WINE_CONFIG_MAKEFILE(dlls/explorerframe) WINE_CONFIG_MAKEFILE(dlls/explorerframe/tests) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-authz-context-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-domainjoin-netjoin-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-dwmapi-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-devcaps-l1-1-0) diff --git a/dlls/ext-ms-win-dwmapi-ext-l1-1-0/Makefile.in b/dlls/ext-ms-win-dwmapi-ext-l1-1-0/Makefile.in new file mode 100644 index 0000000..de0b93d --- /dev/null +++ b/dlls/ext-ms-win-dwmapi-ext-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-dwmapi-ext-l1-1-0.dll diff --git a/dlls/ext-ms-win-dwmapi-ext-l1-1-0/ext-ms-win-dwmapi-ext-l1-1-0.spec b/dlls/ext-ms-win-dwmapi-ext-l1-1-0/ext-ms-win-dwmapi-ext-l1-1-0.spec new file mode 100644 index 0000000..179578c --- /dev/null +++ b/dlls/ext-ms-win-dwmapi-ext-l1-1-0/ext-ms-win-dwmapi-ext-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall DwmIsCompositionEnabled(ptr) dwmapi.DwmIsCompositionEnabled +@ stub DwmpRenderFlick +@ stub DwmRenderGesture +@ stub DwmShowContact diff --git a/tools/make_specfiles b/tools/make_specfiles index cf685b6..e02d888 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -161,6 +161,10 @@ my @dll_groups = "ext-ms-win-security-cryptui-l1-1-0", ], [ + "dwmapi", + "ext-ms-win-dwmapi-ext-l1-1-0", + ], + [ "netapi32", "ext-ms-win-domainjoin-netjoin-l1-1-0", ],

1 0

Andrew Wesie : ntdll: Handle interrupt 0x2c on x86-64.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: bd63cce8f5bb9b55df559c3bdd49ab07fc569e74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd63cce8f5bb9b55df559c3b… Author: Andrew Wesie <awesie(a)gmail.com> Date: Mon Mar 12 23:03:06 2018 -0500 ntdll: Handle interrupt 0x2c on x86-64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 +++ dlls/ntdll/tests/exception.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7b82083..05b0906 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2809,6 +2809,9 @@ static inline BOOL handle_interrupt( unsigned int interrupt, EXCEPTION_RECORD *r { switch(interrupt) { + case 0x2c: + rec->ExceptionCode = STATUS_ASSERTION_FAILURE; + return TRUE; case 0x2d: context->Rip += 3; rec->ExceptionCode = EXCEPTION_BREAKPOINT; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a76fce6..7615b5a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2354,8 +2354,6 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, trace( "exception %u: %x flags:%x addr:%p\n", entry, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); -todo_wine_if( rec->ExceptionCode != except->status && - rec->ExceptionCode != except->alt_status ) ok( rec->ExceptionCode == except->status || (except->alt_status != 0 && rec->ExceptionCode == except->alt_status), "%u: Wrong exception code %x/%x\n", entry, rec->ExceptionCode, except->status );

1 0