Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[hbirr] 18659: - Merge r17753:18655 from trunk.

by hbirr＠svn.reactos.com

- Merge r17753:18655 from trunk. Modified: branches/cache_manager_rewrite/reactos/CREDITS Modified: branches/cache_manager_rewrite/reactos/Makefile Added: branches/cache_manager_rewrite/reactos/apps/utils/dumprecbin/ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.c Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/getopt.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/various.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/cmds.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/cmdtab.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/domacro.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/fake.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp_var.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/main.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/prototypes.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ipconfig/ipconfig. c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ipconfig/ipconfig. xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/netstat.c Added: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/netstat.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/netstat.rc Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/netstat.xm l Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/resource.h Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/trace.c Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/trace.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ping/ping.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/route/route.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/route/route.xml Added: branches/cache_manager_rewrite/reactos/apps/utils/net/tcpsvcs/ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/whois/whois.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/ps/ps.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/rosperf.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/rosperf.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/testlist.c Added: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/text.c Modified: branches/cache_manager_rewrite/reactos/baseaddress.xml Added: branches/cache_manager_rewrite/reactos/boot/freeldr/fdebug/En.rc Added: branches/cache_manager_rewrite/reactos/boot/freeldr/fdebug/Ja.rc Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/fdebug/fdebug.rc Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/ha rdware.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/i3 86disk.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/i3 86vid.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/pc video.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/cache/cache. c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/freeldr_base .xml Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/fs/fat.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/mach ine.h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/rtl. h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/ui.h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/binh ive.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/load er.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/reac tos.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/setu pldr.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/rtl/stdlib.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/tui.c Modified: branches/cache_manager_rewrite/reactos/bootdata/hivecls.inf Modified: branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf Modified: branches/cache_manager_rewrite/reactos/bootdata/packages/reactos.dff Modified: branches/cache_manager_rewrite/reactos/bootdata/txtsetup.sif Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/acpi.xml Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/dispatcher/dsuti ls.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/executer/ammutex .c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/executer/amresop .c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/fdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/include/acp isys.h Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/pdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/isapnp.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/isapnp.h Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/fdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.h Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.xml Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/detect.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/fdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/misc.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/pdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/serenum.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/serenum.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/beep/beep.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/blue/blue.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/bootvid.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/bootvid.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/debugout/debugout.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/mpu401.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/mpu401.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/settings.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/null/null.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/null/null.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/parallel/parallel.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/ramdrv/ramdrv.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/ramdrv/ramdrv.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/devctrl.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/misc.c [truncated at 100 lines; 1414 more skipped] _____ Modified: branches/cache_manager_rewrite/reactos/CREDITS --- branches/cache_manager_rewrite/reactos/CREDITS 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/CREDITS 2005-10-21 18:26:07 UTC (rev 18659) @@ -4,7 +4,7 @@ Robert Bergkvist <fragdance(a)hotmail.com> Hartmut Birr <hartmut.birr(a)gmx.de> Aleksey Bragin <aleksey(a)studiocerebral.com> -Richard Campbell <eek2121(a)comcast.net> +Richard Campbell <betam4x(a)gmail.com> Gunnar Andre' Dalsnes <hardon(a)online.no> Arindam Das Boudewijn Dekker <ariadne(a)xs4all.nl> _____ Modified: branches/cache_manager_rewrite/reactos/Makefile --- branches/cache_manager_rewrite/reactos/Makefile 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/Makefile 2005-10-21 18:26:07 UTC (rev 18659) @@ -321,6 +321,26 @@ $(ECHO_WMC) $(Q)$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) +.PHONY: msvc6 +msvc6: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 msvc + +.PHONY: msvc7 +msvc7: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 msvc + +.PHONY: msvc71 +msvc71: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 msvc + +.PHONY: msvc8 +msvc8: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 msvc + .PHONY: makefile_auto_clean makefile_auto_clean: -@$(rm) makefile.auto $(PREAUTO) 2>$(NUL) _____ Copied: branches/cache_manager_rewrite/reactos/apps/utils/dumprecbin (from rev 18400, trunk/reactos/apps/utils/dumprecbin) Property changes on: branches/cache_manager_rewrite/reactos/apps/utils/dumprecbin ___________________________________________________________________ Name: svn:ignore + *.o *.a *.d *.exe *.coff *.sym *.map GNUmakefile _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c --- branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c 2005-10-21 18:26:07 UTC (rev 18659) @@ -1,4 +1,23 @@ -/* +/* + * ReactOS Win32 Applications + * Copyright (C) 2005 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS arp utility * FILE: apps/utils/net/arp/arp.c @@ -9,7 +28,6 @@ * */ -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <stdio.h> #include <stdlib.h> @@ -19,27 +37,102 @@ #include <winsock2.h> #include <iphlpapi.h> - +#define WIN32_LEAN_AND_MEAN +#define UNICODE +#define _UNICODE + /* * Globals - */ + */ const char SEPERATOR = '-'; - - - +int _CRT_glob = 0; // stop * from listing dir files in arp -d * + + /* * function declerations - */ + */ +DWORD DoFormatMessage(DWORD ErrorCode); +INT PrintEntries(PMIB_IPNETROW pIpAddRow); INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr); -INT PrintEntries(PMIB_IPNETROW pIpAddRow); INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr); INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr); VOID Usage(VOID); - - - + + /* + * convert error code into meaningful message + */ +DWORD DoFormatMessage(DWORD ErrorCode) +{ + LPVOID lpMsgBuf; + DWORD RetVal; + /* double brackets to silence the assignment warning message */ + if ((RetVal = FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ + (LPTSTR) &lpMsgBuf, + 0, + NULL ))) { + _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); + + LocalFree(lpMsgBuf); + /* return number of TCHAR's stored in output buffer + * excluding '\0' - as FormatMessage does*/ + return RetVal; + } + else + return 0; +} + + + +/* * + * Takes an ARP entry and prints the IP address, + * the MAC address and the entry type to screen + * + */ +INT PrintEntries(PMIB_IPNETROW pIpAddRow) +{ + IN_ADDR inaddr; + TCHAR cMacAddr[20]; + + /* print IP addresses */ + inaddr.S_un.S_addr = pIpAddRow->dwAddr; + _tprintf(_T(" %-22s"), inet_ntoa(inaddr)); + + /* print MAC address */ + _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"), + pIpAddRow->bPhysAddr[0], + pIpAddRow->bPhysAddr[1], + pIpAddRow->bPhysAddr[2], + pIpAddRow->bPhysAddr[3], + pIpAddRow->bPhysAddr[4], + pIpAddRow->bPhysAddr[5]); + _tprintf(_T("%-22s"), cMacAddr); + + /* print cache type */ + switch (pIpAddRow->dwType) + { + case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n")); + break; + case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n")); + break; + case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n")); + break; + case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n")); + break; + } + return EXIT_SUCCESS; +} + + +/* + * * Takes optional parameters of an internet address and interface address. * Retrieve all entries in the ARP cache. If an internet address is * specified, display the ARP entry relating to that address. If an @@ -59,136 +152,99 @@ DWORD dwSize = 0; PTCHAR pszIpAddr; TCHAR szIntIpAddr[20]; - + /* Return required buffer size */ GetIpNetTable(NULL, &ulSize, 0); - + /* allocate memory for ARP address table */ pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); - + /* get Arp address table */ - if (pIpNetTable != NULL) { + if (pIpNetTable != NULL) GetIpNetTable(pIpNetTable, &ulSize, TRUE); - } else { + else + { _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); free(pIpNetTable); - return -1; + exit(EXIT_FAILURE); } - - /* check there are entries in the table */ - if (pIpNetTable->dwNumEntries == 0) { + + /* check there are entries in the table */ + if (pIpNetTable->dwNumEntries == 0) + { _tprintf(_T("No ARP entires found\n")); free(pIpNetTable); - return -1; + exit(EXIT_FAILURE); } - - - + + + /* try doing this in the way it's done above, it's clearer */ /* Retrieve the interface-to-ip address mapping - * table to get the IP address for adapter */ + * table to get the IP address for adapter */ pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); GetIpAddrTable(pIpAddrTable, &dwSize, 0); // NULL ? - + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); //ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable)); - - if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0 + + if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) + { _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); _tprintf(_T("error: %d\n"), WSAGetLastError()); } - - - for (k=0; k < pIpAddrTable->dwNumEntries; k++) { - if (pIpNetTable->table[0].dwIndex == pIpAddrTable->table[k].dwIndex) { - //printf("printing pIpAddrTable->table[?].dwIndex = %lx\n", pIpNetTable->table[k].dwIndex); + + + for (k=0; k < pIpAddrTable->dwNumEntries; k++) + { + if (pIpNetTable->table[0].dwIndex == pIpAddrTable->table[k].dwIndex) + { + //printf("debug print: pIpAddrTable->table[?].dwIndex = %lx\n", pIpNetTable->table[k].dwIndex); inaddr2.s_addr = pIpAddrTable->table[k].dwAddr; pszIpAddr = inet_ntoa(inaddr2); strcpy(szIntIpAddr, pszIpAddr); } - } - - + } + + /* print header, including interface IP address and index number */ _tprintf(_T("\nInterface: %s --- 0x%lx \n"), szIntIpAddr, pIpNetTable->table[0].dwIndex); _tprintf(_T(" Internet Address Physical Address Type\n")); - + /* go through all ARP entries */ - for (i=0; i < pIpNetTable->dwNumEntries; i++) { - + for (i=0; i < pIpNetTable->dwNumEntries; i++) + { + /* if the user has supplied their own internet addesss * * only print the arp entry which matches that */ - if (pszInetAddr) { - inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr; + if (pszInetAddr) + { + inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr; pszIpAddr = inet_ntoa(inaddr); - + /* check if it matches, print it */ - if (strcmp(pszIpAddr, pszInetAddr) == 0) { + if (strcmp(pszIpAddr, pszInetAddr) == 0) PrintEntries(&pIpNetTable->table[i]); - } - } else { + } + else /* if an address is not supplied, print all entries */ PrintEntries(&pIpNetTable->table[i]); - } - } - + free(pIpNetTable); free(pIpAddrTable); - - return 0; + + return EXIT_SUCCESS; } - - - + + /* * - * Takes an ARP entry and prints the IP address, - * the MAC address and the entry type to screen - * - */ -INT PrintEntries(PMIB_IPNETROW pIpAddRow) -{ - IN_ADDR inaddr; - TCHAR cMacAddr[20]; - - /* print IP addresses */ - inaddr.S_un.S_addr = pIpAddRow->dwAddr; - _tprintf(_T(" %-22s"), inet_ntoa(inaddr)); //error checking - - /* print MAC address */ - _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"), - pIpAddRow->bPhysAddr[0], - pIpAddRow->bPhysAddr[1], - pIpAddRow->bPhysAddr[2], - pIpAddRow->bPhysAddr[3], - pIpAddRow->bPhysAddr[4], - pIpAddRow->bPhysAddr[5]); - _tprintf(_T("%-22s"), cMacAddr); - - /* print cache type */ - switch (pIpAddRow->dwType) { - case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n")); - break; - case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n")); - break; - case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n")); - break; - case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n")); - break; - } - return 0; -} - - - -/* - * * Takes an internet address, a MAC address and an optional interface * address as arguments and checks their validity. - * Fill out an MIB_IPNETROW structure and insert the data into the + * Fill out an MIB_IPNETROW structure and insert the data into the * ARP cache as a static entry. * */ @@ -196,73 +252,101 @@ { PMIB_IPNETROW pAddHost; PMIB_IPADDRTABLE pIpAddrTable; - DWORD dwIpAddr; + PMIB_IPNETTABLE pIpNetTable; + DWORD dwIpAddr = 0; DWORD dwSize = 0; + ULONG ulSize = 0; INT iRet, i, val; TCHAR c; - + /* error checking */ - + /* check IP address */ - if (pszInetAddr != NULL) { - if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) { + if (pszInetAddr != NULL) + { + if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) + { _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); - return -1; + exit(EXIT_FAILURE); } - } else { + } + else + { Usage(); - return -1; + exit(EXIT_FAILURE); } - + /* check MAC address */ - if (strlen(pszEthAddr) != 17) { + if (strlen(pszEthAddr) != 17) + { _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); - return -1; + exit(EXIT_FAILURE); } - for (i=0; i<17; i++) { - if (pszEthAddr[i] == SEPERATOR) { + for (i=0; i<17; i++) + { + if (pszEthAddr[i] == SEPERATOR) continue; - } - if (!isxdigit(pszEthAddr[i])) { + + if (!isxdigit(pszEthAddr[i])) + { _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); - return -1; + exit(EXIT_FAILURE); } } - + + /* We need the IpNetTable to get the adapter index */ + /* Return required buffer size */ + GetIpNetTable(NULL, &ulSize, 0); + /* allocate memory for ARP address table */ + pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); + /* get Arp address table */ + if (pIpNetTable != NULL) + GetIpNetTable(pIpNetTable, &ulSize, TRUE); + else + { + _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + free(pIpNetTable); + return -1; + } + + /* reserve memory on heap and zero */ pAddHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW)); ZeroMemory(pAddHost, sizeof(MIB_IPNETROW)); - - - - - /* set dwIndex field to the index of a local IP address to + + /* set dwIndex field to the index of a local IP address to * indicate the network on which the ARP entry applies */ - if (pszIfAddr) { + if (pszIfAddr) sscanf(pszIfAddr, "%lx", &pAddHost->dwIndex); - } else { - /* map the IP to the index */ + else + { + /* map the IP to the index */ pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); GetIpAddrTable(pIpAddrTable, &dwSize, 0); - + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); - - if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0 + + if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) + { _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); _tprintf(_T("error: %d\n"), WSAGetLastError()); } - printf("printing pIpAddrTable->table[0].dwIndex = %lx\n", pIpAddrTable->table[0].dwIndex); - pAddHost->dwIndex = 4; + //printf("debug print: pIpNetTable->table[0].dwIndex = %lx\n", pIpNetTable->table[0].dwIndex); + /* needs testing. I get the correct index on my machine, but need others + * to test their card index. Any problems and we can use GetAdaptersInfo instead */ + pAddHost->dwIndex = pIpNetTable->table[0].dwIndex; free(pIpAddrTable); } - + /* Set MAC address to 6 bytes (typical) */ pAddHost->dwPhysAddrLen = 6; - - + + /* Encode bPhysAddr into correct byte array */ - for (i=0; i<6; i++) { + for (i=0; i<6; i++) + { val =0; c = toupper(pszEthAddr[i*3]); c = c - (isdigit(c) ? '0' : ('A' - 10)); @@ -272,103 +356,155 @@ c = c - (isdigit(c) ? '0' : ('A' - 10)); val += c; pAddHost->bPhysAddr[i] = val; - } - - + + /* copy converted IP address */ pAddHost->dwAddr = dwIpAddr; - - + + /* set type to static */ pAddHost->dwType = MIB_IPNET_TYPE_STATIC; - - + + /* Add the ARP entry */ - if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR) { - _tprintf(_T("The ARP entry addition failed: %d\n"), iRet); - return -1; + if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR) + { + DoFormatMessage(iRet); + free(pAddHost); + exit(EXIT_FAILURE); } - + free(pAddHost); - - return 0; + + return EXIT_SUCCESS; } - - - + + /* * - * Takes an internet address and an optional interface address as + * Takes an internet address and an optional interface address as * arguments and checks their validity. - * Add the interface number and IP to an MIB_IPNETROW structure - * and remove the entrty from the ARP cache. + * Add the interface number and IP to an MIB_IPNETROW structure + * and remove the entry from the ARP cache. * */ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) { PMIB_IPNETROW pDelHost; PMIB_IPADDRTABLE pIpAddrTable; - DWORD dwIpAddr; + PMIB_IPNETTABLE pIpNetTable; + ULONG ulSize = 0; + DWORD dwIpAddr = 0; DWORD dwSize = 0; - INT iret; - + INT iRet; + BOOL bFlushTable = FALSE; + /* error checking */ - + /* check IP address */ - if (pszInetAddr != NULL) { - if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) { + if (pszInetAddr != NULL) + { + /* if wildcard is given, set flag to delete all hosts */ + if (strncmp(pszInetAddr, "*", 1) == 0) + bFlushTable = TRUE; + else if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) + { _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); - return -1; + exit(EXIT_FAILURE); } - } else { + } + else + { Usage(); + exit(EXIT_FAILURE); + } + + /* We need the IpNetTable to get the adapter index */ + /* Return required buffer size */ + GetIpNetTable(NULL, &ulSize, 0); + /* allocate memory for ARP address table */ + pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); + /* get Arp address table */ + if (pIpNetTable != NULL) + GetIpNetTable(pIpNetTable, &ulSize, TRUE); + else + { + _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + free(pIpNetTable); return -1; } - - + + pIpAddrTable = (MIB_IPADDRTABLE*) malloc(sizeof(MIB_IPADDRTABLE)); pDelHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW)); ZeroMemory(pIpAddrTable, sizeof(MIB_IPADDRTABLE)); ZeroMemory(pDelHost, sizeof(MIB_IPNETROW)); - /* set dwIndex field to the index of a local IP address to + /* set dwIndex field to the index of a local IP address to * indicate the network on which the ARP entry applies */ - if (pszIfAddr) { + if (pszIfAddr) sscanf(pszIfAddr, "%lx", &pDelHost->dwIndex); - } else { + else + { /* map the IP to the index */ - if (GetIpAddrTable(pIpAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) { + if (GetIpAddrTable(pIpAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); - } - if ((iret = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { - _tprintf(_T("GetIpAddrTable failed: %d\n"), iret); + + if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) + { + _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); _tprintf(_T("error: %d\n"), WSAGetLastError()); } - pDelHost->dwIndex = 4; //pIpAddrTable->table[0].dwIndex; - } - - /* copy converted IP address */ - pDelHost->dwAddr = dwIpAddr; - + /* needs testing. I get the correct index on my machine, but need others + * to test their card index. Any problems and we can use GetAdaptersInfo instead */ + pDelHost->dwIndex = pIpNetTable->table[0].dwIndex; + } + + if (bFlushTable == TRUE) + { + /* delete arp cache */ + if ((iRet = FlushIpNetTable(pDelHost->dwIndex)) != NO_ERROR) + { + DoFormatMessage(iRet); + free(pIpAddrTable); + free(pDelHost); + return EXIT_FAILURE; + } + else + { + free(pIpAddrTable); + free(pDelHost); + return EXIT_SUCCESS; + } + } + else + /* copy converted IP address */ + pDelHost->dwAddr = dwIpAddr; + /* Add the ARP entry */ - if ((iret = DeleteIpNetEntry(pDelHost)) != NO_ERROR) { - _tprintf(_T("The ARP entry deletion failed: %d\n"), iret); - return -1; + if ((iRet = DeleteIpNetEntry(pDelHost)) != NO_ERROR) + { + + DoFormatMessage(iRet); + free(pIpAddrTable); + free(pDelHost); + exit(EXIT_FAILURE); } - + free(pIpAddrTable); free(pDelHost); - - return 0; + + return EXIT_SUCCESS; } - - - + + + /* * * print program usage to screen * - */ + */ VOID Usage(VOID) { _tprintf(_T("\nDisplays and modifies the IP-to-Physical address translation tables used by\n" @@ -401,10 +537,10 @@ " > arp -s 157.55.85.212 00-aa-00-62-c6-09 .... Adds a static entry.\n" " > arp -a .... Displays the arp table.\n\n")); } - - - -/* + + + +/* * * Program entry. * Parse command line and call the required function @@ -412,35 +548,37 @@ */ INT main(int argc, char* argv[]) { - const char N[] = "-N"; - - if ((argc < 2) || (argc > 5)) + if ((argc < 2) || (argc > 5)) { Usage(); - return FALSE; + return EXIT_FAILURE; } - - - if (argv[1][0] == '-') { - switch (argv[1][1]) { - /* FIX ME */ - /* need better control for -a, as -N might not be arg 4 */ - case 'a': if (argc == 2) + + if (argv[1][0] == '-') + { + switch (argv[1][1]) + { + case 'a': /* fall through */ + case 'g': + if (argc == 2) DisplayArpEntries(NULL, NULL); else if (argc == 3) DisplayArpEntries(argv[2], NULL); - else if ((argc == 5) && ((strcmp(argv[3], N)) == 0)) + else if ((argc == 4) && ((strcmp(argv[2], "-N")) == 0)) + DisplayArpEntries(NULL, argv[3]); + else if ((argc == 5) && ((strcmp(argv[3], "-N")) == 0)) DisplayArpEntries(argv[2], argv[4]); else Usage(); + return EXIT_FAILURE; break; - case 'g': break; case 'd': if (argc == 3) Deletehost(argv[2], NULL); else if (argc == 4) Deletehost(argv[2], argv[3]); else Usage(); + return EXIT_FAILURE; break; case 's': if (argc == 4) Addhost(argv[2], argv[3], NULL); @@ -448,15 +586,17 @@ Addhost(argv[2], argv[3], argv[4]); else Usage(); + return EXIT_FAILURE; break; default: Usage(); - return -1; + return EXIT_FAILURE; } - } else { + } + else Usage(); - return -1; - } - - return 0; -} + + return EXIT_SUCCESS; +} /* +warning: suggest parentheses around assignment used as truth value +warning: char format, void arg (arg 2)*/ _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.c --- branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.c 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.c 2005-10-21 18:26:07 UTC (rev 18659) @@ -1,53 +0,0 @@ -/////////////////////////////////////////////////////////////////////// ////// -// Diagnostic Trace -// -#include <stdio.h> -#include <stdarg.h> -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include <tchar.h> -#include "trace.h" - - -#ifdef _DEBUG - -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; - -void _DebugBreak(void) -{ - DebugBreak(); -} - -void Trace(TCHAR* lpszFormat, ...) -{ - va_list args; - int nBuf; - TCHAR szBuffer[512]; - - va_start(args, lpszFormat); - nBuf = _vsntprintf(szBuffer, sizeof(szBuffer)/sizeof(TCHAR), lpszFormat, args); - OutputDebugString(szBuffer); - // was there an error? was the expanded string too long? - //ASSERT(nBuf >= 0); - va_end(args); -} - -void Assert(void* assert, TCHAR* file, int line, void* msg) -{ - if (msg == NULL) { - printf("ASSERT -- %s occured on line %u of file %s.\n", - assert, line, file); - } else { - printf("ASSERT -- %s occured on line %u of file %s: Message = %s.\n", - assert, line, file, msg); - } -} - -#else - -void Trace(TCHAR* lpszFormat, ...) { }; -void Assert(void* assert, TCHAR* file, int line, void* msg) { }; - -#endif //_DEBUG -/////////////////////////////////////////////////////////////////////// ////// _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.h --- branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.h 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.h 2005-10-21 18:26:07 UTC (rev 18659) @@ -1,61 +0,0 @@ -/////////////////////////////////////////////////////////////////////// ////// -// Diagnostic Trace -// -#ifndef __TRACE_H__ -#define __TRACE_H__ - -#ifdef _DEBUG - -#ifdef _X86_ -#define BreakPoint() _asm { int 3h } -#else -#define BreakPoint() _DebugBreak() -#endif - -#ifndef ASSERT -#define ASSERT(exp) \ -{ \ - if (!(exp)) { \ - Assert(#exp, __FILE__, __LINE__, NULL); \ - BreakPoint(); \ - } \ -} \ - -#define ASSERTMSG(exp, msg) \ -{ \ - if (!(exp)) { \ - Assert(#exp, __FILE__, __LINE__, msg); \ - BreakPoint(); \ - } \ -} -#endif - -//===================================================================== ======== -// MACRO: TRACE() -//===================================================================== ======== - -#define TRACE Trace - - -#else // _DEBUG - -//===================================================================== ======== -// Define away MACRO's ASSERT() and TRACE() in non debug builds -//===================================================================== ======== - -#ifndef ASSERT -#define ASSERT(exp) -#define ASSERTMSG(exp, msg) -#endif - -#define TRACE 0 ? (void)0 : Trace - -#endif // !_DEBUG - - -void Assert(void* assert, TCHAR* file, int line, void* msg); -void Trace(TCHAR* lpszFormat, ...); - - -#endif // __TRACE_H__ -/////////////////////////////////////////////////////////////////////// ////// _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml --- branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml 2005-10-21 18:26:07 UTC (rev 18659) @@ -1,30 +1,30 @@ <directory name="arp"> - <xi:include href="arp/arp.xml" /> + <xi:include href="arp/arp.xml" /> </directory> <directory name="finger"> - <xi:include href="finger/finger.xml" /> + <xi:include href="finger/finger.xml" /> </directory> <directory name="ftp"> - <xi:include href="ftp/ftp.xml" /> + <xi:include href="ftp/ftp.xml" /> </directory> <directory name="ipconfig"> - <xi:include href="ipconfig/ipconfig.xml" /> + <xi:include href="ipconfig/ipconfig.xml" /> </directory> <directory name="netstat"> - <xi:include href="netstat/netstat.xml" /> + <xi:include href="netstat/netstat.xml" /> </directory> <directory name="ping"> - <xi:include href="ping/ping.xml" /> + <xi:include href="ping/ping.xml" /> </directory> <directory name="route"> - <xi:include href="route/route.xml" /> + <xi:include href="route/route.xml" /> </directory> <directory name="telnet"> - <xi:include href="telnet/telnet.xml" /> + <xi:include href="telnet/telnet.xml" /> </directory> <directory name="tracert"> - <xi:include href="tracert/tracert.xml" /> + <xi:include href="tracert/tracert.xml" /> </directory> <directory name="whois"> - <xi:include href="whois/whois.xml" /> + <xi:include href="whois/whois.xml" /> </directory> _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.c --- branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.c 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.c 2005-10-21 18:26:07 UTC (rev 18659) @@ -74,7 +74,6 @@ [truncated at 1000 lines; 179644 more skipped]

18 years, 12 months

[gvg] 18658: Merge from trunk. Martijn Vernooij <o112w8r02@sneakemail.com>

by gvg＠svn.reactos.com

Merge from trunk. Martijn Vernooij <o112w8r02(a)sneakemail.com> Work around continuous repainting of treeview control. Fixes bug 493. Modified: branches/ros-branch-0_2_8/reactos/lib/comctl32/treeview.c _____ Modified: branches/ros-branch-0_2_8/reactos/lib/comctl32/treeview.c --- branches/ros-branch-0_2_8/reactos/lib/comctl32/treeview.c 2005-10-21 17:15:53 UTC (rev 18657) +++ branches/ros-branch-0_2_8/reactos/lib/comctl32/treeview.c 2005-10-21 17:16:46 UTC (rev 18658) @@ -2821,8 +2821,6 @@ } } - TREEVIEW_UpdateScrollBars(infoPtr); - if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode = TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect); @@ -3337,6 +3335,7 @@ } } } + TREEVIEW_UpdateScrollBars(infoPtr); return TRUE; }

18 years, 12 months

[gvg] 18657: Martijn Vernooij <o112w8r02@sneakemail.com>

by gvg＠svn.reactos.com

Martijn Vernooij <o112w8r02(a)sneakemail.com> Work around continuous repainting of treeview control. Fixes bug 493. Modified: trunk/reactos/lib/comctl32/treeview.c _____ Modified: trunk/reactos/lib/comctl32/treeview.c --- trunk/reactos/lib/comctl32/treeview.c 2005-10-21 17:00:39 UTC (rev 18656) +++ trunk/reactos/lib/comctl32/treeview.c 2005-10-21 17:15:53 UTC (rev 18657) @@ -2821,8 +2821,6 @@ } } - TREEVIEW_UpdateScrollBars(infoPtr); - if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode = TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect); @@ -3337,6 +3335,7 @@ } } } + TREEVIEW_UpdateScrollBars(infoPtr); return TRUE; }

18 years, 12 months

[gvg] 18656: mlsearch database import scripts by Michael Wirth

by gvg＠svn.reactos.com

mlsearch database import scripts by Michael Wirth Modified: trunk/web/reactos.org/scripts/daily.sh Added: trunk/web/reactos.org/scripts/mlsearch/ Added: trunk/web/reactos.org/scripts/mlsearch/DB/ Added: trunk/web/reactos.org/scripts/mlsearch/DB/common.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/dbase.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/fbsql.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/ibase.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/ifx.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/msql.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/mssql.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/mysql.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/mysqli.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/oci8.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/odbc.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/pgsql.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/sqlite.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/storage.php Added: trunk/web/reactos.org/scripts/mlsearch/DB/sybase.php Added: trunk/web/reactos.org/scripts/mlsearch/DB.php Added: trunk/web/reactos.org/scripts/mlsearch/fetchintodb.php Added: trunk/web/reactos.org/scripts/mlsearch/mbox.php Added: trunk/web/reactos.org/scripts/mlsearch/mimeDecode.php Added: trunk/web/reactos.org/scripts/update_mlsearch_db.sh _____ Modified: trunk/web/reactos.org/scripts/daily.sh --- trunk/web/reactos.org/scripts/daily.sh 2005-10-21 14:04:40 UTC (rev 18655) +++ trunk/web/reactos.org/scripts/daily.sh 2005-10-21 17:00:39 UTC (rev 18656) @@ -5,3 +5,6 @@ ./update_source.sh cd ../source/reactos perl ../../scripts/RosResCheck.pl > ../../htdocs/generated/transstatus.html +cd ../../scripts + +./update_mlsearch_db.sh _____ Added: trunk/web/reactos.org/scripts/mlsearch/DB/common.php --- trunk/web/reactos.org/scripts/mlsearch/DB/common.php 2005-10-21 14:04:40 UTC (rev 18655) +++ trunk/web/reactos.org/scripts/mlsearch/DB/common.php 2005-10-21 17:00:39 UTC (rev 18656) @@ -0,0 +1,2157 @@ +<?php + +/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */ + +/** + * Contains the DB_common base class + * + * PHP versions 4 and 5 + * + * LICENSE: This source file is subject to version 3.0 of the PHP license + * that is available through the world-wide-web at the following URI: + * http://www.php.net/license/3_0.txt. If you did not receive a copy of + * the PHP License and are unable to obtain it through the web, please + * send a note to license(a)php.net so we can mail you a copy immediately. + * + * @category Database + * @package DB + * @author Stig Bakken <ssb(a)php.net> + * @author Tomas V.V. Cox <cox(a)idecnet.com> + * @author Daniel Convissor <danielc(a)php.net> + * @copyright 1997-2005 The PHP Group + * @license http://www.php.net/license/3_0.txt PHP License 3.0 + * @version CVS: $Id: common.php,v 1.137 2005/04/07 14:27:35 danielc Exp $ + * @link http://pear.php.net/package/DB + */ + +/** + * Obtain the PEAR class so it can be extended from + */ +require_once 'PEAR.php'; + +/** + * DB_common is the base class from which each database driver class extends + * + * All common methods are declared here. If a given DBMS driver contains + * a particular method, that method will overload the one here. + * + * @category Database + * @package DB + * @author Stig Bakken <ssb(a)php.net> + * @author Tomas V.V. Cox <cox(a)idecnet.com> + * @author Daniel Convissor <danielc(a)php.net> + * @copyright 1997-2005 The PHP Group + * @license http://www.php.net/license/3_0.txt PHP License 3.0 + * @version Release: 1.7.6 + * @link http://pear.php.net/package/DB + */ +class DB_common extends PEAR +{ + // {{{ properties + + /** + * The current default fetch mode + * @var integer + */ + var $fetchmode = DB_FETCHMODE_ORDERED; + + /** + * The name of the class into which results should be fetched when + * DB_FETCHMODE_OBJECT is in effect + * + * @var string + */ + var $fetchmode_object_class = 'stdClass'; + + /** + * Was a connection present when the object was serialized()? + * @var bool + * @see DB_common::__sleep(), DB_common::__wake() + */ + var $was_connected = null; + + /** + * The most recently executed query + * @var string + */ + var $last_query = ''; + + /** + * Run-time configuration options + * + * The 'optimize' option has been deprecated. Use the 'portability' + * option instead. + * + * @var array + * @see DB_common::setOption() + */ + var $options = array( + 'result_buffering' => 500, + 'persistent' => false, + 'ssl' => false, + 'debug' => 0, + 'seqname_format' => '%s_seq', + 'autofree' => false, + 'portability' => DB_PORTABILITY_NONE, + 'optimize' => 'performance', // Deprecated. Use 'portability'. + ); + + /** + * The parameters from the most recently executed query + * @var array + * @since Property available since Release 1.7.0 + */ + var $last_parameters = array(); + + /** + * The elements from each prepared statement + * @var array + */ + var $prepare_tokens = array(); + + /** + * The data types of the various elements in each prepared statement + * @var array + */ + var $prepare_types = array(); + + /** + * The prepared queries + * @var array + */ + var $prepared_queries = array(); + + + // }}} + // {{{ DB_common + + /** + * This constructor calls <kbd>$this->PEAR('DB_Error')</kbd> + * + * @return void + */ + function DB_common() + { + $this->PEAR('DB_Error'); + } + + // }}} + // {{{ __sleep() + + /** + * Automatically indicates which properties should be saved + * when PHP's serialize() function is called + * + * @return array the array of properties names that should be saved + */ + function __sleep() + { + if ($this->connection) { + // Don't disconnect(), people use serialize() for many reasons + $this->was_connected = true; + } else { + $this->was_connected = false; + } + if (isset($this->autocommit)) { + return array('autocommit', + 'dbsyntax', + 'dsn', + 'features', + 'fetchmode', + 'fetchmode_object_class', + 'options', + 'was_connected', + ); + } else { + return array('dbsyntax', + 'dsn', + 'features', + 'fetchmode', + 'fetchmode_object_class', + 'options', + 'was_connected', + ); + } + } + + // }}} + // {{{ __wakeup() + + /** + * Automatically reconnects to the database when PHP's unserialize() + * function is called + * + * The reconnection attempt is only performed if the object was connected + * at the time PHP's serialize() function was run. + * + * @return void + */ + function __wakeup() + { + if ($this->was_connected) { + $this->connect($this->dsn, $this->options); + } + } + + // }}} + // {{{ __toString() + + /** + * Automatic string conversion for PHP 5 + * + * @return string a string describing the current PEAR DB object + * + * @since Method available since Release 1.7.0 + */ + function __toString() + { + $info = strtolower(get_class($this)); + $info .= ': (phptype=' . $this->phptype . + ', dbsyntax=' . $this->dbsyntax . + ')'; + if ($this->connection) { + $info .= ' [connected]'; + } + return $info; + } + + // }}} + // {{{ toString() + + /** + * DEPRECATED: String conversion method + * + * @return string a string describing the current PEAR DB object + * + * @deprecated Method deprecated in Release 1.7.0 + */ + function toString() + { + return $this->__toString(); + } + + // }}} + // {{{ quoteString() + + /** + * DEPRECATED: Quotes a string so it can be safely used within string + * delimiters in a query + * + * @param string $string the string to be quoted + * + * @return string the quoted string + * + * @see DB_common::quoteSmart(), DB_common::escapeSimple() + * @deprecated Method deprecated some time before Release 1.2 + */ + function quoteString($string) + { + $string = $this->quote($string); + if ($string{0} == "'") { + return substr($string, 1, -1); + } + return $string; + } + + // }}} + // {{{ quote() + + /** + * DEPRECATED: Quotes a string so it can be safely used in a query + * + * @param string $string the string to quote + * + * @return string the quoted string or the string <samp>NULL</samp> + * if the value submitted is <kbd>null</kbd>. + * + * @see DB_common::quoteSmart(), DB_common::escapeSimple() + * @deprecated Deprecated in release 1.6.0 + */ + function quote($string = null) + { + return ($string === null) ? 'NULL' + : "'" . str_replace("'", "''", $string) . "'"; + } + + // }}} + // {{{ quoteIdentifier() + + /** + * Quotes a string so it can be safely used as a table or column name + * + * Delimiting style depends on which database driver is being used. + * + * NOTE: just because you CAN use delimited identifiers doesn't mean + * you SHOULD use them. In general, they end up causing way more + * problems than they solve. + * + * Portability is broken by using the following characters inside + * delimited identifiers: + * + backtick (<kbd>`</kbd>) -- due to MySQL + * + double quote (<kbd>"</kbd>) -- due to Oracle + * + brackets (<kbd>[</kbd> or <kbd>]</kbd>) -- due to Access + * + * Delimited identifiers are known to generally work correctly under + * the following drivers: + * + mssql + * + mysql + * + mysqli + * + oci8 + * + odbc(access) + * + odbc(db2) + * + pgsql + * + sqlite + * + sybase (must execute <kbd>set quoted_identifier on</kbd> sometime + * prior to use) + * + * InterBase doesn't seem to be able to use delimited identifiers + * via PHP 4. They work fine under PHP 5. + * + * @param string $str the identifier name to be quoted + * + * @return string the quoted identifier + * + * @since Method available since Release 1.6.0 + */ + function quoteIdentifier($str) + { + return '"' . str_replace('"', '""', $str) . '"'; + } + + // }}} + // {{{ quoteSmart() + + /** + * Formats input so it can be safely used in a query + * + * The output depends on the PHP data type of input and the database + * type being used. + * + * @param mixed $in the data to be formatted + * + * @return mixed the formatted data. The format depends on the input's + * PHP type: + * <ul> + * <li> + * <kbd>input</kbd> -> <samp>returns</samp> + * </li> + * <li> + * <kbd>null</kbd> -> the string <samp>NULL</samp> + * </li> + * <li> + * <kbd>integer</kbd> or <kbd>double</kbd> -> the unquoted number + * </li> + * <li> + * <kbd>bool</kbd> -> output depends on the driver in use + * Most drivers return integers: <samp>1</samp> if + * <kbd>true</kbd> or <samp>0</samp> if + * <kbd>false</kbd>. + * Some return strings: <samp>TRUE</samp> if + * <kbd>true</kbd> or <samp>FALSE</samp> if + * <kbd>false</kbd>. + * Finally one returns strings: <samp>T</samp> if + * <kbd>true</kbd> or <samp>F</samp> if + * <kbd>false</kbd>. Here is a list of each DBMS, + * the values returned and the suggested column type: + * <ul> + * <li> + * <kbd>dbase</kbd> -> <samp>T/F</samp> + * (<kbd>Logical</kbd>) + * </li> + * <li> + * <kbd>fbase</kbd> -> <samp>TRUE/FALSE</samp> + * (<kbd>BOOLEAN</kbd>) + * </li> + * <li> + * <kbd>ibase</kbd> -> <samp>1/0</samp> + * (<kbd>SMALLINT</kbd>) [1] + * </li> + * <li> + * <kbd>ifx</kbd> -> <samp>1/0</samp> + * (<kbd>SMALLINT</kbd>) [1] + * </li> + * <li> + * <kbd>msql</kbd> -> <samp>1/0</samp> + * (<kbd>INTEGER</kbd>) + * </li> + * <li> + * <kbd>mssql</kbd> -> <samp>1/0</samp> + * (<kbd>BIT</kbd>) + * </li> + * <li> + * <kbd>mysql</kbd> -> <samp>1/0</samp> + * (<kbd>TINYINT(1)</kbd>) + * </li> + * <li> + * <kbd>mysqli</kbd> -> <samp>1/0</samp> + * (<kbd>TINYINT(1)</kbd>) + * </li> + * <li> + * <kbd>oci8</kbd> -> <samp>1/0</samp> + * (<kbd>NUMBER(1)</kbd>) + * </li> + * <li> + * <kbd>odbc</kbd> -> <samp>1/0</samp> + * (<kbd>SMALLINT</kbd>) [1] + * </li> + * <li> + * <kbd>pgsql</kbd> -> <samp>TRUE/FALSE</samp> + * (<kbd>BOOLEAN</kbd>) + * </li> + * <li> + * <kbd>sqlite</kbd> -> <samp>1/0</samp> + * (<kbd>INTEGER</kbd>) + * </li> + * <li> + * <kbd>sybase</kbd> -> <samp>1/0</samp> + * (<kbd>TINYINT(1)</kbd>) + * </li> + * </ul> + * [1] Accommodate the lowest common denominator because not all + * versions of have <kbd>BOOLEAN</kbd>. + * </li> + * <li> + * other (including strings and numeric strings) -> + * the data with single quotes escaped by preceeding + * single quotes, backslashes are escaped by preceeding + * backslashes, then the whole string is encapsulated + * between single quotes + * </li> + * </ul> + * + * @see DB_common::escapeSimple() + * @since Method available since Release 1.6.0 + */ + function quoteSmart($in) + { + if (is_int($in) || is_double($in)) { + return $in; + } elseif (is_bool($in)) { + return $in ? 1 : 0; + } elseif (is_null($in)) { + return 'NULL'; + } else { + return "'" . $this->escapeSimple($in) . "'"; + } + } + + // }}} + // {{{ escapeSimple() + + /** + * Escapes a string according to the current DBMS's standards + * + * In SQLite, this makes things safe for inserts/updates, but may + * cause problems when performing text comparisons against columns + * containing binary data. See the + * {@link http://php.net/sqlite_escape_string PHP manual} for more info. + * + * @param string $str the string to be escaped + * + * @return string the escaped string + * + * @see DB_common::quoteSmart() + * @since Method available since Release 1.6.0 + */ + function escapeSimple($str) + { + return str_replace("'", "''", $str); + } + + // }}} + // {{{ provides() + + /** + * Tells whether the present driver supports a given feature + * + * @param string $feature the feature you're curious about + * + * @return bool whether this driver supports $feature + */ + function provides($feature) + { + return $this->features[$feature]; + } + + // }}} + // {{{ setFetchMode() + + /** + * Sets the fetch mode that should be used by default for query results + * + * @param integer $fetchmode DB_FETCHMODE_ORDERED, DB_FETCHMODE_ASSOC + * or DB_FETCHMODE_OBJECT + * @param string $object_class the class name of the object to be returned + * by the fetch methods when the + * DB_FETCHMODE_OBJECT mode is selected. + * If no class is specified by default a cast + * to object from the assoc array row will be + * done. There is also the posibility to use + * and extend the 'DB_row' class. + * + * @see DB_FETCHMODE_ORDERED, DB_FETCHMODE_ASSOC, DB_FETCHMODE_OBJECT + */ + function setFetchMode($fetchmode, $object_class = 'stdClass') + { + switch ($fetchmode) { + case DB_FETCHMODE_OBJECT: + $this->fetchmode_object_class = $object_class; + case DB_FETCHMODE_ORDERED: + case DB_FETCHMODE_ASSOC: + $this->fetchmode = $fetchmode; + break; + default: + return $this->raiseError('invalid fetchmode mode'); + } + } + + // }}} + // {{{ setOption() + + /** + * Sets run-time configuration options for PEAR DB + * + * Options, their data types, default values and description: + * <ul> + * <li> + * <var>autofree</var> <kbd>boolean</kbd> = <samp>false</samp> + * should results be freed automatically when there are no + * more rows? + * </li><li> + * <var>result_buffering</var> <kbd>integer</kbd> = <samp>500</samp> + * how many rows of the result set should be buffered? + * In mysql: mysql_unbuffered_query() is used instead of + * mysql_query() if this value is 0. (Release 1.7.0) + * In oci8: this value is passed to ocisetprefetch(). + * (Release 1.7.0) + * </li><li> + * <var>debug</var> <kbd>integer</kbd> = <samp>0</samp> + * debug level + * </li><li> + * <var>persistent</var> <kbd>boolean</kbd> = <samp>false</samp> + * should the connection be persistent? + * </li><li> + * <var>portability</var> <kbd>integer</kbd> = <samp>DB_PORTABILITY_NONE</samp> + * portability mode constant (see below) + * </li><li> + * <var>seqname_format</var> <kbd>string</kbd> = <samp>%s_seq</samp> + * the sprintf() format string used on sequence names. This + * format is applied to sequence names passed to + * createSequence(), nextID() and dropSequence(). + * </li><li> + * <var>ssl</var> <kbd>boolean</kbd> = <samp>false</samp> + * use ssl to connect? + * </li> + * </ul> + * + * ----------------------------------------- + * + * PORTABILITY MODES + * + * These modes are bitwised, so they can be combined using <kbd>|</kbd> + * and removed using <kbd>^</kbd>. See the examples section below on how + * to do this. + * + * <samp>DB_PORTABILITY_NONE</samp> + * turn off all portability features + * + * This mode gets automatically turned on if the deprecated + * <var>optimize</var> option gets set to <samp>performance</samp>. + * + * + * <samp>DB_PORTABILITY_LOWERCASE</samp> + * convert names of tables and fields to lower case when using + * <kbd>get*()</kbd>, <kbd>fetch*()</kbd> and <kbd>tableInfo()</kbd> + * + * This mode gets automatically turned on in the following databases + * if the deprecated option <var>optimize</var> gets set to + * <samp>portability</samp>: + * + oci8 + * + * + * <samp>DB_PORTABILITY_RTRIM</samp> + * right trim the data output by <kbd>get*()</kbd> <kbd>fetch*()</kbd> + * + * + * <samp>DB_PORTABILITY_DELETE_COUNT</samp> + * force reporting the number of rows deleted + * + * Some DBMS's don't count the number of rows deleted when performing + * simple <kbd>DELETE FROM tablename</kbd> queries. This portability + * mode tricks such DBMS's into telling the count by adding + * <samp>WHERE 1=1</samp> to the end of <kbd>DELETE</kbd> queries. + * + * This mode gets automatically turned on in the following databases + * if the deprecated option <var>optimize</var> gets set to + * <samp>portability</samp>: + * + fbsql + * + mysql + * + mysqli + * + sqlite + * + * + * <samp>DB_PORTABILITY_NUMROWS</samp> + * enable hack that makes <kbd>numRows()</kbd> work in Oracle + * + * This mode gets automatically turned on in the following databases + * if the deprecated option <var>optimize</var> gets set to + * <samp>portability</samp>: + * + oci8 + * + * + * <samp>DB_PORTABILITY_ERRORS</samp> + * makes certain error messages in certain drivers compatible + * with those from other DBMS's + * + * + mysql, mysqli: change unique/primary key constraints + * DB_ERROR_ALREADY_EXISTS -> DB_ERROR_CONSTRAINT + * + * + odbc(access): MS's ODBC driver reports 'no such field' as code + * 07001, which means 'too few parameters.' When this option is on + * that code gets mapped to DB_ERROR_NOSUCHFIELD. + * DB_ERROR_MISMATCH -> DB_ERROR_NOSUCHFIELD + * + * <samp>DB_PORTABILITY_NULL_TO_EMPTY</samp> + * convert null values to empty strings in data output by get*() and + * fetch*(). Needed because Oracle considers empty strings to be null, + * while most other DBMS's know the difference between empty and null. + * + * + * <samp>DB_PORTABILITY_ALL</samp> + * turn on all portability features + * + * ----------------------------------------- + * + * Example 1. Simple setOption() example + * <code> + * $db->setOption('autofree', true); + * </code> + * + * Example 2. Portability for lowercasing and trimming + * <code> + * $db->setOption('portability', + * DB_PORTABILITY_LOWERCASE | DB_PORTABILITY_RTRIM); + * </code> + * + * Example 3. All portability options except trimming + * <code> + * $db->setOption('portability', + * DB_PORTABILITY_ALL ^ DB_PORTABILITY_RTRIM); + * </code> + * + * @param string $option option name + * @param mixed $value value for the option + * + * @return int DB_OK on success. A DB_Error object on failure. + * + * @see DB_common::$options + */ + function setOption($option, $value) + { + if (isset($this->options[$option])) { + $this->options[$option] = $value; + + /* + * Backwards compatibility check for the deprecated 'optimize' + * option. Done here in case settings change after connecting. + */ + if ($option == 'optimize') { + if ($value == 'portability') { + switch ($this->phptype) { + case 'oci8': + $this->options['portability'] = + DB_PORTABILITY_LOWERCASE | + DB_PORTABILITY_NUMROWS; + break; + case 'fbsql': + case 'mysql': + case 'mysqli': + case 'sqlite': + $this->options['portability'] = + DB_PORTABILITY_DELETE_COUNT; + break; + } + } else { + $this->options['portability'] = DB_PORTABILITY_NONE; + } + } + + return DB_OK; + } + return $this->raiseError("unknown option $option"); + } + + // }}} + // {{{ getOption() + + /** + * Returns the value of an option + * + * @param string $option the option name you're curious about + * + * @return mixed the option's value + */ + function getOption($option) + { + if (isset($this->options[$option])) { + return $this->options[$option]; + } + return $this->raiseError("unknown option $option"); + } + + // }}} + // {{{ prepare() + + /** + * Prepares a query for multiple execution with execute() + * + * Creates a query that can be run multiple times. Each time it is run, + * the placeholders, if any, will be replaced by the contents of + * execute()'s $data argument. + * + * Three types of placeholders can be used: + * + <kbd>?</kbd> scalar value (i.e. strings, integers). The system + * will automatically quote and escape the data. + * + <kbd>!</kbd> value is inserted 'as is' + * + <kbd>&</kbd> requires a file name. The file's contents get + * inserted into the query (i.e. saving binary + * data in a db) + * + * Example 1. + * <code> + * $sth = $db->prepare('INSERT INTO tbl (a, b, c) VALUES (?, !, &)'); + * $data = array( + * "John's text", + * "'it''s good'", + * 'filename.txt' + * ); + * $res = $db->execute($sth, $data); + * </code> + * + * Use backslashes to escape placeholder characters if you don't want + * them to be interpreted as placeholders: + * <pre> + * "UPDATE foo SET col=? WHERE col='over \& under'" + * </pre> + * + * With some database backends, this is emulated. + * + * {@internal ibase and oci8 have their own prepare() methods.}} + * + * @param string $query the query to be prepared + * + * @return mixed DB statement resource on success. A DB_Error object + * on failure. + * + * @see DB_common::execute() + */ + function prepare($query) + { + $tokens = preg_split('/((?<!\\\)[&?!])/', $query, -1, + PREG_SPLIT_DELIM_CAPTURE); + $token = 0; + $types = array(); + $newtokens = array(); + + foreach ($tokens as $val) { + switch ($val) { + case '?': + $types[$token++] = DB_PARAM_SCALAR; + break; + case '&': + $types[$token++] = DB_PARAM_OPAQUE; + break; + case '!': + $types[$token++] = DB_PARAM_MISC; + break; + default: + $newtokens[] = preg_replace('/\\\([&?!])/', "\\1", $val); + } + } + + $this->prepare_tokens[] = &$newtokens; + end($this->prepare_tokens); + + $k = key($this->prepare_tokens); + $this->prepare_types[$k] = $types; + $this->prepared_queries[$k] = implode(' ', $newtokens); + + return $k; + } + + // }}} + // {{{ autoPrepare() + + /** + * Automaticaly generates an insert or update query and pass it to prepare() + * + * @param string $table the table name + * @param array $table_fields the array of field names + * @param int $mode a type of query to make: + * DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE + * @param string $where for update queries: the WHERE clause to + * append to the SQL statement. Don't + * include the "WHERE" keyword. + * + * @return resource the query handle + * + * @uses DB_common::prepare(), DB_common::buildManipSQL() + */ + function autoPrepare($table, $table_fields, $mode = DB_AUTOQUERY_INSERT, + $where = false) + { + $query = $this->buildManipSQL($table, $table_fields, $mode, $where); + if (DB::isError($query)) { + return $query; + } + return $this->prepare($query); + } + + // }}} + // {{{ autoExecute() + + /** + * Automaticaly generates an insert or update query and call prepare() + * and execute() with it + * + * @param string $table the table name + * @param array $fields_values the associative array where $key is a + * field name and $value its value + * @param int $mode a type of query to make: + * DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE + * @param string $where for update queries: the WHERE clause to + * append to the SQL statement. Don't + * include the "WHERE" keyword. + * + * @return mixed a new DB_result object for successful SELECT queries + * or DB_OK for successul data manipulation queries. + * A DB_Error object on failure. + * + * @uses DB_common::autoPrepare(), DB_common::execute() + */ + function autoExecute($table, $fields_values, $mode = DB_AUTOQUERY_INSERT, + $where = false) + { + $sth = $this->autoPrepare($table, array_keys($fields_values), $mode, + $where); + if (DB::isError($sth)) { + return $sth; + } + $ret =& $this->execute($sth, array_values($fields_values)); + $this->freePrepared($sth); + return $ret; + + } + + // }}} + // {{{ buildManipSQL() + + /** + * Produces an SQL query string for autoPrepare() + * + * Example: + * <pre> + * buildManipSQL('table_sql', array('field1', 'field2', 'field3'), + * DB_AUTOQUERY_INSERT); + * </pre> + * + * That returns + * <samp> + * INSERT INTO table_sql (field1,field2,field3) VALUES (?,?,?) + * </samp> + * + * NOTES: + * - This belongs more to a SQL Builder class, but this is a simple + * facility. + * - Be carefull! If you don't give a $where param with an UPDATE + * query, all the records of the table will be updated! + * + * @param string $table the table name + * @param array $table_fields the array of field names + * @param int $mode a type of query to make: + * DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE + * @param string $where for update queries: the WHERE clause to + * append to the SQL statement. Don't + * include the "WHERE" keyword. + * + * @return string the sql query for autoPrepare() + */ + function buildManipSQL($table, $table_fields, $mode, $where = false) + { + if (count($table_fields) == 0) { + return $this->raiseError(DB_ERROR_NEED_MORE_DATA); + } + $first = true; + switch ($mode) { + case DB_AUTOQUERY_INSERT: + $values = ''; + $names = ''; + foreach ($table_fields as $value) { + if ($first) { + $first = false; + } else { + $names .= ','; + $values .= ','; + } + $names .= $value; + $values .= '?'; + } + return "INSERT INTO $table ($names) VALUES ($values)"; + case DB_AUTOQUERY_UPDATE: + $set = ''; + foreach ($table_fields as $value) { + if ($first) { + $first = false; + } else { + $set .= ','; + } + $set .= "$value = ?"; + } + $sql = "UPDATE $table SET $set"; + if ($where) { + $sql .= " WHERE $where"; + } + return $sql; + default: + return $this->raiseError(DB_ERROR_SYNTAX); + } + } + + // }}} + // {{{ execute() + + /** + * Executes a DB statement prepared with prepare() + * + * Example 1. + * <code> + * $sth = $db->prepare('INSERT INTO tbl (a, b, c) VALUES (?, !, &)'); + * $data = array( + * "John's text", + * "'it''s good'", + * 'filename.txt' + * ); + * $res =& $db->execute($sth, $data); + * </code> + * + * @param resource $stmt a DB statement resource returned from prepare() + * @param mixed $data array, string or numeric data to be used in + * execution of the statement. Quantity of items + * passed must match quantity of placeholders in + * query: meaning 1 placeholder for non-array + * parameters or 1 placeholder per array element. + * + * @return mixed a new DB_result object for successful SELECT queries + * or DB_OK for successul data manipulation queries. + * A DB_Error object on failure. + * + * {@internal ibase and oci8 have their own execute() methods.}} + * + * @see DB_common::prepare() + */ + function &execute($stmt, $data = array()) + { + $realquery = $this->executeEmulateQuery($stmt, $data); + if (DB::isError($realquery)) { + return $realquery; + } + $result = $this->simpleQuery($realquery); + + if ($result === DB_OK || DB::isError($result)) { + return $result; + } else { + $tmp =& new DB_result($this, $result); + return $tmp; + } + } + + // }}} + // {{{ executeEmulateQuery() + + /** + * Emulates executing prepared statements if the DBMS not support them + * + * @param resource $stmt a DB statement resource returned from execute() + * @param mixed $data array, string or numeric data to be used in + * execution of the statement. Quantity of items + * passed must match quantity of placeholders in + * query: meaning 1 placeholder for non-array + * parameters or 1 placeholder per array element. + * + * @return mixed a string containing the real query run when emulating + * prepare/execute. A DB_Error object on failure. + * + * @access protected [truncated at 1000 lines; 16651 more skipped]

18 years, 12 months

[weiden] 18655: forgot to commit this...

by weiden＠svn.reactos.com

forgot to commit this... Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2005-10-21 13:45:48 UTC (rev 18654) +++ trunk/reactos/w32api/include/winnt.h 2005-10-21 14:04:40 UTC (rev 18655) @@ -3386,6 +3386,13 @@ } SYSTEM_POWER_INFORMATION,*PSYSTEM_POWER_INFORMATION; #endif +#if (_WIN32_WINNT >= 0x0500) +typedef enum _AUDIT_EVENT_TYPE { + AuditEventObjectAccess, + AuditEventDirectoryServiceAccess +} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; +#endif + #if (_WIN32_WINNT >= 0x0501) typedef enum _HEAP_INFORMATION_CLASS { HeapCompatibilityInformation

18 years, 12 months

[weiden] 18654: added stubs for AccessCheckByTypeAndAuditAlarmA/W, AccessCheckByTypeResultListAndAuditAlarmA/W, AccessCheckByTypeResultListAndAuditAlarmByHandleA/W, GetAuditedPermissionsFromAclA and GetEffectiveRightsFromAclA

by weiden＠svn.reactos.com

added stubs for AccessCheckByTypeAndAuditAlarmA/W, AccessCheckByTypeResultListAndAuditAlarmA/W, AccessCheckByTypeResultListAndAuditAlarmByHandleA/W, GetAuditedPermissionsFromAclA and GetEffectiveRightsFromAclA Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/sec/ac.c Modified: trunk/reactos/lib/advapi32/sec/audit.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-10-21 13:20:19 UTC (rev 18653) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-10-21 13:45:48 UTC (rev 18654) @@ -15,13 +15,13 @@ AccessCheckAndAuditAlarmA@44 AccessCheckAndAuditAlarmW@44 ;AccessCheckByType -;AccessCheckByTypeAndAuditAlarmA@64 -;AccessCheckByTypeAndAuditAlarmW@64 +AccessCheckByTypeAndAuditAlarmA@64 +AccessCheckByTypeAndAuditAlarmW@64 ;AccessCheckByTypeResultList@44 -;AccessCheckByTypeResultListAndAuditAlarmA@64 -;AccessCheckByTypeResultListAndAuditAlarmByHandleA@68 -;AccessCheckByTypeResultListAndAuditAlarmByHandleW@68 -;AccessCheckByTypeResultListAndAuditAlarmW@64 +AccessCheckByTypeResultListAndAuditAlarmA@64 +AccessCheckByTypeResultListAndAuditAlarmByHandleA@68 +AccessCheckByTypeResultListAndAuditAlarmByHandleW@68 +AccessCheckByTypeResultListAndAuditAlarmW@64 AddAccessAllowedAce@16 AddAccessAllowedAceEx@20 AddAccessAllowedObjectAce@28 @@ -236,11 +236,11 @@ ;GetAccessPermissionsForObjectW GetAce@12 GetAclInformation@16 -;GetAuditedPermissionsFromAclA@16 +GetAuditedPermissionsFromAclA@16 GetAuditedPermissionsFromAclW@16 GetCurrentHwProfileA@4 GetCurrentHwProfileW@4 -;GetEffectiveRightsFromAclA@12 +GetEffectiveRightsFromAclA@12 GetEffectiveRightsFromAclW@12 ;GetEventLogInformation GetExplicitEntriesFromAclA(a)12=ADVAPI32.GetExplicitEntriesFromAclW _____ Modified: trunk/reactos/lib/advapi32/sec/ac.c --- trunk/reactos/lib/advapi32/sec/ac.c 2005-10-21 13:20:19 UTC (rev 18653) +++ trunk/reactos/lib/advapi32/sec/ac.c 2005-10-21 13:45:48 UTC (rev 18654) @@ -692,16 +692,15 @@ return ErrorCode; } + /* * @unimplemented */ DWORD STDCALL -GetEffectiveRightsFromAclW( - PACL pacl, - PTRUSTEE_W ptrustee_w, - PACCESS_MASK paccess_mask - ) +GetEffectiveRightsFromAclW(IN PACL pacl, + IN PTRUSTEE_W pTrustee, + OUT PACCESS_MASK pAccessRights) { DPRINT1("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; @@ -713,15 +712,42 @@ */ DWORD STDCALL -GetAuditedPermissionsFromAclW( - PACL pacl, - PTRUSTEE_W ptrustee_w, - PACCESS_MASK paccess_mask, - PACCESS_MASK paccess_mask2 - ) +GetEffectiveRightsFromAclA(IN PACL pacl, + IN PTRUSTEE_A pTrustee, + OUT PACCESS_MASK pAccessRights) { DPRINT1("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } + +/* + * @unimplemented + */ +DWORD +STDCALL +GetAuditedPermissionsFromAclW(IN PACL pacl, + IN PTRUSTEE_W pTrustee, + OUT PACCESS_MASK pSuccessfulAuditedRights, + OUT PACCESS_MASK pFailedAuditRights) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +DWORD +STDCALL +GetAuditedPermissionsFromAclA(IN PACL pacl, + IN PTRUSTEE_A pTrustee, + OUT PACCESS_MASK pSuccessfulAuditedRights, + OUT PACCESS_MASK pFailedAuditRights) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /* EOF */ _____ Modified: trunk/reactos/lib/advapi32/sec/audit.c --- trunk/reactos/lib/advapi32/sec/audit.c 2005-10-21 13:20:19 UTC (rev 18653) +++ trunk/reactos/lib/advapi32/sec/audit.c 2005-10-21 13:45:48 UTC (rev 18654) @@ -13,6 +13,8 @@ #include <advapi32.h> +#define NDEBUG +#include <debug.h> /* FUNCTIONS ****************************************************************/ @@ -505,4 +507,169 @@ return TRUE; } + +/* + * @unimplemented + */ +BOOL STDCALL +AccessCheckByTypeResultListAndAuditAlarmByHandleW(IN LPCWSTR SubsystemName, + IN LPVOID HandleId, + IN HANDLE ClientToken, + IN LPCWSTR ObjectTypeName, + IN LPCWSTR ObjectName, + IN PSECURITY_DESCRIPTOR pSecurityDescriptor, + IN PSID PrincipalSelfSid, + IN DWORD DesiredAccess, + IN AUDIT_EVENT_TYPE AuditType, + IN DWORD Flags, + IN POBJECT_TYPE_LIST ObjectTypeList, + IN DWORD ObjectTypeListLength, + IN PGENERIC_MAPPING GenericMapping, + IN BOOL ObjectCreation, + OUT LPDWORD GrantedAccess, + OUT LPDWORD AccessStatusList, + OUT LPBOOL pfGenerateOnClose) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL STDCALL +AccessCheckByTypeResultListAndAuditAlarmByHandleA(IN LPCSTR SubsystemName, + IN LPVOID HandleId, + IN HANDLE ClientToken, + IN LPCSTR ObjectTypeName, + IN LPCSTR ObjectName, + IN PSECURITY_DESCRIPTOR pSecurityDescriptor, + IN PSID PrincipalSelfSid, + IN DWORD DesiredAccess, + IN AUDIT_EVENT_TYPE AuditType, + IN DWORD Flags, + IN POBJECT_TYPE_LIST ObjectTypeList, + IN DWORD ObjectTypeListLength, + IN PGENERIC_MAPPING GenericMapping, + IN BOOL ObjectCreation, + OUT LPDWORD GrantedAccess, + OUT LPDWORD AccessStatusList, + OUT LPBOOL pfGenerateOnClose) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL STDCALL +AccessCheckByTypeResultListAndAuditAlarmW(IN LPCWSTR SubsystemName, + IN LPVOID HandleId, + IN LPCWSTR ObjectTypeName, + IN LPCWSTR ObjectName, + IN PSECURITY_DESCRIPTOR pSecurityDescriptor, + IN PSID PrincipalSelfSid, + IN DWORD DesiredAccess, + IN AUDIT_EVENT_TYPE AuditType, + IN DWORD Flags, + IN POBJECT_TYPE_LIST ObjectTypeList, + IN DWORD ObjectTypeListLength, + IN PGENERIC_MAPPING GenericMapping, + IN BOOL ObjectCreation, + OUT LPDWORD GrantedAccess, + OUT LPDWORD AccessStatusList, + OUT LPBOOL pfGenerateOnClose) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL STDCALL +AccessCheckByTypeResultListAndAuditAlarmA(IN LPCSTR SubsystemName, + IN LPVOID HandleId, + IN LPCSTR ObjectTypeName, + IN LPCSTR ObjectName, + IN PSECURITY_DESCRIPTOR pSecurityDescriptor, + IN PSID PrincipalSelfSid, + IN DWORD DesiredAccess, + IN AUDIT_EVENT_TYPE AuditType, + IN DWORD Flags, + IN POBJECT_TYPE_LIST ObjectTypeList, + IN DWORD ObjectTypeListLength, + IN PGENERIC_MAPPING GenericMapping, + IN BOOL ObjectCreation, + OUT LPDWORD GrantedAccess, + OUT LPDWORD AccessStatusList, + OUT LPBOOL pfGenerateOnClose) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL STDCALL +AccessCheckByTypeAndAuditAlarmW(IN LPCWSTR SubsystemName, + IN LPVOID HandleId, + IN LPCWSTR ObjectTypeName, + IN LPCWSTR ObjectName, + IN PSECURITY_DESCRIPTOR pSecurityDescriptor, + IN PSID PrincipalSelfSid, + IN DWORD DesiredAccess, + IN AUDIT_EVENT_TYPE AuditType, + IN DWORD Flags, + IN POBJECT_TYPE_LIST ObjectTypeList, + IN DWORD ObjectTypeListLength, + IN PGENERIC_MAPPING GenericMapping, + IN BOOL ObjectCreation, + OUT LPDWORD GrantedAccess, + OUT LPBOOL AccessStatus, + OUT LPBOOL pfGenerateOnClose) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL STDCALL +AccessCheckByTypeAndAuditAlarmA(IN LPCSTR SubsystemName, + IN LPVOID HandleId, + IN LPCSTR ObjectTypeName, + IN LPCSTR ObjectName, + IN PSECURITY_DESCRIPTOR pSecurityDescriptor, + IN PSID PrincipalSelfSid, + IN DWORD DesiredAccess, + IN AUDIT_EVENT_TYPE AuditType, + IN DWORD Flags, + IN POBJECT_TYPE_LIST ObjectTypeList, + IN DWORD ObjectTypeListLength, + IN PGENERIC_MAPPING GenericMapping, + IN BOOL ObjectCreation, + OUT LPDWORD GrantedAccess, + OUT LPBOOL AccessStatus, + OUT LPBOOL pfGenerateOnClose) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + /* EOF */

18 years, 12 months

[amunger] 18653: When you move something in the tree that is on the bootcd, you must update bootdata/packages/reactos.dff. DHCP was missing from recent bootcds.

by amunger＠svn.reactos.com

When you move something in the tree that is on the bootcd, you must update bootdata/packages/reactos.dff. DHCP was missing from recent bootcds. Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-10-21 12:59:32 UTC (rev 18652) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-10-21 13:20:19 UTC (rev 18653) @@ -191,10 +191,10 @@ subsys\system\winlogon\winlogon.exe 1 subsys\system\winefile\winefile.exe 1 subsys\system\winver\winver.exe 1 -subsys\system\dhcp\dhcp.exe 1 subsys\system\sm\sm.exe 1 subsys\system\expand\expand.exe 1 subsys\system\hostname\hostname.exe 1 +services\dhcp\dhcp.exe 1 services\eventlog\eventlog.exe 1 services\rpcss\rpcss.exe 1 services\tcpsvcs\tcpsvcs.exe 1

18 years, 12 months

[amunger] 18652: New search icon.

by amunger＠svn.reactos.com

New search icon. Modified: trunk/reactos/subsys/system/explorer/res/search.ico _____ Modified: trunk/reactos/subsys/system/explorer/res/search.ico (Binary files differ)

18 years, 12 months

[weiden] 18651: implemented ansi stubs: SetupGetInfFileListA and SetupDiGetINFClassA

by weiden＠svn.reactos.com

implemented ansi stubs: SetupGetInfFileListA and SetupDiGetINFClassA Modified: trunk/reactos/lib/setupapi/parser.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/parser.c --- trunk/reactos/lib/setupapi/parser.c 2005-10-21 10:13:26 UTC (rev 18650) +++ trunk/reactos/lib/setupapi/parser.c 2005-10-21 12:31:19 UTC (rev 18651) @@ -2075,6 +2075,52 @@ } /*********************************************************************** + * SetupGetInfFileListA (SETUPAPI.@) + */ +BOOL WINAPI +SetupGetInfFileListA( + IN PCSTR DirectoryPath OPTIONAL, + IN DWORD InfStyle, + IN OUT PSTR ReturnBuffer OPTIONAL, + IN DWORD ReturnBufferSize OPTIONAL, + OUT PDWORD RequiredSize OPTIONAL) +{ + PWSTR DirectoryPathW = NULL; + PWSTR ReturnBufferW = NULL; + BOOL ret = FALSE; + + TRACE("%s %lx %p %ld %p\n", debugstr_a(DirectoryPath), InfStyle, + ReturnBuffer, ReturnBufferSize, RequiredSize); + + if (DirectoryPath != NULL) + { + DirectoryPathW = MultiByteToUnicode(DirectoryPath, CP_ACP); + if (DirectoryPathW == NULL) goto Cleanup; + } + + if (ReturnBuffer != NULL && ReturnBufferSize != 0) + { + ReturnBufferW = MyMalloc(ReturnBufferSize * sizeof(WCHAR)); + if (ReturnBufferW == NULL) goto Cleanup; + } + + ret = SetupGetInfFileListW(DirectoryPathW, InfStyle, ReturnBufferW, ReturnBufferSize, RequiredSize); + + if (ret && ReturnBufferW != NULL) + { + ret = WideCharToMultiByte(CP_ACP, 0, ReturnBufferW, -1, ReturnBuffer, ReturnBufferSize, NULL, NULL) != 0; + } + +Cleanup: + if (DirectoryPathW != NULL) + MyFree(DirectoryPathW); + if (ReturnBufferW != NULL) + MyFree(ReturnBufferW); + + return ret; +} + +/********************************************************************** * * SetupDiGetINFClassW (SETUPAPI.@) */ BOOL WINAPI @@ -2153,3 +2199,48 @@ TRACE("Returning %d\n", ret); return ret; } + +/********************************************************************** * + * SetupDiGetINFClassA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetINFClassA( + IN PCSTR InfName, + OUT LPGUID ClassGuid, + OUT PSTR ClassName, + IN DWORD ClassNameSize, + OUT PDWORD RequiredSize OPTIONAL) +{ + PWSTR InfNameW = NULL; + PWSTR ClassNameW = NULL; + BOOL ret = FALSE; + + TRACE("%s %p %p %ld %p\n", debugstr_a(InfName), ClassGuid, + ClassName, ClassNameSize, RequiredSize); + + if (InfName != NULL) + { + InfNameW = MultiByteToUnicode(InfName, CP_ACP); + if (InfNameW == NULL) goto Cleanup; + } + + if (ClassName != NULL && ClassNameSize != 0) + { + ClassNameW = MyMalloc(ClassNameSize * sizeof(WCHAR)); + if (ClassNameW == NULL) goto Cleanup; + } + + ret = SetupDiGetINFClassW(InfNameW, ClassGuid, ClassNameW, ClassNameSize, RequiredSize); + + if (ret && ClassNameW != NULL) + { + ret = WideCharToMultiByte(CP_ACP, 0, ClassNameW, -1, ClassName, ClassNameSize, NULL, NULL) != 0; + } + +Cleanup: + if (InfNameW != NULL) + MyFree(InfNameW); + if (ClassNameW != NULL) + MyFree(ClassNameW); + + return ret; +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-10-21 10:13:26 UTC (rev 18650) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-10-21 12:31:19 UTC (rev 18651) @@ -341,7 +341,7 @@ @ stub SetupDiGetHwProfileList @ stub SetupDiGetHwProfileListExA @ stub SetupDiGetHwProfileListExW -@ stub SetupDiGetINFClassA +@ stdcall SetupDiGetINFClassA(str ptr ptr long ptr) @ stdcall SetupDiGetINFClassW(wstr ptr ptr long ptr) @ stub SetupDiGetSelectedDevice @ stub SetupDiGetSelectedDriverA @@ -401,7 +401,7 @@ @ stub SetupGetFileCompressionInfoW @ stdcall SetupGetFileQueueCount(long long ptr) @ stdcall SetupGetFileQueueFlags(long ptr) -@ stub SetupGetInfFileListA +@ stdcall SetupGetInfFileListA(str long str long ptr) @ stdcall SetupGetInfFileListW(wstr long wstr long ptr) @ stdcall SetupGetInfInformationA(ptr long ptr long ptr) @ stdcall SetupGetInfInformationW(ptr long ptr long ptr)

18 years, 12 months

[hpoussin] 18650: Implement SetupDiGetDeviceInstallParamsW/SetupDiSetDeviceInstallParamsW

by hpoussin＠svn.reactos.com

Implement SetupDiGetDeviceInstallParamsW/SetupDiSetDeviceInstallParamsW Set and use Flags and FlagsEx fields in SP_DEVINSTALL_PARAMS Allow search of .inf files outside of ReactOS\Inf directory Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-21 09:33:20 UTC (rev 18649) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-21 10:13:26 UTC (rev 18650) @@ -132,6 +132,9 @@ { LIST_ENTRY ListEntry; + /* Reserved Field points to a struct DriverInfoElement */ + SP_DEVINSTALL_PARAMS_W InstallParams; + /* Information about devnode: * - DeviceName: * "Root\*PNP0501" for example. @@ -155,31 +158,16 @@ * the unique ID needs to be generated * - DICD_INHERIT_CLASSDRVS * inherit driver of the device info set (== same pointer) - * - hwndParent - * Used when doing device-specific actions. Can be NULL */ PCWSTR DeviceName; PCWSTR UniqueId; PCWSTR DeviceDescription; GUID ClassGuid; DWORD CreationFlags; - HWND hwndParent; - /* Flags is a combination of: - * - DI_DIDCOMPAT - * Set when the device driver list is created - * FlagsEx is a combination of: - * - DI_FLAGSEX_DIDCOMPATINFO (FIXME: not supported) - */ - DWORD Flags; - DWORD FlagsEx; - /* If CreationFlags contains DICD_INHERIT_CLASSDRVS, this list is invalid */ /* If the driver is not searched/detected, this list is empty */ LIST_ENTRY DriverListHead; /* List of struct DriverInfoElement */ - /* Points into DriverListHead list. The pointer is NULL if no driver is - * currently chosen. */ - struct DriverInfoElement *SelectedDriver; /* List of interfaces implemented by this device */ LIST_ENTRY InterfaceListHead; /* List of struct DeviceInterface */ @@ -191,26 +179,13 @@ { DWORD magic; /* SETUP_DEV_INFO_SET_MAGIC */ GUID ClassGuid; /* If != GUID_NULL, only devices of this class can be in the device info set */ - HWND hwndParent; /* only used on non-device-specific actions, like as a select-device dialog using the global class driver list */ HKEY HKLM; /* Local or distant HKEY_LOCAL_MACHINE registry key */ - /* Flags is a combination of: - * - DI_DIDCLASS - * Set when the class driver list is created - * - DI_MULTMFGS (FIXME: not supported) - * - DI_COMPAT_FROM_CLASS (FIXME: not supported) - * Forces SetupDiBuildDriverInfoList to build a class drivers list - * FlagsEx is a combination of: - * - DI_FLAGSEX_DIDINFOLIST (FIXME: not supported) - */ - DWORD Flags; - DWORD FlagsEx; + /* Reserved Field points to a struct DriverInfoElement */ + SP_DEVINSTALL_PARAMS_W InstallParams; /* If the driver is not searched/detected, this list is empty */ LIST_ENTRY DriverListHead; /* List of struct DriverInfoElement */ - /* Points into DriverListHead list. The pointer is NULL if no driver is - * currently chosen. */ - struct DriverInfoElement *SelectedDriver; LIST_ENTRY ListHead; /* List of struct DeviceInfoElement */ }; @@ -760,13 +735,16 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); return (HDEVINFO)INVALID_HANDLE_VALUE; } + memset(list, 0, sizeof(struct DeviceInfoSet)); list->magic = SETUP_DEV_INFO_SET_MAGIC; memcpy( &list->ClassGuid, ClassGuid ? ClassGuid : &GUID_NULL, sizeof(list->ClassGuid)); - list->hwndParent = hwndParent; + list->InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + list->InstallParams.Flags |= DI_CLASSINSTALLPARAMS; + list->InstallParams.hwndParent = hwndParent; if (MachineName) { rc = RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &list->HKLM); @@ -781,8 +759,6 @@ { list->HKLM = HKEY_LOCAL_MACHINE; } - list->Flags = 0; /* FIXME */ - list->FlagsEx = 0; /* FIXME */ InitializeListHead(&list->DriverListHead); InitializeListHead(&list->ListHead); return (HDEVINFO)list; @@ -1191,26 +1167,26 @@ IN LPCGUID pClassGuid, OUT struct DeviceInfoElement **pDeviceInfo) { + DWORD size; struct DeviceInfoElement *deviceInfo; *pDeviceInfo = NULL; - deviceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInfoElement) + (wcslen(InstancePath) + 1) * sizeof(WCHAR)); + size = sizeof(struct DeviceInfoElement) + (wcslen(InstancePath) + 1) * sizeof(WCHAR); + deviceInfo = HeapAlloc(GetProcessHeap(), 0, size); if (!deviceInfo) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } + memset(deviceInfo, 0, size); + deviceInfo->InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); wcscpy(deviceInfo->Data, InstancePath); deviceInfo->DeviceName = deviceInfo->Data; deviceInfo->UniqueId = wcsrchr(deviceInfo->Data, '\\'); deviceInfo->DeviceDescription = NULL; memcpy(&deviceInfo->ClassGuid, pClassGuid, sizeof(GUID)); deviceInfo->CreationFlags = 0; - deviceInfo->hwndParent = NULL; - deviceInfo->Flags = 0; /* FIXME */ - deviceInfo->FlagsEx = 0; /* FIXME */ - deviceInfo->SelectedDriver = NULL; InitializeListHead(&deviceInfo->DriverListHead); InitializeListHead(&deviceInfo->InterfaceListHead); @@ -2887,6 +2863,7 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else { + SP_DEVINSTALL_PARAMS_W InstallParams; #define CLASS_COINSTALLER 0x1 #define DEVICE_COINSTALLER 0x2 #define CLASS_INSTALLER 0x4 @@ -2935,6 +2912,11 @@ SetLastError(ERROR_INVALID_PARAMETER); } + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + if (!SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams)) + /* Don't process this call, as a parameter is invalid */ + CanHandle = 0; + if (CanHandle != 0) { LIST_ENTRY ClassCoInstallersListHead; @@ -2991,7 +2973,7 @@ RegCloseKey(hKey); } } - if (CanHandle & CLASS_INSTALLER) + if ((CanHandle & CLASS_INSTALLER) && !(InstallParams.FlagsEx & DI_FLAGSEX_CI_FAILED)) { hKey = SetupDiOpenClassRegKey(&DeviceInfoData->ClassGuid, KEY_QUERY_VALUE); if (hKey != INVALID_HANDLE_VALUE) @@ -3006,7 +2988,11 @@ if (rc == ERROR_SUCCESS) { /* Get ClassInstaller function pointer */ - rc = GetFunctionPointer(KeyBuffer, &ClassInstallerLibrary, (PVOID*)&ClassInstaller); + if (GetFunctionPointer(KeyBuffer, &ClassInstallerLibrary, (PVOID*)&ClassInstaller) != ERROR_SUCCESS) + { + InstallParams.FlagsEx |= DI_FLAGSEX_CI_FAILED; + SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + } } HeapFree(GetProcessHeap(), 0, KeyBuffer); } @@ -3059,7 +3045,7 @@ /* Call default handler */ if (rc == ERROR_DI_DO_DEFAULT) { - if (DefaultHandler /*FIXME && DI_NODI_DEFAULTACTION not set */) + if (DefaultHandler && !(InstallParams.Flags & DI_NODI_DEFAULTACTION)) { if ((*DefaultHandler)(DeviceInfoSet, DeviceInfoData)) rc = NO_ERROR; @@ -3171,11 +3157,79 @@ IN PSP_DEVINFO_DATA DeviceInfoData, OUT PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + struct DeviceInfoSet *list; + BOOL ret = FALSE; + + TRACE("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (!DeviceInstallParams) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInstallParams->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + PSP_DEVINSTALL_PARAMS_W Source; + + if (DeviceInfoData) + Source = &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->InstallParams; + else + Source = &list->InstallParams; + memcpy(DeviceInstallParams, Source, Source->cbSize); + ret = TRUE; + } + + TRACE("Returning %d\n", ret); + return ret; } /*********************************************************************** + * SetupDiSetDeviceInstallParamsW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetDeviceInstallParamsW( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + IN PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +{ + struct DeviceInfoSet *list; + BOOL ret = FALSE; + + TRACE("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (!DeviceInstallParams) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInstallParams->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + PSP_DEVINSTALL_PARAMS_W Destination; + + /* FIXME: Validate parameters */ + + if (DeviceInfoData) + Destination = &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->InstallParams; + else + Destination = &list->InstallParams; + memcpy(Destination, DeviceInstallParams, DeviceInstallParams->cbSize); + ret = TRUE; + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/********************************************************************** * * SetupDiCreateDevRegKey (SETUPAPI.@) */ HKEY WINAPI SetupDiCreateDevRegKeyW( @@ -3897,6 +3951,7 @@ IN DWORD DriverType) { struct DeviceInfoSet *list; + SP_DEVINSTALL_PARAMS_W InstallParams; PVOID Buffer = NULL; HINF hInf = INVALID_HANDLE_VALUE; LPWSTR ProviderName = NULL; @@ -3927,8 +3982,13 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else { - BOOL Result = FALSE; + BOOL Result; + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + Result = SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + if (!Result) + goto done; + if (DriverType == SPDIT_COMPATDRIVER) { /* Get hardware IDs list */ @@ -4004,7 +4064,7 @@ break; } Result = SetupGetInfFileListW( - NULL, /* Directory path */ + *InstallParams.DriverPath ? InstallParams.DriverPath : NULL, INF_STYLE_WIN4, Buffer, RequiredSize, &RequiredSize); @@ -4215,11 +4275,15 @@ { if (DeviceInfoData) { - struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; - deviceInfo->Flags |= DI_DIDCOMPAT; + InstallParams.Flags |= DI_DIDCOMPAT; + InstallParams.FlagsEx |= DI_FLAGSEX_DIDCOMPATINFO; } else - list->Flags |= DI_DIDCLASS; + { + InstallParams.Flags |= DI_DIDCLASS; + InstallParams.FlagsEx |= DI_FLAGSEX_DIDINFOLIST; + } + ret = SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); } HeapFree(GetProcessHeap(), 0, ProviderName); @@ -4277,22 +4341,26 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else { - struct DeviceInfoElement *deviceInfo = NULL; PLIST_ENTRY ListEntry; struct DriverInfoElement *driverInfo; + SP_DEVINSTALL_PARAMS_W InstallParams; + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + if (!SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams)) + goto done; + if (!DeviceInfoData) + /* Fall back to destroying class driver list */ DriverType = SPDIT_CLASSDRIVER; if (DriverType == SPDIT_CLASSDRIVER) { - if (!(list->Flags & DI_DIDCLASS)) + if (!(InstallParams.Flags & DI_DIDCLASS)) /* The list was not created */ goto done; } else if (DriverType == SPDIT_COMPATDRIVER) { - deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; - if (!(deviceInfo->Flags & DI_DIDCOMPAT)) + if (!(InstallParams.Flags & DI_DIDCOMPAT)) /* The list was not created */ goto done; } @@ -4308,28 +4376,39 @@ HeapFree(GetProcessHeap(), 0, driverInfo->MatchingId); HeapFree(GetProcessHeap(), 0, driverInfo); } - list->Flags &= ~(DI_DIDCLASS | DI_MULTMFGS); - list->FlagsEx &= ~DI_FLAGSEX_DIDINFOLIST; - list->SelectedDriver = NULL; + InstallParams.Reserved = 0; + InstallParams.Flags &= ~(DI_DIDCLASS | DI_MULTMFGS); + InstallParams.FlagsEx &= ~DI_FLAGSEX_DIDINFOLIST; + ret = SetupDiSetDeviceInstallParamsW(DeviceInfoSet, NULL, &InstallParams); } else { + SP_DEVINSTALL_PARAMS_W InstallParamsSet; + struct DeviceInfoElement *deviceInfo; + + InstallParamsSet.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + if (!SetupDiGetDeviceInstallParamsW(DeviceInfoSet, NULL, &InstallParamsSet)) + goto done; + deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; while (!IsListEmpty(&deviceInfo->DriverListHead)) { ListEntry = RemoveHeadList(&deviceInfo->DriverListHead); driverInfo = (struct DriverInfoElement *)ListEntry; - if (list->SelectedDriver == driverInfo) - list->SelectedDriver = NULL; + if ((PVOID)InstallParamsSet.Reserved == driverInfo) + { + InstallParamsSet.Reserved = 0; + SetupDiSetDeviceInstallParamsW(DeviceInfoSet, NULL, &InstallParamsSet); + } HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); HeapFree(GetProcessHeap(), 0, driverInfo->InfPath); HeapFree(GetProcessHeap(), 0, driverInfo->MatchingId); HeapFree(GetProcessHeap(), 0, driverInfo); } - deviceInfo->Flags &= ~DI_DIDCOMPAT; - deviceInfo->FlagsEx &= ~DI_FLAGSEX_DIDCOMPATINFO; - deviceInfo->SelectedDriver = NULL; + InstallParams.Reserved = 0; + InstallParams.Flags &= ~DI_DIDCOMPAT; + InstallParams.FlagsEx &= ~DI_FLAGSEX_DIDCOMPATINFO; + ret = SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); } - ret = TRUE; } done: @@ -4629,22 +4708,23 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else { - struct DriverInfoElement *driverInfo; - - if (DeviceInfoData) - driverInfo = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver; - else - driverInfo = ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver; + SP_DEVINSTALL_PARAMS InstallParams; - if (driverInfo == NULL) - SetLastError(ERROR_NO_DRIVER_SELECTED); - else + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams)) { - memcpy( - &DriverInfoData->DriverType, - &driverInfo->Info.DriverType, - DriverInfoData->cbSize - FIELD_OFFSET(SP_DRVINFO_DATA_W, DriverType)); - ret = TRUE; + struct DriverInfoElement *driverInfo; + driverInfo = (struct DriverInfoElement *)InstallParams.Reserved; + if (driverInfo == NULL) + SetLastError(ERROR_NO_DRIVER_SELECTED); + else + { + memcpy( + &DriverInfoData->DriverType, + &driverInfo->Info.DriverType, + DriverInfoData->cbSize - FIELD_OFFSET(SP_DRVINFO_DATA_W, DriverType)); + ret = TRUE; + } } } @@ -4682,12 +4762,12 @@ if (DeviceInfoData) { - pDriverInfo = &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver; + pDriverInfo = (struct DriverInfoElement **)&((struct DeviceInfoElement *)DeviceInfoData->Reserved)->InstallParams.Reserved; ListHead = &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->DriverListHead; } else { - pDriverInfo = &((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver; + pDriverInfo = (struct DriverInfoElement **)&((struct DeviceInfoSet *)DeviceInfoSet)->InstallParams.Reserved; ListHead = &((struct DeviceInfoSet *)DeviceInfoSet)->DriverListHead; } @@ -4794,45 +4874,62 @@ SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); - else if (DeviceInfoData && ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver == NULL) - SetLastError(ERROR_INVALID_PARAMETER); - else if (!DeviceInfoData && ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver == NULL) - SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoData && ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->InstallParams.Reserved == 0) + SetLastError(ERROR_NO_DRIVER_SELECTED); + else if (!DeviceInfoData && ((struct DeviceInfoSet *)DeviceInfoSet)->InstallParams.Reserved == 0) + SetLastError(ERROR_NO_DRIVER_SELECTED); else { - struct DriverInfoElement *DriverInfo; - HWND hWnd; - HINF hInf; + SP_DEVINSTALL_PARAMS_W InstallParams; + HINF hInf = INVALID_HANDLE_VALUE; + struct DriverInfoElement *SelectedDriver; + WCHAR SectionName[MAX_PATH]; + DWORD SectionNameLength = 0; - if (DeviceInfoData) + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + ret = SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + if (!ret) + goto cleanup; + + SelectedDriver = (struct DriverInfoElement *)InstallParams.Reserved; + if (!SelectedDriver) { - DriverInfo = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver; - hWnd = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->hwndParent; + SetLastError(ERROR_NO_DRIVER_SELECTED); + goto cleanup; } + + hInf = SetupOpenInfFileW(SelectedDriver->InfPath, NULL, INF_STYLE_WIN4, NULL); + if (hInf == INVALID_HANDLE_VALUE) + goto cleanup; + + ret = SetupDiGetActualSectionToInstallW(hInf, SelectedDriver->InfSection, + SectionName, MAX_PATH, &SectionNameLength, NULL); + if (!ret) + goto cleanup; + + if (InstallParams.InstallMsgHandler) + { + ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, hInf, SectionName, + SPINST_FILES, NULL, NULL, SP_COPY_NEWER, + InstallParams.InstallMsgHandler, InstallParams.InstallMsgHandlerContext, + DeviceInfoSet, DeviceInfoData); + } else { - DriverInfo = ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver; - hWnd = ((struct DeviceInfoSet *)DeviceInfoSet)->hwndParent; + PVOID callback_context = SetupInitDefaultQueueCallback(InstallParams.hwndParent); + ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, hInf, SectionName, + SPINST_FILES, NULL, NULL, SP_COPY_NEWER, + SetupDefaultQueueCallbackW, callback_context, + DeviceInfoSet, DeviceInfoData); + SetupTermDefaultQueueCallback(callback_context); } - - hInf = SetupOpenInfFileW(DriverInfo->InfPath, NULL, INF_STYLE_WIN4, NULL); +cleanup: if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); + if (ret) { - WCHAR SectionName[MAX_PATH]; - DWORD SectionNameLength = 0; - - ret = SetupDiGetActualSectionToInstallW(hInf, DriverInfo->InfSection, - SectionName, MAX_PATH, &SectionNameLength, NULL); - if (ret) - { - PVOID callback_context = SetupInitDefaultQueueCallback(hWnd); - ret = SetupInstallFromInfSectionW(hWnd, hInf, SectionName, - SPINST_FILES, NULL, NULL, SP_COPY_NEWER, - SetupDefaultQueueCallbackW, callback_context, - NULL, NULL); - SetupTermDefaultQueueCallback(callback_context); - } - SetupCloseInfFile(hInf); + InstallParams.Flags |= DI_NOFILECOPY; + ret = SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); } } @@ -4880,8 +4977,9 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData) { - struct DriverInfoElement *DriverInfo; struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + SP_DEVINSTALL_PARAMS_W InstallParams; + struct DriverInfoElement *SelectedDriver; SYSTEMTIME DriverDate; WCHAR SectionName[MAX_PATH]; WCHAR Buffer[32]; @@ -4889,6 +4987,7 @@ BOOL Result = FALSE; INFCONTEXT ContextService; INT Flags; + ULONG DoAction; DWORD RequiredSize; HINF hInf = INVALID_HANDLE_VALUE; LPCWSTR AssociatedService = NULL; @@ -4900,7 +4999,6 @@ HKEY hKey = INVALID_HANDLE_VALUE; HKEY hClassKey = INVALID_HANDLE_VALUE; LONG rc; - HWND hWnd; BOOL ret = FALSE; /* Return value */ TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); @@ -4913,10 +5011,6 @@ SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); - else if (DeviceInfoData && ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver == NULL) - SetLastError(ERROR_INVALID_PARAMETER); - else if (!DeviceInfoData && ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver == NULL) - SetLastError(ERROR_INVALID_PARAMETER); else Result = TRUE; @@ -4926,25 +5020,31 @@ goto cleanup; } - /* FIXME: If DI_FLAGSEX_SETFAILEDINSTALL is set, set FAILEDINSTALL flag in ConfigFlags registry and exit */ + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + Result = SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + if (!Result) + goto cleanup; - if (DeviceInfoData) + if (InstallParams.FlagsEx & DI_FLAGSEX_SETFAILEDINSTALL) { - DriverInfo = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver; - hWnd = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->hwndParent; + /* FIXME: set FAILEDINSTALL in ConfigFlags registry value */ + goto cleanup; } - else + + SelectedDriver = (struct DriverInfoElement *)InstallParams.Reserved; + if (SelectedDriver == NULL) { - DriverInfo = ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver; - hWnd = ((struct DeviceInfoSet *)DeviceInfoSet)->hwndParent; + SetLastError(ERROR_NO_DRIVER_SELECTED); + goto cleanup; } - FileTimeToSystemTime(&DriverInfo->Info.DriverDate, &DriverDate); - hInf = SetupOpenInfFileW(DriverInfo->InfPath, NULL, INF_STYLE_WIN4, NULL); + FileTimeToSystemTime(&SelectedDriver->Info.DriverDate, &DriverDate); + + hInf = SetupOpenInfFileW(SelectedDriver->InfPath, NULL, INF_STYLE_WIN4, NULL); if (hInf == INVALID_HANDLE_VALUE) goto cleanup; - Result = SetupDiGetActualSectionToInstallW(hInf, DriverInfo->InfSection, + Result = SetupDiGetActualSectionToInstallW(hInf, SelectedDriver->InfSection, SectionName, MAX_PATH, &SectionNameLength, NULL); if (!Result || SectionNameLength > MAX_PATH - 9) goto cleanup; @@ -4953,7 +5053,7 @@ /* Get information from [Version] section */ ClassName = NULL; RequiredSize = 0; - if (!SetupDiGetINFClassW(DriverInfo->InfPath, &ClassGuid, ClassName, RequiredSize, &RequiredSize)) + if (!SetupDiGetINFClassW(SelectedDriver->InfPath, &ClassGuid, ClassName, RequiredSize, &RequiredSize)) { if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) goto cleanup; @@ -4963,7 +5063,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - if (!SetupDiGetINFClassW(DriverInfo->InfPath, &ClassGuid, ClassName, RequiredSize, &RequiredSize)) + if (!SetupDiGetINFClassW(SelectedDriver->InfPath, &ClassGuid, ClassName, RequiredSize, &RequiredSize)) goto cleanup; } /* Format ClassGuid to a string */ @@ -4989,48 +5089,60 @@ goto cleanup; /* Install main section */ + DoAction = SPINST_REGISTRY; + if (!(InstallParams.Flags & DI_NOFILECOPY)) + DoAction |= SPINST_FILES; /* Files have already been copied in SetupDiInstallDriverFiles. * Process only registry entries. */ *pSectionName = '\0'; - Result = SetupInstallFromInfSectionW(hWnd, hInf, SectionName, - SPINST_REGISTRY, hKey, NULL, 0, - SetupDefaultQueueCallbackW, NULL, - NULL, NULL); + Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, hInf, SectionName, + DoAction, hKey, NULL, SP_COPY_NEWER, + InstallParams.InstallMsgHandler, InstallParams.InstallMsgHandlerContext, + DeviceInfoSet, DeviceInfoData); if (!Result) goto cleanup; + if (!(InstallParams.Flags & DI_NOFILECOPY) && !(InstallParams.Flags & DI_NOVCP)) + { + Result = SetupCommitFileQueueW(InstallParams.hwndParent, + InstallParams.FileQueue, + InstallParams.InstallMsgHandler, + InstallParams.InstallMsgHandlerContext); + } + InstallParams.Flags |= DI_NOFILECOPY; + SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); /* Write information to driver key */ *pSectionName = UNICODE_NULL; TRACE("Write information to driver key\n"); TRACE("DriverDate : '%u-%u-%u'\n", DriverDate.wMonth, DriverDate.wDay, DriverDate.wYear); - TRACE("DriverDesc : '%S'\n", DriverInfo->Info.Description); - TRACE("DriverVersion : '%u.%u.%u.%u'\n", DriverInfo->Info.DriverVersion & 0xff, (DriverInfo->Info.DriverVersion >> 8) & 0xff, (DriverInfo->Info.DriverVersion >> 16) & 0xff, (DriverInfo->Info.DriverVersion >> 24) & 0xff); - TRACE("InfPath : '%S'\n", DriverInfo->InfPath); - TRACE("InfSection : '%S'\n", DriverInfo->InfSection); - TRACE("InfSectionExt : '%S'\n", &SectionName[wcslen(DriverInfo->InfSection)]); /* FIXME */ - TRACE("MatchingDeviceId: '%S'\n", DriverInfo->MatchingId); - TRACE("ProviderName : '%S'\n", DriverInfo->Info.ProviderName); + TRACE("DriverDesc : '%S'\n", SelectedDriver->Info.Description); + TRACE("DriverVersion : '%u.%u.%u.%u'\n", SelectedDriver->Info.DriverVersion & 0xff, (SelectedDriver->Info.DriverVersion >> 8) & 0xff, (SelectedDriver->Info.DriverVersion >> 16) & 0xff, (SelectedDriver->Info.DriverVersion >> 24) & 0xff); + TRACE("InfPath : '%S'\n", SelectedDriver->InfPath); + TRACE("InfSection : '%S'\n", SelectedDriver->InfSection); + TRACE("InfSectionExt : '%S'\n", &SectionName[wcslen(SelectedDriver->InfSection)]); /* FIXME */ + TRACE("MatchingDeviceId: '%S'\n", SelectedDriver->MatchingId); + TRACE("ProviderName : '%S'\n", SelectedDriver->Info.ProviderName); swprintf(Buffer, L"%u-%u-%u", DriverDate.wMonth, DriverDate.wDay, DriverDate.wYear); rc = RegSetValueEx(hKey, L"DriverDate", 0, REG_SZ, (const BYTE *)Buffer, (wcslen(Buffer) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, L"DriverDateData", 0, REG_BINARY, (const BYTE *)&DriverInfo->Info.DriverDate, sizeof(FILETIME)); + rc = RegSetValueEx(hKey, L"DriverDateData", 0, REG_BINARY, (const BYTE *)&SelectedDriver->Info.DriverDate, sizeof(FILETIME)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, L"DriverDesc", 0, REG_SZ, (const BYTE *)DriverInfo->Info.Description, (wcslen(DriverInfo->Info.Description) + 1) * sizeof(WCHAR)); + rc = RegSetValueEx(hKey, L"DriverDesc", 0, REG_SZ, (const BYTE *)SelectedDriver->Info.Description, (wcslen(SelectedDriver->Info.Description) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) { - swprintf(Buffer, L"%u.%u.%u.%u", DriverInfo->Info.DriverVersion & 0xff, (DriverInfo->Info.DriverVersion >> 8) & 0xff, (DriverInfo->Info.DriverVersion >> 16) & 0xff, (DriverInfo->Info.DriverVersion >> 24) & 0xff); + swprintf(Buffer, L"%u.%u.%u.%u", SelectedDriver->Info.DriverVersion & 0xff, (SelectedDriver->Info.DriverVersion >> 8) & 0xff, (SelectedDriver->Info.DriverVersion >> 16) & 0xff, (SelectedDriver->Info.DriverVersion >> 24) & 0xff); rc = RegSetValueEx(hKey, L"DriverVersion", 0, REG_SZ, (const BYTE *)Buffer, (wcslen(Buffer) + 1) * sizeof(WCHAR)); } if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, L"InfPath", 0, REG_SZ, (const BYTE *)DriverInfo->InfPath, (wcslen(DriverInfo->InfPath) + 1) * sizeof(WCHAR)); + rc = RegSetValueEx(hKey, L"InfPath", 0, REG_SZ, (const BYTE *)SelectedDriver->InfPath, (wcslen(SelectedDriver->InfPath) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, L"InfSection", 0, REG_SZ, (const BYTE *)DriverInfo->InfSection, (wcslen(DriverInfo->InfSection) + 1) * sizeof(WCHAR)); + rc = RegSetValueEx(hKey, L"InfSection", 0, REG_SZ, (const BYTE *)SelectedDriver->InfSection, (wcslen(SelectedDriver->InfSection) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, L"InfSectionExt", 0, REG_SZ, (const BYTE *)&SectionName[wcslen(DriverInfo->InfSection)], (wcslen(SectionName) - wcslen(DriverInfo->InfSection) + 1) * sizeof(WCHAR)); + rc = RegSetValueEx(hKey, L"InfSectionExt", 0, REG_SZ, (const BYTE *)&SectionName[wcslen(SelectedDriver->InfSection)], (wcslen(SectionName) - wcslen(SelectedDriver->InfSection) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, L"MatchingDeviceId", 0, REG_SZ, (const BYTE *)DriverInfo->MatchingId, (wcslen(DriverInfo->MatchingId) + 1) * sizeof(WCHAR)); + rc = RegSetValueEx(hKey, L"MatchingDeviceId", 0, REG_SZ, (const BYTE *)SelectedDriver->MatchingId, (wcslen(SelectedDriver->MatchingId) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, L"ProviderName", 0, REG_SZ, (const BYTE *)DriverInfo->Info.ProviderName, (wcslen(DriverInfo->Info.ProviderName) + 1) * sizeof(WCHAR)); + rc = RegSetValueEx(hKey, L"ProviderName", 0, REG_SZ, (const BYTE *)SelectedDriver->Info.ProviderName, (wcslen(SelectedDriver->Info.ProviderName) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -5039,6 +5151,8 @@ RegCloseKey(hKey); hKey = INVALID_HANDLE_VALUE; + /* FIXME: Process .LogConfigOverride section */ + /* Install .Services section */ wcscpy(pSectionName, L".Services"); Result = SetupFindFirstLineW(hInf, SectionName, NULL, &ContextService); @@ -5131,10 +5245,10 @@ /* Install .HW section */ wcscpy(pSectionName, L".HW"); - Result = SetupInstallFromInfSectionW(hWnd, hInf, SectionName, + Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, hInf, SectionName, SPINST_REGISTRY, hKey, NULL, 0, - SetupDefaultQueueCallbackW, NULL, - NULL, NULL); + InstallParams.InstallMsgHandler, InstallParams.InstallMsgHandlerContext, + DeviceInfoSet, DeviceInfoData); if (!Result) goto cleanup; @@ -5143,17 +5257,17 @@ TRACE("Service : '%S'\n", AssociatedService); TRACE("Class : '%S'\n", ClassName); TRACE("ClassGUID : '%S'\n", lpFullGuidString); - TRACE("DeviceDesc : '%S'\n", DriverInfo->Info.Description); - TRACE("Mfg : '%S'\n", DriverInfo->Info.MfgName); + TRACE("DeviceDesc : '%S'\n", SelectedDriver->Info.Description); + TRACE("Mfg : '%S'\n", SelectedDriver->Info.MfgName); rc = RegSetValueEx(hKey, L"Service", 0, REG_SZ, (const BYTE *)AssociatedService, (wcslen(AssociatedService) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) rc = RegSetValueEx(hKey, L"Class", 0, REG_SZ, (const BYTE *)ClassName, (wcslen(ClassName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) rc = RegSetValueEx(hKey, L"ClassGUID", 0, REG_SZ, (const BYTE *)lpFullGuidString, (wcslen(lpFullGuidString) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, L"DeviceDesc", 0, REG_SZ, (const BYTE *)DriverInfo->Info.Description, (wcslen(DriverInfo->Info.Description) + 1) * sizeof(WCHAR)); + rc = RegSetValueEx(hKey, L"DeviceDesc", 0, REG_SZ, (const BYTE *)SelectedDriver->Info.Description, (wcslen(SelectedDriver->Info.Description) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, L"Mfg", 0, REG_SZ, (const BYTE *)DriverInfo->Info.MfgName, (wcslen(DriverInfo->Info.MfgName) + 1) * sizeof(WCHAR)); + rc = RegSetValueEx(hKey, L"Mfg", 0, REG_SZ, (const BYTE *)SelectedDriver->Info.MfgName, (wcslen(SelectedDriver->Info.MfgName) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -5161,7 +5275,7 @@ } /* Start the device */ - if (!RebootRequired && !(Flags & (DI_NEEDRESTART | DI_NEEDREBOOT | DI_DONOTCALLCONFIGMG))) + if (!RebootRequired && !(InstallParams.Flags & (DI_NEEDRESTART | DI_NEEDREBOOT | DI_DONOTCALLCONFIGMG))) { PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData; NTSTATUS Status; _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-10-21 09:33:20 UTC (rev 18649) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-10-21 10:13:26 UTC (rev 18650) @@ -375,7 +375,7 @@ @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) @ stub SetupDiSetClassInstallParamsW @ stub SetupDiSetDeviceInstallParamsA -@ stub SetupDiSetDeviceInstallParamsW +@ stdcall SetupDiSetDeviceInstallParamsW(ptr ptr ptr) @ stub SetupDiSetDeviceRegistryPropertyA @ stub SetupDiSetDeviceRegistryPropertyW @ stub SetupDiSetDriverInstallParamsA

18 years, 12 months

← Newer
1
...
24
25
26
27
28
29
30
...
74
Older →

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 October 2005