May 2009 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/listview: LVM_GETITEMRECT: don' t offset to item position on LVS_REPORT querying LVIR_BOUNDS.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 1a84ca42b2c001883eb9819d684ae0ae53430000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a84ca42b2c001883eb9819d6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 26 23:04:50 2009 +0400 comctl32/listview: LVM_GETITEMRECT: don't offset to item position on LVS_REPORT querying LVIR_BOUNDS. --- dlls/comctl32/listview.c | 7 ++++++- dlls/comctl32/tests/listview.c | 13 +++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 79ac0e3..0c53bc3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5928,6 +5928,7 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT BOOL doLabel = TRUE, oversizedBox = FALSE; POINT Position, Origin; LVITEMW lvItem; + INT type; TRACE("(hwnd=%p, nItem=%d, lprc=%p)\n", infoPtr->hwndSelf, nItem, lprc); @@ -5962,6 +5963,7 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lvItem.state = (oversizedBox ? LVIS_FOCUSED : 0); } + type = lprc->left; if (uView == LVS_REPORT && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) && lprc->left == LVIR_SELECTBOUNDS) lprc->left = LVIR_BOUNDS; switch(lprc->left) @@ -5987,7 +5989,10 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT return FALSE; } - OffsetRect(lprc, Position.x + Origin.x, Position.y + Origin.y); + if ((uView == LVS_REPORT) && (type == LVIR_BOUNDS)) + OffsetRect(lprc, Origin.x, Origin.y); + else + OffsetRect(lprc, Position.x + Origin.x, Position.y + Origin.y); TRACE(" rect=%s\n", wine_dbgstr_rect(lprc)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3f499f6..793717c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2590,11 +2590,9 @@ static void test_getitemrect(void) r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); expect(TRUE, r); - /* zero width rectangle */ -todo_wine { + /* zero width rectangle with no padding */ expect(0, rect.left); - expect(0, rect.right); -} + todo_wine expect(0, rect.right); insert_column(hwnd, 0); insert_column(hwnd, 1); @@ -2615,9 +2613,8 @@ todo_wine { expect(TRUE, r); /* still no left padding */ -todo_wine { expect(0, rect.left); -} + expect(150, rect.right); rect.left = LVIR_SELECTBOUNDS; rect.right = rect.top = rect.bottom = -1; @@ -2640,9 +2637,9 @@ todo_wine { rect.right = rect.top = rect.bottom = -1; r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); expect(TRUE, r); - todo_wine expect(0, rect.left); + expect(0, rect.left); /* just width sum */ - todo_wine expect(150, rect.right); + expect(150, rect.right); rect.left = LVIR_SELECTBOUNDS; rect.right = rect.top = rect.bottom = -1;

1 0

Nikolay Sivov : comctl32/listview: Move item position calculation out of subitem loop.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 4d2883c189519d41ae2afc9cbe2cb0cef4966512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d2883c189519d41ae2afc9cb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 27 01:57:22 2009 +0400 comctl32/listview: Move item position calculation out of subitem loop. --- dlls/comctl32/listview.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0c53bc3..140f60d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4127,13 +4127,13 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, /* iterate through the invalidated rows */ while(iterator_next(i)) { + LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); + Position.x += Origin.x; + Position.y += Origin.y; + /* iterate through the invalidated columns */ while(iterator_next(&j)) { - LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); - Position.x += Origin.x; - Position.y += Origin.y; - if (rgntype == COMPLEXREGION && !((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) && j.nItem == 0)) { LISTVIEW_GetHeaderRect(infoPtr, j.nItem, &rcItem);

1 0

Nikolay Sivov : user32: Add a stub for DisableProcessWindowsGhosting.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 25dac198c379ddfafe315f722736c613d62a56d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25dac198c379ddfafe315f722… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 27 02:54:34 2009 +0400 user32: Add a stub for DisableProcessWindowsGhosting. --- dlls/user32/misc.c | 11 +++++++++++ dlls/user32/user32.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 9de9b91..8e7f48f 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -706,3 +706,14 @@ LRESULT WINAPI SendIMEMessageExW(HWND p1, LPARAM p2) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } + +/********************************************************************** + * DisableProcessWindowsGhosting [USER32.@] + * + */ +VOID WINAPI DisableProcessWindowsGhosting(VOID) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8efdf0a..cae0bed 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -163,7 +163,7 @@ @ stdcall DialogBoxIndirectParamW(long ptr long ptr long) @ stdcall DialogBoxParamA(long str long ptr long) @ stdcall DialogBoxParamW(long wstr long ptr long) -# @ stub DisableProcessWindowsGhosting +@ stdcall DisableProcessWindowsGhosting() @ stdcall DispatchMessageA(ptr) @ stdcall DispatchMessageW(ptr) # @ stub DisplayExitWindowsWarnings

1 0

Chris Robinson : quartz: Release enumpins when done with it.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 7ba802ac29cdcbbc1350035e63c2d8b847039b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba802ac29cdcbbc1350035e6… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue May 26 18:57:09 2009 -0700 quartz: Release enumpins when done with it. --- dlls/quartz/control.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index d14e221..9a50737 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -278,6 +278,8 @@ static HRESULT ForwardCmdSeek( PCRITICAL_SECTION crit_sect, IBaseFilter* from, S IPin_Release( pin ); } } + IEnumPins_Release( enumpins ); + if (foundend && allnotimpl) hr = E_NOTIMPL; else

1 0

Henri Verbeet : wined3d: Make "packed_input" a bitmap.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 664b17b9eefc412cbf0d97afc8e44686d33a9156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=664b17b9eefc412cbf0d97afc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 10:24:48 2009 +0200 wined3d: Make "packed_input" a bitmap. --- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/glsl_shader.c | 12 ++++++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 2fd79ff..076070a 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -411,7 +411,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 * Pshader: mark 3.0 input registers used, save token */ case WINED3DSPR_INPUT: if (!pshader) reg_maps->attributes[semantic.reg.reg.idx] = 1; - else reg_maps->packed_input[semantic.reg.reg.idx] = 1; + else reg_maps->input_registers |= 1 << semantic.reg.reg.idx; semantics_in[semantic.reg.reg.idx] = semantic; break; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 020cf61..a1e5aef 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3175,14 +3175,15 @@ static void pshader_glsl_input_pack(IWineD3DPixelShader *iface, SHADER_BUFFER *b { unsigned int i; IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; + WORD map = reg_maps->input_registers; - for (i = 0; i < MAX_REG_INPUT; ++i) + for (i = 0; map; map >>= 1, ++i) { DWORD usage, usage_idx; char reg_mask[6]; /* Unused */ - if (!reg_maps->packed_input[i]) continue; + if (!(map & 1)) continue; usage = semantics_in[i].usage; usage_idx = semantics_in[i].usage_idx; @@ -3280,6 +3281,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in DWORD in_count = vec4_varyings(3, gl_info); char reg_mask[6], reg_mask_out[6]; char destination[50]; + WORD input_map; set = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*set) * (in_count + 2)); @@ -3289,8 +3291,10 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in shader_addline(buffer, "vec4 front_secondary_color = gl_FrontSecondaryColor;\n"); } - for(i = 0; i < MAX_REG_INPUT; i++) { - if (!reg_maps_in->packed_input[i]) continue; + input_map = reg_maps_in->input_registers; + for (i = 0; input_map; input_map >>= 1, ++i) + { + if (!(input_map & 1)) continue; in_idx = map[i]; if (in_idx >= (in_count + 2)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 79ac60b..114407f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -621,12 +621,12 @@ typedef struct shader_reg_maps char texcoord[MAX_REG_TEXCRD]; /* pixel < 3.0 */ char temporary[MAX_REG_TEMP]; /* pixel, vertex */ char address[MAX_REG_ADDR]; /* vertex */ - char packed_input[MAX_REG_INPUT]; /* pshader >= 3.0 */ char packed_output[MAX_REG_OUTPUT]; /* vertex >= 3.0 */ char attributes[MAX_ATTRIBS]; /* vertex */ char labels[MAX_LABELS]; /* pixel, vertex */ DWORD *constf; /* pixel, vertex */ DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ + WORD input_registers; /* MAX_REG_INPUT, 12 */ WORD integer_constants; /* MAX_CONST_I, 16 */ WORD boolean_constants; /* MAX_CONST_B, 16 */

1 0

Henri Verbeet : wined3d: Use the "input_registers" bitmap for vertex shader attributes as well.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 10fadadc54310546845b1ed8acdcaa0d54cea2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fadadc54310546845b1ed8a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 10:24:49 2009 +0200 wined3d: Use the "input_registers" bitmap for vertex shader attributes as well. --- dlls/wined3d/baseshader.c | 5 ++--- dlls/wined3d/glsl_shader.c | 24 ++++++++++++++++-------- dlls/wined3d/vertexshader.c | 17 ++++++++--------- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 076070a..4ec4073 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -260,7 +260,7 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh break; case WINED3DSPR_INPUT: - if (!pshader) reg_maps->attributes[reg->idx] = 1; + if (!pshader) reg_maps->input_registers |= 1 << reg->idx; else { if (reg->rel_addr) @@ -410,8 +410,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 /* Vshader: mark attributes used * Pshader: mark 3.0 input registers used, save token */ case WINED3DSPR_INPUT: - if (!pshader) reg_maps->attributes[semantic.reg.reg.idx] = 1; - else reg_maps->input_registers |= 1 << semantic.reg.reg.idx; + reg_maps->input_registers |= 1 << semantic.reg.reg.idx; semantics_in[semantic.reg.reg.idx] = semantic; break; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a1e5aef..b99e7df 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -964,9 +964,16 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s } /* Declare attributes */ - for (i = 0; i < This->baseShader.limits.attributes; i++) { - if (reg_maps->attributes[i]) + if (reg_maps->shader_version.type == WINED3D_SHADER_TYPE_VERTEX) + { + WORD map = reg_maps->input_registers; + + for (i = 0; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; + shader_addline(buffer, "attribute vec4 attrib%i;\n", i); + } } /* Declare loop registers aLx */ @@ -3652,7 +3659,7 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use /* Attach GLSL vshader */ if (vshader_id) { - const unsigned int max_attribs = 16; /* TODO: Will this always be the case? It is at the moment... */ + WORD map = ((IWineD3DBaseShaderImpl *)vshader)->baseShader.reg_maps.input_registers; char tmp_name[10]; reorder_shader_id = generate_param_reorder_function(vshader, pshader, gl_info); @@ -3677,11 +3684,12 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use * We have to do this here because we need to know the Program ID * in order to make the bindings work, and it has to be done prior * to linking the GLSL program. */ - for (i = 0; i < max_attribs; ++i) { - if (((IWineD3DBaseShaderImpl*)vshader)->baseShader.reg_maps.attributes[i]) { - snprintf(tmp_name, sizeof(tmp_name), "attrib%i", i); - GL_EXTCALL(glBindAttribLocationARB(programId, i, tmp_name)); - } + for (i = 0; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; + + snprintf(tmp_name, sizeof(tmp_name), "attrib%u", i); + GL_EXTCALL(glBindAttribLocationARB(programId, i, tmp_name)); } checkGLcall("glBindAttribLocationARB"); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 26350d9..9b8fcfd 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -134,16 +134,15 @@ static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_id return FALSE; } -BOOL vshader_get_input( - IWineD3DVertexShader* iface, - BYTE usage_req, BYTE usage_idx_req, - unsigned int* regnum) { - - IWineD3DVertexShaderImpl* This = (IWineD3DVertexShaderImpl*) iface; - int i; +BOOL vshader_get_input(IWineD3DVertexShader* iface, BYTE usage_req, BYTE usage_idx_req, unsigned int *regnum) +{ + IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; + WORD map = This->baseShader.reg_maps.input_registers; + unsigned int i; - for (i = 0; i < MAX_ATTRIBS; i++) { - if (!This->baseShader.reg_maps.attributes[i]) continue; + for (i = 0; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; if (match_usage(This->semantics_in[i].usage, This->semantics_in[i].usage_idx, usage_req, usage_idx_req)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 114407f..e82d1e1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -622,11 +622,10 @@ typedef struct shader_reg_maps char temporary[MAX_REG_TEMP]; /* pixel, vertex */ char address[MAX_REG_ADDR]; /* vertex */ char packed_output[MAX_REG_OUTPUT]; /* vertex >= 3.0 */ - char attributes[MAX_ATTRIBS]; /* vertex */ char labels[MAX_LABELS]; /* pixel, vertex */ DWORD *constf; /* pixel, vertex */ DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ - WORD input_registers; /* MAX_REG_INPUT, 12 */ + WORD input_registers; /* max(MAX_REG_INPUT, MAX_ATTRIBS), 16 */ WORD integer_constants; /* MAX_CONST_I, 16 */ WORD boolean_constants; /* MAX_CONST_B, 16 */

1 0

Henri Verbeet : wined3d: Make "packed_output" a bitmap.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: e6efb797c36144f826ecae2125375789c688f39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6efb797c36144f826ecae212… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 10:24:50 2009 +0200 wined3d: Make "packed_output" a bitmap. --- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/glsl_shader.c | 23 ++++++++++++++++------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 4ec4073..ab3354f 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -416,7 +416,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 /* Vshader: mark 3.0 output registers used, save token */ case WINED3DSPR_OUTPUT: - reg_maps->packed_output[semantic.reg.reg.idx] = 1; + reg_maps->output_registers |= 1 << semantic.reg.reg.idx; semantics_out[semantic.reg.reg.idx] = semantic; if (semantic.usage == WINED3DDECLUSAGE_FOG) reg_maps->fog = 1; break; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b99e7df..c857398 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3288,7 +3288,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in DWORD in_count = vec4_varyings(3, gl_info); char reg_mask[6], reg_mask_out[6]; char destination[50]; - WORD input_map; + WORD input_map, output_map; set = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*set) * (in_count + 2)); @@ -3361,8 +3361,11 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in } } else { BOOL found = FALSE; - for(j = 0; j < MAX_REG_OUTPUT; j++) { - if (!reg_maps_out->packed_output[j]) continue; + + output_map = reg_maps_out->output_registers; + for (j = 0; output_map; output_map >>= 1, ++j) + { + if (!(output_map & 1)) continue; usage_out = semantics_out[j].usage; usage_idx_out = semantics_out[j].usage_idx; @@ -3465,12 +3468,15 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs shader_addline(&buffer, "void order_ps_input() { /* do nothing */ }\n"); } } else if(ps_major < 3 && vs_major >= 3) { + WORD map = vs->baseShader.reg_maps.output_registers; + /* The vertex shader writes to its own varyings, the pixel shader needs them in the builtin ones */ semantics_out = vs->semantics_out; shader_addline(&buffer, "void order_ps_input(in vec4 OUT[%u]) {\n", MAX_REG_OUTPUT); - for(i = 0; i < MAX_REG_OUTPUT; i++) { - if (!vs->baseShader.reg_maps.packed_output[i]) continue; + for (i = 0; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; usage = semantics_out[i].usage; usage_idx = semantics_out[i].usage_idx; @@ -3515,6 +3521,8 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs shader_addline(&buffer, "}\n"); } else if(ps_major >= 3 && vs_major >= 3) { + WORD map = vs->baseShader.reg_maps.output_registers; + semantics_out = vs->semantics_out; /* This one is tricky: a 3.0 pixel shader reads from a 3.0 vertex shader */ @@ -3522,8 +3530,9 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs shader_addline(&buffer, "void order_ps_input(in vec4 OUT[%u]) {\n", MAX_REG_OUTPUT); /* First, sort out position and point size. Those are not passed to the pixel shader */ - for(i = 0; i < MAX_REG_OUTPUT; i++) { - if (!vs->baseShader.reg_maps.packed_output[i]) continue; + for (i = 0; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; usage = semantics_out[i].usage; usage_idx = semantics_out[i].usage_idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e82d1e1..36c2da9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -621,11 +621,11 @@ typedef struct shader_reg_maps char texcoord[MAX_REG_TEXCRD]; /* pixel < 3.0 */ char temporary[MAX_REG_TEMP]; /* pixel, vertex */ char address[MAX_REG_ADDR]; /* vertex */ - char packed_output[MAX_REG_OUTPUT]; /* vertex >= 3.0 */ char labels[MAX_LABELS]; /* pixel, vertex */ DWORD *constf; /* pixel, vertex */ DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ WORD input_registers; /* max(MAX_REG_INPUT, MAX_ATTRIBS), 16 */ + WORD output_registers; /* MAX_REG_OUTPUT, 12 */ WORD integer_constants; /* MAX_CONST_I, 16 */ WORD boolean_constants; /* MAX_CONST_B, 16 */

1 0

Henri Verbeet : wined3d: Use a separate structure for vertex shader attributes.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 19cb4594e333f88f008cc4def74101a809bf7966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19cb4594e333f88f008cc4def… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 10:24:50 2009 +0200 wined3d: Use a separate structure for vertex shader attributes. In D3D10 shaders input/output semantics are strings rather than predefined types. Unfortunately, the code in vshader_get_input() can be performance critical, depending on application behaviour. Since vshader_get_input() is only relevant for d3d9 shaders anyway, just store the usage and usage_idx for these shaders. --- dlls/wined3d/baseshader.c | 15 ++++++++++++--- dlls/wined3d/pixelshader.c | 5 +++-- dlls/wined3d/vertexshader.c | 18 ++++++------------ dlls/wined3d/wined3d_private.h | 13 ++++++++++--- 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ab3354f..91c656c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -345,8 +345,9 @@ static unsigned int get_instr_extra_regcount(enum WINED3D_SHADER_INSTRUCTION_HAN * as an address register. */ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe, - struct shader_reg_maps *reg_maps, struct wined3d_shader_semantic *semantics_in, - struct wined3d_shader_semantic *semantics_out, const DWORD *byte_code, DWORD constf_size) + struct shader_reg_maps *reg_maps, struct wined3d_shader_attribute *attributes, + struct wined3d_shader_semantic *semantics_in, struct wined3d_shader_semantic *semantics_out, + const DWORD *byte_code, DWORD constf_size) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; void *fe_data = This->baseShader.frontend_data; @@ -411,7 +412,15 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 * Pshader: mark 3.0 input registers used, save token */ case WINED3DSPR_INPUT: reg_maps->input_registers |= 1 << semantic.reg.reg.idx; - semantics_in[semantic.reg.reg.idx] = semantic; + if (shader_version.type == WINED3D_SHADER_TYPE_VERTEX) + { + attributes[semantic.reg.reg.idx].usage = semantic.usage; + attributes[semantic.reg.reg.idx].usage_idx = semantic.usage_idx; + } + else + { + semantics_in[semantic.reg.reg.idx] = semantic; + } break; /* Vshader: mark 3.0 output registers used, save token */ diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 26904a8..9ebe77b 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -242,8 +242,9 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i list_init(&This->baseShader.constantsI); /* Second pass: figure out which registers are used, what the semantics are, etc.. */ - hr = shader_get_registers_used((IWineD3DBaseShader *)This, fe, reg_maps, This->semantics_in, NULL, pFunction, - GL_LIMITS(pshader_constantsF)); + hr = shader_get_registers_used((IWineD3DBaseShader *)This, fe, + reg_maps, NULL, This->semantics_in, NULL, + pFunction, GL_LIMITS(pshader_constantsF)); if (FAILED(hr)) return hr; pshader_set_limits(This); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 9b8fcfd..aceaa97 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -115,14 +115,8 @@ static void vshader_set_input( unsigned int regnum, BYTE usage, BYTE usage_idx) { - This->semantics_in[regnum].usage = usage; - This->semantics_in[regnum].usage_idx = usage_idx; - This->semantics_in[regnum].reg.reg.type = WINED3DSPR_INPUT; - This->semantics_in[regnum].reg.reg.idx = regnum; - This->semantics_in[regnum].reg.write_mask = WINED3DSP_WRITEMASK_ALL; - This->semantics_in[regnum].reg.modifiers = 0; - This->semantics_in[regnum].reg.shift = 0; - This->semantics_in[regnum].reg.reg.rel_addr = NULL; + This->attributes[regnum].usage = usage; + This->attributes[regnum].usage_idx = usage_idx; } static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_idx2) { @@ -144,8 +138,8 @@ BOOL vshader_get_input(IWineD3DVertexShader* iface, BYTE usage_req, BYTE usage_i { if (!(map & 1)) continue; - if (match_usage(This->semantics_in[i].usage, - This->semantics_in[i].usage_idx, usage_req, usage_idx_req)) + if (match_usage(This->attributes[i].usage, + This->attributes[i].usage_idx, usage_req, usage_idx_req)) { *regnum = i; return TRUE; @@ -283,8 +277,8 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader This->min_rel_offset = GL_LIMITS(vshader_constantsF); This->max_rel_offset = 0; hr = shader_get_registers_used((IWineD3DBaseShader*) This, fe, - reg_maps, This->semantics_in, This->semantics_out, pFunction, - GL_LIMITS(vshader_constantsF)); + reg_maps, This->attributes, NULL, This->semantics_out, + pFunction, GL_LIMITS(vshader_constantsF)); if (hr != WINED3D_OK) return hr; vshader_set_limits(This); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 36c2da9..b68dc60 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -695,6 +695,12 @@ struct wined3d_shader_semantic struct wined3d_shader_dst_param reg; }; +struct wined3d_shader_attribute +{ + WINED3DDECLUSAGE usage; + UINT usage_idx; +}; + struct wined3d_shader_frontend { void *(*shader_init)(const DWORD *ptr, const struct wined3d_shader_signature *output_signature); @@ -2577,8 +2583,9 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, const shader_reg_maps *reg_maps, const DWORD *pFunction, void *backend_ctx); HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe, - struct shader_reg_maps *reg_maps, struct wined3d_shader_semantic *semantics_in, - struct wined3d_shader_semantic *semantics_out, const DWORD *byte_code, DWORD constf_size); + struct shader_reg_maps *reg_maps, struct wined3d_shader_attribute *attributes, + struct wined3d_shader_semantic *semantics_in, struct wined3d_shader_semantic *semantics_out, + const DWORD *byte_code, DWORD constf_size); void shader_init(struct IWineD3DBaseShaderClass *shader, IWineD3DDevice *device); const struct wined3d_shader_frontend *shader_select_frontend(DWORD version_token); void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe_data, const DWORD *pFunction); @@ -2671,7 +2678,7 @@ typedef struct IWineD3DVertexShaderImpl { UINT num_gl_shaders, shader_array_size; /* Vertex shader input and output semantics */ - struct wined3d_shader_semantic semantics_in[MAX_ATTRIBS]; + struct wined3d_shader_attribute attributes[MAX_ATTRIBS]; struct wined3d_shader_semantic semantics_out[MAX_REG_OUTPUT]; UINT min_rel_offset, max_rel_offset;

1 0

Henri Verbeet : wined3d: Use strings for shader input/output semantics.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 2ee0d47a49113d400b3bdcb8facebe862d4c81e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee0d47a49113d400b3bdcb8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 10:24:50 2009 +0200 wined3d: Use strings for shader input/output semantics. --- dlls/wined3d/baseshader.c | 53 ++++++++- dlls/wined3d/glsl_shader.c | 265 ++++++++++++++++++++-------------------- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- dlls/wined3d/wined3d_private.h | 9 +- 5 files changed, 190 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ee0d47a49113d400b3bd…

1 0

Piotr Caban : jscript: Added implementation of Math_exp.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 62319694765447a331f7fb946f0ec84d94cc35e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62319694765447a331f7fb946… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed May 27 01:09:37 2009 +0200 jscript: Added implementation of Math_exp. --- dlls/jscript/math.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 27 +++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 2c45f8f..0253111 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -293,8 +293,22 @@ static HRESULT Math_cos(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d static HRESULT Math_exp(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, exp(num_val(&v))); + return S_OK; } static HRESULT Math_floor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 3da1cc7..8c2065e 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -767,6 +767,33 @@ ok(isNaN(tmp), "Math.atan2() is not NaN"); tmp = Math.atan2(1); ok(isNaN(tmp), "Math.atan2(1) is not NaN"); +tmp = Math.exp(0); +ok(tmp === 1, "Math.exp(0) = " + tmp); + +tmp = Math.exp(1); +ok(Math.floor(tmp*100) === 271, "Math.exp(1) = " + tmp); + +tmp = Math.exp(-1); +ok(Math.floor(tmp*100) === 36, "Math.exp(-1) = " + tmp); + +tmp = Math.exp(true); +ok(Math.floor(tmp*100) === 271, "Math.exp(true) = " + tmp); + +tmp = Math.exp(1, 1); +ok(Math.floor(tmp*100) === 271, "Math.exp(1, 1) = " + tmp); + +tmp = Math.exp(); +ok(isNaN(tmp), "Math.exp() is not NaN"); + +tmp = Math.exp(NaN); +ok(isNaN(tmp), "Math.exp(NaN) is not NaN"); + +tmp = Math.exp(Infinity); +ok(tmp === Infinity, "Math.exp(Infinity) = " + tmp); + +tmp = Math.exp(-Infinity); +ok(tmp === 0, "Math.exp(-Infinity) = " + tmp); + var func = function (a) { var a = 1; if(a) return;

1 0