Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[amunger] 22171: Merge ncpa and networking fixes from trunk. Revisions: 21899-21900, 21912-21913, 21915, 21990, 21996, 22106, 22123

by amunger＠svn.reactos.org

Author: amunger Date: Fri Jun 2 03:37:44 2006 New Revision: 22171 URL: http://svn.reactos.ru/svn/reactos?rev=22171&view=rev Log: Merge ncpa and networking fixes from trunk. Revisions: 21899-21900, 21912-21913, 21915, 21990, 21996, 22106, 22123 Added: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/fr.rc - copied unchanged from r21915, trunk/reactos/dll/cpl/ncpa/fr.rc Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/Ja.rc branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/cz.rc branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/de.rc branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/dk.rc branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/en.rc branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/es.rc branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/hu.rc branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/ncpa.rc branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/nl.rc branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/ru.rc branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/sv.rc branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/tcpip_properties.c branches/ros-branch-0_3_0/reactos/drivers/network/tcpip/tcpip/dispatch.c branches/ros-branch-0_3_0/reactos/drivers/network/wshtcpip/wshtcpip.c branches/ros-branch-0_3_0/reactos/lib/drivers/ip/network/ip.c branches/ros-branch-0_3_0/reactos/lib/drivers/ip/network/router.c branches/ros-branch-0_3_0/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/Ja.rc URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/Ja.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/Ja.rc Fri Jun 2 03:37:44 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "Ýè(&C)", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "±ÌÚ±Í`FbN }[NªIÉÈÁÄ¢éR|[lgðgpµÄ¢Ü·:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "CXg[(&I)", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "í(&U)", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "vpeB(&P)", IDC_PROPERTIES, 174, 130, 65, 14 Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/cz.rc URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/cz.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/cz.rc Fri Jun 2 03:37:44 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Nastavit", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Vybrané komponenty jsou pouívány tímto pøipojením:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Instalovat", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Odstranit", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 174, 130, 65, 14 Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/de.rc URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/de.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/de.rc Fri Jun 2 03:37:44 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Konfigurieren", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Diese &Verbindung verwendet folgende Elemente:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installieren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Deinstallieren", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Eigenschaften", IDC_PROPERTIES, 174, 130, 65, 14 Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/dk.rc URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/dk.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/dk.rc Fri Jun 2 03:37:44 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Konfigure", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Komponeter mærkeret med et flueben er brugt af den forbindelse:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installere", IDC_INSTALL, 9, 133, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Afinstallere", IDC_UNINSTALL, 90, 133, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Egenskaber", IDC_PROPERTIES, 174, 133, 65, 14 Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/en.rc URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/en.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/en.rc Fri Jun 2 03:37:44 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Configure", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Install", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Uninstall", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Properties", IDC_PROPERTIES, 174, 130, 65, 14 Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/es.rc URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/es.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/es.rc Fri Jun 2 03:37:44 2006 @@ -27,7 +27,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Configurar", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Los componentes marcados son utilizados por esta conección:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Instalar", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 130, 65, 14 Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/hu.rc URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/hu.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/hu.rc Fri Jun 2 03:37:44 2006 @@ -22,7 +22,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Beállítás", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "A megjelölt alkotóelemek vannak használatban ennél a kapcsolatnál:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Telepítés", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Eltávolítás", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Tulajdonságok", IDC_PROPERTIES, 174, 130, 65, 14 Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/ncpa.rc URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/ncpa.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/ncpa.rc Fri Jun 2 03:37:44 2006 @@ -18,13 +18,18 @@ IDI_VERTICAL ICON "resources/VERTIC.ICO" IDI_NETSTAT ICON "resources/NETCONN.ICO" -#include "en.rc" #include "cz.rc" #include "de.rc" #include "dk.rc" +#include "en.rc" +#include "es.rc" +#include "fr.rc" +#include "hu.rc" +#include "Ja.rc" #include "nl.rc" +#include "ru.rc" #include "sv.rc" -#include "es.rc" -#include "Ja.rc" -#include "hu.rc" -#include "ru.rc" + + + + Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/nl.rc URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/nl.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/nl.rc Fri Jun 2 03:37:44 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Configureren", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installeren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Verwijderen", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Eigenschappen", IDC_PROPERTIES, 174, 130, 65, 14 Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/ru.rc URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/ru.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/ru.rc Fri Jun 2 03:37:44 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Íàñòðîèòü", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Îòìå÷åííûå êîìïîíåíòû èñïîëüçóþòñÿ ýòèì ïîäêëþ÷åíèåì:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Óñòàíîâèòü", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Óäàëèòü", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Ñâîéñòâà", IDC_PROPERTIES, 174, 130, 65, 14 Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/sv.rc URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/sv.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/sv.rc Fri Jun 2 03:37:44 2006 @@ -23,7 +23,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Konfigurera", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Markerade komponenter används av denna anslutning:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installera", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Avinstallera", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Egenskaper", IDC_PROPERTIES, 174, 130, 65, 14 Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/tcpip_properties.c Fri Jun 2 03:37:44 2006 @@ -71,6 +71,7 @@ if (! Enabled) { SendDlgItemMessage(Dlg, IDC_DNS1, IPM_CLEARADDRESS, 0, 0); SendDlgItemMessage(Dlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0); + } } @@ -132,10 +133,13 @@ ValidateAndStore(HWND Dlg, PTCPIP_PROPERTIES_DATA DlgData) { DWORD IpAddress; + MIB_IPFORWARDROW RowToAdd = { 0 }, RowToRem = { 0 }; DlgData->DhcpEnabled = (BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_USEDHCP)); if (! DlgData->DhcpEnabled) { + DhcpReleaseIpAddressLease( DlgData->AdapterIndex ); + if (4 != SendMessageW(GetDlgItem(Dlg, IDC_IPADDR), IPM_GETADDRESS, 0, (LPARAM) &IpAddress)) { ShowError(Dlg, IDS_ENTER_VALID_IPADDRESS); @@ -156,11 +160,26 @@ } else { DlgData->Gateway = htonl(IpAddress); } + DhcpStaticRefreshParams + ( DlgData->AdapterIndex, DlgData->IpAddress, DlgData->SubnetMask ); + + RowToRem.dwForwardMask = 0; + RowToRem.dwForwardMetric1 = 1; + RowToRem.dwForwardNextHop = DlgData->OldGateway; + + DeleteIpForwardEntry( &RowToRem ); + + RowToAdd.dwForwardMask = 0; + RowToAdd.dwForwardMetric1 = 1; + RowToAdd.dwForwardNextHop = DlgData->Gateway; + + CreateIpForwardEntry( &RowToAdd ); ASSERT(BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_FIXEDDNS)); } else { DlgData->IpAddress = INADDR_NONE; DlgData->SubnetMask = INADDR_NONE; DlgData->Gateway = INADDR_NONE; + DhcpLeaseIpAddress( DlgData->AdapterIndex ); } if (BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_FIXEDDNS)) { @@ -251,7 +270,8 @@ goto cleanup; } - MessageBox(NULL, TEXT("You need to reboot before the new parameters take effect."), TEXT("Reboot required"), MB_OK | MB_ICONWARNING); + // arty ... Not needed anymore ... We update the address live now + //MessageBox(NULL, TEXT("You need to reboot before the new parameters take effect."), TEXT("Reboot required"), MB_OK | MB_ICONWARNING); ret = TRUE; cleanup: Modified: branches/ros-branch-0_3_0/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/drivers… ============================================================================== --- branches/ros-branch-0_3_0/reactos/drivers/network/tcpip/tcpip/dispatch.c (original) +++ branches/ros-branch-0_3_0/reactos/drivers/network/tcpip/tcpip/dispatch.c Fri Jun 2 03:37:44 2006 @@ -1522,6 +1522,9 @@ IF->Unicast.Address.IPv4Address = IpAddrChange->Address; IF->Netmask.Type = IP_ADDRESS_V4; IF->Netmask.Address.IPv4Address = IpAddrChange->Netmask; + IF->Broadcast.Address.IPv4Address = + IF->Unicast.Address.IPv4Address | + ~IF->Netmask.Address.IPv4Address; TI_DbgPrint(MID_TRACE,("New Unicast Address: %x\n", IF->Unicast.Address.IPv4Address)); @@ -1548,6 +1551,7 @@ ForEachInterface(IF) { if( IF->Index == *NteIndex ) { + IPRemoveInterfaceRoute( IF ); IF->Unicast.Type = IP_ADDRESS_V4; IF->Unicast.Address.IPv4Address = 0; IF->Netmask.Type = IP_ADDRESS_V4; Modified: branches/ros-branch-0_3_0/reactos/drivers/network/wshtcpip/wshtcpip.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/drivers… ============================================================================== --- branches/ros-branch-0_3_0/reactos/drivers/network/wshtcpip/wshtcpip.c (original) +++ branches/ros-branch-0_3_0/reactos/drivers/network/wshtcpip/wshtcpip.c Fri Jun 2 03:37:44 2006 @@ -93,6 +93,11 @@ } +/* +Document from OSR how WSHGetSockaddrType works +http://www.osronline.com/ddkx/network/37wshfun_5lyq.htm +*/ + INT EXPORT WSHGetSockaddrType( @@ -100,10 +105,57 @@ IN DWORD SockaddrLength, OUT PSOCKADDR_INFO SockaddrInfo) { - UNIMPLEMENTED - - return 0; -} + PSOCKADDR_IN ipv4 = (PSOCKADDR_IN)Sockaddr; + + if ((ipv4 != NULL) + && (SockaddrLength == sizeof(SOCKADDR_IN)) + && (ipv4->sin_family == AF_INET) + && (SockaddrInfo != NULL)) + { + + switch (ntohl(ipv4->sin_addr.s_addr)) + { + case INADDR_ANY: + SockaddrInfo->AddressInfo = SockaddrAddressInfoWildcard; + break; + + case INADDR_BROADCAST: + SockaddrInfo->AddressInfo = SockaddrAddressInfoBroadcast; + break; + + case INADDR_LOOPBACK: + SockaddrInfo->AddressInfo = SockaddrAddressInfoLoopback; + break; + + default: + SockaddrInfo->AddressInfo = SockaddrAddressInfoNormal; + break; + } + + SockaddrInfo->EndpointInfo = SockaddrEndpointInfoNormal; + if (ntohs(ipv4->sin_port) == 0) + SockaddrInfo->EndpointInfo = SockaddrEndpointInfoWildcard; + if (ntohs(ipv4->sin_port) < IPPORT_RESERVED) + SockaddrInfo->EndpointInfo = SockaddrEndpointInfoReserved; + + return 0; + } + + DPRINT1("FIXME WSHGetSockaddrType Unsupported Address Family or bad parameters\n"); + if (SockaddrInfo != NULL) + { + SockaddrInfo->AddressInfo = SockaddrAddressInfoNormal; + SockaddrInfo->EndpointInfo = SockaddrEndpointInfoNormal; + } + + DPRINT1("Size of Address Family %d \n",SockaddrLength); + + DPRINT1("FIXME WSHGetSockaddrType return Winsock error, but we do not return any error\n"); + return 0; +} + + + INT Modified: branches/ros-branch-0_3_0/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/lib/dri… ============================================================================== --- branches/ros-branch-0_3_0/reactos/lib/drivers/ip/network/ip.c (original) +++ branches/ros-branch-0_3_0/reactos/lib/drivers/ip/network/ip.c Fri Jun 2 03:37:44 2006 @@ -305,14 +305,19 @@ TCPDisposeInterfaceData( IF->TCPContext ); IF->TCPContext = NULL; + TI_DbgPrint(DEBUG_IP,("Removing interface Addr %s\n", A2S(&IF->Unicast))); + TI_DbgPrint(DEBUG_IP,(" Mask %s\n", A2S(&IF->Netmask))); + AddrWidenAddress(&GeneralRoute,&IF->Unicast,&IF->Netmask); + RouterRemoveRoute(&GeneralRoute, &IF->Unicast); /* Remove permanent NCE, but first we have to find it */ NCE = NBLocateNeighbor(&IF->Unicast); if (NCE) NBRemoveNeighbor(NCE); - + else + TI_DbgPrint(DEBUG_IP, ("Could not delete IF route (0x%X)\n", IF)); } VOID IPUnregisterInterface( Modified: branches/ros-branch-0_3_0/reactos/lib/drivers/ip/network/router.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/lib/dri… ============================================================================== --- branches/ros-branch-0_3_0/reactos/lib/drivers/ip/network/router.c (original) +++ branches/ros-branch-0_3_0/reactos/lib/drivers/ip/network/router.c Fri Jun 2 03:37:44 2006 @@ -18,6 +18,30 @@ LIST_ENTRY FIBListHead; KSPIN_LOCK FIBLock; +void RouterDumpRoutes() { + PLIST_ENTRY CurrentEntry; + PLIST_ENTRY NextEntry; + PFIB_ENTRY Current; + PNEIGHBOR_CACHE_ENTRY NCE; + + TI_DbgPrint(DEBUG_ROUTER,("Dumping Routes\n")); + + CurrentEntry = FIBListHead.Flink; + while (CurrentEntry != &FIBListHead) { + NextEntry = CurrentEntry->Flink; + Current = CONTAINING_RECORD(CurrentEntry, FIB_ENTRY, ListEntry); + + NCE = Current->Router; + + TI_DbgPrint(DEBUG_ROUTER,("Examining FIBE %x\n", Current)); + TI_DbgPrint(DEBUG_ROUTER,("... NetworkAddress %s\n", A2S(&Current->NetworkAddress))); + TI_DbgPrint(DEBUG_ROUTER,("... NCE->Address . %s\n", A2S(&NCE->Address))); + + CurrentEntry = NextEntry; + } + + TI_DbgPrint(DEBUG_ROUTER,("Dumping Routes ... Done\n")); +} VOID FreeFIB( PVOID Object) @@ -195,7 +219,7 @@ return NULL; } - INIT_TAG(Router, TAG('R','O','U','T')); + INIT_TAG(Router, TAG('R','O','U','T')); RtlCopyMemory( &FIBE->NetworkAddress, NetworkAddress, sizeof(FIBE->NetworkAddress) ); @@ -331,13 +355,17 @@ PNEIGHBOR_CACHE_ENTRY NCE; TI_DbgPrint(DEBUG_ROUTER, ("Called\n")); + TI_DbgPrint(DEBUG_ROUTER, ("Deleting Route From: %s\n", A2S(Router))); + TI_DbgPrint(DEBUG_ROUTER, (" To: %s\n", A2S(Target))); TcpipAcquireSpinLock(&FIBLock, &OldIrql); - CurrentEntry = FIBListHead.Flink; - while (CurrentEntry != &FIBListHead) { - NextEntry = CurrentEntry->Flink; - Current = CONTAINING_RECORD(CurrentEntry, FIB_ENTRY, ListEntry); + RouterDumpRoutes(); + + CurrentEntry = FIBListHead.Flink; + while (CurrentEntry != &FIBListHead) { + NextEntry = CurrentEntry->Flink; + Current = CONTAINING_RECORD(CurrentEntry, FIB_ENTRY, ListEntry); NCE = Current->Router; @@ -355,6 +383,8 @@ TI_DbgPrint(DEBUG_ROUTER, ("Deleting route\n")); DestroyFIBE( Current ); } + + RouterDumpRoutes(); TcpipReleaseSpinLock(&FIBLock, OldIrql); @@ -384,8 +414,33 @@ * for providing this reference */ { + KIRQL OldIrql; + PFIB_ENTRY FIBE; + PLIST_ENTRY CurrentEntry; + PLIST_ENTRY NextEntry; + PFIB_ENTRY Current; PNEIGHBOR_CACHE_ENTRY NCE; - PFIB_ENTRY FIBE; + + TcpipAcquireSpinLock(&FIBLock, &OldIrql); + + CurrentEntry = FIBListHead.Flink; + while (CurrentEntry != &FIBListHead) { + NextEntry = CurrentEntry->Flink; + Current = CONTAINING_RECORD(CurrentEntry, FIB_ENTRY, ListEntry); + + NCE = Current->Router; + + if( AddrIsEqual(NetworkAddress, &Current->NetworkAddress) && + AddrIsEqual(Netmask, &Current->Netmask) ) { + TI_DbgPrint(DEBUG_ROUTER,("Attempting to add duplicate route to %s\n", A2S(NetworkAddress))); + TcpipReleaseSpinLock(&FIBLock, OldIrql); + return NULL; + } + + CurrentEntry = NextEntry; + } + + TcpipReleaseSpinLock(&FIBLock, OldIrql); /* The NCE references RouterAddress. The NCE is referenced for us */ NCE = NBFindOrCreateNeighbor(Interface, RouterAddress); Modified: branches/ros-branch-0_3_0/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/lib/dri… ============================================================================== --- branches/ros-branch-0_3_0/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c (original) +++ branches/ros-branch-0_3_0/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c Fri Jun 2 03:37:44 2006 @@ -827,6 +827,19 @@ register struct socket *so; register int how; { + if (so == NULL) + { + register struct protosw *pr = NULL; + + how++; + if (how & FREAD) + sorflush(so); + if (how & FWRITE) + return ((*pr->pr_usrreq)(so, PRU_SHUTDOWN, + (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0)); + return (0); + } + register struct protosw *pr = so->so_proto; how++;

18 years, 5 months

[hpoussin] 22170: Change registry settings (related to revision 22169) I'm not sure if this change is correct or if win32k has to be fixed.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Jun 2 02:00:43 2006 New Revision: 22170 URL: http://svn.reactos.ru/svn/reactos?rev=22170&view=rev Log: Change registry settings (related to revision 22169) I'm not sure if this change is correct or if win32k has to be fixed. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Fri Jun 2 02:00:43 2006 @@ -720,8 +720,8 @@ HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\drivers\vbemp.sys" HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" - + +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,8 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,640 @@ -733,8 +733,8 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ImagePath",0x00020000,"system32\drivers\vgamp.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi" - + +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi" HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.VRefresh",0x00010001,1 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.BitsPerPel",0x00010001,8 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640

18 years, 5 months

[hpoussin] 22169: Store real parameters registry key in DEVICEMAP\VIDEO Use it in win32k when loading and storing settings (SetupDevMode and IntChangeDisplaySettings)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Jun 2 01:45:50 2006 New Revision: 22169 URL: http://svn.reactos.ru/svn/reactos?rev=22169&view=rev Log: Store real parameters registry key in DEVICEMAP\VIDEO Use it in win32k when loading and storing settings (SetupDevMode and IntChangeDisplaySettings) Modified: trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/video/videoprt/vide… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Fri Jun 2 01:45:50 2006 @@ -130,6 +130,94 @@ ((PMINIPORT_DPC_ROUTINE)SystemArgument1)(HwDeviceExtension, SystemArgument2); } +NTSTATUS +IntCreateRegistryPath( + IN PCUNICODE_STRING DriverRegistryPath, + OUT PUNICODE_STRING DeviceRegistryPath) +{ + static WCHAR RegistryMachineSystem[] = L"\\REGISTRY\\MACHINE\\SYSTEM\\"; + static WCHAR CurrentControlSet[] = L"CURRENTCONTROLSET\\"; + static WCHAR ControlSet[] = L"CONTROLSET"; + static WCHAR Insert1[] = L"Hardware Profiles\\Current\\System\\CurrentControlSet\\"; + static WCHAR Insert2[] = L"\\Device0"; + LPWSTR ProfilePath = NULL; + BOOLEAN Valid; + PWCHAR AfterControlSet; + + Valid = (0 == _wcsnicmp(DriverRegistryPath->Buffer, RegistryMachineSystem, + wcslen(RegistryMachineSystem))); + { + AfterControlSet = DriverRegistryPath->Buffer + wcslen(RegistryMachineSystem); + if (0 == _wcsnicmp(AfterControlSet, CurrentControlSet, wcslen(CurrentControlSet))) + { + AfterControlSet += wcslen(CurrentControlSet); + } + else if (0 == _wcsnicmp(AfterControlSet, ControlSet, wcslen(ControlSet))) + { + AfterControlSet += wcslen(ControlSet); + while (L'0' <= *AfterControlSet && L'9' <= *AfterControlSet) + { + AfterControlSet++; + } + Valid = (L'\\' == *AfterControlSet); + AfterControlSet++; + } + else + { + Valid = FALSE; + } + } + + if (Valid) + { + ProfilePath = ExAllocatePoolWithTag(PagedPool, + (wcslen(DriverRegistryPath->Buffer) + + wcslen(Insert1) + wcslen(Insert2) + 1) * sizeof(WCHAR), + TAG_VIDEO_PORT); + if (NULL != ProfilePath) + { + wcsncpy(ProfilePath, DriverRegistryPath->Buffer, AfterControlSet - DriverRegistryPath->Buffer); + wcscpy(ProfilePath + (AfterControlSet - DriverRegistryPath->Buffer), Insert1); + wcscat(ProfilePath, AfterControlSet); + wcscat(ProfilePath, Insert2); + + Valid = NT_SUCCESS(RtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, ProfilePath)); + } + else + { + Valid = FALSE; + } + } + else + { + DPRINT1("Unparsable registry path %wZ", DriverRegistryPath); + } + + if (Valid) + { + RtlInitUnicodeString(DeviceRegistryPath, ProfilePath); + } + else + { + if (ProfilePath) + ExFreePoolWithTag(ProfilePath, TAG_VIDEO_PORT); + + DeviceRegistryPath->Length = + DeviceRegistryPath->MaximumLength = + DriverRegistryPath->Length + (9 * sizeof(WCHAR)); + DeviceRegistryPath->Length -= sizeof(WCHAR); + DeviceRegistryPath->Buffer = ExAllocatePoolWithTag( + NonPagedPool, + DeviceRegistryPath->MaximumLength, + TAG_VIDEO_PORT); + if (!DeviceRegistryPath->Buffer) + return STATUS_NO_MEMORY; + swprintf(DeviceRegistryPath->Buffer, L"%s\\Device0", + DriverRegistryPath->Buffer); + } + return STATUS_SUCCESS; +} + NTSTATUS NTAPI IntVideoPortCreateAdapterDeviceObject( IN PDRIVER_OBJECT DriverObject, @@ -203,16 +291,20 @@ DeviceExtension->FunctionalDeviceObject = *DeviceObject; DeviceExtension->DriverExtension = DriverExtension; - DeviceExtension->RegistryPath.Length = - DeviceExtension->RegistryPath.MaximumLength = - DriverExtension->RegistryPath.Length + (9 * sizeof(WCHAR)); - DeviceExtension->RegistryPath.Length -= sizeof(WCHAR); - DeviceExtension->RegistryPath.Buffer = ExAllocatePoolWithTag( - NonPagedPool, - DeviceExtension->RegistryPath.MaximumLength, - TAG_VIDEO_PORT); - swprintf(DeviceExtension->RegistryPath.Buffer, L"%s\\Device0", - DriverExtension->RegistryPath.Buffer); + /* + * Get the registry path associated with this driver. + */ + + Status = IntCreateRegistryPath( + &DriverExtension->RegistryPath, + &DeviceExtension->RegistryPath); + if (!NT_SUCCESS(Status)) + { + DPRINT("IntCreateRegistryPath() call failed with status 0x%08x\n", Status); + IoDeleteDevice(*DeviceObject); + *DeviceObject = NULL; + return Status; + } if (PhysicalDeviceObject != NULL) { Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Fri Jun 2 01:45:50 2006 @@ -265,14 +265,14 @@ return hNewDC; } -static BOOL FASTCALL +static BOOLEAN FASTCALL GetRegistryPath(PUNICODE_STRING RegistryPath, ULONG DisplayNumber) { RTL_QUERY_REGISTRY_TABLE QueryTable[2]; WCHAR DeviceNameBuffer[20]; NTSTATUS Status; - swprintf(DeviceNameBuffer, L"\\Device\\Video%d", DisplayNumber); + swprintf(DeviceNameBuffer, L"\\Device\\Video%lu", DisplayNumber); RtlInitUnicodeString(RegistryPath, NULL); RtlZeroMemory(QueryTable, sizeof(QueryTable)); QueryTable[0].Flags = RTL_QUERY_REGISTRY_REQUIRED | RTL_QUERY_REGISTRY_DIRECT; @@ -286,11 +286,11 @@ NULL); if (! NT_SUCCESS(Status)) { - DPRINT1("No \\Device\\Video%d value in DEVICEMAP\\VIDEO found\n", DisplayNumber); + DPRINT1("No \\Device\\Video%lu value in DEVICEMAP\\VIDEO found\n", DisplayNumber); return FALSE; } - DPRINT("RegistryPath %S\n", RegistryPath->Buffer); + DPRINT("RegistryPath %wZ\n", RegistryPath); return TRUE; } @@ -381,103 +381,48 @@ static BOOL FASTCALL SetupDevMode(PDEVMODEW DevMode, ULONG DisplayNumber) { - static WCHAR RegistryMachineSystem[] = L"\\REGISTRY\\MACHINE\\SYSTEM\\"; - static WCHAR CurrentControlSet[] = L"CURRENTCONTROLSET\\"; - static WCHAR ControlSet[] = L"CONTROLSET"; - static WCHAR Insert[] = L"Hardware Profiles\\Current\\System\\CurrentControlSet\\"; UNICODE_STRING RegistryPath; - BOOL Valid; - PWCHAR AfterControlSet; - PWCHAR ProfilePath; RTL_QUERY_REGISTRY_TABLE QueryTable[2]; NTSTATUS Status; - - if (! GetRegistryPath(&RegistryPath, DisplayNumber)) + BOOLEAN Valid = TRUE; + + if (!GetRegistryPath(&RegistryPath, DisplayNumber)) { DPRINT("GetRegistryPath failed\n"); return FALSE; } - Valid = (0 == _wcsnicmp(RegistryPath.Buffer, RegistryMachineSystem, - wcslen(RegistryMachineSystem))); - if (Valid) - { - AfterControlSet = RegistryPath.Buffer + wcslen(RegistryMachineSystem); - if (0 == _wcsnicmp(AfterControlSet, CurrentControlSet, wcslen(CurrentControlSet))) + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + QueryTable[0].QueryRoutine = DevModeCallback; + QueryTable[0].Flags = 0; + QueryTable[0].Name = NULL; + QueryTable[0].EntryContext = NULL; + QueryTable[0].DefaultType = REG_NONE; + QueryTable[0].DefaultData = NULL; + QueryTable[0].DefaultLength = 0; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + RegistryPath.Buffer, + QueryTable, + DevMode, + NULL); + if (! NT_SUCCESS(Status)) + { + DPRINT("RtlQueryRegistryValues for %wZ failed with status 0x%08x\n", + &RegistryPath, Status); + Valid = FALSE; + } + else + { + DPRINT("dmBitsPerPel %d dmDisplayFrequency %d dmPelsWidth %d dmPelsHeight %d\n", + DevMode->dmBitsPerPel, DevMode->dmDisplayFrequency, + DevMode->dmPelsWidth, DevMode->dmPelsHeight); + if (0 == DevMode->dmBitsPerPel || 0 == DevMode->dmDisplayFrequency + || 0 == DevMode->dmPelsWidth || 0 == DevMode->dmPelsHeight) { - AfterControlSet += wcslen(CurrentControlSet); - } - else if (0 == _wcsnicmp(AfterControlSet, ControlSet, wcslen(ControlSet))) - { - AfterControlSet += wcslen(ControlSet); - while (L'0' <= *AfterControlSet && L'9' <= *AfterControlSet) - { - AfterControlSet++; - } - Valid = (L'\\' == *AfterControlSet); - AfterControlSet++; - } - else - { + DPRINT("Not all required devmode members are set\n"); Valid = FALSE; } - } - - if (Valid) - { - ProfilePath = ExAllocatePoolWithTag(PagedPool, - (wcslen(RegistryPath.Buffer) + - wcslen(Insert) + 1) * sizeof(WCHAR), - TAG_DC); - if (NULL != ProfilePath) - { - wcsncpy(ProfilePath, RegistryPath.Buffer, AfterControlSet - RegistryPath.Buffer); - wcscpy(ProfilePath + (AfterControlSet - RegistryPath.Buffer), Insert); - wcscat(ProfilePath, AfterControlSet); - - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - QueryTable[0].QueryRoutine = DevModeCallback; - QueryTable[0].Flags = 0; - QueryTable[0].Name = NULL; - QueryTable[0].EntryContext = NULL; - QueryTable[0].DefaultType = REG_NONE; - QueryTable[0].DefaultData = NULL; - QueryTable[0].DefaultLength = 0; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - ProfilePath, - QueryTable, - DevMode, - NULL); - if (! NT_SUCCESS(Status)) - { - DPRINT("RtlQueryRegistryValues for %S failed with status 0x%08x\n", - ProfilePath, Status); - Valid = FALSE; - } - else - { - DPRINT("dmBitsPerPel %d dmDisplayFrequency %d dmPelsWidth %d dmPelsHeight %d\n", - DevMode->dmBitsPerPel, DevMode->dmDisplayFrequency, - DevMode->dmPelsWidth, DevMode->dmPelsHeight); - if (0 == DevMode->dmBitsPerPel || 0 == DevMode->dmDisplayFrequency - || 0 == DevMode->dmPelsWidth || 0 == DevMode->dmPelsHeight) - { - DPRINT("Not all required devmode members are set\n"); - Valid = FALSE; - } - } - - ExFreePool(ProfilePath); - } - else - { - Valid = FALSE; - } - } - else - { - DPRINT1("Unparsable registry path %S in DEVICEMAP\\VIDEO0", RegistryPath.Buffer); } RtlFreeUnicodeString(&RegistryPath); @@ -2734,6 +2679,137 @@ return TRUE; } + +static NTSTATUS FASTCALL +GetVideoDeviceName( + OUT PUNICODE_STRING VideoDeviceName, + IN PCUNICODE_STRING DisplayDevice) /* ex: "\.\DISPLAY1" or "\??\DISPLAY1" */ +{ + UNICODE_STRING Prefix = RTL_CONSTANT_STRING(L"\\??\\"); + UNICODE_STRING ObjectName; + UNICODE_STRING KernelModeName = { 0, }; + OBJECT_ATTRIBUTES ObjectAttributes; + USHORT LastSlash; + ULONG Length; + HANDLE LinkHandle = NULL; + NTSTATUS Status; + + RtlInitUnicodeString(VideoDeviceName, NULL); + + /* Get device name (DisplayDevice is "\.\xxx") */ + for (LastSlash = DisplayDevice->Length / sizeof(WCHAR); LastSlash > 0; LastSlash--) + { + if (DisplayDevice->Buffer[LastSlash - 1] == L'\\') + break; + } + + if (LastSlash == 0) + { + DPRINT1("Invalid device name '%wZ'\n", DisplayDevice); + Status = STATUS_OBJECT_NAME_INVALID; + goto cleanup; + } + ObjectName = *DisplayDevice; + ObjectName.Length -= LastSlash * sizeof(WCHAR); + ObjectName.MaximumLength -= LastSlash * sizeof(WCHAR); + ObjectName.Buffer += LastSlash; + + /* Create "\??\xxx" (ex: "\??\DISPLAY1") */ + KernelModeName.MaximumLength = Prefix.Length + ObjectName.Length + sizeof(UNICODE_NULL); + KernelModeName.Buffer = ExAllocatePoolWithTag(PagedPool, + KernelModeName.MaximumLength, + TAG_DC); + if (!KernelModeName.Buffer) + { + Status = STATUS_NO_MEMORY; + goto cleanup; + } + RtlCopyUnicodeString(&KernelModeName, &Prefix); + Status = RtlAppendUnicodeStringToString(&KernelModeName, &ObjectName); + if (!NT_SUCCESS(Status)) + goto cleanup; + + /* Open \??\xxx (ex: "\??\DISPLAY1") */ + InitializeObjectAttributes(&ObjectAttributes, + &KernelModeName, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenSymbolicLinkObject(&LinkHandle, + GENERIC_READ, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to open symbolic link %wZ (Status 0x%08lx)\n", &KernelModeName, Status); + Status = STATUS_NO_SUCH_DEVICE; + goto cleanup; + } + + Status = ZwQuerySymbolicLinkObject(LinkHandle, VideoDeviceName, &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) + { + DPRINT1("Unable to query symbolic link %wZ (Status 0x%08lx)\n", &KernelModeName, Status); + Status = STATUS_NO_SUCH_DEVICE; + goto cleanup; + } + VideoDeviceName->MaximumLength = Length; + VideoDeviceName->Buffer = ExAllocatePoolWithTag(PagedPool, + VideoDeviceName->MaximumLength + sizeof(UNICODE_NULL), + TAG_DC); + if (!VideoDeviceName->Buffer) + { + Status = STATUS_NO_MEMORY; + goto cleanup; + } + Status = ZwQuerySymbolicLinkObject(LinkHandle, VideoDeviceName, NULL); + VideoDeviceName->Buffer[VideoDeviceName->MaximumLength / sizeof(WCHAR) - 1] = UNICODE_NULL; + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to query symbolic link %wZ (Status 0x%08lx)\n", &KernelModeName, Status); + Status = STATUS_NO_SUCH_DEVICE; + goto cleanup; + } + Status = STATUS_SUCCESS; + +cleanup: + if (!NT_SUCCESS(Status) && VideoDeviceName->Buffer) + ExFreePoolWithTag(VideoDeviceName->Buffer, TAG_DC); + if (KernelModeName.Buffer) + ExFreePoolWithTag(KernelModeName.Buffer, TAG_DC); + if (LinkHandle) + ZwClose(LinkHandle); + return Status; +} + +static NTSTATUS FASTCALL +GetVideoRegistryKey( + OUT PUNICODE_STRING RegistryPath, + IN PCUNICODE_STRING DeviceName) /* ex: "\Device\Video0" */ +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NTSTATUS Status; + + RtlInitUnicodeString(RegistryPath, NULL); + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + QueryTable[0].Flags = RTL_QUERY_REGISTRY_REQUIRED | RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].Name = DeviceName->Buffer; + QueryTable[0].EntryContext = RegistryPath; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_DEVICEMAP, + L"VIDEO", + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("No %wZ value in DEVICEMAP\\VIDEO found (Status 0x%08lx)\n", DeviceName, Status); + return STATUS_NO_SUCH_DEVICE; + } + + DPRINT("RegistryPath %wZ\n", RegistryPath); + return STATUS_SUCCESS; +} + LONG FASTCALL IntChangeDisplaySettings( @@ -2827,13 +2903,8 @@ if ((dwflags & CDS_UPDATEREGISTRY) == CDS_UPDATEREGISTRY) { - UNICODE_STRING ObjectName; - UNICODE_STRING KernelModeName; - WCHAR KernelModeNameBuffer[256]; + UNICODE_STRING DeviceName; UNICODE_STRING RegistryKey; - WCHAR RegistryKeyBuffer[512]; - PDEVICE_OBJECT DeviceObject; - ULONG LastSlash; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE DevInstRegKey; ULONG NewValue; @@ -2842,76 +2913,31 @@ dwflags &= ~CDS_UPDATEREGISTRY; - /* Get device name (pDeviceName is "\.\xxx") */ - for (LastSlash = pDeviceName->Length / sizeof(WCHAR); LastSlash > 0; LastSlash--) - { - if (pDeviceName->Buffer[LastSlash - 1] == L'\\') - break; - } - - if (LastSlash == 0) return DISP_CHANGE_RESTART; - ObjectName = *pDeviceName; - ObjectName.Length -= LastSlash * sizeof(WCHAR); - ObjectName.MaximumLength -= LastSlash * sizeof(WCHAR); - ObjectName.Buffer += LastSlash; - - KernelModeName.Length = 0; - KernelModeName.MaximumLength = sizeof(KernelModeNameBuffer); - KernelModeName.Buffer = KernelModeNameBuffer; - - /* Open \??\xxx (ex: "\??\DISPLAY1") */ - Status = RtlAppendUnicodeToString(&KernelModeName, L"\\??\\"); - - if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; - Status = RtlAppendUnicodeStringToString(&KernelModeName, &ObjectName); - - if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; - Status = ObReferenceObjectByName( - &KernelModeName, - OBJ_CASE_INSENSITIVE, - NULL, - 0, - IoDeviceObjectType, - KernelMode, - NULL, - (PVOID*)&DeviceObject); - - if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; - /* Get associated driver name (ex: "VBE") */ - for (LastSlash = DeviceObject->DriverObject->DriverName.Length / sizeof(WCHAR); LastSlash > 0; LastSlash--) - { - if (DeviceObject->DriverObject->DriverName.Buffer[LastSlash - 1] == L'\\') - break; - } - - if (LastSlash == 0) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } - ObjectName = DeviceObject->DriverObject->DriverName; - ObjectName.Length -= LastSlash * sizeof(WCHAR); - ObjectName.MaximumLength -= LastSlash * sizeof(WCHAR); - ObjectName.Buffer += LastSlash; - - RegistryKey.Length = 0; - RegistryKey.MaximumLength = sizeof(RegistryKeyBuffer); - RegistryKey.Buffer = RegistryKeyBuffer; - - /* Open registry key */ - Status = RtlAppendUnicodeToString(&RegistryKey, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\"); - - if (!NT_SUCCESS(Status)) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } - Status = RtlAppendUnicodeStringToString(&RegistryKey, &ObjectName); - - if (!NT_SUCCESS(Status)) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } - Status = RtlAppendUnicodeToString(&RegistryKey, - L"\\Device0"); - - if (!NT_SUCCESS(Status)) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } + Status = GetVideoDeviceName(&DeviceName, pDeviceName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to get destination of '%wZ' (Status 0x%08lx)\n", pDeviceName, Status); + return DISP_CHANGE_FAILED; + } + Status = GetVideoRegistryKey(&RegistryKey, &DeviceName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to get registry key for '%wZ' (Status 0x%08lx)\n", &DeviceName, Status); + ExFreePoolWithTag(DeviceName.Buffer, TAG_DC); + return DISP_CHANGE_FAILED; + } + ExFreePoolWithTag(DeviceName.Buffer, TAG_DC); InitializeObjectAttributes(&ObjectAttributes, &RegistryKey, OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwOpenKey(&DevInstRegKey, GENERIC_READ | GENERIC_WRITE, &ObjectAttributes); - ObDereferenceObject(DeviceObject); - if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to open registry key %wZ (Status 0x%08lx)\n", &RegistryKey, Status); + ExFreePoolWithTag(RegistryKey.Buffer, TAG_DC); + return DISP_CHANGE_FAILED; + } + ExFreePoolWithTag(RegistryKey.Buffer, TAG_DC); /* Update needed fields */ if (NT_SUCCESS(Status) && DevMode->dmFields & DM_BITSPERPEL)

18 years, 5 months

[cwittich] 22168: -fix copy paste error (crypt32->cryptdll)

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Jun 2 01:38:07 2006 New Revision: 22168 URL: http://svn.reactos.ru/svn/reactos?rev=22168&view=rev Log: -fix copy paste error (crypt32->cryptdll) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/packages/reac… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Jun 2 01:38:07 2006 @@ -149,7 +149,7 @@ dll\win32\comdlg32\comdlg32.dll 1 dll\win32\crtdll\crtdll.dll 1 dll\win32\crypt32\crypt32.dll 1 -dll\win32\crypt32\cryptdll.dll 1 +dll\win32\cryptdll\cryptdll.dll 1 dll\win32\dbghelp\dbghelp.dll 1 dll\win32\devmgr\devmgr.dll 1 dll\win32\dhcpcsvc\dhcpcsvc.dll 1

18 years, 5 months

[cwittich] 22167: -added cryptdll to build -added cryptdll.dll and usb.inf to bootcd

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Jun 2 01:36:42 2006 New Revision: 22167 URL: http://svn.reactos.ru/svn/reactos?rev=22167&view=rev Log: -added cryptdll to build -added cryptdll.dll and usb.inf to bootcd Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=2216… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Fri Jun 2 01:36:42 2006 @@ -84,6 +84,7 @@ <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> <property name="BASEADDRESS_MPR" value="0x76620000" /> <property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> + <property name="BASEADDRESS_CRYPTDLL" value="0x76740000" /> <property name="BASEADDRESS_SHFOLDER" value="0x76780000" /> <property name="BASEADDRESS_NTMARTA" value="0x768A0000" /> <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/packages/reac… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Jun 2 01:36:42 2006 @@ -149,6 +149,7 @@ dll\win32\comdlg32\comdlg32.dll 1 dll\win32\crtdll\crtdll.dll 1 dll\win32\crypt32\crypt32.dll 1 +dll\win32\crypt32\cryptdll.dll 1 dll\win32\dbghelp\dbghelp.dll 1 dll\win32\devmgr\devmgr.dll 1 dll\win32\dhcpcsvc\dhcpcsvc.dll 1 @@ -360,6 +361,7 @@ media\inf\scsi.inf 6 media\inf\syssetup.inf 6 media\inf\usbport.inf 6 +media\inf\usb.inf 6 media\inf\usbstor.inf 6 media\inf\xboxdisp.inf 6 Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev=… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Fri Jun 2 01:36:42 2006 @@ -40,6 +40,9 @@ <directory name="crypt32"> <xi:include href="crypt32/crypt32.rbuild" /> </directory> +<directory name="cryptdll"> + <xi:include href="cryptdll/cryptdll.rbuild" /> +</directory> <directory name="dbghelp"> <xi:include href="dbghelp/dbghelp.rbuild" /> </directory>

18 years, 5 months

[gedmurphy] 22166: First time import from wine-0.9.14

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jun 2 01:30:02 2006 New Revision: 22166 URL: http://svn.reactos.ru/svn/reactos?rev=22166&view=rev Log: First time import from wine-0.9.14 Added: trunk/reactos/dll/win32/cryptdll/ trunk/reactos/dll/win32/cryptdll/Makefile.in trunk/reactos/dll/win32/cryptdll/cryptdll.c trunk/reactos/dll/win32/cryptdll/cryptdll.rbuild trunk/reactos/dll/win32/cryptdll/cryptdll.spec Added: trunk/reactos/dll/win32/cryptdll/Makefile.in URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/cryptdll/Makefile… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/Makefile.in (added) +++ trunk/reactos/dll/win32/cryptdll/Makefile.in Fri Jun 2 01:30:02 2006 @@ -1,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = cryptdll.dll +IMPORTLIB = libcryptdll.$(IMPLIBEXT) +IMPORTS = advapi32 kernel32 + +C_SRCS = \ + cryptdll.c + +@MAKE_DLL_RULES@ + +### Dependencies: Added: trunk/reactos/dll/win32/cryptdll/cryptdll.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/cryptdll/cryptdll… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/cryptdll.c (added) +++ trunk/reactos/dll/win32/cryptdll/cryptdll.c Fri Jun 2 01:30:02 2006 @@ -1,0 +1,50 @@ +/* + * Copyright 2005 Ulrich Czekalla (for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include <stdlib.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cryptdll); + +HMODULE CRYPTDLL_hModule = 0; + +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + { + DisableThreadLibraryCalls(hinstDLL); + CRYPTDLL_hModule = hinstDLL; + break; + } + case DLL_PROCESS_DETACH: + { + break; + } + } + + return TRUE; +} Added: trunk/reactos/dll/win32/cryptdll/cryptdll.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/cryptdll/cryptdll… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/cryptdll.rbuild (added) +++ trunk/reactos/dll/win32/cryptdll/cryptdll.rbuild Fri Jun 2 01:30:02 2006 @@ -1,0 +1,10 @@ +<module name="cryptdll" type="win32dll" baseaddress="${BASEADDRESS_CRYPTDLL}" installbase="system32" installname="cryptdll.dll"> + <importlibrary definition="cryptdll.spec.def" /> + <include base="cryptdll">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x501</define> + <define name="DLL_WINE_PREATTACH">8</define> + <file>cryptdll.c</file> + <file>cryptdll.spec</file> +</module> Added: trunk/reactos/dll/win32/cryptdll/cryptdll.spec URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/cryptdll/cryptdll… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/cryptdll.spec (added) +++ trunk/reactos/dll/win32/cryptdll/cryptdll.spec Fri Jun 2 01:30:02 2006 @@ -1,0 +1,14 @@ +@ stub CDBuildIntegrityVect +@ stub CDBuildVect +@ stub CDFindCommonCSystem +@ stub CDFindCommonCSystemWithKey +@ stub CDGenerateRandomBits +@ stub CDLocateCSystem +@ stub CDLocateCheckSum +@ stub CDLocateRng +@ stub CDRegisterCSystem +@ stub CDRegisterCheckSum +@ stub CDRegisterRng +@ stdcall MD5Final(ptr) advapi32.MD5Final +@ stdcall MD5Init(ptr) advapi32.MD5Init +@ stdcall MD5Update(ptr ptr long) advapi32.MD5Update

18 years, 5 months

[gedmurphy] 22165: split into release and current

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jun 2 01:27:24 2006 New Revision: 22165 URL: http://svn.reactos.ru/svn/reactos?rev=22165&view=rev Log: split into release and current Added: vendor/wine/dlls/cryptdll/Wine-0_9_14/ vendor/wine/dlls/cryptdll/Wine-0_9_14/Makefile.in vendor/wine/dlls/cryptdll/Wine-0_9_14/cryptdll.c vendor/wine/dlls/cryptdll/Wine-0_9_14/cryptdll.spec vendor/wine/dlls/cryptdll/current/ vendor/wine/dlls/cryptdll/current/Makefile.in vendor/wine/dlls/cryptdll/current/cryptdll.c vendor/wine/dlls/cryptdll/current/cryptdll.spec Removed: vendor/wine/dlls/cryptdll/Makefile.in vendor/wine/dlls/cryptdll/cryptdll.c vendor/wine/dlls/cryptdll/cryptdll.spec Removed: vendor/wine/dlls/cryptdll/Makefile.in URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/cryptdll/Makefile.in?rev… ============================================================================== --- vendor/wine/dlls/cryptdll/Makefile.in (original) +++ vendor/wine/dlls/cryptdll/Makefile.in (removed) @@ -1,14 +1,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = cryptdll.dll -IMPORTLIB = libcryptdll.$(IMPLIBEXT) -IMPORTS = advapi32 kernel32 - -C_SRCS = \ - cryptdll.c - -@MAKE_DLL_RULES@ - -### Dependencies: Added: vendor/wine/dlls/cryptdll/Wine-0_9_14/Makefile.in URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/cryptdll/Wine-0_9_14/Mak… ============================================================================== --- vendor/wine/dlls/cryptdll/Wine-0_9_14/Makefile.in (added) +++ vendor/wine/dlls/cryptdll/Wine-0_9_14/Makefile.in Fri Jun 2 01:27:24 2006 @@ -1,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = cryptdll.dll +IMPORTLIB = libcryptdll.$(IMPLIBEXT) +IMPORTS = advapi32 kernel32 + +C_SRCS = \ + cryptdll.c + +@MAKE_DLL_RULES@ + +### Dependencies: Added: vendor/wine/dlls/cryptdll/Wine-0_9_14/cryptdll.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/cryptdll/Wine-0_9_14/cry… ============================================================================== --- vendor/wine/dlls/cryptdll/Wine-0_9_14/cryptdll.c (added) +++ vendor/wine/dlls/cryptdll/Wine-0_9_14/cryptdll.c Fri Jun 2 01:27:24 2006 @@ -1,0 +1,50 @@ +/* + * Copyright 2005 Ulrich Czekalla (for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include <stdlib.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cryptdll); + +HMODULE CRYPTDLL_hModule = 0; + +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + { + DisableThreadLibraryCalls(hinstDLL); + CRYPTDLL_hModule = hinstDLL; + break; + } + case DLL_PROCESS_DETACH: + { + break; + } + } + + return TRUE; +} Added: vendor/wine/dlls/cryptdll/Wine-0_9_14/cryptdll.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/cryptdll/Wine-0_9_14/cry… ============================================================================== --- vendor/wine/dlls/cryptdll/Wine-0_9_14/cryptdll.spec (added) +++ vendor/wine/dlls/cryptdll/Wine-0_9_14/cryptdll.spec Fri Jun 2 01:27:24 2006 @@ -1,0 +1,14 @@ +@ stub CDBuildIntegrityVect +@ stub CDBuildVect +@ stub CDFindCommonCSystem +@ stub CDFindCommonCSystemWithKey +@ stub CDGenerateRandomBits +@ stub CDLocateCSystem +@ stub CDLocateCheckSum +@ stub CDLocateRng +@ stub CDRegisterCSystem +@ stub CDRegisterCheckSum +@ stub CDRegisterRng +@ stdcall MD5Final(ptr) advapi32.MD5Final +@ stdcall MD5Init(ptr) advapi32.MD5Init +@ stdcall MD5Update(ptr ptr long) advapi32.MD5Update Removed: vendor/wine/dlls/cryptdll/cryptdll.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/cryptdll/cryptdll.c?rev=… ============================================================================== --- vendor/wine/dlls/cryptdll/cryptdll.c (original) +++ vendor/wine/dlls/cryptdll/cryptdll.c (removed) @@ -1,50 +1,0 @@ -/* - * Copyright 2005 Ulrich Czekalla (for CodeWeavers) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <stdarg.h> -#include <stdlib.h> -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(cryptdll); - -HMODULE CRYPTDLL_hModule = 0; - -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - { - DisableThreadLibraryCalls(hinstDLL); - CRYPTDLL_hModule = hinstDLL; - break; - } - case DLL_PROCESS_DETACH: - { - break; - } - } - - return TRUE; -} Removed: vendor/wine/dlls/cryptdll/cryptdll.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/cryptdll/cryptdll.spec?r… ============================================================================== --- vendor/wine/dlls/cryptdll/cryptdll.spec (original) +++ vendor/wine/dlls/cryptdll/cryptdll.spec (removed) @@ -1,14 +1,0 @@ -@ stub CDBuildIntegrityVect -@ stub CDBuildVect -@ stub CDFindCommonCSystem -@ stub CDFindCommonCSystemWithKey -@ stub CDGenerateRandomBits -@ stub CDLocateCSystem -@ stub CDLocateCheckSum -@ stub CDLocateRng -@ stub CDRegisterCSystem -@ stub CDRegisterCheckSum -@ stub CDRegisterRng -@ stdcall MD5Final(ptr) advapi32.MD5Final -@ stdcall MD5Init(ptr) advapi32.MD5Init -@ stdcall MD5Update(ptr ptr long) advapi32.MD5Update Added: vendor/wine/dlls/cryptdll/current/Makefile.in URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/cryptdll/current/Makefil… ============================================================================== --- vendor/wine/dlls/cryptdll/current/Makefile.in (added) +++ vendor/wine/dlls/cryptdll/current/Makefile.in Fri Jun 2 01:27:24 2006 @@ -1,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = cryptdll.dll +IMPORTLIB = libcryptdll.$(IMPLIBEXT) +IMPORTS = advapi32 kernel32 + +C_SRCS = \ + cryptdll.c + +@MAKE_DLL_RULES@ + +### Dependencies: Added: vendor/wine/dlls/cryptdll/current/cryptdll.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/cryptdll/current/cryptdl… ============================================================================== --- vendor/wine/dlls/cryptdll/current/cryptdll.c (added) +++ vendor/wine/dlls/cryptdll/current/cryptdll.c Fri Jun 2 01:27:24 2006 @@ -1,0 +1,50 @@ +/* + * Copyright 2005 Ulrich Czekalla (for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include <stdlib.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cryptdll); + +HMODULE CRYPTDLL_hModule = 0; + +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + { + DisableThreadLibraryCalls(hinstDLL); + CRYPTDLL_hModule = hinstDLL; + break; + } + case DLL_PROCESS_DETACH: + { + break; + } + } + + return TRUE; +} Added: vendor/wine/dlls/cryptdll/current/cryptdll.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/cryptdll/current/cryptdl… ============================================================================== --- vendor/wine/dlls/cryptdll/current/cryptdll.spec (added) +++ vendor/wine/dlls/cryptdll/current/cryptdll.spec Fri Jun 2 01:27:24 2006 @@ -1,0 +1,14 @@ +@ stub CDBuildIntegrityVect +@ stub CDBuildVect +@ stub CDFindCommonCSystem +@ stub CDFindCommonCSystemWithKey +@ stub CDGenerateRandomBits +@ stub CDLocateCSystem +@ stub CDLocateCheckSum +@ stub CDLocateRng +@ stub CDRegisterCSystem +@ stub CDRegisterCheckSum +@ stub CDRegisterRng +@ stdcall MD5Final(ptr) advapi32.MD5Final +@ stdcall MD5Init(ptr) advapi32.MD5Init +@ stdcall MD5Update(ptr ptr long) advapi32.MD5Update

18 years, 5 months

[greatlrd] 22164: redirect __p__tzname to _tzname, I copy the idea from wine, for they are doing same

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 2 01:26:10 2006 New Revision: 22164 URL: http://svn.reactos.ru/svn/reactos?rev=22164&view=rev Log: redirect __p__tzname to _tzname, I copy the idea from wine, for they are doing same Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.def… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def Fri Jun 2 01:26:10 2006 @@ -146,7 +146,7 @@ __p__pgmptr __p__pwctype __p__timezone -__p__tzname=stub +__p__tzname=_tzname __p__wcmdln __p__wenviron __p__winmajor

18 years, 5 months

[gedmurphy] 22163: import cryptdll from Wine

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jun 2 01:23:52 2006 New Revision: 22163 URL: http://svn.reactos.ru/svn/reactos?rev=22163&view=rev Log: import cryptdll from Wine Added: vendor/wine/dlls/cryptdll/ vendor/wine/dlls/cryptdll/Makefile.in vendor/wine/dlls/cryptdll/cryptdll.c vendor/wine/dlls/cryptdll/cryptdll.spec Added: vendor/wine/dlls/cryptdll/Makefile.in URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/cryptdll/Makefile.in?rev… ============================================================================== --- vendor/wine/dlls/cryptdll/Makefile.in (added) +++ vendor/wine/dlls/cryptdll/Makefile.in Fri Jun 2 01:23:52 2006 @@ -1,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = cryptdll.dll +IMPORTLIB = libcryptdll.$(IMPLIBEXT) +IMPORTS = advapi32 kernel32 + +C_SRCS = \ + cryptdll.c + +@MAKE_DLL_RULES@ + +### Dependencies: Added: vendor/wine/dlls/cryptdll/cryptdll.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/cryptdll/cryptdll.c?rev=… ============================================================================== --- vendor/wine/dlls/cryptdll/cryptdll.c (added) +++ vendor/wine/dlls/cryptdll/cryptdll.c Fri Jun 2 01:23:52 2006 @@ -1,0 +1,50 @@ +/* + * Copyright 2005 Ulrich Czekalla (for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include <stdlib.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cryptdll); + +HMODULE CRYPTDLL_hModule = 0; + +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + { + DisableThreadLibraryCalls(hinstDLL); + CRYPTDLL_hModule = hinstDLL; + break; + } + case DLL_PROCESS_DETACH: + { + break; + } + } + + return TRUE; +} Added: vendor/wine/dlls/cryptdll/cryptdll.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/cryptdll/cryptdll.spec?r… ============================================================================== --- vendor/wine/dlls/cryptdll/cryptdll.spec (added) +++ vendor/wine/dlls/cryptdll/cryptdll.spec Fri Jun 2 01:23:52 2006 @@ -1,0 +1,14 @@ +@ stub CDBuildIntegrityVect +@ stub CDBuildVect +@ stub CDFindCommonCSystem +@ stub CDFindCommonCSystemWithKey +@ stub CDGenerateRandomBits +@ stub CDLocateCSystem +@ stub CDLocateCheckSum +@ stub CDLocateRng +@ stub CDRegisterCSystem +@ stub CDRegisterCheckSum +@ stub CDRegisterRng +@ stdcall MD5Final(ptr) advapi32.MD5Final +@ stdcall MD5Init(ptr) advapi32.MD5Init +@ stdcall MD5Update(ptr ptr long) advapi32.MD5Update

18 years, 5 months

[greatlrd] 22162: redirect __p__mbctype to _mbctype, I copy the idea from wine, for they are doing same

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 2 01:21:16 2006 New Revision: 22162 URL: http://svn.reactos.ru/svn/reactos?rev=22162&view=rev Log: redirect __p__mbctype to _mbctype, I copy the idea from wine, for they are doing same Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.def… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def Fri Jun 2 01:21:16 2006 @@ -140,7 +140,7 @@ __p__fmode __p__iob __p__mbcasemap=stub -__p__mbctype=stub +__p__mbctype=_mbctype __p__osver __p__pctype __p__pgmptr

18 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2006