wine-devel

wine-devel@winehq.org

1 participants
84482 discussions

[PATCH vkd3d 1/5] tests: Rename struct shader_context to struct shader_runner.
by Zebediah Figura 21 Mar '22

21 Mar '22

This is a bit clearer, and avoids colliding with other things named "context", e.g. struct test_context, or d3d11 device contexts. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tests/shader_runner.c | 90 ++++++++++++++++++------------------- tests/shader_runner.h | 12 ++--- tests/shader_runner_d3d11.c | 20 ++++----- tests/shader_runner_d3d12.c | 20 ++++----- 4 files changed, 71 insertions(+), 71 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 8cfdf052c..d68d7f186 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -99,7 +99,7 @@ static bool match_string(const char *line, const char *token, const char **const return true; } -static void parse_require_directive(struct shader_context *context, const char *line) +static void parse_require_directive(struct shader_runner *runner, const char *line) { if (match_string(line, "shader model >=", &line)) { @@ -117,7 +117,7 @@ static void parse_require_directive(struct shader_context *context, const char * { if (match_string(line, model_strings[i], &line)) { - context->minimum_shader_model = i; + runner->minimum_shader_model = i; return; } } @@ -277,19 +277,19 @@ static void parse_texture_directive(struct texture_params *texture, const char * } } -static void set_uniforms(struct shader_context *context, size_t offset, size_t count, const void *uniforms) +static void set_uniforms(struct shader_runner *runner, size_t offset, size_t count, const void *uniforms) { - context->uniform_count = align(max(context->uniform_count, offset + count), 4); - vkd3d_array_reserve((void **)&context->uniforms, &context->uniform_capacity, - context->uniform_count, sizeof(*context->uniforms)); - memcpy(context->uniforms + offset, uniforms, count * sizeof(*context->uniforms)); + runner->uniform_count = align(max(runner->uniform_count, offset + count), 4); + vkd3d_array_reserve((void **)&runner->uniforms, &runner->uniform_capacity, + runner->uniform_count, sizeof(*runner->uniforms)); + memcpy(runner->uniforms + offset, uniforms, count * sizeof(*runner->uniforms)); } -static void parse_test_directive(struct shader_context *context, const char *line) +static void parse_test_directive(struct shader_runner *runner, const char *line) { if (match_string(line, "draw quad", &line)) { - context->ops->draw_quad(context); + runner->ops->draw_quad(runner); } else if (match_string(line, "probe all rgba", &line)) { @@ -304,7 +304,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin if (ret < 5) ulps = 0; - context->ops->probe_vec4(context, &rect, &v, ulps); + runner->ops->probe_vec4(runner, &rect, &v, ulps); } else if (match_string(line, "probe rect rgba", &line)) { @@ -324,7 +324,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin rect.right = x + w; rect.top = y; rect.bottom = y + h; - context->ops->probe_vec4(context, &rect, &v, ulps); + runner->ops->probe_vec4(runner, &rect, &v, ulps); } else if (match_string(line, "probe rgba", &line)) { @@ -343,7 +343,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin rect.right = x + 1; rect.top = y; rect.bottom = y + 1; - context->ops->probe_vec4(context, &rect, &v, ulps); + runner->ops->probe_vec4(runner, &rect, &v, ulps); } else if (match_string(line, "uniform", &line)) { @@ -359,7 +359,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin if (sscanf(line, "%f %f %f %f", &v.x, &v.y, &v.z, &v.w) < 4) fatal_error("Malformed float4 constant '%s'.\n", line); - set_uniforms(context, offset, 4, &v); + set_uniforms(runner, offset, 4, &v); } else if (match_string(line, "float", &line)) { @@ -367,7 +367,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin if (sscanf(line, "%f", &f) < 1) fatal_error("Malformed float constant '%s'.\n", line); - set_uniforms(context, offset, 1, &f); + set_uniforms(runner, offset, 1, &f); } else if (match_string(line, "int4", &line)) { @@ -375,7 +375,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin if (sscanf(line, "%d %d %d %d", &v[0], &v[1], &v[2], &v[3]) < 4) fatal_error("Malformed int4 constant '%s'.\n", line); - set_uniforms(context, offset, 4, v); + set_uniforms(runner, offset, 4, v); } else if (match_string(line, "int", &line)) { @@ -383,7 +383,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin if (sscanf(line, "%i", &i) < 1) fatal_error("Malformed int constant '%s'.\n", line); - set_uniforms(context, offset, 1, &i); + set_uniforms(runner, offset, 1, &i); } else if (match_string(line, "uint", &line)) { @@ -391,7 +391,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin if (sscanf(line, "%u", &u) < 1) fatal_error("Malformed uint constant '%s'.\n", line); - set_uniforms(context, offset, 1, &u); + set_uniforms(runner, offset, 1, &u); } } else @@ -400,14 +400,14 @@ static void parse_test_directive(struct shader_context *context, const char *lin } } -static struct sampler *get_sampler(struct shader_context *context, unsigned int slot) +static struct sampler *get_sampler(struct shader_runner *runner, unsigned int slot) { struct sampler *sampler; size_t i; - for (i = 0; i < context->sampler_count; ++i) + for (i = 0; i < runner->sampler_count; ++i) { - sampler = &context->samplers[i]; + sampler = &runner->samplers[i]; if (sampler->slot == slot) return sampler; @@ -416,25 +416,25 @@ static struct sampler *get_sampler(struct shader_context *context, unsigned int return NULL; } -static void set_texture(struct shader_context *context, struct texture *texture) +static void set_texture(struct shader_runner *runner, struct texture *texture) { size_t i; - for (i = 0; i < context->texture_count; ++i) + for (i = 0; i < runner->texture_count; ++i) { - if (context->textures[i]->slot == texture->slot) + if (runner->textures[i]->slot == texture->slot) { - context->ops->destroy_texture(context, context->textures[i]); - context->textures[i] = texture; + runner->ops->destroy_texture(runner, runner->textures[i]); + runner->textures[i] = texture; return; } } - context->textures = realloc(context->textures, (context->texture_count + 1) * sizeof(*context->textures)); - context->textures[context->texture_count++] = texture; + runner->textures = realloc(runner->textures, (runner->texture_count + 1) * sizeof(*runner->textures)); + runner->textures[runner->texture_count++] = texture; } -void run_shader_tests(struct shader_context *context, int argc, char **argv, const struct shader_runner_ops *ops) +void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const struct shader_runner_ops *ops) { size_t shader_source_size = 0, shader_source_len = 0; struct sampler *current_sampler = NULL; @@ -446,7 +446,7 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con char line[256]; FILE *f; - context->minimum_shader_model = SHADER_MODEL_2_0; + runner->minimum_shader_model = SHADER_MODEL_2_0; for (i = 1; i < argc; ++i) { @@ -469,8 +469,8 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con return; } - memset(context, 0, sizeof(*context)); - context->ops = ops; + memset(runner, 0, sizeof(*runner)); + runner->ops = ops; for (;;) { @@ -489,13 +489,13 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con break; case STATE_TEXTURE: - set_texture(context, context->ops->create_texture(context, &current_texture)); + set_texture(runner, runner->ops->create_texture(runner, &current_texture)); free(current_texture.data); break; case STATE_SHADER_PIXEL: - free(context->ps_source); - context->ps_source = shader_source; + free(runner->ps_source); + runner->ps_source = shader_source; shader_source = NULL; shader_source_len = 0; shader_source_size = 0; @@ -599,15 +599,15 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con { state = STATE_SAMPLER; - if ((current_sampler = get_sampler(context, index))) + if ((current_sampler = get_sampler(runner, index))) { memset(current_sampler, 0, sizeof(*current_sampler)); } else { - context->samplers = realloc(context->samplers, - ++context->sampler_count * sizeof(*context->samplers)); - current_sampler = &context->samplers[context->sampler_count - 1]; + runner->samplers = realloc(runner->samplers, + ++runner->sampler_count * sizeof(*runner->samplers)); + current_sampler = &runner->samplers[runner->sampler_count - 1]; memset(current_sampler, 0, sizeof(*current_sampler)); } current_sampler->slot = index; @@ -664,7 +664,7 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con } case STATE_REQUIRE: - parse_require_directive(context, line); + parse_require_directive(runner, line); break; case STATE_SAMPLER: @@ -676,19 +676,19 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con break; case STATE_TEST: - parse_test_directive(context, line); + parse_test_directive(runner, line); break; } } } - free(context->ps_source); - for (i = 0; i < context->texture_count; ++i) + free(runner->ps_source); + for (i = 0; i < runner->texture_count; ++i) { - if (context->textures[i]) - context->ops->destroy_texture(context, context->textures[i]); + if (runner->textures[i]) + runner->ops->destroy_texture(runner, runner->textures[i]); } - free(context->textures); + free(runner->textures); fclose(f); diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 6958191d9..84c170164 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -65,7 +65,7 @@ struct texture unsigned int slot; }; -struct shader_context +struct shader_runner { const struct shader_runner_ops *ops; @@ -84,15 +84,15 @@ struct shader_context struct shader_runner_ops { - struct texture *(*create_texture)(struct shader_context *context, const struct texture_params *params); - void (*destroy_texture)(struct shader_context *context, struct texture *texture); - void (*draw_quad)(struct shader_context *context); - void (*probe_vec4)(struct shader_context *context, const RECT *rect, const struct vec4 *v, unsigned int ulps); + struct texture *(*create_texture)(struct shader_runner *runner, const struct texture_params *params); + void (*destroy_texture)(struct shader_runner *runner, struct texture *texture); + void (*draw_quad)(struct shader_runner *runner); + void (*probe_vec4)(struct shader_runner *runner, const RECT *rect, const struct vec4 *v, unsigned int ulps); }; void fatal_error(const char *format, ...) VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2); -void run_shader_tests(struct shader_context *context, int argc, char **argv, const struct shader_runner_ops *ops); +void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const struct shader_runner_ops *ops); #ifdef _WIN32 void run_shader_tests_d3d11(int argc, char **argv); diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 6290ac290..f84a3be83 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -53,7 +53,7 @@ static struct d3d11_texture *d3d11_texture(struct texture *t) struct d3d11_shader_context { - struct shader_context c; + struct shader_runner c; ID3D11Device *device; HWND window; @@ -65,9 +65,9 @@ struct d3d11_shader_context ID3D11VertexShader *vs; }; -static struct d3d11_shader_context *d3d11_shader_context(struct shader_context *c) +static struct d3d11_shader_context *d3d11_shader_context(struct shader_runner *r) { - return CONTAINING_RECORD(c, struct d3d11_shader_context, c); + return CONTAINING_RECORD(r, struct d3d11_shader_context, c); } static bool enable_debug_layer; @@ -359,9 +359,9 @@ static ID3D11Buffer *create_buffer(ID3D11Device *device, unsigned int bind_flags return buffer; } -static struct texture *d3d11_runner_create_texture(struct shader_context *c, const struct texture_params *params) +static struct texture *d3d11_runner_create_texture(struct shader_runner *r, const struct texture_params *params) { - struct d3d11_shader_context *context = d3d11_shader_context(c); + struct d3d11_shader_context *context = d3d11_shader_context(r); ID3D11Device *device = context->device; D3D11_SUBRESOURCE_DATA resource_data; D3D11_TEXTURE2D_DESC desc = {0}; @@ -394,7 +394,7 @@ static struct texture *d3d11_runner_create_texture(struct shader_context *c, con return &texture->t; } -static void d3d11_runner_destroy_texture(struct shader_context *c, struct texture *t) +static void d3d11_runner_destroy_texture(struct shader_runner *r, struct texture *t) { struct d3d11_texture *texture = d3d11_texture(t); @@ -403,7 +403,7 @@ static void d3d11_runner_destroy_texture(struct shader_context *c, struct textur free(texture); } -static void d3d11_runner_draw_quad(struct shader_context *c) +static void d3d11_runner_draw_quad(struct shader_runner *r) { static const char vs_source[] = "void main(uint id : SV_VertexID, out float4 position : SV_Position)\n" @@ -412,7 +412,7 @@ static void d3d11_runner_draw_quad(struct shader_context *c) " position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);\n" "}"; - struct d3d11_shader_context *context = d3d11_shader_context(c); + struct d3d11_shader_context *context = d3d11_shader_context(r); ID3D11Device *device = context->device; ID3D11Buffer *cb = NULL; ID3D11PixelShader *ps; @@ -561,9 +561,9 @@ static void check_readback_data_vec4(struct resource_readback *rb, got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); } -static void d3d11_runner_probe_vec4(struct shader_context *c, const RECT *rect, const struct vec4 *v, unsigned int ulps) +static void d3d11_runner_probe_vec4(struct shader_runner *r, const RECT *rect, const struct vec4 *v, unsigned int ulps) { - struct d3d11_shader_context *context = d3d11_shader_context(c); + struct d3d11_shader_context *context = d3d11_shader_context(r); struct resource_readback rb; init_readback(context, &rb); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 571efeacd..eec9582c7 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -40,16 +40,16 @@ static struct d3d12_texture *d3d12_texture(struct texture *t) struct d3d12_shader_context { - struct shader_context c; + struct shader_runner c; struct test_context test_context; ID3D12DescriptorHeap *heap; }; -static struct d3d12_shader_context *d3d12_shader_context(struct shader_context *c) +static struct d3d12_shader_context *d3d12_shader_context(struct shader_runner *r) { - return CONTAINING_RECORD(c, struct d3d12_shader_context, c); + return CONTAINING_RECORD(r, struct d3d12_shader_context, c); } static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_model) @@ -80,9 +80,9 @@ static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_m #define MAX_RESOURCE_DESCRIPTORS 256 -static struct texture *d3d12_runner_create_texture(struct shader_context *c, const struct texture_params *params) +static struct texture *d3d12_runner_create_texture(struct shader_runner *r, const struct texture_params *params) { - struct d3d12_shader_context *context = d3d12_shader_context(c); + struct d3d12_shader_context *context = d3d12_shader_context(r); struct test_context *test_context = &context->test_context; ID3D12Device *device = test_context->device; D3D12_SUBRESOURCE_DATA resource_data; @@ -113,7 +113,7 @@ static struct texture *d3d12_runner_create_texture(struct shader_context *c, con return &texture->t; } -static void d3d12_runner_destroy_texture(struct shader_context *c, struct texture *t) +static void d3d12_runner_destroy_texture(struct shader_runner *r, struct texture *t) { struct d3d12_texture *texture = d3d12_texture(t); @@ -121,9 +121,9 @@ static void d3d12_runner_destroy_texture(struct shader_context *c, struct textur free(texture); } -static void d3d12_runner_draw_quad(struct shader_context *c) +static void d3d12_runner_draw_quad(struct shader_runner *r) { - struct d3d12_shader_context *context = d3d12_shader_context(c); + struct d3d12_shader_context *context = d3d12_shader_context(r); struct test_context *test_context = &context->test_context; ID3D12GraphicsCommandList *command_list = test_context->list; @@ -243,10 +243,10 @@ static void d3d12_runner_draw_quad(struct shader_context *c) reset_command_list(command_list, test_context->allocator); } -static void d3d12_runner_probe_vec4(struct shader_context *c, +static void d3d12_runner_probe_vec4(struct shader_runner *r, const RECT *rect, const struct vec4 *v, unsigned int ulps) { - struct d3d12_shader_context *context = d3d12_shader_context(c); + struct d3d12_shader_context *context = d3d12_shader_context(r); struct test_context *test_context = &context->test_context; struct resource_readback rb; -- 2.35.1

2 9

[PATCH] sc: Add support for the 'query' command.
by Dmitry Timoshkov 21 Mar '22

21 Mar '22

Output is modelled on behaviour observed under the Windows 10. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/sc/sc.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 4e642874237..4407ab5bcab 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -175,6 +175,26 @@ static void usage( void ) exit( 1 ); } +static const WCHAR *service_type_string( DWORD type ) +{ + switch (type) + { + case SERVICE_WIN32_OWN_PROCESS: return L"WIN32_OWN_PROCESS"; + case SERVICE_WIN32_SHARE_PROCESS: return L"WIN32_SHARE_PROCESS"; + case SERVICE_WIN32: return L"WIN32"; + default: return L""; + } +} + +static const WCHAR *service_state_string( DWORD state ) +{ + static const WCHAR * const state_str[] = { L"", L"STOPPED", L"START_PENDING" + L"STOP_PENDING", L"RUNNING", L"CONTINUE_PENDING", L"PAUSE_PENDING", L"PAUSED" }; + + if (state <= ARRAY_SIZE( state_str )) return state_str[ state ]; + return L""; +} + int __cdecl wmain( int argc, const WCHAR *argv[] ) { SC_HANDLE manager, service; @@ -285,6 +305,33 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_ERR("failed to open service %lu\n", GetLastError()); } + else if (!wcsicmp( argv[1], L"query" )) + { + service = OpenServiceW( manager, argv[2], SERVICE_QUERY_STATUS ); + if (service) + { + SERVICE_STATUS status; + + ret = QueryServiceStatus( service, &status ); + if (!ret) + WINE_ERR("failed to query service status %lu\n", GetLastError()); + else + printf( "SERVICE_NAME: %ws\n" + " TYPE : %lx %ws\n" + " STATE : %lx %ws\n" + " WIN32_EXIT_CODE : %lu (0x%lx)\n" + " SERVICE_EXIT_CODE : %lu (0x%lx)\n" + " CHECKPOINT : 0x%lx\n" + " WAIT_HINT : 0x%lx\n", + argv[2], status.dwServiceType, service_type_string( status.dwServiceType ), + status.dwCurrentState, service_state_string( status.dwCurrentState ), + status.dwControlsAccepted, status.dwWin32ExitCode, + status.dwServiceSpecificExitCode, status.dwCheckPoint, + status.dwWaitHint ); + CloseServiceHandle( service ); + } + else WINE_ERR("failed to open service %lu\n", GetLastError()); + } else if (!wcsicmp( argv[1], L"sdset" )) { WINE_FIXME("SdSet command not supported, faking success\n"); -- 2.35.1

1 0

[PATCH v2 5/5] win32u: Move message spy implementation from user32.
by Jacek Caban 21 Mar '22

21 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed wrong ntdll_wcstoumbs call spotted by Huw. Thanks! dlls/user32/Makefile.in | 1 - dlls/user32/user_main.c | 21 +++++++ dlls/user32/user_private.h | 7 --- dlls/win32u/Makefile.in | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 6 ++ dlls/win32u/ntuser_private.h | 15 +++++ dlls/{user32 => win32u}/spy.c | 109 ++++++++++++++++++---------------- dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 + dlls/win32u/window.c | 4 +- dlls/win32u/wrappers.c | 7 +++ include/ntuser.h | 5 ++ 14 files changed, 124 insertions(+), 60 deletions(-) rename dlls/{user32 => win32u}/spy.c (96%)

2 1

[PATCH] winhttp: Avoid freeing potentially uninitialized context in netconn_secure_connect().
by Paul Gofman 21 Mar '22

21 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Certain failures in InitializeSecurityContextW may leave output context unitialized. Freeing that on error path below may cause access violation. It seems to me that just zeroing the context is easier and less fragile rather than accurately guessing which possible InitializeSecurityContextW() status requires freeing the handle or not. On a separate note, I tested that Windows DeleteSecurityContext may also have an exception given invalid context but it catches that (probably like other secur32 functions in similar cases) and returns SEC_E_INVALID_HANDLE: https://gist.github.com/gofman/7960b67a0fadaae843157b5556a1c003. I am not immediately sure if we want to fix that now in secur32 (I am not aware of any specific app depending on that), in case we will we can factor out structure getter and either use __TRY / __CATCH or add a magic number to the structure. In any case I suppose avoiding hitting this case in winhttp worth it regardless. dlls/winhttp/net.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 2fc48476513..07a65c5465f 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -293,6 +293,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur if (!(read_buf = malloc( read_buf_size ))) return ERROR_OUTOFMEMORY; + memset( &ctx, 0, sizeof(ctx) ); status = InitializeSecurityContextW(cred_handle, NULL, hostname, isc_req_flags, 0, 0, NULL, 0, &ctx, &out_desc, &attrs, NULL); -- 2.35.1

2 1

[PATCH 4/5] user32: Store current spy indent in user_thread_info struct.
by Jacek Caban 21 Mar '22

21 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/spy.c | 13 ++----------- dlls/win32u/ntuser_private.h | 1 + 2 files changed, 3 insertions(+), 11 deletions(-)

3 2

[PATCH 3/5] user.exe: Use win32u directly for cursor icon handle support.
by Jacek Caban 21 Mar '22

21 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user.exe16/message.c | 11 +++++------ dlls/user.exe16/user.c | 7 ++++--- dlls/user.exe16/user_private.h | 3 --- dlls/user32/controls.h | 6 ------ dlls/user32/cursoricon.c | 10 ---------- dlls/user32/user_main.c | 6 ------ dlls/user32/winproc.c | 3 --- 7 files changed, 9 insertions(+), 37 deletions(-)

3 2

[PATCH 2/5] win32u: Don't use CDECL for window surface functions.
by Jacek Caban 21 Mar '22

21 Mar '22

They are no longer used from PE code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/dce.c | 42 +++++++++++++++++------------------ dlls/wineandroid.drv/window.c | 14 ++++++------ dlls/winemac.drv/surface.c | 14 ++++++------ dlls/winex11.drv/bitblt.c | 14 ++++++------ include/wine/gdi_driver.h | 20 ++++++++++------- 5 files changed, 54 insertions(+), 50 deletions(-)

2 1

[PATCH 1/5] win32u: Move dib.drv implementation from gdi.exe.
by Jacek Caban 21 Mar '22

21 Mar '22

2 1

[PATCH 5/5] win32u: Move message spy implementation from user32.
by Jacek Caban 21 Mar '22

21 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/Makefile.in | 1 - dlls/user32/user_main.c | 21 +++++++ dlls/user32/user_private.h | 7 --- dlls/win32u/Makefile.in | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 6 ++ dlls/win32u/ntuser_private.h | 15 +++++ dlls/{user32 => win32u}/spy.c | 109 ++++++++++++++++++---------------- dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 + dlls/win32u/window.c | 4 +- dlls/win32u/wrappers.c | 7 +++ include/ntuser.h | 5 ++ 14 files changed, 124 insertions(+), 60 deletions(-) rename dlls/{user32 => win32u}/spy.c (96%)

3 2

[PATCH] preloader: Forward PT_DYNAMIC for debugger support
by Tatsuyuki Ishi 21 Mar '22

21 Mar '22

In order for a debugger to properly resolve loaded modules and detect loading of them, it's necessary that the correct DT_DEBUG entry is visible to the debugger. We had two problems with this before: 1. Since the preloader is the main executable, its ELF metadata is used instead of the executable that we are trying to load. 2. The ELF header was actually getting overwritten by the reserved region, since we only adjusted the placement for the .text section. While 1. cannot be solved unless we run the preloader in another way, e.g. as an interpreter, we can use some dirty hacks to solve 2. This patch simply creates a stub PT_DYNAMIC section in the preloader, then during execution patch that to point to the main executable's respective section. This allows GDB to have full shared library support when attaching. There are numerous limitation due to the nature of the hack: It relies on the BFD linker to create a PT_DYNAMIC entry, it doesn't work when the executable was launched within the debugger, and it doesn't work with LLDB. GDB doesn't seem to resolve the symbols of the main executable, but that should not be much of an issue since the loader itself is very short. Some alternative ways to fix this are also possible: 1. Run the preloader as an ELF interpreter. This would get rid of the need of messing with the auxiliary vector and various ELF metadata, but the interpreter can be only specified by absolute path, which is a packaging nuisance. 2. Get rid of the preloader entirely, make the loader static and let it perform the reservation. This should work on glibc, but it's in general not a very well supported use case and feels like a compatibility disaster. --- configure | 17 ++++++---- configure.ac | 17 ++++++---- loader/Makefile.in | 5 +-- loader/preloader.c | 68 ++++++++++++++++++++++++++++++++------ loader/preloader_dynamic.s | 11 ++++++ 5 files changed, 93 insertions(+), 25 deletions(-) create mode 100644 loader/preloader_dynamic.s diff --git a/configure b/configure index 6a3a43a9e97..098c67f250a 100755 --- a/configure +++ b/configure @@ -10372,7 +10372,7 @@ if test "x$ac_cv_cflags__Wl___export_dynamic" = xyes then : WINELOADER_LDFLAGS="-Wl,--export-dynamic" fi - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs" case $host_cpu in *i[3456789]86* | x86_64 | *aarch64* | arm*) @@ -10402,10 +10402,13 @@ fi printf "%s\n" "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; } if test "x$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" = xyes then : - case $host_os in - freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; - *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;; - esac + + case $host_os in + freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; + *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;; + esac + WINEPRELOADER_LDFLAGS="$WINEPRELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d400000" + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7d000400" >&5 printf %s "checking whether the compiler supports -Wl,--section-start,.interp=0x7d000400... " >&6; } @@ -10433,11 +10436,13 @@ fi printf "%s\n" "$ac_cv_cflags__Wl___section_start__interp_0x7d000400" >&6; } if test "x$ac_cv_cflags__Wl___section_start__interp_0x7d000400" = xyes then : - case $host_os in + + case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;; *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;; esac fi + WINEPRELOADER_LDFLAGS="$WINEPRELOADER_LDFLAGS -Wl,-Ttext=0x7d400000" # Extract the first word of "prelink", so it can be a program name with args. set dummy prelink; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/configure.ac b/configure.ac index 5a85fce12a4..9b0e167448f 100644 --- a/configure.ac +++ b/configure.ac @@ -826,20 +826,25 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,-z,defs],[UNIXLDFLAGS="$UNIXLDFLAGS -Wl,-z,defs"]) WINE_TRY_CFLAGS([-Wl,--export-dynamic],[WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs" case $host_cpu in *i[[3456789]]86* | x86_64 | *aarch64* | arm*) WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], - [case $host_os in - freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; - *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;; - esac], + [ + case $host_os in + freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; + *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;; + esac + WINEPRELOADER_LDFLAGS="$WINEPRELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d400000" + ], [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7d000400], - [case $host_os in + [ + case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;; *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;; esac]) + WINEPRELOADER_LDFLAGS="$WINEPRELOADER_LDFLAGS -Wl,-Ttext=0x7d400000" AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) if test "x$PRELINK" = xfalse then diff --git a/loader/Makefile.in b/loader/Makefile.in index 7302c231915..b5bdf6e1439 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -2,6 +2,7 @@ SOURCES = \ main.c \ preloader.c \ preloader_mac.c \ + preloader_dynamic.s \ wine.de.UTF-8.man.in \ wine.desktop \ wine.fr.UTF-8.man.in \ @@ -25,10 +26,10 @@ wine64_OBJS = main.o wine64_DEPS = $(WINELOADER_DEPENDS) wine64_LDFLAGS = $(WINELOADER_LDFLAGS) $(LDEXECFLAGS) $(PTHREAD_LIBS) -wine_preloader_OBJS = preloader.o preloader_mac.o +wine_preloader_OBJS = preloader.o preloader_mac.o preloader_dynamic.o wine_preloader_DEPS = $(WINELOADER_DEPENDS) wine_preloader_LDFLAGS = $(WINEPRELOADER_LDFLAGS) -wine64_preloader_OBJS = preloader.o preloader_mac.o +wine64_preloader_OBJS = preloader.o preloader_mac.o preloader_dynamic.o wine64_preloader_DEPS = $(WINELOADER_DEPENDS) wine64_preloader_LDFLAGS = $(WINEPRELOADER_LDFLAGS) diff --git a/loader/preloader.c b/loader/preloader.c index 585be50624f..6af37cfca12 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -868,7 +868,7 @@ static void set_auxiliary_values( struct wld_auxv *av, const struct wld_auxv *ne * * Get a field of the auxiliary structure */ -static int get_auxiliary( struct wld_auxv *av, int type, int def_val ) +static unsigned long get_auxiliary(struct wld_auxv *av, unsigned long type, unsigned long def_val) { for ( ; av->a_type != AT_NULL; av++) if( av->a_type == type ) return av->a_un.a_val; @@ -1148,13 +1148,30 @@ static unsigned int gnu_hash( const char *name ) return h; } +static void *find_segment(const struct wld_link_map *map, int type, ElfW(Half) * size) +{ + void *ret = NULL; + const ElfW(Phdr) *ph; + /* parse the (already loaded) ELF executable's header */ + for (ph = map->l_phdr; ph < &map->l_phdr[map->l_phnum]; ++ph) + { + if (type == ph->p_type) + { + ret = (void *)(ph->p_vaddr + map->l_addr); + if (size) + *size = ph->p_memsz; + break; + } + } + return ret; +} + /* * Find a symbol in the symbol table of the executable loaded */ static void *find_symbol( const struct wld_link_map *map, const char *var, int type ) { const ElfW(Dyn) *dyn = NULL; - const ElfW(Phdr) *ph; const ElfW(Sym) *symtab = NULL; const Elf32_Word *hashtab = NULL; const Elf32_Word *gnu_hashtab = NULL; @@ -1165,15 +1182,7 @@ static void *find_symbol( const struct wld_link_map *map, const char *var, int t #ifdef DUMP_SYMS wld_printf("%p %x\n", map->l_phdr, map->l_phnum ); #endif - /* parse the (already loaded) ELF executable's header */ - for (ph = map->l_phdr; ph < &map->l_phdr[map->l_phnum]; ++ph) - { - if( PT_DYNAMIC == ph->p_type ) - { - dyn = (void *)(ph->p_vaddr + map->l_addr); - break; - } - } + dyn = find_segment( map, PT_DYNAMIC, NULL ); if( !dyn ) return NULL; while( dyn->d_tag ) @@ -1375,6 +1384,12 @@ void* wld_start( void **stack ) struct wld_auxv new_av[8], delete_av[3], *av; struct wld_link_map main_binary_map, ld_so_map; struct wine_preload_info **wine_main_preload_info; + void *main_binary_dynamic = NULL; + ElfW(Half) main_binary_dynamic_size = 0; + ElfW(Phdr) *self_phdr; + unsigned long phdr_offset = 0; + ElfW(Half) self_phnum; + ElfW(Phdr) *ph; pargc = *stack; argv = (char **)pargc + 1; @@ -1394,6 +1409,8 @@ void* wld_start( void **stack ) av = (struct wld_auxv *)(p+1); page_size = get_auxiliary( av, AT_PAGESZ, 4096 ); page_mask = page_size - 1; + self_phdr = (void *)get_auxiliary(av, AT_PHDR, (unsigned long)NULL); + self_phnum = get_auxiliary(av, AT_PHNUM, 0); preloader_start = (char *)_start - ((unsigned long)_start & page_mask); preloader_end = (char *)((unsigned long)(_end + page_mask) & ~page_mask); @@ -1442,6 +1459,35 @@ void* wld_start( void **stack ) interp = (char *)main_binary_map.l_addr + main_binary_map.l_interp; map_so_lib( interp, &ld_so_map ); + main_binary_dynamic = find_segment(&main_binary_map, PT_DYNAMIC, &main_binary_dynamic_size); + for (ph = self_phdr; ph < &self_phdr[self_phnum]; ++ph) + { + if (is_addr_reserved(ph)) + { + wld_printf("preloader: Warning: preloader PHDR is in reserved range, symbols in gdb " + "will be broken! (Make sure the linker used to build Wine supports " + "-Ttext-segment)\n"); + break; + } + + if (PT_PHDR == ph->p_type) + { + /* Best effort PIE support */ + phdr_offset = (unsigned long)self_phdr - (unsigned long)ph->p_vaddr; + } + else if (PT_DYNAMIC == ph->p_type) + { + /* + * Monkey patch our PT_DYNAMIC entry to point it to the real executable's PT_DYNAMIC section. + * This is required by debuggers to resolve loaded shared libraries and more. + */ + wld_mprotect((void *)((unsigned long)ph & ~page_mask), page_size, PROT_READ | PROT_WRITE); + ph->p_vaddr = (unsigned long)main_binary_dynamic - phdr_offset; + ph->p_memsz = main_binary_dynamic_size; + break; + } + } + /* store pointer to the preload info into the appropriate main binary variable */ wine_main_preload_info = find_symbol( &main_binary_map, "wine_main_preload_info", STT_OBJECT ); if (wine_main_preload_info) *wine_main_preload_info = preload_info; diff --git a/loader/preloader_dynamic.s b/loader/preloader_dynamic.s new file mode 100644 index 00000000000..cd658c758d8 --- /dev/null +++ b/loader/preloader_dynamic.s @@ -0,0 +1,11 @@ +DT_NULL=0 +# This section is a stub PT_DYNAMIC entry that will be patched over to the real exectuable's +# respective section. +# This only works with ld.bfd. gold and lld (with --image-base) will create their own +# PT_DYNAMIC entry unless instructed otherwise with a linker script. +.section ".dynamic" + _DYNAMIC: .globl _DYNAMIC + # Don't put any "real" entries here: GDB will look at the on-disk image first, and we + # need to make sure that the stub entries doesn't get preferred over the real entries + # that we forward to. + .long DT_NULL,0 -- 2.35.1

1 0

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-devel