October 2012 - Wine-commits

Hans Leidekker : credui: Don' t save credentials if CREDUI_FLAGS_DO_NOT_PERSIST is specified.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: d6f8687630b3702e91aee5dadc5fd6b1842ba879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f8687630b3702e91aee5dad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 18 14:16:21 2012 +0200 credui: Don't save credentials if CREDUI_FLAGS_DO_NOT_PERSIST is specified. --- dlls/credui/credui_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index e3e964f..b470928 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -655,7 +655,7 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, LeaveCriticalSection(&csPendingCredentials); } - else + else if (!(dwFlags & CREDUI_FLAGS_DO_NOT_PERSIST)) result = save_credentials(pszTargetName, pszUsername, pszPassword, (dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS) != 0); }

1 0

Hans Leidekker : credui: Don' t show a dialog if existing credentials can be found.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 9d95d33118dceca36252745302485d7268934c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d95d33118dceca3625274530… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 18 14:16:52 2012 +0200 credui: Don't show a dialog if existing credentials can be found. --- dlls/credui/credui_main.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index b470928..6e8d452 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -548,6 +548,38 @@ static INT_PTR CALLBACK CredDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, } } +static BOOL find_existing_credential(const WCHAR *target, WCHAR *username, ULONG len_username, + WCHAR *password, ULONG len_password) +{ + DWORD count, i; + CREDENTIALW **credentials; + + if (!CredEnumerateW(target, 0, &count, &credentials)) return FALSE; + for (i = 0; i < count; i++) + { + if (credentials[i]->Type != CRED_TYPE_DOMAIN_PASSWORD) + { + FIXME("no support for type %u credentials\n", credentials[i]->Type); + continue; + } + if ((!*username || !strcmpW(username, credentials[i]->UserName)) && + strlenW(credentials[i]->UserName) < len_username && + credentials[i]->CredentialBlobSize / sizeof(WCHAR) < len_password) + { + TRACE("found existing credential for %s\n", debugstr_w(credentials[i]->UserName)); + + strcpyW(username, credentials[i]->UserName); + memcpy(password, credentials[i]->CredentialBlob, credentials[i]->CredentialBlobSize); + password[credentials[i]->CredentialBlobSize / sizeof(WCHAR)] = 0; + + CredFree(credentials); + return TRUE; + } + } + CredFree(credentials); + return FALSE; +} + /****************************************************************************** * CredUIPromptForCredentialsW [CREDUI.@] */ @@ -578,6 +610,11 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, if ((dwFlags & CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX) && !pfSave) return ERROR_INVALID_PARAMETER; + if (!(dwFlags & CREDUI_FLAGS_ALWAYS_SHOW_UI) && + !(dwFlags & CREDUI_FLAGS_INCORRECT_PASSWORD) && + find_existing_credential(pszTargetName, pszUsername, ulUsernameMaxChars, pszPassword, ulPasswordMaxChars)) + return ERROR_SUCCESS; + params.pszTargetName = pszTargetName; if (pUIInfo) {

1 0

Hans Leidekker : advapi32: Only require a domain in the username for CRED_PERSIST_ENTERPRISE credentials .
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 860c335b2297d36830a85d4d659d5a8358a445ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=860c335b2297d36830a85d4d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 18 15:10:05 2012 +0200 advapi32: Only require a domain in the username for CRED_PERSIST_ENTERPRISE credentials. --- dlls/advapi32/cred.c | 8 +++++++- dlls/advapi32/tests/cred.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 98c4ba7..b2597b6 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -1804,13 +1804,19 @@ BOOL WINAPI CredWriteW(PCREDENTIALW Credential, DWORD Flags) return FALSE; } + TRACE("Credential->Flags = 0x%08x\n", Credential->Flags); + TRACE("Credential->Type = %u\n", Credential->Type); TRACE("Credential->TargetName = %s\n", debugstr_w(Credential->TargetName)); + TRACE("Credential->Comment = %s\n", debugstr_w(Credential->Comment)); + TRACE("Credential->Persist = %u\n", Credential->Persist); + TRACE("Credential->TargetAlias = %s\n", debugstr_w(Credential->TargetAlias)); TRACE("Credential->UserName = %s\n", debugstr_w(Credential->UserName)); if (Credential->Type == CRED_TYPE_DOMAIN_PASSWORD) { if (!Credential->UserName || - (!strchrW(Credential->UserName, '\\') && !strchrW(Credential->UserName, '@'))) + (Credential->Persist == CRED_PERSIST_ENTERPRISE && + (!strchrW(Credential->UserName, '\\') && !strchrW(Credential->UserName, '@')))) { ERR("bad username %s\n", debugstr_w(Credential->UserName)); SetLastError(ERROR_BAD_USERNAME); diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 5762f1b..3d37a3c 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -121,6 +121,47 @@ static void test_CredWriteA(void) ok(!ret && GetLastError() == ERROR_BAD_USERNAME, "CredWriteA with NULL username should have failed with ERROR_BAD_USERNAME instead of %d\n", GetLastError()); + + new_cred.UserName = (char *)"winetest"; + new_cred.Persist = CRED_PERSIST_LOCAL_MACHINE; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.Type = CRED_TYPE_GENERIC; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_GENERIC, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.Persist = CRED_PERSIST_SESSION; + ret = pCredWriteA(&new_cred, 0); + ok(ret, "CredWriteA failed with error %u\n", GetLastError()); + + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_GENERIC, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + + new_cred.Type = CRED_TYPE_DOMAIN_PASSWORD; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.UserName = NULL; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(!ret, "CredWriteA succeeded\n"); + ok(GetLastError() == ERROR_BAD_USERNAME, "got %u\n", GetLastError()); } static void test_CredDeleteA(void)

1 0

Jacek Caban : jscript: Use jsstr_t for passing strings to regexp matching functions.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 2d962d03954e7c768b14cb98b25ae2af601d3b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d962d03954e7c768b14cb98b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 17:45:23 2012 +0200 jscript: Use jsstr_t for passing strings to regexp matching functions. --- dlls/jscript/jscript.h | 2 +- dlls/jscript/regexp.c | 50 +++++++++++++++++++---------------------------- dlls/jscript/string.c | 6 ++-- 3 files changed, 24 insertions(+), 34 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index d779c7b..2630ff0 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -416,7 +416,7 @@ HRESULT create_jscaller(script_ctx_t*) DECLSPEC_HIDDEN; #define REM_CHECK_GLOBAL 0x0001 #define REM_RESET_INDEX 0x0002 #define REM_NO_CTX_UPDATE 0x0004 -HRESULT regexp_match_next(script_ctx_t*,jsdisp_t*,DWORD,const WCHAR*,DWORD,const WCHAR**,match_result_t**, +HRESULT regexp_match_next(script_ctx_t*,jsdisp_t*,DWORD,jsstr_t*,const WCHAR**,match_result_t**, DWORD*,DWORD*,match_result_t*) DECLSPEC_HIDDEN; HRESULT parse_regexp_flags(const WCHAR*,DWORD,DWORD*) DECLSPEC_HIDDEN; HRESULT regexp_string_match(script_ctx_t*,jsdisp_t*,jsstr_t*,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index bdff445..4d29390 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3323,16 +3323,16 @@ static void set_last_index(RegExpInstance *This, DWORD last_index) } static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, DWORD rem_flags, - const WCHAR *str, DWORD len, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, + jsstr_t *str, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, match_result_t *ret) { REMatchState *x, *result; REGlobalData gData; DWORD matchlen; - gData.cpbegin = str; - gData.cpend = str + len; - gData.start = *cp-str; + gData.cpbegin = str->str; + gData.cpend = str->str + jsstr_length(str); + gData.start = *cp-str->str; gData.skipped = 0; gData.pool = &ctx->tmp_heap; @@ -3370,16 +3370,9 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D } } - /* FIXME: We often already have a copy of input string that we could use to store last match */ - if(!(rem_flags & REM_NO_CTX_UPDATE) && - (!ctx->last_match || len != jsstr_length(ctx->last_match) || strncmpW(ctx->last_match->str, str, len))) { - jsstr_t *last_match; - - last_match = jsstr_alloc_len(str, len); - if(!last_match) - return E_OUTOFMEMORY; + if(!(rem_flags & REM_NO_CTX_UPDATE) && ctx->last_match != str) { jsstr_release(ctx->last_match); - ctx->last_match = last_match; + ctx->last_match = jsstr_addref(str); } if(parens) { @@ -3392,7 +3385,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D (*parens)[i].str = NULL; (*parens)[i].len = 0; }else { - (*parens)[i].str = str + result->parens[i].index; + (*parens)[i].str = str->str + result->parens[i].index; (*parens)[i].len = result->parens[i].length; } } @@ -3419,18 +3412,18 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D *cp = result->cp; ret->str = result->cp-matchlen; ret->len = matchlen; - set_last_index(regexp, result->cp-str); + set_last_index(regexp, result->cp-str->str); if(!(rem_flags & REM_NO_CTX_UPDATE)) { - ctx->last_match_index = ret->str-str; + ctx->last_match_index = ret->str-str->str; ctx->last_match_length = matchlen; } return S_OK; } -HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, DWORD rem_flags, const WCHAR *str, - DWORD len, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, +HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, DWORD rem_flags, jsstr_t *str, + const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, match_result_t *ret) { RegExpInstance *regexp = (RegExpInstance*)dispex; @@ -3442,18 +3435,18 @@ HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, DWORD rem_flags, mark = jsheap_mark(&ctx->tmp_heap); - hres = do_regexp_match_next(ctx, regexp, rem_flags, str, len, cp, parens, parens_size, parens_cnt, ret); + hres = do_regexp_match_next(ctx, regexp, rem_flags, str, cp, parens, parens_size, parens_cnt, ret); jsheap_clear(mark); return hres; } -static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, const WCHAR *str, DWORD len, BOOL gflag, +static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *str, BOOL gflag, match_result_t **match_result, DWORD *result_cnt) { RegExpInstance *This = (RegExpInstance*)dispex; match_result_t *ret = NULL, cres; - const WCHAR *cp = str; + const WCHAR *cp = str->str; DWORD i=0, ret_size = 0; jsheap_t *mark; HRESULT hres; @@ -3461,7 +3454,7 @@ static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, const WCHAR *st mark = jsheap_mark(&ctx->tmp_heap); while(1) { - hres = do_regexp_match_next(ctx, This, 0, str, len, &cp, NULL, NULL, NULL, &cres); + hres = do_regexp_match_next(ctx, This, 0, str, &cp, NULL, NULL, NULL, &cres); if(hres == S_FALSE) { hres = S_OK; break; @@ -3658,7 +3651,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsstr_t match_result_t *match, match_result_t **parens, DWORD *parens_cnt, BOOL *ret) { RegExpInstance *regexp; - DWORD parens_size = 0, last_index = 0, length; + DWORD parens_size = 0, last_index = 0; const WCHAR *cp; jsstr_t *string; HRESULT hres; @@ -3673,7 +3666,6 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsstr_t hres = to_string(ctx, arg, &string); if(FAILED(hres)) return hres; - length = jsstr_length(string); if(regexp->jsregexp->flags & JSREG_GLOB) { if(regexp->last_index < 0) { @@ -3689,7 +3681,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsstr_t } cp = string->str + last_index; - hres = regexp_match_next(ctx, &regexp->dispex, REM_RESET_INDEX, string->str, length, &cp, parens, + hres = regexp_match_next(ctx, &regexp->dispex, REM_RESET_INDEX, string, &cp, parens, parens ? &parens_size : NULL, parens_cnt, match); if(FAILED(hres)) { jsstr_release(string); @@ -3929,18 +3921,16 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval RegExpInstance *regexp = (RegExpInstance*)re; match_result_t *match_result; - unsigned match_cnt, i, length; + unsigned match_cnt, i; jsdisp_t *array; HRESULT hres; - length = jsstr_length(str); - if(!(regexp->jsregexp->flags & JSREG_GLOB)) { match_result_t match, *parens = NULL; DWORD parens_cnt, parens_size = 0; const WCHAR *cp = str->str; - hres = regexp_match_next(ctx, &regexp->dispex, 0, str->str, length, &cp, &parens, &parens_size, &parens_cnt, &match); + hres = regexp_match_next(ctx, &regexp->dispex, 0, str, &cp, &parens, &parens_size, &parens_cnt, &match); if(FAILED(hres)) return hres; @@ -3960,7 +3950,7 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval return S_OK; } - hres = regexp_match(ctx, &regexp->dispex, str->str, length, FALSE, &match_result, &match_cnt); + hres = regexp_match(ctx, &regexp->dispex, str, FALSE, &match_result, &match_cnt); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 5972061..c7aaf64 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -745,7 +745,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un while(1) { if(regexp) { - hres = regexp_match_next(ctx, regexp, re_flags, str->str, jsstr_length(str), &cp, parens_ptr, + hres = regexp_match_next(ctx, regexp, re_flags, str, &cp, parens_ptr, &parens_size, &parens_cnt, &match); re_flags |= REM_CHECK_GLOBAL; @@ -933,7 +933,7 @@ static HRESULT String_search(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } cp = str->str; - hres = regexp_match_next(ctx, regexp, REM_RESET_INDEX, str->str, jsstr_length(str), &cp, NULL, NULL, NULL, &match); + hres = regexp_match_next(ctx, regexp, REM_RESET_INDEX, str, &cp, NULL, NULL, NULL, &match); jsstr_release(str); jsdisp_release(regexp); if(FAILED(hres)) @@ -1090,7 +1090,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi ptr = cp = str->str; for(i=0; i<limit; i++) { if(regexp) { - hres = regexp_match_next(ctx, regexp, 0, str->str, length, &cp, NULL, NULL, NULL, &match_result); + hres = regexp_match_next(ctx, regexp, 0, str, &cp, NULL, NULL, NULL, &match_result); if(hres != S_OK) break; ptr2 = match_result.str;

1 0

Alexandre Julliard : gdi32: Add a generation count in the high word of GDI handles.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 091c342f32583464df5ef45ae314d34e9a511c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=091c342f32583464df5ef45ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 16:58:28 2012 +0200 gdi32: Add a generation count in the high word of GDI handles. --- dlls/gdi32/enhmfdrv/objects.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdiobj.c | 108 +++++++++++++++++++++++++++------------- dlls/gdi32/mfdrv/objects.c | 2 +- dlls/gdi32/palette.c | 3 + 5 files changed, 79 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=091c342f32583464df5ef…

1 0

Alexandre Julliard : user32: Don't free a clip region twice.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 6cda76fd997078a28125fa56b87f7130e43625db URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cda76fd997078a28125fa56b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 21:40:18 2012 +0200 user32: Don't free a clip region twice. --- dlls/user32/painting.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 7d106bb..e9705fe 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -790,7 +790,6 @@ void move_window_bits( HWND hwnd, struct window_surface *old_surface, bits, info, DIB_RGB_COLORS ); old_surface->funcs->unlock( old_surface ); ReleaseDC( hwnd, hdc ); - DeleteObject( rgn ); } }

1 0

Alexandre Julliard : winex11: Don't delete the DC if it' s not for a valid pbuffer.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 64aed7c5be455db9315a39e33fdc84dd3a284255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64aed7c5be455db9315a39e33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 21:40:52 2012 +0200 winex11: Don't delete the DC if it's not for a valid pbuffer. --- dlls/winex11.drv/opengl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5151e20..cf99876 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2318,14 +2318,17 @@ static int X11DRV_wglReleasePbufferDCARB( struct wgl_pbuffer *object, HDC hdc ) TRACE("(%p, %p)\n", object, hdc); EnterCriticalSection( &context_section ); + if (!XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&gl )) { XDeleteContext( gdi_display, (XID)hdc, gl_pbuffer_context ); free_gl_drawable( gl ); } + else hdc = 0; + LeaveCriticalSection( &context_section ); - return DeleteDC(hdc); + return hdc && DeleteDC(hdc); } /**

1 0

Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_gen_sample_code().
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: e832978adb04b99e67fa2d7b8cc8d6861d63e26e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e832978adb04b99e67fa2d7b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 17 23:07:59 2012 +0200 wined3d: Explicitly check the shader type in shader_glsl_gen_sample_code(). --- 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 199695b..a585b1d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2140,6 +2140,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s DWORD sampler, const struct glsl_sample_function *sample_function, DWORD swizzle, const char *dx, const char *dy, const char *bias, const char *coord_reg_fmt, ...) { + const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; const char *sampler_base; char dst_swizzle[6]; struct color_fixup_desc fixup; @@ -2148,7 +2149,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s shader_glsl_swizzle_to_str(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); - if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) + if (version->type == WINED3D_SHADER_TYPE_PIXEL) { const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; fixup = priv->cur_ps_args->color_fixup[sampler];

1 0

Francois Gouget : testbot/build: Also create the staging directory if it does not exist.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: tools Branch: master Commit: 58537d5728a256502d72b99ed14ef4b43daa16ce URL: http://source.winehq.org/git/tools.git/?a=commit;h=58537d5728a256502d72b99e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 18 15:24:30 2012 +0200 testbot/build: Also create the staging directory if it does not exist. This simplifies the initial configuration a little bit. --- testbot/bin/build/Reconfig.pl | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index c3f8eb4..4661727 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -121,6 +121,11 @@ delete $ENV{ENV}; # Start with clean logfile unlink("$LogDir/Reconfig.log"); +if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") +{ + LogMsg "Unable to create '$DataDir/staging': $!\n"; + exit(1); +} if (! GitPull()) { exit(1);

1 0

Francois Gouget : testbot/VMs: Use a TestAgent tool instead of VMware to run scripts on or copy files from /to the VMs.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: tools Branch: master Commit: ff92857532c2623b1c5dd89afb2a8d0043764508 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ff92857532c2623b1c5dd89a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 18 15:34:36 2012 +0200 testbot/VMs: Use a TestAgent tool instead of VMware to run scripts on or copy files from/to the VMs. --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunTask.pl | 2 +- testbot/bin/build/Reconfig.pl | 33 ++ testbot/ddl/winetestbot.sql | 1 + testbot/doc/INSTALL.txt | 14 +- testbot/doc/winetestbot-schema.dia | 24 +- testbot/lib/WineTestBot/Config.pm | 10 +- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 3 + testbot/lib/WineTestBot/TestAgent.pm | 250 ++++++++++ testbot/lib/WineTestBot/VMs.pm | 109 +---- testbot/src/testagentd/.gitignore | 4 + testbot/src/testagentd/Makefile | 40 ++ testbot/src/testagentd/platform.h | 85 ++++ testbot/src/testagentd/platform_unix.c | 203 ++++++++ testbot/src/testagentd/platform_windows.c | 267 ++++++++++ testbot/src/testagentd/testagentd.c | 626 ++++++++++++++++++++++++ 17 files changed, 1574 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=ff92857532c2623b1c5d…

1 0