wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Piotr Caban : wininet: Added more fields to cookie structure.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: ee47def0adf81da86c8a6ff9ced626124cca0fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee47def0adf81da86c8a6ff9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:20:35 2012 +0200 wininet: Added more fields to cookie structure. --- dlls/wininet/cookie.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 8552548..6f21628 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -65,7 +65,9 @@ struct _cookie LPWSTR lpCookieName; LPWSTR lpCookieData; + DWORD flags; FILETIME expiry; + FILETIME create; }; struct _cookie_domain @@ -90,14 +92,25 @@ static void COOKIE_deleteDomain(cookie_domain *deadDomain); static cookie *COOKIE_addCookie(cookie_domain *domain, LPCWSTR name, LPCWSTR data, FILETIME expiry) { cookie *newCookie = heap_alloc(sizeof(cookie)); + if (!newCookie) + return NULL; - list_init(&newCookie->entry); - newCookie->lpCookieName = NULL; - newCookie->lpCookieData = NULL; - newCookie->expiry = expiry; newCookie->lpCookieName = heap_strdupW(name); newCookie->lpCookieData = heap_strdupW(data); + if (!newCookie->lpCookieName || !newCookie->lpCookieData) + { + heap_free(newCookie->lpCookieName); + heap_free(newCookie->lpCookieData); + heap_free(newCookie); + + return NULL; + } + + newCookie->flags = 0; /* TODO */ + newCookie->expiry = expiry; + GetSystemTimeAsFileTime(&newCookie->create); + TRACE("added cookie %p (data is %s)\n", newCookie, debugstr_w(data) ); list_add_tail(&domain->cookie_list, &newCookie->entry);

1 0

Jason Edmeades : cmd: Ensure current directory saved during cmd /c.
by Alexandre Julliard 01 Oct '12

01 Oct '12

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

Jason Edmeades : cmd: Fix setlocal/endlocal implementation.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: c55cd87632bdb54c0ea506edc279ebb9118def95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c55cd87632bdb54c0ea506edc… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Sep 30 23:07:01 2012 +0100 cmd: Fix setlocal/endlocal implementation. --- programs/cmd/batch.c | 9 ++ programs/cmd/builtins.c | 14 +++- programs/cmd/tests/test_builtins.cmd | 136 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 50 +++++++++++- programs/cmd/wcmd.h | 3 +- 5 files changed, 207 insertions(+), 5 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 4926b1f..b77931d 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -22,6 +22,8 @@ #include "wcmd.h" #include "wine/debug.h" +extern struct env_stack *saved_environment; + WINE_DEFAULT_DEBUG_CHANNEL(cmd); /**************************************************************************** @@ -94,6 +96,13 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA CloseHandle (h); /* + * If there are outstanding setlocal's to the current context, unwind them. + */ + while (saved_environment && saved_environment->batchhandle == context->h) { + WCMD_endlocal(); + } + +/* * If invoked by a CALL, we return to the context of our caller. Otherwise return * to the caller's caller. */ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f9e51e5..f6922ad 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -103,7 +103,7 @@ static const WCHAR parmY[] = {'/','Y','\0'}; static const WCHAR parmNoY[] = {'/','-','Y','\0'}; static HINSTANCE hinst; -static struct env_stack *saved_environment; +struct env_stack *saved_environment; static BOOL verify_mode = FALSE; /************************************************************************** @@ -2087,6 +2087,9 @@ void WCMD_setlocal (const WCHAR *s) { struct env_stack *env_copy; WCHAR cwd[MAX_PATH]; + /* setlocal does nothing outside of batch programs */ + if (!context) return; + /* DISABLEEXTENSIONS ignored */ env_copy = LocalAlloc (LMEM_FIXED, sizeof (struct env_stack)); @@ -2097,10 +2100,10 @@ void WCMD_setlocal (const WCHAR *s) { } env = GetEnvironmentStringsW (); - env_copy->strings = WCMD_dupenv (env); if (env_copy->strings) { + env_copy->batchhandle = context->h; env_copy->next = saved_environment; saved_environment = env_copy; @@ -2127,7 +2130,12 @@ void WCMD_endlocal (void) { struct env_stack *temp; int len, n; - if (!saved_environment) + /* setlocal does nothing outside of batch programs */ + if (!context) return; + + /* setlocal needs a saved environment from within the same context (batch + program) as it was saved in */ + if (!saved_environment || saved_environment->batchhandle != context->h) return; /* pop the old environment from the stack */ diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f564aed..d89721a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1659,27 +1659,163 @@ cmd /e:oN /C tmp.cmd rem FIXME: creating file before setting envvar value to prevent parsing-time evaluation (due to EnableDelayedExpansion not being implemented/available yet) echo --- setlocal with corresponding endlocal +rem %CD% does not tork on NT4 so use the following workaround +for /d %%i in (.) do set CURDIR=%%~dpnxi echo @echo off> test.cmd echo echo %%VAR%%>> test.cmd echo setlocal>> test.cmd echo set VAR=localval>> test.cmd +echo md foobar2>> test.cmd +echo cd foobar2>> test.cmd echo echo %%VAR%%>> test.cmd +echo for /d %%%%i in (.) do echo %%%%~dpnxi>> test.cmd echo endlocal>> test.cmd echo echo %%VAR%%>> test.cmd +echo for /d %%%%i in (.) do echo %%%%~dpnxi>> test.cmd set VAR=globalval call test.cmd echo %VAR% +for /d %%i in (.) do echo %%~dpnxi +cd /d %curdir% +rd foobar2 set VAR= echo --- setlocal with no corresponding endlocal echo @echo off> test.cmd echo echo %%VAR%%>> test.cmd echo setlocal>> test.cmd echo set VAR=localval>> test.cmd +echo md foobar2>> test.cmd +echo cd foobar2>> test.cmd echo echo %%VAR%%>> test.cmd +echo for /d %%%%i in (.) do echo %%%%~dpnxi>> test.cmd set VAR=globalval +rem %CD% does not tork on NT4 so use the following workaround +for /d %%i in (.) do set CURDIR=%%~dpnxi call test.cmd echo %VAR% +for /d %%i in (.) do echo %%~dpnxi +cd /d %curdir% +rd foobar2 set VAR= +echo --- setlocal within same batch program +set var1=one +set var2= +set var3= +rem %CD% does not tork on NT4 so use the following workaround +for /d %%i in (.) do set CURDIR=%%~dpnxi +setlocal +set var2=two +mkdir foobar2 +cd foobar2 +setlocal +set var3=three +if "%var1%"=="one" echo Var1 ok 1 +if "%var2%"=="two" echo Var2 ok 2 +if "%var3%"=="three" echo Var3 ok 3 +for /d %%i in (.) do set curdir2=%%~dpnxi +if "%curdir2%"=="%curdir%\foobar2" echo Directory is ok 1 +endlocal +if "%var1%"=="one" echo Var1 ok 1 +if "%var2%"=="two" echo Var2 ok 2 +if "%var3%"=="" echo Var3 ok 3 +for /d %%i in (.) do set curdir2=%%~dpnxi +if "%curdir2%"=="%curdir%\foobar2" echo Directory is ok 2 +endlocal +if "%var1%"=="one" echo Var1 ok 1 +if "%var2%"=="" echo Var2 ok 2 +if "%var3%"=="" echo Var3 ok 3 +for /d %%i in (.) do set curdir2=%%~dpnxi +if "%curdir2%"=="%curdir%" echo Directory is ok 3 +rd foobar2 /s /q +set var1= + +echo --- Mismatched set and end locals +mkdir foodir2 2>nul +mkdir foodir3 2>nul +mkdir foodir4 2>nul +rem %CD% does not tork on NT4 so use the following workaround +for /d %%i in (.) do set curdir=%%~dpnxi + +echo @echo off> 2set1end.cmd +echo echo %%VAR%%>> 2set1end.cmd +echo setlocal>> 2set1end.cmd +echo set VAR=2set1endvalue1>> 2set1end.cmd +echo cd ..\foodir3>> 2set1end.cmd +echo setlocal>> 2set1end.cmd +echo set VAR=2set1endvalue2>> 2set1end.cmd +echo cd ..\foodir4>> 2set1end.cmd +echo endlocal>> 2set1end.cmd +echo echo %%VAR%%>> 2set1end.cmd +echo for /d %%%%i in (.) do echo %%%%~dpnxi>> 2set1end.cmd + +echo @echo off> 1set2end.cmd +echo echo %%VAR%%>> 1set2end.cmd +echo setlocal>> 1set2end.cmd +echo set VAR=1set2endvalue1>> 1set2end.cmd +echo cd ..\foodir3>> 1set2end.cmd +echo endlocal>> 1set2end.cmd +echo echo %%VAR%%>> 1set2end.cmd +echo for /d %%%%i in (.) do echo %%%%~dpnxi>> 1set2end.cmd +echo endlocal>> 1set2end.cmd +echo echo %%VAR%%>> 1set2end.cmd +echo for /d %%%%i in (.) do echo %%%%~dpnxi>> 1set2end.cmd + +echo --- Extra setlocal in called batch +set VAR=value1 +rem -- setlocal1 == this batch, should never be used inside a called routine +setlocal +set var=value2 +cd foodir2 +call %curdir%\2set1end.cmd +echo Finished: +echo %VAR% +for /d %%i in (.) do echo %%~dpnxi +endlocal +echo %VAR% +for /d %%i in (.) do echo %%~dpnxi +cd /d %curdir% + +echo --- Extra endlocal in called batch +set VAR=value1 +rem -- setlocal1 == this batch, should never be used inside a called routine +setlocal +set var=value2 +cd foodir2 +call %curdir%\1set2end.cmd +echo Finished: +echo %VAR% +for /d %%i in (.) do echo %%~dpnxi +endlocal +echo %VAR% +for /d %%i in (.) do echo %%~dpnxi +cd /d %curdir% + +echo --- endlocal in called function rather than batch pgm is ineffective +@echo off +set var=1 +set var2=1 +setlocal +set var=2 +call :endlocalroutine +echo %var% +endlocal +echo %var% +goto :endlocalfinished +:endlocalroutine +echo %var% +endlocal +echo %var% +setlocal +set var2=2 +endlocal +echo %var2% +endlocal +echo %var% +echo %var2% +goto :eof +:endlocalfinished +echo %var% + cd .. & rd /q/s foobar echo ------------ Testing Errorlevel ------------ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 435d0e6..4bab1ef 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -853,12 +853,60 @@ ErrLev: 0 --- setlocal with corresponding endlocal globalval localval +@pwd@\foobar\foobar2 globalval +@pwd@\foobar globalval +@pwd@\foobar --- setlocal with no corresponding endlocal globalval localval -@todo_wine@globalval +@pwd@\foobar\foobar2 +globalval +@pwd@\foobar +--- setlocal within same batch program +Var1 ok 1 +Var2 ok 2 +Var3 ok 3 +Directory is ok 1 +Var1 ok 1 +Var2 ok 2 +Var3 ok 3 +Directory is ok 2 +Var1 ok 1 +Var2 ok 2 +Var3 ok 3 +Directory is ok 3 +--- Mismatched set and end locals +--- Extra setlocal in called batch +value2 +2set1endvalue1 +@pwd@\foobar\foodir3 +Finished: +value2 +@pwd@\foobar\foodir2 +value1 +@pwd@\foobar +--- Extra endlocal in called batch +value2 +value2 +@pwd@\foobar\foodir2 +value2 +@pwd@\foobar\foodir2 +Finished: +value2 +@pwd@\foobar\foodir2 +value1 +@pwd@\foobar +--- endlocal in called function rather than batch pgm is ineffective +2 +2 +1 +2 +1 +2 +1 +1 ------------ Testing Errorlevel ------------ 9009 1 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 451c49b..32edc2b 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -146,9 +146,10 @@ struct env_stack struct env_stack *next; union { int stackdepth; /* Only used for pushd and popd */ - WCHAR cwd; /* Only used for set/endlocal */ + WCHAR cwd; /* Only used for set/endlocal */ } u; WCHAR *strings; + HANDLE batchhandle; /* Used to ensure set/endlocals stay in scope */ }; /* Data structure to save setlocal and pushd information */

1 0

Jason Edmeades : cmd: Add full for /R support.
by Alexandre Julliard 01 Oct '12

01 Oct '12

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

Jason Edmeades : cmd: Convert wcmd_for to use WCMD_parameter.
by Alexandre Julliard 01 Oct '12

01 Oct '12

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@ad @todo_wine@z@y -@todo_wine@a|d +a|d @todo_wine@no output @todo_wine@no output ------ delims option @@ -639,7 +639,7 @@ c @todo_wine@a d @todo_wine@a @todo_wine@C r -@todo_wine@foo bar baz +foo bar baz @todo_wine@c:\ ------ skip option @todo_wine@c

1 0

Jacek Caban : vbscript: Added Right() implementation.
by Alexandre Julliard 01 Oct '12

01 Oct '12

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

Jacek Caban : vbscript: Added Left() implementation.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 3e45fbcb6b210ebf32118b6bace4baf0dd8b9f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e45fbcb6b210ebf32118b6ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 1 12:59:56 2012 +0200 vbscript: Added Left() 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 3f88207..98eb047 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -632,10 +632,42 @@ static HRESULT Global_LenB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI return E_NOTIMPL; } -static HRESULT Global_Left(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Left(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, len); + SysFreeString(conv_str); + if(!ret) + return E_OUTOFMEMORY; + + return return_bstr(res, ret); } static HRESULT Global_LeftB(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 9e39a0f..c6f8536 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -205,6 +205,16 @@ TestStrReverse "", "" TestStrReverse 123, "321" if isEnglishLang then TestStrReverse true, "eurT" +Sub TestLeft(str, len, ex) + Call ok(Left(str, len) = ex, "Left(" & str & ", " & len & ") = " & Left(str, len)) +End Sub + +TestLeft "test", 2, "te" +TestLeft "test", 5, "test" +TestLeft "test", 0, "" +TestLeft 123, 2, "12" +if isEnglishLang then TestLeft true, 2, "Tr" + 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

Alexandre Julliard : user32: Add a driver entry point for UpdateLayeredWindow.
by Alexandre Julliard 01 Oct '12

01 Oct '12

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 01 Oct '12

01 Oct '12

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

Alexandre Julliard : user32: Also call set_window_pos when the WS_EX_LAYERED bit is changed.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 61f9789c3127a2a3ac3bf2d679caac94523bfce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f9789c3127a2a3ac3bf2d67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 13:17:40 2012 +0200 user32: Also call set_window_pos when the WS_EX_LAYERED bit is changed. --- dlls/user32/win.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0dbe29e..6845369 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2472,9 +2472,10 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B } SERVER_END_REQ; - if (offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) + if ((offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) || + (offset == GWL_EXSTYLE && ((style.styleOld ^ style.styleNew) & WS_EX_LAYERED))) { - needs_show = !(wndPtr->flags & WIN_HIDDEN) && (style.styleNew & WS_VISIBLE); + needs_show = !(wndPtr->flags & WIN_HIDDEN) && (wndPtr->dwStyle & WS_VISIBLE); invalidate_dce( wndPtr, NULL ); } WIN_ReleasePtr( wndPtr );

1 0

← Newer
1
...
89
90
91
92
93
94
95
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012