April 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : wine.inf: Rename 'E. Europe Standard Time' to ' Belarus Standard Time'.
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: 163a19dbeb80811341a7b7c558c5000b98253bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=163a19dbeb80811341a7b7c55… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 29 18:48:06 2015 +0200 wine.inf: Rename 'E. Europe Standard Time' to 'Belarus Standard Time'. --- loader/wine.inf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 40bf26d..9381a5d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2636,6 +2636,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Display",,"Atlantic/Azo HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Dlt",,"Azores Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Std",,"Azores Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"TZI",1,3c,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Display",,"Europe/Minsk" +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Dlt",,"Belarus Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Std",,"Belarus Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"Display",,"America/Regina" HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"Dlt",,"Canada Central Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"Std",,"Canada Central Standard Time" @@ -2700,10 +2704,6 @@ HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"Display",,"Austra HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"Dlt",,"E. Australia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"Std",,"E. Australia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"Display",,"Europe/Minsk" -HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"Dlt",,"E. Europe Daylight Time" -HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"Std",,"E. Europe Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Display",,"America/Sao_Paulo" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Dlt",,"E. South America Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Std",,"E. South America Standard Time"

1 0

Sebastian Lackner : wine.inf: 'Central Brazilian Standard Time' should refer to America/Campo_Grande.
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: f651fe48d6b53c2d9e11bbe17490b2be7a34681f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f651fe48d6b53c2d9e11bbe17… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 29 18:54:00 2015 +0200 wine.inf: 'Central Brazilian Standard Time' should refer to America/Campo_Grande. The original timezone America/Manaus is already covered by 'SA Western Standard Time'. --- loader/wine.inf.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9381a5d..a2854e3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2664,10 +2664,15 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Display",,"Asia/D HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Dlt",,"Central Asia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Std",,"Central Asia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Display",,"America/Manaus" +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Display",,"America/Campo_Grande" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Dlt",,"Central Brazilian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Std",,"Central Brazilian Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2015",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,df,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2023",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,e7,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2026",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,ea,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2034",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,f2,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,f2,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2037",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,f5,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,f5,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"Display",,"Europe/Belgrade" HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"Dlt",,"Central Europe Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"Std",,"Central Europe Standard Time"

1 0

Sebastian Lackner : wine.inf: Add timezone information for America/ {Buenos_Aires, Bahia, Asuncion}.
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: 88267268b149716a86554f223a411ae8ebf48125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88267268b149716a86554f223… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 29 19:03:51 2015 +0200 wine.inf: Add timezone information for America/{Buenos_Aires, Bahia, Asuncion}. --- loader/wine.inf.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a2854e3..b1acabe 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2612,6 +2612,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"Display",,"Asia/Baghdad HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"Dlt",,"Arabic Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"Std",,"Arabic Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Display",,"America/Buenos_Aires" +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Dlt",,"Argentina Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Std",,"Argentina Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Armenian Standard Time,"Display",,"Asia/Yerevan" HKLM,%CurrentVersionNT%\Time Zones\Armenian Standard Time,"Dlt",,"Armenian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Armenian Standard Time,"Std",,"Armenian Standard Time" @@ -2636,6 +2640,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Display",,"Atlantic/Azo HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Dlt",,"Azores Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Std",,"Azores Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"TZI",1,3c,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"Display",,"America/Bahia" +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"Dlt",,"Bahia Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"Std",,"Bahia Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Display",,"Europe/Minsk" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Dlt",,"Belarus Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Std",,"Belarus Standard Time" @@ -2939,6 +2947,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Display",,"Am HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Dlt",,"Pacific Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Std",,"Pacific Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Display",,"America/Asuncion" +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Dlt",,"Paraguay Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Std",,"Paraguay Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Display",,"Europe/Paris" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Dlt",,"Romance Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Std",,"Romance Standard Time"

1 0

Alex Henrie : comdlg32: Remove unused string resource "Borders".
by Alexandre Julliard 29 Apr '15

29 Apr '15

1 0

Matteo Bruni : d3d9/tests: Add spotlight and light range tests.
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: 40ce3d16e8e4f9d000811a453cfd321337b1ecf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40ce3d16e8e4f9d000811a453… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 01:38:16 2015 +0200 d3d9/tests: Add spotlight and light range tests. --- dlls/d3d9/tests/visual.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 14b80d5..23050d6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -28,6 +28,8 @@ * causes visible results in games can be tested in a way that does not depend on pixel exactness */ +#include <math.h> + #define COBJMACROS #include <d3d9.h> #include "wine/test.h" @@ -569,6 +571,33 @@ static void test_specular_lighting(void) 100.0f, 0.0f, 0.0f, 0.0f, 1.0f, + }, + spot = + { + D3DLIGHT_SPOT, + {0.0f, 0.0f, 0.0f, 0.0f}, + {1.0f, 1.0f, 1.0f, 0.0f}, + {0.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 1.0f}, + 100.0f, + 1.0f, + 0.0f, 0.0f, 1.0f, + M_PI / 12.0f, M_PI / 3.0f + }, + /* The chosen range value makes the test fail when using a manhattan + * distance metric vs the correct euclidean distance. */ + point_range = + { + D3DLIGHT_POINT, + {0.0f, 0.0f, 0.0f, 0.0f}, + {1.0f, 1.0f, 1.0f, 0.0f}, + {0.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + 1.2f, + 0.0f, + 0.0f, 0.0f, 1.0f, }; static const struct expected_color { @@ -622,6 +651,42 @@ static void test_specular_lighting(void) {160, 360, 0x00000000}, {320, 360, 0x00070707}, {480, 360, 0x00000000}, + }, + expected_spot[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00141414}, + {480, 120, 0x00000000}, + {160, 240, 0x00141414}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00141414}, + {160, 360, 0x00000000}, + {320, 360, 0x00141414}, + {480, 360, 0x00000000}, + }, + expected_spot_local[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00020202}, + {480, 120, 0x00000000}, + {160, 240, 0x00020202}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00020202}, + {160, 360, 0x00000000}, + {320, 360, 0x00020202}, + {480, 360, 0x00000000}, + }, + expected_point_range[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x005a5a5a}, + {480, 120, 0x00000000}, + {160, 240, 0x005a5a5a}, + {320, 240, 0x00ffffff}, + {480, 240, 0x005a5a5a}, + {160, 360, 0x00000000}, + {320, 360, 0x005a5a5a}, + {480, 360, 0x00000000}, }; static const struct { @@ -640,6 +705,12 @@ static void test_specular_lighting(void) sizeof(expected_point) / sizeof(expected_point[0])}, {&point, TRUE, expected_point_local, sizeof(expected_point_local) / sizeof(expected_point_local[0])}, + {&spot, FALSE, expected_spot, + sizeof(expected_spot) / sizeof(expected_spot[0])}, + {&spot, TRUE, expected_spot_local, + sizeof(expected_spot_local) / sizeof(expected_spot_local[0])}, + {&point_range, FALSE, expected_point_range, + sizeof(expected_point_range) / sizeof(expected_point_range[0])}, }; IDirect3DDevice9 *device; D3DMATERIAL9 material;

1 0

Matteo Bruni : d3d8/tests: Add a specular lighting test.
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: 67bdfd3d8e94e3f26cdad5110c0a250f8665ac41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67bdfd3d8e94e3f26cdad5110… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 01:38:17 2015 +0200 d3d8/tests: Add a specular lighting test. --- dlls/d3d8/tests/visual.c | 299 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 299 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67bdfd3d8e94e3f26cdad…

1 0

Matteo Bruni : ddraw/tests: Add a ddraw7 specular lighting test.
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: 287093e26ee5905ed14bfdc305c37704bb821024 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287093e26ee5905ed14bfdc30… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 01:38:18 2015 +0200 ddraw/tests: Add a ddraw7 specular lighting test. --- dlls/ddraw/tests/ddraw7.c | 296 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 296 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=287093e26ee5905ed14bf…

1 0

Matteo Bruni : wined3d: Use string_buffer_sprintf() in handle_ps3_input().
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: 12e59c5278afcae17d540ecc4fe4be07c7be66af URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e59c5278afcae17d540ecc4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 01:38:19 2015 +0200 wined3d: Use string_buffer_sprintf() in handle_ps3_input(). --- dlls/wined3d/glsl_shader.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 132ecdf..1851714 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4766,19 +4766,20 @@ static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const struc HeapFree(GetProcessHeap(), 0, entry); } -static void handle_ps3_input(struct wined3d_string_buffer *buffer, +static void handle_ps3_input(struct shader_glsl_priv *priv, const struct wined3d_gl_info *gl_info, const DWORD *map, const struct wined3d_shader_signature *input_signature, const struct wined3d_shader_reg_maps *reg_maps_in, const struct wined3d_shader_signature *output_signature, const struct wined3d_shader_reg_maps *reg_maps_out) { + struct wined3d_string_buffer *buffer = &priv->shader_buffer; unsigned int i, j; DWORD *set; DWORD in_idx; unsigned int in_count = vec4_varyings(3, gl_info); char reg_mask[6]; - char destination[50]; + struct wined3d_string_buffer *destination = string_buffer_get(&priv->string_buffers); set = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*set) * (in_count + 2)); @@ -4800,11 +4801,11 @@ static void handle_ps3_input(struct wined3d_string_buffer *buffer, } if (in_idx == in_count) - sprintf(destination, "gl_FrontColor"); + string_buffer_sprintf(destination, "gl_FrontColor"); else if (in_idx == in_count + 1) - sprintf(destination, "gl_FrontSecondaryColor"); + string_buffer_sprintf(destination, "gl_FrontSecondaryColor"); else - sprintf(destination, "ps_link[%u]", in_idx); + string_buffer_sprintf(destination, "ps_link[%u]", in_idx); if (!set[in_idx]) set[in_idx] = ~0u; @@ -4827,7 +4828,7 @@ static void handle_ps3_input(struct wined3d_string_buffer *buffer, shader_glsl_write_mask_to_str(mask, reg_mask); shader_addline(buffer, "%s%s = vs_out[%u]%s;\n", - destination, reg_mask, output->register_idx, reg_mask); + destination->buffer, reg_mask, output->register_idx, reg_mask); } } @@ -4848,24 +4849,26 @@ static void handle_ps3_input(struct wined3d_string_buffer *buffer, reg_mask[size] = '\0'; if (i == in_count) - sprintf(destination, "gl_FrontColor"); + string_buffer_sprintf(destination, "gl_FrontColor"); else if (i == in_count + 1) - sprintf(destination, "gl_FrontSecondaryColor"); + string_buffer_sprintf(destination, "gl_FrontSecondaryColor"); else - sprintf(destination, "ps_link[%u]", i); + string_buffer_sprintf(destination, "ps_link[%u]", i); - if (size == 1) shader_addline(buffer, "%s.%s = 0.0;\n", destination, reg_mask); - else shader_addline(buffer, "%s.%s = vec%u(0.0);\n", destination, reg_mask, size); + if (size == 1) shader_addline(buffer, "%s.%s = 0.0;\n", destination->buffer, reg_mask); + else shader_addline(buffer, "%s.%s = vec%u(0.0);\n", destination->buffer, reg_mask, size); } HeapFree(GetProcessHeap(), 0, set); + string_buffer_release(&priv->string_buffers, destination); } /* Context activation is done by the caller. */ -static GLuint generate_param_reorder_function(struct wined3d_string_buffer *buffer, +static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, const struct wined3d_shader *vs, const struct wined3d_shader *ps, const struct wined3d_gl_info *gl_info) { + struct wined3d_string_buffer *buffer = &priv->shader_buffer; GLuint ret = 0; DWORD ps_major = ps ? ps->reg_maps.shader_version.major : 0; unsigned int i; @@ -4964,7 +4967,7 @@ static GLuint generate_param_reorder_function(struct wined3d_string_buffer *buff } /* Then, fix the pixel shader input */ - handle_ps3_input(buffer, gl_info, ps->u.ps.input_reg_map, &ps->input_signature, + handle_ps3_input(priv, gl_info, ps->u.ps.input_reg_map, &ps->input_signature, &ps->reg_maps, &vs->output_signature, &vs->reg_maps); shader_addline(buffer, "}\n"); @@ -6578,7 +6581,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const WORD map = vshader->reg_maps.input_registers; struct wined3d_string_buffer *tmp_name = string_buffer_get(&priv->string_buffers); - reorder_shader_id = generate_param_reorder_function(&priv->shader_buffer, vshader, pshader, gl_info); + reorder_shader_id = generate_param_reorder_function(priv, vshader, pshader, gl_info); TRACE("Attaching GLSL shader object %u to program %u.\n", reorder_shader_id, program_id); GL_EXTCALL(glAttachShader(program_id, reorder_shader_id)); checkGLcall("glAttachShader");

1 0

Matteo Bruni : wined3d: Use string_buffer_sprintf() in shader_glsl_generate_ffp_fragment_shader().
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: ca46914d07da4ffd42b2b718f88c51c3fd1902ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca46914d07da4ffd42b2b718f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 01:38:20 2015 +0200 wined3d: Use string_buffer_sprintf() in shader_glsl_generate_ffp_fragment_shader(). --- dlls/wined3d/glsl_shader.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1851714..e814c66 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5910,9 +5910,10 @@ static void shader_glsl_ffp_fragment_op(struct wined3d_string_buffer *buffer, un } /* Context activation is done by the caller. */ -static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_string_buffer *buffer, +static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv *priv, const struct ffp_frag_settings *settings, const struct wined3d_gl_info *gl_info) { + struct wined3d_string_buffer *buffer = &priv->shader_buffer; BYTE lum_map = 0, bump_map = 0, tex_map = 0, tss_const_map = 0; BOOL tempreg_used = FALSE, tfactor_used = FALSE; const char *final_combiner_src = "ret"; @@ -5920,6 +5921,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_string_buf GLuint shader_id; DWORD arg0, arg1, arg2; unsigned int stage; + struct wined3d_string_buffer *tex_reg_name = string_buffer_get(&priv->string_buffers); string_buffer_clear(buffer); @@ -6061,7 +6063,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_string_buf for (stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage) { const char *texture_function, *coord_mask; - char tex_reg_name[8]; BOOL proj; if (!(tex_map & (1 << stage))) @@ -6191,8 +6192,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_string_buf stage, texture_function, stage, stage, coord_mask); } - sprintf(tex_reg_name, "tex%u", stage); - shader_glsl_color_correction_ext(buffer, tex_reg_name, WINED3DSP_WRITEMASK_ALL, + string_buffer_sprintf(tex_reg_name, "tex%u", stage); + shader_glsl_color_correction_ext(buffer, tex_reg_name->buffer, WINED3DSP_WRITEMASK_ALL, settings->op[stage].color_fixup); } @@ -6265,6 +6266,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_string_buf shader_id = GL_EXTCALL(glCreateShader(GL_FRAGMENT_SHADER)); shader_glsl_compile(gl_info, shader_id, buffer->buffer); + + string_buffer_release(&priv->string_buffers, tex_reg_name); return shader_id; } @@ -6302,7 +6305,7 @@ static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(str return NULL; glsl_desc->entry.settings = *args; - glsl_desc->id = shader_glsl_generate_ffp_fragment_shader(&priv->shader_buffer, args, gl_info); + glsl_desc->id = shader_glsl_generate_ffp_fragment_shader(priv, args, gl_info); list_init(&glsl_desc->linked_programs); add_ffp_frag_shader(&priv->ffp_fragment_shaders, &glsl_desc->entry);

1 0

Sebastian Lackner : wine.inf: Add dynamic DST information for America/ Godthab.
by Alexandre Julliard 29 Apr '15

29 Apr '15

Module: wine Branch: master Commit: 14be416dc2f69c4c15edbe955c6a331507248723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14be416dc2f69c4c15edbe955… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 17:39:20 2015 +0200 wine.inf: Add dynamic DST information for America/Godthab. --- loader/wine.inf.in | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b130ee8..e15ced7 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2780,7 +2780,32 @@ HKLM,%CurrentVersionNT%\Time Zones\GMT Standard Time,"TZI",1,00,00,00,00,00,00,0 HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"Display",,"America/Godthab" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"Dlt",,"Greenland Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"Std",,"Greenland Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,df,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2018",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,e2,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,e2,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2020",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,e4,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,e4,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2026",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,ea,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2029",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ed,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,ed,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2035",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f3,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,f3,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2037",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f5,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,f5,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2040",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f8,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,f8,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2043",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,fb,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,fb,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2046",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,fe,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,fe,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2048",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,00,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2054",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,06,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,06,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2057",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,09,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,09,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2063",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,0f,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,0f,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2065",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,11,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,11,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2068",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,14,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,14,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2071",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,17,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,17,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2074",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,1a,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,1a,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2076",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,1c,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,1c,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2082",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,22,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,22,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2085",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,25,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,25,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2091",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,2b,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,2b,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2093",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,2d,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,2d,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2096",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,30,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,30,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2099",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,33,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,33,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"Display",,"Greenwich" HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"Dlt",,"Greenwich Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"Std",,"Greenwich Standard Time"

1 0