October 2012 - Wine-Commits

Jason Edmeades : cmd: Ensure current directory saved during cmd /c.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 4e10456bf61c444bac39ad278e63aa5a9e9cb399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e10456bf61c444bac39ad278… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Oct 1 00:12:59 2012 +0100 cmd: Ensure current directory saved during cmd /c. --- programs/cmd/wcmdmain.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 64dd21d..02babea 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2509,6 +2509,15 @@ int wmain (int argc, WCHAR *argvW[]) WCMD_strip_quotes(cmd); } + /* Save cwd into appropriate env var (Must be before the /c processing */ + GetCurrentDirectoryW(sizeof(string)/sizeof(WCHAR), string); + if (IsCharAlphaW(string[0]) && string[1] == ':') { + static const WCHAR fmt[] = {'=','%','c',':','\0'}; + wsprintfW(envvar, fmt, string[0]); + SetEnvironmentVariableW(envvar, string); + WINE_TRACE("Set %s to %s\n", wine_dbgstr_w(envvar), wine_dbgstr_w(string)); + } + if (opt_c) { /* If we do a "cmd /c command", we don't want to allocate a new * console since the command returns immediately. Rather, we use @@ -2602,15 +2611,6 @@ int wmain (int argc, WCHAR *argvW[]) } - /* Save cwd into appropriate env var */ - GetCurrentDirectoryW(1024, string); - if (IsCharAlphaW(string[0]) && string[1] == ':') { - static const WCHAR fmt[] = {'=','%','c',':','\0'}; - wsprintfW(envvar, fmt, string[0]); - SetEnvironmentVariableW(envvar, string); - WINE_TRACE("Set %s to %s\n", wine_dbgstr_w(envvar), wine_dbgstr_w(string)); - } - if (opt_k) { /* Parse the command string, without reading any more input */ WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE);

1 0

Piotr Caban : wininet: Added support for persistent cookies.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: b49c980d0d003f1cbaa750ded2b60fc143b04c1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49c980d0d003f1cbaa750ded… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:21:59 2012 +0200 wininet: Added support for persistent cookies. --- dlls/wininet/cookie.c | 297 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 279 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b49c980d0d003f1cbaa75…

1 0

Rico Schüller : d3dx9: Fix D3DXMatrixAffineTransformation() and add some tests.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: ec9db0a11f4030358f68e238a99c74314eb9c8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9db0a11f4030358f68e238a… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 1 12:40:51 2012 +0200 d3dx9: Fix D3DXMatrixAffineTransformation() and add some tests. --- dlls/d3dx9_36/math.c | 15 +++++++++++---- dlls/d3dx9_36/tests/math.c | 35 +++++++++++++++++++++++++++++------ 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 53dddd4..b43c678 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -81,7 +81,7 @@ FLOAT WINAPI D3DXFresnelTerm(FLOAT costheta, FLOAT refractionindex) { FLOAT a, d, g, result; - TRACE("costheta %f, refractionindex %f)\n", costheta, refractionindex); + TRACE("costheta %f, refractionindex %f\n", costheta, refractionindex); g = sqrtf(refractionindex * refractionindex + costheta * costheta - 1.0f); a = g + costheta; @@ -102,6 +102,13 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin D3DXMatrixIdentity(out); + if (rotationcenter) + { + out->u.m[3][0] = -rotationcenter->x; + out->u.m[3][1] = -rotationcenter->y; + out->u.m[3][2] = -rotationcenter->z; + } + if (rotation) { FLOAT temp00, temp01, temp02, temp10, temp11, temp12, temp20, temp21, temp22; @@ -130,9 +137,9 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin { FLOAT x, y, z; - x = -rotationcenter->x; - y = -rotationcenter->y; - z = -rotationcenter->z; + x = out->u.m[3][0]; + y = out->u.m[3][1]; + z = out->u.m[3][2]; out->u.m[3][0] = x * temp00 + y * temp10 + z * temp20; out->u.m[3][1] = x * temp01 + y * temp11 + z * temp21; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9043ab3..9a5cbcc 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -275,14 +275,37 @@ static void D3DXMatrixTest(void) U(expectedmat).m[1][0] = 519.760010f; U(expectedmat).m[1][1] = -352.440002f; U(expectedmat).m[1][2] = -277.679993f; U(expectedmat).m[1][3] = 0.0f; U(expectedmat).m[2][0] = 363.119995f; U(expectedmat).m[2][1] = -121.040001f; U(expectedmat).m[2][2] = -117.479996f; U(expectedmat).m[2][3] = 0.0f; U(expectedmat).m[3][0] = -1239.0f; U(expectedmat).m[3][1] = 667.0f; U(expectedmat).m[3][2] = 567.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixAffineTransformation(&gotmat,3.56f,&at,&q,&axis); + D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, &q, &axis); expect_mat(&expectedmat, &gotmat); -/* Test the NULL case */ - U(expectedmat).m[0][0] = -459.239990f; U(expectedmat).m[0][1] = -576.719971f; U(expectedmat).m[0][2] = -263.440002f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 519.760010f; U(expectedmat).m[1][1] = -352.440002f; U(expectedmat).m[1][2] = -277.679993f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 363.119995f; U(expectedmat).m[2][1] = -121.040001f; U(expectedmat).m[2][2] = -117.479996f; U(expectedmat).m[2][3] = 0.0f; + + /* Test the NULL case */ + U(expectedmat).m[3][0] = 1.0f; U(expectedmat).m[3][1] = -3.0f; U(expectedmat).m[3][2] = 7.0f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, &q, &axis); + expect_mat(&expectedmat, &gotmat); + + U(expectedmat).m[3][0] = -1240.0f; U(expectedmat).m[3][1] = 670.0f; U(expectedmat).m[3][2] = 560.0f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, &q, NULL); + expect_mat(&expectedmat, &gotmat); + + U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, &q, NULL); + expect_mat(&expectedmat, &gotmat); + + U(expectedmat).m[0][0] = 3.56f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; + U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 3.56f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; + U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 3.56f; U(expectedmat).m[2][3] = 0.0f; U(expectedmat).m[3][0] = 1.0f; U(expectedmat).m[3][1] = -3.0f; U(expectedmat).m[3][2] = 7.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixAffineTransformation(&gotmat,3.56f,NULL,&q,&axis); + D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, NULL, &axis); + expect_mat(&expectedmat, &gotmat); + + D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, NULL, &axis); + expect_mat(&expectedmat, &gotmat); + + U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, NULL, NULL); + expect_mat(&expectedmat, &gotmat); + + D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, NULL, NULL); expect_mat(&expectedmat, &gotmat); /*____________D3DXMatrixfDeterminant_____________*/

1 0

Jason Edmeades : cmd: Add full for /R support.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 9dde62cb96b8f423f8cfe4f095eb10ec65ea7d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dde62cb96b8f423f8cfe4f09… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Sep 27 19:58:56 2012 +0100 cmd: Add full for /R support. --- programs/cmd/builtins.c | 430 ++++++++++++++++++------------ programs/cmd/tests/test_builtins.cmd | 123 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 10 + 3 files changed, 397 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9dde62cb96b8f423f8cfe…

1 0

Alexandre Julliard : user32: Default to the dummy surface if the driver doesn't provide something else.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 91b0ee56cf3e6a16fa0cc82df642a77b204ea145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b0ee56cf3e6a16fa0cc82df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 13:09:27 2012 +0200 user32: Default to the dummy surface if the driver doesn't provide something else. --- dlls/user32/winpos.c | 6 ++++++ dlls/winex11.drv/window.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index fa74567..0593140 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1949,11 +1949,17 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ) { WND *win; + HWND parent = GetAncestor( hwnd, GA_PARENT ); BOOL ret; int old_width; RECT visible_rect, old_visible_rect, old_window_rect; struct window_surface *old_surface, *new_surface = NULL; + if (!parent || parent == GetDesktopWindow()) + { + new_surface = &dummy_surface; /* provide a default surface for top-level windows */ + window_surface_add_ref( new_surface ); + } visible_rect = *window_rect; USER_Driver->pWindowPosChanging( hwnd, insert_after, swp_flags, window_rect, client_rect, &visible_rect, &new_surface ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a2103da..dff4384 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2030,9 +2030,14 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag X11DRV_window_to_X_rect( data, visible_rect ); /* create the window surface if necessary */ + if (!data->whole_window) goto done; - if (data->embedded) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; + + if (*surface) window_surface_release( *surface ); + *surface = NULL; /* indicate that we want to draw directly to the window */ + + if (data->embedded) goto done; if (data->whole_window == root_window) goto done; if (has_gl_drawable( hwnd )) goto done; if (!client_side_graphics && !layered) goto done;

1 0

Alexandre Julliard : user32: Call the SetWindowStyle driver entry point before updating the window position .
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 1d78f43000037a0201242188cf73e19cc1161323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d78f43000037a0201242188c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 13:12:29 2012 +0200 user32: Call the SetWindowStyle driver entry point before updating the window position. --- dlls/user32/win.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0faf02d..0dbe29e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -763,6 +763,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) if (!ok) return 0; + USER_Driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); if (needs_show) { RECT window_rect, client_rect; @@ -772,7 +773,6 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) &window_rect, &client_rect, NULL ); } - USER_Driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); return style.styleOld; } @@ -2481,19 +2481,19 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if (!ok) return 0; - if (needs_show) - { - RECT window_rect, client_rect; - WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); - set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW, - &window_rect, &client_rect, NULL ); - } if (offset == GWL_STYLE || offset == GWL_EXSTYLE) { style.styleOld = retval; style.styleNew = newval; USER_Driver->pSetWindowStyle( hwnd, offset, &style ); + if (needs_show) + { + RECT window_rect, client_rect; + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); + set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | + SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW, + &window_rect, &client_rect, NULL ); + } SendMessageW( hwnd, WM_STYLECHANGED, offset, (LPARAM)&style ); }

1 0

Jacek Caban : vbscript: Added Right() implementation.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 50985fa2d3f0f59e9f55eac4d2f722dfb6444efd URL: http://source.winehq.org/git/wine.git/?a=commit;h=50985fa2d3f0f59e9f55eac4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 1 13:00:09 2012 +0200 vbscript: Added Right() implementation. --- dlls/vbscript/global.c | 38 +++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 10 ++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 98eb047..fa600ee 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -676,10 +676,42 @@ static HRESULT Global_LeftB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR return E_NOTIMPL; } -static HRESULT Global_Right(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Right(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, ret, conv_str = NULL; + int len, str_len; + HRESULT hres; + + TRACE("(%s %s)\n", debugstr_variant(args+1), debugstr_variant(args)); + + if(V_VT(args+1) == VT_BSTR) { + str = V_BSTR(args+1); + }else { + hres = to_string(args+1, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + hres = to_int(args, &len); + if(FAILED(hres)) + return hres; + + if(len < 0) { + FIXME("len = %d\n", len); + return E_FAIL; + } + + str_len = SysStringLen(str); + if(len > str_len) + len = str_len; + + ret = SysAllocStringLen(str+str_len-len, len); + SysFreeString(conv_str); + if(!ret) + return E_OUTOFMEMORY; + + return return_bstr(res, ret); } static HRESULT Global_RightB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index c6f8536..06122ef 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -215,6 +215,16 @@ TestLeft "test", 0, "" TestLeft 123, 2, "12" if isEnglishLang then TestLeft true, 2, "Tr" +Sub TestRight(str, len, ex) + Call ok(Right(str, len) = ex, "Right(" & str & ", " & len & ") = " & Right(str, len)) +End Sub + +TestRight "test", 2, "st" +TestRight "test", 5, "test" +TestRight "test", 0, "" +TestRight 123, 2, "23" +if isEnglishLang then TestRight true, 2, "ue" + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val)))

1 0

Jason Edmeades : cmd: Convert wcmd_for to use WCMD_parameter.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 8fbd65358e0ca6cd4a09a0d1fa6e6716a38db04d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fbd65358e0ca6cd4a09a0d1f… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Wed Sep 26 14:37:56 2012 +0100 cmd: Convert wcmd_for to use WCMD_parameter. --- programs/cmd/builtins.c | 55 ++++++++++++----------------- programs/cmd/tests/test_builtins.cmd.exp | 4 +- 2 files changed, 25 insertions(+), 34 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 57ac339..e54c444 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1080,7 +1080,6 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WCHAR *firstCmd; int thisDepth; - WCHAR *curPos = p; BOOL expandDirs = FALSE; BOOL useNumbers = FALSE; BOOL doFileset = FALSE; @@ -1088,33 +1087,34 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { LONG numbers[3] = {0,0,0}; /* Defaults to 0 in native */ int itemNum; CMD_LIST *thisCmdStart; - + int parameterNo = 0; /* Handle optional qualifiers (multiple are allowed) */ - while (*curPos && *curPos == '/') { - WINE_TRACE("Processing qualifier at %s\n", wine_dbgstr_w(curPos)); - curPos++; - switch (toupperW(*curPos)) { - case 'D': curPos++; expandDirs = TRUE; break; - case 'L': curPos++; useNumbers = TRUE; break; + WCHAR *thisArg = WCMD_parameter(p, parameterNo++, NULL, NULL, FALSE); + while (thisArg && *thisArg == '/') { + WINE_TRACE("Processing qualifier at %s\n", wine_dbgstr_w(thisArg)); + thisArg++; + switch (toupperW(*thisArg)) { + case 'D': expandDirs = TRUE; break; + case 'L': useNumbers = TRUE; break; /* Recursive is special case - /R can have an optional path following it */ /* filenamesets are another special case - /F can have an optional options following it */ case 'R': case 'F': { - BOOL isRecursive = (*curPos == 'R'); + BOOL isRecursive = (*thisArg == 'R'); if (!isRecursive) doFileset = TRUE; - /* Skip whitespace */ - curPos++; - while (*curPos && (*curPos==' ' || *curPos=='\t')) curPos++; + /* Retrieve next parameter to see if is path/options */ + thisArg = WCMD_parameter(p, parameterNo, NULL, NULL, !isRecursive); /* Next parm is either qualifier, path/options or variable - only care about it if it is the path/options */ - if (*curPos && *curPos != '/' && *curPos != '%') { + if (thisArg && *thisArg != '/' && *thisArg != '%') { + parameterNo++; if (isRecursive) WINE_FIXME("/R needs to handle supplied root\n"); else { static unsigned int once; @@ -1124,38 +1124,29 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { break; } default: - WINE_FIXME("for qualifier '%c' unhandled\n", *curPos); - curPos++; + WINE_FIXME("for qualifier '%c' unhandled\n", *thisArg); } - /* Skip whitespace between qualifiers */ - while (*curPos && (*curPos==' ' || *curPos=='\t')) curPos++; + /* Step to next token */ + thisArg = WCMD_parameter(p, parameterNo++, NULL, NULL, FALSE); } - /* Skip whitespace before variable */ - while (*curPos && (*curPos==' ' || *curPos=='\t')) curPos++; - /* Ensure line continues with variable */ - if (!*curPos || *curPos != '%') { + if (!*thisArg || *thisArg != '%') { WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } /* Variable should follow */ - i = 0; - while (curPos[i] && curPos[i]!=' ' && curPos[i]!='\t') i++; - memcpy(&variable[0], curPos, i*sizeof(WCHAR)); - variable[i] = 0x00; + strcpyW(variable, thisArg); WINE_TRACE("Variable identified as %s\n", wine_dbgstr_w(variable)); - curPos = &curPos[i]; - - /* Skip whitespace before IN */ - while (*curPos && (*curPos==' ' || *curPos=='\t')) curPos++; /* Ensure line continues with IN */ - if (!*curPos - || !WCMD_keyword_ws_found(inW, sizeof(inW)/sizeof(inW[0]), curPos)) { - + thisArg = WCMD_parameter(p, parameterNo++, NULL, NULL, FALSE); + if (!thisArg + || !(CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + thisArg, sizeof(inW)/sizeof(inW[0]), inW, + sizeof(inW)/sizeof(inW[0])) == CSTR_EQUAL)) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 57bc82a..21440b5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -630,7 +630,7 @@ c ------ eol option @todo_wine(a)ad @todo_wine(a)z@y -(a)todo_wine@a|d +a|d @todo_wine(a)no output @todo_wine(a)no output ------ delims option @@ -639,7 +639,7 @@ c @todo_wine(a)a d @todo_wine(a)a @todo_wine(a)C r -(a)todo_wine@foo bar baz +foo bar baz @todo_wine(a)c:\ ------ skip option @todo_wine(a)c

1 0

Alexandre Julliard : user32: Add a driver entry point for UpdateLayeredWindow.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 24eee97d21e0e8034dd9b567d8feec131526a220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24eee97d21e0e8034dd9b567d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 18:13:01 2012 +0200 user32: Add a driver entry point for UpdateLayeredWindow. --- dlls/user32/driver.c | 16 +++++++++++++ dlls/user32/exticon.c | 1 + dlls/user32/focus.c | 1 + dlls/user32/hook.c | 1 + dlls/user32/user_private.h | 1 + dlls/user32/win.c | 34 +--------------------------- dlls/user32/winproc.c | 1 + dlls/winex11.drv/window.c | 43 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 1 + 9 files changed, 67 insertions(+), 32 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 1d3d96a..20837d0 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -22,6 +22,7 @@ #include <stdio.h> #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "wine/debug.h" @@ -122,6 +123,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(SetWindowText); GET_USER_FUNC(ShowWindow); GET_USER_FUNC(SysCommand); + GET_USER_FUNC(UpdateLayeredWindow); GET_USER_FUNC(WindowMessage); GET_USER_FUNC(WindowPosChanging); GET_USER_FUNC(WindowPosChanged); @@ -413,6 +415,12 @@ static LRESULT CDECL nulldrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam return -1; } +static BOOL CDECL nulldrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, + const RECT *window_rect ) +{ + return TRUE; +} + static LRESULT CDECL nulldrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { return 0; @@ -489,6 +497,7 @@ static USER_DRIVER null_driver = nulldrv_SetWindowText, nulldrv_ShowWindow, nulldrv_SysCommand, + nulldrv_UpdateLayeredWindow, nulldrv_WindowMessage, nulldrv_WindowPosChanging, nulldrv_WindowPosChanged @@ -757,6 +766,12 @@ static LRESULT CDECL loaderdrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lpar return load_driver()->pSysCommand( hwnd, wparam, lparam ); } +static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, + const RECT *window_rect ) +{ + return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect ); +} + static LRESULT CDECL loaderdrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { return load_driver()->pWindowMessage( hwnd, msg, wparam, lparam ); @@ -837,6 +852,7 @@ static USER_DRIVER lazy_load_driver = loaderdrv_SetWindowText, loaderdrv_ShowWindow, loaderdrv_SysCommand, + loaderdrv_UpdateLayeredWindow, loaderdrv_WindowMessage, loaderdrv_WindowPosChanging, loaderdrv_WindowPosChanged diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index fb9ff03..840483c 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -36,6 +36,7 @@ #define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "winnls.h" #include "user_private.h" diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 6b5312f..bd2e572 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "win.h" #include "user_private.h" diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 1ba5dda..c9e9e20 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -70,6 +70,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "winerror.h" #include "win.h" diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 505b2bf..6e337ca 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -111,6 +111,7 @@ typedef struct tagUSER_DRIVER { void (CDECL *pSetWindowText)(HWND,LPCWSTR); UINT (CDECL *pShowWindow)(HWND,INT,RECT*,UINT); LRESULT (CDECL *pSysCommand)(HWND,WPARAM,LPARAM); + BOOL (CDECL *pUpdateLayeredWindow)(HWND,const UPDATELAYEREDWINDOWINFO *,const RECT *); LRESULT (CDECL *pWindowMessage)(HWND,UINT,WPARAM,LPARAM); void (CDECL *pWindowPosChanging)(HWND,HWND,UINT,const RECT *,const RECT *,RECT *,struct window_surface**); void (CDECL *pWindowPosChanged)(HWND,HWND,UINT,const RECT *,const RECT *,const RECT *,const RECT *,struct window_surface*); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 6845369..023af02 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3648,7 +3648,6 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF DWORD flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW; RECT window_rect, client_rect; SIZE offset; - BYTE alpha = 0xff; if (!info || info->cbSize != sizeof(*info) || @@ -3693,39 +3692,10 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF TRACE( "window %p win %s client %s\n", hwnd, wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(&client_rect) ); - set_window_pos( hwnd, 0, flags, &window_rect, &client_rect, NULL ); - - if (info->hdcSrc) - { - HDC hdc = GetWindowDC( hwnd ); - if (hdc) - { - int x = 0, y = 0; - RECT rect; - - GetWindowRect( hwnd, &rect ); - OffsetRect( &rect, -rect.left, -rect.top); - if (info->pptSrc) - { - x = info->pptSrc->x; - y = info->pptSrc->y; - } + if (!USER_Driver->pUpdateLayeredWindow( hwnd, info, &window_rect )) return FALSE; - if (!info->prcDirty || (info->prcDirty && IntersectRect(&rect, &rect, info->prcDirty))) - { - TRACE( "copying window %p pos %d,%d\n", hwnd, x, y ); - BitBlt( hdc, rect.left, rect.top, rect.right, rect.bottom, - info->hdcSrc, rect.left + x, rect.top + y, SRCCOPY ); - } - ReleaseDC( hwnd, hdc ); - } - } - - if (info->pblend && !(info->dwFlags & ULW_OPAQUE)) alpha = info->pblend->SourceConstantAlpha; - TRACE( "setting window %p alpha %u\n", hwnd, alpha ); - USER_Driver->pSetLayeredWindowAttributes( hwnd, info->crKey, alpha, - info->dwFlags & (LWA_ALPHA | LWA_COLORKEY) ); + set_window_pos( hwnd, 0, flags, &window_rect, &client_rect, NULL ); return TRUE; } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index de7de6f..33afbdd 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "controls.h" #include "win.h" #include "user_private.h" diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index dff4384..45c3a36 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2324,6 +2324,49 @@ void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alph } +/***************************************************************************** + * UpdateLayeredWindow (X11DRV.@) + */ +BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, + const RECT *window_rect ) +{ + BYTE alpha = 0xff; + + if (info->hdcSrc) + { + HDC hdc = GetWindowDC( hwnd ); + + if (hdc) + { + int x = 0, y = 0; + RECT rect; + + GetWindowRect( hwnd, &rect ); + OffsetRect( &rect, -rect.left, -rect.top); + if (info->pptSrc) + { + x = info->pptSrc->x; + y = info->pptSrc->y; + } + + if (!info->prcDirty || (info->prcDirty && IntersectRect(&rect, &rect, info->prcDirty))) + { + TRACE( "copying window %p pos %d,%d\n", hwnd, x, y ); + BitBlt( hdc, rect.left, rect.top, rect.right, rect.bottom, + info->hdcSrc, rect.left + x, rect.top + y, SRCCOPY ); + } + ReleaseDC( hwnd, hdc ); + } + } + + if (info->pblend && !(info->dwFlags & ULW_OPAQUE)) alpha = info->pblend->SourceConstantAlpha; + TRACE( "setting window %p alpha %u\n", hwnd, alpha ); + X11DRV_SetLayeredWindowAttributes( hwnd, info->crKey, alpha, + info->dwFlags & (LWA_ALPHA | LWA_COLORKEY) ); + return TRUE; +} + + /********************************************************************** * X11DRV_WindowMessage (X11DRV.@) */ diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 1e8d4d9..8f68a47 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -51,6 +51,7 @@ @ cdecl SetWindowText(long wstr) X11DRV_SetWindowText @ cdecl ShowWindow(long long ptr long) X11DRV_ShowWindow @ cdecl SysCommand(long long long) X11DRV_SysCommand +@ cdecl UpdateLayeredWindow(long ptr ptr) X11DRV_UpdateLayeredWindow @ cdecl WindowMessage(long long long long) X11DRV_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) X11DRV_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) X11DRV_WindowPosChanged

1 0

Alexandre Julliard : user32: Invalid DCEs when the window surface changes.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: ddf41276e145896664834828389d1ff6f1567f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf41276e1458966648348283… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 13:17:53 2012 +0200 user32: Invalid DCEs when the window surface changes. --- dlls/user32/winpos.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 0593140..c866a5d 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2017,9 +2017,13 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, } SERVER_END_REQ; - if (ret && (((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || - (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED)))) - invalidate_dce( win, &old_window_rect ); + if (ret) + { + if (old_surface != new_surface || + ((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || + (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED))) + invalidate_dce( win, &old_window_rect ); + } WIN_ReleasePtr( win );

1 0