Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 69791: [IPHLPAPI] Fix GetAdaptersAdresses operational status. ReactOS is now seen online. CORE-9178 #resolve Please retest apps with connectivity problems.
by spetreolle＠svn.reactos.org 02 Nov '15

02 Nov '15

Author: spetreolle Date: Mon Nov 2 23:56:46 2015 New Revision: 69791 URL: http://svn.reactos.org/svn/reactos?rev=69791&view=rev Log: [IPHLPAPI] Fix GetAdaptersAdresses operational status. ReactOS is now seen online. CORE-9178 #resolve Please retest apps with connectivity problems. Modified: trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt trunk/reactos/dll/win32/iphlpapi/address.c trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Mon Nov 2 23:56:46 2015 @@ -6,6 +6,7 @@ spec2def(iphlpapi.dll iphlpapi.spec ADD_IMPORTLIB) +add_definitions(-DGetAdaptersAddressesV2) list(APPEND SOURCE address.c dhcp_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/address.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/address… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] Mon Nov 2 23:56:46 2015 @@ -9,7 +9,7 @@ #include "iphlpapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); -#if 1 +#ifdef GetAdaptersAddressesV2 /* Helper for GetAdaptersAddresses: * Retrieves the list of network adapters from tcpip.sys */ static @@ -422,7 +422,11 @@ CurrentAA->Flags = 0; // FIXME! CurrentAA->Mtu = Entry->if_mtu; CurrentAA->IfType = Entry->if_type; - CurrentAA->OperStatus = Entry->if_operstatus; + if(Entry->if_operstatus >= IF_OPER_STATUS_CONNECTING) + CurrentAA->OperStatus = IfOperStatusUp; + else + CurrentAA->OperStatus = IfOperStatusDown; + /* Next items */ Ptr = (BYTE*)(CurrentAA + 1); Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Mon Nov 2 23:56:46 2015 @@ -1517,22 +1517,6 @@ return ret; } - -/****************************************************************** - * GetPerAdapterInfo (IPHLPAPI.@) - * - * - * PARAMS - * - * IfIndex [In] - * pPerAdapterInfo [In/Out] - * pOutBufLen [In/Out] - * - * RETURNS - * - * DWORD - * - */ static void CreateNameServerListEnumNamesFunc( PWCHAR Interface, PWCHAR Server, PVOID Data) { IP_ADDR_STRING *pNext; @@ -1563,6 +1547,21 @@ Context->NumServers++; } +/****************************************************************** + * GetPerAdapterInfo (IPHLPAPI.@) + * + * + * PARAMS + * + * IfIndex [In] + * pPerAdapterInfo [In/Out] + * pOutBufLen [In/Out] + * + * RETURNS + * + * DWORD + * + */ DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterInfo, PULONG pOutBufLen) { HKEY hkey; @@ -2294,7 +2293,7 @@ /* * @implemented */ -#if 0 +#ifdef GetAdaptersAddressesV1 DWORD WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG Family,ULONG Flags,PVOID Reserved,PIP_ADAPTER_ADDRESSES pAdapterAddresses,PULONG pOutBufLen) { InterfaceIndexTable *indexTable; @@ -2308,7 +2307,7 @@ if (!pOutBufLen) return ERROR_INVALID_PARAMETER; if (Reserved) return ERROR_INVALID_PARAMETER; - indexTable = getNonLoopbackInterfaceIndexTable(); //I think we want non-loopback here + indexTable = getInterfaceIndexTable(); if (!indexTable) return ERROR_NOT_ENOUGH_MEMORY; @@ -2345,8 +2344,8 @@ /* We're only going to implement what's required for XP SP0 */ } } - - if (*pOutBufLen < requiredSize) + TRACE("size: %d, requiredSize: %d\n", *pOutBufLen, requiredSize); + if (!pAdapterAddresses || *pOutBufLen < requiredSize) { *pOutBufLen = requiredSize; closeTcpFile(tcpFile); @@ -2397,16 +2396,15 @@ currentLocation += sizeof(WCHAR); currentAddress->Next = (PVOID)currentLocation; + /* Terminate the last address correctly */ + if(i==0) + currentAddress->Next = NULL; /* We're only going to implement what's required for XP SP0 */ currentAddress = currentAddress->Next; } } - - /* Terminate the last address correctly */ - if (currentAddress) - currentAddress->Next = NULL; /* Now again, for real this time */ @@ -2470,7 +2468,10 @@ currentAddress->IfType = ifInfo.if_info.ent.if_type; /* Operational status */ - currentAddress->OperStatus = ifInfo.if_info.ent.if_operstatus; + if(ifInfo.if_info.ent.if_operstatus >= IF_OPER_STATUS_CONNECTING) + currentAddress->OperStatus = IfOperStatusUp; + else + currentAddress->OperStatus = IfOperStatusDown; /* We're only going to implement what's required for XP SP0 */

1 0

[rnaumann] 69790: [APPLICATIONS] -Improve some icons. By Henry Tang Ih. CORE-10408
by rnaumann＠svn.reactos.org 02 Nov '15

02 Nov '15

Author: rnaumann Date: Mon Nov 2 22:11:51 2015 New Revision: 69790 URL: http://svn.reactos.org/svn/reactos?rev=69790&view=rev Log: [APPLICATIONS] -Improve some icons. By Henry Tang Ih. CORE-10408 Modified: trunk/reactos/base/applications/mmc/resources/mmc.ico trunk/reactos/base/applications/screensavers/3dtext/res/icon_3dtext.ico trunk/reactos/base/applications/wordpad/res/wordpad.ico Modified: trunk/reactos/base/applications/mmc/resources/mmc.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/reso… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/screensavers/3dtext/res/icon_3dtext.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/wordpad/res/wordpad.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== Binary files - no diff available.

1 0

[rnaumann] 69789: [NTOBJSHEX] - Improve the icons. By Jared Smudde. CORE-10466
by rnaumann＠svn.reactos.org 02 Nov '15

02 Nov '15

Author: rnaumann Date: Mon Nov 2 22:05:44 2015 New Revision: 69789 URL: http://svn.reactos.org/svn/reactos?rev=69789&view=rev Log: [NTOBJSHEX] - Improve the icons. By Jared Smudde. CORE-10466 Modified: trunk/reactos/dll/shellext/ntobjshex/resources/1.ico trunk/reactos/dll/shellext/ntobjshex/resources/2.ico trunk/reactos/dll/shellext/ntobjshex/resources/3.ico trunk/reactos/dll/shellext/ntobjshex/resources/4.ico trunk/reactos/dll/shellext/ntobjshex/resources/5.ico trunk/reactos/dll/shellext/ntobjshex/resources/6.ico trunk/reactos/dll/shellext/ntobjshex/resources/8.ico Modified: trunk/reactos/dll/shellext/ntobjshex/resources/1.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/shellext/ntobjshex/resources/2.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/shellext/ntobjshex/resources/3.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/shellext/ntobjshex/resources/4.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/shellext/ntobjshex/resources/5.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/shellext/ntobjshex/resources/6.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/shellext/ntobjshex/resources/8.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary files - no diff available.

1 0

[akhaldi] 69788: [WS2_32_NEW] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114
by akhaldi＠svn.reactos.org 02 Nov '15

02 Nov '15

Author: akhaldi Date: Mon Nov 2 18:37:49 2015 New Revision: 69788 URL: http://svn.reactos.org/svn/reactos?rev=69788&view=rev Log: [WS2_32_NEW] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114 Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c trunk/reactos/dll/win32/ws2_32_new/src/async.c trunk/reactos/dll/win32/ws2_32_new/src/bhook.c trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c trunk/reactos/dll/win32/ws2_32_new/src/dthread.c trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c trunk/reactos/dll/win32/ws2_32_new/src/event.c trunk/reactos/dll/win32/ws2_32_new/src/getproto.c trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c trunk/reactos/dll/win32/ws2_32_new/src/qos.c trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c trunk/reactos/dll/win32/ws2_32_new/src/recv.c trunk/reactos/dll/win32/ws2_32_new/src/rnr.c trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c trunk/reactos/dll/win32/ws2_32_new/src/select.c trunk/reactos/dll/win32/ws2_32_new/src/send.c trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c trunk/reactos/dll/win32/ws2_32_new/src/socklife.c trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c trunk/reactos/dll/win32/ws2_32_new/src/sputil.c trunk/reactos/dll/win32/ws2_32_new/src/startup.c trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2.2 Library - * FILE: lib/ws2_32.h + * FILE: dll/win32/ws2_32_new/inc/ws2_32.h * PURPOSE: WinSock 2.2 Main Header */ Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2.2 Library - * FILE: lib/ws2_32.h + * FILE: dll/win32/ws2_32_new/inc/ws2_32p.h * PURPOSE: WinSock 2.2 Main Header */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: addrconv.c + * FILE: dll/win32/ws2_32_new/src/addrconv.c * PURPOSE: Address and Port Conversion Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: addrinfo.c + * FILE: dll/win32/ws2_32_new/src/addrinfo.c * PURPOSE: Protocol-Independent Address Resolution * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/async.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/async.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: async.c + * FILE: dll/win32/ws2_32_new/src/async.c * PURPOSE: Async Block Object and Async Thread Management * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/bhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/b… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/bhook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/bhook.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: bhook.c + * FILE: dll/win32/ws2_32_new/src/bhook.c * PURPOSE: Blocking Hook support for 1.x clients * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dcatalog.c + * FILE: dll/win32/ws2_32_new/src/dcatalog.c * PURPOSE: Transport Catalog Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dcatitem.c + * FILE: dll/win32/ws2_32_new/src/dcatitem.c * PURPOSE: Transport Catalog Entry Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dllmain.c + * FILE: dll/win32/ws2_32_new/src/dllmain.c * PURPOSE: DLL Entrypoint * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dprocess.c + * FILE: dll/win32/ws2_32_new/src/dprocess.c * PURPOSE: Process Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dprovide.c + * FILE: dll/win32/ws2_32_new/src/dprovide.c * PURPOSE: Transport Provider Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dsocket.c + * FILE: dll/win32/ws2_32_new/src/dsocket.c * PURPOSE: Socket Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dprocess.c + * FILE: dll/win32/ws2_32_new/src/dthread.c * PURPOSE: Thread Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dupsock.c + * FILE: dll/win32/ws2_32_new/src/dupsock.c * PURPOSE: Socket Duplication * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/e… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: enumprot.c + * FILE: dll/win32/ws2_32_new/src/enumprot.c * PURPOSE: Protocol Enumeration * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/e… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/event.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: event.c + * FILE: dll/win32/ws2_32_new/src/event.c * PURPOSE: Socket Events * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/getproto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/g… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/getproto.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/getproto.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: getproto.c + * FILE: dll/win32/ws2_32_new/src/getproto.c * PURPOSE: GetProtoByY Functions. * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/g… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: getxbyy.c + * FILE: dll/win32/ws2_32_new/src/getxbyxx.c * PURPOSE: Get X by Y Functions for Name Resolution. * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/i… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: ioctl.c + * FILE: dll/win32/ws2_32_new/src/ioctl.c * PURPOSE: Socket I/O Control Code support. * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: nscatalo.c + * FILE: dll/win32/ws2_32_new/src/nscatalo.c * PURPOSE: Namespace Catalog Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: nscatent.c + * FILE: dll/win32/ws2_32_new/src/nscatent.c * PURPOSE: Namespace Catalog Entry Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: nspinstl.c + * FILE: dll/win32/ws2_32_new/src/nspinstl.c * PURPOSE: Namespace Provider Installation * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: nsprovid.c + * FILE: dll/win32/ws2_32_new/src/nsprovid.c * PURPOSE: Namespace Provider Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: nsquery.c + * FILE: dll/win32/ws2_32_new/src/nsquery.c * PURPOSE: Namespace Query Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/qos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/q… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/qos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/qos.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: qos.c + * FILE: dll/win32/ws2_32_new/src/qos.c * PURPOSE: QoS Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/q… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: qshelpr.c + * FILE: dll/win32/ws2_32_new/src/qshelpr.c * PURPOSE: Query Set Conversion/Packing Helpers * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/r… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: rasdial.c + * FILE: dll/win32/ws2_32_new/src/rasdial.c * PURPOSE: RAS Auto-Dial Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/recv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/r… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/recv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/recv.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: recv.c + * FILE: dll/win32/ws2_32_new/src/recv.c * PURPOSE: Socket Receive Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/rnr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/r… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/rnr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/rnr.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: rnr.c + * FILE: dll/win32/ws2_32_new/src/rnr.c * PURPOSE: Registration n' Resolution Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: scihlpr.c + * FILE: dll/win32/ws2_32_new/src/scihlpr.c * PURPOSE: Service Class Information Conversion/Packing Helpers * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: sselect.c + * FILE: dll/win32/ws2_32_new/src/select.c * PURPOSE: Socket Select Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/send.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/send.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: send.c + * FILE: dll/win32/ws2_32_new/src/send.c * PURPOSE: Socket Sending Support. * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: socktrl.c + * FILE: dll/win32/ws2_32_new/src/sockctrl.c * PURPOSE: Socket Control/State Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/socklife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/socklife.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/socklife.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: socklife.c + * FILE: dll/win32/ws2_32_new/src/socklife.c * PURPOSE: Socket Lifetime Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: spinstal.c + * FILE: dll/win32/ws2_32_new/src/spinstal.c * PURPOSE: Transport Service Provider Installation * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/sputil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/sputil.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/sputil.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: sputil.c + * FILE: dll/win32/ws2_32_new/src/sputil.c * PURPOSE: Transport Service Provider Utility Functions * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: startup.c + * FILE: dll/win32/ws2_32_new/src/startup.c * PURPOSE: Startup/Cleanup Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c [iso-8859-1] Mon Nov 2 18:37:49 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: wsautil.c + * FILE: dll/win32/ws2_32_new/src/wsautil.c * PURPOSE: Winsock Utility Functions * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */

1 0

[akhaldi] 69787: [MSAFD] Handle SO_SNDTIMEO and SO_RCVTIMEO in WSPGetSockOpt(). By Peter Hater. CORE-10440
by akhaldi＠svn.reactos.org 02 Nov '15

02 Nov '15

Author: akhaldi Date: Mon Nov 2 18:12:23 2015 New Revision: 69787 URL: http://svn.reactos.org/svn/reactos?rev=69787&view=rev Log: [MSAFD] Handle SO_SNDTIMEO and SO_RCVTIMEO in WSPGetSockOpt(). By Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Nov 2 18:12:23 2015 @@ -2174,6 +2174,14 @@ Buffer = &IntBuffer; BufferSize = sizeof(INT); break; + case SO_SNDTIMEO: + Buffer = &Socket->SharedData.SendTimeout; + BufferSize = sizeof(DWORD); + break; + case SO_RCVTIMEO: + Buffer = &Socket->SharedData.RecvTimeout; + BufferSize = sizeof(DWORD); + break; case SO_GROUP_ID: case SO_GROUP_PRIORITY:

1 0

[akhaldi] 69786: [MSAFD] Return SOCKET_ERROR instead of 0 in WSPAddressToString, WSPDuplicateSocket and WSPStringToAddress. By Peter Hater. CORE-10440
by akhaldi＠svn.reactos.org 02 Nov '15

02 Nov '15

Author: akhaldi Date: Mon Nov 2 17:55:26 2015 New Revision: 69786 URL: http://svn.reactos.org/svn/reactos?rev=69786&view=rev Log: [MSAFD] Return SOCKET_ERROR instead of 0 in WSPAddressToString, WSPDuplicateSocket and WSPStringToAddress. By Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/msafd/misc/stubs.c Modified: trunk/reactos/dll/win32/msafd/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/stubs.c [iso-8859-1] Mon Nov 2 17:55:26 2015 @@ -25,7 +25,7 @@ { UNIMPLEMENTED; - return 0; + return SOCKET_ERROR; } @@ -50,7 +50,7 @@ { UNIMPLEMENTED; - return 0; + return SOCKET_ERROR; } @@ -114,7 +114,7 @@ { UNIMPLEMENTED; - return 0; + return SOCKET_ERROR; } /* EOF */

1 0

[akhaldi] 69785: [MSAFD] Add more exports. By Peter Hater. CORE-10440
by akhaldi＠svn.reactos.org 02 Nov '15

02 Nov '15

Author: akhaldi Date: Mon Nov 2 17:39:35 2015 New Revision: 69785 URL: http://svn.reactos.org/svn/reactos?rev=69785&view=rev Log: [MSAFD] Add more exports. By Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/msafd/msafd.spec Modified: trunk/reactos/dll/win32/msafd/msafd.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.spec… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.spec [iso-8859-1] Mon Nov 2 17:39:35 2015 @@ -1 +1,15 @@ -@ stdcall WSPStartup (long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall WSPAccept(long ptr ptr ptr long ptr) +@ stdcall WSPBind(long ptr long ptr) +@ stdcall WSPCleanup(ptr) +@ stdcall WSPCloseSocket(long ptr) +@ stdcall WSPConnect(long ptr long ptr ptr ptr ptr ptr) +@ stdcall WSPGetPeerName(long ptr ptr ptr) +@ stdcall WSPGetSockName(long ptr ptr ptr) +@ stdcall WSPGetSockOpt(long long long ptr ptr ptr) +@ stdcall WSPIoctl(long long ptr long ptr long ptr ptr ptr ptr ptr) +@ stdcall WSPListen(long long ptr) +@ stdcall WSPSelect(long ptr ptr ptr ptr ptr) +@ stdcall WSPSetSockOpt(long long long ptr long ptr) +@ stdcall WSPShutdown(long long ptr) +@ stdcall WSPSocket(long long long ptr long long ptr) +@ stdcall WSPStartup(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)

1 0

[akhaldi] 69784: [MSAFD] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114
by akhaldi＠svn.reactos.org 02 Nov '15

02 Nov '15

Author: akhaldi Date: Mon Nov 2 17:35:58 2015 New Revision: 69784 URL: http://svn.reactos.org/svn/reactos?rev=69784&view=rev Log: [MSAFD] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114 Modified: trunk/reactos/dll/win32/msafd/include/helpers.h trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/event.c trunk/reactos/dll/win32/msafd/misc/helpers.c trunk/reactos/dll/win32/msafd/misc/sndrcv.c trunk/reactos/dll/win32/msafd/misc/stubs.c trunk/reactos/dll/win32/msafd/msafd.h Modified: trunk/reactos/dll/win32/msafd/include/helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/include/he… ============================================================================== --- trunk/reactos/dll/win32/msafd/include/helpers.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/include/helpers.h [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: include/helpers.h + * FILE: dll/win32/msafd/include/helpers.h * PURPOSE: Definitions for helper DLL management */ #ifndef __HELPERS_H Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: misc/dllmain.c + * FILE: dll/win32/msafd/misc/dllmain.c * PURPOSE: DLL entry point * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Alex Ionescu (alex(a)relsoft.net) Modified: trunk/reactos/dll/win32/msafd/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/event… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: misc/event.c + * FILE: dll/win32/msafd/misc/event.c * PURPOSE: Event handling * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Alex Ionescu (alex(a)relsoft.net) Modified: trunk/reactos/dll/win32/msafd/misc/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/helpe… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: misc/helpers.c + * FILE: dll/win32/msafd/misc/helpers.c * PURPOSE: Helper DLL management * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Alex Ionescu (alex(a)relsoft.net) Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: misc/sndrcv.c + * FILE: dll/win32/msafd/misc/sndrcv.c * PURPOSE: Send/receive routines * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Alex Ionescu (alex(a)relsoft.net) Modified: trunk/reactos/dll/win32/msafd/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/stubs.c [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: misc/stubs.c + * FILE: dll/win32/msafd/misc/stubs.c * PURPOSE: Stubs * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS: Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: include/msafd.h + * FILE: dll/win32/msafd/msafd.h * PURPOSE: Ancillary Function Driver DLL header */

1 0

[akhaldi] 69783: [MSAFD] Remove fixed CatalogEntryId. By Peter Hater. CORE-10440
by akhaldi＠svn.reactos.org 02 Nov '15

02 Nov '15

Author: akhaldi Date: Mon Nov 2 17:32:00 2015 New Revision: 69783 URL: http://svn.reactos.org/svn/reactos?rev=69783&view=rev Log: [MSAFD] Remove fixed CatalogEntryId. By Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Nov 2 17:32:00 2015 @@ -19,6 +19,7 @@ HANDLE GlobalHeap; WSPUPCALLTABLE Upcalls; +DWORD CatalogEntryId; /* CatalogEntryId for upcalls */ LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; PSOCKET_INFORMATION SocketListHead = NULL; CRITICAL_SECTION SocketListLock; @@ -289,7 +290,7 @@ CreateContext(Socket); /* Notify Winsock */ - Upcalls.lpWPUModifyIFSHandle(1, (SOCKET)Sock, lpErrno); + Upcalls.lpWPUModifyIFSHandle(CatalogEntryId, (SOCKET)Sock, lpErrno); /* Return Socket Handle */ TRACE("Success %x\n", Sock); @@ -2403,10 +2404,11 @@ lpProcTable->lpWSPStringToAddress = WSPStringToAddress; lpWSPData->wVersion = MAKEWORD(2, 2); lpWSPData->wHighVersion = MAKEWORD(2, 2); + /* Save CatalogEntryId for all upcalls */ + CatalogEntryId = lpProtocolInfo->dwCatalogEntryId; } TRACE("Status (%d).\n", Status); - return Status; }

1 0

[tkreuzer] 69782: [WIN32K] Only scale characters with the world-to-device transform, when the graphics mode is GM_ADVANCED. Fixes Petzold's WhatSize testapp. CORE-7154 #resolve
by tkreuzer＠svn.reactos.org 01 Nov '15

01 Nov '15

Author: tkreuzer Date: Sun Nov 1 23:40:31 2015 New Revision: 69782 URL: http://svn.reactos.org/svn/reactos?rev=69782&view=rev Log: [WIN32K] Only scale characters with the world-to-device transform, when the graphics mode is GM_ADVANCED. Fixes Petzold's WhatSize testapp. CORE-7154 #resolve Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Sun Nov 1 23:40:31 2015 @@ -17,7 +17,7 @@ PSURFACE psurfDefaultBitmap = NULL; PBRUSH pbrDefaultBrush = NULL; -static const MATRIX gmxWorldToDeviceDefault = +const MATRIX gmxWorldToDeviceDefault = { FLOATOBJ_16, FLOATOBJ_0, FLOATOBJ_0, FLOATOBJ_16, @@ -25,7 +25,7 @@ 0, 0, 0x4b }; -static const MATRIX gmxDeviceToWorldDefault = +const MATRIX gmxDeviceToWorldDefault = { FLOATOBJ_1_16, FLOATOBJ_0, FLOATOBJ_0, FLOATOBJ_1_16, @@ -33,7 +33,7 @@ 0, 0, 0x53 }; -static const MATRIX gmxWorldToPageDefault = +const MATRIX gmxWorldToPageDefault = { FLOATOBJ_1, FLOATOBJ_0, FLOATOBJ_0, FLOATOBJ_1, Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sun Nov 1 23:40:31 2015 @@ -29,6 +29,12 @@ ( ((DWORD)(BYTE)(ch0) << 24) | ((DWORD)(BYTE)(ch1) << 16) | \ ((DWORD)(BYTE)(ch2) << 8) | (DWORD)(BYTE)(ch3) ) #endif + +extern const MATRIX gmxWorldToDeviceDefault; +extern const MATRIX gmxWorldToPageDefault; + +// HACK!! Fix XFORMOBJ then use 1:16 / 16:1 +#define gmxWorldToDeviceDefault gmxWorldToPageDefault FT_Library library; @@ -3520,15 +3526,26 @@ goto fail; } - pmxWorldToDevice = DC_pmxWorldToDevice(dc); - FtSetCoordinateTransform(face, pmxWorldToDevice); + if (dc->dcattr.iGraphicsMode == GM_ADVANCED) + { + pmxWorldToDevice = DC_pmxWorldToDevice(dc); + FtSetCoordinateTransform(face, pmxWorldToDevice); + + fixAscender = ScaleLong(face->size->metrics.ascender, &pmxWorldToDevice->efM22); + fixDescender = ScaleLong(face->size->metrics.descender, &pmxWorldToDevice->efM22); + } + else + { + pmxWorldToDevice = (PMATRIX)&gmxWorldToDeviceDefault; + FtSetCoordinateTransform(face, pmxWorldToDevice); + + fixAscender = face->size->metrics.ascender; + fixDescender = face->size->metrics.descender; + } /* * Process the vertical alignment and determine the yoff. */ - - fixAscender = ScaleLong(face->size->metrics.ascender, &pmxWorldToDevice->efM22); - fixDescender = ScaleLong(face->size->metrics.descender, &pmxWorldToDevice->efM22); if (pdcattr->lTextAlign & TA_BASELINE) yoff = 0;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs