wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Józef Kucia : d3d11/tests: Add test for face culling.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 0bcd9a5a4bb3d8e5251ca9f3f6001193f2ab441f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bcd9a5a4bb3d8e5251ca9f3f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:45 2016 +0200 d3d11/tests: Add test for face culling. 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 | 231 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 186 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bcd9a5a4bb3d8e5251ca…

1 0

Józef Kucia : wined3d: Add FIXMEs for unhandled sysval semantics.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 79dc5128c326538ecf9eb4bfc45a5de458d05e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79dc5128c326538ecf9eb4bfc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:44 2016 +0200 wined3d: Add FIXMEs for unhandled sysval semantics. 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/glsl_shader.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 498c41c..ece9b72 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1784,6 +1784,8 @@ static void shader_glsl_declare_generic_vertex_attribute(struct wined3d_string_b index); return; } + if (e->sysval_semantic) + FIXME("Unhandled sysval semantic %#x.\n", e->sysval_semantic); if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "layout(location = %u) ", index); @@ -5306,18 +5308,28 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w if (args->vp_mode == vertexshader) { if (input->sysval_semantic == WINED3D_SV_POSITION && !semantic_idx) + { shader_addline(buffer, "ps_in[%u]%s = vpos%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, reg_mask); + } else if (args->pointsprite && shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) + { shader_addline(buffer, "ps_in[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", input->register_idx); + } else if (input->sysval_semantic == WINED3D_SV_IS_FRONT_FACE) + { shader_addline(buffer, "ps_in[%u] = vec4(" "uintBitsToFloat(gl_FrontFacing ? 0xffffffffu : 0u), 0.0, 0.0, 0.0);\n", input->register_idx); + } else + { + if (input->sysval_semantic) + FIXME("Unhandled sysval semantic %#x.\n", input->sysval_semantic); shader_addline(buffer, "ps_in[%u]%s = ps_link[%u]%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, shader->u.ps.input_reg_map[input->register_idx], reg_mask); + } } else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) { @@ -5595,6 +5607,10 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv shader_addline(buffer, "gl_PointSize = clamp(shader_out[%u].%c, " "ffp_point.size_min, ffp_point.size_max);\n", output->register_idx, reg_mask[1]); } + else if (output->sysval_semantic) + { + FIXME("Unhandled sysval semantic %#x.\n", output->sysval_semantic); + } } /* Then, setup the pixel shader input. */

1 0

Józef Kucia : wined3d: Implement SV_IsFrontFace input sysval semantic.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: a5852dec9c81ae28b02f7f4f8c3b2997677bfa37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5852dec9c81ae28b02f7f4f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:43 2016 +0200 wined3d: Implement SV_IsFrontFace input sysval semantic. 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/glsl_shader.c | 4 ++++ dlls/wined3d/shader.c | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dba3460..498c41c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5310,6 +5310,10 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w shader->u.ps.input_reg_map[input->register_idx], reg_mask, reg_mask); else if (args->pointsprite && shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) shader_addline(buffer, "ps_in[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", input->register_idx); + else if (input->sysval_semantic == WINED3D_SV_IS_FRONT_FACE) + shader_addline(buffer, "ps_in[%u] = vec4(" + "uintBitsToFloat(gl_FrontFacing ? 0xffffffffu : 0u), 0.0, 0.0, 0.0);\n", + input->register_idx); else shader_addline(buffer, "ps_in[%u]%s = ps_link[%u]%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f1940c6..28d5972 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1311,9 +1311,13 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st for (i = 0; i < input_signature->element_count; ++i) { reg_maps->input_registers |= 1u << input_signature->elements[i].register_idx; - if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL - && input_signature->elements[i].sysval_semantic == WINED3D_SV_POSITION) - reg_maps->vpos = 1; + if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL) + { + if (input_signature->elements[i].sysval_semantic == WINED3D_SV_POSITION) + reg_maps->vpos = 1; + else if (input_signature->elements[i].sysval_semantic == WINED3D_SV_IS_FRONT_FACE) + reg_maps->usesfacing = 1; + } } } else if (!input_signature->elements && reg_maps->input_registers)

1 0

Józef Kucia : d3d11: Add support for FrontCounterClockwise.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 3449c79d139c841b33d19551a67b7976d47e533d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3449c79d139c841b33d19551a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:42 2016 +0200 d3d11: Add support for FrontCounterClockwise. 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/d3d11_private.h | 1 + dlls/d3d11/device.c | 6 +++--- dlls/d3d11/state.c | 20 +++++++++++++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index cdada42..e9837cc 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -419,6 +419,7 @@ struct d3d_rasterizer_state LONG refcount; struct wined3d_private_store private_store; + struct wined3d_rasterizer_state *wined3d_state; D3D11_RASTERIZER_DESC desc; struct wine_rb_entry entry; ID3D11Device *device; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7f819db8..41a0319 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -834,6 +834,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_mutex_lock(); if (!(device->rasterizer_state = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { + wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_CCW); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); @@ -843,12 +844,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon return; } + wined3d_device_set_rasterizer_state(device->wined3d_device, device->rasterizer_state->wined3d_state); + desc = &device->rasterizer_state->desc; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); - /* glFrontFace() */ - if (desc->FrontCounterClockwise) - FIXME("Ignoring FrontCounterClockwise %#x.\n", desc->FrontCounterClockwise); /* OpenGL style depth bias. */ if (desc->DepthBias || desc->SlopeScaledDepthBias) FIXME("Ignoring depth bias.\n"); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 68ad1bd..d702d98 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -664,9 +664,10 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); wine_rb_remove(&device->rasterizer_states, &state->desc); - ID3D11Device_Release(state->device); + wined3d_rasterizer_state_decref(state->wined3d_state); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); + ID3D11Device_Release(state->device); HeapFree(GetProcessHeap(), 0, state); } @@ -849,6 +850,9 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc) { + struct wined3d_rasterizer_state_desc wined3d_desc; + HRESULT hr; + state->ID3D11RasterizerState_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; @@ -856,17 +860,27 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d wined3d_private_store_init(&state->private_store); state->desc = *desc; + wined3d_desc.front_ccw = desc->FrontCounterClockwise; + if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, + &wined3d_desc, &state->wined3d_state))) + { + WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr); + wined3d_private_store_cleanup(&state->private_store); + wined3d_mutex_unlock(); + return hr; + } + if (wine_rb_put(&device->rasterizer_states, desc, &state->entry) == -1) { ERR("Failed to insert rasterizer state entry.\n"); wined3d_private_store_cleanup(&state->private_store); + wined3d_rasterizer_state_decref(state->wined3d_state); wined3d_mutex_unlock(); return E_FAIL; } wined3d_mutex_unlock(); - state->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(state->device); + ID3D11Device_AddRef(state->device = &device->ID3D11Device_iface); return S_OK; }

1 0

Józef Kucia : wined3d: Introduce rasterizer state object.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 3861b4bb3771cf5fa4116bb50883fb13718b1c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3861b4bb3771cf5fa4116bb50… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:41 2016 +0200 wined3d: Introduce rasterizer state object. 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/cs.c | 28 +++++++++++++++++++ dlls/wined3d/device.c | 26 ++++++++++++++++++ dlls/wined3d/state.c | 62 ++++++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d.spec | 6 ++++ dlls/wined3d/wined3d_private.h | 11 ++++++++ include/wine/wined3d.h | 14 ++++++++++ 6 files changed, 138 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3861b4bb3771cf5fa4116…

1 0

Józef Kucia : wined3d: Handle SM5 derivative instructions in shader_get_registers_used().
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: d95c91caa8e59b17fa7adb803afa76f17998de5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95c91caa8e59b17fa7adb803… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:40 2016 +0200 wined3d: Handle SM5 derivative instructions in shader_get_registers_used(). 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/shader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5192b18..f1940c6 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1217,8 +1217,18 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } if (ins.handler_idx == WINED3DSIH_NRM) reg_maps->usesnrm = 1; - else if (ins.handler_idx == WINED3DSIH_DSY) reg_maps->usesdsy = 1; - else if (ins.handler_idx == WINED3DSIH_DSX) reg_maps->usesdsx = 1; + else if (ins.handler_idx == WINED3DSIH_DSY + || ins.handler_idx == WINED3DSIH_DSY_COARSE + || ins.handler_idx == WINED3DSIH_DSY_FINE) + { + reg_maps->usesdsy = 1; + } + else if (ins.handler_idx == WINED3DSIH_DSX + || ins.handler_idx == WINED3DSIH_DSX_COARSE + || ins.handler_idx == WINED3DSIH_DSX_FINE) + { + reg_maps->usesdsx = 1; + } else if (ins.handler_idx == WINED3DSIH_TEXLDD) reg_maps->usestexldd = 1; else if (ins.handler_idx == WINED3DSIH_TEXLDL) reg_maps->usestexldl = 1; else if (ins.handler_idx == WINED3DSIH_MOVA) reg_maps->usesmova = 1;

1 0

Józef Kucia : d3d10core/tests: Add test for DXGI_FORMAT_R10G10B10A2_UINT vertex format.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: bdae44fb51bda6845f02543dd320ff245a186085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdae44fb51bda6845f02543dd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:39 2016 +0200 d3d10core/tests: Add test for DXGI_FORMAT_R10G10B10A2_UINT vertex format. 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 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index c6fc480..3d7ef0c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -8257,6 +8257,7 @@ static void test_input_assembler(void) LAYOUT_UNORM8, LAYOUT_SNORM8, LAYOUT_UNORM10_2, + LAYOUT_UINT10_2, LAYOUT_COUNT, }; @@ -8290,6 +8291,7 @@ static void test_input_assembler(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R10G10B10A2_UNORM, + DXGI_FORMAT_R10G10B10A2_UINT, }; static const struct { @@ -8464,6 +8466,16 @@ static void test_input_assembler(void) {0.0f, 0.0f, 0.0f, 1.0f}}, {LAYOUT_UNORM10_2, sizeof(unorm10_2_data), &unorm10_2_data, {1.0f, 0.0f, 512.0f / 1023.0f, 2.0f / 3.0f}}, + {LAYOUT_UINT10_2, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_UINT10_2, sizeof(uint32_max), &uint32_max, + {1023.0f, 1023.0f, 1023.0f, 3.0f}}, + {LAYOUT_UINT10_2, sizeof(g10_data), &g10_data, + {0.0f, 1023.0f, 0.0f, 0.0f}}, + {LAYOUT_UINT10_2, sizeof(a2_data), &a2_data, + {0.0f, 0.0f, 0.0f, 3.0f}}, + {LAYOUT_UINT10_2, sizeof(unorm10_2_data), &unorm10_2_data, + {1023.0f, 0.0f, 512.0f, 2.0f}}, }; if (!init_test_context(&test_context)) @@ -8484,9 +8496,11 @@ static void test_input_assembler(void) for (i = 0; i < LAYOUT_COUNT; ++i) { input_layout_desc[1].Format = layout_formats[i]; + input_layout[i] = NULL; hr = ID3D10Device_CreateInputLayout(device, input_layout_desc, sizeof(input_layout_desc) / sizeof(*input_layout_desc), vs_float_code, sizeof(vs_float_code), &input_layout[i]); + todo_wine_if(input_layout_desc[1].Format == DXGI_FORMAT_R10G10B10A2_UINT) ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", layout_formats[i], hr); } @@ -8522,6 +8536,9 @@ static void test_input_assembler(void) { D3D10_BOX box = {0, 0, 0, 1, 1, 1}; + if (tests[i].layout_id == LAYOUT_UINT10_2) + continue; + assert(tests[i].layout_id < LAYOUT_COUNT); ID3D10Device_IASetInputLayout(device, input_layout[tests[i].layout_id]); @@ -8541,6 +8558,7 @@ static void test_input_assembler(void) switch (layout_formats[tests[i].layout_id]) { case DXGI_FORMAT_R16G16B16A16_UINT: + case DXGI_FORMAT_R10G10B10A2_UINT: case DXGI_FORMAT_R8G8B8A8_UINT: ID3D10Device_VSSetShader(device, vs_uint); break; @@ -8571,7 +8589,10 @@ static void test_input_assembler(void) ID3D10Buffer_Release(vb_attribute); ID3D10Buffer_Release(vb_position); for (i = 0; i < LAYOUT_COUNT; ++i) - ID3D10InputLayout_Release(input_layout[i]); + { + if (input_layout[i]) + ID3D10InputLayout_Release(input_layout[i]); + } ID3D10PixelShader_Release(ps); ID3D10VertexShader_Release(vs_float); ID3D10VertexShader_Release(vs_uint);

1 0

Michael Stefaniuc : ddraw: Don't memset memory before overwritting it.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 63fcf7faee88aea9425f57de8516dea262f54531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63fcf7faee88aea9425f57de8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 27 16:10:39 2016 +0200 ddraw: Don't memset memory before overwritting it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/viewport.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 5ebc41e..154f9aa 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -272,7 +272,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE wined3d_mutex_lock(); dwSize = lpData->dwSize; - memset(lpData, 0, dwSize); if (!This->use_vp2) memcpy(lpData, &(This->viewports.vp1), dwSize); else { @@ -895,7 +894,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport2(IDirect3DViewport3 *iface, D3DVI wined3d_mutex_lock(); dwSize = lpData->dwSize; - memset(lpData, 0, dwSize); if (This->use_vp2) memcpy(lpData, &(This->viewports.vp2), dwSize); else {

1 0

Aric Stewart : ntoskrnl: Build a more intelligent and correct RegistryPath if possible.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 2ffaaee1cf286072eea76fa5392eeabf3b060f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ffaaee1cf286072eea76fa53… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jul 22 13:45:21 2016 -0500 ntoskrnl: Build a more intelligent and correct RegistryPath if possible. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8003ba1..dc19dee 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -817,6 +817,34 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, return irp; } +static void build_driver_keypath( const WCHAR *name, UNICODE_STRING *keypath ) +{ + static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; + static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','S','e','r','v','i','c','e','s', + '\\',0}; + WCHAR *str; + + /* Check what prefix is present */ + if (strncmpW( name, servicesW, strlenW(servicesW) ) == 0) + { + FIXME( "Driver name %s is malformed as the keypath\n", debugstr_w(name) ); + RtlCreateUnicodeString( keypath, name ); + return; + } + if (strncmpW( name, driverW, strlenW(driverW) ) == 0) + name += strlenW(driverW); + else + FIXME( "Driver name %s does not properly begin with \\Driver\\", debugstr_w(name) ); + + str = HeapAlloc( GetProcessHeap(), 0, sizeof(servicesW) + strlenW(name)*sizeof(WCHAR)); + lstrcpyW( str, servicesW ); + lstrcatW( str, name ); + RtlInitUnicodeString( keypath, str ); +} /*********************************************************************** * IoCreateDriver (NTOSKRNL.EXE.@) @@ -844,9 +872,9 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) driver->DriverInit = init; driver->DriverExtension = extension; extension->DriverObject = driver; - extension->ServiceKeyName = driver->DriverName; + build_driver_keypath( driver->DriverName.Buffer, &extension->ServiceKeyName ); - status = driver->DriverInit( driver, name ); + status = driver->DriverInit( driver, &extension->ServiceKeyName ); if (status) { @@ -865,6 +893,7 @@ void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver ) TRACE("(%p)\n", driver); RtlFreeUnicodeString( &driver->DriverName ); + RtlFreeUnicodeString( &driver->DriverExtension->ServiceKeyName ); RtlFreeHeap( GetProcessHeap(), 0, driver ); }

1 0

Alexandre Julliard : kernel32/tests: Fix a few more loader test failures.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 1110eccafba7f1a5671c80b2788dc78ac710285a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1110eccafba7f1a5671c80b27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 13:45:15 2016 +0900 kernel32/tests: Fix a few more loader test failures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4efe2f7..0b38445 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -340,17 +340,18 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header ) LARGE_INTEGER size; HANDLE file, map; NTSTATUS status; + ULONG file_size; GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "ldr", 0, dll_name); - size.u.LowPart = create_test_dll( &dos_header, sizeof(dos_header), nt_header, dll_name ); - ok( size.u.LowPart, "could not create %s\n", dll_name); - size.u.HighPart = 0; + file_size = create_test_dll( &dos_header, sizeof(dos_header), nt_header, dll_name ); + ok( file_size, "could not create %s\n", dll_name); file = CreateFileA(dll_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + size.QuadPart = file_size; status = pNtCreateSection(&map, STANDARD_RIGHTS_REQUIRED | SECTION_MAP_READ | SECTION_QUERY, NULL, &size, PAGE_READONLY, SEC_IMAGE, file ); if (!status) @@ -362,8 +363,8 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header ) ok( info_size == sizeof(info), "NtQuerySection wrong size %u\n", info_size ); ok( info.Attributes == (SEC_IMAGE | SEC_FILE), "NtQuerySection wrong attr %x\n", info.Attributes ); ok( info.BaseAddress == NULL, "NtQuerySection wrong base %p\n", info.BaseAddress ); - ok( info.Size.QuadPart == size.QuadPart, "NtQuerySection wrong size %x%08x / %x%08x\n", - info.Size.u.HighPart, info.Size.u.LowPart, size.u.HighPart, size.u.LowPart ); + ok( info.Size.QuadPart == file_size, "NtQuerySection wrong size %x%08x / %08x\n", + info.Size.u.HighPart, info.Size.u.LowPart, file_size ); query_image_section( 1000, dll_name, nt_header ); } if (map) CloseHandle( map ); @@ -1944,7 +1945,8 @@ static void child_process(const char *dll_name, DWORD target_offset) memset(&pbi, 0, sizeof(pbi)); ret = pNtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); ok(!ret, "NtQueryInformationProcess error %#x\n", ret); - ok(pbi.ExitStatus == STILL_ACTIVE, "expected STILL_ACTIVE, got %lu\n", pbi.ExitStatus); + ok(pbi.ExitStatus == STILL_ACTIVE || pbi.ExitStatus == 195, + "expected STILL_ACTIVE, got %lu\n", pbi.ExitStatus); affinity = 1; ret = pNtSetInformationProcess(process, ProcessAffinityMask, &affinity, sizeof(affinity)); ok(!ret, "NtSetInformationProcess error %#x\n", ret); @@ -1979,7 +1981,8 @@ static void child_process(const char *dll_name, DWORD target_offset) memset(&pbi, 0, sizeof(pbi)); ret = pNtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); ok(!ret, "NtQueryInformationProcess error %#x\n", ret); - ok(pbi.ExitStatus == STILL_ACTIVE, "expected STILL_ACTIVE, got %lu\n", pbi.ExitStatus); + ok(pbi.ExitStatus == STILL_ACTIVE || pbi.ExitStatus == 195, + "expected STILL_ACTIVE, got %lu\n", pbi.ExitStatus); affinity = 1; ret = pNtSetInformationProcess(process, ProcessAffinityMask, &affinity, sizeof(affinity)); ok(!ret, "NtSetInformationProcess error %#x\n", ret);

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2016