Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[ion] 19033: - Implement RtlInitializeUnicodePrefix and RtlNextUnicodePrefix. The UnicodePrefix package is needed by MUP and NPFS drivers.

by ion＠svn.reactos.com

- Implement RtlInitializeUnicodePrefix and RtlNextUnicodePrefix. The UnicodePrefix package is needed by MUP and NPFS drivers. - Add some of the splay tree functions/macros to the NDK. Modified: trunk/reactos/include/ndk/ifssupp.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/lib/rtl/unicodeprefix.c _____ Modified: trunk/reactos/include/ndk/ifssupp.h --- trunk/reactos/include/ndk/ifssupp.h 2005-11-06 23:32:41 UTC (rev 19032) +++ trunk/reactos/include/ndk/ifssupp.h 2005-11-07 01:01:29 UTC (rev 19033) @@ -19,6 +19,13 @@ typedef PVOID PRTL_HEAP_PARAMETERS; +typedef struct _RTL_SPLAY_LINKS +{ + struct _RTL_SPLAY_LINKS *Parent; + struct _RTL_SPLAY_LINKS *LeftChild; + struct _RTL_SPLAY_LINKS *RightChild; +} RTL_SPLAY_LINKS, *PRTL_SPLAY_LINKS; + #if defined(USE_LPC6432) #define LPC_CLIENT_ID CLIENT_ID64 #define LPC_SIZE_T ULONGLONG _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-11-06 23:32:41 UTC (rev 19032) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-11-07 01:01:29 UTC (rev 19033) @@ -14,9 +14,69 @@ #include "extypes.h" #include "rtltypes.h" +/* MACROS ********************************************************************/ + +/* FIXME: Eventually move the ones in rtltypes.h here... */ + +/* + * Splay Tree Macros + */ +#define RtlIsLeftChild(Links) \ + (RtlLeftChild(RtlParent(Links)) == (PRTL_SPLAY_LINKS)(Links)) + +#define RtlIsRoot(Links) \ + (RtlParent(Links) == (PRTL_SPLAY_LINKS)(Links)) + +#define RtlLeftChild(Links) \ + (PRTL_SPLAY_LINKS)(Links)->LeftChild + +#define RtlParent(Links) \ + (PRTL_SPLAY_LINKS)(Links)->Parent + /* PROTOTYPES ****************************************************************/ /* + * Splay Tree Functions + */ +NTSYSAPI +PRTL_SPLAY_LINKS +NTAPI +RtlSplay(PRTL_SPLAY_LINKS Links); + +NTSYSAPI +PRTL_SPLAY_LINKS +NTAPI +RtlDelete(PRTL_SPLAY_LINKS Links); + +NTSYSAPI +VOID +NTAPI +RtlDeleteNoSplay( + PRTL_SPLAY_LINKS Links, + PRTL_SPLAY_LINKS *Root +); + +NTSYSAPI +PRTL_SPLAY_LINKS +NTAPI +RtlSubtreeSuccessor(PRTL_SPLAY_LINKS Links); + +NTSYSAPI +PRTL_SPLAY_LINKS +NTAPI +RtlSubtreePredecessor(PRTL_SPLAY_LINKS Links); + +NTSYSAPI +PRTL_SPLAY_LINKS +NTAPI +RtlRealSuccessor(PRTL_SPLAY_LINKS Links); + +NTSYSAPI +PRTL_SPLAY_LINKS +NTAPI +RtlRealPredecessor(PRTL_SPLAY_LINKS Links); + +/* * Error and Exception Functions */ NTSYSAPI _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-06 23:32:41 UTC (rev 19032) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 01:01:29 UTC (rev 19033) @@ -2,8 +2,8 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Unicode Prefix implementation - * FILE: lib/rtl/unicodeprfx.c - * PROGRAMMER: + * FILE: lib/rtl/unicodeprefix.c + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ /* INCLUDES *****************************************************************/ @@ -13,33 +13,62 @@ #define NDEBUG #include <debug.h> +/* + * FIXME: Try to find the official names and add to NDK + * Definitions come from fastfat driver. + */ +typedef USHORT NODE_TYPE_CODE; +#define PFX_NTC_TABLE ((NODE_TYPE_CODE)0x0800) +#define PFX_NTC_ROOT ((NODE_TYPE_CODE)0x0801) +#define PFX_NTC_CHILD ((NODE_TYPE_CODE)0x0802) +#define PFX_NTC_CASE_MATCH ((NODE_TYPE_CODE)0x0803) + /* FUNCTIONS ***************************************************************/ +/*STATIC*/ +ULONG +NTAPI +ComputeUnicodeNameLength(IN PUNICODE_STRING UnicodeName) +{ + ULONG Chars = UnicodeName->Length / sizeof(WCHAR); + ULONG i, NamesFound = 1; + + /* Loop the string */ + for (i = 0; i < (Chars - 1); i++) + { + /* Check if we found a backslash, meaning another name */ + if (UnicodeName->Buffer[i] == '\\') NamesFound++; + } + + /* Return the number of names found */ + return NamesFound; +} + /* * @unimplemented */ PUNICODE_PREFIX_TABLE_ENTRY NTAPI -RtlFindUnicodePrefix ( - PUNICODE_PREFIX_TABLE PrefixTable, - PUNICODE_STRING FullName, - ULONG CaseInsensitiveIndex - ) +RtlFindUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable, + PUNICODE_STRING FullName, + ULONG CaseInsensitiveIndex) { UNIMPLEMENTED; return 0; } /* -* @unimplemented +* @implemented */ VOID NTAPI -RtlInitializeUnicodePrefix ( - PUNICODE_PREFIX_TABLE PrefixTable - ) +RtlInitializeUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable) { - UNIMPLEMENTED; + /* Setup the table */ + PrefixTable->NameLength = 0; + PrefixTable->LastNextEntry = NULL; + PrefixTable->NodeTypeCode = PFX_NTC_TABLE; + PrefixTable->NextPrefixTree = (PUNICODE_PREFIX_TABLE_ENTRY)PrefixTable; } /* @@ -47,28 +76,95 @@ */ BOOLEAN NTAPI -RtlInsertUnicodePrefix ( - PUNICODE_PREFIX_TABLE PrefixTable, - PUNICODE_STRING Prefix, - PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry - ) +RtlInsertUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable, + PUNICODE_STRING Prefix, + PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry) { + /* + * implementation notes: + * - get name length (number of names) + * - init splay links + * - find a matching tree + * - if !found, insert a new NTC_ROOT entry and return TRUE; + * - if found, loop tree and compare strings: + * if equal, handle casematch/nomatch + * if greater or lesser equal, then add left/right childs accordingly + * - splay the tree + */ UNIMPLEMENTED; return FALSE; } /* -* @unimplemented +* @implemented */ PUNICODE_PREFIX_TABLE_ENTRY NTAPI -RtlNextUnicodePrefix ( - PUNICODE_PREFIX_TABLE PrefixTable, - BOOLEAN Restart - ) +RtlNextUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable, + BOOLEAN Restart) { - UNIMPLEMENTED; - return 0; + PRTL_SPLAY_LINKS SplayLinks; + PUNICODE_PREFIX_TABLE_ENTRY Entry; + PUNICODE_PREFIX_TABLE_ENTRY CaseMatchEntry; + + /* We might need this entry 2/3rd of the time, so cache it now */ + CaseMatchEntry = PrefixTable->LastNextEntry->CaseMatch; + + /* Check if this is a restart or if we don't have a last entry */ + if ((Restart) || !(PrefixTable->LastNextEntry)) + { + /* Get the next entry and validate it */ + Entry = PrefixTable->NextPrefixTree; + if (Entry->NodeTypeCode == PFX_NTC_TABLE) return NULL; + + /* Now get the Splay Tree Links */ + SplayLinks = &Entry->Links; + + /* Loop until we get the first node in the tree */ + while (RtlLeftChild(SplayLinks)) SplayLinks = RtlLeftChild(SplayLinks); + + /* Get the entry from it */ + Entry = CONTAINING_RECORD(SplayLinks, + UNICODE_PREFIX_TABLE_ENTRY, + Links); + } + else if (CaseMatchEntry->NodeTypeCode == PFX_NTC_CASE_MATCH) + { + /* If the last entry was a Case Match, then return it */ + Entry = CaseMatchEntry; + } + else + { + /* Find the successor */ + SplayLinks = RtlRealSuccessor(&CaseMatchEntry->Links); + if (!SplayLinks) + { + /* Didn't find one, we'll have to search the tree */ + SplayLinks = &PrefixTable->LastNextEntry->Links; + + /* Get the topmost node (root) */ + while (!RtlIsRoot(SplayLinks)) SplayLinks = RtlParent(SplayLinks); + Entry = CONTAINING_RECORD(SplayLinks, + UNICODE_PREFIX_TABLE_ENTRY, + Links); + + /* Get its tree and make sure somethign is in it */ + Entry = Entry->NextPrefixTree; + if (Entry->NameLength <= 0) return NULL; + + /* Select these new links and find the first node */ + while (RtlLeftChild(SplayLinks)) SplayLinks = RtlLeftChild(SplayLinks); + } + + /* Get the entry from it */ + Entry = CONTAINING_RECORD(SplayLinks, + UNICODE_PREFIX_TABLE_ENTRY, + Links); + } + + /* Save this entry as the last one returned, and return it */ + PrefixTable->LastNextEntry = Entry; + return Entry; } /* @@ -76,10 +172,8 @@ */ VOID NTAPI -RtlRemoveUnicodePrefix ( - PUNICODE_PREFIX_TABLE PrefixTable, - PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry - ) +RtlRemoveUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable, + PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry) { UNIMPLEMENTED; }

18 years, 10 months

[hpoussin] 19032: Add missing files to revision 19031

by hpoussin＠svn.reactos.com

Add missing files to revision 19031 Modified: trunk/reactos/lib/setupapi/En.rc Added: trunk/reactos/lib/setupapi/resource.h Modified: trunk/reactos/lib/setupapi/setupapi.rc Modified: trunk/reactos/lib/setupapi/setupapi_private.h _____ Modified: trunk/reactos/lib/setupapi/En.rc --- trunk/reactos/lib/setupapi/En.rc 2005-11-06 23:23:45 UTC (rev 19031) +++ trunk/reactos/lib/setupapi/En.rc 2005-11-06 23:32:41 UTC (rev 19032) @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION @@ -32,3 +32,9 @@ LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_QUERY_REBOOT_TEXT "Your computer needs to be rebooted to finish installation. Do you want to proceed?" + IDS_QUERY_REBOOT_CAPTION "Reboot" +END _____ Added: trunk/reactos/lib/setupapi/resource.h --- trunk/reactos/lib/setupapi/resource.h 2005-11-06 23:23:45 UTC (rev 19031) +++ trunk/reactos/lib/setupapi/resource.h 2005-11-06 23:32:41 UTC (rev 19032) @@ -0,0 +1,7 @@ +#define IDS_QUERY_REBOOT_TEXT 1 +#define IDS_QUERY_REBOOT_CAPTION 2 + +#define COPYFILEDLGORD 1000 +#define SOURCESTRORD 500 +#define DESTSTRORD 501 +#define PROGRESSORD 502 Property changes on: trunk/reactos/lib/setupapi/resource.h ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/setupapi.rc --- trunk/reactos/lib/setupapi/setupapi.rc 2005-11-06 23:23:45 UTC (rev 19031) +++ trunk/reactos/lib/setupapi/setupapi.rc 2005-11-06 23:32:41 UTC (rev 19032) @@ -18,11 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "setupapi_private.h" +#include <windows.h> +#include "resource.h" #include "Bg.rc" #include "Cs.rc" _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-06 23:23:45 UTC (rev 19031) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-06 23:32:41 UTC (rev 19032) @@ -139,11 +139,6 @@ LIST_ENTRY ListHead; /* List of struct DeviceInfoElement */ }; -#define COPYFILEDLGORD 1000 -#define SOURCESTRORD 500 -#define DESTSTRORD 501 -#define PROGRESSORD 502 - extern HINSTANCE hInstance; #define RC_STRING_MAX_SIZE 256

18 years, 10 months

[hpoussin] 19031: - Fix header mess by using a common header setupapi_private.h

by hpoussin＠svn.reactos.com

- Fix header mess by using a common header setupapi_private.h - Move some structure definitions from devinst.c to setupapi_private.h Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/dirid.c Modified: trunk/reactos/lib/setupapi/diskspace.c Modified: trunk/reactos/lib/setupapi/infparse.c Modified: trunk/reactos/lib/setupapi/install.c Modified: trunk/reactos/lib/setupapi/misc.c Modified: trunk/reactos/lib/setupapi/parser.c Modified: trunk/reactos/lib/setupapi/queue.c Modified: trunk/reactos/lib/setupapi/rpc.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h Modified: trunk/reactos/lib/setupapi/setupcab.c Modified: trunk/reactos/lib/setupapi/stringtable.c Modified: trunk/reactos/lib/setupapi/stubs.c Modified: trunk/reactos/lib/setupapi/virtcopy.c _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -19,25 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "setupapi.h" -#include "cfgmgr32.h" #include "setupapi_private.h" -#include "rpc.h" -#include "rpc_private.h" - -#include "pnp_c.h" - -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* Registry key and value names */ _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -19,23 +19,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> - -#include <windows.h> -#include "setupapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "cfgmgr32.h" -#include "initguid.h" -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - +#define INITGUID #include "setupapi_private.h" - WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* Unicode constants */ @@ -87,8 +73,6 @@ IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN OUT PCOINSTALLER_CONTEXT_DATA Context); -#define SETUP_DEV_INFO_SET_MAGIC 0xd00ff057 - struct CoInstallerElement { LIST_ENTRY ListEntry; @@ -99,105 +83,6 @@ PVOID PrivateData; }; -struct DeviceInterface /* Element of DeviceInfoElement.InterfaceListHead */ -{ - LIST_ENTRY ListEntry; - - struct DeviceInfoElement* DeviceInfo; - GUID InterfaceClassGuid; - - - /* SPINT_ACTIVE : the interface is active/enabled - * SPINT_DEFAULT: the interface is the default interface for the device class FIXME??? - * SPINT_REMOVED: the interface is removed - */ - DWORD Flags; - - WCHAR SymbolicLink[0]; /* \\?\ACPI#PNP0501#4&2658d0a0&0#{GUID} */ -}; - -/* We don't want to open the .inf file to read only one information in it, so keep a handle to it once it - * has been already loaded once. Keep also a reference counter */ -struct InfFileDetails -{ - HINF hInf; - LONG References; -}; - -struct DriverInfoElement /* Element of DeviceInfoSet.DriverListHead and DeviceInfoElement.DriverListHead */ -{ - LIST_ENTRY ListEntry; - - DWORD DriverRank; - SP_DRVINFO_DATA_V2_W Info; - SP_DRVINFO_DETAIL_DATA_W Details; - GUID ClassGuid; - LPWSTR MatchingId; - struct InfFileDetails *InfFileDetails; -}; - -struct DeviceInfoElement /* Element of DeviceInfoSet.ListHead */ -{ - LIST_ENTRY ListEntry; - - /* Reserved Field points to a struct DriverInfoElement */ - SP_DEVINSTALL_PARAMS_W InstallParams; - - /* Information about devnode: - * - DeviceName: - * "Root\*PNP0501" for example. - * It doesn't contain the unique ID for the device - * (points into the Data field at the end of the structure) - * WARNING: no NULL char exist between DeviceName and UniqueId - * in Data field! - * - UniqueId - * "5&1be2108e&0" or "0000" - * If DICD_GENERATE_ID is specified in creation flags, - * this unique ID is autogenerated using 4 digits, base 10 - * (points into the Data field at the end of the structure) - * - DeviceDescription - * String which identifies the device. Can be NULL. If not NULL, - * points into the Data field at the end of the structure - * - ClassGuid - * Identifies the class of this device. FIXME: can it be GUID_NULL? - * - CreationFlags - * Is a combination of: - * - DICD_GENERATE_ID - * the unique ID needs to be generated - * - DICD_INHERIT_CLASSDRVS - * inherit driver of the device info set (== same pointer) - */ - PCWSTR DeviceName; - PCWSTR UniqueId; - PCWSTR DeviceDescription; - GUID ClassGuid; - DWORD CreationFlags; - - /* 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 */ - - /* List of interfaces implemented by this device */ - LIST_ENTRY InterfaceListHead; /* List of struct DeviceInterface */ - - WCHAR Data[0]; -}; - -struct DeviceInfoSet /* HDEVINFO */ -{ - DWORD magic; /* SETUP_DEV_INFO_SET_MAGIC */ - GUID ClassGuid; /* If != GUID_NULL, only devices of this class can be in the device info set */ - HKEY HKLM; /* Local or distant HKEY_LOCAL_MACHINE registry key */ - - /* 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 */ - - LIST_ENTRY ListHead; /* List of struct DeviceInfoElement */ -}; - /*********************************************************************** * SetupDiBuildClassInfoList (SETUPAPI.@) */ @@ -5465,6 +5350,10 @@ { BOOL ret = FALSE; + TRACE("%p %p %p %p %lu %p\n", DeviceInfoSet, DeviceInfoData, + DriverInfoData, DriverInfoDetailData, + DriverInfoDetailDataSize, RequiredSize); + if (!DeviceInfoSet) SetLastError(ERROR_INVALID_PARAMETER); else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) @@ -5482,7 +5371,7 @@ else if (DriverInfoDetailData && DriverInfoDetailData->cbSize != sizeof(SP_DRVINFO_DETAIL_DATA_W)) SetLastError(ERROR_INVALID_USER_BUFFER); else if (DriverInfoDetailData && DriverInfoDetailData->Reserved == 0) - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_NO_DRIVER_SELECTED); else { struct DriverInfoElement *driverInfoElement; _____ Modified: trunk/reactos/lib/setupapi/dirid.c --- trunk/reactos/lib/setupapi/dirid.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/dirid.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -18,21 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winternl.h" -#include "winerror.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "setupapi.h" -#include "shlobj.h" -#include "wine/unicode.h" #include "setupapi_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); _____ Modified: trunk/reactos/lib/setupapi/diskspace.c --- trunk/reactos/lib/setupapi/diskspace.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/diskspace.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -18,17 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdarg.h> +#include "setupapi_private.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "setupapi.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(setupapi); typedef struct { _____ Modified: trunk/reactos/lib/setupapi/infparse.c --- trunk/reactos/lib/setupapi/infparse.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/infparse.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -25,20 +25,7 @@ * (IpSaveRestorePosition, IpFindNextMatchLine, ...). */ -#include <stdarg.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winternl.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "setupapi.h" -#include "setupx16.h" #include "setupapi_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/install.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -18,20 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winternl.h" -#include "winerror.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "setupapi.h" #include "setupapi_private.h" -#include "wine/unicode.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); _____ Modified: trunk/reactos/lib/setupapi/misc.c --- trunk/reactos/lib/setupapi/misc.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/misc.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -18,24 +18,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "setupapi.h" - -#include "wine/unicode.h" -#include "wine/debug.h" - #include "setupapi_private.h" - WINE_DEFAULT_DEBUG_CHANNEL(setupapi); - /*********************************************************************** *** * MyFree [SETUPAPI.@] * _____ Modified: trunk/reactos/lib/setupapi/parser.c --- trunk/reactos/lib/setupapi/parser.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/parser.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -19,30 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" -#include "wine/port.h" - -#include <assert.h> -#include <limits.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "winternl.h" -#include "winerror.h" -#include "cfgmgr32.h" -#include "setupapi.h" #include "setupapi_private.h" -#include "wine/unicode.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* Unicode constants */ _____ Modified: trunk/reactos/lib/setupapi/queue.c --- trunk/reactos/lib/setupapi/queue.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/queue.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -18,21 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winternl.h" -#include "winerror.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "setupapi.h" -#include "wine/unicode.h" #include "setupapi_private.h" -#include "winver.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); _____ Modified: trunk/reactos/lib/setupapi/rpc.c --- trunk/reactos/lib/setupapi/rpc.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/rpc.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -18,12 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <windows.h> -#include <rpc.h> -#include <rpcdce.h> -#include <setupapi.h> -#include "rpc_private.h" +#include "setupapi_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(setupapi); static RPC_BINDING_HANDLE LocalBindingHandle = NULL; static HSTRING_TABLE LocalStringTable = NULL; _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-06 23:23:45 UTC (rev 19031) @@ -1,5 +1,6 @@ /* * Copyright 2001 Andreas Mohr + * Copyright 2005 HervÚ Poussineau * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,11 +20,132 @@ #ifndef __SETUPAPI_PRIVATE_H #define __SETUPAPI_PRIVATE_H +#include <assert.h> +#include <fcntl.h> +#include <share.h> + +#include <windows.h> +#include <cfgmgr32.h> +#include <fdi.h> +#include <setupapi.h> +#include <shlobj.h> +#include <wine/debug.h> +#include <wine/unicode.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +#include <pnp_c.h> +#include "rpc_private.h" +#include "resource.h" + +#define SETUP_DEV_INFO_SET_MAGIC 0xd00ff057 + +struct DeviceInterface /* Element of DeviceInfoElement.InterfaceListHead */ +{ + LIST_ENTRY ListEntry; + + struct DeviceInfoElement* DeviceInfo; + GUID InterfaceClassGuid; + + + /* SPINT_ACTIVE : the interface is active/enabled + * SPINT_DEFAULT: the interface is the default interface for the device class FIXME??? + * SPINT_REMOVED: the interface is removed + */ + DWORD Flags; + + WCHAR SymbolicLink[0]; /* \\?\ACPI#PNP0501#4&2658d0a0&0#{GUID} */ +}; + +/* We don't want to open the .inf file to read only one information in it, so keep a handle to it once it + * has been already loaded once. Keep also a reference counter */ +struct InfFileDetails +{ + HINF hInf; + LONG References; +}; + +struct DriverInfoElement /* Element of DeviceInfoSet.DriverListHead and DeviceInfoElement.DriverListHead */ +{ + LIST_ENTRY ListEntry; + + DWORD DriverRank; + SP_DRVINFO_DATA_V2_W Info; + SP_DRVINFO_DETAIL_DATA_W Details; + GUID ClassGuid; + LPWSTR MatchingId; + struct InfFileDetails *InfFileDetails; +}; + +struct DeviceInfoElement /* Element of DeviceInfoSet.ListHead */ +{ + LIST_ENTRY ListEntry; + + /* Reserved Field points to a struct DriverInfoElement */ + SP_DEVINSTALL_PARAMS_W InstallParams; + + /* Information about devnode: + * - DeviceName: + * "Root\*PNP0501" for example. + * It doesn't contain the unique ID for the device + * (points into the Data field at the end of the structure) + * WARNING: no NULL char exist between DeviceName and UniqueId + * in Data field! + * - UniqueId + * "5&1be2108e&0" or "0000" + * If DICD_GENERATE_ID is specified in creation flags, + * this unique ID is autogenerated using 4 digits, base 10 + * (points into the Data field at the end of the structure) + * - DeviceDescription + * String which identifies the device. Can be NULL. If not NULL, + * points into the Data field at the end of the structure + * - ClassGuid + * Identifies the class of this device. FIXME: can it be GUID_NULL? + * - CreationFlags + * Is a combination of: + * - DICD_GENERATE_ID + * the unique ID needs to be generated + * - DICD_INHERIT_CLASSDRVS + * inherit driver of the device info set (== same pointer) + */ + PCWSTR DeviceName; + PCWSTR UniqueId; + PCWSTR DeviceDescription; + GUID ClassGuid; + DWORD CreationFlags; + + /* 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 */ + + /* List of interfaces implemented by this device */ + LIST_ENTRY InterfaceListHead; /* List of struct DeviceInterface */ + + WCHAR Data[0]; +}; + +struct DeviceInfoSet /* HDEVINFO */ +{ + DWORD magic; /* SETUP_DEV_INFO_SET_MAGIC */ + GUID ClassGuid; /* If != GUID_NULL, only devices of this class can be in the device info set */ + HKEY HKLM; /* Local or distant HKEY_LOCAL_MACHINE registry key */ + + /* 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 */ + + LIST_ENTRY ListHead; /* List of struct DeviceInfoElement */ +}; + #define COPYFILEDLGORD 1000 #define SOURCESTRORD 500 #define DESTSTRORD 501 #define PROGRESSORD 502 +extern HINSTANCE hInstance; +#define RC_STRING_MAX_SIZE 256 #define REG_INSTALLEDFILES "System\\CurrentControlSet\\Control\\InstalledFiles" #define REGPART_RENAME "\\Rename" _____ Modified: trunk/reactos/lib/setupapi/setupcab.c --- trunk/reactos/lib/setupapi/setupcab.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/setupcab.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -23,27 +23,8 @@ * */ -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "setupapi.h" #include "setupapi_private.h" -#include "fdi.h" -#include "wine/unicode.h" -#include "fcntl.h" -#include "share.h" - -#include "wine/debug.h" - HINSTANCE hInstance = 0; OSVERSIONINFOW OsVersionInfo; _____ Modified: trunk/reactos/lib/setupapi/stringtable.c --- trunk/reactos/lib/setupapi/stringtable.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/stringtable.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -18,18 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdarg.h> +#include "setupapi_private.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "setupapi.h" - -#include "wine/debug.h" - - #define TABLE_DEFAULT_SIZE 256 WINE_DEFAULT_DEBUG_CHANNEL(setupapi); _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/stubs.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -18,17 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdarg.h> +#include "setupapi_private.h" -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "setupapi.h" - WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /*********************************************************************** _____ Modified: trunk/reactos/lib/setupapi/virtcopy.c --- trunk/reactos/lib/setupapi/virtcopy.c 2005-11-06 18:21:00 UTC (rev 19030) +++ trunk/reactos/lib/setupapi/virtcopy.c 2005-11-06 23:23:45 UTC (rev 19031) @@ -21,19 +21,7 @@ * This is bad ! We ought to have 16bit resource handling working. */ -#include <stdarg.h> -#include <string.h> -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "wownt32.h" -#include "wingdi.h" -#include "winnls.h" -#include "setupapi.h" -#include "setupx16.h" #include "setupapi_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

18 years, 10 months

[ekohl] 19030: - Read a services optional display name from the registry.

by ekohl＠svn.reactos.com

- Read a services optional display name from the registry. - Fix return size bugs in GetServiceDisplayNameW and GetServiceKeyNameW. Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/database.c Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-11-06 17:58:08 UTC (rev 19029) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-11-06 18:21:00 UTC (rev 19030) @@ -592,6 +592,8 @@ return FALSE; } + (*lpcchBuffer)--; + return TRUE; } @@ -644,6 +646,8 @@ return FALSE; } + (*lpcchBuffer)--; + return TRUE; } _____ Modified: trunk/reactos/subsys/system/services/database.c --- trunk/reactos/subsys/system/services/database.c 2005-11-06 17:58:08 UTC (rev 19029) +++ trunk/reactos/subsys/system/services/database.c 2005-11-06 18:21:00 UTC (rev 19030) @@ -123,7 +123,7 @@ { PSERVICE_GROUP Group; - DPRINT("IopGetGroupOrderList(%S, %x, %x, %x, %x, %x)\n", + DPRINT("CreateGroupOrderListRoutine(%S, %x, %x, %x, %x, %x)\n", ValueName, ValueType, ValueData, ValueLength, Context, EntryContext); if (ValueType == REG_BINARY && @@ -253,6 +253,7 @@ HKEY hServiceKey) { PSERVICE lpService = NULL; + LPWSTR lpDisplayName = NULL; LPWSTR lpGroup = NULL; DWORD dwSize; DWORD dwError; @@ -326,6 +327,14 @@ DPRINT("Group: %S\n", lpGroup); + dwError = ScmReadString(hServiceKey, + L"DisplayName", + &lpDisplayName); + if (dwError != ERROR_SUCCESS) + lpDisplayName = NULL; + + DPRINT("Display name: %S\n", lpDisplayName); + dwError = ScmCreateNewServiceRecord(lpServiceName, &lpService); if (dwError != ERROR_SUCCESS) @@ -342,6 +351,12 @@ lpGroup = NULL; } + if (lpDisplayName != NULL) + { + lpService->lpDisplayName = lpDisplayName; + lpDisplayName = NULL; + } + DPRINT("ServiceName: '%S'\n", lpService->lpServiceName); DPRINT("Group: '%S'\n", lpService->lpServiceGroup); DPRINT("Start %lx Type %lx Tag %lx ErrorControl %lx\n", @@ -357,6 +372,9 @@ if (lpGroup != NULL) HeapFree(GetProcessHeap(), 0, lpGroup); + if (lpDisplayName != NULL) + HeapFree(GetProcessHeap(), 0, lpDisplayName); + return dwError; } @@ -456,6 +474,8 @@ RegCloseKey(hServicesKey); + /* FIXME: Delete services that are marked for delete */ + DPRINT("ScmCreateServiceDatabase() done\n"); return ERROR_SUCCESS; _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-11-06 17:58:08 UTC (rev 19029) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-11-06 18:21:00 UTC (rev 19030) @@ -969,10 +969,10 @@ return ERROR_SERVICE_DOES_NOT_EXIST; } - dwLength = wcslen(lpService->lpDisplayName); + dwLength = wcslen(lpService->lpDisplayName) + 1; if (lpDisplayName != NULL && - *lpcchBuffer > dwLength) + *lpcchBuffer >= dwLength) { wcscpy(lpDisplayName, lpService->lpDisplayName); } @@ -1019,10 +1019,10 @@ return ERROR_SERVICE_DOES_NOT_EXIST; } - dwLength = wcslen(lpService->lpServiceName); + dwLength = wcslen(lpService->lpServiceName) + 1; if (lpServiceName != NULL && - *lpcchBuffer > dwLength) + *lpcchBuffer >= dwLength) { wcscpy(lpServiceName, lpService->lpServiceName); }

18 years, 10 months

[turner] 19029: make the output visually pleasing.

by turner＠svn.reactos.com

make the output visually pleasing. Modified: trunk/reactos/subsys/system/cmd/seta_test.cmd _____ Modified: trunk/reactos/subsys/system/cmd/seta_test.cmd --- trunk/reactos/subsys/system/cmd/seta_test.cmd 2005-11-06 16:11:01 UTC (rev 19028) +++ trunk/reactos/subsys/system/cmd/seta_test.cmd 2005-11-06 17:58:08 UTC (rev 19029) @@ -1,4 +1,4 @@ -@rem echo off +@echo off @rem the next line reexecutes the script without params if it was called with params, else we'll get false failures @if not "%1"=="" seta_test.cmd @@ -11,74 +11,106 @@ if "1"=="2" goto failure if not "1"=="1" goto failure set /a a=1 +echo. if not "%a%"=="1" goto failure set /a b=a +echo. if not "%b%"=="1" goto failure set /a a=!5 +echo. if not "%a%"=="0" goto failure set /a a=!a +echo. if not "%a%"=="1" goto failure set /a a=~5 +echo. if not "%a%"=="-6" goto failure set /a a=5,a=-a +echo. if not "%a%"=="-5" goto failure set /a a=5*7 +echo. if not "%a%"=="35" goto failure set /a a=2000/10 +echo. if not "%a%"=="200" goto failure set /a a=42%%9 +echo. if not "%a%"=="6" goto failure set /a a=5%2 +echo. if not "%a%"=="5" goto failure set /a a=42^%13 +echo. if not "%a%"=="423" goto failure set /a a=7+9 +echo. if not "%a%"=="16" goto failure set /a a=9-7 +echo. if not "%a%"=="2" goto failure set /a a=9^<^<2 +echo. if not "%a%"=="36" goto failure set /a a=36^>^>2 +echo. if not "%a%"=="9" goto failure set /a a=42^&9 +echo. if not "%a%"=="8" goto failure set /a a=32^9 +echo. if not "%a%"=="329" goto failure set /a a=32^^9 +echo. if not "%a%"=="41" goto failure set /a a=10^|22 +echo. if not "%a%"=="30" goto failure set /a a=2,a*=3 +echo. if not "%a%"=="6" goto failure set /a a=11,a/=2 +echo. if not "%a%"=="5" goto failure set /a a=42,a%%=9 +echo. if not "%a%"=="6" goto failure set /a a=7,a+=9 +echo. if not "%a%"=="16" goto failure set /a a=9,a-=7 +echo. if not "%a%"=="2" goto failure set /a a=42,a^&=9 +echo. if not "%a%"=="8" goto failure set /a a=32,a^^=9 +echo. if not "%a%"=="41" goto failure set /a a=10,a^|=22 +echo. if not "%a%"=="30" goto failure set /a a=9,a^<^<=2 +echo. if not "%a%"=="36" goto failure set /a a=36,a^>^>=2 +echo. if not "%a%"=="9" goto failure set /a a=1,2 +echo. if not "%a%"=="1" goto failure set /a a=(a=1,a+2) +echo. if "%a%"=="3" goto success goto failure :success echo SUCCESS! +echo. goto done :failure echo FAILURE! remove the echo off and see the last formula that executed before this line - +echo. :done

18 years, 10 months

[turner] 19028: %foo% where foo is not a envir var should be returned as %foo% not as "".

by turner＠svn.reactos.com

%foo% where foo is not a envir var should be returned as %foo% not as "". Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-11-06 13:30:42 UTC (rev 19027) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-11-06 16:11:01 UTC (rev 19028) @@ -1175,7 +1175,9 @@ return ret; } - return _T(""); /* not found - return empty string */ + GrowIfNecessary(_tcslen(varName) + 2, &ret, &retlen); + _stprintf(ret,_T("%%%s%%"),varName); + return ret; /* not found - return orginal string */ } LPCTSTR

18 years, 10 months

[gedmurphy] 19027: couple of fixes to get it building under mingw

by gedmurphy＠svn.reactos.com

couple of fixes to get it building under mingw Modified: trunk/reactos/subsys/system/sc/query.c Modified: trunk/reactos/subsys/system/sc/sc.c Modified: trunk/reactos/subsys/system/sc/sc.xml _____ Modified: trunk/reactos/subsys/system/sc/query.c --- trunk/reactos/subsys/system/sc/query.c 2005-11-06 11:56:56 UTC (rev 19026) +++ trunk/reactos/subsys/system/sc/query.c 2005-11-06 13:30:42 UTC (rev 19027) @@ -13,7 +13,7 @@ /* local function decs */ VOID PrintService(BOOL bExtended); -INT EnumServices(DWORD ServiceType, DWORD ServiceState); +BOOL EnumServices(DWORD ServiceType, DWORD ServiceState); /* global variables */ static ENUM_SERVICE_STATUS_PROCESS *pServiceStatus = NULL; @@ -88,13 +88,15 @@ /* print default values */ PrintService(bExtended); } + + return TRUE; } -INT EnumServices(DWORD ServiceType, DWORD ServiceState) +BOOL EnumServices(DWORD ServiceType, DWORD ServiceState) { - SC_HANDLE hSc; + //SC_HANDLE hSc; DWORD BufSize = 0; DWORD BytesNeeded = 0; DWORD NumServices = 0; @@ -144,6 +146,8 @@ return FALSE; } } + + return TRUE; } _____ Modified: trunk/reactos/subsys/system/sc/sc.c --- trunk/reactos/subsys/system/sc/sc.c 2005-11-06 11:56:56 UTC (rev 19026) +++ trunk/reactos/subsys/system/sc/sc.c 2005-11-06 13:30:42 UTC (rev 19027) @@ -62,7 +62,7 @@ hSCManager = OpenSCManager(MachineName, NULL, SC_MANAGER_ALL_ACCESS); if (hSCManager == NULL) { - _tprintf(_T("[SC] OpenSCManager FAILED %d:\n\n"), GetLastError()); + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); ReportLastError(); return -1; } @@ -134,7 +134,7 @@ } -int _tmain(DWORD argc, LPCTSTR argv[]) +int _tmain(int argc, LPCTSTR argv[]) { LPTSTR MachineName = NULL; // remote machine LPCTSTR Command = NULL; // sc command _____ Modified: trunk/reactos/subsys/system/sc/sc.xml --- trunk/reactos/subsys/system/sc/sc.xml 2005-11-06 11:56:56 UTC (rev 19026) +++ trunk/reactos/subsys/system/sc/sc.xml 2005-11-06 13:30:42 UTC (rev 19027) @@ -3,8 +3,11 @@ <define name="DEFINE_GUID" /> <library>kernel32</library> <file>sc.c</file> - <file>manage.c</file> + <file>start.c</file> <file>query.c</file> + <file>control.c</file> + <file>create.c</file> + <file>delete.c</file> <file>usage.c</file> <file>sc.rc</file> </module>

18 years, 10 months

[ekohl] 19026: - Rewrote the code that reads the service configuration from the registry because it was not flexible enough with respect to the handling of default values.

by ekohl＠svn.reactos.com

- Rewrote the code that reads the service configuration from the registry because it was not flexible enough with respect to the handling of default values. - Read delete flag from the registry. Modified: trunk/reactos/subsys/system/services/config.c Modified: trunk/reactos/subsys/system/services/database.c Modified: trunk/reactos/subsys/system/services/rpcserver.c Modified: trunk/reactos/subsys/system/services/services.c Modified: trunk/reactos/subsys/system/services/services.h _____ Modified: trunk/reactos/subsys/system/services/config.c --- trunk/reactos/subsys/system/services/config.c 2005-11-06 10:48:14 UTC (rev 19025) +++ trunk/reactos/subsys/system/services/config.c 2005-11-06 11:56:56 UTC (rev 19026) @@ -43,6 +43,51 @@ DWORD +ScmCreateServiceKey(LPWSTR lpServiceName, + REGSAM samDesired, + PHKEY phKey) +{ + HKEY hServicesKey = NULL; + DWORD dwDisposition; + DWORD dwError; + + *phKey = NULL; + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + KEY_READ | KEY_CREATE_SUB_KEY, + &hServicesKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwError = RegCreateKeyExW(hServicesKey, + lpServiceName, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + samDesired, + NULL, + phKey, + &dwDisposition); +#if 0 + if ((dwError == ERROR_SUCCESS) && + (dwDisposition == REG_OPENED_EXISTING_KEY)) + { + RegCloseKey(*phKey); + *phKey = NULL; + dwError = ERROR_SERVICE_EXISTS; + } +#endif + + RegCloseKey(hServicesKey); + + return dwError; +} + + + +DWORD ScmWriteDependencies(HKEY hServiceKey, LPWSTR lpDependencies, DWORD dwDependenciesLength) @@ -130,5 +175,106 @@ return dwError; } + +DWORD +ScmMarkServiceForDelete(PSERVICE pService) +{ + HKEY hServiceKey = NULL; + DWORD dwValue = 1; + DWORD dwError; + + DPRINT("ScmMarkServiceForDelete() called\n"); + + dwError = ScmOpenServiceKey(pService->lpServiceName, + KEY_WRITE, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwError = RegSetValueExW(hServiceKey, + L"DeleteFlag", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(DWORD)); + + RegCloseKey(hServiceKey); + + return dwError; +} + + +BOOL +ScmIsDeleteFlagSet(HKEY hServiceKey) +{ + DWORD dwError; + DWORD dwType; + DWORD dwFlag; + DWORD dwSize = sizeof(DWORD); + + dwError = RegQueryValueExW(hServiceKey, + L"DeleteFlag", + 0, + &dwType, + (LPBYTE)&dwFlag, + &dwSize); + + return (dwError == ERROR_SUCCESS); +} + + +DWORD +ScmReadString(HKEY hServiceKey, + LPWSTR lpValueName, + LPWSTR *lpValue) +{ + DWORD dwError; + DWORD dwSize; + DWORD dwType; + LPBYTE ptr = NULL; + + *lpValue = NULL; + + dwSize = 0; + dwError = RegQueryValueExW(hServiceKey, + lpValueName, + 0, + &dwType, + NULL, + &dwSize); + if (dwError != ERROR_SUCCESS) + return dwError; + + ptr = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (ptr == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + dwError = RegQueryValueExW(hServiceKey, + lpValueName, + 0, + &dwType, + ptr, + &dwSize); + if (dwError != ERROR_SUCCESS) + goto done; + + if (dwType == REG_EXPAND_SZ) + { + /* FIXME: ... */ + DPRINT1("Expand me!\n"); + *lpValue = (LPWSTR)ptr; + } + else + { + *lpValue = (LPWSTR)ptr; + } + +done:; + if (dwError != ERROR_SUCCESS) + HeapFree(GetProcessHeap(), 0, ptr); + + return dwError; +} + /* EOF */ _____ Modified: trunk/reactos/subsys/system/services/database.c --- trunk/reactos/subsys/system/services/database.c 2005-11-06 10:48:14 UTC (rev 19025) +++ trunk/reactos/subsys/system/services/database.c 2005-11-06 11:56:56 UTC (rev 19026) @@ -211,89 +211,6 @@ } -static NTSTATUS STDCALL -CreateServiceListEntry(LPWSTR lpServiceName) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[6]; - PSERVICE Service = NULL; - NTSTATUS Status; - - DPRINT("Service: '%S'\n", lpServiceName); - - - /* Allocate service entry */ - Service = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(SERVICE) + ((wcslen(lpServiceName) + 1) * sizeof(WCHAR))); - if (Service == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Copy service name */ - wcscpy(Service->szServiceName, lpServiceName); - Service->lpServiceName = Service->szServiceName; - Service->lpDisplayName = Service->lpServiceName; - - /* Get service data */ - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].Name = L"Start"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[0].EntryContext = &Service->dwStartType; - - QueryTable[1].Name = L"Type"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[1].EntryContext = &Service->Status.dwServiceType; - - QueryTable[2].Name = L"ErrorControl"; - QueryTable[2].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[2].EntryContext = &Service->dwErrorControl; - - QueryTable[3].Name = L"Group"; - QueryTable[3].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[3].EntryContext = &Service->ServiceGroup; - - QueryTable[4].Name = L"Tag"; - QueryTable[4].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[4].EntryContext = &Service->dwTag; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, - lpServiceName, - QueryTable, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - PrintString("RtlQueryRegistryValues() failed (Status %lx)\n", Status); - HeapFree(GetProcessHeap(), 0, Service); - return Status; - } - - DPRINT("ServiceName: '%S'\n", Service->lpServiceName); - DPRINT("ServiceGroup: '%wZ'\n", &Service->ServiceGroup); - DPRINT("Start %lx Type %lx Tag %lx ErrorControl %lx\n", - Service->dwStartType, - Service->Status.dwServiceType, - Service->dwTag, - Service->dwErrorControl); - - /* Append service entry */ - InsertTailList(&ServiceListHead, - &Service->ServiceListEntry); - - Service->Status.dwCurrentState = SERVICE_STOPPED; - Service->Status.dwControlsAccepted = 0; - Service->Status.dwWin32ExitCode = 0; - Service->Status.dwServiceSpecificExitCode = 0; - Service->Status.dwCheckPoint = 0; - Service->Status.dwWaitHint = 2000; /* 2 seconds */ - - return STATUS_SUCCESS; -} - - DWORD ScmCreateNewServiceRecord(LPWSTR lpServiceName, PSERVICE *lpServiceRecord) @@ -331,31 +248,127 @@ } -NTSTATUS -ScmCreateServiceDataBase(VOID) +static DWORD +CreateServiceListEntry(LPWSTR lpServiceName, + HKEY hServiceKey) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING ServicesKeyName = - RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Se rvices"); - UNICODE_STRING SubKeyName; - HKEY ServicesKey; - ULONG Index; - NTSTATUS Status; + PSERVICE lpService = NULL; + LPWSTR lpGroup = NULL; + DWORD dwSize; + DWORD dwError; + DWORD dwServiceType; + DWORD dwStartType; + DWORD dwErrorControl; + DWORD dwTagId; - PKEY_BASIC_INFORMATION KeyInfo = NULL; - ULONG KeyInfoLength = 0; - ULONG ReturnedLength; + DPRINT("Service: '%S'\n", lpServiceName); + if (*lpServiceName == L'{') + return ERROR_SUCCESS; - DPRINT("ScmCreateServiceDataBase() called\n"); + dwSize = sizeof(DWORD); + dwError = RegQueryValueExW(hServiceKey, + L"Type", + NULL, + NULL, + (LPBYTE)&dwServiceType, + &dwSize); + if (dwError != ERROR_SUCCESS) + return ERROR_SUCCESS; - /* Initialize basic variables */ - InitializeListHead(&GroupListHead); - InitializeListHead(&ServiceListHead); + if (((dwServiceType & ~SERVICE_INTERACTIVE_PROCESS) != SERVICE_WIN32_OWN_PROCESS) && + ((dwServiceType & ~SERVICE_INTERACTIVE_PROCESS) != SERVICE_WIN32_SHARE_PROCESS) && + (dwServiceType != SERVICE_KERNEL_DRIVER) && + (dwServiceType != SERVICE_FILE_SYSTEM_DRIVER)) + return ERROR_SUCCESS; - /* Initialize the database lock */ - RtlInitializeResource(&DatabaseLock); + DPRINT("Service type: %lx\n", dwServiceType); + dwSize = sizeof(DWORD); + dwError = RegQueryValueExW(hServiceKey, + L"Start", + NULL, + NULL, + (LPBYTE)&dwStartType, + &dwSize); + if (dwError != ERROR_SUCCESS) + return ERROR_SUCCESS; + + DPRINT("Start type: %lx\n", dwStartType); + + dwSize = sizeof(DWORD); + dwError = RegQueryValueExW(hServiceKey, + L"ErrorControl", + NULL, + NULL, + (LPBYTE)&dwErrorControl, + &dwSize); + if (dwError != ERROR_SUCCESS) + return ERROR_SUCCESS; + + DPRINT("Error control: %lx\n", dwErrorControl); + + dwError = RegQueryValueExW(hServiceKey, + L"Tag", + NULL, + NULL, + (LPBYTE)&dwTagId, + &dwSize); + if (dwError != ERROR_SUCCESS) + dwTagId = 0; + + DPRINT("Tag: %lx\n", dwTagId); + + dwError = ScmReadString(hServiceKey, + L"Group", + &lpGroup); + if (dwError != ERROR_SUCCESS) + lpGroup = NULL; + + DPRINT("Group: %S\n", lpGroup); + + dwError = ScmCreateNewServiceRecord(lpServiceName, + &lpService); + if (dwError != ERROR_SUCCESS) + goto done; + + lpService->Status.dwServiceType = dwServiceType; + lpService->dwStartType = dwStartType; + lpService->dwErrorControl = dwErrorControl; + lpService->dwTag = dwTagId; + + if (lpGroup != NULL) + { + lpService->lpServiceGroup = lpGroup; + lpGroup = NULL; + } + + DPRINT("ServiceName: '%S'\n", lpService->lpServiceName); + DPRINT("Group: '%S'\n", lpService->lpServiceGroup); + DPRINT("Start %lx Type %lx Tag %lx ErrorControl %lx\n", + lpService->dwStartType, + lpService->Status.dwServiceType, + lpService->dwTag, + lpService->dwErrorControl); + + if (ScmIsDeleteFlagSet(hServiceKey)) + lpService->bDeleted = TRUE; + +done:; + if (lpGroup != NULL) + HeapFree(GetProcessHeap(), 0, lpGroup); + + return dwError; +} + + +DWORD +ScmReadGroupList(VOID) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NTSTATUS Status; + + InitializeListHead(&GroupListHead); + /* Build group order list */ RtlZeroMemory(&QueryTable, sizeof(QueryTable)); @@ -368,75 +381,84 @@ QueryTable, NULL, NULL); - if (!NT_SUCCESS(Status)) - return Status; - RtlInitUnicodeString(&ServicesKeyName, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services"); + return RtlNtStatusToDosError(Status); +} - InitializeObjectAttributes(&ObjectAttributes, - &ServicesKeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = RtlpNtOpenKey(&ServicesKey, - KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes, - 0); - if (!NT_SUCCESS(Status)) - return Status; +DWORD +ScmCreateServiceDatabase(VOID) +{ + WCHAR szSubKey[MAX_PATH]; + HKEY hServicesKey; + HKEY hServiceKey; + DWORD dwSubKey; + DWORD dwSubKeyLength; + FILETIME ftLastChanged; + DWORD dwError; - /* Allocate key info buffer */ - KeyInfoLength = sizeof(KEY_BASIC_INFORMATION) + MAX_PATH * sizeof(WCHAR); - KeyInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, KeyInfoLength); - if (KeyInfo == NULL) - { - NtClose(ServicesKey); - return STATUS_INSUFFICIENT_RESOURCES; - } + DPRINT("ScmCreateServiceDatabase() called\n"); - Index = 0; - while (TRUE) + dwError = ScmReadGroupList(); + if (dwError != ERROR_SUCCESS) + return dwError; + + /* Initialize basic variables */ + InitializeListHead(&ServiceListHead); + + /* Initialize the database lock */ + RtlInitializeResource(&DatabaseLock); + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + KEY_READ, + &hServicesKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwSubKey = 0; + for (;;) { - Status = NtEnumerateKey(ServicesKey, - Index, - KeyBasicInformation, - KeyInfo, - KeyInfoLength, - &ReturnedLength); - if (NT_SUCCESS(Status)) + dwSubKeyLength = MAX_PATH; + dwError = RegEnumKeyExW(hServicesKey, + dwSubKey, + szSubKey, + &dwSubKeyLength, + NULL, + NULL, + NULL, + &ftLastChanged); + if (dwError == ERROR_SUCCESS && + szSubKey[0] != L'{') { - if (KeyInfo->NameLength < MAX_PATH * sizeof(WCHAR)) + DPRINT("SubKeyName: '%S'\n", szSubKey); + + dwError = RegOpenKeyExW(hServicesKey, + szSubKey, + 0, + KEY_READ, + &hServiceKey); + if (dwError == ERROR_SUCCESS) { - SubKeyName.Length = KeyInfo->NameLength; - SubKeyName.MaximumLength = KeyInfo->NameLength + sizeof(WCHAR); - SubKeyName.Buffer = KeyInfo->Name; - SubKeyName.Buffer[SubKeyName.Length / sizeof(WCHAR)] = 0; + dwError = CreateServiceListEntry(szSubKey, + hServiceKey); - DPRINT("KeyName: '%wZ'\n", &SubKeyName); - Status = CreateServiceListEntry(SubKeyName.Buffer); - - /* Ignore services without proper registry. */ - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - Status = STATUS_SUCCESS; - } + RegCloseKey(hServiceKey); } } - if (!NT_SUCCESS(Status)) + if (dwError != ERROR_SUCCESS) break; - Index++; + dwSubKey++; } - HeapFree(GetProcessHeap(), 0, KeyInfo); - NtClose(ServicesKey); + RegCloseKey(hServicesKey); - DPRINT("ScmCreateServiceDataBase() done\n"); + DPRINT("ScmCreateServiceDatabase() done\n"); - return STATUS_SUCCESS; + return ERROR_SUCCESS; } @@ -518,7 +540,7 @@ Service->Status.dwCurrentState = SERVICE_RUNNING; /* Find the driver's group and mark it as 'running' */ - if (Service->ServiceGroup.Buffer != NULL) + if (Service->lpServiceGroup != NULL) { GroupEntry = GroupListHead.Flink; while (GroupEntry != &GroupListHead) @@ -526,7 +548,8 @@ CurrentGroup = CONTAINING_RECORD(GroupEntry, SERVICE_GROUP, GroupListEntry); DPRINT("Checking group '%wZ'\n", &CurrentGroup->GroupName); - if (RtlEqualUnicodeString(&Service->ServiceGroup, &CurrentGroup->GroupName, TRUE)) + if (Service->lpServiceGroup != NULL && + _wcsicmp(Service->lpServiceGroup, CurrentGroup->GroupName.Buffer) == 0) { CurrentGroup->ServicesRunning = TRUE; } @@ -902,7 +925,8 @@ { CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); - if ((RtlEqualUnicodeString(&CurrentGroup->GroupName, &CurrentService->ServiceGroup, TRUE)) && + if ((CurrentService->lpServiceGroup != NULL) && + (_wcsicmp(CurrentGroup->GroupName.Buffer, CurrentService->lpServiceGroup) == 0) && (CurrentService->dwStartType == SERVICE_AUTO_START) && (CurrentService->ServiceVisited == FALSE) && (CurrentService->dwTag == CurrentGroup->TagArray[i])) @@ -922,7 +946,8 @@ { CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); - if ((RtlEqualUnicodeString(&CurrentGroup->GroupName, &CurrentService->ServiceGroup, TRUE)) && + if ((CurrentService->lpServiceGroup != NULL) && + (_wcsicmp(CurrentGroup->GroupName.Buffer, CurrentService->lpServiceGroup) == 0) && (CurrentService->dwStartType == SERVICE_AUTO_START) && (CurrentService->ServiceVisited == FALSE)) { @@ -943,7 +968,7 @@ { CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); - if ((CurrentService->ServiceGroup.Length != 0) && + if ((CurrentService->lpServiceGroup != NULL) && (CurrentService->dwStartType == SERVICE_AUTO_START) && (CurrentService->ServiceVisited == FALSE)) { @@ -961,7 +986,7 @@ { CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); - if ((CurrentService->ServiceGroup.Length == 0) && + if ((CurrentService->lpServiceGroup == NULL) && (CurrentService->dwStartType == SERVICE_AUTO_START) && (CurrentService->ServiceVisited == FALSE)) { @@ -983,32 +1008,4 @@ } } - -DWORD -ScmMarkServiceForDelete(PSERVICE pService) -{ - HKEY hServiceKey = NULL; - DWORD dwValue = 1; - DWORD dwError; - - DPRINT("ScmMarkServiceForDelete() called\n"); - - dwError = ScmOpenServiceKey(pService->lpServiceName, - KEY_WRITE, - &hServiceKey); - if (dwError != ERROR_SUCCESS) - return dwError; - - dwError = RegSetValueExW(hServiceKey, - L"DeleteFlag", - 0, - REG_DWORD, - (LPBYTE)&dwValue, - sizeof(DWORD)); - - RegCloseKey(hServiceKey); - - return dwError; -} - /* EOF */ _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-11-06 10:48:14 UTC (rev 19025) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-11-06 11:56:56 UTC (rev 19026) @@ -560,49 +560,6 @@ } -static DWORD -CreateServiceKey(LPWSTR lpServiceName, - PHKEY phKey) -{ - HKEY hServicesKey = NULL; - DWORD dwDisposition; - DWORD dwError; - - *phKey = NULL; - - dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"System\\CurrentControlSet\\Services", - 0, - KEY_WRITE, - &hServicesKey); - if (dwError != ERROR_SUCCESS) - return dwError; - - dwError = RegCreateKeyExW(hServicesKey, - lpServiceName, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_WRITE, - NULL, - phKey, - &dwDisposition); -#if 0 - if ((dwError == ERROR_SUCCESS) && - (dwDisposition == REG_OPENED_EXISTING_KEY)) - { - RegCloseKey(*phKey); - *phKey = NULL; - dwError = ERROR_SERVICE_EXISTS; - } -#endif - - RegCloseKey(hServicesKey); - - return dwError; -} - - /* Function 12 */ unsigned long ScmrCreateServiceW(handle_t BindingHandle, @@ -710,7 +667,9 @@ /* Write service data to the registry */ /* Create the service key */ - dwError = CreateServiceKey(lpServiceName, &hServiceKey); + dwError = ScmCreateServiceKey(lpServiceName, + KEY_WRITE, + &hServiceKey); if (dwError != ERROR_SUCCESS) goto done; _____ Modified: trunk/reactos/subsys/system/services/services.c --- trunk/reactos/subsys/system/services/services.c 2005-11-06 10:48:14 UTC (rev 19025) +++ trunk/reactos/subsys/system/services/services.c 2005-11-06 11:56:56 UTC (rev 19026) @@ -313,7 +313,7 @@ { HANDLE hScmStartEvent; HANDLE hEvent; - NTSTATUS Status; + DWORD dwError; DPRINT("SERVICES: Service Control Manager\n"); @@ -335,10 +335,10 @@ /* Create the service database */ - Status = ScmCreateServiceDataBase(); - if (!NT_SUCCESS(Status)) + dwError = ScmCreateServiceDatabase(); + if (dwError != ERROR_SUCCESS) { - DPRINT1("SERVICES: failed to create SCM database (Status %lx)\n", Status); + DPRINT1("SERVICES: failed to create SCM database (Error %lu)\n", dwError); ExitThread(0); } _____ Modified: trunk/reactos/subsys/system/services/services.h --- trunk/reactos/subsys/system/services/services.h 2005-11-06 10:48:14 UTC (rev 19025) +++ trunk/reactos/subsys/system/services/services.h 2005-11-06 11:56:56 UTC (rev 19026) @@ -14,7 +14,7 @@ LIST_ENTRY ServiceListEntry; LPWSTR lpServiceName; LPWSTR lpDisplayName; - UNICODE_STRING ServiceGroup; + LPWSTR lpServiceGroup; BOOL bDeleted; SERVICE_STATUS Status; @@ -47,14 +47,25 @@ REGSAM samDesired, PHKEY phKey); +DWORD ScmCreateServiceKey(LPWSTR lpServiceName, + REGSAM samDesired, + PHKEY phKey); + DWORD ScmWriteDependencies(HKEY hServiceKey, LPWSTR lpDependencies, DWORD dwDependenciesLength); +DWORD ScmMarkServiceForDelete(PSERVICE pService); +BOOL ScmIsDeleteFlagSet(HKEY hServiceKey); +DWORD ScmReadString(HKEY hServiceKey, + LPWSTR lpValueName, + LPWSTR *lpValue); + + /* database.c */ -NTSTATUS ScmCreateServiceDataBase(VOID); +DWORD ScmCreateServiceDatabase(VOID); VOID ScmGetBootAndSystemDriverState(VOID); VOID ScmAutoStartServices(VOID);

18 years, 10 months

[ion] 19025: This one is for Steven... 18 months later, I kept my promise ; )

by ion＠svn.reactos.com

This one is for Steven... 18 months later, I kept my promise ;) - BindImage & friends refactoring of my original code. Fixed two or three dozen bugs, stopped making assumptions about everything, actually checked for failure, used dynamic allocation instead of 32 static structures, fixed a lot of broken code, fixed some helper functions, made the code as 64-bit compatible as I could (checked with msvc WP64 + prefast). - Remove internal.c and use NDK instead - Remove debug.c and symbol.c like WINE have done - Rewrite the entire exports file to update it for XP. Forward almost all the functions to dbghelp, like WINE have done (note: windows DLL used delayed imports instead). - Cleanup source to add implemented/unimplemented tags, source header, and precompiled header. - Sync with latest code from WINE. Tested with Quicken 2004 & its patches (which make extensive use of BindImage) as well as random bindings of some applications on my disk. Worked perfectly in Windows. Modified: trunk/reactos/lib/imagehlp/access.c Deleted: trunk/reactos/lib/imagehlp/debug.c Modified: trunk/reactos/lib/imagehlp/imagehlp.def Modified: trunk/reactos/lib/imagehlp/imagehlp.xml Modified: trunk/reactos/lib/imagehlp/imagehlp_main.c Modified: trunk/reactos/lib/imagehlp/integrity.c Deleted: trunk/reactos/lib/imagehlp/internal.c Modified: trunk/reactos/lib/imagehlp/modify.c Added: trunk/reactos/lib/imagehlp/precomp.h Deleted: trunk/reactos/lib/imagehlp/symbol.c Deleted: trunk/reactos/lib/imagehlp/winehq2ros.patch Modified: trunk/reactos/w32api/include/imagehlp.h Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/lib/imagehlp/access.c --- trunk/reactos/lib/imagehlp/access.c 2005-11-06 01:24:21 UTC (rev 19024) +++ trunk/reactos/lib/imagehlp/access.c 2005-11-06 10:48:14 UTC (rev 19025) @@ -1,564 +1,634 @@ /* - * IMAGEHLP library - * - * Copyright 1998 Patrik Stridvall - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Imagehlp Libary + * FILE: lib/imagehlp/access.c + * PURPOSE: Image (un)load/mapping and data directory/section access + * PROGRAMMER: Patrik Stridvall */ -#include <stdarg.h> -#include <string.h> -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winerror.h" -#include "wine/debug.h" -#include "imagehlp.h" +/* INCLUDES ******************************************************************/ -/* Couple of Hacks */ -extern inline DWORD WINAPI GetLastError(void) +#include "precomp.h" + +//#define NDEBUG +#include <debug.h> + +/* DATA **********************************************************************/ + +BOOLEAN DllListInitialized; +LIST_ENTRY ImageLoadListHead; + +/* FUNCTIONS *****************************************************************/ + +PVOID +IMAGEAPI +ImageDirectoryEntryToData32(PVOID Base, + BOOLEAN MappedAsImage, + USHORT DirectoryEntry, + PULONG Size, + PIMAGE_SECTION_HEADER *FoundHeader OPTIONAL, + PIMAGE_FILE_HEADER FileHeader, + PIMAGE_OPTIONAL_HEADER OptionalHeader) { - DWORD ret; - __asm__ __volatile__( ".byte 0x64\n\tmovl 0x60,%0" : "=r" (ret) ); - return ret; -} + ULONG i; + PIMAGE_SECTION_HEADER CurrentSection; + ULONG DirectoryEntryVA; -#define InitializeListHead(ListHead) (\ - (ListHead)->Flink = (ListHead)->Blink = (ListHead)) + /* Check if this entry is invalid */ + if (DirectoryEntry >= OptionalHeader->NumberOfRvaAndSizes) + { + /* Nothing found */ + *Size = 0; + return NULL; + } -#define InsertTailList(ListHead,Entry) {\ - PLIST_ENTRY _EX_Blink;\ - PLIST_ENTRY _EX_ListHead;\ - _EX_ListHead = (ListHead);\ - _EX_Blink = _EX_ListHead->Blink;\ - (Entry)->Flink = _EX_ListHead;\ - (Entry)->Blink = _EX_Blink;\ - _EX_Blink->Flink = (Entry);\ - _EX_ListHead->Blink = (Entry);\ + /* Get the VA of the Directory Requested */ + DirectoryEntryVA = OptionalHeader->DataDirectory[DirectoryEntry].VirtualAddress; + if (!DirectoryEntryVA) + { + /* It doesn't exist */ + *Size = 0; + return NULL; } -WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); + /* Get the size of the Directory Requested */ + *Size = OptionalHeader->DataDirectory[DirectoryEntry].Size; -/********************************************************************** * - * Data - */ + /* Check if it was mapped as an image or if the entry is within the headers */ + if ((MappedAsImage) || (DirectoryEntryVA < OptionalHeader->SizeOfHeaders)) + { + /* No header found */ + if (FoundHeader) *FoundHeader = NULL; + + /* And simply return the VA */ + return (PVOID)((ULONG_PTR)Base + DirectoryEntryVA); + } -static PLOADED_IMAGE IMAGEHLP_pFirstLoadedImage=NULL; -static PLOADED_IMAGE IMAGEHLP_pLastLoadedImage=NULL; + /* Read the first Section */ + CurrentSection = (PIMAGE_SECTION_HEADER)((ULONG_PTR)OptionalHeader + + FileHeader->SizeOfOptionalHeader); + + /* Loop through every section*/ + for (i = 0; i < FileHeader->NumberOfSections; i++) + { + /* If the Directory VA is located inside this section's VA, then this section belongs to this Directory */ + if ((DirectoryEntryVA >= CurrentSection->VirtualAddress) && + (DirectoryEntryVA < (CurrentSection->VirtualAddress + + CurrentSection->SizeOfRawData))) + { + /* Return the section header */ + if (FoundHeader) *FoundHeader = CurrentSection; + return ((PVOID)((ULONG_PTR)Base + + (DirectoryEntryVA - CurrentSection->VirtualAddress) + + CurrentSection->PointerToRawData)); + } -static LOADED_IMAGE IMAGEHLP_EmptyLoadedImage = { - NULL, /* ModuleName */ - 0, /* hFile */ - NULL, /* MappedAddress */ - NULL, /* FileHeader */ - NULL, /* LastRvaSection */ - 0, /* NumberOfSections */ - NULL, /* Sections */ - 1, /* Characteristics */ - FALSE, /* fSystemImage */ - FALSE, /* fDOSImage */ - { &IMAGEHLP_EmptyLoadedImage.Links, &IMAGEHLP_EmptyLoadedImage.Links }, /* Links */ - 148, /* SizeOfImage; */ -}; + /* Move to the next section */ + CurrentSection++; + } -extern HANDLE IMAGEHLP_hHeap; -BOOLEAN DllListInitialized; -LIST_ENTRY ImageLoadListHead; - -/********************************************************************** * - * EnumerateLoadedModules (IMAGEHLP.@) - */ -BOOL WINAPI EnumerateLoadedModules( - HANDLE hProcess, - PENUMLOADED_MODULES_CALLBACK EnumLoadedModulesCallback, - PVOID UserContext) -{ - FIXME("(%p, %p, %p): stub\n", - hProcess, EnumLoadedModulesCallback, UserContext - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + /* If we got here, then we didn't find anything */ + return NULL; } -/********************************************************************** * - * GetTimestampForLoadedLibrary (IMAGEHLP.@) +/* + * @unimplemented */ -DWORD WINAPI GetTimestampForLoadedLibrary(HMODULE Module) +DWORD +IMAGEAPI +GetTimestampForLoadedLibrary(HMODULE Module) { - FIXME("(%p): stub\n", Module); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } -/********************************************************************** * - * GetImageConfigInformation (IMAGEHLP.@) +/* + * @unimplemented */ -BOOL WINAPI GetImageConfigInformation( - PLOADED_IMAGE LoadedImage, - PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation) +BOOL +IMAGEAPI +GetImageConfigInformation(PLOADED_IMAGE LoadedImage, + PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation) { - FIXME("(%p, %p): stub\n", - LoadedImage, ImageConfigInformation - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } -/********************************************************************** * - * GetImageUnusedHeaderBytes (IMAGEHLP.@) +/* + * @implemented */ DWORD -WINAPI -GetImageUnusedHeaderBytes( - PLOADED_IMAGE LoadedImage, - LPDWORD SizeUnusedHeaderBytes - ) +IMAGEAPI +GetImageUnusedHeaderBytes(PLOADED_IMAGE LoadedImage, + LPDWORD SizeUnusedHeaderBytes) { - DWORD FirstFreeByte; - PIMAGE_OPTIONAL_HEADER OptionalHeader32 = NULL; - PIMAGE_NT_HEADERS NtHeaders; - ULONG i; + SIZE_T FirstFreeByte; + PIMAGE_OPTIONAL_HEADER OptionalHeader = NULL; + PIMAGE_NT_HEADERS NtHeaders; + ULONG i; - /* Read the NT Headers */ + /* Read the NT Headers */ NtHeaders = LoadedImage->FileHeader; - /* Find the first free byte, which is after all the headers and sections */ - FirstFreeByte = (ULONG_PTR)NtHeaders - (ULONG_PTR)LoadedImage->MappedAddress + - FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader) + - NtHeaders->FileHeader.SizeOfOptionalHeader + - NtHeaders->FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER); + /* Find the first free byte, which is after all the headers and sections */ + FirstFreeByte = (ULONG_PTR)NtHeaders - + (ULONG_PTR)LoadedImage->MappedAddress + + FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader) + + NtHeaders->FileHeader.SizeOfOptionalHeader + + NtHeaders->FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER); - /* Get the Optional Header */ - OptionalHeader32 = &LoadedImage->FileHeader->OptionalHeader; + /* Get the Optional Header */ + OptionalHeader = &LoadedImage->FileHeader->OptionalHeader; - /* There is the possibilty that one of the Data Directories is in the PE Header - itself, so we'll need to find such a case and add it to our PE used space */ - for ( i = 0; i<OptionalHeader32->NumberOfRvaAndSizes; i++ ) { - - /* If the VA is less then the size of headers, then the data is inside the PE header */ - if (OptionalHeader32->DataDirectory[i].VirtualAddress < OptionalHeader32->SizeOfHeaders) { - - /* However, make sure it's not 0, which means it doesnt actually exist */ - if (OptionalHeader32->DataDirectory[i].VirtualAddress >= FirstFreeByte) { - - /* Our first empty byte is after this Directory Data then */ - FirstFreeByte = OptionalHeader32->DataDirectory[i].VirtualAddress + - OptionalHeader32->DataDirectory[i].Size; - } + /* + * There is the possibilty that one of the Data Directories is in the PE Header + * itself, so we'll need to find such a case and add it to our PE used space + */ + for (i = 0; i < OptionalHeader->NumberOfRvaAndSizes; i++) + { + /* If the VA is less then the size of headers, then the data is inside the PE header */ + if (OptionalHeader->DataDirectory[i].VirtualAddress < + OptionalHeader->SizeOfHeaders) + { + /* However, make sure it's not 0, which means it doesnt actually exist */ + if (OptionalHeader->DataDirectory[i].VirtualAddress >= + FirstFreeByte) + { + /* Our first empty byte is after this Directory Data then */ + FirstFreeByte = OptionalHeader->DataDirectory[i].VirtualAddress + + OptionalHeader->DataDirectory[i].Size; } } + } - /* Return the unused Header Bytes */ - *SizeUnusedHeaderBytes = OptionalHeader32->SizeOfHeaders - FirstFreeByte; + /* Return the unused Header Bytes */ + *SizeUnusedHeaderBytes = OptionalHeader->SizeOfHeaders - (DWORD)FirstFreeByte; - /* And return the first free byte*/ - return FirstFreeByte; + /* And return the first free byte*/ + return (DWORD)FirstFreeByte; } -/********************************************************************** * - * ImageDirectoryEntryToData (IMAGEHLP.@) +/* + * @implemented */ PVOID -WINAPI -ImageDirectoryEntryToData( - PVOID Base, - BOOLEAN MappedAsImage, - USHORT DirectoryEntry, - PULONG Size - ) +IMAGEAPI +ImageDirectoryEntryToData(PVOID Base, + BOOLEAN MappedAsImage, + USHORT DirectoryEntry, + PULONG Size) { - return ImageDirectoryEntryToDataEx(Base, MappedAsImage, DirectoryEntry, Size, NULL); + /* Let the extended function handle it */ + return ImageDirectoryEntryToDataEx(Base, + MappedAsImage, + DirectoryEntry, + Size, + NULL); } -/********************************************************************** * - * RosImageDirectoryEntryToDataEx (IMAGEHLP.@) +/* + * @implemented */ PVOID -WINAPI -ImageDirectoryEntryToDataEx ( - IN PVOID Base, - IN BOOLEAN MappedAsImage, - IN USHORT DirectoryEntry, - OUT PULONG Size, - OUT PIMAGE_SECTION_HEADER *FoundSection OPTIONAL - ) +IMAGEAPI +ImageDirectoryEntryToDataEx(IN PVOID Base, + IN BOOLEAN MappedAsImage, + IN USHORT DirectoryEntry, + OUT PULONG Size, + OUT PIMAGE_SECTION_HEADER *FoundSection OPTIONAL) { - PIMAGE_NT_HEADERS NtHeader; - PIMAGE_FILE_HEADER FileHeader; - PIMAGE_OPTIONAL_HEADER OptionalHeader; + PIMAGE_NT_HEADERS NtHeader; + PIMAGE_FILE_HEADER FileHeader; + PIMAGE_OPTIONAL_HEADER OptionalHeader; + /* Get the optional header ourselves */ NtHeader = ImageNtHeader(Base); FileHeader = &NtHeader->FileHeader; OptionalHeader = &NtHeader->OptionalHeader; - return (ImageDirectoryEntryToData32(Base, - MappedAsImage, - DirectoryEntry, - Size, - FoundSection, - FileHeader, - OptionalHeader)); + /* FIXME: Read image type and call appropriate function (32, 64, ROM) */ + return ImageDirectoryEntryToData32(Base, + MappedAsImage, + DirectoryEntry, + Size, + FoundSection, + FileHeader, + OptionalHeader); } -/********************************************************************** * - * RosImageDirectoryEntryToDataEx (IMAGEHLP.@) +/* + * @implemented */ -PVOID -STDCALL -ImageDirectoryEntryToData32 ( - PVOID Base, - BOOLEAN MappedAsImage, - USHORT DirectoryEntry, - PULONG Size, - PIMAGE_SECTION_HEADER *FoundHeader OPTIONAL, - PIMAGE_FILE_HEADER FileHeader, - PIMAGE_OPTIONAL_HEADER OptionalHeader - ) +PLOADED_IMAGE +IMAGEAPI +ImageLoad(LPSTR DllName, + LPSTR DllPath) { - ULONG i; - PIMAGE_SECTION_HEADER CurrentSection; - ULONG DirectoryEntryVA; - - /* Get the VA of the Directory Requested */ - DirectoryEntryVA = OptionalHeader->DataDirectory[DirectoryEntry].VirtualAddress; - - /* Get the size of the Directory Requested */ - *Size = OptionalHeader->DataDirectory[DirectoryEntry].Size; - - /* Return VA if Mapped as Image*/ - if (MappedAsImage || DirectoryEntryVA < OptionalHeader->SizeOfHeaders) { - if (FoundHeader) { - *FoundHeader = NULL; - } - return (PVOID)((ULONG_PTR)Base + DirectoryEntryVA); - } - - /* Read the first Section */ - CurrentSection = (PIMAGE_SECTION_HEADER)((ULONG_PTR)OptionalHeader + FileHeader->SizeOfOptionalHeader); - - /* Loop through every section*/ - for (i=0; i<FileHeader->NumberOfSections; i++) { - - /* If the Directory VA is located inside this section's VA, then this section belongs to this Directory */ - if (DirectoryEntryVA >= CurrentSection->VirtualAddress && - DirectoryEntryVA < CurrentSection->VirtualAddress + CurrentSection->SizeOfRawData) { - if (FoundHeader) { - *FoundHeader = CurrentSection; - } - //return( (PVOID)((ULONG_PTR)Base + (DirectoryAddress - NtSection->VirtualAddress) + NtSection->PointerToRawData) ); - return ((PVOID)((ULONG_PTR)Base + (DirectoryEntryVA - CurrentSection->VirtualAddress) + CurrentSection->PointerToRawData)); - } - ++CurrentSection; - } - return(NULL); -} -/********************************************************************** * - * ImageLoad (IMAGEHLP.@) - */ -PLOADED_IMAGE WINAPI ImageLoad(LPSTR DllName, LPSTR DllPath) -{ - PLIST_ENTRY Head,Next; + PLIST_ENTRY Head, Next; PLOADED_IMAGE LoadedImage; + CHAR Drive[_MAX_DRIVE], Dir[_MAX_DIR], Filename[_MAX_FNAME], Ext[_MAX_EXT]; + BOOL CompleteName = TRUE; + CHAR FullName[MAX_PATH]; - /* Initialize the List Head */ - if (!DllListInitialized) { + /* Initialize the List Head */ + if (!DllListInitialized) + { InitializeListHead(&ImageLoadListHead); DllListInitialized = TRUE; } - /* Move to the Next DLL */ + /* Move to the Next DLL */ Head = &ImageLoadListHead; Next = Head->Flink; + DPRINT("Trying to find library: %s in current ListHead \n", DllName); - //FIXME("Trying to find library: %s in current ListHead \n", DllName); + /* Split the path */ + _splitpath(DllName, Drive, Dir, Filename, Ext); - /* Check if we already Loaded it */ - while (Next != Head) { + /* Check if we only got a name */ + if (!strlen(Drive) && !strlen(Dir)) CompleteName = FALSE; - /* Get the Loaded Image Structure */ + /* Check if we already Loaded it */ + while (Next != Head) + { + /* Get the Loaded Image Structure */ LoadedImage = CONTAINING_RECORD(Next, LOADED_IMAGE, Links); - //FIXME("Found: %s in current ListHead \n", LoadedImage->ModuleName); + DPRINT("Found: %s in current ListHead \n", LoadedImage->ModuleName); - /* Check if the Names Match */ - if (!lstrcmpi( DllName, LoadedImage->ModuleName )) { - //FIXME("Found it, returning it\n"); + /* Check if we didn't have a complete name */ + if (!CompleteName) + { + /* Split this module's name */ + _splitpath(LoadedImage->ModuleName, NULL, NULL, Filename, Ext); + + /* Use only the name and extension */ + strcpy(FullName, Filename); + strcat(FullName, Ext); + } + else + { + /* Use the full untouched name */ + strcpy(FullName, LoadedImage->ModuleName); + } + + /* Check if the Names Match */ + if (!_stricmp(DllName, FullName)) + { + DPRINT("Found it, returning it\n"); return LoadedImage; } - /* Move to next Entry */ + /* Move to next Entry */ Next = Next->Flink; - //FIXME("Moving to next List Entry\n"); } - //FIXME("Didn't find it...allocating it for you now\n"); + /* Allocate memory for the Structure, and write the Module Name under */ + DPRINT("Didn't find it...allocating it for you now\n"); + LoadedImage = HeapAlloc(IMAGEHLP_hHeap, + 0, + sizeof(*LoadedImage) + strlen(DllName) + 1); + if (LoadedImage) + { + /* Module Name will be after structure */ + LoadedImage->ModuleName = (LPSTR)(LoadedImage + 1); - /* Allocate memory for the Structure, and write the Module Name under */ - LoadedImage = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(*LoadedImage) + lstrlen(DllName) + 1); + /* Copy the Module Name */ + strcpy(LoadedImage->ModuleName, DllName); - /* Module Name will be after structure */ - LoadedImage->ModuleName = (LPSTR)LoadedImage + 1; + /* Now Load it */ + if (MapAndLoad(DllName, DllPath, LoadedImage, TRUE, TRUE)) + { + /* Add it to our list and return it */ + InsertTailList(&ImageLoadListHead, &LoadedImage->Links); + return LoadedImage; + } - /* Copy the Moduel Name */ - lstrcpy(LoadedImage->ModuleName, DllName); - - /* Now Load it and add it to our list*/ - if (MapAndLoad(DllName, DllPath, LoadedImage, TRUE, TRUE)) { - InsertTailList(&ImageLoadListHead, &LoadedImage->Links); - return LoadedImage; + /* If we're here...there's been a failure */ + HeapFree(IMAGEHLP_hHeap, 0, LoadedImage); + LoadedImage = NULL; } - - /* If we're here...there's been a failure */ - HeapFree(IMAGEHLP_hHeap, 0, LoadedImage); - LoadedImage = NULL; return LoadedImage; } -/********************************************************************** * - * ImageRvaToSection (IMAGEHLP.@) +/* + * @implemented */ PIMAGE_SECTION_HEADER -WINAPI -ImageRvaToSection( - IN PIMAGE_NT_HEADERS NtHeaders, - IN PVOID Base, - IN ULONG Rva - ) +IMAGEAPI +ImageRvaToSection(IN PIMAGE_NT_HEADERS NtHeaders, + IN PVOID Base, + IN ULONG Rva) { - PIMAGE_SECTION_HEADER Section; + PIMAGE_SECTION_HEADER Section; ULONG i; - /* Get the First Section */ + /* Get the First Section */ Section = IMAGE_FIRST_SECTION(NtHeaders); - /* Look through each section and check if the RVA is in between */ - for (i=0; i < NtHeaders->FileHeader.NumberOfSections; i++) { - if (Rva >= Section->VirtualAddress && Rva < Section->VirtualAddress + - Section->SizeOfRawData) { + /* Look through each section */ + for (i = 0; i < NtHeaders->FileHeader.NumberOfSections; i++) + { + /* Check if the RVA is in between */ + if ((Rva >= Section->VirtualAddress) && + (Rva < (Section->VirtualAddress + Section->SizeOfRawData))) + { + /* Return this section */ return Section; - } - ++Section; } - /* Not Found */ + /* Move to the next section */ + Section++; + } + + /* Not Found */ return NULL; } -/********************************************************************** * - * ImageNtHeader (IMAGEHLP.@) +/* + * @implemented */ -PIMAGE_NT_HEADERS WINAPI ImageNtHeader(PVOID Base) +PIMAGE_NT_HEADERS +IMAGEAPI +ImageNtHeader(PVOID Base) { - TRACE("(%p)\n", Base); - - /* Just return the e_lfanew Offset VA */ - return (PIMAGE_NT_HEADERS)((LPBYTE)Base + - ((PIMAGE_DOS_HEADER)Base)->e_lfanew); + /* Let RTL do it */ + return RtlImageNtHeader(Base); } -/********************************************************************** * - * ImageRvaToVa (IMAGEHLP.@) +/* + * @implemented */ PVOID -WINAPI -ImageRvaToVa( - IN PIMAGE_NT_HEADERS NtHeaders, - IN PVOID Base, - IN ULONG Rva, - IN OUT PIMAGE_SECTION_HEADER *LastRvaSection OPTIONAL - ) +IMAGEAPI +ImageRvaToVa(IN PIMAGE_NT_HEADERS NtHeaders, + IN PVOID Base, + IN ULONG Rva, + IN OUT PIMAGE_SECTION_HEADER *LastRvaSection OPTIONAL) { PIMAGE_SECTION_HEADER Section; - /* Get the Section Associated */ - Section = ImageRvaToSection(NtHeaders, Base, Rva); + /* Get the Section Associated */ + Section = ImageRvaToSection(NtHeaders, Base, Rva); - /* Return it, if specified */ + /* Return it, if specified */ if (LastRvaSection) *LastRvaSection = Section; - /* Return the VA */ + /* Return the VA */ return (PVOID)((ULONG_PTR)Base + (Rva - Section->VirtualAddress) + - Section->PointerToRawData); + Section->PointerToRawData); } -/********************************************************************** * - * ImageUnload (IMAGEHLP.@) +/* + * @implemented */ -BOOL WINAPI ImageUnload(PLOADED_IMAGE pLoadedImage) +BOOL +IMAGEAPI +ImageUnload(PLOADED_IMAGE LoadedImage) { - LIST_ENTRY *pCurrent, *pFind; + /* If the image list isn't empty, remove this entry */ + if (!IsListEmpty(&LoadedImage->Links)) RemoveEntryList(&LoadedImage->Links); - TRACE("(%p)\n", pLoadedImage); - - if(!IMAGEHLP_pFirstLoadedImage || !pLoadedImage) - { - /* No image loaded or null pointer */ - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + /* Unmap and unload it */ + UnMapAndLoad(LoadedImage); - pFind=&pLoadedImage->Links; - pCurrent=&IMAGEHLP_pFirstLoadedImage->Links; - while((pCurrent != pFind) && - (pCurrent != NULL)) - pCurrent = pCurrent->Flink; - if(!pCurrent) - { - /* Not found */ - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + /* Free the structure */ + HeapFree(IMAGEHLP_hHeap, 0, LoadedImage); - if(pCurrent->Blink) - pCurrent->Blink->Flink = pCurrent->Flink; - else - IMAGEHLP_pFirstLoadedImage = pCurrent->Flink?CONTAINING_RECORD( - pCurrent->Flink, LOADED_IMAGE, Links):NULL; - - if(pCurrent->Flink) - pCurrent->Flink->Blink = pCurrent->Blink; - else - IMAGEHLP_pLastLoadedImage = pCurrent->Blink?CONTAINING_RECORD( - pCurrent->Blink, LOADED_IMAGE, Links):NULL; - - return FALSE; + /* Return success */ + return TRUE; } -/********************************************************************** * - * MapAndLoad (IMAGEHLP.@) +/* + * @implemented */ -BOOL WINAPI MapAndLoad( - LPSTR ImageName, - LPSTR DllPath, - PLOADED_IMAGE LoadedImage, - BOOL DotDll, - BOOL ReadOnly) +BOOL +IMAGEAPI +MapAndLoad(LPSTR ImageName, + LPSTR DllPath, + PLOADED_IMAGE LoadedImage, + BOOL DotDll, + BOOL ReadOnly) { - HANDLE hFileMapping = NULL; - PIMAGE_NT_HEADERS NtHeader = NULL; - ULONG Tried = 0; - UCHAR Buffer[MAX_PATH]; - LPSTR FilePart; - LPSTR FileToOpen; + HANDLE hFile; + HANDLE hFileMapping; + ULONG Tried = 0; + UCHAR Buffer[MAX_PATH]; + LPSTR FilePart; + LPSTR FileToOpen; + PIMAGE_NT_HEADERS NtHeader; - /* So we can add the DLL Path later */ - FileToOpen = ImageName; + /* So we can add the DLL Path later */ + FileToOpen = ImageName; + + /* Assume failure */ + LoadedImage->hFile = INVALID_HANDLE_VALUE; -TryAgain: - /* Get a handle to the file */ - if ((LoadedImage->hFile = CreateFileA (FileToOpen, - ReadOnly ? GENERIC_READ : GENERIC_READ | GENERIC_WRITE, - ReadOnly ? FILE_SHARE_READ : FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - 0, - NULL)) == INVALID_HANDLE_VALUE) + /* Start open loop */ + while (TRUE) { - /* It Failed, use the DLL Search Path then (make sure we haven't already) */ - if (!Tried) { - Tried = SearchPath(DllPath, ImageName, DotDll ? ".dll" : ".exe", MAX_PATH, Buffer, &FilePart); - if (Tried) { - FileToOpen = Buffer; - goto TryAgain; + /* Get a handle to the file */ + hFile = CreateFileA(FileToOpen, + ReadOnly ? GENERIC_READ : + GENERIC_READ | GENERIC_WRITE, + ReadOnly ? FILE_SHARE_READ : + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + 0, + NULL); + + if (hFile == INVALID_HANDLE_VALUE) + { + /* Check if we already tried this once */ + if (!Tried) + { + /* We didn't do do a path search now */ + Tried = SearchPath(DllPath, + ImageName, + DotDll ? ".dll" : ".exe", + MAX_PATH, + Buffer, + &FilePart); + + /* Check if it was successful */ + if (Tried && (Tried < MAX_PATH)) + { + /* Change the filename to use, and try again */ + FileToOpen = Buffer; + continue; + } } + + /* Fail */ + return FALSE; } - /* Fail */ - return FALSE; - } - /* Create the File Mapping */ - if (!(hFileMapping = CreateFileMappingA (LoadedImage->hFile, - NULL, - ReadOnly ? PAGE_READONLY : PAGE_READWRITE, - 0, - 0, - NULL))) - { - DWORD dwLastError = GetLastError(); - SetLastError(dwLastError); - goto Error; + /* Success, break out */ + break; } - /* Get a pointer to the file */ - if(!(LoadedImage->MappedAddress = MapViewOfFile(hFileMapping, - ReadOnly ? FILE_MAP_READ : FILE_MAP_WRITE, - 0, - 0, - 0))) + /* Create the File Mapping */ + hFileMapping = CreateFileMappingA(hFile, + NULL, + ReadOnly ? PAGE_READONLY : + PAGE_READWRITE, + 0, + 0, + NULL); + if (!hFileMapping) { - DWORD dwLastError = GetLastError(); - SetLastError(dwLastError); - goto Error; + /* Fail */ + SetLastError(GetLastError()); + CloseHandle(hFile); + return FALSE; } - /* Close the handle to the map, we don't need it anymore */ - CloseHandle(hFileMapping); - hFileMapping=NULL; + /* Get a pointer to the file */ + LoadedImage->MappedAddress = MapViewOfFile(hFileMapping, + ReadOnly ? FILE_MAP_READ : + FILE_MAP_WRITE, + 0, + 0, + 0); - /* Get the Nt Header */ - NtHeader = ImageNtHeader(LoadedImage->MappedAddress); + /* Close the handle to the map, we don't need it anymore */ + CloseHandle(hFileMapping); - /* Write data */ - LoadedImage->ModuleName = HeapAlloc(IMAGEHLP_hHeap, 0, lstrlen(ImageName) + 1); - lstrcpy(LoadedImage->ModuleName, ImageName); - LoadedImage->FileHeader = NtHeader; - LoadedImage->Sections = (PIMAGE_SECTION_HEADER) - ((LPBYTE)&NtHeader->OptionalHeader + - NtHeader->FileHeader.SizeOfOptionalHeader); - LoadedImage->NumberOfSections = NtHeader->FileHeader.NumberOfSections; - LoadedImage->SizeOfImage = NtHeader->OptionalHeader.SizeOfImage; - LoadedImage->Characteristics = NtHeader->FileHeader.Characteristics; - LoadedImage->LastRvaSection = LoadedImage->Sections; - LoadedImage->fSystemImage = FALSE; /* FIXME */ - LoadedImage->fDOSImage = FALSE; /* FIXME */ + /* Write the image size */ + LoadedImage->SizeOfImage = GetFileSize(hFile, NULL); - /* Read only, so no sense in keeping the handle alive */ - if (ReadOnly) CloseHandle(LoadedImage->hFile); + /* Get the Nt Header */ + NtHeader = ImageNtHeader(LoadedImage->MappedAddress); - /* Return Success */ - return TRUE; + /* Allocate memory for the name and save it */ + LoadedImage->ModuleName = HeapAlloc(IMAGEHLP_hHeap, + 0, + strlen(FileToOpen) + 16); + strcpy(LoadedImage->ModuleName, FileToOpen); -Error: - if(LoadedImage->MappedAddress) - UnmapViewOfFile(LoadedImage->MappedAddress); - if(hFileMapping) - CloseHandle(hFileMapping); - if(LoadedImage->hFile) - CloseHandle(LoadedImage->hFile); - return FALSE; + /* Save the NT Header */ + LoadedImage->FileHeader = NtHeader; + + /* Save the section data */ + LoadedImage->Sections = IMAGE_FIRST_SECTION(NtHeader); + LoadedImage->NumberOfSections = NtHeader->FileHeader.NumberOfSections; + + /* Setup other data */ + LoadedImage->SizeOfImage = NtHeader->OptionalHeader.SizeOfImage; + LoadedImage->Characteristics = NtHeader->FileHeader.Characteristics; + LoadedImage->LastRvaSection = LoadedImage->Sections; + LoadedImage->fSystemImage = FALSE; /* FIXME */ + LoadedImage->fDOSImage = FALSE; /* FIXME */ + InitializeListHead(&LoadedImage->Links); + + /* Check if it was read-only */ + if (ReadOnly) + { + /* It was, so close our handle and write it as invalid */ + CloseHandle(hFile); + LoadedImage->hFile = INVALID_HANDLE_VALUE; + } + else + { + /* Write our file handle */ + LoadedImage->hFile = hFile; + } + + /* Return Success */ + return TRUE; } -/********************************************************************** * - * SetImageConfigInformation (IMAGEHLP.@) +/* + * @unimplemented */ -BOOL WINAPI SetImageConfigInformation( - PLOADED_IMAGE LoadedImage, - PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation) +BOOL +IMAGEAPI +SetImageConfigInformation(PLOADED_IMAGE LoadedImage, + PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation) { - FIXME("(%p, %p): stub\n", - LoadedImage, ImageConfigInformation - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } -/********************************************************************** * - * UnMapAndLoad (IMAGEHLP.@) +/* + * @implemented */ -BOOL WINAPI UnMapAndLoad(PLOADED_IMAGE LoadedImage) +BOOL +IMAGEAPI +UnMapAndLoad(PLOADED_IMAGE Image) { - FIXME("(%p): stub\n", LoadedImage); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + PIMAGE_NT_HEADERS NtHeader; + DWORD HeaderCheckSum, CheckSum; + + /* Check if the image was read-only */ + if (Image->hFile == INVALID_HANDLE_VALUE) + { + /* We'll only unmap the view */ + UnmapViewOfFile(Image->MappedAddress); + } + else + { [truncated at 1000 lines; 4883 more skipped]

18 years, 10 months

[turner] 19024: Add some ctrl breaker checks into copy, del, and dir.

by turner＠svn.reactos.com

Add some ctrl breaker checks into copy, del, and dir. Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-11-05 23:10:43 UTC (rev 19023) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-11-06 01:24:21 UTC (rev 19024) @@ -643,6 +643,8 @@ } } } + /* Just in case a CTRL+C slipped through a command */ + bCtrlBreak = FALSE; free(com); } _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-11-05 23:10:43 UTC (rev 19023) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-11-06 01:24:21 UTC (rev 19024) @@ -51,7 +51,12 @@ #define BUFF_SIZE 16384 /* 16k = max buffer size */ -int copy (TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH], INT append, DWORD lpdwFlags, BOOL bTouch) +INT +copy (TCHAR source[MAX_PATH], + TCHAR dest[MAX_PATH], + INT append, + DWORD lpdwFlags, + BOOL bTouch) { TCHAR szMsg[RC_STRING_MAX_SIZE]; FILETIME srctime,NewFileTime; @@ -68,6 +73,9 @@ TCHAR * FileName; SYSTEMTIME CurrentTime; + /* Check Breaker */ + if(CheckCtrlBreak(BREAK_INPUT)) + return 0; #ifdef _DEBUG DebugPrintf (_T("checking mode\n")); @@ -235,6 +243,7 @@ do { + ReadFile (hFileSrc, buffer, BUFF_SIZE, &dwRead, NULL); if (lpdwFlags & COPY_ASCII) { @@ -254,14 +263,14 @@ break; WriteFile (hFileDest, buffer, dwRead, &dwWritten, NULL); - if (dwWritten != dwRead) + if (dwWritten != dwRead || CheckCtrlBreak(BREAK_INPUT)) { ConOutResPuts(STRING_COPY_ERROR3); free (buffer); CloseHandle (hFileDest); CloseHandle (hFileSrc); - nErrorLevel = 1; + nErrorLevel = 1; return 0; } } @@ -731,6 +740,12 @@ do { + /* Check Breaker */ + if(CheckCtrlBreak(BREAK_INPUT)) + { + freep(arg); + return 1; + } /* Set the override to yes each new file */ nOverwrite = 1; _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-11-05 23:10:43 UTC (rev 19023) +++ trunk/reactos/subsys/system/cmd/del.c 2005-11-06 01:24:21 UTC (rev 19024) @@ -107,8 +107,9 @@ /*This function is called by CommandDelete and does the actual process of deleting the single file*/ + if(CheckCtrlBreak(BREAK_INPUT)) + return 1; - /*check to see if it is read only and if this is done based on /A if it is done by file name, access is denied. However, if it is done using the /A switch you must un-read only the file and allow it to be _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-11-05 23:10:43 UTC (rev 19023) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-11-06 01:24:21 UTC (rev 19024) @@ -2027,7 +2027,7 @@ } /* read the parameters */ - if (!DirReadParam(rest, &params, &entries, &stFlags)) + if (!DirReadParam(rest, &params, &entries, &stFlags) || CheckCtrlBreak(BREAK_INPUT)) { nErrorLevel = 1; return 1; @@ -2044,7 +2044,7 @@ for(loop = 0; loop < entries; loop++) { /* parse the directory info */ - if (DirParsePathspec (params[loop], szPath, szFilespec)) + if (DirParsePathspec (params[loop], szPath, szFilespec) || CheckCtrlBreak(BREAK_INPUT)) { nErrorLevel = 1; return 1;

18 years, 10 months

← Newer
1
...
74
75
76
77
78
79
80
...
88
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 November 2005