August 2014 - Wine-commits - list.winehq.org

Matteo Bruni : wined3d: Handle half-float attributes in load_numbered_arrays().
by Alexandre Julliard 28 Aug '14

28 Aug '14

Module: wine Branch: master Commit: 6eb242a2757ee59822c23e0feb6a89d72a1f4fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb242a2757ee59822c23e0fe… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 27 18:40:51 2014 +0200 wined3d: Handle half-float attributes in load_numbered_arrays(). Fixes a bunch of graphic glitches in WildStar on Nvidia. --- dlls/wined3d/state.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3712f3b..700db84 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4203,13 +4203,32 @@ static void load_numbered_arrays(struct wined3d_context *context, break; case WINED3DFMT_R16G16_FLOAT: - /* Are those 16 bit floats. C doesn't have a 16 bit float type. I could read the single bits and calculate a 4 - * byte float according to the IEEE standard - */ - FIXME("Unsupported WINED3DDECLTYPE_FLOAT16_2\n"); + if (gl_info->supported[NV_HALF_FLOAT] && gl_info->supported[NV_VERTEX_PROGRAM]) + { + /* Not supported by GL_ARB_half_float_vertex. */ + GL_EXTCALL(glVertexAttrib2hvNV(i, (const GLhalfNV *)ptr)); + } + else + { + float x = float_16_to_32(((const unsigned short *)ptr) + 0); + float y = float_16_to_32(((const unsigned short *)ptr) + 1); + GL_EXTCALL(glVertexAttrib2fARB(i, x, y)); + } break; case WINED3DFMT_R16G16B16A16_FLOAT: - FIXME("Unsupported WINED3DDECLTYPE_FLOAT16_4\n"); + if (gl_info->supported[NV_HALF_FLOAT] && gl_info->supported[NV_VERTEX_PROGRAM]) + { + /* Not supported by GL_ARB_half_float_vertex. */ + GL_EXTCALL(glVertexAttrib4hvNV(i, (const GLhalfNV *)ptr)); + } + else + { + float x = float_16_to_32(((const unsigned short *)ptr) + 0); + float y = float_16_to_32(((const unsigned short *)ptr) + 1); + float z = float_16_to_32(((const unsigned short *)ptr) + 2); + float w = float_16_to_32(((const unsigned short *)ptr) + 3); + GL_EXTCALL(glVertexAttrib4fARB(i, x, y, z, w)); + } break; default:

1 0

Matteo Bruni : wined3d: Store bool uniforms location in the GLSL shader structures.
by Alexandre Julliard 28 Aug '14

28 Aug '14

Module: wine Branch: master Commit: 33627f02aa05b6efefd9681f906c1e516b0b5ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33627f02aa05b6efefd9681f9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 27 18:40:52 2014 +0200 wined3d: Store bool uniforms location in the GLSL shader structures. --- dlls/wined3d/glsl_shader.c | 56 +++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bebcfd4..34cc567 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -41,7 +41,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); -WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); WINE_DECLARE_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -114,6 +113,7 @@ struct glsl_vs_program GLenum vertex_color_clamp; GLint *uniform_f_locations; GLint uniform_i_locations[MAX_CONST_I]; + GLint uniform_b_locations[MAX_CONST_B]; GLint pos_fixup_location; }; @@ -129,6 +129,7 @@ struct glsl_ps_program GLhandleARB id; GLint *uniform_f_locations; GLint uniform_i_locations[MAX_CONST_I]; + GLint uniform_b_locations[MAX_CONST_B]; GLint bumpenv_mat_location[MAX_TEXTURES]; GLint bumpenv_lum_scale_location[MAX_TEXTURES]; GLint bumpenv_lum_offset_location[MAX_TEXTURES]; @@ -648,12 +649,8 @@ static void shader_glsl_load_constantsI(const struct wined3d_shader *shader, con { if (!(constants_set & 1)) continue; - TRACE_(d3d_constants)("Loading constants %u: %i, %i, %i, %i\n", - i, constants[i*4], constants[i*4+1], constants[i*4+2], constants[i*4+3]); - /* We found this uniform name in the program - go ahead and send the data */ GL_EXTCALL(glUniform4ivARB(locations[i], 1, &constants[i*4])); - checkGLcall("glUniform4ivARB"); } /* Load immediate constants */ @@ -664,41 +661,25 @@ static void shader_glsl_load_constantsI(const struct wined3d_shader *shader, con unsigned int idx = lconst->idx; const GLint *values = (const GLint *)lconst->value; - TRACE_(d3d_constants)("Loading local constants %i: %i, %i, %i, %i\n", idx, - values[0], values[1], values[2], values[3]); - /* We found this uniform name in the program - go ahead and send the data */ GL_EXTCALL(glUniform4ivARB(locations[idx], 1, values)); - checkGLcall("glUniform4ivARB"); ptr = list_next(&shader->constantsI, ptr); } + checkGLcall("glUniform4ivARB()"); } /* Context activation is done by the caller. */ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - GLhandleARB programId, const BOOL *constants, WORD constants_set) + const GLint locations[MAX_CONST_B], const BOOL *constants, WORD constants_set) { - GLint tmp_loc; unsigned int i; - char tmp_name[10]; - const char *prefix; struct list* ptr; - prefix = shader_glsl_get_prefix(shader->reg_maps.shader_version.type); - - /* TODO: Benchmark and see if it would be beneficial to store the - * locations of the constants to avoid looking up each time */ for (i = 0; constants_set; constants_set >>= 1, ++i) { if (!(constants_set & 1)) continue; - TRACE_(d3d_constants)("Loading constants %i: %i;\n", i, constants[i]); - - /* 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_b[%i]", prefix, i); - tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); - GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i])); + GL_EXTCALL(glUniform1ivARB(locations[i], 1, &constants[i])); } /* Load immediate constants */ @@ -709,15 +690,10 @@ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, con unsigned int idx = lconst->idx; const GLint *values = (const GLint *)lconst->value; - TRACE_(d3d_constants)("Loading local constants %i: %i\n", idx, values[0]); - - snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, idx); - tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); - GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, values)); + GL_EXTCALL(glUniform1ivARB(locations[idx], 1, values)); ptr = list_next(&shader->constantsB, ptr); } - - checkGLcall("shader_glsl_load_constantsB()"); + checkGLcall("glUniform1ivARB()"); } static void reset_program_constant_version(struct wine_rb_entry *entry, void *context) @@ -772,7 +748,6 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context float position_fixup[4]; DWORD update_mask = 0; - GLhandleARB programId; struct glsl_shader_prog_link *prog = ctx_data->glsl_program; UINT constant_version; int i; @@ -781,7 +756,6 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context /* No GLSL program set - nothing to do. */ return; } - programId = prog->programId; constant_version = prog->constant_version; update_mask = context->constant_update_mask & prog->constant_update_mask; @@ -794,7 +768,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context vshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_VS_B) - shader_glsl_load_constantsB(vshader, gl_info, programId, state->vs_consts_b, + shader_glsl_load_constantsB(vshader, gl_info, prog->vs.uniform_b_locations, state->vs_consts_b, vshader->reg_maps.boolean_constants); if (update_mask & WINED3D_SHADER_CONST_VS_POS_FIXUP) @@ -813,7 +787,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context pshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_PS_B) - shader_glsl_load_constantsB(pshader, gl_info, programId, state->ps_consts_b, + shader_glsl_load_constantsB(pshader, gl_info, prog->ps.uniform_b_locations, state->ps_consts_b, pshader->reg_maps.boolean_constants); if (update_mask & WINED3D_SHADER_CONST_PS_BUMP_ENV) @@ -5719,6 +5693,12 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * vs->uniform_i_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); } + for (i = 0; i < MAX_CONST_B; ++i) + { + snprintf(name, sizeof(name), "vs_b[%u]", i); + vs->uniform_b_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + } + vs->pos_fixup_location = GL_EXTCALL(glGetUniformLocationARB(program_id, "posFixup")); } @@ -5744,6 +5724,12 @@ static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info * ps->uniform_i_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); } + for (i = 0; i < MAX_CONST_B; ++i) + { + snprintf(name, sizeof(name), "ps_b[%u]", i); + ps->uniform_b_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + } + for (i = 0; i < MAX_TEXTURES; ++i) { snprintf(name, sizeof(name), "bumpenv_mat%u", i);

1 0

Nikolay Sivov : advapi32/registry: Use heap helpers.
by Alexandre Julliard 28 Aug '14

28 Aug '14

Module: wine Branch: master Commit: ad012a8a57015e18aa379752ad8db06bf2ff3fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad012a8a57015e18aa379752a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 28 17:42:22 2014 +0400 advapi32/registry: Use heap helpers. --- dlls/advapi32/registry.c | 83 ++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad012a8a57015e18aa379…

1 0

Shuai Meng : vbscript: Implemented Date.
by Alexandre Julliard 28 Aug '14

28 Aug '14

Module: wine Branch: master Commit: 88d7f611a4b389eec37d6478bfe683d031f0dd48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d7f611a4b389eec37d6478b… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue Aug 26 00:07:51 2014 +0800 vbscript: Implemented Date. --- dlls/vbscript/global.c | 16 ++++++++++++++-- dlls/vbscript/tests/api.vbs | 2 ++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 6663343..c512729 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1400,8 +1400,20 @@ static HRESULT Global_Now(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Date(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME lt; + UDATE ud; + DATE date; + HRESULT hres; + + TRACE("\n"); + + GetLocalTime(&lt); + ud.st = lt; + ud.wDayOfYear = 0; + hres = VarDateFromUdateEx(&ud, 0, VAR_DATEVALUEONLY, &date); + if(FAILED(hres)) + return hres; + return return_date(res, date); } static HRESULT Global_Time(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 44c80de..ab87717 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1237,4 +1237,6 @@ Call ok(getVT(Log("10")) = "VT_R8", "getVT(Log(""10"")) = " & getVT(Log("10"))) Call ok(Approch(Log(CByte(2)), 0.6931), "Log(CByte(2)) = " & Log(CByte(2))) Call ok(getVT(Log(CByte(2))) = "VT_R8", "getVT(Log(CByte(2))) = " & getVT(Log(CByte(2)))) +Call ok(getVT(Date) = "VT_DATE", "getVT(Date) = " & getVT(Date)) + Call reportSuccess()

1 0

Shuai Meng : vbscript: Implemented Time.
by Alexandre Julliard 28 Aug '14

28 Aug '14

Module: wine Branch: master Commit: fdf4b1e7924b807b7a5bd56eaee24f7a62dd24f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf4b1e7924b807b7a5bd56ea… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue Aug 26 00:08:27 2014 +0800 vbscript: Implemented Time. --- dlls/vbscript/global.c | 16 ++++++++++++++-- dlls/vbscript/tests/api.vbs | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index c512729..311c892 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1418,8 +1418,20 @@ static HRESULT Global_Date(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Time(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME lt; + UDATE ud; + DATE time; + HRESULT hres; + + TRACE("\n"); + + GetLocalTime(&lt); + ud.st = lt; + ud.wDayOfYear = 0; + hres = VarDateFromUdateEx(&ud, 0, VAR_TIMEVALUEONLY, &time); + if(FAILED(hres)) + return hres; + return return_date(res, time); } static HRESULT Global_Day(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index ab87717..d688e17 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1238,5 +1238,6 @@ Call ok(Approch(Log(CByte(2)), 0.6931), "Log(CByte(2)) = " & Log(CByte(2))) Call ok(getVT(Log(CByte(2))) = "VT_R8", "getVT(Log(CByte(2))) = " & getVT(Log(CByte(2)))) Call ok(getVT(Date) = "VT_DATE", "getVT(Date) = " & getVT(Date)) +Call ok(getVT(Time) = "VT_DATE", "getVT(Time) = " & getVT(Time)) Call reportSuccess()

1 0

Jeremy Newman : remove goolge cse js, not needed, loaded on search results page
by Jeremy Newman 28 Aug '14

28 Aug '14

Module: appdb Branch: master Commit: 43097e666a1b0eb1d4f76063a167362215ff3701 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=43097e666a1b0eb1d4f76063… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Aug 28 11:27:30 2014 -0500 remove goolge cse js, not needed, loaded on search results page --- include/header.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/header.php b/include/header.php index 73cafda..014a8c4 100644 --- a/include/header.php +++ b/include/header.php @@ -36,12 +36,8 @@ <div id="search_box"> <form action="//www.winehq.org/search" id="cse-search-box" style="margin: 0; padding: 0;"> - <input type="hidden" name="cx" value="partner-pub-0971840239976722:w9sqbcsxtyf"> - <input type="hidden" name="cof" value="FORID:10"> - <input type="hidden" name="ie" value="UTF-8"> <span style="color: #ffffff;">Search:</span> <input type="text" name="q" size="20"> </form> - <script type="text/javascript" src="//www.google.com/coop/cse/brand?form=cse-search-box&lang=en"></script> </div> <div id="tabs">

1 0

Jeremy Newman : remove goolge cse js, not needed, loaded on search results page
by Jeremy Newman 28 Aug '14

28 Aug '14

Module: bugzilla Branch: master Commit: 900ca97d99cfba47af9d6d9cb58e6fe9587a26e8 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=900ca97d99cfba47af9d6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Aug 28 11:26:08 2014 -0500 remove goolge cse js, not needed, loaded on search results page --- template/en/default/global/banner.html.tmpl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/template/en/default/global/banner.html.tmpl b/template/en/default/global/banner.html.tmpl index ec2357e..1b2ba6d 100644 --- a/template/en/default/global/banner.html.tmpl +++ b/template/en/default/global/banner.html.tmpl @@ -20,12 +20,8 @@ <div id="search_box"> <form action="//www.winehq.org/search" id="cse-search-box" style="margin: 0; padding: 0;"> - <input type="hidden" name="cx" value="partner-pub-0971840239976722:w9sqbcsxtyf"> - <input type="hidden" name="cof" value="FORID:10"> - <input type="hidden" name="ie" value="UTF-8"> <span style="color: #ffffff;">Search:</span> <input type="text" name="q" size="20"> </form> - <script type="text/javascript" src="//www.google.com/coop/cse/brand?form=cse-search-box&lang=en"></script> </div> <div id="tabs">

1 0

Jeremy Newman : search API update
by Jeremy Newman 28 Aug '14

28 Aug '14

Module: website Branch: master Commit: bea2f8715116bab84ac1e91ddfc61cce50cd63ee URL: http://source.winehq.org/git/website.git/?a=commit;h=bea2f8715116bab84ac1e9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Aug 28 11:00:35 2014 -0500 search API update Updated the Google CSE to the latest version of the API fixes HTTPS searches, bug 37191 --- templates/de/global/themes/winehq/content.template | 4 --- .../de/global/themes/winehq/content_nobox.template | 4 --- templates/de/search.template | 31 +++++++++------------- templates/en/global/themes/winehq/content.template | 4 --- .../en/global/themes/winehq/content_nobox.template | 4 --- templates/en/search.template | 31 +++++++++------------- templates/fr/global/themes/winehq/content.template | 4 --- .../fr/global/themes/winehq/content_nobox.template | 4 --- templates/fr/search.template | 31 +++++++++------------- templates/he/global/themes/winehq/content.template | 4 --- .../he/global/themes/winehq/content_nobox.template | 4 --- templates/he/search.template | 31 +++++++++------------- templates/pl/search.template | 31 +++++++++------------- templates/tr/global/themes/winehq/content.template | 4 --- .../tr/global/themes/winehq/content_nobox.template | 4 --- templates/tr/search.template | 31 +++++++++------------- templates/uk/global/themes/winehq/content.template | 4 --- .../uk/global/themes/winehq/content_nobox.template | 4 --- templates/uk/search.template | 31 +++++++++------------- 19 files changed, 84 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=bea2f8715116bab84a…

1 0

Jeremy Newman : protocol relative url for search
by Jeremy Newman 28 Aug '14

28 Aug '14

Module: website Branch: master Commit: 7656a56417932984c2eb5b89618f5af0730d4085 URL: http://source.winehq.org/git/website.git/?a=commit;h=7656a56417932984c2eb5b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Aug 28 10:03:25 2014 -0500 protocol relative url for search --- templates/de/search.template | 2 +- templates/en/search.template | 2 +- templates/fr/search.template | 2 +- templates/he/search.template | 2 +- templates/pl/search.template | 2 +- templates/tr/search.template | 2 +- templates/uk/search.template | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/de/search.template b/templates/de/search.template index dbb99a0..1c20fb4 100644 --- a/templates/de/search.template +++ b/templates/de/search.template @@ -22,5 +22,5 @@ var googleSearchDomain = "www.google.com"; var googleSearchPath = "/cse"; </script> -<script type="text/javascript" src="http://www.google.com/afsonline/show_afs_search.js"></script> +<script type="text/javascript" src="//www.google.com/afsonline/show_afs_search.js"></script> diff --git a/templates/en/search.template b/templates/en/search.template index 4c63769..23cb08f 100644 --- a/templates/en/search.template +++ b/templates/en/search.template @@ -22,5 +22,5 @@ var googleSearchDomain = "www.google.com"; var googleSearchPath = "/cse"; </script> -<script type="text/javascript" src="http://www.google.com/afsonline/show_afs_search.js"></script> +<script type="text/javascript" src="//www.google.com/afsonline/show_afs_search.js"></script> diff --git a/templates/fr/search.template b/templates/fr/search.template index a144a70..c540b4d 100644 --- a/templates/fr/search.template +++ b/templates/fr/search.template @@ -22,5 +22,5 @@ var googleSearchDomain = "www.google.fr"; var googleSearchPath = "/cse"; </script> -<script type="text/javascript" src="http://www.google.fr/afsonline/show_afs_search.js"></script> +<script type="text/javascript" src="//www.google.fr/afsonline/show_afs_search.js"></script> diff --git a/templates/he/search.template b/templates/he/search.template index 4c6828b..4ed8d73 100644 --- a/templates/he/search.template +++ b/templates/he/search.template @@ -22,5 +22,5 @@ var googleSearchDomain = "www.google.com"; var googleSearchPath = "/cse"; </script> -<script type="text/javascript" src="http://www.google.com/afsonline/show_afs_search.js"></script> +<script type="text/javascript" src="//www.google.com/afsonline/show_afs_search.js"></script> diff --git a/templates/pl/search.template b/templates/pl/search.template index c44736b..d1693c7 100644 --- a/templates/pl/search.template +++ b/templates/pl/search.template @@ -22,5 +22,5 @@ var googleSearchDomain = "www.google.com"; var googleSearchPath = "/cse"; </script> -<script type="text/javascript" src="http://www.google.com/afsonline/show_afs_search.js"></script> +<script type="text/javascript" src="//www.google.com/afsonline/show_afs_search.js"></script> diff --git a/templates/tr/search.template b/templates/tr/search.template index 8bdf215..10fad9c 100644 --- a/templates/tr/search.template +++ b/templates/tr/search.template @@ -22,5 +22,5 @@ var googleSearchDomain = "www.google.com"; var googleSearchPath = "/cse"; </script> -<script type="text/javascript" src="http://www.google.com/afsonline/show_afs_search.js"></script> +<script type="text/javascript" src="//www.google.com/afsonline/show_afs_search.js"></script> diff --git a/templates/uk/search.template b/templates/uk/search.template index 60c09ed..b8e60cd 100644 --- a/templates/uk/search.template +++ b/templates/uk/search.template @@ -22,5 +22,5 @@ var googleSearchDomain = "www.google.com"; var googleSearchPath = "/cse"; </script> -<script type="text/javascript" src="http://www.google.com/afsonline/show_afs_search.js"></script> +<script type="text/javascript" src="//www.google.com/afsonline/show_afs_search.js"></script>

1 0

Alexandre Julliard : make_makefiles: Check for idl sources in parent directory to set clean flag.
by Alexandre Julliard 27 Aug '14

27 Aug '14

Module: wine Branch: master Commit: a2db8bc137fbfa0bcf8664083e9969bf5a3f6745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2db8bc137fbfa0bcf8664083… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 27 10:53:25 2014 +0200 make_makefiles: Check for idl sources in parent directory to set clean flag. --- configure | 2 +- configure.ac | 2 +- tools/make_makefiles | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 7bc8f1a..a5c5eb4 100755 --- a/configure +++ b/configure @@ -17421,7 +17421,7 @@ wine_fn_config_program cmd enable_cmd install,po wine_fn_config_test programs/cmd/tests cmd.exe_test wine_fn_config_program conhost enable_conhost install wine_fn_config_program control enable_control install -wine_fn_config_program cscript enable_cscript install +wine_fn_config_program cscript enable_cscript clean,install wine_fn_config_program dpnsvr enable_dpnsvr install wine_fn_config_program dxdiag enable_dxdiag install,po wine_fn_config_program eject enable_eject install diff --git a/configure.ac b/configure.ac index 7de7a87..b93cf6a 100644 --- a/configure.ac +++ b/configure.ac @@ -3332,7 +3332,7 @@ WINE_CONFIG_PROGRAM(cmd,,[install,po]) WINE_CONFIG_TEST(programs/cmd/tests) WINE_CONFIG_PROGRAM(conhost,,[install]) WINE_CONFIG_PROGRAM(control,,[install]) -WINE_CONFIG_PROGRAM(cscript,,[install]) +WINE_CONFIG_PROGRAM(cscript,,[clean,install]) WINE_CONFIG_PROGRAM(dpnsvr,,[install]) WINE_CONFIG_PROGRAM(dxdiag,,[install,po]) WINE_CONFIG_PROGRAM(eject,,[install]) diff --git a/tools/make_makefiles b/tools/make_makefiles index 861023a..649b434 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -444,13 +444,14 @@ sub assign_sources_to_makefiles(@) # preserve shared source files from the parent makefile foreach my $file (@makefiles) { - my %make = %{$makefiles{$file}}; + my $make = $makefiles{$file}; my $parent = get_parent_makefile( $file ); next unless $parent; preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "LEX_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); + ${${$make}{"=flags"}}{"clean"} = 1 if defined ${$make}{"=IDL_SRCS"} && @{${$make}{"=IDL_SRCS"}}; } }

1 0