September 2021 - Wine-devel

[PATCH 0/5] winemac.drv: Layer-backed views
by Chip Davis 01 Sep '21

01 Sep '21

3 10

[PATCH 6/6] gdi32: Move CombineTransform to objects.c.
by Jacek Caban 01 Sep '21

01 Sep '21

And use a separated copy in ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/dc.c | 52 +------------------------------------- dlls/gdi32/mapping.c | 22 ++++++++++++++-- dlls/gdi32/ntgdi_private.h | 2 ++ dlls/gdi32/objects.c | 24 ++++++++++++++++++ 5 files changed, 48 insertions(+), 54 deletions(-)

2 1

[PATCH 5/6] gdi32: Copy TranslateCharsetInfo to text.c.
by Jacek Caban 01 Sep '21

01 Sep '21

And use a separated copy in ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 96 ++++++++++++++++---------------------- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/text.c | 82 ++++++++++++++++++++++++++++++++ 4 files changed, 123 insertions(+), 58 deletions(-)

2 1

[PATCH 4/6] gdi32: Use ntgdi for AddFontResourceExW and RemoveFontResourceExW.
by Jacek Caban 01 Sep '21

01 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 10 ++++++---- dlls/gdi32/text.c | 16 ++++++++++++++++ include/ntgdi.h | 4 ++++ 3 files changed, 26 insertions(+), 4 deletions(-)

2 1

[PATCH 3/6] gdi32: Use NtGdiAddFontMemResourceEx for AddFontMemResourceEx.
by Jacek Caban 01 Sep '21

01 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 19 ++++++++++--------- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/text.c | 8 ++++++++ include/ntgdi.h | 3 +++ 4 files changed, 22 insertions(+), 10 deletions(-)

2 1

[PATCH 2/6] gdi32: Use NtGdiEnumFonts for EnumFontFamiliesExW.
by Jacek Caban 01 Sep '21

01 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 100 +++++++++++++++++++++------------------------- dlls/gdi32/text.c | 43 ++++++++++++++++++++ include/ntgdi.h | 9 +++++ 3 files changed, 98 insertions(+), 54 deletions(-)

2 2

[PATCH 1/6] gdi32: Use EnumFontFamiliesExW for EnumFontFamiliesExA.
by Jacek Caban 01 Sep '21

01 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 119 +--------------------------------------------- dlls/gdi32/text.c | 73 ++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 117 deletions(-)

2 1

[PATCH 2/3] wininet: Fix some InternetErrorDlg() conditions returning ERROR_INVALID_PARAMETER.
by Dmitry Timoshkov 01 Sep '21

01 Sep '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/dialogs.c | 5 +---- dlls/wininet/tests/internet.c | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 7af1bcd59f9..25ed1f2a651 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -498,7 +498,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, if( !dwError && !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) ) break; if(!req) - return ERROR_INVALID_HANDLE; + return ERROR_INVALID_PARAMETER; switch(req->status_code) { case HTTP_STATUS_PROXY_AUTH_REQ: @@ -523,9 +523,6 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, res = ERROR_CANCELLED; break; } - if(!req) - return ERROR_INVALID_HANDLE; - if( dwFlags & ~FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS ) FIXME("%08x contains unsupported flags.\n", dwFlags); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 6b8eefc0b78..f7d7f1f49d7 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1595,7 +1595,6 @@ static void test_InternetErrorDlg(void) res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_INCORRECT_PASSWORD || i == ERROR_INTERNET_INSERT_CDROM || i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED || i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR) @@ -1608,7 +1607,8 @@ static void test_InternetErrorDlg(void) i != ERROR_INTERNET_MIXED_SECURITY && i != ERROR_INTERNET_CHG_POST_IS_NON_SECURE && i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && - i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) + i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION && + i != ERROR_INTERNET_INCORRECT_PASSWORD) ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); } -- 2.31.1

1 0

[PATCH vkd3d 5/5] vkd3d-shader: Pass a vkd3d_shader_parser structure to vkd3d_dxbc_binary_to_text().
by Henri Verbeet 01 Sep '21

01 Sep '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 78ec1c18..3b01b531 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1771,7 +1771,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, "\n"); } -enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, +enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) { enum vkd3d_shader_compile_option_formatting_flags formatting; @@ -1831,17 +1831,17 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, vkd3d_string_buffer_init(buffer); shader_version = &compiler.shader_version; - shader_sm4_read_header(data, &ptr, shader_version); + shader_sm4_read_header(parser->data, &ptr, shader_version); vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u%s\n", compiler.colours.version, shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor, compiler.colours.reset); indent = 0; - while (!shader_sm4_is_end(data, &ptr)) + while (!shader_sm4_is_end(parser->data, &ptr)) { struct vkd3d_shader_instruction ins; - shader_sm4_read_instruction(data, &ptr, &ins); + shader_sm4_read_instruction(parser->data, &ptr, &ins); if (ins.handler_idx == VKD3DSIH_INVALID) { WARN("Skipping unrecognized instruction.\n"); @@ -1905,7 +1905,7 @@ void vkd3d_shader_trace(struct vkd3d_shader_parser *parser) const char *p, *q, *end; struct vkd3d_shader_code code; - if (vkd3d_dxbc_binary_to_text(parser->data, NULL, &code) != VKD3D_OK) + if (vkd3d_dxbc_binary_to_text(parser, NULL, &code) != VKD3D_OK) return; end = (const char *)code.code + code.size; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0cfe1eaf..36c211e6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1051,7 +1051,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - ret = vkd3d_dxbc_binary_to_text(parser.data, compile_info, out); + ret = vkd3d_dxbc_binary_to_text(&parser, compile_info, out); vkd3d_shader_parser_destroy(&parser); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6c40efa9..97c1999b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -910,7 +910,7 @@ struct vkd3d_string_buffer_cache size_t count, max_count, capacity; }; -enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, +enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out); void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer); struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list); -- 2.20.1

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Pass a vkd3d_shader_parser structure to vkd3d_shader_trace().
by Henri Verbeet 01 Sep '21

01 Sep '21

Mostly to avoid passing around void pointers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 10 +--------- libs/vkd3d-shader/vkd3d_shader_private.h | 10 +++++++++- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 26bc7885..78ec1c18 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1900,12 +1900,12 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, return result; } -void vkd3d_shader_trace(void *data) +void vkd3d_shader_trace(struct vkd3d_shader_parser *parser) { const char *p, *q, *end; struct vkd3d_shader_code code; - if (vkd3d_dxbc_binary_to_text(data, NULL, &code) != VKD3D_OK) + if (vkd3d_dxbc_binary_to_text(parser->data, NULL, &code) != VKD3D_OK) return; end = (const char *)code.code + code.size; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e28cfad8..0cfe1eaf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -367,14 +367,6 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, shader_get_source_type_suffix(source_type), shader->code, shader->size); } -struct vkd3d_shader_parser -{ - struct vkd3d_shader_desc shader_desc; - struct vkd3d_shader_version shader_version; - void *data; - const DWORD *ptr; -}; - static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context) { @@ -960,7 +952,7 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, } if (TRACE_ON()) - vkd3d_shader_trace(parser.data); + vkd3d_shader_trace(&parser); while (!shader_sm4_is_end(parser.data, &parser.ptr)) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e195c12a..6c40efa9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -874,7 +874,15 @@ static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_reg return reg->type == VKD3DSPR_OUTPUT || reg->type == VKD3DSPR_COLOROUT; } -void vkd3d_shader_trace(void *data); +struct vkd3d_shader_parser +{ + struct vkd3d_shader_desc shader_desc; + struct vkd3d_shader_version shader_version; + void *data; + const uint32_t *ptr; +}; + +void vkd3d_shader_trace(struct vkd3d_shader_parser *parser); const char *shader_get_type_prefix(enum vkd3d_shader_type type); -- 2.20.1

1 0