June 2006 - Wine-Commits - list.winehq.org

Jason Green : wined3d: Added correct cast support for gl_FogFragCoord and gl_PointSize output registers .
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 9afa540eb54976a497ba16e6cfde06bf47bc8cdb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9afa540eb54976a497ba16e… Author: Jason Green <jave27(a)gmail.com> Date: Sat Jun 17 15:55:15 2006 -0400 wined3d: Added correct cast support for gl_FogFragCoord and gl_PointSize output registers. --- dlls/wined3d/glsl_shader.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6b4fd72..a9b5820 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -380,17 +380,29 @@ static const char* shift_glsl_tab[] = { "0.5 * " /* 15 (d2) */ }; -/** Print the beginning of the generated GLSL string. example: "reg_name.xyzw = vec4(" */ -static void shader_glsl_add_dst(DWORD param, const char* reg_name, const char* reg_mask, char* outStr) { +/** Print the beginning of the generated GLSL string. example: "reg_name.xyzw = vec4(" + * Will also change the reg_mask if necessary (not all register types are equal in DX vs GL) */ +static void shader_glsl_add_dst(DWORD param, const char* reg_name, char* reg_mask, char* outStr) { int shift = (param & D3DSP_DSTSHIFT_MASK) >> D3DSP_DSTSHIFT_SHIFT; - - /* TODO: determine if destination is anything other than a float vector and accommodate*/ - if (reg_name[0] == 'A') - sprintf(outStr, "%s%s = %sivec4(", reg_name, reg_mask, shift_glsl_tab[shift]); - else - sprintf(outStr, "%s%s = %svec4(", reg_name, reg_mask, shift_glsl_tab[shift]); - + char cast[6]; + + if ((shader_get_regtype(param) == D3DSPR_RASTOUT) + && ((param & D3DSP_REGNUM_MASK) != 0)) { + /* gl_FogFragCoord or glPointSize - both floats */ + strcpy(cast, "float"); + strcpy(reg_mask, ""); + + } else if (reg_name[0] == 'A') { + /* Address register for vertex shaders (ivec4) */ + strcpy(cast, "ivec4"); + + } else { + /* Everything else should be a 4 component float vector */ + strcpy(cast, "vec4"); + } + + sprintf(outStr, "%s%s = %s%s(", reg_name, reg_mask, shift_glsl_tab[shift], cast); } /* Generate a GLSL parameter that does the input modifier computation and return the input register/mask to use */

1 0

Jason Green : wined3d: Fix lookup for LOOP register.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: fd83de7129dfbf3a5360aa2db1716a4c4de4223a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd83de7129dfbf3a5360aa2… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 16 16:13:01 2006 -0400 wined3d: Fix lookup for LOOP register. --- dlls/wined3d/baseshader.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index e50eb35..004a0ef 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -363,6 +363,11 @@ void shader_get_registers_used( } else if (D3DSIO_DEF == curOpcode->opcode) { pToken += curOpcode->num_params; + /* If there's a loop in the shader */ + } else if (D3DSIO_LOOP == curOpcode->opcode) { + reg_maps->loop = 1; + pToken += curOpcode->num_params; + /* Set texture, address, temporary registers */ } else { int i, limit; @@ -411,9 +416,6 @@ void shader_get_registers_used( else if (D3DSPR_INPUT == regtype && !pshader) reg_maps->attributes[reg] = 1; - - else if (D3DSPR_LOOP == regtype) - reg_maps->loop = 1; } } }

1 0

Jason Green : wined3d: Load boolean and integer constants into the GLSL shader program.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 406ec20459c398611bcc5bae1cb87d10d2cb9380 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=406ec20459c398611bcc5ba… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 16 16:08:34 2006 -0400 wined3d: Load boolean and integer constants into the GLSL shader program. --- dlls/wined3d/glsl_shader.c | 93 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 73199da..6b4fd72 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -110,6 +110,79 @@ void shader_glsl_load_constantsF( } } +/** + * Loads integer constants (aka uniforms) into the currently set GLSL program. + * When @constants_set == NULL, it will load all the constants. + */ +void shader_glsl_load_constantsI( + WineD3D_GL_Info *gl_info, + GLhandleARB programId, + unsigned max_constants, + int* constants, + BOOL* constants_set, + char is_pshader) { + + GLhandleARB tmp_loc; + int i; + char tmp_name[7]; + const char* prefix = is_pshader? "PI":"VI"; + + for (i=0; i<max_constants; ++i) { + if (NULL == constants_set || constants_set[i]) { + + TRACE("Loading constants %i: %i, %i, %i, %i\n", + i, constants[i*4], constants[i*4+1], constants[i*4+2], constants[i*4+3]); + + /* TODO: Benchmark and see if it would be beneficial to store the + * locations of the constants to avoid looking up each time */ + snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, i); + tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); + if (tmp_loc != -1) { + /* We found this uniform name in the program - go ahead and send the data */ + GL_EXTCALL(glUniform4ivARB(tmp_loc, 1, &constants[i*4])); + checkGLcall("glUniform4ivARB"); + } + } + } +} + +/** + * Loads boolean constants (aka uniforms) into the currently set GLSL program. + * When @constants_set == NULL, it will load all the constants. + */ +void shader_glsl_load_constantsB( + WineD3D_GL_Info *gl_info, + GLhandleARB programId, + unsigned max_constants, + BOOL* constants, + BOOL* constants_set, + char is_pshader) { + + GLhandleARB tmp_loc; + int i; + char tmp_name[7]; + const char* prefix = is_pshader? "PB":"VB"; + + for (i=0; i<max_constants; ++i) { + if (NULL == constants_set || constants_set[i]) { + + TRACE("Loading constants %i: %i;\n", i, constants[i*4]); + + /* TODO: Benchmark and see if it would be beneficial to store the + * locations of the constants to avoid looking up each time */ + snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, i); + tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); + if (tmp_loc != -1) { + /* We found this uniform name in the program - go ahead and send the data */ + GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i*4])); + checkGLcall("glUniform1ivARB"); + } + } + } +} + + + /** * Loads the app-supplied constants into the currently set GLSL program. */ @@ -143,7 +216,15 @@ void shader_glsl_load_constants( stateBlock->vertexShaderConstantF, stateBlock->set.vertexShaderConstantsF, 0); - /* TODO: Load boolean & integer constants for vertex shader */ + /* Load DirectX 9 integer constants/uniforms for vertex shader */ + shader_glsl_load_constantsI(gl_info, programId, MAX_CONST_I, + stateBlock->vertexShaderConstantI, + stateBlock->set.vertexShaderConstantsI, 0); + + /* Load DirectX 9 boolean constants/uniforms for vertex shader */ + shader_glsl_load_constantsB(gl_info, programId, MAX_CONST_B, + stateBlock->vertexShaderConstantB, + stateBlock->set.vertexShaderConstantsB, 0); } if (usePixelShader) { @@ -156,7 +237,15 @@ void shader_glsl_load_constants( stateBlock->pixelShaderConstantF, stateBlock->set.pixelShaderConstantsF, 1); - /* TODO: Load boolean & integer constants for pixel shader */ + /* Load DirectX 9 integer constants/uniforms for pixel shader */ + shader_glsl_load_constantsI(gl_info, programId, MAX_CONST_I, + stateBlock->pixelShaderConstantI, + stateBlock->set.pixelShaderConstantsI, 1); + + /* Load DirectX 9 boolean constants/uniforms for pixel shader */ + shader_glsl_load_constantsB(gl_info, programId, MAX_CONST_B, + stateBlock->pixelShaderConstantB, + stateBlock->set.pixelShaderConstantsB, 1); } }

1 0

Jason Green : wined3d: Remove dead vertex shader code.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 7f18b4e5fab71acccc6efaa823a9e5b9e6c4a933 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f18b4e5fab71acccc6efaa… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 16 16:06:50 2006 -0400 wined3d: Remove dead vertex shader code. --- dlls/wined3d/vertexshader.c | 61 ------------------------------------------- 1 files changed, 0 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index d2028f2..8b62ff7 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -42,8 +42,6 @@ # define VSTRACE(A) # define TRACE_VSVECTOR(name) #endif -#if 1 /* FIXME : Needs sorting when vshader code moved in properly */ - /** * DirectX9 SDK download * http://msdn.microsoft.com/library/default.asp?url=/downloads/list/directx.a… @@ -1182,65 +1180,6 @@ #endif return WINED3D_OK; } -HRESULT WINAPI IWineD3DVertexShaderImpl_SetConstantF(IWineD3DVertexShader *iface, UINT StartRegister, CONST FLOAT *pConstantData, UINT Vector4fCount) { - IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - FIXME("(%p) : stub\n", This); - return WINED3D_OK; -} - -HRESULT WINAPI IWineD3DVertexShaderImpl_GetConstantF(IWineD3DVertexShader *iface, UINT StartRegister, FLOAT *pConstantData, UINT Vector4fCount) { - IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - FIXME("(%p) : stub\n", This); - return WINED3D_OK; -} - -HRESULT WINAPI IWineD3DVertexShaderImpl_SetConstantI(IWineD3DVertexShader *iface, UINT StartRegister, CONST int *pConstantData, UINT Vector4iCount) { - IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - if (StartRegister + Vector4iCount > WINED3D_VSHADER_MAX_CONSTANTS) { - ERR("(%p) : SetVertexShaderConstantI C[%u] invalid\n", This, StartRegister); - return WINED3DERR_INVALIDCALL; - } - if (NULL == pConstantData) { - return WINED3DERR_INVALIDCALL; - } - FIXME("(%p) : stub\n", This); - return WINED3D_OK; -} - -HRESULT WINAPI IWineD3DVertexShaderImpl_GetConstantI(IWineD3DVertexShader *iface, UINT StartRegister, int *pConstantData, UINT Vector4iCount) { - IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - TRACE("(%p) : C[%u] count=%u\n", This, StartRegister, Vector4iCount); - if (StartRegister + Vector4iCount > WINED3D_VSHADER_MAX_CONSTANTS) { - return WINED3DERR_INVALIDCALL; - } - if (NULL == pConstantData) { - return WINED3DERR_INVALIDCALL; - } - FIXME("(%p) : stub\n", This); - return WINED3D_OK; -} - -HRESULT WINAPI IWineD3DVertexShaderImpl_SetConstantB(IWineD3DVertexShader *iface, UINT StartRegister, CONST BOOL *pConstantData, UINT BoolCount) { - IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - if (StartRegister + BoolCount > WINED3D_VSHADER_MAX_CONSTANTS) { - ERR("(%p) : SetVertexShaderConstantB C[%u] invalid\n", This, StartRegister); - return WINED3DERR_INVALIDCALL; - } - if (NULL == pConstantData) { - return WINED3DERR_INVALIDCALL; - } - FIXME("(%p) : stub\n", This); - return WINED3D_OK; -} - -HRESULT WINAPI IWineD3DVertexShaderImpl_GetConstantB(IWineD3DVertexShader *iface, UINT StartRegister, BOOL *pConstantData, UINT BoolCount) { - IWineD3DVertexShaderImpl* This = (IWineD3DVertexShaderImpl *)iface; - FIXME("(%p) : stub\n", This); - return WINED3D_OK; -} - -#endif - /* ******************************************* IWineD3DVertexShader IUnknown parts follow ******************************************* */

1 0

Jason Green : wined3d: Implement locally defined boolean and integer constants in GLSL.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: f444009bfb699e73418007e950324df5ef177bdb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f444009bfb699e73418007e… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 16 16:08:00 2006 -0400 wined3d: Implement locally defined boolean and integer constants in GLSL. --- dlls/wined3d/glsl_shader.c | 27 ++++++++++++++++++++++++++- dlls/wined3d/pixelshader.c | 4 ++-- dlls/wined3d/vertexshader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 11decec..73199da 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -947,7 +947,7 @@ void shader_glsl_lrp(SHADER_OPCODE_ARG* tmpLine, src2_str, src1_str, src0_str, src0_str, dst_mask); } -/** Process the D3DSIO_DCL opcode into a GLSL string - creates a local vec4 +/** Process the D3DSIO_DEF opcode into a GLSL string - creates a local vec4 * float constant, and stores it's usage on the regmaps. */ void shader_glsl_def(SHADER_OPCODE_ARG* arg) { @@ -967,6 +967,31 @@ void shader_glsl_def(SHADER_OPCODE_ARG* arg->reg_maps->constantsF[reg] = 1; } +/** Process the D3DSIO_DEFI opcode into a GLSL string - creates a local ivec4 + * integer constant, and stores it's usage on the regmaps. */ +void shader_glsl_defi(SHADER_OPCODE_ARG* arg) { + + DWORD reg = arg->dst & D3DSP_REGNUM_MASK; + + shader_addline(arg->buffer, + "const ivec4 I%lu = { %ld, %ld, %ld, %ld };\n", reg, + (long)arg->src[0], (long)arg->src[1], + (long)arg->src[2], (long)arg->src[3]); + + arg->reg_maps->constantsI[reg] = 1; +} + +/** Process the D3DSIO_DEFB opcode into a GLSL string - creates a local boolean + * constant, and stores it's usage on the regmaps. */ +void shader_glsl_defb(SHADER_OPCODE_ARG* arg) { + + DWORD reg = arg->dst & D3DSP_REGNUM_MASK; + + shader_addline(arg->buffer, "const bool B%lu = %s;\n", reg, (arg->src[0]) ? "true" : "false"); + + arg->reg_maps->constantsB[reg] = 1; +} + /** Process the D3DSIO_LIT instruction in GLSL: * dst.x = dst.w = 1.0 * dst.y = (src0.x > 0) ? src0.x diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 4c72390..6d9f4b4 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -707,8 +707,8 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI /* Constant definitions */ {D3DSIO_DEF, "def", "undefined", 1, 5, pshader_def, shader_hw_def, shader_glsl_def, 0, 0}, - {D3DSIO_DEFB, "defb", GLNAME_REQUIRE_GLSL, 1, 2, pshader_defb, NULL, NULL, 0, 0}, - {D3DSIO_DEFI, "defi", GLNAME_REQUIRE_GLSL, 1, 5, pshader_defi, NULL, NULL, 0, 0}, + {D3DSIO_DEFB, "defb", GLNAME_REQUIRE_GLSL, 1, 2, pshader_defb, NULL, shader_glsl_defb, 0, 0}, + {D3DSIO_DEFI, "defi", GLNAME_REQUIRE_GLSL, 1, 5, pshader_defi, NULL, shader_glsl_defi, 0, 0}, /* Texture */ {D3DSIO_TEXCOORD, "texcoord", "undefined", 1, 1, pshader_texcoord, pshader_hw_texcoord, pshader_glsl_texcoord, 0, D3DPS_VERSION(1,3)}, diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 8b62ff7..86eff1f 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -536,8 +536,8 @@ CONST SHADER_OPCODE IWineD3DVertexShader /* Constant definitions */ {D3DSIO_DEF, "def", NULL, 1, 5, vshader_def, shader_hw_def, shader_glsl_def, 0, 0}, - {D3DSIO_DEFB, "defb", GLNAME_REQUIRE_GLSL, 1, 2, vshader_defb, NULL, NULL, 0, 0}, - {D3DSIO_DEFI, "defi", GLNAME_REQUIRE_GLSL, 1, 5, vshader_defi, NULL, NULL, 0, 0}, + {D3DSIO_DEFB, "defb", GLNAME_REQUIRE_GLSL, 1, 2, vshader_defb, NULL, shader_glsl_defb, 0, 0}, + {D3DSIO_DEFI, "defi", GLNAME_REQUIRE_GLSL, 1, 5, vshader_defi, NULL, shader_glsl_defi, 0, 0}, /* Flow control - requires GLSL or software shaders */ {D3DSIO_REP , "rep", GLNAME_REQUIRE_GLSL, 0, 1, vshader_rep, NULL, NULL, 0, 0}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eee7fc3..e8322a2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1376,6 +1376,8 @@ extern void shader_glsl_rcp(SHADER_OPCOD extern void shader_glsl_cnd(SHADER_OPCODE_ARG* arg); extern void shader_glsl_compare(SHADER_OPCODE_ARG* arg); extern void shader_glsl_def(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_defi(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_defb(SHADER_OPCODE_ARG* arg); extern void shader_glsl_cmp(SHADER_OPCODE_ARG* arg); extern void shader_glsl_lit(SHADER_OPCODE_ARG* arg); extern void shader_glsl_dst(SHADER_OPCODE_ARG* arg);

1 0

Jason Green : wined3d: Add preliminary support for constant boolean and integer registers in GLSL .
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 34d271bab6c6d43bb3b03739eed4a3bce5b678bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34d271bab6c6d43bb3b0373… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 16 16:07:31 2006 -0400 wined3d: Add preliminary support for constant boolean and integer registers in GLSL. - Separate the declaration phase of the shader string generator into the arb and glsl specific files. - Add declarations and recognition for application-sent constant integers and booleans (locally defined ones will follow). - Standardize capitilization of pixel/vertex specific variable names. --- dlls/wined3d/arb_program_shader.c | 36 ++++++++++ dlls/wined3d/baseshader.c | 128 ------------------------------------ dlls/wined3d/glsl_shader.c | 133 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 7 +- 4 files changed, 168 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=34d271bab6c6d43bb3b…

1 0

Jason Green : wined3d: Move constant loading into target-specific files.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 2d8e05f8a1e7f1068c0472213dac92112f9418c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d8e05f8a1e7f1068c04722… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 16 16:07:00 2006 -0400 wined3d: Move constant loading into target-specific files. - Moves GLSL constant loading code into glsl_shader.c and out of the over-populated drawprim.c. - Creates a new file named arb_program_shader.c which will hold code specific to ARB_vertex_program & ARB_fragment_program. - Remove the constant loading calls from drawprim.c --- dlls/wined3d/Makefile.in | 1 dlls/wined3d/arb_program_shader.c | 111 ++++++++++++++++++++++++ dlls/wined3d/drawprim.c | 174 +------------------------------------ dlls/wined3d/glsl_shader.c | 113 ++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 10 ++ 5 files changed, 240 insertions(+), 169 deletions(-) create mode 100644 dlls/wined3d/arb_program_shader.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2d8e05f8a1e7f1068c0…

1 0

Krzysztof Foltman : riched20: EM_CHARFROMPOS didn' t work properly with scrolling
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 8e852101447eb60aa4ed361f863306cc3e076b96 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e852101447eb60aa4ed361… Author: Krzysztof Foltman <wdev(a)foltman.com> Date: Sun Jun 18 22:21:23 2006 +0200 riched20: EM_CHARFROMPOS didn't work properly with scrolling (vertical scrollbar position was not taken into account). --- dlls/riched20/caret.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0ae347a..057e5d8 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -718,6 +718,7 @@ ME_CharFromPos(ME_TextEditor *editor, in GetClientRect(editor->hWnd, &rc); if (x < 0 || y < 0 || x >= rc.right || y >= rc.bottom) return -1; + y += ME_GetYScrollPos(editor); ME_FindPixelPos(editor, x, y, &cursor, NULL); return (ME_GetParagraph(cursor.pRun)->member.para.nCharOfs + cursor.pRun->member.run.nCharOfs + cursor.nOffset);

1 0

Hans Leidekker : dnsapi: Free all allocated records instead of just the last one.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: f9b213ff7b7151bb7739aa19b810d9c0cb996a9a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9b213ff7b7151bb7739aa1… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Jun 17 15:24:32 2006 +0200 dnsapi: Free all allocated records instead of just the last one. --- dlls/dnsapi/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 6e84eb4..2bcd913 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -537,7 +537,7 @@ exit: DNS_RRSET_TERMINATE( rrset ); if (ret != ERROR_SUCCESS) - DnsRecordListFree( (DNS_RECORD *)record, DnsFreeRecordList ); + DnsRecordListFree( rrset.pFirstRR, DnsFreeRecordList ); else *recp = (DNS_RECORDA *)rrset.pFirstRR;

1 0

Hans Leidekker : dnsapi: Correct testing for zero option value DNS_QUERY_STANDARD.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 5213b4a3f29822b69b3bd6fe0cb0dad0bc002c53 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5213b4a3f29822b69b3bd6f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Jun 17 15:13:28 2006 +0200 dnsapi: Correct testing for zero option value DNS_QUERY_STANDARD. --- dlls/dnsapi/query.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index f7f9271..6e84eb4 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -88,8 +88,9 @@ static unsigned long dns_map_options( DW { unsigned long ret = 0; - if (options & DNS_QUERY_STANDARD) - ret |= RES_DEFAULT; + if (options == DNS_QUERY_STANDARD) + return RES_DEFAULT; + if (options & DNS_QUERY_ACCEPT_TRUNCATED_RESPONSE) ret |= RES_IGNTC; if (options & DNS_QUERY_USE_TCP_ONLY)

1 0