September 2021 - Wine-Commits

Zhiyi Zhang : regsvr32: Enable visual styles.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: d4d80a7bb3681392d4e390419cd7529133691bdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4d80a7bb3681392d4e39041… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 9 14:52:17 2021 +0800 regsvr32: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 26 +++++++++++++------------- po/ast.po | 26 +++++++++++++------------- po/bg.po | 26 +++++++++++++------------- po/ca.po | 26 +++++++++++++------------- po/cs.po | 26 +++++++++++++------------- po/da.po | 26 +++++++++++++------------- po/de.po | 26 +++++++++++++------------- po/el.po | 26 +++++++++++++------------- po/en.po | 26 +++++++++++++------------- po/en_US.po | 26 +++++++++++++------------- po/eo.po | 26 +++++++++++++------------- po/es.po | 26 +++++++++++++------------- po/fa.po | 26 +++++++++++++------------- po/fi.po | 26 +++++++++++++------------- po/fr.po | 26 +++++++++++++------------- po/he.po | 26 +++++++++++++------------- po/hi.po | 26 +++++++++++++------------- po/hr.po | 26 +++++++++++++------------- po/hu.po | 26 +++++++++++++------------- po/it.po | 26 +++++++++++++------------- po/ja.po | 26 +++++++++++++------------- po/ko.po | 26 +++++++++++++------------- po/lt.po | 26 +++++++++++++------------- po/ml.po | 26 +++++++++++++------------- po/nb_NO.po | 26 +++++++++++++------------- po/nl.po | 26 +++++++++++++------------- po/or.po | 26 +++++++++++++------------- po/pa.po | 26 +++++++++++++------------- po/pl.po | 26 +++++++++++++------------- po/pt_BR.po | 26 +++++++++++++------------- po/pt_PT.po | 26 +++++++++++++------------- po/rm.po | 26 +++++++++++++------------- po/ro.po | 26 +++++++++++++------------- po/ru.po | 26 +++++++++++++------------- po/si.po | 26 +++++++++++++------------- po/sk.po | 26 +++++++++++++------------- po/sl.po | 26 +++++++++++++------------- po/sr_RS(a)cyrillic.po | 26 +++++++++++++------------- po/sr_RS(a)latin.po | 26 +++++++++++++------------- po/sv.po | 26 +++++++++++++------------- po/ta.po | 26 +++++++++++++------------- po/te.po | 26 +++++++++++++------------- po/th.po | 26 +++++++++++++------------- po/tr.po | 26 +++++++++++++------------- po/uk.po | 26 +++++++++++++------------- po/wa.po | 26 +++++++++++++------------- po/wine.pot | 26 +++++++++++++------------- po/zh_CN.po | 26 +++++++++++++------------- po/zh_TW.po | 26 +++++++++++++------------- programs/regsvr32/regsvr32.manifest | 16 ++++++++++++++++ programs/regsvr32/regsvr32.rc | 4 ++++ 51 files changed, 657 insertions(+), 637 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4d80a7bb3681392d4e3…

1 0

Zhiyi Zhang : user32: Scale scroll bar minimum thumb size according to DPI.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 52c44bd8f02839bed1ba15470b84af6b032651da URL: https://source.winehq.org/git/wine.git/?a=commit;h=52c44bd8f02839bed1ba1547… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 9 14:49:03 2021 +0800 user32: Scale scroll bar minimum thumb size according to DPI. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index d62020f8f23..a17495d9ff0 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -195,7 +195,7 @@ static BOOL SCROLL_GetScrollBarRect( HWND hwnd, INT nBar, RECT *lprect, INT *arrowSize, INT *thumbSize, INT *thumbPos ) { - INT pixels; + INT pixels, min_thumb_size; BOOL vertical; WND *wndPtr = WIN_GetPtr( hwnd ); @@ -265,7 +265,8 @@ static BOOL SCROLL_GetScrollBarRect( HWND hwnd, INT nBar, RECT *lprect, if (info->page) { *thumbSize = MulDiv(pixels,info->page,(info->maxVal-info->minVal+1)); - if (*thumbSize < SCROLL_MIN_THUMB) *thumbSize = SCROLL_MIN_THUMB; + min_thumb_size = MulDiv(SCROLL_MIN_THUMB, GetDpiForWindow(hwnd), 96); + if (*thumbSize < min_thumb_size) *thumbSize = min_thumb_size; } else *thumbSize = GetSystemMetrics(SM_CXVSCROLL); @@ -329,10 +330,10 @@ static void SCROLL_GetScrollBarDrawInfo( HWND hwnd, INT bar, * Compute the current scroll position based on the thumb position in pixels * from the top of the scroll-bar. */ -static UINT SCROLL_GetThumbVal( SCROLLBAR_INFO *infoPtr, RECT *rect, - BOOL vertical, INT pos ) +static UINT SCROLL_GetThumbVal( HWND hwnd, SCROLLBAR_INFO *infoPtr, RECT *rect, BOOL vertical, + INT pos ) { - INT thumbSize; + INT thumbSize, minThumbSize; INT pixels = vertical ? rect->bottom-rect->top : rect->right-rect->left; INT range; @@ -342,7 +343,8 @@ static UINT SCROLL_GetThumbVal( SCROLLBAR_INFO *infoPtr, RECT *rect, if (infoPtr->page) { thumbSize = MulDiv(pixels,infoPtr->page,(infoPtr->maxVal-infoPtr->minVal+1)); - if (thumbSize < SCROLL_MIN_THUMB) thumbSize = SCROLL_MIN_THUMB; + minThumbSize = MulDiv(SCROLL_MIN_THUMB, GetDpiForWindow(hwnd), 96); + if (thumbSize < minThumbSize) thumbSize = minThumbSize; } else thumbSize = GetSystemMetrics(SM_CXVSCROLL); @@ -938,7 +940,7 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) g_tracking_info.win = hwnd; g_tracking_info.bar = nBar; g_tracking_info.thumb_pos = trackThumbPos + lastMousePos - lastClickPos; - g_tracking_info.thumb_val = SCROLL_GetThumbVal( infoPtr, &rect, vertical, + g_tracking_info.thumb_val = SCROLL_GetThumbVal( hwnd, infoPtr, &rect, vertical, g_tracking_info.thumb_pos ); if (!SCROLL_MovingThumb) { @@ -964,7 +966,7 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) { lastMousePos = pos; g_tracking_info.thumb_pos = trackThumbPos + pos - lastClickPos; - g_tracking_info.thumb_val = SCROLL_GetThumbVal( infoPtr, &rect, vertical, + g_tracking_info.thumb_val = SCROLL_GetThumbVal( hwnd, infoPtr, &rect, vertical, g_tracking_info.thumb_pos ); SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM( SB_THUMBTRACK, g_tracking_info.thumb_val ), @@ -1012,7 +1014,7 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) if (hittest == SCROLL_THUMB) { - UINT val = SCROLL_GetThumbVal( infoPtr, &rect, vertical, + UINT val = SCROLL_GetThumbVal( hwnd, infoPtr, &rect, vertical, trackThumbPos + lastMousePos - lastClickPos ); SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM( SB_THUMBTRACK, val ), (LPARAM)hwndCtl ); @@ -1026,7 +1028,7 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) if (hittest == SCROLL_THUMB) { - UINT val = SCROLL_GetThumbVal( infoPtr, &rect, vertical, + UINT val = SCROLL_GetThumbVal( hwnd, infoPtr, &rect, vertical, trackThumbPos + lastMousePos - lastClickPos ); SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM( SB_THUMBPOSITION, val ), (LPARAM)hwndCtl );

1 0

Zhiyi Zhang : user32: Change scroll bar minimum thumb size to 8 pixels.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: e0c0f0f19adb8ec78fe8849e2098f89e1e6ba981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0c0f0f19adb8ec78fe8849e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 9 14:48:47 2021 +0800 user32: Change scroll bar minimum thumb size to 8 pixels. It's 8 pixels on XP and Win 7. On Win 10, it's the same size as themed scroll bar thumb. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 088e41eee43..d62020f8f23 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -60,7 +60,7 @@ typedef struct #define SCROLL_MIN_RECT 4 /* Minimum size of the thumb in pixels */ -#define SCROLL_MIN_THUMB 6 +#define SCROLL_MIN_THUMB 8 /* Overlap between arrows and thumb */ #define SCROLL_ARROW_THUMB_OVERLAP 0

1 0

Zhiyi Zhang : uxtheme: Get and set system metrics in 96 DPI.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 7290db3e7a9652fcc39717b2fb492071dd52c641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7290db3e7a9652fcc39717b2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 9 14:46:24 2021 +0800 uxtheme: Get and set system metrics in 96 DPI. Fix a bug that font size may be smaller than normal after toggling theming. For example, the following steps will change the system metrics to incorrect values. 1. Open winecfg, and set DPI to 192. Do not restart winecfg. 2. Change the theme to Light. UXTHEME_BackupSystemMetrics() backs up system metrics in 96 DPI because the current DPI is still 96. 3. Restart winecfg and turn off theming. UXTHEME_RestoreSystemMetrics() restores system metrics in 192 DPI because the current DPI is 192. So system metrics will be scaled to 1/2 of the original size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37592 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/msstyles.c | 4 ++++ dlls/uxtheme/system.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index efabd06f7c0..7356f6ea354 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -838,12 +838,16 @@ static BOOL parse_handle_nonclient_size (struct PARSENONCLIENTSTATE* state, static void parse_apply_nonclient (struct PARSENONCLIENTSTATE* state) { + DPI_AWARENESS_CONTEXT old_context; + if (state->metricsDirty) { + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, sizeof (state->metrics), &state->metrics, 0); SystemParametersInfoW (SPI_SETICONTITLELOGFONT, sizeof (state->iconTitleFont), &state->iconTitleFont, 0); + SetThreadDpiAwarenessContext(old_context); } } diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index ca0dd228b2c..a467fc8b157 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -278,9 +278,12 @@ static void save_sys_colors (HKEY baseKey) * is deactivated */ static void UXTHEME_BackupSystemMetrics(void) { + DPI_AWARENESS_CONTEXT old_context; HKEY hKey; const struct BackupSysParam* bsp = backupSysParams; + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + if (RegCreateKeyExW( HKEY_CURRENT_USER, szThemeManager, 0, 0, 0, KEY_ALL_ACCESS, 0, &hKey, 0) == ERROR_SUCCESS) @@ -317,14 +320,19 @@ static void UXTHEME_BackupSystemMetrics(void) RegCloseKey (hKey); } + + SetThreadDpiAwarenessContext(old_context); } /* Read back old settings after a theme was deactivated */ static void UXTHEME_RestoreSystemMetrics(void) { + DPI_AWARENESS_CONTEXT old_context; HKEY hKey; const struct BackupSysParam* bsp = backupSysParams; + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + if (RegOpenKeyExW (HKEY_CURRENT_USER, szThemeManager, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { @@ -404,6 +412,8 @@ static void UXTHEME_RestoreSystemMetrics(void) RegCloseKey (hKey); } + + SetThreadDpiAwarenessContext(old_context); } /* Make system settings persistent, so they're in effect even w/o uxtheme

1 0

Henri Verbeet : vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_read_instruction().
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: vkd3d Branch: master Commit: bb482332bfc97b45398e2905b6bca69ac3f744da URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bb482332bfc97b45398e290… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 14:35:52 2021 +0200 vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_read_instruction(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 31 ++++++++++++++++--------------- libs/vkd3d-shader/glsl.c | 9 ++++----- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 6 +++--- libs/vkd3d-shader/vkd3d_shader_private.h | 9 ++++----- 5 files changed, 28 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 18ccc95..99c32ae 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1527,24 +1527,25 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh } } -void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_shader_instruction *ins) +void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, + const uint32_t **ptr, struct vkd3d_shader_instruction *ins) { const struct vkd3d_sm4_opcode_info *opcode_info; - DWORD opcode_token, opcode, previous_token; - struct vkd3d_sm4_data *priv = data; + uint32_t opcode_token, opcode, previous_token; + struct vkd3d_sm4_data *sm4 = parser->data; unsigned int i, len; size_t remaining; const DWORD *p; DWORD precise; - list_move_head(&priv->src_free, &priv->src); + list_move_head(&sm4->src_free, &sm4->src); - if (*ptr >= priv->end) + if (*ptr >= sm4->end) { WARN("End of byte-code, failed to read opcode.\n"); goto fail; } - remaining = priv->end - *ptr; + remaining = sm4->end - *ptr; opcode_token = *(*ptr)++; opcode = opcode_token & VKD3D_SM4_OPCODE_MASK; @@ -1581,9 +1582,9 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha ins->structured = false; ins->predicate = NULL; ins->dst_count = strlen(opcode_info->dst_info); - ins->dst = priv->dst_param; + ins->dst = sm4->dst_param; ins->src_count = strlen(opcode_info->src_info); - ins->src = priv->src_param; + ins->src = sm4->src_param; ins->resource_type = VKD3D_SHADER_RESOURCE_NONE; ins->resource_stride = 0; ins->resource_data_type[0] = VKD3D_DATA_FLOAT; @@ -1597,7 +1598,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha if (opcode_info->read_opcode_func) { - opcode_info->read_opcode_func(ins, opcode, opcode_token, p, len, priv); + opcode_info->read_opcode_func(ins, opcode, opcode_token, p, len, sm4); } else { @@ -1618,19 +1619,19 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha for (i = 0; i < ins->dst_count; ++i) { - if (!(shader_sm4_read_dst_param(priv, &p, *ptr, map_data_type(opcode_info->dst_info[i]), - &priv->dst_param[i]))) + if (!(shader_sm4_read_dst_param(sm4, &p, *ptr, map_data_type(opcode_info->dst_info[i]), + &sm4->dst_param[i]))) { ins->handler_idx = VKD3DSIH_INVALID; return; } - priv->dst_param[i].modifiers |= instruction_dst_modifier; + sm4->dst_param[i].modifiers |= instruction_dst_modifier; } for (i = 0; i < ins->src_count; ++i) { - if (!(shader_sm4_read_src_param(priv, &p, *ptr, map_data_type(opcode_info->src_info[i]), - &priv->src_param[i]))) + if (!(shader_sm4_read_src_param(sm4, &p, *ptr, map_data_type(opcode_info->src_info[i]), + &sm4->src_param[i]))) { ins->handler_idx = VKD3DSIH_INVALID; return; @@ -1641,7 +1642,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha return; fail: - *ptr = priv->end; + *ptr = sm4->end; ins->handler_idx = VKD3DSIH_INVALID; return; } diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 38d18cc..04d948c 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -95,9 +95,8 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator return; } -int vkd3d_glsl_generator_generate(void *parser_data, const uint32_t *parser_ptr, - struct vkd3d_glsl_generator *generator, - struct vkd3d_shader_code *out) +int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, + struct vkd3d_shader_parser *parser, struct vkd3d_shader_code *out) { void *code; struct vkd3d_shader_instruction ins; @@ -105,9 +104,9 @@ int vkd3d_glsl_generator_generate(void *parser_data, const uint32_t *parser_ptr, vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); - while (!shader_sm4_is_end(parser_data, &parser_ptr)) + while (!shader_sm4_is_end(parser->data, &parser->ptr)) { - shader_sm4_read_instruction(parser_data, &parser_ptr, &ins); + shader_sm4_read_instruction(parser, &parser->ptr, &ins); if (ins.handler_idx == VKD3DSIH_INVALID) { diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 107554f..3e2b152 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1841,7 +1841,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, { struct vkd3d_shader_instruction ins; - shader_sm4_read_instruction(parser->data, &ptr, &ins); + shader_sm4_read_instruction(parser, &ptr, &ins); if (ins.handler_idx == VKD3DSIH_INVALID) { WARN("Skipping unrecognized instruction.\n"); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 08a1cee..5661177 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -956,7 +956,7 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, while (!shader_sm4_is_end(parser.data, &parser.ptr)) { - shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); + shader_sm4_read_instruction(&parser, &parser.ptr, &instruction); if (instruction.handler_idx == VKD3DSIH_INVALID) { @@ -1068,7 +1068,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return VKD3D_ERROR; } - ret = vkd3d_glsl_generator_generate(parser.data, parser.ptr, glsl_generator, out); + ret = vkd3d_glsl_generator_generate(glsl_generator, &parser, out); vkd3d_glsl_generator_destroy(glsl_generator); vkd3d_shader_parser_destroy(&parser); @@ -1087,7 +1087,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info while (!shader_sm4_is_end(parser.data, &parser.ptr)) { - shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); + shader_sm4_read_instruction(&parser, &parser.ptr, &instruction); if (instruction.handler_idx == VKD3DSIH_INVALID) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 3b1169a..5e828b6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -893,8 +893,8 @@ void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, void shader_sm4_free(struct vkd3d_shader_parser *parser); void shader_sm4_read_header(struct vkd3d_shader_parser *parser, const uint32_t **ptr, struct vkd3d_shader_version *shader_version); -void shader_sm4_read_instruction(void *data, const DWORD **ptr, - struct vkd3d_shader_instruction *ins); +void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, + const uint32_t **ptr, struct vkd3d_shader_instruction *ins); bool shader_sm4_is_end(void *data, const DWORD **ptr); struct vkd3d_string_buffer @@ -998,9 +998,8 @@ struct vkd3d_glsl_generator; struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shader_version *version, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context); -int vkd3d_glsl_generator_generate(void *parser_data, const uint32_t *parser_ptr, - struct vkd3d_glsl_generator *generator, - struct vkd3d_shader_code *out); +int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, + struct vkd3d_shader_parser *parser, struct vkd3d_shader_code *out); void vkd3d_glsl_generator_destroy(struct vkd3d_glsl_generator *generator); struct vkd3d_dxbc_compiler;

1 0

Henri Verbeet : vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_free().
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: vkd3d Branch: master Commit: 661570254dad14bd51dab473aa8cbd4805d671a1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=661570254dad14bd51dab47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 14:35:50 2021 +0200 vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_free(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.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/dxbc.c b/libs/vkd3d-shader/dxbc.c index 83f9196..479cc5b 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1075,17 +1075,17 @@ void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, return priv; } -void shader_sm4_free(void *data) +void shader_sm4_free(struct vkd3d_shader_parser *parser) { struct vkd3d_shader_src_param_entry *e1, *e2; - struct vkd3d_sm4_data *priv = data; + struct vkd3d_sm4_data *sm4 = parser->data; - list_move_head(&priv->src_free, &priv->src); - LIST_FOR_EACH_ENTRY_SAFE(e1, e2, &priv->src_free, struct vkd3d_shader_src_param_entry, entry) + list_move_head(&sm4->src_free, &sm4->src); + LIST_FOR_EACH_ENTRY_SAFE(e1, e2, &sm4->src_free, struct vkd3d_shader_src_param_entry, entry) { vkd3d_free(e1); } - vkd3d_free(priv); + vkd3d_free(sm4); } static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_sm4_data *priv) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 36c211e..c439308 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -394,7 +394,7 @@ static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) { - shader_sm4_free(parser->data); + shader_sm4_free(parser); free_shader_desc(&parser->shader_desc); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 97c1999..fb449aa 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -890,7 +890,7 @@ struct vkd3d_shader_message_context; void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context); -void shader_sm4_free(void *data); +void shader_sm4_free(struct vkd3d_shader_parser *parser); void shader_sm4_read_header(void *data, const DWORD **ptr, struct vkd3d_shader_version *shader_version); void shader_sm4_read_instruction(void *data, const DWORD **ptr,

1 0

Henri Verbeet : vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_read_header().
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: vkd3d Branch: master Commit: 12190ee3a950d2bae5fdac8563ec603541e809b2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=12190ee3a950d2bae5fdac8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 14:35:51 2021 +0200 vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_read_header(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 9 +++++---- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 479cc5b..18ccc95 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1110,12 +1110,13 @@ static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_sm4_data *priv) return &e->param; } -void shader_sm4_read_header(void *data, const DWORD **ptr, struct vkd3d_shader_version *shader_version) +void shader_sm4_read_header(struct vkd3d_shader_parser *parser, + const uint32_t **ptr, struct vkd3d_shader_version *shader_version) { - struct vkd3d_sm4_data *priv = data; + struct vkd3d_sm4_data *sm4 = parser->data; - *ptr = priv->start; - *shader_version = priv->shader_version; + *ptr = sm4->start; + *shader_version = sm4->shader_version; } static bool shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 3b01b53..107554f 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1831,7 +1831,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, vkd3d_string_buffer_init(buffer); shader_version = &compiler.shader_version; - shader_sm4_read_header(parser->data, &ptr, shader_version); + shader_sm4_read_header(parser, &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); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c439308..08a1cee 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -388,7 +388,7 @@ static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, return VKD3D_ERROR_INVALID_ARGUMENT; } - shader_sm4_read_header(parser->data, &parser->ptr, &parser->shader_version); + shader_sm4_read_header(parser, &parser->ptr, &parser->shader_version); return VKD3D_OK; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index fb449aa..3b1169a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -891,8 +891,8 @@ struct vkd3d_shader_message_context; void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context); void shader_sm4_free(struct vkd3d_shader_parser *parser); -void shader_sm4_read_header(void *data, const DWORD **ptr, - struct vkd3d_shader_version *shader_version); +void shader_sm4_read_header(struct vkd3d_shader_parser *parser, + const uint32_t **ptr, struct vkd3d_shader_version *shader_version); void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_shader_instruction *ins); bool shader_sm4_is_end(void *data, const DWORD **ptr);

1 0

Henri Verbeet : vkd3d-shader: Introduce shader_sm4_reset().
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: vkd3d Branch: master Commit: 4509f089e5edcb02abe31438cc0557eec277469a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4509f089e5edcb02abe3143… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 14:35:54 2021 +0200 vkd3d-shader: Introduce shader_sm4_reset(). This allows us to drop the "ptr" argument to various functions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 21 ++++++++++++++------- libs/vkd3d-shader/glsl.c | 4 ++-- libs/vkd3d-shader/trace.c | 7 +++---- libs/vkd3d-shader/vkd3d_shader_main.c | 13 ++++++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 9 ++++----- 5 files changed, 31 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 99a085f..86cd0ec 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1110,12 +1110,11 @@ static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_sm4_data *priv) return &e->param; } -void shader_sm4_read_header(struct vkd3d_shader_parser *parser, - const uint32_t **ptr, struct vkd3d_shader_version *shader_version) +void shader_sm4_read_header(struct vkd3d_shader_parser *parser, struct vkd3d_shader_version *shader_version) { struct vkd3d_sm4_data *sm4 = parser->data; - *ptr = sm4->start; + parser->ptr = sm4->start; *shader_version = sm4->shader_version; } @@ -1527,12 +1526,12 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh } } -void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, - const uint32_t **ptr, struct vkd3d_shader_instruction *ins) +void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins) { const struct vkd3d_sm4_opcode_info *opcode_info; uint32_t opcode_token, opcode, previous_token; struct vkd3d_sm4_data *sm4 = parser->data; + const uint32_t **ptr = &parser->ptr; unsigned int i, len; size_t remaining; const DWORD *p; @@ -1647,10 +1646,18 @@ fail: return; } -bool shader_sm4_is_end(struct vkd3d_shader_parser *parser, const uint32_t **ptr) +bool shader_sm4_is_end(struct vkd3d_shader_parser *parser) { struct vkd3d_sm4_data *sm4 = parser->data; - return *ptr == sm4->end; + + return parser->ptr == sm4->end; +} + +void shader_sm4_reset(struct vkd3d_shader_parser *parser) +{ + struct vkd3d_sm4_data *sm4 = parser->data; + + parser->ptr = sm4->start; } static bool require_space(size_t offset, size_t count, size_t size, size_t data_size) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 9824840..b304add 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -104,9 +104,9 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); - while (!shader_sm4_is_end(parser, &parser->ptr)) + while (!shader_sm4_is_end(parser)) { - shader_sm4_read_instruction(parser, &parser->ptr, &ins); + shader_sm4_read_instruction(parser, &ins); if (ins.handler_idx == VKD3DSIH_INVALID) { diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 409ed55..1dca1ae 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1781,7 +1781,6 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, struct vkd3d_string_buffer *buffer; unsigned int indent, i; const char *indent_str; - const DWORD *ptr; void *code; static const struct vkd3d_d3d_asm_colours no_colours = @@ -1831,17 +1830,17 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, vkd3d_string_buffer_init(buffer); shader_version = &compiler.shader_version; - shader_sm4_read_header(parser, &ptr, shader_version); + shader_sm4_read_header(parser, 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(parser, &ptr)) + while (!shader_sm4_is_end(parser)) { struct vkd3d_shader_instruction ins; - shader_sm4_read_instruction(parser, &ptr, &ins); + shader_sm4_read_instruction(parser, &ins); if (ins.handler_idx == VKD3DSIH_INVALID) { WARN("Skipping unrecognized instruction.\n"); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index b108fa6..5d7cdf0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -388,7 +388,7 @@ static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, return VKD3D_ERROR_INVALID_ARGUMENT; } - shader_sm4_read_header(parser, &parser->ptr, &parser->shader_version); + shader_sm4_read_header(parser, &parser->shader_version); return VKD3D_OK; } @@ -952,11 +952,14 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, } if (TRACE_ON()) + { vkd3d_shader_trace(&parser); + shader_sm4_reset(&parser); + } - while (!shader_sm4_is_end(&parser, &parser.ptr)) + while (!shader_sm4_is_end(&parser)) { - shader_sm4_read_instruction(&parser, &parser.ptr, &instruction); + shader_sm4_read_instruction(&parser, &instruction); if (instruction.handler_idx == VKD3DSIH_INVALID) { @@ -1085,9 +1088,9 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return VKD3D_ERROR; } - while (!shader_sm4_is_end(&parser, &parser.ptr)) + while (!shader_sm4_is_end(&parser)) { - shader_sm4_read_instruction(&parser, &parser.ptr, &instruction); + shader_sm4_read_instruction(&parser, &instruction); if (instruction.handler_idx == VKD3DSIH_INVALID) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6d044c5..b9c2cce 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -891,11 +891,10 @@ struct vkd3d_shader_message_context; void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context); void shader_sm4_free(struct vkd3d_shader_parser *parser); -void shader_sm4_read_header(struct vkd3d_shader_parser *parser, - const uint32_t **ptr, struct vkd3d_shader_version *shader_version); -void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, - const uint32_t **ptr, struct vkd3d_shader_instruction *ins); -bool shader_sm4_is_end(struct vkd3d_shader_parser *parser, const uint32_t **ptr); +void shader_sm4_read_header(struct vkd3d_shader_parser *parser, struct vkd3d_shader_version *shader_version); +void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins); +bool shader_sm4_is_end(struct vkd3d_shader_parser *parser); +void shader_sm4_reset(struct vkd3d_shader_parser *parser); struct vkd3d_string_buffer {

1 0

Henri Verbeet : vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_is_end().
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: vkd3d Branch: master Commit: 26009069dd79bc3aed290153e78f2046cc2320fc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=26009069dd79bc3aed29015… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 14:35:53 2021 +0200 vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_is_end(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 6 +++--- libs/vkd3d-shader/glsl.c | 2 +- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 99c32ae..99a085f 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1647,10 +1647,10 @@ fail: return; } -bool shader_sm4_is_end(void *data, const DWORD **ptr) +bool shader_sm4_is_end(struct vkd3d_shader_parser *parser, const uint32_t **ptr) { - struct vkd3d_sm4_data *priv = data; - return *ptr == priv->end; + struct vkd3d_sm4_data *sm4 = parser->data; + return *ptr == sm4->end; } static bool require_space(size_t offset, size_t count, size_t size, size_t data_size) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 04d948c..9824840 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -104,7 +104,7 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); - while (!shader_sm4_is_end(parser->data, &parser->ptr)) + while (!shader_sm4_is_end(parser, &parser->ptr)) { shader_sm4_read_instruction(parser, &parser->ptr, &ins); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 3e2b152..409ed55 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1837,7 +1837,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, shader_version->minor, compiler.colours.reset); indent = 0; - while (!shader_sm4_is_end(parser->data, &ptr)) + while (!shader_sm4_is_end(parser, &ptr)) { struct vkd3d_shader_instruction ins; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5661177..b108fa6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -954,7 +954,7 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, if (TRACE_ON()) vkd3d_shader_trace(&parser); - while (!shader_sm4_is_end(parser.data, &parser.ptr)) + while (!shader_sm4_is_end(&parser, &parser.ptr)) { shader_sm4_read_instruction(&parser, &parser.ptr, &instruction); @@ -1085,7 +1085,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return VKD3D_ERROR; } - while (!shader_sm4_is_end(parser.data, &parser.ptr)) + while (!shader_sm4_is_end(&parser, &parser.ptr)) { shader_sm4_read_instruction(&parser, &parser.ptr, &instruction); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5e828b6..6d044c5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -895,7 +895,7 @@ void shader_sm4_read_header(struct vkd3d_shader_parser *parser, const uint32_t **ptr, struct vkd3d_shader_version *shader_version); void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, const uint32_t **ptr, struct vkd3d_shader_instruction *ins); -bool shader_sm4_is_end(void *data, const DWORD **ptr); +bool shader_sm4_is_end(struct vkd3d_shader_parser *parser, const uint32_t **ptr); struct vkd3d_string_buffer {

1 0

Zebediah Figura : d3dcompiler/tests: Test include preprocessing with more functions.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: wine Branch: master Commit: 0ef10854c8a243896cf1c1ee6008c15161081c3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ef10854c8a243896cf1c1ee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 8 12:49:03 2021 +0200 d3dcompiler/tests: Test include preprocessing with more functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 218 +++++++++++++++++++++++----------- 1 file changed, 147 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0ef10854c8a243896cf1…

1 0