wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Józef Kucia : winevulkan: Fix typos.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: f1b88ab1f63e6116fed34cc6781d2219cd04fed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1b88ab1f63e6116fed34cc6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 9 10:25:58 2018 +0200 winevulkan: Fix typos. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 14 +++++++------- dlls/winevulkan/vulkan.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 94941c1..7d84cfb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -124,12 +124,12 @@ CORE_EXTENSIONS = [ DRIVER_VERSION = 3 # Table of functions for which we have a special implementation. -# This are regular device / instance functions for which we need -# to more work compared to a regular thunk or because they are +# These are regular device / instance functions for which we need +# to do more work compared to a regular thunk or because they are # part of the driver interface. # - dispatch set whether we need a function pointer in the device # / instance dispatch table. -# - driver sets whether the api is part of the driver interface. +# - driver sets whether the API is part of the driver interface. # - thunk sets whether to create a thunk in vulkan_thunks.c. FUNCTION_OVERRIDES = { # Global functions @@ -1199,7 +1199,7 @@ class VkParam(object): else: proto += " " + self.name - # Allows appeninding something to the variable name useful for + # Allows appending something to the variable name useful for # win32 to host conversion. if postfix is not None: proto += postfix @@ -1371,7 +1371,7 @@ class VkParam(object): return "NULL" # Dispatchable objects wrap the native handle. For thunk generation we - # need to pass the native handle to the native vulkan calls. + # need to pass the native handle to the native Vulkan calls. if self.is_dispatchable(): return "{0}->{1}".format(self.name, self.handle.native_handle()) elif conv and self.needs_conversion(): @@ -2250,7 +2250,7 @@ class VkRegistry(object): funcs[func.name] = func # To make life easy for the code generation, separate all function - # calls out in the 3 types of vulkan functions: device, global and instance. + # calls out in the 3 types of Vulkan functions: device, global and instance. device_funcs = [] global_funcs = [] instance_funcs = [] @@ -2474,7 +2474,7 @@ class VkRegistry(object): if type_info["category"] in ["struct", "union"]: # We store unions among structs as some structs depend # on unions. The types are very similar in parsing and - # generation anyway. The official vulkan scripts use + # generation anyway. The official Vulkan scripts use # a similar kind of hack. struct = VkStruct.from_xml(t) structs.append(struct) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 8f67483..ef9f095 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -136,7 +136,7 @@ err: return NULL; } -/* Helper function for release command buffers. */ +/* Helper function to release command buffers. */ static void wine_vk_command_buffers_free(struct VkDevice_T *device, VkCommandPool pool, uint32_t count, const VkCommandBuffer *buffers) { @@ -799,7 +799,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * /* Per the spec, we are only supposed to return device functions as in functions * for which the first parameter is vkDevice or a child of vkDevice like a * vkCommandBuffer or vkQueue. - * Loader takes are of filtering of extensions which are enabled or not. + * Loader takes care of filtering of extensions which are enabled or not. */ func = wine_vk_get_device_proc_addr(name); if (func)

1 0

Józef Kucia : winevulkan: Pack structures better.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: cf5f750ed888456b5912f386ff8d75b56180b684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf5f750ed888456b5912f386… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 9 10:25:57 2018 +0200 winevulkan: Pack structures better. Makes structures slightly smaller on 64-bit. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan_private.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 86b8e31..582fb78 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -72,11 +72,10 @@ struct VkDevice_T { struct wine_vk_base base; struct vulkan_device_funcs funcs; + VkDevice device; /* native device */ - uint32_t max_queue_families; struct VkQueue_T **queues; - - VkDevice device; /* native device */ + uint32_t max_queue_families; unsigned int quirks; }; @@ -85,14 +84,13 @@ struct VkInstance_T { struct wine_vk_base base; struct vulkan_instance_funcs funcs; + VkInstance instance; /* native instance */ /* We cache devices as we need to wrap them as they are * dispatchable objects. */ - uint32_t num_phys_devs; struct VkPhysicalDevice_T **phys_devs; - - VkInstance instance; /* native instance */ + uint32_t num_phys_devs; unsigned int quirks; }; @@ -101,11 +99,10 @@ struct VkPhysicalDevice_T { struct wine_vk_base base; struct VkInstance_T *instance; /* parent */ + VkPhysicalDevice phys_dev; /* native physical device */ - uint32_t extension_count; VkExtensionProperties *extensions; - - VkPhysicalDevice phys_dev; /* native physical device */ + uint32_t extension_count; }; struct VkQueue_T

1 0

Józef Kucia : winevulkan: Get rid of unused "phys_dev " field from VkDevice_T.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 9451a42cf72ba0ba62fb98340d467e028a5c5042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9451a42cf72ba0ba62fb9834… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 9 10:25:56 2018 +0200 winevulkan: Get rid of unused "phys_dev" field from VkDevice_T. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 2 -- dlls/winevulkan/vulkan_private.h | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index c507e37..8f67483 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -532,8 +532,6 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, return res; } - object->phys_dev = phys_dev; - /* Just load all function pointers we are aware off. The loader takes care of filtering. * We use vkGetDeviceProcAddr as opposed to vkGetInstanceProcAddr for efficiency reasons * as functions pass through fewer dispatch tables within the loader. diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index ce13b1a..86b8e31 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -64,7 +64,7 @@ struct wine_vk_base struct VkCommandBuffer_T { struct wine_vk_base base; - VkDevice device; /* parent */ + struct VkDevice_T *device; /* parent */ VkCommandBuffer command_buffer; /* native command buffer */ }; @@ -72,7 +72,6 @@ struct VkDevice_T { struct wine_vk_base base; struct vulkan_device_funcs funcs; - struct VkPhysicalDevice_T *phys_dev; /* parent */ uint32_t max_queue_families; struct VkQueue_T **queues; @@ -112,7 +111,7 @@ struct VkPhysicalDevice_T struct VkQueue_T { struct wine_vk_base base; - VkDevice device; /* parent */ + struct VkDevice_T *device; /* parent */ VkQueue queue; /* native queue */ };

1 0

Dmitry Timoshkov : netapi32: Properly implement NetApiBufferFree.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 67968b88057868ceecca4e5e52e014aeeb33fcb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67968b88057868ceecca4e5e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 5 15:55:58 2018 +0800 netapi32: Properly implement NetApiBufferFree. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 4c4333c..620df79 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1204,7 +1204,7 @@ NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD ByteCount, LPVOID* Buffer) NET_API_STATUS WINAPI NetApiBufferFree(LPVOID Buffer) { TRACE("(%p)\n", Buffer); - HeapFree(GetProcessHeap(), 0, Buffer); + MIDL_user_free(Buffer); return NERR_Success; }

1 0

Dmitry Timoshkov : netapi32: Implement NetScheduleJobGetInfo.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 586a622813036c132972861fce56f760db15378e URL: https://source.winehq.org/git/wine.git/?a=commit;h=586a622813036c132972861f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 5 15:55:54 2018 +0800 netapi32: Implement NetScheduleJobGetInfo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 6 ++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index c92f431..4c4333c 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1170,6 +1170,12 @@ NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR server, LPBYTE* bufptr, DWORD p return ret; } +NET_API_STATUS WINAPI NetScheduleJobGetInfo(LPCWSTR server, DWORD jobid, LPBYTE *bufptr) +{ + TRACE("(%s, %u, %p)\n", debugstr_w(server), jobid, bufptr); + return NetrJobGetInfo(server, jobid, (LPAT_INFO *)bufptr); +} + NET_API_STATUS WINAPI NetUseGetInfo(LMSTR server, LMSTR name, DWORD level, LPBYTE *bufptr) { FIXME("stub (%p, %p, %d, %p)\n", server, name, level, bufptr); diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 8dbd378..7b51939 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -171,7 +171,7 @@ @ stdcall NetScheduleJobAdd(wstr ptr ptr) @ stdcall NetScheduleJobDel(wstr long long) @ stdcall NetScheduleJobEnum(wstr ptr long ptr ptr ptr) -@ stub NetScheduleJobGetInfo +@ stdcall NetScheduleJobGetInfo(wstr long ptr) @ stub NetServerComputerNameAdd @ stub NetServerComputerNameDel @ stdcall NetServerDiskEnum(wstr long ptr long ptr ptr ptr)

1 0

Dmitry Timoshkov : netapi32: Implement NetScheduleJobEnum.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: fb9a4a6725b7310890b96876894c39021918815f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb9a4a6725b7310890b96876… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 5 15:55:52 2018 +0800 netapi32: Implement NetScheduleJobEnum. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 4f5e2d2..c92f431 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1154,10 +1154,20 @@ NET_API_STATUS WINAPI NetScheduleJobDel(LPCWSTR server, DWORD minjobid, DWORD ma NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR server, LPBYTE* bufptr, DWORD prefmaxsize, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle) { - FIXME("stub (%s, %p, %d, %p, %p, %p)\n", debugstr_w(server), bufptr, prefmaxsize, entriesread, totalentries, resumehandle); - *entriesread = 0; - *totalentries = 0; - return NERR_Success; + AT_ENUM_CONTAINER container; + NET_API_STATUS ret; + + TRACE("(%s, %p, %u, %p, %p, %p)\n", debugstr_w(server), bufptr, prefmaxsize, entriesread, totalentries, resumehandle); + + container.EntriesRead = 0; + container.Buffer = NULL; + ret = NetrJobEnum(server, &container, prefmaxsize, totalentries, resumehandle); + if (ret == ERROR_SUCCESS) + { + *bufptr = (LPBYTE)container.Buffer; + *entriesread = container.EntriesRead; + } + return ret; } NET_API_STATUS WINAPI NetUseGetInfo(LMSTR server, LMSTR name, DWORD level, LPBYTE *bufptr)

1 0

Dmitry Timoshkov : netapi32: Implement NetScheduleJobDel.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 0ddcd1bb58643dee2f4ab93da243dbfc3f0f4e63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ddcd1bb58643dee2f4ab93d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 5 15:55:49 2018 +0800 netapi32: Implement NetScheduleJobDel. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 6185b80..4f5e2d2 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1147,8 +1147,8 @@ NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR server, LPBYTE bufptr, LPDWORD j NET_API_STATUS WINAPI NetScheduleJobDel(LPCWSTR server, DWORD minjobid, DWORD maxjobid) { - FIXME("stub (%s, %d, %d)\n", debugstr_w(server), minjobid, maxjobid); - return NERR_Success; + TRACE("(%s, %u, %u)\n", debugstr_w(server), minjobid, maxjobid); + return NetrJobDel(server, minjobid, maxjobid); } NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR server, LPBYTE* bufptr, DWORD prefmaxsize, LPDWORD entriesread,

1 0

Dmitry Timoshkov : netapi32: Implement NetScheduleJobAdd.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 5ce26d11de52d116bcad3380c9e13283c6ccbe89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ce26d11de52d116bcad3380… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 5 15:55:45 2018 +0800 netapi32: Implement NetScheduleJobAdd. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/Makefile.in | 5 ++++- dlls/netapi32/atsvc.idl | 21 +++++++++++++++++++++ dlls/netapi32/netapi32.c | 35 ++++++++++++++++++++++++++++++++--- 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index fda9c0e..23da483 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_SVRAPI_ MODULE = netapi32.dll IMPORTLIB = netapi32 -IMPORTS = iphlpapi ws2_32 advapi32 +IMPORTS = rpcrt4 iphlpapi ws2_32 advapi32 C_SRCS = \ nbcmdqueue.c \ @@ -9,3 +9,6 @@ C_SRCS = \ nbt.c \ netapi32.c \ netbios.c + +IDL_SRCS = \ + atsvc.idl diff --git a/dlls/netapi32/atsvc.idl b/dlls/netapi32/atsvc.idl new file mode 100644 index 0000000..b5a2cee --- /dev/null +++ b/dlls/netapi32/atsvc.idl @@ -0,0 +1,21 @@ +/* + * Copyright 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep client + +#include "wine/atsvc.idl" diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 278d452..6185b80 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -39,7 +39,7 @@ #include "winbase.h" #include "lm.h" #include "lmaccess.h" -#include "lmat.h" +#include "atsvc.h" #include "lmapibuf.h" #include "lmbrowsr.h" #include "lmshare.h" @@ -1141,8 +1141,8 @@ NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWOR NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR server, LPBYTE bufptr, LPDWORD jobid) { - FIXME("stub (%s, %p, %p)\n", debugstr_w(server), bufptr, jobid); - return NERR_Success; + TRACE("(%s, %p, %p)\n", debugstr_w(server), bufptr, jobid); + return NetrJobAdd(server, (AT_INFO *)bufptr, jobid); } NET_API_STATUS WINAPI NetScheduleJobDel(LPCWSTR server, DWORD minjobid, DWORD maxjobid) @@ -3527,3 +3527,32 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu return ERROR_SUCCESS; } + +DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) +{ + return HeapAlloc(GetProcessHeap(), 0, n); +} + +DECLSPEC_HIDDEN void __RPC_USER MIDL_user_free(void __RPC_FAR *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} + +DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) +{ + static unsigned char ncalrpc[] = "ncalrpc"; + unsigned char *binding_str; + handle_t rpc_handle = 0; + + if (RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str) == RPC_S_OK) + { + RpcBindingFromStringBindingA(binding_str, &rpc_handle); + RpcStringFreeA(&binding_str); + } + return rpc_handle; +} + +DECLSPEC_HIDDEN void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle) +{ + RpcBindingFree(&rpc_handle); +}

1 0

Dmitry Timoshkov : schedsvc/tests: Add ATSvc RPC API tests.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: eacbcd725a00263c0d248c7a832d8d41dcf80c6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=eacbcd725a00263c0d248c7a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 5 15:55:42 2018 +0800 schedsvc/tests: Add ATSvc RPC API tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/Makefile.in | 2 + dlls/schedsvc/tests/atsvc.idl | 21 +++++ dlls/schedsvc/tests/atsvcapi.c | 196 ++++++++++++++++++++++++++++++++++++++++ include/lmat.h | 28 ++++++ 4 files changed, 247 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eacbcd725a00263c0d24…

1 0

Dmitry Timoshkov : schedsvc: Add ATSvc server side stubs.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 10688c5f91db69be9083fc3168df53bcc520bf83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10688c5f91db69be9083fc31… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 5 15:55:39 2018 +0800 schedsvc: Add ATSvc server side stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/Makefile.in | 5 +++- dlls/schedsvc/atsvc.c | 52 ++++++++++++++++++++++++++++++++++ dlls/schedsvc/atsvc.idl | 21 ++++++++++++++ dlls/schedsvc/svc_main.c | 38 +++++++++++++++++++++---- include/wine/atsvc.idl | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 180 insertions(+), 7 deletions(-) diff --git a/dlls/schedsvc/Makefile.in b/dlls/schedsvc/Makefile.in index 32ee4e3..021cae4 100644 --- a/dlls/schedsvc/Makefile.in +++ b/dlls/schedsvc/Makefile.in @@ -2,7 +2,10 @@ MODULE = schedsvc.dll IMPORTS = rpcrt4 advapi32 ole32 C_SRCS = \ + atsvc.c \ schedsvc.c \ svc_main.c -IDL_SRCS = schrpc.idl +IDL_SRCS = \ + atsvc.idl \ + schrpc.idl diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c new file mode 100644 index 0000000..6bb8d4c --- /dev/null +++ b/dlls/schedsvc/atsvc.c @@ -0,0 +1,52 @@ +/* + * ATSvc RPC API + * + * Copyright 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "atsvc.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); + +DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) +{ + FIXME("%s,%p,%p: stub\n", debugstr_w(server_name), info, jobid); + return ERROR_NOT_SUPPORTED; +} + +DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jobid) +{ + FIXME("%s,%u,%u: stub\n", debugstr_w(server_name), min_jobid, max_jobid); + return ERROR_NOT_SUPPORTED; +} + +DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container, + DWORD max_length, DWORD *total, DWORD *resume) +{ + FIXME("%s,%p,%u,%p,%p: stub\n", debugstr_w(server_name), container, max_length, total, resume); + return ERROR_NOT_SUPPORTED; +} + +DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **info) +{ + FIXME("%s,%u,%p: stub\n", debugstr_w(server_name), jobid, info); + return ERROR_NOT_SUPPORTED; +} diff --git a/dlls/schedsvc/atsvc.idl b/dlls/schedsvc/atsvc.idl new file mode 100644 index 0000000..17f684e --- /dev/null +++ b/dlls/schedsvc/atsvc.idl @@ -0,0 +1,21 @@ +/* + * Copyright 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep server + +#include "wine/atsvc.idl" diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index bd8a29d..8713bdb 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winsvc.h" #include "rpc.h" +#include "atsvc.h" #include "schrpc.h" #include "wine/debug.h" @@ -123,22 +124,38 @@ static RPC_BINDING_VECTOR *sched_bindings; static RPC_STATUS RPC_init(void) { - WCHAR transport[] = SCHEDSVC_TRANSPORT; + static WCHAR ncacn_npW[] = { 'n','c','a','c','n','_','n','p',0 }; + static WCHAR endpoint_npW[] = { '\\','p','i','p','e','\\','a','t','s','v','c',0 }; + static WCHAR ncalrpcW[] = { 'n','c','a','l','r','p','c',0 }; + static WCHAR endpoint_lrpcW[] = { 'a','t','s','v','c',0 }; RPC_STATUS status; - TRACE("using %s\n", debugstr_w(transport)); + status = RpcServerRegisterIf(ITaskSchedulerService_v1_0_s_ifspec, NULL, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerRegisterIf error %#x\n", status); + return status; + } - status = RpcServerUseProtseqEpW(transport, 0, NULL, NULL); + status = RpcServerRegisterIf(atsvc_v1_0_s_ifspec, NULL, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerRegisterIf error %#x\n", status); + RpcServerUnregisterIf(ITaskSchedulerService_v1_0_s_ifspec, NULL, FALSE); + return status; + } + + status = RpcServerUseProtseqEpW(ncacn_npW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, endpoint_npW, NULL); if (status != RPC_S_OK) { ERR("RpcServerUseProtseqEp error %#x\n", status); return status; } - status = RpcServerRegisterIf(ITaskSchedulerService_v1_0_s_ifspec, 0, 0); + status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, endpoint_lrpcW, NULL); if (status != RPC_S_OK) { - ERR("RpcServerRegisterIf error %#x\n", status); + ERR("RpcServerUseProtseqEp error %#x\n", status); return status; } @@ -156,6 +173,13 @@ static RPC_STATUS RPC_init(void) return status; } + status = RpcEpRegisterW(atsvc_v1_0_s_ifspec, sched_bindings, NULL, NULL); + if (status != RPC_S_OK) + { + ERR("RpcEpRegister error %#x\n", status); + return status; + } + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); if (status != RPC_S_OK) { @@ -169,8 +193,10 @@ static void RPC_finish(void) { RpcMgmtStopServerListening(NULL); RpcEpUnregister(ITaskSchedulerService_v1_0_s_ifspec, sched_bindings, NULL); + RpcEpUnregister(atsvc_v1_0_s_ifspec, sched_bindings, NULL); RpcBindingVectorFree(&sched_bindings); - RpcServerUnregisterIf(NULL, NULL, FALSE); + RpcServerUnregisterIf(ITaskSchedulerService_v1_0_s_ifspec, NULL, FALSE); + RpcServerUnregisterIf(atsvc_v1_0_s_ifspec, NULL, FALSE); } void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) diff --git a/include/wine/atsvc.idl b/include/wine/atsvc.idl new file mode 100644 index 0000000..c1fce98 --- /dev/null +++ b/include/wine/atsvc.idl @@ -0,0 +1,71 @@ +/* + * ATSvc Service definitions + * + * Copyright 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +[ + uuid(1ff70682-0a51-30e8-076d-740be8cee98b), + implicit_handle(handle_t rpc_handle), + version(1.0), + pointer_default(unique) +] +interface atsvc +{ + typedef [handle] const WCHAR *ATSVC_HANDLE; + + typedef struct _AT_ENUM + { + DWORD JobId; + DWORD_PTR JobTime; + DWORD DaysOfMonth; + unsigned char DaysOfWeek; + unsigned char Flags; + [string] WCHAR *Command; + } AT_ENUM, *PAT_ENUM, *LPAT_ENUM; + + typedef struct _AT_INFO + { + DWORD_PTR JobTime; + DWORD DaysOfMonth; + unsigned char DaysOfWeek; + unsigned char Flags; + [string] WCHAR *Command; + } AT_INFO, *PAT_INFO, *LPAT_INFO; + + typedef struct _AT_ENUM_CONTAINER + { + DWORD EntriesRead; + [size_is(EntriesRead)] LPAT_ENUM Buffer; + } AT_ENUM_CONTAINER, *PAT_ENUM_CONTAINER, *LPAT_ENUM_CONTAINER; + + DWORD NetrJobAdd([in,string,unique] ATSVC_HANDLE ServerName, + [in] LPAT_INFO pAtInfo, [out] LPDWORD pJobId); + + DWORD NetrJobDel([in,string,unique] ATSVC_HANDLE ServerName, + [in] DWORD MinJobId, [in] DWORD MaxJobId); + + DWORD NetrJobEnum([in,string,unique] ATSVC_HANDLE ServerName, + [in,out] LPAT_ENUM_CONTAINER pEnumContainer, [in] DWORD PreferedMaximumLength, + [out] LPDWORD pTotalEntries, [in,out,unique] LPDWORD pResumeHandle); + + DWORD NetrJobGetInfo([in,string,unique] ATSVC_HANDLE ServerName, + [in] DWORD JobId, [out] LPAT_INFO *ppAtInfo); +}

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2018