October 2018 - Wine-commits

Zebediah Figura : rpcrt4: Correctly handle simple ref pointers in calc_arg_size().
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: 5be461cd71a5a91bc573ad98808d7fa0a6219799 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5be461cd71a5a91bc573ad98… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 11 11:59:18 2018 -0500 rpcrt4: Correctly handle simple ref pointers in calc_arg_size(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 9e434a5..18ce74d 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -156,8 +156,7 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) case FC_RP: if (pFormat[1] & FC_SIMPLE_POINTER) { - FIXME("Simple reference pointer (type %#x).\n", pFormat[2]); - size = sizeof(void *); + size = 0; break; } size = calc_arg_size(pStubMsg, &pFormat[2] + *(const SHORT*)&pFormat[2]);

1 0

Zebediah Figura : rpcrt4: Avoid clearing a NULL output parameter in client_do_args().
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: 43275fb17824c947c1896d27098f294ab2e1930e URL: https://source.winehq.org/git/wine.git/?a=commit;h=43275fb17824c947c1896d27… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 11 11:59:19 2018 -0500 rpcrt4: Avoid clearing a NULL output parameter in client_do_args(). Avoids an unhandled exception. Passing NULL as a ref pointer (which a top-level [out] parameter necessarily is) is illegal, but this will be caught in the CALCSIZE pass. This matches midl/widl behaviour in the -Os case. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 18ce74d..6a65a14 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -422,6 +422,11 @@ static void client_free_handle( } } +static inline BOOL param_needs_alloc( PARAM_ATTRIBUTES attr ) +{ + return attr.IsOut && !attr.IsIn && !attr.IsBasetype && !attr.IsByValue; +} + void client_do_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, enum stubless_phase phase, void **fpu_args, unsigned short number_of_params, unsigned char *pRetVal ) { @@ -453,11 +458,8 @@ void client_do_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, enum s switch (phase) { case STUBLESS_INITOUT: - if (!params[i].attr.IsBasetype && params[i].attr.IsOut && - !params[i].attr.IsIn && !params[i].attr.IsByValue) - { + if (param_needs_alloc(params[i].attr) && *(unsigned char **)pArg) memset( *(unsigned char **)pArg, 0, calc_arg_size( pStubMsg, pTypeFormat )); - } break; case STUBLESS_CALCSIZE: if (params[i].attr.IsSimpleRef && !*(unsigned char **)pArg) @@ -1138,11 +1140,6 @@ LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, uns } #endif -static inline BOOL param_needs_alloc( PARAM_ATTRIBUTES attr ) -{ - return attr.IsOut && !attr.IsIn && !attr.IsBasetype && !attr.IsByValue; -} - static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat, enum stubless_phase phase, unsigned short number_of_params)

1 0

Jacek Caban : credui: Correctly check for duplicated username entries in CredDialogFillUsernameCombo.
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: 3acde309eda9f0c6b760bdacc28621aa8abb66a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3acde309eda9f0c6b760bdac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 12 14:50:25 2018 +0200 credui: Correctly check for duplicated username entries in CredDialogFillUsernameCombo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui_main.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 1b9c71b..99aa9a1 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -160,20 +160,27 @@ static void CredDialogFillUsernameCombo(HWND hwndUsername, const struct cred_dia DWORD j; BOOL duplicate = FALSE; + if (!credentials[i]->UserName) + continue; + if (params->dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS) { - if ((credentials[i]->Type != CRED_TYPE_GENERIC) || !credentials[i]->UserName) + if (credentials[i]->Type != CRED_TYPE_GENERIC) + { + credentials[i]->UserName = NULL; continue; + } } - else + else if (credentials[i]->Type == CRED_TYPE_GENERIC) { - if (credentials[i]->Type == CRED_TYPE_GENERIC) - continue; + credentials[i]->UserName = NULL; + continue; } /* don't add another item with the same name if we've already added it */ for (j = 0; j < i; j++) - if (!strcmpW(credentials[i]->UserName, credentials[j]->UserName)) + if (credentials[j]->UserName + && !strcmpW(credentials[i]->UserName, credentials[j]->UserName)) { duplicate = TRUE; break;

1 0

Louis Lenders : prntvtp: Add stub for PTOpenProviderEx.
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: 03800be0daf82ec31933af363e2e1cea12485337 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03800be0daf82ec31933af36… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Oct 12 13:59:20 2018 +0200 prntvtp: Add stub for PTOpenProviderEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45925 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/main.c | 6 ++++++ dlls/prntvpt/prntvpt.spec | 2 +- include/prntvpt.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 72b1dcf..cdf1b6c 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -55,3 +55,9 @@ HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provid FIXME("%s, %d, %p: stub\n", debugstr_w(printer), version, provider); return E_NOTIMPL; } + +HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version) +{ + FIXME("%s, %d, %d, %p, %p: stub\n", debugstr_w(printer), max_version, pref_version, provider, used_version); + return E_NOTIMPL; +} diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index bf9a8ca..5581fa4 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,6 +1,6 @@ @ stdcall PTQuerySchemaVersionSupport(wstr ptr) @ stdcall PTOpenProvider(wstr long ptr) -@ stub PTOpenProviderEx +@ stdcall PTOpenProviderEx(wstr long long ptr ptr) @ stub PTCloseProvider @ stub BindPTProviderThunk @ stub PTGetPrintCapabilities diff --git a/include/prntvpt.h b/include/prntvpt.h index 55ecbbe..8b873dd 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -26,6 +26,7 @@ extern "C" { DECLARE_HANDLE(HPTPROVIDER); HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); +HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version); #ifdef __cplusplus }

1 0

Michał Janiszewski : winevulkan: Remove unused variable in make_vulkan.
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: 66e0e071520d8ce7236b103e48992fb939eaa09a URL: https://source.winehq.org/git/wine.git/?a=commit;h=66e0e071520d8ce7236b103e… Author: Michał Janiszewski <janisozaur(a)gmail.com> Date: Fri Oct 12 00:07:55 2018 +0200 winevulkan: Remove unused variable in make_vulkan. Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ec861bd..e96645d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1778,10 +1778,8 @@ class ConversionFunction(object): if self.direction == Direction.OUTPUT: params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] - return_type = self.type else: params = ["const {0} *in".format(self.type), "{0} *out_host".format(self.type), "uint32_t count"] - return_type = "{0}_host".format(self.type) # Generate function prototype. body = "static inline void {0}(".format(self.name)

1 0

Hans Leidekker : msi: Fix memory leaks.
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: 965ca1b4de78600366cde437c97a7208a954b18b URL: https://source.winehq.org/git/wine.git/?a=commit;h=965ca1b4de78600366cde437… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 12 16:44:02 2018 +0200 msi: Fix memory leaks. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 97bde52..3cb0f31 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -538,46 +538,49 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) if (r != ERROR_SUCCESS) return r; + hPackage = alloc_msi_remote_handle( remote_package ); + if (!hPackage) + { + ERR( "failed to create handle for %x\n", remote_package ); + midl_user_free( dll ); + midl_user_free( proc ); + return ERROR_INSTALL_FAILURE; + } + hModule = LoadLibraryW( dll ); if (!hModule) { ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); + midl_user_free( dll ); + midl_user_free( proc ); + MsiCloseHandle( hPackage ); return ERROR_SUCCESS; } fn = (MsiCustomActionEntryPoint) GetProcAddress( hModule, proc ); - if (fn) + if (!fn) WARN( "GetProcAddress(%s) failed\n", debugstr_a(proc) ); + else { - hPackage = alloc_msi_remote_handle( remote_package ); - if (hPackage) + handle_msi_break(proc); + + __TRY { - TRACE("calling %s\n", debugstr_a(proc)); - handle_msi_break(proc); - - __TRY - { - r = custom_proc_wrapper(fn, hPackage); - } - __EXCEPT_PAGE_FAULT - { - ERR("Custom action (%s:%s) caused a page fault: %08x\n", - debugstr_w(dll), debugstr_a(proc), GetExceptionCode()); - r = ERROR_SUCCESS; - } - __ENDTRY; - - MsiCloseHandle( hPackage ); + r = custom_proc_wrapper( fn, hPackage ); } - else - ERR("failed to create handle for %x\n", remote_package ); + __EXCEPT_PAGE_FAULT + { + ERR( "Custom action (%s:%s) caused a page fault: %08x\n", + debugstr_w(dll), debugstr_a(proc), GetExceptionCode() ); + r = ERROR_SUCCESS; + } + __ENDTRY; } - else - ERR("GetProcAddress(%s) failed\n", debugstr_a(proc)); FreeLibrary(hModule); midl_user_free(dll); midl_user_free(proc); + MsiCloseHandle(hPackage); return r; }

1 0

Hans Leidekker : msi: Fix the remote case for MsiViewModify( MSIMODIFY_UPDATE).
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: c494570d89f270c9240519c625c5c757a4e8ff23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c494570d89f270c9240519c6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 12 16:44:03 2018 +0200 msi: Fix the remote case for MsiViewModify(MSIMODIFY_UPDATE). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45972 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msipriv.h | 2 +- dlls/msi/msiquery.c | 4 ++-- dlls/msi/record.c | 11 ++++++----- dlls/msi/winemsi.idl | 2 ++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 76f532f..4e61fdb 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -141,8 +141,8 @@ typedef struct tagMSIFIELD typedef struct tagMSIRECORD { MSIOBJECTHDR hdr; - MSIQUERY *query; UINT count; /* as passed to MsiCreateRecord */ + UINT64 cookie; MSIFIELD fields[1]; /* nb. array size is count+1 */ } MSIRECORD; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 544bfc9..701a347 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -379,7 +379,7 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) if (r == ERROR_SUCCESS) { query->row ++; - (*prec)->query = query; + (*prec)->cookie = (UINT64)(ULONG_PTR)query; MSI_RecordSetInteger(*prec, 0, 1); } @@ -693,7 +693,7 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) if ( !view || !view->ops->modify) return ERROR_FUNCTION_FAILED; - if ( mode == MSIMODIFY_UPDATE && rec->query != query ) + if ( mode == MSIMODIFY_UPDATE && rec->cookie != (UINT64)(ULONG_PTR)query ) return ERROR_FUNCTION_FAILED; r = view->ops->modify( view, mode, rec, query->row ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index a7d5588..cca6308 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -1064,6 +1064,7 @@ UINT copy_remote_record(const struct wire_record *in, MSIHANDLE out) if (!(rec = msihandle2msiinfo(out, MSIHANDLETYPE_RECORD))) return ERROR_INVALID_HANDLE; + rec->cookie = in->cookie; for (i = 0; i <= in->count; i++) { switch (in->fields[i].type) @@ -1114,17 +1115,17 @@ UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out) struct wire_record *marshal_record(MSIHANDLE handle) { struct wire_record *ret; - unsigned int i, count; + unsigned int i; MSIRECORD *rec; if (!(rec = msihandle2msiinfo(handle, MSIHANDLETYPE_RECORD))) return NULL; - count = MSI_RecordGetFieldCount(rec); - ret = midl_user_allocate(sizeof(*ret) + count * sizeof(ret->fields[0])); - ret->count = count; + ret = midl_user_allocate(sizeof(*ret) + rec->count * sizeof(ret->fields[0])); + ret->count = rec->count; + ret->cookie = rec->cookie; - for (i = 0; i <= count; i++) + for (i = 0; i <= rec->count; i++) { switch (rec->fields[i].type) { diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index ebbca82..1658603 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -51,8 +51,10 @@ struct wire_field { int len; }; +/* compatible with MSIRECORD minus header */ struct wire_record { unsigned int count; + UINT64 cookie; [size_is(count+1)] struct wire_field fields[]; };

1 0

Matteo Bruni : wined3d: Dump buffer descriptor in wined3d_buffer_create().
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: 097c4b135bf9dd409a17d3ec667c8c8cbb690589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=097c4b135bf9dd409a17d3ec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 12 15:39:53 2018 +0200 wined3d: Dump buffer descriptor in wined3d_buffer_create(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 7 +++++-- dlls/wined3d/utils.c | 21 +++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e20d66c..e7b0515 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1445,8 +1445,11 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct struct wined3d_buffer *object; HRESULT hr; - TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p.\n", - device, desc, data, parent, parent_ops, buffer); + TRACE("device %p, desc byte_width %u, usage %s, bind_flags %s, access %s, data %p, parent %p, " + "parent_ops %p, buffer %p.\n", + device, desc->byte_width, debug_d3dusage(desc->usage), + wined3d_debug_bind_flags(desc->bind_flags), wined3d_debug_resource_access(desc->access), + data, parent, parent_ops, buffer); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e3df24a..d62578b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4447,6 +4447,27 @@ const char *wined3d_debug_resource_access(DWORD access) return wine_dbg_sprintf("%s", buffer.str); } +const char *wined3d_debug_bind_flags(DWORD bind_flags) +{ + struct debug_buffer buffer; + + init_debug_buffer(&buffer, "0"); +#define BIND_FLAG_TO_STR(x) if (bind_flags & x) { debug_append(&buffer, #x, " | "); bind_flags &= ~x; } + BIND_FLAG_TO_STR(WINED3D_BIND_VERTEX_BUFFER); + BIND_FLAG_TO_STR(WINED3D_BIND_INDEX_BUFFER); + BIND_FLAG_TO_STR(WINED3D_BIND_CONSTANT_BUFFER); + BIND_FLAG_TO_STR(WINED3D_BIND_SHADER_RESOURCE); + BIND_FLAG_TO_STR(WINED3D_BIND_STREAM_OUTPUT); + BIND_FLAG_TO_STR(WINED3D_BIND_RENDER_TARGET); + BIND_FLAG_TO_STR(WINED3D_BIND_DEPTH_STENCIL); + BIND_FLAG_TO_STR(WINED3D_BIND_UNORDERED_ACCESS); +#undef BIND_FLAG_TO_STR + if (bind_flags) + FIXME("Unrecognised bind flag(s) %#x.\n", bind_flags); + + return wine_dbg_sprintf("%s", buffer.str); +} + const char *debug_d3dusage(DWORD usage) { struct debug_buffer buffer; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 19945cf..dbab1aa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3064,6 +3064,7 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta } const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; +const char *wined3d_debug_bind_flags(DWORD bind_flags) DECLSPEC_HIDDEN; static inline BOOL wined3d_resource_access_is_managed(unsigned int access) {

1 0

Matteo Bruni : wined3d: Dump view descriptor contents.
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: c7568a57067b1d51d0918c800cbfc71d204d260f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7568a57067b1d51d0918c80… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 12 15:39:54 2018 +0200 wined3d: Dump view descriptor contents. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 25 +++++++++++++++++++++++++ dlls/wined3d/view.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d62578b..da01bbb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4468,6 +4468,31 @@ const char *wined3d_debug_bind_flags(DWORD bind_flags) return wine_dbg_sprintf("%s", buffer.str); } +const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const struct wined3d_resource *resource) +{ + struct debug_buffer buffer; + unsigned int flags = d->flags; + + init_debug_buffer(&buffer, "0"); +#define VIEW_FLAG_TO_STR(x) if (flags & x) { debug_append(&buffer, #x, " | "); flags &= ~x; } + VIEW_FLAG_TO_STR(WINED3D_VIEW_BUFFER_RAW); + VIEW_FLAG_TO_STR(WINED3D_VIEW_BUFFER_APPEND); + VIEW_FLAG_TO_STR(WINED3D_VIEW_BUFFER_COUNTER); + VIEW_FLAG_TO_STR(WINED3D_VIEW_TEXTURE_CUBE); + VIEW_FLAG_TO_STR(WINED3D_VIEW_TEXTURE_ARRAY); +#undef VIEW_FLAG_TO_STR + if (flags) + FIXME("Unrecognised view flag(s) %#x.\n", flags); + + if (resource->type == WINED3D_RTYPE_BUFFER) + return wine_dbg_sprintf("format %s, flags %s, start_idx %u, count %u", + debug_d3dformat(d->format_id), buffer.str, d->u.buffer.start_idx, d->u.buffer.count); + else + return wine_dbg_sprintf("format %s, flags %s, level_idx %u, level_count %u, layer_idx %u, layer_count %u", + debug_d3dformat(d->format_id), buffer.str, d->u.texture.level_idx, d->u.texture.level_count, + d->u.texture.layer_idx, d->u.texture.layer_count); +} + const char *debug_d3dusage(DWORD usage) { struct debug_buffer buffer; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index b8a3568..3662250 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -620,8 +620,8 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_view_desc *d struct wined3d_rendertarget_view *object; HRESULT hr; - TRACE("desc %p, resource %p, parent %p, parent_ops %p, view %p.\n", - desc, resource, parent, parent_ops, view); + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -799,8 +799,8 @@ HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc struct wined3d_shader_resource_view *object; HRESULT hr; - TRACE("desc %p, resource %p, parent %p, parent_ops %p, view %p.\n", - desc, resource, parent, parent_ops, view); + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -1167,8 +1167,8 @@ HRESULT CDECL wined3d_unordered_access_view_create(const struct wined3d_view_des struct wined3d_unordered_access_view *object; HRESULT hr; - TRACE("desc %p, resource %p, parent %p, parent_ops %p, view %p.\n", - desc, resource, parent, parent_ops, view); + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dbab1aa..c376186 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3065,6 +3065,8 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; const char *wined3d_debug_bind_flags(DWORD bind_flags) DECLSPEC_HIDDEN; +const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, + const struct wined3d_resource *resource) DECLSPEC_HIDDEN; static inline BOOL wined3d_resource_access_is_managed(unsigned int access) {

1 0

Matteo Bruni : wined3d: Invalidate shader resource bindings after binding texture view.
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: 237136d2f7a92300feb7342b3228e9b31fbcc66d URL: https://source.winehq.org/git/wine.git/?a=commit;h=237136d2f7a92300feb7342b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 12 15:39:55 2018 +0200 wined3d: Invalidate shader resource bindings after binding texture view. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 3662250..7bb8b81 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -234,6 +234,9 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target wined3d_gl_texture_swizzle_from_color_fixup(swizzle, view_format->color_fixup); gl_info->gl_ops.gl.p_glTexParameteriv(view->target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); checkGLcall("set format swizzle"); + + context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); + context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); } context_release(context);

1 0