October 2012 - Wine-Commits

Henri Verbeet : wined3d: Implement SM4 loops in the GLSL shader backend.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: e34acc225122072acb2238bc0a8e0d2a46f59b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e34acc225122072acb2238bc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:50 2012 +0200 wined3d: Implement SM4 loops in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 106 +++++++++++++++++++++++++------------------- 1 files changed, 60 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ed5db06..4196fa5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1181,9 +1181,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } /* Declare loop registers aLx */ - for (i = 0; i < reg_maps->loop_depth; i++) { - shader_addline(buffer, "int aL%u;\n", i); - shader_addline(buffer, "int tmpInt%u;\n", i); + if (reg_maps->shader_version.major < 4) + { + for (i = 0; i < reg_maps->loop_depth; ++i) + { + shader_addline(buffer, "int aL%u;\n", i); + shader_addline(buffer, "int tmpInt%u;\n", i); + } } /* Temporary variables for matrix operations */ @@ -2954,68 +2958,78 @@ static void shader_glsl_sgn(const struct wined3d_shader_instruction *ins) static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; struct glsl_src_param src1_param; const DWORD *control_values = NULL; - shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &src1_param); - - /* Try to hardcode the loop control parameters if possible. Direct3D 9 class hardware doesn't support real - * varying indexing, but Microsoft designed this feature for Shader model 2.x+. If the loop control is - * known at compile time, the GLSL compiler can unroll the loop, and replace indirect addressing with direct - * addressing. - */ - if (ins->src[1].reg.type == WINED3DSPR_CONSTINT) + if (ins->ctx->reg_maps->shader_version.major < 4) { - LIST_FOR_EACH_ENTRY(constant, &shader->constantsI, struct wined3d_shader_lconst, entry) + shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &src1_param); + + /* Try to hardcode the loop control parameters if possible. Direct3D 9 + * class hardware doesn't support real varying indexing, but Microsoft + * designed this feature for Shader model 2.x+. If the loop control is + * known at compile time, the GLSL compiler can unroll the loop, and + * replace indirect addressing with direct addressing. */ + if (ins->src[1].reg.type == WINED3DSPR_CONSTINT) { - if (constant->idx == ins->src[1].reg.idx) + LIST_FOR_EACH_ENTRY(constant, &shader->constantsI, struct wined3d_shader_lconst, entry) { - control_values = constant->value; - break; + if (constant->idx == ins->src[1].reg.idx) + { + control_values = constant->value; + break; + } } } - } - - if (control_values) - { - struct wined3d_shader_loop_control loop_control; - loop_control.count = control_values[0]; - loop_control.start = control_values[1]; - loop_control.step = (int)control_values[2]; - if (loop_control.step > 0) - { - shader_addline(ins->ctx->buffer, "for (aL%u = %u; aL%u < (%u * %d + %u); aL%u += %d) {\n", - loop_state->current_depth, loop_control.start, - loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, - loop_state->current_depth, loop_control.step); - } - else if (loop_control.step < 0) + if (control_values) { - shader_addline(ins->ctx->buffer, "for (aL%u = %u; aL%u > (%u * %d + %u); aL%u += %d) {\n", - loop_state->current_depth, loop_control.start, - loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, - loop_state->current_depth, loop_control.step); + struct wined3d_shader_loop_control loop_control; + loop_control.count = control_values[0]; + loop_control.start = control_values[1]; + loop_control.step = (int)control_values[2]; + + if (loop_control.step > 0) + { + shader_addline(buffer, "for (aL%u = %u; aL%u < (%u * %d + %u); aL%u += %d)\n{\n", + loop_state->current_depth, loop_control.start, + loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, + loop_state->current_depth, loop_control.step); + } + else if (loop_control.step < 0) + { + shader_addline(buffer, "for (aL%u = %u; aL%u > (%u * %d + %u); aL%u += %d)\n{\n", + loop_state->current_depth, loop_control.start, + loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, + loop_state->current_depth, loop_control.step); + } + else + { + shader_addline(buffer, "for (aL%u = %u, tmpInt%u = 0; tmpInt%u < %u; tmpInt%u++)\n{\n", + loop_state->current_depth, loop_control.start, loop_state->current_depth, + loop_state->current_depth, loop_control.count, + loop_state->current_depth); + } } else { - shader_addline(ins->ctx->buffer, "for (aL%u = %u, tmpInt%u = 0; tmpInt%u < %u; tmpInt%u++) {\n", - loop_state->current_depth, loop_control.start, loop_state->current_depth, - loop_state->current_depth, loop_control.count, - loop_state->current_depth); + shader_addline(buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z)\n{\n", + loop_state->current_depth, loop_state->current_reg, + src1_param.reg_name, loop_state->current_depth, src1_param.reg_name, + loop_state->current_depth, loop_state->current_reg, src1_param.reg_name); } - } else { - shader_addline(ins->ctx->buffer, - "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z) {\n", - loop_state->current_depth, loop_state->current_reg, - src1_param.reg_name, loop_state->current_depth, src1_param.reg_name, - loop_state->current_depth, loop_state->current_reg, src1_param.reg_name); + + ++loop_state->current_reg; + } + else + { + shader_addline(buffer, "for (;;)\n{\n"); } ++loop_state->current_depth; - ++loop_state->current_reg; } static void shader_glsl_end(const struct wined3d_shader_instruction *ins)

1 0

Henri Verbeet : wined3d: Implement SM4 WINED3DSIH_SINCOS in the GLSL shader backend.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 8f915156b96ec3e9d2607c76c2cf0984f357fbd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f915156b96ec3e9d2607c76c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:51 2012 +0200 wined3d: Implement SM4 WINED3DSIH_SINCOS in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 70 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4196fa5..0c5ceb6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2909,28 +2909,68 @@ static void shader_glsl_dst(const struct wined3d_shader_instruction *ins) */ static void shader_glsl_sincos(const struct wined3d_shader_instruction *ins) { + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct glsl_src_param src0_param; DWORD write_mask; - write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); + if (ins->ctx->reg_maps->shader_version.major < 4) + { + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - switch (write_mask) { - case WINED3DSP_WRITEMASK_0: - shader_addline(ins->ctx->buffer, "cos(%s));\n", src0_param.param_str); - break; + write_mask = shader_glsl_append_dst(buffer, ins); + switch (write_mask) + { + case WINED3DSP_WRITEMASK_0: + shader_addline(buffer, "cos(%s));\n", src0_param.param_str); + break; - case WINED3DSP_WRITEMASK_1: - shader_addline(ins->ctx->buffer, "sin(%s));\n", src0_param.param_str); - break; + case WINED3DSP_WRITEMASK_1: + shader_addline(buffer, "sin(%s));\n", src0_param.param_str); + break; - case (WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1): - shader_addline(ins->ctx->buffer, "vec2(cos(%s), sin(%s)));\n", src0_param.param_str, src0_param.param_str); - break; + case (WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1): + shader_addline(buffer, "vec2(cos(%s), sin(%s)));\n", + src0_param.param_str, src0_param.param_str); + break; - default: - ERR("Write mask should be .x, .y or .xy\n"); - break; + default: + ERR("Write mask should be .x, .y or .xy\n"); + break; + } + + return; + } + + if (ins->dst[0].reg.type != WINED3DSPR_NULL) + { + + if (ins->dst[1].reg.type != WINED3DSPR_NULL) + { + char dst_mask[6]; + + write_mask = shader_glsl_get_write_mask(&ins->dst[0], dst_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_addline(buffer, "tmp0%s = sin(%s);\n", dst_mask, src0_param.param_str); + + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_addline(buffer, "cos(%s));\n", src0_param.param_str); + + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_addline(buffer, "tmp0%s);\n", dst_mask); + } + else + { + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_addline(buffer, "sin(%s));\n", src0_param.param_str); + } + } + else if (ins->dst[1].reg.type != WINED3DSPR_NULL) + { + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_addline(buffer, "cos(%s));\n", src0_param.param_str); } }

1 0

Marcus Meissner : server: Removed duplicate close of acceptfd (Coverity).
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 3199fe147de2bf48aca48eba3a75be1b500b2030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3199fe147de2bf48aca48eba3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 10 10:06:55 2012 +0200 server: Removed duplicate close of acceptfd (Coverity). --- server/sock.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 7e4acd8..7dcc101 100644 --- a/server/sock.c +++ b/server/sock.c @@ -760,10 +760,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) if (!(newfd = create_anonymous_fd( &sock_fd_ops, acceptfd, &acceptsock->obj, get_fd_options( acceptsock->fd ) ))) - { - close( acceptfd ); return FALSE; - } } acceptsock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE;

1 0

Francois Gouget : shell32/tests: Simplify shlexec's test_directory() and add some more tests.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: eee9b8ee124dafda078dc2412658e6403c1c402e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee9b8ee124dafda078dc2412… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 00:53:52 2012 +0200 shell32/tests: Simplify shlexec's test_directory() and add some more tests. --- dlls/shell32/tests/shlexec.c | 68 +++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 69b466e..8d164a6 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -818,26 +818,6 @@ static DWORD get_long_path_name(const char* shortpath, char* longpath, DWORD lon /*** * - * PathFindFileNameA equivalent that supports WinNT - * - ***/ - -static LPSTR path_find_file_name(LPCSTR lpszPath) -{ - LPCSTR lastSlash = lpszPath; - - while (lpszPath && *lpszPath) - { - if ((*lpszPath == '\\' || *lpszPath == '/' || *lpszPath == ':') && - lpszPath[1] && lpszPath[1] != '\\' && lpszPath[1] != '/') - lastSlash = lpszPath + 1; - lpszPath = CharNext(lpszPath); - } - return (LPSTR)lastSlash; -} - -/*** - * * Tests * ***/ @@ -2592,33 +2572,55 @@ static void cleanup_test(void) static void test_directory(void) { - char path[MAX_PATH], newdir[MAX_PATH]; - char params[1024]; + char path[MAX_PATH], curdir[MAX_PATH]; + char params[1024], dirpath[1024]; INT_PTR rc; - /* copy this executable to a new folder and cd to it */ - sprintf(newdir, "%s\\newfolder", tmpdir); - rc = CreateDirectoryA( newdir, NULL ); - ok( rc, "failed to create %s err %u\n", newdir, GetLastError() ); - sprintf(path, "%s\\%s", newdir, path_find_file_name(argv0)); + sprintf(path, "%s\\test2.exe", tmpdir); CopyFileA(argv0, path, FALSE); - SetCurrentDirectory(tmpdir); sprintf(params, "shlexec \"%s\" Exec", child_file); + /* Test with the current directory */ + GetCurrentDirectoryA(sizeof(curdir), curdir); + SetCurrentDirectoryA(tmpdir); rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, - NULL, path_find_file_name(argv0), params, NULL, NULL); - todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); + NULL, "test2.exe", params, NULL, NULL); + ok(rc > 32, "%s returned %lu\n", shell_call, rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + todo_wine okChildPath("longPath", path); + SetCurrentDirectoryA(curdir); + + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, "test2.exe", params, NULL, NULL); + ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); + + /* Explicitly specify the directory to use */ + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, "test2.exe", params, tmpdir, NULL); + ok(rc > 32, "%s returned %lu\n", shell_call, rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + todo_wine okChildPath("longPath", path); + /* Specify it through an environment variable */ rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, - NULL, path_find_file_name(argv0), params, newdir, NULL); + NULL, "test2.exe", params, "%TMPDIR%", NULL); + todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); + + rc=shell_execute_ex(SEE_MASK_DOENVSUBST|SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, "test2.exe", params, "%TMPDIR%", NULL); ok(rc > 32, "%s returned %lu\n", shell_call, rc); okChildInt("argcA", 4); okChildString("argvA3", "Exec"); todo_wine okChildPath("longPath", path); - DeleteFile(path); - RemoveDirectoryA(newdir); + /* Not a colon-separated directory list */ + sprintf(dirpath, "%s:%s", curdir, tmpdir); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, "test2.exe", params, dirpath, NULL); + ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); } START_TEST(shlexec)

1 0

Francois Gouget : shell32: Fix ShellExecute()'s handling of file URLs.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 53e4ddc399cef1f044fb25bdb19a478ced6178d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e4ddc399cef1f044fb25bdb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 00:54:07 2012 +0200 shell32: Fix ShellExecute()'s handling of file URLs. --- dlls/shell32/shlexec.c | 46 +++++++++++++++++++++++++---------------- dlls/shell32/tests/shlexec.c | 46 ++++++++++++++++++++++------------------- 2 files changed, 53 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index a714fe8..5799ab0 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1504,7 +1504,7 @@ static UINT_PTR SHELL_quote_and_execute( LPCWSTR wcmd, LPCWSTR wszParameters, LP return retval; } -static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ) +static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wcmd, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ) { static const WCHAR wShell[] = {'\\','s','h','e','l','l','\\',0}; static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0}; @@ -1534,13 +1534,6 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, strcatW(lpstrProtocol, psei->lpVerb && *psei->lpVerb ? psei->lpVerb: wszOpen); strcatW(lpstrProtocol, wCommand); - /* Remove File Protocol from lpFile */ - /* In the case file://path/file */ - if (!strncmpiW(lpFile, wFile, iSize)) - { - lpFile += iSize; - while (*lpFile == ':') lpFile++; - } retval = execute_from_key(lpstrProtocol, lpFile, NULL, psei->lpParameters, wcmd, execfunc, psei, psei_out); HeapFree(GetProcessHeap(), 0, lpstrProtocol); @@ -1567,7 +1560,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) { static const WCHAR wSpace[] = {' ',0}; static const WCHAR wWww[] = {'w','w','w',0}; - static const WCHAR wFile[] = {'f','i','l','e',0}; static const WCHAR wHttp[] = {'h','t','t','p',':','/','/',0}; static const DWORD unsupportedFlags = SEE_MASK_INVOKEIDLIST | SEE_MASK_ICON | SEE_MASK_HOTKEY | @@ -1724,21 +1716,39 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) dwApplicationNameLen ); } - /* expand environment strings */ - len = ExpandEnvironmentStringsW(sei_tmp.lpFile, NULL, 0); - if (len>0) + /* convert file URLs */ + if (UrlIsFileUrlW(sei_tmp.lpFile)) { LPWSTR buf; - buf = HeapAlloc(GetProcessHeap(),0,(len+1)*sizeof(WCHAR)); + DWORD size; + + size = MAX_PATH; + buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (FAILED(PathCreateFromUrlW(sei_tmp.lpFile, buf, &size, 0))) + return SE_ERR_OOM; - ExpandEnvironmentStringsW(sei_tmp.lpFile, buf, len+1); HeapFree(GetProcessHeap(), 0, wszApplicationName); - dwApplicationNameLen = len+1; + dwApplicationNameLen = lstrlenW(buf) + 1; wszApplicationName = buf; - /* appKnownSingular unmodified */ - sei_tmp.lpFile = wszApplicationName; } + else /* or expand environment strings (not both!) */ + { + len = ExpandEnvironmentStringsW(sei_tmp.lpFile, NULL, 0); + if (len>0) + { + LPWSTR buf; + buf = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + + ExpandEnvironmentStringsW(sei_tmp.lpFile, buf, len + 1); + HeapFree(GetProcessHeap(), 0, wszApplicationName); + dwApplicationNameLen = len + 1; + wszApplicationName = buf; + /* appKnownSingular unmodified */ + + sei_tmp.lpFile = wszApplicationName; + } + } if (*sei_tmp.lpDirectory) { @@ -1889,7 +1899,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) } else if (PathIsURLW(lpFile)) /* File not found, check for URL */ { - retval = SHELL_execute_url( lpFile, wFile, wcmd, &sei_tmp, sei, execfunc ); + retval = SHELL_execute_url( lpFile, wcmd, &sei_tmp, sei, execfunc ); } /* Check if file specified is in the form www.??????.*** */ else if (!strncmpiW(lpFile, wWww, 3)) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 8d164a6..e3d5676 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1637,34 +1637,37 @@ typedef struct static fileurl_tests_t fileurl_tests[]= { /* How many slashes does it take... */ - {"file:", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file:/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file://", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file:///", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"File:///", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file:////", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file://///", "%s\\test file.shlexec", 0, 0x1}, + {"file:", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file:/", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file://", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file:///", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"File:///", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file:////", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file://///", "%s\\test file.shlexec", 0, 0}, /* Test with Windows-style paths */ - {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_COLON, 0x1}, - {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_BSLASH, 0x1}, + {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_COLON, 0}, + {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_BSLASH, 0}, /* Check handling of hostnames */ - {"file://localhost/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file://localhost:80/", "%s\\test file.shlexec", 0, 0x1}, - {"file://LocalHost/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file://127.0.0.1/", "%s\\test file.shlexec", 0, 0x1}, - {"file://::1/", "%s\\test file.shlexec", 0, 0x1}, - {"file://notahost/", "%s\\test file.shlexec", 0, 0x1}, + {"file://localhost/", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file://localhost:80/", "%s\\test file.shlexec", 0, 0}, + {"file://LocalHost/", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file://127.0.0.1/", "%s\\test file.shlexec", 0, 0}, + {"file://::1/", "%s\\test file.shlexec", 0, 0}, + {"file://notahost/", "%s\\test file.shlexec", 0, 0}, /* Environment variables are not expanded in URLs */ {"%urlprefix%", "%s\\test file.shlexec", 0, 0x1}, - {"file:///", "%s\\%%urlenvvar%% file.shlexec", 0, 0x1}, + {"file:///", "%%TMPDIR%%\\test file.shlexec", 0, 0}, + + /* Test shortcuts vs. URLs */ + {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1d}, {NULL, NULL, 0, 0} }; -static void test_fileurl(void) +static void test_fileurls(void) { char filename[MAX_PATH], fileurl[MAX_PATH], longtmpdir[MAX_PATH]; char command[MAX_PATH]; @@ -1681,7 +1684,6 @@ static void test_fileurl(void) get_long_path_name(tmpdir, longtmpdir, sizeof(longtmpdir)/sizeof(*longtmpdir)); SetEnvironmentVariable("urlprefix", "file:///"); - SetEnvironmentVariable("urlenvvar", "test"); test=fileurl_tests; while (test->basename) @@ -1705,7 +1707,10 @@ static void test_fileurl(void) ok(rc == SE_ERR_FNF, "FindExecutable(%s) failed: bad rc=%lu\n", fileurl, rc); /* Then ShellExecute() */ - rc = shell_execute(NULL, fileurl, NULL, NULL); + if ((test->todo & 0x10) == 0) + rc = shell_execute(NULL, fileurl, NULL, NULL); + else todo_wait + rc = shell_execute(NULL, fileurl, NULL, NULL); if (bad_shellexecute) { win_skip("shell32 is too old (likely 4.72). Skipping the file URL tests\n"); @@ -1750,7 +1755,6 @@ static void test_fileurl(void) } SetEnvironmentVariable("urlprefix", NULL); - SetEnvironmentVariable("urlenvvar", NULL); } static void test_find_executable(void) @@ -2639,7 +2643,7 @@ START_TEST(shlexec) test_argify(); test_lpFile_parsed(); test_filename(); - test_fileurl(); + test_fileurls(); test_find_executable(); test_lnks(); test_exes();

1 0

Marcus Meissner : winetest: Close filehandle on run error (Coverity).
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: a89f877fd3f65275af407a3bf7d7896afdff930c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a89f877fd3f65275af407a3bf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 10 10:12:11 2012 +0200 winetest: Close filehandle on run error (Coverity). --- programs/winetest/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 45c8602..cc73f94 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -662,6 +662,7 @@ get_subtests (const char *tempdir, struct wine_test *test, LPSTR res_name) if (status == -2) { report (R_ERROR, "Cannot run %s error %u", test->exename, err); + CloseHandle( subfile ); goto quit; }

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_DIV in the GLSL shader backend.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: f9c181bf7429f885db49301d40ebbe79a863422f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c181bf7429f885db49301d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:48 2012 +0200 wined3d: Implement WINED3DSIH_DIV in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 66c1e9d..708c6d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2197,6 +2197,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) { case WINED3DSIH_ADD: op = '+'; break; case WINED3DSIH_AND: op = '&'; break; + case WINED3DSIH_DIV: op = '/'; break; case WINED3DSIH_MUL: op = '*'; break; case WINED3DSIH_SUB: op = '-'; break; default: @@ -5154,7 +5155,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DEF */ shader_glsl_nop, /* WINED3DSIH_DEFB */ shader_glsl_nop, /* WINED3DSIH_DEFI */ shader_glsl_nop, - /* WINED3DSIH_DIV */ NULL, + /* WINED3DSIH_DIV */ shader_glsl_binop, /* WINED3DSIH_DP2ADD */ shader_glsl_dp2add, /* WINED3DSIH_DP3 */ shader_glsl_dot, /* WINED3DSIH_DP4 */ shader_glsl_dot,

1 0

Marcus Meissner : advapi32: Removed a double free issue on loop termination (Coverity).
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 748dd6fed378adb4ebe00ce0ca14d036d72380b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=748dd6fed378adb4ebe00ce0c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 10 10:00:17 2012 +0200 advapi32: Removed a double free issue on loop termination (Coverity). --- dlls/advapi32/tests/crypt.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 7abf90b..4820d27 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -624,9 +624,6 @@ static BOOL FindProvTypesRegVals(DWORD *pdwIndex, DWORD *pdwProvType, LPSTR *psz (*pdwIndex)++; } - - if (!ret) - LocalFree(*pszTypeName); RegCloseKey(hSubKey); LocalFree(szName);

1 0

Francois Gouget : testbot/build: Trace the build commands to help developers analyze the logs.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: tools Branch: master Commit: 122787dad633ab6023eeab15113906177b7b011d URL: http://source.winehq.org/git/tools.git/?a=commit;h=122787dad633ab6023eeab15… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 01:15:04 2012 +0200 testbot/build: Trace the build commands to help developers analyze the logs. --- testbot/bin/BuildSingleTest.pl | 48 +++++++++++++++++++++++++--------------- testbot/bin/Reconfig.pl | 24 ++++++++++---------- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/testbot/bin/BuildSingleTest.pl b/testbot/bin/BuildSingleTest.pl index af28f88..07787d4 100755 --- a/testbot/bin/BuildSingleTest.pl +++ b/testbot/bin/BuildSingleTest.pl @@ -119,8 +119,9 @@ sub ApplyPatch if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; - system("cd $DataDir/wine-git; autoconf --output configure configure.ac" . - ">> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/wine-git && set -x && " . + " autoconf --output configure configure.ac " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Autoconf failed\n"; @@ -169,10 +170,9 @@ sub BuildTestExecutable { InfoMsg "Reconfigure $Bits-bit crossbuild\n"; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); - system("cd $DataDir/build-mingw$Bits && " . - "../wine-git/configure --host=$Host " . - "--with-wine-tools=../build-native --without-x --without-freetype " . - ">> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Reconfigure of $Bits-bit crossbuild failed\n"; @@ -183,15 +183,18 @@ sub BuildTestExecutable if ($NeedMakeInclude || $NeedConfigure) { InfoMsg "Recreating include/Makefile\n"; - system("cd $DataDir/build-mingw${Bits}; ./config.status --file include/Makefile:Make.vars.in:include/Makefile.in >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " ./config.status --file include/Makefile:Make.vars.in:include/Makefile.in " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Recreation of include/Makefile failed\n"; return !1; } - system("make -j$ncpus -C $DataDir/build-mingw${Bits}/include " . - ">> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " make -j$ncpus include " . + ") >> $LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Make in include dir failed\n"; @@ -202,15 +205,18 @@ sub BuildTestExecutable if ($NeedImplib || $NeedConfigure) { InfoMsg "Rebuilding $BaseName import lib\n"; - system("cd $DataDir/build-mingw${Bits}; ./config.status --file $PatchType/$BaseName/Makefile:Make.vars.in:$PatchType/$BaseName/Makefile.in >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " ./config.status --file $PatchType/$BaseName/Makefile:Make.vars.in:$PatchType/$BaseName/Makefile.in " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Unable to regenerate $PatchType/$BaseName/Makefile\n"; } else { - system("make -j$ncpus -C $DataDir/build-mingw${Bits}/$PatchType/$BaseName " . - "lib$BaseName.a >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " make -j$ncpus -C $PatchType/$BaseName lib$BaseName.a " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { InfoMsg "Make of import library failed\n"; @@ -221,7 +227,9 @@ sub BuildTestExecutable if ($NeedMakefile || $NeedConfigure) { InfoMsg "Recreating tests/Makefile\n"; - system("cd $DataDir/build-mingw${Bits}; ./config.status --file $PatchType/$BaseName/tests/Makefile:Make.vars.in:$PatchType/$BaseName/tests/Makefile.in >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " ./config.status --file $PatchType/$BaseName/tests/Makefile:Make.vars.in:$PatchType/$BaseName/tests/Makefile.in " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Recreation of tests/Makefile failed\n"; @@ -232,7 +240,9 @@ sub BuildTestExecutable if ($NeedBuildDeps) { InfoMsg "Making build dependencies\n"; - system("cd $DataDir/build-mingw${Bits}; make -j$ncpus __builddeps__ >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " make -j$ncpus __builddeps__ " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Making build dependencies failed\n"; @@ -240,23 +250,25 @@ sub BuildTestExecutable } } - my $TestsDir = "$DataDir/build-mingw${Bits}/$PatchType/$BaseName/tests"; + my $TestsDir = "$PatchType/$BaseName/tests"; my $TestExecutable = "$TestsDir/$BaseName"; if ($PatchType eq "programs") { $TestExecutable .= ".exe"; } $TestExecutable .= "_test.exe"; - unlink($TestExecutable); + unlink("$DataDir/build-mingw${Bits}/$TestExecutable"); InfoMsg "Making test executable\n"; - system("make -j$ncpus -C $TestsDir >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " make -j$ncpus -C $TestsDir " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Make failed\n"; return !1; } - if (! -f $TestExecutable) + if (! -f "$DataDir/build-mingw${Bits}/$TestExecutable") { LogMsg "Make didn't produce a $TestExecutable file\n"; return !1; diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index fe789f0..3b60abd 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -78,12 +78,12 @@ sub CountCPUs() sub BuildNative { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); - system("cd $DataDir/build-native && " . - "rm -rf * && " . - "../wine-git/configure --enable-win64 --without-x --without-freetype " . - ">> $LogDir/Reconfig.log 2>&1 && " . - "make -j$ncpus depend >> $LogDir/Reconfig.log 2>&1 && " . - "make -j$ncpus __tooldeps__ >> $LogDir/Reconfig.log 2>&1"); + system("( cd $DataDir/build-native && set -x && " . + " rm -rf * && " . + " ../wine-git/configure --enable-win64 --without-x --without-freetype && " . + " make -j$ncpus depend && " . + " make -j$ncpus __tooldeps__ " . + ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) { @@ -100,12 +100,12 @@ sub BuildCross my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); - system("cd $DataDir/build-mingw$Bits && " . - "rm -rf * && " . - "../wine-git/configure --host=$Host --with-wine-tools=../build-native " . - "--without-x --without-freetype >> $LogDir/Reconfig.log 2>&1 && " . - "make -j$ncpus depend >> $LogDir/Reconfig.log 2>&1 && " . - "make -j$ncpus programs/winetest >> $LogDir/Reconfig.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " rm -rf * && " . + " ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . + " make -j$ncpus depend && " . + " make -j$ncpus programs/winetest " . + ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) { LogMsg "Build cross ($Bits bits) failed\n";

1 0

Francois Gouget : testbot/build: Tweak $PATH to make use of ccache if present.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: tools Branch: master Commit: cce423b4e075b12c10fc26fffe60cf9f5e28f736 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cce423b4e075b12c10fc26ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 01:13:42 2012 +0200 testbot/build: Tweak $PATH to make use of ccache if present. Remove /usr/local/mingw, it's unneeded. --- testbot/bin/BuildSingleTest.pl | 2 +- testbot/bin/Reconfig.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/BuildSingleTest.pl b/testbot/bin/BuildSingleTest.pl index 52ff8ba..a8adc4e 100755 --- a/testbot/bin/BuildSingleTest.pl +++ b/testbot/bin/BuildSingleTest.pl @@ -253,7 +253,7 @@ sub BuildTestExecutable return 1; } -$ENV{PATH} = "/usr/bin:/bin:/usr/local/mingw/bin:/usr/local/mingw64/bin"; +$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; # Start with clean logfile diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index 2a75e6f..f2e07a3 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -103,7 +103,7 @@ sub BuildCross return 1; } -$ENV{PATH} = "/usr/bin:/bin:/usr/local/mingw/bin:/usr/local/mingw64/bin"; +$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; # Start with clean logfile

1 0