October 2010 - Wine-commits

Jeremy Newman : adding he
by Jeremy Newman 15 Oct '10

15 Oct '10

Module: website Branch: master Commit: 7dcdc3fe5e4a28291414b9942b24da4f9415e090 URL: http://source.winehq.org/git/website.git/?a=commit;h=7dcdc3fe5e4a28291414b9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 15 09:33:35 2010 -0500 adding he --- include/winehq.conf.sample | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index e46fc4d..1e1d6af 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -22,7 +22,7 @@ theme: winehq lang: en # available languages -(a)languages: en, de, es, fr, pl, pt +(a)languages: en, de, es, fr, he, pl, pt # default base URLS (if you run the site, in a subdir, set base_root) base_root:

1 0

Jeremy Newman : language plugin now has a list command
by Jeremy Newman 15 Oct '10

15 Oct '10

Module: website Branch: master Commit: 35b9f6c2b556df42cb935f0d63a6126dbe87bcaa URL: http://source.winehq.org/git/website.git/?a=commit;h=35b9f6c2b556df42cb935f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 15 09:35:12 2010 -0500 language plugin now has a list command --- include/plugins/language.php | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/include/plugins/language.php b/include/plugins/language.php index a785430..c4e19bd 100644 --- a/include/plugins/language.php +++ b/include/plugins/language.php @@ -6,14 +6,32 @@ by Jeremy Newman <jnewman(a)codeweavers.com> */ -global $html, $config; +global $html, $config, $data; -// if specified, switch to lang -if (defined('PAGE_PARAMS') and in_array(PAGE_PARAMS, $config->languages)) +switch ($this->params['cmd']) { - setcookie("lang", PAGE_PARAMS, time()+60*60*24*365, "{$config->base_root}/"); - $html->redirect($config->base_url); - exit(); + // list languages + case "list": + foreach ($config->languages as $lang) + { + $row = array( + 'lang' => $lang, + 'langFull' => $data->languages[$lang]['name'], + 'langHelp' => $data->languages[$lang]['change'] + ); + echo $html->template('local', 'global/lang_row', $row, 1); + } + break; + + // set the language based on the URL + default: + // if specified, switch to lang + if (defined('PAGE_PARAMS') and in_array(PAGE_PARAMS, $config->languages)) + { + setcookie("lang", PAGE_PARAMS, time()+60*60*24*365, "{$config->base_root}/"); + $html->redirect($config->base_url); + exit(); + } } ?>

1 0

Jeremy Newman : adding template for rows in language plugin
by Jeremy Newman 15 Oct '10

15 Oct '10

Module: website Branch: master Commit: 6dc90b6412e3f02eb8b2ab0ebb0f682c3524296f URL: http://source.winehq.org/git/website.git/?a=commit;h=6dc90b6412e3f02eb8b2ab… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 15 09:35:40 2010 -0500 adding template for rows in language plugin --- templates/en/global/lang_row.template | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/templates/en/global/lang_row.template b/templates/en/global/lang_row.template new file mode 100644 index 0000000..cb6c776 --- /dev/null +++ b/templates/en/global/lang_row.template @@ -0,0 +1,3 @@ + <li style="background-image: url('{$root}/images/lang/{$lang}.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/{$lang}">{$langFull}</a> · {$langHelp} + </li>

1 0

Matteo Bruni : d3dcompiler: Don' t store instruction length in DEF opcode in PS 1.x.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 422d57e2fc458e9ed5eb7e978459f52a37f53569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=422d57e2fc458e9ed5eb7e978… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 13 22:19:03 2010 +0200 d3dcompiler: Don't store instruction length in DEF opcode in PS 1.x. --- dlls/d3dcompiler_43/bytecodewriter.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 5b22580..5ff1e2f 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -598,7 +598,7 @@ static void ps_1_x_header(struct bc_writer *This, const struct bwriter_shader *s /* Declare the shader type and version */ put_dword(buffer, This->version); - write_constF(shader, buffer, TRUE); + write_constF(shader, buffer, FALSE); } static void ps_1_4_header(struct bc_writer *This, const struct bwriter_shader *shader, struct bytecode_buffer *buffer) { @@ -619,7 +619,7 @@ static void ps_1_4_header(struct bc_writer *This, const struct bwriter_shader *s /* Declare the shader type and version */ put_dword(buffer, This->version); - write_constF(shader, buffer, TRUE); + write_constF(shader, buffer, FALSE); } static void end(struct bc_writer *This, const struct bwriter_shader *shader, struct bytecode_buffer *buffer) {

1 0

Matteo Bruni : d3dcompiler: Accept dot terminated float immediate values.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 7c47a9d1927b40978d753f598f931b9455d1e9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c47a9d1927b40978d753f598… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 13 22:27:14 2010 +0200 d3dcompiler: Accept dot terminated float immediate values. --- dlls/d3dcompiler_43/asmshader.l | 2 +- dlls/d3dcompiler_43/tests/asm.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.l b/dlls/d3dcompiler_43/asmshader.l index 0ba7e7a..5817344 100644 --- a/dlls/d3dcompiler_43/asmshader.l +++ b/dlls/d3dcompiler_43/asmshader.l @@ -98,7 +98,7 @@ NEWLINE (\n)|(\r\n) COMMA "," -IMMVAL \-?(([0-9]+)|([0-9]*\.[0-9]+))(f)? +IMMVAL \-?(([0-9]+\.?)|([0-9]*\.[0-9]+))(f)? ANY (.) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 08fff44..af5ad62 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -127,6 +127,12 @@ static void ps_1_1_test(void) { "mov_d4 r0, r1\n", {0xffff0101, 0x00000001, 0x8e0f0000, 0x80e40001, 0x0000ffff} }, + { /* shader 2 */ + "ps.1.1\n" + "def c2, 0, 0., 0, 0.\n", + {0xffff0101, 0x00000051, 0xa00f0002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0000ffff} + }, }; exec_tests("ps_1_1", tests, sizeof(tests) / sizeof(tests[0]));

1 0

Aric Stewart : strmbase: Remove non-standard custom allocator logic from strmbase.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 60bf76db9aab827a17ec3692aacf58434f19b454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60bf76db9aab827a17ec3692a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 13 11:02:14 2010 -0500 strmbase: Remove non-standard custom allocator logic from strmbase. Implement function overrides for parser.c where a custom allocator was needed. --- dlls/qcap/vfwcapture.c | 4 ++- dlls/quartz/filesource.c | 4 ++- dlls/quartz/parser.c | 46 +++++++++++++++++++++++++++++++++++++--- dlls/quartz/parser.h | 3 ++ dlls/strmbase/pin.c | 51 ++++++++++++-------------------------------- dlls/strmbase/transform.c | 4 ++- include/wine/strmbase.h | 11 +++++---- 7 files changed, 74 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60bf76db9aab827a17ec3…

1 0

Alexandre Julliard : uninstaller: Remove unneeded carriage return in resource string.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: d80db876113217ea9ce7201688b02f58fdcedd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d80db876113217ea9ce720168… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 14 12:39:09 2010 +0200 uninstaller: Remove unneeded carriage return in resource string. --- programs/uninstaller/Bg.rc | 2 +- programs/uninstaller/Cy.rc | 2 +- programs/uninstaller/Da.rc | 2 +- programs/uninstaller/De.rc | 2 +- programs/uninstaller/En.rc | 2 +- programs/uninstaller/Eo.rc | 2 +- programs/uninstaller/Es.rc | 2 +- programs/uninstaller/Fi.rc | 2 +- programs/uninstaller/He.rc | 2 +- programs/uninstaller/Hu.rc | 2 +- programs/uninstaller/It.rc | 2 +- programs/uninstaller/Ja.rc | 2 +- programs/uninstaller/Ko.rc | 2 +- programs/uninstaller/Lt.rc | 2 +- programs/uninstaller/Nl.rc | 2 +- programs/uninstaller/No.rc | 2 +- programs/uninstaller/Pl.rc | 2 +- programs/uninstaller/Pt.rc | 4 ++-- programs/uninstaller/Ro.rc | 2 +- programs/uninstaller/Ru.rc | 2 +- programs/uninstaller/Si.rc | 2 +- programs/uninstaller/Sv.rc | 2 +- programs/uninstaller/Tr.rc | 2 +- programs/uninstaller/Uk.rc | 2 +- programs/uninstaller/Zh.rc | 4 ++-- 25 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d80db876113217ea9ce72…

1 0

Hans Leidekker : msi/tests: Move test coverage for standard actions to a separate module.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 8db3c0e358c54e0ebc3f7b4b7461296d046029e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db3c0e358c54e0ebc3f7b4b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 14 11:06:13 2010 +0200 msi/tests: Move test coverage for standard actions to a separate module. --- dlls/msi/tests/Makefile.in | 1 + dlls/msi/tests/action.c | 5846 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/install.c | 4810 ------------------------------------ 3 files changed, 5847 insertions(+), 4810 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8db3c0e358c54e0ebc3f7…

1 0

Henri Verbeet : wined3d: Recognize the SM4 sample_d opcode.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 4eb8fd79602039c2c2d7eed05dbbf734ea1f5239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb8fd79602039c2c2d7eed05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 14 13:03:58 2010 +0200 wined3d: Recognize the SM4 sample_d opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a34b506..2f70a57 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5000,6 +5000,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_RSQ */ shader_hw_scalar_op, /* WINED3DSIH_SAMPLE */ NULL, + /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_hw_map2gl, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index facb686..fb7d02e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5058,6 +5058,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_RSQ */ shader_glsl_rsq, /* WINED3DSIH_SAMPLE */ NULL, + /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_glsl_compare, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2e57e9f..e3451a5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -104,6 +104,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_RET */ "ret", /* WINED3DSIH_RSQ */ "rsq", /* WINED3DSIH_SAMPLE */ "sample", + /* WINED3DSIH_SAMPLE_GRAD */ "sample_d", /* WINED3DSIH_SAMPLE_LOD */ "sample_l", /* WINED3DSIH_SETP */ "setp", /* WINED3DSIH_SGE */ "sge", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 47cece3..ef7af43 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -86,6 +86,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_RSQ = 0x44, WINED3D_SM4_OP_SAMPLE = 0x45, WINED3D_SM4_OP_SAMPLE_LOD = 0x48, + WINED3D_SM4_OP_SAMPLE_GRAD = 0x49, WINED3D_SM4_OP_SINCOS = 0x4d, WINED3D_SM4_OP_UTOF = 0x56, }; @@ -165,6 +166,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, 1, 1}, {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, 1, 3}, {WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD, 1, 4}, + {WINED3D_SM4_OP_SAMPLE_GRAD,WINED3DSIH_SAMPLE_GRAD, 1, 5}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c648bd9..fc1fd08 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -473,6 +473,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_RET, WINED3DSIH_RSQ, WINED3DSIH_SAMPLE, + WINED3DSIH_SAMPLE_GRAD, WINED3DSIH_SAMPLE_LOD, WINED3DSIH_SETP, WINED3DSIH_SGE,

1 0

Henri Verbeet : d3d10core: Implement device_parent_CreateVolume().
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 07ace95fcdc6dfb7cf79c7659d18af6287169443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ace95fcdc6dfb7cf79c7659… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 14 13:03:59 2010 +0200 d3d10core: Implement device_parent_CreateVolume(). --- dlls/d3d10core/device.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index f5c4e82..fd72ac7 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1253,6 +1253,13 @@ static const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl = d3d10_device_inner_Release, }; +static void STDMETHODCALLTYPE d3d10_subresource_destroyed(void *parent) {} + +const struct wined3d_parent_ops d3d10_subresource_parent_ops = +{ + d3d10_subresource_destroyed, +}; + /* IWineD3DDeviceParent IUnknown methods */ static inline struct d3d10_device *device_from_device_parent(IWineD3DDeviceParent *iface) @@ -1418,10 +1425,20 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent IUnknown *superior, UINT width, UINT height, UINT depth, enum wined3d_format_id format, WINED3DPOOL pool, DWORD usage, IWineD3DVolume **volume) { - FIXME("iface %p, superior %p, width %u, height %u, depth %u, format %#x, pool %#x, usage %#x, volume %p stub!\n", + HRESULT hr; + + TRACE("iface %p, superior %p, width %u, height %u, depth %u, format %#x, pool %#x, usage %#x, volume %p.\n", iface, superior, width, height, depth, format, pool, usage, volume); - return E_NOTIMPL; + hr = IWineD3DDevice_CreateVolume(device_from_device_parent(iface)->wined3d_device, + width, height, depth, usage, format, pool, NULL, &d3d10_subresource_parent_ops, volume); + if (FAILED(hr)) + { + WARN("Failed to create wined3d volume, hr %#x.\n", hr); + return hr; + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDeviceParent *iface,

1 0