June 2008 - Wine-commits - list.winehq.org

Hans Leidekker : wininet: Make resolving hostnames thread-safe.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 2f99450c49ccfe0e4cf2f8b39ac0e7b350d3dbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f99450c49ccfe0e4cf2f8b39… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat May 31 21:46:07 2008 +0200 wininet: Make resolving hostnames thread-safe. --- dlls/wininet/http.c | 4 +++- dlls/wininet/utility.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 119b49b..2326a7a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1346,6 +1346,8 @@ static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_NAME_RESOLVED, szaddr, strlen(szaddr)+1); + + TRACE("resolved %s to %s\n", debugstr_w(lpwhs->lpszServerName), szaddr); return TRUE; } @@ -3607,7 +3609,7 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) if (!NETCON_create(&lpwhr->netConnection, lpwhs->socketAddress.sin_family, SOCK_STREAM, 0)) { - WARN("Socket creation failed\n"); + WARN("Socket creation failed: %u\n", INTERNET_GetLastError()); goto lend; } diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 2597268..b0d9c9c 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -40,6 +40,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); +/* critical section to protect non-reentrant gethostbyname() */ +static CRITICAL_SECTION cs_gethostbyname; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &cs_gethostbyname, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cs_gethostbyname") } +}; +static CRITICAL_SECTION cs_gethostbyname = { &critsect_debug, -1, 0, 0, 0, 0 }; + #define TIME_STRING_LEN 30 time_t ConvertTimeString(LPCWSTR asctime) @@ -151,12 +161,15 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, name = HeapAlloc(GetProcessHeap(), 0, sz+1); WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, name, sz, NULL, NULL ); name[sz] = 0; + + EnterCriticalSection( &cs_gethostbyname ); phe = gethostbyname(name); HeapFree( GetProcessHeap(), 0, name ); if (NULL == phe) { TRACE("Failed to get hostname: (%s)\n", debugstr_w(lpszServerName) ); + LeaveCriticalSection( &cs_gethostbyname ); return FALSE; } @@ -165,6 +178,7 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, psa->sin_family = phe->h_addrtype; psa->sin_port = htons(nServerPort); + LeaveCriticalSection( &cs_gethostbyname ); return TRUE; }

1 0

Simon Richter : libwine: Fix wine_switch_to_stack on ppc.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 2416533cd5187fdb0118c14a8a4bb48b5dc28e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2416533cd5187fdb0118c14a8… Author: Simon Richter <Simon.Richter(a)hogyros.de> Date: Sat May 31 10:50:11 2008 +0200 libwine: Fix wine_switch_to_stack on ppc. The PowerPC ABI expects the caller to allocate space for the return address on the stack, above the current stack pointer, even if the address is passed in the link register (usually the address is stored at SP+4 by the callee). --- libs/wine/port.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index cbc00f9..859818f 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -90,14 +90,17 @@ __ASM_GLOBAL_FUNC( wine_switch_to_stack, "mr r3,r4\n\t" /* args -> function param 1 (r3) */ "mr r1,r5\n\t" /* stack */ "subi r1,r1,0x100\n\t" /* adjust stack pointer */ - "bctr\n" /* call ctr */ + "bctrl\n" /* call ctr */ "1:\tb 1b") /* loop */ #elif defined(__powerpc__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_switch_to_stack, "mtctr 3\n\t" /* func -> ctr */ "mr 3,4\n\t" /* args -> function param 1 (r3) */ "mr 1,5\n\t" /* stack */ - "bctr\n\t" /* call ctr */ + "subi 1, 1, 16\n\t" /* allocate space for the callee */ + "li 0, 0\n\t" /* load zero */ + "stw 0, 0(1)\n\t" /* create a bottom stack frame */ + "bctrl\n\t" /* call ctr */ "1:\tb 1b") /* loop */ #elif defined(__ALPHA__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_switch_to_stack,

1 0

Simon Richter : libwine: Implement wine_call_on_stack for ppc.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: ff77ba8e17a8e3902dbc8a2dcd5f6e66b7642348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff77ba8e17a8e3902dbc8a2dc… Author: Simon Richter <Simon.Richter(a)hogyros.de> Date: Sat May 31 10:50:36 2008 +0200 libwine: Implement wine_call_on_stack for ppc. --- libs/wine/port.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index e2f7b0c..cbc00f9 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -179,6 +179,23 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "popq %rbx\n\t" "popq %rbp\n\t" "ret") +#elif defined(__powerpc__) && defined(__GNUC__) +__ASM_GLOBAL_FUNC( wine_call_on_stack, + "mflr 0\n\t" /* get return address */ + "stw 0, 4(1)\n\t" /* save return address */ + "subi 5, 5, 16\n\t" /* reserve space on new stack */ + "stw 1, 12(5)\n\t" /* store old sp */ + "mtctr 3\n\t" /* func -> ctr */ + "mr 3,4\n\t" /* args -> function param 1 (r3) */ + "mr 1,5\n\t" /* stack */ + "li 0, 0\n\t" /* zero */ + "stw 0, 0(1)\n\t" /* bottom of stack */ + "stwu 1, -16(1)\n\t" /* create a frame for this function */ + "bctrl\n\t" /* call ctr */ + "lwz 1, 28(1)\n\t" /* fetch old sp */ + "lwz 0, 4(1)\n\t" /* fetch return address */ + "mtlr 0\n\t" /* return address -> lr */ + "blr") /* return */ #else #error You must implement wine_switch_to_stack for your platform #endif

1 0

Simon Richter : winebuild: Fix import stub on ppc.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 238e1868b2b29df813250ae2961a68a9b744f2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=238e1868b2b29df813250ae29… Author: Simon Richter <Simon.Richter(a)hogyros.de> Date: Sat May 31 10:51:01 2008 +0200 winebuild: Fix import stub on ppc. The address calculation was wrong, as the addition of the lower 16 bits is a signed addition, so if bit 15 is set, the upper 16 bits need to be incremented by one (so the hi portion of the symbol always references the symbol + 0x8000). --- tools/winebuild/import.c | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 5b62512..5e0c172 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -699,30 +699,20 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tjmp $31,($0)\n" ); break; case CPU_POWERPC: - output( "\taddi %s, %s, -0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tstw %s, 0(%s)\n", ppc_reg(9), ppc_reg(1) ); - output( "\taddi %s, %s, -0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tstw %s, 0(%s)\n", ppc_reg(8), ppc_reg(1) ); - output( "\taddi %s, %s, -0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tstw %s, 0(%s)\n", ppc_reg(7), ppc_reg(1) ); + output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(31) ); if (target_platform == PLATFORM_APPLE) { - output( "\tlis %s, ha16(%s+%d)\n", ppc_reg(9), table, pos ); - output( "\tla %s, lo16(%s+%d)(%s)\n", ppc_reg(8), table, pos, ppc_reg(9) ); + output( "\tlis %s, ha16(%s+%d+32768)\n", ppc_reg(31), table, pos ); + output( "\tla %s, lo16(%s+%d)(%s)\n", ppc_reg(31), table, pos, ppc_reg(31) ); } else { - output( "\tlis %s, (%s+%d)@h\n", ppc_reg(9), table, pos ); - output( "\tla %s, (%s+%d)@l(%s)\n", ppc_reg(8), table, pos, ppc_reg(9) ); + output( "\tlis %s, (%s+%d+32768)@h\n", ppc_reg(31), table, pos ); + output( "\tla %s, (%s+%d)@l(%s)\n", ppc_reg(31), table, pos, ppc_reg(31) ); } - output( "\tlwz %s, 0(%s)\n", ppc_reg(7), ppc_reg(8) ); - output( "\tmtctr %s\n", ppc_reg(7) ); - output( "\tlwz %s, 0(%s)\n", ppc_reg(7), ppc_reg(1) ); - output( "\taddi %s, %s, 0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tlwz %s, 0(%s)\n", ppc_reg(8), ppc_reg(1) ); - output( "\taddi %s, %s, 0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tlwz %s, 0(%s)\n", ppc_reg(9), ppc_reg(1) ); - output( "\taddi %s, %s, 0x4\n", ppc_reg(1), ppc_reg(1) ); + output( "\tlwz %s, 0(%s)\n", ppc_reg(31), ppc_reg(31) ); + output( "\tmtctr %s\n", ppc_reg(31) ); + output( "\tmr %s, %s\n", ppc_reg(31), ppc_reg(0) ); output( "\tbctr\n" ); break; }

1 0

James Hawkins : ddraw: Delete the temporarily attached surface.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 735297871364007cf7e6a2a74209b8b2164611a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=735297871364007cf7e6a2a74… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat May 31 16:19:29 2008 -0500 ddraw: Delete the temporarily attached surface. --- dlls/ddraw/tests/dsurface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 42c23a4..342b88a 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1271,7 +1271,10 @@ static void AttachmentTest(void) ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); if (SUCCEEDED(IDirectDrawSurface7_AddAttachedSurface(surface1, surface4))) + { + IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface4); refrast = TRUE; + } hr = IDirectDrawSurface7_AddAttachedSurface(surface1, surface4); /* Succeeds on refrast */ if (refrast)

1 0

Jonathan Ernst : start.exe: Updated French translation.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 785507e653b5369d725573805fcba970feaf9c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=785507e653b5369d725573805… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 2 09:02:25 2008 +0200 start.exe: Updated French translation. --- programs/start/Fr.rc | 54 +++++++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 24 deletions(-) diff --git a/programs/start/Fr.rc b/programs/start/Fr.rc index a86b01e..ef875b9 100644 --- a/programs/start/Fr.rc +++ b/programs/start/Fr.rc @@ -3,7 +3,8 @@ * French Language Support * * Copyright 2003 Dan Kegel - * Copyright 2003 Vincent B�ron + * Copyright 2003 Vincent Béron + * Copyright 2008 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,43 +23,48 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +#pragma code_page(65001) /* UTF-8 */ + STRINGTABLE DISCARDABLE { -STRING_USAGE, "Lance un programme, ou ouvre un document dans le programme normalement utilis� avec cette extension. \n\ -Usage: \n\ +STRING_USAGE, "Lance un programme, ou ouvre un document dans le programme normalement utilisé avec cette extension. \n\ +Usage : \n\ start [options] fichier_programme [...] \n\ start [options] fichier_document \n\ \n\ -Options: \n\ -/M[inimized] Lance le programme minimis�. \n\ -/MAX[imized] Lance le programme maximis�. \n\ -/R[estored] Lance le programme normalement (ni minimis� ni maximis�). \n\ -/W[ait] Attend que le programme lanc� se termine, et termine ensuite avec son code de sortie. \n\ +Options : \n\ +/M[inimized] Lance le programme minimisé. \n\ +/MAX[imized] Lance le programme maximisé. \n\ +/R[estored] Lance le programme normalement (ni minimisé ni maximisé). \n\ +/W[ait] Attend que le programme lancé se termine, et termine ensuite avec son code de sortie. \n\ /L Montre la licence d'utilisation. \n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel \n\ -Start est fourni sans AUCUNE GARANTIE; pour les d�tails lancez avec l'option /L. \n\ -Ceci est un logiciel libre, et vous �tes invit� � le redistribuer\n\ -sous certaines condition; lancez 'start /L' pour les d�tails. \n\ +Start est fourni sans AUCUNE GARANTIE ; pour les détails lancez avec l'option /L. \n\ +Ceci est un logiciel libre, et vous êtes invité à le redistribuer\n\ +sous certaines condition; lancez 'start /L' pour les détails. \n\ " STRING_LICENSE, "start.exe version 0.2 Copyright (C) 2003, Dan Kegel \n\ -This program is free software; you can redistribute it and/or \n\ -modify it under the terms of the GNU Lesser Public License \n\ -as published by the Free Software Foundation; either version 2.1 \n\ -of the License, or (at your option) any later version. \n\ +Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou\n\ +e modifier suivant les termes de la Licence Générale Publique Limitée GNU \n\ +telle que publiée par la Free Software Foundation ; soit la version 2.1 \n\ +de la License, soit (à votre gré) toute version ultérieure. \n\ \n\ -This program is distributed in the hope that it will be useful, \n\ -but WITHOUT ANY WARRANTY; without even the implied warranty of \n\ -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \n\ -GNU Lesser Public License for more details. \n\ +Wine est distribué dans l’espoir qu'il sera utile, mais \n\ +SANS AUCUNE GARANTIE : sans même la garantie implicite de \n\ +COMMERCIALISABILITÉ ou d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \n\ +la Licence Générale Publique Limitée pour plus de détails. \n\ \n\ -You should have received a copy of the GNU Lesser Public License \n\ -along with this program; if not, write to the Free Software \n\ -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. \n\ +Vous devriez avoir reçu une copie de la Licence Générale Publique Limitée \n\ +GNU avec cette bibliothèque ; si ce n’est pas le cas, écrivez à la : \n\ +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, \n\ +MA 02110-1301, USA. \n\ \n\ -See the COPYING.LIB file for license information. \n\ +Référez-vous au fichier COPYING.LIB pour des informations sur la licence. \n\ " -STRING_EXECFAIL "Le programme n'a pas pu �tre lanc�, ou il n'y a pas de programme associ� avec le fichier sp�cifi�.\nShellExecuteEx a �chou�" +STRING_EXECFAIL "Le programme n'a pas pu être lancé, ou il n'y a pas de programme associé avec le fichier spécifié.\nShellExecuteEx a échoué" } + +#pragma code_page(default) /* Return to default encoding */

1 0

Jonathan Ernst : shell32: Updated French translation.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 992e3edc4bb75e936719d4935baf9f14a7c681d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992e3edc4bb75e936719d4935… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 2 09:02:08 2008 +0200 shell32: Updated French translation. --- dlls/shell32/shell32_Fr.rc | 126 ++++++++++++++++++++++++++------------------ 1 files changed, 74 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=992e3edc4bb75e936719d…

1 0

Jon Griffiths : oleaut32/tests: Fix memory leaks reported by valgrind.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 7cdc50fede94e42f8cf795330c247e89c0578e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdc50fede94e42f8cf795330… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Fri May 30 07:32:37 2008 -0700 oleaut32/tests: Fix memory leaks reported by valgrind. --- dlls/oleaut32/tests/vartest.c | 89 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7cdc50fede94e42f8cf79…

1 0

Hans Leidekker : wininet: Don't send a "Connection: Close" header.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 656a035821e0d070d0f55351fcad576a682b13f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=656a035821e0d070d0f55351f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat May 31 21:47:24 2008 +0200 wininet: Don't send a "Connection: Close" header. --- dlls/wininet/http.c | 9 ++--- dlls/wininet/tests/http.c | 68 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 64 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2326a7a..b973a79 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3156,7 +3156,6 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, INT responseLen; BOOL loop_next; INTERNET_ASYNC_RESULT iar; - static const WCHAR szClose[] = { 'C','l','o','s','e',0 }; static const WCHAR szPost[] = { 'P','O','S','T',0 }; static const WCHAR szContentLength[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0 }; @@ -3211,10 +3210,10 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, } HTTP_FixURL(lpwhr); - HTTP_ProcessHeader(lpwhr, szConnection, - lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION ? szKeepAlive : szClose, - HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); - + if (lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION) + { + HTTP_ProcessHeader(lpwhr, szConnection, szKeepAlive, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + } HTTP_InsertAuthorization(lpwhr, lpwhr->pAuthInfo, szAuthorization); HTTP_InsertAuthorization(lpwhr, lpwhr->pProxyAuthInfo, szProxy_Authorization); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cd2aba2..9ad9790 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1394,7 +1394,6 @@ static DWORD CALLBACK server_thread(LPVOID param) buffer[i-3] == '\r' && buffer[i-1] == '\r') break; } - if (strstr(buffer, "GET /test1")) { if (!strstr(buffer, "Content-Length: 0")) @@ -1405,7 +1404,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } - if (strstr(buffer, "/test2")) { if (strstr(buffer, "Proxy-Authorization: Basic bWlrZToxMTAx")) @@ -1416,7 +1414,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, proxymsg, sizeof proxymsg-1, 0); } - if (strstr(buffer, "/test3")) { if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) @@ -1424,7 +1421,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, noauthmsg, sizeof noauthmsg-1, 0); } - if (strstr(buffer, "/test4")) { if (strstr(buffer, "Connection: Close")) @@ -1432,7 +1428,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } - if (strstr(buffer, "POST /test5")) { if (strstr(buffer, "Content-Length: 0")) @@ -1443,7 +1438,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } - if (strstr(buffer, "GET /test6")) { send(c, contmsg, sizeof contmsg-1, 0); @@ -1451,7 +1445,6 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, okmsg, sizeof okmsg-1, 0); send(c, page1, sizeof page1-1, 0); } - if (strstr(buffer, "POST /test7")) { if (strstr(buffer, "Content-Length: 100")) @@ -1462,7 +1455,22 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } - + if (strstr(buffer, "/test8")) + { + if (!strstr(buffer, "Connection: Close") && + strstr(buffer, "Connection: Keep-Alive")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } + if (strstr(buffer, "/test9")) + { + if (!strstr(buffer, "Connection: Close") && + !strstr(buffer, "Connection: Keep-Alive")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg-1, 0); @@ -1686,6 +1694,49 @@ static void test_header_handling_order(int port) InternetCloseHandle(session); } +static void test_connection_header(int port) +{ + HINTERNET ses, con, req; + DWORD size, status; + BOOL ret; + + ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnect(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequest(con, NULL, "/test8", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + status = 0; + size = sizeof(status); + ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); + ok(ret, "HttpQueryInfo failed\n"); + ok(status == 200, "request failed with status %u\n", status); + + InternetCloseHandle(req); + + req = HttpOpenRequest(con, NULL, "/test9", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + status = 0; + size = sizeof(status); + ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); + ok(ret, "HttpQueryInfo failed\n"); + ok(status == 200, "request failed with status %u\n", status); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_http_connection(void) { struct server_info si; @@ -1709,6 +1760,7 @@ static void test_http_connection(void) test_header_handling_order(si.port); test_basic_request(si.port, "POST", "/test5"); test_basic_request(si.port, "GET", "/test6"); + test_connection_header(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Hwang YunSong(황윤성) : shell32: Updated Korean resource.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: aa821fdd7b1071a510bfb2efd0ac0e4cdd2268bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa821fdd7b1071a510bfb2efd… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Jun 2 09:56:14 2008 +0900 shell32: Updated Korean resource. --- dlls/shell32/shell32_Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index e6e45bc..1f1b0e8 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -266,6 +266,6 @@ 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.\n\n\ You should have received a copy of the GNU Lesser General Public \ -License along with this library; if not, write to the Free Software \ +License along with Wine; if not, write to the Free Software \ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." }

1 0