October 2008 - Wine-Commits

Juan Lang : crypt32: Fix chain error status when a cert's issuer can' t be found.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 558057b4b22dbe71f05e257294ebc2af78effb5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=558057b4b22dbe71f05e25729… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 29 14:09:43 2008 -0700 crypt32: Fix chain error status when a cert's issuer can't be found. --- dlls/crypt32/chain.c | 1 + dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index f52ac0c..e713362 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -917,6 +917,7 @@ static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, else { TRACE("Couldn't find issuer, halting chain creation\n"); + chain->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_PARTIAL_CHAIN; break; } } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index c583ed4..3d89512 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1595,7 +1595,7 @@ static ChainCheck chainCheckNoStore[] = { { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_PARTIAL_CHAIN, 0 }, 1, simpleStatus8NoStore }, - TODO_ERROR | TODO_INFO }, + TODO_INFO }, }; /* Wednesday, Oct 1, 2007 */

1 0

Juan Lang : crypt32: Don' t neglect status to ignore on a Windows platform when a test is todo_wine.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 97cfb3adfe073da495a78fd40912056374467211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97cfb3adfe073da495a78fd40… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 29 13:49:17 2008 -0700 crypt32: Don't neglect status to ignore on a Windows platform when a test is todo_wine. --- dlls/crypt32/tests/chain.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 7c13878..c583ed4 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1167,12 +1167,19 @@ static void checkElementStatus(const CERT_TRUST_STATUS *expected, const CERT_TRUST_STATUS *got, const CERT_TRUST_STATUS *ignore, DWORD todo, DWORD testIndex, DWORD chainIndex, DWORD elementIndex) { - if (todo & TODO_ERROR && got->dwErrorStatus != expected->dwErrorStatus) - todo_wine + if (got->dwErrorStatus == expected->dwErrorStatus) ok(got->dwErrorStatus == expected->dwErrorStatus, "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", testIndex, chainIndex, elementIndex, expected->dwErrorStatus, got->dwErrorStatus); + else if (todo & TODO_ERROR) + todo_wine + ok(got->dwErrorStatus == expected->dwErrorStatus || + broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == + expected->dwErrorStatus), + "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", + testIndex, chainIndex, elementIndex, expected->dwErrorStatus, + got->dwErrorStatus); else ok(got->dwErrorStatus == expected->dwErrorStatus || broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == @@ -1180,12 +1187,19 @@ static void checkElementStatus(const CERT_TRUST_STATUS *expected, "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", testIndex, chainIndex, elementIndex, expected->dwErrorStatus, got->dwErrorStatus); - if (todo & TODO_INFO && got->dwInfoStatus != expected->dwInfoStatus) - todo_wine + if (got->dwInfoStatus == expected->dwInfoStatus) ok(got->dwInfoStatus == expected->dwInfoStatus, "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", testIndex, chainIndex, elementIndex, expected->dwInfoStatus, got->dwInfoStatus); + else if (todo & TODO_INFO) + todo_wine + ok(got->dwInfoStatus == expected->dwInfoStatus || + broken((got->dwInfoStatus & ~ignore->dwInfoStatus) == + expected->dwInfoStatus), + "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", + testIndex, chainIndex, elementIndex, expected->dwInfoStatus, + got->dwInfoStatus); else ok(got->dwInfoStatus == expected->dwInfoStatus || broken((got->dwInfoStatus & ~ignore->dwInfoStatus) ==

1 0

Juan Lang : crypt32: Fix some test failures on Win9x/NT4.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 3fdf6024a2cb68f95450e24802ec55ed172e20ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fdf6024a2cb68f95450e2480… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 30 10:10:09 2008 -0700 crypt32: Fix some test failures on Win9x/NT4. --- dlls/crypt32/tests/encode.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index e08a7ce..1dacc10 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -469,7 +469,8 @@ static void testTimeEncoding(DWORD dwEncoding, LPCSTR structType, } } else - ok((!ret && GetLastError() == CRYPT_E_BAD_ENCODE) || broken(ret), + ok((!ret && GetLastError() == CRYPT_E_BAD_ENCODE) || + broken(GetLastError() == ERROR_SUCCESS), "Expected CRYPT_E_BAD_ENCODE, got 0x%08x\n", GetLastError()); } @@ -498,13 +499,20 @@ static void compareTime(const SYSTEMTIME *expected, const FILETIME *got) SYSTEMTIME st; FileTimeToSystemTime(got, &st); - ok(expected->wYear == st.wYear && + ok((expected->wYear == st.wYear && expected->wMonth == st.wMonth && expected->wDay == st.wDay && expected->wHour == st.wHour && expected->wMinute == st.wMinute && expected->wSecond == st.wSecond && - abs(expected->wMilliseconds - st.wMilliseconds) <= 1, + abs(expected->wMilliseconds - st.wMilliseconds) <= 1) || + /* Some Windows systems only seem to be accurate in their time decoding to + * within about an hour. + */ + broken(expected->wYear == st.wYear && + expected->wMonth == st.wMonth && + expected->wDay == st.wDay && + abs(expected->wHour - st.wHour) <= 1), "Got unexpected value for time decoding:\nexpected %s, got %s\n", printSystemTime(expected), printFileTime(got)); } @@ -524,7 +532,8 @@ static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType, if (structType == X509_CHOICE_OF_TIME || (time->sysTime.wYear >= 1950 && time->sysTime.wYear <= 2050)) { - ok(ret, "CryptDecodeObjectEx failed: %d (0x%08x)\n", GetLastError(), + ok(ret || broken(GetLastError() == OSS_DATA_ERROR), + "CryptDecodeObjectEx failed: %d (0x%08x)\n", GetLastError(), GetLastError()); if (ret) compareTime(&time->sysTime, &ft);

1 0

Rob Shearman : inetcomm: Add an implementation of the HELO/EHLO command.
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: f34f9ba5b5092a37f7a47d19cb3c1466d554841e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34f9ba5b5092a37f7a47d19c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Oct 30 15:46:25 2008 +0100 inetcomm: Add an implementation of the HELO/EHLO command. --- dlls/inetcomm/inetcomm_private.h | 2 + dlls/inetcomm/internettransport.c | 17 ++++ dlls/inetcomm/smtptransport.c | 172 ++++++++++++++++++++++++++++++++++++- 3 files changed, 189 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/inetcomm_private.h b/dlls/inetcomm/inetcomm_private.h index f62040f..c9d8225 100644 --- a/dlls/inetcomm/inetcomm_private.h +++ b/dlls/inetcomm/inetcomm_private.h @@ -67,6 +67,8 @@ HRESULT InternetTransport_ReadLine(InternetTransport *This, INETXPORT_COMPLETION_FUNCTION fnCompletion); HRESULT InternetTransport_Write(InternetTransport *This, const char *pvData, int cbSize, INETXPORT_COMPLETION_FUNCTION fnCompletion); +HRESULT InternetTransport_DoCommand(InternetTransport *This, + LPSTR pszCommand, INETXPORT_COMPLETION_FUNCTION fnCompletion); BOOL InternetTransport_RegisterClass(HINSTANCE hInstance); void InternetTransport_UnregisterClass(HINSTANCE hInstance); diff --git a/dlls/inetcomm/internettransport.c b/dlls/inetcomm/internettransport.c index 0d3c679..b6a5a4a 100644 --- a/dlls/inetcomm/internettransport.c +++ b/dlls/inetcomm/internettransport.c @@ -274,6 +274,23 @@ HRESULT InternetTransport_Write(InternetTransport *This, const char *pvData, return S_OK; } +HRESULT InternetTransport_DoCommand(InternetTransport *This, + LPSTR pszCommand, INETXPORT_COMPLETION_FUNCTION fnCompletion) +{ + if (This->Status == IXP_DISCONNECTED) + return IXP_E_NOT_CONNECTED; + + if (This->fnCompletion) + return IXP_E_BUSY; + + if (This->pCallback && This->fCommandLogging) + { + ITransportCallback_OnCommand(This->pCallback, CMD_SEND, pszCommand, 0, + (IInternetTransport *)&This->u.vtbl); + } + return InternetTransport_Write(This, pszCommand, strlen(pszCommand), fnCompletion); +} + static LRESULT CALLBACK InternetTransport_WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { if (uMsg == IX_READ) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index bc38df7..b3bc781 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -1,6 +1,7 @@ /* * SMTP Transport * + * Copyright 2006 Robert Shearman for CodeWeavers * Copyright 2008 Hans Leidekker for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -40,8 +41,174 @@ typedef struct { InternetTransport InetTransport; ULONG refs; + BOOL fESMTP; } SMTPTransport; +static HRESULT SMTPTransport_ParseResponse(SMTPTransport *This, char *pszResponse, SMTPRESPONSE *pResponse) +{ + HRESULT hrServerError; + + TRACE("response: %s\n", debugstr_a(pszResponse)); + + if (!isdigit(*pszResponse)) + return IXP_E_SMTP_RESPONSE_ERROR; + pResponse->pTransport = (ISMTPTransport *)&This->InetTransport.u.vtblSMTP2; + pResponse->rIxpResult.pszResponse = pszResponse; + pResponse->rIxpResult.dwSocketError = 0; + pResponse->rIxpResult.uiServerError = strtol(pszResponse, &pszResponse, 10); + if (*pszResponse == '-') + { + pResponse->fDone = FALSE; + pszResponse++; + } + else + pResponse->fDone = TRUE; + + switch (pResponse->rIxpResult.uiServerError) + { + case 211: hrServerError = IXP_E_SMTP_211_SYSTEM_STATUS; break; + case 214: hrServerError = IXP_E_SMTP_214_HELP_MESSAGE; break; + case 220: hrServerError = IXP_E_SMTP_220_READY; break; + case 221: hrServerError = IXP_E_SMTP_221_CLOSING; break; + case 245: hrServerError = IXP_E_SMTP_245_AUTH_SUCCESS; break; + case 250: hrServerError = IXP_E_SMTP_250_MAIL_ACTION_OKAY; break; + case 251: hrServerError = IXP_E_SMTP_251_FORWARDING_MAIL; break; + case 334: hrServerError = IXP_E_SMTP_334_AUTH_READY_RESPONSE; break; + case 354: hrServerError = IXP_E_SMTP_354_START_MAIL_INPUT; break; + case 421: hrServerError = IXP_E_SMTP_421_NOT_AVAILABLE; break; + case 450: hrServerError = IXP_E_SMTP_450_MAILBOX_BUSY; break; + case 451: hrServerError = IXP_E_SMTP_451_ERROR_PROCESSING; break; + case 452: hrServerError = IXP_E_SMTP_452_NO_SYSTEM_STORAGE; break; + case 454: hrServerError = IXP_E_SMTP_454_STARTTLS_FAILED; break; + case 500: hrServerError = IXP_E_SMTP_500_SYNTAX_ERROR; break; + case 501: hrServerError = IXP_E_SMTP_501_PARAM_SYNTAX; break; + case 502: hrServerError = IXP_E_SMTP_502_COMMAND_NOTIMPL; break; + case 503: hrServerError = IXP_E_SMTP_503_COMMAND_SEQ; break; + case 504: hrServerError = IXP_E_SMTP_504_COMMAND_PARAM_NOTIMPL; break; + case 530: hrServerError = IXP_E_SMTP_530_STARTTLS_REQUIRED; break; + case 550: hrServerError = IXP_E_SMTP_550_MAILBOX_NOT_FOUND; break; + case 551: hrServerError = IXP_E_SMTP_551_USER_NOT_LOCAL; break; + case 552: hrServerError = IXP_E_SMTP_552_STORAGE_OVERFLOW; break; + case 553: hrServerError = IXP_E_SMTP_553_MAILBOX_NAME_SYNTAX; break; + case 554: hrServerError = IXP_E_SMTP_554_TRANSACT_FAILED; break; + default: + hrServerError = IXP_E_SMTP_RESPONSE_ERROR; + break; + } + pResponse->rIxpResult.hrResult = hrServerError; + pResponse->rIxpResult.hrServerError = hrServerError; + + if (This->InetTransport.pCallback && This->InetTransport.fCommandLogging) + { + ITransportCallback_OnCommand(This->InetTransport.pCallback, CMD_RESP, + pResponse->rIxpResult.pszResponse, hrServerError, + (IInternetTransport *)&This->InetTransport.u.vtbl); + } + return S_OK; +} + +static void SMTPTransport_CallbackProcessHelloResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response = { 0 }; + HRESULT hr; + + TRACE("\n"); + + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + response.command = This->fESMTP ? SMTP_EHLO : SMTP_HELO; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } + + if (!response.fDone) + { + InternetTransport_ReadLine(&This->InetTransport, + SMTPTransport_CallbackProcessHelloResp); + return; + } + + /* FIXME: try to authorize */ + + /* always changed to this status, even if authorization not support on server */ + InternetTransport_ChangeStatus(&This->InetTransport, IXP_AUTHORIZED); + InternetTransport_ChangeStatus(&This->InetTransport, IXP_CONNECTED); + + memset(&response, 0, sizeof(response)); + response.command = SMTP_CONNECTED; + response.fDone = TRUE; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); +} + +static void SMTPTransport_CallbackRecvHelloResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackProcessHelloResp); +} + +static void SMTPTransport_CallbackSendHello(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response = { 0 }; + HRESULT hr; + const char *pszHello; + char *pszCommand; + const char szHostName[] = "localhost"; /* FIXME */ + + TRACE("\n"); + + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + response.command = SMTP_BANNER; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } + + TRACE("(%s)\n", pBuffer); + + This->fESMTP = strstr(response.rIxpResult.pszResponse, "ESMTP") && + This->InetTransport.ServerInfo.dwFlags & (ISF_SSLONSAMEPORT|ISF_QUERYDSNSUPPORT|ISF_QUERYAUTHSUPPORT); + + if (This->fESMTP) + pszHello = "EHLO "; + else + pszHello = "HELO "; + + pszCommand = HeapAlloc(GetProcessHeap(), 0, strlen(pszHello) + strlen(szHostName) + 2); + strcpy(pszCommand, pszHello); + strcat(pszCommand, szHostName); + pszCommand[strlen(pszCommand)+1] = '\0'; + pszCommand[strlen(pszCommand)] = '\n'; + + InternetTransport_DoCommand(&This->InetTransport, pszCommand, + SMTPTransport_CallbackRecvHelloResp); + + HeapFree(GetProcessHeap(), 0, pszCommand); +} + static HRESULT WINAPI SMTPTransport_QueryInterface(ISMTPTransport2 *iface, REFIID riid, void **ppv) { TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); @@ -123,8 +290,8 @@ static HRESULT WINAPI SMTPTransport_Connect(ISMTPTransport2 *iface, hr = InternetTransport_Connect(&This->InetTransport, pInetServer, fAuthenticate, fCommandLogging); - FIXME("continue state machine here\n"); - return hr; + /* this starts the state machine, which continues in SMTPTransport_CallbackSendHELO */ + return InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackSendHello); } static HRESULT WINAPI SMTPTransport_HandsOffCallback(ISMTPTransport2 *iface) @@ -314,6 +481,7 @@ HRESULT WINAPI CreateSMTPTransport(ISMTPTransport **ppTransport) This->InetTransport.u.vtblSMTP2 = &SMTPTransport2Vtbl; This->refs = 0; + This->fESMTP = FALSE; hr = InternetTransport_Init(&This->InetTransport); if (FAILED(hr)) {

1 0

Hans Leidekker : inetcomm: Add a stub implementation of ISMTPTransport2.
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: aff6049180ca77a5709c5c4278f6a60fc4f23c4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff6049180ca77a5709c5c427… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 30 15:05:39 2008 +0100 inetcomm: Add a stub implementation of ISMTPTransport2. --- dlls/inetcomm/Makefile.in | 3 +- dlls/inetcomm/inetcomm_private.h | 2 +- dlls/inetcomm/smtptransport.c | 396 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 399 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aff6049180ca77a5709c5…

1 0

Hans Leidekker : inetcomm: Add a stub implementation of IPOP3Transport.
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: 80cb3569af49da3588ab0d746579404821203643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80cb3569af49da3588ab0d746… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 30 15:05:24 2008 +0100 inetcomm: Add a stub implementation of IPOP3Transport. --- dlls/inetcomm/Makefile.in | 1 + dlls/inetcomm/inetcomm_private.h | 1 + dlls/inetcomm/pop3transport.c | 379 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 381 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80cb3569af49da3588ab0…

1 0

Hans Leidekker : wsock32: Make EnumProtocols a wrapper around WSAEnumProtocols instead of forwarding directly .
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: bc5dd3022a448c51a2915d1ca8c62ff136da373e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc5dd3022a448c51a2915d1ca… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 30 15:06:25 2008 +0100 wsock32: Make EnumProtocols a wrapper around WSAEnumProtocols instead of forwarding directly. --- dlls/wsock32/protocol.c | 133 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wsock32/wsock32.spec | 4 +- 2 files changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index cd2cf71..85cb54b 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -2,6 +2,7 @@ * WSOCK32 specific functions * * Copyright (C) 2001 Stefan Leichter + * Copyright (C) 2008 Hans Leidekker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,9 +37,13 @@ #include "windef.h" #include "winbase.h" #include "winsock2.h" +#include "nspapi.h" +#include "wine/debug.h" #include "wine/unicode.h" +WINE_DEFAULT_DEBUG_CHANNEL(winsock); + /***************************************************************************** * inet_network [WSOCK32.1100] */ @@ -62,3 +67,131 @@ struct netent * WINAPI WSOCK32_getnetbyname(const char *name) return NULL; #endif } + +static DWORD map_service(DWORD wsaflags) +{ + DWORD flags = 0; + + if (wsaflags & XP1_CONNECTIONLESS) flags |= XP_CONNECTIONLESS; + if (wsaflags & XP1_GUARANTEED_DELIVERY) flags |= XP_GUARANTEED_DELIVERY; + if (wsaflags & XP1_GUARANTEED_ORDER) flags |= XP_GUARANTEED_ORDER; + if (wsaflags & XP1_MESSAGE_ORIENTED) flags |= XP_MESSAGE_ORIENTED; + if (wsaflags & XP1_PSEUDO_STREAM) flags |= XP_PSEUDO_STREAM; + if (wsaflags & XP1_GRACEFUL_CLOSE) flags |= XP_GRACEFUL_CLOSE; + if (wsaflags & XP1_EXPEDITED_DATA) flags |= XP_EXPEDITED_DATA; + if (wsaflags & XP1_CONNECT_DATA) flags |= XP_CONNECT_DATA; + if (wsaflags & XP1_DISCONNECT_DATA) flags |= XP_DISCONNECT_DATA; + if (wsaflags & XP1_SUPPORT_BROADCAST) flags |= XP_SUPPORTS_BROADCAST; + if (wsaflags & XP1_SUPPORT_MULTIPOINT) flags |= XP_SUPPORTS_MULTICAST; + if (wsaflags & XP1_QOS_SUPPORTED) flags |= XP_BANDWITH_ALLOCATION; + if (wsaflags & XP1_PARTIAL_MESSAGE) flags |= XP_FRAGMENTATION; + return flags; +} + +/***************************************************************************** + * EnumProtocolsA [WSOCK32.1111] + */ +INT WINAPI EnumProtocolsA(LPINT protocols, LPVOID buffer, LPDWORD buflen) +{ + INT ret; + DWORD size, string_size = WSAPROTOCOL_LEN + 1; + + TRACE("%p, %p, %p\n", protocols, buffer, buflen); + + if (!buflen) return SOCKET_ERROR; + + size = 0; + ret = WSAEnumProtocolsA(protocols, NULL, &size); + + if (ret == SOCKET_ERROR && WSAGetLastError() == WSAENOBUFS) + { + DWORD num_protocols = size / sizeof(WSAPROTOCOL_INFOA); + if (*buflen < num_protocols * (sizeof(PROTOCOL_INFOA) + string_size)) + { + *buflen = num_protocols * (sizeof(PROTOCOL_INFOA) + string_size); + return SOCKET_ERROR; + } + if (buffer) + { + WSAPROTOCOL_INFOA *wsabuf; + PROTOCOL_INFOA *pi = buffer; + unsigned int i, string_offset; + + if (!(wsabuf = HeapAlloc(GetProcessHeap(), 0, size))) return SOCKET_ERROR; + + ret = WSAEnumProtocolsA(protocols, wsabuf, &size); + string_offset = ret * sizeof(PROTOCOL_INFOA); + + for (i = 0; i < ret; i++) + { + pi[i].dwServiceFlags = map_service(wsabuf[i].dwServiceFlags1); + pi[i].iAddressFamily = wsabuf[i].iAddressFamily; + pi[i].iMaxSockAddr = wsabuf[i].iMaxSockAddr; + pi[i].iMinSockAddr = wsabuf[i].iMinSockAddr; + pi[i].iSocketType = wsabuf[i].iSocketType; + pi[i].iProtocol = wsabuf[i].iProtocol; + pi[i].dwMessageSize = wsabuf[i].dwMessageSize; + + memcpy((char *)buffer + string_offset, wsabuf[i].szProtocol, string_size); + pi[i].lpProtocol = (char *)buffer + string_offset; + string_offset += string_size; + } + HeapFree(GetProcessHeap(), 0, wsabuf); + } + } + return ret; +} + +/***************************************************************************** + * EnumProtocolsW [WSOCK32.1112] + */ +INT WINAPI EnumProtocolsW(LPINT protocols, LPVOID buffer, LPDWORD buflen) +{ + INT ret; + DWORD size, string_size = (WSAPROTOCOL_LEN + 1) * sizeof(WCHAR); + + TRACE("%p, %p, %p\n", protocols, buffer, buflen); + + if (!buflen) return SOCKET_ERROR; + + size = 0; + ret = WSAEnumProtocolsW(protocols, NULL, &size); + + if (ret == SOCKET_ERROR && WSAGetLastError() == WSAENOBUFS) + { + DWORD num_protocols = size / sizeof(WSAPROTOCOL_INFOW); + if (*buflen < num_protocols * (sizeof(PROTOCOL_INFOW) + string_size)) + { + *buflen = num_protocols * (sizeof(PROTOCOL_INFOW) + string_size); + return SOCKET_ERROR; + } + if (buffer) + { + WSAPROTOCOL_INFOW *wsabuf; + PROTOCOL_INFOW *pi = buffer; + unsigned int i, string_offset; + + if (!(wsabuf = HeapAlloc(GetProcessHeap(), 0, size))) return SOCKET_ERROR; + + ret = WSAEnumProtocolsW(protocols, wsabuf, &size); + string_offset = ret * sizeof(PROTOCOL_INFOW); + + for (i = 0; i < ret; i++) + { + pi[i].dwServiceFlags = map_service(wsabuf[i].dwServiceFlags1); + pi[i].iAddressFamily = wsabuf[i].iAddressFamily; + pi[i].iMaxSockAddr = wsabuf[i].iMaxSockAddr; + pi[i].iMinSockAddr = wsabuf[i].iMinSockAddr; + pi[i].iSocketType = wsabuf[i].iSocketType; + pi[i].iProtocol = wsabuf[i].iProtocol; + pi[i].dwMessageSize = wsabuf[i].dwMessageSize; + + memcpy((char *)buffer + string_offset, wsabuf[i].szProtocol, string_size); + pi[i].lpProtocol = (WCHAR *)(char *)buffer + string_offset; + string_offset += string_size; + } + HeapFree(GetProcessHeap(), 0, wsabuf); + } + } + return ret; +} diff --git a/dlls/wsock32/wsock32.spec b/dlls/wsock32/wsock32.spec index 9297984..db0b76d 100644 --- a/dlls/wsock32/wsock32.spec +++ b/dlls/wsock32/wsock32.spec @@ -62,8 +62,8 @@ 1108 stdcall s_perror(str) 1109 stdcall GetAddressByNameA(long ptr str ptr long ptr ptr ptr ptr ptr) 1110 stdcall GetAddressByNameW(long ptr wstr ptr long ptr ptr ptr ptr ptr) -1111 stdcall EnumProtocolsA(ptr ptr ptr) ws2_32.WSAEnumProtocolsA -1112 stdcall EnumProtocolsW(ptr ptr ptr) ws2_32.WSAEnumProtocolsW +1111 stdcall EnumProtocolsA(ptr ptr ptr) +1112 stdcall EnumProtocolsW(ptr ptr ptr) 1113 stdcall GetTypeByNameA(str ptr) 1114 stdcall GetTypeByNameW(wstr ptr) #1115 stub GetNameByTypeA

1 0

Nikolay Sivov : gdiplus: Add a structure to header for easier navigation ( by wrapper class).
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: 59dde0d9a7ed863c8b352fc0292c1a1a9fa0734c URL: http://source.winehq.org/git/wine.git/?a=commit;h=59dde0d9a7ed863c8b352fc02… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 30 12:22:08 2008 +0300 gdiplus: Add a structure to header for easier navigation (by wrapper class). --- include/gdiplusflat.h | 611 +++++++++++++++++++++++++------------------------ 1 files changed, 317 insertions(+), 294 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59dde0d9a7ed863c8b352…

1 0

Alexandre Julliard : kernel32: Moved the pthread emulation support to ntdll .
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: 5002bd21d12e99b69bce7d0ce22dfa7e4cccb804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5002bd21d12e99b69bce7d0ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 30 15:39:50 2008 +0100 kernel32: Moved the pthread emulation support to ntdll. --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/kernel_private.h | 5 +---- dlls/kernel32/process.c | 2 -- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/ntdll_misc.h | 4 +++- dlls/{kernel32 => ntdll}/pthread.c | 14 +++++++------- dlls/ntdll/thread.c | 1 + 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 0f00b92..ffbfae3 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -51,7 +51,6 @@ C_SRCS = \ powermgnt.c \ process.c \ profile.c \ - pthread.c \ relay16.c \ resource.c \ resource16.c \ diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 8d69707..ccece65 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -30,8 +30,7 @@ struct kernel_thread_data WORD htask16; /* Win16 task handle */ DWORD sys_count[4]; /* syslevel mutex entry counters */ struct tagSYSLEVEL *sys_mutex[4]; /* syslevel mutex pointers */ - void *pthread_data; /* private data for pthread emulation */ - void *pad[43]; /* change this if you add fields! */ + void *pad[44]; /* change this if you add fields! */ }; static inline struct kernel_thread_data *kernel_get_thread_data(void) @@ -71,8 +70,6 @@ extern HANDLE dos_handles[DOS_TABLE_SIZE]; extern const WCHAR *DIR_Windows; extern const WCHAR *DIR_System; -extern void PTHREAD_Init(void); - extern VOID SYSLEVEL_CheckNotLevel( INT level ); extern void FILE_SetDosError(void); diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 72d829b..c8aba47 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -970,8 +970,6 @@ void __wine_kernel_init(void) /* Initialize everything */ - PTHREAD_Init(); - setbuf(stdout,NULL); setbuf(stderr,NULL); kernel32_handle = GetModuleHandleW(kernel32W); diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 345b88f..0c6a947 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -30,6 +30,7 @@ C_SRCS = \ om.c \ path.c \ process.c \ + pthread.c \ reg.c \ relay.c \ resource.c \ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3317a6a..a8fcf63 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -59,6 +59,7 @@ extern size_t get_signal_stack_total_size(void); extern void version_init( const WCHAR *appname ); extern void debug_init(void); extern HANDLE thread_init(void); +extern void pthread_init(void); extern void actctx_init(void); extern void virtual_init(void); extern void virtual_init_threading(void); @@ -180,8 +181,9 @@ struct ntdll_thread_data int reply_fd; /* 1e4 fd for receiving server replies */ int wait_fd[2]; /* 1e8 fd for sleeping server requests */ void *vm86_ptr; /* 1f0 data for vm86 mode */ + void *pthread_data; /* 1f4 private data for pthread emulation */ - void *pad[2]; /* 1f4 change this if you add fields! */ + void *pad[1]; /* 1f8 change this if you add fields! */ }; static inline struct ntdll_thread_data *ntdll_get_thread_data(void) diff --git a/dlls/kernel32/pthread.c b/dlls/ntdll/pthread.c similarity index 97% rename from dlls/kernel32/pthread.c rename to dlls/ntdll/pthread.c index 0628890..60b6033 100644 --- a/dlls/kernel32/pthread.c +++ b/dlls/ntdll/pthread.c @@ -46,7 +46,7 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" -#include "kernel_private.h" +#include "ntdll_misc.h" #include "wine/pthread.h" #define P_OUTPUT(stuff) write(2,stuff,strlen(stuff)) @@ -183,7 +183,7 @@ static void mutex_real_init( pthread_mutex_t *mutex ) CRITICAL_SECTION *critsect = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(CRITICAL_SECTION)); RtlInitializeCriticalSection(critsect); - if (InterlockedCompareExchangePointer((void**)&(((wine_mutex)mutex)->critsect),critsect,NULL) != NULL) { + if (interlocked_cmpxchg_ptr((void**)&(((wine_mutex)mutex)->critsect),critsect,NULL) != NULL) { /* too late, some other thread already did it */ RtlDeleteCriticalSection(critsect); RtlFreeHeap(GetProcessHeap(), 0, critsect); @@ -242,7 +242,7 @@ static void rwlock_real_init(pthread_rwlock_t *rwlock) RTL_RWLOCK *lock = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_RWLOCK)); RtlInitializeResource(lock); - if (InterlockedCompareExchangePointer((void**)&(((wine_rwlock)rwlock)->lock),lock,NULL) != NULL) { + if (interlocked_cmpxchg_ptr((void**)&(((wine_rwlock)rwlock)->lock),lock,NULL) != NULL) { /* too late, some other thread already did it */ RtlDeleteResource(lock); RtlFreeHeap(GetProcessHeap(), 0, lock); @@ -363,7 +363,7 @@ static void wine_cond_real_init(pthread_cond_t *cond) NtCreateEvent( &detail->waiters_done, EVENT_ALL_ACCESS, NULL, FALSE, FALSE ); RtlInitializeCriticalSection (&detail->waiters_count_lock); - if (InterlockedCompareExchangePointer((void**)&(((wine_cond)cond)->cond), detail, NULL) != NULL) + if (interlocked_cmpxchg_ptr((void**)&(((wine_cond)cond)->cond), detail, NULL) != NULL) { /* too late, some other thread already did it */ P_OUTPUT("FIXME:pthread_cond_init:expect troubles...\n"); @@ -549,12 +549,12 @@ static int wine_pthread_equal(pthread_t thread1, pthread_t thread2) static void *wine_get_thread_data(void) { - return kernel_get_thread_data()->pthread_data; + return ntdll_get_thread_data()->pthread_data; } static void wine_set_thread_data( void *data ) { - kernel_get_thread_data()->pthread_data = data; + ntdll_get_thread_data()->pthread_data = data; } static const struct wine_pthread_callbacks callbacks = @@ -590,7 +590,7 @@ static const struct wine_pthread_callbacks callbacks = static struct wine_pthread_functions pthread_functions; -void PTHREAD_Init(void) +void pthread_init(void) { wine_pthread_get_functions( &pthread_functions, sizeof(pthread_functions) ); pthread_functions.init_process( &callbacks, sizeof(callbacks) ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index db126bb..54d93d4 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -342,6 +342,7 @@ HANDLE thread_init(void) user_shared_data->TickCountLowDeprecated = user_shared_data->u.TickCount.LowPart; user_shared_data->TickCountMultiplier = 1 << 24; + pthread_init(); return exe_file; }

1 0

Alexandre Julliard : kernel32: Use ntdll functions where possible to implement the pthread wrappers.
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: 8551c8d50ea77cd15fb68307566face88b09eb71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8551c8d50ea77cd15fb683075… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 30 15:38:59 2008 +0100 kernel32: Use ntdll functions where possible to implement the pthread wrappers. --- dlls/kernel32/pthread.c | 126 +++++++++++++++++++++++++++-------------------- 1 files changed, 72 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8551c8d50ea77cd15fb68…

1 0