October 2012 - Wine-Commits

Jason Edmeades : cmd: cmd.exe /c or / k should suppress copy overwrite prompts.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: b1dacc6c379ede878b5740a8ab5df635538b6e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1dacc6c379ede878b5740a8a… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Oct 1 22:37:17 2012 +0100 cmd: cmd.exe /c or /k should suppress copy overwrite prompts. --- programs/cmd/builtins.c | 3 +- programs/cmd/tests/test_builtins.cmd | 86 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 43 +++++++++++++++ programs/cmd/wcmdmain.c | 7 ++- 4 files changed, 137 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f6922ad..f1c356c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); extern int defaultColor; extern BOOL echo_mode; +extern BOOL interactive; struct env_stack *pushd_directories; const WCHAR dotW[] = {'.','\0'}; @@ -446,7 +447,7 @@ void WCMD_copy (void) { else { /* By default, we will force the overwrite in batch mode and ask for * confirmation in interactive mode. */ - force = !!context; + force = !interactive; /* If COPYCMD is set, then we force the overwrite with /Y and ask for * confirmation with /-Y. If COPYCMD is neither of those, then we use the diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d89721a..1c0f875 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1816,8 +1816,94 @@ goto :eof :endlocalfinished echo %var% +set var= +set var2= cd .. & rd /q/s foobar +echo ------------ cmd.exe command lines ------------ +mkdir foobar +cd foobar +echo file1 > file1 + +rem Basic test of command line. Note a section prefix per command +rem to resync, as wine does not output anything in these cases yet. +echo --- Test 1 +cmd.exe /c echo Line1 +echo --- Test 2 +cmd.exe /c echo Test quotes "&" work +echo --- Test 3 +cmd.exe /c echo "&" +echo --- Test 4 +cmd.exe /c echo "<" +echo --- Test 5 +cmd.exe /c echo ">" +echo --- Test 6 +cmd.exe /c echo "\" +echo --- Test 7 +cmd.exe /c echo "|" +echo --- Test 8 +cmd.exe /c echo "`" +echo --- Test 9 +cmd.exe /c echo """ +echo --- Test 10 +echo on > file3 +(a)type file3 +(a)echo off +echo --- Test 11 +cmd.exe /c echo on >file3 +(a)type file3 +(a)echo off +echo --- Test 12 +cmd.exe /c "echo passed1" +echo --- Test 13 +cmd.exe /c " echo passed2 " +echo --- Test 14 +cmd.exe /c "dir /ad ..\fooba* /b" +echo --- Test 15 + +rem Ensure no interactive prompting when cmd.exe /c or /k +echo file2 > file2 +cmd.exe /c copy file1 file2 >nul +echo No prompts or I would not get here1 +rem - Try cmd.exe /k as well +cmd.exe /k "copy file1 file2 >nul && exit" +echo No prompts or I would not get here2 + +rem Non existing variable expansion is as per command line, ie left as-is +cmd.exe /c echo %%hello1%% +cmd.exe /c echo %%hello2 +cmd.exe /c echo %%hello3^:h=t%% +cmd.exe /c echo %%hello4%%%% + +rem Cannot issue a call from cmd.exe /c +cmd.exe /c call :hello5 + +rem %1-9 has no meaning +cmd.exe /c echo one = %%1 + +rem for loop vars need expanding +cmd.exe /c for /L %%i in (1,1,5) do @echo %%i + +rem goto's are ineffective +cmd.exe /c goto :fred +cmd.exe /c goto eof + +rem - %var% is expanded at read time, not execute time +set var=11 +cmd.exe /c "set var=22 && setlocal && set var=33 && endlocal && echo var contents: %%var%%" + +rem - endlocal ineffective on cmd.exe /c lines +cmd.exe /c "set var=22 && setlocal && set var=33 && endlocal && set var" +set var=99 + +rem - Environment is inherited ok +cmd.exe /c ECHO %%VAR%% + +rem - Exit works +cmd.exe /c exit + +cd .. +rd foobar /s /q echo ------------ Testing Errorlevel ------------ rem WARNING: Do *not* add tests using ErrorLevel after this section should_not_exist 2> nul > nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4bab1ef..e817706 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -907,6 +907,49 @@ value1 2 1 1 +------------ cmd.exe command lines ------------ +--- Test 1 +Line1 +--- Test 2 +(a)todo_wine@Test quotes "&" work +--- Test 3 +(a)todo_wine@"&" +--- Test 4 +(a)todo_wine@"<" +--- Test 5 +(a)todo_wine@">" +--- Test 6 +(a)todo_wine@"\" +--- Test 7 +(a)todo_wine@"|" +--- Test 8 +(a)todo_wine@"`" +--- Test 9 +(a)todo_wine@""" +--- Test 10 +--- Test 11 +--- Test 12 +(a)todo_wine@passed1 +--- Test 13 +(a)todo_wine@passed2(a)space@ +--- Test 14 +(a)todo_wine@foobar +--- Test 15 +No prompts or I would not get here1 +No prompts or I would not get here2 +%hello1% +%hello2 +%hello3:h=t% +%hello4%% +one = %1 +1 +2 +3 +4 +5 +(a)todo_wine@var contents: 11 +var=33(a)space@ +99 ------------ Testing Errorlevel ------------ 9009 1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 02babea..0e7a197 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -39,6 +39,7 @@ extern struct env_stack *pushd_directories; BATCH_CONTEXT *context = NULL; DWORD errorlevel; WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; +BOOL interactive; int defaultColor = 7; BOOL echo_mode = TRUE; @@ -2366,6 +2367,9 @@ int wmain (int argc, WCHAR *argvW[]) WCMD_echo(eoff); } + /* Until we start to read from the keyboard, stay as non-interactive */ + interactive = FALSE; + if (opt_c || opt_k) { int len,qcount; WCHAR** arg; @@ -2625,7 +2629,8 @@ int wmain (int argc, WCHAR *argvW[]) */ SetEnvironmentVariableW(promptW, defaultpromptW); - WCMD_version (); + interactive = TRUE; + if (!opt_k) WCMD_version (); while (TRUE) { /* Read until EOF (which for std input is never, but if redirect

1 0

Jason Edmeades : cmd: Fix basic cmd.exe /c "echo hello" type syntax.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 88f14bb59045e1d8c8bb0a71abb50f505620c420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f14bb59045e1d8c8bb0a71a… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 2 00:35:47 2012 +0100 cmd: Fix basic cmd.exe /c "echo hello" type syntax. Add checks for existance of command to run in order to keep the new quote handling capabilities of cmd.exe /C or /K. If the command cannot be found, drop back to /S processing mode as per cmd.exe help. --- programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 7 ++- programs/cmd/wcmdmain.c | 71 +++++++++++++++++++++++++++++- 3 files changed, 74 insertions(+), 5 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1c0f875..3e064b9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1829,6 +1829,7 @@ rem Basic test of command line. Note a section prefix per command rem to resync, as wine does not output anything in these cases yet. echo --- Test 1 cmd.exe /c echo Line1 +cmd.exe /c echo "Line2" echo --- Test 2 cmd.exe /c echo Test quotes "&" work echo --- Test 3 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e817706..6483f1e 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -910,6 +910,7 @@ value1 ------------ cmd.exe command lines ------------ --- Test 1 Line1 +(a)todo_wine@"Line2" --- Test 2 @todo_wine(a)Test quotes "&" work --- Test 3 @@ -929,11 +930,11 @@ Line1 --- Test 10 --- Test 11 --- Test 12 -(a)todo_wine@passed1 +passed1 --- Test 13 -(a)todo_wine@passed2(a)space@ +passed2(a)space@ --- Test 14 -(a)todo_wine@foobar +foobar --- Test 15 No prompts or I would not get here1 No prompts or I would not get here2 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0e7a197..675256b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2419,10 +2419,12 @@ int wmain (int argc, WCHAR *argvW[]) } } + /* If there is not exactly 2 quote characters, then /S (old behaviour) is enabled */ if (qcount!=2) opt_s = TRUE; - /* check argvW[0] for a space and invalid characters */ + /* check argvW[0] for a space and invalid characters. There must not be any invalid + * characters, but there must be one or more whitespace */ if (!opt_s) { opt_s = TRUE; p=*argvW; @@ -2432,7 +2434,7 @@ int wmain (int argc, WCHAR *argvW[]) opt_s = TRUE; break; } - if (*p==' ') + if (*p==' ' || *p=='\t') opt_s = FALSE; p++; } @@ -2507,6 +2509,71 @@ int wmain (int argc, WCHAR *argvW[]) WINE_TRACE("/c command line: '%s'\n", wine_dbgstr_w(cmd)); + /* Finally, we only stay in new mode IF the first parameter is quoted and + is a valid executable, ie must exist, otherwise drop back to old mode */ + if (!opt_s) { + WCHAR *thisArg = WCMD_parameter(cmd, 0, NULL, NULL, FALSE); + static const WCHAR extEXEW[] = {'.','e','x','e','\0'}; + static const WCHAR extCOMW[] = {'.','c','o','m','\0'}; + BOOL found = FALSE; + + /* If the supplied parameter has any directory information, look there */ + WINE_TRACE("First parameter is '%s'\n", wine_dbgstr_w(thisArg)); + if (strchrW(thisArg, '\\') != NULL) { + + GetFullPathNameW(thisArg, sizeof(string)/sizeof(WCHAR), string, NULL); + WINE_TRACE("Full path name '%s'\n", wine_dbgstr_w(string)); + p = string + strlenW(string); + + /* Does file exist with this name? */ + if (GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { + WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } else strcpyW(p, extEXEW); + + /* Does file exist with .exe appended */ + if (!found && GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { + WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } else strcpyW(p, extCOMW); + + /* Does file exist with .com appended */ + if (!found && GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { + WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + + /* Otherwise we now need to look in the path to see if we can find it */ + } else { + p = thisArg + strlenW(thisArg); + + /* Does file exist with this name? */ + if (SearchPathW(NULL, thisArg, NULL, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + + /* Does file exist plus an extension of .exe? */ + if (SearchPathW(NULL, thisArg, extEXEW, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + + /* Does file exist plus an extension of .com? */ + if (SearchPathW(NULL, thisArg, extCOMW, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + } + + /* If not found, drop back to old behaviour */ + if (!found) { + WINE_TRACE("Binary not found, dropping back to old behaviour\n"); + opt_s = TRUE; + } + + } + /* strip first and last quote characters if opt_s; check for invalid * executable is done later */ if (opt_s && *cmd=='\"')

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_RSGetState().
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: c7caabb864189c74ded7a221c93154e6bfce326a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7caabb864189c74ded7a221c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:10 2012 +0200 d3d10core: Implement d3d10_device_RSGetState(). --- dlls/d3d10core/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index d43ee4b..eaf0793 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -580,7 +580,12 @@ static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_RSGetState(ID3D10Device *iface, ID3D10RasterizerState **rasterizer_state) { - FIXME("iface %p, rasterizer_state %p stub!\n", iface, rasterizer_state); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); + + if ((*rasterizer_state = device->rasterizer_state ? &device->rasterizer_state->ID3D10RasterizerState_iface : NULL)) + ID3D10RasterizerState_AddRef(*rasterizer_state); } static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_RSSetState().
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: fbcce6787af79c7a6e11b45a7403a90a8519522b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcce6787af79c7a6e11b45a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:09 2012 +0200 d3d10core: Implement d3d10_device_RSSetState(). --- dlls/d3d10core/d3d10core_private.h | 35 ++++++++++++++++++++--------------- dlls/d3d10core/device.c | 6 +++++- dlls/d3d10core/state.c | 9 +++++++++ 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index f88355b..4f98c93 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -44,6 +44,8 @@ #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') +struct d3d10_device; + struct d3d10_shader_info { const DWORD *shader_code; @@ -68,21 +70,6 @@ void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; HRESULT parse_dxbc(const char *data, SIZE_T data_size, HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN; -/* IDirect3D10Device */ -struct d3d10_device -{ - IUnknown IUnknown_inner; - ID3D10Device ID3D10Device_iface; - IWineDXGIDeviceParent IWineDXGIDeviceParent_iface; - IUnknown *outer_unk; - LONG refcount; - - struct wined3d_device_parent device_parent; - struct wined3d_device *wined3d_device; -}; - -void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN; - /* ID3D10Texture2D */ struct d3d10_texture2d { @@ -248,6 +235,7 @@ struct d3d10_rasterizer_state }; HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) DECLSPEC_HIDDEN; +struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; /* ID3D10SamplerState */ struct d3d10_sampler_state @@ -267,6 +255,23 @@ struct d3d10_query HRESULT d3d10_query_init(struct d3d10_query *query) DECLSPEC_HIDDEN; +/* IDirect3D10Device */ +struct d3d10_device +{ + IUnknown IUnknown_inner; + ID3D10Device ID3D10Device_iface; + IWineDXGIDeviceParent IWineDXGIDeviceParent_iface; + IUnknown *outer_unk; + LONG refcount; + + struct wined3d_device_parent device_parent; + struct wined3d_device *wined3d_device; + + struct d3d10_rasterizer_state *rasterizer_state; +}; + +void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 00a34a9..d43ee4b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -342,7 +342,11 @@ static void STDMETHODCALLTYPE d3d10_device_DrawAuto(ID3D10Device *iface) static void STDMETHODCALLTYPE d3d10_device_RSSetState(ID3D10Device *iface, ID3D10RasterizerState *rasterizer_state) { - FIXME("iface %p, rasterizer_state %p stub!\n", iface, rasterizer_state); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); + + device->rasterizer_state = unsafe_impl_from_ID3D10RasterizerState(rasterizer_state); } static void STDMETHODCALLTYPE d3d10_device_RSSetViewports(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index edb2030..3b5c45f 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -372,6 +372,15 @@ HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) return S_OK; } +struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_rasterizer_state_vtbl); + + return impl_from_ID3D10RasterizerState(iface); +} + static inline struct d3d10_sampler_state *impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) { return CONTAINING_RECORD(iface, struct d3d10_sampler_state, ID3D10SamplerState_iface);

1 0

Piotr Caban : wininet: Added more fields to cookie structure.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

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

Piotr Caban : wininet: Added basic persistent cookie tests.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: c34bc977a012957b56076f65f227c2c58af7e7f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34bc977a012957b56076f65f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:22:27 2012 +0200 wininet: Added basic persistent cookie tests. --- dlls/wininet/tests/internet.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index a0b6466..5a8ba99 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <string.h> #include "windef.h" #include "winbase.h" @@ -368,6 +369,7 @@ static void test_complicated_cookie(void) BOOL ret; CHAR buffer[1024]; + CHAR user[256]; ret = InternetSetCookie("http://www.example.com/bar",NULL,"A=B; domain=.example.com"); ok(ret == TRUE,"InternetSetCookie failed\n"); @@ -471,6 +473,29 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"K=L")!=NULL,"K=L missing\n"); ok(strstr(buffer,"M=N")==NULL,"M=N present\n"); ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); + + /* test persistent cookies */ + ret = InternetSetCookie("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); + ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); + + len = sizeof(user); + ret = GetUserName(user, &len); + ok(ret, "GetUserName failed with error %d\n", GetLastError()); + for(; len>0; len--) + user[len-1] = tolower(user[len-1]); + + sprintf(buffer, "Cookie:%s(a)testing.example.com/", user); + ret = GetUrlCacheEntryInfo(buffer, NULL, &len); + ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() = %d\n", GetLastError()); + + /* remove persistent cookie */ + ret = InternetSetCookie("http://testing.example.com", NULL, "A=B"); + ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); + + ret = GetUrlCacheEntryInfo(buffer, NULL, &len); + ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError()); } static void test_cookie_url(void)

1 0

Jason Edmeades : cmd: Fix setlocal/endlocal implementation.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

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 +(a)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 +(a)pwd@\foobar\foobar2 globalval +(a)pwd@\foobar globalval +(a)pwd@\foobar --- setlocal with no corresponding endlocal globalval localval -(a)todo_wine@globalval +(a)pwd@\foobar\foobar2 +globalval +(a)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 +(a)pwd@\foobar\foodir3 +Finished: +value2 +(a)pwd@\foobar\foodir2 +value1 +(a)pwd@\foobar +--- Extra endlocal in called batch +value2 +value2 +(a)pwd@\foobar\foodir2 +value2 +(a)pwd@\foobar\foodir2 +Finished: +value2 +(a)pwd@\foobar\foodir2 +value1 +(a)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

Piotr Caban : wininet: Make cookies functions thread-safe.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: b9c2a19591b64d78c53aeec5c22b91204412bb86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c2a19591b64d78c53aeec5c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:23:10 2012 +0200 wininet: Make cookies functions thread-safe. --- dlls/wininet/cookie.c | 31 +++++++++++++++++++++++++++++-- dlls/wininet/internet.c | 1 + dlls/wininet/internet.h | 1 + 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 5253b2b..0a65e4c 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -49,7 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); /* FIXME - * Cookies are NOT THREAD SAFE * Cookies could use A LOT OF MEMORY. We need some kind of memory management here! */ @@ -78,6 +77,14 @@ struct _cookie_domain struct list cookie_list; }; +static CRITICAL_SECTION cookie_cs; +static CRITICAL_SECTION_DEBUG cookie_cs_debug = +{ + 0, 0, &cookie_cs, + { &cookie_cs_debug.ProcessLocksList, &cookie_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cookie_cs") } +}; +static CRITICAL_SECTION cookie_cs = { &cookie_cs_debug, -1, 0, 0, 0, 0 }; static struct list domain_list = LIST_INIT(domain_list); static cookie *COOKIE_addCookie(cookie_domain *domain, LPCWSTR name, LPCWSTR data, @@ -529,6 +536,8 @@ BOOL get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD GetSystemTimeAsFileTime(&tm); + EnterCriticalSection(&cookie_cs); + load_persistent_cookie(host, path); LIST_FOR_EACH_ENTRY(domain, &domain_list, cookie_domain, entry) { @@ -577,6 +586,8 @@ BOOL get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD } } + LeaveCriticalSection(&cookie_cs); + if (!domain_count) { TRACE("no cookies found for %s\n", debugstr_w(host)); SetLastError(ERROR_NO_MORE_ITEMS); @@ -825,6 +836,8 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki } } + EnterCriticalSection(&cookie_cs); + load_persistent_cookie(domain, path); LIST_FOR_EACH(cursor, &domain_list) @@ -843,6 +856,7 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki { heap_free(data); if (value != data) heap_free(value); + LeaveCriticalSection(&cookie_cs); return TRUE; } } @@ -866,11 +880,19 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki { heap_free(data); if (value != data) heap_free(value); + LeaveCriticalSection(&cookie_cs); return FALSE; } heap_free(data); if (value != data) heap_free(value); - return !update_persistent || save_persistent_cookie(thisCookieDomain); + + if (!update_persistent || save_persistent_cookie(thisCookieDomain)) + { + LeaveCriticalSection(&cookie_cs); + return TRUE; + } + LeaveCriticalSection(&cookie_cs); + return FALSE; } /*********************************************************************** @@ -1115,3 +1137,8 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDeci FIXME("(%s, 0x%08x) stub\n", debugstr_w(pchHostName), dwDecision); return FALSE; } + +void free_cookie(void) +{ + DeleteCriticalSection(&cookie_cs); +} diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a6dbaa1..0e83389 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -315,6 +315,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) collect_connections(COLLECT_CLEANUP); NETCON_unload(); free_urlcache(); + free_cookie(); if (g_dwTlsErrIndex != TLS_OUT_OF_INDEXES) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index a4fcdaa..181ef4c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -553,6 +553,7 @@ server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL); BOOL init_urlcache(void) DECLSPEC_HIDDEN; void free_urlcache(void) DECLSPEC_HIDDEN; +void free_cookie(void) DECLSPEC_HIDDEN; #define MAX_REPLY_LEN 0x5B4

1 0

Piotr Caban : wininet: Added support for urlcache file name generating.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: e4a0281679ee8436a8a4632590d11f0f5c675776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a0281679ee8436a8a463259… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:21:04 2012 +0200 wininet: Added support for urlcache file name generating. --- dlls/wininet/urlcache.c | 41 +++++++++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 249ac46..24bf48b 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2861,13 +2861,13 @@ BOOL WINAPI CreateUrlCacheEntryW( BYTE CacheDir; LONG lBufferSize; BOOL bFound = FALSE; + BOOL generate_name = FALSE; int count; DWORD error; HANDLE hFile; FILETIME ft; static const WCHAR szWWW[] = {'w','w','w',0}; - static const WCHAR fmt[] = {'%','0','8','X','%','s',0}; TRACE("(%s, 0x%08x, %s, %p, 0x%08x)\n", debugstr_w(lpszUrlName), @@ -2879,7 +2879,7 @@ BOOL WINAPI CreateUrlCacheEntryW( if (dwReserved) FIXME("dwReserved 0x%08x\n", dwReserved); - lpszUrlEnd = lpszUrlName + strlenW(lpszUrlName); + lpszUrlEnd = lpszUrlName + strlenW(lpszUrlName); if (((lpszUrlEnd - lpszUrlName) > 1) && (*(lpszUrlEnd - 1) == '/' || *(lpszUrlEnd - 1) == '\\')) lpszUrlEnd--; @@ -2917,14 +2917,14 @@ BOOL WINAPI CreateUrlCacheEntryW( while(len && szFile[--len] == '/') szFile[len] = '\0'; /* FIXME: get rid of illegal characters like \, / and : */ + TRACE("File name: %s\n", debugstr_a(szFile)); } else { - FIXME("need to generate a random filename\n"); + generate_name = TRUE; + szFile[0] = 0; } - TRACE("File name: %s\n", debugstr_a(szFile)); - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { @@ -2978,7 +2978,7 @@ BOOL WINAPI CreateUrlCacheEntryW( lstrcpyW(szExtension+1, lpszFileExtension); } - for (i = 0; i < 255; i++) + for (i = 0; i<255 && !generate_name; i++) { static const WCHAR szFormat[] = {'[','%','u',']','%','s',0}; WCHAR *p; @@ -3008,15 +3008,32 @@ BOOL WINAPI CreateUrlCacheEntryW( } } + /* Try to generate random name */ GetSystemTimeAsFileTime(&ft); - wsprintfW(lpszFileNameNoPath + countnoextension, fmt, ft.dwLowDateTime, szExtension); + strcpyW(lpszFileNameNoPath+countnoextension+8, szExtension); - TRACE("Trying: %s\n", debugstr_w(lpszFileName)); - hFile = CreateFileW(lpszFileName, GENERIC_READ, 0, NULL, CREATE_NEW, 0, NULL); - if (hFile != INVALID_HANDLE_VALUE) + for(i=0; i<255; i++) { - CloseHandle(hFile); - return TRUE; + int j; + ULONGLONG n = ft.dwHighDateTime; + n <<= 32; + n += ft.dwLowDateTime; + n ^= (ULONGLONG)i<<48; + + for(j=0; j<8; j++) + { + int r = (n % 36); + n /= 37; + lpszFileNameNoPath[countnoextension+j] = (r < 10 ? '0' + r : 'A' + r - 10); + } + + TRACE("Trying: %s\n", debugstr_w(lpszFileName)); + hFile = CreateFileW(lpszFileName, GENERIC_READ, 0, NULL, CREATE_NEW, 0, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + CloseHandle(hFile); + return TRUE; + } } WARN("Could not find a unique filename\n");

1 0

Piotr Caban : wininet: Added basic cookie domain validation in set_cookie function.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: fc219b0ab37da8b80d023fa1aaa957ec01b61b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc219b0ab37da8b80d023fa1a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:22:57 2012 +0200 wininet: Added basic cookie domain validation in set_cookie function. --- dlls/wininet/cookie.c | 83 ++++++++++++++++++++++++++++------------- dlls/wininet/tests/internet.c | 20 ++++++++++ 2 files changed, 77 insertions(+), 26 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 46adf68..5253b2b 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -678,6 +678,43 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, return r; } + +/*********************************************************************** + * IsDomainLegalCookieDomainW (WININET.@) + */ +BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 ) +{ + DWORD s1_len, s2_len; + + FIXME("(%s, %s) semi-stub\n", debugstr_w(s1), debugstr_w(s2)); + + if (!s1 || !s2) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (s1[0] == '.' || !s1[0] || s2[0] == '.' || !s2[0]) + { + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } + if(!strchrW(s1, '.') || !strchrW(s2, '.')) + return FALSE; + + s1_len = strlenW(s1); + s2_len = strlenW(s2); + if (s1_len > s2_len) + return FALSE; + + if (strncmpiW(s1, s2+s2_len-s1_len, s1_len) || (s2_len>s1_len && s2[s2_len-s1_len-1]!='.')) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return TRUE; +} + BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cookie_data) { cookie_domain *thisCookieDomain = NULL; @@ -727,7 +764,26 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki if (strncmpiW(ptr, szDomain, 7) == 0) { - ptr+=strlenW(szDomain); + WCHAR *end_ptr; + + ptr += sizeof(szDomain)/sizeof(szDomain[0])-1; + if(*ptr == '.') + ptr++; + end_ptr = strchrW(ptr, ';'); + if(end_ptr) + *end_ptr = 0; + + if(!IsDomainLegalCookieDomainW(ptr, domain)) + { + if(value != data) + heap_free(value); + heap_free(data); + return FALSE; + } + + if(end_ptr) + *end_ptr = ';'; + domain = ptr; TRACE("Parsing new domain %s\n",debugstr_w(domain)); } @@ -1059,28 +1115,3 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDeci FIXME("(%s, 0x%08x) stub\n", debugstr_w(pchHostName), dwDecision); return FALSE; } - -/*********************************************************************** - * IsDomainLegalCookieDomainW (WININET.@) - */ -BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 ) -{ - const WCHAR *p; - - FIXME("(%s, %s)\n", debugstr_w(s1), debugstr_w(s2)); - - if (!s1 || !s2) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (s1[0] == '.' || !s1[0] || s2[0] == '.' || !s2[0]) - { - SetLastError(ERROR_INVALID_NAME); - return FALSE; - } - if (!(p = strchrW(s2, '.'))) return FALSE; - if (strchrW(p + 1, '.') && !strcmpW(p + 1, s1)) return TRUE; - else if (!strcmpW(s1, s2)) return TRUE; - return FALSE; -} diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5a8ba99..cf1fc4e 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -496,6 +496,15 @@ static void test_complicated_cookie(void) ret = GetUrlCacheEntryInfo(buffer, NULL, &len); ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError()); + + /* try setting cookie for different domain */ + ret = InternetSetCookie("http://www.aaa.example.com/bar",NULL,"E=F; domain=different.com"); + ok(!ret, "InternetSetCookie succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %d\n", GetLastError()); + ret = InternetSetCookie("http://www.aaa.example.com.pl/bar",NULL,"E=F; domain=example.com.pl"); + ok(ret, "InternetSetCookie failed with error: %d\n", GetLastError()); + ret = InternetSetCookie("http://www.aaa.example.com.pl/bar",NULL,"E=F; domain=com.pl"); + todo_wine ok(!ret, "InternetSetCookie succeeded\n"); } static void test_cookie_url(void) @@ -828,6 +837,8 @@ static void test_IsDomainLegalCookieDomainW(void) static const WCHAR dot_com[] = {'.','c','o','m',0}; static const WCHAR gmail_com[] = {'g','m','a','i','l','.','c','o','m',0}; static const WCHAR dot_gmail_com[] = {'.','g','m','a','i','l','.','c','o','m',0}; + static const WCHAR www_gmail_com[] = {'w','w','w','.','g','m','a','i','l','.','c','o','m',0}; + static const WCHAR www_mail_gmail_com[] = {'w','w','w','.','m','a','i','l','.','g','m','a','i','l','.','c','o','m',0}; static const WCHAR mail_gmail_com[] = {'m','a','i','l','.','g','m','a','i','l','.','c','o','m',0}; static const WCHAR gmail_co_uk[] = {'g','m','a','i','l','.','c','o','.','u','k',0}; static const WCHAR co_uk[] = {'c','o','.','u','k',0}; @@ -924,6 +935,12 @@ static void test_IsDomainLegalCookieDomainW(void) ret = pIsDomainLegalCookieDomainW(gmail_com, gmail_com); ok(ret, "IsDomainLegalCookieDomainW failed\n"); + ret = pIsDomainLegalCookieDomainW(gmail_com, www_gmail_com); + ok(ret, "IsDomainLegalCookieDomainW failed\n"); + + ret = pIsDomainLegalCookieDomainW(gmail_com, www_mail_gmail_com); + ok(ret, "IsDomainLegalCookieDomainW failed\n"); + SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(gmail_co_uk, co_uk); error = GetLastError(); @@ -940,6 +957,9 @@ static void test_IsDomainLegalCookieDomainW(void) ret = pIsDomainLegalCookieDomainW(gmail_co_uk, dot_co_uk); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ret = pIsDomainLegalCookieDomainW(co_uk, gmail_co_uk); + todo_wine ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ret = pIsDomainLegalCookieDomainW(gmail_co_uk, gmail_co_uk); ok(ret, "IsDomainLegalCookieDomainW failed\n");

1 0