October 2018 - Wine-Commits

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

Oct. 12, 2018

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

Matteo Bruni : wined3d: Dump view descriptor contents.
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

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

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

Oct. 12, 2018

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

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

Oct. 12, 2018

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

Akihiro Sagawa : gdi32: Use the helper function to order the points of a rectangle.
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: master Commit: bdfbd32e8581465fac823d30a0ee5ea412f06a73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdfbd32e8581465fac823d30… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Oct 12 00:35:34 2018 +0900 gdi32: Use the helper function to order the points of a rectangle. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 0f21283..c8d67cb 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -40,13 +40,6 @@ static inline BOOL rop_uses_src( DWORD rop ) return ((rop >> 2) & 0x330000) != (rop & 0x330000); } -static inline void swap_ints( int *i, int *j ) -{ - int tmp = *i; - *i = *j; - *j = tmp; -} - BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords *src ) { RECT rect; @@ -70,8 +63,7 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * rect.top = dst->y + rect.top * dst->height / abs(src->height); rect.right = dst->x + rect.right * dst->width / abs(src->width); rect.bottom = dst->y + rect.bottom * dst->height / abs(src->height); - if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); - if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom ); + order_rect( &rect ); /* avoid rounding errors */ rect.left--; @@ -88,8 +80,7 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * rect.top = src->y + rect.top * src->height / abs(dst->height); rect.right = src->x + rect.right * src->width / abs(dst->width); rect.bottom = src->y + rect.bottom * src->height / abs(dst->height); - if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); - if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom ); + order_rect( &rect ); /* avoid rounding errors */ rect.left--;

1 0

Tag wine-3.18 : Alexandre Julliard : Release 3.18
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: refs/tags/wine-3.18 Tag: 77bead7d8cee04eea59824352ccd2f737633e61f URL: https://source.winehq.org/git/wine.git/?a=tag;h=77bead7d8cee04eea59824352cc… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 13 00:59:01 2018 +0200 Release 3.18

1 0

Serge Gautherie : ddraw: Get rid of a redundant assignment in ddraw7_GetDisplayMode().
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: master Commit: ff64475e99973b24e4679736cff2c08805805ed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff64475e99973b24e4679736… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Fri Oct 12 21:09:10 2018 +0330 ddraw: Get rid of a redundant assignment in ddraw7_GetDisplayMode(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e9e06ee..43bc36b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1648,11 +1648,10 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 memset(DDSD, 0, DDSD->dwSize); DDSD->dwSize = sizeof(*DDSD); - DDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; + DDSD->dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; DDSD->dwWidth = mode.width; DDSD->dwHeight = mode.height; DDSD->u2.dwRefreshRate = 60; - DDSD->ddsCaps.dwCaps = 0; DDSD->u4.ddpfPixelFormat.dwSize = sizeof(DDSD->u4.ddpfPixelFormat); ddrawformat_from_wined3dformat(&DDSD->u4.ddpfPixelFormat, mode.format_id); DDSD->u1.lPitch = mode.width * DDSD->u4.ddpfPixelFormat.u1.dwRGBBitCount / 8;

1 0

Jacek Caban : ntdll/tests: Use FILE_INFORMATION_CLASS values instead of hardcoded numbers.
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: master Commit: a0669eeeadfe3bb57b46ce8bc7434ad9d7f6045f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0669eeeadfe3bb57b46ce8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 12 17:50:06 2018 +0200 ntdll/tests: Use FILE_INFORMATION_CLASS values instead of hardcoded numbers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index ebf228d..dcd7c3c 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -218,7 +218,7 @@ static void test_create_invalid(void) 0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout); ok(!res, "NtCreateNamedPipeFile returned %x\n", res); - res = pNtQueryInformationFile(handle, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); + res = pNtQueryInformationFile(handle, &iosb, &info, sizeof(info), FilePipeLocalInformation); ok(res == STATUS_ACCESS_DENIED, "NtQueryInformationFile returned %x\n", res); /* test FILE_CREATE creation disposition */ @@ -258,14 +258,14 @@ static void test_create(void) res = listen_pipe(hserver, hEvent, &iosb, FALSE); ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res); - res = pNtQueryInformationFile(hserver, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); + res = pNtQueryInformationFile(hserver, &iosb, &info, sizeof(info), FilePipeLocalInformation); ok(!res, "NtQueryInformationFile for server returned %x, sharing: %x\n", res, sharing[j]); ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n", info.NamedPipeConfiguration, pipe_config[j]); hclient = CreateFileW(testpipe, access[k], 0, 0, OPEN_EXISTING, 0, 0); if (hclient != INVALID_HANDLE_VALUE) { - res = pNtQueryInformationFile(hclient, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); + res = pNtQueryInformationFile(hclient, &iosb, &info, sizeof(info), FilePipeLocalInformation); ok(!res, "NtQueryInformationFile for client returned %x, access: %x, sharing: %x\n", res, access[k], sharing[j]); ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n", @@ -564,7 +564,7 @@ static void _check_pipe_handle_state(int line, HANDLE handle, ULONG read, ULONG if (handle != INVALID_HANDLE_VALUE) { memset(&fpi, 0x55, sizeof(fpi)); - res = pNtQueryInformationFile(handle, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtQueryInformationFile(handle, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok_(__FILE__, line)(!res, "NtQueryInformationFile returned %x\n", res); ok_(__FILE__, line)(fpi.ReadMode == read, "Unexpected ReadMode, expected %x, got %x\n", read, fpi.ReadMode); @@ -597,12 +597,12 @@ static void test_filepipeinfo(void) timeout.QuadPart = -100000000; /* test with INVALID_HANDLE_VALUE */ - res = pNtQueryInformationFile(INVALID_HANDLE_VALUE, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtQueryInformationFile(INVALID_HANDLE_VALUE, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_OBJECT_TYPE_MISMATCH, "NtQueryInformationFile returned %x\n", res); fpi.ReadMode = 0; fpi.CompletionMode = 0; - res = pNtSetInformationFile(INVALID_HANDLE_VALUE, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(INVALID_HANDLE_VALUE, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_OBJECT_TYPE_MISMATCH, "NtSetInformationFile returned %x\n", res); /* server end with read-only attributes */ @@ -622,7 +622,7 @@ static void test_filepipeinfo(void) fpi.ReadMode = 0; fpi.CompletionMode = 0; - res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %x\n", res); check_pipe_handle_state(hServer, 0, 1); @@ -630,7 +630,7 @@ static void test_filepipeinfo(void) fpi.ReadMode = 1; /* invalid on a byte stream pipe */ fpi.CompletionMode = 1; - res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %x\n", res); check_pipe_handle_state(hServer, 0, 1); @@ -640,7 +640,7 @@ static void test_filepipeinfo(void) { fpi.ReadMode = 1; /* invalid on a byte stream pipe */ fpi.CompletionMode = 1; - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_INVALID_PARAMETER, "NtSetInformationFile returned %x\n", res); } @@ -651,7 +651,7 @@ static void test_filepipeinfo(void) { fpi.ReadMode = 0; fpi.CompletionMode = 1; - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(!res, "NtSetInformationFile returned %x\n", res); } @@ -662,12 +662,12 @@ static void test_filepipeinfo(void) { fpi.ReadMode = 0; fpi.CompletionMode = 2; /* not in range 0-1 */ - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res); fpi.ReadMode = 2; /* not in range 0-1 */ fpi.CompletionMode = 0; - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res); } @@ -677,7 +677,7 @@ static void test_filepipeinfo(void) fpi.ReadMode = 0; fpi.CompletionMode = 0; - res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %x\n", res); CloseHandle(hServer); @@ -701,7 +701,7 @@ static void test_filepipeinfo(void) { fpi.ReadMode = 1; fpi.CompletionMode = 1; - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(!res, "NtSetInformationFile returned %x\n", res); } @@ -710,7 +710,7 @@ static void test_filepipeinfo(void) fpi.ReadMode = 0; fpi.CompletionMode = 1; - res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(!res, "NtSetInformationFile returned %x\n", res); check_pipe_handle_state(hServer, 0, 1); @@ -720,12 +720,12 @@ static void test_filepipeinfo(void) { fpi.ReadMode = 0; fpi.CompletionMode = 2; /* not in range 0-1 */ - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res); fpi.ReadMode = 2; /* not in range 0-1 */ fpi.CompletionMode = 0; - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res); } @@ -735,7 +735,7 @@ static void test_filepipeinfo(void) fpi.ReadMode = 1; fpi.CompletionMode = 0; - res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(!res, "NtSetInformationFile returned %x\n", res); check_pipe_handle_state(hServer, 1, 0);

1 0

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

Oct. 12, 2018

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: Avoid using GL_MAX_VARYING_FLOATS_ARB in core profile contexts.
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: master Commit: 985b96b09e3608498ca717abe384a5d37fab31e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=985b96b09e3608498ca717ab… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 12 15:39:57 2018 +0200 wined3d: Avoid using GL_MAX_VARYING_FLOATS_ARB in core profile contexts. 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/adapter_gl.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index cedfe23..99df19c 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3079,9 +3079,18 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, &gl_max); gl_info->limits.glsl_ps_float_constants = gl_max / 4; TRACE("Max ARB_FRAGMENT_SHADER float constants: %u.\n", gl_info->limits.glsl_ps_float_constants); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VARYING_FLOATS_ARB, &gl_max); - gl_info->limits.glsl_varyings = gl_max; - TRACE("Max GLSL varyings: %u (%u 4 component varyings).\n", gl_max, gl_max / 4); + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VARYING_FLOATS_ARB, &gl_max); + gl_info->limits.glsl_varyings = gl_max; + } + else + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAGMENT_INPUT_COMPONENTS, &gl_max); + gl_info->limits.glsl_varyings = gl_max - 4; + } + TRACE("Max GLSL varyings: %u (%u 4 component varyings).\n", gl_info->limits.glsl_varyings, + gl_info->limits.glsl_varyings / 4); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) {

1 0