March 2016 - Wine-commits - list.winehq.org

Józef Kucia : wined3d: Introduce helper function for binding buffers.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 4affb95ebb87645a3127130d16aee9a8c6335c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4affb95ebb87645a3127130d1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:47 2016 +0100 wined3d: Introduce helper function for binding buffers. Signed-off-by: Józef Kucia <jkucia(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 | 53 ++++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3d4ab55..68c9af5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -100,6 +100,17 @@ static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) return FALSE; } +/* Context activation is done by the caller. */ +static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER) + context_invalidate_state(context, STATE_INDEXBUFFER); + + GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); +} + /* Context activation is done by the caller */ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) { @@ -148,9 +159,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine goto fail; } - if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(This->buffer_type_hint, This->buffer_object)); + buffer_bind(This, context); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -486,25 +495,23 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) } /* Context activation is done by the caller. */ -BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) +BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; /* Heap_memory exists if the buffer is double buffered or has no buffer object at all. */ - if (This->resource.heap_memory) - return This->resource.heap_memory; + if (buffer->resource.heap_memory) + return buffer->resource.heap_memory; - if (!wined3d_resource_allocate_sysmem(&This->resource)) + if (!wined3d_resource_allocate_sysmem(&buffer->resource)) ERR("Failed to allocate system memory.\n"); - if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - - GL_EXTCALL(glBindBuffer(This->buffer_type_hint, This->buffer_object)); - GL_EXTCALL(glGetBufferSubData(This->buffer_type_hint, 0, This->resource.size, This->resource.heap_memory)); - This->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + buffer_bind(buffer, context); + GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); + checkGLcall("buffer download"); + buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; - return This->resource.heap_memory; + return buffer->resource.heap_memory; } static void buffer_unload(struct wined3d_resource *resource) @@ -977,9 +984,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN context = context_acquire(device, NULL); gl_info = context->gl_info; - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); + buffer_bind(buffer, context); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { @@ -1076,9 +1081,7 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) context = context_acquire(device, NULL); gl_info = context->gl_info; - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); + buffer_bind(buffer, context); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { @@ -1167,19 +1170,13 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ } else if (dst_buffer_mem && !src_buffer_mem) { - if (src_buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(src_buffer->buffer_type_hint, src_bo_address.buffer_object)); - + buffer_bind(src_buffer, context); GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst_buffer_mem + dst_offset)); checkGLcall("buffer download"); } else if (!dst_buffer_mem && src_buffer_mem) { - if (dst_buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(dst_buffer->buffer_type_hint, dst_bo_address.buffer_object)); - + buffer_bind(dst_buffer, context); GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src_buffer_mem + src_offset)); checkGLcall("buffer upload"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7d7a2bb..48d21d3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2892,7 +2892,7 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; -BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; +BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Allow draw calls without color attachments.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 53f4cc1a9eef9708e8b4d537d745161222242a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f4cc1a9eef9708e8b4d537d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:48 2016 +0100 wined3d: Allow draw calls without color attachments. Signed-off-by: Józef Kucia <jkucia(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 | 2 +- dlls/wined3d/state.c | 50 ++++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e372eaa..31fd22a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2675,7 +2675,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat } context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, wined3d_rendertarget_view_get_surface(fb->depth_stencil), - fb->render_targets[0]->resource->draw_binding, + fb->render_targets[0] ? fb->render_targets[0]->resource->draw_binding : 0, fb->depth_stencil ? fb->depth_stencil->resource->draw_binding : 0); } } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ec49d56..70f053b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -367,11 +367,20 @@ static GLenum gl_blend_factor(enum wined3d_blend factor, const struct wined3d_fo static void state_blend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; - unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; const struct wined3d_gl_info *gl_info = context->gl_info; - GLenum srcBlend, dstBlend; + const struct wined3d_format *rt_format; enum wined3d_blend d3d_blend; + GLenum srcBlend, dstBlend; + unsigned int rt_fmt_flags; + + if (!state->fb->render_targets[0]) + { + gl_info->gl_ops.gl.p_glDisable(GL_BLEND); + return; + } + + rt_format = state->fb->render_targets[0]->format; + rt_fmt_flags = state->fb->render_targets[0]->format_flags; /* According to the red book, GL_LINE_SMOOTH needs GL_BLEND with specific * blending parameters to work. */ @@ -4544,31 +4553,40 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + const struct wined3d_rendertarget_view *depth_stencil = state->fb->depth_stencil; const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_viewport vp = state->viewport; + unsigned int width, height; + + if (target) + { + if (vp.width > target->width) + vp.width = target->width; + if (vp.height > target->height) + vp.height = target->height; - if (vp.width > target->width) - vp.width = target->width; - if (vp.height > target->height) - vp.height = target->height; + surface_get_drawable_size(wined3d_rendertarget_view_get_surface(target), context, &width, &height); + } + else if (depth_stencil) + { + width = depth_stencil->width; + height = depth_stencil->height; + } + else + { + FIXME("No attachments draw calls not supported.\n"); + return; + } gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); checkGLcall("glDepthRange"); /* Note: GL requires lower left, DirectX supplies upper left. This is * reversed when using offscreen rendering. */ if (context->render_offscreen) - { gl_info->gl_ops.gl.p_glViewport(vp.x, vp.y, vp.width, vp.height); - } else - { - UINT width, height; - - surface_get_drawable_size(wined3d_rendertarget_view_get_surface(target), context, &width, &height); - gl_info->gl_ops.gl.p_glViewport(vp.x, (height - (vp.y + vp.height)), - vp.width, vp.height); - } + gl_info->gl_ops.gl.p_glViewport(vp.x, (height - (vp.y + vp.height)), vp.width, vp.height); checkGLcall("glViewport"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 48d21d3..feb86d1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3431,7 +3431,7 @@ static inline BOOL needs_srgb_write(const struct wined3d_context *context, { return (!(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) || state->render_states[WINED3D_RS_SRGBWRITEENABLE]) - && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; + && fb->render_targets[0] && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; } /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */

1 0

Józef Kucia : d3d10core/tests: Test render to depth texture.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 4037b48a4cb9cf18ed0f978d8ad43d1ed55ba2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4037b48a4cb9cf18ed0f978d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:49 2016 +0100 d3d10core/tests: Test render to depth texture. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 195 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 181 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a402d60..4c41d25 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2348,24 +2348,19 @@ static void test_scissor(void) static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; static const DWORD ps_code[] = { - /* float4 main(float4 position : SV_POSITION) : SV_Target - * { - * return float4(0.0, 1.0, 0.0, 1.0); - * } */ - 0x43425844, 0xe70802a0, 0xee334047, 0x7bfd0c79, 0xaeff7804, 0x00000001, 0x000001b0, 0x00000005, - 0x00000034, 0x0000008c, 0x000000c0, 0x000000f4, 0x00000134, 0x46454452, 0x00000050, 0x00000000, - 0x00000000, 0x00000000, 0x0000001c, 0xffff0400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, - 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x39207265, 0x2e30332e, - 0x30303239, 0x3336312e, 0xab003438, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, +#if 0 + float4 main(float4 position : SV_POSITION) : SV_Target + { + return float4(0.0, 1.0, 0.0, 1.0); + } +#endif + 0x43425844, 0x30240e72, 0x012f250c, 0x8673c6ea, 0x392e4cec, 0x00000001, 0x000000d4, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, - 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x54415453, 0x00000074, 0x00000002, - 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, }; if (!init_test_context(&test_context)) @@ -5936,6 +5931,177 @@ static void test_clear_depth_stencil_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_draw_depth_only(void) +{ + ID3D10DepthStencilState *depth_stencil_state; + D3D10_DEPTH_STENCIL_DESC depth_stencil_desc; + struct d3d10core_test_context test_context; + ID3D10PixelShader *ps_color, *ps_depth; + D3D10_TEXTURE2D_DESC texture_desc; + D3D10_BUFFER_DESC buffer_desc; + ID3D10DepthStencilView *dsv; + struct texture_readback rb; + ID3D10Texture2D *texture; + ID3D10Device *device; + unsigned int i, j; + D3D10_VIEWPORT vp; + struct vec4 depth; + ID3D10Buffer *cb; + HRESULT hr; + + static const DWORD ps_color_code[] = + { +#if 0 + float4 main(float4 position : SV_POSITION) : SV_Target + { + return float4(0.0, 1.0, 0.0, 1.0); + } +#endif + 0x43425844, 0x30240e72, 0x012f250c, 0x8673c6ea, 0x392e4cec, 0x00000001, 0x000000d4, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const DWORD ps_depth_code[] = + { +#if 0 + float depth; + + float main() : SV_Depth + { + return depth; + } +#endif + 0x43425844, 0x91af6cd0, 0x7e884502, 0xcede4f54, 0x6f2c9326, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff, + 0x00000e01, 0x445f5653, 0x68747065, 0xababab00, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x02000065, 0x0000c001, 0x05000036, 0x0000c001, + 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + buffer_desc.ByteWidth = sizeof(depth); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &cb); + ok(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + 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_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + + depth_stencil_desc.DepthEnable = TRUE; + depth_stencil_desc.DepthWriteMask = D3D10_DEPTH_WRITE_MASK_ALL; + depth_stencil_desc.DepthFunc = D3D10_COMPARISON_LESS; + depth_stencil_desc.StencilEnable = FALSE; + + hr = ID3D10Device_CreateDepthStencilState(device, &depth_stencil_desc, &depth_stencil_state); + ok(SUCCEEDED(hr), "Failed to create depth stencil state, hr %#x.\n", hr); + + hr = ID3D10Device_CreatePixelShader(device, ps_color_code, sizeof(ps_color_code), &ps_color); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_depth_code, sizeof(ps_depth_code), &ps_depth); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + ID3D10Device_PSSetShader(device, ps_color); + ID3D10Device_OMSetRenderTargets(device, 0, NULL, dsv); + ID3D10Device_OMSetDepthStencilState(device, depth_stencil_state, 0); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + check_texture_float(texture, 1.0f, 1); + draw_quad(&test_context); + check_texture_float(texture, 0.0f, 1); + + ID3D10Device_PSSetShader(device, ps_depth); + + depth.x = 0.7f; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &depth, 0, 0); + draw_quad(&test_context); + check_texture_float(texture, 0.0f, 1); + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + check_texture_float(texture, 1.0f, 1); + draw_quad(&test_context); + check_texture_float(texture, 0.7f, 1); + depth.x = 0.8f; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &depth, 0, 0); + draw_quad(&test_context); + check_texture_float(texture, 0.7f, 1); + depth.x = 0.5f; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &depth, 0, 0); + draw_quad(&test_context); + check_texture_float(texture, 0.5f, 1); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + depth.x = 0.1f; + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + depth.x = 1.0f / 16.0f * (j + 4 * i); + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &depth, 0, 0); + + vp.TopLeftX = 160 * j; + vp.TopLeftY = 120 * i; + vp.Width = 160; + vp.Height = 120; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D10Device_RSSetViewports(device, 1, &vp); + + draw_quad(&test_context); + } + } + get_texture_readback(texture, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + float obtained_depth, expected_depth; + + obtained_depth = get_readback_float(&rb, 80 + j * 160, 60 + i * 120); + expected_depth = 1.0f / 16.0f * (j + 4 * i); + ok(compare_float(obtained_depth, expected_depth, 1), + "Got unexpected depth %.8e at (%u, %u), expected %.8e.\n", + obtained_depth, j, i, expected_depth); + } + } + release_texture_readback(&rb); + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps_color); + ID3D10PixelShader_Release(ps_depth); + ID3D10DepthStencilView_Release(dsv); + ID3D10DepthStencilState_Release(depth_stencil_state); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -5970,4 +6136,5 @@ START_TEST(device) test_cb_relative_addressing(); test_swapchain_flip(); test_clear_depth_stencil_view(); + test_draw_depth_only(); }

1 0

Józef Kucia : d3d11/tests: Test render to depth texture.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 329dfee70c35184329d0820a5e9edbbed8b49b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329dfee70c35184329d0820a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:50 2016 +0100 d3d11/tests: Test render to depth texture. Signed-off-by: Józef Kucia <jkucia(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 | 188 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 178 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 819c547..4953675 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4139,20 +4139,13 @@ static void test_scissor(void) return float4(0.0, 1.0, 0.0, 1.0); } #endif - 0x43425844, 0xe70802a0, 0xee334047, 0x7bfd0c79, 0xaeff7804, 0x00000001, 0x000001b0, 0x00000005, - 0x00000034, 0x0000008c, 0x000000c0, 0x000000f4, 0x00000134, 0x46454452, 0x00000050, 0x00000000, - 0x00000000, 0x00000000, 0x0000001c, 0xffff0400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, - 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x39207265, 0x2e30332e, - 0x30303239, 0x3336312e, 0xab003438, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x43425844, 0x30240e72, 0x012f250c, 0x8673c6ea, 0x392e4cec, 0x00000001, 0x000000d4, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, - 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x54415453, 0x00000074, 0x00000002, - 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, }; if (!init_test_context(&test_context, NULL)) @@ -5362,6 +5355,180 @@ static void test_clear_depth_stencil_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_draw_depth_only(void) +{ + ID3D11DepthStencilState *depth_stencil_state; + D3D11_DEPTH_STENCIL_DESC depth_stencil_desc; + struct d3d11_test_context test_context; + ID3D11PixelShader *ps_color, *ps_depth; + D3D11_TEXTURE2D_DESC texture_desc; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + ID3D11DepthStencilView *dsv; + struct texture_readback rb; + ID3D11Texture2D *texture; + ID3D11Device *device; + unsigned int i, j; + D3D11_VIEWPORT vp; + struct vec4 depth; + ID3D11Buffer *cb; + HRESULT hr; + + static const DWORD ps_color_code[] = + { +#if 0 + float4 main(float4 position : SV_POSITION) : SV_Target + { + return float4(0.0, 1.0, 0.0, 1.0); + } +#endif + 0x43425844, 0x30240e72, 0x012f250c, 0x8673c6ea, 0x392e4cec, 0x00000001, 0x000000d4, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const DWORD ps_depth_code[] = + { +#if 0 + float depth; + + float main() : SV_Depth + { + return depth; + } +#endif + 0x43425844, 0x91af6cd0, 0x7e884502, 0xcede4f54, 0x6f2c9326, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff, + 0x00000e01, 0x445f5653, 0x68747065, 0xababab00, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x02000065, 0x0000c001, 0x05000036, 0x0000c001, + 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + buffer_desc.ByteWidth = sizeof(depth); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &cb); + ok(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + + depth_stencil_desc.DepthEnable = TRUE; + depth_stencil_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL; + depth_stencil_desc.DepthFunc = D3D11_COMPARISON_LESS; + depth_stencil_desc.StencilEnable = FALSE; + + hr = ID3D11Device_CreateDepthStencilState(device, &depth_stencil_desc, &depth_stencil_state); + ok(SUCCEEDED(hr), "Failed to create depth stencil state, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_color_code, sizeof(ps_color_code), NULL, &ps_color); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_depth_code, sizeof(ps_depth_code), NULL, &ps_depth); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + ID3D11DeviceContext_PSSetShader(context, ps_color, NULL, 0); + ID3D11DeviceContext_OMSetRenderTargets(context, 0, NULL, dsv); + ID3D11DeviceContext_OMSetDepthStencilState(context, depth_stencil_state, 0); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + check_texture_float(texture, 1.0f, 1); + draw_quad(&test_context); + check_texture_float(texture, 0.0f, 1); + + ID3D11DeviceContext_PSSetShader(context, ps_depth, NULL, 0); + + depth.x = 0.7f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &depth, 0, 0); + draw_quad(&test_context); + check_texture_float(texture, 0.0f, 1); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + check_texture_float(texture, 1.0f, 1); + draw_quad(&test_context); + check_texture_float(texture, 0.7f, 1); + depth.x = 0.8f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &depth, 0, 0); + draw_quad(&test_context); + check_texture_float(texture, 0.7f, 1); + depth.x = 0.5f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &depth, 0, 0); + draw_quad(&test_context); + check_texture_float(texture, 0.5f, 1); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + depth.x = 0.1f; + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + depth.x = 1.0f / 16.0f * (j + 4 * i); + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &depth, 0, 0); + + vp.TopLeftX = 160.0f * j; + vp.TopLeftY = 120.0f * i; + vp.Width = 160.0f; + vp.Height = 120.0f; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + + draw_quad(&test_context); + } + } + get_texture_readback(texture, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + float obtained_depth, expected_depth; + + obtained_depth = get_readback_float(&rb, 80 + j * 160, 60 + i * 120); + expected_depth = 1.0f / 16.0f * (j + 4 * i); + ok(compare_float(obtained_depth, expected_depth, 1), + "Got unexpected depth %.8e at (%u, %u), expected %.8e.\n", + obtained_depth, j, i, expected_depth); + } + } + release_texture_readback(&rb); + + ID3D11Buffer_Release(cb); + ID3D11PixelShader_Release(ps_color); + ID3D11PixelShader_Release(ps_depth); + ID3D11DepthStencilView_Release(dsv); + ID3D11DepthStencilState_Release(depth_stencil_state); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_cb_relative_addressing(void) { struct d3d11_test_context test_context; @@ -5594,5 +5761,6 @@ START_TEST(d3d11) test_multisample_init(); test_check_multisample_quality_levels(); test_clear_depth_stencil_view(); + test_draw_depth_only(); test_cb_relative_addressing(); }

1 0

Piotr Caban : msvcrt: Register exception object before unwinding.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 3a0b3c5bc89178d332dd1117348d8785975afc18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a0b3c5bc89178d332dd11173… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 21 19:16:06 2016 +0100 msvcrt: Register exception object before unwinding. Thrown object was incorrectly freed in following situation: try { try { throw obj; } catch(...) { throw; } } catch(...) { //use object here } Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 9adda79..3debece 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -446,6 +446,8 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame TRACE("found catch(...) block\n"); } + __CxxRegisterExceptionObject(&rec, &nested_frame.frame_info); + /* unwind the stack */ RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 ); cxx_local_unwind( frame, descr, tryblock->start_level ); @@ -457,12 +459,10 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame catchblock, catchblock->handler, &frame->ebp ); /* setup an exception block for nested exceptions */ - nested_frame.frame.Handler = catch_function_nested_handler; nested_frame.cxx_frame = frame; nested_frame.descr = descr; nested_frame.trylevel = nested_trylevel + 1; - __CxxRegisterExceptionObject(&rec, &nested_frame.frame_info); __wine_push_frame( &nested_frame.frame ); addr = call_ebp_func( catchblock->handler, &frame->ebp );

1 0

Thomas Faber : dbghelp: Use documented member name in SYMBOL_INFO structure.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: e91c06b068a7e93d1b1802e530aa89cc876ddcc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e91c06b068a7e93d1b1802e53… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Mar 21 18:30:14 2016 +0100 dbghelp: Use documented member name in SYMBOL_INFO structure. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 6 +++--- dlls/dbghelp/type.c | 2 +- include/dbghelp.h | 2 +- programs/winedbg/symbol.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index efcf7b6..08ea834 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -564,7 +564,7 @@ static void symt_fill_sym_info(struct module_pair* pair, if (!symt_get_info(pair->effective, sym, TI_GET_TYPE, &sym_info->TypeIndex)) sym_info->TypeIndex = 0; - sym_info->info = symt_ptr2index(pair->effective, sym); + sym_info->Index = symt_ptr2index(pair->effective, sym); sym_info->Reserved[0] = sym_info->Reserved[1] = 0; if (!symt_get_info(pair->effective, sym, TI_GET_LENGTH, &size) && (!sym_info->TypeIndex || @@ -723,7 +723,7 @@ static BOOL send_symbol(const struct sym_enum* se, struct module_pair* pair, const struct symt_function* func, const struct symt* sym) { symt_fill_sym_info(pair, func, sym, se->sym_info); - if (se->index && se->sym_info->info != se->index) return FALSE; + if (se->index && se->sym_info->Index != se->index) return FALSE; if (se->tag && se->sym_info->Tag != se->tag) return FALSE; if (se->addr && !(se->addr >= se->sym_info->Address && se->addr < se->sym_info->Address + se->sym_info->Size)) return FALSE; return !se->cb(se->sym_info, se->sym_info->Size, se->user); @@ -987,7 +987,7 @@ void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) siw->TypeIndex = si->TypeIndex; siw->Reserved[0] = si->Reserved[0]; siw->Reserved[1] = si->Reserved[1]; - siw->Index = si->info; /* FIXME: see dbghelp.h */ + siw->Index = si->Index; siw->Size = si->Size; siw->ModBase = si->ModBase; siw->Flags = si->Flags; diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 6ccbc9a..5991366 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -471,7 +471,7 @@ BOOL WINAPI SymEnumTypes(HANDLE hProcess, ULONG64 BaseOfDll, { type = *(struct symt**)vector_at(&pair.effective->vtypes, i); sym_info->TypeIndex = symt_ptr2index(pair.effective, type); - sym_info->info = 0; /* FIXME */ + sym_info->Index = 0; /* FIXME */ symt_get_info(pair.effective, type, TI_GET_LENGTH, &size); sym_info->Size = size; sym_info->ModBase = pair.requested->module.BaseOfImage; diff --git a/include/dbghelp.h b/include/dbghelp.h index 483ef29..2fd9ef0 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -957,7 +957,7 @@ typedef struct _SYMBOL_INFO ULONG SizeOfStruct; ULONG TypeIndex; ULONG64 Reserved[2]; - ULONG info; /* sdk states info, while MSDN says it's Index... */ + ULONG Index; ULONG Size; ULONG64 ModBase; ULONG Flags; diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index c43cba9..1040187 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -99,7 +99,7 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base, VARIANT v; type.module = sym->ModBase; - type.id = sym->info; + type.id = sym->Index; if (!types_get_info(&type, TI_GET_VALUE, &v)) { @@ -252,7 +252,7 @@ static BOOL CALLBACK sgv_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx) return TRUE; } sgv->syms[insp].flags = sym->Flags; - sgv->syms[insp].sym_info = sym->info; + sgv->syms[insp].sym_info = sym->Index; sgv->num++; return TRUE; @@ -614,7 +614,7 @@ enum dbg_line_status symbol_get_function_line_status(const ADDRESS64* addr) return dbg_no_line_info; func.module = sym->ModBase; - func.id = sym->info; + func.id = sym->Index; if (symbol_get_debug_start(&func, &start) && lin < start) return dbg_not_on_a_line_number;

1 0

Austin English : include: Fix GetCurrentConsoleFontEx/ SetCurrentConsoleFontEx definition.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 96ab323cf94db458343553f180dd8cbb8440e3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ab323cf94db458343553f18… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 21 23:20:12 2016 -0500 include: Fix GetCurrentConsoleFontEx/SetCurrentConsoleFontEx definition. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincon.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/wincon.h b/include/wincon.h index 94fb0f8..8f4d54c 100644 --- a/include/wincon.h +++ b/include/wincon.h @@ -125,6 +125,9 @@ typedef struct _CONSOLE_FONT_INFOEX UINT FontWeight; WCHAR FaceName[LF_FACESIZE]; } CONSOLE_FONT_INFOEX,*LPCONSOLE_FONT_INFOEX; + +WINBASEAPI BOOL WINAPI GetCurrentConsoleFontEx(HANDLE,BOOL,LPCONSOLE_FONT_INFOEX); +WINBASEAPI BOOL WINAPI SetCurrentConsoleFontEx(HANDLE,BOOL,LPCONSOLE_FONT_INFOEX); #endif typedef struct tagCONSOLE_HISTORY_INFO @@ -347,7 +350,6 @@ WINBASEAPI DWORD WINAPI GetConsoleTitleW(LPWSTR,DWORD); #define GetConsoleTitle WINELIB_NAME_AW(GetConsoleTitle) WINBASEAPI HWND WINAPI GetConsoleWindow(void); WINBASEAPI BOOL WINAPI GetCurrentConsoleFont(HANDLE,BOOL,LPCONSOLE_FONT_INFO); -WINBASEAPI BOOL WINAPI GetCurrentConsoleFontEx(HANDLE,BOOL,LPCONSOLE_FONT_INFOEX); WINBASEAPI BOOL WINAPI GetNumberOfConsoleInputEvents( HANDLE,LPDWORD); WINBASEAPI BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD); WINBASEAPI BOOL WINAPI PeekConsoleInputA( HANDLE,PINPUT_RECORD,DWORD,LPDWORD); @@ -385,7 +387,6 @@ WINBASEAPI BOOL WINAPI SetConsoleTitleA(LPCSTR); WINBASEAPI BOOL WINAPI SetConsoleTitleW(LPCWSTR); #define SetConsoleTitle WINELIB_NAME_AW(SetConsoleTitle) WINBASEAPI BOOL WINAPI SetConsoleWindowInfo( HANDLE,BOOL,LPSMALL_RECT); -WINBASEAPI BOOL WINAPI SetCurrentConsoleFontEx(HANDLE,BOOL,LPCONSOLE_FONT_INFOEX); WINBASEAPI BOOL WINAPI WriteConsoleA(HANDLE,const void *,DWORD,LPDWORD,void *); WINBASEAPI BOOL WINAPI WriteConsoleW(HANDLE,const void *,DWORD,LPDWORD,void *); #define WriteConsole WINELIB_NAME_AW(WriteConsole)

1 0

Alexandre Julliard : winebuild: Don' t store the full spec for an imported dll.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 8e10ae6705bd3033ce29c229ebb34b0a227b455e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e10ae6705bd3033ce29c229e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 22 14:33:17 2016 +0900 winebuild: Don't store the full spec for an imported dll. We only need the dll name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 76 ++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 41 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 4446dff..b0373f7 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -39,7 +39,7 @@ struct import { - DLLSPEC *spec; /* description of the imported dll */ + char *dll_name; /* exported file name of the dll */ char *full_name; /* full name of the input file */ dev_t dev; /* device/inode of the input file */ ino_t ino; @@ -129,7 +129,7 @@ static void free_imports( struct import *imp ) { free( imp->exports ); free( imp->imports ); - free_dll_spec( imp->spec ); + free( imp->dll_name ); free( imp->full_name ); free( imp ); } @@ -153,7 +153,7 @@ static struct import *is_already_imported( const char *name ) for (i = 0; i < nb_imports; i++) { - if (!strcmp( dll_imports[i]->spec->file_name, name )) return dll_imports[i]; + if (!strcmp( dll_imports[i]->dll_name, name )) return dll_imports[i]; } return NULL; } @@ -191,22 +191,20 @@ static char *find_library( const char *name ) } /* read in the list of exported symbols of an import library */ -static int read_import_lib( struct import *imp ) +static DLLSPEC *read_import_lib( struct import *imp ) { FILE *f; - int i, ret; + int i; struct stat stat; struct import *prev_imp; - DLLSPEC *spec = imp->spec; - int delayed = is_delayed_import( spec->file_name ); + DLLSPEC *spec = alloc_dll_spec(); f = open_input_file( NULL, imp->full_name ); fstat( fileno(f), &stat ); imp->dev = stat.st_dev; imp->ino = stat.st_ino; - ret = parse_def_file( f, spec ); + if (!parse_def_file( f, spec )) exit( 1 ); close_input_file( f ); - if (!ret) return 0; /* check if we already imported that library from a different file */ if ((prev_imp = is_already_imported( spec->file_name ))) @@ -214,13 +212,8 @@ static int read_import_lib( struct import *imp ) if (prev_imp->dev != imp->dev || prev_imp->ino != imp->ino) fatal_error( "%s and %s have the same export name '%s'\n", prev_imp->full_name, imp->full_name, spec->file_name ); - return 0; /* the same file was already loaded, ignore this one */ - } - - if (delayed) - { - imp->delay = 1; - nb_delayed++; + free_dll_spec( spec ); + return NULL; /* the same file was already loaded, ignore this one */ } if (spec->nb_entry_points) @@ -230,7 +223,7 @@ static int read_import_lib( struct import *imp ) imp->exports[imp->nb_exports++] = &spec->entry_points[i]; qsort( imp->exports, imp->nb_exports, sizeof(*imp->exports), func_cmp ); } - return 1; + return spec; } /* build the dll exported name from the import lib name or path */ @@ -260,29 +253,30 @@ static char *get_dll_name( const char *name, const char *filename ) /* add a dll to the list of imports */ void add_import_dll( const char *name, const char *filename ) { + DLLSPEC *spec; + char *dll_name = get_dll_name( name, filename ); struct import *imp = xmalloc( sizeof(*imp) ); - imp->spec = alloc_dll_spec(); - imp->spec->file_name = get_dll_name( name, filename ); - imp->delay = 0; - imp->imports = NULL; - imp->nb_imports = 0; - imp->exports = NULL; - imp->nb_exports = 0; + memset( imp, 0, sizeof(*imp) ); if (filename) imp->full_name = xstrdup( filename ); else imp->full_name = find_library( name ); - if (read_import_lib( imp )) + if (!(spec = read_import_lib( imp ))) { - dll_imports = xrealloc( dll_imports, (nb_imports+1) * sizeof(*dll_imports) ); - dll_imports[nb_imports++] = imp; + free_imports( imp ); + return; } - else + + imp->dll_name = spec->file_name ? spec->file_name : dll_name; + + if (is_delayed_import( dll_name )) { - free_imports( imp ); - if (nb_errors) exit(1); + imp->delay = 1; + nb_delayed++; } + dll_imports = xrealloc( dll_imports, (nb_imports+1) * sizeof(*dll_imports) ); + dll_imports[nb_imports++] = imp; } /* add a library to the list of delayed imports */ @@ -359,7 +353,7 @@ static void add_extra_undef_symbols( DLLSPEC *spec ) static int check_unused( const struct import* imp, const DLLSPEC *spec ) { int i; - const char *file_name = imp->spec->file_name; + const char *file_name = imp->dll_name; size_t len = strlen( file_name ); const char *p = strchr( file_name, '.' ); if (p && !strcasecmp( p, ".dll" )) len = p - file_name; @@ -397,10 +391,10 @@ static void check_undefined_forwards( DLLSPEC *spec ) { struct import *imp = dll_imports[j]; - if (strcasecmp( imp->spec->file_name, dll_name )) continue; + if (strcasecmp( imp->dll_name, dll_name )) continue; if (!find_export( api_name, imp->exports, imp->nb_exports )) warning( "%s:%d: forward '%s' not found in %s\n", - spec->src_name, odp->lineno, odp->link_name, imp->spec->file_name ); + spec->src_name, odp->lineno, odp->link_name, imp->dll_name ); break; } if (j == nb_imports) @@ -550,7 +544,7 @@ void resolve_imports( DLLSPEC *spec ) if (odp->flags & FLAG_PRIVATE) continue; if (odp->type != TYPE_STDCALL && odp->type != TYPE_CDECL) warning( "winebuild: Data export '%s' cannot be imported from %s\n", - odp->link_name, imp->spec->file_name ); + odp->link_name, imp->dll_name ); else { add_import_func( imp, odp ); @@ -563,7 +557,7 @@ void resolve_imports( DLLSPEC *spec ) { /* the dll is not used, get rid of it */ if (check_unused( imp, spec )) - warning( "winebuild: %s imported but no symbols used\n", imp->spec->file_name ); + warning( "winebuild: %s imported but no symbols used\n", imp->dll_name ); remove_import_dll( i ); i--; } @@ -683,7 +677,7 @@ static void output_immediate_imports(void) for (i = j = 0; i < nb_imports; i++) { if (dll_imports[i]->delay) continue; - dll_name = make_c_identifier( dll_imports[i]->spec->file_name ); + dll_name = make_c_identifier( dll_imports[i]->dll_name ); output( "\t.long .L__wine_spec_import_data_names+%d-.L__wine_spec_rva_base\n", /* OriginalFirstThunk */ j * get_ptr_size() ); output( "\t.long 0\n" ); /* TimeDateStamp */ @@ -705,7 +699,7 @@ static void output_immediate_imports(void) for (i = 0; i < nb_imports; i++) { if (dll_imports[i]->delay) continue; - dll_name = make_c_identifier( dll_imports[i]->spec->file_name ); + dll_name = make_c_identifier( dll_imports[i]->dll_name ); for (j = 0; j < dll_imports[i]->nb_imports; j++) { ORDDEF *odp = dll_imports[i]->imports[j]; @@ -734,7 +728,7 @@ static void output_immediate_imports(void) for (i = 0; i < nb_imports; i++) { if (dll_imports[i]->delay) continue; - dll_name = make_c_identifier( dll_imports[i]->spec->file_name ); + dll_name = make_c_identifier( dll_imports[i]->dll_name ); for (j = 0; j < dll_imports[i]->nb_imports; j++) { ORDDEF *odp = dll_imports[i]->imports[j]; @@ -751,9 +745,9 @@ static void output_immediate_imports(void) for (i = 0; i < nb_imports; i++) { if (dll_imports[i]->delay) continue; - dll_name = make_c_identifier( dll_imports[i]->spec->file_name ); + dll_name = make_c_identifier( dll_imports[i]->dll_name ); output( ".L__wine_spec_import_name_%s:\n\t%s \"%s\"\n", - dll_name, get_asm_string_keyword(), dll_imports[i]->spec->file_name ); + dll_name, get_asm_string_keyword(), dll_imports[i]->dll_name ); } } @@ -865,7 +859,7 @@ static void output_delayed_imports( const DLLSPEC *spec ) if (!dll_imports[i]->delay) continue; output( ".L__wine_delay_name_%d:\n", i ); output( "\t%s \"%s\"\n", - get_asm_string_keyword(), dll_imports[i]->spec->file_name ); + get_asm_string_keyword(), dll_imports[i]->dll_name ); } for (i = 0; i < nb_imports; i++)

1 0

Alexandre Julliard : winebuild: Store a C-compatible version of the dll name.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 05399ad711bdbf5038ded66e42f29f00b85e76b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05399ad711bdbf5038ded66e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 22 15:06:27 2016 +0900 winebuild: Store a C-compatible version of the dll name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 3 ++- tools/winebuild/import.c | 16 +++++++--------- tools/winebuild/main.c | 1 + tools/winebuild/spec16.c | 13 +++++-------- tools/winebuild/utils.c | 30 ++++++++---------------------- 5 files changed, 23 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05399ad711bdbf5038ded…

1 0

Alexandre Julliard : winebuild: Store dll imports in a list instead of an array.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 9b70b6bd13247afde1771cef0a92b2b7a7cdeb6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b70b6bd13247afde1771cef0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 22 14:56:49 2016 +0900 winebuild: Store dll imports in a list instead of an array. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 186 +++++++++++++++++++++++------------------------ 1 file changed, 92 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b70b6bd13247afde1771…

1 0