December 2008 - Wine-commits

Jeremy Newman : set the width based on browser width
by Jeremy Newman 09 Dec '08

09 Dec '08

Module: website Branch: master Commit: a611bc8ad45274d0f4057e122ee46cf3b3f51f53 URL: http://source.winehq.org/git/website.git/?a=commit;h=a611bc8ad45274d0f4057e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 9 11:37:31 2008 -0600 set the width based on browser width --- templates/en/search.template | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/templates/en/search.template b/templates/en/search.template index 4eb5847..4c63769 100644 --- a/templates/en/search.template +++ b/templates/en/search.template @@ -5,9 +5,20 @@ <div id="cse-search-results"></div> <script type="text/javascript"> + $.gglclientCoords = function() { + var dimensions = {width: 0, height: 0}; + if (document.documentElement) { + dimensions.width = document.documentElement.offsetWidth; + dimensions.height = document.documentElement.offsetHeight; + } else if (window.innerWidth && window.innerHeight) { + dimensions.width = window.innerWidth; + dimensions.height = window.innerHeight; + } + return dimensions; + } var googleSearchIframeName = "cse-search-results"; var googleSearchFormName = "cse-search-box"; - var googleSearchFrameWidth = 800; + var googleSearchFrameWidth = ($.gglclientCoords().width - 250); var googleSearchDomain = "www.google.com"; var googleSearchPath = "/cse"; </script>

1 0

Jeremy Newman : top tab should link to base URL
by Jeremy Newman 09 Dec '08

09 Dec '08

Module: website Branch: master Commit: 6b8602dd41fa066c88c2e63952c44fb83a4334ff URL: http://source.winehq.org/git/website.git/?a=commit;h=6b8602dd41fa066c88c2e6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 9 11:25:15 2008 -0600 top tab should link to base URL --- include/themes/winehq/content.template | 4 ++-- include/themes/winehq/content_nobox.template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/themes/winehq/content.template b/include/themes/winehq/content.template index baea0f6..4fb8cad 100644 --- a/include/themes/winehq/content.template +++ b/include/themes/winehq/content.template @@ -42,8 +42,8 @@ <div id="tabs"> <ul> - <li class="s"><a href=".">WineHQ</a></li> - <li><a href="http://wiki.winehq.org">Wiki</a></li> + <li class="s"><a href="{$base_url}">WineHQ</a></li> + <li><a href="http://wiki.winehq.org/">Wiki</a></li> <li><a href="http://appdb.winehq.org/">AppDB</a></li> <li><a href="http://bugs.winehq.org/">Bugzilla</a></li> <li><a href="http://forums.winehq.org/">Forums</a></li> diff --git a/include/themes/winehq/content_nobox.template b/include/themes/winehq/content_nobox.template index c21b271..ddb2a27 100644 --- a/include/themes/winehq/content_nobox.template +++ b/include/themes/winehq/content_nobox.template @@ -42,7 +42,7 @@ <div id="tabs"> <ul> - <li class="s"><a href=".">WineHQ</a></li> + <li class="s"><a href="{$base_url}">WineHQ</a></li> <li><a href="http://wiki.winehq.org">Wiki</a></li> <li><a href="http://appdb.winehq.org/">AppDB</a></li> <li><a href="http://bugs.winehq.org/">Bugzilla</a></li>

1 0

Jeremy Newman : update the news date so it works even on wide screens
by Jeremy Newman 09 Dec '08

09 Dec '08

Module: website Branch: master Commit: 3199f83a08e63060284486babbff197334a01a28 URL: http://source.winehq.org/git/website.git/?a=commit;h=3199f83a08e63060284486… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 9 09:50:27 2008 -0600 update the news date so it works even on wide screens don't center latest releases, instead indent a bit a bit more white space between lines of latest release another IE fix, set left margin for home page menu --- styles.css | 12 ++++++++++-- templates/en/home.template | 11 ++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/styles.css b/styles.css index 297e898..bb4630a 100644 --- a/styles.css +++ b/styles.css @@ -192,15 +192,23 @@ BODY { /* header text */ H1.title { color: #A50D0D; border-bottom: 1px solid #A50D0D; margin: 0px; } +H1.title A { color: #A50D0D; text-decoration: none; } +H1.title A:hover { color: red; } H3.title { color: #A50D0D; border-bottom: 1px solid #A50D0D; margin: 0px; } -P.newsdate { color: #4e4e4e; font-size: 10pt; text-align: right; margin: 0 5px 10px 0;} +H3.title A { color: #A50D0D; text-decoration: none; } +H3.title A:hover { color: red; } +P.newsdate { color: #4e4e4e; font-size: 8pt; margin: 0 5px 10px 10px;} P.newstitle { color: #4e4e4e; font-size: 12pt; font-weight: bold; border-bottom: 1px solid #C0C0C0; margin-bottom: 5px; } P.newstitle A { color: #4e4e4e; text-decoration: none; } P.newstitle A:hover { color: #FF6666; text-decoration: none; } DIV.newsblock { margin: 0 5px 25px 10px; padding: 0; } /* winehq main page menu */ -ul.winehq_menu { list-style-type: none; margin: 20px 0px 0px 0px; } +ul.winehq_menu { + list-style-type: none; + margin: 20px 0px 0px 0px; + margin-left: expression("30px"); /* for IE */ + } ul.winehq_menu li { height: 50px; margin: 0px 0px 25px 0px; padding: 5px 0 0 45px; cursor: pointer; } ul.winehq_menu li.info { background-image: url('images/main_info.png'); background-repeat: no-repeat } ul.winehq_menu li.info:hover { background-image: url('images/main_info_s.png'); background-repeat: no-repeat } diff --git a/templates/en/home.template b/templates/en/home.template index a321334..dd17acd 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -58,10 +58,9 @@ <div class="content" style="padding: 5px 10px 5px 10px; height: 85px; overflow: auto;"> <h3 class="title" style="margin: 0;">Latest Releases</h3> - <div align="center" style="margin: 0; padding: 0;"> - <table style="margin: 7px 0 0 0; border-spacing: 0; border: 0;"> + <table style="margin: 7px 0 0 15px; border-spacing: 0; border: 0;"> <tr><td>Stable:</td> - <td style="padding-left: 15px;"> + <td style="padding-left: 15px; padding-bottom: 2px;"> <b><a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a></b> <span class="small"> (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">shortlog</a>) @@ -75,7 +74,6 @@ </span> </td></tr> </table> - </div> </div> <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> </div> @@ -84,12 +82,11 @@ <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> <div class="content" style="padding: 10px; height: 340px; overflow: auto;"> - <h3 class="title">News</h3> - <div style="text-align: right; margin: 0;"><a href="{$root}/news/" class="small">more news...</a></div> + <h3 class="title"><a href="{$root}/news/">News</a></h3>  - <div style="text-align: right; margin: 0;"><a href="{$root}/news/" class="small">more news...</a></div> + <p><a href="{$root}/news/">more news...</a></p> </div> <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> </div>

1 0

Jeremy Newman : clean up
by Jeremy Newman 09 Dec '08

09 Dec '08

Module: website Branch: master Commit: 433ed31fd6bc296099ee4f38807e5701e298786c URL: http://source.winehq.org/git/website.git/?a=commit;h=433ed31fd6bc296099ee4f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 9 10:01:47 2008 -0600 clean up --- templates/en/lang.template | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/en/lang.template b/templates/en/lang.template index 2d4b1a7..0aa1263 100644 --- a/templates/en/lang.template +++ b/templates/en/lang.template @@ -7,15 +7,15 @@ <p><b>Current Langage: </b> {$langCur}</p> -<blockquote> - - <p> - <a href="{$root}/lang/en"><img src="{$root}/images/lang/en.png" alt="English" /> English</a> - </p> - - <p> - <a href="{$root}/lang/es"><img src="{$root}/images/lang/es.png" alt="Español" /> Español</a> - </p> - -</blockquote> +<ul style="list-style: none; margin-left: 20px; padding: 0;"> + + <li style="background-image: url('{$root}/images/lang/en.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/en" title="English">English</a> + </li></a> + + <li style="background-image: url('{$root}/images/lang/es.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/es" title="Español">Español</a> + </li> + +</ul>

1 0

Jeremy Newman : update main menu so subtitles wrap correctly on small screens
by Jeremy Newman 09 Dec '08

09 Dec '08

Module: website Branch: master Commit: 45da178889b4713d4f47b01d98f9d77e8a82acde URL: http://source.winehq.org/git/website.git/?a=commit;h=45da178889b4713d4f47b0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 9 10:22:35 2008 -0600 update main menu so subtitles wrap correctly on small screens --- styles.css | 8 ++++---- templates/en/home.template | 25 ++++++++++--------------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/styles.css b/styles.css index bb4630a..98c90e3 100644 --- a/styles.css +++ b/styles.css @@ -220,10 +220,10 @@ ul.winehq_menu li.devel { background-image: url('images/main_devel.pn ul.winehq_menu li.devel:hover { background-image: url('images/main_devel_s.png'); background-repeat: no-repeat } ul.winehq_menu li.donate { background-image: url('images/main_donate.png'); background-repeat: no-repeat } ul.winehq_menu li.donate:hover { background-image: url('images/main_donate_s.png'); background-repeat: no-repeat } -ul.winehq_menu li a { text-decoration: none; } -ul.winehq_menu li a:hover .title { text-decoration: underline; color: red; } -ul.winehq_menu span.title { font-size: 24px; color: maroon; padding-left: 20px; margin-top: 10px; } -ul.winehq_menu span.subtitle { font-size: 14px; color: #4e4e4e; padding-left: 35px; } +ul.winehq_menu li a { text-decoration: none; color: maroon; } +ul.winehq_menu li a:hover { text-decoration: underline; color: red; } +ul.winehq_menu div.title { font-size: 24px; padding: 0; margin: 5px 0 0 20px; } +ul.winehq_menu div.subtitle { font-size: 14px; color: #4e4e4e; padding: 0; margin: 0 0 0 35px; } /* stuff */ img { border: 0; } diff --git a/templates/en/home.template b/templates/en/home.template index dd17acd..3560f32 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -10,38 +10,33 @@ <ul class="winehq_menu"> <li class="info" onClick="document.location='{$root}/about/';"> - <a href="{$root}/about/"> - <span class="title">Information</span></a><br> - <span class="subtitle">Overview of Wine features.</span> + <div class="title"><a href="{$root}/about/">Information</a></div> + <div class="subtitle">Overview of Wine features.</div> </li> <li class="dl" onClick="document.location='{$root}/download/';"> - <a href="{$root}/download/"> - <span class="title">Download</span></a><br> - <span class="subtitle">Get Wine now!</span> + <div class="title"><a href="{$root}/download/">Download</a></div> + <div class="subtitle">Get Wine now!</div> </li> <li class="help" onClick="document.location='{$root}/help/';"> - <a href="{$root}/help/"> - <span class="title">Help!</span></a><br> - <span class="subtitle">Documentation, Support, and Wiki.</span> + <div class="title"><a href="{$root}/help/">Help!</a></div> + <div class="subtitle">Documentation, Support, and Wiki.</div> </li> <li class="devel" onClick="document.location='{$root}/devel/';"> - <a href="{$root}/devel/"> - <span class="title">Development</span></a><br> - <span class="subtitle">Wine source, Bug Tracking, etc.</span> + <div class="title"><a href="{$root}/devel/">Development</a></div> + <div class="subtitle">Wine source, Bug Tracking, etc.</div> </li> <li class="donate" onClick="document.donateForm.submit();"> <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> - <a href="javascript:document.donateForm.submit();"> - <span class="title">Donate</span></a> + <div class="title"><a href="javascript:document.donateForm.submit();">Donate</a></div> <input type="hidden" name="cmd" value="_xclick"> <input type="hidden" name="business" value="donate(a)winehq.org"> <input type="hidden" name="item_name" value="Wine donation"> </form> - <span class="subtitle">Donate to Wine.</span> + <div class="subtitle">Donate to Wine.</div> </li> </ul>

1 0

Paul Vriens : riched32/tests: Remove an incorrect comment.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: fba5c4f32851cddf993fb8c551dd0092183a14e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba5c4f32851cddf993fb8c55… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 9 12:02:59 2008 +0100 riched32/tests: Remove an incorrect comment. --- dlls/riched32/tests/editor.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 5fef571..f472fbc 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -83,8 +83,7 @@ static void test_WM_SETTEXT() - \r with text or other characters (except \n) past it, is a line break. That is, a run of \r{N} without a terminating \n is considered N line breaks - \r at the end of the text is NOT a line break. This differs from riched20, - where \r at the end of the text is a proper line break. This causes - TestItem2 to fail its test. + where \r at the end of the text is a proper line break. */ #define TEST_SETTEXT(a, b, nlines, is_todo, is_todo2) \

1 0

Paul Vriens : advapi32/tests: Fix some test failures on NT4.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: e38d569590aac39e7f76ea43fb6fc4f5ae5480fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38d569590aac39e7f76ea43f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 9 11:53:48 2008 +0100 advapi32/tests: Fix some test failures on NT4. --- dlls/advapi32/tests/security.c | 49 ++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f30ca4f..bdcdb9e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1728,25 +1728,33 @@ static void test_LookupAccountName(void) sid_use = 0xcafebabe; SetLastError(0xdeadbeef); ret = LookupAccountNameA(NULL, NULL, NULL, &sid_size, NULL, &domain_size, &sid_use); - ok(!ret, "Expected 0, got %d\n", ret); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - ok(sid_size != 0, "Expected non-zero sid size\n"); - ok(domain_size != 0, "Expected non-zero domain size\n"); - ok(sid_use == 0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); - - psid = HeapAlloc(GetProcessHeap(), 0, sid_size); - domain = HeapAlloc(GetProcessHeap(), 0, domain_size); - - /* try NULL account name */ - ret = LookupAccountNameA(NULL, NULL, psid, &sid_size, domain, &domain_size, &sid_use); - get_sid_info(psid, &account, &sid_dom); - ok(ret, "Failed to lookup account name\n"); - /* Using a fixed string will not work on different locales */ - ok(!lstrcmp(account, domain), - "Got %s for account and %s for domain, these should be the same\n", - account, domain); - ok(sid_use == SidTypeDomain, "Expected SidTypeDomain (%d), got %d\n", SidTypeDomain, sid_use); + if (!ret && GetLastError() != ERROR_NONE_MAPPED) + { + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(sid_size != 0, "Expected non-zero sid size\n"); + ok(domain_size != 0, "Expected non-zero domain size\n"); + ok(sid_use == 0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); + + psid = HeapAlloc(GetProcessHeap(), 0, sid_size); + domain = HeapAlloc(GetProcessHeap(), 0, domain_size); + + /* try NULL account name */ + ret = LookupAccountNameA(NULL, NULL, psid, &sid_size, domain, &domain_size, &sid_use); + get_sid_info(psid, &account, &sid_dom); + ok(ret, "Failed to lookup account name\n"); + /* Using a fixed string will not work on different locales */ + ok(!lstrcmp(account, domain), + "Got %s for account and %s for domain, these should be the same\n", + account, domain); + ok(sid_use == SidTypeDomain, "Expected SidTypeDomain (%d), got %d\n", SidTypeDomain, sid_use); + + HeapFree(GetProcessHeap(), 0, psid); + HeapFree(GetProcessHeap(), 0, domain); + } + else + win_skip("NULL account name doesn't work on NT4\n"); /* try an invalid account name */ SetLastError(0xdeadbeef); @@ -1770,9 +1778,6 @@ static void test_LookupAccountName(void) "Expected RPC_S_SERVER_UNAVAILABLE or RPC_S_INVALID_NET_ADDR, got %d\n", GetLastError()); ok(sid_size == 0, "Expected 0, got %d\n", sid_size); ok(domain_size == 0, "Expected 0, got %d\n", domain_size); - - HeapFree(GetProcessHeap(), 0, psid); - HeapFree(GetProcessHeap(), 0, domain); } static void test_security_descriptor(void)

1 0

Aric Stewart : imm32: Implement W/A handling in ImmEscape.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: a4d4c07c2f105b3c76874f1850428029c657b7f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d4c07c2f105b3c76874f185… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 8 10:51:33 2008 -0600 imm32: Implement W/A handling in ImmEscape. --- dlls/imm32/imm.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index b03977c..b1ee40f 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -778,6 +778,16 @@ UINT WINAPI ImmEnumRegisterWordW( return 0; } +static inline BOOL EscapeRequiresWA(UINT uEscape) +{ + if (uEscape == IME_ESC_GET_EUDC_DICTIONARY || + uEscape == IME_ESC_SET_EUDC_DICTIONARY || + uEscape == IME_ESC_IME_NAME || + uEscape == IME_ESC_GETHELPFILENAME) + return TRUE; + return FALSE; +} + /*********************************************************************** * ImmEscapeA (IMM32.@) */ @@ -790,13 +800,23 @@ LRESULT WINAPI ImmEscapeA( if (immHkl->hIME && immHkl->pImeEscape) { - if (!is_kbd_ime_unicode(immHkl)) + if (!EscapeRequiresWA(uEscape) || !is_kbd_ime_unicode(immHkl)) return immHkl->pImeEscape(hIMC,uEscape,lpData); else { - FIXME("A procedure called with W ime back end\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + WCHAR buffer[81]; /* largest required buffer should be 80 */ + LRESULT rc; + if (uEscape == IME_ESC_SET_EUDC_DICTIONARY) + { + MultiByteToWideChar(CP_ACP,0,(LPSTR)lpData,-1,buffer,81); + rc = immHkl->pImeEscape(hIMC,uEscape,buffer); + } + else + { + rc = immHkl->pImeEscape(hIMC,uEscape,buffer); + WideCharToMultiByte(CP_ACP,0,buffer,-1,(LPSTR)lpData,80, NULL, NULL); + } + return rc; } } else @@ -815,13 +835,23 @@ LRESULT WINAPI ImmEscapeW( if (immHkl->hIME && immHkl->pImeEscape) { - if (is_kbd_ime_unicode(immHkl)) + if (!EscapeRequiresWA(uEscape) || is_kbd_ime_unicode(immHkl)) return immHkl->pImeEscape(hIMC,uEscape,lpData); else { - FIXME("W procedure called with A ime back end\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + CHAR buffer[81]; /* largest required buffer should be 80 */ + LRESULT rc; + if (uEscape == IME_ESC_SET_EUDC_DICTIONARY) + { + WideCharToMultiByte(CP_ACP,0,(LPWSTR)lpData,-1,buffer,81, NULL, NULL); + rc = immHkl->pImeEscape(hIMC,uEscape,buffer); + } + else + { + rc = immHkl->pImeEscape(hIMC,uEscape,buffer); + MultiByteToWideChar(CP_ACP,0,buffer,-1,(LPWSTR)lpData,80); + } + return rc; } } else

1 0

Hans Leidekker : ws2_32: Implement WSAIoctl(SIO_KEEPALIVE_VALS).
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: c58541e20a04ba0dcd1d25384e5fd95cdd658440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c58541e20a04ba0dcd1d25384… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 8 14:27:24 2008 +0100 ws2_32: Implement WSAIoctl(SIO_KEEPALIVE_VALS). Based on a patch by Philippe Rétornaz. --- dlls/ws2_32/socket.c | 44 +++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/mstcpip.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index da46b4a..b0caab6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -132,6 +132,7 @@ #include "ws2tcpip.h" #include "ws2spi.h" #include "wsipx.h" +#include "mstcpip.h" #include "winnt.h" #include "iphlpapi.h" #include "wine/server.h" @@ -2317,6 +2318,49 @@ INT WINAPI WSAIoctl(SOCKET s, WSASetLastError(WSAEOPNOTSUPP); return SOCKET_ERROR; + case WS_SIO_KEEPALIVE_VALS: + { + int fd; + struct tcp_keepalive *k = lpvInBuffer; + int keepalive = k->onoff ? 1 : 0; + int keepidle = k->keepalivetime / 1000; + int keepintvl = k->keepaliveinterval / 1000; + + if (!lpvInBuffer) + { + WSASetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + + TRACE("onoff: %d, keepalivetime: %d, keepaliveinterval: %d\n", keepalive, keepidle, keepintvl); + + fd = get_sock_fd(s, 0, NULL); + if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive, sizeof(int)) == -1) + { + release_sock_fd(s, fd); + WSASetLastError(WSAEINVAL); + return SOCKET_ERROR; + } +#if defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&keepidle, sizeof(int)) == -1) + { + release_sock_fd(s, fd); + WSASetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, sizeof(int)) == -1) + { + release_sock_fd(s, fd); + WSASetLastError(WSAEINVAL); + return SOCKET_ERROR; + } +#else + FIXME("ignoring keepalive interval and timeout\n"); +#endif + + release_sock_fd(s, fd); + break; + } default: FIXME("unsupported WS_IOCTL cmd (%08x)\n", dwIoControlCode); WSASetLastError(WSAEOPNOTSUPP); diff --git a/include/Makefile.in b/include/Makefile.in index de25bbf..5b24e0d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -287,6 +287,7 @@ SRCDIR_INCLUDES = \ msidefs.h \ msiquery.h \ mssip.h \ + mstcpip.h \ msvcrt/conio.h \ msvcrt/crtdbg.h \ msvcrt/ctype.h \ diff --git a/include/mstcpip.h b/include/mstcpip.h new file mode 100644 index 0000000..25dcfe1 --- /dev/null +++ b/include/mstcpip.h @@ -0,0 +1,62 @@ +/* + * Copyright 2008 Hans Leidekker for CodeWeavers. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +struct tcp_keepalive +{ + u_long onoff; + u_long keepalivetime; + u_long keepaliveinterval; +}; + +#ifndef USE_WS_PREFIX + +#define SIO_RCVALL _WSAIOW(IOC_VENDOR, 1) +#define SIO_RCVALL_MCAST _WSAIOW(IOC_VENDOR, 2) +#define SIO_RCVALL_IGMPMCAST _WSAIOW(IOC_VENDOR, 3) +#define SIO_KEEPALIVE_VALS _WSAIOW(IOC_VENDOR, 4) +#define SIO_ABSORB_RTRALERT _WSAIOW(IOC_VENDOR, 5) +#define SIO_UCAST_IF _WSAIOW(IOC_VENDOR, 6) +#define SIO_LIMIT_BROADCASTS _WSAIOW(IOC_VENDOR, 7) +#define SIO_INDEX_BIND _WSAIOW(IOC_VENDOR, 8) +#define SIO_INDEX_MCASTIF _WSAIOW(IOC_VENDOR, 9) +#define SIO_INDEX_ADD_MCAST _WSAIOW(IOC_VENDOR, 10) +#define SIO_INDEX_DEL_MCAST _WSAIOW(IOC_VENDOR, 11) + +#define RCVALL_OFF 0 +#define RCVALL_ON 1 +#define RCVALL_SOCKETLEVELONLY 2 + +#else + +#define WS_SIO_RCVALL _WSAIOW(WS_IOC_VENDOR, 1) +#define WS_SIO_RCVALL_MCAST _WSAIOW(WS_IOC_VENDOR, 2) +#define WS_SIO_RCVALL_IGMPMCAST _WSAIOW(WS_IOC_VENDOR, 3) +#define WS_SIO_KEEPALIVE_VALS _WSAIOW(WS_IOC_VENDOR, 4) +#define WS_SIO_ABSORB_RTRALERT _WSAIOW(WS_IOC_VENDOR, 5) +#define WS_SIO_UCAST_IF _WSAIOW(WS_IOC_VENDOR, 6) +#define WS_SIO_LIMIT_BROADCASTS _WSAIOW(WS_IOC_VENDOR, 7) +#define WS_SIO_INDEX_BIND _WSAIOW(WS_IOC_VENDOR, 8) +#define WS_SIO_INDEX_MCASTIF _WSAIOW(WS_IOC_VENDOR, 9) +#define WS_SIO_INDEX_ADD_MCAST _WSAIOW(WS_IOC_VENDOR, 10) +#define WS_SIO_INDEX_DEL_MCAST _WSAIOW(WS_IOC_VENDOR, 11) + +#define WS_RCVALL_OFF 0 +#define WS_RCVALL_ON 1 +#define WS_RCVALL_SOCKETLEVELONLY 2 + +#endif /* USE_WS_PREFIX */

1 0

Stefan Dösinger : ntdll: Print the SYSTEM_PERFORMANCE_INFORMATION only once.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 40447e804d6f60c6c9b4a0b415a39d1593338cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=40447e804d6f60c6c9b4a0b41… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 28 15:33:34 2008 +0100 ntdll: Print the SYSTEM_PERFORMANCE_INFORMATION only once. --- dlls/ntdll/nt.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3f365bc..c593f45 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -742,6 +742,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( case SystemPerformanceInformation: { SYSTEM_PERFORMANCE_INFORMATION spi; + static BOOL fixme_written = FALSE; memset(&spi, 0 , sizeof(spi)); len = sizeof(spi); @@ -752,7 +753,10 @@ NTSTATUS WINAPI NtQuerySystemInformation( else memcpy( SystemInformation, &spi, len); } else ret = STATUS_INFO_LENGTH_MISMATCH; - FIXME("info_class SYSTEM_PERFORMANCE_INFORMATION\n"); + if(!fixme_written) { + FIXME("info_class SYSTEM_PERFORMANCE_INFORMATION\n"); + fixme_written = TRUE; + } } break; case SystemTimeOfDayInformation:

1 0