April 2018 - Wine-devel - list.winehq.org

[PATCH 7/7] netapi32: Properly implement NetApiBufferFree.
by Dmitry Timoshkov 05 Apr '18

05 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 4c4333c57b..620df791b6 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; } -- 2.16.3

1 0

[PATCH 6/7] netapi32: Implement NetScheduleJobGetInfo.
by Dmitry Timoshkov 05 Apr '18

05 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 c92f431115..4c4333c57b 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 8dbd378521..7b51939b80 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) -- 2.16.3

1 0

[PATCH 5/7] netapi32: Implement NetScheduleJobEnum.
by Dmitry Timoshkov 05 Apr '18

05 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 4f5e2d2455..c92f431115 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) -- 2.16.3

1 0

[PATCH 4/7] netapi32: Implement NetScheduleJobDel.
by Dmitry Timoshkov 05 Apr '18

05 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 6185b8041f..4f5e2d2455 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, -- 2.16.3

1 0

[PATCH 3/7] netapi32: Implement NetScheduleJobAdd.
by Dmitry Timoshkov 05 Apr '18

05 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/netapi32/Makefile.in | 5 ++++- dlls/netapi32/atsvc.idl | 3 +++ dlls/netapi32/netapi32.c | 35 ++++++++++++++++++++++++++++++++--- 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 dlls/netapi32/atsvc.idl diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index fda9c0e43a..23da4838f9 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 0000000000..61bc163a57 --- /dev/null +++ b/dlls/netapi32/atsvc.idl @@ -0,0 +1,3 @@ +#pragma makedep client + +#include "wine/atsvc.idl" diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 278d4528b0..6185b8041f 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); +} -- 2.16.3

1 0

[PATCH 2/7] schedsvc/tests: Add ATSvc RPC API tests.
by Dmitry Timoshkov 05 Apr '18

05 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/tests/Makefile.in | 2 + dlls/schedsvc/tests/atsvc.idl | 3 + dlls/schedsvc/tests/atsvcapi.c | 196 ++++++++++++++++++++++++++++++++++++++++ include/lmat.h | 28 ++++++ 4 files changed, 229 insertions(+) create mode 100644 dlls/schedsvc/tests/atsvc.idl create mode 100644 dlls/schedsvc/tests/atsvcapi.c diff --git a/dlls/schedsvc/tests/Makefile.in b/dlls/schedsvc/tests/Makefile.in index cd56fde214..b8e7448bb7 100644 --- a/dlls/schedsvc/tests/Makefile.in +++ b/dlls/schedsvc/tests/Makefile.in @@ -2,7 +2,9 @@ TESTDLL = schedsvc.dll IMPORTS = rpcrt4 ole32 C_SRCS = \ + atsvcapi.c \ rpcapi.c IDL_SRCS = \ + atsvc.idl \ schrpc.idl diff --git a/dlls/schedsvc/tests/atsvc.idl b/dlls/schedsvc/tests/atsvc.idl new file mode 100644 index 0000000000..61bc163a57 --- /dev/null +++ b/dlls/schedsvc/tests/atsvc.idl @@ -0,0 +1,3 @@ +#pragma makedep client + +#include "wine/atsvc.idl" diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c new file mode 100644 index 0000000000..d429232913 --- /dev/null +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -0,0 +1,196 @@ +/* + * 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 <stdio.h> +#include <windows.h> +#include <ole2.h> +#include <rpcdce.h> +#include <mstask.h> +#include "atsvc.h" + +#include "wine/test.h" + +/* lmat.h defines those, but other types in that file conflict + * with generated atsvc.h typedefs. + */ +#define JOB_ADD_CURRENT_DATE 0x08 +#define JOB_NONINTERACTIVE 0x10 + +extern handle_t rpc_handle; + +static int test_failures, test_skipped; + +static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) +{ + if (test_skipped) + skip("Can't connect to ATSvc service: %#x\n", ptrs->ExceptionRecord->ExceptionCode); + + if (winetest_debug) + { + fprintf(stdout, "%04x:atsvcapi: 1 tests executed (0 marked as todo, %d %s), %d skipped.\n", + GetCurrentProcessId(), test_failures, test_failures != 1 ? "failures" : "failure", test_skipped); + fflush(stdout); + } + ExitProcess(test_failures); +} + +START_TEST(atsvcapi) +{ + static unsigned char ncalrpc[] = "ncalrpc"; + static WCHAR task1W[] = { 'T','a','s','k','1','.','e','x','e',0 }; + HRESULT hr; + unsigned char *binding_str; + WCHAR server_name[MAX_COMPUTERNAME_LENGTH + 1]; + PTOP_LEVEL_EXCEPTION_FILTER old_exception_filter; + AT_ENUM_CONTAINER container; + AT_INFO info; + DWORD ret, i, total, start_index, jobid, try, try_count; + BOOL found; + + total = MAX_COMPUTERNAME_LENGTH + 1; + SetLastError(0xdeadbeef); + ret = GetComputerNameW(server_name, &total); + ok(ret, "GetComputerName error %u\n", GetLastError()); + + hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); + ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); + hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); + ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); + hr = RpcStringFreeA(&binding_str); + ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr); + + /* widl generated RpcTryExcept/RpcExcept can't catch raised exceptions */ + old_exception_filter = SetUnhandledExceptionFilter(rpc_exception_filter); + + /* If the first call fails that's probably because the service is not running */ + test_failures = 0; + test_skipped = 1; + + memset(&info, 0, sizeof(info)); + info.Flags = JOB_ADD_CURRENT_DATE | JOB_NONINTERACTIVE; + info.Command = task1W; + jobid = 0; + ret = NetrJobAdd(server_name, &info, &jobid); + if (ret == ERROR_ACCESS_DENIED) + { + win_skip("NetrJobAdd: Access denied, skipping the tests\n"); + goto skip_tests; + } +todo_wine + ok(ret == ERROR_SUCCESS || broken(ret == ERROR_NOT_SUPPORTED) /* Win8+ */, "NetrJobAdd error %u\n", ret); + if (ret == ERROR_NOT_SUPPORTED) + { + /* FIXME: use win_skip() when todo_wine above is removed */ + skip("NetrJobAdd is not supported on this platform\n"); + goto skip_tests; + } + ok(jobid != 0, "jobid should not be 0\n"); + + /* From now on: if the call fails that's a failure */ + test_failures = 1; + test_skipped = 0; + + try_count = 5; + + for (try = 1; try <= try_count; try++) + { + container.EntriesRead = 0; + container.Buffer = NULL; + total = start_index = 0; + ret = NetrJobEnum(server_name, &container, 1, &total, &start_index); + if (ret == ERROR_ACCESS_DENIED) + { + win_skip("NetrJobEnum: Access denied, skipping the tests\n"); + goto skip_tests_delete; + } + ok(ret == ERROR_SUCCESS, "NetrJobEnum error %u (%#x)\n", ret, ret); + ok(total != 0, "total %u\n", total); + ok(start_index == 0, "start_index %u\n", start_index); + ok(container.Buffer != NULL, "Buffer %p\n", container.Buffer); + ok(container.EntriesRead != 0, "EntriesRead %u\n", container.EntriesRead); + + found = FALSE; + + for (i = 0; i < container.EntriesRead; i++) + { + AT_INFO *info2; + + trace("%u: jobid %u, command %s\n", i, container.Buffer[i].JobId, wine_dbgstr_w(container.Buffer[i].Command)); + + if (container.Buffer[i].JobId == jobid || + !lstrcmpW(container.Buffer[i].Command, task1W)) + { + found = TRUE; + trace("found %u: jobid %u, command %s\n", i, container.Buffer[i].JobId, wine_dbgstr_w(container.Buffer[i].Command)); + } + + info2 = NULL; + ret = NetrJobGetInfo(server_name, container.Buffer[i].JobId, &info2); + ok(ret == ERROR_SUCCESS, "NetrJobGetInfo error %u\n", ret); + + ok(container.Buffer[i].JobTime == info2->JobTime, "%u != %u\n", (UINT)container.Buffer[i].JobTime, (UINT)info2->JobTime); + ok(container.Buffer[i].DaysOfMonth == info2->DaysOfMonth, "%u != %u\n", container.Buffer[i].DaysOfMonth, info2->DaysOfMonth); + ok(container.Buffer[i].DaysOfWeek == info2->DaysOfWeek, "%u != %u\n", container.Buffer[i].DaysOfWeek, info2->DaysOfWeek); + ok(container.Buffer[i].Flags == info2->Flags, "%#x != %#x\n", container.Buffer[i].Flags, info2->Flags); + ok(!lstrcmpW(container.Buffer[i].Command, info2->Command), "%s != %s\n", wine_dbgstr_w(container.Buffer[i].Command), wine_dbgstr_w(info2->Command)); + + MIDL_user_free(container.Buffer[i].Command); + MIDL_user_free(info2->Command); + MIDL_user_free(info2); + } + + if (found) + break; + } + + MIDL_user_free(container.Buffer); + + ok(found, "just added jobid %u should be found\n", jobid); + +skip_tests_delete: + ret = NetrJobDel(server_name, jobid, jobid); + ok(ret == ERROR_SUCCESS, "NetrJobDel error %u\n", ret); + +skip_tests: + SetUnhandledExceptionFilter(old_exception_filter); + + hr = RpcBindingFree(&rpc_handle); + ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); +} + +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; + HRESULT hr; + + hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); + ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); + + hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); + ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); + + RpcStringFreeA(&binding_str); + return rpc_handle; +} + +DECLSPEC_HIDDEN void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle) +{ + RpcBindingFree(&rpc_handle); +} diff --git a/include/lmat.h b/include/lmat.h index da9691a668..0fa574f41a 100644 --- a/include/lmat.h +++ b/include/lmat.h @@ -25,6 +25,34 @@ extern "C" { #endif +#define JOB_RUN_PERIODICALLY 0x01 +#define JOB_EXEC_ERROR 0x02 +#define JOB_RUNS_TODAY 0x04 +#define JOB_ADD_CURRENT_DATE 0x08 +#define JOB_NONINTERACTIVE 0x10 + +#define JOB_INPUT_FLAGS (JOB_RUN_PERIODICALLY | JOB_ADD_CURRENT_DATE | JOB_NONINTERACTIVE) +#define JOB_OUTPUT_FLAGS (JOB_RUN_PERIODICALLY | JOB_EXEC_ERROR | JOB_RUNS_TODAY | JOB_NONINTERACTIVE) + +typedef struct _AT_INFO +{ + DWORD_PTR JobTime; + DWORD DaysOfMonth; + UCHAR DaysOfWeek; + UCHAR Flags; + LPWSTR Command; +} AT_INFO, *PAT_INFO, *LPAT_INFO; + +typedef struct _AT_ENUM +{ + DWORD JobId; + DWORD_PTR JobTime; + DWORD DaysOfMonth; + UCHAR DaysOfWeek; + UCHAR Flags; + LPWSTR Command; +} AT_ENUM, *PAT_ENUM, *LPAT_ENUM; + NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR,LPBYTE,LPDWORD); NET_API_STATUS WINAPI NetScheduleJobDel(LPCWSTR,DWORD,DWORD); NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); -- 2.16.3

1 0

[PATCH 1/7] schedsvc: Add ATSvc server side stubs.
by Dmitry Timoshkov 05 Apr '18

05 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/Makefile.in | 5 +++- dlls/schedsvc/atsvc.c | 52 ++++++++++++++++++++++++++++++++++ dlls/schedsvc/atsvc.idl | 3 ++ dlls/schedsvc/svc_main.c | 38 +++++++++++++++++++++---- include/wine/atsvc.idl | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 162 insertions(+), 7 deletions(-) create mode 100644 dlls/schedsvc/atsvc.c create mode 100644 dlls/schedsvc/atsvc.idl create mode 100644 include/wine/atsvc.idl diff --git a/dlls/schedsvc/Makefile.in b/dlls/schedsvc/Makefile.in index 32ee4e33f8..021cae468a 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 0000000000..6bb8d4c707 --- /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 0000000000..afb2b86ac4 --- /dev/null +++ b/dlls/schedsvc/atsvc.idl @@ -0,0 +1,3 @@ +#pragma makedep server + +#include "wine/atsvc.idl" diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index bd8a29dcd9..8713bdb88a 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 0000000000..c1fce98074 --- /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); +} -- 2.16.3

1 0

[PATCH] wpcap: Implement pcap_dump_open and pcap_dump
by Alistair Leslie-Hughes 05 Apr '18

05 Apr '18

From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wpcap/wpcap.c | 10 ++++++++++ dlls/wpcap/wpcap.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index fe46903..d731d84 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -341,3 +341,13 @@ int CDECL wine_wsockinit(void) if (WSAStartup(MAKEWORD(1,1), &wsadata)) return -1; return 0; } + +pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname) +{ + return pcap_dump_open(p, fname); +} + +void CDECL wine_pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) +{ + return pcap_dump(user, h, sp); +} diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 66303b4..ffb6ed1 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -16,12 +16,12 @@ @ cdecl pcap_datalink_val_to_description(long) wine_pcap_datalink_val_to_description @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch -@ stub pcap_dump +@ cdecl pcap_dump(ptr ptr str) wine_pcap_dump @ stub pcap_dump_close @ stub pcap_dump_file @ stub pcap_dump_flush @ stub pcap_dump_ftell -@ stub pcap_dump_open +@ cdecl pcap_dump_open(ptr str) wine_pcap_dump_open @ stub pcap_file @ stub pcap_fileno @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs -- 1.9.1

2 1

[PATCH] fltmgr.sys: Implement FltGetRoutineAddress
by Alistair Leslie-Hughes 04 Apr '18

04 Apr '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 15 +++++++++++++++ include/ddk/fltkernel.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index c217ad3..7b1ba29 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -79,7 +79,7 @@ @ stub FltGetLowerInstance @ stub FltGetRequestorProcess @ stub FltGetRequestorProcessId -@ stub FltGetRoutineAddress +@ stdcall FltGetRoutineAddress(str) @ stub FltGetStreamContext @ stub FltGetStreamHandleContext @ stub FltGetSwappedBufferMdlAddress diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 2ffde97..16ca284 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -64,3 +64,18 @@ void WINAPI FltUnregisterFilter( PFLT_FILTER filter ) { FIXME( "(%p): stub\n", filter ); } + +void* WINAPI FltGetRoutineAddress(LPCSTR name) +{ + static const WCHAR fltmgrW[] = {'f','l','t','m','g','r','.','s','y','s',0}; + HMODULE mod = GetModuleHandleW(fltmgrW); + void *func; + + func = GetProcAddress(mod, name); + if (func) + TRACE( "%s -> %p\n", debugstr_a(name), func ); + else + FIXME( "%s not found\n", debugstr_a(name) ); + + return func; +} diff --git a/include/ddk/fltkernel.h b/include/ddk/fltkernel.h index 00b7dc5..8ebebfa 100644 --- a/include/ddk/fltkernel.h +++ b/include/ddk/fltkernel.h @@ -654,6 +654,7 @@ typedef struct _FLT_REGISTRATION } FLT_REGISTRATION, *PFLT_REGISTRATION; +void* WINAPI FltGetRoutineAddress(LPCSTR name); NTSTATUS WINAPI FltRegisterFilter(PDRIVER_OBJECT, const FLT_REGISTRATION *, PFLT_FILTER *); NTSTATUS WINAPI FltStartFiltering(PFLT_FILTER); void WINAPI FltUnregisterFilter(PFLT_FILTER); -- 1.9.1

1 0

[PATCH 4/4] ntoskrnl: Add ObGetObjectType stub
by Alistair Leslie-Hughes 04 Apr '18

04 Apr '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e4b96a7..57a87ad 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2366,6 +2366,16 @@ USHORT WINAPI ObGetFilterVersion(void) } /*********************************************************************** + * ObGetObjectType (NTOSKRNL.EXE.@) + */ +POBJECT_TYPE WINAPI ObGetObjectType(void *object) +{ + FIXME("stub: %p\n", object); + + return NULL; +} + +/*********************************************************************** * IoGetAttachedDeviceReference (NTOSKRNL.EXE.@) */ DEVICE_OBJECT* WINAPI IoGetAttachedDeviceReference( DEVICE_OBJECT *device ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c7913db..1b03233 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -808,6 +808,7 @@ @ stub ObFindHandleForObject @ stdcall ObGetFilterVersion() @ stub ObGetObjectSecurity +@ stdcall ObGetObjectType(ptr) @ stub ObInsertObject @ stub ObLogSecurityDescriptor @ stub ObMakeTemporaryObject -- 1.9.1

1 0