- wine-devel - winehq.org

[PATCH 3/4] [v2] winmm/tests: Add more MIDI System Exclusive message tests.
by Akihiro Sagawa 05 Apr '18

05 Apr '18

In v2, introduce time division settings and reduce the duration. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)

2 1

[PATCH 2/4] [v2] midimap: Open lower devices when opening MIDI Mapper.
by Akihiro Sagawa 05 Apr '18

05 Apr '18

Without this change, the lower device can't get a long message at the beginning. The mapper didn't open it before receiving a short message in modData function. In v2, rebased it. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/midimap/midimap.c | 27 ++++++++++++++------------- dlls/winmm/tests/midi.c | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-)

2 1

[PATCH 1/4] [v2] winmm/tests: Add MIDI System Exclusive message tests.
by Akihiro Sagawa 05 Apr '18

05 Apr '18

In v2, reduce duration time to 200ms from 400ms. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+)

2 1

[PATCH 1/2] ddraw: Fix D3DEXECUTEDATA.dwSize handling.
by Stefan Dösinger 05 Apr '18

05 Apr '18

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/ddraw/executebuffer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 497287e32f..89d9ed3a26 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -610,6 +610,12 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * TRACE("iface %p, data %p.\n", iface, data); + if (data->dwSize != sizeof(*data)) + { + WARN("data->dwSize is %u, returning DDERR_INVALIDPARAMS.\n", data->dwSize); + return DDERR_INVALIDPARAMS; + } + /* Skip past previous vertex data. */ buffer->src_vertex_pos += buffer->data.dwVertexCount; @@ -693,12 +699,11 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * static HRESULT WINAPI d3d_execute_buffer_GetExecuteData(IDirect3DExecuteBuffer *iface, D3DEXECUTEDATA *data) { struct d3d_execute_buffer *buffer = impl_from_IDirect3DExecuteBuffer(iface); - DWORD dwSize; TRACE("iface %p, data %p.\n", iface, data); - dwSize = data->dwSize; - memcpy(data, &buffer->data, dwSize); + /* Tests show that dwSize is ignored. */ + memcpy(data, &buffer->data, sizeof(*data)); if (TRACE_ON(ddraw)) { -- 2.16.1

2 3

[PATCH] d2d1: Fix outline join drawing.
by Giovanni Mascellani 05 Apr '18

05 Apr '18

Calling d2d_outline_vertex_set(x, y, 0, 0, 0, 0) causes a normalize() to be invoked with a zero vector in the vertex shader vs_code_bezier_outline. This gives rise to an undefinite result, that in some cases causes the join triangles to be dropped. Tested on Debian unstable. Signed-off-by: Giovanni Mascellani <g.mascellani(a)gmail.com> --- dlls/d2d1/geometry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 5b5a75b9ed..d716fb128d 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2136,14 +2136,14 @@ static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, } else if (ccw < 0.0f) { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, 0.0f, 0.0f, 0.0f, 0.0f); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, q_next.x, q_next.y, q_prev.x, q_prev.y); d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_next.x, -q_next.y, -q_next.x, -q_next.y); d2d_outline_vertex_set(&v[2], p0->x, p0->y, -q_next.x, -q_next.y, -q_prev.x, -q_prev.y); d2d_outline_vertex_set(&v[3], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); } else { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, 0.0f, 0.0f, 0.0f, 0.0f); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_next.x, -q_next.y); d2d_outline_vertex_set(&v[1], p0->x, p0->y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); d2d_outline_vertex_set(&v[2], p0->x, p0->y, q_prev.x, q_prev.y, q_next.x, q_next.y); d2d_outline_vertex_set(&v[3], p0->x, p0->y, q_next.x, q_next.y, q_next.x, q_next.y); -- 2.16.3

2 1

[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

[PATCH 3/4] ntoskrnl: Add PsGetProcessId 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 | 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 04 Apr '18

04 Apr '18

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 04 Apr '18

04 Apr '18

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 04 Apr '18

04 Apr '18

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 04 Apr '18

04 Apr '18

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 04 Apr '18

04 Apr '18

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 04 Apr '18

04 Apr '18

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 04 Apr '18

04 Apr '18

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 04 Apr '18

04 Apr '18

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 04 Apr '18

04 Apr '18

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 04 Apr '18

04 Apr '18

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 04 Apr '18

04 Apr '18

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 04 Apr '18

04 Apr '18

1 0

[PATCH website] Update the mailing list traffic estimations
by Michael Stefaniuc 03 Apr '18

03 Apr '18

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@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@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@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@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@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@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@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@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.xn--org-ky7m " [<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@winehq.org">wine-devel(a)winehq.org</a> - 중간 용량 (하루에 25편) 와인 개발, + 중간 용량 (하루에 50편) 와인 개발, 와인HQ, 깃기, 기타 개발자가 알아야 할 내용에 관한 공개 토론 목록입니다. </li> @@ -77,7 +77,7 @@ WWW</a>를 통해 구독하거나, 목록 이름-request(a)winehq.xn--org-ky7m " [<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@winehq.org">wine-cvs(a)winehq.org</a> - 중간 용량 (하루에 35편) 깃 나무의 기우기를 추적하는 읽기 전용 목록입니다. + 중간 용량 (하루에 25편) 깃 나무의 기우기를 추적하는 읽기 전용 목록입니다. </li> <li> @@ -100,7 +100,7 @@ WWW</a>를 통해 구독하거나, 목록 이름-request(a)winehq.xn--org-ky7m " [<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@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@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@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@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@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@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@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@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@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@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@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@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@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 03 Apr '18

03 Apr '18

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

[PATCH] dmime: Call interface methods properly.
by Zebediah Figura 03 Apr '18

03 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dmime/audiopath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index d656058..1aad13b 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -114,7 +114,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if if (ref == 0) { if (This->pDSBuffer) - IDirectSoundBuffer8_Release(This->pDSBuffer); + IDirectSoundBuffer_Release(This->pDSBuffer); This->pPerf = NULL; HeapFree(GetProcessHeap(), 0, This); } @@ -140,7 +140,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud IsEqualIID (iidInterface, &IID_IDirectSoundBuffer) || IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8) || IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - return IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, iidInterface, ppObject); + return IDirectSoundBuffer_QueryInterface (This->pDSBuffer, iidInterface, ppObject); } WARN("Unsupported interface %s\n", debugstr_dmguid(iidInterface)); @@ -151,7 +151,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud case DMUS_PATH_PRIMARY_BUFFER: { if (IsEqualIID (iidInterface, &IID_IDirectSound3DListener)) { - IDirectSoundBuffer8_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); + IDirectSoundBuffer_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); return S_OK; } else { FIXME("bad iid...\n"); -- 2.7.4

4 8

[PATCH v3] dmime: Call interface methods properly.
by Zebediah Figura 03 Apr '18

03 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: appeal to git pedantry dlls/dmime/audiopath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index d656058..bdd9201 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -114,7 +114,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if if (ref == 0) { if (This->pDSBuffer) - IDirectSoundBuffer8_Release(This->pDSBuffer); + IDirectSoundBuffer_Release(This->pDSBuffer); This->pPerf = NULL; HeapFree(GetProcessHeap(), 0, This); } @@ -140,7 +140,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud IsEqualIID (iidInterface, &IID_IDirectSoundBuffer) || IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8) || IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - return IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, iidInterface, ppObject); + return IDirectSoundBuffer_QueryInterface(This->pDSBuffer, iidInterface, ppObject); } WARN("Unsupported interface %s\n", debugstr_dmguid(iidInterface)); @@ -151,7 +151,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud case DMUS_PATH_PRIMARY_BUFFER: { if (IsEqualIID (iidInterface, &IID_IDirectSound3DListener)) { - IDirectSoundBuffer8_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); + IDirectSoundBuffer_QueryInterface(This->pPrimary, &IID_IDirectSound3DListener, ppObject); return S_OK; } else { FIXME("bad iid...\n"); -- 2.7.4

2 1

[PATCH v2] ntdll: Implement _alldvrm() and _aulldvrm().
by Zebediah Figura 03 Apr '18

03 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=42267 dlls/ntdll/large_int.c | 76 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- 3 files changed, 80 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index a0d465c..b7d074f 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -627,6 +627,44 @@ LONGLONG WINAPI _allshr( LONGLONG a, LONG b ) } /****************************************************************************** + * _alldvrm (NTDLL.@) + * + * Divide two 64 bit integers. + * + * PARAMS + * a [I] Initial number. + * b [I] Number to divide a by. + * + * RETURNS + * Returns the quotient of a and b in edx:eax. + * Returns the remainder of a and b in ebx:ecx. + */ +__ASM_STDCALL_FUNC( _alldvrm, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _allrem\n\t" + "movl %edx, %ebx\n\t" + "movl %eax, %ecx\n\t" + "pushl %ecx\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _alldiv\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) + +/****************************************************************************** * _aullrem (NTDLL.@) * * Calculate the remainder after dividing two 64 bit unsigned integers. @@ -660,4 +698,42 @@ ULONGLONG WINAPI _aullshr( ULONGLONG a, LONG b ) return a >> b; } +/****************************************************************************** + * _aulldvrm (NTDLL.@) + * + * Divide two 64 bit unsigned integers. + * + * PARAMS + * a [I] Initial number. + * b [I] Number to divide a by. + * + * RETURNS + * Returns the quotient of a and b in edx:eax. + * Returns the remainder of a and b in ebx:ecx. + */ +__ASM_STDCALL_FUNC( _aulldvrm, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _aullrem\n\t" + "movl %edx, %ebx\n\t" + "movl %eax, %ecx\n\t" + "pushl %ecx\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _aulldiv\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) + #endif /* __i386__ */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0107932..8744704 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1337,7 +1337,7 @@ @ cdecl -private __iscsymf(long) NTDLL___iscsymf @ cdecl -private __toascii(long) NTDLL___toascii @ stdcall -arch=i386 -ret64 _alldiv(int64 int64) -# @ stub _alldvrm +@ stdcall -arch=i386 -norelay _alldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _allmul(int64 int64) @ stdcall -arch=i386 -norelay _alloca_probe() @ stdcall -arch=i386 -ret64 _allrem(int64 int64) @@ -1345,7 +1345,7 @@ @ stdcall -arch=i386 -ret64 _allshr(int64 long) @ cdecl -private -ret64 _atoi64(str) @ stdcall -arch=i386 -ret64 _aulldiv(int64 int64) -# @ stub _aulldvrm +@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -private -arch=i386 -norelay _chkstk() diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 26afa6f..49f529a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1407,14 +1407,14 @@ @ cdecl -private -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -private _abnormal_termination() msvcrt._abnormal_termination @ stdcall -private -arch=i386 -ret64 _alldiv(int64 int64) -@ stub _alldvrm +@ stdcall -private -arch=i386 -norelay _alldvrm(int64 int64) @ stdcall -private -arch=i386 -ret64 _allmul(int64 int64) @ stdcall -private -arch=i386 -norelay _alloca_probe() @ stdcall -private -arch=i386 -ret64 _allrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _allshl(int64 long) @ stdcall -private -arch=i386 -ret64 _allshr(int64 long) @ stdcall -private -arch=i386 -ret64 _aulldiv(int64 int64) -@ stub _aulldvrm +@ stdcall -private -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -private -arch=i386 -norelay _chkstk() -- 2.7.4

1 0

[PATCH] ntdll: Implement _alldvrm() and _aulldvrm().
by Zebediah Figura 03 Apr '18

03 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=42267 Inspired by a patch by Sebastian Lackner. dlls/ntdll/large_int.c | 76 ++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/tests/large_int.c | 92 ++++++++++++++++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- 4 files changed, 171 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index a0d465c..b7d074f 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -627,6 +627,44 @@ LONGLONG WINAPI _allshr( LONGLONG a, LONG b ) } /****************************************************************************** + * _alldvrm (NTDLL.@) + * + * Divide two 64 bit integers. + * + * PARAMS + * a [I] Initial number. + * b [I] Number to divide a by. + * + * RETURNS + * Returns the quotient of a and b in edx:eax. + * Returns the remainder of a and b in ebx:ecx. + */ +__ASM_STDCALL_FUNC( _alldvrm, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _allrem\n\t" + "movl %edx, %ebx\n\t" + "movl %eax, %ecx\n\t" + "pushl %ecx\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _alldiv\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) + +/****************************************************************************** * _aullrem (NTDLL.@) * * Calculate the remainder after dividing two 64 bit unsigned integers. @@ -660,4 +698,42 @@ ULONGLONG WINAPI _aullshr( ULONGLONG a, LONG b ) return a >> b; } +/****************************************************************************** + * _aulldvrm (NTDLL.@) + * + * Divide two 64 bit unsigned integers. + * + * PARAMS + * a [I] Initial number. + * b [I] Number to divide a by. + * + * RETURNS + * Returns the quotient of a and b in edx:eax. + * Returns the remainder of a and b in ebx:ecx. + */ +__ASM_STDCALL_FUNC( _aulldvrm, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _aullrem\n\t" + "movl %edx, %ebx\n\t" + "movl %eax, %ecx\n\t" + "pushl %ecx\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _aulldiv\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) + #endif /* __i386__ */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0107932..8744704 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1337,7 +1337,7 @@ @ cdecl -private __iscsymf(long) NTDLL___iscsymf @ cdecl -private __toascii(long) NTDLL___toascii @ stdcall -arch=i386 -ret64 _alldiv(int64 int64) -# @ stub _alldvrm +@ stdcall -arch=i386 -norelay _alldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _allmul(int64 int64) @ stdcall -arch=i386 -norelay _alloca_probe() @ stdcall -arch=i386 -ret64 _allrem(int64 int64) @@ -1345,7 +1345,7 @@ @ stdcall -arch=i386 -ret64 _allshr(int64 long) @ cdecl -private -ret64 _atoi64(str) @ stdcall -arch=i386 -ret64 _aulldiv(int64 int64) -# @ stub _aulldvrm +@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -private -arch=i386 -norelay _chkstk() diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index da7afa4..70ea0b0 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -33,7 +33,8 @@ static VOID (WINAPI *pRtlFreeAnsiString)(PSTRING); static NTSTATUS (WINAPI *pRtlInt64ToUnicodeString)(ULONGLONG, ULONG, UNICODE_STRING *); static NTSTATUS (WINAPI *pRtlLargeIntegerToChar)(ULONGLONG *, ULONG, ULONG, PCHAR); static NTSTATUS (WINAPI *pRtlUnicodeStringToAnsiString)(STRING *, const UNICODE_STRING *, BOOLEAN); - +static LONGLONG (WINAPI *p_alldvrm)(LONGLONG, LONGLONG); +static ULONGLONG (WINAPI *p_aulldvrm)(ULONGLONG, ULONGLONG); static void InitFunctionPtrs(void) { @@ -45,6 +46,8 @@ static void InitFunctionPtrs(void) pRtlInt64ToUnicodeString = (void *)GetProcAddress(hntdll, "RtlInt64ToUnicodeString"); pRtlLargeIntegerToChar = (void *)GetProcAddress(hntdll, "RtlLargeIntegerToChar"); pRtlUnicodeStringToAnsiString = (void *)GetProcAddress(hntdll, "RtlUnicodeStringToAnsiString"); + p_alldvrm = (void *)GetProcAddress(hntdll, "_alldvrm"); + p_aulldvrm = (void *)GetProcAddress(hntdll, "_aulldvrm"); } /* if */ } @@ -434,6 +437,90 @@ static void test_RtlLargeIntegerToChar(void) largeint2str[0].base, largeint2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION); } +#ifdef __i386__ +static LONGLONG _alldvrm_wrapper(LARGE_INTEGER a, LARGE_INTEGER b, LARGE_INTEGER *rem) +{ + /* _alldvrm() divides two LONGLONGs and returns the quotient in edx:eax and + * the remainder in ebx:ecx. */ + + LONGLONG ret; + + __asm__ __volatile__ ( + "pushl %%ebx\n\t" + "pushl %3\n\t" + "pushl %4\n\t" + "pushl %5\n\t" + "pushl %6\n\t" + "call *%7\n\t" + "movl %%ebx, %1\n\t" + "movl %%ecx, %2\n\t" + "popl %%ebx\n\t" + : "=A" (ret), "=r" (rem->HighPart), "=r" (rem->LowPart) + : "ri" (b.HighPart), "ri" (b.LowPart), "ri" (a.HighPart), "ri" (a.LowPart), "m" (p_alldvrm) + : "ebx", "ecx" + ); + + return ret; +} + +static ULONGLONG _aulldvrm_wrapper(ULARGE_INTEGER a, ULARGE_INTEGER b, ULARGE_INTEGER *rem) +{ + ULONGLONG ret; + + __asm__ __volatile__ ( + "pushl %%ebx\n\t" + "pushl %3\n\t" + "pushl %4\n\t" + "pushl %5\n\t" + "pushl %6\n\t" + "call *%7\n\t" + "movl %%ebx, %1\n\t" + "movl %%ecx, %2\n\t" + "popl %%ebx\n\t" + : "=A" (ret), "=r" (rem->HighPart), "=r" (rem->LowPart) + : "ri" (b.HighPart), "ri" (b.LowPart), "ri" (a.HighPart), "ri" (a.LowPart), "m" (p_aulldvrm) + : "ebx", "ecx" + ); + + return ret; +} + +static void test__alldvrm(void) +{ + ULARGE_INTEGER ua, ub, urem; + LARGE_INTEGER a, b, rem; + ULONGLONG uret; + LONGLONG ret; + + /* _alldvrm(0x0123456701234567, 3) */ + a.HighPart = a.LowPart = 0x01234567; + b.QuadPart = 3; + ret = _alldvrm_wrapper(a, b, &rem); + ok(ret == 0x61172255b66c77ULL, "got %x%08x\n", (DWORD)(ret >> 32), (DWORD)ret); + ok(rem.QuadPart == 2, "got %x%08x\n", rem.HighPart, rem.LowPart); + + /* _alldvrm(0x0123456701234567, -3) */ + a.HighPart = a.LowPart = 0x01234567; + b.QuadPart = -3; + ret = _alldvrm_wrapper(a, b, &rem); + ok(ret == 0xff9ee8ddaa499389ULL, "got %x%08x\n", (DWORD)(ret >> 32), (DWORD)ret); + ok(rem.QuadPart == 2, "got %x%08x\n", rem.HighPart, rem.LowPart); + + /* _aulldvrm(0x0123456701234567, 3) */ + ua.HighPart = ua.LowPart = 0x01234567; + ub.QuadPart = 3; + uret = _aulldvrm_wrapper(ua, ub, &urem); + ok(uret == 0x61172255b66c77ULL, "got %x%08x\n", (DWORD)(uret >> 32), (DWORD)uret); + ok(urem.QuadPart == 2, "got %x%08x\n", urem.HighPart, urem.LowPart); + + /* _aulldvrm(0x0123456701234567, -3) */ + ua.HighPart = ua.LowPart = 0x01234567; + ub.QuadPart = -3; + uret = _aulldvrm_wrapper(ua, ub, &urem); + ok(uret == 0, "got %x%08x\n", (DWORD)(uret >> 32), (DWORD)uret); + ok(urem.QuadPart == ua.QuadPart, "got %x%08x\n", urem.HighPart, urem.LowPart); +} +#endif /* __i386__ */ START_TEST(large_int) { @@ -445,4 +532,7 @@ START_TEST(large_int) test_RtlInt64ToUnicodeString(); if (pRtlLargeIntegerToChar) test_RtlLargeIntegerToChar(); +#ifdef __i386__ + test__alldvrm(); +#endif /* __i386__ */ } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 26afa6f..49f529a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1407,14 +1407,14 @@ @ cdecl -private -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -private _abnormal_termination() msvcrt._abnormal_termination @ stdcall -private -arch=i386 -ret64 _alldiv(int64 int64) -@ stub _alldvrm +@ stdcall -private -arch=i386 -norelay _alldvrm(int64 int64) @ stdcall -private -arch=i386 -ret64 _allmul(int64 int64) @ stdcall -private -arch=i386 -norelay _alloca_probe() @ stdcall -private -arch=i386 -ret64 _allrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _allshl(int64 long) @ stdcall -private -arch=i386 -ret64 _allshr(int64 long) @ stdcall -private -arch=i386 -ret64 _aulldiv(int64 int64) -@ stub _aulldvrm +@ stdcall -private -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -private -arch=i386 -norelay _chkstk() -- 2.7.4

2 2

[PATCH vkd3d 1/2] libs/vkd3d: Add structure type fields to public API structures.
by Józef Kucia 03 Apr '18

03 Apr '18

From: Józef Kucia <jkucia(a)codeweavers.com> Adds flexibility for future API extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- demos/demo_xcb.h | 2 ++ include/vkd3d.h | 20 ++++++++++++++++++++ libs/vkd3d-utils/vkd3d_utils_main.c | 4 ++++ libs/vkd3d/device.c | 12 +++++++++++- libs/vkd3d/resource.c | 10 ++++++++++ libs/vkd3d/vkd3d_main.c | 7 +++++++ tests/vkd3d_api.c | 4 ++++ 7 files changed, 58 insertions(+), 1 deletion(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 053db0df9bab..38715565267e 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -446,6 +446,8 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX); vkResetFences(vk_device, 1, &vk_fence); + resource_create_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; + resource_create_info.next = NULL; resource_create_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; resource_create_info.desc.Alignment = 0; resource_create_info.desc.Width = desc->width; diff --git a/include/vkd3d.h b/include/vkd3d.h index 692b58d70065..7c5f6441e9d9 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -34,6 +34,17 @@ extern "C" { #endif /* __cplusplus */ +#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff + +enum vkd3d_structure_type +{ + VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, + VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO, + VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE), +}; + typedef bool (*PFN_vkd3d_signal_event)(HANDLE event); typedef void * (*PFN_vkd3d_thread)(void *data); @@ -45,6 +56,9 @@ struct vkd3d_instance; struct vkd3d_instance_create_info { + enum vkd3d_structure_type type; + const void *next; + PFN_vkd3d_signal_event pfn_signal_event; PFN_vkd3d_create_thread pfn_create_thread; PFN_vkd3d_join_thread pfn_join_thread; @@ -59,6 +73,9 @@ struct vkd3d_instance_create_info struct vkd3d_device_create_info { + enum vkd3d_structure_type type; + const void *next; + D3D_FEATURE_LEVEL minimum_feature_level; struct vkd3d_instance *instance; @@ -79,6 +96,9 @@ struct vkd3d_device_create_info struct vkd3d_image_resource_create_info { + enum vkd3d_structure_type type; + const void *next; + VkImage vk_image; D3D12_RESOURCE_DESC desc; unsigned int flags; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index ba64d406983c..adafb00bddc8 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -48,12 +48,16 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, FIXME("Ignoring adapter %p.\n", adapter); memset(&instance_create_info, 0, sizeof(instance_create_info)); + instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_create_info.next = NULL; instance_create_info.pfn_signal_event = vkd3d_signal_event; instance_create_info.wchar_size = sizeof(WCHAR); instance_create_info.instance_extensions = instance_extensions; instance_create_info.instance_extension_count = ARRAY_SIZE(instance_extensions); memset(&device_create_info, 0, sizeof(device_create_info)); + device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.next = NULL; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance_create_info = &instance_create_info; device_create_info.device_extensions = device_extensions; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d61c331929f7..57b94b64239d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -342,7 +342,17 @@ HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_in struct vkd3d_instance *object; HRESULT hr; - TRACE("create_info %p.\n", create_info); + TRACE("create_info %p, instance %p.\n", create_info, instance); + + if (!create_info || !instance) + return E_INVALIDARG; + if (create_info->type != VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO) + { + WARN("Invalid structure type %#x.\n", create_info->type); + return E_INVALIDARG; + } + if (create_info->next) + WARN("Unhandled next %p.\n", create_info->next); if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 4746ee2cf59b..e37b03bc005f 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -805,6 +805,16 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, TRACE("device %p, create_info %p, resource %p.\n", device, create_info, resource); + if (!create_info || !resource) + return E_INVALIDARG; + if (create_info->type != VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO) + { + WARN("Invalid structure type %#x.\n", create_info->type); + return E_INVALIDARG; + } + if (create_info->next) + WARN("Unhandled next %p.\n", create_info->next); + if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index b58e6e5ac53c..97d642a7cf91 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -30,6 +30,13 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, if (!create_info || !device) return E_INVALIDARG; + if (create_info->type != VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO) + { + WARN("Invalid structure type %#x.\n", create_info->type); + return E_INVALIDARG; + } + if (create_info->next) + WARN("Unhandled next %p.\n", create_info->next); if (!create_info->instance && !create_info->instance_create_info) { ERR("Instance or instance create info is required.\n"); diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 4b3466edc919..439cb6364eb8 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -62,12 +62,14 @@ static bool signal_event(HANDLE event) static const struct vkd3d_instance_create_info instance_default_create_info = { + .type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .wchar_size = sizeof(WCHAR), .pfn_signal_event = signal_event, }; static const struct vkd3d_device_create_info device_default_create_info = { + .type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .minimum_feature_level = D3D_FEATURE_LEVEL_11_0, .instance_create_info = &instance_default_create_info, }; @@ -849,6 +851,8 @@ static void test_vulkan_resource_present_state(void) vk_memory = allocate_vulkan_image_memory(device, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, vk_image); + resource_create_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; + resource_create_info.next = NULL; resource_create_info.vk_image = vk_image; resource_create_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; resource_create_info.desc.Alignment = 0; -- 2.16.1

2 3

[PATCH] user32/cursoricon: Fix CreateIcon() bitmap mask handling.
by Zhiyi Zhang 03 Apr '18

03 Apr '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/cursoricon.c | 80 +++++++++++---------- dlls/user32/tests/cursoricon.c | 160 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 187 insertions(+), 53 deletions(-)

2 3

[PATCH 3/3] riched20: Get ITextRange interface from QueryInterface instead of casting.
by Jactry Zeng 03 Apr '18

03 Apr '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/richole.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-)

2 1

[PATCH 2/3 v2] riched20: Implement {ITextRange,ITextSelection}::MoveEnd.
by Jactry Zeng 03 Apr '18

03 Apr '18

Superseded patch 144259. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/richole.c | 59 ++++++++++++++++++++-- dlls/riched20/tests/richole.c | 115 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+), 4 deletions(-)

2 1

[PATCH 1/3 resend] riched20/tests: Add helpers for simplifying tests of ITextRange and ITextSelection.
by Jactry Zeng 03 Apr '18

03 Apr '18

Superseded patch 144258. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/tests/richole.c | 97 ++++++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 33 deletions(-)

2 1

[PATCH] ntdll: Add stub for NtContinue.
by Alistair Leslie-Hughes 03 Apr '18

03 Apr '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/exception.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index f853810..2887d69 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -306,6 +306,16 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) } +/********************************************************************* + * NtContinue (NTDLL.@) + */ +NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alert ) +{ + FIXME( "(%p, %d) stub!\n", context, alert ); + return STATUS_NOT_IMPLEMENTED; +} + + /************************************************************* * __wine_spec_unimplemented_stub * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0107932..dd3d228 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -128,7 +128,7 @@ @ stdcall NtCompleteConnectPort(ptr) # @ stub NtCompressKey @ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) -@ stub NtContinue +@ stdcall NtContinue(ptr long) # @ stub NtCreateDebugObject @ stdcall NtCreateDirectoryObject(ptr long ptr) @ stdcall NtCreateEvent(ptr long ptr long long) @@ -1058,7 +1058,7 @@ @ stdcall -private ZwCompleteConnectPort(ptr) NtCompleteConnectPort # @ stub ZwCompressKey @ stdcall -private ZwConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) NtConnectPort -@ stub ZwContinue +@ stdcall -private ZwContinue(ptr long) NtContinue # @ stub ZwCreateDebugObject @ stdcall -private ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject @ stdcall -private ZwCreateEvent(ptr long ptr long long) NtCreateEvent -- 1.9.1

2 3

[PATCH 1/5] wsdapi/tests: Add test for Hello message Any header element.
by Owen Rudge 03 Apr '18

03 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-)

2 1

[PATCH] progman: Explicitly use unsigned constants to fix shifting in PUT_SHORT (clang)
by André Hentschel 03 Apr '18

03 Apr '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- programs/progman/grpfile.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index d49dde3..360a2f9 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -564,10 +564,10 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) PUT_SHORT(buffer, 18, group->iconx); PUT_SHORT(buffer, 20, group->icony); PUT_SHORT(buffer, 22, Title); - PUT_SHORT(buffer, 24, 0x0020); /* unknown */ - PUT_SHORT(buffer, 26, 0x0020); /* unknown */ - PUT_SHORT(buffer, 28, 0x0108); /* unknown */ - PUT_SHORT(buffer, 30, 0x0000); /* unknown */ + PUT_SHORT(buffer, 24, 0x0020u); /* unknown */ + PUT_SHORT(buffer, 26, 0x0020u); /* unknown */ + PUT_SHORT(buffer, 28, 0x0108u); /* unknown */ + PUT_SHORT(buffer, 30, 0x0000u); /* unknown */ PUT_SHORT(buffer, 32, NumProg); if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 34)) return FALSE; @@ -609,7 +609,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) PUT_SHORT(buffer, 0, program->x); PUT_SHORT(buffer, 2, program->y); PUT_SHORT(buffer, 4, program->nIconIndex); - PUT_SHORT(buffer, 6, 0x048c); /* unknown */ + PUT_SHORT(buffer, 6, 0x048cu); /* unknown */ PUT_SHORT(buffer, 8, sizeXor); PUT_SHORT(buffer, 10, sizeAnd * 8); PUT_SHORT(buffer, 12, CurrIcon); @@ -664,9 +664,9 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) if (need_extension) { /* write `PMCC' extension */ - PUT_SHORT(buffer, 0, 0x8000); - PUT_SHORT(buffer, 2, 0xffff); - PUT_SHORT(buffer, 4, 0x000a); + PUT_SHORT(buffer, 0, 0x8000u); + PUT_SHORT(buffer, 2, 0xffffu); + PUT_SHORT(buffer, 4, 0x000au); buffer[6] = 'P', buffer[7] = 'M'; buffer[8] = 'C', buffer[9] = 'C'; if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 10)) @@ -682,7 +682,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) /* Working directory */ if (lpszWorkDir[0]) { - PUT_SHORT(buffer, 0, 0x8101); + PUT_SHORT(buffer, 0, 0x8101u); PUT_SHORT(buffer, 2, seqnum); PUT_SHORT(buffer, 4, 7 + strlen(lpszWorkDir)); if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 6) || @@ -693,9 +693,9 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) /* Hot key */ if (program->nHotKey) { - PUT_SHORT(buffer, 0, 0x8102); + PUT_SHORT(buffer, 0, 0x8102u); PUT_SHORT(buffer, 2, seqnum); - PUT_SHORT(buffer, 4, 8); + PUT_SHORT(buffer, 4, 8u); PUT_SHORT(buffer, 6, program->nHotKey); if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 8)) return FALSE; } @@ -703,9 +703,9 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) /* Show command */ if (program->nCmdShow) { - PUT_SHORT(buffer, 0, 0x8103); + PUT_SHORT(buffer, 0, 0x8103u); PUT_SHORT(buffer, 2, seqnum); - PUT_SHORT(buffer, 4, 8); + PUT_SHORT(buffer, 4, 8u); PUT_SHORT(buffer, 6, program->nCmdShow); if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 8)) return FALSE; } @@ -715,9 +715,9 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) } /* Write `End' extension */ - PUT_SHORT(buffer, 0, 0xffff); - PUT_SHORT(buffer, 2, 0xffff); - PUT_SHORT(buffer, 4, 0x0000); + PUT_SHORT(buffer, 0, 0xffffu); + PUT_SHORT(buffer, 2, 0xffffu); + PUT_SHORT(buffer, 4, 0x0000u); if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 6)) return FALSE; } -- 2.7.4

2 1

[PATCH] ntdll: Allow special characters in pipe names.
by Zebediah Figura 03 Apr '18

03 Apr '18

From: Michael Müller <michael(a)fds-team.de> Based on a patch by Valentyn Pavliuchenko. Fixes bug 28995. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/pipe.c | 13 +++++++++++++ dlls/ntdll/directory.c | 14 ++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index fa677cf..b74232c 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -627,6 +627,19 @@ static void test_CreateNamedPipe(int pipemode) ok(CloseHandle(hnp), "CloseHandle\n"); + hnp = CreateNamedPipeA("\\\\.\\pipe\\test->pipe.c", PIPE_ACCESS_DUPLEX, pipemode | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError()); + + hFile = CreateFileA("\\\\.\\pipe\\test->pipe.c", 0, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + ok(CloseHandle(hFile), "CloseHandle\n"); + ok(CloseHandle(hnp), "CloseHandle\n"); + if (winetest_debug > 1) trace("test_CreateNamedPipe returning\n"); } diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 4655a634..e6754ec 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2819,6 +2819,7 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI UINT disposition, BOOLEAN check_case ) { static const WCHAR unixW[] = {'u','n','i','x'}; + static const WCHAR pipeW[] = {'p','i','p','e'}; static const WCHAR invalid_charsW[] = { INVALID_NT_CHARS, 0 }; NTSTATUS status = STATUS_SUCCESS; @@ -2829,6 +2830,7 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI int pos, ret, name_len, unix_len, prefix_len, used_default; WCHAR prefix[MAX_DIR_ENTRY_LEN]; BOOLEAN is_unix = FALSE; + BOOLEAN is_pipe = FALSE; name = nameW->Buffer; name_len = nameW->Length / sizeof(WCHAR); @@ -2862,13 +2864,17 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI name += prefix_len; name_len -= prefix_len; - /* check for invalid characters (all chars except 0 are valid for unix) */ - is_unix = (prefix_len == 4 && !memcmp( prefix, unixW, sizeof(unixW) )); - if (is_unix) + /* check for invalid characters (all chars except 0 are valid for unix and pipes) */ + if (prefix_len == 4) + { + is_unix = !memcmp( prefix, unixW, sizeof(unixW) ); + is_pipe = !memcmp( prefix, pipeW, sizeof(pipeW) ); + } + if (is_unix || is_pipe) { for (p = name; p < name + name_len; p++) if (!*p) return STATUS_OBJECT_NAME_INVALID; - check_case = TRUE; + check_case |= is_unix; } else { -- 2.7.4

2 1

[2/2] riched20: Implement {ITextRange,ITextSelection}::MoveEnd in case tomStory.
by Jactry Zeng 03 Apr '18

03 Apr '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/richole.c | 54 ++++++++++++++++++-- dlls/riched20/tests/richole.c | 115 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+), 4 deletions(-)

3 2

[PATCH 1/4] winevulkan: Generate code for extension name and version constants.
by Józef Kucia 03 Apr '18

03 Apr '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- The series makes Wine vulkan.h more compatible with the official Vulkan header. It should be useful when we start writing Vulkan code for Direct3D 12 swapchains. --- dlls/winevulkan/make_vulkan | 2 +- include/wine/vulkan.h | 66 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 8cd0b49f5205..edaaadb5cdda 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2354,7 +2354,7 @@ class VkRegistry(object): enum.add(VkEnumValue(enum_elem.attrib["name"], value)) elif "value" in enum_elem.keys(): - # For now skip, it mostly contains extension name and version info. + self.consts.append(VkConstant(enum_elem.attrib.get("name"), enum_elem.attrib.get("value"))) continue else: # This seems to be used to pull in constants e.g. VK_MAX_DEVICE_GROUP_KHX diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index fcc31bc3c9d1..1ab270161e4f 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -37,6 +37,72 @@ #define VK_QUEUE_FAMILY_EXTERNAL_KHX (~0U-1) #define VK_SUBPASS_EXTERNAL (~0U) #define VK_MAX_DEVICE_GROUP_SIZE_KHX 32 +#define VK_KHR_SURFACE_SPEC_VERSION 25 +#define VK_KHR_SURFACE_EXTENSION_NAME "VK_KHR_surface" +#define VK_COLORSPACE_SRGB_NONLINEAR_KHR VK_COLOR_SPACE_SRGB_NONLINEAR_KHR +#define VK_KHR_SWAPCHAIN_SPEC_VERSION 68 +#define VK_KHR_SWAPCHAIN_EXTENSION_NAME "VK_KHR_swapchain" +#define VK_KHR_WIN32_SURFACE_SPEC_VERSION 6 +#define VK_KHR_WIN32_SURFACE_EXTENSION_NAME "VK_KHR_win32_surface" +#define VK_NV_GLSL_SHADER_SPEC_VERSION 1 +#define VK_NV_GLSL_SHADER_EXTENSION_NAME "VK_NV_glsl_shader" +#define VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION 1 +#define VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME "VK_KHR_sampler_mirror_clamp_to_edge" +#define VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE 4 +#define VK_IMG_FILTER_CUBIC_SPEC_VERSION 1 +#define VK_IMG_FILTER_CUBIC_EXTENSION_NAME "VK_IMG_filter_cubic" +#define VK_AMD_RASTERIZATION_ORDER_SPEC_VERSION 1 +#define VK_AMD_RASTERIZATION_ORDER_EXTENSION_NAME "VK_AMD_rasterization_order" +#define VK_AMD_SHADER_TRINARY_MINMAX_SPEC_VERSION 1 +#define VK_AMD_SHADER_TRINARY_MINMAX_EXTENSION_NAME "VK_AMD_shader_trinary_minmax" +#define VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_SPEC_VERSION 1 +#define VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_EXTENSION_NAME "VK_AMD_shader_explicit_vertex_parameter" +#define VK_AMD_GCN_SHADER_SPEC_VERSION 1 +#define VK_AMD_GCN_SHADER_EXTENSION_NAME "VK_AMD_gcn_shader" +#define VK_NV_DEDICATED_ALLOCATION_SPEC_VERSION 1 +#define VK_NV_DEDICATED_ALLOCATION_EXTENSION_NAME "VK_NV_dedicated_allocation" +#define VK_AMD_DRAW_INDIRECT_COUNT_SPEC_VERSION 1 +#define VK_AMD_DRAW_INDIRECT_COUNT_EXTENSION_NAME "VK_AMD_draw_indirect_count" +#define VK_AMD_NEGATIVE_VIEWPORT_HEIGHT_SPEC_VERSION 1 +#define VK_AMD_NEGATIVE_VIEWPORT_HEIGHT_EXTENSION_NAME "VK_AMD_negative_viewport_height" +#define VK_AMD_GPU_SHADER_HALF_FLOAT_SPEC_VERSION 1 +#define VK_AMD_GPU_SHADER_HALF_FLOAT_EXTENSION_NAME "VK_AMD_gpu_shader_half_float" +#define VK_AMD_SHADER_BALLOT_SPEC_VERSION 1 +#define VK_AMD_SHADER_BALLOT_EXTENSION_NAME "VK_AMD_shader_ballot" +#define VK_AMD_TEXTURE_GATHER_BIAS_LOD_SPEC_VERSION 1 +#define VK_AMD_TEXTURE_GATHER_BIAS_LOD_EXTENSION_NAME "VK_AMD_texture_gather_bias_lod" +#define VK_IMG_FORMAT_PVRTC_SPEC_VERSION 1 +#define VK_IMG_FORMAT_PVRTC_EXTENSION_NAME "VK_IMG_format_pvrtc" +#define VK_NV_EXTERNAL_MEMORY_SPEC_VERSION 1 +#define VK_NV_EXTERNAL_MEMORY_EXTENSION_NAME "VK_NV_external_memory" +#define VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION 1 +#define VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME "VK_KHR_get_physical_device_properties2" +#define VK_KHR_SHADER_DRAW_PARAMETERS_SPEC_VERSION 1 +#define VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME "VK_KHR_shader_draw_parameters" +#define VK_EXT_SHADER_SUBGROUP_BALLOT_SPEC_VERSION 1 +#define VK_EXT_SHADER_SUBGROUP_BALLOT_EXTENSION_NAME "VK_EXT_shader_subgroup_ballot" +#define VK_EXT_SHADER_SUBGROUP_VOTE_SPEC_VERSION 1 +#define VK_EXT_SHADER_SUBGROUP_VOTE_EXTENSION_NAME "VK_EXT_shader_subgroup_vote" +#define VK_KHR_MAINTENANCE1_SPEC_VERSION 1 +#define VK_KHR_MAINTENANCE1_EXTENSION_NAME "VK_KHR_maintenance1" +#define VK_KHR_PUSH_DESCRIPTOR_SPEC_VERSION 1 +#define VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME "VK_KHR_push_descriptor" +#define VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION 1 +#define VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME "VK_KHR_incremental_present" +#define VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_SPEC_VERSION 1 +#define VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME "VK_KHR_descriptor_update_template" +#define VK_NV_CLIP_SPACE_W_SCALING_SPEC_VERSION 1 +#define VK_NV_CLIP_SPACE_W_SCALING_EXTENSION_NAME "VK_NV_clip_space_w_scaling" +#define VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_SPEC_VERSION 1 +#define VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_EXTENSION_NAME "VK_NV_sample_mask_override_coverage" +#define VK_NV_GEOMETRY_SHADER_PASSTHROUGH_SPEC_VERSION 1 +#define VK_NV_GEOMETRY_SHADER_PASSTHROUGH_EXTENSION_NAME "VK_NV_geometry_shader_passthrough" +#define VK_NV_VIEWPORT_ARRAY2_SPEC_VERSION 1 +#define VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME "VK_NV_viewport_array2" +#define VK_NV_VIEWPORT_SWIZZLE_SPEC_VERSION 1 +#define VK_NV_VIEWPORT_SWIZZLE_EXTENSION_NAME "VK_NV_viewport_swizzle" +#define VK_EXT_DISCARD_RECTANGLES_SPEC_VERSION 1 +#define VK_EXT_DISCARD_RECTANGLES_EXTENSION_NAME "VK_EXT_discard_rectangles" #define VK_MAKE_VERSION(major, minor, patch) \ (((major) << 22) | ((minor) << 12) | (patch)) -- 2.16.1

1 3

[1/2] riched20/tests: Add helpers for simplifying tests of ITextRange and ITextSelection.
by Jactry Zeng 03 Apr '18

03 Apr '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/tests/richole.c | 97 ++++++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 33 deletions(-)

2 1

[PATCH] comctl32/button: Remove style checking when handling BM_SETIMAGE.
by Nikolay Sivov 03 Apr '18

03 Apr '18

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Replaced {} -> {0} for struct initialization. dlls/comctl32/button.c | 141 +++++++++++--------------- dlls/comctl32/tests/button.c | 234 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 295 insertions(+), 80 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1e339ef19c..46a6ff4063 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -96,6 +96,7 @@ typedef struct _BUTTON_INFO HFONT font; WCHAR *note; INT note_length; + DWORD image_type; /* IMAGE_BITMAP or IMAGE_ICON */ union { HICON icon; @@ -718,18 +719,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L break; case BM_SETIMAGE: - /* Check that image format matches button style */ - switch (style & (BS_BITMAP|BS_ICON)) - { - case BS_BITMAP: - if (wParam != IMAGE_BITMAP) return 0; - break; - case BS_ICON: - if (wParam != IMAGE_ICON) return 0; - break; - default: - return 0; - } + infoPtr->image_type = (DWORD)wParam; oldHbitmap = infoPtr->u.image; infoPtr->u.image = (HANDLE)lParam; InvalidateRect( hWnd, NULL, FALSE ); @@ -802,62 +792,51 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc) { LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); LONG ex_style = GetWindowLongW( infoPtr->hwnd, GWL_EXSTYLE ); - WCHAR *text; + WCHAR *text = get_button_text(infoPtr); ICONINFO iconInfo; - BITMAP bm; + BITMAP bm = { 0 }; UINT dtStyle = BUTTON_BStoDT( style, ex_style ); RECT r = *rc; INT n; /* Calculate label rectangle according to label type */ - switch (style & (BS_ICON|BS_BITMAP)) + /* FIXME: Doesn't support showing both image and text yet */ + if (infoPtr->u.image) + { + if (infoPtr->image_type == IMAGE_ICON) + { + GetIconInfo(infoPtr->u.icon, &iconInfo); + GetObjectW(iconInfo.hbmColor, sizeof(bm), &bm); + DeleteObject(iconInfo.hbmColor); + DeleteObject(iconInfo.hbmMask); + } + else if (infoPtr->image_type == IMAGE_BITMAP) + { + GetObjectW(infoPtr->u.bitmap, sizeof(bm), &bm); + } + + r.right = r.left + bm.bmWidth; + r.bottom = r.top + bm.bmHeight; + } + else if (text && text[0]) { - case BS_TEXT: - { - HFONT hFont, hPrevFont = 0; - - if (!(text = get_button_text( infoPtr ))) goto empty_rect; - if (!text[0]) - { - heap_free( text ); - goto empty_rect; - } - - if ((hFont = infoPtr->font)) hPrevFont = SelectObject( hdc, hFont ); - DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT); - if (hPrevFont) SelectObject( hdc, hPrevFont ); - heap_free( text ); - break; - } - - case BS_ICON: - if (!GetIconInfo(infoPtr->u.icon, &iconInfo)) - goto empty_rect; - - GetObjectW (iconInfo.hbmColor, sizeof(BITMAP), &bm); - - r.right = r.left + bm.bmWidth; - r.bottom = r.top + bm.bmHeight; - - DeleteObject(iconInfo.hbmColor); - DeleteObject(iconInfo.hbmMask); - break; - - case BS_BITMAP: - if (!GetObjectW( infoPtr->u.bitmap, sizeof(BITMAP), &bm)) - goto empty_rect; - - r.right = r.left + bm.bmWidth; - r.bottom = r.top + bm.bmHeight; - break; - - default: - empty_rect: - rc->right = r.left; - rc->bottom = r.top; - return (UINT)-1; + HFONT hFont, hPrevFont = 0; + + if ((hFont = infoPtr->font)) hPrevFont = SelectObject(hdc, hFont); + DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT); + if (hPrevFont) SelectObject(hdc, hPrevFont); } + if ((infoPtr->u.image && bm.bmWidth == 0 && bm.bmHeight == 0) + || (text == NULL || text[0] == '\0')) + { + rc->right = r.left; + rc->bottom = r.top; + heap_free(text); + return (UINT)-1; + } + heap_free(text); + /* Position label inside bounding rectangle according to * alignment flags. (calculated rect is always left-top aligned). * If label is aligned to any side - shift label in opposite @@ -934,28 +913,30 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, flags |= DSS_MONO; } - switch (style & (BS_ICON|BS_BITMAP)) + /* FIXME: Support drawing label with both image and text */ + if (infoPtr->u.image != 0) + { + switch (infoPtr->image_type) + { + case IMAGE_ICON: + flags |= DST_ICON; + lp = (LPARAM)infoPtr->u.icon; + break; + case IMAGE_BITMAP: + flags |= DST_BITMAP; + lp = (LPARAM)infoPtr->u.bitmap; + break; + default: + return; + } + } + else { - case BS_TEXT: - /* DST_COMPLEX -- is 0 */ - lpOutputProc = BUTTON_DrawTextCallback; - if (!(text = get_button_text( infoPtr ))) return; - lp = (LPARAM)text; - wp = dtFlags; - break; - - case BS_ICON: - flags |= DST_ICON; - lp = (LPARAM)infoPtr->u.icon; - break; - - case BS_BITMAP: - flags |= DST_BITMAP; - lp = (LPARAM)infoPtr->u.bitmap; - break; - - default: - return; + /* DST_COMPLEX -- is 0 */ + lpOutputProc = BUTTON_DrawTextCallback; + if (!(text = get_button_text(infoPtr))) return; + lp = (LPARAM)text; + wp = dtFlags; } DrawStateW(hdc, hbr, lpOutputProc, lp, wp, rc->left, rc->top, diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 5ad04d737f..6ac85a8aec 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -962,6 +962,239 @@ static void test_note(void) } } +static void test_bm_get_set_image(void) +{ + HWND hwnd; + HDC hdc; + HBITMAP hbmp1x1; + HBITMAP hbmp2x2; + HBITMAP hmask2x2; + ICONINFO icon_info2x2; + HICON hicon2x2; + HBITMAP hbmp; + HICON hicon; + ICONINFO icon_info; + BITMAP bm; + static const DWORD default_style = BS_PUSHBUTTON | WS_TABSTOP | WS_POPUP | WS_VISIBLE; + + hdc = GetDC(0); + hbmp1x1 = CreateCompatibleBitmap(hdc, 1, 1); + hbmp2x2 = CreateCompatibleBitmap(hdc, 2, 2); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(hbmp1x1, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 1 && bm.bmHeight == 1, "Expect bitmap size: %d,%d, got: %d,%d\n", 1, 1, + bm.bmWidth, bm.bmHeight); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(hbmp2x2, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 2 && bm.bmHeight == 2, "Expect bitmap size: %d,%d, got: %d,%d\n", 2, 2, + bm.bmWidth, bm.bmHeight); + + hmask2x2 = CreateCompatibleBitmap(hdc, 2, 2); + ZeroMemory(&icon_info2x2, sizeof(icon_info2x2)); + icon_info2x2.fIcon = TRUE; + icon_info2x2.hbmMask = hmask2x2; + icon_info2x2.hbmColor = hbmp2x2; + hicon2x2 = CreateIconIndirect(&icon_info2x2); + ok(hicon2x2 !=NULL, "Expect CreateIconIndirect() success\n"); + + ZeroMemory(&icon_info, sizeof(icon_info)); + ok(GetIconInfo(hicon2x2, &icon_info), "Expect GetIconInfo() success\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(icon_info.hbmColor, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 2 && bm.bmHeight == 2, "Expect bitmap size: %d,%d, got: %d,%d\n", 2, 2, + bm.bmWidth, bm.bmHeight); + DeleteObject(icon_info.hbmColor); + DeleteObject(icon_info.hbmMask); + + hwnd = CreateWindowA(WC_BUTTONA, "test", default_style | BS_BITMAP, 0, 0, 100, 100, 0, 0, + 0, 0); + ok(hwnd != NULL, "Expect hwnd to be not NULL\n"); + /* Get image when image is not set */ + hbmp = (HBITMAP)SendMessageA(hwnd, BM_GETIMAGE, IMAGE_BITMAP, 0); + ok(hbmp == 0, "Expect hbmp == 0\n"); + /* Set image */ + hbmp = (HBITMAP)SendMessageA(hwnd, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hbmp1x1); + ok(hbmp == 0, "Expect hbmp == 0\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_GETIMAGE, IMAGE_BITMAP, 0); + ok(hbmp != 0, "Expect hbmp != 0\n"); + /* Set null resets image */ + hbmp = (HBITMAP)SendMessageA(hwnd, BM_SETIMAGE, IMAGE_BITMAP, 0); + ok(hbmp != 0, "Expect hbmp != 0\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_GETIMAGE, IMAGE_BITMAP, 0); + ok(hbmp == 0, "Expect hbmp == 0\n"); + DestroyWindow(hwnd); + + /* Set bitmap with BS_BITMAP */ + hwnd = CreateWindowA(WC_BUTTONA, "test", default_style | BS_BITMAP, 0, 0, 100, 100, 0, 0, + 0, 0); + ok(hwnd != NULL, "Expect hwnd to be not NULL\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hbmp1x1); + ok(hbmp == 0, "Expect hbmp == 0\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_GETIMAGE, IMAGE_BITMAP, 0); + ok(hbmp != 0, "Expect hbmp != 0\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(hbmp, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 1 && bm.bmHeight == 1, "Expect bitmap size: %d,%d, got: %d,%d\n", 1, 1, + bm.bmWidth, bm.bmHeight); + DestroyWindow(hwnd); + + /* Set bitmap without BS_BITMAP */ + hwnd = CreateWindowA(WC_BUTTONA, "test", default_style, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Expect hwnd to be not NULL\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hbmp1x1); + ok(hbmp == 0, "Expect hbmp == 0\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_GETIMAGE, IMAGE_BITMAP, 0); + if (hbmp == 0) + { + /* on xp or 2003*/ + win_skip("Show both image and text is not supported. Skip following tests.\n"); + DestroyWindow(hwnd); + goto done; + } + ok(hbmp != 0, "Expect hbmp != 0\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(hbmp, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 1 && bm.bmHeight == 1, "Expect bitmap size: %d,%d, got: %d,%d\n", 1, 1, + bm.bmWidth, bm.bmHeight); + DestroyWindow(hwnd); + + /* Set icon with BS_ICON */ + hwnd = CreateWindowA(WC_BUTTONA, "test", default_style | BS_ICON, 0, 0, 100, 100, 0, 0, 0, + 0); + ok(hwnd != NULL, "Expect hwnd to be not NULL\n"); + hicon = (HICON)SendMessageA(hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hicon2x2); + ok(hicon == 0, "Expect hicon == 0\n"); + hicon = (HICON)SendMessageA(hwnd, BM_GETIMAGE, IMAGE_ICON, 0); + ok(hicon != 0, "Expect hicon != 0\n"); + ZeroMemory(&icon_info, sizeof(icon_info)); + ok(GetIconInfo(hicon, &icon_info), "Expect GetIconInfo() success\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(icon_info.hbmColor, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 2 && bm.bmHeight == 2, "Expect bitmap size: %d,%d, got: %d,%d\n", 2, 2, + bm.bmWidth, bm.bmHeight); + DeleteObject(icon_info.hbmColor); + DeleteObject(icon_info.hbmMask); + DestroyWindow(hwnd); + + /* Set icon without BS_ICON */ + hwnd = CreateWindowA(WC_BUTTONA, "test", default_style, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Expect hwnd to be not NULL\n"); + hicon = (HICON)SendMessageA(hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hicon2x2); + ok(hicon == 0, "Expect hicon == 0\n"); + hicon = (HICON)SendMessageA(hwnd, BM_GETIMAGE, IMAGE_ICON, 0); + ok(hicon != 0, "Expect hicon != 0\n"); + ZeroMemory(&icon_info, sizeof(icon_info)); + ok(GetIconInfo(hicon, &icon_info), "Expect GetIconInfo() success\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(icon_info.hbmColor, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 2 && bm.bmHeight == 2, "Expect bitmap size: %d,%d, got: %d,%d\n", 2, 2, + bm.bmWidth, bm.bmHeight); + DeleteObject(icon_info.hbmColor); + DeleteObject(icon_info.hbmMask); + DestroyWindow(hwnd); + + /* Set icon with BS_BITMAP */ + hwnd = CreateWindowA(WC_BUTTONA, "test", default_style | BS_BITMAP, 0, 0, 100, 100, 0, 0, + 0, 0); + ok(hwnd != NULL, "Expect hwnd to be not NULL\n"); + hicon = (HICON)SendMessageA(hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hicon2x2); + ok(hicon == 0, "Expect hicon == 0\n"); + hicon = (HICON)SendMessageA(hwnd, BM_GETIMAGE, IMAGE_ICON, 0); + ok(hicon != 0, "Expect hicon != 0\n"); + ZeroMemory(&icon_info, sizeof(icon_info)); + ok(GetIconInfo(hicon, &icon_info), "Expect GetIconInfo() success\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(icon_info.hbmColor, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 2 && bm.bmHeight == 2, "Expect bitmap size: %d,%d, got: %d,%d\n", 2, 2, + bm.bmWidth, bm.bmHeight); + DeleteObject(icon_info.hbmColor); + DeleteObject(icon_info.hbmMask); + DestroyWindow(hwnd); + + /* Set bitmap with BS_ICON */ + hwnd = CreateWindowA(WC_BUTTONA, "test", default_style | BS_ICON, 0, 0, 100, 100, 0, 0, 0, + 0); + ok(hwnd != NULL, "Expect hwnd to be not NULL\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hbmp1x1); + ok(hbmp == 0, "Expect hbmp == 0\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_GETIMAGE, IMAGE_BITMAP, 0); + ok(hbmp != 0, "Expect hbmp != 0\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(hbmp, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 1 && bm.bmHeight == 1, "Expect bitmap size: %d,%d, got: %d,%d\n", 1, 1, + bm.bmWidth, bm.bmHeight); + DestroyWindow(hwnd); + + /* Set bitmap with BS_BITMAP and IMAGE_ICON*/ + hwnd = CreateWindowA(WC_BUTTONA, "test", default_style | BS_BITMAP, 0, 0, 100, 100, 0, 0, + 0, 0); + ok(hwnd != NULL, "Expect hwnd to be not NULL\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hbmp1x1); + ok(hbmp == 0, "Expect hbmp == 0\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_GETIMAGE, IMAGE_ICON, 0); + ok(hbmp != 0, "Expect hbmp != 0\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(hbmp, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 1 && bm.bmHeight == 1, "Expect bitmap size: %d,%d, got: %d,%d\n", 1, 1, + bm.bmWidth, bm.bmHeight); + DestroyWindow(hwnd); + + /* Set icon with BS_ICON and IMAGE_BITMAP */ + hwnd = CreateWindowA(WC_BUTTONA, "test", default_style | BS_ICON, 0, 0, 100, 100, 0, 0, 0, + 0); + ok(hwnd != NULL, "Expect hwnd to be not NULL\n"); + hicon = (HICON)SendMessageA(hwnd, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hicon2x2); + ok(hicon == 0, "Expect hicon == 0\n"); + hicon = (HICON)SendMessageA(hwnd, BM_GETIMAGE, IMAGE_BITMAP, 0); + ok(hicon != 0, "Expect hicon != 0\n"); + ZeroMemory(&icon_info, sizeof(icon_info)); + ok(GetIconInfo(hicon, &icon_info), "Expect GetIconInfo() success\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(icon_info.hbmColor, sizeof(BITMAP), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 2 && bm.bmHeight == 2, "Expect bitmap size: %d,%d, got: %d,%d\n", 2, 2, + bm.bmWidth, bm.bmHeight); + DeleteObject(icon_info.hbmColor); + DeleteObject(icon_info.hbmMask); + DestroyWindow(hwnd); + + /* Set bitmap with BS_ICON and IMAGE_ICON */ + hwnd = CreateWindowA(WC_BUTTONA, "test", default_style | BS_ICON, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Expect hwnd to be not NULL\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hbmp1x1); + ok(hbmp == 0, "Expect hbmp == 0\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_GETIMAGE, IMAGE_ICON, 0); + ok(hbmp != 0, "Expect hbmp != 0\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(hbmp, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 1 && bm.bmHeight == 1, "Expect bitmap size: %d,%d, got: %d,%d\n", 1, 1, + bm.bmWidth, bm.bmHeight); + DestroyWindow(hwnd); + + /* Set icon with BS_BITMAP and IMAGE_BITMAP */ + hwnd = CreateWindowA(WC_BUTTONA, "test", default_style | BS_BITMAP, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Expect hwnd to be not NULL\n"); + hicon = (HICON)SendMessageA(hwnd, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hicon2x2); + ok(hicon == 0, "Expect hicon == 0\n"); + hicon = (HICON)SendMessageA(hwnd, BM_GETIMAGE, IMAGE_BITMAP, 0); + ok(hicon != 0, "Expect hicon != 0\n"); + ZeroMemory(&icon_info, sizeof(icon_info)); + ok(GetIconInfo(hicon, &icon_info), "Expect GetIconInfo() success\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(icon_info.hbmColor, sizeof(BITMAP), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 2 && bm.bmHeight == 2, "Expect bitmap size: %d,%d, got: %d,%d\n", 2, 2, + bm.bmWidth, bm.bmHeight); + DeleteObject(icon_info.hbmColor); + DeleteObject(icon_info.hbmMask); + DestroyWindow(hwnd); + +done: + DestroyIcon(hicon2x2); + DeleteObject(hmask2x2); + DeleteObject(hbmp2x2); + DeleteObject(hbmp1x1); + ReleaseDC(0, hdc); +} + static void register_parent_class(void) { WNDCLASSA cls; @@ -1054,6 +1287,7 @@ START_TEST(button) test_button_messages(); test_note(); test_button_data(); + test_bm_get_set_image(); unload_v6_module(ctx_cookie, hCtx); } -- 2.16.3

1 0

[PATCH] user32: Add support for PNG icons. (v2)
by Dmitry Timoshkov 03 Apr '18

03 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/Makefile.in | 1 + dlls/user32/cursoricon.c | 333 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 330 insertions(+), 4 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 246c424155..931a715763 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -D_USER32_ -D_WINABLE_ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = gdi32 version advapi32 +EXTRAINCL = $(PNG_CFLAGS) DELAYIMPORTS = imm32 usp10 C_SRCS = \ diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 8e272f09ce..5bf87aae84 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -6,6 +6,8 @@ * 1997 Alex Korobka * 1998 Turchanov Sergey * 2007 Henri Verbeet + * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,6 +31,9 @@ #include <stdarg.h> #include <string.h> #include <stdlib.h> +#ifdef HAVE_PNG_H +#include <png.h> +#endif #include "windef.h" #include "winbase.h" @@ -43,11 +48,17 @@ #include "wine/list.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(cursor); WINE_DECLARE_DEBUG_CHANNEL(icon); WINE_DECLARE_DEBUG_CHANNEL(resource); +#define RIFF_FOURCC( c0, c1, c2, c3 ) \ + ( (DWORD)(BYTE)(c0) | ( (DWORD)(BYTE)(c1) << 8 ) | \ + ( (DWORD)(BYTE)(c2) << 16 ) | ( (DWORD)(BYTE)(c3) << 24 ) ) +#define PNG_SIGN RIFF_FOURCC(0x89,'P','N','G') + static struct list icon_cache = LIST_INIT( icon_cache ); /********************************************************************** @@ -108,6 +119,303 @@ static int get_display_bpp(void) return ret; } +#ifdef SONAME_LIBPNG + +static void *libpng_handle; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(png_create_read_struct); +MAKE_FUNCPTR(png_create_info_struct); +MAKE_FUNCPTR(png_destroy_read_struct); +MAKE_FUNCPTR(png_error); +MAKE_FUNCPTR(png_get_bit_depth); +MAKE_FUNCPTR(png_get_color_type); +MAKE_FUNCPTR(png_get_error_ptr); +MAKE_FUNCPTR(png_get_image_height); +MAKE_FUNCPTR(png_get_image_width); +MAKE_FUNCPTR(png_get_io_ptr); +MAKE_FUNCPTR(png_read_image); +MAKE_FUNCPTR(png_read_info); +MAKE_FUNCPTR(png_read_update_info); +MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_crc_action); +MAKE_FUNCPTR(png_set_error_fn); +MAKE_FUNCPTR(png_set_expand); +MAKE_FUNCPTR(png_set_gray_to_rgb); +MAKE_FUNCPTR(png_set_read_fn); +#undef MAKE_FUNCPTR + +static BOOL load_libpng(void) +{ + USER_Lock(); + + if (!libpng_handle && (libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)) != NULL) + { +#define LOAD_FUNCPTR(f) \ + if ((p##f = wine_dlsym(libpng_handle, #f, NULL, 0)) == NULL) \ + { \ + libpng_handle = NULL; \ + USER_Unlock(); \ + return FALSE; \ + } + LOAD_FUNCPTR(png_create_read_struct); + LOAD_FUNCPTR(png_create_info_struct); + LOAD_FUNCPTR(png_destroy_read_struct); + LOAD_FUNCPTR(png_error); + LOAD_FUNCPTR(png_get_bit_depth); + LOAD_FUNCPTR(png_get_color_type); + LOAD_FUNCPTR(png_get_error_ptr); + LOAD_FUNCPTR(png_get_image_height); + LOAD_FUNCPTR(png_get_image_width); + LOAD_FUNCPTR(png_get_io_ptr); + LOAD_FUNCPTR(png_read_image); + LOAD_FUNCPTR(png_read_info); + LOAD_FUNCPTR(png_read_update_info); + LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_crc_action); + LOAD_FUNCPTR(png_set_error_fn); + LOAD_FUNCPTR(png_set_expand); + LOAD_FUNCPTR(png_set_gray_to_rgb); + LOAD_FUNCPTR(png_set_read_fn); +#undef LOAD_FUNCPTR + } + + USER_Unlock(); + return TRUE; +} + +static void user_error_fn(png_structp png_ptr, png_const_charp error_message) +{ + jmp_buf *pjmpbuf; + + /* This uses setjmp/longjmp just like the default. We can't use the + * default because there's no way to access the jmp buffer in the png_struct + * that works in 1.2 and 1.4 and allows us to dynamically load libpng. */ + WARN("PNG error: %s\n", debugstr_a(error_message)); + pjmpbuf = ppng_get_error_ptr(png_ptr); + longjmp(*pjmpbuf, 1); +} + +static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message) +{ + WARN("PNG warning: %s\n", debugstr_a(warning_message)); +} + +struct png_wrapper +{ + const char *buffer; + size_t size, pos; +}; + +static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) +{ + struct png_wrapper *png = ppng_get_io_ptr(png_ptr); + + if (png->size - png->pos >= length) + { + memcpy(data, png->buffer + png->pos, length); + png->pos += length; + } + else + { + ppng_error(png_ptr, "failed to read PNG data"); + } +} + +static unsigned be_uint(unsigned val) +{ + union + { + unsigned val; + unsigned char c[4]; + } u; + + u.val = val; + return (u.c[0] << 24) | (u.c[1] << 16) | (u.c[2] << 8) | u.c[3]; +} + +static BOOL get_png_info(const void *png_data, DWORD size, int *width, int *height, int *bpp) +{ + static const char png_sig[8] = { 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a }; + static const char png_IHDR[8] = { 0,0,0,0x0d,'I','H','D','R' }; + const struct + { + char png_sig[8]; + char ihdr_sig[8]; + unsigned width, height; + char bit_depth, color_type, compression, filter, interlace; + } *png = png_data; + + if (size < sizeof(*png)) return FALSE; + if (memcmp(png->png_sig, png_sig, sizeof(png_sig)) != 0) return FALSE; + if (memcmp(png->ihdr_sig, png_IHDR, sizeof(png_IHDR)) != 0) return FALSE; + + *bpp = (png->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ? 32 : 24; + *width = be_uint(png->width); + *height = be_uint(png->height); + + return TRUE; +} + +static BITMAPINFO *load_png(const char *png_data, DWORD *size) +{ + struct png_wrapper png; + png_structp png_ptr; + png_infop info_ptr; + png_bytep *row_pointers; + jmp_buf jmpbuf; + int color_type, bit_depth, bpp, width, height; + int rowbytes, image_size, mask_size = 0, i; + BITMAPINFO *info; + unsigned char *image_data; + + if (!get_png_info(png_data, *size, &width, &height, &bpp)) + return NULL; + + if (!load_libpng()) return NULL; + + png.buffer = png_data; + png.size = *size; + png.pos = 0; + + /* initialize libpng */ + png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!png_ptr) return NULL; + + info_ptr = ppng_create_info_struct(png_ptr); + if (!info_ptr) + { + ppng_destroy_read_struct(&png_ptr, NULL, NULL); + return NULL; + } + + /* set up setjmp/longjmp error handling */ + if (setjmp(jmpbuf)) + { + ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + + ppng_set_error_fn(png_ptr, jmpbuf, user_error_fn, user_warning_fn); + ppng_set_crc_action(png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); + + /* set up custom i/o handling */ + ppng_set_read_fn(png_ptr, &png, user_read_data); + + /* read the header */ + ppng_read_info(png_ptr, info_ptr); + + color_type = ppng_get_color_type(png_ptr, info_ptr); + bit_depth = ppng_get_bit_depth(png_ptr, info_ptr); + + /* expand grayscale image data to rgb */ + if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) + ppng_set_gray_to_rgb(png_ptr); + + /* expand palette image data to rgb */ + if (color_type == PNG_COLOR_TYPE_PALETTE || bit_depth < 8) + ppng_set_expand(png_ptr); + + /* update color type information */ + ppng_read_update_info(png_ptr, info_ptr); + + color_type = ppng_get_color_type(png_ptr, info_ptr); + bit_depth = ppng_get_bit_depth(png_ptr, info_ptr); + + bpp = 0; + + switch (color_type) + { + case PNG_COLOR_TYPE_RGB: + if (bit_depth == 8) + bpp = 24; + break; + + case PNG_COLOR_TYPE_RGB_ALPHA: + if (bit_depth == 8) + { + ppng_set_bgr(png_ptr); + bpp = 32; + } + break; + + default: + break; + } + + if (!bpp) + { + FIXME("unsupported PNG color format %d, %d bpp\n", color_type, bit_depth); + ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + + width = ppng_get_image_width(png_ptr, info_ptr); + height = ppng_get_image_height(png_ptr, info_ptr); + + rowbytes = (width * bpp + 7) / 8; + image_size = height * rowbytes; + if (bpp != 32) /* add a mask if there is no alpha */ + mask_size = (width + 7) / 8 * height; + + info = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFOHEADER) + image_size + mask_size); + if (!info) + { + ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + + image_data = (unsigned char *)info + sizeof(BITMAPINFOHEADER); + memset(image_data + image_size, 0, mask_size); + + row_pointers = HeapAlloc(GetProcessHeap(), 0, height * sizeof(png_bytep)); + if (!row_pointers) + { + HeapFree(GetProcessHeap(), 0, info); + ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + + /* upside down */ + for (i = 0; i < height; i++) + row_pointers[i] = image_data + (height - i - 1) * rowbytes; + + ppng_read_image(png_ptr, row_pointers); + HeapFree(GetProcessHeap(), 0, row_pointers); + ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); + + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = height * 2; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = bpp; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = image_size; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + + *size = sizeof(BITMAPINFOHEADER) + image_size + mask_size; + + return info; +} + +#else /* SONAME_LIBPNG */ + +static BOOL get_png_info(const void *png_data, DWORD size, int *width, int *height, int *bpp) +{ + ERR("Trying to load PNG icon, but PNG support is not compiled in.\n"); + return FALSE; +} + +static BITMAPINFO *load_png( const char *png, DWORD *max_size ) +{ + ERR("Trying to load PNG icon, but PNG support is not compiled in.\n"); + return NULL; +} + +#endif + static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) { struct cursoricon_object *obj; @@ -523,6 +831,8 @@ static int CURSORICON_FindBestIcon( LPCVOID dir, DWORD size, fnGetCIEntry get_en /* Find Best Colors for Best Fit */ for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { + TRACE("entry %d: %d x %d, %d bpp\n", i, cx, cy, bits); + if(abs(width - cx) == iXDiff && abs(height - cy) == iYDiff) { iTempColorDiff = abs(depth - bits); @@ -680,6 +990,10 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, entry = &filedir->idEntries[n]; if (entry->dwDIBOffset > size - sizeof(info->biSize)) return FALSE; info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); + + if (info->biSize == PNG_SIGN) + return get_png_info(info, size, width, height, bits); + if (info->biSize != sizeof(BITMAPCOREHEADER)) { if ((const char *)(info + 1) - (const char *)dir > size) return FALSE; @@ -824,6 +1138,21 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE /* Check bitmap header */ + if (bmi->bmiHeader.biSize == PNG_SIGN) + { + BITMAPINFO *bmi_png; + + bmi_png = load_png( (const char *)bmi, &maxsize ); + if (bmi_png) + { + hObj = create_icon_from_bmi( bmi_png, maxsize, module, resname, + rsrc, hotspot, bIcon, width, height, cFlag ); + HeapFree( GetProcessHeap(), 0, bmi_png ); + return hObj; + } + return 0; + } + if (maxsize < sizeof(BITMAPCOREHEADER)) { WARN( "invalid size %u\n", maxsize ); @@ -1001,10 +1330,6 @@ done: /********************************************************************** * .ANI cursor support */ -#define RIFF_FOURCC( c0, c1, c2, c3 ) \ - ( (DWORD)(BYTE)(c0) | ( (DWORD)(BYTE)(c1) << 8 ) | \ - ( (DWORD)(BYTE)(c2) << 16 ) | ( (DWORD)(BYTE)(c3) << 24 ) ) - #define ANI_RIFF_ID RIFF_FOURCC('R', 'I', 'F', 'F') #define ANI_LIST_ID RIFF_FOURCC('L', 'I', 'S', 'T') #define ANI_ACON_ID RIFF_FOURCC('A', 'C', 'O', 'N') -- 2.16.3

1 0

[PATCH] ntoskrnl.exe: Add stubs for ExAcquireFastMutexUnsafe and ExReleaseFastMutexUnsafe.
by Alistair Leslie-Hughes 03 Apr '18

03 Apr '18

From: Alexander Morozov <amorozov(a)etersoft.ru> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 28 ++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- include/ddk/wdm.h | 2 ++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e3d72ba..7258c37 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -600,6 +600,34 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) /*********************************************************************** + * ExAcquireFastMutexUnsafe (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT(ExAcquireFastMutexUnsafe) +void WINAPI __regs_ExAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex) +#else +void WINAPI ExAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex) +#endif +{ + FIXME("(%p): stub\n", FastMutex); +} + + +/*********************************************************************** + * ExReleaseFastMutexUnsafe (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT(ExReleaseFastMutexUnsafe) +void WINAPI __regs_ExReleaseFastMutexUnsafe(PFAST_MUTEX FastMutex) +#else +void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX FastMutex) +#endif +{ + FIXME("(%p): stub\n", FastMutex); +} + + +/*********************************************************************** * IoAcquireCancelSpinLock (NTOSKRNL.EXE.@) */ void WINAPI IoAcquireCancelSpinLock(PKIRQL irql) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 26afa6f..3f5409d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1,4 +1,4 @@ -@ stub ExAcquireFastMutexUnsafe +@ stdcall -norelay ExAcquireFastMutexUnsafe(ptr) @ stub ExAcquireRundownProtection @ stub ExAcquireRundownProtectionEx @ stub ExInitializeRundownProtection @@ -8,7 +8,7 @@ @ stub ExInterlockedPopEntrySList @ stub ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection -@ stub ExReleaseFastMutexUnsafe +@ stdcall -norelay ExReleaseFastMutexUnsafe(ptr) @ stub ExReleaseResourceLite @ stub ExReleaseRundownProtection @ stub ExReleaseRundownProtectionEx diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 9e8e705..5b7c9e6 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1367,12 +1367,14 @@ static inline void IoSetCompletionRoutine(IRP *irp, PIO_COMPLETION_ROUTINE routi #define SYMBOLIC_LINK_QUERY 0x0001 #define SYMBOLIC_LINK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1) +void WINAPI ExAcquireFastMutexUnsafe(PFAST_MUTEX); PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG); PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); +void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); -- 1.9.1

1 0

[PATCH v2] dmime: Call interface methods properly.
by Zebediah Figura 03 Apr '18

03 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: formatting dlls/dmime/audiopath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index d656058..f12315a 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -114,7 +114,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if if (ref == 0) { if (This->pDSBuffer) - IDirectSoundBuffer8_Release(This->pDSBuffer); + IDirectSoundBuffer_Release(This->pDSBuffer); This->pPerf = NULL; HeapFree(GetProcessHeap(), 0, This); } @@ -140,7 +140,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud IsEqualIID (iidInterface, &IID_IDirectSoundBuffer) || IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8) || IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - return IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, iidInterface, ppObject); + return IDirectSoundBuffer_QueryInterface(This->pDSBuffer, iidInterface, ppObject); } WARN("Unsupported interface %s\n", debugstr_dmguid(iidInterface)); @@ -151,8 +151,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud case DMUS_PATH_PRIMARY_BUFFER: { if (IsEqualIID (iidInterface, &IID_IDirectSound3DListener)) { - IDirectSoundBuffer8_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); + IDirectSoundBuffer_QueryInterface(This->pPrimary, &IID_IDirectSound3DListener, ppObject); return S_OK; } else { FIXME("bad iid...\n"); -- 2.7.4

1 0

[PATCH 1/8] d3d11: Implement d3d11_device_CreateTexture1D().
by Henri Verbeet 02 Apr '18

02 Apr '18

From: Sven Hesse <shesse(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 15 +++ dlls/d3d11/device.c | 13 +- dlls/d3d11/tests/d3d11.c | 92 +++++++++++++ dlls/d3d11/texture.c | 316 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 434 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index f9cfd6cecd4..68e56d76092 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -112,6 +112,21 @@ void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; HRESULT parse_dxbc(const char *data, SIZE_T data_size, HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN; +/* ID3D11Texture1D, ID3D10Texture1D */ +struct d3d_texture1d +{ + ID3D11Texture1D ID3D11Texture1D_iface; + ID3D10Texture1D ID3D10Texture1D_iface; + LONG refcount; + + struct wined3d_private_store private_store; + D3D11_TEXTURE1D_DESC desc; + ID3D11Device *device; +}; + +HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DESC *desc, + const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture1d **texture) DECLSPEC_HIDDEN; + /* ID3D11Texture2D, ID3D10Texture2D */ struct d3d_texture2d { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d93f4ebe734..9799d73dbf7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2764,9 +2764,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBuffer(ID3D11Device *iface, static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture1D(ID3D11Device *iface, const D3D11_TEXTURE1D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture1D **texture) { - FIXME("iface %p, desc %p, data %p, texture %p stub!\n", iface, desc, data, texture); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_texture1d *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); + + if (FAILED(hr = d3d_texture1d_create(device, desc, data, &object))) + return hr; + + *texture = &object->ID3D11Texture1D_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6d7fccdcfb6..146509dd05e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1825,6 +1825,97 @@ static void test_get_immediate_context(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_texture1d(void) +{ + ULONG refcount, expected_refcount; + ID3D11Device *device, *tmp; + D3D11_TEXTURE1D_DESC desc; + ID3D11Texture1D *texture; + unsigned int i; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + desc.Width = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + expected_refcount = get_refcount(device) + 1; + hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 1d texture, hr %#x.\n", hr); + refcount = get_refcount(device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11Texture1D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount(device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + ID3D11Texture1D_Release(texture); + + desc.MipLevels = 0; + expected_refcount = get_refcount(device) + 1; + hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 1d texture, hr %#x.\n", hr); + refcount = get_refcount(device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11Texture1D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount(device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + ID3D11Texture1D_GetDesc(texture, &desc); + ok(desc.Width == 512, "Got unexpected Width %u.\n", desc.Width); + ok(desc.MipLevels == 10, "Got unexpected MipLevels %u.\n", desc.MipLevels); + ok(desc.ArraySize == 1, "Got unexpected ArraySize %u.\n", desc.ArraySize); + ok(desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", desc.Format); + ok(desc.Usage == D3D11_USAGE_DEFAULT, "Got unexpected Usage %u.\n", desc.Usage); + ok(desc.BindFlags == D3D11_BIND_SHADER_RESOURCE, "Got unexpected BindFlags %#x.\n", desc.BindFlags); + ok(desc.CPUAccessFlags == 0, "Got unexpected CPUAccessFlags %#x.\n", desc.CPUAccessFlags); + ok(desc.MiscFlags == 0, "Got unexpected MiscFlags %#x.\n", desc.MiscFlags); + + check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + ID3D11Texture1D_Release(texture); + + desc.MipLevels = 1; + desc.ArraySize = 2; + hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 1d texture, hr %#x.\n", hr); + + check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + ID3D11Texture1D_Release(texture); + + for (i = 0; i < 4; ++i) + { + desc.ArraySize = i; + desc.Format = DXGI_FORMAT_R32G32B32A32_TYPELESS; + desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, (ID3D11Texture1D **)&texture); + todo_wine_if(!i) + ok(hr == (i ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); + if (SUCCEEDED(hr)) + ID3D11Texture1D_Release(texture); + } + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_texture2d(void) { ULONG refcount, expected_refcount; @@ -25114,6 +25205,7 @@ START_TEST(d3d11) test_create_device(); run_for_each_feature_level(test_device_interfaces); test_get_immediate_context(); + test_create_texture1d(); test_create_texture2d(); test_texture2d_interfaces(); test_create_texture3d(); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 2bcbe964b9b..8c7a54956a7 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -25,6 +25,322 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); +/* ID3D11Texture1D methods */ + +static inline struct d3d_texture1d *impl_from_ID3D11Texture1D(ID3D11Texture1D *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_texture1d, ID3D11Texture1D_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_texture1d_QueryInterface(ID3D11Texture1D *iface, REFIID iid, void **out) +{ + struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID3D11Texture1D) + || IsEqualGUID(iid, &IID_ID3D11Resource) + || IsEqualGUID(iid, &IID_ID3D11DeviceChild) + || IsEqualGUID(iid, &IID_IUnknown)) + { + *out = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + if (IsEqualGUID(iid, &IID_ID3D10Texture1D) + || IsEqualGUID(iid, &IID_ID3D10Resource) + || IsEqualGUID(iid, &IID_ID3D10DeviceChild)) + { + *out = &texture->ID3D10Texture1D_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d11_texture1d_AddRef(ID3D11Texture1D *iface) +{ + struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + ULONG refcount = InterlockedIncrement(&texture->refcount); + + TRACE("%p increasing refcount to %u.\n", texture, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d11_texture1d_Release(ID3D11Texture1D *iface) +{ + struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + ULONG refcount = InterlockedDecrement(&texture->refcount); + + TRACE("%p decreasing refcount to %u.\n", texture, refcount); + + if (!refcount) + { + wined3d_private_store_cleanup(&texture->private_store); + ID3D11Device_Release(texture->device); + heap_free(texture); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d11_texture1d_GetDevice(ID3D11Texture1D *iface, ID3D11Device **device) +{ + struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = texture->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_texture1d_GetPrivateData(ID3D11Texture1D *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&texture->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_texture1d_SetPrivateData(ID3D11Texture1D *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&texture->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_texture1d_SetPrivateDataInterface(ID3D11Texture1D *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&texture->private_store, guid, data); +} + +static void STDMETHODCALLTYPE d3d11_texture1d_GetType(ID3D11Texture1D *iface, + D3D11_RESOURCE_DIMENSION *resource_dimension) +{ + TRACE("iface %p, resource_dimension %p.\n", iface, resource_dimension); + + *resource_dimension = D3D11_RESOURCE_DIMENSION_TEXTURE1D; +} + +static void STDMETHODCALLTYPE d3d11_texture1d_SetEvictionPriority(ID3D11Texture1D *iface, UINT eviction_priority) +{ + FIXME("iface %p, eviction_priority %#x stub!\n", iface, eviction_priority); +} + +static UINT STDMETHODCALLTYPE d3d11_texture1d_GetEvictionPriority(ID3D11Texture1D *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static void STDMETHODCALLTYPE d3d11_texture1d_GetDesc(ID3D11Texture1D *iface, D3D11_TEXTURE1D_DESC *desc) +{ + struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = texture->desc; +} + +static const struct ID3D11Texture1DVtbl d3d11_texture1d_vtbl = +{ + /* IUnknown methods */ + d3d11_texture1d_QueryInterface, + d3d11_texture1d_AddRef, + d3d11_texture1d_Release, + /* ID3D11DeviceChild methods */ + d3d11_texture1d_GetDevice, + d3d11_texture1d_GetPrivateData, + d3d11_texture1d_SetPrivateData, + d3d11_texture1d_SetPrivateDataInterface, + /* ID3D11Resource methods */ + d3d11_texture1d_GetType, + d3d11_texture1d_SetEvictionPriority, + d3d11_texture1d_GetEvictionPriority, + /* ID3D11Texture1D methods */ + d3d11_texture1d_GetDesc, +}; + +static inline struct d3d_texture1d *impl_from_ID3D10Texture1D(ID3D10Texture1D *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_texture1d, ID3D10Texture1D_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_texture1d_QueryInterface(ID3D10Texture1D *iface, REFIID iid, void **out) +{ + struct d3d_texture1d *texture = impl_from_ID3D10Texture1D(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + return d3d11_texture1d_QueryInterface(&texture->ID3D11Texture1D_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE d3d10_texture1d_AddRef(ID3D10Texture1D *iface) +{ + struct d3d_texture1d *texture = impl_from_ID3D10Texture1D(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_texture1d_AddRef(&texture->ID3D11Texture1D_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_texture1d_Release(ID3D10Texture1D *iface) +{ + struct d3d_texture1d *texture = impl_from_ID3D10Texture1D(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_texture1d_Release(&texture->ID3D11Texture1D_iface); +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_texture1d_GetDevice(ID3D10Texture1D *iface, ID3D10Device **device) +{ + struct d3d_texture1d *texture = impl_from_ID3D10Texture1D(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + ID3D11Device_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_texture1d_GetPrivateData(ID3D10Texture1D *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_texture1d *texture = impl_from_ID3D10Texture1D(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d11_texture1d_GetPrivateData(&texture->ID3D11Texture1D_iface, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d10_texture1d_SetPrivateData(ID3D10Texture1D *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_texture1d *texture = impl_from_ID3D10Texture1D(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d11_texture1d_SetPrivateData(&texture->ID3D11Texture1D_iface, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d10_texture1d_SetPrivateDataInterface(ID3D10Texture1D *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_texture1d *texture = impl_from_ID3D10Texture1D(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d11_texture1d_SetPrivateDataInterface(&texture->ID3D11Texture1D_iface, guid, data); +} + +/* ID3D10Resource methods */ + +static void STDMETHODCALLTYPE d3d10_texture1d_GetType(ID3D10Texture1D *iface, + D3D10_RESOURCE_DIMENSION *resource_dimension) +{ + TRACE("iface %p, resource_dimension %p\n", iface, resource_dimension); + + *resource_dimension = D3D10_RESOURCE_DIMENSION_TEXTURE1D; +} + +static void STDMETHODCALLTYPE d3d10_texture1d_SetEvictionPriority(ID3D10Texture1D *iface, UINT eviction_priority) +{ + FIXME("iface %p, eviction_priority %u stub!\n", iface, eviction_priority); +} + +static UINT STDMETHODCALLTYPE d3d10_texture1d_GetEvictionPriority(ID3D10Texture1D *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +/* ID3D10Texture1D methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_texture1d_Map(ID3D10Texture1D *iface, UINT sub_resource_idx, + D3D10_MAP map_type, UINT map_flags, void **data) +{ + FIXME("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, data %p stub!\n", + iface, sub_resource_idx, map_type, map_flags, data); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d3d10_texture1d_Unmap(ID3D10Texture1D *iface, UINT sub_resource_idx) +{ + FIXME("iface %p, sub_resource_idx %u stub!\n", iface, sub_resource_idx); +} + +static void STDMETHODCALLTYPE d3d10_texture1d_GetDesc(ID3D10Texture1D *iface, D3D10_TEXTURE1D_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D10Texture1DVtbl d3d10_texture1d_vtbl = +{ + /* IUnknown methods */ + d3d10_texture1d_QueryInterface, + d3d10_texture1d_AddRef, + d3d10_texture1d_Release, + /* ID3D10DeviceChild methods */ + d3d10_texture1d_GetDevice, + d3d10_texture1d_GetPrivateData, + d3d10_texture1d_SetPrivateData, + d3d10_texture1d_SetPrivateDataInterface, + /* ID3D10Resource methods */ + d3d10_texture1d_GetType, + d3d10_texture1d_SetEvictionPriority, + d3d10_texture1d_GetEvictionPriority, + /* ID3D10Texture1D methods */ + d3d10_texture1d_Map, + d3d10_texture1d_Unmap, + d3d10_texture1d_GetDesc, +}; + +HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DESC *desc, + const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture1d **out) +{ + struct d3d_texture1d *texture; + + if (!(texture = heap_alloc_zero(sizeof(*texture)))) + return E_OUTOFMEMORY; + + texture->ID3D11Texture1D_iface.lpVtbl = &d3d11_texture1d_vtbl; + texture->ID3D10Texture1D_iface.lpVtbl = &d3d10_texture1d_vtbl; + texture->refcount = 1; + + wined3d_private_store_init(&texture->private_store); + texture->desc = *desc; + texture->desc.MipLevels = desc->MipLevels ? desc->MipLevels : wined3d_log2i(desc->Width) + 1; + texture->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(texture->device); + + TRACE("Created texture %p.\n", texture); + *out = texture; + + return S_OK; +} + /* ID3D11Texture2D methods */ static HRESULT STDMETHODCALLTYPE d3d11_texture2d_QueryInterface(ID3D11Texture2D *iface, REFIID riid, void **object) -- 2.11.0

2 1

[PATCH 8/8] d3d11: Implement d3d10_texture1d_Map().
by Henri Verbeet 02 Apr '18

02 Apr '18

From: Sven Hesse <shesse(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/texture.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 9bda6b0dbea..0730dbc8c6f 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -347,10 +347,25 @@ static UINT STDMETHODCALLTYPE d3d10_texture1d_GetEvictionPriority(ID3D10Texture1 static HRESULT STDMETHODCALLTYPE d3d10_texture1d_Map(ID3D10Texture1D *iface, UINT sub_resource_idx, D3D10_MAP map_type, UINT map_flags, void **data) { - FIXME("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, data %p stub!\n", + struct d3d_texture1d *texture = impl_from_ID3D10Texture1D(iface); + struct wined3d_map_desc wined3d_map_desc; + HRESULT hr; + + TRACE("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, data %p.\n", iface, sub_resource_idx, map_type, map_flags, data); - return E_NOTIMPL; + if (map_flags) + FIXME("Ignoring map_flags %#x.\n", map_flags); + + wined3d_mutex_lock(); + if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) + { + *data = wined3d_map_desc.data; + } + wined3d_mutex_unlock(); + + return hr; } static void STDMETHODCALLTYPE d3d10_texture1d_Unmap(ID3D10Texture1D *iface, UINT sub_resource_idx) -- 2.11.0

1 0

[PATCH 7/8] d3d11: Implement d3d10_texture1d_Unmap().
by Henri Verbeet 02 Apr '18

02 Apr '18

From: Sven Hesse <shesse(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/texture.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 58f822c7320..9bda6b0dbea 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -355,7 +355,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture1d_Map(ID3D10Texture1D *iface, UIN static void STDMETHODCALLTYPE d3d10_texture1d_Unmap(ID3D10Texture1D *iface, UINT sub_resource_idx) { - FIXME("iface %p, sub_resource_idx %u stub!\n", iface, sub_resource_idx); + struct d3d_texture1d *texture = impl_from_ID3D10Texture1D(iface); + + TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); + + wined3d_mutex_lock(); + wined3d_resource_unmap(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_texture1d_GetDesc(ID3D10Texture1D *iface, D3D10_TEXTURE1D_DESC *desc) -- 2.11.0

1 0

[PATCH 6/8] d3d11: Implement d3d10_texture1d_GetDesc().
by Henri Verbeet 02 Apr '18

02 Apr '18

From: Sven Hesse <shesse(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 10 ++++++++++ dlls/d3d11/tests/d3d11.c | 18 ++++++++++++++++++ dlls/d3d11/texture.c | 16 +++++++++++++++- 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 0a9c43c317d..8b0567696c9 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1368,6 +1368,16 @@ static void test_create_texture1d(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + ID3D10Texture1D_GetDesc(texture, &desc); + ok(desc.Width == 512, "Got unexpected Width %u.\n", desc.Width); + ok(desc.MipLevels == 10, "Got unexpected MipLevels %u.\n", desc.MipLevels); + ok(desc.ArraySize == 1, "Got unexpected ArraySize %u.\n", desc.ArraySize); + ok(desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", desc.Format); + ok(desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected Usage %u.\n", desc.Usage); + ok(desc.BindFlags == D3D10_BIND_SHADER_RESOURCE, "Got unexpected BindFlags %#x.\n", desc.BindFlags); + ok(desc.CPUAccessFlags == 0, "Got unexpected CPUAccessFlags %#x.\n", desc.CPUAccessFlags); + ok(desc.MiscFlags == 0, "Got unexpected MiscFlags %#x.\n", desc.MiscFlags); + check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); ID3D10Texture1D_Release(texture); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ca30a553521..2f47124a232 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1992,6 +1992,7 @@ static void test_texture1d_interfaces(void) for (i = 0; i < ARRAY_SIZE(desc_conversion_tests); ++i) { const struct test *current = &desc_conversion_tests[i]; + D3D10_TEXTURE1D_DESC d3d10_desc; ID3D10Device *d3d10_device; desc.Width = 512; @@ -2029,6 +2030,23 @@ static void test_texture1d_interfaces(void) continue; } + ID3D10Texture1D_GetDesc(d3d10_texture, &d3d10_desc); + + ok(d3d10_desc.Width == desc.Width, + "Test %u: Got unexpected Width %u.\n", i, d3d10_desc.Width); + ok(d3d10_desc.MipLevels == desc.MipLevels, + "Test %u: Got unexpected MipLevels %u.\n", i, d3d10_desc.MipLevels); + ok(d3d10_desc.ArraySize == desc.ArraySize, + "Test %u: Got unexpected ArraySize %u.\n", i, d3d10_desc.ArraySize); + ok(d3d10_desc.Format == desc.Format, + "Test %u: Got unexpected Format %u.\n", i, d3d10_desc.Format); + ok(d3d10_desc.BindFlags == current->expected_bind_flags, + "Test %u: Got unexpected BindFlags %#x.\n", i, d3d10_desc.BindFlags); + ok(d3d10_desc.CPUAccessFlags == desc.CPUAccessFlags, + "Test %u: Got unexpected CPUAccessFlags %#x.\n", i, d3d10_desc.CPUAccessFlags); + ok(d3d10_desc.MiscFlags == current->expected_misc_flags, + "Test %u: Got unexpected MiscFlags %#x.\n", i, d3d10_desc.MiscFlags); + d3d10_device = (ID3D10Device *)0xdeadbeef; ID3D10Texture1D_GetDevice(d3d10_texture, &d3d10_device); todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index c6998ed29c4..58f822c7320 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -360,7 +360,21 @@ static void STDMETHODCALLTYPE d3d10_texture1d_Unmap(ID3D10Texture1D *iface, UINT static void STDMETHODCALLTYPE d3d10_texture1d_GetDesc(ID3D10Texture1D *iface, D3D10_TEXTURE1D_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_texture1d *texture = impl_from_ID3D10Texture1D(iface); + D3D11_TEXTURE1D_DESC d3d11_desc; + + TRACE("iface %p, desc %p.\n", iface, desc); + + d3d11_texture1d_GetDesc(&texture->ID3D11Texture1D_iface, &d3d11_desc); + + desc->Width = d3d11_desc.Width; + desc->MipLevels = d3d11_desc.MipLevels; + desc->ArraySize = d3d11_desc.ArraySize; + desc->Format = d3d11_desc.Format; + desc->Usage = d3d10_usage_from_d3d11_usage(d3d11_desc.Usage); + desc->BindFlags = d3d10_bind_flags_from_d3d11_bind_flags(d3d11_desc.BindFlags); + desc->CPUAccessFlags = d3d10_cpu_access_flags_from_d3d11_cpu_access_flags(d3d11_desc.CPUAccessFlags); + desc->MiscFlags = d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(d3d11_desc.MiscFlags); } static const struct ID3D10Texture1DVtbl d3d10_texture1d_vtbl = -- 2.11.0

1 0

[PATCH 5/8] d3d11: Create DXGI surfaces for 1D textures.
by Henri Verbeet 02 Apr '18

02 Apr '18

From: Sven Hesse <shesse(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 119 ++++++++++++++++++++++++++++++++++++++++ dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/tests/d3d11.c | 123 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3d11/texture.c | 72 +++++++++++++++++++++++-- 4 files changed, 311 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5cd4e5184aa..0a9c43c317d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1351,6 +1351,7 @@ static void test_create_texture1d(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + check_interface(texture, &IID_IDXGISurface, TRUE, FALSE); ID3D10Texture1D_Release(texture); desc.MipLevels = 0; @@ -1394,6 +1395,123 @@ static void test_create_texture1d(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_texture1d_interfaces(void) +{ + ID3D11Texture1D *d3d11_texture; + D3D10_TEXTURE1D_DESC desc; + ID3D10Texture1D *texture; + ID3D10Device *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct test + { + UINT bind_flags; + UINT misc_flags; + UINT expected_bind_flags; + UINT expected_misc_flags; + } + desc_conversion_tests[] = + { + { + D3D10_BIND_SHADER_RESOURCE, 0, + D3D11_BIND_SHADER_RESOURCE, 0 + }, + { + 0, D3D10_RESOURCE_MISC_SHARED, + 0, D3D11_RESOURCE_MISC_SHARED + }, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + desc.Width = 512; + desc.MipLevels = 0; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 1d texture, hr %#x.\n", hr); + check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + hr = check_interface(texture, &IID_ID3D11Texture1D, TRUE, TRUE); /* Not available on all Windows versions. */ + ID3D10Texture1D_Release(texture); + if (FAILED(hr)) + { + win_skip("1D textures do not implement ID3D11Texture1D, skipping tests.\n"); + ID3D10Device_Release(device); + return; + } + + for (i = 0; i < ARRAY_SIZE(desc_conversion_tests); ++i) + { + const struct test *current = &desc_conversion_tests[i]; + D3D11_TEXTURE1D_DESC d3d11_desc; + ID3D11Device *d3d11_device; + + desc.Width = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = current->bind_flags; + desc.CPUAccessFlags = 0; + desc.MiscFlags = current->misc_flags; + + hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, &texture); + /* Shared resources are not supported by REF and WARP devices. */ + ok(SUCCEEDED(hr) || broken(hr == E_OUTOFMEMORY), + "Test %u: Failed to create a 1d texture, hr %#x.\n", i, hr); + if (FAILED(hr)) + { + win_skip("Failed to create ID3D10Texture1D, skipping test %u.\n", i); + continue; + } + + check_interface(texture, &IID_IDXGISurface, TRUE, FALSE); + hr = ID3D10Texture1D_QueryInterface(texture, &IID_ID3D11Texture1D, (void **)&d3d11_texture); + ok(SUCCEEDED(hr), "Test %u: Texture should implement ID3D11Texture1D.\n", i); + ID3D10Texture1D_Release(texture); + + ID3D11Texture1D_GetDesc(d3d11_texture, &d3d11_desc); + + ok(d3d11_desc.Width == desc.Width, + "Test %u: Got unexpected Width %u.\n", i, d3d11_desc.Width); + ok(d3d11_desc.MipLevels == desc.MipLevels, + "Test %u: Got unexpected MipLevels %u.\n", i, d3d11_desc.MipLevels); + ok(d3d11_desc.ArraySize == desc.ArraySize, + "Test %u: Got unexpected ArraySize %u.\n", i, d3d11_desc.ArraySize); + ok(d3d11_desc.Format == desc.Format, + "Test %u: Got unexpected Format %u.\n", i, d3d11_desc.Format); + ok(d3d11_desc.Usage == (D3D11_USAGE)desc.Usage, + "Test %u: Got unexpected Usage %u.\n", i, d3d11_desc.Usage); + ok(d3d11_desc.BindFlags == current->expected_bind_flags, + "Test %u: Got unexpected BindFlags %#x.\n", i, d3d11_desc.BindFlags); + ok(d3d11_desc.CPUAccessFlags == desc.CPUAccessFlags, + "Test %u: Got unexpected CPUAccessFlags %#x.\n", i, d3d11_desc.CPUAccessFlags); + ok(d3d11_desc.MiscFlags == current->expected_misc_flags, + "Test %u: Got unexpected MiscFlags %#x.\n", i, d3d11_desc.MiscFlags); + + d3d11_device = NULL; + ID3D11Texture1D_GetDevice(d3d11_texture, &d3d11_device); + ok(!!d3d11_device, "Test %u: Got NULL, expected device pointer.\n", i); + ID3D11Device_Release(d3d11_device); + + ID3D11Texture1D_Release(d3d11_texture); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_texture2d(void) { ULONG refcount, expected_refcount; @@ -15542,6 +15660,7 @@ START_TEST(device) test_feature_level(); test_device_interfaces(); test_create_texture1d(); + test_texture1d_interfaces(); test_create_texture2d(); test_texture2d_interfaces(); test_create_texture3d(); diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 1921299faf8..bc9d6a17b6d 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -120,6 +120,7 @@ struct d3d_texture1d LONG refcount; struct wined3d_private_store private_store; + IUnknown *dxgi_surface; struct wined3d_texture *wined3d_texture; D3D11_TEXTURE1D_DESC desc; ID3D11Device *device; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e8408c0a0a4..ca30a553521 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1866,6 +1866,7 @@ static void test_create_texture1d(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D11Device_Release(tmp); + check_interface(texture, &IID_IDXGISurface, TRUE, FALSE); ID3D11Texture1D_Release(texture); desc.MipLevels = 0; @@ -1919,6 +1920,127 @@ static void test_create_texture1d(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_texture1d_interfaces(void) +{ + ID3D10Texture1D *d3d10_texture; + D3D11_TEXTURE1D_DESC desc; + ID3D11Texture1D *texture; + ID3D11Device *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct test + { + BOOL implements_d3d10_interfaces; + UINT bind_flags; + UINT misc_flags; + UINT expected_bind_flags; + UINT expected_misc_flags; + } + desc_conversion_tests[] = + { + { + TRUE, + D3D11_BIND_SHADER_RESOURCE, 0, + D3D10_BIND_SHADER_RESOURCE, 0 + }, + { + TRUE, + D3D11_BIND_UNORDERED_ACCESS, 0, + D3D11_BIND_UNORDERED_ACCESS, 0 + }, + { + FALSE, + 0, D3D11_RESOURCE_MISC_RESOURCE_CLAMP, + 0, 0 + }, + { + TRUE, + 0, D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + 0, D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX + }, + }; + + if (!(device = create_device(NULL))) + { + skip("Failed to create ID3D11Device, skipping tests.\n"); + return; + } + + desc.Width = 512; + desc.MipLevels = 0; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 1d texture, hr %#x.\n", hr); + check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + hr = check_interface(texture, &IID_ID3D10Texture1D, TRUE, TRUE); /* Not available on all Windows versions. */ + ID3D11Texture1D_Release(texture); + if (FAILED(hr)) + { + win_skip("1D textures do not implement ID3D10Texture1D, skipping tests.\n"); + ID3D11Device_Release(device); + return; + } + + for (i = 0; i < ARRAY_SIZE(desc_conversion_tests); ++i) + { + const struct test *current = &desc_conversion_tests[i]; + ID3D10Device *d3d10_device; + + desc.Width = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = current->bind_flags; + desc.CPUAccessFlags = 0; + desc.MiscFlags = current->misc_flags; + + hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); + /* Shared resources are not supported by REF and WARP devices. */ + ok(SUCCEEDED(hr) || broken(hr == E_OUTOFMEMORY), + "Test %u: Failed to create a 1d texture, hr %#x.\n", i, hr); + if (FAILED(hr)) + { + win_skip("Failed to create ID3D11Texture1D, skipping test %u.\n", i); + continue; + } + + check_interface(texture, &IID_IDXGISurface, TRUE, FALSE); + + hr = ID3D11Texture1D_QueryInterface(texture, &IID_ID3D10Texture1D, (void **)&d3d10_texture); + ID3D11Texture1D_Release(texture); + + if (current->implements_d3d10_interfaces) + { + ok(SUCCEEDED(hr), "Test %u: Texture should implement ID3D10Texture1D.\n", i); + } + else + { + todo_wine ok(hr == E_NOINTERFACE, "Test %u: Texture should not implement ID3D10Texture1D.\n", i); + if (SUCCEEDED(hr)) ID3D10Texture1D_Release(d3d10_texture); + continue; + } + + d3d10_device = (ID3D10Device *)0xdeadbeef; + ID3D10Texture1D_GetDevice(d3d10_texture, &d3d10_device); + todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); + if (d3d10_device) ID3D10Device_Release(d3d10_device); + + ID3D10Texture1D_Release(d3d10_texture); + } + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_texture2d(void) { ULONG refcount, expected_refcount; @@ -25735,6 +25857,7 @@ START_TEST(d3d11) run_for_each_feature_level(test_device_interfaces); test_get_immediate_context(); test_create_texture1d(); + test_texture1d_interfaces(); test_create_texture2d(); test_texture2d_interfaces(); test_create_texture3d(); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 66328b7724c..c6998ed29c4 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -57,6 +57,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture1d_QueryInterface(ID3D11Texture1D return S_OK; } + if (texture->dxgi_surface) + { + TRACE("Forwarding to dxgi surface.\n"); + return IUnknown_QueryInterface(texture->dxgi_surface, iid, out); + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; @@ -117,9 +123,19 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture1d_GetPrivateData(ID3D11Texture1D REFGUID guid, UINT *data_size, void *data) { struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + IDXGISurface *dxgi_surface; + HRESULT hr; TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + if (texture->dxgi_surface + && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) + { + hr = IDXGISurface_GetPrivateData(dxgi_surface, guid, data_size, data); + IDXGISurface_Release(dxgi_surface); + return hr; + } + return d3d_get_private_data(&texture->private_store, guid, data_size, data); } @@ -127,9 +143,19 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture1d_SetPrivateData(ID3D11Texture1D REFGUID guid, UINT data_size, const void *data) { struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + IDXGISurface *dxgi_surface; + HRESULT hr; TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + if (texture->dxgi_surface + && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) + { + hr = IDXGISurface_SetPrivateData(dxgi_surface, guid, data_size, data); + IDXGISurface_Release(dxgi_surface); + return hr; + } + return d3d_set_private_data(&texture->private_store, guid, data_size, data); } @@ -137,9 +163,19 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture1d_SetPrivateDataInterface(ID3D11T REFGUID guid, const IUnknown *data) { struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + IDXGISurface *dxgi_surface; + HRESULT hr; TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + if (texture->dxgi_surface + && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) + { + hr = IDXGISurface_SetPrivateDataInterface(dxgi_surface, guid, data); + IDXGISurface_Release(dxgi_surface); + return hr; + } + return d3d_set_private_data_interface(&texture->private_store, guid, data); } @@ -228,6 +264,8 @@ static void STDMETHODCALLTYPE d3d_texture1d_wined3d_object_released(void *parent { struct d3d_texture1d *texture = parent; + if (texture->dxgi_surface) + IUnknown_Release(texture->dxgi_surface); wined3d_private_store_cleanup(&texture->private_store); heap_free(texture); } @@ -397,20 +435,46 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE flags |= WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS; wined3d_mutex_lock(); - hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, desc->ArraySize, levels, flags, (struct wined3d_sub_resource_data *)data, - texture, &d3d_texture1d_wined3d_parent_ops, &texture->wined3d_texture); - wined3d_mutex_unlock(); - if (FAILED(hr)) + texture, &d3d_texture1d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); wined3d_private_store_cleanup(&texture->private_store); heap_free(texture); + wined3d_mutex_unlock(); if (hr == WINED3DERR_NOTAVAILABLE || hr == WINED3DERR_INVALIDCALL) hr = E_INVALIDARG; return hr; } + if (desc->MipLevels == 1 && desc->ArraySize == 1) + { + IWineDXGIDevice *wine_device; + + if (FAILED(hr = ID3D10Device1_QueryInterface(&device->ID3D10Device1_iface, &IID_IWineDXGIDevice, + (void **)&wine_device))) + { + ERR("Device should implement IWineDXGIDevice.\n"); + wined3d_texture_decref(texture->wined3d_texture); + wined3d_mutex_unlock(); + return E_FAIL; + } + + hr = IWineDXGIDevice_create_surface(wine_device, texture->wined3d_texture, 0, NULL, + (IUnknown *)&texture->ID3D10Texture1D_iface, (void **)&texture->dxgi_surface); + IWineDXGIDevice_Release(wine_device); + if (FAILED(hr)) + { + ERR("Failed to create DXGI surface, returning %#.x\n", hr); + texture->dxgi_surface = NULL; + wined3d_texture_decref(texture->wined3d_texture); + wined3d_mutex_unlock(); + return hr; + } + } + wined3d_mutex_unlock(); + texture->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(texture->device); -- 2.11.0

1 0

[PATCH 4/8] d3d11: Create wined3d textures for 1D textures.
by Henri Verbeet 02 Apr '18

02 Apr '18

From: Sven Hesse <shesse(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 530 ++++++++++++++++++++++++++++++++++++++++- dlls/d3d11/d3d11_private.h | 3 + dlls/d3d11/tests/d3d11.c | 534 +++++++++++++++++++++++++++++++++++++++++- dlls/d3d11/texture.c | 89 ++++++- dlls/d3d11/utils.c | 8 + 5 files changed, 1155 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index c4349395338..5cd4e5184aa 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1313,6 +1313,7 @@ static void test_device_interfaces(void) static void test_create_texture1d(void) { ULONG refcount, expected_refcount; + D3D10_SUBRESOURCE_DATA data = {0}; ID3D10Device *device, *tmp; D3D10_TEXTURE1D_DESC desc; ID3D10Texture1D *texture; @@ -1334,6 +1335,9 @@ static void test_create_texture1d(void) desc.CPUAccessFlags = 0; desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture1D(device, &desc, &data, &texture); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + expected_refcount = get_refcount(device) + 1; hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 1d texture, hr %#x.\n", hr); @@ -1381,8 +1385,7 @@ static void test_create_texture1d(void) desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; desc.MiscFlags = 0; hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, (ID3D10Texture1D **)&texture); - todo_wine_if(!i) - ok(hr == (i ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (i ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); if (SUCCEEDED(hr)) ID3D10Texture1D_Release(texture); } @@ -5550,6 +5553,528 @@ done: release_test_context(&test_context); } +static void test_texture1d(void) +{ + struct shader + { + const DWORD *code; + size_t size; + }; + struct texture + { + UINT width; + UINT miplevel_count; + UINT array_size; + DXGI_FORMAT format; + D3D10_SUBRESOURCE_DATA data[3]; + }; + + struct d3d10core_test_context test_context; + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + const struct texture *current_texture; + D3D10_TEXTURE1D_DESC texture_desc; + D3D10_SAMPLER_DESC sampler_desc; + const struct shader *current_ps; + ID3D10ShaderResourceView *srv; + ID3D10SamplerState *sampler; + struct resource_readback rb; + ID3D10Texture1D *texture; + struct vec4 ps_constant; + ID3D10PixelShader *ps; + ID3D10Device *device; + unsigned int i, x; + ID3D10Buffer *cb; + DWORD color; + HRESULT hr; + + static const DWORD ps_ld_code[] = + { +#if 0 + Texture1D t; + + float miplevel; + + float4 main(float4 position : SV_POSITION) : SV_TARGET + { + float2 p; + t.GetDimensions(miplevel, p.x, p.y); + p.y = miplevel; + p *= float2(position.x / 640.0f, 1.0f); + return t.Load(int2(p)); + } +#endif + 0x43425844, 0x7b0c6359, 0x598178f6, 0xef2ddbdb, 0x88fc794c, 0x00000001, 0x000001ac, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000010f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000110, 0x00000040, + 0x00000044, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04001058, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101012, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x0600001c, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, + 0x0700003d, 0x001000f2, 0x00000000, 0x0010000a, 0x00000000, 0x00107e46, 0x00000000, 0x07000038, + 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0010100a, 0x00000000, 0x06000036, 0x001000e2, + 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x0a000038, 0x001000f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00004002, 0x3acccccd, 0x3f800000, 0x3f800000, 0x3f800000, 0x0500001b, 0x001000f2, + 0x00000000, 0x00100e46, 0x00000000, 0x0700002d, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x00107e46, 0x00000000, 0x0100003e, + }; + static const struct shader ps_ld = {ps_ld_code, sizeof(ps_ld_code)}; + static const DWORD ps_ld_sint8_code[] = + { +#if 0 + Texture1D<int4> t; + + float4 main(float4 position : SV_POSITION) : SV_TARGET + { + float2 p, s; + int4 c; + + p = float2(position.x / 640.0f, 0.0f); + t.GetDimensions(0, s.x, s.y); + p *= s; + + c = t.Load(int2(p)); + return (max(c / (float4)127, (float4)-1) + (float4)1) / 2.0f; + } +#endif + 0x43425844, 0x65a13d1e, 0x8a0bfc92, 0xa2f2708a, 0x0bafafb6, 0x00000001, 0x00000234, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000010f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000198, 0x00000040, + 0x00000066, 0x04001058, 0x00107000, 0x00000000, 0x00003333, 0x04002064, 0x00101012, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x0700003d, 0x001000f2, + 0x00000000, 0x00004001, 0x00000000, 0x00107e46, 0x00000000, 0x07000038, 0x00100012, 0x00000001, + 0x0010100a, 0x00000000, 0x00004001, 0x3acccccd, 0x08000036, 0x001000e2, 0x00000001, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x07000038, 0x001000f2, 0x00000000, 0x00100fc6, + 0x00000000, 0x00100e46, 0x00000001, 0x0500001b, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, + 0x0700002d, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0500002b, + 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x0a000038, 0x001000f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00004002, 0x3c010204, 0x3c010204, 0x3c010204, 0x3c010204, 0x0a000034, 0x001000f2, + 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0xbf800000, 0xbf800000, 0xbf800000, 0xbf800000, + 0x0a000000, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, + 0x3f800000, 0x3f800000, 0x0a000038, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, + 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, + }; + static const struct shader ps_ld_sint8 = {ps_ld_sint8_code, sizeof(ps_ld_sint8_code)}; + static const DWORD ps_ld_uint8_code[] = + { +#if 0 + Texture1D<uint4> t; + + float4 main(float4 position : SV_POSITION) : SV_TARGET + { + float2 p, s; + + p = float2(position.x / 640.0f, 0.0f); + t.GetDimensions(0, s.x, s.y); + p *= s; + + return t.Load(int2(p)) / (float4)255; + } +#endif + 0x43425844, 0x35186c1f, 0x55bad4fd, 0xb7c97a57, 0x99c060e7, 0x00000001, 0x000001bc, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000010f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000120, 0x00000040, + 0x00000048, 0x04001058, 0x00107000, 0x00000000, 0x00004444, 0x04002064, 0x00101012, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x0700003d, 0x001000f2, + 0x00000000, 0x00004001, 0x00000000, 0x00107e46, 0x00000000, 0x07000038, 0x00100012, 0x00000001, + 0x0010100a, 0x00000000, 0x00004001, 0x3acccccd, 0x08000036, 0x001000e2, 0x00000001, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x07000038, 0x001000f2, 0x00000000, 0x00100fc6, + 0x00000000, 0x00100e46, 0x00000001, 0x0500001b, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, + 0x0700002d, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x05000056, + 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x0a000038, 0x001020f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00004002, 0x3b808081, 0x3b808081, 0x3b808081, 0x3b808081, 0x0100003e, + }; + static const struct shader ps_ld_uint8 = {ps_ld_uint8_code, sizeof(ps_ld_uint8_code)}; + static DWORD ps_ld_array_code[] = + { +#if 0 + Texture1DArray t; + + float miplevel; + + float4 main(float4 position : SV_POSITION) : SV_TARGET + { + float3 p; + t.GetDimensions(miplevel, p.x, p.y, p.z); + p.y = 1; + p.z = miplevel; + p *= float3(position.x / 640.0f, 1.0f, 1.0f); + return t.Load(int3(p)); + } +#endif + 0x43425844, 0xbfccadc4, 0xc00ff13d, 0x2ba75365, 0xf747cbee, 0x00000001, 0x000001c0, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000010f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000124, 0x00000040, + 0x00000049, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04003858, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101012, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x0600001c, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, + 0x0700003d, 0x001000f2, 0x00000000, 0x0010000a, 0x00000000, 0x00107e46, 0x00000000, 0x07000038, + 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0010100a, 0x00000000, 0x06000036, 0x001000c2, + 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x0a000038, 0x00100072, 0x00000000, 0x00100386, + 0x00000000, 0x00004002, 0x3acccccd, 0x3f800000, 0x3f800000, 0x00000000, 0x0500001b, 0x001000d2, + 0x00000000, 0x00100906, 0x00000000, 0x05000036, 0x00100022, 0x00000000, 0x00004001, 0x00000001, + 0x0700002d, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, + }; + static const struct shader ps_ld_array = {ps_ld_array_code, sizeof(ps_ld_array_code)}; + + static const DWORD rgba_level_0[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + }; + static const DWORD rgba_level_1[] = + { + 0xffffffff, 0xff0000ff, + }; + static const DWORD rgba_level_2[] = + { + 0xffff0000, + }; + static const DWORD srgb_data[] = + { + 0x00000000, 0xffffffff, 0xff000000, 0x7f7f7f7f, + }; + static const DWORD r32_uint[] = + { + 0, 1, 2, 3, + }; + static const DWORD r9g9b9e5_data[] = + { + 0x80000100, 0x80020000, 0x84000000, 0x84000100, + }; + static const DWORD array_data0[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + }; + static const DWORD array_data1[] = + { + 0x00ffff00, 0xff000000, 0x00ff0000, 0x000000ff, + }; + static const DWORD array_data2[] = + { + 0x000000ff, 0xffff00ff, 0x0000ff00, 0xff000000, + }; + static const struct texture rgba_texture = + { + 4, 3, 1, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, + {rgba_level_1, 2 * sizeof(*rgba_level_1), 0}, + {rgba_level_2, sizeof(*rgba_level_2), 0}, + } + }; + static const struct texture srgb_texture = {4, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + {{srgb_data, 4 * sizeof(*srgb_data)}}}; + static const struct texture sint8_texture = {4, 1, 1, DXGI_FORMAT_R8G8B8A8_SINT, + {{rgba_level_0, 4 * sizeof(*rgba_level_0)}}}; + static const struct texture uint8_texture = {4, 1, 1, DXGI_FORMAT_R8G8B8A8_UINT, + {{rgba_level_0, 4 * sizeof(*rgba_level_0)}}}; + static const struct texture r32u_typeless = {4, 1, 1, DXGI_FORMAT_R32_TYPELESS, + {{r32_uint, 4 * sizeof(*r32_uint)}}}; + static const struct texture r9g9b9e5_texture = {4, 1, 1, DXGI_FORMAT_R9G9B9E5_SHAREDEXP, + {{r9g9b9e5_data, 4 * sizeof(*r9g9b9e5_data)}}}; + static const struct texture array_texture = {4, 1, 3, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + { + {array_data0, 4 * sizeof(*array_data0)}, + {array_data1, 4 * sizeof(*array_data1)}, + {array_data2, 4 * sizeof(*array_data2)}, + } + }; + + static const DWORD level_1_colors[] = + { + 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff, + }; + static const DWORD level_2_colors[] = + { + 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, + }; + static const DWORD srgb_colors[] = + { + 0x00000001, 0xffffffff, 0xff000000, 0x7f363636, + }; + static const DWORD sint8_colors[] = + { + 0x7e80807e, 0x7e807e7e, 0x7e807e80, 0x7e7e7e80, + }; + static const DWORD r32u_colors[4] = + { + 0x01000000, 0x01000001, 0x01000002, 0x01000003, + }; + static const DWORD r9g9b9e5_colors[4] = + { + 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffff00ff, + }; + static const DWORD zero_colors[4] = {0}; + static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const struct texture_test + { + const struct shader *ps; + const struct texture *texture; + D3D10_FILTER filter; + float lod_bias; + float min_lod; + float max_lod; + float ps_constant; + const DWORD *expected_colors; + } + texture_tests[] = + { +#define POINT D3D10_FILTER_MIN_MAG_MIP_POINT +#define POINT_LINEAR D3D10_FILTER_MIN_MAG_POINT_MIP_LINEAR +#define MIP_MAX D3D10_FLOAT32_MAX + {&ps_ld, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, + {&ps_ld, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, 1.0f, level_1_colors}, + {&ps_ld, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, 2.0f, level_2_colors}, + {&ps_ld, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, 3.0f, zero_colors}, + {&ps_ld, &srgb_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, srgb_colors}, + {&ps_ld, &r9g9b9e5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, r9g9b9e5_colors}, + {&ps_ld, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_ld, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, + {&ps_ld_sint8, &sint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, sint8_colors}, + {&ps_ld_uint8, &uint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, + {&ps_ld_array, &array_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, array_data1}, + }; +#undef POINT +#undef POINT_LINEAR +#undef MIP_MAX + static const struct srv_test + { + const struct shader *ps; + const struct texture *texture; + struct srv_desc srv_desc; + float ps_constant; + const DWORD *expected_colors; + } + srv_tests[] = + { +#define TEX_1D D3D10_SRV_DIMENSION_TEXTURE1D +#define R32_UINT DXGI_FORMAT_R32_UINT + {&ps_ld_uint8, &r32u_typeless, {R32_UINT, TEX_1D, 0, 1}, 0.0f, r32u_colors}, +#undef TEX_1D +#undef R32_UINT +#undef FMT_UNKNOWN + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(ps_constant), NULL); + + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = D3D10_FLOAT32_MAX; + + ps = NULL; + srv = NULL; + sampler = NULL; + texture = NULL; + current_ps = NULL; + current_texture = NULL; + for (i = 0; i < ARRAY_SIZE(texture_tests); ++i) + { + const struct texture_test *test = &texture_tests[i]; + + if (current_ps != test->ps) + { + if (ps) + ID3D10PixelShader_Release(ps); + + current_ps = test->ps; + + hr = ID3D10Device_CreatePixelShader(device, current_ps->code, current_ps->size, &ps); + ok(SUCCEEDED(hr), "Test %u: Failed to create pixel shader, hr %#x.\n", i, hr); + + ID3D10Device_PSSetShader(device, ps); + } + + if (current_texture != test->texture) + { + if (texture) + ID3D10Texture1D_Release(texture); + if (srv) + ID3D10ShaderResourceView_Release(srv); + + current_texture = test->texture; + + if (current_texture) + { + texture_desc.Width = current_texture->width; + texture_desc.MipLevels = current_texture->miplevel_count; + texture_desc.ArraySize = current_texture->array_size; + texture_desc.Format = current_texture->format; + + hr = ID3D10Device_CreateTexture1D(device, &texture_desc, current_texture->data, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 1d texture, hr %#x.\n", i, hr); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + } + else + { + texture = NULL; + srv = NULL; + } + + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + } + + if (!sampler || (sampler_desc.Filter != test->filter + || sampler_desc.MipLODBias != test->lod_bias + || sampler_desc.MinLOD != test->min_lod + || sampler_desc.MaxLOD != test->max_lod)) + { + if (sampler) + ID3D10SamplerState_Release(sampler); + + sampler_desc.Filter = test->filter; + sampler_desc.MipLODBias = test->lod_bias; + sampler_desc.MinLOD = test->min_lod; + sampler_desc.MaxLOD = test->max_lod; + + hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Test %u: Failed to create sampler state, hr %#x.\n", i, hr); + + ID3D10Device_PSSetSamplers(device, 0, 1, &sampler); + } + + ps_constant.x = test->ps_constant; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &ps_constant, 0, 0); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + + draw_quad(&test_context); + + get_texture_readback(test_context.backbuffer, 0, &rb); + for (x = 0; x < 4; ++x) + { + color = get_readback_color(&rb, 80 + x * 160, 0); + ok(compare_color(color, test->expected_colors[x], 2), + "Test %u: Got unexpected color 0x%08x at (%u).\n", i, color, x); + } + release_resource_readback(&rb); + } + if (srv) + ID3D10ShaderResourceView_Release(srv); + ID3D10SamplerState_Release(sampler); + if (texture) + ID3D10Texture1D_Release(texture); + ID3D10PixelShader_Release(ps); + + if (is_warp_device(device) && !is_d3d11_interface_available(device)) + { + win_skip("SRV tests are broken on WARP.\n"); + ID3D10Buffer_Release(cb); + release_test_context(&test_context); + return; + } + + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = D3D10_FLOAT32_MAX; + + hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + ID3D10Device_PSSetSamplers(device, 0, 1, &sampler); + + ps = NULL; + srv = NULL; + texture = NULL; + current_ps = NULL; + current_texture = NULL; + for (i = 0; i < ARRAY_SIZE(srv_tests); ++i) + { + const struct srv_test *test = &srv_tests[i]; + + if (current_ps != test->ps) + { + if (ps) + ID3D10PixelShader_Release(ps); + + current_ps = test->ps; + + hr = ID3D10Device_CreatePixelShader(device, current_ps->code, current_ps->size, &ps); + ok(SUCCEEDED(hr), "Test %u: Failed to create pixel shader, hr %#x.\n", i, hr); + + ID3D10Device_PSSetShader(device, ps); + } + + if (current_texture != test->texture) + { + if (texture) + ID3D10Texture1D_Release(texture); + + current_texture = test->texture; + + texture_desc.Width = current_texture->width; + texture_desc.MipLevels = current_texture->miplevel_count; + texture_desc.ArraySize = current_texture->array_size; + texture_desc.Format = current_texture->format; + + hr = ID3D10Device_CreateTexture1D(device, &texture_desc, current_texture->data, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 1d texture, hr %#x.\n", i, hr); + } + + if (srv) + ID3D10ShaderResourceView_Release(srv); + + get_srv_desc(&srv_desc, &test->srv_desc); + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, &srv_desc, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + + ps_constant.x = test->ps_constant; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &ps_constant, 0, 0); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + + draw_quad(&test_context); + + get_texture_readback(test_context.backbuffer, 0, &rb); + for (x = 0; x < 4; ++x) + { + color = get_readback_color(&rb, 80 + x * 160, 0); + ok(compare_color(color, test->expected_colors[x], 1), + "Test %u: Got unexpected color 0x%08x at (%u).\n", i, color, x); + } + release_resource_readback(&rb); + } + ID3D10PixelShader_Release(ps); + ID3D10Texture1D_Release(texture); + ID3D10ShaderResourceView_Release(srv); + ID3D10SamplerState_Release(sampler); + + ID3D10Buffer_Release(cb); + release_test_context(&test_context); +} + static void test_texture(void) { struct shader @@ -15040,6 +15565,7 @@ START_TEST(device) test_scissor(); test_clear_state(); test_blend(); + test_texture1d(); test_texture(); test_cube_maps(); test_depth_stencil_sampling(); diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 68e56d76092..1921299faf8 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -120,12 +120,15 @@ struct d3d_texture1d LONG refcount; struct wined3d_private_store private_store; + struct wined3d_texture *wined3d_texture; D3D11_TEXTURE1D_DESC desc; ID3D11Device *device; }; HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture1d **texture) DECLSPEC_HIDDEN; +struct d3d_texture1d *unsafe_impl_from_ID3D11Texture1D(ID3D11Texture1D *iface) DECLSPEC_HIDDEN; +struct d3d_texture1d *unsafe_impl_from_ID3D10Texture1D(ID3D10Texture1D *iface) DECLSPEC_HIDDEN; /* ID3D11Texture2D, ID3D10Texture2D */ struct d3d_texture2d diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 146509dd05e..e8408c0a0a4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1828,6 +1828,7 @@ static void test_get_immediate_context(void) static void test_create_texture1d(void) { ULONG refcount, expected_refcount; + D3D11_SUBRESOURCE_DATA data = {0}; ID3D11Device *device, *tmp; D3D11_TEXTURE1D_DESC desc; ID3D11Texture1D *texture; @@ -1849,6 +1850,9 @@ static void test_create_texture1d(void) desc.CPUAccessFlags = 0; desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture1D(device, &desc, &data, &texture); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + expected_refcount = get_refcount(device) + 1; hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 1d texture, hr %#x.\n", hr); @@ -1906,8 +1910,7 @@ static void test_create_texture1d(void) desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; desc.MiscFlags = 0; hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, (ID3D11Texture1D **)&texture); - todo_wine_if(!i) - ok(hr == (i ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (i ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); if (SUCCEEDED(hr)) ID3D11Texture1D_Release(texture); } @@ -6032,6 +6035,532 @@ done: release_test_context(&test_context); } +static void test_texture1d(void) +{ + struct shader + { + const DWORD *code; + size_t size; + }; + struct texture + { + UINT width; + UINT miplevel_count; + UINT array_size; + DXGI_FORMAT format; + D3D11_SUBRESOURCE_DATA data[3]; + }; + + D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; + struct d3d11_test_context test_context; + const struct texture *current_texture; + D3D11_TEXTURE1D_DESC texture_desc; + D3D11_SAMPLER_DESC sampler_desc; + const struct shader *current_ps; + D3D_FEATURE_LEVEL feature_level; + ID3D11ShaderResourceView *srv; + ID3D11DeviceContext *context; + ID3D11SamplerState *sampler; + struct resource_readback rb; + ID3D11Texture1D *texture; + struct vec4 ps_constant; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i, x; + ID3D11Buffer *cb; + DWORD color; + HRESULT hr; + + static const DWORD ps_ld_code[] = + { +#if 0 + Texture1D t; + + float miplevel; + + float4 main(float4 position : SV_POSITION) : SV_TARGET + { + float2 p; + t.GetDimensions(miplevel, p.x, p.y); + p.y = miplevel; + p *= float2(position.x / 640.0f, 1.0f); + return t.Load(int2(p)); + } +#endif + 0x43425844, 0x7b0c6359, 0x598178f6, 0xef2ddbdb, 0x88fc794c, 0x00000001, 0x000001ac, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000010f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000110, 0x00000040, + 0x00000044, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04001058, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101012, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x0600001c, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, + 0x0700003d, 0x001000f2, 0x00000000, 0x0010000a, 0x00000000, 0x00107e46, 0x00000000, 0x07000038, + 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0010100a, 0x00000000, 0x06000036, 0x001000e2, + 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x0a000038, 0x001000f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00004002, 0x3acccccd, 0x3f800000, 0x3f800000, 0x3f800000, 0x0500001b, 0x001000f2, + 0x00000000, 0x00100e46, 0x00000000, 0x0700002d, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x00107e46, 0x00000000, 0x0100003e, + }; + static const struct shader ps_ld = {ps_ld_code, sizeof(ps_ld_code)}; + static const DWORD ps_ld_sint8_code[] = + { +#if 0 + Texture1D<int4> t; + + float4 main(float4 position : SV_POSITION) : SV_TARGET + { + float2 p, s; + int4 c; + + p = float2(position.x / 640.0f, 0.0f); + t.GetDimensions(0, s.x, s.y); + p *= s; + + c = t.Load(int2(p)); + return (max(c / (float4)127, (float4)-1) + (float4)1) / 2.0f; + } +#endif + 0x43425844, 0x65a13d1e, 0x8a0bfc92, 0xa2f2708a, 0x0bafafb6, 0x00000001, 0x00000234, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000010f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000198, 0x00000040, + 0x00000066, 0x04001058, 0x00107000, 0x00000000, 0x00003333, 0x04002064, 0x00101012, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x0700003d, 0x001000f2, + 0x00000000, 0x00004001, 0x00000000, 0x00107e46, 0x00000000, 0x07000038, 0x00100012, 0x00000001, + 0x0010100a, 0x00000000, 0x00004001, 0x3acccccd, 0x08000036, 0x001000e2, 0x00000001, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x07000038, 0x001000f2, 0x00000000, 0x00100fc6, + 0x00000000, 0x00100e46, 0x00000001, 0x0500001b, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, + 0x0700002d, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0500002b, + 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x0a000038, 0x001000f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00004002, 0x3c010204, 0x3c010204, 0x3c010204, 0x3c010204, 0x0a000034, 0x001000f2, + 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0xbf800000, 0xbf800000, 0xbf800000, 0xbf800000, + 0x0a000000, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, + 0x3f800000, 0x3f800000, 0x0a000038, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, + 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, + }; + static const struct shader ps_ld_sint8 = {ps_ld_sint8_code, sizeof(ps_ld_sint8_code)}; + static const DWORD ps_ld_uint8_code[] = + { +#if 0 + Texture1D<uint4> t; + + float4 main(float4 position : SV_POSITION) : SV_TARGET + { + float2 p, s; + + p = float2(position.x / 640.0f, 0.0f); + t.GetDimensions(0, s.x, s.y); + p *= s; + + return t.Load(int2(p)) / (float4)255; + } +#endif + 0x43425844, 0x35186c1f, 0x55bad4fd, 0xb7c97a57, 0x99c060e7, 0x00000001, 0x000001bc, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000010f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000120, 0x00000040, + 0x00000048, 0x04001058, 0x00107000, 0x00000000, 0x00004444, 0x04002064, 0x00101012, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x0700003d, 0x001000f2, + 0x00000000, 0x00004001, 0x00000000, 0x00107e46, 0x00000000, 0x07000038, 0x00100012, 0x00000001, + 0x0010100a, 0x00000000, 0x00004001, 0x3acccccd, 0x08000036, 0x001000e2, 0x00000001, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x07000038, 0x001000f2, 0x00000000, 0x00100fc6, + 0x00000000, 0x00100e46, 0x00000001, 0x0500001b, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, + 0x0700002d, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x05000056, + 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x0a000038, 0x001020f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00004002, 0x3b808081, 0x3b808081, 0x3b808081, 0x3b808081, 0x0100003e, + }; + static const struct shader ps_ld_uint8 = {ps_ld_uint8_code, sizeof(ps_ld_uint8_code)}; + static DWORD ps_ld_array_code[] = + { +#if 0 + Texture1DArray t; + + float miplevel; + + float4 main(float4 position : SV_POSITION) : SV_TARGET + { + float3 p; + t.GetDimensions(miplevel, p.x, p.y, p.z); + p.y = 1; + p.z = miplevel; + p *= float3(position.x / 640.0f, 1.0f, 1.0f); + return t.Load(int3(p)); + } +#endif + 0x43425844, 0xbfccadc4, 0xc00ff13d, 0x2ba75365, 0xf747cbee, 0x00000001, 0x000001c0, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000010f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000124, 0x00000040, + 0x00000049, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04003858, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101012, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x0600001c, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, + 0x0700003d, 0x001000f2, 0x00000000, 0x0010000a, 0x00000000, 0x00107e46, 0x00000000, 0x07000038, + 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0010100a, 0x00000000, 0x06000036, 0x001000c2, + 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x0a000038, 0x00100072, 0x00000000, 0x00100386, + 0x00000000, 0x00004002, 0x3acccccd, 0x3f800000, 0x3f800000, 0x00000000, 0x0500001b, 0x001000d2, + 0x00000000, 0x00100906, 0x00000000, 0x05000036, 0x00100022, 0x00000000, 0x00004001, 0x00000001, + 0x0700002d, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, + }; + static const struct shader ps_ld_array = {ps_ld_array_code, sizeof(ps_ld_array_code)}; + + static const DWORD rgba_level_0[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + }; + static const DWORD rgba_level_1[] = + { + 0xffffffff, 0xff0000ff, + }; + static const DWORD rgba_level_2[] = + { + 0xffff0000, + }; + static const DWORD srgb_data[] = + { + 0x00000000, 0xffffffff, 0xff000000, 0x7f7f7f7f, + }; + static const DWORD r32_uint[] = + { + 0, 1, 2, 3, + }; + static const DWORD r9g9b9e5_data[] = + { + 0x80000100, 0x80020000, 0x84000000, 0x84000100, + }; + static const DWORD array_data0[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + }; + static const DWORD array_data1[] = + { + 0x00ffff00, 0xff000000, 0x00ff0000, 0x000000ff, + }; + static const DWORD array_data2[] = + { + 0x000000ff, 0xffff00ff, 0x0000ff00, 0xff000000, + }; + static const struct texture rgba_texture = + { + 4, 3, 1, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, + {rgba_level_1, 2 * sizeof(*rgba_level_1), 0}, + {rgba_level_2, sizeof(*rgba_level_2), 0}, + } + }; + static const struct texture srgb_texture = {4, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + {{srgb_data, 4 * sizeof(*srgb_data)}}}; + static const struct texture sint8_texture = {4, 1, 1, DXGI_FORMAT_R8G8B8A8_SINT, + {{rgba_level_0, 4 * sizeof(*rgba_level_0)}}}; + static const struct texture uint8_texture = {4, 1, 1, DXGI_FORMAT_R8G8B8A8_UINT, + {{rgba_level_0, 4 * sizeof(*rgba_level_0)}}}; + static const struct texture r32u_typeless = {4, 1, 1, DXGI_FORMAT_R32_TYPELESS, + {{r32_uint, 4 * sizeof(*r32_uint)}}}; + static const struct texture r9g9b9e5_texture = {4, 1, 1, DXGI_FORMAT_R9G9B9E5_SHAREDEXP, + {{r9g9b9e5_data, 4 * sizeof(*r9g9b9e5_data)}}}; + static const struct texture array_texture = {4, 1, 3, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + { + {array_data0, 4 * sizeof(*array_data0)}, + {array_data1, 4 * sizeof(*array_data1)}, + {array_data2, 4 * sizeof(*array_data2)}, + } + }; + + static const DWORD level_1_colors[] = + { + 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff, + }; + static const DWORD level_2_colors[] = + { + 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, + }; + static const DWORD srgb_colors[] = + { + 0x00000001, 0xffffffff, 0xff000000, 0x7f363636, + }; + static const DWORD sint8_colors[] = + { + 0x7e80807e, 0x7e807e7e, 0x7e807e80, 0x7e7e7e80, + }; + static const DWORD r32u_colors[4] = + { + 0x01000000, 0x01000001, 0x01000002, 0x01000003, + }; + static const DWORD r9g9b9e5_colors[4] = + { + 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffff00ff, + }; + static const DWORD zero_colors[4] = {0}; + static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const struct texture_test + { + const struct shader *ps; + const struct texture *texture; + D3D11_FILTER filter; + float lod_bias; + float min_lod; + float max_lod; + float ps_constant; + const DWORD *expected_colors; + } + texture_tests[] = + { +#define POINT D3D11_FILTER_MIN_MAG_MIP_POINT +#define POINT_LINEAR D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR +#define MIP_MAX D3D11_FLOAT32_MAX + {&ps_ld, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, + {&ps_ld, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, 1.0f, level_1_colors}, + {&ps_ld, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, 2.0f, level_2_colors}, + {&ps_ld, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, 3.0f, zero_colors}, + {&ps_ld, &srgb_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, srgb_colors}, + {&ps_ld, &r9g9b9e5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, r9g9b9e5_colors}, + {&ps_ld, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_ld, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, + {&ps_ld_sint8, &sint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, sint8_colors}, + {&ps_ld_uint8, &uint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, + {&ps_ld_array, &array_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, array_data1}, + }; +#undef POINT +#undef POINT_LINEAR +#undef MIP_MAX + static const struct srv_test + { + const struct shader *ps; + const struct texture *texture; + struct srv_desc srv_desc; + float ps_constant; + const DWORD *expected_colors; + } + srv_tests[] = + { +#define TEX_1D D3D11_SRV_DIMENSION_TEXTURE1D +#define R32_UINT DXGI_FORMAT_R32_UINT + {&ps_ld_uint8, &r32u_typeless, {R32_UINT, TEX_1D, 0, 1}, 0.0f, r32u_colors}, +#undef TEX_1D +#undef R32_UINT +#undef FMT_UNKNOWN + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + feature_level = ID3D11Device_GetFeatureLevel(device); + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(ps_constant), NULL); + + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = D3D11_FLOAT32_MAX; + + ps = NULL; + srv = NULL; + sampler = NULL; + texture = NULL; + current_ps = NULL; + current_texture = NULL; + for (i = 0; i < ARRAY_SIZE(texture_tests); ++i) + { + const struct texture_test *test = &texture_tests[i]; + + if (current_ps != test->ps) + { + if (ps) + ID3D11PixelShader_Release(ps); + + current_ps = test->ps; + + hr = ID3D11Device_CreatePixelShader(device, current_ps->code, current_ps->size, NULL, &ps); + ok(SUCCEEDED(hr), "Test %u: Failed to create pixel shader, hr %#x.\n", i, hr); + + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + } + + if (current_texture != test->texture) + { + if (texture) + ID3D11Texture1D_Release(texture); + if (srv) + ID3D11ShaderResourceView_Release(srv); + + current_texture = test->texture; + + if (current_texture) + { + texture_desc.Width = current_texture->width; + texture_desc.MipLevels = current_texture->miplevel_count; + texture_desc.ArraySize = current_texture->array_size; + texture_desc.Format = current_texture->format; + + hr = ID3D11Device_CreateTexture1D(device, &texture_desc, current_texture->data, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 1d texture, hr %#x.\n", i, hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + } + else + { + texture = NULL; + srv = NULL; + } + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + } + + if (!sampler || (sampler_desc.Filter != test->filter + || sampler_desc.MipLODBias != test->lod_bias + || sampler_desc.MinLOD != test->min_lod + || sampler_desc.MaxLOD != test->max_lod)) + { + if (sampler) + ID3D11SamplerState_Release(sampler); + + sampler_desc.Filter = test->filter; + sampler_desc.MipLODBias = test->lod_bias; + sampler_desc.MinLOD = test->min_lod; + sampler_desc.MaxLOD = test->max_lod; + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Test %u: Failed to create sampler state, hr %#x.\n", i, hr); + + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler); + } + + ps_constant.x = test->ps_constant; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &ps_constant, 0, 0); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + + draw_quad(&test_context); + + get_texture_readback(test_context.backbuffer, 0, &rb); + for (x = 0; x < 4; ++x) + { + color = get_readback_color(&rb, 80 + x * 160, 0); + ok(compare_color(color, test->expected_colors[x], 2), + "Test %u: Got unexpected color 0x%08x at (%u).\n", i, color, x); + } + release_resource_readback(&rb); + } + if (srv) + ID3D11ShaderResourceView_Release(srv); + ID3D11SamplerState_Release(sampler); + if (texture) + ID3D11Texture1D_Release(texture); + ID3D11PixelShader_Release(ps); + + if (is_warp_device(device) && feature_level < D3D_FEATURE_LEVEL_11_0) + { + win_skip("SRV tests are broken on WARP.\n"); + ID3D11Buffer_Release(cb); + release_test_context(&test_context); + return; + } + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = D3D11_FLOAT32_MAX; + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler); + + ps = NULL; + srv = NULL; + texture = NULL; + current_ps = NULL; + current_texture = NULL; + for (i = 0; i < ARRAY_SIZE(srv_tests); ++i) + { + const struct srv_test *test = &srv_tests[i]; + + if (current_ps != test->ps) + { + if (ps) + ID3D11PixelShader_Release(ps); + + current_ps = test->ps; + + hr = ID3D11Device_CreatePixelShader(device, current_ps->code, current_ps->size, NULL, &ps); + ok(SUCCEEDED(hr), "Test %u: Failed to create pixel shader, hr %#x.\n", i, hr); + + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + } + + if (current_texture != test->texture) + { + if (texture) + ID3D11Texture1D_Release(texture); + + current_texture = test->texture; + + texture_desc.Width = current_texture->width; + texture_desc.MipLevels = current_texture->miplevel_count; + texture_desc.ArraySize = current_texture->array_size; + texture_desc.Format = current_texture->format; + + hr = ID3D11Device_CreateTexture1D(device, &texture_desc, current_texture->data, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 1d texture, hr %#x.\n", i, hr); + } + + if (srv) + ID3D11ShaderResourceView_Release(srv); + + get_srv_desc(&srv_desc, &test->srv_desc); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, &srv_desc, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + + ps_constant.x = test->ps_constant; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &ps_constant, 0, 0); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + + draw_quad(&test_context); + + get_texture_readback(test_context.backbuffer, 0, &rb); + for (x = 0; x < 4; ++x) + { + color = get_readback_color(&rb, 80 + x * 160, 0); + ok(compare_color(color, test->expected_colors[x], 1), + "Test %u: Got unexpected color 0x%08x at (%u).\n", i, color, x); + } + release_resource_readback(&rb); + } + ID3D11PixelShader_Release(ps); + ID3D11Texture1D_Release(texture); + ID3D11ShaderResourceView_Release(srv); + ID3D11SamplerState_Release(sampler); + + ID3D11Buffer_Release(cb); + release_test_context(&test_context); +} + static void test_texture(void) { struct shader @@ -25229,6 +25758,7 @@ START_TEST(d3d11) run_for_each_feature_level(test_state_refcounting); test_device_context_state(); test_blend(); + test_texture1d(); test_texture(); test_cube_maps(); test_depth_stencil_sampling(); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 8c7a54956a7..66328b7724c 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -70,6 +70,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_AddRef(ID3D11Texture1D *iface) TRACE("%p increasing refcount to %u.\n", texture, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(texture->device); + wined3d_mutex_lock(); + wined3d_texture_incref(texture->wined3d_texture); + wined3d_mutex_unlock(); + } + return refcount; } @@ -82,9 +90,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_Release(ID3D11Texture1D *iface) if (!refcount) { - wined3d_private_store_cleanup(&texture->private_store); - ID3D11Device_Release(texture->device); - heap_free(texture); + ID3D11Device *device = texture->device; + + wined3d_mutex_lock(); + wined3d_texture_decref(texture->wined3d_texture); + wined3d_mutex_unlock(); + /* Release the device last, it may cause the wined3d device to be + * destroyed. */ + ID3D11Device_Release(device); } return refcount; @@ -178,6 +191,14 @@ static const struct ID3D11Texture1DVtbl d3d11_texture1d_vtbl = d3d11_texture1d_GetDesc, }; +struct d3d_texture1d *unsafe_impl_from_ID3D11Texture1D(ID3D11Texture1D *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_texture1d_vtbl); + return CONTAINING_RECORD(iface, struct d3d_texture1d, ID3D11Texture1D_iface); +} + static inline struct d3d_texture1d *impl_from_ID3D10Texture1D(ID3D10Texture1D *iface) { return CONTAINING_RECORD(iface, struct d3d_texture1d, ID3D10Texture1D_iface); @@ -203,6 +224,14 @@ static ULONG STDMETHODCALLTYPE d3d10_texture1d_AddRef(ID3D10Texture1D *iface) return d3d11_texture1d_AddRef(&texture->ID3D11Texture1D_iface); } +static void STDMETHODCALLTYPE d3d_texture1d_wined3d_object_released(void *parent) +{ + struct d3d_texture1d *texture = parent; + + wined3d_private_store_cleanup(&texture->private_store); + heap_free(texture); +} + static ULONG STDMETHODCALLTYPE d3d10_texture1d_Release(ID3D10Texture1D *iface) { struct d3d_texture1d *texture = impl_from_ID3D10Texture1D(iface); @@ -317,10 +346,27 @@ static const struct ID3D10Texture1DVtbl d3d10_texture1d_vtbl = d3d10_texture1d_GetDesc, }; +struct d3d_texture1d *unsafe_impl_from_ID3D10Texture1D(ID3D10Texture1D *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_texture1d_vtbl); + return CONTAINING_RECORD(iface, struct d3d_texture1d, ID3D10Texture1D_iface); +} + +static const struct wined3d_parent_ops d3d_texture1d_wined3d_parent_ops = +{ + d3d_texture1d_wined3d_object_released, +}; + HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture1d **out) { + struct wined3d_resource_desc wined3d_desc; struct d3d_texture1d *texture; + unsigned int levels; + DWORD flags = 0; + HRESULT hr; if (!(texture = heap_alloc_zero(sizeof(*texture)))) return E_OUTOFMEMORY; @@ -328,10 +374,43 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE texture->ID3D11Texture1D_iface.lpVtbl = &d3d11_texture1d_vtbl; texture->ID3D10Texture1D_iface.lpVtbl = &d3d10_texture1d_vtbl; texture->refcount = 1; - wined3d_private_store_init(&texture->private_store); texture->desc = *desc; - texture->desc.MipLevels = desc->MipLevels ? desc->MipLevels : wined3d_log2i(desc->Width) + 1; + levels = desc->MipLevels ? desc->MipLevels : wined3d_log2i(desc->Width) + 1; + texture->desc.MipLevels = levels; + + wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE_1D; + wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format); + wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; + wined3d_desc.multisample_quality = 0; + wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage); + wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, + desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); + wined3d_desc.width = desc->Width; + wined3d_desc.height = 1; + wined3d_desc.depth = 1; + wined3d_desc.size = 0; + + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GDI_COMPATIBLE) + flags |= WINED3D_TEXTURE_CREATE_GET_DC; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS) + flags |= WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS; + + wined3d_mutex_lock(); + hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, + desc->ArraySize, levels, flags, (struct wined3d_sub_resource_data *)data, + texture, &d3d_texture1d_wined3d_parent_ops, &texture->wined3d_texture); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to create wined3d texture, hr %#x.\n", hr); + wined3d_private_store_cleanup(&texture->private_store); + heap_free(texture); + if (hr == WINED3DERR_NOTAVAILABLE || hr == WINED3DERR_INVALIDCALL) + hr = E_INVALIDARG; + return hr; + } + texture->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(texture->device); diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index cd226b21fb8..8fdb00518ff 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -713,6 +713,10 @@ struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *re return wined3d_buffer_get_resource(unsafe_impl_from_ID3D11Buffer( (ID3D11Buffer *)resource)->wined3d_buffer); + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + return wined3d_texture_get_resource(unsafe_impl_from_ID3D11Texture1D( + (ID3D11Texture1D *)resource)->wined3d_texture); + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: return wined3d_texture_get_resource(unsafe_impl_from_ID3D11Texture2D( (ID3D11Texture2D *)resource)->wined3d_texture); @@ -739,6 +743,10 @@ struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *re return wined3d_buffer_get_resource(unsafe_impl_from_ID3D10Buffer( (ID3D10Buffer *)resource)->wined3d_buffer); + case D3D10_RESOURCE_DIMENSION_TEXTURE1D: + return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture1D( + (ID3D10Texture1D *)resource)->wined3d_texture); + case D3D10_RESOURCE_DIMENSION_TEXTURE2D: return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture2D( (ID3D10Texture2D *)resource)->wined3d_texture); -- 2.11.0

1 0

[PATCH 3/8] wined3d: Implement support for 1D textures.
by Henri Verbeet 02 Apr '18

02 Apr '18

From: Sven Hesse <shesse(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 20 ++- dlls/wined3d/device.c | 17 +++ dlls/wined3d/directx.c | 14 ++ dlls/wined3d/glsl_shader.c | 7 + dlls/wined3d/nvidia_texture_shader.c | 3 + dlls/wined3d/resource.c | 1 + dlls/wined3d/shader.c | 3 +- dlls/wined3d/texture.c | 284 ++++++++++++++++++++++++++++------- dlls/wined3d/utils.c | 1 + dlls/wined3d/view.c | 5 + dlls/wined3d/wined3d_private.h | 2 + include/wine/wined3d.h | 5 +- 12 files changed, 306 insertions(+), 56 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 47eb42e9f71..4b2f26359b7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -144,7 +144,8 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context, gl_info->fbo_ops.glFramebufferTexture(fbo_target, attachment, resource->object, resource->level); } - else if (resource->target == GL_TEXTURE_2D_ARRAY || resource->target == GL_TEXTURE_3D) + else if (resource->target == GL_TEXTURE_1D_ARRAY || resource->target == GL_TEXTURE_2D_ARRAY + || resource->target == GL_TEXTURE_3D) { if (!gl_info->fbo_ops.glFramebufferTextureLayer) { @@ -155,6 +156,11 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context, gl_info->fbo_ops.glFramebufferTextureLayer(fbo_target, attachment, resource->object, resource->level, resource->layer); } + else if (resource->target == GL_TEXTURE_1D) + { + gl_info->fbo_ops.glFramebufferTexture1D(fbo_target, attachment, + resource->target, resource->object, resource->level); + } else { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, attachment, @@ -242,6 +248,8 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G } texture_type[] = { + {GL_TEXTURE_1D, GL_TEXTURE_BINDING_1D, "1d", WINED3D_GL_EXT_NONE}, + {GL_TEXTURE_1D_ARRAY, GL_TEXTURE_BINDING_1D_ARRAY, "1d-array", EXT_TEXTURE_ARRAY}, {GL_TEXTURE_2D, GL_TEXTURE_BINDING_2D, "2d", WINED3D_GL_EXT_NONE}, {GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB, "rectangle", ARB_TEXTURE_RECTANGLE}, {GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BINDING_2D_ARRAY, "2d-array" , EXT_TEXTURE_ARRAY}, @@ -1742,6 +1750,7 @@ void context_bind_dummy_textures(const struct wined3d_device *device, const stru { GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + i)); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D, textures->tex_1d); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, textures->tex_2d); if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) @@ -1757,7 +1766,10 @@ void context_bind_dummy_textures(const struct wined3d_device *device, const stru gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, textures->tex_cube_array); if (gl_info->supported[EXT_TEXTURE_ARRAY]) + { + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D_ARRAY, textures->tex_1d_array); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_ARRAY, textures->tex_2d_array); + } if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, textures->tex_buffer); @@ -2491,6 +2503,12 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint case GL_NONE: /* nothing to do */ break; + case GL_TEXTURE_1D: + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D, textures->tex_1d); + break; + case GL_TEXTURE_1D_ARRAY: + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D_ARRAY, textures->tex_1d_array); + break; case GL_TEXTURE_2D: gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, textures->tex_2d); break; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index adaa4f10000..cc42dba45df 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -630,6 +630,12 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ * to each texture stage when the currently set D3D texture is NULL. */ context_active_texture(context, gl_info, 0); + gl_info->gl_ops.gl.p_glGenTextures(1, &textures->tex_1d); + TRACE("Dummy 1D texture given name %u.\n", textures->tex_1d); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D, textures->tex_1d); + gl_info->gl_ops.gl.p_glTexImage1D(GL_TEXTURE_1D, 0, GL_RGBA8, 1, 0, + GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color); + gl_info->gl_ops.gl.p_glGenTextures(1, &textures->tex_2d); TRACE("Dummy 2D texture given name %u.\n", textures->tex_2d); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, textures->tex_2d); @@ -681,6 +687,12 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ if (gl_info->supported[EXT_TEXTURE_ARRAY]) { + gl_info->gl_ops.gl.p_glGenTextures(1, &textures->tex_1d_array); + TRACE("Dummy 1D array texture given name %u.\n", textures->tex_1d_array); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D_ARRAY, textures->tex_1d_array); + gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_1D_ARRAY, 0, GL_RGBA8, 1, 1, 0, + GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color); + gl_info->gl_ops.gl.p_glGenTextures(1, &textures->tex_2d_array); TRACE("Dummy 2D array texture given name %u.\n", textures->tex_2d_array); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_ARRAY, textures->tex_2d_array); @@ -748,7 +760,10 @@ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d gl_info->gl_ops.gl.p_glDeleteTextures(1, &dummy_textures->tex_buffer); if (gl_info->supported[EXT_TEXTURE_ARRAY]) + { gl_info->gl_ops.gl.p_glDeleteTextures(1, &dummy_textures->tex_2d_array); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &dummy_textures->tex_1d_array); + } if (gl_info->supported[ARB_TEXTURE_CUBE_MAP_ARRAY]) gl_info->gl_ops.gl.p_glDeleteTextures(1, &dummy_textures->tex_cube_array); @@ -763,6 +778,7 @@ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d gl_info->gl_ops.gl.p_glDeleteTextures(1, &dummy_textures->tex_rect); gl_info->gl_ops.gl.p_glDeleteTextures(1, &dummy_textures->tex_2d); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &dummy_textures->tex_1d); checkGLcall("delete dummy textures"); @@ -5055,6 +5071,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso switch (type) { + case WINED3D_RTYPE_TEXTURE_1D: case WINED3D_RTYPE_TEXTURE_2D: case WINED3D_RTYPE_TEXTURE_3D: for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3bd63c3c074..7deefaf82dc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5320,6 +5320,20 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; + case WINED3D_RTYPE_TEXTURE_1D: + allowed_usage = WINED3DUSAGE_DYNAMIC + | WINED3DUSAGE_SOFTWAREPROCESSING + | WINED3DUSAGE_TEXTURE + | WINED3DUSAGE_QUERY_FILTER + | WINED3DUSAGE_QUERY_GENMIPMAP + | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING + | WINED3DUSAGE_QUERY_SRGBREAD + | WINED3DUSAGE_QUERY_SRGBWRITE + | WINED3DUSAGE_QUERY_VERTEXTEXTURE + | WINED3DUSAGE_QUERY_WRAPANDMIP; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_1D; + break; + case WINED3D_RTYPE_TEXTURE_2D: allowed_usage = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_RENDERTARGET diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e920fac3907..0bc6aa02319 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2576,6 +2576,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont sampler_type = "samplerCube"; break; + case WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY: + if (shadow_sampler) + sampler_type = "sampler1DArrayShadow"; + else + sampler_type = "sampler1DArray"; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: if (shadow_sampler) sampler_type = "sampler2DArrayShadow"; diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 0baa414e57d..20db62739b5 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -69,6 +69,9 @@ static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD st gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_CUBE_MAP_ARB); checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_CUBE_MAP_ARB)"); break; + default: + FIXME("Unhandled target %#x.\n", state->textures[stage]->target); + break; } } else diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a95d6f50b68..2a6fa6ad7ec 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -75,6 +75,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource_types[] = { {WINED3D_RTYPE_BUFFER, 0, WINED3D_GL_RES_TYPE_BUFFER}, + {WINED3D_RTYPE_TEXTURE_1D, 0, WINED3D_GL_RES_TYPE_TEX_1D}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_2D}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB}, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 93079e89120..c20c1da14bc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3871,8 +3871,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 switch (texture->target) { /* RECT textures are distinguished from 2D textures via np2_fixup */ - case GL_TEXTURE_RECTANGLE_ARB: - case GL_TEXTURE_2D: + default: break; case GL_TEXTURE_3D: diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9e6b599c8e9..b56e6e4e65e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -445,7 +445,10 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * GLenum target; level_count = texture->level_count; - layer_count = texture->target == GL_TEXTURE_2D_ARRAY ? 1 : texture->layer_count; + if (texture->target == GL_TEXTURE_1D_ARRAY || texture->target == GL_TEXTURE_2D_ARRAY) + layer_count = 1; + else + layer_count = texture->layer_count; for (layer = 0; layer < layer_count; ++layer) { @@ -472,10 +475,16 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * format->glFormat, format->glType, NULL)); checkGLcall("glTexImage3D"); } + else if (target == GL_TEXTURE_1D) + { + gl_info->gl_ops.gl.p_glTexImage1D(target, level, gl_internal_format, + width, 0, format->glFormat, format->glType, NULL); + } else { - gl_info->gl_ops.gl.p_glTexImage2D(target, level, gl_internal_format, - width, height, 0, format->glFormat, format->glType, NULL); + gl_info->gl_ops.gl.p_glTexImage2D(target, level, gl_internal_format, width, + target == GL_TEXTURE_1D_ARRAY ? texture->layer_count : height, 0, + format->glFormat, format->glType, NULL); checkGLcall("glTexImage2D"); } } @@ -509,6 +518,13 @@ static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture GL_EXTCALL(glTexStorage3DMultisample(texture->target, samples, gl_internal_format, width, height, texture->layer_count, GL_FALSE)); break; + case GL_TEXTURE_1D_ARRAY: + GL_EXTCALL(glTexStorage2D(texture->target, texture->level_count, + gl_internal_format, width, texture->layer_count)); + break; + case GL_TEXTURE_1D: + GL_EXTCALL(glTexStorage1D(texture->target, texture->level_count, gl_internal_format, width)); + break; default: GL_EXTCALL(glTexStorage2D(texture->target, texture->level_count, gl_internal_format, width, height)); @@ -1782,7 +1798,12 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); level = sub_resource_idx % texture->level_count; - if (target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_1D_ARRAY) + { + dst_y = sub_resource_idx / texture->level_count; + update_h = 1; + } + else if (target == GL_TEXTURE_2D_ARRAY) { dst_z = sub_resource_idx / texture->level_count; update_d = 1; @@ -1860,7 +1881,12 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s target, level, dst_x, dst_y, dst_z, update_w, update_h, update_d, internal, dst_slice_pitch, addr); - if (dst_row_pitch == src_row_pitch) + if (target == GL_TEXTURE_1D) + { + GL_EXTCALL(glCompressedTexSubImage1D(target, level, dst_x, + update_w, internal, dst_row_pitch, addr)); + } + else if (dst_row_pitch == src_row_pitch) { if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) { @@ -1915,6 +1941,11 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y, dst_z, update_w, update_h, update_d, format->glFormat, format->glType, bo.addr)); } + else if (target == GL_TEXTURE_1D) + { + gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, dst_x, + update_w, format->glFormat, format->glType, bo.addr); + } else { gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y, @@ -2247,6 +2278,142 @@ static const struct wined3d_resource_ops texture_resource_ops = texture_resource_sub_resource_unmap, }; +/* Context activation is done by the caller. */ +static void texture1d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_context *context, const struct wined3d_bo_address *data) +{ + const struct wined3d_format *format = texture->resource.format; + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (format->conv_byte_count) + { + FIXME("Attempting to download a converted texture, format %s.\n", + debug_d3dformat(format->id)); + return; + } + + if (data->buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data->buffer_object)); + checkGLcall("glBindBuffer"); + } + + gl_info->gl_ops.gl.p_glGetTexImage(texture->target, sub_resource_idx, + format->glFormat, format->glType, data->addr); + checkGLcall("glGetTexImage"); + + if (data->buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } +} + +/* Context activation is done by the caller. */ +static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, DWORD location) +{ + struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + unsigned int row_pitch, slice_pitch; + + TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", + texture, sub_resource_idx, context, wined3d_debug_location(location)); + + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) + return FALSE; + + switch (location) + { + case WINED3D_LOCATION_TEXTURE_RGB: + case WINED3D_LOCATION_TEXTURE_SRGB: + if (sub_resource->locations & WINED3D_LOCATION_SYSMEM) + { + struct wined3d_const_bo_address data = {0, texture->resource.heap_memory}; + struct wined3d_box src_box; + + data.addr += sub_resource->offset; + wined3d_texture_bind_and_dirtify(texture, context, + location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); + wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); + wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, + &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); + } + else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) + { + struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; + struct wined3d_box src_box; + + wined3d_texture_bind_and_dirtify(texture, context, + location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); + wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); + wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, + &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); + } + else + { + FIXME("Implement texture loading from %s.\n", wined3d_debug_location(sub_resource->locations)); + return FALSE; + } + break; + + case WINED3D_LOCATION_SYSMEM: + if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) + { + struct wined3d_bo_address data = {0, texture->resource.heap_memory}; + + data.addr += sub_resource->offset; + if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) + wined3d_texture_bind_and_dirtify(texture, context, FALSE); + else + wined3d_texture_bind_and_dirtify(texture, context, TRUE); + + texture1d_download_data(texture, sub_resource_idx, context, &data); + ++texture->download_count; + } + else + { + FIXME("Implement WINED3D_LOCATION_SYSMEM loading from %s.\n", + wined3d_debug_location(sub_resource->locations)); + return FALSE; + } + break; + + case WINED3D_LOCATION_BUFFER: + if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) + { + struct wined3d_bo_address data = {sub_resource->buffer_object, NULL}; + + if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) + wined3d_texture_bind_and_dirtify(texture, context, FALSE); + else + wined3d_texture_bind_and_dirtify(texture, context, TRUE); + + texture1d_download_data(texture, sub_resource_idx, context, &data); + } + else + { + FIXME("Implement WINED3D_LOCATION_BUFFER loading from %s.\n", + wined3d_debug_location(sub_resource->locations)); + return FALSE; + } + break; + + default: + FIXME("Implement %s loading from %s.\n", wined3d_debug_location(location), + wined3d_debug_location(sub_resource->locations)); + return FALSE; + } + + return TRUE; +} + +static const struct wined3d_texture_ops texture1d_ops = +{ + texture1d_load_location, +}; + static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, DWORD flags, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_texture_ops *texture_ops) @@ -2443,6 +2610,46 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc list_init(&texture->renderbuffers); + switch (desc->resource_type) + { + case WINED3D_RTYPE_TEXTURE_1D: + if (layer_count > 1) + texture->target = GL_TEXTURE_1D_ARRAY; + else + texture->target = GL_TEXTURE_1D; + break; + + case WINED3D_RTYPE_TEXTURE_2D: + if (desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) + { + texture->target = GL_TEXTURE_CUBE_MAP_ARB; + } + else if (desc->multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + if (layer_count > 1) + texture->target = GL_TEXTURE_2D_MULTISAMPLE_ARRAY; + else + texture->target = GL_TEXTURE_2D_MULTISAMPLE; + } + else + { + if (layer_count > 1) + texture->target = GL_TEXTURE_2D_ARRAY; + else + texture->target = GL_TEXTURE_2D; + } + break; + + case WINED3D_RTYPE_TEXTURE_3D: + texture->target = GL_TEXTURE_3D; + break; + + default: + ERR("Invalid resource type %s.\n", debug_d3dresourcetype(desc->resource_type)); + wined3d_texture_cleanup_sync(texture); + return WINED3DERR_INVALIDCALL; + } + /* Precalculated scaling for 'faked' non power of two texture coords. */ if (texture->resource.gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) { @@ -2451,41 +2658,16 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags &= ~(WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS); texture->target = GL_TEXTURE_RECTANGLE_ARB; } + else if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + { + texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width)); + texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height)); + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; + } else { - if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - { - texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width)); - texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height)); - texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; - } - else - { - texture->pow2_matrix[0] = 1.0f; - texture->pow2_matrix[5] = 1.0f; - } - if (desc->resource_type == WINED3D_RTYPE_TEXTURE_3D) - { - texture->target = GL_TEXTURE_3D; - } - else if (desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) - { - texture->target = GL_TEXTURE_CUBE_MAP_ARB; - } - else if (desc->multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) - { - if (layer_count > 1) - texture->target = GL_TEXTURE_2D_MULTISAMPLE_ARRAY; - else - texture->target = GL_TEXTURE_2D_MULTISAMPLE; - } - else - { - if (layer_count > 1) - texture->target = GL_TEXTURE_2D_ARRAY; - else - texture->target = GL_TEXTURE_2D; - } + texture->pow2_matrix[0] = 1.0f; + texture->pow2_matrix[5] = 1.0f; } texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; @@ -2982,6 +3164,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct UINT layer_count, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) { + const struct wined3d_texture_ops *texture_ops; struct wined3d_texture *object; HRESULT hr; @@ -3028,29 +3211,28 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct } } - if (!(object = heap_alloc_zero(FIELD_OFFSET(struct wined3d_texture, - sub_resources[level_count * layer_count])))) - return E_OUTOFMEMORY; - switch (desc->resource_type) { + case WINED3D_RTYPE_TEXTURE_1D: + texture_ops = &texture1d_ops; + break; case WINED3D_RTYPE_TEXTURE_2D: - hr = wined3d_texture_init(object, desc, layer_count, level_count, - flags, device, parent, parent_ops, &texture2d_ops); + texture_ops = &texture2d_ops; break; - case WINED3D_RTYPE_TEXTURE_3D: - hr = wined3d_texture_init(object, desc, layer_count, level_count, - flags, device, parent, parent_ops, &texture3d_ops); + texture_ops = &texture3d_ops; break; - default: ERR("Invalid resource type %s.\n", debug_d3dresourcetype(desc->resource_type)); - hr = WINED3DERR_INVALIDCALL; - break; + return WINED3DERR_INVALIDCALL; } - if (FAILED(hr)) + if (!(object = heap_alloc_zero(FIELD_OFFSET(struct wined3d_texture, + sub_resources[level_count * layer_count])))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_texture_init(object, desc, layer_count, + level_count, flags, device, parent, parent_ops, texture_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); heap_free(object); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8b2019d671d..0775f53b7a5 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4269,6 +4269,7 @@ const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) #define WINED3D_TO_STR(x) case x: return #x WINED3D_TO_STR(WINED3D_RTYPE_NONE); WINED3D_TO_STR(WINED3D_RTYPE_BUFFER); + WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_1D); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_2D); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_3D); #undef WINED3D_TO_STR diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 05167f4be9c..c98ebfb7ee8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -59,6 +59,11 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, {GL_TEXTURE_2D_MULTISAMPLE, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_MULTISAMPLE_ARRAY}, {GL_TEXTURE_2D_MULTISAMPLE_ARRAY, 0, GL_TEXTURE_2D_MULTISAMPLE}, {GL_TEXTURE_2D_MULTISAMPLE_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_MULTISAMPLE_ARRAY}, + + {GL_TEXTURE_1D, 0, GL_TEXTURE_1D}, + {GL_TEXTURE_1D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_1D_ARRAY}, + {GL_TEXTURE_1D_ARRAY, 0, GL_TEXTURE_1D}, + {GL_TEXTURE_1D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_1D_ARRAY}, }; unsigned int i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a25d984a4f5..cdea1125f36 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2859,11 +2859,13 @@ struct wined3d_state struct wined3d_dummy_textures { + GLuint tex_1d; GLuint tex_2d; GLuint tex_rect; GLuint tex_3d; GLuint tex_cube; GLuint tex_cube_array; + GLuint tex_1d_array; GLuint tex_2d_array; GLuint tex_buffer; GLuint tex_2d_ms; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4e390cc960a..446e98b96f1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -690,8 +690,9 @@ enum wined3d_resource_type { WINED3D_RTYPE_NONE = 0, WINED3D_RTYPE_BUFFER = 1, - WINED3D_RTYPE_TEXTURE_2D = 2, - WINED3D_RTYPE_TEXTURE_3D = 3, + WINED3D_RTYPE_TEXTURE_1D = 2, + WINED3D_RTYPE_TEXTURE_2D = 3, + WINED3D_RTYPE_TEXTURE_3D = 4, }; enum wined3d_query_type -- 2.11.0

1 0

[PATCH 2/8] d3d11: Implement d3d10_device_CreateTexture1D().
by Henri Verbeet 02 Apr '18

02 Apr '18

From: Sven Hesse <shesse(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 82 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3d11/device.c | 23 ++++++++++-- 2 files changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7b28e016c4b..c4349395338 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1310,6 +1310,87 @@ static void test_device_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_texture1d(void) +{ + ULONG refcount, expected_refcount; + ID3D10Device *device, *tmp; + D3D10_TEXTURE1D_DESC desc; + ID3D10Texture1D *texture; + unsigned int i; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + desc.Width = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + expected_refcount = get_refcount(device) + 1; + hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 1d texture, hr %#x.\n", hr); + refcount = get_refcount(device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10Texture1D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount(device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); + + ID3D10Texture1D_Release(texture); + + desc.MipLevels = 0; + expected_refcount = get_refcount(device) + 1; + hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 1d texture, hr %#x.\n", hr); + refcount = get_refcount(device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10Texture1D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount(device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); + + check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + ID3D10Texture1D_Release(texture); + + desc.MipLevels = 1; + desc.ArraySize = 2; + hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 1d texture, hr %#x.\n", hr); + + check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + ID3D10Texture1D_Release(texture); + + for (i = 0; i < 4; ++i) + { + desc.ArraySize = i; + desc.Format = DXGI_FORMAT_R32G32B32A32_TYPELESS; + desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, (ID3D10Texture1D **)&texture); + todo_wine_if(!i) + ok(hr == (i ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); + if (SUCCEEDED(hr)) + ID3D10Texture1D_Release(texture); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_texture2d(void) { ULONG refcount, expected_refcount; @@ -14935,6 +15016,7 @@ START_TEST(device) test_feature_level(); test_device_interfaces(); + test_create_texture1d(); test_create_texture2d(); test_texture2d_interfaces(); test_create_texture3d(); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9799d73dbf7..8316105034e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4995,9 +4995,28 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface, static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture1D(ID3D10Device1 *iface, const D3D10_TEXTURE1D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data, ID3D10Texture1D **texture) { - FIXME("iface %p, desc %p, data %p, texture %p stub!\n", iface, desc, data, texture); + struct d3d_device *device = impl_from_ID3D10Device(iface); + D3D11_TEXTURE1D_DESC d3d11_desc; + struct d3d_texture1d *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); + + d3d11_desc.Width = desc->Width; + d3d11_desc.MipLevels = desc->MipLevels; + d3d11_desc.ArraySize = desc->ArraySize; + d3d11_desc.Format = desc->Format; + d3d11_desc.Usage = d3d11_usage_from_d3d10_usage(desc->Usage); + d3d11_desc.BindFlags = d3d11_bind_flags_from_d3d10_bind_flags(desc->BindFlags); + d3d11_desc.CPUAccessFlags = d3d11_cpu_access_flags_from_d3d10_cpu_access_flags(desc->CPUAccessFlags); + d3d11_desc.MiscFlags = d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(desc->MiscFlags); + + if (FAILED(hr = d3d_texture1d_create(device, &d3d11_desc, (const D3D11_SUBRESOURCE_DATA *)data, &object))) + return hr; + + *texture = &object->ID3D10Texture1D_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *iface, -- 2.11.0

1 0

[PATCH 5/5] windowscodecs: Directly use patterns stored in component info object in IWICMetadataReaderInfo::MatchesPattern implementation.
by Jacek Caban 02 Apr '18

02 Apr '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/windowscodecs/info.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-)

2 1

[PATCH 4/5] windowscodecs: Store metadata container patterns in meatadata reader info object.
by Jacek Caban 02 Apr '18

02 Apr '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/windowscodecs/info.c | 262 ++++++++++++++++++++++++++++------------------ 1 file changed, 162 insertions(+), 100 deletions(-)

2 1

[PATCH 1/5] windowscodecs: Store bitmap patterns in bitmap decoder info object.
by Jacek Caban 02 Apr '18

02 Apr '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/windowscodecs/info.c | 211 +++++++++++++++++++++++++++------------------- 1 file changed, 126 insertions(+), 85 deletions(-)

2 1

[PATCH 2/5] windowscodecs: Directly use patterns stored in component info object in IWICBitmapDecoderInfo::MatchesPattern implementation.
by Jacek Caban 02 Apr '18

02 Apr '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/windowscodecs/info.c | 43 +++++++++++++++---------------------------- 1 file changed, 15 insertions(+), 28 deletions(-)

2 1

[PATCH 3/5] windowscodecs: Store container formats in metadata component info object.
by Jacek Caban 02 Apr '18

02 Apr '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/windowscodecs/info.c | 50 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-)

2 1

[PATCH] wincodecs: Add a helper for GetDecoderInfo()
by Nikolay Sivov 02 Apr '18

02 Apr '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/bmpdecode.c | 13 +------------ dlls/windowscodecs/gifformat.c | 13 +------------ dlls/windowscodecs/icoformat.c | 13 +------------ dlls/windowscodecs/info.c | 16 ++++++++++++++++ dlls/windowscodecs/jpegformat.c | 13 +------------ dlls/windowscodecs/pngformat.c | 13 +------------ dlls/windowscodecs/tgaformat.c | 13 +------------ dlls/windowscodecs/tiffformat.c | 13 +------------ dlls/windowscodecs/wincodecs_private.h | 1 + 9 files changed, 24 insertions(+), 84 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 2bcb81e0d6..4109bad4b3 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -1068,20 +1068,9 @@ static HRESULT WINAPI BmpDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI BmpDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WICBmpDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WICBmpDecoder, ppIDecoderInfo); } static HRESULT WINAPI BmpDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index f63a7f37a9..0eb1d804ec 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1170,20 +1170,9 @@ static HRESULT WINAPI GifDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI GifDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WICGifDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WICGifDecoder, ppIDecoderInfo); } static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalette *palette) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 1b1c79291b..5e38ee0d0f 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -556,20 +556,9 @@ static HRESULT WINAPI IcoDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI IcoDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WICIcoDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WICIcoDecoder, ppIDecoderInfo); } static HRESULT WINAPI IcoDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 6114eef557..fadefba50d 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2029,6 +2029,22 @@ void ReleaseComponentInfos(void) IWICComponentInfo_Release(&info->IWICComponentInfo_iface); } +HRESULT get_decoder_info(const CLSID *clsid, IWICBitmapDecoderInfo **info) +{ + IWICComponentInfo *compinfo; + HRESULT hr; + + hr = CreateComponentInfo(clsid, &compinfo); + if (FAILED(hr)) return hr; + + hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, + (void **)info); + + IWICComponentInfo_Release(compinfo); + + return hr; +} + typedef struct { IEnumUnknown IEnumUnknown_iface; LONG ref; diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 27cd88036b..f05663f070 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -398,20 +398,9 @@ static HRESULT WINAPI JpegDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI JpegDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WICJpegDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WICJpegDecoder, ppIDecoderInfo); } static HRESULT WINAPI JpegDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 26b5fd52bc..fd0d197bb3 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -829,20 +829,9 @@ static HRESULT WINAPI PngDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI PngDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WICPngDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WICPngDecoder, ppIDecoderInfo); } static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index ec7fa23169..b3d9aeae26 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -360,20 +360,9 @@ static HRESULT WINAPI TgaDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI TgaDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WineTgaDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WineTgaDecoder, ppIDecoderInfo); } static HRESULT WINAPI TgaDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 6fe3f19677..2b2f84f859 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -672,20 +672,9 @@ static HRESULT WINAPI TiffDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI TiffDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WICTiffDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WICTiffDecoder, ppIDecoderInfo); } static HRESULT WINAPI TiffDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 037bde2da0..b29fc1fa4d 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -126,6 +126,7 @@ extern HRESULT CreatePropertyBag2(const PROPBAG2 *options, UINT count, extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) DECLSPEC_HIDDEN; extern void ReleaseComponentInfos(void) DECLSPEC_HIDDEN; extern HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown) DECLSPEC_HIDDEN; +extern HRESULT get_decoder_info(REFCLSID clsid, IWICBitmapDecoderInfo **info) DECLSPEC_HIDDEN; typedef struct BmpDecoder BmpDecoder; -- 2.16.2

2 1

[PATCH] user32: Add support for PNG icons.
by Dmitry Timoshkov 02 Apr '18

02 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/Makefile.in | 1 + dlls/user32/cursoricon.c | 337 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 334 insertions(+), 4 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 246c424155..931a715763 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -D_USER32_ -D_WINABLE_ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = gdi32 version advapi32 +EXTRAINCL = $(PNG_CFLAGS) DELAYIMPORTS = imm32 usp10 C_SRCS = \ diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 8e272f09ce..1cb46050d4 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -6,6 +6,8 @@ * 1997 Alex Korobka * 1998 Turchanov Sergey * 2007 Henri Verbeet + * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,6 +31,9 @@ #include <stdarg.h> #include <string.h> #include <stdlib.h> +#ifdef HAVE_PNG_H +#include <png.h> +#endif #include "windef.h" #include "winbase.h" @@ -43,11 +48,17 @@ #include "wine/list.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(cursor); WINE_DECLARE_DEBUG_CHANNEL(icon); WINE_DECLARE_DEBUG_CHANNEL(resource); +#define RIFF_FOURCC( c0, c1, c2, c3 ) \ + ( (DWORD)(BYTE)(c0) | ( (DWORD)(BYTE)(c1) << 8 ) | \ + ( (DWORD)(BYTE)(c2) << 16 ) | ( (DWORD)(BYTE)(c3) << 24 ) ) +#define PNG_SIGN RIFF_FOURCC(0x89,'P','N','G') + static struct list icon_cache = LIST_INIT( icon_cache ); /********************************************************************** @@ -108,6 +119,307 @@ static int get_display_bpp(void) return ret; } +#ifdef SONAME_LIBPNG + +static void *libpng_handle; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(png_create_read_struct); +MAKE_FUNCPTR(png_create_info_struct); +MAKE_FUNCPTR(png_destroy_read_struct); +MAKE_FUNCPTR(png_error); +MAKE_FUNCPTR(png_get_bit_depth); +MAKE_FUNCPTR(png_get_color_type); +MAKE_FUNCPTR(png_get_error_ptr); +MAKE_FUNCPTR(png_get_image_height); +MAKE_FUNCPTR(png_get_image_width); +MAKE_FUNCPTR(png_get_io_ptr); +MAKE_FUNCPTR(png_read_image); +MAKE_FUNCPTR(png_read_info); +MAKE_FUNCPTR(png_read_update_info); +MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_crc_action); +MAKE_FUNCPTR(png_set_error_fn); +MAKE_FUNCPTR(png_set_expand); +MAKE_FUNCPTR(png_set_gray_to_rgb); +MAKE_FUNCPTR(png_set_read_fn); +#undef MAKE_FUNCPTR + +static BOOL load_libpng(void) +{ + USER_Lock(); + + if (!libpng_handle && (libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)) != NULL) + { +#define LOAD_FUNCPTR(f) \ + if ((p##f = wine_dlsym(libpng_handle, #f, NULL, 0)) == NULL) \ + { \ + libpng_handle = NULL; \ + USER_Unlock(); \ + return FALSE; \ + } + LOAD_FUNCPTR(png_create_read_struct); + LOAD_FUNCPTR(png_create_info_struct); + LOAD_FUNCPTR(png_destroy_read_struct); + LOAD_FUNCPTR(png_error); + LOAD_FUNCPTR(png_get_bit_depth); + LOAD_FUNCPTR(png_get_color_type); + LOAD_FUNCPTR(png_get_error_ptr); + LOAD_FUNCPTR(png_get_image_height); + LOAD_FUNCPTR(png_get_image_width); + LOAD_FUNCPTR(png_get_io_ptr); + LOAD_FUNCPTR(png_read_image); + LOAD_FUNCPTR(png_read_info); + LOAD_FUNCPTR(png_read_update_info); + LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_crc_action); + LOAD_FUNCPTR(png_set_error_fn); + LOAD_FUNCPTR(png_set_expand); + LOAD_FUNCPTR(png_set_gray_to_rgb); + LOAD_FUNCPTR(png_set_read_fn); +#undef LOAD_FUNCPTR + } + + USER_Unlock(); + return TRUE; +} + +static void user_error_fn(png_structp png_ptr, png_const_charp error_message) +{ + jmp_buf *pjmpbuf; + + /* This uses setjmp/longjmp just like the default. We can't use the + * default because there's no way to access the jmp buffer in the png_struct + * that works in 1.2 and 1.4 and allows us to dynamically load libpng. */ + WARN("PNG error: %s\n", debugstr_a(error_message)); + pjmpbuf = ppng_get_error_ptr(png_ptr); + longjmp(*pjmpbuf, 1); +} + +static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message) +{ + WARN("PNG warning: %s\n", debugstr_a(warning_message)); +} + +struct png_wrapper +{ + png_structp png_ptr; + png_infop info_ptr; + int width, height, bpp; + const char *buffer; + int size, pos; +}; + +static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) +{ + struct png_wrapper *png = ppng_get_io_ptr(png_ptr); + + if (png->size - png->pos >= length) + { + memcpy(data, png->buffer + png->pos, length); + png->pos += length; + } + else + { + ppng_error(png->png_ptr, "failed to read PNG data"); + } +} + +static BOOL create_png_decoder(struct png_wrapper *png) +{ + jmp_buf jmpbuf; + int color_type, bit_depth; + + if (!load_libpng()) return FALSE; + + /* initialize libpng */ + png->png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!png->png_ptr) return FALSE; + + png->info_ptr = ppng_create_info_struct(png->png_ptr); + if (!png->info_ptr) + { + ppng_destroy_read_struct(&png->png_ptr, NULL, NULL); + return FALSE; + } + + /* set up setjmp/longjmp error handling */ + if (setjmp(jmpbuf)) + { + ppng_destroy_read_struct(&png->png_ptr, &png->info_ptr, NULL); + return FALSE; + } + + ppng_set_error_fn(png->png_ptr, jmpbuf, user_error_fn, user_warning_fn); + ppng_set_crc_action(png->png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); + + /* set up custom i/o handling */ + ppng_set_read_fn(png->png_ptr, png, user_read_data); + + /* read the header */ + ppng_read_info(png->png_ptr, png->info_ptr); + + color_type = ppng_get_color_type(png->png_ptr, png->info_ptr); + bit_depth = ppng_get_bit_depth(png->png_ptr, png->info_ptr); + + /* expand grayscale image data to rgb */ + if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) + ppng_set_gray_to_rgb(png->png_ptr); + + /* expand palette image data to rgb */ + if (color_type == PNG_COLOR_TYPE_PALETTE || bit_depth < 8) + ppng_set_expand(png->png_ptr); + + /* update color type information */ + ppng_read_update_info(png->png_ptr, png->info_ptr); + + color_type = ppng_get_color_type(png->png_ptr, png->info_ptr); + bit_depth = ppng_get_bit_depth(png->png_ptr, png->info_ptr); + + png->bpp = 0; + + switch (color_type) + { + case PNG_COLOR_TYPE_RGB: + if (bit_depth == 8) + png->bpp = 24; + break; + + case PNG_COLOR_TYPE_RGB_ALPHA: + if (bit_depth == 8) + { + ppng_set_bgr(png->png_ptr); + png->bpp = 32; + } + break; + + default: + break; + } + + if (!png->bpp) + { + FIXME("unsupported PNG color format %d, %d bpp\n", color_type, bit_depth); + ppng_destroy_read_struct(&png->png_ptr, &png->info_ptr, NULL); + return FALSE; + } + + png->width = ppng_get_image_width(png->png_ptr, png->info_ptr); + png->height = ppng_get_image_height(png->png_ptr, png->info_ptr); + + return TRUE; +} + +static void destroy_png_decoder(struct png_wrapper *png) +{ + ppng_destroy_read_struct(&png->png_ptr, &png->info_ptr, NULL); +} + +static BOOL get_png_info(const void *png_data, DWORD size, int *width, int *height, int *bpp) +{ + static const char png_sig[8] = { 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a }; + struct png_wrapper png; + + if (size < sizeof(png_sig) || memcmp(png_data, png_sig, sizeof(png_sig)) != 0) + return FALSE; + + png.buffer = png_data; + png.size = size; + png.pos = 0; + + if (!create_png_decoder(&png)) return FALSE; + + *width = png.width; + *height = png.height; + *bpp = png.bpp; + + destroy_png_decoder(&png); + return TRUE; +} + +static BITMAPINFO *load_png(const char *png_data, DWORD *size) +{ + static const char png_sig[8] = { 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a }; + struct png_wrapper png; + png_bytep *row_pointers; + int rowbytes, image_size, mask_size = 0, i; + BITMAPINFO *info; + unsigned char *image_data; + + if (*size < sizeof(png_sig) || memcmp(png_data, png_sig, sizeof(png_sig)) != 0) + return NULL; + + png.buffer = png_data; + png.size = *size; + png.pos = 0; + + if (!create_png_decoder(&png)) return NULL; + + rowbytes = (png.width * png.bpp + 7) / 8; + image_size = png.height * rowbytes; + if (png.bpp != 32) /* add a mask if there is no alpha */ + mask_size = (png.width + 7) / 8 * png.height; + + info = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFOHEADER) + image_size + mask_size); + if (!info) + { + destroy_png_decoder(&png); + return NULL; + } + + image_data = (unsigned char *)info + sizeof(BITMAPINFOHEADER); + memset(image_data + image_size, 0, mask_size); + + row_pointers = HeapAlloc(GetProcessHeap(), 0, png.height * sizeof(png_bytep)); + if (!row_pointers) + { + HeapFree(GetProcessHeap(), 0, info); + destroy_png_decoder(&png); + return NULL; + } + + /* upside down */ + for (i = 0; i < png.height; i++) + row_pointers[i] = image_data + (png.height - i - 1) * rowbytes; + + ppng_read_image(png.png_ptr, row_pointers); + + HeapFree(GetProcessHeap(), 0, row_pointers); + + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = png.width; + info->bmiHeader.biHeight = png.height * 2; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = png.bpp; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = image_size; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + + *size = sizeof(BITMAPINFOHEADER) + image_size + mask_size; + + destroy_png_decoder(&png); + + return info; +} + +#else /* SONAME_LIBPNG */ + +static BOOL get_png_info(const void *png_data, DWORD size, int *width, int *height, int *bpp) +{ + ERR("Trying to load PNG icon, but PNG support is not compiled in.\n"); + return FALSE; +} + +static BITMAPINFO *load_png( const char *png, DWORD *max_size ) +{ + ERR("Trying to load PNG icon, but PNG support is not compiled in.\n"); + return NULL; +} + +#endif + static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) { struct cursoricon_object *obj; @@ -523,6 +835,8 @@ static int CURSORICON_FindBestIcon( LPCVOID dir, DWORD size, fnGetCIEntry get_en /* Find Best Colors for Best Fit */ for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { + TRACE("entry %d: %d x %d, %d bpp\n", i, cx, cy, bits); + if(abs(width - cx) == iXDiff && abs(height - cy) == iYDiff) { iTempColorDiff = abs(depth - bits); @@ -680,6 +994,10 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, entry = &filedir->idEntries[n]; if (entry->dwDIBOffset > size - sizeof(info->biSize)) return FALSE; info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); + + if (info->biSize == PNG_SIGN) + return get_png_info(info, size, width, height, bits); + if (info->biSize != sizeof(BITMAPCOREHEADER)) { if ((const char *)(info + 1) - (const char *)dir > size) return FALSE; @@ -824,6 +1142,21 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE /* Check bitmap header */ + if (bmi->bmiHeader.biSize == PNG_SIGN) + { + BITMAPINFO *bmi_png; + + bmi_png = load_png( (const char *)bmi, &maxsize ); + if (bmi_png) + { + hObj = create_icon_from_bmi( bmi_png, maxsize, module, resname, + rsrc, hotspot, bIcon, width, height, cFlag ); + HeapFree( GetProcessHeap(), 0, bmi_png ); + return hObj; + } + return 0; + } + if (maxsize < sizeof(BITMAPCOREHEADER)) { WARN( "invalid size %u\n", maxsize ); @@ -1001,10 +1334,6 @@ done: /********************************************************************** * .ANI cursor support */ -#define RIFF_FOURCC( c0, c1, c2, c3 ) \ - ( (DWORD)(BYTE)(c0) | ( (DWORD)(BYTE)(c1) << 8 ) | \ - ( (DWORD)(BYTE)(c2) << 16 ) | ( (DWORD)(BYTE)(c3) << 24 ) ) - #define ANI_RIFF_ID RIFF_FOURCC('R', 'I', 'F', 'F') #define ANI_LIST_ID RIFF_FOURCC('L', 'I', 'S', 'T') #define ANI_ACON_ID RIFF_FOURCC('A', 'C', 'O', 'N') -- 2.16.2

2 3

[PATCH] comctl32/static: Remove some misleading comments
by Nikolay Sivov 02 Apr '18

02 Apr '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/static.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index d9e2fe30dc..5cc02ced97 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * Notes: - * - Windows XP introduced new behavior: The background of centered - * icons and bitmaps is painted differently. This is only done if - * a manifest is present. - * Because it has not yet been decided how to implement the two - * different modes in Wine, only the Windows XP mode is implemented. * - Controls with SS_SIMPLE but without SS_NOPREFIX: * The text should not be changed. Windows doesn't clear the * client rectangle, so the new text must be larger than the old one. @@ -701,7 +696,6 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) HBITMAP hBitmap, oldbitmap; HBRUSH hbrush; - /* message is still sent, even if the returned brush is not used */ hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); if ((hBitmap = (HBITMAP)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET )) -- 2.16.2

1 0

[PATCH] user32/static: Use correct brush color for centered image background
by Nikolay Sivov 02 Apr '18

02 Apr '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- It was introduced with commit 1de825f746c6f4873a54ab21c16d728695c9a1e8, issue reported as https://bugs.winehq.org/show_bug.cgi?id=30103. Now with two parallel implementations we can have both cases working correctly. dlls/user32/static.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 11b04fc98f..1f7c03121c 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * Notes: - * - Windows XP introduced new behavior: The background of centered - * icons and bitmaps is painted differently. This is only done if - * a manifest is present. - * Because it has not yet been decided how to implement the two - * different modes in Wine, only the Windows XP mode is implemented. * - Controls with SS_SIMPLE but without SS_NOPREFIX: * The text should not be changed. Windows doesn't clear the * client rectangle, so the new text must be larger than the old one. @@ -737,10 +732,9 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) { HDC hMemDC; HBITMAP hBitmap, oldbitmap; - HBRUSH hbrush; /* message is still sent, even if the returned brush is not used */ - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); + STATIC_SendWmCtlColorStatic(hwnd, hdc); if ((hBitmap = (HBITMAP)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET )) && (GetObjectType(hBitmap) == OBJ_BITMAP) @@ -748,26 +742,23 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) { BITMAP bm; RECT rcClient; - LOGBRUSH brush; GetObjectW(hBitmap, sizeof(bm), &bm); oldbitmap = SelectObject(hMemDC, hBitmap); - /* Set the background color for monochrome bitmaps - to the color of the background brush */ - if (GetObjectW( hbrush, sizeof(brush), &brush )) - { - if (brush.lbStyle == BS_SOLID) - SetBkColor(hdc, brush.lbColor); - } GetClientRect(hwnd, &rcClient); if (style & SS_CENTERIMAGE) { - FillRect( hdc, &rcClient, hbrush ); + HBRUSH hbrush = CreateSolidBrush(GetPixel(hMemDC, 0, 0)); + + FillRect(hdc, &rcClient, hbrush); + rcClient.left = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; rcClient.top = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; rcClient.right = rcClient.left + bm.bmWidth; rcClient.bottom = rcClient.top + bm.bmHeight; + + DeleteObject(hbrush); } StretchBlt(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, rcClient.bottom - rcClient.top, hMemDC, -- 2.16.2

1 0

[PATCH] comctl32/button: Remove style checking when handling BM_SETIMAGE.
by Zhiyi Zhang 02 Apr '18

02 Apr '18

If BS_ICON and BS_BITMAP are not specified in style and BM_SETIMAGE message is used, button shows both image and text. Therefore style checking when handling BM_SETIMAGE should be removed in comctl32. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 141 +++++++++++--------------- dlls/comctl32/tests/button.c | 234 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 295 insertions(+), 80 deletions(-)

1 0

[PATCH 9/9] mstask: Store creator using IRegistrationInfo.
by Dmitry Timoshkov 02 Apr '18

02 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 60 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index d04666d76d..34d1fa010e 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -301,20 +301,60 @@ static HRESULT WINAPI MSTASK_ITask_GetComment(ITask *iface, LPWSTR *comment) return hr; } -static HRESULT WINAPI MSTASK_ITask_SetCreator( - ITask* iface, - LPCWSTR pwszCreator) +static HRESULT WINAPI MSTASK_ITask_SetCreator(ITask *iface, LPCWSTR creator) { - FIXME("(%p, %p): stub\n", iface, pwszCreator); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + IRegistrationInfo *info; + HRESULT hr; + + TRACE("(%p, %s)\n", iface, debugstr_w(creator)); + + if (!creator || !creator[0]) + creator = NULL; + + hr = ITaskDefinition_get_RegistrationInfo(This->task, &info); + if (hr == S_OK) + { + hr = IRegistrationInfo_put_Author(info, (BSTR)creator); + IRegistrationInfo_Release(info); + } + return hr; } -static HRESULT WINAPI MSTASK_ITask_GetCreator( - ITask* iface, - LPWSTR *ppwszCreator) +static HRESULT WINAPI MSTASK_ITask_GetCreator(ITask *iface, LPWSTR *creator) { - FIXME("(%p, %p): stub\n", iface, ppwszCreator); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + IRegistrationInfo *info; + HRESULT hr; + BSTR author; + DWORD len; + + TRACE("(%p, %p)\n", iface, creator); + + hr = ITaskDefinition_get_RegistrationInfo(This->task, &info); + if (hr != S_OK) return hr; + + hr = IRegistrationInfo_get_Author(info, &author); + if (hr == S_OK) + { + len = author ? lstrlenW(author) + 1 : 1; + *creator = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*creator) + { + if (!author) + *creator[0] = 0; + else + lstrcpyW(*creator, author); + hr = S_OK; + } + else + hr = E_OUTOFMEMORY; + + SysFreeString(author); + } + + IRegistrationInfo_Release(info); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetWorkItemData( -- 2.16.3

1 0

[PATCH 8/9] mstask: Store comment using IRegistrationInfo.
by Dmitry Timoshkov 02 Apr '18

02 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 5a4023694c..d04666d76d 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -248,41 +248,56 @@ static HRESULT WINAPI MSTASK_ITask_GetExitCode( static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) { TaskImpl *This = impl_from_ITask(iface); + IRegistrationInfo *info; + HRESULT hr; TRACE("(%p, %s)\n", iface, debugstr_w(comment)); if (!comment || !comment[0]) comment = NULL; - return IExecAction_put_Id(This->action, (BSTR)comment); + hr = ITaskDefinition_get_RegistrationInfo(This->task, &info); + if (hr == S_OK) + { + hr = IRegistrationInfo_put_Description(info, (BSTR)comment); + IRegistrationInfo_Release(info); + } + return hr; } static HRESULT WINAPI MSTASK_ITask_GetComment(ITask *iface, LPWSTR *comment) { TaskImpl *This = impl_from_ITask(iface); + IRegistrationInfo *info; HRESULT hr; - BSTR id; + BSTR description; DWORD len; TRACE("(%p, %p)\n", iface, comment); - hr = IExecAction_get_Id(This->action, &id); + hr = ITaskDefinition_get_RegistrationInfo(This->task, &info); if (hr != S_OK) return hr; - len = id ? lstrlenW(id) + 1 : 1; - *comment = CoTaskMemAlloc(len * sizeof(WCHAR)); - if (*comment) + hr = IRegistrationInfo_get_Description(info, &description); + if (hr == S_OK) { - if (!id) - *comment[0] = 0; + len = description ? lstrlenW(description) + 1 : 1; + *comment = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*comment) + { + if (!description) + *comment[0] = 0; + else + lstrcpyW(*comment, description); + hr = S_OK; + } else - lstrcpyW(*comment, id); - hr = S_OK; + hr = E_OUTOFMEMORY; + + SysFreeString(description); } - else - hr = E_OUTOFMEMORY; - SysFreeString(id); + IRegistrationInfo_Release(info); return hr; } -- 2.16.3

1 0

[PATCH 7/9] taskschd: IRegistrationInfo::put_Source() should accept NULL input.
by Dmitry Timoshkov 02 Apr '18

02 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 15 ++++++++++----- dlls/taskschd/tests/scheduler.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 334fa3f5cf..432f983c22 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -767,15 +767,14 @@ static HRESULT WINAPI RegistrationInfo_get_Source(IRegistrationInfo *iface, BSTR static HRESULT WINAPI RegistrationInfo_put_Source(IRegistrationInfo *iface, BSTR source) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(source)); - if (!source) return E_INVALIDARG; - + if (source && !(str = heap_strdupW(source))) return E_OUTOFMEMORY; heap_free(reginfo->source); - reginfo->source = heap_strdupW(source); - /* FIXME: update XML on the server side */ - return reginfo->source ? S_OK : E_OUTOFMEMORY; + reginfo->source = str; + return S_OK; } static const IRegistrationInfoVtbl RegistrationInfo_vtbl = @@ -3341,6 +3340,12 @@ static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *inf if (hr == S_OK) IRegistrationInfo_put_URI(info, value); } + else if (!lstrcmpW(name, Source)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IRegistrationInfo_put_Source(info, value); + } else FIXME("unhandled RegistrationInfo element %s\n", debugstr_w(name)); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index cb17eafee7..12c30e8db3 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1429,6 +1429,7 @@ static void test_TaskDefinition(void) " <Date>2018-04-02T11:22:33</Date>\n" " <Documentation>doc</Documentation>\n" " <URI>uri</URI>\n" + " <Source>source</Source>\n" " </RegistrationInfo>\n" " <Settings>\n" " <Enabled>false</Enabled>\n" @@ -1513,6 +1514,7 @@ static void test_TaskDefinition(void) static const WCHAR dateW[] = { '2','0','1','8','-','0','4','-','0','2','T','1','1',':','2','2',':','3','3',0 }; static const WCHAR docW[] = { 'd','o','c',0 }; static const WCHAR uriW[] = { 'u','r','i',0 }; + static const WCHAR sourceW[] = { 's','o','u','r','c','e',0 }; static WCHAR Task1[] = { '"','T','a','s','k','1','"',0 }; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, @@ -1674,9 +1676,17 @@ todo_wine ok(hr == S_OK, "get_URI error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Source(reginfo, &bstr); + ok(hr == S_OK, "get_Source error %#x\n", hr); + ok(!lstrcmpW(bstr, sourceW), "expected %s, got %s\n", wine_dbgstr_w(sourceW), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegistrationInfo_put_Source(reginfo, NULL); + ok(hr == S_OK, "put_Source error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; hr = IRegistrationInfo_get_Source(reginfo, &bstr); ok(hr == S_OK, "get_Source error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + V_VT(&var) = VT_BSTR; V_BSTR(&var) = NULL; hr = IRegistrationInfo_get_SecurityDescriptor(reginfo, &var); @@ -1695,7 +1705,6 @@ if (hr == S_OK) hr = IRegistrationInfo_get_Description(reginfo, &bstr); ok(hr == S_OK, "get_Description error %#x\n", hr); -if (hr == S_OK) ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); hr = ITaskDefinition_get_Triggers(taskdef, &trigger_col); -- 2.16.3

1 0

[PATCH 6/9] taskschd: IRegistrationInfo::put_URI() should accept NULL input.
by Dmitry Timoshkov 02 Apr '18

02 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 15 ++++++++++----- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 3a3b5e1821..334fa3f5cf 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -728,15 +728,14 @@ static HRESULT WINAPI RegistrationInfo_get_URI(IRegistrationInfo *iface, BSTR *u static HRESULT WINAPI RegistrationInfo_put_URI(IRegistrationInfo *iface, BSTR uri) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(uri)); - if (!uri) return E_INVALIDARG; - + if (uri && !(str = heap_strdupW(uri))) return E_OUTOFMEMORY; heap_free(reginfo->uri); - reginfo->uri = heap_strdupW(uri); - /* FIXME: update XML on the server side */ - return reginfo->uri ? S_OK : E_OUTOFMEMORY; + reginfo->uri = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_SecurityDescriptor(IRegistrationInfo *iface, VARIANT *sddl) @@ -3336,6 +3335,12 @@ static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *inf if (hr == S_OK) IRegistrationInfo_put_Documentation(info, value); } + else if (!lstrcmpW(name, URI)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IRegistrationInfo_put_URI(info, value); + } else FIXME("unhandled RegistrationInfo element %s\n", debugstr_w(name)); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index b499f0b32b..cb17eafee7 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1428,6 +1428,7 @@ static void test_TaskDefinition(void) " <Version>1.0</Version>\n" " <Date>2018-04-02T11:22:33</Date>\n" " <Documentation>doc</Documentation>\n" + " <URI>uri</URI>\n" " </RegistrationInfo>\n" " <Settings>\n" " <Enabled>false</Enabled>\n" @@ -1511,6 +1512,7 @@ static void test_TaskDefinition(void) static const WCHAR versionW[] = { '1','.','0',0 }; static const WCHAR dateW[] = { '2','0','1','8','-','0','4','-','0','2','T','1','1',':','2','2',':','3','3',0 }; static const WCHAR docW[] = { 'd','o','c',0 }; + static const WCHAR uriW[] = { 'u','r','i',0 }; static WCHAR Task1[] = { '"','T','a','s','k','1','"',0 }; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, @@ -1661,9 +1663,17 @@ todo_wine ok(hr == S_OK, "get_Documentation error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_URI(reginfo, &bstr); + ok(hr == S_OK, "get_URI error %#x\n", hr); + ok(!lstrcmpW(bstr, uriW), "expected %s, got %s\n", wine_dbgstr_w(uriW), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegistrationInfo_put_URI(reginfo, NULL); + ok(hr == S_OK, "put_URI error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; hr = IRegistrationInfo_get_URI(reginfo, &bstr); ok(hr == S_OK, "get_URI error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Source(reginfo, &bstr); ok(hr == S_OK, "get_Source error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); -- 2.16.3

1 0

[PATCH 5/9] taskschd: IRegistrationInfo::put_Documentation() should accept NULL input.
by Dmitry Timoshkov 02 Apr '18

02 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 15 ++++++++++----- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index c226446fb7..3a3b5e1821 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -689,15 +689,14 @@ static HRESULT WINAPI RegistrationInfo_get_Documentation(IRegistrationInfo *ifac static HRESULT WINAPI RegistrationInfo_put_Documentation(IRegistrationInfo *iface, BSTR doc) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(doc)); - if (!doc) return E_INVALIDARG; - + if (doc && !(str = heap_strdupW(doc))) return E_OUTOFMEMORY; heap_free(reginfo->documentation); - reginfo->documentation = heap_strdupW(doc); - /* FIXME: update XML on the server side */ - return reginfo->documentation ? S_OK : E_OUTOFMEMORY; + reginfo->documentation = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_XmlText(IRegistrationInfo *iface, BSTR *xml) @@ -3331,6 +3330,12 @@ static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *inf if (hr == S_OK) IRegistrationInfo_put_Date(info, value); } + else if (!lstrcmpW(name, Documentation)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IRegistrationInfo_put_Documentation(info, value); + } else FIXME("unhandled RegistrationInfo element %s\n", debugstr_w(name)); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 2e6a8c483d..b499f0b32b 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1427,6 +1427,7 @@ static void test_TaskDefinition(void) " <Author>author</Author>\n" " <Version>1.0</Version>\n" " <Date>2018-04-02T11:22:33</Date>\n" + " <Documentation>doc</Documentation>\n" " </RegistrationInfo>\n" " <Settings>\n" " <Enabled>false</Enabled>\n" @@ -1509,6 +1510,7 @@ static void test_TaskDefinition(void) static const WCHAR authorW[] = { 'a','u','t','h','o','r',0 }; static const WCHAR versionW[] = { '1','.','0',0 }; static const WCHAR dateW[] = { '2','0','1','8','-','0','4','-','0','2','T','1','1',':','2','2',':','3','3',0 }; + static const WCHAR docW[] = { 'd','o','c',0 }; static WCHAR Task1[] = { '"','T','a','s','k','1','"',0 }; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, @@ -1648,9 +1650,17 @@ todo_wine ok(hr == S_OK, "get_Date error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Documentation(reginfo, &bstr); + ok(hr == S_OK, "get_Documentation error %#x\n", hr); + ok(!lstrcmpW(bstr, docW), "expected %s, got %s\n", wine_dbgstr_w(docW), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegistrationInfo_put_Documentation(reginfo, NULL); + ok(hr == S_OK, "put_Documentation error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; hr = IRegistrationInfo_get_Documentation(reginfo, &bstr); ok(hr == S_OK, "get_Documentation error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_URI(reginfo, &bstr); ok(hr == S_OK, "get_URI error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); -- 2.16.3

1 0

[PATCH 4/9] taskschd: IRegistrationInfo::put_Date() should accept NULL input.
by Dmitry Timoshkov 02 Apr '18

02 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 15 ++++++++++----- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 02e7caef23..c226446fb7 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -662,15 +662,14 @@ static HRESULT WINAPI RegistrationInfo_get_Date(IRegistrationInfo *iface, BSTR * static HRESULT WINAPI RegistrationInfo_put_Date(IRegistrationInfo *iface, BSTR date) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(date)); - if (!date) return E_INVALIDARG; - + if (date && !(str = heap_strdupW(date))) return E_OUTOFMEMORY; heap_free(reginfo->date); - reginfo->date = heap_strdupW(date); - /* FIXME: update XML on the server side */ - return reginfo->date ? S_OK : E_OUTOFMEMORY; + reginfo->date = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Documentation(IRegistrationInfo *iface, BSTR *doc) @@ -3326,6 +3325,12 @@ static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *inf if (hr == S_OK) IRegistrationInfo_put_Version(info, value); } + else if (!lstrcmpW(name, Date)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IRegistrationInfo_put_Date(info, value); + } else FIXME("unhandled RegistrationInfo element %s\n", debugstr_w(name)); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c46d84947c..2e6a8c483d 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1426,6 +1426,7 @@ static void test_TaskDefinition(void) " <Description>\"Task1\"</Description>\n" " <Author>author</Author>\n" " <Version>1.0</Version>\n" + " <Date>2018-04-02T11:22:33</Date>\n" " </RegistrationInfo>\n" " <Settings>\n" " <Enabled>false</Enabled>\n" @@ -1507,6 +1508,7 @@ static void test_TaskDefinition(void) "</Task>\n"; static const WCHAR authorW[] = { 'a','u','t','h','o','r',0 }; static const WCHAR versionW[] = { '1','.','0',0 }; + static const WCHAR dateW[] = { '2','0','1','8','-','0','4','-','0','2','T','1','1',':','2','2',':','3','3',0 }; static WCHAR Task1[] = { '"','T','a','s','k','1','"',0 }; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, @@ -1635,9 +1637,17 @@ todo_wine ok(hr == S_OK, "get_Version error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Date(reginfo, &bstr); + ok(hr == S_OK, "get_Date error %#x\n", hr); + ok(!lstrcmpW(bstr, dateW), "expected %s, got %s\n", wine_dbgstr_w(dateW), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegistrationInfo_put_Date(reginfo, NULL); + ok(hr == S_OK, "put_Date error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; hr = IRegistrationInfo_get_Date(reginfo, &bstr); ok(hr == S_OK, "get_Date error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Documentation(reginfo, &bstr); ok(hr == S_OK, "get_Documentation error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); -- 2.16.3

1 0

[PATCH 3/9] taskschd: IRegistrationInfo::put_Version() should accept NULL input.
by Dmitry Timoshkov 02 Apr '18

02 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 15 ++++++++++----- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 7ae478f58c..02e7caef23 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -635,15 +635,14 @@ static HRESULT WINAPI RegistrationInfo_get_Version(IRegistrationInfo *iface, BST static HRESULT WINAPI RegistrationInfo_put_Version(IRegistrationInfo *iface, BSTR version) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(version)); - if (!version) return E_INVALIDARG; - + if (version && !(str = heap_strdupW(version))) return E_OUTOFMEMORY; heap_free(reginfo->version); - reginfo->version = heap_strdupW(version); - /* FIXME: update XML on the server side */ - return reginfo->version ? S_OK : E_OUTOFMEMORY; + reginfo->version = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Date(IRegistrationInfo *iface, BSTR *date) @@ -3321,6 +3320,12 @@ static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *inf if (hr == S_OK) IRegistrationInfo_put_Description(info, value); } + else if (!lstrcmpW(name, Version)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IRegistrationInfo_put_Version(info, value); + } else FIXME("unhandled RegistrationInfo element %s\n", debugstr_w(name)); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index d006dff703..c46d84947c 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1425,6 +1425,7 @@ static void test_TaskDefinition(void) " <RegistrationInfo>\n" " <Description>\"Task1\"</Description>\n" " <Author>author</Author>\n" + " <Version>1.0</Version>\n" " </RegistrationInfo>\n" " <Settings>\n" " <Enabled>false</Enabled>\n" @@ -1505,6 +1506,7 @@ static void test_TaskDefinition(void) " </Actions>\n" "</Task>\n"; static const WCHAR authorW[] = { 'a','u','t','h','o','r',0 }; + static const WCHAR versionW[] = { '1','.','0',0 }; static WCHAR Task1[] = { '"','T','a','s','k','1','"',0 }; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, @@ -1622,9 +1624,17 @@ todo_wine ok(hr == S_OK, "get_Author error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Version(reginfo, &bstr); + ok(hr == S_OK, "get_Version error %#x\n", hr); + ok(!lstrcmpW(bstr, versionW), "expected %s, got %s\n", wine_dbgstr_w(versionW), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegistrationInfo_put_Version(reginfo, NULL); + ok(hr == S_OK, "put_Version error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; hr = IRegistrationInfo_get_Version(reginfo, &bstr); ok(hr == S_OK, "get_Version error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Date(reginfo, &bstr); ok(hr == S_OK, "get_Date error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); -- 2.16.3

1 0

[PATCH 2/9] taskschd: IRegistrationInfo::put_Author() should accept NULL input.
by Dmitry Timoshkov 02 Apr '18

02 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 9 ++++----- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 933d833016..7ae478f58c 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -608,15 +608,14 @@ static HRESULT WINAPI RegistrationInfo_get_Author(IRegistrationInfo *iface, BSTR static HRESULT WINAPI RegistrationInfo_put_Author(IRegistrationInfo *iface, BSTR author) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(author)); - if (!author) return E_INVALIDARG; - + if (author && !(str = heap_strdupW(author))) return E_OUTOFMEMORY; heap_free(reginfo->author); - reginfo->author = heap_strdupW(author); - /* FIXME: update XML on the server side */ - return reginfo->author ? S_OK : E_OUTOFMEMORY; + reginfo->author = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Version(IRegistrationInfo *iface, BSTR *version) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 82f3315099..d006dff703 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1424,6 +1424,7 @@ static void test_TaskDefinition(void) "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" " <RegistrationInfo>\n" " <Description>\"Task1\"</Description>\n" + " <Author>author</Author>\n" " </RegistrationInfo>\n" " <Settings>\n" " <Enabled>false</Enabled>\n" @@ -1503,6 +1504,7 @@ static void test_TaskDefinition(void) " </Exec>\n" " </Actions>\n" "</Task>\n"; + static const WCHAR authorW[] = { 'a','u','t','h','o','r',0 }; static WCHAR Task1[] = { '"','T','a','s','k','1','"',0 }; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, @@ -1609,9 +1611,17 @@ todo_wine ok(hr == S_OK, "get_Description error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Author(reginfo, &bstr); + ok(hr == S_OK, "get_Author error %#x\n", hr); + ok(!lstrcmpW(bstr, authorW), "expected %s, got %s\n", wine_dbgstr_w(authorW), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegistrationInfo_put_Author(reginfo, NULL); + ok(hr == S_OK, "put_Author error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; hr = IRegistrationInfo_get_Author(reginfo, &bstr); ok(hr == S_OK, "get_Author error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Version(reginfo, &bstr); ok(hr == S_OK, "get_Version error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); -- 2.16.3

1 0

[PATCH 1/9] taskschd: IRegistrationInfo::put_Description() should accept NULL input.
by Dmitry Timoshkov 02 Apr '18

02 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 9 ++++----- dlls/taskschd/tests/scheduler.c | 7 +++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 19546c0d71..933d833016 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -581,15 +581,14 @@ static HRESULT WINAPI RegistrationInfo_get_Description(IRegistrationInfo *iface, static HRESULT WINAPI RegistrationInfo_put_Description(IRegistrationInfo *iface, BSTR description) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(description)); - if (!description) return E_INVALIDARG; - + if (description && !(str = heap_strdupW(description))) return E_OUTOFMEMORY; heap_free(reginfo->description); - reginfo->description = heap_strdupW(description); - /* FIXME: update XML on the server side */ - return reginfo->description ? S_OK : E_OUTOFMEMORY; + reginfo->description = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Author(IRegistrationInfo *iface, BSTR *author) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c0f691a53d..82f3315099 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1602,6 +1602,13 @@ todo_wine ok(hr == S_OK, "get_Description error %#x\n", hr); ok(!lstrcmpW(bstr, Task1), "expected Task1, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + hr = IRegistrationInfo_put_Description(reginfo, NULL); + ok(hr == S_OK, "put_Description error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; + hr = IRegistrationInfo_get_Description(reginfo, &bstr); + ok(hr == S_OK, "get_Description error %#x\n", hr); + ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Author(reginfo, &bstr); ok(hr == S_OK, "get_Author error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); -- 2.16.3

1 0

Re: [GSoC] Project proposal : Winetest Scripting Interface
by Yash Yadav 01 Apr '18

01 Apr '18

Hey Stefan, A big thanks for dedicating some time of your schedule to check out a proposal which has absoluely no chance of being selected. About the idea in the suggested list, I'd agree that the discussion in the IRC gave me a different picture of the project compared to what I thought of after reading on the website. Good all the way, indeed the idea is interesting and comparatively more closer to my strengths than other projects. And yes, You're right, I had not tried out the testsuite then. I should've had. But I wonder what was I thinking when I wrote that <quoted> part of the proposal. I have compiled and installed wine from source before and am aware "make install" certainly wouldn't test it there. Ugh, mistake. As I write this I just ran "make test" from the source root. Test fails at bcrypt dll test, heap allocation errors I guess. The output pattern from this single run seems catchable though. I thought tests would return huge paragraphs of texts for each test (oh what the hell was I thinking), what turned out were lines of fixme/errs just like the ones that show up on a regular program run. The single lined fixme/err(s) seem easier to filter compared to what I was imagining. xD Thanks again for this feedback, I feel great for my first attempt. Great because I didn't think this proposal would be one of the "more selectable" ones. It was my first attempt. I was confused myself of whether my proposal makes sense or not. This has been a good experience for me and as I have not submitted any patch to wine so I have less to regret now as I would've lost it anyway I guess. My main target next is to figure out how to catch problem areas in huge code bases. Might as well try to fix a wine bug sometime, thats a priority for summers. I'm likely to show up in the IRC in the middle of the summers. :) I'm CC'ing this into the mailing list as I usually like to keep things public (except personal things which are supposed to be undercovered). I already have opened my proposal into the mailing list. I have the IRC conversation of us which explained the winetest scripting interface idea to a better extent, I'm not sure if I should publicize it here for future references. I'll keep it unless required. I wish good luck for my fellow students and the organization to get the right set of contributors. Yash Yadav On 04/01/2018 03:03 PM, Stefan Dösinger wrote: > Hi Yash, > > As promised here is my take on the merits of your proposal for future > use. In short, I'd give it a thumbs up, but I am usually easier to > convince than other Wine mentors. Whether we would have accepted it > would also depend on what other proposals we could choose from and how > many slots we'd get. > > A big problem is that the idea (which I proposed on the idea list) is > somewhat poorly defined. It isn't a clear "code to spec" task, but > involves a lot of talking to other projects and investigating how > their test suite and development workflows work. Your proposal > accounts for that, which is great! You had good interaction with us on > IRC and discussed your ideas early, which is also a big plus. Of > course success or failure are partially in those 3rd party project's > hands. If we never get a proper reply from them the GSoC project would > be doomed to failure. > > If time permits I'd like to talk to the Mesa devs and ask them what > would be necessary for them to run our testsuite on a regular basis. > Of course so many priorities need attention :-\ . But my default > action will be to remove the idea from the suggested idea list for > next year. > > I am not sure if you have run the Wine tests yet - "Code the initial > version of the script that would run the “make install” in selected > directories depending upon the type of test that is called in for" > suggests you maybe did not, because running "make install" is not > required to run the tests. In fact you can run all of Wine out of the > source tree, which is much more comfortable when you're working on the > code. Just run "make" to build it and run it from ~/path/to/built/wine > foo.exe . No sudo, no copying of megabytes of files. The canonical way > to run the tests is "make test", which you can run on the top level > directory, or in a subdirectory, e.g. dlls/d3d9/tests. There's > programs/winetest/, which is a comfortable way to copy one binary to > another computer and run the tests. > > The "make install" thing wouldn't be a reason for me to reject the > proposal. It might be a case of poor phrasing, language > misunderstanding, etc. That's where the requirement to send a patch is > handy - if you manage to build Wine, make a small patch, commit it to > your git tree and send it to the mailing list we know you're competent > enough to figure out the difference between "make install" and "make > test" quickly. > > I hope I could shed some light on the magic of GSoC applications and > give you something for your effort to write the proposal despite the > deadline screwup. However, what I've written is just my opinion. Since > I'd mentor such a project it would carry a lot of weight, but it isn't > the the only thing that matters. Projects other than Wine may look at > completely different things. > > Feel free to quote this E-Mail on the mailing list. The things we look > for in proposals aren't a secret. But because this was your proposal > I'm sending this in a private mail to you to give you a choice what to do. > > Best regards, > Stefan

1 0

[PATCH] setupapi: Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub.
by Alistair Leslie-Hughes 01 Apr '18

01 Apr '18

From: Tim Wanders <timwanders241(a)gmail.com> Fixes: https://bugs.winehq.org/show_bug.cgi?id=43831 Returning CR_SUCCESS assumes that the return value will be valid. This causes crashes in programs which only check the return. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/setupapi/stubs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 990974d9b9..7c3413a7cc 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -180,8 +180,9 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG pulLen, PCWSTR pszFilter, DWORD WINAPI CM_Get_Parent(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) { FIXME("%p 0x%08x 0x%08x stub\n", pdnDevInst, dnDevInst, ulFlags); - *pdnDevInst = dnDevInst; - return CR_SUCCESS; + if(pdnDevInst) + *pdnDevInst = 0; + return CR_NO_SUCH_DEVNODE; } /*********************************************************************** -- 2.16.2

1 0

[PATCH] winex11.drv: Print a debugstr and not the pointer to it
by Michael Stefaniuc 01 Apr '18

01 Apr '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index f881b0f3f1..c2c1c6a1f7 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -335,7 +335,7 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ unsigned int i; VkResult res; - TRACE("layer_name %p, count %p, properties %p\n", debugstr_a(layer_name), count, properties); + TRACE("layer_name %s, count %p, properties %p\n", debugstr_a(layer_name), count, properties); /* This shouldn't get called with layer_name set, the ICD loader prevents it. */ if (layer_name) -- 2.14.3

1 0

[PATCH] user32: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 01 Apr '18

01 Apr '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/class.c | 12 ++++++------ dlls/user32/dialog.c | 4 ++-- dlls/user32/exticon.c | 4 ++-- dlls/user32/mdi.c | 8 ++++---- dlls/user32/menu.c | 2 +- dlls/user32/message.c | 4 ++-- dlls/user32/msgbox.c | 2 +- dlls/user32/nonclient.c | 4 ++-- dlls/user32/spy.c | 11 +++++------ dlls/user32/sysparams.c | 7 +++---- dlls/user32/text.c | 2 +- dlls/user32/win.c | 4 ++-- 12 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index a8b5a8fe5c..d4e7951d39 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -150,7 +150,7 @@ static BOOL is_comctl32_class( const WCHAR *name ) {'t','o','o','l','t','i','p','s','_','c','l','a','s','s','3','2',0}, }; - int min = 0, max = (sizeof(classesW) / sizeof(classesW[0])) - 1; + int min = 0, max = ARRAY_SIZE( classesW ) - 1; while (min <= max) { @@ -171,7 +171,7 @@ static BOOL is_builtin_class( const WCHAR *name ) {'S','c','r','o','l','l','b','a','r',0}, }; - int min = 0, max = (sizeof(classesW) / sizeof(classesW[0])) - 1; + int min = 0, max = ARRAY_SIZE( classesW ) - 1; while (min <= max) { @@ -473,7 +473,7 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE strcpyW( classPtr->name, name ); classPtr->basename += basename_offset; } - else GlobalGetAtomNameW( classPtr->atomName, classPtr->name, sizeof(classPtr->name)/sizeof(WCHAR) ); + else GlobalGetAtomNameW( classPtr->atomName, classPtr->name, ARRAY_SIZE( classPtr->name )); SERVER_START_REQ( create_class ) { @@ -1125,7 +1125,7 @@ static ULONG_PTR CLASS_SetClassLong( HWND hwnd, INT offset, LONG_PTR newval, if (!set_server_info( hwnd, offset, newval, size )) break; retval = class->atomName; class->atomName = newval; - GlobalGetAtomNameW( newval, class->name, sizeof(class->name)/sizeof(WCHAR) ); + GlobalGetAtomNameW( newval, class->name, ARRAY_SIZE( class->name )); break; case GCL_CBCLSEXTRA: /* cannot change this one */ SetLastError( ERROR_INVALID_PARAMETER ); @@ -1166,7 +1166,7 @@ INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count ) DWORD len; if (count <= 0) return 0; - if (!GetClassNameW( hwnd, tmpbuf, sizeof(tmpbuf)/sizeof(WCHAR) )) return 0; + if (!GetClassNameW( hwnd, tmpbuf, ARRAY_SIZE( tmpbuf ))) return 0; RtlUnicodeToMultiByteN( buffer, count - 1, &len, tmpbuf, strlenW(tmpbuf) * sizeof(WCHAR) ); buffer[len] = 0; return len; @@ -1299,7 +1299,7 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) if (!IS_INTRESOURCE(name)) { WCHAR nameW[MAX_ATOM_LEN + 1]; - if (!MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, sizeof(nameW)/sizeof(WCHAR) )) + if (!MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, ARRAY_SIZE( nameW ))) return FALSE; classPtr = CLASS_FindClass( nameW, hInstance ); } diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 46220b0de7..7d1f6b3de7 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -960,7 +960,7 @@ static BOOL DIALOG_IsAccelerator( HWND hwnd, HWND hwndDlg, WPARAM wParam ) { dlgCode = SendMessageW( hwndControl, WM_GETDLGCODE, 0, 0 ); if ( (dlgCode & (DLGC_BUTTON | DLGC_STATIC)) && - GetWindowTextW( hwndControl, buffer, sizeof(buffer)/sizeof(WCHAR) )) + GetWindowTextW( hwndControl, buffer, ARRAY_SIZE( buffer ))) { /* find the accelerator key */ LPWSTR p = buffer - 2; @@ -1868,7 +1868,7 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, if (idStatic && ((hwnd = GetDlgItem( hDlg, idStatic )) != 0)) { WCHAR temp[MAX_PATH]; - GetCurrentDirectoryW( sizeof(temp)/sizeof(WCHAR), temp ); + GetCurrentDirectoryW( ARRAY_SIZE( temp ), temp ); CharLowerW( temp ); /* Can't use PostMessage() here, because the string is on the stack */ SetDlgItemTextW( hDlg, idStatic, temp ); diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index a428ae70c6..a16ae522c7 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -286,8 +286,8 @@ static UINT ICO_ExtractIconExW( TRACE("%s, %d, %d %p 0x%08x\n", debugstr_w(lpszExeFileName), nIconIndex, nIcons, pIconId, flags); - dwSearchReturn = SearchPathW(NULL, lpszExeFileName, NULL, sizeof(szExePath) / sizeof(szExePath[0]), szExePath, NULL); - if ((dwSearchReturn == 0) || (dwSearchReturn > sizeof(szExePath) / sizeof(szExePath[0]))) + dwSearchReturn = SearchPathW(NULL, lpszExeFileName, NULL, ARRAY_SIZE(szExePath), szExePath, NULL); + if ((dwSearchReturn == 0) || (dwSearchReturn > ARRAY_SIZE(szExePath))) { WARN("File %s not found or path too long\n", debugstr_w(lpszExeFileName)); return -1; diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index ea362585a6..f990335d88 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -437,7 +437,7 @@ static LRESULT MDI_RefreshMenu(MDICLIENTINFO *ci) if (visible == MDI_MOREWINDOWSLIMIT) { - LoadStringW(user32_module, IDS_MDI_MOREWINDOWS, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(user32_module, IDS_MDI_MOREWINDOWS, buf, ARRAY_SIZE(buf)); AppendMenuW(ci->hWindowMenu, MF_STRING, id, buf); break; } @@ -453,7 +453,7 @@ static LRESULT MDI_RefreshMenu(MDICLIENTINFO *ci) buf[0] = '&'; buf[1] = '0' + visible; buf[2] = ' '; - InternalGetWindowText(ci->child[i], buf + 3, sizeof(buf)/sizeof(WCHAR) - 3); + InternalGetWindowText(ci->child[i], buf + 3, ARRAY_SIZE(buf) - 3); TRACE("Adding %p, id %u %s\n", ci->child[i], id, debugstr_w(buf)); AppendMenuW(ci->hWindowMenu, MF_STRING, id, buf); @@ -979,7 +979,7 @@ static void MDI_UpdateFrameText( HWND frame, HWND hClient, BOOL repaint, LPCWSTR if (!lpTitle && !ci->frameTitle) /* first time around, get title from the frame window */ { - GetWindowTextW( frame, lpBuffer, sizeof(lpBuffer)/sizeof(WCHAR) ); + GetWindowTextW( frame, lpBuffer, ARRAY_SIZE( lpBuffer )); lpTitle = lpBuffer; } @@ -1910,7 +1910,7 @@ static INT_PTR WINAPI MDI_MoreWindowsDlgProc (HWND hDlg, UINT iMsg, WPARAM wPara { WCHAR buffer[MDI_MAXTITLELENGTH]; - if (!InternalGetWindowText( ci->child[i], buffer, sizeof(buffer)/sizeof(WCHAR) )) + if (!InternalGetWindowText(ci->child[i], buffer, ARRAY_SIZE(buffer))) continue; SendMessageW(hListBox, LB_ADDSTRING, 0, (LPARAM)buffer ); SendMessageW(hListBox, LB_SETITEMDATA, i, (LPARAM)ci->child[i] ); diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index f4194ed6f2..99a99c0395 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5510,7 +5510,7 @@ INT WINAPI TranslateAcceleratorW( HWND hWnd, HACCEL hAccel, LPMSG msg ) hAccel,hWnd,msg->hwnd,msg->message,msg->wParam,msg->lParam); if (!(count = CopyAcceleratorTableW( hAccel, NULL, 0 ))) return 0; - if (count > sizeof(data)/sizeof(data[0])) + if (count > ARRAY_SIZE( data )) { if (!(ptr = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*ptr) ))) return 0; } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 6b7f91854f..d2e6a75726 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2312,7 +2312,7 @@ static BOOL process_rawinput_message( MSG *msg, const struct hardware_msg_data * rawinput->data.mouse.usFlags = MOUSE_MOVE_RELATIVE; rawinput->data.mouse.u.s.usButtonFlags = 0; rawinput->data.mouse.u.s.usButtonData = 0; - for (i = 1; i < sizeof(button_flags) / sizeof(*button_flags); ++i) + for (i = 1; i < ARRAY_SIZE(button_flags); ++i) { if (msg_data->flags & (1 << i)) rawinput->data.mouse.u.s.usButtonFlags |= button_flags[i]; @@ -3902,7 +3902,7 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) } GetKeyboardState( state ); - len = ToUnicode(msg->wParam, HIWORD(msg->lParam), state, wp, sizeof(wp)/sizeof(WCHAR), 0); + len = ToUnicode(msg->wParam, HIWORD(msg->lParam), state, wp, ARRAY_SIZE(wp), 0); if (len == -1) { message = (msg->message == WM_KEYDOWN) ? WM_DEADCHAR : WM_SYSDEADCHAR; diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index d3d11d6ceb..457c3ae7d1 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -294,7 +294,7 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* Position the buttons */ bpos = (wwidth - (bw + bspace) * buttons + bspace) / 2; - for (buttons = i = 0; i < (sizeof(buttonOrder) / sizeof(buttonOrder[0])); i++) { + for (buttons = i = 0; i < ARRAY_SIZE(buttonOrder); i++) { /* Convert the button order to ID* value to order for the buttons */ hItem = GetDlgItem(hwnd, buttonOrder[i]); diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 2b38897729..fcf32f01ef 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -343,7 +343,7 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, if (!str) { - if (!GetWindowTextW( hwnd, text, sizeof(text)/sizeof(WCHAR) )) text[0] = 0; + if (!GetWindowTextW( hwnd, text, ARRAY_SIZE( text ))) text[0] = 0; str = text; } rc.left += 2; @@ -953,7 +953,7 @@ static void NC_DrawCaption( HDC hdc, RECT *rect, HWND hwnd, DWORD style, } } - if (GetWindowTextW( hwnd, buffer, sizeof(buffer)/sizeof(WCHAR) )) + if (GetWindowTextW( hwnd, buffer, ARRAY_SIZE( buffer ))) { NONCLIENTMETRICSW nclm; HFONT hFont, hOldFont; diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 80bd0a3133..749fc220b4 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2127,7 +2127,7 @@ const char *SPY_GetClassLongOffsetName( INT offset ) { INT index; if (offset < 0 && offset % 2 == 0 && ((index = -(offset + 8) / 2) < - sizeof(ClassLongOffsetNames) / sizeof(*ClassLongOffsetNames))) + ARRAY_SIZE(ClassLongOffsetNames))) { return ClassLongOffsetNames[index]; } @@ -2148,7 +2148,7 @@ static void SPY_GetClassName( SPY_INSTANCE *sp_e ) strcpyW(sp_e->wnd_class, WC_PROPSHEETW); } else { - GetClassNameW(sp_e->msg_hwnd, sp_e->wnd_class, sizeof(sp_e->wnd_class)/sizeof(WCHAR)); + GetClassNameW(sp_e->msg_hwnd, sp_e->wnd_class, ARRAY_SIZE(sp_e->wnd_class)); } } @@ -2223,12 +2223,12 @@ static void SPY_GetWndName( SPY_INSTANCE *sp_e ) SPY_GetClassName( sp_e ); - len = InternalGetWindowText(sp_e->msg_hwnd, sp_e->wnd_name, sizeof(sp_e->wnd_name)/sizeof(WCHAR)); + len = InternalGetWindowText(sp_e->msg_hwnd, sp_e->wnd_name, ARRAY_SIZE(sp_e->wnd_name)); if(!len) /* get class name */ { LPWSTR dst = sp_e->wnd_name; LPWSTR src = sp_e->wnd_class; - int n = sizeof(sp_e->wnd_name)/sizeof(WCHAR) - 3; + int n = ARRAY_SIZE(sp_e->wnd_name) - 3; *dst++ = '{'; while ((n-- > 0) && *src) *dst++ = *src++; *dst++ = '}'; @@ -2537,8 +2537,7 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) if (pnmh->code == NM_CUSTOMDRAW) { /* save and restore error code over the next call */ save_error = GetLastError(); - GetClassNameW(pnmh->hwndFrom, from_class, - sizeof(from_class)/sizeof(WCHAR)); + GetClassNameW(pnmh->hwndFrom, from_class, ARRAY_SIZE(from_class)); SetLastError(save_error); if (strcmpW(TOOLBARCLASSNAMEW, from_class) == 0) dumplen = sizeof(NMTBCUSTOMDRAW)-sizeof(NMHDR); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2fcf2fbfea..7780293490 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1383,7 +1383,7 @@ void SYSPARAMS_Init(void) if (volatile_base_key && dispos == REG_CREATED_NEW_KEY) /* first process, initialize entries */ { - for (i = 0; i < sizeof(default_entries)/sizeof(default_entries[0]); i++) + for (i = 0; i < ARRAY_SIZE( default_entries ); i++) default_entries[i]->hdr.init( default_entries[i] ); } } @@ -2251,9 +2251,8 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, { WCHAR buffer[256]; if (pvParam) - if (!MultiByteToWideChar( CP_ACP, 0, pvParam, -1, buffer, - sizeof(buffer)/sizeof(WCHAR) )) - buffer[sizeof(buffer)/sizeof(WCHAR)-1] = 0; + if (!MultiByteToWideChar( CP_ACP, 0, pvParam, -1, buffer, ARRAY_SIZE( buffer ))) + buffer[ARRAY_SIZE(buffer)-1] = 0; ret = SystemParametersInfoW( uiAction, uiParam, pvParam ? buffer : NULL, fuWinIni ); break; } diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 2ac3afd607..0b5bd47461 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -970,7 +970,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, do { - len = sizeof(line)/sizeof(line[0]); + len = ARRAY_SIZE(line); if (invert_y) last_line = !(flags & DT_NOCLIP) && y - ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) < rect->bottom; else diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3c497f878e..019b178f95 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1748,7 +1748,7 @@ HWND WINAPI DECLSPEC_HOTPATCH CreateWindowExA( DWORD exStyle, LPCSTR className, if (!IS_INTRESOURCE(className)) { WCHAR bufferW[256]; - if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) + if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, ARRAY_SIZE( bufferW ))) return 0; return wow_handlers.create_window( (CREATESTRUCTW *)&cs, bufferW, instance, FALSE ); } @@ -2024,7 +2024,7 @@ HWND WINAPI FindWindowExA( HWND parent, HWND child, LPCSTR className, LPCSTR tit if (!IS_INTRESOURCE(className)) { WCHAR classW[256]; - if (MultiByteToWideChar( CP_ACP, 0, className, -1, classW, sizeof(classW)/sizeof(WCHAR) )) + if (MultiByteToWideChar( CP_ACP, 0, className, -1, classW, ARRAY_SIZE( classW ))) hwnd = FindWindowExW( parent, child, classW, titleW ); } else -- 2.14.3

1 0

[PATCH] user32: Remove an ARRAY_SIZE() alike macro
by Michael Stefaniuc 01 Apr '18

01 Apr '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/sysparams.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2c4ff5ec8d..2fcf2fbfea 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1300,7 +1300,6 @@ static struct sysparam_rgb_entry system_colors[] = RGB_ENTRY( COLOR_MENUBAR, RGB(212, 208, 200) ) #undef RGB_ENTRY }; -#define NUM_SYS_COLORS (sizeof(system_colors) / sizeof(system_colors[0])) /* entries that are initialized by default in the registry */ static union sysparam_all_entry * const default_entries[] = @@ -2690,7 +2689,8 @@ COLORREF WINAPI DECLSPEC_HOTPATCH GetSysColor( INT nIndex ) { COLORREF ret = 0; - if (nIndex >= 0 && nIndex < NUM_SYS_COLORS) get_entry( &system_colors[nIndex], 0, &ret ); + if (nIndex >= 0 && nIndex < ARRAY_SIZE( system_colors )) + get_entry( &system_colors[nIndex], 0, &ret ); return ret; } @@ -2705,7 +2705,7 @@ BOOL WINAPI SetSysColors( INT count, const INT *colors, const COLORREF *values ) if (IS_INTRESOURCE(colors)) return FALSE; /* stupid app passes a color instead of an array */ for (i = 0; i < count; i++) - if (colors[i] >= 0 && colors[i] <= NUM_SYS_COLORS) + if (colors[i] >= 0 && colors[i] <= ARRAY_SIZE( system_colors )) set_entry( &system_colors[colors[i]], values[i], 0, 0 ); /* Send WM_SYSCOLORCHANGE message to all windows */ @@ -2735,7 +2735,7 @@ DWORD_PTR WINAPI SetSysColorsTemp( const COLORREF *pPens, const HBRUSH *pBrushes */ HBRUSH WINAPI DECLSPEC_HOTPATCH GetSysColorBrush( INT index ) { - if (index < 0 || index >= NUM_SYS_COLORS) return 0; + if (index < 0 || index >= ARRAY_SIZE( system_colors )) return 0; if (!system_colors[index].brush) { @@ -2757,7 +2757,7 @@ HBRUSH WINAPI DECLSPEC_HOTPATCH GetSysColorBrush( INT index ) HPEN SYSCOLOR_GetPen( INT index ) { /* We can assert here, because this function is internal to Wine */ - assert (0 <= index && index < NUM_SYS_COLORS); + assert (0 <= index && index < ARRAY_SIZE( system_colors )); if (!system_colors[index].pen) { -- 2.14.3

1 0

[PATCH] wsdapi: Remove redundant NULL checks before heap_free()
by Michael Stefaniuc 01 Apr '18

01 Apr '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wsdapi/network.c | 2 +- dlls/wsdapi/soap.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index cfcae6b042..bea63fb67e 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -215,7 +215,7 @@ BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_delay, U ret = TRUE; cleanup: - if (adapter_addresses != NULL) heap_free(adapter_addresses); + heap_free(adapter_addresses); return ret; } diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 7779317850..970bc4f847 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -127,8 +127,7 @@ static inline void free_xml_string(WS_XML_STRING *value) if (value == NULL) return; - if (value->bytes != NULL) - heap_free(value->bytes); + heap_free(value->bytes); heap_free(value); } -- 2.14.3

1 0

[PATCH] wsdapi/tests: Remove redundant NULL checks before heap_free()
by Michael Stefaniuc 01 Apr '18

01 Apr '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wsdapi/tests/discovery.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 1c7619d5e6..73fe22c258 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -260,7 +260,7 @@ static void start_listening(messageStorage *msgStorage, const char *multicastAdd cleanup: closesocket(s); - if (parameter != NULL) heap_free(parameter); + heap_free(parameter); cleanup_addresses: freeaddrinfo(multicastAddr); @@ -309,7 +309,7 @@ static BOOL start_listening_on_all_addresses(messageStorage *msgStorage, ULONG f ret = TRUE; cleanup: - if (adapterAddresses != NULL) heap_free(adapterAddresses); + heap_free(adapterAddresses); return ret; } @@ -626,8 +626,8 @@ static void Publish_tests(void) after_publish_test: - if (publisherIdW != NULL) heap_free(publisherIdW); - if (sequenceIdW != NULL) heap_free(sequenceIdW); + heap_free(publisherIdW); + heap_free(sequenceIdW); ref = IWSDiscoveryPublisher_Release(publisher); ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); -- 2.14.3

1 0

[PATCH] shell32: Remove redundant NULL checks before heap_free()
by Michael Stefaniuc 01 Apr '18

01 Apr '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/dde.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index c54fe7854f..c8b93d31f6 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -184,7 +184,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) CreateDirectoryW(path, NULL); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - if (last_group) heap_free(last_group); + heap_free(last_group); last_group = path; } else if (!strcmpiW(command, delete_groupW)) @@ -224,7 +224,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - if (last_group) heap_free(last_group); + heap_free(last_group); last_group = path; } else if (!strcmpiW(command, add_itemW)) -- 2.14.3

1 0

[PATCH] LICENSE: switch to Microsoft Public License
by Austin English 01 Apr '18

01 Apr '18

From 5db15de2eb9c622378e72e0a67d70bcbcf3a526d Mon Sep 17 00:00:00 2001 From: Austin English <austinenglish(a)gmail.com> Date: Sun, 1 Apr 2018 14:31:04 -0500 Subject: [PATCH] LICENSE: switch to Microsoft Public License For better interoperability with our API overlords Signed-off-by: Austin English <austinenglish(a)gmail.com> --- LICENSE | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/LICENSE b/LICENSE index 765b9c3978..a9dd7f3328 100644 --- a/LICENSE +++ b/LICENSE @@ -1,17 +1,21 @@ -Copyright (c) 1993-2018 the Wine project authors (see the file AUTHORS -for a complete list) +Microsoft Public License (MS-PL) +This license governs use of the accompanying software. If you use the software, you +accept this license. If you do not accept the license, do not use the software. -Wine 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. +1. Definitions +The terms "reproduce," "reproduction," "derivative works," and "distribution" have the +same meaning here as under U.S. copyright law. +A "contribution" is the original software, or any additions or changes to the software. +A "contributor" is any person that distributes its contribution under this license. +"Licensed patents" are a contributor's patent claims that read directly on its contribution. -This program 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. +2. Grant of Rights +(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create. +(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software. -A copy of the GNU Lesser General Public License is included in the -Wine distribution in the file COPYING.LIB. If you did not receive this -copy, write to the Free Software Foundation, Inc., 51 Franklin St, -Fifth Floor, Boston, MA 02110-1301, USA. +3. Conditions and Limitations +(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks. +(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. +(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. +(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. +(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. -- 2.16.3

1 0

[PATCH 4/4] winmm: Fix MEVT_LONGMSG handling in MIDI stream.
by Akihiro Sagawa 01 Apr '18

01 Apr '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/winmm.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-)

2 1

[PATCH 2/4] midimap: Open lower devices when opening MIDI Mapper.
by Akihiro Sagawa 01 Apr '18

01 Apr '18

Without this change, the lower device can't get a long message at the beginning. The mapper didn't open it before receiving a short message in modData function. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/midimap/midimap.c | 27 ++++++++++++++------------- dlls/winmm/tests/midi.c | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-)

1 0

[PATCH 1/4] winmm/tests: Add MIDI System Exclusive message tests.
by Akihiro Sagawa 01 Apr '18

01 Apr '18

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

1 0

[PATCH] kernel32: add stub for RequestDeviceWakeup
by Louis Lenders 01 Apr '18

01 Apr '18

For https://bugs.winehq.org/show_bug.cgi?id=44874

1 0

[PATCH] comctl32/button: Keep control style
by Nikolay Sivov 01 Apr '18

01 Apr '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/button.c | 8 +++++++- dlls/comctl32/tests/button.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 7d48fe7956..1e339ef19c 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -91,6 +91,7 @@ typedef struct _BUTTON_INFO { HWND hwnd; HWND parent; + LONG style; LONG state; HFONT font; WCHAR *note; @@ -340,11 +341,16 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L break; case WM_NCCREATE: + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; + infoPtr = heap_alloc_zero( sizeof(*infoPtr) ); SetWindowLongPtrW( hWnd, 0, (LONG_PTR)infoPtr ); infoPtr->hwnd = hWnd; - infoPtr->parent = GetParent(hWnd); + infoPtr->parent = cs->hwndParent; + infoPtr->style = cs->style; return DefWindowProcW(hWnd, uMsg, wParam, lParam); + } case WM_NCDESTROY: SetWindowLongPtrW( hWnd, 0, 0 ); diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 0aacfa5888..7bd73de7cb 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1004,6 +1004,7 @@ static void test_button_data(void) { HWND self; HWND parent; + LONG style; }; unsigned int i; HWND parent; @@ -1027,6 +1028,7 @@ static void test_button_data(void) { ok(desc->self == hwnd, "Unexpected 'self' field.\n"); ok(desc->parent == parent, "Unexpected 'parent' field.\n"); + ok(desc->style == (WS_CHILD | BS_NOTIFY | styles[i]), "Unexpected 'style' field.\n"); } DestroyWindow(hwnd); -- 2.16.2

1 0

[PATCH 1/2] comdlg32: Add some traces for custom Places (Coverity)
by Nikolay Sivov 01 Apr '18

01 Apr '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comdlg32/filedlg.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 43d5f41180..7bed51556d 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -312,14 +312,21 @@ static void filedlg_collect_places_pidls(FileOpenDlgInfos *fodInfos) static const WCHAR placeW[] = {'P','l','a','c','e','%','d',0}; WCHAR nameW[8]; DWORD value; + HRESULT hr; WCHAR *str; sprintfW(nameW, placeW, i); if (get_config_key_dword(hkey, nameW, &value)) - SHGetSpecialFolderLocation(NULL, value, &fodInfos->places[i]); + { + hr = SHGetSpecialFolderLocation(NULL, value, &fodInfos->places[i]); + if (FAILED(hr)) + WARN("Unrecognized special folder %u.\n", value); + } else if (get_config_key_string(hkey, nameW, &str)) { - SHParseDisplayName(str, NULL, &fodInfos->places[i], 0, NULL); + hr = SHParseDisplayName(str, NULL, &fodInfos->places[i], 0, NULL); + if (FAILED(hr)) + WARN("Failed to parse custom places location, %s.\n", debugstr_w(str)); heap_free(str); } } -- 2.16.2

1 1

[PATCH] po: Update Ancient Greek translation.
by Zebediah Figura 01 Apr '18

01 Apr '18

--- I'd say I spent far too much time on an April Fools' joke, but then again, who doesn't? po/Makefile.in | 1 + po/grc.po | 1181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1182 insertions(+) create mode 100644 po/grc.po diff --git a/po/Makefile.in b/po/Makefile.in index 430a9a8..5c2bdb0 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -13,6 +13,7 @@ PO_SRCS = \ fa.po \ fi.po \ fr.po \ + grc.po \ he.po \ hi.po \ hr.po \ diff --git a/po/grc.po b/po/grc.po new file mode 100644 index 0000000..8c6e56e --- /dev/null +++ b/po/grc.po @@ -0,0 +1,1181 @@ +# Ancient Greek translations for Wine +# +msgid "" +msgstr "" +"Project-Id-Version: Wine\n" +"Report-Msgid-Bugs-To: https://bugs.winehq.org\n" +"POT-Creation-Date: N/A\n" +"PO-Revision-Date: 2018-04-01 00:00-0500\n" +"Last-Translator: Ζεβεδαῖος\n" +"Language-Team: Ancient Greek\n" +"Language: grc\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: appwiz.rc:58 +msgid "Install/Uninstall" +msgstr "Ἐνιστάναι/Ἀφιστάναι" + +#: appwiz.rc:61 +msgid "" +"To install a new program from a floppy disk, CD-ROM drive, or your hard " +"drive, click Install." +msgstr "" +"Ὥστε νέον πρόγραμμα ἐξ ὑγροῦ ἢ CD-ROM ἢ σκληροῦ κύκλου ἐνιστάναι, θλῖβε" +"Ἐνιστάναι." + +#: appwiz.rc:62 +msgid "&Install..." +msgstr "&Ἐνιστάναι..." + +#: appwiz.rc:65 +msgid "" +"The following software can be automatically removed. To remove a program or " +"to modify its installed components, select it from the list and click Modify/" +"Remove." +msgstr "" +"Τάδε μαλάγματα δύναται αὐτομάτως ἐξαιρεθῆναι. Ὥστε πρόγραμμα ἐξαιρεῖν ἢ" +"ὥστε μετατιθέναι τὰ ἑσταμένα συστατικὰ, ἑλοῦ ἐξ ἀπογραφῆς καὶ θλῖβε" +"Μετατιθέναι/Ἐξαιρεῖν." + +#: appwiz.rc:67 +msgid "&Support Information" +msgstr "&Ἐρείσματος Ἐπιστήμη" + +#: appwiz.rc:68 regedit.rc:133 regedit.rc:232 +msgid "&Modify..." +msgstr "&Μετατιθέναι..." + +#: appwiz.rc:69 appwiz.rc:45 cryptui.rc:346 msacm32.rc:40 winecfg.rc:200 +#: winecfg.rc:237 wordpad.rc:256 +msgid "&Remove" +msgstr "&Ἐξαιρεῖν" + +#: appwiz.rc:75 +msgid "Support Information" +msgstr "Ἐρείσματος Ἐπιστήμη" + +#: appwiz.rc:78 avifil32.rc:54 comctl32.rc:65 comctl32.rc:55 comdlg32.rc:232 +#: comdlg32.rc:262 comdlg32.rc:305 comdlg32.rc:359 comdlg32.rc:398 +#: comdlg32.rc:452 credui.rc:52 cryptui.rc:263 cryptui.rc:275 cryptui.rc:365 +#: dinput.rc:46 ieframe.rc:96 localui.rc:44 localui.rc:57 mpr.rc:49 +#: msacm32.rc:53 mshtml.rc:47 mshtml.rc:57 msvfw32.rc:36 oledlg.rc:62 +#: oledlg.rc:94 serialui.rc:41 setupapi.rc:59 shell32.rc:276 shell32.rc:300 +#: shell32.rc:322 shell32.rc:341 shlwapi.rc:44 twain.rc:32 user32.rc:83 +#: user32.rc:98 wininet.rc:51 wininet.rc:71 winspool.rc:42 net.rc:47 +#: notepad.rc:117 oleview.rc:161 oleview.rc:174 progman.rc:106 progman.rc:124 +#: progman.rc:142 progman.rc:158 progman.rc:180 progman.rc:199 progman.rc:216 +#: regedit.rc:296 regedit.rc:307 regedit.rc:320 regedit.rc:336 regedit.rc:349 +#: regedit.rc:362 taskmgr.rc:442 taskmgr.rc:517 winecfg.rc:214 winecfg.rc:224 +#: wineconsole.rc:135 winefile.rc:128 winefile.rc:151 winefile.rc:181 +#: winemine.rc:73 winemine.rc:84 winemine.rc:98 wordpad.rc:215 wordpad.rc:226 +#: wordpad.rc:244 wordpad.rc:257 +msgid "OK" +msgstr "Εἶεν" + +#: appwiz.rc:79 +msgid "The following information can be used to get technical support for %s:" +msgstr "Ἥδ' ἐπιστήμη δύναται ὠφελεῖν ὥστε τεχνικὸν ἔρεισμα κτᾶσθαι ἐπὶ %s:" + +#: appwiz.rc:80 +msgid "Publisher:" +msgstr "Ἐκφορεύς:" + +#: appwiz.rc:81 winefile.rc:166 +msgid "Version:" +msgstr "Ἑρμηνεία:" + +#: appwiz.rc:82 +msgid "Contact:" +msgstr "Ὁμιλία:" + +#: appwiz.rc:83 +msgid "Support Information:" +msgstr "Ἐρείσματος Ἐπιστήμη" + +#: appwiz.rc:84 +msgid "Support Telephone:" +msgstr "Ἐρείσματος Τηλέφωνος:" + +#: appwiz.rc:85 +msgid "Readme:" +msgstr "Ἀναγίγνωσκέμε:" + +#: appwiz.rc:86 +msgid "Product Updates:" +msgstr "Ἐργου Καινίσεις:" + +#: appwiz.rc:87 +msgid "Comments:" +msgstr "Σχόλια:" + +#: appwiz.rc:100 +msgid "Wine Gecko Installer" +msgstr "Οἶνου-Γαλεώτου Ἐνστάτης" + +#: appwiz.rc:103 +msgid "" +"Wine could not find a Gecko package which is needed for applications " +"embedding HTML to work correctly. Wine can automatically download and " +"install it for you.\n" +"\n" +"Note: it is recommended to use your distribution's packages instead. See <a " +"href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> for " +"details." +msgstr "" +"Οἶνος οὐκ ἐδύνατο Γαλεώτου φορτίον εὑρεῖν ὃ δεῖ προσθέσεις σὺν HTML ὀρθῶς" +"ἐργάζεσθαι. Οἶνος δύναται αὐτοματῶς κατακτᾶσθαι καὶ ἐνιστάναι ἀντί σου.\n" +"\n" +"Μάθε: χρὴ τὰ φορτία τῆς διανομῆς ἀντὶ τούτων χρῆσθαι. Εἶδε εἰς <a " +"href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> ἐπ' " +"ἀκριβείᾳ." + +#: appwiz.rc:109 appwiz.rc:124 +msgid "&Install" +msgstr "&Ἐνιστάναι" + +#: appwiz.rc:110 appwiz.rc:125 avifil32.rc:55 browseui.rc:40 comctl32.rc:66 +#: comctl32.rc:81 comctl32.rc:56 comdlg32.rc:171 comdlg32.rc:193 +#: comdlg32.rc:211 comdlg32.rc:233 comdlg32.rc:263 comdlg32.rc:306 +#: comdlg32.rc:328 comdlg32.rc:348 comdlg32.rc:360 comdlg32.rc:399 +#: comdlg32.rc:453 comdlg32.rc:478 comdlg32.rc:504 comdlg32.rc:527 credui.rc:53 +#: cryptui.rc:264 cryptui.rc:276 cryptui.rc:366 dinput.rc:47 ieframe.rc:97 +#: inetcpl.rc:81 localui.rc:45 localui.rc:58 mpr.rc:50 msacm32.rc:54 +#: mshtml.rc:48 mshtml.rc:58 msvfw32.rc:37 oledlg.rc:63 oledlg.rc:95 +#: serialui.rc:42 setupapi.rc:42 setupapi.rc:60 shell32.rc:277 shell32.rc:301 +#: shell32.rc:312 shell32.rc:342 shlwapi.rc:45 twain.rc:33 user32.rc:84 +#: user32.rc:99 wininet.rc:52 wininet.rc:72 winspool.rc:43 notepad.rc:118 +#: oleview.rc:162 oleview.rc:175 progman.rc:107 progman.rc:125 progman.rc:143 +#: progman.rc:159 progman.rc:181 progman.rc:200 progman.rc:217 regedit.rc:297 +#: regedit.rc:308 regedit.rc:321 regedit.rc:337 regedit.rc:350 regedit.rc:363 +#: taskmgr.rc:443 taskmgr.rc:518 wineboot.rc:34 winecfg.rc:215 winecfg.rc:225 +#: wineconsole.rc:136 winefile.rc:129 winefile.rc:152 winefile.rc:182 +#: winemine.rc:99 wordpad.rc:216 wordpad.rc:227 wordpad.rc:245 wordpad.rc:258 +msgid "Cancel" +msgstr "Καθαιρεῖν" + +#: appwiz.rc:115 +msgid "Wine Mono Installer" +msgstr "Οἴνου-Μονο Ἐνστάτης" + +#: appwiz.rc:118 +msgid "" +"Wine could not find a wine-mono package which is needed for .NET " +"applications to work correctly. Wine can automatically download and install " +"it for you.\n" +"\n" +"Note: it is recommended to use your distribution's packages instead. See <a " +"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " +"details." +msgstr "" +"Οἶνος οὐκ ἐδύνατο οἴνου-μονο φορτίον εὑρεῖν ὃ δεῖ προσθέσεις σὺν .NET ὀρθῶς" +"ἐργάζεσθαι. Οἶνος δύναται αὐτοματῶς κατακτᾶσθαι καὶ ἐνιστάναι ἀντί σου.\n" +"\n" +"Μάθε: χρὴ τὰ φορτία τῆς διανομῆς ἀντὶ τούτων χρῆσθαι. Εἶδε εἰς <a " +"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> ἐπ' " +"ἀκριβείᾳ." + +#: appwiz.rc:31 +msgid "Add/Remove Programs" +msgstr "Προγράμματα Προστιθέναι/Ἐξαιρεῖν" + +#: appwiz.rc:32 +msgid "" +"Allows you to install new software, or remove existing software from your " +"computer." +msgstr "" +"Ἐᾷ σε νεὰ μαλάγματα ἐνστάναι ἢ ὑπάρχοντα μαλάγματα ἐξελεῖν ἀπὸ τοῦ λογιστοῦ." + +#: appwiz.rc:33 taskmgr.rc:262 winecfg.rc:33 +msgid "Applications" +msgstr "Προσθέσεις" + +#: appwiz.rc:35 +msgid "" +"Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " +"entry for this program from the registry?" +msgstr "" +"Ἀδύνατος ἀποστάτην ἐπεξελθεῖν, '%s'. Ἐθέλεις ἁπὸ τὴν ἀναγραφὴν τὴν παραγραφὴν " +"τῆς ἀποστάσεως τούτου προγράμματος ἐξελεῖν;" + +#: appwiz.rc:36 +msgid "Not specified" +msgstr "Οὐκ ὀνομάσας" + +#: appwiz.rc:38 shell32.rc:144 shell32.rc:241 regedit.rc:147 winefile.rc:107 +msgid "Name" +msgstr "Ὄνομα" + +#: appwiz.rc:39 +msgid "Publisher" +msgstr "Ἐκφορεύς" + +#: appwiz.rc:40 cryptui.rc:54 +msgid "Version" +msgstr "Ἑρμηνεία" + +#: appwiz.rc:41 +msgid "Installation programs" +msgstr "Προγράμματα τῆς ἐνστάσεως" + +#: appwiz.rc:42 +msgid "Programs (*.exe)" +msgstr "Πρόγραμματα (*.exe)" + +#: appwiz.rc:43 avifil32.rc:33 cryptui.rc:83 shell32.rc:199 notepad.rc:76 +#: oleview.rc:103 progman.rc:82 regedit.rc:225 winedbg.rc:42 winhlp32.rc:90 +msgid "All files (*.*)" +msgstr "Πάντα βίβλια (*.*)" + +#: appwiz.rc:46 +msgid "&Modify/Remove" +msgstr "&Μετατιθέναι/Ἐξαιρεῖν" + +#: appwiz.rc:51 +msgid "Downloading..." +msgstr "Κατακτώμενος..." + +#: appwiz.rc:52 +msgid "Installing..." +msgstr "Ἐνιστάς..." + +#: appwiz.rc:53 +msgid "" +"Unexpected checksum of downloaded file. Aborting installation of corrupted " +"file." +msgstr "" +"Ἀπροσδόκητος εὐθυάριθμος τοῦ κατακεκτημένου βίβλιου. Ἀμβλῶν τὴν ἐνστάσιν τοῦ " +"διεφθαρμένου βιβλίου." + +#: avifil32.rc:42 +msgid "Compress options" +msgstr "Συστολῆς αἱρέσεις" + +#: avifil32.rc:45 +msgid "&Choose a stream:" +msgstr "&Αἱροῦ ῥοῦν:" + +#: avifil32.rc:48 wordpad.rc:76 +msgid "&Options..." +msgstr "Αἱρέσεις" + +#: avifil32.rc:49 +msgid "&Interleave every" +msgstr "&Παραλλάσσειν διὰ" + +#: avifil32.rc:51 msvfw32.rc:51 +msgid "frames" +msgstr "κύτεων" + +#: avifil32.rc:52 +msgid "Current format:" +msgstr "Παρὸν σχῆμα:" + +#: avifil32.rc:30 +msgid "Waveform: %s" +msgstr "Κυμομορφή: %s" + +#: avifil32.rc:31 +msgid "Waveform" +msgstr "Κυμομορφή" + +#: avifil32.rc:32 +msgid "All multimedia files" +msgstr "Πάντα πολύπορα βίβλια" + +#: avifil32.rc:34 +msgid "video" +msgstr "θεά" + +#: avifil32.rc:35 +msgid "audio" +msgstr "φωνή" + +#: avifil32.rc:36 +msgid "Wine AVI-default-filehandler" +msgstr "Οἶνος AVI-ἐρῆμος-βιβλιοχρήστης" + +#: avifil32.rc:37 +msgid "uncompressed" +msgstr "ἀσύστολος" + +#: browseui.rc:28 +msgid "Canceling..." +msgstr "Καθαιρῶν..." + +#: comctl32.rc:62 winefile.rc:157 +msgid "Properties for %s" +msgstr "Ἰδια ἐπὶ %s" + +#: comctl32.rc:67 comdlg32.rc:264 +msgid "&Apply" +msgstr "&Προσφέρειν" + +#: comctl32.rc:68 comctl32.rc:82 comdlg32.rc:307 user32.rc:88 +msgid "Help" +msgstr "Ὠφέλεια" + +#: comctl32.rc:75 +msgid "Wizard" +msgstr "Φαρμακεύς" + +#: comctl32.rc:78 +msgid "< &Back" +msgstr "< &Πάλιν" + +#: comctl32.rc:79 +msgid "&Next >" +msgstr "&Ἑξῆς >" + +#: comctl32.rc:80 +msgid "Finish" +msgstr "Τελευτᾶν" + +#: comctl32.rc:91 +msgid "Customize Toolbar" +msgstr "Ἰδιῶσθαι Ὀργανομοχλός" + +#: comctl32.rc:94 comctl32.rc:57 cryptui.rc:351 ieframe.rc:43 oleview.rc:83 +#: oleview.rc:187 oleview.rc:200 oleview.rc:212 taskmgr.rc:139 +msgid "&Close" +msgstr "&Κλείειν" + +#: comctl32.rc:95 +msgid "R&eset" +msgstr "Ἀ&ναλύειν" + +#: comctl32.rc:96 comdlg32.rc:172 comdlg32.rc:194 comdlg32.rc:265 +#: comdlg32.rc:329 comdlg32.rc:349 comdlg32.rc:361 comdlg32.rc:479 +#: comdlg32.rc:505 comdlg32.rc:528 ieframe.rc:58 msacm32.rc:52 oledlg.rc:96 +#: shell32.rc:128 clock.rc:44 notepad.rc:60 notepad.rc:119 oleview.rc:72 +#: progman.rc:55 progman.rc:108 progman.rc:126 progman.rc:144 progman.rc:160 +#: progman.rc:184 progman.rc:202 progman.rc:219 regedit.rc:77 taskmgr.rc:87 +#: winefile.rc:82 winemine.rc:53 winhlp32.rc:57 wordpad.rc:102 +msgid "&Help" +msgstr "&Ὠφέλεια" + +#: comctl32.rc:97 +msgid "Move &Up" +msgstr "Κινεῖν &Ἄνω" + +#: comctl32.rc:98 +msgid "Move &Down" +msgstr "Κινεῖν &Κάτω" + +#: comctl32.rc:99 +msgid "A&vailable buttons:" +msgstr "Π&ρόχειροι ὀμφαλοί:" + +#: comctl32.rc:101 +msgid "&Add ->" +msgstr "&Προστιθέναι ->" + +#: comctl32.rc:102 +msgid "<- &Remove" +msgstr "<- &Ἐξαιρεῖν" + +#: comctl32.rc:103 +msgid "&Toolbar buttons:" +msgstr "&Ὀμφαλοὶ τοῦ ὀργανομοχλοῦ:" + +#: comctl32.rc:42 +msgid "Separator" +msgstr "Χωριστής" + +#: comctl32.rc:47 progman.rc:81 +msgctxt "hotkey" +msgid "None" +msgstr "Οὐδὲν" + +#: comctl32.rc:52 shell32.rc:309 shlwapi.rc:46 user32.rc:79 +msgid "&Yes" +msgstr "&Ναί" + +#: comctl32.rc:53 shell32.rc:311 shlwapi.rc:47 user32.rc:80 +msgid "&No" +msgstr "&Οὔ" + +#: comctl32.rc:54 user32.rc:82 +msgid "&Retry" +msgstr "Πειρᾶν πάλιν" + +#: comctl32.rc:31 cryptui.rc:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:60 +#: winedbg.rc:75 wordpad.rc:180 +msgid "Close" +msgstr "Κλείειν" + +#: comctl32.rc:36 +msgid "Today:" +msgstr "Σήμερον:" + +#: comctl32.rc:37 +msgid "Go to today" +msgstr "Ἰέναι ἐν σήμερον" + +#: comdlg32.rc:157 comdlg32.rc:170 comdlg32.rc:459 comdlg32.rc:484 +#: comdlg32.rc:511 shell32.rc:167 oleview.rc:101 +msgid "Open" +msgstr "Ἀνοιγνύναι" + +#: comdlg32.rc:160 comdlg32.rc:182 +msgid "File &Name:" +msgstr "&Ὄνομα τοῦ βιβλίου:" + +#: comdlg32.rc:163 comdlg32.rc:185 +msgid "&Directories:" +msgstr "&Χωρία:" + +#: comdlg32.rc:166 comdlg32.rc:188 +msgid "List Files of &Type:" +msgstr "Ἀριθμεῖν Βίβλια τοῦδε γένους:" + +#: comdlg32.rc:168 comdlg32.rc:190 +msgid "Dri&ves:" +msgstr "Κύκλοι:" + +#: comdlg32.rc:173 comdlg32.rc:195 winefile.rc:173 +msgid "&Read Only" +msgstr "&Μόνον Ἀναγνωστέον" + +#: comdlg32.rc:179 +msgid "Save As..." +msgstr "Σῴζειν ὡς..." + +#: comdlg32.rc:192 comdlg32.rc:145 +msgid "Save As" +msgstr "Σῴζειν ὡς" + +#: comdlg32.rc:201 comdlg32.rc:210 comdlg32.rc:356 comdlg32.rc:54 hhctrl.rc:49 +#: wordpad.rc:173 +msgid "Print" +msgstr "Ἐπισημαίνειν" + +#: comdlg32.rc:204 +msgid "Printer:" +msgstr "Ἐπισημαντήρ:" + +#: comdlg32.rc:206 comdlg32.rc:383 +msgid "Print range" +msgstr "Βολή τοῦ ἐπισημαίνειν" + +#: comdlg32.rc:207 comdlg32.rc:384 regedit.rc:268 +msgid "&All" +msgstr "&Ὅλα" + +#: comdlg32.rc:208 +msgid "S&election" +msgstr "&Αἵρεσις" + +#: comdlg32.rc:209 +msgid "&Pages" +msgstr "&Γραφαί" + +#: comdlg32.rc:212 comdlg32.rc:234 +msgid "&Setup" +msgstr "&Σκεύασμα" + +#: comdlg32.rc:213 +msgid "&From:" +msgstr "&Ἀπό:" + +#: comdlg32.rc:214 +msgid "&To:" +msgstr "&Εἰς:" + +#: comdlg32.rc:215 wineps.rc:42 +msgid "Print &Quality:" +msgstr "&Λεπτότης τοῦ Ἐπισημαίνειν:" + +#: comdlg32.rc:217 +msgid "Print to Fi&le" +msgstr "Εἰς &Βίβλιον Ἐπισημαίνειν" + +#: comdlg32.rc:218 +msgid "Condensed" +msgstr "Σύντομος" + +#: comdlg32.rc:224 comdlg32.rc:395 +msgid "Print Setup" +msgstr "Σκεύασμα τοῦ Ἐπισημαίνειν" + +#: comdlg32.rc:227 comdlg32.rc:363 comdlg32.rc:402 +msgid "Printer" +msgstr "Ἐπισημαντήρ" + +#: comdlg32.rc:228 +msgid "&Default Printer" +msgstr "&Ἐρῆμος ἐπισημαντήρ" + +#: comdlg32.rc:229 +msgid "[none]" +msgstr "[οὐδέν]" + +#: comdlg32.rc:230 +msgid "Specific &Printer" +msgstr "Εἰδικὸς &Ἐπισημαντήρ" + +#: comdlg32.rc:235 comdlg32.rc:421 comdlg32.rc:440 wineps.rc:34 +msgid "Orientation" +msgstr "εὐθυωρία" + +#: comdlg32.rc:236 +msgid "Po&rtrait" +msgstr "Εἰ&κών" + +#: comdlg32.rc:237 comdlg32.rc:442 wineps.rc:37 +msgid "&Landscape" +msgstr "&Χώρα" + +#: comdlg32.rc:240 comdlg32.rc:415 comdlg32.rc:435 wineps.rc:28 +msgid "Paper" +msgstr "Βίβλος" + +#: comdlg32.rc:241 +msgid "Si&ze" +msgstr "Μέγε&θος" + +#: comdlg32.rc:242 +msgid "&Source" +msgstr "&Πηγή" + +#: comdlg32.rc:250 wineconsole.rc:85 +msgid "Font" +msgstr "Τύπος" + +#: comdlg32.rc:253 +msgid "&Font:" +msgstr "&Τύπος:" + +#: comdlg32.rc:256 +msgid "Font St&yle:" +msgstr "&Τρόπος τοῦ τύπου:" + +#: comdlg32.rc:259 comdlg32.rc:436 winecfg.rc:294 +msgid "&Size:" +msgstr "&Μέγεθος:" + +#: comdlg32.rc:266 +msgid "Effects" +msgstr "τέχναι" + +#: comdlg32.rc:267 +msgid "Stri&keout" +msgstr "Διαγραφή" + +#: comdlg32.rc:268 +msgid "&Underline" +msgstr "&Ὑπόγραμμα" + +#: comdlg32.rc:269 winecfg.rc:292 +msgid "&Color:" +msgstr "&Χρῶμα:" + +#: comdlg32.rc:272 +msgid "Sample" +msgstr "Δεῖγμα" + +#: comdlg32.rc:274 +msgid "Scr&ipt:" +msgstr "&Γραμματική:" + +#: comdlg32.rc:282 +msgid "Color" +msgstr "Χρῶμα" + +#: comdlg32.rc:285 +msgid "&Basic Colors:" +msgstr "Ἁπλᾶ Χρώματα" + +#: comdlg32.rc:286 +msgid "&Custom Colors:" +msgstr "&Ἴδια Χρώματα:" + +#: comdlg32.rc:287 comdlg32.rc:310 +msgid "Color | Sol&id" +msgstr "Χρῶμα | &Στερεόν" + +#: comdlg32.rc:288 +msgid "&Red:" +msgstr "&Ἐρυθρόν:" + +#: comdlg32.rc:290 +msgid "&Green:" +msgstr "&Χλωρόν:" + +#: comdlg32.rc:292 +msgid "&Blue:" +msgstr "&Κυανόν:" + +#: comdlg32.rc:294 +msgid "&Hue:" +msgstr "&Χρόα:" + +#: comdlg32.rc:296 +msgctxt "Saturation" +msgid "&Sat:" +msgstr "&Μεστότης" + +#: comdlg32.rc:298 +msgctxt "Luminance" +msgid "&Lum:" +msgstr "&Λαμπρότης:" + +#: comdlg32.rc:308 +msgid "&Add to Custom Colors" +msgstr "&Προστιθέναι Ἰδίοις Χρώμασιν" + +#: comdlg32.rc:309 +msgid "&Define Custom Colors >>" +msgstr "&Ὁρίζειν Ἴδια Χρώματα >>" + +#: comdlg32.rc:316 regedit.rc:275 regedit.rc:285 +msgid "Find" +msgstr "Εὑρεῖν" + +#: comdlg32.rc:319 comdlg32.rc:338 +msgid "Fi&nd What:" +msgstr "Τίνα Εὑρεῖν:" + +#: comdlg32.rc:321 comdlg32.rc:342 +msgid "Match &Whole Word Only" +msgstr "&Ὅλον Λόγον Μόνον Ἰσοῦσθαι" + +#: comdlg32.rc:322 comdlg32.rc:343 +msgid "Match &Case" +msgstr "Κᾶσον Ἰσοῦσθαι" + +#: comdlg32.rc:323 joy.rc:71 +msgid "Direction" +msgstr "Τρόπος" + +#: comdlg32.rc:324 view.rc:42 +msgid "&Up" +msgstr "&Ἄνω" + +#: comdlg32.rc:325 view.rc:43 +msgid "&Down" +msgstr "&Κάτω" + +#: comdlg32.rc:327 comdlg32.rc:345 +msgid "&Find Next" +msgstr "&Ἑξῆς εὑρεῖν" + +#: comdlg32.rc:335 +msgid "Replace" +msgstr "Μεταλλάσσειν" + +#: comdlg32.rc:340 +msgid "Re&place With:" +msgstr "Μεταλλάσσειν:" + +#: comdlg32.rc:346 +msgid "&Replace" +msgstr "&Μεταλλάσσειν" + +#: comdlg32.rc:347 +msgid "Replace &All" +msgstr "&Ὅλα Μεταλλάσσειν" + +#: comdlg32.rc:364 +msgid "Print to fi&le" +msgstr "Εἰς &Βίβλιον Ἐπισημαίνειν" + +#: comdlg32.rc:365 comdlg32.rc:403 ieframe.rc:42 shdoclc.rc:61 shell32.rc:108 +#: clock.rc:31 wineconsole.rc:30 +msgid "&Properties" +msgstr "&Ἴδια" + +#: comdlg32.rc:366 comdlg32.rc:404 msacm32.rc:34 winefile.rc:138 +msgid "&Name:" +msgstr "&Ὄνομα:" + +#: comdlg32.rc:368 comdlg32.rc:406 +msgid "Status:" +msgstr "Τάξις:" + +#: comdlg32.rc:370 comdlg32.rc:408 +msgid "Type:" +msgstr "Γένος:" + +#: comdlg32.rc:372 comdlg32.rc:410 +msgid "Where:" +msgstr "Ποῦ:" + +#: comdlg32.rc:374 comdlg32.rc:412 +msgid "Comment:" +msgstr "Σχόλιον:" + +#: comdlg32.rc:377 +msgid "Copies" +msgstr "Μιμήματα" + +#: comdlg32.rc:378 +msgid "Number of &copies:" +msgstr "Ἀριθμὸς &μιμημάτων:" + +#: comdlg32.rc:380 +msgid "C&ollate" +msgstr "Συντάσσειν" + +#: comdlg32.rc:385 +msgid "Pa&ges" +msgstr "Γρα&φαί" + +#: comdlg32.rc:386 +msgid "&Selection" +msgstr "&Αἵρεσις" + +#: comdlg32.rc:389 +msgid "&from:" +msgstr "&ἀπό:" + +#: comdlg32.rc:390 +msgid "&to:" +msgstr "&εἰς:" + +#: comdlg32.rc:416 winecfg.rc:300 +msgid "Si&ze:" +msgstr "Μέγε&θος:" + +#: comdlg32.rc:418 +msgid "&Source:" +msgstr "&Πηγή:" + +#: comdlg32.rc:423 +msgid "P&ortrait" +msgstr "Ε&ἰκών" + +#: comdlg32.rc:424 +msgid "L&andscape" +msgstr "&Χώρα" + +#: comdlg32.rc:429 +msgid "Setup Page" +msgstr "Γραφὴν Σκευάζειν" + +#: comdlg32.rc:438 +msgid "&Tray:" +msgstr "Σανίδιον" + +#: comdlg32.rc:441 wineps.rc:35 +msgid "&Portrait" +msgstr "&Εἰκών" + +#: comdlg32.rc:444 +msgid "L&eft:" +msgstr "Ἀ&ριστερά:" + +#: comdlg32.rc:446 notepad.rc:112 +msgid "&Right:" +msgstr "&Δεξιά:" + +#: comdlg32.rc:448 +msgid "T&op:" +msgstr "&Ἄνω:" + +#: comdlg32.rc:450 notepad.rc:114 +msgid "&Bottom:" +msgstr "&Κάτω:" + +#: comdlg32.rc:454 +msgid "P&rinter..." +msgstr "Εκ&τυπωτής..." + +#: comdlg32.rc:462 comdlg32.rc:487 +msgid "Look &in:" +msgstr "Εἰδεῖν ἐν:" + +#: comdlg32.rc:468 comdlg32.rc:494 +msgid "File &name:" +msgstr "&Ὄνομα βιβλίου:" + +#: comdlg32.rc:472 comdlg32.rc:498 +msgid "Files of &type:" +msgstr "Βίβλια τοῦδε &γένους:" + +#: comdlg32.rc:475 comdlg32.rc:501 +msgid "Open as &read-only" +msgstr "Ἀνοιγνύναι ὡς &μόνον-ἀναγνωστέον" + +#: comdlg32.rc:477 comdlg32.rc:503 comdlg32.rc:521 shdoclc.rc:127 shell32.rc:99 +msgid "&Open" +msgstr "&Ἀνοιγνύναι" + +#: comdlg32.rc:514 +msgid "File name:" +msgstr "Ὄνομα βιβλίου" + +#: comdlg32.rc:517 +msgid "Files of type:" +msgstr "Βιβλία τοῦδε γένους:" + +#: comdlg32.rc:32 +msgid "File not found" +msgstr "Τὸ βιβλίον οὐχ ηὑρέθη" + +#: comdlg32.rc:33 +msgid "Please verify that the correct file name was given" +msgstr "Συγγνώμη, βεβαίου τὸ ὀρθὸν ὄνομα τοῦ βιβλίου δοθῆναι" + +#: comdlg32.rc:34 +msgid "" +"File does not exist.\n" +"Do you want to create file?" +msgstr "" +"Τὸ βιβλίον οὐχ ὑπάρχει.\n" +"Ἐθέλεις γεννᾶν;" + +#: comdlg32.rc:35 +msgid "" +"File already exists.\n" +"Do you want to replace it?" +msgstr "" +"Τὸ βιβλίον ὑπάρχει ἤδη.\n" +"Ἐθέλεις μεταλλάσσειν;" + +#: comdlg32.rc:36 +msgid "Invalid character(s) in path" +msgstr "Ἄκυρα γράμματα ἐν ὁδῷ" + +#: comdlg32.rc:37 +msgid "" +"A filename cannot contain any of the following characters:\n" +" / : < > |" +msgstr "" +"Ὄνομα βιβλίου οὐ δύναται τινας τῶνδε γράμματα ἔχειν:\n" +" / : < > |" + +#: comdlg32.rc:38 +msgid "Path does not exist" +msgstr "Ἡ ὁδὸς οὐχ ὑπάρχει" + +#: comdlg32.rc:39 +msgid "File does not exist" +msgstr "Τὸ βιβλίον οὑχ ὑπάρχει" + +#: comdlg32.rc:40 +msgid "The selection contains a non-folder object" +msgstr "Ἡ αἵρεσις ἀχώριον σκεῦος ἔχει" + +#: comdlg32.rc:45 +msgid "Up One Level" +msgstr "Ἄνω Ἓν Κῶλον" + +#: comdlg32.rc:46 +msgid "Create New Folder" +msgstr "Νεὸν Χωρίον Γεννᾶν" + +#: comdlg32.rc:47 +msgid "List" +msgstr "Ἀπογραφή" + +#: comdlg32.rc:48 cryptui.rc:196 +msgid "Details" +msgstr "Ἀκρίβεια" + +#: comdlg32.rc:49 +msgid "Browse to Desktop" +msgstr "Νέμεσθαι πρὸς Βάθρον" + +#: comdlg32.rc:113 +msgid "Regular" +msgstr "Νόμιμος" + +#: comdlg32.rc:114 +msgid "Bold" +msgstr "Βαρύς" + +#: comdlg32.rc:115 +msgid "Italic" +msgstr "Πλάγιος" + +#: comdlg32.rc:116 +msgid "Bold Italic" +msgstr "Βαρὺς καὶ Πλάγιος" + +#: comdlg32.rc:121 wordpad.rc:125 +msgid "Black" +msgstr "Μέλας" + +#: comdlg32.rc:122 wordpad.rc:126 +msgid "Maroon" +msgstr "" + +#: comdlg32.rc:123 wordpad.rc:127 +msgid "Green" +msgstr "Χλωρός" + +#: comdlg32.rc:124 wordpad.rc:128 +msgid "Olive" +msgstr "Ἐλαία" + +#: comdlg32.rc:125 wordpad.rc:129 +msgid "Navy" +msgstr "" + +#: comdlg32.rc:126 wordpad.rc:130 +msgid "Purple" +msgstr "" + +#: comdlg32.rc:127 wordpad.rc:131 +msgid "Teal" +msgstr "" + +#: comdlg32.rc:128 wordpad.rc:132 +msgid "Gray" +msgstr "Σκαιός" + +#: comdlg32.rc:129 wordpad.rc:133 +msgid "Silver" +msgstr "Ἀργύρεος" + +#: comdlg32.rc:130 wordpad.rc:134 +msgid "Red" +msgstr "Ἐρυθρός" + +#: comdlg32.rc:131 wordpad.rc:135 +msgid "Lime" +msgstr "Φιλύρινος" + +#: comdlg32.rc:132 wordpad.rc:136 +msgid "Yellow" +msgstr "Ξανθός" + +#: comdlg32.rc:133 wordpad.rc:137 +msgid "Blue" +msgstr "Κυανός" + +#: comdlg32.rc:134 wordpad.rc:138 +msgid "Fuchsia" +msgstr "" + +#: comdlg32.rc:135 wordpad.rc:139 +msgid "Aqua" +msgstr "" + +#: comdlg32.rc:136 wordpad.rc:140 +msgid "White" +msgstr "Λευκός" + +#: comdlg32.rc:56 +msgid "Unreadable Entry" +msgstr "" + +#: comdlg32.rc:58 +msgid "" +"This value does not lie within the page range.\n" +"Please enter a value between %1!d! and %2!d!." +msgstr "" +"Οὗτος ἀριθμὸς οὐκ εἴσω τοῦ βολῆς τῶν γραφῶν.\n" +"Συγγνώμη, γράφε ἀριθμὸν μεταξὺ %1!d! καὶ %2!d!." + +#: comdlg32.rc:60 +msgid "The 'from' entry cannot exceed the 'to' entry." +msgstr "Δεῖ τὸν 'ἀπό' ἀριθμὸν οὐ τὸν 'εἰς' ἀριθμὸν ὑπερβάλλειν." + +#: comdlg32.rc:62 +msgid "" +"Margins overlap or fall outside Paper boundaries.\n" +"Please reenter margins." +msgstr "" +"Τὰ χεῖλα ὑπερέχουσιν ἢ ἔξω τῶν ὅρεων τοῦ βίβλου.\n" +"Συγγνώμη, γράφε τὰ χεῖλα πάλιν." + +#: comdlg32.rc:64 +msgid "The 'Number of copies' field cannot be empty." +msgstr "Δεῖ τὸν 'Ἀριθμὸς μιμημάτων' οὐ κοῖλον εἶναι." + +#: comdlg32.rc:66 +msgid "" +"This large number of copies is not supported by your printer.\n" +"Please enter a value between 1 and %d." +msgstr "" +"Οὗτος μέγας ἀριθμὸς οὐκ ἐρείδονται ὑπο σοῦ ἐκτυπωτοῦ.\n" +"Συγγνώμη, γράφε ἀριθμόν τινα μεταξὺ 1 καὶ %d." + +#: comdlg32.rc:67 +msgid "A printer error occurred." +msgstr "Ἁμαρτία τις τοῦ ἐκτυπωτοῦ ἐγένετο." + +#: comdlg32.rc:68 +msgid "No default printer defined." +msgstr "Οὐδεὶς ἐρῆμος ἐκτυπωτὴς ὀρίζεται." + +#: comdlg32.rc:69 +msgid "Cannot find the printer." +msgstr "Οὐ δύναται τὸν ἐκτυπωτὴν εὑρεῖν." + +#: comdlg32.rc:70 progman.rc:76 +msgid "Out of memory." +msgstr "Μνήμης ἐνδέης." + +#: comdlg32.rc:71 +msgid "An error occurred." +msgstr "Ἁμαρτία ἐγένετο." + +#: comdlg32.rc:72 +msgid "Unknown printer driver." +msgstr "Ἀγνὼς ἐκτυπωτοῦ ἡνίοχος." + +#: comdlg32.rc:75 +msgid "" +"Before you can perform printer-related tasks such as page setup or printing " +"a document, you need to install a printer. Please install one and retry." +msgstr "" +"Πρὶν ἐκτυπωτικὰ ἔργα πράσσειν δύνασθαι οἷα σκεύασμα γραφῆς ἢ ἐκτύπωμα " +"γραμματείου, δεῖ σε ἐκτυπωτὴν ἐνστῆσαι. Συγγνώμη, τινὰ ἐνστῆσον καὶ πειρᾶν " +"πάλιν." + +#: comdlg32.rc:141 +msgid "Select a font size between %1!d! and %2!d! points." +msgstr "Ἑλοῦ μέγεθός τις τοῦ τύπου μεταξὺ %1!d! καὶ %2!d! στιγμῶν." + +#: comdlg32.rc:142 ieframe.rc:35 +msgid "&Save" +msgstr "&Σῴζειν" + +#: comdlg32.rc:143 +msgid "Save &in:" +msgstr "Σῴζειν ἐν:" + +#: comdlg32.rc:144 +msgid "Save" +msgstr "Σῴζειν" + +#: comdlg32.rc:146 +msgid "Open File" +msgstr "Ἀνοιγνύναι Βιβλίον" + +#: comdlg32.rc:147 +msgid "Select Folder" +msgstr "Χωρίον Ἑλεῖν" + +#: comdlg32.rc:148 +msgid "Font size has to be a number." +msgstr "Δεῖ τὸν μέγεθον τοῦ τύπος ἀριθμόν τινα εἶναι." + +#: comdlg32.rc:83 oleview.rc:98 +msgid "Ready" +msgstr "Ἑτοῖμος" + +#: comdlg32.rc:84 +msgid "Paused; " +msgstr "Παυθείς, " + +#: comdlg32.rc:85 +msgid "Error; " +msgstr "Ἁμαρτία, " + +#: comdlg32.rc:86 +msgid "Pending deletion; " +msgstr "Μέλλων ἐξαλείψειν, " + +#: comdlg32.rc:87 +msgid "Paper jam; " +msgstr "Πηκτὸς βίβλος, " + +#: comdlg32.rc:88 +msgid "Out of paper; " +msgstr "Βίβλου ἐνδέης, " + +#: comdlg32.rc:89 +msgid "Feed paper manual; " +msgstr "Βόσκε βίβλον χειρὸς, " + +#: comdlg32.rc:90 +msgid "Paper problem; " +msgstr "Πρόβλημα τοῦ βίβλου, " + +#: comdlg32.rc:91 +msgid "Printer offline; " +msgstr "Οἴχεται ἐκτυπωτής, " + +#: comdlg32.rc:92 +msgid "I/O Active; " +msgstr "I/O ἄσχυλος, " + +#: comdlg32.rc:93 +msgid "Busy; " +msgstr "Ἔνεργος, " + +#: comdlg32.rc:94 +msgid "Printing; " +msgstr "Ἐκτυπῶν, " + +#: comdlg32.rc:95 +msgid "Output tray is full; " +msgstr "Μεστὸν σανίδιον τῆς ἐκθέσεως, " + +#: comdlg32.rc:96 +msgid "Not available; " +msgstr "Οὐ πρόχειρος, " + +#: comdlg32.rc:97 +msgid "Waiting; " +msgstr "Μένων, " + +#: comdlg32.rc:98 +msgid "Processing; " +msgstr "Πομπεύων, " + +#: comdlg32.rc:99 +msgid "Initializing; " +msgstr "Παρασκευάζων, " + +#: comdlg32.rc:100 +msgid "Warming up; " +msgstr "Θέρμων, " + +#: comdlg32.rc:101 +msgid "Toner low; " +msgstr "" + +#: comdlg32.rc:102 +msgid "No toner; " +msgstr "" + +#: comdlg32.rc:103 +msgid "Page punt; " +msgstr "" + +#: comdlg32.rc:104 +msgid "Interrupted by user; " +msgstr "" + +#: comdlg32.rc:105 +msgid "Out of memory; " +msgstr "Μνήμης ἐνδέης, " + +#: comdlg32.rc:106 +msgid "The printer door is open; " +msgstr "Ἀνεῳγμένη ὴ θύρα τοῦ ἐκτυπωτοῦ, " + +#: comdlg32.rc:107 +msgid "Print server unknown; " +msgstr "" + +#: comdlg32.rc:108 +msgid "Power save mode; " +msgstr "" + +#: comdlg32.rc:77 +msgid "Default Printer; " +msgstr "Ἐρῆμος ἐκτυπωτής, " + +#: comdlg32.rc:78 +msgid "There are %d documents in the queue" +msgstr "Εἴσιν %δ γραμματεῖα ἐν ἀπογραφῇ" + +#: comdlg32.rc:79 +msgid "Margins [inches]" +msgstr "Χεῖλα [δάκτυλοι]" + +#: comdlg32.rc:80 +msgid "Margins [mm]" +msgstr "Χεῖλα [μμ]" + +#: comdlg32.rc:81 sane.rc:33 +msgctxt "unit: millimeters" +msgid "mm" +msgstr "μμ" -- 2.7.4

2 1

Wine staging 3.5 release
by Alistair Leslie-Hughes 31 Mar '18

31 Mar '18

Packages have been published to the following repository. https://repos.wine-staging.com/alesliehughes/ Summary of the past few weeks * Rebased to current wine 3.5 (950 patches are applied to wine vanilla) * All existing bcrypt patches accepted upstream (Thank Hans for reviewing) * Removed patches that have already being fixed upstream. * Reviewed and upstreamed patches. Fixes * Corrected 1D Texture support. New Patches * Added support for Implicit MTA. * Added more ntoskrnl stubs for BattlEye service * Added support for fucntion BCryptDeriveKeyPBKDF2 * Added function _crtCaptureCurrentContext for Rise of the Tomb Raider Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: Banished, Claybook, Diablo 2 * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.com Best Regards Alistair.

1 0

[PATCH v2 1/4] devenum: Register waveOut devices as codec devices.
by Zebediah Figura 31 Mar '18

31 Mar '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 131 +++++++++++++++++++++++++---------------- dlls/devenum/devenum.rc | 1 - dlls/devenum/devenum_private.h | 1 - dlls/devenum/tests/Makefile.in | 2 +- dlls/devenum/tests/devenum.c | 109 ++++++++++++++++++++++++++++++++++ 5 files changed, 190 insertions(+), 54 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 6884ffc..e3fe049 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -594,6 +594,85 @@ cleanup: return TRUE; } +static void register_waveout_devices(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IPropertyBag *prop_bag = NULL; + REGFILTERPINS2 rgpins = {0}; + REGPINTYPES rgtypes = {0}; + REGFILTER2 rgf = {0}; + WCHAR clsid[CHARS_IN_GUID]; + IMoniker *mon = NULL; + WAVEOUTCAPSW caps; + int i, count; + VARIANT var; + HRESULT hr; + + hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); + if (FAILED(hr)) return; + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + V_VT(&var) = VT_BSTR; + + if (i == -1) /* WAVE_MAPPER */ + V_BSTR(&var) = SysAllocString(defaultW); + else + V_BSTR(&var) = SysAllocString(caps.szPname); + if (!(V_BSTR(&var))) + goto cleanup; + + hr = register_codec(&CLSID_AudioRendererCategory, V_BSTR(&var), &mon); + if (FAILED(hr)) goto cleanup; + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + if (FAILED(hr)) goto cleanup; + + /* write friendly name */ + hr = IPropertyBag_Write(prop_bag, wszFriendlyName, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write clsid */ + V_VT(&var) = VT_BSTR; + StringFromGUID2(&CLSID_AudioRender, clsid, CHARS_IN_GUID); + if (!(V_BSTR(&var) = SysAllocString(clsid))) + goto cleanup; + hr = IPropertyBag_Write(prop_bag, clsid_keyname, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write filter data */ + rgf.dwVersion = 2; + rgf.dwMerit = MERIT_DO_NOT_USE; + rgf.u.s2.cPins2 = 1; + rgf.u.s2.rgPins2 = &rgpins; + rgpins.dwFlags = REG_PINFLAG_B_RENDERER; + rgpins.nMediaTypes = 1; + rgpins.lpMediaType = &rgtypes; + rgtypes.clsMajorType = &MEDIATYPE_Audio; + rgtypes.clsMinorType = &MEDIASUBTYPE_NULL; + + write_filter_data(prop_bag, &rgf); + + /* write WaveOutId */ + V_VT(&var) = VT_I4; + V_I4(&var) = i; + hr = IPropertyBag_Write(prop_bag, waveoutidW, &var); + if (FAILED(hr)) goto cleanup; + +cleanup: + VariantClear(&var); + if (prop_bag) IPropertyBag_Release(prop_bag); + if (mon) IMoniker_Release(mon); + } +} + /********************************************************************** * DEVENUM_ICreateDevEnum_CreateClassEnumerator */ @@ -616,6 +695,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( register_legacy_filters(); hr = DirectSoundEnumerateW(&register_dsound_devices, NULL); if (FAILED(hr)) return hr; + register_waveout_devices(); return create_EnumMoniker(clsidDeviceClass, ppEnumMoniker); } @@ -752,62 +832,11 @@ static HRESULT register_codecs(void) if (SUCCEEDED(res)) { UINT i; - WAVEOUTCAPSW wocaps; WAVEINCAPSW wicaps; MIDIOUTCAPSW mocaps; REGPINTYPES * pTypes; IPropertyBag * pPropBag = NULL; - numDevs = waveOutGetNumDevs(); - - res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(res)) /* can't register any devices in this category */ - numDevs = 0; - - rfp2.dwFlags = REG_PINFLAG_B_RENDERER; - for (i = 0; i < numDevs; i++) - { - if (waveOutGetDevCapsW(i, &wocaps, sizeof(WAVEOUTCAPSW)) - == MMSYSERR_NOERROR) - { - IMoniker * pMoniker = NULL; - - rfp2.nMediaTypes = 1; - pTypes = CoTaskMemAlloc(rfp2.nMediaTypes * sizeof(REGPINTYPES)); - if (!pTypes) - { - IFilterMapper2_Release(pMapper); - return E_OUTOFMEMORY; - } - /* FIXME: Native devenum seems to register a lot more types for - * DSound than we do. Not sure what purpose they serve */ - pTypes[0].clsMajorType = &MEDIATYPE_Audio; - pTypes[0].clsMinorType = &MEDIASUBTYPE_PCM; - - rfp2.lpMediaType = pTypes; - - res = IFilterMapper2_RegisterFilter(pMapper, - &CLSID_AudioRender, - wocaps.szPname, - &pMoniker, - &CLSID_AudioRendererCategory, - wocaps.szPname, - &rf2); - - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - - if (pMoniker) - IMoniker_Release(pMoniker); - - if (i == iDefaultDevice) - { - FIXME("Default device\n"); - } - - CoTaskMemFree(pTypes); - } - } - numDevs = waveInGetNumDevs(); res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioInputDeviceCategory); diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index d9262e1..95e39d6 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -29,7 +29,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { - IDS_DEVENUM_WODEFAULT "Default WaveOut Device" IDS_DEVENUM_MIDEFAULT "Default MidiOut Device" } diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 93147ad..c891083 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -101,7 +101,6 @@ extern const WCHAR clsid_keyname[6] DECLSPEC_HIDDEN; /********************************************************************** * Resource IDs */ -#define IDS_DEVENUM_WODEFAULT 9 #define IDS_DEVENUM_MIDEFAULT 10 #define IDS_DEVENUM_KSDEFAULT 11 #define IDS_DEVENUM_KS 12 diff --git a/dlls/devenum/tests/Makefile.in b/dlls/devenum/tests/Makefile.in index 028ba27..a673f20 100644 --- a/dlls/devenum/tests/Makefile.in +++ b/dlls/devenum/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = devenum.dll -IMPORTS = advapi32 dsound oleaut32 ole32 +IMPORTS = advapi32 dsound oleaut32 ole32 winmm C_SRCS = \ devenum.c diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c4bf8af..79f5ed8 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -30,6 +30,7 @@ #include "vfwmsgs.h" #include "mmsystem.h" #include "dsound.h" +#include "mmddk.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -37,11 +38,25 @@ static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':',0}; static const WCHAR clsidW[] = {'C','L','S','I','D',0}; +static const WCHAR waveW[] = {'w','a','v','e',':',0}; static const WCHAR mrleW[] = {'m','r','l','e',0}; static const WCHAR swW[] = {'s','w',':',0}; static const WCHAR cmW[] = {'c','m',':',0}; static const WCHAR backslashW[] = {'\\',0}; +static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) +{ + do { if (*str == ch) return (WCHAR *)str; } while (*str++); + return NULL; +} + +static inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + if (n <= 0) return 0; + while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + static void test_devenum(IBindCtx *bind_ctx) { IEnumMoniker *enum_cat, *enum_moniker; @@ -618,6 +633,99 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod return TRUE; } +static void test_waveout(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IParseDisplayName *parser; + IPropertyBag *prop_bag; + IMoniker *mon; + WCHAR endpoint[200]; + WAVEOUTCAPSW caps; + WCHAR buffer[200]; + const WCHAR *name; + MMRESULT mmr; + int count, i; + VARIANT var; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + if (i == -1) /* WAVE_MAPPER */ + name = defaultW; + else + name = caps.szPname; + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, name); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + + /* Win8+ uses the endpoint GUID instead of the device name */ + mmr = waveOutMessage((HWAVEOUT)(DWORD_PTR) i, DRV_QUERYFUNCTIONINSTANCEID, + (DWORD_PTR) endpoint, sizeof(endpoint)); + ok(!mmr, "waveOutMessage failed: %u\n", mmr); + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, waveW); + lstrcatW(buffer, strchrW(endpoint, '}') + 2); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + } + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(!strncmpW(name, V_BSTR(&var), lstrlenW(name)), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + StringFromGUID2(&CLSID_AudioRender, buffer, CHARS_IN_GUID); + ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, waveoutidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); + + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + } + + IParseDisplayName_Release(parser); +} + START_TEST(devenum) { IBindCtx *bind_ctx = NULL; @@ -643,6 +751,7 @@ START_TEST(devenum) test_legacy_filter(); hr = DirectSoundEnumerateW(test_dsound, NULL); ok(hr == S_OK, "got %#x\n", hr); + test_waveout(); CoUninitialize(); } -- 2.7.4

2 5

[PATCH] testbot: Standardize the packages inheritance and exports.
by Francois Gouget 31 Mar '18

31 Mar '18

Use "our" instead of the antiquated 'use vars'. Use "use Exporter 'import'" as this form avoid exporting the whole Exporter interface from each of our packages. This means we can also drop @ISA in those cases where we don't need to inherit from another package. Also we don't need the Exporter module just to inherit an interface so remove unneeded uses of Exporter. Defining the package inheritance and public interface does not depend on the rest of the package so move these statements first, even before all the other imports. Remove the ampersands from the exported functions names: they are unnecessary (and reportedly slower). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/BackEnd.pm | 7 ++----- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 8 +++----- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 9 +++------ .../lib/ObjectModel/CGI/CollectionBlockForPage.pm | 5 +---- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 7 ++----- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +---- testbot/lib/ObjectModel/CGI/FreeFormPage.pm | 6 +----- testbot/lib/ObjectModel/CGI/ItemPage.pm | 7 ++----- testbot/lib/ObjectModel/CGI/Page.pm | 8 ++++---- testbot/lib/ObjectModel/Collection.pm | 7 ++----- testbot/lib/ObjectModel/DBIBackEnd.pm | 12 +++++------- .../lib/ObjectModel/DetailrefPropertyDescriptor.pm | 8 ++++---- testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 8 +++----- testbot/lib/ObjectModel/Item.pm | 8 +++----- .../lib/ObjectModel/ItemrefPropertyDescriptor.pm | 9 ++++----- testbot/lib/ObjectModel/PropertyDescriptor.pm | 4 ---- testbot/lib/WineTestBot/Activity.pm | 9 +++------ testbot/lib/WineTestBot/Branches.pm | 16 +++++++--------- testbot/lib/WineTestBot/CGI/PageBase.pm | 9 +++------ testbot/lib/WineTestBot/CGI/Sessions.pm | 18 +++++++----------- testbot/lib/WineTestBot/Engine/Events.pm | 6 ++---- testbot/lib/WineTestBot/Engine/Notify.pm | 16 +++++++--------- testbot/lib/WineTestBot/Jobs.pm | 20 ++++++++------------ testbot/lib/WineTestBot/LibvirtDomain.pm | 8 +++----- testbot/lib/WineTestBot/Log.pm | 9 +++------ testbot/lib/WineTestBot/Patches.pm | 21 +++++++++------------ testbot/lib/WineTestBot/PendingPatchSets.pm | 20 ++++++++------------ testbot/lib/WineTestBot/PendingPatches.pm | 17 ++++++----------- testbot/lib/WineTestBot/RecordGroups.pm | 18 ++++++------------ testbot/lib/WineTestBot/Records.pm | 18 +++++++----------- testbot/lib/WineTestBot/Roles.pm | 16 +++++----------- testbot/lib/WineTestBot/Steps.pm | 20 ++++++++------------ testbot/lib/WineTestBot/StepsTasks.pm | 19 ++++++++----------- testbot/lib/WineTestBot/Tasks.pm | 21 ++++++++------------- testbot/lib/WineTestBot/TestAgent.pm | 17 +++++++---------- testbot/lib/WineTestBot/UserRoles.pm | 17 ++++++----------- testbot/lib/WineTestBot/Users.pm | 21 +++++++++------------ testbot/lib/WineTestBot/Utils.pm | 12 +++++------- testbot/lib/WineTestBot/VMs.pm | 20 ++++++++------------ testbot/lib/WineTestBot/WineTestBotObjects.pm | 18 +++++++----------- testbot/web/index.pl | 17 +++++++++-------- 41 files changed, 199 insertions(+), 322 deletions(-) diff --git a/testbot/lib/ObjectModel/BackEnd.pm b/testbot/lib/ObjectModel/BackEnd.pm index 0bb48cf7c..ae209a4c1 100644 --- a/testbot/lib/ObjectModel/BackEnd.pm +++ b/testbot/lib/ObjectModel/BackEnd.pm @@ -30,11 +30,8 @@ should provide. =cut -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&AddDBBackEnd &GetDBBackEnd &RemoveDBBackEnd &CloseAllDBBackEnds); +use Exporter 'import'; +our @EXPORT = qw(AddDBBackEnd GetDBBackEnd RemoveDBBackEnd CloseAllDBBackEnds); sub new($@) { diff --git a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm index 4c3382cb0..766a34230 100644 --- a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm @@ -30,13 +30,11 @@ This handles the boolean, a number and string columns. =cut +use Exporter 'import'; use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateBasicPropertyDescriptor); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::PropertyDescriptor Exporter); -@EXPORT = qw(&CreateBasicPropertyDescriptor); sub _initialize($$$) { diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index ca2c6d3e1..155717aee 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -27,15 +27,12 @@ ObjectModel::CGI::CollectionBlock - Base class for list blocks package ObjectModel::CGI::CollectionBlock; +use Exporter 'import'; +our @EXPORT = qw(new); + use POSIX qw(strftime); use URI::Escape; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); - -@EXPORT = qw(new); sub new($$$@) { diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index 3dd8154a7..ff8247ec9 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -28,11 +28,8 @@ ObjectModel::CGI::CollectionBlockForPage - Collection block for list pages =cut use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::CollectionBlock Exporter); sub CallGenerateFormStart($) { diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index e45b2a4a7..6593afcd2 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -27,13 +27,10 @@ ObjectModel::CGI::CollectionPage - Base class for list pages =cut -use ObjectModel::CGI::CollectionBlockForPage; use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::Page Exporter); +use ObjectModel::CGI::CollectionBlockForPage; sub _initialize($$$$) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 1745ec87b..b3861dd2a 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -29,11 +29,8 @@ ObjectModel::CGI::FormPage - Base class for web forms =cut use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::Page Exporter); sub _initialize($$$$) { diff --git a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm index 7af04c498..c4f00101b 100644 --- a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm @@ -28,10 +28,6 @@ ObjectModel::CGI::FreeFormPage - Base class for unbound web forms =cut use ObjectModel::CGI::FormPage; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::FormPage Exporter); +our @ISA = qw(ObjectModel::CGI::FormPage); 1; diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index b44e5b2d3..c208aea31 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -28,13 +28,10 @@ ObjectModel::CGI::ItemPage - Base class for bound web forms =cut -use URI::Escape; use ObjectModel::CGI::FormPage; +our @ISA = qw(ObjectModel::CGI::FormPage); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::FormPage Exporter); +use URI::Escape; sub _initialize($$$$) { diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index ff7e8487a..b91022832 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -27,13 +27,13 @@ ObjectModel::CGI::Page - Base class for web pages =cut +use Exporter 'import'; +our @EXPORT = qw(new SetPageBaseCreator); + use CGI; -use vars qw(@ISA @EXPORT $PageBaseCreator); -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(new SetPageBaseCreator); +my $PageBaseCreator; sub new($$$@) { diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 032c7386d..712172bca 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -37,11 +37,8 @@ criteria. =cut -use vars qw(@ISA @EXPORT_OK); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT_OK = qw(&new &ComputeMasterKey); +use Exporter 'import'; +our @EXPORT_OK = qw(new ComputeMasterKey); use Scalar::Util qw(weaken); use ObjectModel::BackEnd; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 0016e19c6..40bfe85f7 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -30,16 +30,14 @@ ObjectModel::BackEnd =cut -use DBI; -use Time::Local; - +use Exporter 'import'; use ObjectModel::BackEnd; +our @ISA = qw(ObjectModel::BackEnd); +our @EXPORT = qw(UseDBIBackEnd); -use vars qw(@ISA @EXPORT); +use DBI; +use Time::Local; -require Exporter; -@ISA = qw(ObjectModel::BackEnd Exporter); -@EXPORT = qw(&UseDBIBackEnd); sub GetDb($) { diff --git a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm index d60fe6395..25144d08c 100644 --- a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm @@ -25,11 +25,11 @@ ObjectModel::DetailrefPropertyDescriptor - A reference to a collection of relate =cut -use vars qw(@ISA @EXPORT); +use Exporter 'import'; +use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateDetailrefPropertyDescriptor SetDetailrefKeyPrefix); -require Exporter; -@ISA = qw(ObjectModel::PropertyDescriptor Exporter); -@EXPORT = qw(&CreateDetailrefPropertyDescriptor &SetDetailrefKeyPrefix); sub _initialize($$) { diff --git a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm index 3e116ba72..d5850698e 100644 --- a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm @@ -30,13 +30,11 @@ new value is allowed. =cut +use Exporter 'import'; use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateEnumPropertyDescriptor); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::PropertyDescriptor Exporter); -@EXPORT = qw(&CreateEnumPropertyDescriptor); sub _initialize($$) { diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 201577c98..fb125f015 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -26,15 +26,13 @@ ObjectModel::Item - Base class for items =cut +use Exporter 'import'; +our @EXPORT_OK = qw(new); + use Scalar::Util qw(weaken); use ObjectModel::BackEnd; use ObjectModel::Collection; -use vars qw(@ISA @EXPORT_OK); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT_OK = qw(&new); =pod diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index 21806a269..cba4f9af1 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -25,11 +25,10 @@ ObjectModel::ItemrefPropertyDescriptor - A property referencing an ObjectModel:: =cut -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::PropertyDescriptor Exporter); -@EXPORT = qw(&CreateItemrefPropertyDescriptor); +use Exporter 'import'; +use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateItemrefPropertyDescriptor); sub _initialize($$$) { diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index 583082e81..f13a4b248 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -32,10 +32,6 @@ required or not. =cut -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); sub new($$$$$@) { diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index acec6064c..b3e576a19 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -25,18 +25,15 @@ WineTestBot::Activity - reconstruct the TestBot's activity from its history rec =cut +use Exporter 'import'; +our @EXPORT = qw(GetActivity GetStatistics); + use Scalar::Util qw(weaken); use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::RecordGroups; use WineTestBot::Records; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&GetActivity &GetStatistics); - sub _UpdateMin($$) { diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index a67832590..a18fafcbd 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -27,12 +27,10 @@ WineTestBot::Branch - Describes a Wine branch =cut use WineTestBot::WineTestBotObjects; -use WineTestBot::Config; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw (@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -42,6 +40,7 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } + package WineTestBot::Branches; =head1 NAME @@ -50,14 +49,13 @@ WineTestBot::Branches - A collection of WineTestBot::Branch objects =cut -use ObjectModel::BasicPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateBranches); -use vars qw (@ISA @EXPORT); +use ObjectModel::BasicPropertyDescriptor; -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateBranches); sub GetDefaultBranch($) { diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index fa383c512..67e8fc86f 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -28,6 +28,9 @@ WineTestBot::CGI::PageBase - Base class for web pages =cut +use Exporter 'import'; +our @EXPORT = qw(CreatePageBase); + use Apache2::Const -compile => qw(REDIRECT); use Apache2::ServerRec; use CGI::Cookie; @@ -36,12 +39,6 @@ use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Utils; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&CreatePageBase); - sub new($$$$@) { my $class = shift; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 87fd15fb2..af30fbb85 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -28,12 +28,10 @@ WineTestBot::CGI::Session - A web user's session =cut -use WineTestBot::Utils; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -require Exporter; -use vars qw(@ISA @EXPORT); -@ISA = qw(WineTestBot::WineTestBotItem Exporter); +use WineTestBot::Utils; sub InitializeNew($$) { @@ -53,19 +51,17 @@ WineTestBot::CGI::Sessions - A Session collection =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateSessions DeleteSessions NewSession); + use CGI::Cookie; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::Users; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateSessions &DeleteSessions &NewSession); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Engine/Events.pm b/testbot/lib/WineTestBot/Engine/Events.pm index c3ebe9baf..677debfbf 100644 --- a/testbot/lib/WineTestBot/Engine/Events.pm +++ b/testbot/lib/WineTestBot/Engine/Events.pm @@ -27,11 +27,9 @@ WineTestBot::Engine::Events - Engine events =cut -use vars qw (@ISA @EXPORT); +use Exporter 'import'; +our @EXPORT = qw(AddEvent DeleteEvent EventScheduled RunEvents); -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&AddEvent &DeleteEvent &EventScheduled &RunEvents); my %Events; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index c277f7aa9..ddb14d2fa 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -27,18 +27,16 @@ WineTestBot::Engine::Notify - Engine notification =cut +use Exporter 'import'; +our $RunningInEngine; +our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobCancel + JobRestart RescheduleJobs VMStatusChange + WinePatchMLSubmission WinePatchWebSubmission GetScreenshot); +our @EXPORT_OK = qw($RunningInEngine); + use Socket; use WineTestBot::Config; -use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&Shutdown &PingEngine &JobStatusChange &JobCancel - &JobRestart &RescheduleJobs &VMStatusChange - &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); -@EXPORT_OK = qw($RunningInEngine); - sub SendCmdReceiveReply($) { diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index f810b4f12..29f7860cb 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -51,17 +51,15 @@ A Job is composed of multiple WineTestBot::Step objects. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use File::Path; use WineTestBot::Config; use WineTestBot::Branches; use WineTestBot::Engine::Notify; -use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub _initialize($$) { @@ -391,11 +389,15 @@ those that are yet to be run. =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateJobs ScheduleJobs CheckJobs); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use WineTestBot::WineTestBotObjects; use WineTestBot::Branches; use WineTestBot::Config; use WineTestBot::Patches; @@ -404,12 +406,6 @@ use WineTestBot::Steps; use WineTestBot::Users; use WineTestBot::VMs; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateJobs &ScheduleJobs &CheckJobs); - sub CreateItem($) { diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 37d519ce9..843579361 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -32,14 +32,12 @@ technologies. =cut +use Exporter 'import'; +our @EXPORT_OK = qw(new); + use Sys::Virt; use Image::Magick; -use vars qw (@ISA @EXPORT_OK); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT_OK = qw(new); my $HackVirtURI = 1; diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 65782c514..36efb48a2 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -25,14 +25,11 @@ WineTestBot::Log - Logging =cut -use WineTestBot::Config; -use WineTestBot::Utils; +use Exporter 'import'; +our @EXPORT = qw(LogMsg OpenLog Time Elapsed PrettyElapsed); -use vars qw (@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&LogMsg &OpenLog &Time &Elapsed &PrettyElapsed); my $logfile; my $logprefix; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 7906f1cb6..e4b9b0089 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -33,6 +33,9 @@ linked to this patch through a WineTestBot::PendingPatch object. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use Encode qw/decode/; use File::Basename; @@ -42,13 +45,8 @@ use WineTestBot::Jobs; use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::VMs; -use WineTestBot::WineTestBotObjects; use WineTestBot::Engine::Notify; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -357,6 +355,7 @@ sub GetEMailRecipient($) return BuildEMailRecipient($self->FromEMail, $self->FromName); } + package WineTestBot::Patches; =head1 NAME @@ -365,15 +364,13 @@ WineTestBot::Patches - A collection of WineTestBot::Patch objects =cut -use ObjectModel::BasicPropertyDescriptor; -use WineTestBot::Config; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreatePatches); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreatePatches); +use ObjectModel::BasicPropertyDescriptor; +use WineTestBot::Config; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index d51652221..88dc73677 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -38,15 +38,13 @@ The WineTestBot::PendingPatchSet class is where this tracking is implemented. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use WineTestBot::Config; use WineTestBot::Patches; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); =pod =over 12 @@ -153,19 +151,17 @@ WineTestBot::PendingPatchSets - A collection of WineTestBot::PendingPatchSet obj =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreatePendingPatchSets); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::PendingPatches; use WineTestBot::Patches; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreatePendingPatchSets); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index 281db60ef..4de599dac 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -32,11 +32,8 @@ identifying the patch series it belongs to. =cut use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); package WineTestBot::PendingPatches; @@ -46,16 +43,14 @@ WineTestBot::PendingPatches - A collection of WineTestBot::PendingPatch objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreatePendingPatches); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Patches; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreatePendingPatches); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index 1e5dbbdd4..9f0f52036 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -31,12 +31,8 @@ or the state of the TestBot at at a given time. =cut use WineTestBot::WineTestBotObjects; -use WineTestBot::Config; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -56,17 +52,15 @@ WineTestBot::RecordGroups - A collection of WineTestBot::RecordGroup objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateRecordGroups CompareRecordGroups SaveRecord); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; -use WineTestBot::WineTestBotObjects; use WineTestBot::Records; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateRecordGroups &CompareRecordGroups &SaveRecord); - sub CreateItem($) { diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index 98d5ee7d9..990ae421e 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -38,13 +38,11 @@ only limited by the amount of data dumped into the Records table. =cut -use WineTestBot::Config; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw (@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -62,15 +60,13 @@ WineTestBot::Records - A collection of WineTestBot::Record objects =cut -use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::EnumPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateRecords); -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateRecords); +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index a617ac14e..45f370f1d 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -30,11 +30,7 @@ A Role is a class of users and defines what they can do. =cut use WineTestBot::WineTestBotObjects; - -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); +our @ISA = qw(WineTestBot::WineTestBotItem); package WineTestBot::Roles; @@ -45,14 +41,12 @@ WineTestBot::Roles - A collection of WineTestBot::Role objects =cut -use ObjectModel::BasicPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateRoles); -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateRoles); +use ObjectModel::BasicPropertyDescriptor; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index ef2b3872b..237347347 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -36,16 +36,14 @@ or to reset their PreviousNo fields beforehand. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use File::Copy; use File::Path; use WineTestBot::Config; -use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -184,17 +182,15 @@ WineTestBot::Steps - A collection of Job Steps =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateSteps); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Tasks; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateSteps); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 3610492ba..9dec8060a 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -26,13 +26,11 @@ WineTestBot::StepTask - Merged Step + Task object =cut -use WineTestBot::Config; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw(@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub GetStepDir($) { @@ -82,6 +80,7 @@ sub GetTitle($) return $Title; } + package WineTestBot::StepsTasks; =head1 NAME @@ -97,18 +96,16 @@ a specific database table. =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateStepsTasks); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Steps; use WineTestBot::Tasks; use WineTestBot::VMs; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateStepsTasks); sub _initialize($$) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index f16dfe201..4473df217 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -33,18 +33,15 @@ virtual machine that the test must be performed in. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use POSIX qw(:errno_h); use File::Path; use ObjectModel::BackEnd; use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Steps; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -203,17 +200,15 @@ WineTestBot::Tasks - A collection of WineTestBot::Task objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateTasks); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::VMs; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateTasks); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 2f7ec4def..8957b9f82 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -22,11 +22,8 @@ package TestAgent; use strict; -use vars qw (@ISA @EXPORT_OK $SENDFILE_EXE $RUN_DNT $RUN_DNTRUNC_OUT $RUN_DNTRUNC_ERR $RUN_DNTRUNC); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT_OK = qw(new); +use Exporter 'import'; +our @EXPORT_OK = qw(new); my $BLOCK_SIZE = 65536; @@ -1097,7 +1094,7 @@ sub GetVersion($) return $self->{agentversion}; } -$SENDFILE_EXE = 1; +our $SENDFILE_EXE = 1; sub _SendStringOrFile($$$$$$) { @@ -1173,10 +1170,10 @@ sub GetFileToString($$) return $self->_GetStringOrFile($ServerPathName, undef, undef); } -$RUN_DNT = 1; -$RUN_DNTRUNC_OUT = 2; -$RUN_DNTRUNC_ERR = 4; -$RUN_DNTRUNC = $RUN_DNTRUNC_OUT | $RUN_DNTRUNC_ERR; +our $RUN_DNT = 1; +our $RUN_DNTRUNC_OUT = 2; +our $RUN_DNTRUNC_ERR = 4; +our $RUN_DNTRUNC = $RUN_DNTRUNC_OUT | $RUN_DNTRUNC_ERR; sub Run($$$;$$$) { diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 972bdc0e9..585537ae8 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -26,11 +26,8 @@ WineTestBot::UserRole - A UserRole item =cut use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); package WineTestBot::UserRoles; @@ -40,16 +37,14 @@ WineTestBot::UserRoles - A collection of WineTestBot::UserRole objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateUserRoles); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Roles; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateUserRoles); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 178b377b9..4752006ab 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -26,18 +26,16 @@ WineTestBot::User - A User =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use Digest::SHA qw(sha1_hex); use URI::Escape; use WineTestBot::Config; use WineTestBot::Roles; use WineTestBot::UserRoles; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -287,6 +285,7 @@ sub HasRole($$) return defined($self->Roles->GetItem($RoleName)); } + package WineTestBot::Users; =head1 NAME @@ -295,19 +294,17 @@ WineTestBot::Users - A collection of WineTestBot::User objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateUsers GetBatchUser Authenticate); + use Net::LDAP; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::UserRoles; -use WineTestBot::WineTestBotObjects; - -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateUsers &GetBatchUser &Authenticate); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 63b906242..81a2eda39 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -25,17 +25,15 @@ WineTestBot::Utils - Utility functions =cut +use Exporter 'import'; +our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString + OpenNewFile CreateNewFile CreateNewLink CreateNewDir + DurationToString BuildEMailRecipient); + use Fcntl; use WineTestBot::Config; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString - &OpenNewFile &CreateNewFile &CreateNewLink &CreateNewDir - &DurationToString &BuildEMailRecipient); sub MakeSecureURL($) { diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index e74640bf2..b6305e83e 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -142,6 +142,9 @@ are undergoing maintenance. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use File::Basename; use ObjectModel::BackEnd; @@ -150,12 +153,7 @@ use WineTestBot::Engine::Notify; use WineTestBot::LibvirtDomain; use WineTestBot::RecordGroups; use WineTestBot::TestAgent; -use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub _initialize($$) { @@ -637,15 +635,13 @@ role or status. =cut -use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::EnumPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateVMs); -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateVMs); +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index 20ff6b1e3..bc34b74c8 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -25,14 +25,12 @@ WineTestBot::WineTestBotItem - Base item class for WineTestBot =cut -use ObjectModel::BackEnd; use ObjectModel::Item; -use WineTestBot::Config; +our @ISA = qw(ObjectModel::Item); -use vars qw (@ISA @EXPORT); +use ObjectModel::BackEnd; +use WineTestBot::Config; -require Exporter; -@ISA = qw(ObjectModel::Item Exporter); sub GetBackEnd($) { @@ -49,15 +47,13 @@ WineTestBot::WineTestBotCollection - Base collection class for WineTestBot =cut +use ObjectModel::Collection; +our @ISA = qw(ObjectModel::Collection); + use ObjectModel::BackEnd; -use ObjectModel::Item; +use WineTestBot::Item; use WineTestBot::Config; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::Collection Exporter); - sub GetBackEnd($) { #my ($self) = @_; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 427d7f6b9..72bd307d5 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -21,13 +21,12 @@ use strict; package JobStatusBlock; -use URI::Escape; use ObjectModel::CGI::CollectionBlock; -use WineTestBot::Branches; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use vars qw(@ISA); +use URI::Escape; +use WineTestBot::Branches; -@ISA = qw(ObjectModel::CGI::CollectionBlock); sub SortKeys($$) { @@ -140,13 +139,12 @@ sub GenerateDataCell($$$$) } } + package VMStatusBlock; use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use vars qw(@ISA); - -@ISA = qw(ObjectModel::CGI::CollectionBlock); sub SortKeys($$) { @@ -183,16 +181,18 @@ sub GetDetailsPage($) return undef; } + package StatusPage; use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); + use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::VMs; -@StatusPage::ISA = qw(ObjectModel::CGI::Page); sub _initialize($$$) { @@ -303,6 +303,7 @@ EOF print "Generated in ", Elapsed($self->{start}), " s\n"; } + package main; my $Request = shift; -- 2.16.2

1 0

[PATCH 1/4] devenum: Register waveOut devices as codec devices.
by Zebediah Figura 31 Mar '18

31 Mar '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 131 +++++++++++++++++++++++++---------------- dlls/devenum/devenum.rc | 1 - dlls/devenum/devenum_private.h | 1 - dlls/devenum/tests/Makefile.in | 2 +- dlls/devenum/tests/devenum.c | 109 ++++++++++++++++++++++++++++++++++ 5 files changed, 190 insertions(+), 54 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 6884ffc..e3fe049 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -594,6 +594,85 @@ cleanup: return TRUE; } +static void register_waveout_devices(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IPropertyBag *prop_bag = NULL; + REGFILTERPINS2 rgpins = {0}; + REGPINTYPES rgtypes = {0}; + REGFILTER2 rgf = {0}; + WCHAR clsid[CHARS_IN_GUID]; + IMoniker *mon = NULL; + WAVEOUTCAPSW caps; + int i, count; + VARIANT var; + HRESULT hr; + + hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); + if (FAILED(hr)) return; + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + V_VT(&var) = VT_BSTR; + + if (i == -1) /* WAVE_MAPPER */ + V_BSTR(&var) = SysAllocString(defaultW); + else + V_BSTR(&var) = SysAllocString(caps.szPname); + if (!(V_BSTR(&var))) + goto cleanup; + + hr = register_codec(&CLSID_AudioRendererCategory, V_BSTR(&var), &mon); + if (FAILED(hr)) goto cleanup; + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + if (FAILED(hr)) goto cleanup; + + /* write friendly name */ + hr = IPropertyBag_Write(prop_bag, wszFriendlyName, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write clsid */ + V_VT(&var) = VT_BSTR; + StringFromGUID2(&CLSID_AudioRender, clsid, CHARS_IN_GUID); + if (!(V_BSTR(&var) = SysAllocString(clsid))) + goto cleanup; + hr = IPropertyBag_Write(prop_bag, clsid_keyname, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write filter data */ + rgf.dwVersion = 2; + rgf.dwMerit = MERIT_DO_NOT_USE; + rgf.u.s2.cPins2 = 1; + rgf.u.s2.rgPins2 = &rgpins; + rgpins.dwFlags = REG_PINFLAG_B_RENDERER; + rgpins.nMediaTypes = 1; + rgpins.lpMediaType = &rgtypes; + rgtypes.clsMajorType = &MEDIATYPE_Audio; + rgtypes.clsMinorType = &MEDIASUBTYPE_NULL; + + write_filter_data(prop_bag, &rgf); + + /* write WaveOutId */ + V_VT(&var) = VT_I4; + V_I4(&var) = i; + hr = IPropertyBag_Write(prop_bag, waveoutidW, &var); + if (FAILED(hr)) goto cleanup; + +cleanup: + VariantClear(&var); + if (prop_bag) IPropertyBag_Release(prop_bag); + if (mon) IMoniker_Release(mon); + } +} + /********************************************************************** * DEVENUM_ICreateDevEnum_CreateClassEnumerator */ @@ -616,6 +695,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( register_legacy_filters(); hr = DirectSoundEnumerateW(&register_dsound_devices, NULL); if (FAILED(hr)) return hr; + register_waveout_devices(); return create_EnumMoniker(clsidDeviceClass, ppEnumMoniker); } @@ -752,62 +832,11 @@ static HRESULT register_codecs(void) if (SUCCEEDED(res)) { UINT i; - WAVEOUTCAPSW wocaps; WAVEINCAPSW wicaps; MIDIOUTCAPSW mocaps; REGPINTYPES * pTypes; IPropertyBag * pPropBag = NULL; - numDevs = waveOutGetNumDevs(); - - res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(res)) /* can't register any devices in this category */ - numDevs = 0; - - rfp2.dwFlags = REG_PINFLAG_B_RENDERER; - for (i = 0; i < numDevs; i++) - { - if (waveOutGetDevCapsW(i, &wocaps, sizeof(WAVEOUTCAPSW)) - == MMSYSERR_NOERROR) - { - IMoniker * pMoniker = NULL; - - rfp2.nMediaTypes = 1; - pTypes = CoTaskMemAlloc(rfp2.nMediaTypes * sizeof(REGPINTYPES)); - if (!pTypes) - { - IFilterMapper2_Release(pMapper); - return E_OUTOFMEMORY; - } - /* FIXME: Native devenum seems to register a lot more types for - * DSound than we do. Not sure what purpose they serve */ - pTypes[0].clsMajorType = &MEDIATYPE_Audio; - pTypes[0].clsMinorType = &MEDIASUBTYPE_PCM; - - rfp2.lpMediaType = pTypes; - - res = IFilterMapper2_RegisterFilter(pMapper, - &CLSID_AudioRender, - wocaps.szPname, - &pMoniker, - &CLSID_AudioRendererCategory, - wocaps.szPname, - &rf2); - - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - - if (pMoniker) - IMoniker_Release(pMoniker); - - if (i == iDefaultDevice) - { - FIXME("Default device\n"); - } - - CoTaskMemFree(pTypes); - } - } - numDevs = waveInGetNumDevs(); res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioInputDeviceCategory); diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index d9262e1..95e39d6 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -29,7 +29,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { - IDS_DEVENUM_WODEFAULT "Default WaveOut Device" IDS_DEVENUM_MIDEFAULT "Default MidiOut Device" } diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 93147ad..c891083 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -101,7 +101,6 @@ extern const WCHAR clsid_keyname[6] DECLSPEC_HIDDEN; /********************************************************************** * Resource IDs */ -#define IDS_DEVENUM_WODEFAULT 9 #define IDS_DEVENUM_MIDEFAULT 10 #define IDS_DEVENUM_KSDEFAULT 11 #define IDS_DEVENUM_KS 12 diff --git a/dlls/devenum/tests/Makefile.in b/dlls/devenum/tests/Makefile.in index 028ba27..a673f20 100644 --- a/dlls/devenum/tests/Makefile.in +++ b/dlls/devenum/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = devenum.dll -IMPORTS = advapi32 dsound oleaut32 ole32 +IMPORTS = advapi32 dsound oleaut32 ole32 winmm C_SRCS = \ devenum.c diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c4bf8af..79f5ed8 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -30,6 +30,7 @@ #include "vfwmsgs.h" #include "mmsystem.h" #include "dsound.h" +#include "mmddk.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -37,11 +38,25 @@ static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':',0}; static const WCHAR clsidW[] = {'C','L','S','I','D',0}; +static const WCHAR waveW[] = {'w','a','v','e',':',0}; static const WCHAR mrleW[] = {'m','r','l','e',0}; static const WCHAR swW[] = {'s','w',':',0}; static const WCHAR cmW[] = {'c','m',':',0}; static const WCHAR backslashW[] = {'\\',0}; +static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) +{ + do { if (*str == ch) return (WCHAR *)str; } while (*str++); + return NULL; +} + +static inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + if (n <= 0) return 0; + while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + static void test_devenum(IBindCtx *bind_ctx) { IEnumMoniker *enum_cat, *enum_moniker; @@ -618,6 +633,99 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod return TRUE; } +static void test_waveout(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IParseDisplayName *parser; + IPropertyBag *prop_bag; + IMoniker *mon; + WCHAR endpoint[200]; + WAVEOUTCAPSW caps; + WCHAR buffer[200]; + const WCHAR *name; + MMRESULT mmr; + int count, i; + VARIANT var; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + if (i == -1) /* WAVE_MAPPER */ + name = defaultW; + else + name = caps.szPname; + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, name); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + + /* Win8+ uses the endpoint GUID instead of the device name */ + mmr = waveOutMessage((HWAVEOUT)(DWORD_PTR) i, DRV_QUERYFUNCTIONINSTANCEID, + (DWORD_PTR) endpoint, sizeof(endpoint)); + ok(!mmr, "waveOutMessage failed: %u\n", mmr); + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, waveW); + lstrcatW(buffer, strchrW(endpoint, '}') + 2); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + } + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(!strncmpW(name, V_BSTR(&var), lstrlenW(name)), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + StringFromGUID2(&CLSID_AudioRender, buffer, CHARS_IN_GUID); + ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, waveoutidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); + + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + } + + IParseDisplayName_Release(parser); +} + START_TEST(devenum) { IBindCtx *bind_ctx = NULL; @@ -643,6 +751,7 @@ START_TEST(devenum) test_legacy_filter(); hr = DirectSoundEnumerateW(test_dsound, NULL); ok(hr == S_OK, "got %#x\n", hr); + test_waveout(); CoUninitialize(); } -- 2.7.4

2 4

[PATCH] oleaut32/typelib.c: fix cursor2 having the wrong type
by Adeniyi Mayokun 31 Mar '18

31 Mar '18

>From 275d93c9ab0f533fa70d698726afc8adaaefb664 Mon Sep 17 00:00:00 2001 From: Adeniyi Mayokun <adeniyimayokun17(a)gmail.com> Date: Wed, 14 Mar 2018 06:55:15 +0100 Subject: [PATCH] oleaut32/typelib.c: fix cursor2 having the wrong type Signed-off-by: Adeniyi Mayokun <adeniyimayokun17@gmail> --- dlls/oleaut32/typelib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1c00d715f4..247d383ff7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4725,10 +4725,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) if (!ref) { TLBImpLib *pImpLib, *pImpLibNext; - TLBRefType *ref_type; + TLBRefType *ref_type, *ref_type_next; TLBString *tlbstr, *tlbstr_next; TLBGuid *tlbguid, *tlbguid_next; - void *cursor2; int i; /* remove cache entry */ @@ -4778,7 +4777,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) heap_free(pImpLib); } - LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list, TLBRefType, entry) + LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list, TLBRefType, entry) { list_remove(&ref_type->entry); heap_free(ref_type); -- 2.14.1

3 2

WineConf and sound recording
by M. GOUJON 31 Mar '18

31 Mar '18

Hi everyone, Recordings of previous wine confs have been somewhat disappointing especially the sound part: microphone buggy, people asking question too far from the micro... Some of you are native English speakers, others not and understanding everyone quickly becomes a challenge (and you ends up with a headache). May I suggest you to buy some clip-on microphones ? Handheld ones ones are heavy and people always forget to speak in it. If you wanna invest some bucks, digital recorders are the best option. If needed, I can donate those missing bucks.

4 4

[PATCH] ntdll: Throw exception if invalid handle is passed to NtClose and debugger enabled.
by Alistair Leslie-Hughes 31 Mar '18

31 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/om.c | 26 ++++++++++++++++ dlls/ntdll/tests/exception.c | 71 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index febe5bd81d..0b56251348 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -38,6 +38,7 @@ #include "winternl.h" #include "ntdll_misc.h" #include "wine/server.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -377,6 +378,12 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, return ret; } +static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) +{ + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +} + /* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */ NTSTATUS close_handle( HANDLE handle ) { @@ -390,6 +397,25 @@ NTSTATUS close_handle( HANDLE handle ) } SERVER_END_REQ; if (fd != -1) close( fd ); + + if (ret == STATUS_INVALID_HANDLE && handle && NtCurrentTeb()->Peb->BeingDebugged) + { + __TRY + { + EXCEPTION_RECORD record; + record.ExceptionCode = EXCEPTION_INVALID_HANDLE; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = NULL; + record.NumberParameters = 0; + RtlRaiseException( &record ); + } + __EXCEPT(invalid_handle_exception_handler) + { + } + __ENDTRY + } + return ret; } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b3592e6e1e..64a23110a5 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -52,6 +52,7 @@ static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static NTSTATUS (WINAPI *pNtClose)(HANDLE); #if defined(__x86_64__) typedef struct @@ -1091,6 +1092,16 @@ static void test_debugger(void) if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } + else if (stage == 11 || stage == 12 || stage == 13) + { + ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE, + "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode, + EXCEPTION_INVALID_HANDLE); + ok(de.u.Exception.ExceptionRecord.NumberParameters == 0, + "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); + + if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } else ok(FALSE, "unexpected stage %x\n", stage); @@ -2895,6 +2906,54 @@ static void test_breakpoint(DWORD numexc) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static DWORD invalid_handle_exceptions; + +static LONG CALLBACK invalid_handle_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == EXCEPTION_INVALID_HANDLE, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, EXCEPTION_INVALID_HANDLE); + ok(rec->NumberParameters == 0, "ExceptionParameters is %d instead of 0\n", rec->NumberParameters); + + invalid_handle_exceptions++; + return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; +} + +static void test_closehandle(DWORD numexc, HANDLE handle) +{ + PVOID vectored_handler; + NTSTATUS status; + DWORD res; + + if (!pRtlAddVectoredExceptionHandler || !pRtlRemoveVectoredExceptionHandler || !pRtlRaiseException) + { + skip("RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler or RtlRaiseException not found\n"); + return; + } + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &invalid_handle_vectored_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + invalid_handle_exceptions = 0; + res = CloseHandle(handle); + + ok(!res || (is_wow64 && res), "CloseHandle(%p) unexpectedly succeeded\n", handle); + ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error code %d instead of %d\n", + GetLastError(), ERROR_INVALID_HANDLE); + ok(invalid_handle_exceptions == numexc, "CloseHandle generated %d exceptions, expected %d\n", + invalid_handle_exceptions, numexc); + + invalid_handle_exceptions = 0; + status = pNtClose(handle); + ok(status == STATUS_INVALID_HANDLE || (is_wow64 && status == 0), "NtClose(%p) returned status %08x\n", handle, status); + ok(invalid_handle_exceptions == numexc, "NtClose generated %d exceptions, expected %d\n", + invalid_handle_exceptions, numexc); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + static void test_vectored_continue_handler(void) { PVOID handler1, handler2; @@ -2949,6 +3008,7 @@ START_TEST(exception) pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); + pNtClose = (void *)GetProcAddress( hntdll, "NtClose" ); pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" ); pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" ); pRtlCaptureContext = (void *)GetProcAddress( hntdll, "RtlCaptureContext" ); @@ -2997,6 +3057,7 @@ START_TEST(exception) if (pRtlRaiseException) { test_stage = 1; + run_rtlraiseexception_test(0x12345); run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); @@ -3004,6 +3065,7 @@ START_TEST(exception) run_rtlraiseexception_test(0x12345); run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); + test_stage = 3; test_outputdebugstring(0, FALSE); test_stage = 4; @@ -3020,6 +3082,12 @@ START_TEST(exception) test_breakpoint(0); test_stage = 10; test_breakpoint(1); + test_stage = 11; + test_closehandle(0, (HANDLE)0xdeadbeef); + test_stage = 12; + test_closehandle(1, (HANDLE)0xdeadbeef); + test_stage = 13; + test_closehandle(0, 0); /* Special case. */ } else skip( "RtlRaiseException not found\n" ); @@ -3036,6 +3104,7 @@ START_TEST(exception) test_ripevent(1); test_debug_service(1); test_breakpoint(1); + test_closehandle(0, (HANDLE)0xdeadbeef); test_vectored_continue_handler(); test_debugger(); test_simd_exceptions(); @@ -3043,7 +3112,6 @@ START_TEST(exception) test_dpe_exceptions(); test_prot_fault(); test_thread_context(); - #elif defined(__x86_64__) pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, "RtlAddFunctionTable" ); @@ -3069,6 +3137,7 @@ START_TEST(exception) test_ripevent(1); test_debug_service(1); test_breakpoint(1); + test_closehandle(0, (HANDLE)0xdeadbeef); test_vectored_continue_handler(); test_virtual_unwind(); test___C_specific_handler(); -- 2.16.2

1 0

[PATCH 2/2] kernel32: improve stub for SetThreadUILanguage a bit
by Louis Lenders 31 Mar '18

31 Mar '18

For https://bugs.winehq.org/show_bug.cgi?id=44469

1 0

[PATCH 1/2] Add simple test for SetThreadUILanguage
by Louis Lenders 31 Mar '18

31 Mar '18

1 0

[PATCH] shell32: Fix destination buffer size (Coverity)
by Nikolay Sivov 31 Mar '18

31 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shell32_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 525eba4544..e78e8f8c56 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1082,8 +1082,7 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, SetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT2), info->szOtherStuff ); GetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT3), template, ARRAY_SIZE(template) ); - MultiByteToWideChar( CP_UTF8, 0, wine_get_build_id(), -1, - version, ARRAY_SIZE(template) ); + MultiByteToWideChar( CP_UTF8, 0, wine_get_build_id(), -1, version, ARRAY_SIZE(version) ); sprintfW( buffer, template, version ); SetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT3), buffer ); hWndCtl = GetDlgItem(hWnd, IDC_ABOUT_LISTBOX); -- 2.16.2

1 0

DXTn/S3TC in d3dx9
by Henri Verbeet 31 Mar '18

31 Mar '18

On 30 March 2018 at 04:34, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > I would like to hear about support for DTXn. (as long as someone > records it for me). Since the patent on this format has expired. > It's now officially part of mesa(17?), and since a large number of bugs > depend on this missing feature. How could we get implement > it quickly? > I don't know about a large number of bugs depending on d3dx9 DXTn support, but it would probably be good to resolve the issue regardless. You'll probably want to look into libsquish [1], either making sure the upstream API is suitable for usage in d3dx9, or perhaps just importing it into the Wine tree. [1] http://sjbrown.co.uk/2006/01/19/dxt-compression-techniques/

3 4

Re: WineConf and sound recording
by M. GOUJON 30 Mar '18

30 Mar '18

On 03/30/2018 08:46 PM, M. GOUJON wrote: > On 03/30/2018 05:04 PM, Henri Verbeet wrote: >> On 29 March 2018 at 20:30, M. GOUJON <ale.goujon(a)gmail.com> wrote: >>> Recordings of previous wine confs have been somewhat disappointing >>> especially the sound part: microphone buggy, people asking question >>> too far >>> from the micro... >>> Some of you are native English speakers, others not and understanding >>> everyone quickly becomes a challenge (and you ends up with a headache). >>> >>> May I suggest you to buy some clip-on microphones ? >>> Handheld ones ones are heavy and people always forget to speak in it. >>> If you wanna invest some bucks, digital recorders are the best option. >>> >>> If needed, I can donate those missing bucks. >>> >> I happen to agree that the recordings have room for improvement, and >> would like to see us do better there. Budget is definitely a >> consideration though, and as much as I would like to promise that this >> year will be better, I don't think I can. I'm curious though, did you >> have specific equipment in mind that you'd like to recommend? > Yes, it's called H4N from Zoom. I know it's a bit expensive but it's > an excellent recorder. > Just put it on the table in front of the audience, adjust the micro > level, start recording in WAVE and forget it. > As I said, we can find an arrangement like me buying the recorder and > you buying the SD card. Forgot to CC'ing wine-devel. On 03/30/2018 10:54 PM, Stefan Dösinger wrote: > I'm afraid the answer is no. The main requirement for the recording is > that it does not interrupt the conference itself. We had clip on > microphones and mics to pass around at FOSDEM and on the WineConf 2007 > in Zurich, and they always cause problems. Batteries are empty, clips > coming off, passing around the microphone slows down conversations, etc. Handy recorders are designed to be put somewhere and record for several hours. If you want to avoid batteries issue, you can still buy the power adaptor. As long as you don't play drum with your fingers on the table the recorder is on, sound quality is quite good. > What would be highly welcome is help with editing the videos afterwards. If someone has the patience to create subtitles for everything we'd make life easier for non-native speakers. I'm not used to do that but yeah, I guess I can also contribute this way.

1 0

[PATCH v2] dsound/tests: Call interface methods properly.
by Zebediah Figura 30 Mar '18

30 Mar '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dsound/tests/capture.c | 4 ++-- dlls/dsound/tests/ds3d.c | 30 +++++++++--------------------- dlls/dsound/tests/ds3d8.c | 11 ----------- dlls/dsound/tests/dsound.c | 5 +++-- dlls/dsound/tests/dsound8.c | 34 +++++++++++++++++----------------- dlls/dsound/tests/duplex.c | 6 +++--- 6 files changed, 34 insertions(+), 56 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 4eae28b..a23d1eb 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -114,7 +114,7 @@ static void IDirectSoundCapture_test(LPDIRECTSOUNDCAPTURE dsco, ok(rc==DS_OK, "IDirectSoundCapture_QueryInterface(IID_IUnknown) " "failed: %08x\n", rc); if (rc==DS_OK) - IDirectSoundCapture_Release(unknown); + IUnknown_Release(unknown); rc=IDirectSoundCapture_QueryInterface(dsco, &IID_IDirectSoundCapture, (LPVOID*)&dsc); @@ -162,7 +162,7 @@ static void IDirectSoundCapture_test(LPDIRECTSOUNDCAPTURE dsco, ZeroMemory(&dsccaps, sizeof(dsccaps)); /* DSOUND: Error: Invalid caps buffer */ - rc=IDirectSound_GetCaps(dsco, &dsccaps); + rc=IDirectSoundCapture_GetCaps(dsco, &dsccaps); ok(rc==DSERR_INVALIDPARAM, "IDirectSound_GetCaps() " "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 6c12f71..d4356c2 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -535,18 +535,6 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " "should have 1\n",ref); - temp_buffer=NULL; - rc=IDirectSound3DBuffer_QueryInterface(*dsbo, - &IID_IDirectSoundBuffer, - (LPVOID *)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSound3DBuffer_QueryInterface() failed: %08x\n", rc); - ok(temp_buffer==*dsbo,"COM interface broken: %p != %p\n", - temp_buffer,*dsbo); - ref=IDirectSoundBuffer_Release(temp_buffer); - ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " - "should have 1\n",ref); - ref=IDirectSoundBuffer_Release(*dsbo); ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " "should have 0\n",ref); @@ -1193,6 +1181,8 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) if (rc==DS_OK && primary!=NULL) { LPDIRECTSOUND3DLISTENER listener=NULL; LPDIRECTSOUNDBUFFER temp_buffer=NULL; + IKsPropertySet *propset; + rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSound3DListener,(void **)&listener); ok(rc==DS_OK && listener!=NULL,"IDirectSoundBuffer_QueryInterface() " @@ -1231,11 +1221,10 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) temp_buffer = NULL; rc = IDirectSound3DListener_QueryInterface(listener, &IID_IKsPropertySet, - (void **)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, + (void **)&propset); + ok(rc == DS_OK && propset != NULL, "IDirectSound3DListener_QueryInterface didn't handle IKsPropertySet: ret = %08x\n", rc); - if(temp_buffer) - IKsPropertySet_Release(temp_buffer); + IKsPropertySet_Release(propset); } /* Testing the reference counting */ @@ -1244,12 +1233,11 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) "references, should have 0\n",ref); } - temp_buffer = NULL; - rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IKsPropertySet, (void **)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, + propset = NULL; + rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IKsPropertySet, (void **)&propset); + ok(rc == DS_OK && propset != NULL, "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08x\n", rc); - if(temp_buffer) - IKsPropertySet_Release(temp_buffer); + IKsPropertySet_Release(propset); /* Testing the reference counting */ ref=IDirectSoundBuffer_Release(primary); diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 25eb010..00340af 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -371,17 +371,6 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " "should have 1\n",ref); - temp_buffer=NULL; - rc=IDirectSound3DBuffer_QueryInterface(*dsbo, &IID_IDirectSoundBuffer, - (LPVOID *)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSound3DBuffer_QueryInterface() failed: %08x\n", rc); - ok(temp_buffer==*dsbo,"COM interface broken: %p != %p\n", - temp_buffer,*dsbo); - ref=IDirectSoundBuffer_Release(temp_buffer); - ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " - "should have 1\n",ref); - ref=IDirectSoundBuffer_Release(*dsbo); ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " "should have 0\n",ref); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 1ccb8f9..07c8908 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -30,6 +30,7 @@ #include "wine/test.h" #include "mmsystem.h" +#define COBJMACROS #include "dsound.h" #include "dsconf.h" #include "initguid.h" @@ -61,7 +62,7 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, rc=IDirectSound_QueryInterface(dso,&IID_IUnknown,(LPVOID*)&unknown); ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IUnknown) failed: %08x\n", rc); if (rc==DS_OK) - IDirectSound_Release(unknown); + IUnknown_Release(unknown); rc=IDirectSound_QueryInterface(dso,&IID_IDirectSound,(LPVOID*)&ds); ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IDirectSound) failed: %08x\n", rc); @@ -337,7 +338,7 @@ static HRESULT test_dsound(LPGUID lpGuid) "buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { LPDIRECTSOUND3DBUFFER buffer3d; - rc=IDirectSound_QueryInterface(secondary, &IID_IDirectSound3DBuffer, + rc = IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSound3DBuffer, (void **)&buffer3d); ok(rc==DS_OK && buffer3d!=NULL,"IDirectSound_QueryInterface() " "failed: %08x\n",rc); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 53b3d47..a6e3f12 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -72,7 +72,7 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, rc=IDirectSound8_QueryInterface(dso,&IID_IUnknown,(LPVOID*)&unknown); ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IUnknown) failed: %08x\n", rc); if (rc==DS_OK) - IDirectSound8_Release(unknown); + IUnknown_Release(unknown); rc=IDirectSound8_QueryInterface(dso,&IID_IDirectSound,(LPVOID*)&ds); ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IDirectSound) failed: %08x\n", rc); @@ -353,7 +353,7 @@ static HRESULT test_dsound8(LPGUID lpGuid) if (rc==DS_OK && secondary!=NULL) { LPDIRECTSOUND3DBUFFER buffer3d; LPDIRECTSOUNDBUFFER8 buffer8; - rc=IDirectSound8_QueryInterface(secondary, + rc=IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSound3DBuffer, (void **)&buffer3d); ok(rc==DS_OK && buffer3d!=NULL, @@ -363,7 +363,7 @@ static HRESULT test_dsound8(LPGUID lpGuid) ok(ref==2,"IDirectSound3DBuffer_AddRef() has %d references, " "should have 2\n",ref); } - rc=IDirectSound8_QueryInterface(secondary, + rc=IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSoundBuffer8, (void **)&buffer8); if (rc==DS_OK && buffer8!=NULL) { @@ -645,7 +645,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels); } - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary " "buffer %08x\n",rc); @@ -756,7 +756,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); if (wfx.wBitsPerSample != 8 && wfx.wBitsPerSample != 16) ok(((rc == DSERR_CONTROLUNAVAIL || rc == DSERR_INVALIDCALL || rc == DSERR_INVALIDPARAM /* 2003 */) && !secondary) || rc == DS_OK, /* driver dependent? */ @@ -779,7 +779,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Samples.wValidBitsPerSample = wfx.wBitsPerSample; wfxe.dwChannelMask = (wfx.nChannels == 1 ? KSAUDIO_SPEAKER_MONO : KSAUDIO_SPEAKER_STEREO); - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -791,7 +791,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", @@ -804,7 +804,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx); wfxe.SubFormat = GUID_NULL; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_INVALIDPARAM || rc==DSERR_INVALIDCALL) && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -815,7 +815,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) } wfxe.Format.cbSize = sizeof(wfxe); - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==DSERR_INVALIDPARAM) && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -826,7 +826,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) } wfxe.SubFormat = (format_tags[tag] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -837,7 +837,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) } wfxe.Format.cbSize = sizeof(wfxe) + 1; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", @@ -850,7 +850,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx); ++wfxe.Samples.wValidBitsPerSample; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -862,7 +862,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) --wfxe.Samples.wValidBitsPerSample; wfxe.Samples.wValidBitsPerSample = 0; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -873,7 +873,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) } wfxe.Samples.wValidBitsPerSample = wfxe.Format.wBitsPerSample; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary " "buffer %08x\n",rc); @@ -1162,7 +1162,7 @@ static void test_COM(void) ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk); ok(refcount == 2, "refcount == %u, expected 2\n", refcount); - hr = IDirectSound_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); + hr = IDirectSound8_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk8); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); @@ -1194,7 +1194,7 @@ static void test_effects(void) rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); if (rc!=DS_OK) { - IDirectSound_Release(dso); + IDirectSound8_Release(dso); return; } @@ -1372,7 +1372,7 @@ static void test_effects(void) IDirectSoundBuffer_Release(primary); } - while (IDirectSound_Release(dso)); + while (IDirectSound8_Release(dso)); } START_TEST(dsound8) diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index ecdebdc..b770515 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -49,7 +49,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IUnknown,(LPVOID*)&unknown); ok(rc==DS_OK,"IDirectSoundFullDuplex_QueryInterface(IID_IUnknown) failed: %08x\n", rc); if (rc==DS_OK) { - ref=IDirectSoundFullDuplex_Release(unknown); + ref = IUnknown_Release(unknown); ok(ref==0, "IDirectSoundFullDuplex_Release() has %d references, " "should have 0\n", ref); } @@ -94,7 +94,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, "failed: %08x\n",rc); if (rc==DS_OK) { ok(dsfdo==dsfd, "different interfaces\n"); - ref=IDirectSound8_Release(dsfd); + ref=IDirectSoundFullDuplex_Release(dsfd); ok(ref==1, "IDirectSoundFullDuplex_Release() has %d references, should have 1\n", ref); } @@ -319,7 +319,7 @@ static void test_COM(void) ok(refcount == 2, "refcount == %u, expected 2\n", refcount); refcount = IDirectSoundFullDuplex_AddRef(dsfd); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - hr = IDirectSoundCapture_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); + hr = IDirectSound8_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); ok(unk == unk8, "Got different IUnknown when QI'ing IDirectSoundFullDuplex and IDirectSoundCapture\n"); -- 2.7.4

2 1

[PATCH 2/2] windowscodecs: Cache component info objects.
by Jacek Caban 30 Mar '18

30 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/windowscodecs/info.c | 47 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/main.c | 3 +++ dlls/windowscodecs/tests/info.c | 31 +++++++++++++++++++--- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 78 insertions(+), 4 deletions(-)

2 1

[PATCH 1/2] windowscodecs: Use common base structure for component info implementations.
by Jacek Caban 30 Mar '18

30 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/windowscodecs/info.c | 148 ++++++++++++++++++++++------------------------ 1 file changed, 71 insertions(+), 77 deletions(-)

2 3

[PATCH 5/5] wined3d: Add some traces to arbfp_blitter_blit().
by Henri Verbeet 30 Mar '18

30 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2c0a46f779a..d29264d6714 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7814,12 +7814,24 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl struct wined3d_blitter *next; RECT s, d; + TRACE("blitter %p, op %#x, context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " + "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_rect %s, colour_key %p, filter %s.\n", + blitter, op, context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), + wine_dbgstr_rect(dst_rect), color_key, debug_d3dtexturefiltertype(filter)); + if (!arbfp_blit_supported(op, context, &src_texture->resource, src_location, &dst_texture->resource, dst_location)) { - if ((next = blitter->next)) - return next->ops->blitter_blit(next, op, context, src_texture, src_sub_resource_idx, src_location, - src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect, color_key, filter); + if (!(next = blitter->next)) + { + ERR("No blitter to handle blit op %#x.\n", op); + return dst_location; + } + + TRACE("Forwarding to blitter %p.\n", next); + return next->ops->blitter_blit(next, op, context, src_texture, src_sub_resource_idx, src_location, + src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect, color_key, filter); } arbfp_blitter = CONTAINING_RECORD(blitter, struct wined3d_arbfp_blitter, blitter); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Add some traces to fbo_blitter_blit().
by Henri Verbeet 30 Mar '18

30 Mar '18

For easier debugging. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d7aaf24110..ee325a1af5b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2192,6 +2192,12 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit struct wined3d_device *device; struct wined3d_blitter *next; + TRACE("blitter %p, op %#x, context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " + "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_rect %s, colour_key %p, filter %s.\n", + blitter, op, context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), + wine_dbgstr_rect(dst_rect), colour_key, debug_d3dtexturefiltertype(filter)); + src_resource = &src_texture->resource; dst_resource = &dst_texture->resource; @@ -2208,9 +2214,15 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!fbo_blitter_supported(blit_op, context->gl_info, src_resource, src_location, dst_resource, dst_location)) { - if ((next = blitter->next)) - return next->ops->blitter_blit(next, op, context, src_texture, src_sub_resource_idx, src_location, - src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect, colour_key, filter); + if (!(next = blitter->next)) + { + ERR("No blitter to handle blit op %#x.\n", op); + return dst_location; + } + + TRACE("Forwarding to blitter %p.\n", next); + return next->ops->blitter_blit(next, op, context, src_texture, src_sub_resource_idx, src_location, + src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect, colour_key, filter); } if (blit_op == WINED3D_BLIT_OP_COLOR_BLIT) -- 2.11.0

1 0

[PATCH 3/5] wined3d: Avoid a FIXME about 0 back-buffer usage in wined3d_device_reset().
by Henri Verbeet 30 Mar '18

30 Mar '18

Since we use this for ddraw now. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b17effefd5a..adaa4f10000 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4778,7 +4778,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, TRACE("refresh_rate %u\n", swapchain_desc->refresh_rate); TRACE("auto_restore_display_mode %#x\n", swapchain_desc->auto_restore_display_mode); - if (swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) + if (swapchain_desc->backbuffer_usage && swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) FIXME("Got unexpected backbuffer usage %#x.\n", swapchain_desc->backbuffer_usage); if (swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_DISCARD -- 2.11.0

1 0

[PATCH 2/5] wined3d: Get rid of convert_p8_uint_b8g8r8a8_unorm().
by Henri Verbeet 30 Mar '18

30 Mar '18

Perhaps this made sense when we still pretended to support P8 textures, but currently this should never get used, and certainly not in the colour-keying path. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 7 +----- dlls/wined3d/utils.c | 57 ++++-------------------------------------- dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 8 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b94b07ba6e4..8d7aaf24110 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2091,9 +2091,6 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re wined3d_texture_get_memory(texture, sub_resource_idx, &data, sub_resource->locations); if (conversion) { - /* This code is only entered for color keying fixups */ - struct wined3d_palette *palette = NULL; - wined3d_format_calculate_pitch(format, device->surface_alignment, width, height, &dst_row_pitch, &dst_slice_pitch); @@ -2105,10 +2102,8 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re context_release(context); return FALSE; } - if (texture->swapchain && texture->swapchain->palette) - palette = texture->swapchain->palette; conversion->convert(src_mem, src_row_pitch, dst_mem, dst_row_pitch, - width, height, palette, &texture->async.gl_color_key); + width, height, &texture->async.gl_color_key); src_row_pitch = dst_row_pitch; src_slice_pitch = dst_slice_pitch; context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 95f26a36939..8b2019d671d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -895,45 +895,9 @@ static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD colo && color <= color_key->color_space_high_value; } -static void convert_p8_uint_b8g8r8a8_unorm(const BYTE *src, unsigned int src_pitch, - BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) -{ - const BYTE *src_row; - unsigned int x, y; - DWORD *dst_row; - - if (!palette) - { - /* FIXME: This should probably use the system palette. */ - FIXME("P8 surface loaded without a palette.\n"); - - for (y = 0; y < height; ++y) - { - memset(&dst[dst_pitch * y], 0, width * 4); - } - - return; - } - - for (y = 0; y < height; ++y) - { - src_row = &src[src_pitch * y]; - dst_row = (DWORD *)&dst[dst_pitch * y]; - for (x = 0; x < width; ++x) - { - BYTE src_color = src_row[x]; - dst_row[x] = 0xff000000 - | (palette->colors[src_color].rgbRed << 16) - | (palette->colors[src_color].rgbGreen << 8) - | palette->colors[src_color].rgbBlue; - } - } -} - static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const WORD *src_row; unsigned int x, y; @@ -956,7 +920,7 @@ static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsig static void convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const WORD *src_row; unsigned int x, y; @@ -979,7 +943,7 @@ static void convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, uns static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const BYTE *src_row; unsigned int x, y; @@ -1000,7 +964,7 @@ static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsig static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const DWORD *src_row; unsigned int x, y; @@ -1023,7 +987,7 @@ static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, uns static void convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const DWORD *src_row; unsigned int x, y; @@ -1062,10 +1026,6 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers {WINED3DFMT_B8G8R8X8_UNORM, {WINED3DFMT_B8G8R8A8_UNORM, convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key }}, {WINED3DFMT_B8G8R8A8_UNORM, {WINED3DFMT_B8G8R8A8_UNORM, convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key }}, }; - static const struct wined3d_color_key_conversion convert_p8 = - { - WINED3DFMT_B8G8R8A8_UNORM, convert_p8_uint_b8g8r8a8_unorm - }; if (need_alpha_ck && (texture->async.flags & WINED3D_TEXTURE_ASYNC_COLOR_KEY)) { @@ -1078,13 +1038,6 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers FIXME("Color-keying not supported with format %s.\n", debug_d3dformat(format->id)); } - /* FIXME: This should check if the blitter backend can do P8 conversion, - * instead of checking for ARB_fragment_program. */ - if (format->id == WINED3DFMT_P8_UINT - && !(texture->resource.device->adapter->gl_info.supported[ARB_FRAGMENT_PROGRAM] - && texture->swapchain && texture == texture->swapchain->front_buffer)) - return &convert_p8; - return NULL; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 080134d0340..a25d984a4f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4214,8 +4214,8 @@ struct wined3d_rational struct wined3d_color_key_conversion { enum wined3d_format_id dst_format; - void (*convert)(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, - unsigned int height, const struct wined3d_palette *palette, const struct wined3d_color_key *color_key); + void (*convert)(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, + unsigned int width, unsigned int height, const struct wined3d_color_key *colour_key); }; struct wined3d_format -- 2.11.0

1 0

[PATCH 1/5] ddraw: Copy the entire front-buffer surface after a buffer swap.
by Henri Verbeet 30 Mar '18

30 Mar '18

wined3d_swapchain_present() will invalidate everything except WINED3D_LOCATION_DRAWABLE, which means a partial blit to the front-buffer afterwards might need to read the drawable contents back to the texture. For P8 front-buffers that's problematic, because the original palette indices are lost. We may want to improve the wined3d side of this to avoid reading back the drawable, but copying the entire surface in ddraw in this situation seems like a good idea regardless. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a9632de502f..b8552af2871 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -59,6 +59,7 @@ struct FvfToDecl #define DDRAW_NO3D 0x00000008 #define DDRAW_SCL_DDRAW1 0x00000010 #define DDRAW_SCL_RECURSIVE 0x00000020 +#define DDRAW_SWAPPED 0x00000040 #define DDRAW_STRIDE_ALIGNMENT 8 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2d200493c95..cb837b1f903 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -50,6 +50,12 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, BOOL ret; RECT r; + if (surface->ddraw->flags & DDRAW_SWAPPED && !read) + { + surface->ddraw->flags &= ~DDRAW_SWAPPED; + rect = NULL; + } + if (!rect) { SetRect(&r, 0, 0, surface->surface_desc.dwWidth, surface->surface_desc.dwHeight); @@ -78,7 +84,10 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, if (SUCCEEDED(hr = wined3d_texture_blt(dst_texture, 0, rect, surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT)) && swap_interval) + { hr = wined3d_swapchain_present(surface->ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); + surface->ddraw->flags |= DDRAW_SWAPPED; + } return hr; } -- 2.11.0

1 0

[RFC 0/2] Cleaning up DXTn support patches in Staging
by Kyle Devir 30 Mar '18

30 Mar '18

This is my first stab at helping a FOSS project, in a middle of a rough spot in life, so please don't mind my awkward wordiness. :) libtxc_dxtn has now been depreciated due to the functionality now being merged into Mesa a while ago now. Some distros, including Arch, have completely removed the library in response to this. Given that adding proper DXTn support without libtxc_dxtn feels out of my league for now, I thought I might as well clean up the useless code, and additionally add the needed code from Mesa in a file called dxtn.h. In Mesa, the code is also in header file, used by internal Mesa functions. I'm not sure just yet how to turn this into something that just uses GL more directly, but that'll be a something I'll be starting to research soon. For now, this minor cleanup might be suitable for Staging, but eventually, I plan to get this into mainline, which will need to be a lot tidier than it currently is. Throw any suggestions at me that you think will help. :) Kyle Devir (2): wined3d: implement DXTn compression support d3dx9_36: implement DXTn compression support dlls/d3dx9_24/Makefile.in | 2 +- dlls/d3dx9_25/Makefile.in | 2 +- dlls/d3dx9_26/Makefile.in | 2 +- dlls/d3dx9_27/Makefile.in | 2 +- dlls/d3dx9_28/Makefile.in | 2 +- dlls/d3dx9_29/Makefile.in | 2 +- dlls/d3dx9_30/Makefile.in | 2 +- dlls/d3dx9_31/Makefile.in | 2 +- dlls/d3dx9_32/Makefile.in | 2 +- dlls/d3dx9_33/Makefile.in | 2 +- dlls/d3dx9_34/Makefile.in | 2 +- dlls/d3dx9_35/Makefile.in | 2 +- dlls/d3dx9_36/Makefile.in | 2 +- dlls/d3dx9_36/surface.c | 100 ++++- dlls/d3dx9_36/tests/surface.c | 8 +- dlls/d3dx9_37/Makefile.in | 2 +- dlls/d3dx9_38/Makefile.in | 2 +- dlls/d3dx9_39/Makefile.in | 2 +- dlls/d3dx9_40/Makefile.in | 2 +- dlls/d3dx9_41/Makefile.in | 2 +- dlls/d3dx9_42/Makefile.in | 2 +- dlls/d3dx9_43/Makefile.in | 2 +- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/dxtn.c | 435 +++++++++++++++++++ dlls/wined3d/dxtn.h | 987 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 153 +++++++ dlls/wined3d/wined3d.spec | 7 + dlls/wined3d/wined3d_main.c | 1 + include/wine/wined3d.h | 13 + 29 files changed, 1714 insertions(+), 31 deletions(-) create mode 100644 dlls/wined3d/dxtn.c create mode 100644 dlls/wined3d/dxtn.h -- 2.16.3

1 2

[PATCH] comctl32/button: Improve button data layout compatibility
by Nikolay Sivov 30 Mar '18

30 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=44857 dlls/comctl32/button.c | 2 ++ dlls/comctl32/tests/button.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 8b5a654efc..7d48fe7956 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -90,6 +90,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(button); typedef struct _BUTTON_INFO { HWND hwnd; + HWND parent; LONG state; HFONT font; WCHAR *note; @@ -342,6 +343,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L infoPtr = heap_alloc_zero( sizeof(*infoPtr) ); SetWindowLongPtrW( hWnd, 0, (LONG_PTR)infoPtr ); infoPtr->hwnd = hWnd; + infoPtr->parent = GetParent(hWnd); return DefWindowProcW(hWnd, uMsg, wParam, lParam); case WM_NCDESTROY: diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 4c07f0adcd..0aacfa5888 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -979,6 +979,62 @@ static void register_parent_class(void) RegisterClassA(&cls); } +static void test_button_data(void) +{ + static const DWORD styles[] = + { + BS_PUSHBUTTON, + BS_DEFPUSHBUTTON, + BS_CHECKBOX, + BS_AUTOCHECKBOX, + BS_RADIOBUTTON, + BS_3STATE, + BS_AUTO3STATE, + BS_GROUPBOX, + BS_USERBUTTON, + BS_AUTORADIOBUTTON, + BS_OWNERDRAW, + BS_SPLITBUTTON, + BS_DEFSPLITBUTTON, + BS_COMMANDLINK, + BS_DEFCOMMANDLINK, + }; + + struct button_desc + { + HWND self; + HWND parent; + }; + unsigned int i; + HWND parent; + + parent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(parent != 0, "Failed to create parent window\n"); + + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + struct button_desc *desc; + HWND hwnd; + + hwnd = create_button(styles[i], parent); + ok(hwnd != NULL, "Failed to create a button.\n"); + + desc = (void *)GetWindowLongPtrA(hwnd, 0); + ok(desc != NULL, "Expected window data.\n"); + + if (desc) + { + ok(desc->self == hwnd, "Unexpected 'self' field.\n"); + ok(desc->parent == parent, "Unexpected 'parent' field.\n"); + } + + DestroyWindow(hwnd); + } + + DestroyWindow(parent); +} + START_TEST(button) { ULONG_PTR ctx_cookie; @@ -995,6 +1051,7 @@ START_TEST(button) test_button_class(); test_button_messages(); test_note(); + test_button_data(); unload_v6_module(ctx_cookie, hCtx); } -- 2.16.2

1 0

[PATCH] testbot/web: Grab the last 12 hours of activity by default.
by Francois Gouget 30 Mar '18

30 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- 12 hours is probably sufficient in most cases and the rest of the time a higher value can be specified. testbot/web/Activity.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 96a1ef0a7..08e0291ae 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -33,7 +33,7 @@ use WineTestBot::VMs; @ActivityPage::ISA = qw(ObjectModel::CGI::FreeFormPage); -my $HOURS_DEFAULT = 24; +my $HOURS_DEFAULT = 12; sub _initialize($$$) { -- 2.16.2

1 0

[PATCH] testbot: Fix Collection::IsEmpty() on perl 5.20.
by Francois Gouget 30 Mar '18

30 Mar '18

Although scalar(%hash) is 0 when the hash is empty, the rest of the time it is not a number. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index a57a32942..032c7386d 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -420,8 +420,9 @@ sub IsEmpty($) } # Even though scalar(hash) does not return the number of items in Perl 5.20 - # it returns 0 for an empty hash. - return !$self->{Items} || scalar(%{$self->{Items}}) == 0; + # (and cannot generally be compared to numbers), it evaluates to true for + # all hashes except empty ones. + return !$self->{Items} || !%{$self->{Items}}; } sub CombineKey($@) -- 2.16.2

1 0

[PATCH 8/8] mstask: Implement setting and getting a task comment using IExecAction.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 64 +++++++++++++++++++++--------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index ed0b984d84..5a4023694c 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -39,7 +39,6 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; - LPWSTR comment; DWORD maxRunTime; LPWSTR accountName; } TaskImpl; @@ -62,7 +61,6 @@ static void TaskDestructor(TaskImpl *This) ITaskDefinition_Release(This->task); HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); - HeapFree(GetProcessHeap(), 0, This->comment); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); } @@ -247,56 +245,45 @@ static HRESULT WINAPI MSTASK_ITask_GetExitCode( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_SetComment( - ITask* iface, - LPCWSTR pwszComment) +static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); - LPWSTR tmp_comment; - TRACE("(%p, %s)\n", iface, debugstr_w(pwszComment)); + TRACE("(%p, %s)\n", iface, debugstr_w(comment)); - /* Empty comment */ - if (pwszComment[0] == 0) - { - HeapFree(GetProcessHeap(), 0, This->comment); - This->comment = NULL; - return S_OK; - } + if (!comment || !comment[0]) + comment = NULL; - /* Set to pwszComment */ - n = (lstrlenW(pwszComment) + 1); - tmp_comment = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - if (!tmp_comment) - return E_OUTOFMEMORY; - lstrcpyW(tmp_comment, pwszComment); - HeapFree(GetProcessHeap(), 0, This->comment); - This->comment = tmp_comment; - - return S_OK; + return IExecAction_put_Id(This->action, (BSTR)comment); } -static HRESULT WINAPI MSTASK_ITask_GetComment( - ITask* iface, - LPWSTR *ppwszComment) +static HRESULT WINAPI MSTASK_ITask_GetComment(ITask *iface, LPWSTR *comment) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR id; + DWORD len; - TRACE("(%p, %p)\n", iface, ppwszComment); + TRACE("(%p, %p)\n", iface, comment); - n = This->comment ? lstrlenW(This->comment) + 1 : 1; - *ppwszComment = CoTaskMemAlloc(n * sizeof(WCHAR)); - if (!*ppwszComment) - return E_OUTOFMEMORY; + hr = IExecAction_get_Id(This->action, &id); + if (hr != S_OK) return hr; - if (!This->comment) - *ppwszComment[0] = 0; + len = id ? lstrlenW(id) + 1 : 1; + *comment = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*comment) + { + if (!id) + *comment[0] = 0; + else + lstrcpyW(*comment, id); + hr = S_OK; + } else - lstrcpyW(*ppwszComment, This->comment); + hr = E_OUTOFMEMORY; - return S_OK; + SysFreeString(id); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetCreator( @@ -798,7 +785,6 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); - This->comment = NULL; This->accountName = NULL; /* Default time is 3 days = 259200000 ms */ -- 2.16.2

1 0

[PATCH 7/8] mstask: Implement setting and getting working directory using IExecAction.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 1aba435efd..ed0b984d84 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -533,20 +533,45 @@ static HRESULT WINAPI MSTASK_ITask_GetParameters(ITask *iface, LPWSTR *params) return hr; } -static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory( - ITask* iface, - LPCWSTR pwszWorkingDirectory) +static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory(ITask * iface, LPCWSTR workdir) { - FIXME("(%p, %s): stub\n", iface, debugstr_w(pwszWorkingDirectory)); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %s)\n", iface, debugstr_w(workdir)); + + if (!workdir || !workdir[0]) + workdir = NULL; + + return IExecAction_put_WorkingDirectory(This->action, (BSTR)workdir); } -static HRESULT WINAPI MSTASK_ITask_GetWorkingDirectory( - ITask* iface, - LPWSTR *ppwszWorkingDirectory) +static HRESULT WINAPI MSTASK_ITask_GetWorkingDirectory(ITask *iface, LPWSTR *workdir) { - FIXME("(%p, %p): stub\n", iface, ppwszWorkingDirectory); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR dir; + DWORD len; + + TRACE("(%p, %p)\n", iface, workdir); + + hr = IExecAction_get_WorkingDirectory(This->action, &dir); + if (hr != S_OK) return hr; + + len = dir ? lstrlenW(dir) + 1 : 1; + *workdir = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*workdir) + { + if (!dir) + *workdir[0] = 0; + else + lstrcpyW(*workdir, dir); + hr = S_OK; + } + else + hr = E_OUTOFMEMORY; + + SysFreeString(dir); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetPriority( -- 2.16.2

1 0

[PATCH 6/8] mstask: Implement setting and getting parameters using IExecAction.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 62 ++++++++++++++++++++++-------------------------------- 1 file changed, 25 insertions(+), 37 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 1a079cc8c5..1aba435efd 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -39,7 +39,6 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; - LPWSTR parameters; LPWSTR comment; DWORD maxRunTime; LPWSTR accountName; @@ -64,7 +63,6 @@ static void TaskDestructor(TaskImpl *This) HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); HeapFree(GetProcessHeap(), 0, This->comment); - HeapFree(GetProcessHeap(), 0, This->parameters); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); } @@ -493,55 +491,46 @@ static HRESULT WINAPI MSTASK_ITask_GetApplicationName(ITask *iface, LPWSTR *appn return hr; } -static HRESULT WINAPI MSTASK_ITask_SetParameters( - ITask* iface, - LPCWSTR pwszParameters) +static HRESULT WINAPI MSTASK_ITask_SetParameters(ITask *iface, LPCWSTR params) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); - LPWSTR tmp_parameters; - TRACE("(%p, %s)\n", iface, debugstr_w(pwszParameters)); + TRACE("(%p, %s)\n", iface, debugstr_w(params)); /* Empty parameter list */ - if (pwszParameters[0] == 0) - { - HeapFree(GetProcessHeap(), 0, This->parameters); - This->parameters = NULL; - return S_OK; - } + if (!params || !params[0]) + params = NULL; - /* Set to pwszParameters */ - n = (lstrlenW(pwszParameters) + 1); - tmp_parameters = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - if (!tmp_parameters) - return E_OUTOFMEMORY; - lstrcpyW(tmp_parameters, pwszParameters); - HeapFree(GetProcessHeap(), 0, This->parameters); - This->parameters = tmp_parameters; - return S_OK; + return IExecAction_put_Arguments(This->action, (BSTR)params); } -static HRESULT WINAPI MSTASK_ITask_GetParameters( - ITask* iface, - LPWSTR *ppwszParameters) +static HRESULT WINAPI MSTASK_ITask_GetParameters(ITask *iface, LPWSTR *params) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR args; + DWORD len; - TRACE("(%p, %p)\n", iface, ppwszParameters); + TRACE("(%p, %p)\n", iface, params); - n = This->parameters ? lstrlenW(This->parameters) + 1 : 1; - *ppwszParameters = CoTaskMemAlloc(n * sizeof(WCHAR)); - if (!*ppwszParameters) - return E_OUTOFMEMORY; + hr = IExecAction_get_Arguments(This->action, &args); + if (hr != S_OK) return hr; - if (!This->parameters) - *ppwszParameters[0] = 0; + len = args ? lstrlenW(args) + 1 : 1; + *params = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*params) + { + if (!args) + *params[0] = 0; + else + lstrcpyW(*params, args); + hr = S_OK; + } else - lstrcpyW(*ppwszParameters, This->parameters); + hr = E_OUTOFMEMORY; - return S_OK; + SysFreeString(args); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory( @@ -784,7 +773,6 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); - This->parameters = NULL; This->comment = NULL; This->accountName = NULL; -- 2.16.2

1 0

[PATCH 5/8] mstask: Implement setting and getting an application name using IExecAction.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 110 +++++++++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 50 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 97d778255f..1a079cc8c5 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -37,8 +37,8 @@ typedef struct IPersistFile IPersistFile_iface; LONG ref; ITaskDefinition *task; + IExecAction *action; LPWSTR task_name; - LPWSTR applicationName; LPWSTR parameters; LPWSTR comment; DWORD maxRunTime; @@ -58,6 +58,8 @@ static inline TaskImpl *impl_from_IPersistFile( IPersistFile *iface ) static void TaskDestructor(TaskImpl *This) { TRACE("%p\n", This); + if (This->action) + IExecAction_Release(This->action); ITaskDefinition_Release(This->task); HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); @@ -427,73 +429,68 @@ static HRESULT WINAPI MSTASK_ITask_GetAccountInformation( return S_OK; } -static HRESULT WINAPI MSTASK_ITask_SetApplicationName( - ITask* iface, - LPCWSTR pwszApplicationName) +static HRESULT WINAPI MSTASK_ITask_SetApplicationName(ITask *iface, LPCWSTR appname) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); - LPWSTR tmp_name; + DWORD len; - TRACE("(%p, %s)\n", iface, debugstr_w(pwszApplicationName)); + TRACE("(%p, %s)\n", iface, debugstr_w(appname)); /* Empty application name */ - if (pwszApplicationName[0] == 0) - { - HeapFree(GetProcessHeap(), 0, This->applicationName); - This->applicationName = NULL; - return S_OK; - } + if (!appname || !appname[0]) + return IExecAction_put_Path(This->action, NULL); /* Attempt to set pwszApplicationName to a path resolved application name */ - n = SearchPathW(NULL, pwszApplicationName, NULL, 0, NULL, NULL); - if (n) + len = SearchPathW(NULL, appname, NULL, 0, NULL, NULL); + if (len) { - tmp_name = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); + LPWSTR tmp_name; + HRESULT hr; + + tmp_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!tmp_name) return E_OUTOFMEMORY; - n = SearchPathW(NULL, pwszApplicationName, NULL, n, tmp_name, NULL); - if (n) - { - HeapFree(GetProcessHeap(), 0, This->applicationName); - This->applicationName = tmp_name; - return S_OK; - } + len = SearchPathW(NULL, appname, NULL, len, tmp_name, NULL); + if (len) + hr = IExecAction_put_Path(This->action, tmp_name); else - HeapFree(GetProcessHeap(), 0, tmp_name); + hr = HRESULT_FROM_WIN32(GetLastError()); + + HeapFree(GetProcessHeap(), 0, tmp_name); + return hr; } - /* If unable to path resolve name, simply set to pwszApplicationName */ - n = (lstrlenW(pwszApplicationName) + 1); - tmp_name = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - if (!tmp_name) - return E_OUTOFMEMORY; - lstrcpyW(tmp_name, pwszApplicationName); - HeapFree(GetProcessHeap(), 0, This->applicationName); - This->applicationName = tmp_name; - return S_OK; + /* If unable to path resolve name, simply set to appname */ + return IExecAction_put_Path(This->action, (BSTR)appname); } -static HRESULT WINAPI MSTASK_ITask_GetApplicationName( - ITask* iface, - LPWSTR *ppwszApplicationName) +static HRESULT WINAPI MSTASK_ITask_GetApplicationName(ITask *iface, LPWSTR *appname) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR path; + DWORD len; - TRACE("(%p, %p)\n", iface, ppwszApplicationName); + TRACE("(%p, %p)\n", iface, appname); - n = This->applicationName ? lstrlenW(This->applicationName) + 1 : 1; - *ppwszApplicationName = CoTaskMemAlloc(n * sizeof(WCHAR)); - if (!*ppwszApplicationName) - return E_OUTOFMEMORY; + hr = IExecAction_get_Path(This->action, &path); + if (hr != S_OK) return hr; - if (!This->applicationName) - *ppwszApplicationName[0] = 0; + len = path ? lstrlenW(path) + 1 : 1; + *appname = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*appname) + { + if (!path) + *appname[0] = 0; + else + lstrcpyW(*appname, path); + hr = S_OK; + } else - lstrcpyW(*ppwszApplicationName, This->applicationName); + hr = E_OUTOFMEMORY; - return S_OK; + SysFreeString(path); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetParameters( @@ -767,6 +764,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t { TaskImpl *This; ITaskDefinition *taskdef; + IActionCollection *actions; HRESULT hr; TRACE("(%s, %p)\n", debugstr_w(task_name), task); @@ -786,7 +784,6 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); - This->applicationName = NULL; This->parameters = NULL; This->comment = NULL; This->accountName = NULL; @@ -794,7 +791,20 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000; - *task = &This->ITask_iface; - InterlockedIncrement(&dll_ref); - return S_OK; + hr = ITaskDefinition_get_Actions(This->task, &actions); + if (hr == S_OK) + { + hr = IActionCollection_Create(actions, TASK_ACTION_EXEC, (IAction **)&This->action); + IActionCollection_Release(actions); + if (hr == S_OK) + { + *task = &This->ITask_iface; + InterlockedIncrement(&dll_ref); + return S_OK; + } + } + + ITaskDefinition_Release(This->task); + ITask_Release(&This->ITask_iface); + return hr; } -- 2.16.2

1 0

[PATCH 4/8] mstask/tests: Add some tests for task file storage.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task_scheduler.c | 151 +++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 31d284819c..e1e76e8c9c 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -2,6 +2,7 @@ * Test suite for TaskScheduler interface * * Copyright (C) 2008 Google (Roy Shea) + * Copyright (C) 2018 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -231,9 +232,159 @@ if (0) { /* crashes on win2k */ ITaskScheduler_Release(scheduler); } +static BOOL file_exists(const WCHAR *name) +{ + return GetFileAttributesW(name) != INVALID_FILE_ATTRIBUTES; +} + +static void test_save_task_curfile(ITask *task) +{ + HRESULT hr; + IPersistFile *pfile; + WCHAR *curfile; + + hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + curfile = NULL; + hr = IPersistFile_GetCurFile(pfile, &curfile); + ok(hr == S_OK, "GetCurFile error %#x\n", hr); + ok(curfile && curfile[0] , "curfile should not be NULL\n"); + + ok(file_exists(curfile), "curfile should exist\n"); + + hr = IPersistFile_Save(pfile, curfile, FALSE); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + + hr = IPersistFile_Save(pfile, curfile, TRUE); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + + hr = IPersistFile_Save(pfile, NULL, FALSE); + ok(hr == S_OK, "Save error %#x\n", hr); + + hr = IPersistFile_Save(pfile, NULL, TRUE); + ok(hr == S_OK, "Save error %#x\n", hr); + + curfile = NULL; + hr = IPersistFile_GetCurFile(pfile, &curfile); + ok(hr == S_OK, "GetCurFile error %#x\n", hr); + ok(curfile && curfile[0] , "curfile should not be NULL\n"); + + IPersistFile_Release(pfile); +} + +static WCHAR *get_task_curfile(ITask *task) +{ + HRESULT hr; + IPersistFile *pfile; + WCHAR *curfile; + + hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + curfile = NULL; + hr = IPersistFile_GetCurFile(pfile, &curfile); +todo_wine + ok(hr == S_OK, "GetCurFile error %#x\n", hr); +todo_wine + ok(curfile && curfile[0] , "curfile should not be NULL\n"); + + IPersistFile_Release(pfile); + + return curfile; +} + +static void test_task_storage(void) +{ + static const WCHAR Task1[] = { 'w','i','n','e','t','a','s','k',0 }; + static const WCHAR Task1_job[] = { '\\','T','a','s','k','s','\\','w','i','n','e','t','a','s','k','.','j','o','b',0 }; + WCHAR task_full_name[MAX_PATH]; + HRESULT hr; + ITaskScheduler *scheduler; + ITask *task, *task2; + WCHAR *curfile, *curfile2; + + GetWindowsDirectoryW(task_full_name, MAX_PATH); + lstrcatW(task_full_name, Task1_job); + + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); + if (hr != S_OK) + { + win_skip("CoCreateInstance(CLSID_CTaskScheduler) error %#x\n", hr); + return; + } + + hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "NewWorkItem error %#x\n", hr); + + curfile = get_task_curfile(task); + ok(!file_exists(curfile), "curfile should not exist\n"); +todo_wine + ok(!lstrcmpW(curfile, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + + hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task2); + ok(hr == S_OK, "NewWorkItem error %#x\n", hr); + ok(task2 != task, "tasks should not be equal\n"); + + curfile2 = get_task_curfile(task); + ok(!file_exists(curfile2), "curfile2 should not exist\n"); +todo_wine + ok(!lstrcmpW(curfile2, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); + + CoTaskMemFree(curfile); + CoTaskMemFree(curfile2); + + task2 = (ITask *)0xdeadbeef; + hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task2); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); + ok(task2 == (ITask *)0xdeadbeef, "task should not be set to NULL\n"); + + hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); +todo_wine + ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + + curfile = get_task_curfile(task); +todo_wine + ok(file_exists(curfile), "curfile should exist\n"); + + hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + + curfile = get_task_curfile(task); +todo_wine + ok(file_exists(curfile), "curfile should exist\n"); + + ITask_Release(task); + + task = NULL; + hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task); +todo_wine + ok(hr == S_OK, "Activate error %#x\n", hr); +todo_wine + ok(task != NULL, "task should not be set to NULL\n"); + if (task == NULL) goto fail; + + curfile2 = get_task_curfile(task); + ok(file_exists(curfile2), "curfile2 should exist\n"); + ok(!lstrcmpW(curfile2, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); + + CoTaskMemFree(curfile2); + + test_save_task_curfile(task); + + DeleteFileW(curfile); + CoTaskMemFree(curfile); + + ITask_Release(task); +fail: + ITaskScheduler_Release(scheduler); +} + START_TEST(task_scheduler) { CoInitialize(NULL); + + test_task_storage(); test_NewWorkItem(); test_Activate(); test_GetTargetComputer(); -- 2.16.2

1 0

[PATCH 3/8] mstask: Improve stubs for ITask::GetTaskFlags and ITask::GetFlags.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 18 ++++++++---------- dlls/mstask/tests/task.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index e77a959e0f..97d778255f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -373,12 +373,11 @@ static HRESULT WINAPI MSTASK_ITask_SetFlags( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetFlags( - ITask* iface, - DWORD *pdwFlags) +static HRESULT WINAPI MSTASK_ITask_GetFlags(ITask *iface, DWORD *flags) { - FIXME("(%p, %p): stub\n", iface, pdwFlags); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, flags); + *flags = 0; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetAccountInformation( @@ -588,12 +587,11 @@ static HRESULT WINAPI MSTASK_ITask_SetTaskFlags( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetTaskFlags( - ITask* iface, - DWORD *pdwFlags) +static HRESULT WINAPI MSTASK_ITask_GetTaskFlags(ITask *iface, DWORD *flags) { - FIXME("(%p, %p): stub\n", iface, pdwFlags); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, flags); + *flags = 0; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetMaxRunTime( diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index d139207039..956aa0bbd0 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -496,6 +496,39 @@ static void test_SetAccountInformation_GetAccountInformation(void) return; } +static void test_GetFlags(void) +{ + BOOL setup; + HRESULT hr; + DWORD flags; + + setup = setup_task(); + ok(setup, "Failed to setup test_task\n"); + if (!setup) + { + skip("Failed to create task. Skipping tests.\n"); + return; + } + + if (0) /* crashes under Windows */ + hr = ITask_GetFlags(test_task, NULL); + + flags = 0xdeadbeef; + hr = ITask_GetFlags(test_task, &flags); + ok(hr == S_OK, "GetFlags error %#x\n", hr); + ok(flags == 0, "got %#x\n", flags); + + if (0) /* crashes under Windows */ + hr = ITask_GetTaskFlags(test_task, NULL); + + flags = 0xdeadbeef; + hr = ITask_GetTaskFlags(test_task, &flags); + ok(hr == S_OK, "GetTaskFlags error %#x\n", hr); + ok(flags == 0, "got %#x\n", flags); + + cleanup_task(); +} + START_TEST(task) { CoInitialize(NULL); @@ -505,5 +538,6 @@ START_TEST(task) test_SetComment_GetComment(); test_SetMaxRunTime_GetMaxRunTime(); test_SetAccountInformation_GetAccountInformation(); + test_GetFlags(); CoUninitialize(); } -- 2.16.2

1 0

[PATCH 2/8] mstask: Switch to using ITaskDefinition instead of IRegisteredTask.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Testing under Windows revealed that task definition on disk should be created only when IPersistFile::Save() is called, and until that ITask should stay as a task description in memory. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/mstask_private.h | 15 ++++++++++++++- dlls/mstask/task.c | 37 ++++++++++--------------------------- dlls/mstask/task_scheduler.c | 14 +------------- 3 files changed, 25 insertions(+), 41 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 511019ded6..038c6c84c1 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -19,6 +19,9 @@ #ifndef __MSTASK_PRIVATE_H__ #define __MSTASK_PRIVATE_H__ +#include "wine/heap.h" +#include "wine/unicode.h" + extern LONG dll_ref DECLSPEC_HIDDEN; typedef struct ClassFactoryImpl ClassFactoryImpl; @@ -26,6 +29,16 @@ extern ClassFactoryImpl MSTASK_ClassFactory DECLSPEC_HIDDEN; extern HRESULT TaskTriggerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; -extern HRESULT TaskConstructor(ITaskFolder *folder, const WCHAR *task_name, ITask **task, BOOL create) DECLSPEC_HIDDEN; +extern HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **task) DECLSPEC_HIDDEN; + +static inline WCHAR *heap_strdupW(const WCHAR *src) +{ + WCHAR *dst; + unsigned len; + if (!src) return NULL; + len = (strlenW(src) + 1) * sizeof(WCHAR); + if ((dst = heap_alloc(len))) memcpy(dst, src, len); + return dst; +} #endif /* __MSTASK_PRIVATE_H__ */ diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 095431cb04..e77a959e0f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -36,7 +36,8 @@ typedef struct ITask ITask_iface; IPersistFile IPersistFile_iface; LONG ref; - IRegisteredTask *regtask; + ITaskDefinition *task; + LPWSTR task_name; LPWSTR applicationName; LPWSTR parameters; LPWSTR comment; @@ -57,6 +58,8 @@ static inline TaskImpl *impl_from_IPersistFile( IPersistFile *iface ) static void TaskDestructor(TaskImpl *This) { TRACE("%p\n", This); + ITaskDefinition_Release(This->task); + HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); HeapFree(GetProcessHeap(), 0, This->comment); HeapFree(GetProcessHeap(), 0, This->parameters); @@ -762,49 +765,29 @@ static const IPersistFileVtbl MSTASK_IPersistFileVtbl = MSTASK_IPersistFile_GetCurFile }; -HRESULT TaskConstructor(ITaskFolder *folder, const WCHAR *task_name, ITask **task, BOOL create) +HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **task) { TaskImpl *This; - IRegisteredTask *regtask; - BSTR bstr; + ITaskDefinition *taskdef; HRESULT hr; TRACE("(%s, %p)\n", debugstr_w(task_name), task); - bstr = SysAllocString(task_name); - if (!bstr) return E_OUTOFMEMORY; - - if (create) - { - static const char xml_tmplate[] = - "<?xml version=\"1.0\"?>\n" - "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" - "</Task>\n"; - WCHAR xmlW[sizeof(xml_tmplate)]; - VARIANT v_null; - - MultiByteToWideChar(CP_ACP, 0, xml_tmplate, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); - - V_VT(&v_null) = VT_NULL; - hr = ITaskFolder_RegisterTask(folder, bstr, xmlW, TASK_CREATE | TASK_UPDATE, - v_null, v_null, TASK_LOGON_NONE, v_null, &regtask); - } - else - hr = ITaskFolder_GetTask(folder, bstr, &regtask); - SysFreeString(bstr); + hr = ITaskService_NewTask(service, 0, &taskdef); if (hr != S_OK) return hr; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) { - IRegisteredTask_Release(regtask); + ITaskDefinition_Release(taskdef); return E_OUTOFMEMORY; } This->ITask_iface.lpVtbl = &MSTASK_ITaskVtbl; This->IPersistFile_iface.lpVtbl = &MSTASK_IPersistFileVtbl; This->ref = 1; - This->regtask = regtask; + This->task = taskdef; + This->task_name = heap_strdupW(task_name); This->applicationName = NULL; This->parameters = NULL; This->comment = NULL; diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index e9b8727633..6e17a57908 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -37,7 +37,6 @@ typedef struct ITaskScheduler ITaskScheduler_iface; LONG ref; ITaskService *service; - ITaskFolder *root; } TaskSchedulerImpl; typedef struct @@ -59,7 +58,6 @@ static inline EnumWorkItemsImpl *impl_from_IEnumWorkItems(IEnumWorkItems *iface) static void TaskSchedulerDestructor(TaskSchedulerImpl *This) { TRACE("%p\n", This); - ITaskFolder_Release(This->root); ITaskService_Release(This->service); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); @@ -308,7 +306,7 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( if (!IsEqualGUID(riid, &IID_ITask)) return E_NOINTERFACE; - return TaskConstructor(This->root, task_name, (ITask **)task, TRUE); + return TaskConstructor(This->service, task_name, (ITask **)task); } static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem( @@ -349,7 +347,6 @@ HRESULT TaskSchedulerConstructor(LPVOID *ppObj) { TaskSchedulerImpl *This; ITaskService *service; - ITaskFolder *root; VARIANT v_null; HRESULT hr; @@ -366,24 +363,15 @@ HRESULT TaskSchedulerConstructor(LPVOID *ppObj) return hr; } - hr = ITaskService_GetFolder(service, NULL, &root); - if (hr != S_OK) - { - ITaskService_Release(service); - return hr; - } - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) { - ITaskFolder_Release(root); ITaskService_Release(service); return E_OUTOFMEMORY; } This->ITaskScheduler_iface.lpVtbl = &MSTASK_ITaskSchedulerVtbl; This->service = service; - This->root = root; This->ref = 1; *ppObj = &This->ITaskScheduler_iface; -- 2.16.2

1 0

[PATCH 1/8] taskschd: Implement ExecAction::put_Id and ExecAction::get_Id.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 27 +++++++++++++++++++++++---- dlls/taskschd/tests/scheduler.c | 24 ++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 1b6a7015ee..19546c0d71 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1679,6 +1679,7 @@ typedef struct WCHAR *path; WCHAR *directory; WCHAR *args; + WCHAR *id; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1703,6 +1704,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) heap_free(action->path); heap_free(action->directory); heap_free(action->args); + heap_free(action->id); heap_free(action); } @@ -1759,14 +1761,30 @@ static HRESULT WINAPI ExecAction_Invoke(IExecAction *iface, DISPID dispid, REFII static HRESULT WINAPI ExecAction_get_Id(IExecAction *iface, BSTR *id) { - FIXME("%p,%p: stub\n", iface, id); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, id); + + if (!id) return E_POINTER; + + if (!action->id) *id = NULL; + else if (!(*id = SysAllocString(action->id))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI ExecAction_put_Id(IExecAction *iface, BSTR id) { - FIXME("%p,%s: stub\n", iface, debugstr_w(id)); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(id)); + + if (id && !(str = heap_strdupW((id)))) return E_OUTOFMEMORY; + heap_free(action->id); + action->id = str; + + return S_OK; } static HRESULT WINAPI ExecAction_get_Type(IExecAction *iface, TASK_ACTION_TYPE *type) @@ -1896,6 +1914,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->path = NULL; action->directory = NULL; action->args = NULL; + action->id = NULL; *obj = &action->IExecAction_iface; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 80bc1c9034..c0f691a53d 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1306,12 +1306,13 @@ static void create_action(ITaskDefinition *taskdef) static WCHAR task1_exe[] = { 't','a','s','k','1','.','e','x','e',0 }; static WCHAR workdir[] = { 'w','o','r','k','d','i','r',0 }; static WCHAR args[] = { 'a','r','g','u','m','e','n','s',0 }; + static WCHAR comment[] = { 'c','o','m','m','e','n','t',0 }; HRESULT hr; IActionCollection *actions; IAction *action; IExecAction *exec_action; TASK_ACTION_TYPE type; - BSTR path; + BSTR path, str; hr = ITaskDefinition_get_Actions(taskdef, NULL); ok(hr == E_POINTER, "got %#x\n", hr); @@ -1384,7 +1385,7 @@ static void create_action(ITaskDefinition *taskdef) ok(hr == S_OK, "put_Arguments error %#x\n", hr); hr = IExecAction_put_Arguments(exec_action, args); - ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + ok(hr == S_OK, "put_Arguments error %#x\n", hr); path = NULL; hr = IExecAction_get_Arguments(exec_action, &path); @@ -1393,6 +1394,25 @@ static void create_action(ITaskDefinition *taskdef) ok(!lstrcmpW(path, args), "got %s\n", wine_dbgstr_w(path)); SysFreeString(path); + + str = (BSTR)0xdeadbeef; + hr = IExecAction_get_Id(exec_action, &str); + ok(hr == S_OK, "get_Id error %#x\n", hr); + ok(str == NULL, "id should be NULL\n"); + + hr = IExecAction_put_Id(exec_action, NULL); + ok(hr == S_OK, "put_Id error %#x\n", hr); + + hr = IExecAction_put_Id(exec_action, comment); + ok(hr == S_OK, "put_Id error %#x\n", hr); + + str = NULL; + hr = IExecAction_get_Id(exec_action, &str); + ok(hr == S_OK, "get_Id error %#x\n", hr); + ok(str != NULL, "should not be NULL\n"); + ok(!lstrcmpW(str, comment), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IExecAction_Release(exec_action); IAction_Release(action); IActionCollection_Release(actions); -- 2.16.2

1 0

[PATCH 01/11] winex11: Print error message when libvulkan cannot be loaded.
by Józef Kucia 30 Mar '18

30 Mar '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winex11.drv/vulkan.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index c633579286eb..58ba5d71b1ef 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -134,7 +134,11 @@ static BOOL wine_vk_init(void) if (init_done) return (vulkan_handle != NULL); init_done = TRUE; - if (!(vulkan_handle = wine_dlopen(SONAME_LIBVULKAN, RTLD_NOW, NULL, 0))) return FALSE; + if (!(vulkan_handle = wine_dlopen(SONAME_LIBVULKAN, RTLD_NOW, NULL, 0))) + { + ERR("Failed to load " SONAME_LIBVULKAN); + return FALSE; + } #define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) return FALSE; LOAD_FUNCPTR(vkAcquireNextImageKHR) -- 2.16.1

2 21

[PATCH 1/4] wusa: create temp directories for installer
by Vijay Kiran Kamuju 29 Mar '18

29 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- programs/wusa/main.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 166 insertions(+), 5 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index aa7a38fe178..77dd46d8bd4 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -1,5 +1,7 @@ /* * Copyright 2012 Austin English + * Copyright 2015 Michael Müller + * Copyright 2015 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,17 +19,176 @@ */ #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/list.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wusa); +struct installer_tempdir { + struct list entry; + WCHAR *path; +}; + +struct installer_state { + BOOL norestart; + BOOL quiet; + struct list tempdirs; +}; + +static const WCHAR *path_combine(const WCHAR *path, const WCHAR *filename) +{ + static const WCHAR backslashW[] = {'\\',0}; + WCHAR *result; + DWORD length; + + if (!path || !filename) + return NULL; + length = strlenW(path) + strlenW(filename) + 2; + if (!(result = heap_alloc(length * sizeof(WCHAR)))) + return NULL; + + strcpyW(result,path); + if (result[0] && result[strlenW(result) - 1] != '\\') + strcatW(result, backslashW); + strcatW(result,filename); + return result; +} + +static BOOL delete_directory(const WCHAR *path) +{ + static const WCHAR starW[] = {'*',0}; + static const WCHAR dotW[] = {'.',0}; + static const WCHAR dotdotW[] = {'.','.',0}; + WIN32_FIND_DATAW data; + WCHAR *full_path; + HANDLE search; + + if (!(full_path = (WCHAR *)path_combine(path, starW))) + return FALSE; + search = FindFirstFileW(full_path, &data); + heap_free(full_path); + + if (search != INVALID_HANDLE_VALUE) + { + do + { + if (!strcmpW(data.cFileName, dotW)) + continue; + if (!strcmpW(data.cFileName, dotdotW)) + continue; + if (!(full_path = (WCHAR *)path_combine(path, data.cFileName))) + continue; + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + delete_directory(full_path); + else + DeleteFileW(full_path); + heap_free(full_path); + } while (FindNextFileW(search, &data)); + FindClose(search); + } + + return RemoveDirectoryW(full_path); +} + +static const WCHAR *create_temp_directory(struct installer_state *state) +{ + static const WCHAR msuW[] = {'m','s','u',0}; + static UINT id; + struct installer_tempdir *entry; + WCHAR tmp[MAX_PATH]; + + if (!GetTempPathW(sizeof(tmp)/sizeof(WCHAR), tmp)) + return NULL; + if (!(entry = heap_alloc(sizeof(*entry)))) + return NULL; + if (!(entry->path = heap_alloc((MAX_PATH+20)*sizeof(WCHAR)))) + { + heap_free(entry); + return NULL; + } + + for(;;) + { + if (!GetTempFileNameW(tmp, msuW, ++id, entry->path)) + { + heap_free(entry->path); + heap_free(entry); + return NULL; + } + if (CreateDirectoryW(entry->path, NULL)) + break; + } + + list_add_tail(&state->tempdirs, &entry->entry); + return entry->path; +} + +static void installer_cleanup(struct installer_state *state) +{ + struct installer_tempdir *tempdir, *tempdir2; + + LIST_FOR_EACH_ENTRY_SAFE(tempdir, tempdir2, &state->tempdirs, struct installer_tempdir, entry) + { + list_remove(&tempdir->entry); + delete_directory(tempdir->path); + heap_free(tempdir->path); + heap_free(tempdir); + } +} + +static BOOL install_msu(WCHAR *filename, struct installer_state *state) +{ + const WCHAR *temp_path; + + list_init(&state->tempdirs); + + WINE_TRACE("Processing msu file %s\n", wine_dbgstr_w(filename)); + if (!(temp_path = create_temp_directory(state))) + return FALSE; + + installer_cleanup(state); + return TRUE; +} + int wmain(int argc, WCHAR *argv[]) { + static const WCHAR norestartW[] = {'/','n','o','r','e','s','t','a','r','t',0}; + static const WCHAR quietW[] = {'/','q','u','i','e','t',0}; + struct installer_state state; + WCHAR *filename = NULL; int i; - WINE_FIXME("stub:"); - for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + if (TRACE_ON(wusa)) + { + WINE_TRACE("Command line :"); + for (i = 0; i < argc; i++) + WINE_TRACE(" %s", wine_dbgstr_w(argv[i])); + WINE_TRACE("\n"); + } + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + if (!strcmpW(argv[i], norestartW)) + state.norestart = TRUE; + else if (!strcmpW(argv[i], quietW)) + state.quiet = TRUE; + else + WINE_FIXME("Unknown option: %s\n", wine_dbgstr_w(argv[i])); + } + else if (!filename) + filename = argv[i]; + else + WINE_FIXME("Unknown option: %s\n", wine_dbgstr_w(argv[i])); + } + + if (!filename) + { + WINE_FIXME("Missing filename argument\n"); + return 1; + } - return 0; + return !install_msu(filename, &state); } -- 2.16.2

3 6

[PATCH 5/5] wsdapi/tests: Add test for Hello message Any body element.
by Owen Rudge 29 Mar '18

29 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)

1 0

[PATCH 4/5] wsdapi: Create Body and Hello elements in Hello message.
by Owen Rudge 29 Mar '18

29 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 29 ++++++++++++++++++++++++++--- dlls/wsdapi/tests/discovery.c | 6 ++++-- 2 files changed, 30 insertions(+), 5 deletions(-)

1 0

[PATCH 3/5] wsdapi: Register default namespaces when creating publisher.
by Owen Rudge 29 Mar '18

29 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 9 +++++++++ dlls/wsdapi/soap.c | 9 +++++++++ dlls/wsdapi/wsdapi_internal.h | 2 ++ 3 files changed, 20 insertions(+)

1 0

[PATCH 2/2] wiaservc: add some tests for SelectDeviceDlg
by Stefan Leichter 29 Mar '18

29 Mar '18

Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- dlls/wiaservc/tests/wia.c | 16 ++++++++++++++++ include/wiadef.h | 6 ++++++ 2 files changed, 22 insertions(+)

1 0

[PATCH 1/2] include: fix declaration of SelectDeviceDlg
by Stefan Leichter 29 Mar '18

29 Mar '18

fixes https://bugs.winehq.org/show_bug.cgi?id=43930 Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- include/wia_lh.idl | 2 +- include/wia_xp.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH vkd3d 1/3] libs/vkd3d: Add support for custom PRESENT state transitions.
by Józef Kucia 29 Mar '18

29 Mar '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- This should be the last feature needed to implement D3D12 swapchains in Wine. Vulkan swapchains are quite limited, e.g. * Vulkan implementations support very limited set of formats for swapchains, * views with a different format cannot be created for swapchains, * swapchains are not multisampled (AFAIK it's the same in D3D12). This patch adds flexibility needed to emulate support for missing swapchain features, e.g. additional swapchain formats. --- demos/demo_xcb.h | 31 ++++++++++++++++--------------- include/vkd3d.h | 20 ++++++++++++++------ libs/vkd3d/command.c | 28 +++++++++++++++++++--------- libs/vkd3d/resource.c | 16 +++++++++++----- libs/vkd3d/vkd3d_private.h | 3 ++- 5 files changed, 62 insertions(+), 36 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 9980b506ffb6..053db0df9bab 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -307,13 +307,13 @@ static inline void demo_set_idle_func(struct demo *demo, static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *command_queue, struct demo_window *window, const struct demo_swapchain_desc *desc) { + struct vkd3d_image_resource_create_info resource_create_info; struct VkSwapchainCreateInfoKHR vk_swapchain_desc; struct VkXcbSurfaceCreateInfoKHR surface_desc; VkSwapchainKHR vk_swapchain = VK_NULL_HANDLE; uint32_t format_count, queue_family_index; VkSurfaceCapabilitiesKHR surface_caps; VkPhysicalDevice vk_physical_device; - D3D12_RESOURCE_DESC resource_desc; VkFence vk_fence = VK_NULL_HANDLE; struct demo_swapchain *swapchain; unsigned int image_count, i, j; @@ -446,22 +446,23 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX); vkResetFences(vk_device, 1, &vk_fence); - resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; - resource_desc.Alignment = 0; - resource_desc.Width = desc->width; - resource_desc.Height = desc->height; - resource_desc.DepthOrArraySize = 1; - resource_desc.MipLevels = 1; - resource_desc.Format = desc->format; - resource_desc.SampleDesc.Count = 1; - resource_desc.SampleDesc.Quality = 0; - resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; - resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + resource_create_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_create_info.desc.Alignment = 0; + resource_create_info.desc.Width = desc->width; + resource_create_info.desc.Height = desc->height; + resource_create_info.desc.DepthOrArraySize = 1; + resource_create_info.desc.MipLevels = 1; + resource_create_info.desc.Format = desc->format; + resource_create_info.desc.SampleDesc.Count = 1; + resource_create_info.desc.SampleDesc.Quality = 0; + resource_create_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_create_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + resource_create_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION; + resource_create_info.present_state = D3D12_RESOURCE_STATE_PRESENT; for (i = 0; i < image_count; ++i) { - if (FAILED(vkd3d_create_image_resource(d3d12_device, &resource_desc, vk_images[i], - VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_SWAPCHAIN_IMAGE, - &swapchain->buffers[i]))) + resource_create_info.vk_image = vk_images[i]; + if (FAILED(vkd3d_create_image_resource(d3d12_device, &resource_create_info, &swapchain->buffers[i]))) { for (j = 0; j < i; ++j) { diff --git a/include/vkd3d.h b/include/vkd3d.h index 6ec85dbf2ffb..692b58d70065 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -73,9 +73,17 @@ struct vkd3d_device_create_info LUID adapter_luid; }; -/* resource flags */ +/* vkd3d_image_resource_create_info flags */ #define VKD3D_RESOURCE_INITIAL_STATE_TRANSITION 0x00000001 -#define VKD3D_RESOURCE_SWAPCHAIN_IMAGE 0x00000002 +#define VKD3D_RESOURCE_PRESENT_STATE_TRANSITION 0x00000002 + +struct vkd3d_image_resource_create_info +{ + VkImage vk_image; + D3D12_RESOURCE_DESC desc; + unsigned int flags; + D3D12_RESOURCE_STATES present_state; +}; #ifndef VKD3D_NO_PROTOTYPES @@ -96,8 +104,8 @@ uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); void vkd3d_release_vk_queue(ID3D12CommandQueue *queue); -HRESULT vkd3d_create_image_resource(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, - VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource); +HRESULT vkd3d_create_image_resource(ID3D12Device *device, + const struct vkd3d_image_resource_create_info *create_info, ID3D12Resource **resource); ULONG vkd3d_resource_decref(ID3D12Resource *resource); ULONG vkd3d_resource_incref(ID3D12Resource *resource); @@ -131,8 +139,8 @@ typedef uint32_t (*PFN_vkd3d_get_vk_queue_family_index)(ID3D12CommandQueue *queu typedef VkQueue (*PFN_vkd3d_acquire_vk_queue)(ID3D12CommandQueue *queue); typedef void (*PFN_vkd3d_release_vk_queue)(ID3D12CommandQueue *queue); -typedef HRESULT (*PFN_vkd3d_create_image_resource)(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, - VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource); +typedef HRESULT (*PFN_vkd3d_create_image_resource)(ID3D12Device *device, + const struct vkd3d_image_resource_create_info *create_info, ID3D12Resource **resource); typedef ULONG (*PFN_vkd3d_resource_decref)(ID3D12Resource *resource); typedef ULONG (*PFN_vkd3d_resource_incref)(ID3D12Resource *resource); diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 1c0a18ae09e7..39094c24e913 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1150,7 +1150,8 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li } } -static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, bool is_swapchain_image, +static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, + bool is_swapchain_image, D3D12_RESOURCE_STATES present_state, VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout) { switch (state) @@ -1164,10 +1165,18 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, * state when GPU finishes execution of a command list. */ if (is_swapchain_image) { - *access_mask = VK_ACCESS_MEMORY_READ_BIT; - *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - if (image_layout) - *image_layout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + if (present_state == D3D12_RESOURCE_STATE_PRESENT) + { + *access_mask = VK_ACCESS_MEMORY_READ_BIT; + *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; + if (image_layout) + *image_layout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + } + else + { + vk_barrier_parameters_from_d3d12_resource_state(present_state, + false, 0, access_mask, stage_flags, image_layout); + } } else { @@ -1353,7 +1362,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, - resource->flags & VKD3D_RESOURCE_SWAPCHAIN_IMAGE, + resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) { FIXME("Unhandled state %#x.\n", resource->initial_state); @@ -2877,14 +2886,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC sub_resource_idx = transition->Subresource; if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateBefore, - resource->flags & VKD3D_RESOURCE_SWAPCHAIN_IMAGE, + resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, &src_access_mask, &src_stage_mask, &layout_before)) { FIXME("Unhandled state %#x.\n", transition->StateBefore); continue; } if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateAfter, - resource->flags & VKD3D_RESOURCE_SWAPCHAIN_IMAGE, + resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, &dst_access_mask, &dst_stage_mask, &layout_after)) { FIXME("Unhandled state %#x.\n", transition->StateAfter); @@ -2905,7 +2914,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC resource = unsafe_impl_from_ID3D12Resource(uav->pResource); vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource && (resource->flags & VKD3D_RESOURCE_SWAPCHAIN_IMAGE), + resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION), + resource ? resource->present_state : 0, &access_mask, &stage_mask, &image_layout); src_access_mask = dst_access_mask = access_mask; src_stage_mask = dst_stage_mask = stage_mask; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 81135d373ae7..4746ee2cf59b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -797,28 +797,34 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, return S_OK; } -HRESULT vkd3d_create_image_resource(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, - VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource) +HRESULT vkd3d_create_image_resource(ID3D12Device *device, + const struct vkd3d_image_resource_create_info *create_info, ID3D12Resource **resource) { struct d3d12_device *d3d12_device = unsafe_impl_from_ID3D12Device(device); struct d3d12_resource *object; + TRACE("device %p, create_info %p, resource %p.\n", device, create_info, resource); + if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; object->ID3D12Resource_iface.lpVtbl = &d3d12_resource_vtbl; object->refcount = 1; object->internal_refcount = 1; - object->desc = *desc; - object->u.vk_image = vk_image; + object->desc = create_info->desc; + object->u.vk_image = create_info->vk_image; object->vk_memory = VK_NULL_HANDLE; object->flags = VKD3D_RESOURCE_EXTERNAL; - object->flags |= resource_flags & VKD3D_RESOURCE_PUBLIC_FLAGS; + object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; object->map_count = 0; object->map_data = NULL; memset(&object->heap_properties, 0, sizeof(object->heap_properties)); object->heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; object->initial_state = D3D12_RESOURCE_STATE_COMMON; + if (create_info->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION) + object->present_state = create_info->present_state; + else + object->present_state = D3D12_RESOURCE_STATE_COMMON; object->device = d3d12_device; ID3D12Device_AddRef(&d3d12_device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 988522f99e70..cf3112e845b3 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -175,7 +175,7 @@ HRESULT d3d12_fence_create(struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; #define VKD3D_RESOURCE_PUBLIC_FLAGS \ - (VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_SWAPCHAIN_IMAGE) + (VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION) #define VKD3D_RESOURCE_EXTERNAL 0x00000004 /* ID3D12Resource */ @@ -202,6 +202,7 @@ struct d3d12_resource D3D12_HEAP_PROPERTIES heap_properties; D3D12_HEAP_FLAGS heap_flags; D3D12_RESOURCE_STATES initial_state; + D3D12_RESOURCE_STATES present_state; struct d3d12_device *device; }; -- 2.16.1

2 5

[PATCH] hlink/tests: Fix save data test on newer Windows 10
by André Hentschel 29 Mar '18

29 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/hlink/tests/hlink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 3525c44..265dea3 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -417,7 +417,8 @@ static void test_persist_save_data(const char *testname, IHlink *lnk, (expected_data_alt == expected_hlink_data3_ie7 && i == 109) /* Win10 */ || (expected_data_alt == expected_hlink_data5_ie7 && i == 107) /* Win10 */) { - ok(data[i] == 0 || broken(data[i] == 1), "Expected 0 or 1, got %d\n", data[i]); + ok(data[i] == 0 || broken(data[i] == 1) || broken(data[i] == 3), + "Expected 0 or 1, got %d\n", data[i]); continue; } if ((expected_data_alt[i] != data[i]) && -- 2.7.4

1 0

[PATCH 2/2] kernel32/tests: Allow GetLastError to be unchanged in a test
by André Hentschel 29 Mar '18

29 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/tests/locale.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9ce46f9..16b201a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4660,7 +4660,8 @@ static void test_GetGeoInfo(void) SetLastError(0xdeadbeef); ret = pGetGeoInfoA(344, GEO_ISO2, NULL, 0, 0); ok(ret == 0, "got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef /* Win10 */), "got %d\n", GetLastError()); ret = pGetGeoInfoA(203, GEO_ISO2, NULL, 0, 0); ok(ret == 3, "got %d\n", ret); -- 2.7.4

1 0

[PATCH 1/2] kernel32/tests: Fix check for invalid type value
by André Hentschel 29 Mar '18

29 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/tests/locale.c | 2 +- include/winnls.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index efb4231..9ce46f9 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4720,7 +4720,7 @@ static void test_GetGeoInfo(void) /* try invalid type value */ SetLastError(0xdeadbeef); - ret = pGetGeoInfoA(203, GEO_CURRENCYSYMBOL + 1, NULL, 0, 0); + ret = pGetGeoInfoA(203, GEO_NAME + 1, NULL, 0, 0); ok(ret == 0, "got %d\n", ret); ok(GetLastError() == ERROR_INVALID_FLAGS, "got %d\n", GetLastError()); } diff --git a/include/winnls.h b/include/winnls.h index 1191111..3fb8e2c 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -826,7 +826,9 @@ enum SYSGEOTYPE GEO_PARENT, GEO_DIALINGCODE, GEO_CURRENCYCODE, - GEO_CURRENCYSYMBOL + GEO_CURRENCYSYMBOL, + GEO_NAME, + GEO_ID = GEO_DIALINGCODE, }; enum SYSGEOCLASS -- 2.7.4

1 0

[PATCH] schedsvc/tests: Recognize newer Windows 10's RPC version
by André Hentschel 29 Mar '18

29 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/schedsvc/tests/rpcapi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index be1e5eb..a383538 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -115,7 +115,8 @@ START_TEST(rpcapi) hr = SchRpcHighestVersion(&version); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(version == 0x10002 /* vista */ || version == 0x10003 /* win7 */ || - version == 0x10004 /* win8 */ || version == 0x10005 /* win10 */, + version == 0x10004 /* win8 */ || version == 0x10005 /* win10 */ || + version == 0x10006 /* win10 1709 */, "wrong version %#x\n", version); SetUnhandledExceptionFilter(old_exception_filter); -- 2.7.4

1 0

[PATCH] usp10: Don't increment variable both in the loop header and body (clang) (try 2)
by André Hentschel 29 Mar '18

29 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/usp10/shape.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 4031386..3827000 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1696,7 +1696,7 @@ static void ComposeConsonants(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const Co int offset = 0; int cWalk; - for (cWalk = 0; cWalk < *pcChars; cWalk++) + for (cWalk = 0; cWalk < *pcChars; cWalk += 2) { for (i = 0; consonants[i].output!= 0x0; i++) { @@ -1721,7 +1721,6 @@ static void ComposeConsonants(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const Co break; } } - cWalk++; } } -- 2.7.4

2 1

[PATCH] Compile: Fix uninitialized values warnings.
by Kai Krakow 29 Mar '18

29 Mar '18

Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- dlls/crypt32/decode.c | 2 +- dlls/crypt32/encode.c | 4 ++-- dlls/crypt32/object.c | 2 +- tools/widl/typegen.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 8b84388b12..d8d6ec24f1 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -4132,7 +4132,7 @@ static BOOL CRYPT_AsnDecodeOctets(const BYTE *pbEncoded, static BOOL CRYPT_AsnDecodeOctetStringInternal(const BYTE *encoded, DWORD encoded_size, DWORD flags, void *buf, DWORD *buf_size, DWORD *ret_decoded) { - DWORD decoded = 0, indefinite_len_depth = 0, len_size, len, bytes_needed; + DWORD decoded = 0, indefinite_len_depth = 0, len_size, len = 0, bytes_needed; CRYPT_DATA_BLOB *blob; const BYTE *string; diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 6f9f595f4f..47274dbbf1 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2575,7 +2575,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAltName(DWORD dwCertEncodingType, */ for (i = 0, dataLen = 0; ret && i < info->cAltEntry; i++) { - DWORD len; + DWORD len = 0; ret = CRYPT_AsnEncodeAltNameEntry(dwCertEncodingType, NULL, &info->rgAltEntry[i], 0, NULL, NULL, &len); @@ -3789,7 +3789,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCRLDistPoints(DWORD dwCertEncodingType, ret = TRUE; for (i = 0, dataLen = 0; ret && i < info->cDistPoint; i++) { - DWORD len; + DWORD len = 0; ret = CRYPT_AsnEncodeDistPoint(&info->rgDistPoint[i], NULL, &len); diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 0320cfda1b..addcad64fe 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -1360,7 +1360,7 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, static BOOL CRYPT_FormatAltNameInfo(DWORD dwFormatStrType, DWORD indentLevel, const CERT_ALT_NAME_INFO *name, LPWSTR str, DWORD *pcbStr) { - DWORD i, size, bytesNeeded = 0; + DWORD i, size = 0, bytesNeeded = 0; BOOL ret = TRUE; LPCWSTR sep; DWORD sepLen; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e63600c71b..584d33e8f6 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3706,7 +3706,7 @@ static unsigned int get_required_buffer_size_type( { case TGT_USER_TYPE: { - const char *uname; + const char *uname = NULL; const type_t *utype = get_user_type(type, &uname); return get_required_buffer_size_type(utype, uname, NULL, FALSE, alignment); } -- 2.16.1

2 1

[PATCH v7 1/6] wmp: Implement playback via quartz
by Anton Romanov 29 Mar '18

29 Mar '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/wmp/player.c | 89 ++++++++++++++++++++++++++++++--- dlls/wmp/tests/Makefile.in | 2 +- dlls/wmp/tests/av.mp4 | Bin 1493 -> 0 bytes dlls/wmp/tests/media.c | 120 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 6 +-- dlls/wmp/tests/rsrc.rc | 5 +- dlls/wmp/tests/test.mp3 | Bin 0 -> 240333 bytes dlls/wmp/wmp_private.h | 8 ++- 8 files changed, 215 insertions(+), 15 deletions(-) delete mode 100644 dlls/wmp/tests/av.mp4 create mode 100644 dlls/wmp/tests/media.c create mode 100644 dlls/wmp/tests/test.mp3 diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 4a0d0742fd..3d0df96bd8 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -19,6 +19,7 @@ #include "wmp_private.h" #include "wine/debug.h" +#include <nserror.h> WINE_DEFAULT_DEBUG_CHANNEL(wmp); @@ -119,12 +120,20 @@ static HRESULT WINAPI WMPPlayer4_put_URL(IWMPPlayer4 *iface, BSTR url) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); IWMPMedia *media; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_w(url)); if(url == NULL) { return E_POINTER; } - media = create_media_from_url(url); - return IWMPPlayer4_put_currentMedia(iface, media); + hres = create_media_from_url(url, &media); + if (SUCCEEDED(hres)) { + hres = IWMPPlayer4_put_currentMedia(iface, media); + IWMPMedia_Release(media); /* put will addref */ + } + if (SUCCEEDED(hres) && This->auto_start) { + hres = IWMPControls_play(&This->IWMPControls_iface); + } + return hres; } static HRESULT WINAPI WMPPlayer4_get_openState(IWMPPlayer4 *iface, WMPOpenState *pwmpos) @@ -1357,16 +1366,60 @@ static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstr static HRESULT WINAPI WMPControls_play(IWMPControls *iface) { + HRESULT hres = S_OK; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + WMPMedia *media; + + TRACE("(%p)\n", This); + + if (!This->wmpmedia) { + return NS_S_WMPCORE_COMMAND_NOT_AVAILABLE; + } + + media = unsafe_impl_from_IWMPMedia(This->wmpmedia); + if (!media) { + FIXME("No support for non-builtin IWMPMedia implementations\n"); + return E_INVALIDARG; + } + + if (!This->filter_graph) { + hres = CoCreateInstance(&CLSID_FilterGraph, + NULL, + CLSCTX_INPROC_SERVER, + &IID_IGraphBuilder, + (void **)&This->filter_graph); + if (SUCCEEDED(hres)) + hres = IGraphBuilder_RenderFile(This->filter_graph, media->url, NULL); + if (SUCCEEDED(hres)) + hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaControl, + (void**)&This->media_control); + } + + if (SUCCEEDED(hres)) + hres = IMediaControl_Run(This->media_control); + + if (hres == S_FALSE) { + hres = S_OK; /* S_FALSE will mean that graph is transitioning and that is fine */ + } + return hres; } static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) { + HRESULT hres = S_OK; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + if (!This->filter_graph) { + return NS_S_WMPCORE_COMMAND_NOT_AVAILABLE; + } + if (This->media_control) { + hres = IMediaControl_Stop(This->media_control); + IMediaControl_Release(This->media_control); + } + IGraphBuilder_Release(This->filter_graph); + This->filter_graph = NULL; + This->media_control = NULL; + return hres; } static HRESULT WINAPI WMPControls_pause(IWMPControls *iface) @@ -1741,16 +1794,36 @@ void init_player(WindowsMediaPlayer *wmp) void destroy_player(WindowsMediaPlayer *wmp) { + IWMPControls_stop(&wmp->IWMPControls_iface); if(wmp->wmpmedia) IWMPMedia_Release(wmp->wmpmedia); } -IWMPMedia* create_media_from_url(BSTR url){ +WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) +{ + if (iface->lpVtbl == &WMPMediaVtbl) { + return CONTAINING_RECORD(iface, WMPMedia, IWMPMedia_iface); + } + return NULL; +} +HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia) +{ WMPMedia *media = heap_alloc_zero(sizeof(WMPMedia)); + + if (!media) { + return E_OUTOFMEMORY; + } + media->IWMPMedia_iface.lpVtbl = &WMPMediaVtbl; media->url = heap_strdupW(url); media->ref = 1; - return &media->IWMPMedia_iface; + if (media->url) { + *ppMedia = &media->IWMPMedia_iface; + + return S_OK; + } + IWMPMedia_Release(&media->IWMPMedia_iface); + return E_OUTOFMEMORY; } diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in index dded3a4a7e..b4ecf3ffda 100644 --- a/dlls/wmp/tests/Makefile.in +++ b/dlls/wmp/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = wmp.dll IMPORTS = ole32 oleaut32 user32 gdi32 -C_SRCS = oleobj.c +C_SRCS = oleobj.c media.c RC_SRCS = \ rsrc.rc diff --git a/dlls/wmp/tests/av.mp4 b/dlls/wmp/tests/av.mp4 deleted file mode 100644 index 1431e98dd3f5bb28c282d3d732a3a1fc13cf3d63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1493 zcmeHHO-sW-5Z$D$cn}OyK`=rq^=7}c+G`IUJa`ik#7o*uZD_U$*=<2j`7uHf{1GDl z1OJ2v!Gm5r>6;{NZ56!et&eVJ_RZ{@-Py2=F|(~MeMfqNF`bdc*b#oM${1U02eu9V zMQ}^yjZE%({o@Y&97zZ2!~blBKX3W>_ST2tck=HTAD{cZ@Vo&eT`}nJY3bAx=4GZa z`b{u30X;KsOfrA+Qdsb;0;`MQx#~tW!HuCOUU|%5K~!R<&M$QfHdhiFrtM0VXpus! z8w+y59SdAe@Y%E99^ge_ClAreVu!myqQRus?~Q!2$C&d&tH)iNa<paP^xAL?DW*gV zJmyUv*c2zwHkSH<n@jvhshTeQ3#sJjGAQR1Zxn5mK=T+nGsvN>0=u^4bYPYW!*CPt zTN*aoSS3n(!+3qqfYDcs1sIL`ye3uDqbLP`;L_xqDBmInpmH=QpDe|$U`GJ2p{zzd z&Pvttk^tpyV>J6*S+Hlqjx2@qU;BwW2rS>HV~<gE;!E4QQ633y;7KMC5@ko$puM+W Ks#QwWO7#=93TT)B diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c new file mode 100644 index 0000000000..6e4a0c170f --- /dev/null +++ b/dlls/wmp/tests/media.c @@ -0,0 +1,120 @@ +/* + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#define COBJMACROS +#include <wmp.h> +#include <olectl.h> +#include <nserror.h> + +#include "wine/test.h" + +static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; +static inline WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} + +static void test_wmp(void) +{ + IWMPPlayer4 *player4; + IWMPControls *controls; + HRESULT hres; + BSTR filename; + + IOleObject *oleobj; + IWMPSettings *settings; + + hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); + if(hres == REGDB_E_CLASSNOTREG) { + win_skip("CLSID_WindowsMediaPlayer not registered\n"); + return; + } + ok(hres == S_OK, "Could not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + + hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); + ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); + + settings = NULL; + hres = IWMPPlayer4_get_settings(player4, &settings); + ok(hres == S_OK, "get_settings failed: %08x\n", hres); + ok(settings != NULL, "settings = NULL\n"); + + hres = IWMPSettings_put_autoStart(settings, VARIANT_FALSE); + ok(hres == S_OK, "Could not put autoStart in IWMPSettings: %08x\n", hres); + IWMPSettings_Release(settings); + + controls = NULL; + hres = IWMPPlayer4_get_controls(player4, &controls); + ok(hres == S_OK, "get_controls failed: %08x\n", hres); + ok(controls != NULL, "controls = NULL\n"); + + hres = IWMPControls_play(controls); + ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres); + + filename = SysAllocString(load_resource(mp3file)); + + hres = IWMPPlayer4_put_URL(player4, filename); + ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08x\n", hres); + + hres = IWMPControls_play(controls); + ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres); + + hres = IWMPControls_stop(controls); + ok(hres == S_OK, "IWMPControls_stop failed: %08x\n", hres); + + /* Already Stopped */ + hres = IWMPControls_stop(controls); + ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_stop is available: %08x\n", hres); + + hres = IWMPControls_play(controls); + ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres); + + IWMPControls_Release(controls); + IWMPPlayer4_Release(player4); + IOleObject_Release(oleobj); + DeleteFileW(filename); + SysFreeString(filename); +} + +START_TEST(media) +{ + CoInitialize(NULL); + + test_wmp(); + + CoUninitialize(); +} diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index e4c2294436..41179dae5d 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -70,7 +70,7 @@ DEFINE_EXPECT(GetWindowContext); DEFINE_EXPECT(ShowObject); DEFINE_EXPECT(OnShowWindow_FALSE); -static const WCHAR mp4file[] = {'a','v','.','m','p','4',0}; +static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; static inline WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -942,8 +942,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) ok(hres == S_FALSE, "get_currentMedia SUCCEEDED\n"); ok(media == NULL, "media != NULL\n"); - filename = SysAllocString(load_resource(mp4file)); - + filename = SysAllocString(load_resource(mp3file)); SET_EXPECT(GetContainer); SET_EXPECT(Invoke_USERMODE); @@ -1039,6 +1038,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings_Release(settings); IWMPPlayer_Release(player); + DeleteFileW(filename); SysFreeString(filename); } diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc index fb30ae6940..f33acc1256 100644 --- a/dlls/wmp/tests/rsrc.rc +++ b/dlls/wmp/tests/rsrc.rc @@ -18,5 +18,6 @@ #include "windef.h" -/* @makedep: av.mp4 */ -av.mp4 RCDATA "av.mp4" +/* ffmpeg -ar 48000 -t 60 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 output.mp3 */ +/* @makedep: test.mp3 */ +test.mp3 RCDATA "test.mp3" diff --git a/dlls/wmp/tests/test.mp3 b/dlls/wmp/tests/test.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..149a2cd346ee52ae179c46198ce290a5dd4d6251 GIT binary patch literal 240333 zcmeI%f23Xo0LJlCcd=qF8IkluD<ZR5KSsq;mzGVmT``eqrkEu$6EP~1m`IVNlq5-1 zBqA}9NQp$^ij2req${`gz5Vg*;oRHE``_o9?faaU<K1!gx#zyyedmr1!}ROw{rmPU zO#Yl7hPgclj~%}8=B+z-Y~8+X+v=<T{<gBb|Ex8hyN@1zWb(@7G#8#4=H7X2n7d%( zMVsa?-h9cWmtAqymTRxOe(UxfH|@OTwq18D+;#Wfd+yzT-+}udIC$vrLr0E2`q;7K zk3VtZ$)}%r_PLYKzwpw_ue|#D8*jb+?tAZl@X^PgeEQkvr@r{|tFOQL?)x8p{Auau zUrzt}+nL}0`17y7r|)F)o*$gN=j~^|-(k!7yQZ&A-^a=|Pn}*_-h617KQjyuPmXOI zhD}!v!+DcmZ%*bUZ#Xdw8}{73cVYGKy*To<?u(0y)AL{cALk!AYYv^m`EQ-^`47za z{Ksc}{ugI_{tst-{%>b|{-u-a-~YK8N9r8zPv@VaIdbhLho(NbKCaLB-7z`p-`9pU zug&xY*T?no{mb{4wUFQgANarrKCJoq##)zV^*BHI$xnW+g#;h?zz06?!SmI~J>c{0 z_5SnF=l?#x9XvmHe(?M-^1WmAke@I3zz06?!Os^X_kf=-{CqKTTjY@E2hR_lA3Q%q zgf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8gT7@h=@PQ9}hzMPL z-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g_z)4g_`nA~ z@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzTbn$@?eBeW? zki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJANatBRw0WI zeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG@10VRnhltR{2R`tD53NELANarr zK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I@10Pz2EI#mo4}6FS zU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M10VPh5xV%m z2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr@PQ9}Xce;fzz06?AtH3~fe(D( zL#vR*2R`tD4-uh@4}9PQA6kVhKJbALe255LeBc8g_|Ph3@qrI~;6p^{;sYP}z=u{L ziw}I@10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn@PQAlLKYwR zzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8gT7@h=@PQ9} zhzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g_z)4g z_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzTbn$@? zeBeW?ki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJANatB zRw0WIeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG@10VRnhltR{2R`tD53NEL zANarrK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I@10Pz2EI#mo z4}6FSU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M10VPh z5xV%m2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr@PQ9}Xce;fzz06?AtH3~ zfe(D(L#vR*2R`tD4-uh@4}9PQA6kVhKJbALe255LeBc8g_|Ph3@qrI~;6p^{;sYP} zz=u{Liw}I@10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn@PQAl zLKYwRzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8gT7@h= z@PQ9}hzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g z_z)4g_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzT zbn$@?eBeW?ki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJ zANatBRw0WIeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG@10VRnhltR{2R`tD z53NELANarrK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I@10Pz2 zEI#mo4}6FSU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M z10VPh5xV%m2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr@PQ9}Xce;fzz06? zAtH3~fe(D(L#vR*2R`tD4-uh@4}9PQA6kVhKJbALe255LeBc8g_|Ph3@qrI~;6p^{ z;sYP}z=u{Liw}I@10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn z@PQAlLKYwRzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8g zT7@h=@PQ9}hzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1 zeBc8g_z)4g_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIU zKJXzTbn$@?eBeW?ki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE725C6x9 d+)1Ogvb_1wlJk#Vo9RK<XU$8q`ogTQ&p*pvqh$a9 literal 0 HcmV?d00001 diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index e95b194d77..05ad5889e2 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -22,6 +22,7 @@ #include "wine/heap.h" #include "wine/unicode.h" #include "ole2.h" +#include "dshow.h" #include "wmp.h" typedef struct { @@ -70,11 +71,16 @@ struct WindowsMediaPlayer { ConnectionPoint *wmpocx; IWMPMedia *wmpmedia; + + /* DirectShow stuff */ + IGraphBuilder* filter_graph; + IMediaControl* media_control; }; void init_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; void destroy_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; -IWMPMedia* create_media_from_url(BSTR url); +WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) DECLSPEC_HIDDEN; +HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia) DECLSPEC_HIDDEN; void ConnectionPointContainer_Init(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; -- 2.16.2

4 12

[PATCH] wmp/tests: Stop crash when setting a media option.
by Alistair Leslie-Hughes 29 Mar '18

29 Mar '18

Fixes a regression of 9a89db9897eec5b3e0e7e6e5e33f7261f503f765 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wmp/tests/oleobj.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index e4c2294436..58ba6081b1 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -970,10 +970,13 @@ static void test_wmp_ifaces(IOleObject *oleobj) ok(0 == lstrcmpW(url, filename), "%s != %s\n", wine_dbgstr_w(url), wine_dbgstr_w(filename)); SysFreeString(url); + /* Keep a reference since we are using the same media object, stops a crash (w2003std, wvistau64) */ + IWMPMedia_AddRef(media); SET_EXPECT(GetContainer); hres = IWMPPlayer4_put_currentMedia(player4, media); ok(hres == S_OK, "put_currentMedia failed: %08x\n", hres); todo_wine CHECK_CALLED_OR_BROKEN(GetContainer); + IWMPMedia_Release(media); IWMPMedia_Release(media); -- 2.16.2

4 5

[PATCH] shell32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 Mar '18

29 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 95ebb92e5c..c976c85bc8 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1959,7 +1959,7 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + hr = StrRetToBufW(&strret, newPIDL, tempbufW, ARRAY_SIZE(tempbufW)); ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); todo_wine ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); @@ -1968,7 +1968,7 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FOREDITING, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + hr = StrRetToBufW(&strret, newPIDL, tempbufW, ARRAY_SIZE(tempbufW)); ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); todo_wine ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); @@ -1977,7 +1977,7 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FORPARSING, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + hr = StrRetToBufW(&strret, newPIDL, tempbufW, ARRAY_SIZE(tempbufW)); ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); ok (!lstrcmpiW(tempbufW, foldernameW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); @@ -4943,7 +4943,8 @@ static void test_SHChangeNotify(BOOL test_new_delivery) SHCNE_ALLEVENTS, WM_USER_NOTIFY, 1, entries); ok(notifyID != 0, "Failed to register a window for change notifications\n"); - for(i = 0; i < sizeof(chnotify_tests) / sizeof(*chnotify_tests); ++i){ + for (i = 0; i < ARRAY_SIZE(chnotify_tests); ++i) + { exp_data = chnotify_tests + i; exp_data->missing_events = exp_data->notify_count; @@ -5135,7 +5136,7 @@ static void test_GetDefaultColumn(void) CoInitialize(NULL); - for (i = 0; i < sizeof(folders)/sizeof(folders[0]); i++) + for (i = 0; i < ARRAY_SIZE(folders); i++) { IShellFolder2 *folder; ULONG sort, display; @@ -5186,7 +5187,7 @@ static void test_GetDefaultSearchGUID(void) CoInitialize(NULL); - for (i = 0; i < sizeof(folders)/sizeof(folders[0]); i++) + for (i = 0; i < ARRAY_SIZE(folders); i++) { IShellFolder2 *folder; GUID guid; -- 2.14.3

2 1

[PATCH] comctl32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 Mar '18

29 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 56547c6963..4c07f0adcd 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -549,7 +549,7 @@ static void test_button_messages(void) hfont2 = CreateFontIndirectA(&logfont); ok(hfont2 != NULL, "Failed to create Tahoma font\n"); - for (i = 0; i < sizeof(button)/sizeof(button[0]); i++) + for (i = 0; i < ARRAY_SIZE(button); i++) { HFONT prevfont, hfont; MSG msg; -- 2.14.3

1 0

[PATCH] advapi32: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 Mar '18

29 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 44b4bedb07..cc2b2a89de 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2373,7 +2373,7 @@ LSTATUS WINAPI RegSaveKeyW( HKEY hkey, LPCWSTR file, LPSECURITY_ATTRIBUTES sa ) if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; err = GetLastError(); - GetFullPathNameW( file, sizeof(buffer)/sizeof(WCHAR), buffer, &nameW ); + GetFullPathNameW( file, ARRAY_SIZE( buffer ), buffer, &nameW ); for (;;) { @@ -2708,7 +2708,7 @@ LSTATUS WINAPI RegConnectRegistryW( LPCWSTR lpMachineName, HKEY hKey, } else { WCHAR compName[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = sizeof(compName) / sizeof(WCHAR); + DWORD len = ARRAY_SIZE( compName ); /* MSDN says lpMachineName must start with \\ : not so */ if( lpMachineName[0] == '\\' && lpMachineName[1] == '\\') -- 2.14.3

1 0

[PATCH] advapi32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 Mar '18

29 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/tests/registry.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index cc17b80465..1df117bfbb 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1755,7 +1755,7 @@ static void test_reg_query_value(void) /* unicode - try size in WCHARS */ SetLastError(0xdeadbeef); - size = sizeof(valW) / sizeof(WCHAR); + size = ARRAY_SIZE(valW); ret = RegQueryValueW(subkey, NULL, valW, &size); ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); @@ -2010,7 +2010,7 @@ static void test_reg_query_info(void) lstrcpyW(expectbufferW, subkey_classW); ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)), "classbufferW = %s, expected %s\n", - wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); + wine_dbgstr_wn(classbufferW, ARRAY_SIZE(classbufferW)), wine_dbgstr_w(expectbufferW)); memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = 0xdeadbeef; @@ -2021,7 +2021,7 @@ static void test_reg_query_info(void) lstrcpyW(expectbufferW, subkey_classW); ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)), "classbufferW = %s, expected %s\n", - wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); + wine_dbgstr_wn(classbufferW, ARRAY_SIZE(classbufferW)), wine_dbgstr_w(expectbufferW)); RegDeleteKeyA(subsubkey, ""); RegCloseKey(subsubkey); -- 2.14.3

1 0

[PATCH] appwiz.cpl: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 Mar '18

29 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/appwiz.cpl/appwiz.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 76f00a0a3b..67bf037beb 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -171,7 +171,7 @@ static void set_status(DWORD id) HWND status = GetDlgItem(install_dialog, ID_DWL_STATUS); WCHAR buf[64]; - LoadStringW(hInst, id, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(hInst, id, buf, ARRAY_SIZE(buf)); SendMessageW(status, WM_SETTEXT, 0, (LPARAM)buf); } @@ -514,7 +514,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, }else { WCHAR message[256]; - if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) + if(LoadStringW(hInst, IDS_INVALID_SHA, message, ARRAY_SIZE(message))) MessageBoxW(NULL, message, NULL, MB_ICONERROR); } diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index dae9df9035..af893b8391 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -450,10 +450,10 @@ static void InstallProgram(HWND hWnd) WCHAR FilterBufferW[MAX_PATH]; WCHAR FileNameBufferW[MAX_PATH]; - LoadStringW(hInst, IDS_CPL_TITLE, titleW, sizeof(titleW)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_FILTER_INSTALLS, filter_installs, sizeof(filter_installs)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_FILTER_PROGRAMS, filter_programs, sizeof(filter_programs)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_FILTER_ALL, filter_all, sizeof(filter_all)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_CPL_TITLE, titleW, ARRAY_SIZE(titleW)); + LoadStringW(hInst, IDS_FILTER_INSTALLS, filter_installs, ARRAY_SIZE(filter_installs)); + LoadStringW(hInst, IDS_FILTER_PROGRAMS, filter_programs, ARRAY_SIZE(filter_programs)); + LoadStringW(hInst, IDS_FILTER_ALL, filter_all, ARRAY_SIZE(filter_all)); snprintfW( FilterBufferW, MAX_PATH, filters, filter_installs, 0, 0, filter_programs, 0, 0, filter_all, 0, 0 ); -- 2.14.3

1 0

[PATCH] comdlg32: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 Mar '18

29 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/filedlg.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index d788d4fb42..43d5f41180 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1641,7 +1641,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) else if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) { WCHAR buf[64]; - LoadStringW(COMDLG32_hInstance, IDS_SAVE_AS, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(COMDLG32_hInstance, IDS_SAVE_AS, buf, ARRAY_SIZE(buf)); SetWindowTextW(hwnd, buf); } @@ -1860,9 +1860,9 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) { WCHAR buf[16]; - LoadStringW(COMDLG32_hInstance, IDS_SAVE_BUTTON, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(COMDLG32_hInstance, IDS_SAVE_BUTTON, buf, ARRAY_SIZE(buf)); SetDlgItemTextW(hwnd, IDOK, buf); - LoadStringW(COMDLG32_hInstance, IDS_SAVE_IN, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(COMDLG32_hInstance, IDS_SAVE_IN, buf, ARRAY_SIZE(buf)); SetDlgItemTextW(hwnd, IDC_LOOKINSTATIC, buf); } @@ -2322,7 +2322,8 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename) HKEY hkey; /* get the current executable's name */ - if(!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, sizeof(module_path)/sizeof(module_path[0]))) { + if (!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, ARRAY_SIZE(module_path))) + { WARN("GotModuleFileName failed: %d\n", GetLastError()); return; } @@ -2409,7 +2410,8 @@ static void FILEDLG95_MRU_load_filename(LPWSTR stored_path) WCHAR module_path[MAX_PATH], *module_name; /* get the current executable's name */ - if(!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, sizeof(module_path)/sizeof(module_path[0]))) { + if (!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, ARRAY_SIZE(module_path))) + { WARN("GotModuleFileName failed: %d\n", GetLastError()); return; } @@ -2428,10 +2430,10 @@ void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) WCHAR strMsgTitle[MAX_PATH]; WCHAR strMsgText [MAX_PATH]; if (idCaption) - LoadStringW(COMDLG32_hInstance, idCaption, strMsgTitle, sizeof(strMsgTitle)/sizeof(WCHAR)); + LoadStringW(COMDLG32_hInstance, idCaption, strMsgTitle, ARRAY_SIZE(strMsgTitle)); else strMsgTitle[0] = '\0'; - LoadStringW(COMDLG32_hInstance, idText, strMsgText, sizeof(strMsgText)/sizeof(WCHAR)); + LoadStringW(COMDLG32_hInstance, idText, strMsgText, ARRAY_SIZE(strMsgText)); MessageBoxW(hwnd,strMsgText, strMsgTitle, MB_OK | MB_ICONHAND); } @@ -4128,7 +4130,7 @@ static BOOL BrowseSelectedFolder(HWND hwnd) pidlSelection, SBSP_RELATIVE ) ) ) { WCHAR buf[64]; - LoadStringW( COMDLG32_hInstance, IDS_PATHNOTEXISTING, buf, sizeof(buf)/sizeof(WCHAR) ); + LoadStringW( COMDLG32_hInstance, IDS_PATHNOTEXISTING, buf, ARRAY_SIZE(buf)); MessageBoxW( hwnd, buf, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); } bBrowseSelFolder = TRUE; -- 2.14.3

1 0

[PATCH] shell32: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 Mar '18

29 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shelllink.c | 2 +- dlls/shell32/shfldr_mycomp.c | 6 +++--- dlls/shell32/shlexec.c | 46 ++++++++++++++++++++++---------------------- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/systray.c | 2 +- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index e6774719b9..6dca9ac34c 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2088,7 +2088,7 @@ static HRESULT ShellLink_SetAdvertiseInfo(IShellLinkImpl *This, LPCWSTR str) static BOOL ShellLink_GetVolumeInfo(LPCWSTR path, volume_info *volume) { - const int label_sz = sizeof volume->label/sizeof volume->label[0]; + const int label_sz = ARRAY_SIZE(volume->label); WCHAR drive[] = { path[0], ':', '\\', 0 }; BOOL r; diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 3ed887c9cf..b5b9ff22ae 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -327,7 +327,7 @@ static BOOL CreateMyCompEnumList(IEnumIDListImpl *list, DWORD dwFlags) DWORD size; LONG r; - size = sizeof(iid) / sizeof(iid[0]); + size = ARRAY_SIZE(iid); r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL); if (ERROR_SUCCESS == r) { @@ -700,8 +700,8 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface, static const WCHAR wszCloseBracket[] = {')',0}; WCHAR wszDrive[32 /* label */ + 6 /* ' (C:)'\0 */] = {0}; - GetVolumeInformationW (pszPath, wszDrive, sizeof(wszDrive)/sizeof(wszDrive[0]) - 5, - NULL, NULL, NULL, NULL, 0); + GetVolumeInformationW (pszPath, wszDrive, ARRAY_SIZE(wszDrive) - 5, NULL, NULL, + NULL, NULL, 0); strcatW (wszDrive, wszOpenBracket); lstrcpynW (wszDrive + strlenW(wszDrive), pszPath, 3); strcatW (wszDrive, wszCloseBracket); diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index d77e213c6d..4548bf32f8 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -805,13 +805,13 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec unsigned ret = SE_ERR_NOASSOC; BOOL unicode = !(GetVersion() & 0x80000000); - if (strlenW(key) + 1 > sizeof(regkey) / sizeof(regkey[0])) + if (strlenW(key) + 1 > ARRAY_SIZE(regkey)) { FIXME("input parameter %s larger than buffer\n", debugstr_w(key)); return 2; } strcpyW(regkey, key); - endkeyLen = sizeof(regkey) / sizeof(regkey[0]) - (endkey - regkey); + endkeyLen = ARRAY_SIZE(regkey) - (endkey - regkey); if (strlenW(wApplication) + 1 > endkeyLen) { FIXME("endkey %s overruns buffer\n", debugstr_w(wApplication)); @@ -830,7 +830,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec /* Get application command from start string and find filename of application */ if (*start == '"') { - if (strlenW(start + 1) + 1 > sizeof(command) / sizeof(command[0])) + if (strlenW(start + 1) + 1 > ARRAY_SIZE(command)) { FIXME("size of input parameter %s larger than buffer\n", debugstr_w(start + 1)); @@ -839,7 +839,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec strcpyW(command, start+1); if ((ptr = strchrW(command, '"'))) *ptr = 0; - ret = SearchPathW(NULL, command, wszExe, sizeof(fullpath)/sizeof(WCHAR), fullpath, &ptr); + ret = SearchPathW(NULL, command, wszExe, ARRAY_SIZE(fullpath), fullpath, &ptr); } else { @@ -850,11 +850,11 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec int idx = space-start; memcpy(command, start, idx*sizeof(WCHAR)); command[idx] = '\0'; - if ((ret = SearchPathW(NULL, command, wszExe, sizeof(fullpath)/sizeof(WCHAR), fullpath, &ptr))) + if ((ret = SearchPathW(NULL, command, wszExe, ARRAY_SIZE(fullpath), fullpath, &ptr))) break; } if (!ret) - ret = SearchPathW(NULL, start, wszExe, sizeof(fullpath)/sizeof(WCHAR), fullpath, &ptr); + ret = SearchPathW(NULL, start, wszExe, ARRAY_SIZE(fullpath), fullpath, &ptr); } if (!ret) @@ -862,7 +862,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec ERR("Unable to find application path for command %s\n", debugstr_w(start)); return ERROR_ACCESS_DENIED; } - if (strlenW(ptr) + 1 > sizeof(app) / sizeof(app[0])) + if (strlenW(ptr) + 1 > ARRAY_SIZE(app)) { FIXME("size of found path %s larger than buffer\n", debugstr_w(ptr)); return 2; @@ -940,8 +940,8 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec } } - SHELL_ArgifyW(static_res, sizeof(static_res)/sizeof(WCHAR), exec, lpFile, pidl, szCommandline, &resultLen); - if (resultLen > sizeof(static_res)/sizeof(WCHAR)) + SHELL_ArgifyW(static_res, ARRAY_SIZE(static_res), exec, lpFile, pidl, szCommandline, &resultLen); + if (resultLen > ARRAY_SIZE(static_res)) { res = dynamic_res = heap_alloc(resultLen * sizeof(WCHAR)); SHELL_ArgifyW(dynamic_res, resultLen, exec, lpFile, pidl, szCommandline, NULL); @@ -1010,11 +1010,11 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWST /* Is there a replace() function anywhere? */ cmdlen /= sizeof(WCHAR); - if (cmdlen >= sizeof(cmd)/sizeof(WCHAR)) - cmdlen = sizeof(cmd)/sizeof(WCHAR)-1; + if (cmdlen >= ARRAY_SIZE(cmd)) + cmdlen = ARRAY_SIZE(cmd) - 1; cmd[cmdlen] = '\0'; - SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline, &resultLen); - if (resultLen > sizeof(param)/sizeof(WCHAR)) + SHELL_ArgifyW(param, ARRAY_SIZE(param), cmd, lpFile, psei->lpIDList, szCommandline, &resultLen); + if (resultLen > ARRAY_SIZE(param)) ERR("Argify buffer not large enough, truncating\n"); } @@ -1101,7 +1101,7 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR if (lpDirectory) { - GetCurrentDirectoryW(sizeof(old_dir)/sizeof(WCHAR), old_dir); + GetCurrentDirectoryW(ARRAY_SIZE(old_dir), old_dir); SetCurrentDirectoryW(lpDirectory); } @@ -1352,7 +1352,7 @@ static LONG ShellExecute_FromContextMenu( LPSHELLEXECUTEINFOW sei ) i = 0; while ( 1 ) { - r = RegEnumKeyW( hkeycm, i++, szguid, sizeof(szguid)/sizeof(szguid[0]) ); + r = RegEnumKeyW( hkeycm, i++, szguid, ARRAY_SIZE(szguid)); if ( r != ERROR_SUCCESS ) break; @@ -1401,7 +1401,7 @@ static UINT_PTR SHELL_execute_class( LPCWSTR wszApplicationName, LPSHELLEXECUTEI TRACE("SEE_MASK_CLASSNAME->%s, doc->%s\n", debugstr_w(execCmd), debugstr_w(wszApplicationName)); wcmd[0] = '\0'; - done = SHELL_ArgifyW(wcmd, sizeof(wcmd)/sizeof(WCHAR), execCmd, wszApplicationName, psei->lpIDList, NULL, &resultLen); + done = SHELL_ArgifyW(wcmd, ARRAY_SIZE(wcmd), execCmd, wszApplicationName, psei->lpIDList, NULL, &resultLen); if (!done && wszApplicationName[0]) { strcatW(wcmd, wSpace); @@ -1414,7 +1414,7 @@ static UINT_PTR SHELL_execute_class( LPCWSTR wszApplicationName, LPSHELLEXECUTEI else strcatW(wcmd, wszApplicationName); } - if (resultLen > sizeof(wcmd)/sizeof(WCHAR)) + if (resultLen > ARRAY_SIZE(wcmd)) ERR("Argify buffer not large enough... truncating\n"); return execfunc(wcmd, NULL, FALSE, psei, psei_out); } @@ -1437,7 +1437,7 @@ static void SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameter WCHAR buffer[MAX_PATH]; /* last chance to translate IDList: now also allow CLSID paths */ - if (SUCCEEDED(SHELL_GetPathFromIDListForExecuteW(sei->lpIDList, buffer, sizeof(buffer)/sizeof(WCHAR)))) { + if (SUCCEEDED(SHELL_GetPathFromIDListForExecuteW(sei->lpIDList, buffer, ARRAY_SIZE(buffer)))) { if (buffer[0]==':' && buffer[1]==':') { /* open shell folder for the specified class GUID */ if (strlenW(buffer) + 1 > parametersLen) @@ -1550,9 +1550,9 @@ static void do_error_dialog( UINT_PTR retval, HWND hwnd ) int error_code=GetLastError(); if (retval == SE_ERR_NOASSOC) - LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, ARRAY_SIZE(msg)); else - FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, msg, sizeof(msg)/sizeof(WCHAR), NULL); + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, msg, ARRAY_SIZE(msg), NULL); MessageBoxW(hwnd, msg, NULL, MB_ICONERROR); } @@ -1572,8 +1572,8 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024]; WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd; DWORD dwApplicationNameLen = MAX_PATH+2; - DWORD parametersLen = sizeof(parametersBuffer) / sizeof(WCHAR); - DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR); + DWORD parametersLen = ARRAY_SIZE(parametersBuffer); + DWORD wcmdLen = ARRAY_SIZE(wcmdBuffer); DWORD len; SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */ WCHAR *env; @@ -1632,7 +1632,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) if (sei_tmp.lpDirectory) { len = lstrlenW(sei_tmp.lpDirectory) + 1; - if (len > sizeof(dirBuffer) / sizeof(WCHAR)) + if (len > ARRAY_SIZE(dirBuffer)) wszDir = heap_alloc(len * sizeof(WCHAR)); strcpyW(wszDir, sei_tmp.lpDirectory); } diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 02e7a1ba38..5d9333453a 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1307,7 +1307,7 @@ static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE static const WCHAR format[] = {'%','d',0}; WCHAR tmp[8]; - wnsprintfW(tmp, sizeof(tmp)/sizeof(tmp[0]), format, flFrom->dwNumFiles); + wnsprintfW(tmp, ARRAY_SIZE(tmp), format, flFrom->dwNumFiles); return SHELL_ConfirmDialogW(hWnd, (fTrash?ASK_TRASH_MULTIPLE_ITEM:ASK_DELETE_MULTIPLE_ITEM), tmp, NULL); } else diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 3a17cf3daa..f748cbaef9 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -221,7 +221,7 @@ noicon: if (data->uFlags & NIF_MESSAGE) data->uCallbackMessage = nid->uCallbackMessage; if (data->uFlags & NIF_TIP) - lstrcpynW( data->szTip, nid->szTip, sizeof(data->szTip)/sizeof(WCHAR) ); + lstrcpynW( data->szTip, nid->szTip, ARRAY_SIZE(data->szTip)); if (data->uFlags & NIF_STATE) { data->dwState = nid->dwState; -- 2.14.3

1 0

[PATCH] wininet: Add ParseX509EncodedCertificateForListBoxEntry stub
by Alistair Leslie-Hughes 29 Mar '18

29 Mar '18

From: Austin English <austinenglish(a)gmail.com> Fixes https://bugs.winehq.org/show_bug.cgi?id=29842 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/dialogs.c | 9 +++++++++ dlls/wininet/wininet.spec | 2 +- include/winineti.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 938daa8b8f..b13b566a8e 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -573,6 +573,15 @@ BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) return FALSE; } +/*********************************************************************** + * ParseX509EncodedCertificateForListBoxEntry (@) + */ +DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE cert, DWORD len, LPSTR szlistbox, LPDWORD listbox) +{ + FIXME("stub: %p %d %s %p\n", cert, len, debugstr_a(szlistbox), listbox); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /*********************************************************************** * ShowX509EncodedCertificate (@) */ diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index e4337a2743..7ef28d6777 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -216,7 +216,7 @@ @ stdcall IsUrlCacheEntryExpiredA(str long ptr) @ stdcall IsUrlCacheEntryExpiredW(wstr long ptr) @ stdcall LoadUrlCacheContent() -@ stub ParseX509EncodedCertificateForListBoxEntry +@ stdcall ParseX509EncodedCertificateForListBoxEntry(ptr long str ptr) @ stdcall PrivacyGetZonePreferenceW(long long ptr ptr ptr) @ stdcall PrivacySetZonePreferenceW(long long long wstr) @ stdcall ReadUrlCacheEntryStream(ptr long ptr ptr long) diff --git a/include/winineti.h b/include/winineti.h index 5b6f15f117..5e38424fa3 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -120,6 +120,7 @@ BOOL WINAPI InternetQueryFortezzaStatus(DWORD*,DWORD_PTR); BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR,DWORD,FILETIME*); BOOL WINAPI IsUrlCacheEntryExpiredW(LPCWSTR,DWORD,FILETIME*); #define IsUrlCacheEntryExpired WINELIB_NAME_AW(IsUrlCacheEntryExpired) +DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE,DWORD,LPSTR,LPDWORD); BOOL WINAPI SetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA,DWORD); BOOL WINAPI SetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,DWORD); #define SetUrlCacheConfigInfo WINELIB_NAME_AW(SetUrlCacheConfigInfo) -- 2.16.2

2 1

[GSoC] Project proposal : Winetest Scripting Interface
by Yash Yadav 29 Mar '18

29 Mar '18

Hi, I am Yash Yadav and this is my first proposal for the GSoC idea "Winetest Scripting Interface". Please excuse the delay and me doing this near the deadline. *Winetest Scripting Interface*** *Abstract*** Wine(Wine is not an emulator) depends on multiple different third party projects which are mostly drivers or low-level system programs that allow wine to convert and forward windows calls into POSIX-compliant environment. Example supporter projects : openal-soft, gecko, mesa, etc. Having dependency on multiple third party projects naturally brings in the trouble of keeping track of what the other projects are doing. To make things easier, wine has testsuite that could be run by the third party developers (graphics drivers devs for example) to catch problems their own tests do not see. The problem is that with existing testsuite, the reports are not specific enough to count on, as they only report “success” or “failures” on completion/termination. This leaves developers to debug by manually going through the output of the tests in terminal, which is not really feasible as ignorable failure reports would be crowding all the output. *Why This Project*** Being an avid user of wine(Mostly for games though) from the day I shifted to linux, I’ve always wanted to contribute to the project since wine has space for infinite contribution until it reaches the state where everything of windows would run on a non microsoft kernel. Thanks to GSoC and a project I love, I can go up there taking baby steps from now. This project has a good scope of improving wine development process by helping other projects that wine runs on. For a beginner contributor like me, this seems to be a better start at getting familiar with wine codebase compared to just jumping into the core. *Project** Goals*** The project revolves around development of script(s) that enhance the functionality of the existing wine testsuite. The idea is to write a script that runs wine tests keeps a track of reports of tests over different patches and filter out new failures compared to previous reports. The script(s) would be written with non-wine developers in mind. Designed to be run by the developers of other projects that wine depends on. The script(s) would : 1.Report more sensible information than just reporting “Failure” or “Success” or leaving the testers with lines and lines of test results that they should be ignoring. (This could be done by backtracking a little from the failure point.) 2.Filter out the new failures only that show up with new code changes. 3.Know what all errors are ignorable and need not crowd up the reports. 4.Allow running tests specific to the section. (Sound testing wont run graphics tests) *Implementation*** Target is to write the script in python 3 since I’m more fluent in python as compared to other scripting languages. If python is not allowed, I’ll go with Bash shell. If database is used at a later point, I’m planning to go with /sqllite3 /or /Pandas/ python library if csv(comma separated values) is considered. The project implementation is expressed in the* Timeline* section. *Timeline*** *Pre GSoC : **Community Bonding | April 24 - May 13*** Get acquainted with the code base of wine and the test suite. Also, discuss with the team of what exactly needs to be done and who all can be helpful besides the mentor. *Week 1 | May 14 - May 20*** Understand the relevant parts of the testbot.winehq.org code base and try to figure out how the existing structure works on windows. Try out the testsuite. *Week 2 | May 21 - May27*** Try out the existing testsuite for different versions of the supporting projects(the ones that wine depends on) and record patterns in the output from the testsuite. Design the workflow for the script(s). Essentially figuring out to the minute details, i.e. the dataset and the information that’s important from the test reports. *Week 3 - 4 | May 28 - June 10*** Code the initial version of the script that would run the “make install” in selected directories depending upon the type of test that is called in for. Then add support to catch data from the output of the individual tests. *Week 5 | June 11 - June 15*** Phase 1 evaluation. *Week 5 - 8 | June 16 - July 8*** Extend script to filter out the raw data from the reports to gather important information, (the points relative to the failure). This may require backtracking from a failure point or just the failure report for the particular test thats running. (This is to be decided after running the tests manually and understanding the patterns, week 2 work). Result out useful data from the test reports. Also, add a script to check if the report is new or is repeated. This would require use of database or csv(comma separated values) unless suggested otherwise. *Week 9 | July 9 - July 13*** Phase 2 evaluation. *Week 9 - 11 | July 14 - July 29*** Filter out the edge cases and test the script itself for undesired output or working. Work on the back-end (preferably the database that would store the results). Add another script to obtain the data as required. (Date wise/patchset/commit wise). See if it’s possible to integrate the data fetching script into the testbot website to display the reports /timeline/. *Week 12 - 13 | July 30 - August 14*** Fix bugs, clean the code. Write documentation for the script(s). Final evaluation. *The API*** The script(s) would * Keep the test reports under version control system(preferably GIT). The way new failures or bugfixes can be catched. * Only show the relevant data to the failure if a testcase fails. (May require backtracking from the failure point). * The data relevant to the failure would also help in keeping track of previous failures and keeping a timeline of tests. *About Me*** Name : Yash Yadav Email : _yashyadav.710(a)outlook.com_ <mailto:yashyadav.710@outlook.com> | yashdimpu(a)gmail.com Telephone : +91 - 810-427-1666 Github : https://github.com/OhYash Telegram : @OhYash IRC : ohyash on freenode IRC Country of Residence : India Timezone : UTC + 05:30 I am an undergraduate student in my 3^rd year of Bachelors in technology in Lovely Professional University, in Punjab, India. My language of choice is C but I frequently choose between python and C depending upon the type task I do. I have been using git for the past one year. My semester would end on 21^st May and yes, I would be having exams within that period. I would have some placement preparatory classes in June, but If I am selected, I would be able to give about 5-6 hours everyday in weekdays and more(8-10) on weekends.

3 2

[PATCH 1/5] d3dx9: Fix FindNextValidTechnique() when no previous technique is specified.
by Matteo Bruni 29 Mar '18

29 Mar '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Another victim of last-minute changes with not enough testing... dlls/d3dx9_36/effect.c | 5 +++- dlls/d3dx9_36/tests/effect.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 404a36d0b54..a909d66a92f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4048,7 +4048,10 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, { tech = &base->techniques[i]; if (tech == prev_tech) + { + ++i; break; + } } } else @@ -4056,7 +4059,7 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, i = 0; } - for (++i; i < base->technique_count; ++i) + for (; i < base->technique_count; ++i) { tech = &base->techniques[i]; if (SUCCEEDED(ID3DXEffectImpl_ValidateTechnique(iface, get_technique_handle(tech)))) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 9693939a76b..9a8a9b65fbc 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7832,6 +7832,38 @@ static void test_create_effect_from_file(void) DestroyWindow(window); } +#if 0 +technique tech0 +{ + pass p0 + { + LightEnable[0] = FALSE; + FogEnable = FALSE; + } +} +technique tech1 +{ + pass p0 + { + LightEnable[0] = TRUE; + FogEnable = TRUE; + } +} +#endif +static const DWORD test_two_techniques_blob[] = +{ + 0xfeff0901, 0x000000ac, 0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000001, 0x00000001, 0x00000003, 0x00003070, 0x00000006, 0x68636574, 0x00000030, + 0x00000001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, + 0x00000001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, + 0x00000003, 0x00003070, 0x00000006, 0x68636574, 0x00000031, 0x00000000, 0x00000002, 0x00000002, + 0x00000001, 0x0000004c, 0x00000000, 0x00000001, 0x00000044, 0x00000000, 0x00000002, 0x00000091, + 0x00000000, 0x00000008, 0x00000004, 0x0000000e, 0x00000000, 0x00000028, 0x00000024, 0x000000a0, + 0x00000000, 0x00000001, 0x00000098, 0x00000000, 0x00000002, 0x00000091, 0x00000000, 0x0000005c, + 0x00000058, 0x0000000e, 0x00000000, 0x0000007c, 0x00000078, 0x00000000, 0x00000000, +}; + static void test_effect_find_next_valid_technique(void) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -7868,6 +7900,30 @@ static void test_effect_find_next_valid_technique(void) return; } + hr = D3DXCreateEffectEx(device, test_two_techniques_blob, sizeof(test_two_techniques_blob), + NULL, NULL, NULL, 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->FindNextValidTechnique(effect, NULL, &tech); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); + + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!strcmp(desc.Name, "tech1"), "Got unexpected technique %s.\n", desc.Name); + + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + ok(hr == S_FALSE, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); + + effect->lpVtbl->Release(effect); + hr = D3DXCreateEffectEx(device, test_effect_unsupported_shader_blob, sizeof(test_effect_unsupported_shader_blob), NULL, NULL, NULL, 0, NULL, &effect, NULL); ok(hr == D3D_OK, "Got result %#x.\n", hr); -- 2.13.6

2 8

[PATCH 1/4] ole32: Add support for loading enhmetafiles from presentation and contents streams to data cache.
by Sergio Gómez Del Real 29 Mar '18

29 Mar '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/datacache.c | 97 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 73 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 325a98b33b..e511eac23e 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -547,6 +547,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 +725,52 @@ fail: GlobalUnlock( hglobal ); GlobalFree( hglobal ); return E_FAIL; +} + +static HRESULT load_emf( DataCacheEntry *cache_entry, IStream *stm ) +{ + + if (cache_entry->load_stream_num != STREAM_NUMBER_CONTENTS) + { + HMETAFILEPICT hmfpict; + METAFILEPICT *mfpict; + + load_mf_pict(cache_entry, stm); + hmfpict = cache_entry->stgmedium.u.hMetaFilePict; + synthesize_emf(hmfpict, &cache_entry->stgmedium); + mfpict = GlobalLock(hmfpict); + DeleteMetaFile(mfpict->hMF); + GlobalFree(hmfpict); + } + else + { + HRESULT hr; + STATSTG stat; + void *data; + DWORD size_bits; + ULONG read; + + hr = IStream_Stat( stm, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) return 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) hr = 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; + } + + return S_OK; } /************************************************************************ @@ -736,6 +805,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; @@ -1118,30 +1191,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 6

[PATCH 2/2] bcrypt: Introduce helpers for BCryptDe/Encrypt and BCryptImportKeyPair.
by Hans Leidekker 29 Mar '18

29 Mar '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 694 +++++++++++++++++++++++----------------------- 1 file changed, 349 insertions(+), 345 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 1e56062b81..29a0a785d9 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -989,23 +989,13 @@ struct key } u; }; #else -struct key_symmetric -{ - enum mode_id mode; - ULONG block_size; -}; - struct key { struct object hdr; - union - { - struct key_symmetric s; - } u; }; #endif -#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) static inline BOOL key_is_symmetric( struct key *key ) { return alg_props[key->alg_id].symmetric; @@ -1018,104 +1008,6 @@ static ULONG get_block_size( struct algorithm *alg ) return ret; } -static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRYPT_KEY_HANDLE *key, UCHAR *object, - ULONG object_len, UCHAR *input, ULONG input_len ) -{ - ULONG len; - - if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) - { - BCRYPT_KEY_DATA_BLOB_HEADER *header = (BCRYPT_KEY_DATA_BLOB_HEADER *)input; - - if (input_len < sizeof(BCRYPT_KEY_DATA_BLOB_HEADER)) return STATUS_BUFFER_TOO_SMALL; - if (header->dwMagic != BCRYPT_KEY_DATA_BLOB_MAGIC) return STATUS_INVALID_PARAMETER; - if (header->dwVersion != BCRYPT_KEY_DATA_BLOB_VERSION1) - { - FIXME( "unknown key data blob version %u\n", header->dwVersion ); - return STATUS_INVALID_PARAMETER; - } - len = header->cbKeyData; - if (len + sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) > input_len) return STATUS_INVALID_PARAMETER; - - return BCryptGenerateSymmetricKey( algorithm, key, object, object_len, (UCHAR *)&header[1], len, 0 ); - } - else if (!strcmpW( type, BCRYPT_OPAQUE_KEY_BLOB )) - { - if (input_len < sizeof(len)) return STATUS_BUFFER_TOO_SMALL; - len = *(ULONG *)input; - if (len + sizeof(len) > input_len) return STATUS_INVALID_PARAMETER; - - return BCryptGenerateSymmetricKey( algorithm, key, object, object_len, input + sizeof(len), len, 0 ); - } - - FIXME( "unsupported key type %s\n", debugstr_w(type) ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, ULONG output_len, ULONG *size ) -{ - if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) - { - BCRYPT_KEY_DATA_BLOB_HEADER *header = (BCRYPT_KEY_DATA_BLOB_HEADER *)output; - ULONG req_size = sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + key->u.s.secret_len; - - *size = req_size; - if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; - - header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; - header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; - header->cbKeyData = key->u.s.secret_len; - memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); - return STATUS_SUCCESS; - } - else if (!strcmpW( type, BCRYPT_OPAQUE_KEY_BLOB )) - { - ULONG len, req_size = sizeof(len) + key->u.s.secret_len; - - *size = req_size; - if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; - - *(ULONG *)output = key->u.s.secret_len; - memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); - return STATUS_SUCCESS; - } - - FIXME( "unsupported key type %s\n", debugstr_w(type) ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) -{ - UCHAR *buffer; - - memset( key_copy, 0, sizeof(*key_copy) ); - key_copy->hdr = key_orig->hdr; - key_copy->alg_id = key_orig->alg_id; - - if (key_is_symmetric( key_orig )) - { - if (!(buffer = heap_alloc( key_orig->u.s.secret_len ))) return STATUS_NO_MEMORY; - memcpy( buffer, key_orig->u.s.secret, key_orig->u.s.secret_len ); - - key_copy->u.s.mode = key_orig->u.s.mode; - key_copy->u.s.block_size = key_orig->u.s.block_size; - key_copy->u.s.secret = buffer; - key_copy->u.s.secret_len = key_orig->u.s.secret_len; - } - else - { - if (!(buffer = heap_alloc( key_orig->u.a.pubkey_len ))) return STATUS_NO_MEMORY; - memcpy( buffer, key_orig->u.a.pubkey, key_orig->u.a.pubkey_len ); - - key_copy->u.a.pubkey = buffer; - key_copy->u.a.pubkey_len = key_orig->u.a.pubkey_len; - } - - return STATUS_SUCCESS; -} -#endif - -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) static NTSTATUS key_symmetric_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) { UCHAR *buffer; @@ -1645,6 +1537,18 @@ static NTSTATUS key_destroy( struct key *key ) return STATUS_SUCCESS; } #elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 +static inline BOOL key_is_symmetric( struct key *key ) +{ + return alg_props[key->alg_id].symmetric; +} + +static ULONG get_block_size( struct algorithm *alg ) +{ + ULONG ret = 0, size = sizeof(ret); + get_alg_property( alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&ret, sizeof(ret), &size ); + return ret; +} + static NTSTATUS key_symmetric_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) { UCHAR *buffer; @@ -1835,297 +1739,164 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_symmetric_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) -{ - ERR( "support for keys not available at build time\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS key_symmetric_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) -{ - ERR( "support for keys not available at build time\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len ) +static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len, + UCHAR *signature, ULONG signature_len, DWORD flags ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_symmetric_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len ) +static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRYPT_KEY_HANDLE *key, UCHAR *object, + ULONG object_len, UCHAR *input, ULONG input_len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_symmetric_get_tag( struct key *key, UCHAR *tag, ULONG len ) +static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, ULONG output_len, ULONG *size ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len, - UCHAR *signature, ULONG signature_len, DWORD flags ) +static NTSTATUS key_destroy( struct key *key ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRYPT_KEY_HANDLE *key, UCHAR *object, - ULONG object_len, UCHAR *input, ULONG input_len ) +static inline BOOL key_is_symmetric( struct key *key ) { ERR( "support for keys not available at build time\n" ); - return STATUS_NOT_IMPLEMENTED; + return FALSE; } -static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, ULONG output_len, ULONG *size ) +static NTSTATUS key_encrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_destroy( struct key *key ) +static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } -static inline BOOL key_is_symmetric( struct key *key ) -{ - ERR( "support for keys not available at build time\n" ); - return FALSE; -} - -static NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, const UCHAR *pubkey, ULONG pubkey_len ) +static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } #endif -NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE *handle, - UCHAR *object, ULONG object_len, UCHAR *secret, ULONG secret_len, - ULONG flags ) +#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 +static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRYPT_KEY_HANDLE *key, UCHAR *object, + ULONG object_len, UCHAR *input, ULONG input_len ) { - struct algorithm *alg = algorithm; - struct key *key; - NTSTATUS status; - - TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", algorithm, handle, object, object_len, secret, secret_len, flags ); + ULONG len; - if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; - if (object) FIXME( "ignoring object buffer\n" ); + if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) + { + BCRYPT_KEY_DATA_BLOB_HEADER *header = (BCRYPT_KEY_DATA_BLOB_HEADER *)input; - if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; - key->hdr.magic = MAGIC_KEY; + if (input_len < sizeof(BCRYPT_KEY_DATA_BLOB_HEADER)) return STATUS_BUFFER_TOO_SMALL; + if (header->dwMagic != BCRYPT_KEY_DATA_BLOB_MAGIC) return STATUS_INVALID_PARAMETER; + if (header->dwVersion != BCRYPT_KEY_DATA_BLOB_VERSION1) + { + FIXME( "unknown key data blob version %u\n", header->dwVersion ); + return STATUS_INVALID_PARAMETER; + } + len = header->cbKeyData; + if (len + sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) > input_len) return STATUS_INVALID_PARAMETER; - if ((status = key_symmetric_init( key, alg, secret, secret_len ))) + return BCryptGenerateSymmetricKey( algorithm, key, object, object_len, (UCHAR *)&header[1], len, 0 ); + } + else if (!strcmpW( type, BCRYPT_OPAQUE_KEY_BLOB )) { - heap_free( key ); - return status; + if (input_len < sizeof(len)) return STATUS_BUFFER_TOO_SMALL; + len = *(ULONG *)input; + if (len + sizeof(len) > input_len) return STATUS_INVALID_PARAMETER; + + return BCryptGenerateSymmetricKey( algorithm, key, object, object_len, input + sizeof(len), len, 0 ); } - *handle = key; - return STATUS_SUCCESS; + FIXME( "unsupported key type %s\n", debugstr_w(type) ); + return STATUS_NOT_IMPLEMENTED; } -NTSTATUS WINAPI BCryptImportKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, LPCWSTR type, - BCRYPT_KEY_HANDLE *key, PUCHAR object, ULONG object_len, PUCHAR input, - ULONG input_len, ULONG flags ) +static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, ULONG output_len, ULONG *size ) { - struct algorithm *alg = algorithm; - - TRACE("%p, %p, %s, %p, %p, %u, %p, %u, %u\n", algorithm, decrypt_key, debugstr_w(type), key, object, - object_len, input, input_len, flags); + if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) + { + BCRYPT_KEY_DATA_BLOB_HEADER *header = (BCRYPT_KEY_DATA_BLOB_HEADER *)output; + ULONG req_size = sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + key->u.s.secret_len; - if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; - if (!key || !type || !input) return STATUS_INVALID_PARAMETER; + *size = req_size; + if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; - if (decrypt_key) + header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; + header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; + header->cbKeyData = key->u.s.secret_len; + memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); + return STATUS_SUCCESS; + } + else if (!strcmpW( type, BCRYPT_OPAQUE_KEY_BLOB )) { - FIXME( "decryption of key not yet supported\n" ); - return STATUS_NOT_IMPLEMENTED; + ULONG len, req_size = sizeof(len) + key->u.s.secret_len; + + *size = req_size; + if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; + + *(ULONG *)output = key->u.s.secret_len; + memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); + return STATUS_SUCCESS; } - return key_import( algorithm, type, key, object, object_len, input, input_len ); + FIXME( "unsupported key type %s\n", debugstr_w(type) ); + return STATUS_NOT_IMPLEMENTED; } -NTSTATUS WINAPI BCryptExportKey( BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE encrypt_key, LPCWSTR type, - PUCHAR output, ULONG output_len, ULONG *size, ULONG flags ) +static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) { - struct key *key = export_key; - - TRACE("%p, %p, %s, %p, %u, %p, %u\n", key, encrypt_key, debugstr_w(type), output, output_len, size, flags); + UCHAR *buffer; - if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (!output || !type || !size) return STATUS_INVALID_PARAMETER; + memset( key_copy, 0, sizeof(*key_copy) ); + key_copy->hdr = key_orig->hdr; + key_copy->alg_id = key_orig->alg_id; - if (encrypt_key) + if (key_is_symmetric( key_orig )) { - FIXME( "encryption of key not yet supported\n" ); - return STATUS_NOT_IMPLEMENTED; - } - - return key_export( key, type, output, output_len, size ); -} - -NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE *handle_copy, - UCHAR *object, ULONG object_len, ULONG flags ) -{ - struct key *key_orig = handle; - struct key *key_copy; - NTSTATUS status; - - TRACE( "%p, %p, %p, %u, %08x\n", handle, handle_copy, object, object_len, flags ); - if (object) FIXME( "ignoring object buffer\n" ); - - if (!key_orig || key_orig->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (!handle_copy) return STATUS_INVALID_PARAMETER; - if (!(key_copy = heap_alloc( sizeof(*key_copy) ))) return STATUS_NO_MEMORY; - - if ((status = key_duplicate( key_orig, key_copy ))) - { - heap_free( key_copy ); - return status; - } - - *handle_copy = key_copy; - return STATUS_SUCCESS; -} - -NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, - BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, ULONG input_len, ULONG flags ) -{ - struct algorithm *alg = algorithm; - NTSTATUS status; - struct key *key; - - TRACE( "%p, %p, %s, %p, %p, %u, %08x\n", algorithm, decrypt_key, debugstr_w(type), ret_key, input, - input_len, flags ); - - if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; - if (!ret_key || !type || !input) return STATUS_INVALID_PARAMETER; - if (decrypt_key) - { - FIXME( "decryption of key not yet supported\n" ); - return STATUS_NOT_IMPLEMENTED; - } - - if (!strcmpW( type, BCRYPT_ECCPUBLIC_BLOB )) - { - BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)input; - DWORD key_size, magic; - - if (input_len < sizeof(*ecc_blob)) return STATUS_INVALID_PARAMETER; - - switch (alg->id) - { - case ALG_ID_ECDSA_P256: - key_size = 32; - magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; - break; - - case ALG_ID_ECDSA_P384: - key_size = 48; - magic = BCRYPT_ECDSA_PUBLIC_P384_MAGIC; - break; - - default: - FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(type) ); - return STATUS_NOT_SUPPORTED; - } - - if (ecc_blob->dwMagic != magic) return STATUS_NOT_SUPPORTED; - if (ecc_blob->cbKey != key_size) return STATUS_INVALID_PARAMETER; - - if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; - key->hdr.magic = MAGIC_KEY; - if ((status = key_asymmetric_init( key, alg, (BYTE *)ecc_blob, sizeof(*ecc_blob) + ecc_blob->cbKey * 2 ))) - { - heap_free( key ); - return status; - } + if (!(buffer = heap_alloc( key_orig->u.s.secret_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, key_orig->u.s.secret, key_orig->u.s.secret_len ); - *ret_key = key; - return STATUS_SUCCESS; + key_copy->u.s.mode = key_orig->u.s.mode; + key_copy->u.s.block_size = key_orig->u.s.block_size; + key_copy->u.s.secret = buffer; + key_copy->u.s.secret_len = key_orig->u.s.secret_len; } - else if (!strcmpW( type, BCRYPT_RSAPUBLIC_BLOB )) + else { - BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; - ULONG size; - - if (input_len < sizeof(*rsa_blob)) return STATUS_INVALID_PARAMETER; - if (alg->id != ALG_ID_RSA || rsa_blob->Magic != BCRYPT_RSAPUBLIC_MAGIC) return STATUS_NOT_SUPPORTED; - - if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; - key->hdr.magic = MAGIC_KEY; - - size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; - if ((status = key_asymmetric_init( key, alg, (BYTE *)rsa_blob, size ))) - { - heap_free( key ); - return status; - } + if (!(buffer = heap_alloc( key_orig->u.a.pubkey_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, key_orig->u.a.pubkey, key_orig->u.a.pubkey_len ); - *ret_key = key; - return STATUS_SUCCESS; + key_copy->u.a.pubkey = buffer; + key_copy->u.a.pubkey_len = key_orig->u.a.pubkey_len; } - FIXME( "unsupported key type %s\n", debugstr_w(type) ); - return STATUS_NOT_SUPPORTED; -} - -NTSTATUS WINAPI BCryptVerifySignature( BCRYPT_KEY_HANDLE handle, void *padding, UCHAR *hash, ULONG hash_len, - UCHAR *signature, ULONG signature_len, ULONG flags ) -{ - struct key *key = handle; - - TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", handle, padding, hash, hash_len, signature, signature_len, flags ); - - if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (!hash || !hash_len || !signature || !signature_len) return STATUS_INVALID_PARAMETER; - if (key_is_symmetric( key )) return STATUS_NOT_SUPPORTED; - - return key_asymmetric_verify( key, padding, hash, hash_len, signature, signature_len, flags ); -} - -NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle ) -{ - struct key *key = handle; - - TRACE( "%p\n", handle ); - - if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - return key_destroy( key ); + return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, - void *padding, UCHAR *iv, ULONG iv_len, UCHAR *output, - ULONG output_len, ULONG *ret_len, ULONG flags ) +static NTSTATUS key_encrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { - struct key *key = handle; ULONG bytes_left = input_len; UCHAR *buf, *src, *dst; NTSTATUS status; - TRACE( "%p, %p, %u, %p, %p, %u, %p, %u, %p, %08x\n", handle, input, input_len, - padding, iv, iv_len, output, output_len, ret_len, flags ); - - if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (!key_is_symmetric( key )) - { - FIXME( "encryption with asymmetric keys not yet supported\n" ); - return STATUS_NOT_IMPLEMENTED; - } - if (flags & ~BCRYPT_BLOCK_PADDING) - { - FIXME( "flags %08x not implemented\n", flags ); - return STATUS_NOT_IMPLEMENTED; - } - if (key->u.s.mode == MODE_ID_GCM) { BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; @@ -2188,30 +1959,13 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return status; } -NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, - void *padding, UCHAR *iv, ULONG iv_len, UCHAR *output, - ULONG output_len, ULONG *ret_len, ULONG flags ) +static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { - struct key *key = handle; ULONG bytes_left = input_len; UCHAR *buf, *src, *dst; NTSTATUS status; - TRACE( "%p, %p, %u, %p, %p, %u, %p, %u, %p, %08x\n", handle, input, input_len, - padding, iv, iv_len, output, output_len, ret_len, flags ); - - if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (!key_is_symmetric( key )) - { - FIXME( "decryption with asymmetric keys not yet supported\n" ); - return STATUS_NOT_IMPLEMENTED; - } - if (flags & ~BCRYPT_BLOCK_PADDING) - { - FIXME( "flags %08x not supported\n", flags ); - return STATUS_NOT_IMPLEMENTED; - } - if (key->u.s.mode == MODE_ID_GCM) { BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; @@ -2285,6 +2039,256 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return status; } +static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + struct key *key; + NTSTATUS status; + + if (!strcmpW( type, BCRYPT_ECCPUBLIC_BLOB )) + { + BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)input; + DWORD key_size, magic; + + if (input_len < sizeof(*ecc_blob)) return STATUS_INVALID_PARAMETER; + + switch (alg->id) + { + case ALG_ID_ECDSA_P256: + key_size = 32; + magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + break; + + case ALG_ID_ECDSA_P384: + key_size = 48; + magic = BCRYPT_ECDSA_PUBLIC_P384_MAGIC; + break; + + default: + FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(type) ); + return STATUS_NOT_SUPPORTED; + } + + if (ecc_blob->dwMagic != magic) return STATUS_NOT_SUPPORTED; + if (ecc_blob->cbKey != key_size) return STATUS_INVALID_PARAMETER; + + if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; + key->hdr.magic = MAGIC_KEY; + if ((status = key_asymmetric_init( key, alg, (BYTE *)ecc_blob, sizeof(*ecc_blob) + ecc_blob->cbKey * 2 ))) + { + heap_free( key ); + return status; + } + + *ret_key = key; + return STATUS_SUCCESS; + } + else if (!strcmpW( type, BCRYPT_RSAPUBLIC_BLOB )) + { + BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; + ULONG size; + + if (input_len < sizeof(*rsa_blob)) return STATUS_INVALID_PARAMETER; + if (alg->id != ALG_ID_RSA || rsa_blob->Magic != BCRYPT_RSAPUBLIC_MAGIC) return STATUS_NOT_SUPPORTED; + + if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; + key->hdr.magic = MAGIC_KEY; + + size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; + if ((status = key_asymmetric_init( key, alg, (BYTE *)rsa_blob, size ))) + { + heap_free( key ); + return status; + } + + *ret_key = key; + return STATUS_SUCCESS; + } + + FIXME( "unsupported key type %s\n", debugstr_w(type) ); + return STATUS_NOT_SUPPORTED; +} +#endif + +NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE *handle, + UCHAR *object, ULONG object_len, UCHAR *secret, ULONG secret_len, + ULONG flags ) +{ + struct algorithm *alg = algorithm; + struct key *key; + NTSTATUS status; + + TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", algorithm, handle, object, object_len, secret, secret_len, flags ); + + if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + if (object) FIXME( "ignoring object buffer\n" ); + + if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; + key->hdr.magic = MAGIC_KEY; + + if ((status = key_symmetric_init( key, alg, secret, secret_len ))) + { + heap_free( key ); + return status; + } + + *handle = key; + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptImportKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, LPCWSTR type, + BCRYPT_KEY_HANDLE *key, PUCHAR object, ULONG object_len, PUCHAR input, + ULONG input_len, ULONG flags ) +{ + struct algorithm *alg = algorithm; + + TRACE("%p, %p, %s, %p, %p, %u, %p, %u, %u\n", algorithm, decrypt_key, debugstr_w(type), key, object, + object_len, input, input_len, flags); + + if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + if (!key || !type || !input) return STATUS_INVALID_PARAMETER; + + if (decrypt_key) + { + FIXME( "decryption of key not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + return key_import( algorithm, type, key, object, object_len, input, input_len ); +} + +NTSTATUS WINAPI BCryptExportKey( BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE encrypt_key, LPCWSTR type, + PUCHAR output, ULONG output_len, ULONG *size, ULONG flags ) +{ + struct key *key = export_key; + + TRACE("%p, %p, %s, %p, %u, %p, %u\n", key, encrypt_key, debugstr_w(type), output, output_len, size, flags); + + if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!output || !type || !size) return STATUS_INVALID_PARAMETER; + + if (encrypt_key) + { + FIXME( "encryption of key not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + return key_export( key, type, output, output_len, size ); +} + +NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE *handle_copy, + UCHAR *object, ULONG object_len, ULONG flags ) +{ + struct key *key_orig = handle; + struct key *key_copy; + NTSTATUS status; + + TRACE( "%p, %p, %p, %u, %08x\n", handle, handle_copy, object, object_len, flags ); + if (object) FIXME( "ignoring object buffer\n" ); + + if (!key_orig || key_orig->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!handle_copy) return STATUS_INVALID_PARAMETER; + if (!(key_copy = heap_alloc( sizeof(*key_copy) ))) return STATUS_NO_MEMORY; + + if ((status = key_duplicate( key_orig, key_copy ))) + { + heap_free( key_copy ); + return status; + } + + *handle_copy = key_copy; + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, + BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, ULONG input_len, ULONG flags ) +{ + struct algorithm *alg = algorithm; + + TRACE( "%p, %p, %s, %p, %p, %u, %08x\n", algorithm, decrypt_key, debugstr_w(type), ret_key, input, + input_len, flags ); + + if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + if (!ret_key || !type || !input) return STATUS_INVALID_PARAMETER; + if (decrypt_key) + { + FIXME( "decryption of key not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + return key_import_pair( alg, type, ret_key, input, input_len ); +} + +NTSTATUS WINAPI BCryptVerifySignature( BCRYPT_KEY_HANDLE handle, void *padding, UCHAR *hash, ULONG hash_len, + UCHAR *signature, ULONG signature_len, ULONG flags ) +{ + struct key *key = handle; + + TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", handle, padding, hash, hash_len, signature, signature_len, flags ); + + if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!hash || !hash_len || !signature || !signature_len) return STATUS_INVALID_PARAMETER; + if (key_is_symmetric( key )) return STATUS_NOT_SUPPORTED; + + return key_asymmetric_verify( key, padding, hash, hash_len, signature, signature_len, flags ); +} + +NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle ) +{ + struct key *key = handle; + + TRACE( "%p\n", handle ); + + if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + return key_destroy( key ); +} + +NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) +{ + struct key *key = handle; + + TRACE( "%p, %p, %u, %p, %p, %u, %p, %u, %p, %08x\n", handle, input, input_len, padding, iv, iv_len, output, + output_len, ret_len, flags ); + + if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!key_is_symmetric( key )) + { + FIXME( "encryption with asymmetric keys not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + if (flags & ~BCRYPT_BLOCK_PADDING) + { + FIXME( "flags %08x not implemented\n", flags ); + return STATUS_NOT_IMPLEMENTED; + } + + return key_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); +} + +NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) +{ + struct key *key = handle; + + TRACE( "%p, %p, %u, %p, %p, %u, %p, %u, %p, %08x\n", handle, input, input_len, padding, iv, iv_len, output, + output_len, ret_len, flags ); + + if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!key_is_symmetric( key )) + { + FIXME( "decryption with asymmetric keys not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + if (flags & ~BCRYPT_BLOCK_PADDING) + { + FIXME( "flags %08x not supported\n", flags ); + return STATUS_NOT_IMPLEMENTED; + } + + return key_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); +} + NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) { struct object *object = handle; -- 2.11.0

1 0

[PATCH 1/2] bcrypt: Add support for BCRYPT_OPAQUE_KEY_BLOB.
by Hans Leidekker 29 Mar '18

29 Mar '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 99 ++++++++++++++++++++++++++++++---------------- dlls/bcrypt/tests/bcrypt.c | 27 +++++++++++-- 2 files changed, 88 insertions(+), 38 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 1490089cf7..1e56062b81 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1018,6 +1018,40 @@ static ULONG get_block_size( struct algorithm *alg ) return ret; } +static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRYPT_KEY_HANDLE *key, UCHAR *object, + ULONG object_len, UCHAR *input, ULONG input_len ) +{ + ULONG len; + + if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) + { + BCRYPT_KEY_DATA_BLOB_HEADER *header = (BCRYPT_KEY_DATA_BLOB_HEADER *)input; + + if (input_len < sizeof(BCRYPT_KEY_DATA_BLOB_HEADER)) return STATUS_BUFFER_TOO_SMALL; + if (header->dwMagic != BCRYPT_KEY_DATA_BLOB_MAGIC) return STATUS_INVALID_PARAMETER; + if (header->dwVersion != BCRYPT_KEY_DATA_BLOB_VERSION1) + { + FIXME( "unknown key data blob version %u\n", header->dwVersion ); + return STATUS_INVALID_PARAMETER; + } + len = header->cbKeyData; + if (len + sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) > input_len) return STATUS_INVALID_PARAMETER; + + return BCryptGenerateSymmetricKey( algorithm, key, object, object_len, (UCHAR *)&header[1], len, 0 ); + } + else if (!strcmpW( type, BCRYPT_OPAQUE_KEY_BLOB )) + { + if (input_len < sizeof(len)) return STATUS_BUFFER_TOO_SMALL; + len = *(ULONG *)input; + if (len + sizeof(len) > input_len) return STATUS_INVALID_PARAMETER; + + return BCryptGenerateSymmetricKey( algorithm, key, object, object_len, input + sizeof(len), len, 0 ); + } + + FIXME( "unsupported key type %s\n", debugstr_w(type) ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, ULONG output_len, ULONG *size ) { if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) @@ -1034,6 +1068,17 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); return STATUS_SUCCESS; } + else if (!strcmpW( type, BCRYPT_OPAQUE_KEY_BLOB )) + { + ULONG len, req_size = sizeof(len) + key->u.s.secret_len; + + *size = req_size; + if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; + + *(ULONG *)output = key->u.s.secret_len; + memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); + return STATUS_SUCCESS; + } FIXME( "unsupported key type %s\n", debugstr_w(type) ); return STATUS_NOT_IMPLEMENTED; @@ -1829,7 +1874,8 @@ static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *ha return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_destroy( struct key *key ) +static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRYPT_KEY_HANDLE *key, UCHAR *object, + ULONG object_len, UCHAR *input, ULONG input_len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; @@ -1841,6 +1887,12 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_destroy( struct key *key ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static inline BOOL key_is_symmetric( struct key *key ) { ERR( "support for keys not available at build time\n" ); @@ -1880,9 +1932,9 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptImportKey(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, LPCWSTR type, - BCRYPT_KEY_HANDLE *key, PUCHAR object, ULONG object_len, PUCHAR input, - ULONG input_len, ULONG flags) +NTSTATUS WINAPI BCryptImportKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, LPCWSTR type, + BCRYPT_KEY_HANDLE *key, PUCHAR object, ULONG object_len, PUCHAR input, + ULONG input_len, ULONG flags ) { struct algorithm *alg = algorithm; @@ -1894,50 +1946,27 @@ NTSTATUS WINAPI BCryptImportKey(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE d if (decrypt_key) { - FIXME("Decrypting of key not yet supported\n"); - return STATUS_NO_MEMORY; - } - - if (!strcmpW(type, BCRYPT_KEY_DATA_BLOB)) - { - BCRYPT_KEY_DATA_BLOB_HEADER *key_header = (BCRYPT_KEY_DATA_BLOB_HEADER*)input; - - if (input_len < sizeof(BCRYPT_KEY_DATA_BLOB_HEADER)) - return STATUS_BUFFER_TOO_SMALL; - - if (key_header->dwMagic != BCRYPT_KEY_DATA_BLOB_MAGIC) - return STATUS_INVALID_PARAMETER; - - if (key_header->dwVersion != BCRYPT_KEY_DATA_BLOB_VERSION1) - { - FIXME("Unknown key data blob version: %d\n", key_header->dwVersion); - return STATUS_INVALID_PARAMETER; - } - - if (key_header->cbKeyData + sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) > input_len) - return STATUS_INVALID_PARAMETER; - - return BCryptGenerateSymmetricKey(algorithm, key, object, object_len, (UCHAR*)&key_header[1], key_header->cbKeyData, 0); + FIXME( "decryption of key not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; } - FIXME("Unsupported key type: %s\n", debugstr_w(type)); - return STATUS_INVALID_PARAMETER; + return key_import( algorithm, type, key, object, object_len, input, input_len ); } -NTSTATUS WINAPI BCryptExportKey(BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE encrypt_key, LPCWSTR type, - PUCHAR output, ULONG output_len, ULONG *size, ULONG flags) +NTSTATUS WINAPI BCryptExportKey( BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE encrypt_key, LPCWSTR type, + PUCHAR output, ULONG output_len, ULONG *size, ULONG flags ) { struct key *key = export_key; TRACE("%p, %p, %s, %p, %u, %p, %u\n", key, encrypt_key, debugstr_w(type), output, output_len, size, flags); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (!output || !output_len || !size) return STATUS_INVALID_PARAMETER; + if (!output || !type || !size) return STATUS_INVALID_PARAMETER; if (encrypt_key) { - FIXME("Encryption of key not yet supported\n"); - return STATUS_NO_MEMORY; + FIXME( "encryption of key not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; } return key_export( key, type, output, output_len, size ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 7d59f6d4c1..2a499711bd 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1393,7 +1393,7 @@ static void test_BCryptDecrypt(void) static void test_key_import_export(void) { UCHAR buffer1[sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + 16]; - UCHAR buffer2[sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + 16]; + UCHAR buffer2[sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + 16], *buf; BCRYPT_KEY_DATA_BLOB_HEADER *key_data1 = (void*)buffer1; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key; @@ -1408,6 +1408,7 @@ static void test_key_import_export(void) key_data1->cbKeyData = 16; memset(&key_data1[1], 0x11, 16); + key = NULL; ret = pBCryptImportKey(aes, NULL, BCRYPT_KEY_DATA_BLOB, &key, NULL, 0, buffer1, sizeof(buffer1), 0); ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* vista */, "got %08x\n", ret); if (ret == STATUS_INVALID_PARAMETER) @@ -1415,11 +1416,12 @@ static void test_key_import_export(void) win_skip("broken BCryptImportKey\n"); return; } + ok(key != NULL, "key not set\n"); size = 0; - ret = pBCryptExportKey(key, NULL, BCRYPT_KEY_DATA_BLOB, buffer2, 1, &size, 0); + ret = pBCryptExportKey(key, NULL, BCRYPT_KEY_DATA_BLOB, buffer2, 0, &size, 0); ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == sizeof(buffer2), "Got %u\n", size); + ok(size == sizeof(buffer2), "got %u\n", size); size = 0; memset(buffer2, 0xff, sizeof(buffer2)); @@ -1428,6 +1430,25 @@ static void test_key_import_export(void) ok(size == sizeof(buffer2), "Got %u\n", size); ok(!memcmp(buffer1, buffer2, sizeof(buffer1)), "Expected exported key to match imported key\n"); + /* opaque blob */ + size = 0; + ret = pBCryptExportKey(key, NULL, BCRYPT_OPAQUE_KEY_BLOB, buffer2, 0, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size > 0, "got zero\n"); + + buf = HeapAlloc(GetProcessHeap(), 0, size); + ret = pBCryptExportKey(key, NULL, BCRYPT_OPAQUE_KEY_BLOB, buf, size, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + key = NULL; + ret = pBCryptImportKey(aes, NULL, BCRYPT_OPAQUE_KEY_BLOB, &key, NULL, 0, buf, size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(key != NULL, "key not set\n"); + HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- 2.11.0

1 0

[PATCH] wininet: Add support for FormatMessage
by Alistair Leslie-Hughes 29 Mar '18

29 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/Makefile.in | 3 ++ dlls/wininet/tests/internet.c | 60 ++++++++++++++++++++++++++++++++ dlls/wininet/winineterror.mc | 81 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 dlls/wininet/winineterror.mc diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index be69ea53b0..6789c9d336 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -17,3 +17,6 @@ C_SRCS = \ utility.c RC_SRCS = wininet.rc + +MC_SRCS = \ + winineterror.mc diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index dd15a4b8a0..123a1becfd 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1797,6 +1797,65 @@ todo_wine ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); } +static void test_format_message(HMODULE hdll) +{ + DWORD ret; + CHAR out[0x100] = {0}; + + /* These messages come from wininet and not the system. */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM , NULL, ERROR_INTERNET_TIMEOUT, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret == 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_TIMEOUT, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_INTERNAL_ERROR, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_INVALID_URL, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_UNRECOGNIZED_SCHEME, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_NAME_NOT_RESOLVED, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_INVALID_OPERATION, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0 || broken(!ret) /* XP, w2k3 */, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_OPERATION_CANCELLED, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_ITEM_NOT_FOUND, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_CANNOT_CONNECT, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_CONNECTION_ABORTED, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_SEC_CERT_DATE_INVALID, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_HMODULE, hdll, ERROR_INTERNET_SEC_CERT_CN_INVALID, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned %d\n", ret); +} + /* ############################### */ START_TEST(internet) @@ -1863,4 +1922,5 @@ START_TEST(internet) test_InternetSetOption(); test_end_browser_session(); + test_format_message(hdll); } diff --git a/dlls/wininet/winineterror.mc b/dlls/wininet/winineterror.mc new file mode 100644 index 0000000000..703a4dd30e --- /dev/null +++ b/dlls/wininet/winineterror.mc @@ -0,0 +1,81 @@ +; +; Copyright 2018 Alsitair Leslie-Hughes +; +; 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 +; + +LanguageNames=(ENU=0x409:winerr) + +MessageId=12002 +SymbolicName=ERROR_INTERNET_TIMEOUT +Language=ENU +The request has timed out. +. +MessageId=12004 +SymbolicName=ERROR_INTERNET_INTERNAL_ERROR +Language=ENU +An internal error has occurred. +. +MessageId=12005 +SymbolicName=ERROR_INTERNET_INVALID_URL +Language=ENU +The URL is invalid. +. +MessageId=12006 +SymbolicName=ERROR_INTERNET_UNRECOGNIZED_SCHEME +Language=ENU +The URL scheme could not be recognized or is not supported. +. +MessageId=12007 +SymbolicName=ERROR_INTERNET_NAME_NOT_RESOLVED +Language=ENU +The server name could not be resolved. +. +MessageId=12016 +SymbolicName=ERROR_INTERNET_INVALID_OPERATION +Language=ENU +The requested operation is invalid. +. +MessageId=12017 +SymbolicName=ERROR_INTERNET_OPERATION_CANCELLED +Language=ENU +The operation was canceled, usually because the handle on which the request was operating was closed before the operation completed. +. +MessageId=12028 +SymbolicName=ERROR_INTERNET_ITEM_NOT_FOUND +Language=ENU +The requested item could not be located. +. +MessageId=12029 +SymbolicName=ERROR_INTERNET_CANNOT_CONNECT +Language=ENU +The attempt to connect to the server failed. +. +MessageId=12030 +SymbolicName=ERROR_INTERNET_CONNECTION_ABORTED +Language=ENU +The connection with the server has been terminated. +. +MessageId=12037 +SymbolicName=ERROR_INTERNET_SEC_CERT_DATE_INVALID +Language=ENU +SSL certificate date that was received from the server is bad. The certificate is expired. +. +MessageId=12038 +SymbolicName=ERROR_INTERNET_SEC_CERT_CN_INVALID +Language=ENU +SSL certificate common name (host name field) is incorrect. +. + -- 2.16.2

1 0

[PATCH] advapi32: Use larger buffers for domain names.
by Dmitry Timoshkov 29 Mar '18

29 Mar '18

Otherwise GetComputerNameExW(ComputerNamePhysicalDnsDomain) and GetComputerNameExW(ComputerNameDnsDomain) fail if the names don't fit into MAX_COMPUTERNAME_LENGTH characters. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/lsa.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 95bfe09446..354db65929 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -771,9 +771,9 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( SID sid; DWORD sid_subauthority[3]; } domain_sid; - WCHAR domain_name[MAX_COMPUTERNAME_LENGTH + 1]; - WCHAR dns_domain_name[MAX_COMPUTERNAME_LENGTH + 1]; - WCHAR dns_forest_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR domain_name[256]; + WCHAR dns_domain_name[256]; + WCHAR dns_forest_name[256]; } *xdi; struct { @@ -785,7 +785,7 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( xdi = heap_alloc_zero(sizeof(*xdi)); if (!xdi) return STATUS_NO_MEMORY; - dwSize = MAX_COMPUTERNAME_LENGTH + 1; + dwSize = 256; if (GetComputerNameExW(ComputerNamePhysicalDnsDomain, xdi->domain_name, &dwSize)) { WCHAR *dot; @@ -799,7 +799,7 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( TRACE("setting Name to %s\n", debugstr_w(xdi->info.Name.Buffer)); } - dwSize = MAX_COMPUTERNAME_LENGTH + 1; + dwSize = 256; if (GetComputerNameExW(ComputerNameDnsDomain, xdi->dns_domain_name, &dwSize)) { xdi->info.DnsDomainName.Buffer = xdi->dns_domain_name; -- 2.16.2

1 0

[PATCH] wininet: Fix negated check for drain_content result (clang)
by André Hentschel 28 Mar '18

28 Mar '18

Introduced with 4f40039cd785c916cd25e5e9b4a0c75dab53a50a Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/wininet/http.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d77e528..f28f7c5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5091,7 +5091,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->session->password, host)) { heap_free(requestString); - if(!drain_content(request, TRUE) == ERROR_SUCCESS) { + if (drain_content(request, TRUE) != ERROR_SUCCESS) + { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE); } @@ -5119,7 +5120,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, NULL)) { heap_free(requestString); - if(!drain_content(request, TRUE) == ERROR_SUCCESS) { + if (drain_content(request, TRUE) != ERROR_SUCCESS) + { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE); } -- 2.7.4

2 1

[PATCH] gdiplus: Resample first row and first column when src_pointf.[X,Y] is very close to src[x,y].
by Jactry Zeng 28 Mar '18

28 Mar '18

For bug 33410: https://bugs.winehq.org/show_bug.cgi?id=33410 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

2 1

[PATCH 5/5] kernel32: Reimplement TransactNamedPipe on top of FSCTL_PIPE_TRANSCEIVE.
by Jacek Caban 28 Mar '18

28 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/sync.c | 36 ++++++++---- dlls/kernel32/tests/pipe.c | 138 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 12 deletions(-)

1 0

[PATCH 4/5] ntdll/tests: Add FSCTL_PIPE_TRANSCEIVE tests.
by Jacek Caban 28 Mar '18

28 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)

1 0

[PATCH 3/5] server: Add FSCTL_PIPE_TRANSCEIVE implementation.
by Jacek Caban 28 Mar '18

28 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 57 insertions(+), 8 deletions(-)

1 0

[PATCH 2/5] server: Add a helper for queuing pipe message.
by Jacek Caban 28 Mar '18

28 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-)

1 0

[PATCH 1/5] server: Don't change iosb without associated async in wake_message.
by Jacek Caban 28 Mar '18

28 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)

1 0

[PATCH] d3dx11: Add D3DX11CreateTextureFromFileA/W stub.
by Andrey Gusev 28 Mar '18

28 Mar '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3dx11_42/d3dx11_42.spec | 4 ++-- dlls/d3dx11_43/d3dx11_43.spec | 4 ++-- dlls/d3dx11_43/texture.c | 20 ++++++++++++++++++++ include/d3dx11tex.h | 8 ++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index f05e02cf44..cb1f7805ff 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -20,8 +20,8 @@ @ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) d3dx11_43.D3DX11CreateShaderResourceViewFromMemory @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW -@ stub D3DX11CreateTextureFromFileA -@ stub D3DX11CreateTextureFromFileW +@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileA +@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileW @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 1cafaa642f..76a3916e71 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -20,8 +20,8 @@ @ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW -@ stub D3DX11CreateTextureFromFileA -@ stub D3DX11CreateTextureFromFileW +@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) +@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index fe291d9113..6aaf8a7e02 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -35,6 +35,26 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co return E_NOTIMPL; } +HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult) +{ + FIXME("device %p, filename %s, load_info %p, pump %p, texture %p, hresult %p stub.\n", + device, debugstr_a(filename), load_info, pump, texture, hresult); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult) +{ + FIXME("device %p, filename %s, load_info %p, pump %p, texture %p, hresult %p stub.\n", + device, debugstr_w(filename), load_info, pump, texture, hresult); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult) diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index 584a3bd882..4f792ec13e 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -111,6 +111,14 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11ShaderResourceView **view, HRESULT *hresult); +HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult); + +HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult); + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); -- 2.14.3

2 1

Google Summer of Code 2018
by Valentin Mitrea 28 Mar '18

28 Mar '18

Hello Wine community, My name is Valentin and, in the scope of Google Summer of Code 2018, I have submitted two Wine proposals. A few words about me: I am a 2nd year student in the 3D Graphics and Multimedia master program at the Faculty of Automatic Control and Computer Science from University Politehnica of Bucharest. I am currently working at my master thesis project so that I can successfully finish the master program. I have used Wine a little in the past and it looked like a very interesting project. So, getting a chance to work on it, motivated me to drop the applications at GSOC. Also, being at a graphics master and wishing to pursue a career in this field, made me choose Wine project ideas that are related to 3D graphics. I have read through most of the Wine wiki pages and I managed to clone the Git project, compile and install it on my Linux Mint. During the proposal review period, I will start looking into the code to get acquainted with it and I will try to submit a small patch so that I can prove my worth. Looking forward to collaborating with you all! Best regards, Valentin Gabriel Mitrea.

1 0

[PATCH] ieframe: Return S_OK in IViewObject::Draw stub.
by Zebediah Figura 28 Mar '18

28 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=30611 dlls/ieframe/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c index 3e44991..546e251 100644 --- a/dlls/ieframe/view.c +++ b/dlls/ieframe/view.c @@ -60,7 +60,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, FIXME("(%p)->(%d %d %p %p %p %p %p %p %p %08lx)\n", This, dwDrawAspect, lindex, pvAspect, ptd, hdcTargetDev, hdcDraw, lprcBounds, lprcWBounds, pfnContinue, dwContinue); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwAspect, -- 2.7.4

2 1

[PATCH v6 1/6] wmp: Implement playback via quartz
by Anton Romanov 28 Mar '18

28 Mar '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/wmp/player.c | 91 +++++++++++++++++++++++++++++++--- dlls/wmp/tests/Makefile.in | 2 +- dlls/wmp/tests/av.mp4 | Bin 1493 -> 0 bytes dlls/wmp/tests/media.c | 120 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 6 +-- dlls/wmp/tests/rsrc.rc | 5 +- dlls/wmp/tests/test.mp3 | Bin 0 -> 240333 bytes dlls/wmp/wmp_private.h | 8 ++- 8 files changed, 217 insertions(+), 15 deletions(-) delete mode 100644 dlls/wmp/tests/av.mp4 create mode 100644 dlls/wmp/tests/media.c create mode 100644 dlls/wmp/tests/test.mp3 diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 4a0d0742fd..b6f6b325ec 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -19,6 +19,7 @@ #include "wmp_private.h" #include "wine/debug.h" +#include <nserror.h> WINE_DEFAULT_DEBUG_CHANNEL(wmp); @@ -119,12 +120,20 @@ static HRESULT WINAPI WMPPlayer4_put_URL(IWMPPlayer4 *iface, BSTR url) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); IWMPMedia *media; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_w(url)); if(url == NULL) { return E_POINTER; } - media = create_media_from_url(url); - return IWMPPlayer4_put_currentMedia(iface, media); + hres = create_media_from_url(url, &media); + if (SUCCEEDED(hres)) { + hres = IWMPPlayer4_put_currentMedia(iface, media); + IWMPMedia_Release(media); /* put will addref */ + } + if (SUCCEEDED(hres) && This->auto_start) { + hres = IWMPControls_play(&This->IWMPControls_iface); + } + return hres; } static HRESULT WINAPI WMPPlayer4_get_openState(IWMPPlayer4 *iface, WMPOpenState *pwmpos) @@ -1357,16 +1366,62 @@ static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstr static HRESULT WINAPI WMPControls_play(IWMPControls *iface) { + HRESULT hres = S_OK; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + WMPMedia *media; + + TRACE("(%p)\n", This); + + if (!This->wmpmedia) { + return NS_S_WMPCORE_COMMAND_NOT_AVAILABLE; + } + + media = unsafe_impl_from_IWMPMedia(This->wmpmedia); + if (!media) { + FIXME("No support for non-builtin IWMPMedia implementations\n"); + return E_INVALIDARG; + } + + if (!This->filter_graph) { + hres = CoCreateInstance(&CLSID_FilterGraph, + NULL, + CLSCTX_INPROC_SERVER, + &IID_IGraphBuilder, + (void **)&This->filter_graph); + if (SUCCEEDED(hres)) + hres = IGraphBuilder_RenderFile(This->filter_graph, media->url, NULL); + if (SUCCEEDED(hres)) + hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaControl, + (void**)&This->media_control); + } + + if (SUCCEEDED(hres)) + hres = IMediaControl_Run(This->media_control); + + if (hres == S_FALSE) { + hres = S_OK; /* S_FALSE will mean that graph is transitioning and that is fine */ + } + return hres; } static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) { + HRESULT hres = S_OK; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + if (!This->filter_graph) { + return NS_S_WMPCORE_COMMAND_NOT_AVAILABLE; + } + if (This->media_control) { + hres = IMediaControl_Stop(This->media_control); + IMediaControl_Release(This->media_control); + } + if (This->filter_graph) { + IGraphBuilder_Release(This->filter_graph); + } + This->filter_graph = NULL; + This->media_control = NULL; + return hres; } static HRESULT WINAPI WMPControls_pause(IWMPControls *iface) @@ -1741,16 +1796,36 @@ void init_player(WindowsMediaPlayer *wmp) void destroy_player(WindowsMediaPlayer *wmp) { + IWMPControls_stop(&wmp->IWMPControls_iface); if(wmp->wmpmedia) IWMPMedia_Release(wmp->wmpmedia); } -IWMPMedia* create_media_from_url(BSTR url){ +WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) +{ + if (iface->lpVtbl == &WMPMediaVtbl) { + return CONTAINING_RECORD(iface, WMPMedia, IWMPMedia_iface); + } + return NULL; +} +HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia) +{ WMPMedia *media = heap_alloc_zero(sizeof(WMPMedia)); + + if (!media) { + return E_OUTOFMEMORY; + } + media->IWMPMedia_iface.lpVtbl = &WMPMediaVtbl; media->url = heap_strdupW(url); media->ref = 1; - return &media->IWMPMedia_iface; + if (media->url) { + *ppMedia = &media->IWMPMedia_iface; + + return S_OK; + } + IWMPMedia_Release(&media->IWMPMedia_iface); + return E_OUTOFMEMORY; } diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in index dded3a4a7e..b4ecf3ffda 100644 --- a/dlls/wmp/tests/Makefile.in +++ b/dlls/wmp/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = wmp.dll IMPORTS = ole32 oleaut32 user32 gdi32 -C_SRCS = oleobj.c +C_SRCS = oleobj.c media.c RC_SRCS = \ rsrc.rc diff --git a/dlls/wmp/tests/av.mp4 b/dlls/wmp/tests/av.mp4 deleted file mode 100644 index 1431e98dd3f5bb28c282d3d732a3a1fc13cf3d63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1493 zcmeHHO-sW-5Z$D$cn}OyK`=rq^=7}c+G`IUJa`ik#7o*uZD_U$*=<2j`7uHf{1GDl z1OJ2v!Gm5r>6;{NZ56!et&eVJ_RZ{@-Py2=F|(~MeMfqNF`bdc*b#oM${1U02eu9V zMQ}^yjZE%({o@Y&97zZ2!~blBKX3W>_ST2tck=HTAD{cZ@Vo&eT`}nJY3bAx=4GZa z`b{u30X;KsOfrA+Qdsb;0;`MQx#~tW!HuCOUU|%5K~!R<&M$QfHdhiFrtM0VXpus! z8w+y59SdAe@Y%E99^ge_ClAreVu!myqQRus?~Q!2$C&d&tH)iNa<paP^xAL?DW*gV zJmyUv*c2zwHkSH<n@jvhshTeQ3#sJjGAQR1Zxn5mK=T+nGsvN>0=u^4bYPYW!*CPt zTN*aoSS3n(!+3qqfYDcs1sIL`ye3uDqbLP`;L_xqDBmInpmH=QpDe|$U`GJ2p{zzd z&Pvttk^tpyV>J6*S+Hlqjx2@qU;BwW2rS>HV~<gE;!E4QQ633y;7KMC5@ko$puM+W Ks#QwWO7#=93TT)B diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c new file mode 100644 index 0000000000..6e4a0c170f --- /dev/null +++ b/dlls/wmp/tests/media.c @@ -0,0 +1,120 @@ +/* + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#define COBJMACROS +#include <wmp.h> +#include <olectl.h> +#include <nserror.h> + +#include "wine/test.h" + +static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; +static inline WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} + +static void test_wmp(void) +{ + IWMPPlayer4 *player4; + IWMPControls *controls; + HRESULT hres; + BSTR filename; + + IOleObject *oleobj; + IWMPSettings *settings; + + hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); + if(hres == REGDB_E_CLASSNOTREG) { + win_skip("CLSID_WindowsMediaPlayer not registered\n"); + return; + } + ok(hres == S_OK, "Could not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + + hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); + ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); + + settings = NULL; + hres = IWMPPlayer4_get_settings(player4, &settings); + ok(hres == S_OK, "get_settings failed: %08x\n", hres); + ok(settings != NULL, "settings = NULL\n"); + + hres = IWMPSettings_put_autoStart(settings, VARIANT_FALSE); + ok(hres == S_OK, "Could not put autoStart in IWMPSettings: %08x\n", hres); + IWMPSettings_Release(settings); + + controls = NULL; + hres = IWMPPlayer4_get_controls(player4, &controls); + ok(hres == S_OK, "get_controls failed: %08x\n", hres); + ok(controls != NULL, "controls = NULL\n"); + + hres = IWMPControls_play(controls); + ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres); + + filename = SysAllocString(load_resource(mp3file)); + + hres = IWMPPlayer4_put_URL(player4, filename); + ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08x\n", hres); + + hres = IWMPControls_play(controls); + ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres); + + hres = IWMPControls_stop(controls); + ok(hres == S_OK, "IWMPControls_stop failed: %08x\n", hres); + + /* Already Stopped */ + hres = IWMPControls_stop(controls); + ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_stop is available: %08x\n", hres); + + hres = IWMPControls_play(controls); + ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres); + + IWMPControls_Release(controls); + IWMPPlayer4_Release(player4); + IOleObject_Release(oleobj); + DeleteFileW(filename); + SysFreeString(filename); +} + +START_TEST(media) +{ + CoInitialize(NULL); + + test_wmp(); + + CoUninitialize(); +} diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index e4c2294436..41179dae5d 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -70,7 +70,7 @@ DEFINE_EXPECT(GetWindowContext); DEFINE_EXPECT(ShowObject); DEFINE_EXPECT(OnShowWindow_FALSE); -static const WCHAR mp4file[] = {'a','v','.','m','p','4',0}; +static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; static inline WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -942,8 +942,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) ok(hres == S_FALSE, "get_currentMedia SUCCEEDED\n"); ok(media == NULL, "media != NULL\n"); - filename = SysAllocString(load_resource(mp4file)); - + filename = SysAllocString(load_resource(mp3file)); SET_EXPECT(GetContainer); SET_EXPECT(Invoke_USERMODE); @@ -1039,6 +1038,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings_Release(settings); IWMPPlayer_Release(player); + DeleteFileW(filename); SysFreeString(filename); } diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc index fb30ae6940..f33acc1256 100644 --- a/dlls/wmp/tests/rsrc.rc +++ b/dlls/wmp/tests/rsrc.rc @@ -18,5 +18,6 @@ #include "windef.h" -/* @makedep: av.mp4 */ -av.mp4 RCDATA "av.mp4" +/* ffmpeg -ar 48000 -t 60 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 output.mp3 */ +/* @makedep: test.mp3 */ +test.mp3 RCDATA "test.mp3" diff --git a/dlls/wmp/tests/test.mp3 b/dlls/wmp/tests/test.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..149a2cd346ee52ae179c46198ce290a5dd4d6251 GIT binary patch literal 240333 zcmeI%f23Xo0LJlCcd=qF8IkluD<ZR5KSsq;mzGVmT``eqrkEu$6EP~1m`IVNlq5-1 zBqA}9NQp$^ij2req${`gz5Vg*;oRHE``_o9?faaU<K1!gx#zyyedmr1!}ROw{rmPU zO#Yl7hPgclj~%}8=B+z-Y~8+X+v=<T{<gBb|Ex8hyN@1zWb(@7G#8#4=H7X2n7d%( zMVsa?-h9cWmtAqymTRxOe(UxfH|@OTwq18D+;#Wfd+yzT-+}udIC$vrLr0E2`q;7K zk3VtZ$)}%r_PLYKzwpw_ue|#D8*jb+?tAZl@X^PgeEQkvr@r{|tFOQL?)x8p{Auau zUrzt}+nL}0`17y7r|)F)o*$gN=j~^|-(k!7yQZ&A-^a=|Pn}*_-h617KQjyuPmXOI zhD}!v!+DcmZ%*bUZ#Xdw8}{73cVYGKy*To<?u(0y)AL{cALk!AYYv^m`EQ-^`47za z{Ksc}{ugI_{tst-{%>b|{-u-a-~YK8N9r8zPv@VaIdbhLho(NbKCaLB-7z`p-`9pU zug&xY*T?no{mb{4wUFQgANarrKCJoq##)zV^*BHI$xnW+g#;h?zz06?!SmI~J>c{0 z_5SnF=l?#x9XvmHe(?M-^1WmAke@I3zz06?!Os^X_kf=-{CqKTTjY@E2hR_lA3Q%q zgf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8gT7@h=@PQ9}hzMPL z-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g_z)4g_`nA~ z@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzTbn$@?eBeW? zki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJANatBRw0WI zeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG@10VRnhltR{2R`tD53NELANarr zK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I@10Pz2EI#mo4}6FS zU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M10VPh5xV%m z2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr@PQ9}Xce;fzz06?AtH3~fe(D( zL#vR*2R`tD4-uh@4}9PQA6kVhKJbALe255LeBc8g_|Ph3@qrI~;6p^{;sYP}z=u{L ziw}I@10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn@PQAlLKYwR zzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8gT7@h=@PQ9} zhzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g_z)4g z_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzTbn$@? zeBeW?ki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJANatB zRw0WIeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG@10VRnhltR{2R`tD53NEL zANarrK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I@10Pz2EI#mo z4}6FSU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M10VPh z5xV%m2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr@PQ9}Xce;fzz06?AtH3~ zfe(D(L#vR*2R`tD4-uh@4}9PQA6kVhKJbALe255LeBc8g_|Ph3@qrI~;6p^{;sYP} zz=u{Liw}I@10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn@PQAl zLKYwRzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8gT7@h= z@PQ9}hzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g z_z)4g_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzT zbn$@?eBeW?ki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJ zANatBRw0WIeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG@10VRnhltR{2R`tD z53NELANarrK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I@10Pz2 zEI#mo4}6FSU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M z10VPh5xV%m2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr@PQ9}Xce;fzz06? zAtH3~fe(D(L#vR*2R`tD4-uh@4}9PQA6kVhKJbALe255LeBc8g_|Ph3@qrI~;6p^{ z;sYP}z=u{Liw}I@10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn z@PQAlLKYwRzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8g zT7@h=@PQ9}hzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1 zeBc8g_z)4g_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIU zKJXzTbn$@?eBeW?ki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE725C6x9 d+)1Ogvb_1wlJk#Vo9RK<XU$8q`ogTQ&p*pvqh$a9 literal 0 HcmV?d00001 diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index e95b194d77..05ad5889e2 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -22,6 +22,7 @@ #include "wine/heap.h" #include "wine/unicode.h" #include "ole2.h" +#include "dshow.h" #include "wmp.h" typedef struct { @@ -70,11 +71,16 @@ struct WindowsMediaPlayer { ConnectionPoint *wmpocx; IWMPMedia *wmpmedia; + + /* DirectShow stuff */ + IGraphBuilder* filter_graph; + IMediaControl* media_control; }; void init_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; void destroy_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; -IWMPMedia* create_media_from_url(BSTR url); +WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) DECLSPEC_HIDDEN; +HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia) DECLSPEC_HIDDEN; void ConnectionPointContainer_Init(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; -- 2.16.2

2 7

[PATCH] msvcrt: Accept Czechia as locale name
by André Hentschel 28 Mar '18

28 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/msvcrt/tests/locale.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index f87a791..ea42385 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -158,12 +158,14 @@ todo_wine ret = setlocale(LC_ALL, "csy"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Czech_Czech Republic.1250"), "ret = %s\n", ret); + ok(!strcmp(ret, "Czech_Czech Republic.1250") + || !strcmp(ret, "Czech_Czechia.1250"), "ret = %s\n", ret); ret = setlocale(LC_ALL, "czech"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Czech_Czech Republic.1250"), "ret = %s\n", ret); + ok(!strcmp(ret, "Czech_Czech Republic.1250") + || !strcmp(ret, "Czech_Czechia.1250"), "ret = %s\n", ret); ret = setlocale(LC_ALL, "dan"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); -- 2.7.4

2 1

[PATCH v5 1/6] wmp: Implement playback via quartz
by Anton Romanov 28 Mar '18

28 Mar '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/wmp/player.c | 91 +++++++++++++++++++++++++++++++--- dlls/wmp/tests/Makefile.in | 2 +- dlls/wmp/tests/av.mp4 | Bin 1493 -> 0 bytes dlls/wmp/tests/media.c | 120 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 6 +-- dlls/wmp/tests/rsrc.rc | 5 +- dlls/wmp/tests/test.mp3 | Bin 0 -> 240333 bytes dlls/wmp/wmp_private.h | 8 ++- 8 files changed, 217 insertions(+), 15 deletions(-) delete mode 100644 dlls/wmp/tests/av.mp4 create mode 100644 dlls/wmp/tests/media.c create mode 100644 dlls/wmp/tests/test.mp3 diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 4a0d0742fd..5effc75743 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -19,6 +19,7 @@ #include "wmp_private.h" #include "wine/debug.h" +#include <nserror.h> WINE_DEFAULT_DEBUG_CHANNEL(wmp); @@ -119,12 +120,20 @@ static HRESULT WINAPI WMPPlayer4_put_URL(IWMPPlayer4 *iface, BSTR url) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); IWMPMedia *media; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_w(url)); if(url == NULL) { return E_POINTER; } - media = create_media_from_url(url); - return IWMPPlayer4_put_currentMedia(iface, media); + hres = create_media_from_url(url, &media); + if (SUCCEEDED(hres)) { + hres = IWMPPlayer4_put_currentMedia(iface, media); + IWMPMedia_Release(media); /* put will addref */ + } + if (SUCCEEDED(hres) && This->auto_start) { + hres = IWMPControls_play(&This->IWMPControls_iface); + } + return hres; } static HRESULT WINAPI WMPPlayer4_get_openState(IWMPPlayer4 *iface, WMPOpenState *pwmpos) @@ -1357,16 +1366,62 @@ static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstr static HRESULT WINAPI WMPControls_play(IWMPControls *iface) { + HRESULT hres = S_OK; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + WMPMedia *media; + + TRACE("(%p)\n", This); + + if (!This->wmpmedia) { + return NS_S_WMPCORE_COMMAND_NOT_AVAILABLE; + } + + media = unsafe_impl_from_IWMPMedia(This->wmpmedia); + if (!media) { + FIXME("No support for non-builtin IWMPMedia implementations\n"); + return E_INVALIDARG; + } + + if (!This->filter_graph) { + hres = CoCreateInstance(&CLSID_FilterGraph, + NULL, + CLSCTX_INPROC_SERVER, + &IID_IGraphBuilder, + (void **)&This->filter_graph); + if (SUCCEEDED(hres)) + hres = IGraphBuilder_RenderFile(This->filter_graph, media->url, NULL); + if (SUCCEEDED(hres)) + hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaControl, + (void**)&This->media_control); + } + + if (SUCCEEDED(hres)) + hres = IMediaControl_Run(This->media_control); + + if (hres == S_FALSE) { + hres = S_OK; /* S_FALSE will mean that graph is transitioning and that is fine */ + } + return hres; } static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) { + HRESULT hres = S_OK; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + if (!This->filter_graph) { + return NS_S_WMPCORE_COMMAND_NOT_AVAILABLE; + } + if (This->media_control) { + hres = IMediaControl_Stop(This->media_control); + IMediaControl_Release(This->media_control); + } + if (!This->filter_graph) { + IGraphBuilder_Release(This->filter_graph); + } + This->filter_graph = NULL; + This->media_control = NULL; + return hres; } static HRESULT WINAPI WMPControls_pause(IWMPControls *iface) @@ -1741,16 +1796,36 @@ void init_player(WindowsMediaPlayer *wmp) void destroy_player(WindowsMediaPlayer *wmp) { + IWMPControls_stop(&wmp->IWMPControls_iface); if(wmp->wmpmedia) IWMPMedia_Release(wmp->wmpmedia); } -IWMPMedia* create_media_from_url(BSTR url){ +WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) +{ + if (iface->lpVtbl == &WMPMediaVtbl) { + return CONTAINING_RECORD(iface, WMPMedia, IWMPMedia_iface); + } + return NULL; +} +HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia) +{ WMPMedia *media = heap_alloc_zero(sizeof(WMPMedia)); + + if (!media) { + return E_OUTOFMEMORY; + } + media->IWMPMedia_iface.lpVtbl = &WMPMediaVtbl; media->url = heap_strdupW(url); media->ref = 1; - return &media->IWMPMedia_iface; + if (media->url) { + *ppMedia = &media->IWMPMedia_iface; + + return S_OK; + } + IWMPMedia_Release(&media->IWMPMedia_iface); + return E_OUTOFMEMORY; } diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in index dded3a4a7e..b4ecf3ffda 100644 --- a/dlls/wmp/tests/Makefile.in +++ b/dlls/wmp/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = wmp.dll IMPORTS = ole32 oleaut32 user32 gdi32 -C_SRCS = oleobj.c +C_SRCS = oleobj.c media.c RC_SRCS = \ rsrc.rc diff --git a/dlls/wmp/tests/av.mp4 b/dlls/wmp/tests/av.mp4 deleted file mode 100644 index 1431e98dd3f5bb28c282d3d732a3a1fc13cf3d63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1493 zcmeHHO-sW-5Z$D$cn}OyK`=rq^=7}c+G`IUJa`ik#7o*uZD_U$*=<2j`7uHf{1GDl z1OJ2v!Gm5r>6;{NZ56!et&eVJ_RZ{@-Py2=F|(~MeMfqNF`bdc*b#oM${1U02eu9V zMQ}^yjZE%({o@Y&97zZ2!~blBKX3W>_ST2tck=HTAD{cZ@Vo&eT`}nJY3bAx=4GZa z`b{u30X;KsOfrA+Qdsb;0;`MQx#~tW!HuCOUU|%5K~!R<&M$QfHdhiFrtM0VXpus! z8w+y59SdAe@Y%E99^ge_ClAreVu!myqQRus?~Q!2$C&d&tH)iNa<paP^xAL?DW*gV zJmyUv*c2zwHkSH<n@jvhshTeQ3#sJjGAQR1Zxn5mK=T+nGsvN>0=u^4bYPYW!*CPt zTN*aoSS3n(!+3qqfYDcs1sIL`ye3uDqbLP`;L_xqDBmInpmH=QpDe|$U`GJ2p{zzd z&Pvttk^tpyV>J6*S+Hlqjx2@qU;BwW2rS>HV~<gE;!E4QQ633y;7KMC5@ko$puM+W Ks#QwWO7#=93TT)B diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c new file mode 100644 index 0000000000..6e4a0c170f --- /dev/null +++ b/dlls/wmp/tests/media.c @@ -0,0 +1,120 @@ +/* + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#define COBJMACROS +#include <wmp.h> +#include <olectl.h> +#include <nserror.h> + +#include "wine/test.h" + +static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; +static inline WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} + +static void test_wmp(void) +{ + IWMPPlayer4 *player4; + IWMPControls *controls; + HRESULT hres; + BSTR filename; + + IOleObject *oleobj; + IWMPSettings *settings; + + hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); + if(hres == REGDB_E_CLASSNOTREG) { + win_skip("CLSID_WindowsMediaPlayer not registered\n"); + return; + } + ok(hres == S_OK, "Could not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + + hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); + ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); + + settings = NULL; + hres = IWMPPlayer4_get_settings(player4, &settings); + ok(hres == S_OK, "get_settings failed: %08x\n", hres); + ok(settings != NULL, "settings = NULL\n"); + + hres = IWMPSettings_put_autoStart(settings, VARIANT_FALSE); + ok(hres == S_OK, "Could not put autoStart in IWMPSettings: %08x\n", hres); + IWMPSettings_Release(settings); + + controls = NULL; + hres = IWMPPlayer4_get_controls(player4, &controls); + ok(hres == S_OK, "get_controls failed: %08x\n", hres); + ok(controls != NULL, "controls = NULL\n"); + + hres = IWMPControls_play(controls); + ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres); + + filename = SysAllocString(load_resource(mp3file)); + + hres = IWMPPlayer4_put_URL(player4, filename); + ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08x\n", hres); + + hres = IWMPControls_play(controls); + ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres); + + hres = IWMPControls_stop(controls); + ok(hres == S_OK, "IWMPControls_stop failed: %08x\n", hres); + + /* Already Stopped */ + hres = IWMPControls_stop(controls); + ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_stop is available: %08x\n", hres); + + hres = IWMPControls_play(controls); + ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres); + + IWMPControls_Release(controls); + IWMPPlayer4_Release(player4); + IOleObject_Release(oleobj); + DeleteFileW(filename); + SysFreeString(filename); +} + +START_TEST(media) +{ + CoInitialize(NULL); + + test_wmp(); + + CoUninitialize(); +} diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index e4c2294436..41179dae5d 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -70,7 +70,7 @@ DEFINE_EXPECT(GetWindowContext); DEFINE_EXPECT(ShowObject); DEFINE_EXPECT(OnShowWindow_FALSE); -static const WCHAR mp4file[] = {'a','v','.','m','p','4',0}; +static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; static inline WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -942,8 +942,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) ok(hres == S_FALSE, "get_currentMedia SUCCEEDED\n"); ok(media == NULL, "media != NULL\n"); - filename = SysAllocString(load_resource(mp4file)); - + filename = SysAllocString(load_resource(mp3file)); SET_EXPECT(GetContainer); SET_EXPECT(Invoke_USERMODE); @@ -1039,6 +1038,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings_Release(settings); IWMPPlayer_Release(player); + DeleteFileW(filename); SysFreeString(filename); } diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc index fb30ae6940..f33acc1256 100644 --- a/dlls/wmp/tests/rsrc.rc +++ b/dlls/wmp/tests/rsrc.rc @@ -18,5 +18,6 @@ #include "windef.h" -/* @makedep: av.mp4 */ -av.mp4 RCDATA "av.mp4" +/* ffmpeg -ar 48000 -t 60 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 output.mp3 */ +/* @makedep: test.mp3 */ +test.mp3 RCDATA "test.mp3" diff --git a/dlls/wmp/tests/test.mp3 b/dlls/wmp/tests/test.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..149a2cd346ee52ae179c46198ce290a5dd4d6251 GIT binary patch literal 240333 zcmeI%f23Xo0LJlCcd=qF8IkluD<ZR5KSsq;mzGVmT``eqrkEu$6EP~1m`IVNlq5-1 zBqA}9NQp$^ij2req${`gz5Vg*;oRHE``_o9?faaU<K1!gx#zyyedmr1!}ROw{rmPU zO#Yl7hPgclj~%}8=B+z-Y~8+X+v=<T{<gBb|Ex8hyN@1zWb(@7G#8#4=H7X2n7d%( zMVsa?-h9cWmtAqymTRxOe(UxfH|@OTwq18D+;#Wfd+yzT-+}udIC$vrLr0E2`q;7K zk3VtZ$)}%r_PLYKzwpw_ue|#D8*jb+?tAZl@X^PgeEQkvr@r{|tFOQL?)x8p{Auau zUrzt}+nL}0`17y7r|)F)o*$gN=j~^|-(k!7yQZ&A-^a=|Pn}*_-h617KQjyuPmXOI zhD}!v!+DcmZ%*bUZ#Xdw8}{73cVYGKy*To<?u(0y)AL{cALk!AYYv^m`EQ-^`47za z{Ksc}{ugI_{tst-{%>b|{-u-a-~YK8N9r8zPv@VaIdbhLho(NbKCaLB-7z`p-`9pU zug&xY*T?no{mb{4wUFQgANarrKCJoq##)zV^*BHI$xnW+g#;h?zz06?!SmI~J>c{0 z_5SnF=l?#x9XvmHe(?M-^1WmAke@I3zz06?!Os^X_kf=-{CqKTTjY@E2hR_lA3Q%q zgf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8gT7@h=@PQ9}hzMPL z-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g_z)4g_`nA~ z@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzTbn$@?eBeW? zki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJANatBRw0WI zeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG@10VRnhltR{2R`tD53NELANarr zK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I@10Pz2EI#mo4}6FS zU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M10VPh5xV%m z2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr@PQ9}Xce;fzz06?AtH3~fe(D( zL#vR*2R`tD4-uh@4}9PQA6kVhKJbALe255LeBc8g_|Ph3@qrI~;6p^{;sYP}z=u{L ziw}I@10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn@PQAlLKYwR zzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8gT7@h=@PQ9} zhzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g_z)4g z_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzTbn$@? zeBeW?ki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJANatB zRw0WIeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG@10VRnhltR{2R`tD53NEL zANarrK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I@10Pz2EI#mo z4}6FSU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M10VPh z5xV%m2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr@PQ9}Xce;fzz06?AtH3~ zfe(D(L#vR*2R`tD4-uh@4}9PQA6kVhKJbALe255LeBc8g_|Ph3@qrI~;6p^{;sYP} zz=u{Liw}I@10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn@PQAl zLKYwRzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8gT7@h= z@PQ9}hzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g z_z)4g_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzT zbn$@?eBeW?ki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJ zANatBRw0WIeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG@10VRnhltR{2R`tD z53NELANarrK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I@10Pz2 zEI#mo4}6FSU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M z10VPh5xV%m2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr@PQ9}Xce;fzz06? zAtH3~fe(D(L#vR*2R`tD4-uh@4}9PQA6kVhKJbALe255LeBc8g_|Ph3@qrI~;6p^{ z;sYP}z=u{Liw}I@10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn z@PQAlLKYwRzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8g zT7@h=@PQ9}hzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1 zeBc8g_z)4g_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIU zKJXzTbn$@?eBeW?ki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE725C6x9 d+)1Ogvb_1wlJk#Vo9RK<XU$8q`ogTQ&p*pvqh$a9 literal 0 HcmV?d00001 diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index e95b194d77..05ad5889e2 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -22,6 +22,7 @@ #include "wine/heap.h" #include "wine/unicode.h" #include "ole2.h" +#include "dshow.h" #include "wmp.h" typedef struct { @@ -70,11 +71,16 @@ struct WindowsMediaPlayer { ConnectionPoint *wmpocx; IWMPMedia *wmpmedia; + + /* DirectShow stuff */ + IGraphBuilder* filter_graph; + IMediaControl* media_control; }; void init_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; void destroy_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; -IWMPMedia* create_media_from_url(BSTR url); +WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) DECLSPEC_HIDDEN; +HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia) DECLSPEC_HIDDEN; void ConnectionPointContainer_Init(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; -- 2.16.2

2 9

New bandwidth for winehq.org
by Jeremy White 28 Mar '18

28 Mar '18

Folks, We've now upgraded WineHQ from a 20Mbps line to a 100Mbps line (burstable to 1G). This also moves us to Level3 (which is Century Link now :-( ). Note that most users should not see a difference; the bulk of real traffic should be going through Fastly (who is *awesome*). The main thing that this should avoid is that when we do a release, we effectively get ddos'd by Fastly. I never did figure that out, so I've chosen to throw money at the problem. In theory, now when we do a release, our pipe is big enough to satisfy Fastly, and the web site should not get ddos'd. It doesn't change fundamentals; latency should be similar (we see a big improvement, Alexandre sees a slight degradation). The box is also chugging hard; it may be time to shift the SQL database to a different system to reduce the strain. Perhaps that is a conversation for Wineconf. Cheers, Jeremy

1 0

[PATCH] comctl32/button: Implement BCM_{GETNOTE,SETNOTE,GETNOTELENGTH} message.
by Zhiyi Zhang 28 Mar '18

28 Mar '18

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

2 1

[PATCH vkd3d 4/6] libs/vkd3d: Implement d3d12_command_list_CopyResource() for textures.
by Józef Kucia 28 Mar '18

28 Mar '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 39 ++++++++++++++++++++++++++++++++++++--- libs/vkd3d/device.c | 2 +- libs/vkd3d/vkd3d_private.h | 5 +++++ 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 847581c03b65..1c0a18ae09e7 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2619,7 +2619,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); struct d3d12_resource *dst_resource, *src_resource; + const struct vkd3d_format *src_format, *dst_format; const struct vkd3d_vk_device_procs *vk_procs; + VkBufferCopy vk_buffer_copy; + VkImageCopy vk_image_copy; + unsigned int layer_count; + unsigned int i; TRACE("iface %p, dst_resource %p, src_resource %p.\n", iface, dst, src); @@ -2628,10 +2633,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm dst_resource = unsafe_impl_from_ID3D12Resource(dst); src_resource = unsafe_impl_from_ID3D12Resource(src); + d3d12_command_list_track_resource_usage(list, dst_resource); + d3d12_command_list_track_resource_usage(list, src_resource); + if (d3d12_resource_is_buffer(dst_resource)) { - VkBufferCopy vk_buffer_copy; - assert(d3d12_resource_is_buffer(src_resource)); assert(src_resource->desc.Width == dst_resource->desc.Width); @@ -2643,7 +2649,34 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm } else { - FIXME("Not implemented for textures.\n"); + if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, DXGI_FORMAT_UNKNOWN))) + { + WARN("Invalid format %#x.\n", dst_resource->desc.Format); + return; + } + if (!(src_format = vkd3d_format_from_d3d12_resource_desc(&src_resource->desc, DXGI_FORMAT_UNKNOWN))) + { + WARN("Invalid format %#x.\n", src_resource->desc.Format); + return; + } + + layer_count = d3d12_resource_desc_get_layer_count(&dst_resource->desc); + + assert(d3d12_resource_is_texture(dst_resource)); + assert(d3d12_resource_is_texture(src_resource)); + assert(dst_resource->desc.MipLevels == src_resource->desc.MipLevels); + assert(layer_count == d3d12_resource_desc_get_layer_count(&src_resource->desc)); + + for (i = 0; i < dst_resource->desc.MipLevels; ++i) + { + vk_image_copy_from_d3d12(&vk_image_copy, i, i, + &src_resource->desc, &dst_resource->desc, src_format, dst_format, NULL, 0, 0, 0); + vk_image_copy.dstSubresource.layerCount = layer_count; + vk_image_copy.srcSubresource.layerCount = layer_count; + VK_CALL(vkCmdCopyImage(list->vk_command_buffer, src_resource->u.vk_image, + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_resource->u.vk_image, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &vk_image_copy)); + } } } diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e826478fafbb..d61c331929f7 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1951,7 +1951,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - array_size = desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D ? 1 : desc->DepthOrArraySize; + array_size = d3d12_resource_desc_get_layer_count(desc); if (first_sub_resource >= desc->MipLevels * array_size || sub_resource_count > desc->MipLevels * array_size - first_sub_resource) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 62b465223aa3..988522f99e70 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -738,6 +738,11 @@ static inline unsigned int d3d12_resource_desc_get_depth(const D3D12_RESOURCE_DE return max(1, d >> miplevel_idx); } +static inline unsigned int d3d12_resource_desc_get_layer_count(const D3D12_RESOURCE_DESC *desc) +{ + return desc->Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D ? desc->DepthOrArraySize : 1; +} + enum VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; -- 2.16.1

2 1

[PATCH vkd3d 2/6] libs/vkd3d: Avoid passing invalid miplevel count to Vulkan.
by Józef Kucia 28 Mar '18

28 Mar '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index e0ceb4c211b0..81135d373ae7 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -102,6 +102,14 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, return S_OK; } +static unsigned int max_miplevel_count(const D3D12_RESOURCE_DESC *desc) +{ + unsigned int size = max(desc->Width, desc->Height); + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + size = max(size, desc->DepthOrArraySize); + return vkd3d_log2i(size) + 1; +} + static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { @@ -143,7 +151,7 @@ static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_ image_info.arrayLayers = desc->DepthOrArraySize; } - image_info.mipLevels = desc->MipLevels; + image_info.mipLevels = min(desc->MipLevels, max_miplevel_count(desc)); image_info.samples = vk_samples_from_dxgi_sample_desc(&desc->SampleDesc); if (desc->Layout == D3D12_TEXTURE_LAYOUT_UNKNOWN) @@ -653,12 +661,7 @@ static HRESULT validate_buffer_desc(const D3D12_RESOURCE_DESC *desc) static HRESULT validate_texture_desc(D3D12_RESOURCE_DESC *desc) { if (!desc->MipLevels) - { - unsigned int size = max(desc->Width, desc->Height); - if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) - size = max(size, desc->DepthOrArraySize); - desc->MipLevels = vkd3d_log2i(size) + 1; - } + desc->MipLevels = max_miplevel_count(desc); return S_OK; } -- 2.16.1

2 1

[PATCH vkd3d 6/6] demos: Do not force sRGB formats for Vulkan swapchains.
by Józef Kucia 28 Mar '18

28 Mar '18

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes the following validation error: IMAGE(ERROR): object: 0x0 type: 0 location: 3302 msgCode: 180357110: vkCreateImageView() format VK_FORMAT_B8G8R8A8_UNORM differs from image 6 format VK_FORMAT_B8G8R8A8_SRGB. Formats MUST be IDENTICAL unless VK_IMAGE_CREATE_MUTABLE_FORMAT BIT was set on image creation. The spec valid usage text states 'If image was not created with the VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT flag, format must be identical to the format used to create image' Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- demos/demo_xcb.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 4de1149d91b0..9980b506ffb6 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -304,17 +304,6 @@ static inline void demo_set_idle_func(struct demo *demo, demo->idle_func = idle_func; } -static inline DXGI_FORMAT demo_get_srgb_format(DXGI_FORMAT format) -{ - switch (format) - { - case DXGI_FORMAT_B8G8R8A8_UNORM: - return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; - default: - return DXGI_FORMAT_UNKNOWN; - } -} - static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *command_queue, struct demo_window *window, const struct demo_swapchain_desc *desc) { @@ -338,7 +327,7 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c VkImage *vk_images; VkFormat format; - if ((format = vkd3d_get_vk_format(demo_get_srgb_format(desc->format))) == VK_FORMAT_UNDEFINED) + if ((format = vkd3d_get_vk_format(desc->format)) == VK_FORMAT_UNDEFINED) return NULL; if (FAILED(ID3D12CommandQueue_GetDevice(command_queue, &IID_ID3D12Device, (void **)&d3d12_device))) -- 2.16.1

2 1

[PATCH vkd3d 5/6] libs/vkd3d: Handle VK_ERROR_EXTENSION_NOT_PRESENT in hresult_from_vk_result().
by Józef Kucia 28 Mar '18

28 Mar '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index eef194ec8028..a62a74677981 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -347,6 +347,7 @@ HRESULT hresult_from_vk_result(VkResult vr) default: FIXME("Unhandled VkResult %d.\n", vr); case VK_ERROR_DEVICE_LOST: + case VK_ERROR_EXTENSION_NOT_PRESENT: return E_FAIL; } } -- 2.16.1

2 1

[PATCH vkd3d 1/6] libs/vkd3d: Fix error message in vkd3d_check_extensions().
by Józef Kucia 28 Mar '18

28 Mar '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 54b3d0e43077..3c06cd0bcda6 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -111,7 +111,7 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio { if (!has_extension(extensions, count, user_extensions[i])) ERR("Required user %s extension %s is not supported.\n", - extension_type, debugstr_a(required_extensions[i])); + extension_type, debugstr_a(user_extensions[i])); ++extension_count; } -- 2.16.1

2 1

[PATCH vkd3d 3/6] libs/vkd3d: Fix copying descriptors with NULL source range sizes.
by Józef Kucia 28 Mar '18

28 Mar '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Unreal Engine calls CopyDescriptors() with NULL source range sizes. --- libs/vkd3d/device.c | 4 +++- tests/d3d12.c | 6 +----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3c06cd0bcda6..e826478fafbb 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1673,6 +1673,7 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, struct d3d12_device *device = impl_from_ID3D12Device(iface); unsigned int dst_range_idx, dst_idx, src_range_idx, src_idx; const struct d3d12_desc *src; + unsigned int src_range_size; struct d3d12_desc *dst; TRACE("iface %p, dst_descriptor_range_count %u, dst_descriptor_range_offsets %p, " @@ -1695,7 +1696,8 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, for (src_range_idx = 0; src_range_idx < src_descriptor_range_count; ++src_range_idx) { src = d3d12_desc_from_cpu_handle(src_descriptor_range_offsets[src_range_idx]); - for (src_idx = 0; src_idx < src_descriptor_range_sizes[src_range_idx]; ++src_idx) + src_range_size = src_descriptor_range_sizes ? src_descriptor_range_sizes[src_range_idx] : 1; + for (src_idx = 0; src_idx < src_range_size; ++src_idx) { if (dst_idx >= dst_descriptor_range_sizes[dst_range_idx]) { diff --git a/tests/d3d12.c b/tests/d3d12.c index c140a2663973..587f8b72d47a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -11413,16 +11413,12 @@ static void test_copy_descriptors(void) dst_handles[0] = get_cpu_sampler_handle(&context, sampler_heap, 0); dst_range_sizes[0] = 4; src_handles[0] = get_cpu_sampler_handle(&context, cpu_sampler_heap2, 0); - src_range_sizes[0] = 1; src_handles[1] = get_cpu_sampler_handle(&context, cpu_sampler_heap2, 0); - src_range_sizes[1] = 1; src_handles[2] = get_cpu_sampler_handle(&context, cpu_sampler_heap2, 0); - src_range_sizes[2] = 1; src_handles[3] = get_cpu_sampler_handle(&context, cpu_sampler_heap2, 1); - src_range_sizes[3] = 1; /* s0-s3 */ ID3D12Device_CopyDescriptors(device, 1, dst_handles, dst_range_sizes, - 4, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER); + 4, src_handles, NULL, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER); dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 9); dst_range_sizes[0] = 4; -- 2.16.1

2 1

[PATCH 1/6] ole32/tests: Simplify implicit MTA tests.
by Zebediah Figura 28 Mar '18

28 Mar '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/tests/compobj.c | 229 ++++++++++----------------------------------- 1 file changed, 47 insertions(+), 182 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index f1e0134..da4223b 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -602,25 +602,6 @@ static void test_StringFromGUID2(void) ok(len == 0, "len: %d (expected 0)\n", len); } -struct info -{ - HANDLE wait, stop; -}; - -static DWORD CALLBACK ole_initialize_thread(LPVOID pv) -{ - HRESULT hr; - struct info *info = pv; - - hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); - - SetEvent(info->wait); - WaitForSingleObject(info->stop, 10000); - - CoUninitialize(); - return hr; -} - #define test_apt_type(t, q, t_t, t_q) _test_apt_type(t, q, t_t, t_q, __LINE__) static void _test_apt_type(APTTYPE expected_type, APTTYPEQUALIFIER expected_qualifier, BOOL todo_type, BOOL todo_qualifier, int line) @@ -644,10 +625,7 @@ todo_wine_if(todo_qualifier) static void test_CoCreateInstance(void) { HRESULT hr; - HANDLE thread; - DWORD tid, exitcode; IUnknown *pUnk; - struct info info; REFCLSID rclsid = &CLSID_InternetZoneManager; pUnk = (IUnknown *)0xdeadbeef; @@ -682,51 +660,15 @@ static void test_CoCreateInstance(void) hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); - /* show that COM doesn't have to be initialized for multi-threaded apartments if another - thread has already done so */ - - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - - info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - info.stop = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - - ok( !WaitForSingleObject(info.wait, 10000 ), "wait timed out\n" ); - - test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); - - pUnk = (IUnknown *)0xdeadbeef; - hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); - ok(hr == S_OK, "CoCreateInstance should have returned S_OK instead of 0x%08x\n", hr); - if (pUnk) IUnknown_Release(pUnk); - - SetEvent(info.stop); - ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); - - GetExitCodeThread(thread, &exitcode); - hr = exitcode; - ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); - - CloseHandle(thread); - CloseHandle(info.wait); - CloseHandle(info.stop); - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); } static void test_CoGetClassObject(void) { HRESULT hr; - HANDLE thread, handle; - DWORD tid, exitcode; + HANDLE handle; ULONG_PTR cookie; IUnknown *pUnk; - struct info info; REFCLSID rclsid = &CLSID_InternetZoneManager; HKEY hkey; LONG res; @@ -740,45 +682,6 @@ static void test_CoGetClassObject(void) broken(hr == CO_E_NOTINITIALIZED), /* win9x */ "CoGetClassObject should have returned E_INVALIDARG instead of 0x%08x\n", hr); - /* show that COM doesn't have to be initialized for multi-threaded apartments if another - thread has already done so */ - - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - - info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - info.stop = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - - ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); - - test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); - - pUnk = (IUnknown *)0xdeadbeef; - hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); - if(hr == REGDB_E_CLASSNOTREG) - skip("IE not installed so can't test CoGetClassObject\n"); - else - { - ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr); - if (pUnk) IUnknown_Release(pUnk); - } - - SetEvent(info.stop); - ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); - - GetExitCodeThread(thread, &exitcode); - hr = exitcode; - ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); - - CloseHandle(thread); - CloseHandle(info.wait); - CloseHandle(info.stop); - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); if (!pRegOverridePredefKey) @@ -1880,9 +1783,6 @@ static void test_CoGetObjectContext(void) IObjContext *pObjContext; APTTYPE apttype; THDTYPE thdtype; - struct info info; - HANDLE thread; - DWORD tid, exitcode; GUID id, id2; if (!pCoGetObjectContext) @@ -1895,27 +1795,12 @@ static void test_CoGetObjectContext(void) ok(hr == CO_E_NOTINITIALIZED, "CoGetObjectContext should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); ok(pComThreadingInfo == NULL, "pComThreadingInfo should have been set to NULL\n"); - /* show that COM doesn't have to be initialized for multi-threaded apartments if another - thread has already done so */ - - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - - info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - info.stop = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - - ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - pComThreadingInfo = NULL; hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); - ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + ok_ole_success(hr, "CoGetObjectContext"); threadinginfo2 = NULL; hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&threadinginfo2); @@ -1933,28 +1818,6 @@ static void test_CoGetObjectContext(void) hr = CoGetCurrentLogicalThreadId(&id2); ok(IsEqualGUID(&id, &id2), "got %s, expected %s\n", wine_dbgstr_guid(&id), wine_dbgstr_guid(&id2)); - IComThreadingInfo_Release(pComThreadingInfo); - - SetEvent(info.stop); - ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); - - GetExitCodeThread(thread, &exitcode); - hr = exitcode; - ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); - - CloseHandle(thread); - CloseHandle(info.wait); - CloseHandle(info.stop); - - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - - test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - - hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); - ok_ole_success(hr, "CoGetObjectContext"); - hr = IComThreadingInfo_GetCurrentApartmentType(pComThreadingInfo, &apttype); ok_ole_success(hr, "IComThreadingInfo_GetCurrentApartmentType"); ok(apttype == APTTYPE_MAINSTA, "apartment type should be APTTYPE_MAINSTA instead of %d\n", apttype); @@ -2118,9 +1981,6 @@ static void test_CoGetContextToken(void) ULONG refs; ULONG_PTR token, token2; IObjContext *ctx; - struct info info; - HANDLE thread; - DWORD tid, exitcode; if (!pCoGetContextToken) { @@ -2133,44 +1993,6 @@ static void test_CoGetContextToken(void) ok(hr == CO_E_NOTINITIALIZED, "Expected CO_E_NOTINITIALIZED, got 0x%08x\n", hr); ok(token == 0xdeadbeef, "Expected 0, got 0x%lx\n", token); - /* show that COM doesn't have to be initialized for multi-threaded apartments if another - thread has already done so */ - - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - - info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - info.stop = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - - ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); - - test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); - - token = 0; - hr = pCoGetContextToken(&token); - ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); - - token2 = 0; - hr = pCoGetContextToken(&token2); - ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); - ok(token == token2, "got different token\n"); - - SetEvent(info.stop); - ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); - - GetExitCodeThread(thread, &exitcode); - hr = exitcode; - ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); - - CloseHandle(thread); - CloseHandle(info.wait); - CloseHandle(info.stop); - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); CoInitialize(NULL); @@ -3874,6 +3696,48 @@ static void init_funcs(void) pReleaseActCtx = (void*)GetProcAddress(hkernel32, "ReleaseActCtx"); } +static DWORD CALLBACK implicit_mta_proc(void *param) +{ + IComThreadingInfo *threading_info; + ULONG_PTR token; + IUnknown *unk; + CLSID clsid; + HRESULT hr; + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); + + hr = CoCreateInstance(&CLSID_InternetZoneManager, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok_ole_success(hr, "CoCreateInstance"); + IUnknown_Release(unk); + + hr = CoGetClassObject(&CLSID_InternetZoneManager, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&unk); + ok_ole_success(hr, "CoGetClassObject"); + IUnknown_Release(unk); + + hr = CoGetObjectContext(&IID_IComThreadingInfo, (void **)&threading_info); + ok_ole_success(hr, "CoGetObjectContext"); + IComThreadingInfo_Release(threading_info); + + hr = CoGetContextToken(&token); + ok_ole_success(hr, "CoGetContextToken"); + + return 0; +} + +/* Some COM functions (perhaps even all of them?) can make use of an "implicit" + * multi-threaded apartment created by another thread in the same process. */ +static void test_implicit_mta(void) +{ + HANDLE thread; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + thread = CreateThread(NULL, 0, implicit_mta_proc, NULL, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + + CoUninitialize(); +} + START_TEST(compobj) { init_funcs(); @@ -3923,4 +3787,5 @@ START_TEST(compobj) test_IInitializeSpy(); test_CoGetInstanceFromFile(); test_GlobalOptions(); + test_implicit_mta(); } -- 2.7.4

3 11

[PATCH v3 0/3] Implement Unicode Normalization
by Sergio Gómez Del Real 28 Mar '18

28 Mar '18

This work is based on last year's GSoC project from Artur Świgoń. The following things were added to that work: - Implement a generalized Unicode lookup function. - Replace decomposition function with one that does decomposition recursively. - Integrate new tables and code with existing one. - Implement Canonical Ordering Algorithm necessary for normalization. - Implement Full Composition Exclusion exceptions. - Implement conformant NormalizeString API function. - Tests: add a representative sample of tests from official Unicode test archives. v3: - Don't modify decompose.c/compose.c; only the script that will generate them. v2: - Remove unused variables. - Add reference to extern functions in NormalizeString(). - Document NormalizeString() API function. - Code refactoring. Sergio Gómez Del Real (3): tools/make_unicode: Implement full Unicode character decomposition. tools/make_unicode: Implement canonical composition for use in normalization. kernel32: Implement NormalizeString API function. dlls/kernel32/locale.c | 66 ++- dlls/kernel32/tests/locale.c | 84 ++++ dlls/kernel32/tests/normalization_tests.h | 190 ++++++++ libs/port/mbtowc.c | 10 +- tools/make_unicode | 723 +++++++++++++++++++++++++++--- 5 files changed, 1005 insertions(+), 68 deletions(-) create mode 100644 dlls/kernel32/tests/normalization_tests.h -- 2.14.1

2 6

[PATCH v2 0/4] vulkan-1 implementation
by Roderick Colenbrander 28 Mar '18

28 Mar '18

Hi all, This is revised version of my previous vulkan-1 implementation. It now relies on spec file forwards from vulkan-1 to winevulkan, which keeps the implementation even simpler. I was tempted to even leave out vkEnumerateInstanceExtensionProperties, but ultimately kept it for the layer_name check. It is a check, which winevulkan performs as well, but technically doesn't belong at the ICD layer as the loader should sanitize such values, which native does now, so maybe we could take it out of the ICD. Thanks, Roderick Roderick Colenbrander (4): winevulkan: Export symbols for Core Vulkan functions. vulkan-1: Add initial implementation. vulkan-1: Implement vkEnumerateInstanceExtensionProperties. vulkan-1: Implement vkGetInstanceProcAddr. configure.ac | 1 + dlls/vulkan-1/Makefile.in | 7 ++ dlls/vulkan-1/version.rc | 27 ++++ dlls/vulkan-1/vulkan-1.spec | 159 ++++++++++++++++++++++++ dlls/vulkan-1/vulkan.c | 85 +++++++++++++ dlls/winevulkan/Makefile.in | 1 + dlls/winevulkan/make_vulkan | 139 +++++++++++++++++++-- dlls/winevulkan/vulkan.c | 6 +- dlls/winevulkan/vulkan_thunks.c | 268 ++++++++++++++++++++-------------------- dlls/winevulkan/vulkan_thunks.h | 22 ++-- dlls/winevulkan/winevulkan.spec | 158 +++++++++++++++++++++++ 11 files changed, 715 insertions(+), 158 deletions(-) create mode 100644 dlls/vulkan-1/Makefile.in create mode 100644 dlls/vulkan-1/version.rc create mode 100644 dlls/vulkan-1/vulkan-1.spec create mode 100644 dlls/vulkan-1/vulkan.c -- 2.14.3

2 8

[PATCH] user32/tests: Add BM_SETIMAGE style check tests.
by Zhiyi Zhang 28 Mar '18

28 Mar '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/msg.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+)

2 1

[PATCH 4/4] [v2] wsdapi: Add SequenceId to SOAP header, add test.
by Owen Rudge 28 Mar '18

28 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 29 +++++++++++++++++++++++++++-- dlls/wsdapi/tests/discovery.c | 15 +++++++++++---- 2 files changed, 38 insertions(+), 6 deletions(-)

2 1

[PATCH 3/4] [v2] wsdapi: Add InstanceId and MessageNumber to SOAP header.
by Owen Rudge 28 Mar '18

28 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 127 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 126 insertions(+), 3 deletions(-)

2 1

[PATCH 2/4] [v2] wsdapi/tests: Add tests for EndpointReference, AppSequence, MetadataVersion in Hello message.
by Owen Rudge 28 Mar '18

28 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)

2 1

[PATCH 1/4] [v2] wsdapi: Add support for writing XML attributes.
by Owen Rudge 28 Mar '18

28 Mar '18

v2: Return HRESULT instead of BOOL where practical Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 11 deletions(-)

2 1

Suggestion: VK_APPS key (i.e. popup menu key)
by Gero Zahn 28 Mar '18

28 Mar '18

Hi, I submitted a pull-request over at > https://github.com/wine-mirror/wine/pull/9 and @AndreRH was so kind as to inform me that it wouldn't be picked up over there. ;-) So, here goes: I'm using wine on macOS with a regular PC keyboard. When using Windows applications, I miss support for the right popup menu key -- that's not the right Windows / Command key, but actually VK_APPS. I've been patching winemac.drv.so via hex editor manually for quite a while to enable support for this key. Now I thought that I might contribute this otherwise harmless improvement back to the source code. ... I have to admit that I didn't compile the patch myself. :-( But I am convinced that my modification to the source should result in the desired functionality. Here's the (minuscule) patch to keyboard.c -- if the format shouldn't suffice, you can find everything else in above mentioned wine-mirror link at > https://github.com/wine-mirror/wine/pull/9/files ---------->8 snip $ diff keyboard_orig.c keyboard_patched.c 161a162 > kVK_APPS = 0x6E, 297c298 < { 0, 0, FALSE }, /* 0x6E unused */ --- > { VK_APPS, 0x6E, TRUE }, /* kVK_APPS */ 395a397 > { VK_APPS, "Apps" }, $

5 9

[PATCH] dwrite/tests: Use fabs for floating point numbers (clang)
by André Hentschel 28 Mar '18

28 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/dwrite/tests/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 347d750..b54748a 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -635,7 +635,7 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface, ok(emsize == metrics.designUnitsPerEm, "Unexpected font size %f\n", emsize); /* Expected height is in design units, allow some absolute difference from it. Seems to only happen on Vista */ - ok(abs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n", + ok(fabs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n", metrics.capHeight, underline->runHeight, wine_dbgstr_w(ctxt->familyW)); IDWriteFontFace_Release(fontface); -- 2.7.4

2 1

[PATCH 2/2] msxml3/tests: Added invalid host XHR tests.
by Jacek Caban 28 Mar '18

28 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msxml3/tests/httpreq.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)

2 1

[PATCH 1/2] msxml3/tests: Added IServerXMLHTTPRequest tests.
by Jacek Caban 28 Mar '18

28 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msxml3/tests/httpreq.c | 59 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-)

2 1

[PATCH 0/5] vulkan-1 implementation
by Roderick Colenbrander 28 Mar '18

28 Mar '18

Hi all, This patch series adds a minimal vulkan-1 implementation, which is sufficient to run cube, vulkaninfo and Wolfenstein. Compared to the official Vulkan loader I'm taking some shortcuts by only handling a single ICD (winevulkan), which allows us to skip aggregating of results from multiple ICDs. Layers are not supported either. Thanks to these simplifications, creating a vulkan loader was simple. We could just store a global function pointer table and not deal with dispatch tables. The official Vulkan loader still works and will continue to work. At some point we may provide an optional package to add it. Thanks, Roderick Roderick Colenbrander (5): winevulkan/winex11: Add VK_KHR_display stub implementation. vulkan-1: Add stub implementation. vulkan-1: Implement vkEnumerateInstanceExtensionProperties. vulkan-1: Implement thunks for Vulkan Core functions. vulkan-1: Implement vkGetInstanceProcAddr. configure.ac | 1 + dlls/vulkan-1/Makefile.in | 6 + dlls/vulkan-1/version.rc | 27 ++ dlls/vulkan-1/vulkan-1.spec | 158 +++++++ dlls/vulkan-1/vulkan.c | 143 ++++++ dlls/winevulkan/make_vulkan | 166 ++++++- dlls/winevulkan/vulkan.c | 117 +++++ dlls/winevulkan/vulkan_thunks.c | 59 +++ dlls/winevulkan/vulkan_thunks.h | 70 +++ dlls/winex11.drv/vulkan.c | 77 +++- include/wine/vulkan.h | 952 ++++++++++++++++++++++------------------ include/wine/vulkan_driver.h | 9 +- 12 files changed, 1340 insertions(+), 445 deletions(-) create mode 100644 dlls/vulkan-1/Makefile.in create mode 100644 dlls/vulkan-1/version.rc create mode 100644 dlls/vulkan-1/vulkan-1.spec create mode 100644 dlls/vulkan-1/vulkan.c -- 2.14.3

2 13

[PATCH] testbot/Janitor: Simplify the deletion of users and VMs.
by Francois Gouget 27 Mar '18

27 Mar '18

Handle the deleted users and deleted VMs separately. Also iterate over the tasks directly instead of going through the Jobs and Steps when checking the deleted VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 77 ++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 56e024a67..7c4168ca8 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -49,6 +49,7 @@ use WineTestBot::Patches; use WineTestBot::PendingPatchSets; use WineTestBot::CGI::Sessions; use WineTestBot::RecordGroups; +use WineTestBot::Tasks; use WineTestBot::Users; use WineTestBot::VMs; @@ -195,70 +196,66 @@ if ($JobArchiveDays != 0) } } -# Purge the deleted users and VMs if they are not referenced anymore +# Purge the deleted VMs if they are not referenced anymore my $VMs = CreateVMs(); $VMs->AddFilter("Role", ["deleted"]); my %DeletedVMs; map { $DeletedVMs{$_} = 1 } @{$VMs->GetKeys()}; -my $Users = CreateUsers(); -$Users->AddFilter("Status", ["deleted"]); -my %DeletedUsers; -map { $DeletedUsers{$_} = 1 } @{$Users->GetKeys()}; - -if (%DeletedUsers or %DeletedVMs) +if (%DeletedVMs) { - foreach my $Job (@{CreateJobs()->GetItems()}) + foreach my $Task (@{CreateTasks($VMs)->GetItems()}) { - if (exists $DeletedUsers{$Job->User->Name}) + if (exists $DeletedVMs{$Task->VM->Name}) { - Trace "Keeping the ", $Job->User->Name, " account for job ", $Job->Id, "\n"; - delete $DeletedUsers{$Job->User->Name}; + Trace "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; + delete $DeletedVMs{$Task->VM->Name}; + last if (!%DeletedVMs); } + } + foreach my $VMKey (keys %DeletedVMs) + { + Trace "Deleting the $VMKey VM\n"; + next if ($DryRun); - if (%DeletedVMs) + my $VM = $VMs->GetItem($VMKey); + my $ErrMessage = $VMs->DeleteItem($VM); + if (defined $ErrMessage) { - foreach my $Step (@{$Job->Steps->GetItems()}) - { - foreach my $Task (@{$Step->Tasks->GetItems()}) - { - if (exists $DeletedVMs{$Task->VM->Name}) - { - Trace "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; - delete $DeletedVMs{$Task->VM->Name}; - } - } - } + Error "Unable to delete the $VMKey VM: $ErrMessage\n"; } } +} - if (%DeletedUsers) +# Purge the deleted users if they are not referenced anymore +my $Users = CreateUsers(); +$Users->AddFilter("Status", ["deleted"]); +my %DeletedUsers; +map { $DeletedUsers{$_} = 1 } @{$Users->GetKeys()}; + +if (%DeletedUsers) +{ + foreach my $Job (@{CreateJobs($Users)->GetItems()}) { - foreach my $UserName (keys %DeletedUsers) + if (exists $DeletedUsers{$Job->User->Name}) { - my $User = $Users->GetItem($UserName); - Trace "Deleting the $UserName account\n"; - next if ($DryRun); - - DeleteSessions($User); - my $ErrMessage = $Users->DeleteItem($User); - if (defined $ErrMessage) - { - Error "Unable to delete the $UserName account: $ErrMessage\n"; - } + Trace "Keeping the ", $Job->User->Name, " account for job ", $Job->Id, "\n"; + delete $DeletedUsers{$Job->User->Name}; + last if (!%DeletedUsers); } } - foreach my $VMKey (keys %DeletedVMs) + foreach my $UserKey (keys %DeletedUsers) { - my $VM = $VMs->GetItem($VMKey); - Trace "Deleting the $VMKey VM\n"; + Trace "Deleting the $UserKey account\n"; next if ($DryRun); - my $ErrMessage = $VMs->DeleteItem($VM); + my $User = $Users->GetItem($UserKey); + DeleteSessions($User); + my $ErrMessage = $Users->DeleteItem($User); if (defined $ErrMessage) { - Error "Unable to delete the $VMKey VM: $ErrMessage\n"; + Error "Unable to delete the $UserKey account: $ErrMessage\n"; } } } -- 2.16.2

1 0

[PATCH] testbot: Allow running a second, higher privilege TestAgentd.
by Francois Gouget 27 Mar '18

27 Mar '18

By convention it shall run on $AgentPort+1. This makes it possible to run the tests in an unprivileged account, while still having a TestAgentd server with high enough privileges to adjust the VM clock. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 10 ++++++++-- testbot/lib/WineTestBot/VMs.pm | 8 +++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 88c3b5884..4f69a1e4e 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -372,8 +372,14 @@ my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Setting the time\n"); if (!$TA->SetTime()) { - # Not a fatal error - LogTaskError("Unable to set the VM system time: ". $TA->GetLastError() .". Maybe the TestAgentd process is missing the required privileges.\n"); + # Not a fatal error. Try the next port in case the VM runs a privileged + # TestAgentd daemon there. + my $PrivilegedTA = $VM->GetAgent(1); + if (!$PrivilegedTA->SetTime()) + { + LogTaskError("Unable to set the VM system time: ". $PrivilegedTA->GetLastError() .". Maybe the TestAgentd process is missing the required privileges.\n"); + $PrivilegedTA->Disconnect(); + } } my $FileType = $Step->FileType; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index e93208201..e74640bf2 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -208,9 +208,9 @@ sub GetDomain($) return LibvirtDomain->new($self); } -sub GetAgent($) +sub GetAgent($;$) { - my ($self) = @_; + my ($self, $Privileged) = @_; # Use either the tunnel specified in the configuration file # or autodetect the settings based on the VM's VirtURI setting. @@ -226,7 +226,9 @@ sub GetAgent($) $TunnelInfo->{sshport} = $ParsedURI->port; $TunnelInfo->{username} = $ParsedURI->userinfo; } - return TestAgent->new($self->Hostname, $AgentPort, $TunnelInfo); + my $Port = $AgentPort; + $Port++ if ($Privileged); + return TestAgent->new($self->Hostname, $Port, $TunnelInfo); } sub Status($;$) -- 2.16.2

1 0

[PATCH] usp10: Don't increment variable both in the loop header and body (clang)
by André Hentschel 27 Mar '18

27 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/usp10/shape.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 4031386..1927be0 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1721,7 +1721,6 @@ static void ComposeConsonants(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const Co break; } } - cWalk++; } } -- 2.7.4

2 1

[PATCH] winex11: Build helper functions only when needed
by André Hentschel 27 Mar '18

27 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/winex11.drv/bitblt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 6a858c1..165633c 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1588,6 +1588,7 @@ static inline UINT get_color_component( UINT color, UINT mask ) return (color * mask / 255) << shift; } +#ifdef HAVE_LIBXSHAPE static inline void flush_rgn_data( HRGN rgn, RGNDATA *data ) { HRGN tmp = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); @@ -1609,6 +1610,7 @@ static inline void add_row( HRGN rgn, RGNDATA *data, int x, int y, int len ) if (data->rdh.nCount * sizeof(RECT) > data->rdh.nRgnSize - sizeof(RECT)) flush_rgn_data( rgn, data ); } +#endif /*********************************************************************** * update_surface_region -- 2.7.4

1 0

[PATCH 2/2] msxml3/tests: Added invalid host XHR tests.
by Jacek Caban 27 Mar '18

27 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msxml3/tests/httpreq.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)

2 2

[PATCH 1/2] msxml3/tests: Added IServerXMLHTTPRequest tests.
by Jacek Caban 27 Mar '18

27 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msxml3/tests/httpreq.c | 59 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-)

2 2

Questiion of GSOC
by Hua Meng 27 Mar '18

27 Mar '18

Hi, Alex~ After getting more familiar with Wine, I'm also interested in project: Implement Unicode string normalization. But there is a question. I found the project has a conflict with Sergio' work. So I wonder whether the project is suitable for gsoc if Sergio complete his work. Thanks for your reply~ Best regards Hua Meng

3 2

[PATCH 3/3] ddraw: Take the flip interval into account in ddraw_surface7_Flip().
by Henri Verbeet 27 Mar '18

27 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/palette.c | 2 +- dlls/ddraw/surface.c | 59 +++++++++++++++++++++++++++++++++------------- 3 files changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 3cf9b768099..a9632de502f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -219,7 +219,7 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, - const RECT *rect, BOOL read) DECLSPEC_HIDDEN; + const RECT *rect, BOOL read, unsigned int swap_interval) DECLSPEC_HIDDEN; static inline struct ddraw_surface *impl_from_IDirect3DTexture(IDirect3DTexture *iface) { diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 5148832cab6..87aec96443a 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -176,7 +176,7 @@ static HRESULT WINAPI ddraw_palette_SetEntries(IDirectDrawPalette *iface, hr = wined3d_palette_set_entries(palette->wined3d_palette, flags, start, count, entries); if (SUCCEEDED(hr) && palette->flags & DDPCAPS_PRIMARYSURFACE) - ddraw_surface_update_frontbuffer(palette->ddraw->primary, NULL, FALSE); + ddraw_surface_update_frontbuffer(palette->ddraw->primary, NULL, FALSE, 0); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 30276b4a0de..2d200493c95 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -40,8 +40,10 @@ static inline struct ddraw_surface *impl_from_IDirectDrawGammaControl(IDirectDra * applications from drawing to the screen while we've locked the frontbuffer. * We'd like to do this in wined3d instead, but for that to work wined3d needs * to support windowless rendering first. */ -HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read) +HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, + const RECT *rect, BOOL read, unsigned int swap_interval) { + struct wined3d_texture *dst_texture; HDC surface_dc, screen_dc; int x, y, w, h; HRESULT hr; @@ -69,8 +71,15 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RE if (read) return DD_OK; - return wined3d_texture_blt(surface->ddraw->wined3d_frontbuffer, 0, rect, - surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT); + if (swap_interval) + dst_texture = wined3d_swapchain_get_back_buffer(surface->ddraw->wined3d_swapchain, 0); + else + dst_texture = surface->ddraw->wined3d_frontbuffer; + + if (SUCCEEDED(hr = wined3d_texture_blt(dst_texture, 0, rect, surface->wined3d_texture, + surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT)) && swap_interval) + hr = wined3d_swapchain_present(surface->ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); + return hr; } if (FAILED(hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, &surface_dc))) @@ -473,7 +482,7 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; wined3d_swapchain_set_palette(surface->ddraw->wined3d_swapchain, palette_impl ? palette_impl->wined3d_palette : NULL); - ddraw_surface_update_frontbuffer(surface, NULL, FALSE); + ddraw_surface_update_frontbuffer(surface, NULL, FALSE, 0); } if (palette_impl) IDirectDrawPalette_AddRef(&palette_impl->IDirectDrawPalette_iface); @@ -989,7 +998,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface, } if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE); + hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE, 0); if (SUCCEEDED(hr)) hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, &map_desc, rect ? &box : NULL, @@ -1178,7 +1187,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface wined3d_mutex_lock(); hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx); if (SUCCEEDED(hr) && surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, &surface->ddraw->primary_lock, FALSE); + hr = ddraw_surface_update_frontbuffer(surface, &surface->ddraw->primary_lock, FALSE, 0); wined3d_mutex_unlock(); return hr; @@ -1223,6 +1232,24 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Unlock(IDirectDrawSurface return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); } +static unsigned int ddraw_swap_interval_from_flags(DWORD flags) +{ + if (flags & DDFLIP_NOVSYNC) + return 0; + + switch (flags & (DDFLIP_INTERVAL2 | DDFLIP_INTERVAL3 | DDFLIP_INTERVAL4)) + { + case DDFLIP_INTERVAL2: + return 2; + case DDFLIP_INTERVAL3: + return 3; + case DDFLIP_INTERVAL4: + return 4; + default: + return 1; + } +} + static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDrawSurface7 *src, DWORD flags) { @@ -1336,7 +1363,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); src_impl->wined3d_texture = texture; - if (flags) + if (flags & ~(DDFLIP_NOVSYNC | DDFLIP_INTERVAL2 | DDFLIP_INTERVAL3 | DDFLIP_INTERVAL4)) { static UINT once; if (!once++) @@ -1346,7 +1373,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 } if (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(dst_impl, NULL, FALSE); + hr = ddraw_surface_update_frontbuffer(dst_impl, NULL, FALSE, ddraw_swap_interval_from_flags(flags)); else hr = DD_OK; @@ -1487,11 +1514,11 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (!dst_surface->clipper) { if (src_surface && src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect, TRUE); + hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect, TRUE, 0); if (SUCCEEDED(hr)) hr = ddraw_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fill_colour, fx, filter); if (SUCCEEDED(hr) && (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) - hr = ddraw_surface_update_frontbuffer(dst_surface, &dst_rect, FALSE); + hr = ddraw_surface_update_frontbuffer(dst_surface, &dst_rect, FALSE, 0); return hr; } @@ -1534,7 +1561,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - if (FAILED(hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect_clipped, TRUE))) + if (FAILED(hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect_clipped, TRUE, 0))) break; } } @@ -1545,7 +1572,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - if (FAILED(hr = ddraw_surface_update_frontbuffer(dst_surface, &clip_rect[i], FALSE))) + if (FAILED(hr = ddraw_surface_update_frontbuffer(dst_surface, &clip_rect[i], FALSE, 0))) break; } } @@ -2218,7 +2245,7 @@ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *dc) if (surface->dc) hr = DDERR_DCALREADYCREATED; else if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE); + hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE, 0); if (SUCCEEDED(hr)) hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, dc); @@ -2320,7 +2347,7 @@ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC h { surface->dc = NULL; if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE); + hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE, 0); } wined3d_mutex_unlock(); @@ -4288,12 +4315,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurfac } if (src_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(src_impl, src_rect, TRUE); + hr = ddraw_surface_update_frontbuffer(src_impl, src_rect, TRUE, 0); if (SUCCEEDED(hr)) hr = wined3d_texture_blt(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &dst_rect, src_impl->wined3d_texture, src_impl->sub_resource_idx, src_rect, flags, NULL, WINED3D_TEXF_POINT); if (SUCCEEDED(hr) && (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) - hr = ddraw_surface_update_frontbuffer(dst_impl, &dst_rect, FALSE); + hr = ddraw_surface_update_frontbuffer(dst_impl, &dst_rect, FALSE, 0); wined3d_mutex_unlock(); switch(hr) -- 2.11.0

1 0

[PATCH 2/3] ddraw: Create swapchains with back-buffers.
by Henri Verbeet 27 Mar '18

27 Mar '18

As preparation for the next patch. Note that we drop WINED3DUSAGE_RENDERTARGET here. We never render directly to the back-buffer in ddraw, since ddraw back-buffers don't directly correspond to wined3d back-buffers. Moreover, ddraw may create WINED3DFMT_P8_UINT swapchains, for which WINED3DUSAGE_RENDERTARGET wouldn't be valid. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 791e1498f5c..32f01722630 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -629,8 +629,9 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win swapchain_desc.backbuffer_width = mode.width; swapchain_desc.backbuffer_height = mode.height; swapchain_desc.backbuffer_format = mode.format_id; - swapchain_desc.backbuffer_usage = WINED3DUSAGE_RENDERTARGET; - swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_COPY; + swapchain_desc.backbuffer_usage = 0; + swapchain_desc.backbuffer_count = 1; + swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = window; swapchain_desc.windowed = windowed; swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; @@ -4853,25 +4854,26 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic struct wined3d_texture **texture) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); + const struct wined3d_parent_ops *parent_ops; HRESULT hr; TRACE("device_parent %p, container_parent %p, desc %p, texture flags %#x, texture %p.\n", device_parent, container_parent, desc, texture_flags, texture); - if (ddraw->wined3d_frontbuffer) - { - ERR("Frontbuffer already created.\n"); - return E_FAIL; - } + if (!ddraw->wined3d_frontbuffer) + parent_ops = &ddraw_frontbuffer_parent_ops; + else + parent_ops = &ddraw_null_wined3d_parent_ops; if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, desc, 1, 1, - texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, ddraw, &ddraw_frontbuffer_parent_ops, texture))) + texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, ddraw, parent_ops, texture))) { WARN("Failed to create texture, hr %#x.\n", hr); return hr; } - ddraw->wined3d_frontbuffer = *texture; + if (!ddraw->wined3d_frontbuffer) + ddraw->wined3d_frontbuffer = *texture; return hr; } -- 2.11.0

1 0

[PATCH 1/3] wined3d: Only create back-buffer views for swapchains with WINED3DUSAGE_RENDERTARGET set.
by Henri Verbeet 27 Mar '18

27 Mar '18

Since without it the view wouldn't be usable. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b66b3946c46..b17effefd5a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1077,7 +1077,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, goto err_out; } - if (swapchain_desc->backbuffer_count) + if (swapchain_desc->backbuffer_count && swapchain_desc->backbuffer_usage & WINED3DUSAGE_RENDERTARGET) { struct wined3d_resource *back_buffer = &swapchain->back_buffers[0]->resource; struct wined3d_view_desc view_desc; @@ -1113,7 +1113,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, TRACE("All defaults now set up.\n"); /* Clear the screen */ - if (swapchain->back_buffers && swapchain->back_buffers[0]) + if (device->back_buffer_view) clear_flags |= WINED3DCLEAR_TARGET; if (swapchain_desc->enable_auto_depth_stencil) clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; @@ -4893,7 +4893,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_rendertarget_view_decref(device->back_buffer_view); device->back_buffer_view = NULL; } - if (swapchain->desc.backbuffer_count) + if (swapchain->desc.backbuffer_count && swapchain->desc.backbuffer_usage & WINED3DUSAGE_RENDERTARGET) { struct wined3d_resource *back_buffer = &swapchain->back_buffers[0]->resource; -- 2.11.0

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel