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

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 : 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 : 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 : d3d10core/tests: Add test for face culling.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 0ce9055263367716d6b99f55d97ff90490772f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce9055263367716d6b99f55d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:46 2016 +0200 d3d10core/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/d3d10core/tests/device.c | 229 +++++++++++++++++++++++++++++++++--------- 1 file changed, 184 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ce9055263367716d6b99…

1 0

Józef Kucia : wined3d: Rename wined3d_cull enum values.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 7acf39c4304e72163e577b9a5ca88d5ead6edb98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7acf39c4304e72163e577b9a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:47 2016 +0200 wined3d: Rename wined3d_cull enum values. 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/device.c | 2 +- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 41a0319..187b3f0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -836,7 +836,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon { 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_CULLMODE, WINED3D_CULL_BACK); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ANTIALIASEDLINEENABLE, FALSE); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4096caf..54ce2ee 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -194,13 +194,13 @@ static void state_cullmode(struct wined3d_context *context, const struct wined3d gl_info->gl_ops.gl.p_glDisable(GL_CULL_FACE); checkGLcall("glDisable GL_CULL_FACE"); break; - case WINED3D_CULL_CW: + case WINED3D_CULL_FRONT: gl_info->gl_ops.gl.p_glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); gl_info->gl_ops.gl.p_glCullFace(GL_FRONT); checkGLcall("glCullFace(GL_FRONT)"); break; - case WINED3D_CULL_CCW: + case WINED3D_CULL_BACK: gl_info->gl_ops.gl.p_glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); gl_info->gl_ops.gl.p_glCullFace(GL_BACK); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index bb15995..2fbfa2c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1083,7 +1083,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->render_states[WINED3D_RS_LASTPIXEL] = TRUE; state->render_states[WINED3D_RS_SRCBLEND] = WINED3D_BLEND_ONE; state->render_states[WINED3D_RS_DESTBLEND] = WINED3D_BLEND_ZERO; - state->render_states[WINED3D_RS_CULLMODE] = WINED3D_CULL_CCW; + state->render_states[WINED3D_RS_CULLMODE] = WINED3D_CULL_BACK; state->render_states[WINED3D_RS_ZFUNC] = WINED3D_CMP_LESSEQUAL; state->render_states[WINED3D_RS_ALPHAFUNC] = WINED3D_CMP_ALWAYS; state->render_states[WINED3D_RS_ALPHAREF] = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 52c20a4..e2f1004 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -462,8 +462,8 @@ enum wined3d_fill_mode enum wined3d_cull { WINED3D_CULL_NONE = 1, - WINED3D_CULL_CW = 2, - WINED3D_CULL_CCW = 3, + WINED3D_CULL_FRONT = 2, + WINED3D_CULL_BACK = 3, }; enum wined3d_stencil_op

1 0

Józef Kucia : wined3d: Get rid of separate function for SM5 derivative instructions.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 4b815d525aee79239d2fa195d892f0bf7a812434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b815d525aee79239d2fa195d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:48 2016 +0200 wined3d: Get rid of separate function for SM5 derivative instructions. 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 | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ece9b72..b0de8c6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3528,7 +3528,11 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) { case WINED3DSIH_ABS: instruction = "abs"; break; case WINED3DSIH_DSX: instruction = "dFdx"; break; + case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; + case WINED3DSIH_DSX_FINE: instruction = "dFdxFine"; break; case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; + case WINED3DSIH_DSY_COARSE: instruction = "ycorrection.y * dFdyCoarse"; break; + case WINED3DSIH_DSY_FINE: instruction = "ycorrection.y * dFdyFine"; break; case WINED3DSIH_FRC: instruction = "fract"; break; case WINED3DSIH_IMAX: instruction = "max"; break; case WINED3DSIH_IMIN: instruction = "min"; break; @@ -3542,7 +3546,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_UMAX: instruction = "max"; break; case WINED3DSIH_UMIN: instruction = "min"; break; default: instruction = ""; - FIXME("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); + ERR("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); break; } @@ -3564,27 +3568,6 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "));\n"); } -static void shader_glsl_derivative(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_string_buffer *buffer = ins->ctx->buffer; - struct glsl_src_param src_param; - const char *instruction; - DWORD write_mask; - - switch (ins->handler_idx) - { - case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; - case WINED3DSIH_DSX_FINE: instruction = "dFdxFine"; break; - case WINED3DSIH_DSY_COARSE: instruction = "ycorrection.y * dFdyCoarse"; break; - case WINED3DSIH_DSY_FINE: instruction = "ycorrection.y * dFdyFine"; break; - default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; - } - - write_mask = shader_glsl_append_dst(buffer, ins); - shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); - shader_addline(buffer, "%s(%s));\n", instruction, src_param.param_str); -} - static void shader_glsl_nop(const struct wined3d_shader_instruction *ins) {} static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) @@ -8721,11 +8704,11 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DP4 */ shader_glsl_dot, /* WINED3DSIH_DST */ shader_glsl_dst, /* WINED3DSIH_DSX */ shader_glsl_map2gl, - /* WINED3DSIH_DSX_COARSE */ shader_glsl_derivative, - /* WINED3DSIH_DSX_FINE */ shader_glsl_derivative, + /* WINED3DSIH_DSX_COARSE */ shader_glsl_map2gl, + /* WINED3DSIH_DSX_FINE */ shader_glsl_map2gl, /* WINED3DSIH_DSY */ shader_glsl_map2gl, - /* WINED3DSIH_DSY_COARSE */ shader_glsl_derivative, - /* WINED3DSIH_DSY_FINE */ shader_glsl_derivative, + /* WINED3DSIH_DSY_COARSE */ shader_glsl_map2gl, + /* WINED3DSIH_DSY_FINE */ shader_glsl_map2gl, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, /* WINED3DSIH_EMIT_STREAM */ shader_glsl_emit,

1 0

Ken Thomases : kernel32: For Mac 64-bit, re-enable the inlining of various functions, leveraging the TEB self pointer at %gs:0x30.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 2e636d4fe8facb841e3f1ab2a413b07e5f743dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e636d4fe8facb841e3f1ab2a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 27 10:42:30 2016 -0500 kernel32: For Mac 64-bit, re-enable the inlining of various functions, leveraging the TEB self pointer at %gs:0x30. On other platforms, gsbase is set to point to Wine's TEB. So, these functions can use %gs-relative addressing with the field offsets to access the fields of the TEB. On the Mac, gsbase points to internals of the pthread implementation and that wouldn't work. However, Wine hijacks %gs:0x30 and stores the TEB address there. So, we access the TEB fields by first loading the TEB address and then accessing its fields relative to that. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/thread.c | 38 +++++++++++++++++++++++++++++++++++++- include/winbase.h | 32 +++++++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 6630e7f..82ccebe 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -682,7 +682,41 @@ __ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x64\n\tmovl 0x24,%eax\n\tret" /* HANDLE WINAPI GetProcessHeap(void) */ __ASM_STDCALL_FUNC( GetProcessHeap, 0, ".byte 0x64\n\tmovl 0x30,%eax\n\tmovl 0x18(%eax),%eax\n\tret"); -#elif defined(__x86_64__) && !defined(__APPLE__) +#elif defined(__x86_64__) + +#ifdef __APPLE__ + +/*********************************************************************** + * SetLastError (KERNEL32.@) + */ +/* void WINAPI SetLastError( DWORD error ); */ +__ASM_STDCALL_FUNC( SetLastError, 8, ".byte 0x65\n\tmovq 0x30,%rax\n\tmovl %ecx,0x68(%rax)\n\tret" ); + +/*********************************************************************** + * GetLastError (KERNEL32.@) + */ +/* DWORD WINAPI GetLastError(void); */ +__ASM_STDCALL_FUNC( GetLastError, 0, ".byte 0x65\n\tmovq 0x30,%rax\n\tmovl 0x68(%rax),%eax\n\tret" ); + +/*********************************************************************** + * GetCurrentProcessId (KERNEL32.@) + */ +/* DWORD WINAPI GetCurrentProcessId(void) */ +__ASM_STDCALL_FUNC( GetCurrentProcessId, 0, ".byte 0x65\n\tmovq 0x30,%rax\n\tmovl 0x40(%rax),%eax\n\tret" ); + +/*********************************************************************** + * GetCurrentThreadId (KERNEL32.@) + */ +/* DWORD WINAPI GetCurrentThreadId(void) */ +__ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x65\n\tmovq 0x30,%rax\n\tmovl 0x48(%rax),%eax\n\tret" ); + +/*********************************************************************** + * GetProcessHeap (KERNEL32.@) + */ +/* HANDLE WINAPI GetProcessHeap(void) */ +__ASM_STDCALL_FUNC( GetProcessHeap, 0, ".byte 0x65\n\tmovq 0x30,%rax\n\tmovq 0x60(%rax),%rax\n\tmovq 0x30(%rax),%rax\n\tret"); + +#else /*********************************************************************** * SetLastError (KERNEL32.@) @@ -714,6 +748,8 @@ __ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x65\n\tmovl 0x48,%eax\n\tret" /* HANDLE WINAPI GetProcessHeap(void) */ __ASM_STDCALL_FUNC( GetProcessHeap, 0, ".byte 0x65\n\tmovq 0x60,%rax\n\tmovq 0x30(%rax),%rax\n\tret"); +#endif /* __APPLE__ */ + #else /* __x86_64__ */ /********************************************************************** diff --git a/include/winbase.h b/include/winbase.h index 5d8b1ff..220a057 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2904,13 +2904,19 @@ static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) /* A few optimizations for gcc */ -#if defined(__GNUC__) && !defined(__MINGW32__) && (defined(__i386__) || (defined(__x86_64__) && !defined(__APPLE__))) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))) +#if defined(__GNUC__) && !defined(__MINGW32__) && (defined(__i386__) || defined(__x86_64__)) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))) static FORCEINLINE DWORD WINAPI GetLastError(void) { DWORD ret; #ifdef __x86_64__ +#ifdef __APPLE__ + DWORD* teb; + __asm__ __volatile__( ".byte 0x65\n\tmovq 0x30,%0" : "=r" (teb) ); + ret = teb[0x68 / sizeof(DWORD)]; +#else __asm__ __volatile__( ".byte 0x65\n\tmovl 0x68,%0" : "=r" (ret) ); +#endif #else __asm__ __volatile__( ".byte 0x64\n\tmovl 0x34,%0" : "=r" (ret) ); #endif @@ -2921,7 +2927,13 @@ static FORCEINLINE DWORD WINAPI GetCurrentProcessId(void) { DWORD ret; #ifdef __x86_64__ +#ifdef __APPLE__ + DWORD* teb; + __asm__ __volatile__( ".byte 0x65\n\tmovq 0x30,%0" : "=r" (teb) ); + ret = teb[0x40 / sizeof(DWORD)]; +#else __asm__ __volatile__( ".byte 0x65\n\tmovl 0x40,%0" : "=r" (ret) ); +#endif #else __asm__ __volatile__( ".byte 0x64\n\tmovl 0x20,%0" : "=r" (ret) ); #endif @@ -2932,7 +2944,13 @@ static FORCEINLINE DWORD WINAPI GetCurrentThreadId(void) { DWORD ret; #ifdef __x86_64__ +#ifdef __APPLE__ + DWORD* teb; + __asm__ __volatile__( ".byte 0x65\n\tmovq 0x30,%0" : "=r" (teb) ); + ret = teb[0x48 / sizeof(DWORD)]; +#else __asm__ __volatile__( ".byte 0x65\n\tmovl 0x48,%0" : "=r" (ret) ); +#endif #else __asm__ __volatile__( ".byte 0x64\n\tmovl 0x24,%0" : "=r" (ret) ); #endif @@ -2942,7 +2960,13 @@ static FORCEINLINE DWORD WINAPI GetCurrentThreadId(void) static FORCEINLINE void WINAPI SetLastError( DWORD err ) { #ifdef __x86_64__ +#ifdef __APPLE__ + DWORD* teb; + __asm__ __volatile__( ".byte 0x65\n\tmovq 0x30,%0" : "=r" (teb) ); + teb[0x68 / sizeof(DWORD)] = err; +#else __asm__ __volatile__( ".byte 0x65\n\tmovl %0,0x68" : : "r" (err) : "memory" ); +#endif #else __asm__ __volatile__( ".byte 0x64\n\tmovl %0,0x34" : : "r" (err) : "memory" ); #endif @@ -2952,7 +2976,13 @@ static FORCEINLINE HANDLE WINAPI GetProcessHeap(void) { HANDLE *pdb; #ifdef __x86_64__ +#ifdef __APPLE__ + HANDLE** teb; + __asm__ __volatile__( ".byte 0x65\n\tmovq 0x30,%0" : "=r" (teb) ); + pdb = teb[0x60 / sizeof(HANDLE*)]; +#else __asm__ __volatile__( ".byte 0x65\n\tmovq 0x60,%0" : "=r" (pdb) ); +#endif return pdb[0x30 / sizeof(HANDLE)]; /* get dword at offset 0x30 in pdb */ #else __asm__ __volatile__( ".byte 0x64\n\tmovl 0x30,%0" : "=r" (pdb) );

1 0

Ken Thomases : ntdll: For Mac 64-bit, poke the TEB address to %gs: 0x30 and re-enable the inlining of NtCurrentTeb().
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 7501942008f91a9a137fe598ce5ce7cb47de5522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7501942008f91a9a137fe598c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 27 10:42:29 2016 -0500 ntdll: For Mac 64-bit, poke the TEB address to %gs:0x30 and re-enable the inlining of NtCurrentTeb(). 64-bit Windows apps have hard-coded accesses to %gs:0x30 baked into them. They need to find the TEB self pointer there. Technically, the gsbase register and the memory it points to belong to the pthread implementation on macOS. It's used for the pthread TLS implementation. However, study of the sources and experimentation reveal that TLS slot 6 (offset 0x30) is not currently used. Furthermore, Apple has promised to not use that slot in the future. So, we hijack it for our purposes. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_x86_64.c | 34 +++------------------------------- include/winnt.h | 2 +- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f6e7edf..e0c0746 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -149,7 +149,7 @@ @ stdcall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken # @ stub NtCreateWaitablePort -@ stdcall NtCurrentTeb() +@ stdcall -arch=win32,arm64 NtCurrentTeb() # @ stub NtDebugActiveProcess # @ stub NtDebugContinue @ stdcall NtDelayExecution(long ptr) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1db3a23..10faaea 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -241,8 +241,6 @@ static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_ #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.__fpregs)) #elif defined (__APPLE__) -static pthread_key_t teb_key; - #define RAX_sig(context) ((context)->uc_mcontext->__ss.__rax) #define RBX_sig(context) ((context)->uc_mcontext->__ss.__rbx) #define RCX_sig(context) ((context)->uc_mcontext->__ss.__rcx) @@ -2834,13 +2832,6 @@ void signal_free_thread( TEB *teb ) NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } -#ifdef __APPLE__ -static void init_teb_key(void) -{ - pthread_key_create( &teb_key, NULL ); -} -#endif - /********************************************************************** * signal_init_thread */ @@ -2849,10 +2840,6 @@ void signal_init_thread( TEB *teb ) const WORD fpu_cw = 0x27f; stack_t ss; -#ifdef __APPLE__ - static pthread_once_t init_once = PTHREAD_ONCE_INIT; -#endif - #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) @@ -2860,9 +2847,9 @@ void signal_init_thread( TEB *teb ) #elif defined(__NetBSD__) sysarch( X86_64_SET_GSBASE, &teb ); #elif defined (__APPLE__) - /* FIXME: Actually setting %gs needs support from the OS */ - pthread_once( &init_once, init_teb_key ); - pthread_setspecific( teb_key, teb ); + __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" + : + : "r" (teb->Tib.Self), "n" (FIELD_OFFSET(TEB, Tib.Self))); #else # error Please define setting %gs for your architecture #endif @@ -3847,19 +3834,4 @@ __ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret") */ __ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret") -/********************************************************************** - * NtCurrentTeb (NTDLL.@) - * - * FIXME: This isn't exported from NTDLL on real NT. This should be - * removed if and when we can set the GSBASE MSR on Mac OS X. - */ -#ifdef __APPLE__ -TEB * WINAPI NtCurrentTeb(void) -{ - return pthread_getspecific( teb_key ); -} -#else -__ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x65\n\tmovq 0x30,%rax\n\tret" ) -#endif - #endif /* __x86_64__ */ diff --git a/include/winnt.h b/include/winnt.h index 2705373..96722a4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2331,7 +2331,7 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) __asm mov teb, eax; return teb; } -#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__APPLE__) +#elif defined(__x86_64__) && defined(__GNUC__) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb;

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

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