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

[PATCH 7/7] netapi32: Properly implement NetApiBufferFree.
by Dmitry Timoshkov April 5, 2018

April 5, 2018

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 April 5, 2018

April 5, 2018

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 April 5, 2018

April 5, 2018

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 April 5, 2018

April 5, 2018

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 April 5, 2018

April 5, 2018

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 April 5, 2018

April 5, 2018

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 April 5, 2018

April 5, 2018

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 April 5, 2018

April 5, 2018

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 April 4, 2018

April 4, 2018

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 April 4, 2018

April 4, 2018

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

[PATCH 3/4] ntoskrnl: Add PsGetProcessId stub
by Alistair Leslie-Hughes April 4, 2018

April 4, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 92fc1db..e4b96a7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3464,3 +3464,13 @@ void WINAPI ExfUnblockPushLock( EX_PUSH_LOCK *lock, PEX_PUSH_LOCK_WAIT_BLOCK blo { FIXME( "stub: %p, %p\n", lock, block ); } + +/********************************************************************* + * PsGetProcessId (NTOSKRNL.@) + */ +HANDLE WINAPI PsGetProcessId(PEPROCESS process) +{ + FIXME("stub: %p\n", process); + + return 0; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8aaca5b..c7913db 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -874,7 +874,7 @@ @ stub PsGetProcessExitProcessCalled @ stub PsGetProcessExitStatus @ stub PsGetProcessExitTime -@ stub PsGetProcessId +@ stdcall PsGetProcessId(ptr) @ stub PsGetProcessImageFileName @ stub PsGetProcessInheritedFromUniqueProcessId @ stub PsGetProcessJob -- 1.9.1

1 0

[PATCH 2/4] ntoskrnl: Add ExfUnblockPushLock stub
by Alistair Leslie-Hughes April 4, 2018

April 4, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 29c6977..92fc1db 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3449,3 +3449,18 @@ void WINAPI PsReleaseProcessExitSynchronization(PEPROCESS process) { FIXME("stub: %p\n", process); } + +typedef struct _EX_PUSH_LOCK_WAIT_BLOCK *PEX_PUSH_LOCK_WAIT_BLOCK; +/********************************************************************* + * ExfUnblockPushLock (NTOSKRNL.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( ExfUnblockPushLock ) +void WINAPI DECLSPEC_HIDDEN __regs_ExfUnblockPushLock( EX_PUSH_LOCK *lock, + PEX_PUSH_LOCK_WAIT_BLOCK block) +#else +void WINAPI ExfUnblockPushLock( EX_PUSH_LOCK *lock, PEX_PUSH_LOCK_WAIT_BLOCK block ) +#endif +{ + FIXME( "stub: %p, %p\n", lock, block ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 54ca51f..8aaca5b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -133,6 +133,7 @@ @ stub ExEnumHandleTable @ stub ExEventObjectType @ stub ExExtendZone +@ stdcall -norelay ExfUnblockPushLock(ptr ptr) @ stdcall ExFreePool(ptr) @ stdcall ExFreePoolWithTag(ptr long) @ stub ExFreeToPagedLookasideList -- 1.9.1

1 0

[PATCH 1/4] ntoskrnl: Add PsAcquireProcessExitSynchronization/PsReleaseProcessExitSynchronization stub
by Alistair Leslie-Hughes April 4, 2018

April 4, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 18 ++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 20 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7258c37..29c6977 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3431,3 +3431,21 @@ __ASM_STDCALL_FUNC( _chkstk, 0, __ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" "bx lr" ) #endif + +/********************************************************************* + * PsAcquireProcessExitSynchronization (NTOSKRNL.@) +*/ +NTSTATUS WINAPI PsAcquireProcessExitSynchronization(PEPROCESS process) +{ + FIXME("stub: %p\n", process); + + return STATUS_NOT_IMPLEMENTED; +} + +/********************************************************************* + * PsReleaseProcessExitSynchronization (NTOSKRNL.@) + */ +void WINAPI PsReleaseProcessExitSynchronization(PEPROCESS process) +{ + FIXME("stub: %p\n", process); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 5e983b1..54ca51f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -844,6 +844,7 @@ @ stub PoUnregisterSystemState @ stdcall ProbeForRead(ptr long long) @ stdcall ProbeForWrite(ptr long long) +@ stdcall PsAcquireProcessExitSynchronization(ptr) @ stub PsAssignImpersonationToken @ stub PsChargePoolQuota @ stub PsChargeProcessNonPagedPoolQuota @@ -905,6 +906,7 @@ @ stub PsProcessType @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken +@ stdcall PsReleaseProcessExitSynchronization(ptr) @ stdcall PsRemoveCreateThreadNotifyRoutine(ptr) @ stdcall PsRemoveLoadImageNotifyRoutine(ptr) @ stub PsRestoreImpersonation -- 1.9.1

1 0

[PATCH] jscript: Allow using reserved words as identifiers in ES5 mode.
by Jacek Caban April 4, 2018

April 4, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/lex.c | 2 +- dlls/jscript/parser.y | 58 ++++++++++++++++++++++++++++++++++----- dlls/mshtml/tests/documentmode.js | 18 ++++++++++++ dlls/mshtml/tests/es5.js | 43 ++++++++++++++++++++++++++++- 4 files changed, 112 insertions(+), 9 deletions(-)

2 1

[PATCH] user32: Avoid using the comma operator in a while condition.
by Huw Davies April 4, 2018

April 4, 2018

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 7d1f6b3de7..6f23c74309 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1582,9 +1582,9 @@ HWND WINAPI GetNextDlgGroupItem( HWND hwndDlg, HWND hwndCtrl, BOOL fPrevious ) */ retvalue = hwndCtrl; hwnd = hwndCtrl; - while (hwndNext = GetWindow (hwnd, GW_HWNDNEXT), - 1) + while (1) { + hwndNext = GetWindow (hwnd, GW_HWNDNEXT); while (!hwndNext) { /* Climb out until there is a next sibling of the ancestor or we -- 2.16.2

1 0

[PATCH] progman: Fix PUT_SHORT macro (clang)
by André Hentschel April 4, 2018

April 4, 2018

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- programs/progman/grpfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index d49dde3..4a71ce5 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -32,7 +32,7 @@ #define GET_SHORT(buffer, i)\ (((BYTE)((buffer)[(i)]) + 0x100 * (signed char)((buffer)[(i)+1]))) #define PUT_SHORT(buffer, i, s)\ - (((buffer)[(i)] = (s) & 0xff, (buffer)[(i)+1] = ((s) >> 8) & 0xff)) + (((buffer)[(i)] = (BYTE)((s) & 0xff), (buffer)[(i)+1] = (BYTE)(((s) >> 8) & 0xff))) static BOOL GRPFILE_ReadFileToBuffer(LPCSTR, HLOCAL*, INT*); static HLOCAL GRPFILE_ScanGroup(LPCSTR, INT, LPCSTR, BOOL); -- 2.7.4

1 0

[PATCH v4 1/3] tools/make_unicode: Implement full Unicode character decomposition.
by Sergio Gómez Del Real April 4, 2018

April 4, 2018

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- libs/port/mbtowc.c | 10 +- tools/make_unicode | 427 +++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 372 insertions(+), 65 deletions(-) diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 4977c82d8b..d78bfe81e6 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; +extern unsigned int wine_unicode_decompose_string( int compat, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ); /* check the code whether it is in Unicode Private Use Area (PUA). */ /* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */ @@ -107,13 +107,13 @@ static int mbstowcs_sbcs_decompose( const struct sbcs_table *table, int flags, { WCHAR dummy[4]; /* no decomposition is larger than 4 chars */ for (len = 0; srclen; srclen--, src++) - len += wine_decompose( cp2uni[*src], dummy, 4 ); + len += wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dummy, 4 ); return len; } for (len = dstlen; srclen && len; srclen--, src++) { - unsigned int res = wine_decompose( cp2uni[*src], dst, len ); + unsigned int res = wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dst, len ); if (!res) break; len -= res; dst += res; @@ -219,7 +219,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - len += wine_decompose( ch, dummy, 4 ); + len += wine_unicode_decompose_string( 0, &ch, 1, dummy, 4 ); } return len; } @@ -234,7 +234,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - if (!(res = wine_decompose( ch, dst, len ))) break; + if (!(res = wine_unicode_decompose_string( 0, &ch, 1, dst, len ))) break; dst += res; len -= res; } diff --git a/tools/make_unicode b/tools/make_unicode index 92b0b64a94..65ae7ab2a0 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -471,6 +471,26 @@ sub READ_DEFAULTS($) next if $decomp eq ""; # no decomposition, skip it + # store decomposition table + if ($decomp =~ /^<([a-zA-Z]+)>(\s+[0-9a-fA-F]+)+$/) + { + my @seq = (); + for my $ch (split /\s+/, (split /\s+/, $decomp, 2)[1]) + { + push @seq, (hex $ch); + } + $decomp_table[$src] = [1, \@seq]; + } + elsif ($decomp =~ /^([0-9a-fA-F]+)(\s+([0-9a-fA-F]+))*$/) + { + my @seq = (); + for my $ch (split /\s+/, $decomp) + { + push @seq, (hex $ch); + } + $decomp_table[$src] = [0, \@seq]; + } + if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/) { # decomposition of the form "<foo> 1234" -> use char if type is known @@ -508,7 +528,6 @@ sub READ_DEFAULTS($) # store decomposition if it contains two chars if ($decomp =~ /^([0-9a-fA-F]+)\s+([0-9a-fA-F]+)$/) { - $decomp_table[$src] = [ hex $1, hex $2 ]; push @compose_table, [ hex $1, hex $2, $src ]; } elsif ($decomp =~ /^(<[a-z]+>\s)*([0-9a-fA-F]+)$/ && @@ -2258,6 +2277,51 @@ EOF save_file($filename); } +sub recursive_decomp +{ + my ($char, $table_ref, $compat) = @_; + + return ($char) unless defined $table_ref->[$char]; + my $data = $table_ref->[$char]; + return ($char) if $data->[0] && !$compat; + my @mapping = (); + for my $ch (@{$data->[1]}) + { + push @mapping, recursive_decomp( $ch, $table_ref, $compat ); + } + return @mapping; +} + +sub expand_pairs +{ + my @data = @_; + my @result = (); + + for my $ch (@data) + { + if ($ch <= 0xFFFF) + { + push @result, $ch; + } + elsif ($ch >= 2097152) # 2**21 + { + die sprintf "Invalid Unicode character %04x\n", $ch; + } + else + { + my $hx = $ch & 0xFFFF; + my $hu = ($ch >> 16) & ((1 << 5) - 1); + my $hw = ($hu - 1) & 0xFFFF; + my $hi = 0xD800 | ($hw << 6) | ($hx >> 10); + my $lx = $ch & 0xFFFF; + my $lo = (0xDC00 | ($lx & ((1 << 10) - 1))) & 0xFFFF; + push @result, $hi; + push @result, $lo; + } + } + return @result; +} + ################################################################ # dump the char decomposition table sub dump_decompose_table($) @@ -2266,98 +2330,341 @@ sub dump_decompose_table($) open OUTPUT,">$filename.new" or die "Cannot create $filename"; print "Building $filename\n"; - print OUTPUT "/* Unicode char composition */\n"; + print OUTPUT "/* Unicode char decomposition */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - # first determine all the 16-char subsets that contain something + my $utflim = 2097152; + my %nfd_lookup = (); + my %nfkd_lookup = (); + my %decomp_lookup = (); + my @decomp_data = (0); + my $pos = 1; + my $lastchar_decomp; - my @filled = (0) x 4096; - my $pos = 16*2; # for the null subset - for (my $i = 0; $i < 65536; $i++) + for (my $i = 0; $i < $utflim; $i++) { next unless defined $decomp_table[$i]; - $filled[$i >> 4] = $pos; - $pos += 16*2; - $i |= 15; + + if (defined $decomp_table[$i]) + { + $lastchar_decomp = $i; + # fully expand input and mappings + + my @char = expand_pairs( ($i) ); + push @char, 0; + my $char = pack "n*", @char; + + my @nfd = recursive_decomp( $i, \@decomp_table, 0 ); + @nfd = expand_pairs( @nfd ); + push @nfd, 0; + my $nfd = pack "n*", @nfd; + + my @nfkd = recursive_decomp( $i, \@decomp_table, 1 ); + @nfkd = expand_pairs( @nfkd ); + push @nfkd, 0; + my $nfkd = pack "n*", @nfkd; + + # lookup or add mappings + + if ($nfd eq $char) + { + $nfd = undef; + } + elsif (exists $decomp_lookup{$nfd}) + { + $nfd_lookup{$i} = $decomp_lookup{$nfd}; + } + else + { + push @decomp_data, @nfd; + $decomp_lookup{$nfd} = $pos; + $nfd_lookup{$i} = $pos; + $pos += @nfd; + } + + if ($nfkd eq $char) + { + $nfkd = undef; + } + elsif (exists $decomp_lookup{$nfkd}) + { + $nfkd_lookup{$i} = $decomp_lookup{$nfkd}; + } + else + { + push @decomp_data, @nfkd; + $decomp_lookup{$nfkd} = $pos; + $nfkd_lookup{$i} = $pos; + $pos += @nfkd; + } + } } - my $total = $pos; - # now count the 256-char subsets that contain something + printf OUTPUT "static const UINT last_decomposable = 0x%x;\n\n", $lastchar_decomp; + + # dump decomposition data + + printf OUTPUT "static const WCHAR data_decomp[%d] =\n", $pos; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @decomp_data ); + print OUTPUT "\n};\n\n"; - my @filled_idx = (256) x 256; - $pos = 256 + 16; - for (my $i = 0; $i < 4096; $i++) + # find 256-char subsets that contain something + + my $filled_pos = 1; + my $filled_lim = ($lastchar_decomp >> 8) + 1; + my @filled = (0) x $filled_lim; + for (my $i = 0; $i < $utflim; $i++) { - next unless $filled[$i]; - $filled_idx[$i >> 4] = $pos; - $pos += 16; - $i |= 15; + last if $i > $lastchar_decomp; + next unless exists $nfd_lookup{$i} || exists $nfkd_lookup{$i}; + $filled[$i >> 8] = $filled_pos++; + $i |= 255; } - my $null_offset = $pos; # null mapping - $total += $pos; - # add the index offsets to the subsets positions + # dump index of 256-char subsets + + printf OUTPUT "static const BYTE idx1_decomp[%d] =\n", $filled_lim; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%02x", 0, @filled ); + print OUTPUT "\n};\n\n"; + + # for 256-char subsets, find non-empty 16-char subsets - for (my $i = 0; $i < 4096; $i++) + my $sub_filled_pos = 1; + my %sub_filled = (); + for (my $i = 0; $i < $filled_lim; $i++) { next unless $filled[$i]; - $filled[$i] += $null_offset; + for (my $j = 0; $j < 256; $j++) + { + my $idx = ($i << 8) | $j; + next unless exists $nfd_lookup{$idx} || exists $nfkd_lookup{$idx}; + $sub_filled{$idx >> 4} = $sub_filled_pos++; + $j |= 15; + } } - # dump the main index + # dump index of 16-char subsets - printf OUTPUT "static const WCHAR table[%d] =\n", $total; - printf OUTPUT "{\n /* index */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @filled_idx ); - printf OUTPUT ",\n /* null sub-index */\n%s", DUMP_ARRAY( "0x%04x", 0, ($null_offset) x 16 ); - - # dump the second-level indexes - - for (my $i = 0; $i < 256; $i++) + printf OUTPUT "static const USHORT idx2_decomp[%d] =\n", $filled_pos * 16; + print OUTPUT "{\n"; + my @null_idx = (0) x 16; + print OUTPUT " /* null sub-index */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_idx ); + for (my $i = 0; $i < $filled_lim; $i++) { - next unless ($filled_idx[$i] > 256); - my @table = @filled[($i<<4)..($i<<4)+15]; - for (my $j = 0; $j < 16; $j++) { $table[$j] ||= $null_offset; } - printf OUTPUT ",\n /* sub-index %02x */\n", $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + next unless $filled[$i]; + printf OUTPUT ",\n /* sub-index 0x%02x */\n", $filled[$i]; + + my @sub_idx; + for (my $j = 0; $j < 16; $j++) + { + my $idx = ($i << 4) | $j; + $sub_idx[$j] = $sub_filled{$idx} || 0; + } + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_idx ); } + print OUTPUT "\n};\n\n"; # dump the 16-char subsets - printf OUTPUT ",\n /* null mapping */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, (0) x 32 ); - - for (my $i = 0; $i < 4096; $i++) + printf OUTPUT "static const USHORT offsets_decomp[%d] =\n", 32 * $sub_filled_pos; + print OUTPUT "{\n"; + print OUTPUT " /* (nfd, nfkd) x 16 */\n"; + my @null_table = (0) x 32; + print OUTPUT " /* no decomposition */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_table ); + for my $key (sort {$a <=> $b} keys %sub_filled) { - next unless $filled[$i]; - my @table = (0) x 32; + printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $key, $key; + my @sub_table; for (my $j = 0; $j < 16; $j++) { - if (defined $decomp_table[($i<<4) + $j]) - { - $table[2 * $j] = ${$decomp_table[($i << 4) + $j]}[0]; - $table[2 * $j + 1] = ${$decomp_table[($i << 4) + $j]}[1]; - } + my $idx = ($key << 4) | $j; + $sub_table[2 * $j] = $nfd_lookup{$idx} || 0; + $sub_table[2 * $j + 1] = $nfkd_lookup{$idx} || 0; } - printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $i, $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_table ); } + print OUTPUT "\n};\n\n"; - printf OUTPUT "\n};\n\n"; print OUTPUT <<"EOF"; -unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) +static const WCHAR *unicode_table_lookup( UINT cp, int compat, const BYTE *idx1, UINT scale_idx1, + const USHORT *idx2, UINT scale_idx2, const USHORT *offsets, + UINT scale_off, const WCHAR *data, UINT scale_data ) { - const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); - unsigned int res; + USHORT a, b, c, d; - *dst = ch; - if (!*ptr) return 1; - if (dstlen <= 1) return 0; - /* apply the decomposition recursively to the first char */ - if ((res = wine_decompose( *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; - return res; + a = idx1[cp >> scale_idx1]; + b = idx2[(a << scale_idx2) + ((cp >> scale_idx2) & 0xf)]; + c = (b << scale_off) + ((cp & 0xf) << scale_data); + if (compat) ++c; + d = offsets[c]; + + return &data[d]; +} + +static inline int decompose_hangul( WCHAR ch, WCHAR dum[4], int dstlen ) +{ + static const WCHAR sbase = 0xac00, lbase = 0x1100, vbase = 0x1161, tbase = 0x11a7; + static const WCHAR /*lcount = 19, vcount = 21,*/ tcount = 28, ncount = 588/*, scount = 11172*/; + WCHAR sindex, lindex, vindex, tindex; + + if (ch >= 0xac00 && ch <= 0xd7af) + { + sindex = ch - sbase; + lindex = sindex / ncount; + vindex = (sindex % ncount) / tcount; + tindex = sindex % tcount; + dum[0] = lbase + lindex; + dum[1] = vbase + vindex; + dum[2] = (tindex > 0) ? (tbase + tindex) : 0; + dum[3] = 0; + } + else + { + dum[0] = ch; + dum[1] = 0; + } + + return 0; +} + +static inline UINT utf16_codepoint_to_surrogates( UINT cp ) +{ + UINT ch = cp; + WCHAR hx, hw, lx; + UINT hu; + + hx = (WCHAR)cp; + hu = (cp >> 16) & ((1 << 5) - 1); + hw = (WCHAR)hu - 1; + lx = (WCHAR)cp; + ch = 0xD800 | (hw << 6) | (hx >> 10); + ch |= (0xDC00 | (lx & ((1 << 10) - 1)))<<16; + + return ch; +} + +static inline UINT utf16_surrogates_to_codepoint( WCHAR hi, WCHAR lo ) +{ + UINT x, w, u, c; + + x = ((hi & ((1 << 6) - 1)) << 10) | (lo & ((1 << 10) - 1)); + w = (hi >> 6) & ((1 << 5) - 1); + u = w + 1; + c = (u << 16) | x; + + return c; +} + +static int decompose_char_recursive( int compat, UINT ch, WCHAR *dst, int dstlen ) +{ + const WCHAR *map = NULL; + int total_decomp = 0; + int size_decomp; + + if (ch < 0xa0) /* fast path */ + { + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + else if (ch >= 0xac00 && ch <= 0xd7af) /* hangul */ + { + WCHAR dum[4]; + int len = 0, i = 0; + + decompose_hangul( ch, dum, dstlen ); + while (dum[i]) + { + if (dstlen-i) dst[i] = dum[i]; + i++; + len++; + } + return len; + } + else if (ch > last_decomposable || + !*(map = unicode_table_lookup( ch, compat, idx1_decomp, 8, + idx2_decomp, 4, offsets_decomp, 5, data_decomp, 1 ))) + { + if (ch > 0xffff) + { + ch = utf16_codepoint_to_surrogates( ch ); + if (dstlen) *dst = (WCHAR)ch; + if (dstlen-1) *(dst+1) = (WCHAR)(ch>>16); + return 2; + } + else + { + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + } + else { + while (*map) + { + size_decomp = decompose_char_recursive( compat, *map, dst, dstlen ); + dstlen -= size_decomp; + if (dstlen < 0) dstlen = 0; + dst += size_decomp; + map++; + total_decomp += size_decomp; + } + return total_decomp; + } +} + +unsigned int wine_unicode_decompose_string( int compat, const WCHAR *src, + int srclen, WCHAR *dst, int dstlen ) +{ + UINT ch; + int srcpos = 0, dstpos = 0; + int num_decomp; + + if (dstlen < 0) dstlen = 0; + + while (srcpos < srclen) + { + ch = src[srcpos]; + + if (ch >= 0xd800 && ch <= 0xdbff) /* high surrogate */ + { + WCHAR hi, lo; + if (srcpos+1 == srclen) return srcpos; + hi = (WCHAR)ch; + lo = src[++srcpos]; + if (lo < 0xdc00 || lo > 0xdfff) return srcpos; + ch = utf16_surrogates_to_codepoint( hi, lo ); + } + else if (ch >= 0xdc00 && ch <= 0xdfff) /* low surrogate */ + { + return srcpos; + } + + num_decomp = decompose_char_recursive( compat, ch, dst+dstpos, dstlen ); + dstpos += num_decomp; + + if (dstlen > 0) + { + dstlen -= num_decomp; + if (dstlen < 0) + { + while (dstlen < 0) + { + dstpos--; + dstlen++; + } + break; + } + } + + ++srcpos; + } + + return dstpos; } EOF close OUTPUT; -- 2.14.1

2 3

[PATCH 3/4] winmm/tests: Add more MIDI System Exclusive message tests.
by Akihiro Sagawa April 4, 2018

April 4, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+)

3 3

[PATCH 1/3] msctf:return S_OK in TextStoreACPSink_OnTextChange
by Louis Lenders April 4, 2018

April 4, 2018

This is for bug 44404 Several .Net applications crash on these stubs returning E_NOTIMPL. Returning S_OK makes the crashes gone, up to now i`ve not seen this causes any unwanted side-effects/ no new crashes as far as I can tell. Example of program that crashes quite quickly is installer of https://www.remembear.com/download/ Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/msctf/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 54052f6..70b06e2 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -758,7 +758,7 @@ static HRESULT WINAPI TextStoreACPSink_OnTextChange(ITextStoreACPSink *iface, { Context *This = impl_from_ITextStoreACPSink(iface); FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI TextStoreACPSink_OnSelectionChange(ITextStoreACPSink *iface) -- 2.7.4

2 5

[PATCH 2/2] comctl32/button: Implement BCM_{GET,SET}TEXTMARGIN message.
by Zhiyi Zhang April 4, 2018

April 4, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 25 ++++++++++++++++++---- dlls/comctl32/tests/button.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ include/commctrl.h | 4 ++++ 3 files changed, 74 insertions(+), 4 deletions(-)

2 1

[PATCH 1/2] comctl32/button: Implement BCM_{GET,SET}IMAGELIST message.
by Zhiyi Zhang April 4, 2018

April 4, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 42 +++++++++++++++------- dlls/comctl32/tests/button.c | 86 ++++++++++++++++++++++++++++++++++++++++++++ include/commctrl.h | 4 +++ 3 files changed, 119 insertions(+), 13 deletions(-)

2 1

[PATCH v2 1/5] ole32: Add support for loading enhmetafiles from presentation and contents streams to data cache.
by Sergio Gómez Del Real April 4, 2018

April 4, 2018

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/datacache.c | 185 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 122 insertions(+), 63 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 325a98b33b..799e14a867 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -459,6 +459,45 @@ static void DataCache_FireOnViewChange( } } +/* helper for copying STGMEDIUM of type bitmap, MF, EMF or HGLOBAL. +* does no checking of whether src_stgm has a supported tymed, so this should be +* done in the caller */ +static HRESULT copy_stg_medium(CLIPFORMAT cf, STGMEDIUM *dest_stgm, + const STGMEDIUM *src_stgm) +{ + if (src_stgm->tymed == TYMED_MFPICT) + { + const METAFILEPICT *src_mfpict = GlobalLock(src_stgm->u.hMetaFilePict); + METAFILEPICT *dest_mfpict; + + if (!src_mfpict) + return DV_E_STGMEDIUM; + dest_stgm->u.hMetaFilePict = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); + dest_mfpict = GlobalLock(dest_stgm->u.hMetaFilePict); + if (!dest_mfpict) + { + GlobalUnlock(src_stgm->u.hMetaFilePict); + return E_OUTOFMEMORY; + } + *dest_mfpict = *src_mfpict; + dest_mfpict->hMF = CopyMetaFileW(src_mfpict->hMF, NULL); + GlobalUnlock(src_stgm->u.hMetaFilePict); + GlobalUnlock(dest_stgm->u.hMetaFilePict); + } + else if (src_stgm->tymed != TYMED_NULL) + { + dest_stgm->u.hGlobal = OleDuplicateData(src_stgm->u.hGlobal, cf, + GMEM_MOVEABLE); + if (!dest_stgm->u.hGlobal) + return E_OUTOFMEMORY; + } + dest_stgm->tymed = src_stgm->tymed; + dest_stgm->pUnkForRelease = src_stgm->pUnkForRelease; + if (dest_stgm->pUnkForRelease) + IUnknown_AddRef(dest_stgm->pUnkForRelease); + return S_OK; +} + static HRESULT read_clipformat(IStream *stream, CLIPFORMAT *clipformat) { DWORD length; @@ -547,6 +586,30 @@ static HRESULT open_pres_stream( IStorage *stg, int stream_number, IStream **stm return IStorage_OpenStream( stg, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); } +static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) +{ + METAFILEPICT *pict; + HRESULT hr = E_FAIL; + UINT size; + void *bits; + + if (!(pict = GlobalLock( data ))) return hr; + + size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); + if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) + { + GetMetaFileBitsEx( pict->hMF, size, bits ); + med->u.hEnhMetaFile = SetWinMetaFileBits( size, bits, NULL, pict ); + HeapFree( GetProcessHeap(), 0, bits ); + med->tymed = TYMED_ENHMF; + med->pUnkForRelease = NULL; + hr = S_OK; + } + + GlobalUnlock( data ); + return hr; +} + static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) { HRESULT hr; @@ -701,7 +764,62 @@ fail: GlobalUnlock( hglobal ); GlobalFree( hglobal ); return E_FAIL; +} +static HRESULT load_emf( DataCacheEntry *cache_entry, IStream *stm ) +{ + HRESULT hr; + + if (cache_entry->load_stream_num != STREAM_NUMBER_CONTENTS) + { + STGMEDIUM stgmed; + + hr = load_mf_pict( cache_entry, stm ); + if (SUCCEEDED( hr )) + hr = synthesize_emf( cache_entry->stgmedium.u.hMetaFilePict, &stgmed ); + if (SUCCEEDED( hr )) + { + ReleaseStgMedium( &cache_entry->stgmedium ); + hr = copy_stg_medium( CF_ENHMETAFILE, &cache_entry->stgmedium, &stgmed ); + ReleaseStgMedium( &stgmed ); + } + } + else + { + STATSTG stat; + void *data; + DWORD size_bits; + ULONG read; + + hr = IStream_Stat( stm, &stat, STATFLAG_NONAME ); + + if (SUCCEEDED( hr )) + { + data = HeapAlloc( GetProcessHeap(), 0, stat.cbSize.u.LowPart ); + if (!data) return E_OUTOFMEMORY; + + hr = IStream_Read( stm, data, stat.cbSize.u.LowPart, &read ); + if (hr != S_OK || read != stat.cbSize.u.LowPart) + { + HeapFree( GetProcessHeap(), 0, data ); + return E_FAIL; + } + + size_bits = read - sizeof(DWORD) - sizeof(ENHMETAHEADER); + if (size_bits <= 0) + { + HeapFree( GetProcessHeap(), 0, data ); + return E_FAIL; + } + cache_entry->stgmedium.u.hEnhMetaFile = SetEnhMetaFileBits( size_bits, (BYTE *)data + (read - size_bits) ); + cache_entry->stgmedium.tymed = TYMED_ENHMF; + cache_entry->stgmedium.pUnkForRelease = NULL; + + HeapFree( GetProcessHeap(), 0, data ); + } + } + + return hr; } /************************************************************************ @@ -736,6 +854,10 @@ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry, IStorage *st hr = load_dib( cache_entry, stm ); break; + case CF_ENHMETAFILE: + hr = load_emf( cache_entry, stm ); + break; + default: FIXME( "Unimplemented clip format %x\n", cache_entry->fmtetc.cfFormat ); hr = E_NOTIMPL; @@ -1030,45 +1152,6 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag return hr; } -/* helper for copying STGMEDIUM of type bitmap, MF, EMF or HGLOBAL. -* does no checking of whether src_stgm has a supported tymed, so this should be -* done in the caller */ -static HRESULT copy_stg_medium(CLIPFORMAT cf, STGMEDIUM *dest_stgm, - const STGMEDIUM *src_stgm) -{ - if (src_stgm->tymed == TYMED_MFPICT) - { - const METAFILEPICT *src_mfpict = GlobalLock(src_stgm->u.hMetaFilePict); - METAFILEPICT *dest_mfpict; - - if (!src_mfpict) - return DV_E_STGMEDIUM; - dest_stgm->u.hMetaFilePict = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); - dest_mfpict = GlobalLock(dest_stgm->u.hMetaFilePict); - if (!dest_mfpict) - { - GlobalUnlock(src_stgm->u.hMetaFilePict); - return E_OUTOFMEMORY; - } - *dest_mfpict = *src_mfpict; - dest_mfpict->hMF = CopyMetaFileW(src_mfpict->hMF, NULL); - GlobalUnlock(src_stgm->u.hMetaFilePict); - GlobalUnlock(dest_stgm->u.hMetaFilePict); - } - else if (src_stgm->tymed != TYMED_NULL) - { - dest_stgm->u.hGlobal = OleDuplicateData(src_stgm->u.hGlobal, cf, - GMEM_MOVEABLE); - if (!dest_stgm->u.hGlobal) - return E_OUTOFMEMORY; - } - dest_stgm->tymed = src_stgm->tymed; - dest_stgm->pUnkForRelease = src_stgm->pUnkForRelease; - if (dest_stgm->pUnkForRelease) - IUnknown_AddRef(dest_stgm->pUnkForRelease); - return S_OK; -} - static HRESULT synthesize_dib( HBITMAP bm, STGMEDIUM *med ) { HDC hdc = GetDC( 0 ); @@ -1118,30 +1201,6 @@ static HRESULT synthesize_bitmap( HGLOBAL dib, STGMEDIUM *med ) return hr; } -static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) -{ - METAFILEPICT *pict; - HRESULT hr = E_FAIL; - UINT size; - void *bits; - - if (!(pict = GlobalLock( data ))) return hr; - - size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); - if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) - { - GetMetaFileBitsEx( pict->hMF, size, bits ); - med->u.hEnhMetaFile = SetWinMetaFileBits( size, bits, NULL, pict ); - HeapFree( GetProcessHeap(), 0, bits ); - med->tymed = TYMED_ENHMF; - med->pUnkForRelease = NULL; - hr = S_OK; - } - - GlobalUnlock( data ); - return hr; -} - static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, const FORMATETC *formatetc, STGMEDIUM *stgmedium, -- 2.14.1

2 11

[PATCH] comctl32: Use heap_alloc() instead of heap_realloc()
by Dan Bassi April 4, 2018

April 4, 2018

1 0

[PATCH website] Update the mailing list traffic estimations
by Michael Stefaniuc April 3, 2018

April 3, 2018

Also deprecate wine-patches in the English version of that page. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- templates/en/forums.template | 8 ++++---- templates/fr/forums.template | 6 +++--- templates/ko/forums.template | 6 +++--- templates/pl/forums.template | 6 +++--- templates/pt/forums.template | 6 +++--- templates/tr/forums.template | 6 +++--- templates/zh-cn/forums.template | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index f21dad47..6d5d0133 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -66,7 +66,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via newsreader</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - A medium traffic (25/day) open list for discussing Wine development, + A medium traffic (50/day) open list for discussing Wine development, WineHQ, patches or anything else of interest to Wine developers. </li> @@ -76,7 +76,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - A medium traffic (45/day) open list for submitting patches only. + A deprecated list for submitting patches. Use instead <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a>. </li> <li> @@ -85,7 +85,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - A medium traffic (35/day) read only list which tracks commits to the Git + A medium traffic (25/day) read only list which tracks commits to the Git tree. </li> @@ -111,7 +111,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - A high traffic (150/day) read-only list for monitoring activity on the + A high traffic (100/day) read-only list for monitoring activity on the <a href="//bugs.winehq.org/">Bug Tracking Database</a>. </li> diff --git a/templates/fr/forums.template b/templates/fr/forums.template index e82b6c6c..6a70658c 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -50,7 +50,7 @@ le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="// [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via un lecteur de nouvelles</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - Une liste moyen trafic (25 messages par jour) pour la discussion sur le développement de Wine, les patchs ou tout autre élément intéressant pour les développeurs Wine. + Une liste moyen trafic (50 messages par jour) pour la discussion sur le développement de Wine, les patchs ou tout autre élément intéressant pour les développeurs Wine. </li> <li> @@ -68,7 +68,7 @@ le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="// [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via un lecteur de nouvelles</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - Une liste moyen trafic (35 messages par jour) en lecture seule pour le suivi des commits dans Git. + Une liste moyen trafic (25 messages par jour) en lecture seule pour le suivi des commits dans Git. </li> <li> @@ -91,7 +91,7 @@ le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="// [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via un lecteur de nouvelles</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - Une liste haut trafic (150 messages par jour) en lecture seule pour la surveillances des activités sur la + Une liste haut trafic (100 messages par jour) en lecture seule pour la surveillances des activités sur la <a href="//bugs.winehq.org/">base de données de suivi de bogues</a>. </li> diff --git a/templates/ko/forums.template b/templates/ko/forums.template index 416a9d93..496fdaea 100644 --- a/templates/ko/forums.template +++ b/templates/ko/forums.template @@ -58,7 +58,7 @@ WWW</a>를 통해 구독하거나, 목록 이름-request(a)winehq.org로 " [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">보존 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">소식 읽기를 통해</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - 중간 용량 (하루에 25편) 와인 개발, + 중간 용량 (하루에 50편) 와인 개발, 와인HQ, 깃기, 기타 개발자가 알아야 할 내용에 관한 공개 토론 목록입니다. </li> @@ -77,7 +77,7 @@ WWW</a>를 통해 구독하거나, 목록 이름-request(a)winehq.org로 " [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">보존 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">소식 읽기를 통해</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - 중간 용량 (하루에 35편) 깃 나무의 기우기를 추적하는 읽기 전용 목록입니다. + 중간 용량 (하루에 25편) 깃 나무의 기우기를 추적하는 읽기 전용 목록입니다. </li> <li> @@ -100,7 +100,7 @@ WWW</a>를 통해 구독하거나, 목록 이름-request(a)winehq.org로 " [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">보존 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">소식 읽기를 통해</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - 대용량 (하루에 150편) <a href="//bugs.winehq.org/">오류 추적 정보기지</a>를 관리하는 읽기 전용 목록입니다.. + 대용량 (하루에 100편) <a href="//bugs.winehq.org/">오류 추적 정보기지</a>를 관리하는 읽기 전용 목록입니다.. </li> <li> diff --git a/templates/pl/forums.template b/templates/pl/forums.template index e260341e..e8b72926 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -56,7 +56,7 @@ oprogramowanie listy mailingowej. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Archiwum 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">przez czytnik aktualności</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - Średni ruch (25/dziennie) otwarta lista dla dyskusji nt. tworzenia Wine, + Średni ruch (50/dziennie) otwarta lista dla dyskusji nt. tworzenia Wine, WineHQ, łatek lub czegokolwiek innego leżącego w zakresie interesu programistów Wine. <li> @@ -73,7 +73,7 @@ oprogramowanie listy mailingowej. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archiwum 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">przez czytnik aktualności</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - Średni ruch (35/dziennie) lista tylko-do-odczytu, która śledzi zatwierdzenia do drzewa Git. + Średni ruch (25/dziennie) lista tylko-do-odczytu, która śledzi zatwierdzenia do drzewa Git. <li> [<a href="//www.winehq.org/mailman/listinfo/wine-releases">(Wy-/Za-)pisz</a>] @@ -95,7 +95,7 @@ oprogramowanie listy mailingowej. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archiwum 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">przez czytnik aktualności</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - Wysoki ruch (150/dziennie) lista tylko-do-odczytu do monitorowania aktywności + Wysoki ruch (100/dziennie) lista tylko-do-odczytu do monitorowania aktywności <a href="//bugs.winehq.org/">bazy danych śledzącej błędy</a>. <li> diff --git a/templates/pt/forums.template b/templates/pt/forums.template index f109f506..72d86244 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -58,7 +58,7 @@ do contrário o seu email será tratado como um possível spam pelo software da [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Arquivo 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via newsreader</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - Uma lista aberta de tráfego médio (25/dia) para discutir desenvolvimento do Wine, + Uma lista aberta de tráfego médio (50/dia) para discutir desenvolvimento do Wine, WineHQ, patches e qualquer outra coisa de interesse a desenvolvedores do Wine. <li> @@ -75,7 +75,7 @@ do contrário o seu email será tratado como um possível spam pelo software da [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Arquivo 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - Uma lista aberta de tráfego médio (35/dia) de somente leitura que lista os commits feitas + Uma lista aberta de tráfego médio (25/dia) de somente leitura que lista os commits feitas na árvore Git. <li> @@ -98,7 +98,7 @@ do contrário o seu email será tratado como um possível spam pelo software da [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Arquivo 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - Uma lista de alto tráfego (150/dia) de somente leitura para monitorar a atividade na + Uma lista de alto tráfego (100/dia) de somente leitura para monitorar a atividade na <a href="//bugs.winehq.org/">Banco de Dados de Bugs</a>. <li> diff --git a/templates/tr/forums.template b/templates/tr/forums.template index dcee48c4..07e80b17 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -50,7 +50,7 @@ WWW</a> veya listeadı-request(a)winehq.org adresine konu satırı "subscri [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Arşiv 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">haber okuyucu ile</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - Wine geliştirmesi, WineHQ, yamalar ve Wine geliştiricileri ile alakalı diğer şeylerle ilgili orta trafikli (25/gün) bir açık liste + Wine geliştirmesi, WineHQ, yamalar ve Wine geliştiricileri ile alakalı diğer şeylerle ilgili orta trafikli (50/gün) bir açık liste </li> <li> @@ -68,7 +68,7 @@ WWW</a> veya listeadı-request(a)winehq.org adresine konu satırı "subscri [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Arşiv 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">haber okuyucu ile</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - A medium traffic (35/day) read only list which tracks commits to the Git + A medium traffic (25/day) read only list which tracks commits to the Git tree. </li> @@ -92,7 +92,7 @@ WWW</a> veya listeadı-request(a)winehq.org adresine konu satırı "subscri [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Arşiv 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">haber okuyucu ile</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - <a href="//bugs.winehq.org/">Hata İzleme Veritabanı</a> üzerinde etkinliği takip etmek için kullanılan yüksek trafikli (150/gün) salt okunur bir liste. + <a href="//bugs.winehq.org/">Hata İzleme Veritabanı</a> üzerinde etkinliği takip etmek için kullanılan yüksek trafikli (100/gün) salt okunur bir liste. </li> <li> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index a50ba3b7..5ea77e85 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -57,7 +57,7 @@ WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表 [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">存档 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via newsreader</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - 一个中等流量（25封/天）的开放性列表，用于讨论 Wine 开发、WineHQ、patches 或者其他 Wine 开发者感兴趣的事情。 + 一个中等流量（50封/天）的开放性列表，用于讨论 Wine 开发、WineHQ、patches 或者其他 Wine 开发者感兴趣的事情。 </li> <li> @@ -75,7 +75,7 @@ WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表 [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">存档 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - 一个中等流量（35封/天）的只读列表，用于追踪 Git tree 上的 commits。 + 一个中等流量（25封/天）的只读列表，用于追踪 Git tree 上的 commits。 </li> <li> @@ -98,7 +98,7 @@ WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表 [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">存档 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - 一个大流量（150封/天）的只读列表，用于监听 + 一个大流量（100封/天）的只读列表，用于监听 <a href="//bugs.winehq.org/">Bug Tracking Database</a> 的活动。 </li> -- 2.14.3

1 0

WineHQ Downtime Notice
by Jeremy Newman April 3, 2018

April 3, 2018

WineHQ will be going down for some maintenance tonight (2018-03-26) starting at 21:00 CDT (-5 GMT). It will be offline for about 20 minutes while we swap out some equipment. The IP address for all WineHQ sites will also be changing. The DNS A records TTL are already down to 5 minutes, so DNS should switch over fairly quickly. We have already moved our primary and secondary DNS servers to the cloud, so they are no longer running directly on our box. I will reply to this message when the upgrades are complete, or if any plans change. -N

4 10