March 2006 - Wine-Commits - list.winehq.org

Alexandre Julliard : winsock: Renamed the winsock directory to ws2_32.
by Alexandre Julliard March 15, 2006

March 15, 2006

Module: wine Branch: refs/heads/master Commit: af781f398aa2dc98197f72dedada50f6fbd6d672 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=af781f398aa2dc98197f72d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 09:57:30 2006 +0100 winsock: Renamed the winsock directory to ws2_32. --- configure | 6 configure.ac | 4 dlls/.gitignore | 1 dlls/Makefile.in | 18 dlls/winsock/.gitignore | 3 dlls/winsock/Makefile.in | 27 dlls/winsock/async.c | 776 ------- dlls/winsock/protocol.c | 418 ---- dlls/winsock/socket.c | 4683 ---------------------------------------- dlls/winsock/socket16.c | 604 ----- dlls/winsock/tests/.gitignore | 4 dlls/winsock/tests/Makefile.in | 14 dlls/winsock/tests/protocol.c | 109 - dlls/winsock/tests/sock.c | 1443 ------------ dlls/winsock/version.rc | 26 dlls/winsock/winsock.spec | 48 dlls/winsock/ws2_32.spec | 119 - dlls/ws2_32/.gitignore | 3 dlls/ws2_32/Makefile.in | 27 dlls/ws2_32/async.c | 776 +++++++ dlls/ws2_32/protocol.c | 418 ++++ dlls/ws2_32/socket.c | 4683 ++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket16.c | 604 +++++ dlls/ws2_32/tests/.gitignore | 4 dlls/ws2_32/tests/Makefile.in | 14 dlls/ws2_32/tests/protocol.c | 109 + dlls/ws2_32/tests/sock.c | 1443 ++++++++++++ dlls/ws2_32/version.rc | 26 dlls/ws2_32/winsock.spec | 48 dlls/ws2_32/ws2_32.spec | 119 + programs/winetest/Makefile.in | 4 31 files changed, 8288 insertions(+), 8293 deletions(-) delete mode 100644 dlls/winsock/.gitignore delete mode 100644 dlls/winsock/Makefile.in delete mode 100644 dlls/winsock/async.c delete mode 100644 dlls/winsock/protocol.c delete mode 100644 dlls/winsock/socket.c delete mode 100644 dlls/winsock/socket16.c delete mode 100644 dlls/winsock/tests/.gitignore delete mode 100644 dlls/winsock/tests/Makefile.in delete mode 100644 dlls/winsock/tests/protocol.c delete mode 100644 dlls/winsock/tests/sock.c delete mode 100644 dlls/winsock/version.rc delete mode 100644 dlls/winsock/winsock.spec delete mode 100644 dlls/winsock/ws2_32.spec create mode 100644 dlls/ws2_32/.gitignore create mode 100644 dlls/ws2_32/Makefile.in create mode 100644 dlls/ws2_32/async.c create mode 100644 dlls/ws2_32/protocol.c create mode 100644 dlls/ws2_32/socket.c create mode 100644 dlls/ws2_32/socket16.c create mode 100644 dlls/ws2_32/tests/.gitignore create mode 100644 dlls/ws2_32/tests/Makefile.in create mode 100644 dlls/ws2_32/tests/protocol.c create mode 100644 dlls/ws2_32/tests/sock.c create mode 100644 dlls/ws2_32/version.rc create mode 100644 dlls/ws2_32/winsock.spec create mode 100644 dlls/ws2_32/ws2_32.spec Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=af781f398aa2dc98197…

1 0

Alexandre Julliard : wineprefixcreate: Fixed datadir path. Added dependency on relpath.
by Alexandre Julliard March 15, 2006

March 15, 2006

Module: wine Branch: refs/heads/master Commit: b47f0593c8c43d0a2820b763981691d98c059bb5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b47f0593c8c43d0a2820b76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 09:54:19 2006 +0100 wineprefixcreate: Fixed datadir path. Added dependency on relpath. --- tools/Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index cb8337a..1fcc092 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -69,8 +69,8 @@ sfnt2fnt$(EXEEXT): sfnt2fnt.o bin2res$(EXEEXT): bin2res.o $(CC) $(CFLAGS) -o $@ bin2res.o $(LIBPORT) -wineprefixcreate: wineprefixcreate.in - sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) +wineprefixcreate: wineprefixcreate.in relpath$(EXEEXT) + sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)/wine`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) chmod +x wineprefixcreate install install-lib:: wineprefixcreate

1 0

bugzilla/template/en/default/bug edit.html.tmp ...
by Jeremy Newman March 14, 2006

March 14, 2006

ChangeSet ID: 23553 CVSROOT: /opt/cvs-commit Module name: bugzilla Changes by: jnewman(a)winehq.org 2006/03/14 14:16:10 Modified files: template/en/default/bug: edit.html.tmpl template/en/default/bug/create: create.html.tmpl Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Add note to attach and not paste logs and back traces. Patch: http://cvs.winehq.org/patch.py?id=23553 Old revision New revision Changes Path 1.2 1.3 +1 -1 bugzilla/template/en/default/bug/edit.html.tmpl 1.1.1.1 1.2 +1 -1 bugzilla/template/en/default/bug/create/create.html.tmpl Index: bugzilla/template/en/default/bug/edit.html.tmpl diff -u -p bugzilla/template/en/default/bug/edit.html.tmpl:1.2 bugzilla/template/en/default/bug/edit.html.tmpl:1.3 --- bugzilla/template/en/default/bug/edit.html.tmpl:1.2 14 Mar 2006 20:16:10 -0000 +++ bugzilla/template/en/default/bug/edit.html.tmpl 14 Mar 2006 20:16:10 -0000 @@ -392,7 +392,7 @@ [%# *** Comments Groups *** %] <br> - <b>Additional <u>C</u>omments:</b> + <b>Additional <u>C</u>omments:</b><font size"-1"> Please do not PASTE logs and back traces, (attach them instead).<font> [% IF Param("insidergroup") && UserInGroup(Param("insidergroup")) %] <input type="checkbox" name="commentprivacy" value="1"> Private [% END %] Index: bugzilla/template/en/default/bug/create/create.html.tmpl diff -u -p bugzilla/template/en/default/bug/create/create.html.tmpl:1.1.1.1 bugzilla/template/en/default/bug/create/create.html.tmpl:1.2 --- bugzilla/template/en/default/bug/create/create.html.tmpl:1.1.1.1 14 Mar 2006 20:16:10 -0000 +++ bugzilla/template/en/default/bug/create/create.html.tmpl 14 Mar 2006 20:16:10 -0000 @@ -184,7 +184,7 @@ <input name="short_desc" size="60" value="[% short_desc FILTER html %]"> </td> </tr> - + <tr><td></td><td>Please do not PASTE logs and back traces (create an attachment instead)</td></tr> <tr><td align="right" valign="top"><strong>Description:</strong></td> <td colspan="3"> <textarea wrap="hard" name="comment" rows="10" cols="80">

1 0

Pierre d'Herbemont : wineprefixcreate: Make path searching relative.
by Alexandre Julliard March 14, 2006

March 14, 2006

Module: wine Branch: refs/heads/master Commit: b1be72451102e46f3e44c94a3565eb546aebb541 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b1be72451102e46f3e44c94… Author: Pierre d'Herbemont <stegefin(a)free.fr> Date: Sat Mar 11 21:12:11 2006 +0100 wineprefixcreate: Make path searching relative. --- tools/Makefile.in | 2 +- tools/wineprefixcreate.in | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index c44525d..cb8337a 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -70,7 +70,7 @@ bin2res$(EXEEXT): bin2res.o $(CC) $(CFLAGS) -o $@ bin2res.o $(LIBPORT) wineprefixcreate: wineprefixcreate.in - sed -e 's,@dlldir\@,$(dlldir),g' -e 's,@datadir\@,$(datadir),g' $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) + sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) chmod +x wineprefixcreate install install-lib:: wineprefixcreate diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index 876a533..3effdb5 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -36,8 +36,31 @@ usage() set -e -dlldir="@dlldir@" -datadir="@datadir@/wine" +bindir="" +case "$0" in + */*) + # $0 contains a path, use it + bindir=`dirname "$0"` + ;; + *) + # no directory in $0, search in PATH + saved_ifs=$IFS + IFS=: + for d in $PATH + do + IFS=$saved_ifs + if [ -x "$d/$0" ] + then + bindir="$d" + break + fi + done + ;; +esac + +bindir=`cd "$bindir" && pwd` +dlldir="$bindir/@bintodlldir@" +datadir="$bindir/@bintodatadir@" do_wait=0 quiet=0

1 0

Dmitry Timoshkov : shell32: Add parameter formatting rule to the command line if there isn't any.
by Alexandre Julliard March 14, 2006

March 14, 2006

Module: wine Branch: refs/heads/master Commit: 52645e11444cbbd62ad07efa0c6c7873facc35bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=52645e11444cbbd62ad07ef… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 13 13:44:41 2006 +0800 shell32: Add parameter formatting rule to the command line if there isn't any. --- dlls/shell32/shlexec.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index f5b1e88..1f4638a 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -848,7 +848,14 @@ static UINT_PTR execute_from_key(LPWSTR /* Is there a replace() function anywhere? */ cmdlen /= sizeof(WCHAR); cmd[cmdlen] = '\0'; - SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline); + if (!SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline)) + { + /* looks like there is no %1 param in the cmd, add one */ + static const WCHAR oneW[] = { ' ','\"','%','1','\"',0 }; + strcatW(cmd, oneW); + SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline); + } + TRACE("executing: %s\n", debugstr_w(param)); retval = execfunc(param, env, FALSE, psei, psei_out); } else

1 0

Robert Shearman : wininet: Move URL-related tests to a separate file.
by Alexandre Julliard March 14, 2006

March 14, 2006

Module: wine Branch: refs/heads/master Commit: 74cb03247d3cfb5d4eae60348a403c726a914931 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=74cb03247d3cfb5d4eae603… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 14 18:49:19 2006 +0100 wininet: Move URL-related tests to a separate file. --- dlls/wininet/tests/.gitignore | 1 dlls/wininet/tests/Makefile.in | 3 dlls/wininet/tests/http.c | 655 --------------------------------------- dlls/wininet/tests/url.c | 671 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 675 insertions(+), 655 deletions(-) create mode 100644 dlls/wininet/tests/url.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=74cb03247d3cfb5d4ea…

1 0

Robert Shearman : wininet: Make InternetCrackUrlW set the components related to net_loc
by Alexandre Julliard March 14, 2006

March 14, 2006

Module: wine Branch: refs/heads/master Commit: 366fc247fcc27a4208d6e8ec081138726462538d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=366fc247fcc27a4208d6e8e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 14 14:35:37 2006 +0000 wininet: Make InternetCrackUrlW set the components related to net_loc to NULL when net_loc isn't present in the input URL. --- dlls/wininet/internet.c | 22 +++++++++++++--------- dlls/wininet/tests/http.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 73c3a15..42eb61d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1337,13 +1337,13 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp break; } + lpUC->nScheme = INTERNET_SCHEME_UNKNOWN; + lpUC->nPort = INTERNET_INVALID_PORT_NUMBER; + /* Parse <params> */ lpszParam = strpbrkW(lpszap, lpszSeparators); - if (lpszParam != NULL) - { - SetUrlComponentValueW(&lpUC->lpszExtraInfo, &lpUC->dwExtraInfoLength, - lpszParam, dwUrlLength-(lpszParam-lpszUrl)); - } + SetUrlComponentValueW(&lpUC->lpszExtraInfo, &lpUC->dwExtraInfoLength, + lpszParam, lpszParam ? dwUrlLength-(lpszParam-lpszUrl) : 0); if (bIsAbsolute) /* Parse <protocol>:[//<net_loc>] */ { @@ -1425,7 +1425,6 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp { SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, lpszHost, lpszPort - lpszHost); - lpUC->nPort = 0; lpszcp=lpszNetLoc; } else @@ -1444,7 +1443,6 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp lpszcp=lpszHost; SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0); - lpUC->nPort = 0; } else { @@ -1467,7 +1465,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp lpUC->nPort = INTERNET_DEFAULT_GOPHER_PORT; break; default: - lpUC->nPort = INTERNET_INVALID_PORT_NUMBER; + break; } } } @@ -1478,9 +1476,15 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0); SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0); SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0); - lpUC->nPort = 0; } } + else + { + SetUrlComponentValueW(&lpUC->lpszScheme, &lpUC->dwSchemeLength, NULL, 0); + SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0); + SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0); + SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0); + } /* Here lpszcp points to: * diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 093fb74..6611572 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -683,6 +683,7 @@ static void InternetCrackUrlW_test(void) 'C','F','I','D','E','/','m','a','i','n','.','c','f','m','?','C','F','S','V','R', '=','I','D','E','&','A','C','T','I','O','N','=','I','D','E','_','D','E','F','A', 'U','L','T', 0 }; + static const WCHAR url2[] = { '.','.','/','R','i','t','z','.','x','m','l',0 }; URL_COMPONENTSW comp; WCHAR scheme[20], host[20], user[20], pwd[20], urlpart[50], extra[50]; BOOL r; @@ -762,6 +763,35 @@ static void InternetCrackUrlW_test(void) ok( comp.dwPasswordLength == 0, "password length wrong\n"); ok( comp.dwUrlPathLength == 15, "url length wrong\n"); ok( comp.dwExtraInfoLength == 29, "extra length wrong\n"); + + urlpart[0]=0; + scheme[0]=0; + extra[0]=0; + host[0]=0; + user[0]=0; + pwd[0]=0; + memset(&comp, 0, sizeof(comp)); + comp.dwStructSize = sizeof(comp); + comp.lpszScheme = scheme; + comp.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]); + comp.lpszHostName = host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); + comp.lpszUserName = user; + comp.dwUserNameLength = sizeof(user)/sizeof(user[0]); + comp.lpszPassword = pwd; + comp.dwPasswordLength = sizeof(pwd)/sizeof(pwd[0]); + comp.lpszUrlPath = urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); + comp.lpszExtraInfo = extra; + comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); + + r = InternetCrackUrlW(url2, 0, 0, &comp); + ok( r, "InternetCrackUrl failed, error %lx\n",GetLastError()); + ok(!comp.dwSchemeLength,".dwSchemeLength should be 0, but is %ld\n", comp.dwSchemeLength); + ok(!comp.dwHostNameLength,".dwHostNameLength should be 0, but is %ld\n", comp.dwHostNameLength); + ok(!comp.dwUserNameLength,".dwUserNameLength should be 0, but is %ld\n", comp.dwUserNameLength); + ok(!comp.dwPasswordLength,".dwPasswordLength should be 0, but is %ld\n", comp.dwPasswordLength); + ok(!comp.dwExtraInfoLength,".dwExtraInfoLength should be 0, but is %ld\n", comp.dwExtraInfoLength); } static void InternetTimeFromSystemTimeA_test(void)

1 0

Robert Shearman : wininet: Move cookie-related stubs to cookie.c
by Alexandre Julliard March 14, 2006

March 14, 2006

Module: wine Branch: refs/heads/master Commit: 153aac019459745c8c5663d7c5e24beab31854f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=153aac019459745c8c5663d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 14 14:35:52 2006 +0000 wininet: Move cookie-related stubs to cookie.c --- dlls/wininet/cookie.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wininet/internet.c | 82 -------------------------- 2 files changed, 149 insertions(+), 82 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 043de1b..231faca 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -504,3 +504,152 @@ BOOL WINAPI InternetSetCookieA(LPCSTR lp return r; } + +/*********************************************************************** + * InternetSetCookieExA (WININET.@) + * + * See InternetSetCookieExW. + */ +DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR lpszCookieData, + DWORD dwFlags, DWORD_PTR dwReserved) +{ + FIXME("(%s, %s, %s, 0x%08lx, 0x%08lx) stub\n", + debugstr_a(lpszURL), debugstr_a(lpszCookieName), debugstr_a(lpszCookieData), + dwFlags, dwReserved); + return TRUE; +} + +/*********************************************************************** + * InternetSetCookieExW (WININET.@) + * + * Sets a cookie for the specified URL. + * + * RETURNS + * TRUE on success + * FALSE on failure + * + */ +DWORD WINAPI InternetSetCookieExW( LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCWSTR lpszCookieData, + DWORD dwFlags, DWORD_PTR dwReserved) +{ + FIXME("(%s, %s, %s, 0x%08lx, 0x%08lx) stub\n", + debugstr_w(lpszURL), debugstr_w(lpszCookieName), debugstr_w(lpszCookieData), + dwFlags, dwReserved); + return TRUE; +} + +/*********************************************************************** + * InternetGetCookieExA (WININET.@) + * + * See InternetGetCookieExW. + */ +BOOL WINAPI InternetGetCookieExA( LPCSTR pchURL, LPCSTR pchCookieName, LPSTR pchCookieData, + LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved) +{ + FIXME("(%s, %s, %s, %p, 0x%08lx, %p) stub\n", + debugstr_a(pchURL), debugstr_a(pchCookieName), debugstr_a(pchCookieData), + pcchCookieData, dwFlags, lpReserved); + return FALSE; +} + +/*********************************************************************** + * InternetGetCookieExW (WININET.@) + * + * Retrieve cookie for the specified URL. + * + * RETURNS + * TRUE on success + * FALSE on failure + * + */ +BOOL WINAPI InternetGetCookieExW( LPCWSTR pchURL, LPCWSTR pchCookieName, LPWSTR pchCookieData, + LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved) +{ + FIXME("(%s, %s, %s, %p, 0x%08lx, %p) stub\n", + debugstr_w(pchURL), debugstr_w(pchCookieName), debugstr_w(pchCookieData), + pcchCookieData, dwFlags, lpReserved); + return FALSE; +} + +/*********************************************************************** + * InternetClearAllPerSiteCookieDecisions (WININET.@) + * + * Clears all per-site decisions about cookies. + * + * RETURNS + * TRUE on success + * FALSE on failure + * + */ +BOOL WINAPI InternetClearAllPerSiteCookieDecisions( VOID ) +{ + FIXME("stub\n"); + return TRUE; +} + +/*********************************************************************** + * InternetEnumPerSiteCookieDecisionA (WININET.@) + * + * See InternetEnumPerSiteCookieDecisionW. + */ +BOOL WINAPI InternetEnumPerSiteCookieDecisionA( LPSTR pszSiteName, unsigned long *pcSiteNameSize, + unsigned long *pdwDecision, unsigned long dwIndex ) +{ + FIXME("(%s, %p, %p, 0x%08lx) stub\n", + debugstr_a(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex); + return FALSE; +} + +/*********************************************************************** + * InternetEnumPerSiteCookieDecisionW (WININET.@) + * + * Enumerates all per-site decisions about cookies. + * + * RETURNS + * TRUE on success + * FALSE on failure + * + */ +BOOL WINAPI InternetEnumPerSiteCookieDecisionW( LPWSTR pszSiteName, unsigned long *pcSiteNameSize, + unsigned long *pdwDecision, unsigned long dwIndex ) +{ + FIXME("(%s, %p, %p, 0x%08lx) stub\n", + debugstr_w(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex); + return FALSE; +} + +/*********************************************************************** + * InternetGetPerSiteCookieDecisionA (WININET.@) + */ +BOOL WINAPI InternetGetPerSiteCookieDecisionA( LPCSTR pwchHostName, unsigned long *pResult ) +{ + FIXME("(%s, %p) stub\n", debugstr_a(pwchHostName), pResult); + return FALSE; +} + +/*********************************************************************** + * InternetGetPerSiteCookieDecisionW (WININET.@) + */ +BOOL WINAPI InternetGetPerSiteCookieDecisionW( LPCWSTR pwchHostName, unsigned long *pResult ) +{ + FIXME("(%s, %p) stub\n", debugstr_w(pwchHostName), pResult); + return FALSE; +} + +/*********************************************************************** + * InternetSetPerSiteCookieDecisionA (WININET.@) + */ +BOOL WINAPI InternetSetPerSiteCookieDecisionA( LPCSTR pchHostName, DWORD dwDecision ) +{ + FIXME("(%s, 0x%08lx) stub\n", debugstr_a(pchHostName), dwDecision); + return FALSE; +} + +/*********************************************************************** + * InternetSetPerSiteCookieDecisionW (WININET.@) + */ +BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDecision ) +{ + FIXME("(%s, 0x%08lx) stub\n", debugstr_w(pchHostName), dwDecision); + return FALSE; +} diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f2d4ad3..73c3a15 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4139,88 +4139,6 @@ BOOL WINAPI CreateMD5SSOHash( PWSTR pszC return FALSE; } -BOOL WINAPI InternetClearAllPerSiteCookieDecisions( VOID ) -{ - FIXME("stub\n"); - return TRUE; -} - -BOOL WINAPI InternetEnumPerSiteCookieDecisionA( LPSTR pszSiteName, unsigned long *pcSiteNameSize, - unsigned long *pdwDecision, unsigned long dwIndex ) -{ - FIXME("(%s, %p, %p, 0x%08lx) stub\n", - debugstr_a(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex); - return FALSE; -} - -BOOL WINAPI InternetEnumPerSiteCookieDecisionW( LPWSTR pszSiteName, unsigned long *pcSiteNameSize, - unsigned long *pdwDecision, unsigned long dwIndex ) -{ - FIXME("(%s, %p, %p, 0x%08lx) stub\n", - debugstr_w(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex); - return FALSE; -} - -BOOL WINAPI InternetGetCookieExA( LPCSTR pchURL, LPCSTR pchCookieName, LPSTR pchCookieData, - LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved) -{ - FIXME("(%s, %s, %s, %p, 0x%08lx, %p) stub\n", - debugstr_a(pchURL), debugstr_a(pchCookieName), debugstr_a(pchCookieData), - pcchCookieData, dwFlags, lpReserved); - return FALSE; -} - -BOOL WINAPI InternetGetCookieExW( LPCWSTR pchURL, LPCWSTR pchCookieName, LPWSTR pchCookieData, - LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved) -{ - FIXME("(%s, %s, %s, %p, 0x%08lx, %p) stub\n", - debugstr_w(pchURL), debugstr_w(pchCookieName), debugstr_w(pchCookieData), - pcchCookieData, dwFlags, lpReserved); - return FALSE; -} - -BOOL WINAPI InternetGetPerSiteCookieDecisionA( LPCSTR pwchHostName, unsigned long *pResult ) -{ - FIXME("(%s, %p) stub\n", debugstr_a(pwchHostName), pResult); - return FALSE; -} - -BOOL WINAPI InternetGetPerSiteCookieDecisionW( LPCWSTR pwchHostName, unsigned long *pResult ) -{ - FIXME("(%s, %p) stub\n", debugstr_w(pwchHostName), pResult); - return FALSE; -} - -BOOL WINAPI InternetSetPerSiteCookieDecisionA( LPCSTR pchHostName, DWORD dwDecision ) -{ - FIXME("(%s, 0x%08lx) stub\n", debugstr_a(pchHostName), dwDecision); - return FALSE; -} - -BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDecision ) -{ - FIXME("(%s, 0x%08lx) stub\n", debugstr_w(pchHostName), dwDecision); - return FALSE; -} - -DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR lpszCookieData, - DWORD dwFlags, DWORD_PTR dwReserved) -{ - FIXME("(%s, %s, %s, 0x%08lx, 0x%08lx) stub\n", - debugstr_a(lpszURL), debugstr_a(lpszCookieName), debugstr_a(lpszCookieData), - dwFlags, dwReserved); - return TRUE; -} - -DWORD WINAPI InternetSetCookieExW( LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCWSTR lpszCookieData, - DWORD dwFlags, DWORD_PTR dwReserved) -{ - FIXME("(%s, %s, %s, 0x%08lx, 0x%08lx) stub\n", - debugstr_w(lpszURL), debugstr_w(lpszCookieName), debugstr_w(lpszCookieData), - dwFlags, dwReserved); - return TRUE; -} - BOOL WINAPI ResumeSuspendedDownload( HINTERNET hInternet, DWORD dwError ) { FIXME("(%p, 0x%08lx) stub\n", hInternet, dwError);

1 0

Robert Shearman : wininet: Implement setting of send and receive timeouts.
by Alexandre Julliard March 14, 2006

March 14, 2006

Module: wine Branch: refs/heads/master Commit: 5b5d45586ed5b051b5bdbefbf43d08862e196b9f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5b5d45586ed5b051b5bdbef… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 14 14:36:11 2006 +0000 wininet: Implement setting of send and receive timeouts. --- dlls/wininet/internet.c | 26 ++++++++++++++++++++++---- dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 51db944..f2d4ad3 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2442,11 +2442,29 @@ BOOL WINAPI InternetSetOptionW(HINTERNET case INTERNET_OPTION_DISABLE_PASSPORT_AUTH: TRACE("Option INTERNET_OPTION_DISABLE_PASSPORT_AUTH: harmless stub, since not enabled\n"); break; - case INTERNET_OPTION_RECEIVE_TIMEOUT: - FIXME("Option INTERNET_OPTION_RECEIVE_TIMEOUT: STUB\n"); - break; case INTERNET_OPTION_SEND_TIMEOUT: - FIXME("Option INTERNET_OPTION_SEND_TIMEOUT: STUB\n"); + case INTERNET_OPTION_RECEIVE_TIMEOUT: + TRACE("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT\n"); + if (dwBufferLength == sizeof(DWORD)) + { + if (lpwhh->htype == WH_HHTTPREQ) + ret = NETCON_set_timeout( + &((LPWININETHTTPREQW)lpwhh)->netConnection, + dwOption == INTERNET_OPTION_SEND_TIMEOUT, + *(DWORD *)lpBuffer); + else + { + FIXME("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT not supported on protocol %d\n", + lpwhh->htype); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + } + } + else + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + } break; case INTERNET_OPTION_CONNECT_RETRIES: FIXME("Option INTERNET_OPTION_CONNECT_RETRIES: STUB\n"); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6399de9..8043e4c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -481,6 +481,7 @@ BOOL NETCON_recv(WININET_NETCONNECTION * int *recvd /* out */); BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPDWORD dwBuffer); LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection); +BOOL NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value); extern void URLCacheContainers_CreateDefaults(void); extern void URLCacheContainers_DeleteAll(void); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e046e04..0c9d06f 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -714,3 +714,31 @@ LPCVOID NETCON_GetCert(WININET_NETCONNEC return NULL; #endif } + +BOOL NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value) +{ + int result; + struct timeval tv; + + /* FIXME: we should probably store the timeout in the connection to set + * when we do connect */ + if (!NETCON_connected(connection)) + return TRUE; + + /* value is in milliseconds, convert to struct timeval */ + tv.tv_sec = value / 1000; + tv.tv_usec = (value % 1000) * 1000; + + result = setsockopt(connection->socketFD, SOL_SOCKET, + send ? SO_SNDTIMEO : SO_RCVTIMEO, &tv, + sizeof(tv)); + + if (result == -1) + { + WARN("setsockopt failed (%s)\n", strerror(errno)); + INTERNET_SetLastError(sock_get_error(errno)); + return FALSE; + } + + return TRUE; +}

1 0

Robert Shearman : ntdll: Move the call to MODULE_DllThreadAttach from the kernel32
by Alexandre Julliard March 14, 2006

March 14, 2006

Module: wine Branch: refs/heads/master Commit: ea6f3a4cc0ba4a8e0a30df259052c8bb3e25ba5b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea6f3a4cc0ba4a8e0a30df2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 14 14:35:21 2006 +0000 ntdll: Move the call to MODULE_DllThreadAttach from the kernel32 thread creation function to the NTDLL one. --- dlls/kernel/thread.c | 2 -- dlls/ntdll/ntdll.spec | 5 ----- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/kernel/thread.c b/dlls/kernel/thread.c index 41a8ccf..2d83707 100644 --- a/dlls/kernel/thread.c +++ b/dlls/kernel/thread.c @@ -54,7 +54,6 @@ struct new_thread_info void *arg; }; -extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ); /* FIXME */ /*********************************************************************** * THREAD_Start @@ -74,7 +73,6 @@ static void CALLBACK THREAD_Start( void __TRY { - MODULE_DllThreadAttach( NULL ); ExitThread( func( arg ) ); } __EXCEPT(UnhandledExceptionFilter) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7ccbbfd..b2001ae 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1390,8 +1390,3 @@ @ cdecl wine_nt_to_unix_file_name(ptr ptr long long) @ cdecl wine_unix_to_nt_file_name(ptr ptr) @ cdecl __wine_init_windows_dir(wstr wstr) - -################################################################ -# Wine dll separation hacks, these will go away, don't use them -# -@ cdecl MODULE_DllThreadAttach(ptr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index c32a246..35cbd5b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -60,6 +60,7 @@ extern void DECLSPEC_NORETURN server_exi extern void DECLSPEC_NORETURN server_abort_thread( int status ); /* module handling */ +extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ); extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ); extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 5bfdcee..6e3d019 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -39,6 +39,7 @@ #include "wine/pthread.h" #include "wine/debug.h" #include "ntdll_misc.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(thread); @@ -273,6 +274,26 @@ HANDLE thread_init(void) return exe_file; } +typedef ULONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); +static PUNHANDLED_EXCEPTION_FILTER get_unhandled_exception_filter(void) +{ + static PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter; + static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + UNICODE_STRING module_name; + ANSI_STRING func_name; + HMODULE kernel32_handle; + + if (unhandled_exception_filter) return unhandled_exception_filter; + + RtlInitUnicodeString(&module_name, kernel32W); + RtlInitAnsiString( &func_name, "UnhandledExceptionFilter" ); + + if (LdrGetDllHandle( 0, 0, &module_name, &kernel32_handle ) == STATUS_SUCCESS) + LdrGetProcedureAddress( kernel32_handle, &func_name, 0, + (void **)&unhandled_exception_filter ); + + return unhandled_exception_filter; +} /*********************************************************************** * start_thread @@ -316,6 +337,23 @@ static void start_thread( struct wine_pt InsertHeadList( &tls_links, &teb->TlsLinks ); RtlReleasePebLock(); + /* NOTE: Windows does not have an exception handler around the call to + * the thread attach. We do for ease of debugging */ + if (get_unhandled_exception_filter()) + { + __TRY + { + MODULE_DllThreadAttach( NULL ); + } + __EXCEPT(get_unhandled_exception_filter()) + { + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); + } + __ENDTRY + } + else + MODULE_DllThreadAttach( NULL ); + func( arg ); }

1 0