October 2012 - Wine-commits

Marcus Meissner : kernel32: Buffer size is in characters (Coverity).
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 0a8df5ef2684243f2f6d19ab0d590b08f6b7ab54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8df5ef2684243f2f6d19ab0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 13 16:52:57 2012 +0200 kernel32: Buffer size is in characters (Coverity). --- dlls/kernel32/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 11e0044..5e607fe 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3360,7 +3360,7 @@ static void test_OpenFileById(void) ok(GetFileAttributesA(tempFileName) != INVALID_FILE_ATTRIBUTES, "OpenFileById: GetFileAttributesA failed to find the temp file, got error %u\n", GetLastError()); - ret2 = MultiByteToWideChar(CP_ACP, 0, tempFileName + strlen(tempPath), -1, tempFileNameW, sizeof(tempFileNameW)); + ret2 = MultiByteToWideChar(CP_ACP, 0, tempFileName + strlen(tempPath), -1, tempFileNameW, sizeof(tempFileNameW)/sizeof(tempFileNameW[0])); ok(ret2, "OpenFileById: MultiByteToWideChar failed to convert tempFileName, got error %u.\n", GetLastError()); tempFileNameLen = ret2 - 1;

1 0

Marcus Meissner : winefile: Check index before buffer overread (Coverity).
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 8af406fb00054cd611de8c8bf54c926524eb0f0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af406fb00054cd611de8c8bf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 13 16:58:05 2012 +0200 winefile: Check index before buffer overread (Coverity). --- programs/winefile/winefile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 366aa9c..23388c1 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -3163,7 +3163,7 @@ static void set_header(Pane* pane) item.mask = HDI_WIDTH; item.cxy = 0; - for(; x+pane->widths[i]<scroll_pos && i<COLUMNS; i++) { + for(; (i < COLUMNS) && (x+pane->widths[i] < scroll_pos); i++) { x += pane->widths[i]; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item); } @@ -3173,7 +3173,7 @@ static void set_header(Pane* pane) item.cxy = x - scroll_pos; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i++, (LPARAM)&item); - for(; i<COLUMNS; i++) { + for(; i < COLUMNS; i++) { item.cxy = pane->widths[i]; x += pane->widths[i]; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item);

1 0

Marcus Meissner : winex11.drv: Free bitmap info after being done (Coverity) .
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: c9bd05d89e7c851af350f1172c074e17c32fc24a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9bd05d89e7c851af350f1172… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 13 17:13:37 2012 +0200 winex11.drv: Free bitmap info after being done (Coverity). --- dlls/winex11.drv/systray.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index ed09376..5f0791e 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -432,6 +432,7 @@ static void repaint_tray_icon( struct tray_icon *icon ) UpdateLayeredWindow( icon->window, 0, NULL, NULL, hdc, NULL, 0, &blend, ULW_ALPHA ); done: + HeapFree (GetProcessHeap(), 0, info); if (hdc) DeleteDC( hdc ); if (dib) DeleteObject( dib ); }

1 0

Marcus Meissner : shell32: Avoid memory leaking buf (Coverity).
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 9eb7378765109b880d7643bc964b0e38222f6524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb7378765109b880d7643bc9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 13 17:19:40 2012 +0200 shell32: Avoid memory leaking buf (Coverity). --- dlls/shell32/shlexec.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 5799ab0..1c6fa29 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1724,8 +1724,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) size = MAX_PATH; buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (FAILED(PathCreateFromUrlW(sei_tmp.lpFile, buf, &size, 0))) + if (!buf || FAILED(PathCreateFromUrlW(sei_tmp.lpFile, buf, &size, 0))) { + HeapFree(GetProcessHeap(), 0, buf); return SE_ERR_OOM; + } HeapFree(GetProcessHeap(), 0, wszApplicationName); dwApplicationNameLen = lstrlenW(buf) + 1;

1 0

Marcus Meissner : cryptnet: Avoid memory leak of info (Coverity).
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 919a789f454f1bd30c9edc3992cc2982a4935a22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=919a789f454f1bd30c9edc399… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 13 17:23:27 2012 +0200 cryptnet: Avoid memory leak of info (Coverity). --- dlls/cryptnet/cryptnet_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 652c812..c7511d7 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -757,7 +757,6 @@ static void CRYPT_CacheURL(LPCWSTR pszURL, const CRYPT_BLOB_ARRAY *pObject, if (CompareFileTime(&info->ExpireTime, &ft) < 0) { DeleteUrlCacheEntryW(pszURL); - CryptMemFree(info); } else { @@ -767,6 +766,7 @@ static void CRYPT_CacheURL(LPCWSTR pszURL, const CRYPT_BLOB_ARRAY *pObject, return; } } + CryptMemFree(info); } if (!CreateUrlCacheEntryW(pszURL, pObject->rgBlob[0].cbData, NULL, cacheFileName, 0))

1 0

Henri Verbeet : wined3d: Use the correct relative address for constant buffers in the GLSL shader backend .
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 21361d52379a267e6f01cb0dfe9063ea947cd263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21361d52379a267e6f01cb0df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 14 18:40:33 2012 +0200 wined3d: Use the correct relative address for constant buffers in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1f269f0..046ee43 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1541,10 +1541,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_CONSTBUFFER: - if (reg->rel_addr) + if (reg->array_rel_addr) { struct glsl_src_param rel_param; - shader_glsl_add_src_param(ins, reg->rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); + shader_glsl_add_src_param(ins, reg->array_rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); sprintf(register_name, "%s_cb%u[%s + %u]", prefix, reg->idx, rel_param.param_str, reg->array_idx); } else

1 0

Henri Verbeet : wined3d: Recognise SM4 scalar swizzles.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 3baeaa2b886eff05c4589df60c9cc8e8bd76ed41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3baeaa2b886eff05c4589df60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 14 18:40:34 2012 +0200 wined3d: Recognise SM4 scalar swizzles. --- dlls/wined3d/shader_sm4.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 3def9d8..9b52bd7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -51,6 +51,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_REGISTER_TYPE_SHIFT 12 #define WINED3D_SM4_REGISTER_TYPE_MASK (0xf << WINED3D_SM4_REGISTER_TYPE_SHIFT) +#define WINED3D_SM4_SWIZZLE_TYPE_SHIFT 2 +#define WINED3D_SM4_SWIZZLE_TYPE_MASK (0x3 << WINED3D_SM4_SWIZZLE_TYPE_SHIFT) + #define WINED3D_SM4_IMMCONST_TYPE_SHIFT 0 #define WINED3D_SM4_IMMCONST_TYPE_MASK (0x3 << WINED3D_SM4_IMMCONST_TYPE_SHIFT) @@ -147,6 +150,12 @@ enum wined3d_sm4_input_primitive_type WINED3D_SM4_INPUT_PT_TRIANGLEADJ = 0x7, }; +enum wined3d_sm4_swizzle_type +{ + WINED3D_SM4_SWIZZLE_VEC4 = 0x1, + WINED3D_SM4_SWIZZLE_SCALAR = 0x2, +}; + enum wined3d_sm4_immconst_type { WINED3D_SM4_IMMCONST_SCALAR = 0x1, @@ -609,7 +618,24 @@ static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD } else { - src_param->swizzle = (token & WINED3D_SM4_SWIZZLE_MASK) >> WINED3D_SM4_SWIZZLE_SHIFT; + enum wined3d_sm4_swizzle_type swizzle_type = + (token & WINED3D_SM4_SWIZZLE_TYPE_MASK) >> WINED3D_SM4_SWIZZLE_TYPE_SHIFT; + + switch (swizzle_type) + { + case WINED3D_SM4_SWIZZLE_SCALAR: + src_param->swizzle = (token & WINED3D_SM4_SWIZZLE_MASK) >> WINED3D_SM4_SWIZZLE_SHIFT; + src_param->swizzle = (src_param->swizzle & 0x3) * 0x55; + break; + + case WINED3D_SM4_SWIZZLE_VEC4: + src_param->swizzle = (token & WINED3D_SM4_SWIZZLE_MASK) >> WINED3D_SM4_SWIZZLE_SHIFT; + break; + + default: + FIXME("Unhandled swizzle type %#x.\n", swizzle_type); + break; + } } map_register(priv, &src_param->reg);

1 0

Henri Verbeet : wined3d: Use a common function for parsing SM4 source and destination parameters.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: a92d7a12de29b8f5ece629d4ecab6fbe5743115d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a92d7a12de29b8f5ece629d4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 14 18:40:35 2012 +0200 wined3d: Use a common function for parsing SM4 source and destination parameters. --- dlls/wined3d/shader_sm4.c | 113 +++++++++++++++++++++++--------------------- 1 files changed, 59 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 9b52bd7..dceb120 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -511,58 +511,59 @@ static BOOL shader_sm4_read_reg_idx(struct wined3d_sm4_data *priv, const DWORD * return TRUE; } -static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD **ptr, - enum wined3d_data_type data_type, struct wined3d_shader_src_param *src_param) +static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **ptr, + enum wined3d_data_type data_type, struct wined3d_shader_register *param, + enum wined3d_shader_src_modifier *modifier) { - DWORD token = *(*ptr)++; enum wined3d_sm4_register_type register_type; struct wined3d_sm4_reg_idx reg_idx; + DWORD token = *(*ptr)++; DWORD order; register_type = (token & WINED3D_SM4_REGISTER_TYPE_MASK) >> WINED3D_SM4_REGISTER_TYPE_SHIFT; if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table)) { - FIXME("Unhandled register type %#x\n", register_type); - src_param->reg.type = WINED3DSPR_TEMP; + FIXME("Unhandled register type %#x.\n", register_type); + param->type = WINED3DSPR_TEMP; } else { - src_param->reg.type = register_type_table[register_type]; + param->type = register_type_table[register_type]; } - src_param->reg.data_type = data_type; + param->data_type = data_type; if (token & WINED3D_SM4_REGISTER_MODIFIER) { - DWORD modifier = *(*ptr)++; + DWORD m = *(*ptr)++; /* FIXME: This will probably break down at some point. The SM4 * modifiers look like flags, while wined3d currently has an enum * with possible combinations, e.g. WINED3DSPSM_ABSNEG. */ - switch (modifier) + switch (m) { case 0x41: - src_param->modifiers = WINED3DSPSM_NEG; + *modifier = WINED3DSPSM_NEG; break; case 0x81: - src_param->modifiers = WINED3DSPSM_ABS; + *modifier = WINED3DSPSM_ABS; break; default: - FIXME("Skipping modifier 0x%08x.\n", modifier); - src_param->modifiers = WINED3DSPSM_NONE; + FIXME("Skipping modifier 0x%08x.\n", m); + *modifier = WINED3DSPSM_NONE; break; } } else { - src_param->modifiers = WINED3DSPSM_NONE; + *modifier = WINED3DSPSM_NONE; } order = (token & WINED3D_SM4_REGISTER_ORDER_MASK) >> WINED3D_SM4_REGISTER_ORDER_SHIFT; if (order < 1) - src_param->reg.idx = ~0U; + param->idx = ~0U; else { DWORD addressing = (token & WINED3D_SM4_ADDRESSING_MASK0) >> WINED3D_SM4_ADDRESSING_SHIFT0; @@ -571,12 +572,12 @@ static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD ERR("Failed to read register index.\n"); return FALSE; } - src_param->reg.rel_addr = reg_idx.rel_addr; - src_param->reg.idx = reg_idx.offset; + param->rel_addr = reg_idx.rel_addr; + param->idx = reg_idx.offset; } if (order < 2) - src_param->reg.array_idx = ~0U; + param->array_idx = ~0U; else { DWORD addressing = (token & WINED3D_SM4_ADDRESSING_MASK1) >> WINED3D_SM4_ADDRESSING_SHIFT1; @@ -585,37 +586,58 @@ static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD ERR("Failed to read register index.\n"); return FALSE; } - src_param->reg.array_rel_addr = reg_idx.rel_addr; - src_param->reg.array_idx = reg_idx.offset; + param->array_rel_addr = reg_idx.rel_addr; + param->array_idx = reg_idx.offset; } - if (order > 2) FIXME("Unhandled order %u.\n", order); + if (order > 2) + FIXME("Unhandled order %u.\n", order); if (register_type == WINED3D_SM4_RT_IMMCONST) { enum wined3d_sm4_immconst_type immconst_type = (token & WINED3D_SM4_IMMCONST_TYPE_MASK) >> WINED3D_SM4_IMMCONST_TYPE_SHIFT; - src_param->swizzle = WINED3DSP_NOSWIZZLE; - switch(immconst_type) + switch (immconst_type) { case WINED3D_SM4_IMMCONST_SCALAR: - src_param->reg.immconst_type = WINED3D_IMMCONST_SCALAR; - memcpy(src_param->reg.immconst_data, *ptr, 1 * sizeof(DWORD)); + param->immconst_type = WINED3D_IMMCONST_SCALAR; + memcpy(param->immconst_data, *ptr, 1 * sizeof(DWORD)); *ptr += 1; break; case WINED3D_SM4_IMMCONST_VEC4: - src_param->reg.immconst_type = WINED3D_IMMCONST_VEC4; - memcpy(src_param->reg.immconst_data, *ptr, 4 * sizeof(DWORD)); + param->immconst_type = WINED3D_IMMCONST_VEC4; + memcpy(param->immconst_data, *ptr, 4 * sizeof(DWORD)); *ptr += 4; break; default: - FIXME("Unhandled immediate constant type %#x\n", immconst_type); + FIXME("Unhandled immediate constant type %#x.\n", immconst_type); break; } } + + map_register(priv, param); + + return TRUE; +} + +static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD **ptr, + enum wined3d_data_type data_type, struct wined3d_shader_src_param *src_param) +{ + DWORD token = **ptr; + + if (!shader_sm4_read_param(priv, ptr, data_type, &src_param->reg, &src_param->modifiers)) + { + ERR("Failed to read parameter.\n"); + return FALSE; + } + + if (src_param->reg.type == WINED3DSPR_IMMCONST) + { + src_param->swizzle = WINED3DSP_NOSWIZZLE; + } else { enum wined3d_sm4_swizzle_type swizzle_type = @@ -638,47 +660,30 @@ static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD } } - map_register(priv, &src_param->reg); - return TRUE; } static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD **ptr, enum wined3d_data_type data_type, struct wined3d_shader_dst_param *dst_param) { - DWORD token = *(*ptr)++; - enum wined3d_sm4_register_type register_type; - DWORD order; + enum wined3d_shader_src_modifier modifier; + DWORD token = **ptr; - register_type = (token & WINED3D_SM4_REGISTER_TYPE_MASK) >> WINED3D_SM4_REGISTER_TYPE_SHIFT; - if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table)) + if (!shader_sm4_read_param(priv, ptr, data_type, &dst_param->reg, &modifier)) { - FIXME("Unhandled register type %#x\n", register_type); - dst_param->reg.type = WINED3DSPR_TEMP; + ERR("Failed to read parameter.\n"); + return FALSE; } - else + + if (modifier != WINED3DSPSM_NONE) { - dst_param->reg.type = register_type_table[register_type]; + ERR("Invalid source modifier %#x on destination register.\n", modifier); + return FALSE; } - dst_param->reg.data_type = data_type; - - order = (token & WINED3D_SM4_REGISTER_ORDER_MASK) >> WINED3D_SM4_REGISTER_ORDER_SHIFT; - - if (order < 1) dst_param->reg.idx = ~0U; - else dst_param->reg.idx = *(*ptr)++; - - if (order < 2) dst_param->reg.array_idx = ~0U; - else dst_param->reg.array_idx = *(*ptr)++; - - if (order > 2) FIXME("Unhandled order %u.\n", order); dst_param->write_mask = (token & WINED3D_SM4_WRITEMASK_MASK) >> WINED3D_SM4_WRITEMASK_SHIFT; dst_param->modifiers = 0; dst_param->shift = 0; - dst_param->reg.rel_addr = NULL; - dst_param->reg.array_rel_addr = NULL; - - map_register(priv, &dst_param->reg); return TRUE; }

1 0

Henri Verbeet : wined3d: Introduce a structure for shader register indices.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 5626e165ffbf543a77729ea0480dadd37b878e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5626e165ffbf543a77729ea04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 14 18:40:36 2012 +0200 wined3d: Introduce a structure for shader register indices. --- dlls/wined3d/arb_program_shader.c | 258 ++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 140 +++++++++++--------- dlls/wined3d/shader.c | 118 +++++++++-------- dlls/wined3d/shader_sm1.c | 21 ++-- dlls/wined3d/shader_sm4.c | 25 +--- dlls/wined3d/wined3d_private.h | 16 ++- 6 files changed, 295 insertions(+), 283 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5626e165ffbf543a77729…

1 0

Henri Verbeet : wined3d: Handle SM1 comments in the frontend.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 311a1e014843eb2357ac71d83e6cf871574363b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=311a1e014843eb2357ac71d83… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 14 18:40:37 2012 +0200 wined3d: Handle SM1 comments in the frontend. --- dlls/wined3d/shader.c | 43 --------------------------- dlls/wined3d/shader_sm1.c | 62 ++++++++++++++++++++++++++++----------- dlls/wined3d/shader_sm4.c | 7 ---- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 44 insertions(+), 69 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 12d5f98..9c70f08 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -494,12 +494,6 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st while (!fe->shader_is_end(fe_data, &ptr)) { struct wined3d_shader_instruction ins; - const char *comment; - UINT comment_size; - - /* Skip comments. */ - fe->shader_read_comment(&ptr, &comment, &comment_size); - if (comment) continue; /* Fetch opcode. */ fe->shader_read_instruction(fe_data, &ptr, &ins); @@ -1214,13 +1208,6 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_sh while (!fe->shader_is_end(fe_data, &ptr)) { - const char *comment; - UINT comment_size; - - /* Skip comment tokens. */ - fe->shader_read_comment(&ptr, &comment, &comment_size); - if (comment) continue; - /* Read opcode. */ fe->shader_read_instruction(fe_data, &ptr, &ins); @@ -1342,36 +1329,6 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe while (!fe->shader_is_end(fe_data, &ptr)) { struct wined3d_shader_instruction ins; - const char *comment; - UINT comment_size; - - /* comment */ - fe->shader_read_comment(&ptr, &comment, &comment_size); - if (comment) - { - if (comment_size > 4 && *(const DWORD *)comment == WINEMAKEFOURCC('T', 'E', 'X', 'T')) - { - const char *end = comment + comment_size; - const char *ptr = comment + 4; - const char *line = ptr; - - TRACE("// TEXT\n"); - while (ptr != end) - { - if (*ptr == '\n') - { - UINT len = ptr - line; - if (len && *(ptr - 1) == '\r') --len; - TRACE("// %s\n", debugstr_an(line, len)); - line = ++ptr; - } - else ++ptr; - } - if (line != ptr) TRACE("// %s\n", debugstr_an(line, ptr - line)); - } - else TRACE("// %s\n", debugstr_an(comment, comment_size)); - continue; - } fe->shader_read_instruction(fe_data, &ptr, &ins); if (ins.handler_idx == WINED3DSIH_TABLE_SIZE) diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index ae7e3a9..18885f5 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -642,6 +642,48 @@ static void shader_sm1_read_immconst(const DWORD **ptr, struct wined3d_shader_sr *ptr += count; } +static void shader_sm1_read_comment(const DWORD **ptr) +{ + DWORD token = **ptr; + const char *comment; + UINT size; + + while ((token & WINED3DSI_OPCODE_MASK) == WINED3D_SM1_OP_COMMENT) + { + size = (token & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; + comment = (const char *)++(*ptr); + *ptr += size; + + if (size > 1 && *(const DWORD *)comment == WINEMAKEFOURCC('T', 'E', 'X', 'T')) + { + const char *end = comment + size * sizeof(token); + const char *p = comment + sizeof(token); + const char *line = p; + + TRACE("// TEXT\n"); + while (p != end) + { + if (*p == '\n') + { + UINT len = p - line; + if (len && *(p - 1) == '\r') --len; + TRACE("// %s\n", debugstr_an(line, len)); + line = ++p; + } + else ++p; + } + if (line != p) + TRACE("// %s\n", debugstr_an(line, p - line)); + } + else if (size) + TRACE("// %s\n", debugstr_an(comment, size * sizeof(token))); + else + break; + + token = **ptr; + } +} + static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins) { const struct wined3d_sm1_opcode_info *opcode_info; @@ -650,6 +692,8 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi unsigned int i; const DWORD *p; + shader_sm1_read_comment(ptr); + opcode_token = *(*ptr)++; if (!(opcode_info = shader_get_opcode(priv, opcode_token))) { @@ -708,23 +752,6 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi } } -static void shader_sm1_read_comment(const DWORD **ptr, const char **comment, UINT *comment_size) -{ - DWORD token = **ptr; - UINT size; - - if ((token & WINED3DSI_OPCODE_MASK) != WINED3D_SM1_OP_COMMENT) - { - *comment = NULL; - return; - } - - size = (token & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; - *comment = (const char *)++(*ptr); - *comment_size = size * sizeof(DWORD); - *ptr += size; -} - static BOOL shader_sm1_is_end(void *data, const DWORD **ptr) { if (**ptr == WINED3DSP_END) @@ -742,6 +769,5 @@ const struct wined3d_shader_frontend sm1_shader_frontend = shader_sm1_free, shader_sm1_read_header, shader_sm1_read_instruction, - shader_sm1_read_comment, shader_sm1_is_end, }; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f7a73fe..b69ba82 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -789,12 +789,6 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi } } -static void shader_sm4_read_comment(const DWORD **ptr, const char **comment, UINT *comment_size) -{ - FIXME("ptr %p, comment %p, comment_size %p stub!\n", ptr, comment, comment_size); - *comment = NULL; -} - static BOOL shader_sm4_is_end(void *data, const DWORD **ptr) { struct wined3d_sm4_data *priv = data; @@ -807,6 +801,5 @@ const struct wined3d_shader_frontend sm4_shader_frontend = shader_sm4_free, shader_sm4_read_header, shader_sm4_read_instruction, - shader_sm4_read_comment, shader_sm4_is_end, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 41dd737..56bdbad 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -702,7 +702,6 @@ struct wined3d_shader_frontend void (*shader_free)(void *data); void (*shader_read_header)(void *data, const DWORD **ptr, struct wined3d_shader_version *shader_version); void (*shader_read_instruction)(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins); - void (*shader_read_comment)(const DWORD **ptr, const char **comment, UINT *comment_size); BOOL (*shader_is_end)(void *data, const DWORD **ptr); };

1 0