September 2020 - Wine-Commits

Paul Gofman : wined3d: Don't check for readonly depth / stencil in context_preload_texture().
by Alexandre Julliard Sept. 24, 2020

Sept. 24, 2020

Module: wine Branch: master Commit: 774e4b2ea39c3a4c6c004cc454d8202864587fbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=774e4b2ea39c3a4c6c004cc4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 24 15:15:11 2020 +0300 wined3d: Don't check for readonly depth / stencil in context_preload_texture(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 3 ++- dlls/wined3d/device.c | 5 ++++- dlls/wined3d/wined3d_private.h | 13 ------------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3a263e1f6b..08c6e27922 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -347,7 +347,8 @@ static void context_preload_texture(struct wined3d_context *context, if (!(texture = state->textures[idx])) return; - if (wined3d_resource_check_fbo_attached(state, &texture->resource, NULL)) + if (texture->resource.rtv_bind_count_device || (state->fb.depth_stencil + && state->fb.depth_stencil->resource == &texture->resource)) context->uses_fbo_attached_resources = 1; wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3c6affe594..8a69132784 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1952,6 +1952,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_constant_buffer(const struct wi static void wined3d_device_set_shader_resource_view(struct wined3d_device *device, enum wined3d_shader_type type, UINT idx, struct wined3d_shader_resource_view *view) { + const struct wined3d_rendertarget_view *dsv; struct wined3d_shader_resource_view *prev; if (idx >= MAX_SHADER_RESOURCE_VIEWS) @@ -1964,7 +1965,9 @@ static void wined3d_device_set_shader_resource_view(struct wined3d_device *devic if (view == prev) return; - if (view && wined3d_resource_check_fbo_attached(&device->state, view->resource, view->format)) + if (view && (view->resource->rtv_bind_count_device + || ((dsv = device->state.fb.depth_stencil) + && dsv->resource == view->resource && wined3d_dsv_srv_conflict(dsv, view->format)))) { WARN("Application is trying to bind resource which is attached as render target.\n"); view = NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 45ed232099..61bde16501 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5973,19 +5973,6 @@ static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_vi || (srv_format->green_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL)); } -static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, - const struct wined3d_resource *resource, const struct wined3d_format *srv_format) -{ - const struct wined3d_rendertarget_view *dsv; - - if ((resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && (dsv = state->fb.depth_stencil) && dsv->resource == resource - && wined3d_dsv_srv_conflict(dsv, srv_format)) - return TRUE; - - return resource->rtv_bind_count_device; -} - static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view *rtv) { ++rtv->resource->rtv_bind_count_device;

1 0

Paul Gofman : wined3d: Track SRV to RTV aliasing on sub resource level.
by Alexandre Julliard Sept. 24, 2020

Sept. 24, 2020

Module: wine Branch: master Commit: 61e02c5e4f20de6c82342a2ffaa001150bd7c56f URL: https://source.winehq.org/git/wine.git/?a=commit;h=61e02c5e4f20de6c82342a2f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 24 15:15:12 2020 +0300 wined3d: Track SRV to RTV aliasing on sub resource level. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 70 +++++++++++++++-- dlls/wined3d/device.c | 11 +-- dlls/wined3d/resource.c | 1 + dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d_private.h | 169 ++++++++++++++++++++++++++++++++++++++++- 5 files changed, 238 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61e02c5e4f20de6c8234…

1 0

Zebediah Figura : wined3d: Factor out wined3d_state_uses_depth_buffer().
by Alexandre Julliard Sept. 24, 2020

Sept. 24, 2020

Module: wine Branch: master Commit: 8b4e07d5f3ab3c02061530600a81323151892172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b4e07d5f3ab3c0206153060… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 23 23:51:57 2020 -0500 wined3d: Factor out wined3d_state_uses_depth_buffer(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/context_vk.c | 8 +++----- dlls/wined3d/device.c | 3 +-- dlls/wined3d/wined3d_private.h | 5 +++++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index b7ca8ceca2..e3eae3aab5 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4491,7 +4491,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s * that we never copy the stencil data.*/ DWORD location = context->render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) + if (wined3d_state_uses_depth_buffer(state)) wined3d_rendertarget_view_load_location(dsv, context, location); else wined3d_rendertarget_view_prepare_location(dsv, context, location); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index a7c77dd5a6..aef2430208 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2138,8 +2138,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont ++attachment_count; } - if ((state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) - && (view = state->fb.depth_stencil)) + if (wined3d_state_uses_depth_buffer(state) && (view = state->fb.depth_stencil)) { rtv_vk = wined3d_rendertarget_view_vk(view); vk_views[attachment_count] = wined3d_rendertarget_view_vk_get_image_view(rtv_vk, context_vk); @@ -2155,8 +2154,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont } if (!(context_vk->vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, &state->fb, - ARRAY_SIZE(state->fb.render_targets), state->render_states[WINED3D_RS_ZWRITEENABLE] - || state->render_states[WINED3D_RS_ZENABLE], 0))) + ARRAY_SIZE(state->fb.render_targets), wined3d_state_uses_depth_buffer(state), 0))) { ERR("Failed to get render pass.\n"); return false; @@ -2845,7 +2843,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if ((dsv = state->fb.depth_stencil)) { - if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) + if (wined3d_state_uses_depth_buffer(state)) wined3d_rendertarget_view_load_location(dsv, &context_vk->c, dsv->resource->draw_binding); else wined3d_rendertarget_view_prepare_location(dsv, &context_vk->c, dsv->resource->draw_binding); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 13d8bce1ac..3fce04673a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4264,8 +4264,7 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device } } - if (state->render_states[WINED3D_RS_ZENABLE] || state->render_states[WINED3D_RS_ZWRITEENABLE] - || state->render_states[WINED3D_RS_STENCILENABLE]) + if (wined3d_state_uses_depth_buffer(state) || state->render_states[WINED3D_RS_STENCILENABLE]) { struct wined3d_rendertarget_view *rt = device->state.fb.render_targets[0]; struct wined3d_rendertarget_view *ds = device->state.fb.depth_stencil; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2be81ee2a0..0ed1f13381 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3624,6 +3624,11 @@ struct wined3d_state struct wined3d_rasterizer_state *rasterizer_state; }; +static inline bool wined3d_state_uses_depth_buffer(const struct wined3d_state *state) +{ + return state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]; +} + struct wined3d_dummy_textures { GLuint tex_1d;

1 0

Piotr Caban : gdi32: Share font_gamma_ramp structure between all DCs.
by Alexandre Julliard Sept. 24, 2020

Sept. 24, 2020

Module: wine Branch: master Commit: 2370e7b9a14f461cb4cedd29114b8268158e450d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2370e7b9a14f461cb4cedd29… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 23 17:44:57 2020 +0200 gdi32: Share font_gamma_ramp structure between all DCs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 1 - dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/font.c | 18 ++++++++++++------ dlls/gdi32/gdi_private.h | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c24b96e275..230f1949e8 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -168,7 +168,6 @@ static void free_dc_state( DC *dc ) if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); if (dc->region) DeleteObject( dc->region ); if (dc->path) free_gdi_path( dc->path ); - HeapFree( GetProcessHeap(), 0, dc->font_gamma_ramp ); HeapFree( GetProcessHeap(), 0, dc ); } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 98e1b0fba9..5369776484 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -88,7 +88,7 @@ struct intensity_range struct font_intensities { struct intensity_range ranges[17]; - struct font_gamma_ramp *gamma_ramp; + const struct font_gamma_ramp *gamma_ramp; }; typedef struct dibdrv_physdev diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e099bec5e8..a71b24423a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -730,20 +730,17 @@ static void update_font_code_page( DC *dc, HANDLE font ) TRACE("charset %d => cp %d\n", charset, dc->font_code_page); } -static struct font_gamma_ramp *get_font_gamma_ramp( void ) +static BOOL WINAPI fill_font_gamma_ramp( INIT_ONCE *once, void *param, void **context ) { static const WCHAR desktopW[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', 'D','e','s','k','t','o','p',0 }; static const WCHAR smoothing_gamma[] = { 'F','o','n','t','S','m','o','o','t','h','i','n','g', 'G','a','m','m','a',0 }; + struct font_gamma_ramp *ramp = param; const DWORD gamma_default = 1400; - struct font_gamma_ramp *ramp; DWORD i, gamma; HKEY key; - ramp = HeapAlloc( GetProcessHeap(), 0, sizeof(*ramp) ); - if ( ramp == NULL) return NULL; - gamma = gamma_default; if (RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key ) == ERROR_SUCCESS) { @@ -768,7 +765,16 @@ static struct font_gamma_ramp *get_font_gamma_ramp( void ) ramp->gamma = gamma; TRACE("gamma %d\n", ramp->gamma); - return ramp; + return TRUE; +} + +static struct font_gamma_ramp *get_font_gamma_ramp( void ) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + static struct font_gamma_ramp ramp; + + InitOnceExecuteOnce( &init_once, fill_font_gamma_ramp, &ramp, NULL ); + return &ramp; } /*********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 4bb4661966..7f83732372 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -99,7 +99,7 @@ typedef struct tagDC struct gdi_path *path; - struct font_gamma_ramp *font_gamma_ramp; + const struct font_gamma_ramp *font_gamma_ramp; UINT font_code_page; WORD ROPmode;

1 0

Biswapriyo Nath : include/ddraw.h: Add missing dwFlags of DD_BLTDATA struct.
by Alexandre Julliard Sept. 24, 2020

Sept. 24, 2020

Module: wine Branch: master Commit: 94db5c87195943957086f03b8a2f7fb3c5b3dff8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94db5c87195943957086f03b… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Sep 23 21:10:11 2020 +0530 include/ddraw.h: Add missing dwFlags of DD_BLTDATA struct. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddraw.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ddraw.h b/include/ddraw.h index a3fd90dd37..0c14c46812 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -227,6 +227,10 @@ typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL; #define DDBLT_WAIT 0x01000000 #define DDBLT_DEPTHFILL 0x02000000 #define DDBLT_DONOTWAIT 0x08000000 +#define DDBLT_PRESENTATION 0x10000000 +#define DDBLT_LAST_PRESENTATION 0x20000000 +#define DDBLT_EXTENDED_FLAGS 0x40000000 +#define DDBLT_EXTENDED_LINEAR_CONTENT 0x00000004 /* dwTrans for BltFast */ #define DDBLTFAST_NOCOLORKEY 0x00000000

1 0

Piotr Caban : setupapi: Copy all files specified in manifest on wine dll install.
by Alexandre Julliard Sept. 24, 2020

Sept. 24, 2020

Module: wine Branch: master Commit: d851b2f84f6b1152e2707c0015609649fba304e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d851b2f84f6b1152e2707c00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 22 16:12:38 2020 +0200 setupapi: Copy all files specified in manifest on wine dll install. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 150 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 111 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d851b2f84f6b1152e270…

1 0

Zebediah Figura : ntdll: Pass the token to NtCreateUserProcess().
by Alexandre Julliard Sept. 24, 2020

Sept. 24, 2020

Module: wine Branch: master Commit: 6cf3561ff3df814e7450d63769620441e4ea1265 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cf3561ff3df814e7450d637… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 23 23:44:53 2020 -0500 ntdll: Pass the token to NtCreateUserProcess(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index b6b0f10b9b..4cf83753a7 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -56,12 +56,12 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes, RTL_USER_PROCESS_PARAMETERS *params, SECURITY_DESCRIPTOR *process_descr, SECURITY_DESCRIPTOR *thread_descr, - HANDLE parent, BOOLEAN inherit, HANDLE debug, HANDLE exception, + HANDLE parent, BOOLEAN inherit, HANDLE debug, HANDLE token, RTL_USER_PROCESS_INFORMATION *info ) { OBJECT_ATTRIBUTES process_attr, thread_attr; PS_CREATE_INFO create_info; - ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[5] ) / sizeof(ULONG_PTR)]; + ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[6] ) / sizeof(ULONG_PTR)]; PS_ATTRIBUTE_LIST *attr = (PS_ATTRIBUTE_LIST *)buffer; UINT pos = 0; @@ -98,6 +98,14 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes, attr->Attributes[pos].ReturnLength = NULL; pos++; } + if (token) + { + attr->Attributes[pos].Attribute = PS_ATTRIBUTE_TOKEN; + attr->Attributes[pos].Size = sizeof(token); + attr->Attributes[pos].ValuePtr = token; + attr->Attributes[pos].ReturnLength = NULL; + pos++; + } attr->TotalLength = offsetof( PS_ATTRIBUTE_LIST, Attributes[pos] ); InitializeObjectAttributes( &process_attr, NULL, 0, NULL, process_descr );

1 0

Paul Gofman : wined3d: Track resource binding as render target.
by Alexandre Julliard Sept. 24, 2020

Sept. 24, 2020

Module: wine Branch: master Commit: 1b8ccaab47dadd0beb1f55118b40ab905304908e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b8ccaab47dadd0beb1f5511… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 24 15:15:10 2020 +0300 wined3d: Track resource binding as render target. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 12 +++++++++++- dlls/wined3d/wined3d_private.h | 20 +++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3fce04673a..3c6affe594 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1060,6 +1060,7 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str static const struct wined3d_color black = {0.0f, 0.0f, 0.0f, 0.0f}; const struct wined3d_swapchain_desc *swapchain_desc; DWORD clear_flags = 0; + unsigned int i; HRESULT hr; TRACE("device %p, swapchain %p.\n", device, swapchain); @@ -1096,6 +1097,10 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str } device->swapchains[0] = swapchain; + for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) + if (device->state.fb.render_targets[i]) + wined3d_rtv_bind_count_dec(device->state.fb.render_targets[i]); + memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) goto err_out; @@ -4849,13 +4854,19 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device return WINED3D_OK; if (view) + { wined3d_rendertarget_view_incref(view); + wined3d_rtv_bind_count_inc(view); + } device->state.fb.render_targets[view_idx] = view; wined3d_cs_emit_set_rendertarget_view(device->cs, view_idx, view); /* Release after the assignment, to prevent device_resource_released() * from seeing the surface as still in use. */ if (prev) + { + wined3d_rtv_bind_count_dec(prev); wined3d_rendertarget_view_decref(prev); + } wined3d_unbind_srv_for_rtv(device, view, FALSE); @@ -4888,7 +4899,6 @@ HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *devic wined3d_cs_emit_set_depth_stencil_view(device->cs, view); if (prev) wined3d_rendertarget_view_decref(prev); - wined3d_unbind_srv_for_rtv(device, view, TRUE); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ed1f13381..45ed232099 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3936,7 +3936,8 @@ struct wined3d_resource { LONG ref; LONG bind_count; - LONG srv_bind_count_device; + uint32_t srv_bind_count_device; + uint32_t rtv_bind_count_device; LONG map_count; LONG access_count; struct wined3d_device *device; @@ -5975,23 +5976,24 @@ static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_vi static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, const struct wined3d_resource *resource, const struct wined3d_format *srv_format) { - struct wined3d_rendertarget_view * const *rts = &state->fb.render_targets[0]; const struct wined3d_rendertarget_view *dsv; - unsigned int i; if ((resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) && (dsv = state->fb.depth_stencil) && dsv->resource == resource && wined3d_dsv_srv_conflict(dsv, srv_format)) return TRUE; - if (!(resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) - return FALSE; + return resource->rtv_bind_count_device; +} - for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) - if (rts[i] && rts[i]->resource == resource) - return TRUE; +static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view *rtv) +{ + ++rtv->resource->rtv_bind_count_device; +} - return FALSE; +static inline void wined3d_rtv_bind_count_dec(struct wined3d_rendertarget_view *rtv) +{ + --rtv->resource->rtv_bind_count_device; } static inline void wined3d_viewport_get_z_range(const struct wined3d_viewport *vp, float *min_z, float *max_z)

1 0

Piotr Caban : setupapi: Remove unused end parameter from next_xml_attr internal function.
by Alexandre Julliard Sept. 24, 2020

Sept. 24, 2020

Module: wine Branch: master Commit: 9fb0d9fe39d0d629c982f0f873aee627aa3f65e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fb0d9fe39d0d629c982f0f8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 22 16:12:15 2020 +0200 setupapi: Remove unused end parameter from next_xml_attr internal function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index e83bbb2512..7b4b14fa2c 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -554,8 +554,7 @@ static BOOL next_xml_elem( xmlbuf_t *xmlbuf, xmlstr_t *elem ) return xmlbuf->ptr != xmlbuf->end; } -static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, - BOOL* error, BOOL* end) +static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, BOOL* error) { const char *ptr; @@ -573,7 +572,6 @@ static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, return FALSE; xmlbuf->ptr++; - *end = TRUE; *error = FALSE; return FALSE; } @@ -727,7 +725,7 @@ static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR xmlbuf_t buffer; xmlstr_t elem, attr_name, attr_value; xmlstr_t name, version, arch, key, lang; - BOOL end = FALSE, error; + BOOL error; const char *manifest; SIZE_T len; HRSRC rsrc; @@ -746,7 +744,7 @@ static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR while (next_xml_elem( &buffer, &elem )) { if (!xmlstr_cmp( &elem, "assemblyIdentity" )) continue; - while (next_xml_attr( &buffer, &attr_name, &attr_value, &error, &end )) + while (next_xml_attr( &buffer, &attr_name, &attr_value, &error )) { if (xmlstr_cmp(&attr_name, "name")) name = attr_value; else if (xmlstr_cmp(&attr_name, "version")) version = attr_value;

1 0

Vijay Kiran Kamuju : include: Remove duplicated defines in winnt.h.
by Alexandre Julliard Sept. 24, 2020

Sept. 24, 2020

Module: wine Branch: master Commit: e5d780272951426de174671d2e581a39946f2a6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5d780272951426de174671d… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Sep 24 09:29:03 2020 +0200 include: Remove duplicated defines in winnt.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 1eb82876f1..f59a63c041 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4288,15 +4288,9 @@ typedef enum _TOKEN_INFORMATION_CLASS { TOKEN_ADJUST_SESSIONID | \ TOKEN_ADJUST_DEFAULT ) -#define DISABLE_MAX_PRIVILEGE 0x1 -#define SANDBOX_INERT 0x2 -#define LUA_TOKEN 0x4 -#define WRITE_RESTRICTED 0x8 - #ifndef _SECURITY_DEFINED #define _SECURITY_DEFINED - typedef DWORD ACCESS_MASK, *PACCESS_MASK; typedef struct _GENERIC_MAPPING {

1 0