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

Dmitry Timoshkov : mstask/tests: Add some tests for ITask::Run().
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: 3310cd5385f76a9be95a04c6ea98b608657d7961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3310cd5385f76a9be95a04c6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:47 2018 +0800 mstask/tests: Add some tests for ITask::Run(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 6837782..2e8ee93 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -591,6 +591,169 @@ static void test_task_state(void) cleanup_task(); } +static void save_job(ITask *task) +{ + HRESULT hr; + IPersistFile *pfile; + + hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistFile_Save(pfile, NULL, FALSE); + ok(hr == S_OK, "got %#x\n", hr); + + IPersistFile_Release(pfile); +} + +static void test_Run(void) +{ + static const WCHAR wine_test_runW[] = { 'w','i','n','e','_','t','e','s','t','_','r','u','n',0 }; + static const WCHAR cmdW[] = { 'c','m','d','.','e','x','e',0 }; + ITaskScheduler *scheduler; + ITask *task; + ITaskTrigger *trigger; + WORD idx, i; + TASK_TRIGGER trigger_data; + SYSTEMTIME st; + HRESULT hr, status; + + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **)&scheduler); + ok(hr == S_OK, "got %#x\n", hr); + + /* cleanup after previous runs */ + ITaskScheduler_Delete(scheduler, wine_test_runW); + + hr = ITaskScheduler_NewWorkItem(scheduler, wine_test_runW, &CLSID_CTask, + &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_Run(task); + ok(hr == SCHED_E_TASK_NOT_READY, "got %#x\n", hr); + + hr = ITask_Terminate(task); + ok(hr == SCHED_E_TASK_NOT_RUNNING, "got %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + + save_job(task); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + + hr = ITask_CreateTrigger(task, &idx, &trigger); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&trigger_data, 0, sizeof(trigger_data)); + trigger_data.cbTriggerSize = sizeof(trigger_data); + trigger_data.Reserved1 = 0; + GetLocalTime(&st); + trigger_data.wBeginYear = st.wYear; + trigger_data.wBeginMonth = st.wMonth; + trigger_data.wBeginDay = st.wDay; + trigger_data.wStartHour = st.wHour; + trigger_data.wStartMinute = st.wMinute; + trigger_data.TriggerType = TASK_TIME_TRIGGER_WEEKLY; + trigger_data.Type.Weekly.WeeksInterval = 1; + trigger_data.Type.Weekly.rgfDaysOfTheWeek = 0x7f; /* every day */ + hr = ITaskTrigger_SetTrigger(trigger, &trigger_data); + ok(hr == S_OK, "got %#x\n", hr); + ITaskTrigger_Release(trigger); + + hr = ITask_SetApplicationName(task, cmdW); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_SetParameters(task, empty); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_SetWorkingDirectory(task, empty); + ok(hr == S_OK, "got %#x\n", hr); + + /* Save the task so that the Scheduler service would notice the changes */ + save_job(task); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", status); + + hr = ITask_Run(task); + ok(hr == S_OK, "got %#x\n", hr); + + /* According to MSDN the task status doesn't update dynamically */ + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", status); + + ITask_Release(task); + + /* Running the process associated with the task to start up may + * take quite a bit a of time, and waiting for it during the test + * may be not the best idea. + * + * This is how it's supposed to look like in the application + * (the loop should be infinite): + */ + for (i = 0; i < 3; i++) + { + hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "Activate error %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); + + if (status == SCHED_S_TASK_RUNNING) break; + + Sleep(100); + } + + hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "Activate error %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + + if (status == SCHED_S_TASK_RUNNING) + { + hr = ITask_Terminate(task); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); + + /* Waiting for the process associated with the task to terminate + * may take quite a bit a of time, and waiting for it during the + * test is not practical. + * + * This is how it's supposed to look like in the application + * (the loop should be infinite): + */ + for (i = 0; i < 3; i++) + { + hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "Activate error %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); + + if (status != SCHED_S_TASK_RUNNING) break; + + Sleep(100); + } + } + else + ITask_Release(task); + + hr = ITaskScheduler_Delete(scheduler, wine_test_runW); + ok(hr == S_OK, "got %#x\n", hr); + ITaskScheduler_Release(scheduler); +} + START_TEST(task) { CoInitialize(NULL); @@ -601,5 +764,6 @@ START_TEST(task) test_SetMaxRunTime_GetMaxRunTime(); test_SetAccountInformation_GetAccountInformation(); test_task_state(); + test_Run(); CoUninitialize(); }

1 0

Dmitry Timoshkov : mstask: Add stdcall to cdecl thunks for AT Service RPC API.
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: f3f2eeb88c076ee1dbe28119cd0c26b4480dbcd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3f2eeb88c076ee1dbe28119… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 18:30:52 2018 +0800 mstask: Add stdcall to cdecl thunks for AT Service RPC API. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/mstask.spec | 16 ++++++++-------- dlls/mstask/mstask_main.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/mstask/mstask.spec b/dlls/mstask/mstask.spec index dcfb20c..df8ea7a 100644 --- a/dlls/mstask/mstask.spec +++ b/dlls/mstask/mstask.spec @@ -2,10 +2,10 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub GetNetScheduleAccountInformation -@ stdcall NetrJobAdd(wstr ptr ptr) -@ stdcall NetrJobDel(wstr long long) -@ stdcall NetrJobEnum(wstr ptr long ptr ptr) -@ stdcall NetrJobGetInfo(wstr long ptr) +@ stdcall NetrJobAdd(wstr ptr ptr) NetrJobAdd_wrapper +@ stdcall NetrJobDel(wstr long long) NetrJobDel_wrapper +@ stdcall NetrJobEnum(wstr ptr long ptr ptr) NetrJobEnum_wrapper +@ stdcall NetrJobGetInfo(wstr long ptr) NetrJobGetInfo_wrapper @ stub SAGetAccountInformation @ stub SAGetNSAccountInformation @ stub SASetAccountInformation @@ -15,10 +15,10 @@ @ stub _DllCanUnloadNow(a)0 @ stub _DllGetClassObject(a)12 @ stub _GetNetScheduleAccountInformation(a)12 -@ stdcall _NetrJobAdd(a)12(wstr ptr ptr) NetrJobAdd -@ stdcall _NetrJobDel(a)12(wstr long long) NetrJobDel -@ stdcall _NetrJobEnum(a)20(wstr ptr long ptr ptr) NetrJobEnum -@ stdcall _NetrJobGetInfo(a)12(wstr long ptr) NetrJobGetInfo +@ stdcall _NetrJobAdd(a)12(wstr ptr ptr) NetrJobAdd_wrapper +@ stdcall _NetrJobDel(a)12(wstr long long) NetrJobDel_wrapper +@ stdcall _NetrJobEnum(a)20(wstr ptr long ptr ptr) NetrJobEnum_wrapper +@ stdcall _NetrJobGetInfo(a)12(wstr long ptr) NetrJobGetInfo_wrapper @ stub _SAGetAccountInformation(a)16 @ stub _SAGetNSAccountInformation(a)12 @ stub _SASetAccountInformation(a)20 diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index c1e903681..e747af6 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -79,6 +79,27 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( hInst ); } +DWORD WINAPI NetrJobAdd_wrapper(ATSVC_HANDLE server_name, LPAT_INFO info, LPDWORD jobid) +{ + return NetrJobAdd(server_name, info, jobid); +} + +DWORD WINAPI NetrJobDel_wrapper(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jobid) +{ + return NetrJobDel(server_name, min_jobid, max_jobid); +} + +DWORD WINAPI NetrJobEnum_wrapper(ATSVC_HANDLE server_name, LPAT_ENUM_CONTAINER container, + DWORD max_length, LPDWORD total, LPDWORD resume) +{ + return NetrJobEnum(server_name, container, max_length, total, resume); +} + +DWORD WINAPI NetrJobGetInfo_wrapper(ATSVC_HANDLE server_name, DWORD jobid, LPAT_INFO *info) +{ + return NetrJobGetInfo(server_name, jobid, info); +} + DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) { return HeapAlloc(GetProcessHeap(), 0, n);

1 0

Dmitry Timoshkov : mstask: Initialize more task fields from the job file on load.
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: 747cd087a90243c99d52058d798f03c79d9e1f5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=747cd087a90243c99d52058d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:31 2018 +0800 mstask: Initialize more task fields from the job file on load. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 5ec7064..c99d51f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -58,6 +58,7 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; + UINT flags; HRESULT status; WORD idle_minutes, deadline_minutes; DWORD priority, maxRunTime; @@ -65,6 +66,7 @@ typedef struct DWORD trigger_count; TASK_TRIGGER *trigger; BOOL is_dirty; + USHORT instance_count; } TaskImpl; static inline TaskImpl *impl_from_ITask(ITask *iface) @@ -855,7 +857,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) const FIXDLEN_DATA *fixed; const SYSTEMTIME *st; DWORD unicode_strings_size, data_size, triggers_size; - USHORT instance_count, trigger_count, i; + USHORT trigger_count, i; const USHORT *signature; TASK_TRIGGER *task_trigger; @@ -888,7 +890,9 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) This->maxRunTime = fixed->maximum_runtime; TRACE("exit_code %#x\n", fixed->exit_code); TRACE("status %08x\n", fixed->status); + This->status = fixed->status; TRACE("flags %08x\n", fixed->flags); + This->flags = fixed->flags; st = &fixed->last_runtime; TRACE("last_runtime %d/%d/%d wday %d %d:%d:%d.%03d\n", st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, @@ -901,8 +905,8 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) return SCHED_E_INVALID_TASK; } - instance_count = *(const USHORT *)(data + sizeof(*fixed)); - TRACE("instance count %u\n", instance_count); + This->instance_count = *(const USHORT *)(data + sizeof(*fixed)); + TRACE("instance count %u\n", This->instance_count); if (fixed->name_size_offset + sizeof(USHORT) < size) unicode_strings_size = load_unicode_strings(task, data + fixed->name_size_offset, size - fixed->name_size_offset); @@ -1463,6 +1467,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); + This->flags = 0; This->status = SCHED_S_TASK_NOT_SCHEDULED; This->idle_minutes = 10; This->deadline_minutes = 60; @@ -1471,6 +1476,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->trigger_count = 0; This->trigger = NULL; This->is_dirty = FALSE; + This->instance_count = 0; /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000;

1 0

Dmitry Timoshkov : mstask: Implement ITaskScheduler::Delete().
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: 4bd663629d6bce8bd9c109740f7b9698d25605b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bd663629d6bce8bd9c10974… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:23 2018 +0800 mstask: Implement ITaskScheduler::Delete(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task_scheduler.c | 23 ++++++++++++++++++----- dlls/mstask/tests/task_scheduler.c | 17 +++++++++++++---- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 42e7738..416a321 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -302,12 +302,25 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Activate(ITaskScheduler *iface, return hr; } -static HRESULT WINAPI MSTASK_ITaskScheduler_Delete( - ITaskScheduler* iface, - LPCWSTR pwszName) +static HRESULT WINAPI MSTASK_ITaskScheduler_Delete(ITaskScheduler *iface, LPCWSTR name) { - FIXME("%p, %s: stub\n", iface, debugstr_w(pwszName)); - return E_NOTIMPL; + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; + static const WCHAR jobW[] = { '.','j','o','b',0 }; + WCHAR task_name[MAX_PATH]; + + TRACE("%p, %s\n", iface, debugstr_w(name)); + + if (strchrW(name, '.')) return E_INVALIDARG; + + GetWindowsDirectoryW(task_name, MAX_PATH); + lstrcatW(task_name, tasksW); + lstrcatW(task_name, name); + lstrcatW(task_name, jobW); + + if (!DeleteFileW(task_name)) + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; } static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 8b93b56..d476638 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -249,7 +249,7 @@ static void test_save_task_curfile(ITask *task) curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); ok(hr == S_OK, "GetCurFile error %#x\n", hr); - ok(curfile && curfile[0] , "curfile should not be NULL\n"); + ok(curfile && curfile[0], "curfile should not be NULL\n"); ok(file_exists(curfile), "curfile should exist\n"); @@ -343,6 +343,12 @@ static void test_task_storage(void) return; } + hr = ITaskScheduler_Delete(scheduler, Task1_ext); + ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); + + hr = ITaskScheduler_Delete(scheduler, Task1); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); + hr = ITaskScheduler_NewWorkItem(scheduler, Task1_ext, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); @@ -418,9 +424,12 @@ static void test_task_storage(void) test_save_task_curfile(task); - DeleteFileW(task1_full_name); - DeleteFileW(task2_full_name); - DeleteFileW(task3_full_name); + hr = ITaskScheduler_Delete(scheduler, Task1); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITaskScheduler_Delete(scheduler, Task2); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITaskScheduler_Delete(scheduler, Task3); + ok(hr == S_OK, "got %#x\n", hr); ITask_Release(task); ITaskScheduler_Release(scheduler);

1 0

Hans Leidekker : ws2_32: Enable IP_DONTFRAGMENT by default for SOCK_STREAM sockets.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 6d6b4bffb3f619ae298669b888775350223e281f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d6b4bffb3f619ae298669b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 11:30:10 2018 +0200 ws2_32: Enable IP_DONTFRAGMENT by default for SOCK_STREAM sockets. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 9 ++++++-- dlls/ws2_32/tests/sock.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 387ec54..914df17 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7606,9 +7606,14 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (ipxptype > 0) set_ipx_packettype(ret, ipxptype); - /* ensure IP_DONTFRAGMENT is disabled, in Linux the global default can be enabled */ if (unixaf == AF_INET || unixaf == AF_INET6) - set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); + { + /* ensure IP_DONTFRAGMENT is disabled for SOCK_DGRAM and SOCK_RAW, enabled for SOCK_STREAM */ + if (unixtype == SOCK_DGRAM || unixtype == SOCK_RAW) /* in Linux the global default can be enabled */ + set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); + else if (unixtype == SOCK_STREAM) + set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, TRUE); + } #ifdef IPV6_V6ONLY if (unixaf == AF_INET6) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 05495b4..6dd1491 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1908,6 +1908,59 @@ todo_wine ok(value == 1, "Expected 1, got %d\n", value); closesocket(s); + + s = socket(family, SOCK_STREAM, 0); + if (s == INVALID_SOCKET && i) + { + skip("IPv6 is not supported\n"); + break; + } + ok(s != INVALID_SOCKET, "socket failed with error %d\n", GetLastError()); + + size = sizeof(value); + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 1 || broken(value == 0) /* < vista */, "Expected 1, got %d\n", value); + + size = sizeof(value); + value = 0; + err = setsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 0, "Expected 0, got %d\n", value); + + closesocket(s); + + s = socket(family, SOCK_RAW, 0); + if (s == INVALID_SOCKET) + { + if (WSAGetLastError() == WSAEACCES) skip("SOCK_RAW is not available\n"); + else if (i) skip("IPv6 is not supported\n"); + break; + } + ok(s != INVALID_SOCKET, "socket failed with error %d\n", GetLastError()); + + size = sizeof(value); + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 0, "Expected 0, got %d\n", value); + + size = sizeof(value); + value = 1; + err = setsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 1, "Expected 1, got %d\n", value); + + closesocket(s); } }

1 0

Jacek Caban : jscript: Use jsdisp_get_own_property in Object.propertyIsEnumerable implementation.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: fc639fa271657bb4db30dbf1a0e2d9e2b6164013 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc639fa271657bb4db30dbf1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:20:16 2018 +0200 jscript: Use jsdisp_get_own_property in Object.propertyIsEnumerable implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 13 ------------- dlls/jscript/jscript.h | 1 - dlls/jscript/object.c | 8 ++++---- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5ec6830..1c9595f 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1589,19 +1589,6 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL return hres; } -HRESULT jsdisp_is_enumerable(jsdisp_t *obj, const WCHAR *name, BOOL *ret) -{ - dispex_prop_t *prop; - HRESULT hres; - - hres = find_prop_name(obj, string_hash(name), name, &prop); - if(FAILED(hres)) - return hres; - - *ret = prop && (prop->flags & PROPF_ENUMERABLE) && prop->type != PROP_PROTREF; - return S_OK; -} - HRESULT jsdisp_get_own_property(jsdisp_t *obj, const WCHAR *name, BOOL flags_only, property_desc_t *desc) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9f2220f..4f2acc5 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -294,7 +294,6 @@ HRESULT disp_delete(IDispatch*,DISPID,BOOL*) DECLSPEC_HIDDEN; HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_is_enumerable(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 56b6e8e..315c846 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -178,9 +178,9 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + property_desc_t prop_desc; const WCHAR *name; jsstr_t *name_str; - BOOL ret; HRESULT hres; TRACE("\n"); @@ -199,13 +199,13 @@ static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, W if(FAILED(hres)) return hres; - hres = jsdisp_is_enumerable(jsthis->u.jsdisp, name, &ret); + hres = jsdisp_get_own_property(jsthis->u.jsdisp, name, TRUE, &prop_desc); jsstr_release(name_str); - if(FAILED(hres)) + if(FAILED(hres) && hres != DISP_E_UNKNOWNNAME) return hres; if(r) - *r = jsval_bool(ret); + *r = jsval_bool(hres == S_OK && (prop_desc.flags & PROPF_ENUMERABLE) != 0); return S_OK; }

1 0

Jacek Caban : jscript: Use jsdisp_get_own_property in Object.hasOwnProperty implementation.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: f82bc09f28d66b4d9250fd8d918c08176d194f23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f82bc09f28d66b4d9250fd8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:20:06 2018 +0200 jscript: Use jsdisp_get_own_property in Object.hasOwnProperty implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 13 ------------- dlls/jscript/jscript.h | 1 - dlls/jscript/object.c | 17 +++++++++-------- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5ba5b70..5ec6830 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1589,19 +1589,6 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL return hres; } -HRESULT jsdisp_is_own_prop(jsdisp_t *obj, const WCHAR *name, BOOL *ret) -{ - dispex_prop_t *prop; - HRESULT hres; - - hres = find_prop_name(obj, string_hash(name), name, &prop); - if(FAILED(hres)) - return hres; - - *ret = prop && (prop->type == PROP_JSVAL || prop->type == PROP_BUILTIN); - return S_OK; -} - HRESULT jsdisp_is_enumerable(jsdisp_t *obj, const WCHAR *name, BOOL *ret) { dispex_prop_t *prop; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ab7d634..9f2220f 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -294,7 +294,6 @@ HRESULT disp_delete(IDispatch*,DISPID,BOOL*) DECLSPEC_HIDDEN; HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_is_own_prop(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_is_enumerable(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 72365c7..56b6e8e 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -138,20 +138,21 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return hres; if(is_jsdisp(jsthis)) { + property_desc_t prop_desc; const WCHAR *name_str; - BOOL result; name_str = jsstr_flatten(name); - if(name_str) - hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name_str, &result); - else - hres = E_OUTOFMEMORY; + if(!name_str) { + jsstr_release(name); + return E_OUTOFMEMORY; + } + + hres = jsdisp_get_own_property(jsthis->u.jsdisp, name_str, TRUE, &prop_desc); jsstr_release(name); - if(FAILED(hres)) + if(FAILED(hres) && hres != DISP_E_UNKNOWNNAME) return hres; - if(r) - *r = jsval_bool(result); + if(r) *r = jsval_bool(hres == S_OK); return S_OK; }

1 0

Jacek Caban : jscript: Added Object.getOwnPropertyDescriptor implementation.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 551e5a77e24d7b93808b127d16a97d65288e2864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=551e5a77e24d7b93808b127d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:19:56 2018 +0200 jscript: Added Object.getOwnPropertyDescriptor implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 32 +++++++++++++++ dlls/jscript/jscript.h | 7 ++++ dlls/jscript/object.c | 83 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 4 ++ dlls/mshtml/tests/es5.js | 43 +++++++++++++++++--- 5 files changed, 163 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index d3f345a..5ba5b70 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1614,3 +1614,35 @@ HRESULT jsdisp_is_enumerable(jsdisp_t *obj, const WCHAR *name, BOOL *ret) *ret = prop && (prop->flags & PROPF_ENUMERABLE) && prop->type != PROP_PROTREF; return S_OK; } + +HRESULT jsdisp_get_own_property(jsdisp_t *obj, const WCHAR *name, BOOL flags_only, + property_desc_t *desc) +{ + dispex_prop_t *prop; + HRESULT hres; + + hres = find_prop_name(obj, string_hash(name), name, &prop); + if(FAILED(hres)) + return hres; + + if(!prop) + return DISP_E_UNKNOWNNAME; + + memset(desc, 0, sizeof(*desc)); + + switch(prop->type) { + case PROP_BUILTIN: + case PROP_JSVAL: + if(!flags_only) { + hres = prop_get(obj, prop, &desc->value); + if(FAILED(hres)) + return hres; + } + break; + default: + return DISP_E_UNKNOWNNAME; + } + + desc->flags = prop->flags & (PROPF_ENUMERABLE | PROPF_WRITABLE | PROPF_CONFIGURABLE); + return S_OK; +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9c28da0..ab7d634 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -50,6 +50,7 @@ typedef struct _jsval_t jsval_t; typedef struct _jsstr_t jsstr_t; typedef struct _script_ctx_t script_ctx_t; typedef struct _dispex_prop_t dispex_prop_t; +typedef struct _property_desc_t property_desc_t; typedef struct { void **blocks; @@ -292,6 +293,7 @@ HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT disp_delete(IDispatch*,DISPID,BOOL*) DECLSPEC_HIDDEN; HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; +HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_is_own_prop(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_is_enumerable(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; @@ -376,6 +378,11 @@ typedef struct { #include "jsval.h" +struct _property_desc_t { + unsigned flags; + jsval_t value; +}; + typedef struct { EXCEPINFO ei; jsval_t val; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index de09060..72365c7 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -32,8 +32,16 @@ static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; +static const WCHAR getOwnPropertyDescriptorW[] = + {'g','e','t','O','w','n','P','r','o','p','e','r','t','y','D','e','s','c','r','i','p','t','o','r',0}; + static const WCHAR default_valueW[] = {'[','o','b','j','e','c','t',' ','O','b','j','e','c','t',']',0}; +static const WCHAR configurableW[] = {'c','o','n','f','i','g','u','r','a','b','l','e',0}; +static const WCHAR enumerableW[] = {'e','n','u','m','e','r','a','b','l','e',0}; +static const WCHAR valueW[] = {'v','a','l','u','e',0}; +static const WCHAR writableW[] = {'w','r','i','t','a','b','l','e',0}; + static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -252,6 +260,79 @@ static const builtin_info_t ObjectInst_info = { NULL }; +static void release_property_descriptor(property_desc_t *desc) +{ + jsval_release(desc->value); +} + +static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + property_desc_t prop_desc; + jsdisp_t *obj, *desc_obj; + const WCHAR *name; + jsstr_t *name_str; + HRESULT hres; + + TRACE("\n"); + + if(argc < 1 || !is_object_instance(argv[0])) + return throw_type_error(ctx, JS_E_OBJECT_EXPECTED, NULL); + obj = to_jsdisp(get_object(argv[0])); + if(!obj) { + FIXME("not implemented non-JS object\n"); + return E_NOTIMPL; + } + + hres = to_flat_string(ctx, argc >= 2 ? argv[1] : jsval_undefined(), &name_str, &name); + if(FAILED(hres)) + return hres; + + hres = jsdisp_get_own_property(obj, name, FALSE, &prop_desc); + jsstr_release(name_str); + if(hres == DISP_E_UNKNOWNNAME) { + if(r) *r = jsval_undefined(); + return S_OK; + } + if(FAILED(hres)) + return hres; + + hres = create_object(ctx, NULL, &desc_obj); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_name(desc_obj, valueW, prop_desc.value); + if(SUCCEEDED(hres)) + hres = jsdisp_propput_name(desc_obj, writableW, + jsval_bool(!!(prop_desc.flags & PROPF_WRITABLE))); + if(SUCCEEDED(hres)) + hres = jsdisp_propput_name(desc_obj, enumerableW, + jsval_bool(!!(prop_desc.flags & PROPF_ENUMERABLE))); + if(SUCCEEDED(hres)) + hres = jsdisp_propput_name(desc_obj, configurableW, + jsval_bool(!!(prop_desc.flags & PROPF_CONFIGURABLE))); + + release_property_descriptor(&prop_desc); + if(SUCCEEDED(hres) && r) + *r = jsval_obj(desc_obj); + else + jsdisp_release(desc_obj); + return hres; +} + +static const builtin_prop_t ObjectConstr_props[] = { + {getOwnPropertyDescriptorW, Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2} +}; + +static const builtin_info_t ObjectConstr_info = { + JSCLASS_FUNCTION, + DEFAULT_FUNCTION_VALUE, + sizeof(ObjectConstr_props)/sizeof(*ObjectConstr_props), + ObjectConstr_props, + NULL, + NULL +}; + static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -303,7 +384,7 @@ HRESULT create_object_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdi { static const WCHAR ObjectW[] = {'O','b','j','e','c','t',0}; - return create_builtin_constructor(ctx, ObjectConstr_value, ObjectW, NULL, PROPF_CONSTR, + return create_builtin_constructor(ctx, ObjectConstr_value, ObjectW, &ObjectConstr_info, PROPF_CONSTR, object_prototype, ret); } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 3fbb2fb..1525b09 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -140,6 +140,10 @@ function test_javascript() { test_exposed("toISOString", Date.prototype, v >= 9); test_exposed("isArray", Array, v >= 9); test_exposed("indexOf", Array.prototype, v >= 9); + /* FIXME: IE8 implements weird semi-functional property descriptors. */ + if(v != 8) { + test_exposed("getOwnPropertyDescriptor", Object, v >= 8); + } test_parses("if(false) { o.default; }", v >= 9); test_parses("if(false) { o.with; }", v >= 9); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index d539557..efdfb0a 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -28,8 +28,6 @@ function test_date_now() { } function test_toISOString() { - var s; - function expect(date, expected) { var s = date.toISOString(); ok(s === expected, "toISOString returned " + s + " expected " + expected); @@ -53,8 +51,6 @@ function test_toISOString() { expect(new Date(-6216721920000100), "-195031-12-03T23:59:59.900Z"); expect(new Date(1092830912830100), "+036600-06-07T22:27:10.100Z"); - trace("" + 0xdeadbeef); - expect_exception(function() { new Date(NaN).toISOString(); }); expect_exception(function() { new Date(31494784780800001).toISOString(); }); @@ -147,10 +143,47 @@ function test_identifier_keywords() { next_test(); } +function test_own_data_prop_desc(obj, prop, expected_writable, expected_enumerable, + expected_configurable) { + var desc = Object.getOwnPropertyDescriptor(obj, prop); + ok("value" in desc, "value is not in desc"); + ok(desc.value === obj[prop], "desc.value = " + desc.value + " expected " + obj[prop]); + ok(desc.writable === expected_writable, "desc(" + prop + ").writable = " + desc.writable + + " expected " + expected_writable); + ok(desc.enumerable === expected_enumerable, "desc.enumerable = " + desc.enumerable + + " expected " + expected_enumerable); + ok(desc.configurable === expected_configurable, "desc.configurable = " + desc.configurable + + " expected " + expected_configurable); +} + +function test_getOwnPropertyDescriptor() { + var obj; + + obj = { test: 1 }; + test_own_data_prop_desc(obj, "test", true, true, true); + + test_own_data_prop_desc(Object, "getOwnPropertyDescriptor", true, false, true); + test_own_data_prop_desc(Math, "PI", false, false, false); + + var obj = new String(); + ok(Object.getOwnPropertyDescriptor(obj, "slice") === undefined, + "getOwnPropertyDescriptor(slice) did not return undefined"); + test_own_data_prop_desc(String.prototype, "slice", true, false, true); + + obj = new Array(); + test_own_data_prop_desc(obj, "length", true, false, false); + + obj = /test/; + test_own_data_prop_desc(obj, "lastIndex", true, false, false); + + next_test(); +} + var tests = [ test_date_now, test_toISOString, test_indexOf, test_isArray, - test_identifier_keywords + test_identifier_keywords, + test_getOwnPropertyDescriptor ];

1 0

Owen Rudge : include: Add WSD_PROBE structure to wsdtypes.h.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 267af935df4f224ecdedd98d833d4c53c90bdc7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=267af935df4f224ecdedd98d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed May 9 23:31:41 2018 +0100 include: Add WSD_PROBE structure to wsdtypes.h. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wsdtypes.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/wsdtypes.h b/include/wsdtypes.h index 387b6c3..f2a91c3 100644 --- a/include/wsdtypes.h +++ b/include/wsdtypes.h @@ -30,6 +30,8 @@ typedef struct _WSD_REFERENCE_PARAMETERS WSD_REFERENCE_PARAMETERS; typedef struct _WSD_REFERENCE_PROPERTIES WSD_REFERENCE_PROPERTIES; typedef struct _WSD_ENDPOINT_REFERENCE WSD_ENDPOINT_REFERENCE; typedef struct _WSD_URI_LIST WSD_URI_LIST; +typedef struct _WSD_PROBE WSD_PROBE; +typedef struct _WSD_SCOPES WSD_SCOPES; struct _WSD_APP_SEQUENCE { @@ -96,4 +98,17 @@ struct _WSD_SOAP_MESSAGE WSDXML_TYPE *BodyType; }; +struct _WSD_PROBE +{ + WSD_NAME_LIST *Types; + WSD_SCOPES *Scopes; + WSDXML_ELEMENT *Any; +}; + +struct _WSD_SCOPES +{ + const WCHAR *MatchBy; + WSD_URI_LIST *Scopes; +}; + #endif

1 0

Michael Müller : ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 855ec1429632b4fce4417237d77acdfb72310dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=855ec1429632b4fce4417237… Author: Michael Müller <michael(a)fds-team.de> Date: Thu May 10 02:05:43 2018 +0000 ext-ms-win-uxtheme-themes-l1-1-0: Add dll. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in | 1 + .../ext-ms-win-uxtheme-themes-l1-1-0.spec | 24 ++++++++++++++++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 32 insertions(+) diff --git a/configure b/configure index 9e38228..ed45350 100755 --- a/configure +++ b/configure @@ -1283,6 +1283,7 @@ enable_ext_ms_win_rtcore_ntuser_syscolors_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_ext_ms_win_security_credui_l1_1_0 enable_ext_ms_win_security_cryptui_l1_1_0 +enable_ext_ms_win_uxtheme_themes_l1_1_0 enable_faultrep enable_fltlib enable_fltmgr_sys @@ -18690,6 +18691,7 @@ wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0 enable_ex wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win_security_credui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_win_security_cryptui_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-uxtheme-themes-l1-1-0 enable_ext_ms_win_uxtheme_themes_l1_1_0 wine_fn_config_makefile dlls/faultrep enable_faultrep wine_fn_config_makefile dlls/faultrep/tests enable_tests wine_fn_config_makefile dlls/fltlib enable_fltlib diff --git a/configure.ac b/configure.ac index 4ea26b3..f306078 100644 --- a/configure.ac +++ b/configure.ac @@ -3288,6 +3288,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) WINE_CONFIG_MAKEFILE(dlls/fltlib) diff --git a/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in new file mode 100644 index 0000000..576b6f6 --- /dev/null +++ b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-uxtheme-themes-l1-1-0.dll diff --git a/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec new file mode 100644 index 0000000..0a96983 --- /dev/null +++ b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec @@ -0,0 +1,24 @@ +@ stdcall CloseThemeData(ptr) uxtheme.CloseThemeData +@ stdcall DrawThemeBackground(ptr ptr long long ptr ptr) uxtheme.DrawThemeBackground +@ stub GetColorFromPreference +@ stub GetImmersiveColorFromColorSetEx +@ stub GetImmersiveUserColorSetPreference +@ stub GetThemeAnimationProperty +@ stub GetThemeAnimationTransform +@ stdcall GetThemeBackgroundExtent(ptr ptr long long ptr ptr) uxtheme.GetThemeBackgroundExtent +@ stub GetThemeBitmap +@ stdcall GetThemeColor(ptr long long long ptr) uxtheme.GetThemeColor +@ stdcall GetThemeEnumValue(ptr long long long ptr) uxtheme.GetThemeEnumValue +@ stdcall GetThemeFont(ptr ptr long long long ptr) uxtheme.GetThemeFont +@ stdcall GetThemeInt(ptr long long long ptr) uxtheme.GetThemeInt +@ stdcall GetThemeMargins(ptr ptr long long long ptr ptr) uxtheme.GetThemeMargins +@ stdcall GetThemePartSize(ptr ptr long long ptr long ptr) uxtheme.GetThemePartSize +@ stdcall GetThemePosition(ptr long long long ptr) uxtheme.GetThemePosition +@ stub GetThemeTimingFunction +@ stub GetUserColorPreference +@ stdcall IsAppThemed() uxtheme.IsAppThemed +@ stdcall IsThemeActive() uxtheme.IsThemeActive +@ stdcall IsThemePartDefined(ptr long long) uxtheme.IsThemePartDefined +@ stdcall OpenThemeData(ptr wstr) uxtheme.OpenThemeData +@ stdcall OpenThemeDataEx(ptr wstr long) uxtheme.OpenThemeDataEx +@ stdcall SetWindowTheme(ptr wstr wstr) uxtheme.SetWindowTheme diff --git a/tools/make_specfiles b/tools/make_specfiles index 6fe79f6..4faf665 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -443,6 +443,10 @@ my @dll_groups = "api-ms-win-core-winrt-string-l1-1-0", ], [ + "uxtheme", + "ext-ms-win-uxtheme-themes-l1-1-0", + ], + [ "bthprops.cpl", "irprops.cpl", ],

1 0