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

[PATCH] comctl32/treeview: Fix item icon background when using TVS_FULLROWSELECT style
by Nikolay Sivov 15 Apr '18

15 Apr '18

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/treeview.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 49eec4a4dc..b0b8325e25 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2644,7 +2644,9 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) ImageList_DrawEx(infoPtr->himlNormal, imageIndex, hdc, item->imageOffset, centery - infoPtr->normalImageHeight / 2, - 0, 0, infoPtr->clrBk, item->state & TVIS_CUT ? GETBKCOLOR(infoPtr->clrBk) : CLR_DEFAULT, + 0, 0, + TREEVIEW_IsFullRowSelect(infoPtr) ? nmcdhdr.clrTextBk : infoPtr->clrBk, + item->state & TVIS_CUT ? GETBKCOLOR(infoPtr->clrBk) : CLR_DEFAULT, style); } } -- 2.17.0

1 0

Wine staging 3.6 release
by Alistair Leslie-Hughes 15 Apr '18

15 Apr '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.6 (930 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Fixes * winecfg updated to easily toggle csmt support. New Patches * Added SetProcessAffinityUpdateMode stub to stop a crash in Dead Rising 4 * Added IXAudio2 CommitChanges patch to return S_OK Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: Cuphead, Dead Rising 4. * Test your favorite applications. * Steal staging patches and get them accepted upstream. Special note. We have re-enabled a patch for MFStarup (wine issue #43607) again and what does this mean. It means we need people to test as many applications that may use the mplat dll as possible. When this patch was first introduced it crashed Steam on startup and been disable ever since. The crashing issues has long been resolved. Any issues found wont technically be a regression, however we want to try to identify and address any issues that appear before upstreaming this patch. So create a new bug and link 43607 as a dependency. As always, if you find a bug, please report it via https://bugs.winehq.com Best Regards Alistair.

1 0

[PATCH] tdh: Add version resource.
by Gijs Vermeulen 15 Apr '18

15 Apr '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Mentioned in https://bugs.winehq.org/show_bug.cgi?id=43509 dlls/tdh/Makefile.in | 2 ++ dlls/tdh/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100755 dlls/tdh/version.rc diff --git a/dlls/tdh/Makefile.in b/dlls/tdh/Makefile.in index 0a4693f43e..89795498e6 100644 --- a/dlls/tdh/Makefile.in +++ b/dlls/tdh/Makefile.in @@ -2,3 +2,5 @@ MODULE = tdh.dll C_SRCS = \ tdh_main.c + +RC_SRCS = version.rc diff --git a/dlls/tdh/version.rc b/dlls/tdh/version.rc new file mode 100755 index 0000000000..b18f50c0f6 --- /dev/null +++ b/dlls/tdh/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2018 Gijs Vermeulen + * + * 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 WINE_FILEDESCRIPTION_STR "Wine Event Trace Helper Library" +#define WINE_FILENAME_STR "tdh.dll" +#define WINE_FILEVERSION 10,0,16299,15 +#define WINE_FILEVERSION_STR "10.0.16299.15" +#define WINE_PRODUCTVERSION 10,0,16299,15 +#define WINE_PRODUCTVERSION_STR "10.0.16299.15" + +#include "wine/wine_common_ver.rc" -- 2.13.6

1 0

[PATCH 1/1] ntdsapi: add DsCrackNamesA/W stubs (try 2)
by Austin English 13 Apr '18

13 Apr '18

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/ntdsapi/ntdsapi.c | 23 ++++++++++++++++++ dlls/ntdsapi/ntdsapi.spec | 4 ++-- include/ntdsapi.h | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index ee0c8379c3..5fdefa5576 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -204,6 +204,9 @@ DWORD WINAPI DsServerRegisterSpnW(DS_SPN_WRITE_OP operation, LPCWSTR ServiceClas return ERROR_CALL_NOT_IMPLEMENTED; } +/*********************************************************************** + * DsClientMakeSpnForTargetServerW (NTDSAPI.@) + */ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD *buflen, LPWSTR buf) { DWORD len; @@ -229,3 +232,23 @@ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD return ERROR_SUCCESS; } + +/*********************************************************************** + * DsCrackNamesA (NTDSAPI.@) + */ +DWORD WINAPI DsCrackNamesA(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, + DWORD num, const CHAR **names, PDS_NAME_RESULT *result) +{ + FIXME("(%p %u %u %u %u %p %p stub\n", handle, flags, offered, desired, num, names, result); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DsCrackNamesW (NTDSAPI.@) + */ +DWORD WINAPI DsCrackNamesW(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, + DWORD num, const WCHAR **names, PDS_NAME_RESULT *result) +{ + FIXME("(%p %u %u %u %u %p %p stub\n", handle, flags, offered, desired, num, names, result); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/ntdsapi/ntdsapi.spec b/dlls/ntdsapi/ntdsapi.spec index 925cb71358..16842232cf 100644 --- a/dlls/ntdsapi/ntdsapi.spec +++ b/dlls/ntdsapi/ntdsapi.spec @@ -8,8 +8,8 @@ @ stub DsBindWithSpnW @ stub DsClientMakeSpnForTargetServerA @ stdcall DsClientMakeSpnForTargetServerW(wstr wstr ptr ptr) -@ stub DsCrackNamesA -@ stub DsCrackNamesW +@ stdcall DsCrackNamesA(ptr long long long long str ptr) +@ stdcall DsCrackNamesW(ptr long long long long wstr ptr) @ stub DsCrackSpn2A @ stub DsCrackSpn2W @ stub DsCrackSpn3W diff --git a/include/ntdsapi.h b/include/ntdsapi.h index 672ea635d2..512d5b3b76 100644 --- a/include/ntdsapi.h +++ b/include/ntdsapi.h @@ -33,6 +33,28 @@ DWORD WINAPI DsMakeSpnA(LPCSTR, LPCSTR, LPCSTR, USHORT, LPCSTR, DWORD*, LPSTR); DWORD WINAPI DsMakeSpnW(LPCWSTR, LPCWSTR, LPCWSTR, USHORT, LPCWSTR, DWORD*, LPWSTR); #define DsMakeSpn WINELIB_NAME_AW(DsMakeSpn) +typedef enum { + DS_NAME_NO_FLAGS = 0x0, + DS_NAME_FLAG_SYNTACTICAL_ONLY = 0x1, + DS_NAME_FLAG_EVAL_AT_DC = 0x2, + DS_NAME_FLAG_GCVERIFY = 0x4, + DS_NAME_FLAG_TRUST_REFERRAL = 0x8 +} DS_NAME_FLAGS; + +typedef enum { + DS_UNKNOWN_NAME = 0, + DS_FQDN_1779_NAME = 1, + DS_NT4_ACCOUNT_NAME = 2, + DS_DISPLAY_NAME = 3, + DS_UNIQUE_ID_NAME = 6, + DS_CANONICAL_NAME = 7, + DS_USER_PRINCIPAL_NAME = 8, + DS_CANONICAL_NAME_EX = 9, + DS_SERVICE_PRINCIPAL_NAME = 10, + DS_SID_OR_SID_HISTORY_NAME = 11, + DS_DNS_DOMAIN_NAME = 12 +} DS_NAME_FORMAT; + typedef enum { DS_SPN_DNS_HOST = 0, @@ -50,6 +72,43 @@ typedef enum DS_SPN_DELETE_SPN_OP = 2 } DS_SPN_WRITE_OP; +typedef struct { + DWORD status; + CHAR pDomain; + CHAR pName; +} DS_NAME_RESULT_ITEMA, *PDS_NAME_RESULT_ITEMA; + +typedef struct { + DWORD cItems; + PDS_NAME_RESULT_ITEMA rItems; +} DS_NAME_RESULTA, *PDS_NAME_RESULTA; + +typedef struct { + DWORD status; + WCHAR pDomain; + WCHAR pName; +} DS_NAME_RESULT_ITEMW, *PDS_NAME_RESULT_ITEMW; + +typedef struct { + DWORD cItems; + PDS_NAME_RESULT_ITEMW rItems; +} DS_NAME_RESULTW, *PDS_NAME_RESULTW; + +#ifdef UNICODE +#define DS_NAME_RESULT DS_NAME_RESULTW +#define PDS_NAME_RESULT PDS_NAME_RESULTW +#define DS_NAME_RESULT_ITEM DS_NAME_RESULT_ITEMW +#define PDS_NAME_RESULT_ITEM PDS_NAME_RESULT_ITEMW +#else +#define DS_NAME_RESULT DS_NAME_RESULTA +#define PDS_NAME_RESULT PDS_NAME_RESULTA +#define DS_NAME_RESULT_ITEM DS_NAME_RESULT_ITEMA +#define PDS_NAME_RESULT_ITEM PDS_NAME_RESULT_ITEMA +#endif + +DWORD WINAPI DsCrackNamesA(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, DWORD num, const CHAR **names, PDS_NAME_RESULT *result); +DWORD WINAPI DsCrackNamesW(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, DWORD num, const WCHAR **names, PDS_NAME_RESULT *result); +#define DsCrackNames WINELIB_NAME_AW(DsCrackNames) DWORD WINAPI DsServerRegisterSpnA(DS_SPN_WRITE_OP operation, LPCSTR ServiceClass, LPCSTR UserObjectDN); DWORD WINAPI DsServerRegisterSpnW(DS_SPN_WRITE_OP operation, LPCWSTR ServiceClass, LPCWSTR UserObjectDN); #define DsServerRegisterSpn WINELIB_NAME_AW(DsServerRegisterSpn) -- 2.16.1

1 0

[PATCH 1/1] iphlpapi: add GetIpForwardTable2 stub
by Austin English 13 Apr '18

13 Apr '18

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 11 +++++++++++ include/netioapi.h | 32 ++++++++++++++++++++++++++++++++ include/nldef.h | 9 +++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index bbd1ed8071..1686644de0 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -102,7 +102,7 @@ #@ stub GetIpErrorString #@ stub GetIpForwardEntry2 @ stdcall GetIpForwardTable( ptr ptr long ) -#@ stub GetIpForwardTable2 +@ stdcall GetIpForwardTable2( long ptr ) @ stub GetIpForwardTableFromStack #@ stub GetIpInterfaceEntry #@ stub GetIpInterfaceTable diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d81fb6a7ef..7911e9d8cf 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3264,3 +3264,14 @@ PCHAR WINAPI IPHLP_if_indextoname(NET_IFINDEX index, PCHAR name) return getInterfaceNameByIndex(index, name); } + +/****************************************************************** + * GetIpForwardTable2 (IPHLPAPI.@) + */ +DWORD WINAPI GetIpForwardTable2(ADDRESS_FAMILY family, PMIB_IPFORWARD_TABLE2 *table) +{ + static int once; + + if (!once++) FIXME("(%u %p): stub\n", family, table); + return ERROR_NOT_SUPPORTED; +} diff --git a/include/netioapi.h b/include/netioapi.h index 11cadf6e37..e770859dc6 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -21,6 +21,10 @@ #include <ntddndis.h> +#ifndef ANY_SIZE +#define ANY_SIZE 1 +#endif + typedef enum _MIB_IF_TABLE_LEVEL { MibIfTableNormal, @@ -158,6 +162,34 @@ typedef struct _MIB_UNICASTIPADDRESS_TABLE MIB_UNICASTIPADDRESS_ROW Table[1]; } MIB_UNICASTIPADDRESS_TABLE, *PMIB_UNICASTIPADDRESS_TABLE; +typedef struct _IP_ADDRESS_PREFIX { + SOCKADDR_INET Prefix; + UINT8 PrefixLength; +} IP_ADDRESS_PREFIX, *PIP_ADDRESS_PREFIX; + +typedef struct _MIB_IPFORWARD_ROW2 { + NET_LUID InterfaceLuid; + NET_IFINDEX InterfaceIndex; + IP_ADDRESS_PREFIX DestinationPrefix; + SOCKADDR_INET NextHop; + UCHAR SitePrefixLength; + ULONG ValidLifetime; + ULONG PreferredLifetime; + ULONG Metric; + NL_ROUTE_PROTOCOL Protocol; + BOOLEAN Loopback; + BOOLEAN AutoconfigureAddress; + BOOLEAN Publish; + BOOLEAN Immortal; + ULONG Age; + NL_ROUTE_ORIGIN Origin; +} MIB_IPFORWARD_ROW2, *PMIB_IPFORWARD_ROW2; + +typedef struct _MIB_IPFORWARD_TABLE2 { + ULONG NumEntries; + MIB_IPFORWARD_ROW2 Table[ANY_SIZE]; +} MIB_IPFORWARD_TABLE2, *PMIB_IPFORWARD_TABLE2; + typedef VOID (WINAPI *PIPINTERFACE_CHANGE_CALLBACK)(PVOID, PMIB_IPINTERFACE_ROW, MIB_NOTIFICATION_TYPE); typedef VOID (WINAPI *PUNICAST_IPADDRESS_CHANGE_CALLBACK)(PVOID, PMIB_UNICASTIPADDRESS_ROW, diff --git a/include/nldef.h b/include/nldef.h index 1f96773c8e..983b96c552 100644 --- a/include/nldef.h +++ b/include/nldef.h @@ -28,6 +28,15 @@ typedef enum IpPrefixOriginUnchanged = 16, } NL_PREFIX_ORIGIN; +typedef enum _NL_ROUTE_ORIGIN +{ + NlroManual, + NlroWellKnown, + NlroDHCP, + NlroRouterAdvertisement, + Nlro6to4, +} NL_ROUTE_ORIGIN, *PNL_ROUTE_ORIGIN; + typedef enum { IpSuffixOriginOther = 0, -- 2.16.1

1 0

[PATCH v2] rpcrt4/tests: Add some tests for allocation of output parameters.
by Zebediah Figura 13 Apr '18

13 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: remove test that fails on Windows 2003 dlls/rpcrt4/tests/server.c | 61 ++++++++++++++++++++++++++++++++++++++++++-- dlls/rpcrt4/tests/server.idl | 4 +++ 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 5278a1d..782f3d5 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -25,6 +25,7 @@ #include <secext.h> #include <rpcdce.h> #include <netfw.h> +#include "wine/heap.h" #include "wine/test.h" #include "server.h" #include "server_defines.h" @@ -72,16 +73,20 @@ static void InitFunctionPointers(void) if (!pNDRSContextMarshall2) old_windows_version = TRUE; } +static int locks; + void __RPC_FAR *__RPC_USER midl_user_allocate(SIZE_T n) { - return HeapAlloc(GetProcessHeap(), 0, n); + locks++; + return heap_alloc(n); } void __RPC_USER midl_user_free(void __RPC_FAR *p) { - HeapFree(GetProcessHeap(), 0, p); + locks--; + ok(HeapFree(GetProcessHeap(), 0, p), "HeapFree(%p) failed\n", p); } static char * @@ -853,6 +858,25 @@ void __cdecl s_ip_test(ipu_t *a) ok(hr == S_OK, "got %#x\n", hr); } +void __cdecl s_get_pint(int **a) +{ + static int b = 12345; + *a = &b; +} + +int *__cdecl s_ret_pint(void) +{ + int *ret = midl_user_allocate(sizeof(int)); + *ret = 12345; + return ret; +} + +void __cdecl s_get_str(str_t *a) +{ + *a = midl_user_allocate(5); + strcpy(*a, "wine"); +} + static void make_cmdline(char buffer[MAX_PATH], const char *test) { @@ -874,6 +898,8 @@ run_client(const char *test) winetest_wait_child_process( info.hProcess ); ok(CloseHandle(info.hProcess), "CloseHandle\n"); ok(CloseHandle(info.hThread), "CloseHandle\n"); + + ok(!locks, "got %d locks on server\n", locks); } static void @@ -1242,6 +1268,8 @@ pointer_tests(void) int *pa2; s123_t *s123; int val = 42; + int *pint; + str_t str; ok(test_list_length(list) == 3, "RPC test_list_length\n"); ok(square_puint(p1) == 121, "RPC square_puint\n"); @@ -1335,6 +1363,32 @@ pointer_tests(void) full_pointer_test(&val, &val); full_pointer_null_test(&val, NULL); + + /* A simple out pointer (base type or enum) should not be allocated on the + * server side, but still must be freed on the client side. */ + pint = NULL; + get_pint(&pint); + ok(!!pint, "RPC get_pint\n"); + ok(*pint == 12345, "got %d\n", *pint); + midl_user_free(pint); + + pint = &val; + get_pint(&pint); + ok(pint == &val, "got %p\n", pint); + ok(*pint == 12345, "got %d\n", *pint); + + /* Otherwise the pointer must be allocated on the server side and freed on + * the client side. */ + pint = ret_pint(); + ok(!!pint, "RPC ret_pint\n"); + ok(*pint == 12345, "got %d\n", *pint); + midl_user_free(pint); + + str = NULL; + get_str(&str); + ok(!!str, "RPC get_str\n"); + ok(!strcmp(str, "wine"), "got %s\n", str); + midl_user_free(str); } static int @@ -1446,6 +1500,7 @@ array_tests(void) ok(get_cpsc(5, &cpsc) == 45, "RPC sum_cpsc\n"); ok( cpsc.a == 10, "RPC get_cpsc %u\n", cpsc.a ); for (n = 0; n < 10; n++) ok( cpsc.ca[n] == n, "RPC get_cpsc[%d] = %d\n", n, cpsc.ca[n] ); + midl_user_free(cpsc.ca); memset( tmp, 0x33, sizeof(tmp) ); cpsc.ca = tmp; @@ -1592,6 +1647,8 @@ run_tests(void) pointer_tests(); array_tests(); context_handle_test(); + + ok(!locks, "got %d locks on client\n", locks); } static void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 75d78f7..52f689e 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -392,4 +392,8 @@ cpp_quote("#endif") } ipu_t; void ip_test([in] ipu_t *a); + + void get_pint([out] int **a); + int *ret_pint(void); + void get_str([out] str_t *out); } -- 2.7.4

2 1

[PATCH 1/5] d3d9: Don't store currently used textures in the d3d9 device.
by Matteo Bruni 13 Apr '18

13 Apr '18

The texture tracking in d3d9 was not correct for applications using stateblocks. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- For bug 44871. dlls/d3d9/d3d9_private.h | 1 - dlls/d3d9/device.c | 23 ++++++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 38fe06cab1b..c50aabf593f 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -101,7 +101,6 @@ struct d3d9_device UINT index_buffer_size; UINT index_buffer_pos; - struct d3d9_texture *textures[D3D9_MAX_TEXTURE_UNITS]; struct d3d9_surface *render_targets[D3D_MAX_SIMULTANEOUS_RENDERTARGETS]; LONG device_state; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2265c1dca29..d533afb9b3e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -981,10 +981,6 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, device->device_state = D3D9_DEVICE_STATE_OK; } - if (!device->d3d_parent->extended) - for (i = 0; i < ARRAY_SIZE(device->textures); ++i) - device->textures[i] = NULL; - rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0); device->render_targets[0] = wined3d_rendertarget_view_get_sub_resource_parent(rtv); for (i = 1; i < ARRAY_SIZE(device->render_targets); ++i) @@ -2402,13 +2398,6 @@ static HRESULT WINAPI d3d9_device_SetTexture(IDirect3DDevice9Ex *iface, DWORD st wined3d_mutex_lock(); hr = wined3d_device_set_texture(device->wined3d_device, stage, texture_impl ? texture_impl->wined3d_texture : NULL); - if (SUCCEEDED(hr)) - { - unsigned int i = stage >= D3DVERTEXTEXTURESAMPLER0 ? stage - D3DVERTEXTEXTURESAMPLER0 + 16 : stage; - - if (stage < ARRAY_SIZE(device->textures)) - device->textures[i] = texture_impl; - } wined3d_mutex_unlock(); return hr; @@ -2652,11 +2641,15 @@ static float WINAPI d3d9_device_GetNPatchMode(IDirect3DDevice9Ex *iface) /* wined3d critical section must be taken by the caller. */ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) { - unsigned int i; + struct wined3d_texture *texture; + unsigned int i, stage; - for (i = 0; i < ARRAY_SIZE(device->textures); ++i) - if (device->textures[i]) - d3d9_texture_gen_auto_mipmap(device->textures[i]); + for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) + { + stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; + if ((texture = wined3d_device_get_texture(device->wined3d_device, stage))) + d3d9_texture_gen_auto_mipmap(wined3d_texture_get_parent(texture)); + } } static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, -- 2.13.6

5 11

[v2 PATCH] d3d10core/tests: Add a test for setting multiple viewports.
by Nikolay Sivov 13 Apr '18

13 Apr '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: using D3D10_* constants now, changed subject. Thanks, Jozef. dlls/d3d10core/tests/device.c | 189 ++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index d64a892b4a..6982a4ed14 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -15996,6 +15996,194 @@ done: release_test_context(&test_context); } +static void test_multiple_viewports(void) +{ + struct + { + unsigned int draw_id; + unsigned int padding[3]; + } constant; + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + ID3D10Texture2D *texture; + ID3D10GeometryShader *gs; + ID3D10PixelShader *ps; + ID3D10Device *device; + ID3D10Buffer *cb; + HRESULT hr; + + static const DWORD gs_code[] = + { +#if 0 + struct gs_in + { + float4 pos : SV_Position; + }; + + struct gs_out + { + float4 pos : SV_Position; + uint viewport : SV_ViewportArrayIndex; + }; + + [maxvertexcount(6)] + void main(triangle gs_in vin[3], inout TriangleStream<gs_out> vout) + { + gs_out o; + for (uint instance_id = 0; instance_id < 2; ++instance_id) + { + o.viewport = instance_id; + for (uint i = 0; i < 3; ++i) + { + o.pos = vin[i].pos; + vout.Append(o); + } + vout.RestartStrip(); + } + } +#endif + 0x43425844, 0xabbb660f, 0x0729bf23, 0x14a9a104, 0x1b454917, 0x00000001, 0x0000021c, 0x00000003, + 0x0000002c, 0x00000060, 0x000000c4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000005c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000005, 0x00000001, 0x00000001, 0x00000e01, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x565f5653, 0x70776569, 0x4174726f, 0x79617272, 0x65646e49, + 0xabab0078, 0x52444853, 0x00000150, 0x00020040, 0x00000054, 0x05000061, 0x002010f2, 0x00000003, + 0x00000000, 0x00000001, 0x02000068, 0x00000001, 0x0100185d, 0x0100285c, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x04000067, 0x00102012, 0x00000001, 0x00000005, 0x0200005e, 0x00000006, + 0x05000036, 0x00100012, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100022, + 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000002, 0x03040003, 0x0010001a, 0x00000000, + 0x05000036, 0x00100022, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000003, 0x03040003, 0x0010002a, 0x00000000, + 0x07000036, 0x001020f2, 0x00000000, 0x00a01e46, 0x0010001a, 0x00000000, 0x00000000, 0x05000036, + 0x00102012, 0x00000001, 0x0010000a, 0x00000000, 0x01000013, 0x0700001e, 0x00100022, 0x00000000, + 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x01000009, 0x0700001e, 0x00100012, + 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + uint draw_id; + + float4 main(in float4 pos : SV_Position, + in uint viewport : SV_ViewportArrayIndex) : SV_Target + { + return float4(viewport, draw_id, 0, 0); + } +#endif + 0x43425844, 0x77334c0f, 0x5df3ca7a, 0xc53c00db, 0x3e6e5750, 0x00000001, 0x00000150, 0x00000003, + 0x0000002c, 0x00000090, 0x000000c4, 0x4e475349, 0x0000005c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000005, + 0x00000001, 0x00000001, 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x565f5653, 0x70776569, + 0x4174726f, 0x79617272, 0x65646e49, 0xabab0078, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, + 0xabab0074, 0x52444853, 0x00000084, 0x00000040, 0x00000021, 0x04000059, 0x00208e46, 0x00000000, + 0x00000001, 0x04000864, 0x00101012, 0x00000001, 0x00000005, 0x03000065, 0x001020f2, 0x00000000, + 0x05000056, 0x00102012, 0x00000000, 0x0010100a, 0x00000001, 0x06000056, 0x00102022, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const struct vec4 expected_values[] = + { + {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + }; + static const float clear_color[] = {0.5f, 0.5f, 0.0f, 0.0f}; + D3D10_VIEWPORT vp[2]; + RECT rect; + int width; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + memset(&constant, 0, sizeof(constant)); + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(constant), &constant); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + hr = ID3D10Device_CreateGeometryShader(device, gs_code, sizeof(gs_code), &gs); + ok(SUCCEEDED(hr), "Failed to create geometry shader, hr %#x.\n", hr); + ID3D10Device_GSSetShader(device, gs); + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + texture_desc.Width = 32; + texture_desc.Height = 32; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + + width = texture_desc.Width / 2; + + vp[0].TopLeftX = 0.0f; + vp[0].TopLeftY = 0.0f; + vp[0].Width = width; + vp[0].Height = texture_desc.Height; + vp[0].MinDepth = 0.0f; + vp[0].MaxDepth = 1.0f; + + vp[1] = vp[0]; + vp[1].TopLeftX = width; + vp[1].Width = width; + ID3D10Device_RSSetViewports(device, 2, vp); + + constant.draw_id = 0; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + constant.draw_id = 1; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[0], 1); + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); +todo_wine + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[1], 1); + + /* One viewport. */ + ID3D10Device_ClearRenderTargetView(device, rtv, clear_color); + ID3D10Device_RSSetViewports(device, 1, vp); + constant.draw_id = 2; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + SetRect(&rect, 0, 0, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[2], 1); + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[3], 1); + + /* Reset viewports. */ + ID3D10Device_ClearRenderTargetView(device, rtv, clear_color); + ID3D10Device_RSSetViewports(device, 0, NULL); + constant.draw_id = 3; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); +todo_wine + check_texture_sub_resource_vec4(texture, 0, NULL, &expected_values[4], 1); + + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(texture); + + ID3D10Buffer_Release(cb); + ID3D10GeometryShader_Release(gs); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(device) { unsigned int argc, i; @@ -16095,4 +16283,5 @@ START_TEST(device) test_combined_clip_and_cull_distances(); test_generate_mips(); test_alpha_to_coverage(); + test_multiple_viewports(); } -- 2.17.0

2 1

[v2 PATCH] wined3d: Add support for setting multiple viewports
by Nikolay Sivov 13 Apr '18

13 Apr '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 4 +- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/device.c | 2 +- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/cs.c | 35 +++++++++------ dlls/wined3d/device.c | 50 ++++++++++++--------- dlls/wined3d/glsl_shader.c | 44 ++++++++++++++----- dlls/wined3d/state.c | 92 +++++++++++++++++++++++++++++---------- dlls/wined3d/stateblock.c | 12 +++-- dlls/wined3d/utils.c | 17 ++++---- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 29 +++++++----- include/wine/wined3d.h | 5 ++- 14 files changed, 200 insertions(+), 98 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 1fe62975d5..659b33c101 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -979,7 +979,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11Devic wined3d_vp.max_z = viewports[0].MaxDepth; wined3d_mutex_lock(); - wined3d_device_set_viewport(device->wined3d_device, &wined3d_vp); + wined3d_device_set_viewports(device->wined3d_device, 1, &wined3d_vp); wined3d_mutex_unlock(); } @@ -4167,7 +4167,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetViewports(ID3D10Device1 *iface, wined3d_vp.max_z = viewports[0].MaxDepth; wined3d_mutex_lock(); - wined3d_device_set_viewport(device->wined3d_device, &wined3d_vp); + wined3d_device_set_viewports(device->wined3d_device, 1, &wined3d_vp); wined3d_mutex_unlock(); } diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 65480876d3..3bdb278ec5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1650,7 +1650,7 @@ static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3D vp.min_z = viewport->MinZ; vp.max_z = viewport->MaxZ; - wined3d_device_set_viewport(device->wined3d_device, &vp); + wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2265c1dca2..a1b25f9b04 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2072,7 +2072,7 @@ static HRESULT WINAPI d3d9_device_SetViewport(IDirect3DDevice9Ex *iface, const D vp.max_z = viewport->MaxZ; wined3d_mutex_lock(); - wined3d_device_set_viewport(device->wined3d_device, &vp); + wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 35995625e4..23c61c5d80 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5333,7 +5333,7 @@ static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi vp.min_z = viewport->dvMinZ; vp.max_z = viewport->dvMaxZ; - wined3d_device_set_viewport(device->wined3d_device, &vp); + wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d29264d671..dcaddd7b90 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -611,7 +611,7 @@ static void shader_arb_vs_local_constants(const struct arb_vs_compiled_shader *g unsigned char i; /* Upload the position fixup */ - shader_get_position_fixup(context, state, position_fixup); + shader_get_position_fixup(context, state, 1, position_fixup); GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, gl_shader->pos_fixup, position_fixup)); if (!gl_shader->num_int_consts) return; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2f0c4ed52e..221e51eb94 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -33,7 +33,7 @@ enum wined3d_cs_op WINED3D_CS_OP_DRAW, WINED3D_CS_OP_FLUSH, WINED3D_CS_OP_SET_PREDICATION, - WINED3D_CS_OP_SET_VIEWPORT, + WINED3D_CS_OP_SET_VIEWPORTS, WINED3D_CS_OP_SET_SCISSOR_RECT, WINED3D_CS_OP_SET_RENDERTARGET_VIEW, WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW, @@ -138,10 +138,11 @@ struct wined3d_cs_set_predication BOOL value; }; -struct wined3d_cs_set_viewport +struct wined3d_cs_set_viewports { enum wined3d_cs_op opcode; - struct wined3d_viewport viewport; + unsigned int viewport_count; + struct wined3d_viewport viewports[1]; }; struct wined3d_cs_set_scissor_rect @@ -530,7 +531,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * { unsigned int rt_count = cs->device->adapter->gl_info.limits.buffers; const struct wined3d_state *state = &cs->device->state; - const struct wined3d_viewport *vp = &state->viewport; + const struct wined3d_viewport *vp = &state->viewports[0]; struct wined3d_rendertarget_view *view; struct wined3d_cs_clear *op; RECT view_rect; @@ -961,21 +962,29 @@ void wined3d_cs_emit_set_predication(struct wined3d_cs *cs, struct wined3d_query cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } -static void wined3d_cs_exec_set_viewport(struct wined3d_cs *cs, const void *data) +static void wined3d_cs_exec_set_viewports(struct wined3d_cs *cs, const void *data) { - const struct wined3d_cs_set_viewport *op = data; + const struct wined3d_cs_set_viewports *op = data; - cs->state.viewport = op->viewport; + if (op->viewport_count) + memcpy(cs->state.viewports, op->viewports, op->viewport_count * sizeof(*op->viewports)); + else + memset(cs->state.viewports, 0, sizeof(*cs->state.viewports)); + cs->state.viewport_count = op->viewport_count; device_invalidate_state(cs->device, STATE_VIEWPORT); } -void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) +void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_count, + const struct wined3d_viewport *viewports) { - struct wined3d_cs_set_viewport *op; + struct wined3d_cs_set_viewports *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_SET_VIEWPORT; - op->viewport = *viewport; + op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_viewports, viewports[viewport_count]), + WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_SET_VIEWPORTS; + if (viewport_count) + memcpy(op->viewports, viewports, viewport_count * sizeof(*viewports)); + op->viewport_count = viewport_count; cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -2401,7 +2410,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_DRAW */ wined3d_cs_exec_draw, /* WINED3D_CS_OP_FLUSH */ wined3d_cs_exec_flush, /* WINED3D_CS_OP_SET_PREDICATION */ wined3d_cs_exec_set_predication, - /* WINED3D_CS_OP_SET_VIEWPORT */ wined3d_cs_exec_set_viewport, + /* WINED3D_CS_OP_SET_VIEWPORTS */ wined3d_cs_exec_set_viewports, /* WINED3D_CS_OP_SET_SCISSOR_RECT */ wined3d_cs_exec_set_scissor_rect, /* WINED3D_CS_OP_SET_RENDERTARGET_VIEW */ wined3d_cs_exec_set_rendertarget_view, /* WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW */ wined3d_cs_exec_set_depth_stencil_view, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cc42dba45d..ae53628e48 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1909,13 +1909,24 @@ INT CDECL wined3d_device_get_base_vertex_index(const struct wined3d_device *devi return device->state.base_vertex_index; } -void CDECL wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport) +void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned int viewport_count, + const struct wined3d_viewport *viewports) { - TRACE("device %p, viewport %p.\n", device, viewport); - TRACE("x %.8e, y %.8e, w %.8e, h %.8e, min_z %.8e, max_z %.8e.\n", - viewport->x, viewport->y, viewport->width, viewport->height, viewport->min_z, viewport->max_z); + unsigned int i; + + TRACE("device %p, viewport_count %u, viewports %p.\n", device, viewport_count, viewports); + + for (i = 0; i < viewport_count; ++i) + { + TRACE("%u: x %.8e, y %.8e, w %.8e, h %.8e, min_z %.8e, max_z %.8e.\n", i, viewports[i].x, viewports[i].y, + viewports[i].width, viewports[i].height, viewports[i].min_z, viewports[i].max_z); + } - device->update_state->viewport = *viewport; + if (viewport_count) + memcpy(device->update_state->viewports, viewports, viewport_count * sizeof(*viewports)); + else + memset(device->update_state->viewports, 0, sizeof(device->update_state->viewports)); + device->update_state->viewport_count = viewport_count; /* Handle recording of state blocks */ if (device->recording) @@ -1925,14 +1936,14 @@ void CDECL wined3d_device_set_viewport(struct wined3d_device *device, const stru return; } - wined3d_cs_emit_set_viewport(device->cs, viewport); + wined3d_cs_emit_set_viewports(device->cs, viewport_count, viewports); } void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport) { TRACE("device %p, viewport %p.\n", device, viewport); - *viewport = device->state.viewport; + *viewport = device->state.viewports[0]; } static void resolve_depth_buffer(struct wined3d_device *device) @@ -4448,19 +4459,18 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device { struct wined3d_state *state = &device->state; - state->viewport.x = 0; - state->viewport.y = 0; - state->viewport.width = view->width; - state->viewport.height = view->height; - state->viewport.min_z = 0.0f; - state->viewport.max_z = 1.0f; - wined3d_cs_emit_set_viewport(device->cs, &state->viewport); + state->viewports[0].x = 0; + state->viewports[0].y = 0; + state->viewports[0].width = view->width; + state->viewports[0].height = view->height; + state->viewports[0].min_z = 0.0f; + state->viewports[0].max_z = 1.0f; + wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); SetRect(&state->scissor_rect, 0, 0, view->width, view->height); wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); } - prev = device->fb.render_targets[view_idx]; if (view == prev) return WINED3D_OK; @@ -4960,11 +4970,11 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_set_rendertarget_view(device, 0, view, FALSE); /* Note the min_z / max_z is not reset. */ - state->viewport.x = 0; - state->viewport.y = 0; - state->viewport.width = view->width; - state->viewport.height = view->height; - wined3d_cs_emit_set_viewport(device->cs, &state->viewport); + state->viewports[0].x = 0; + state->viewports[0].y = 0; + state->viewports[0].width = view->width; + state->viewports[0].height = view->height; + wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); SetRect(&state->scissor_rect, 0, 0, view->width, view->height); wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 121892dd47..554642b203 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1756,7 +1756,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context const struct wined3d_shader *pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; - float position_fixup[4]; + float position_fixup[4 * WINED3D_MAX_VIEWPORTS]; DWORD update_mask; struct glsl_shader_prog_link *prog = ctx_data->glsl_program; @@ -1793,9 +1793,11 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context if (update_mask & WINED3D_SHADER_CONST_POS_FIXUP) { - shader_get_position_fixup(context, state, position_fixup); + unsigned int fixup_count = state->shader[WINED3D_SHADER_TYPE_GEOMETRY] ? + max(state->viewport_count, 1) : 1; + shader_get_position_fixup(context, state, fixup_count, position_fixup); if (state->shader[WINED3D_SHADER_TYPE_GEOMETRY]) - GL_EXTCALL(glUniform4fv(prog->gs.pos_fixup_location, 1, position_fixup)); + GL_EXTCALL(glUniform4fv(prog->gs.pos_fixup_location, fixup_count, position_fixup)); else if (state->shader[WINED3D_SHADER_TYPE_DOMAIN]) GL_EXTCALL(glUniform4fv(prog->ds.pos_fixup_location, 1, position_fixup)); else @@ -3806,7 +3808,7 @@ static void PRINTF_ATTR(9, 10) shader_glsl_gen_sample_code(const struct wined3d_ shader_glsl_color_correction(ins, fixup); } -static void shader_glsl_fixup_position(struct wined3d_string_buffer *buffer) +static void shader_glsl_fixup_position(struct wined3d_string_buffer *buffer, BOOL use_viewport_index) { /* Write the final position. * @@ -3815,8 +3817,16 @@ static void shader_glsl_fixup_position(struct wined3d_string_buffer *buffer) * pos_fixup. pos_fixup.y contains 1.0 or -1.0 to turn the rendering * upside down for offscreen rendering. pos_fixup.x contains 1.0 to allow * a MAD. */ - shader_addline(buffer, "gl_Position.y = gl_Position.y * pos_fixup.y;\n"); - shader_addline(buffer, "gl_Position.xy += pos_fixup.zw * gl_Position.ww;\n"); + if (use_viewport_index) + { + shader_addline(buffer, "gl_Position.y = gl_Position.y * pos_fixup[gl_ViewportIndex].y;\n"); + shader_addline(buffer, "gl_Position.xy += pos_fixup[gl_ViewportIndex].zw * gl_Position.ww;\n"); + } + else + { + shader_addline(buffer, "gl_Position.y = gl_Position.y * pos_fixup.y;\n"); + shader_addline(buffer, "gl_Position.xy += pos_fixup.zw * gl_Position.ww;\n"); + } /* Z coord [0;1]->[-1;1] mapping, see comment in get_projection_matrix() * in utils.c @@ -5143,9 +5153,10 @@ static void shader_glsl_emit(const struct wined3d_shader_instruction *ins) { unsigned int stream = ins->handler_idx == WINED3DSIH_EMIT ? 0 : ins->src[0].reg.idx[0].offset; + shader_addline(ins->ctx->buffer, "gl_ViewportIndex = 0;\n"); shader_addline(ins->ctx->buffer, "setup_gs_output(gs_out);\n"); if (!ins->ctx->gl_info->supported[ARB_CLIP_CONTROL]) - shader_glsl_fixup_position(ins->ctx->buffer); + shader_glsl_fixup_position(ins->ctx->buffer, TRUE); if (!stream) shader_addline(ins->ctx->buffer, "EmitVertex();\n"); @@ -6766,6 +6777,14 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w else FIXME("ARB_fragment_layer_viewport is not supported.\n"); } + else if (input->sysval_semantic == WINED3D_SV_VIEWPORT_ARRAY_INDEX && !semantic_idx) + { + if (gl_info->supported[ARB_VIEWPORT_ARRAY]) + shader_addline(buffer, "ps_in[%u]%s = intBitsToFloat(gl_ViewportIndex);\n", + input->register_idx, reg_mask); + else + FIXME("ARB_viewport_array is not supported.\n"); + } else { if (input->sysval_semantic) @@ -7057,6 +7076,11 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv shader_addline(buffer, "gl_Layer = floatBitsToInt(outputs[%u])%s;\n", output->register_idx, reg_mask); } + else if (output->sysval_semantic == WINED3D_SV_VIEWPORT_ARRAY_INDEX && !semantic_idx) + { + shader_addline(buffer, "gl_ViewportIndex = floatBitsToInt(outputs[%u])%s;\n", + output->register_idx, reg_mask); + } else if (output->sysval_semantic == WINED3D_SV_CLIP_DISTANCE) { shader_glsl_generate_clip_or_cull_distances(buffer, output, reg_maps_out->clip_distance_mask); @@ -7830,7 +7854,7 @@ static void shader_glsl_generate_vs_epilogue(const struct wined3d_gl_info *gl_in shader_addline(buffer, "gl_PointSize = clamp(ffp_point.size, ffp_point.size_min, ffp_point.size_max);\n"); if (args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL && !gl_info->supported[ARB_CLIP_CONTROL]) - shader_glsl_fixup_position(buffer); + shader_glsl_fixup_position(buffer, FALSE); } /* Context activation is done by the caller. */ @@ -8068,7 +8092,7 @@ static void shader_glsl_generate_ds_epilogue(const struct wined3d_gl_info *gl_in shader_addline(buffer, "setup_ds_output(ds_out);\n"); if (args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL && !gl_info->supported[ARB_CLIP_CONTROL]) - shader_glsl_fixup_position(buffer); + shader_glsl_fixup_position(buffer, FALSE); } static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *context, @@ -8193,7 +8217,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_addline(buffer, "in shader_in_out { vec4 reg[%u]; } shader_in[];\n", shader->limits->packed_input); if (!gl_info->supported[ARB_CLIP_CONTROL]) - shader_addline(buffer, "uniform vec4 pos_fixup;\n"); + shader_addline(buffer, "uniform vec4 pos_fixup[%u];\n", WINED3D_MAX_VIEWPORTS); if (is_rasterization_disabled(shader)) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 83cc484be8..5a37fadabd 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4514,21 +4514,24 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine } } -static void get_viewport(struct wined3d_context *context, const struct wined3d_state *state, - struct wined3d_viewport *viewport) +static void get_viewports(struct wined3d_context *context, const struct wined3d_state *state, + unsigned int viewport_count, struct wined3d_viewport *viewports) { const struct wined3d_rendertarget_view *depth_stencil = state->fb->depth_stencil; const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; - unsigned int width, height; + unsigned int width, height, i; - *viewport = state->viewport; - - if (target) + for (i = 0; i < viewport_count; ++i) { - if (viewport->width > target->width) - viewport->width = target->width; - if (viewport->height > target->height) - viewport->height = target->height; + viewports[i] = state->viewports[i]; + + if (target) + { + if (viewports[i].width > target->width) + viewports[i].width = target->width; + if (viewports[i].height > target->height) + viewports[i].height = target->height; + } } /* @@ -4552,22 +4555,45 @@ static void get_viewport(struct wined3d_context *context, const struct wined3d_s return; } - viewport->y = height - (viewport->y + viewport->height); + for (i = 0; i < viewport_count; ++i) + viewports[i].y = height - (viewports[i].y + viewports[i].height); } static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_viewport vp; + struct wined3d_viewport vp[WINED3D_MAX_VIEWPORTS]; + + if (gl_info->supported[ARB_VIEWPORT_ARRAY]) + { + unsigned int i, reset_count = 0; - get_viewport(context, state, &vp); + get_viewports(context, state, state->viewport_count, vp); + for (i = 0; i < state->viewport_count; ++i) + { + GL_EXTCALL(glDepthRangeIndexed(i, vp[i].min_z, vp[i].max_z)); + GL_EXTCALL(glViewportIndexedf(i, vp[i].x, vp[i].y, vp[i].width, vp[i].height)); + } - gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); + if (context->viewport_count > state->viewport_count) + reset_count = context->viewport_count - state->viewport_count; - if (gl_info->supported[ARB_VIEWPORT_ARRAY]) - GL_EXTCALL(glViewportIndexedf(0, vp.x, vp.y, vp.width, vp.height)); + if (reset_count) + { + static const GLfloat reset[4 * WINED3D_MAX_VIEWPORTS]; + static const GLdouble resetd[2 * WINED3D_MAX_VIEWPORTS]; + + GL_EXTCALL(glDepthRangeArrayv(state->viewport_count, reset_count, resetd)); + GL_EXTCALL(glViewportArrayv(state->viewport_count, reset_count, reset)); + } + context->viewport_count = state->viewport_count; + } else - gl_info->gl_ops.gl.p_glViewport(vp.x, vp.y, vp.width, vp.height); + { + get_viewports(context, state, 1, vp); + gl_info->gl_ops.gl.p_glDepthRange(vp[0].min_z, vp[0].max_z); + gl_info->gl_ops.gl.p_glViewport(vp[0].x, vp[0].y, vp[0].width, vp[0].height); + } checkGLcall("setting clip space and viewport"); } @@ -4578,16 +4604,34 @@ static void viewport_miscpart_cc(struct wined3d_context *context, float pixel_center_offset = context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER ? 63.0f / 128.0f : -1.0f / 128.0f; const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_viewport vp; - - get_viewport(context, state, &vp); - vp.x += pixel_center_offset; - vp.y += pixel_center_offset; + struct wined3d_viewport vp[WINED3D_MAX_VIEWPORTS]; + unsigned int i, reset_count = 0; - gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); + get_viewports(context, state, state->viewport_count, vp); GL_EXTCALL(glClipControl(context->render_offscreen ? GL_UPPER_LEFT : GL_LOWER_LEFT, GL_ZERO_TO_ONE)); - GL_EXTCALL(glViewportIndexedf(0, vp.x, vp.y, vp.width, vp.height)); + + for (i = 0; i < state->viewport_count; ++i) + { + vp[i].x += pixel_center_offset; + vp[i].y += pixel_center_offset; + GL_EXTCALL(glDepthRangeIndexed(i, vp[i].min_z, vp[i].max_z)); + GL_EXTCALL(glViewportIndexedf(i, vp[i].x, vp[i].y, vp[i].width, vp[i].height)); + } + + if (context->viewport_count > state->viewport_count) + reset_count = context->viewport_count - state->viewport_count; + + if (reset_count) + { + static const GLfloat reset[4 * WINED3D_MAX_VIEWPORTS]; + static const GLdouble resetd[2 * WINED3D_MAX_VIEWPORTS]; + + GL_EXTCALL(glDepthRangeArrayv(state->viewport_count, reset_count, resetd)); + GL_EXTCALL(glViewportArrayv(state->viewport_count, reset_count, reset)); + } + context->viewport_count = state->viewport_count; + checkGLcall("setting clip space and viewport"); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4c28eb55e8..23a615fc08 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -811,11 +811,15 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) } if (stateblock->changed.viewport - && memcmp(&src_state->viewport, &stateblock->state.viewport, sizeof(stateblock->state.viewport))) + && (src_state->viewport_count != stateblock->state.viewport_count + || memcmp(src_state->viewports, stateblock->state.viewports, src_state->viewport_count * sizeof(stateblock->state.viewports)))) { - TRACE("Updating viewport.\n"); + TRACE("Updating viewports.\n"); - stateblock->state.viewport = src_state->viewport; + if ((stateblock->state.viewport_count = src_state->viewport_count)) + memcpy(stateblock->state.viewports, src_state->viewports, sizeof(src_state->viewports)); + else + memset(stateblock->state.viewports, 0, sizeof(*stateblock->state.viewports)); } if (stateblock->changed.scissorRect && memcmp(&src_state->scissor_rect, @@ -1055,7 +1059,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) wined3d_device_set_material(device, &stateblock->state.material); if (stateblock->changed.viewport) - wined3d_device_set_viewport(device, &stateblock->state.viewport); + wined3d_device_set_viewports(device, stateblock->state.viewport_count, stateblock->state.viewports); if (stateblock->changed.scissorRect) wined3d_device_set_scissor_rect(device, &stateblock->state.scissor_rect); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0775f53b7a..c0bb4f17ab 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4865,10 +4865,10 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w if (context->last_was_rhw) { /* Transform D3D RHW coordinates to OpenGL clip coordinates. */ - float x = state->viewport.x; - float y = state->viewport.y; - float w = state->viewport.width; - float h = state->viewport.height; + float x = state->viewports[0].x; + float y = state->viewports[0].y; + float w = state->viewports[0].width; + float h = state->viewports[0].height; float x_scale = 2.0f / w; float x_offset = (center_offset - (2.0f * x) - w) / w; float y_scale = flip ? 2.0f / h : 2.0f / -h; @@ -4892,10 +4892,10 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w else { float y_scale = flip ? -1.0f : 1.0f; - float x_offset = center_offset / state->viewport.width; + float x_offset = center_offset / state->viewports[0].width; float y_offset = flip - ? center_offset / state->viewport.height - : -center_offset / state->viewport.height; + ? center_offset / state->viewports[0].height + : -center_offset / state->viewports[0].height; float z_scale = clip_control ? 1.0f : 2.0f; float z_offset = clip_control ? 0.0f : -1.0f; const struct wined3d_matrix projection = @@ -5095,9 +5095,10 @@ void get_pointsize(const struct wined3d_context *context, const struct wined3d_s b.d = state->render_states[WINED3D_RS_POINTSCALE_B]; c.d = state->render_states[WINED3D_RS_POINTSCALE_C]; + /* Always use first viewport, this path does not apply to d3d10/11 multiple viewports case. */ if (state->render_states[WINED3D_RS_POINTSCALEENABLE]) { - float scale_factor = state->viewport.height * state->viewport.height; + float scale_factor = state->viewports[0].height * state->viewports[0].height; out_att[0] = a.f / scale_factor; out_att[1] = b.f / scale_factor; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 16d22f5263..b4c41cc59a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -187,7 +187,7 @@ @ cdecl wined3d_device_set_unordered_access_view(ptr long ptr long) @ cdecl wined3d_device_set_vertex_declaration(ptr ptr) @ cdecl wined3d_device_set_vertex_shader(ptr ptr) -@ cdecl wined3d_device_set_viewport(ptr ptr) +@ cdecl wined3d_device_set_viewports(ptr long ptr) @ cdecl wined3d_device_set_vs_cb(ptr long ptr) @ cdecl wined3d_device_set_vs_consts_b(ptr long long ptr) @ cdecl wined3d_device_set_vs_consts_f(ptr long long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cdea1125f3..39e4619254 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1990,6 +1990,8 @@ struct wined3d_context GLfloat fog_coord_value; GLfloat color[4], fogstart, fogend, fogcolor[4]; GLuint dummy_arbfp_prog; + + unsigned int viewport_count; }; struct wined3d_fb_state @@ -2843,7 +2845,8 @@ struct wined3d_state struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES]; struct wined3d_material material; - struct wined3d_viewport viewport; + struct wined3d_viewport viewports[WINED3D_MAX_VIEWPORTS]; + unsigned int viewport_count; RECT scissor_rect; /* Light hashmap. Collisions are handled using linked lists. */ @@ -3592,7 +3595,7 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined unsigned int initial_count) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_count, const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN; void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, @@ -4095,24 +4098,28 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) } static inline void shader_get_position_fixup(const struct wined3d_context *context, - const struct wined3d_state *state, float *position_fixup) + const struct wined3d_state *state, unsigned int fixup_count, float *position_fixup) { float center_offset; + unsigned int i; if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) center_offset = 63.0f / 64.0f; else center_offset = -1.0f / 64.0f; - position_fixup[0] = 1.0f; - position_fixup[1] = 1.0f; - position_fixup[2] = center_offset / state->viewport.width; - position_fixup[3] = -center_offset / state->viewport.height; - - if (context->render_offscreen) + for (i = 0; i < fixup_count; ++i) { - position_fixup[1] *= -1.0f; - position_fixup[3] *= -1.0f; + position_fixup[4 * i ] = 1.0f; + position_fixup[4 * i + 1] = 1.0f; + position_fixup[4 * i + 2] = center_offset / state->viewports[i].width; + position_fixup[4 * i + 3] = -center_offset / state->viewports[i].height; + + if (context->render_offscreen) + { + position_fixup[4 * i + 1] *= -1.0f; + position_fixup[4 * i + 3] *= -1.0f; + } } } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 446e98b96f..3539b4eb06 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1561,6 +1561,8 @@ enum wined3d_shader_byte_code_format #define WINED3D_VIEW_TEXTURE_CUBE 0x00000008 #define WINED3D_VIEW_TEXTURE_ARRAY 0x00000010 +#define WINED3D_MAX_VIEWPORTS 16 + struct wined3d_display_mode { UINT width; @@ -2440,7 +2442,8 @@ void __cdecl wined3d_device_set_unordered_access_view(struct wined3d_device *dev void __cdecl wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader); -void __cdecl wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport); +void __cdecl wined3d_device_set_viewports(struct wined3d_device *device, unsigned int viewport_count, + const struct wined3d_viewport *viewports); void __cdecl wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const BOOL *constants); -- 2.16.3

2 1

[PATCH v11 1/4] wmp: Add media completion notifications
by Anton Romanov 13 Apr '18

13 Apr '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/wmp/oleobj.c | 26 +++++---- dlls/wmp/player.c | 92 ++++++++++++++++++++++++++++++- dlls/wmp/tests/media.c | 113 ++++++++++++++++++++++++++++++++++---- dlls/wmp/tests/rsrc.rc | 3 + dlls/wmp/tests/test1s.mp3 | Bin 0 -> 4365 bytes dlls/wmp/wmp_main.c | 1 + dlls/wmp/wmp_private.h | 7 ++- 7 files changed, 216 insertions(+), 26 deletions(-) create mode 100644 dlls/wmp/tests/test1s.mp3 diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index cbf183c1f6..a90a0c2c6c 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -899,18 +899,20 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, wmp->ref = 1; - init_player(wmp); - - ConnectionPointContainer_Init(wmp); - hdc = GetDC(0); - dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); - dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); - ReleaseDC(0, hdc); - - wmp->extent.cx = MulDiv(192, 2540, dpi_x); - wmp->extent.cy = MulDiv(192, 2540, dpi_y); - - hres = IOleObject_QueryInterface(&wmp->IOleObject_iface, riid, ppv); + if (init_player(wmp)) { + ConnectionPointContainer_Init(wmp); + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + wmp->extent.cx = MulDiv(192, 2540, dpi_x); + wmp->extent.cy = MulDiv(192, 2540, dpi_y); + + hres = IOleObject_QueryInterface(&wmp->IOleObject_iface, riid, ppv); + } else { + hres = E_FAIL; + } IOleObject_Release(&wmp->IOleObject_iface); return hres; } diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 8e01200788..f4ce62a447 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -24,6 +24,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); +static ATOM player_msg_class; +static INIT_ONCE class_init_once; +static UINT WM_WMPEVENT; +static const WCHAR WMPmessageW[] = {'_', 'W', 'M', 'P', 'M','e','s','s','a','g','e',0}; + + static void update_state(WindowsMediaPlayer *wmp, LONG type, LONG state) { DISPPARAMS dispparams; @@ -212,18 +218,20 @@ static HRESULT WINAPI WMPPlayer4_put_currentMedia(IWMPPlayer4 *iface, IWMPMedia { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); TRACE("(%p)->(%p)\n", This, pMedia); + if(pMedia == NULL) { return E_POINTER; } update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistChanging); if(This->wmpmedia != NULL) { + IWMPControls_stop(&This->IWMPControls_iface); IWMPMedia_Release(This->wmpmedia); } update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistChanged); update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistOpenNoMedia); + IWMPMedia_AddRef(pMedia); This->wmpmedia = pMedia; - IWMPMedia_AddRef(This->wmpmedia); return S_OK; } @@ -1425,6 +1433,20 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) (void**)&This->media_control); if (SUCCEEDED(hres)) update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); + if (SUCCEEDED(hres)) + hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaEvent, + (void**)&This->media_event); + if (SUCCEEDED(hres)) + { + IMediaEventEx *media_event_ex = NULL; + hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaEventEx, + (void**)&media_event_ex); + if (SUCCEEDED(hres)) { + hres = IMediaEventEx_SetNotifyWindow(media_event_ex, (OAHWND)This->msg_window, + WM_WMPEVENT, (LONG_PTR)This); + IMediaEventEx_Release(media_event_ex); + } + } } update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsTransitioning); @@ -1457,9 +1479,15 @@ static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) hres = IMediaControl_Stop(This->media_control); IMediaControl_Release(This->media_control); } + if (This->media_event) { + IMediaEvent_Release(This->media_event); + } + IGraphBuilder_Release(This->filter_graph); This->filter_graph = NULL; This->media_control = NULL; + This->media_event = NULL; + update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistOpenNoMedia); update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsStopped); return hres; @@ -1823,8 +1851,66 @@ static const IWMPMediaVtbl WMPMediaVtbl = { WMPMedia_isReadOnlyItem }; -void init_player(WindowsMediaPlayer *wmp) +static LRESULT WINAPI player_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_WMPEVENT && wParam == 0) { + WindowsMediaPlayer *wmp = (WindowsMediaPlayer*)lParam; + LONG event_code; + LONG_PTR p1, p2; + HRESULT hr; + if (wmp->media_event) { + do { + hr = IMediaEvent_GetEvent(wmp->media_event, &event_code, &p1, &p2, 0); + if (SUCCEEDED(hr)) { + TRACE("got event_code = 0x%02x\n", event_code); + IMediaEvent_FreeEventParams(wmp->media_event, event_code, p1, p2); + /* For now we only handle EC_COMPLETE */ + if (event_code == EC_COMPLETE) { + update_state(wmp, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsMediaEnded); + update_state(wmp, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsTransitioning); + update_state(wmp, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsStopped); + } + } + } while (hr == S_OK); + } else { + FIXME("Got event from quartz when interfaces are already released\n"); + } + } + return DefWindowProcW(hwnd, msg, wParam, lParam); +} + +static BOOL WINAPI register_player_msg_class(INIT_ONCE *once, void *param, void **context) { + static WNDCLASSEXW wndclass = { + sizeof(wndclass), CS_DBLCLKS, player_wnd_proc, 0, 0, + NULL, NULL, NULL, NULL, NULL, + WMPmessageW, NULL + }; + + wndclass.hInstance = wmp_instance; + player_msg_class = RegisterClassExW(&wndclass); + WM_WMPEVENT= RegisterWindowMessageW(WMPmessageW); + return TRUE; +} + +void unregister_player_msg_class(void) { + if(player_msg_class) + UnregisterClassW(MAKEINTRESOURCEW(player_msg_class), wmp_instance); +} + +BOOL init_player(WindowsMediaPlayer *wmp) { + InitOnceExecuteOnce(&class_init_once, register_player_msg_class, NULL, NULL); + wmp->msg_window = CreateWindowW( MAKEINTRESOURCEW(player_msg_class), NULL, 0, 0, + 0, 0, 0, HWND_MESSAGE, 0, wmp_instance, wmp ); + if (!wmp->msg_window) { + ERR("Failed to create message window, GetLastError: %d\n", GetLastError()); + return FALSE; + } + if (!WM_WMPEVENT) { + ERR("Failed to register window message, GetLastError: %d\n", GetLastError()); + return FALSE; + } + wmp->IWMPPlayer4_iface.lpVtbl = &WMPPlayer4Vtbl; wmp->IWMPPlayer_iface.lpVtbl = &WMPPlayerVtbl; wmp->IWMPSettings_iface.lpVtbl = &WMPSettingsVtbl; @@ -1833,6 +1919,7 @@ void init_player(WindowsMediaPlayer *wmp) wmp->invoke_urls = VARIANT_TRUE; wmp->auto_start = VARIANT_TRUE; + return TRUE; } void destroy_player(WindowsMediaPlayer *wmp) @@ -1840,6 +1927,7 @@ void destroy_player(WindowsMediaPlayer *wmp) IWMPControls_stop(&wmp->IWMPControls_iface); if(wmp->wmpmedia) IWMPMedia_Release(wmp->wmpmedia); + DestroyWindow(wmp->msg_window); } WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index a7f611c826..f8201813b0 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -40,16 +40,15 @@ called_ ## kind |= (1 << index); \ }while(0) -#define CHECK_CALLED(kind, index) \ +#define CLEAR_CALLED(kind, index) \ do { \ - ok(called_ ## kind & (1 << index), "expected " #kind ", %d\n", index); \ expect_ ## kind &= ~(1 << index); \ called_ ## kind &= ~(1 << index); \ }while(0) -#define CHECK_CALLED_OR_BROKEN(kind, index) \ +#define CHECK_CALLED(kind, index) \ do { \ - ok(called_ ## kind & (1 << index) || broken(1), "expected " #kind ", %d\n", index); \ + ok(called_ ## kind & (1 << index), "expected " #kind ", %d\n", index); \ expect_ ## kind &= ~(1 << index); \ called_ ## kind &= ~(1 << index); \ }while(0) @@ -65,9 +64,11 @@ DEFINE_EXPECT(PLAYSTATE); DEFINE_EXPECT(OPENSTATE); static HANDLE playing_event; +static HANDLE completed_event; static DWORD main_thread_id; static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; +static const WCHAR mp3file1s[] = {'t','e','s','t','1','s','.','m','p','3',0}; static inline WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -151,6 +152,8 @@ static HRESULT WINAPI WMPOCXEvents_Invoke(IDispatch *iface, DISPID dispIdMember, CHECK_EXPECT(PLAYSTATE, V_UI4(pDispParams->rgvarg)); if (V_UI4(pDispParams->rgvarg) == wmppsPlaying) { SetEvent(playing_event); + } else if (V_UI4(pDispParams->rgvarg) == wmppsMediaEnded) { + SetEvent(completed_event); } if (winetest_debug > 1) trace("DISPID_WMPCOREEVENT_PLAYSTATECHANGE, %d\n", V_UI4(pDispParams->rgvarg)); @@ -208,18 +211,16 @@ static HRESULT pump_messages(DWORD timeout, DWORD count, const HANDLE *handles) return res; } -static void test_wmp(void) +static void test_completion_event(void) { DWORD res = 0; IWMPPlayer4 *player4; - IWMPControls *controls; HRESULT hres; BSTR filename; IConnectionPointContainer *container; IConnectionPoint *point; IOleObject *oleobj; static DWORD dw = 100; - IWMPSettings *settings; hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -243,6 +244,86 @@ static void test_wmp(void) hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); + filename = SysAllocString(load_resource(mp3file1s)); + + SET_EXPECT(OPENSTATE, wmposPlaylistChanging); + SET_EXPECT(OPENSTATE, wmposPlaylistOpenNoMedia); + SET_EXPECT(OPENSTATE, wmposPlaylistChanged); + SET_EXPECT(OPENSTATE, wmposOpeningUnknownURL); + SET_EXPECT(OPENSTATE, wmposMediaOpen); + SET_EXPECT(OPENSTATE, wmposMediaOpening); + SET_EXPECT(PLAYSTATE, wmppsPlaying); + SET_EXPECT(PLAYSTATE, wmppsMediaEnded); + SET_EXPECT(PLAYSTATE, wmppsStopped); + SET_EXPECT(PLAYSTATE, wmppsTransitioning); + /* following two are sent on vistau64 vms only */ + SET_EXPECT(OPENSTATE, wmposMediaChanging); + SET_EXPECT(PLAYSTATE, wmppsReady); + hres = IWMPPlayer4_put_URL(player4, filename); + ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08x\n", hres); + res = pump_messages(3000, 1, &completed_event); + ok(res == WAIT_OBJECT_0, "Timed out while waiting for media to complete\n"); + + /* following two are sent on vistau64 vms only */ + CLEAR_CALLED(OPENSTATE, wmposMediaChanging); + CLEAR_CALLED(PLAYSTATE, wmppsReady); + + CHECK_CALLED(OPENSTATE, wmposPlaylistChanging); + CHECK_CALLED(OPENSTATE, wmposPlaylistChanged); + CHECK_CALLED(OPENSTATE, wmposPlaylistOpenNoMedia); + CHECK_CALLED(PLAYSTATE, wmppsTransitioning); + CHECK_CALLED(OPENSTATE, wmposOpeningUnknownURL); + CHECK_CALLED(OPENSTATE, wmposMediaOpen); + CHECK_CALLED(PLAYSTATE, wmppsPlaying); + CHECK_CALLED(PLAYSTATE, wmppsMediaEnded); + CHECK_CALLED(PLAYSTATE, wmppsStopped); + /* MediaOpening happens only on xp, 2003 */ + CLEAR_CALLED(OPENSTATE, wmposMediaOpening); + + hres = IConnectionPoint_Unadvise(point, dw); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + + IConnectionPoint_Release(point); + IWMPPlayer4_Release(player4); + IOleObject_Release(oleobj); + DeleteFileW(filename); + SysFreeString(filename); +} + +static BOOL test_wmp(void) +{ + DWORD res = 0; + IWMPPlayer4 *player4; + IWMPControls *controls; + HRESULT hres; + BSTR filename; + IConnectionPointContainer *container; + IConnectionPoint *point; + IOleObject *oleobj; + static DWORD dw = 100; + IWMPSettings *settings; + BOOL test_ran = TRUE; + + 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 FALSE; + } + ok(hres == S_OK, "Could not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + + hres = IOleObject_QueryInterface(oleobj, &IID_IConnectionPointContainer, (void**)&container); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + + hres = IConnectionPointContainer_FindConnectionPoint(container, &IID__WMPOCXEvents, &point); + IConnectionPointContainer_Release(container); + ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + + hres = IConnectionPoint_Advise(point, (IUnknown*)&WMPOCXEvents, &dw); + ok(hres == S_OK, "Advise failed: %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); @@ -277,9 +358,10 @@ static void test_wmp(void) SET_EXPECT(OPENSTATE, wmposOpeningUnknownURL); SET_EXPECT(OPENSTATE, wmposMediaOpen); - SET_EXPECT(OPENSTATE, wmposMediaOpening); SET_EXPECT(PLAYSTATE, wmppsPlaying); SET_EXPECT(PLAYSTATE, wmppsTransitioning); + /* MediaOpening happens only on xp, 2003 */ + SET_EXPECT(OPENSTATE, wmposMediaOpening); hres = IWMPControls_play(controls); ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres); res = pump_messages(5000, 1, &playing_event); @@ -288,14 +370,15 @@ static void test_wmp(void) /* This happens on Vista Ultimate 64 vms * I have been unable to find out source of this behaviour */ win_skip("Failed to transition media to playing state.\n"); + test_ran = FALSE; goto playback_skip; } CHECK_CALLED(OPENSTATE, wmposOpeningUnknownURL); CHECK_CALLED(OPENSTATE, wmposMediaOpen); - /* MediaOpening happens only on xp, 2003 */ - todo_wine CHECK_CALLED_OR_BROKEN(OPENSTATE, wmposMediaOpening); CHECK_CALLED(PLAYSTATE, wmppsPlaying); CHECK_CALLED(PLAYSTATE, wmppsTransitioning); + /* MediaOpening happens only on xp, 2003 */ + CLEAR_CALLED(OPENSTATE, wmposMediaOpening); SET_EXPECT(PLAYSTATE, wmppsStopped); /* The following happens on wine only since we close media on stop */ @@ -331,6 +414,8 @@ playback_skip: IOleObject_Release(oleobj); DeleteFileW(filename); SysFreeString(filename); + + return test_ran; } START_TEST(media) @@ -339,9 +424,15 @@ START_TEST(media) main_thread_id = GetCurrentThreadId(); playing_event = CreateEventW(NULL, FALSE, FALSE, NULL); - test_wmp(); + completed_event = CreateEventW(NULL, FALSE, FALSE, NULL); + if (test_wmp()) { + test_completion_event(); + } else { + win_skip("Failed to play media\n"); + } CloseHandle(playing_event); + CloseHandle(completed_event); CoUninitialize(); } diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc index f33acc1256..ea25a2dea1 100644 --- a/dlls/wmp/tests/rsrc.rc +++ b/dlls/wmp/tests/rsrc.rc @@ -21,3 +21,6 @@ /* 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" +/* ffmpeg -ar 48000 -t 1 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 dlls/wmp/tests/test1s.mp3 */ +/* @makedep: test1s.mp3 */ +test1s.mp3 RCDATA "test1s.mp3" diff --git a/dlls/wmp/tests/test1s.mp3 b/dlls/wmp/tests/test1s.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..3e0b407e3fb8b292bf47fdb383a42b66d06d5568 GIT binary patch literal 4365 zcmeZtF=k-^0p*b3U{@f`&%nU!lUSB!YOZHttY>Io0G5Ri|9^)d(a)vt*J^V0HxGC*S( zv>6x#9xw<Biiyd{C(a)CqatLy3-8yj0#*x9+bxOjT{`-g^xMn(a)+kq@|_h<P;W`mzUSp zHZ^s0boBL2o;-8r%=z<|ELpW`)rJk*w(Z`%`{2Rj$IqNObLrBJ8+Y&Cef;?4%XjbI zefje1*Z=<@mjK<I40N+0vU?d+m=A#DK<=10|Dfvs-y$gt{2v$?GJ!%I3=F&q3=E7w zv;@cnGEEv77+8E9eO<x+209J{;FSyw1(`2Lz<dldkp+k_--gEKN72~)3L2X~jmGA0 zp|SawXl(w&e*EblIXPmmiAbNL=7S1NjF1BhfXau_(a)EHvs?5P7NI-0*&aE1*?Vl;e4 m!)LVq8m(V&6%wQ6!@!mgxZ(vWPI3EZ)O`H$I~qO|g%1GKzMp&m literal 0 HcmV?d00001 diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index 9a33b2762b..273d193e58 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -92,6 +92,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) break; case DLL_PROCESS_DETACH: unregister_wmp_class(); + unregister_player_msg_class(); break; } diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 9e84d56ea8..3792e52abd 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -75,9 +75,13 @@ struct WindowsMediaPlayer { /* DirectShow stuff */ IGraphBuilder* filter_graph; IMediaControl* media_control; + IMediaEvent* media_event; + + /* Async event notification */ + HWND msg_window; }; -void init_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; +BOOL init_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; void destroy_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) DECLSPEC_HIDDEN; HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia) DECLSPEC_HIDDEN; @@ -88,6 +92,7 @@ void call_sink(ConnectionPoint *This, DISPID dispid, DISPPARAMS *dispparams) DEC HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; void unregister_wmp_class(void) DECLSPEC_HIDDEN; +void unregister_player_msg_class(void) DECLSPEC_HIDDEN; extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; -- 2.17.0

2 5