Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 19037: Lots of DPRINT1 -> DPRINT changes
by hpoussin＠svn.reactos.com 07 Nov '05

07 Nov '05

Lots of DPRINT1 -> DPRINT changes Adjust the image path in ScmrCreateServiceW (just enough for my needs) Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-11-07 10:04:41 UTC (rev 19036) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-11-07 10:53:52 UTC (rev 19037) @@ -281,7 +281,7 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService; - DPRINT1("ScmrControlService() called\n"); + DPRINT("ScmrControlService() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -326,7 +326,7 @@ PSERVICE lpService; DWORD dwError; - DPRINT1("ScmrDeleteService() called\n"); + DPRINT("ScmrDeleteService() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -361,7 +361,7 @@ /* FIXME: Release service database lock */ - DPRINT1("ScmrDeleteService() done\n"); + DPRINT("ScmrDeleteService() done\n"); return dwError; } @@ -509,13 +509,13 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; - DPRINT1("ScmrChangeServiceConfigW() called\n"); - DPRINT1("dwServiceType = %lu\n", dwServiceType); - DPRINT1("dwStartType = %lu\n", dwStartType); - DPRINT1("dwErrorControl = %lu\n", dwErrorControl); - DPRINT1("lpBinaryPathName = %S\n", lpBinaryPathName); - DPRINT1("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); - DPRINT1("lpDisplayName = %S\n", lpDisplayName); + DPRINT("ScmrChangeServiceConfigW() called\n"); + DPRINT("dwServiceType = %lu\n", dwServiceType); + DPRINT("dwStartType = %lu\n", dwStartType); + DPRINT("dwErrorControl = %lu\n", dwErrorControl); + DPRINT("lpBinaryPathName = %S\n", lpBinaryPathName); + DPRINT("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); + DPRINT("lpDisplayName = %S\n", lpDisplayName); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -554,7 +554,7 @@ /* FIXME: Unlock database */ - DPRINT1("ScmrChangeServiceConfigW() done (Error %lu)\n", dwError); + DPRINT("ScmrChangeServiceConfigW() done (Error %lu)\n", dwError); return dwError; } @@ -587,15 +587,15 @@ LPWSTR lpImagePath = NULL; HKEY hServiceKey = NULL; - DPRINT1("ScmrCreateServiceW() called\n"); - DPRINT1("lpServiceName = %S\n", lpServiceName); - DPRINT1("lpDisplayName = %S\n", lpDisplayName); - DPRINT1("dwDesiredAccess = %lx\n", dwDesiredAccess); - DPRINT1("dwServiceType = %lu\n", dwServiceType); - DPRINT1("dwStartType = %lu\n", dwStartType); - DPRINT1("dwErrorControl = %lu\n", dwErrorControl); - DPRINT1("lpBinaryPathName = %S\n", lpBinaryPathName); - DPRINT1("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); + DPRINT("ScmrCreateServiceW() called\n"); + DPRINT("lpServiceName = %S\n", lpServiceName); + DPRINT("lpDisplayName = %S\n", lpDisplayName); + DPRINT("dwDesiredAccess = %lx\n", dwDesiredAccess); + DPRINT("dwServiceType = %lu\n", dwServiceType); + DPRINT("dwStartType = %lu\n", dwStartType); + DPRINT("dwErrorControl = %lu\n", dwErrorControl); + DPRINT("lpBinaryPathName = %S\n", lpBinaryPathName); + DPRINT("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -622,7 +622,11 @@ if (dwServiceType & SERVICE_DRIVER) { - /* FIXME: Adjust the image path */ + /* FIXME: Adjust the image path + * Following line is VERY BAD, because it assumes that the + * first part of full file name is the OS directory */ + if (lpBinaryPathName[1] == ':') lpBinaryPathName += GetWindowsDirectoryW(NULL, 0); + lpImagePath = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR)); @@ -787,7 +791,7 @@ if (dwError == ERROR_SUCCESS) { - DPRINT1("hService %lx\n", hServiceHandle); + DPRINT("hService %lx\n", hServiceHandle); *hService = (unsigned int)hServiceHandle; if (lpdwTagId != NULL) @@ -814,7 +818,7 @@ if (lpImagePath != NULL) HeapFree(GetProcessHeap(), 0, lpImagePath); - DPRINT1("ScmrCreateServiceW() done (Error %lu)\n", dwError); + DPRINT("ScmrCreateServiceW() done (Error %lu)\n", dwError); return dwError; } @@ -903,7 +907,7 @@ lpService = ScmGetServiceEntryByName(lpServiceName); if (lpService == NULL) { - DPRINT1("Could not find a service!\n"); + DPRINT("Could not find a service!\n"); return ERROR_SERVICE_DOES_NOT_EXIST; }

1 0

[hpoussin] 19036: Better stub for QueryServiceConfigW
by hpoussin＠svn.reactos.com 07 Nov '05

07 Nov '05

Better stub for QueryServiceConfigW Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-11-07 04:42:28 UTC (rev 19035) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-11-07 10:04:41 UTC (rev 19036) @@ -909,8 +909,17 @@ LPDWORD pcbBytesNeeded) { DPRINT1("QueryServiceConfigW is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + if (lpServiceConfig && cbBufSize >= sizeof(QUERY_SERVICE_CONFIGW)) + { + memset(lpServiceConfig, 0, *pcbBytesNeeded); + return TRUE; + } + else + { + *pcbBytesNeeded = sizeof(QUERY_SERVICE_CONFIGW); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } }

1 0

[ion] 19035: - Implement PFX_NTC_ROOT/PFX_NTC_CHILD deletions in RtlRemoveUnicodePrefix, if the entry isn't a case match.
by ion＠svn.reactos.com 07 Nov '05

07 Nov '05

- Implement PFX_NTC_ROOT/PFX_NTC_CHILD deletions in RtlRemoveUnicodePrefix, if the entry isn't a case match. Modified: trunk/reactos/lib/rtl/unicodeprefix.c _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 04:23:28 UTC (rev 19034) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 04:42:28 UTC (rev 19035) @@ -175,7 +175,8 @@ RtlRemoveUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable, PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry) { - PUNICODE_PREFIX_TABLE_ENTRY Entry; + PUNICODE_PREFIX_TABLE_ENTRY Entry, RefEntry, NewEntry; + PRTL_SPLAY_LINKS SplayLinks; /* Erase the last entry */ PrefixTable->LastNextEntry = NULL; @@ -186,7 +187,7 @@ /* Get the case match entry */ Entry = PrefixTableEntry->CaseMatch; - /* Now loop until we find the one matching what the caller sent */ + /* Now loop until we find one referencing what the caller sent */ while (Entry->CaseMatch != PrefixTableEntry) Entry = Entry->CaseMatch; /* We found the entry that was sent, link them to delete this entry */ @@ -195,7 +196,66 @@ else if ((PrefixTableEntry->NodeTypeCode == PFX_NTC_ROOT) || (PrefixTableEntry->NodeTypeCode == PFX_NTC_CHILD)) { - /* FIXME */ + /* Check if this entry is a case match */ + if (PrefixTableEntry->CaseMatch != PrefixTableEntry) + { + /* FIXME */ + } + else + { + /* It's not a case match, so we'll delete the actual entry */ + SplayLinks = &PrefixTableEntry->Links; + + /* Find the root entry */ + while (!RtlIsRoot(SplayLinks)) SplayLinks = RtlParent(SplayLinks); + Entry = CONTAINING_RECORD(SplayLinks, + UNICODE_PREFIX_TABLE_ENTRY, + Links); + + /* Delete the entry and check if the whole tree is gone */ + SplayLinks = RtlDelete(&PrefixTableEntry->Links); + if (!SplayLinks) + { + /* The tree is also gone now, find the entry referencing us */ + RefEntry = Entry->NextPrefixTree; + while (RefEntry->NextPrefixTree != Entry) + { + /* Not this one, move to the next entry */ + RefEntry = RefEntry->NextPrefixTree; + } + + /* Link them so this entry stops being referenced */ + RefEntry->NextPrefixTree = Entry->NextPrefixTree; + } + else if (&Entry->Links != SplayLinks) + { + /* The tree is still here, but we got moved to a new one */ + NewEntry = CONTAINING_RECORD(SplayLinks, + UNICODE_PREFIX_TABLE_ENTRY, + Links); + + /* Find the entry referencing us */ + RefEntry = Entry->NextPrefixTree; + while (RefEntry->NextPrefixTree != Entry) + { + /* Not this one, move to the next entry */ + RefEntry = RefEntry->NextPrefixTree; + } + + /* Since we got moved, make us the new root entry */ + NewEntry->NodeTypeCode = PFX_NTC_ROOT; + + /* Link us with the entry referencing the old root */ + RefEntry->NextPrefixTree = NewEntry; + + /* And link us with the old tree */ + NewEntry->NextPrefixTree = Entry->NextPrefixTree; + + /* Set the old tree as a child */ + Entry->NodeTypeCode = PFX_NTC_CHILD; + Entry->NextPrefixTree = NULL; + } + } } }

1 0

[ion] 19034: - Implement PFX_NTC_CASE_MATCH deletions in RtlRemoveUnicodePrefix
by ion＠svn.reactos.com 07 Nov '05

07 Nov '05

- Implement PFX_NTC_CASE_MATCH deletions in RtlRemoveUnicodePrefix Modified: trunk/reactos/lib/rtl/unicodeprefix.c _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 01:01:29 UTC (rev 19033) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 04:23:28 UTC (rev 19034) @@ -175,7 +175,28 @@ RtlRemoveUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable, PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry) { - UNIMPLEMENTED; + PUNICODE_PREFIX_TABLE_ENTRY Entry; + + /* Erase the last entry */ + PrefixTable->LastNextEntry = NULL; + + /* Check if this was a Case Match Entry */ + if (PrefixTableEntry->NodeTypeCode == PFX_NTC_CASE_MATCH) + { + /* Get the case match entry */ + Entry = PrefixTableEntry->CaseMatch; + + /* Now loop until we find the one matching what the caller sent */ + while (Entry->CaseMatch != PrefixTableEntry) Entry = Entry->CaseMatch; + + /* We found the entry that was sent, link them to delete this entry */ + Entry->CaseMatch = PrefixTableEntry->CaseMatch; + } + else if ((PrefixTableEntry->NodeTypeCode == PFX_NTC_ROOT) || + (PrefixTableEntry->NodeTypeCode == PFX_NTC_CHILD)) + { + /* FIXME */ + } } /* EOF */

1 0

[ion] 19033: - Implement RtlInitializeUnicodePrefix and RtlNextUnicodePrefix. The UnicodePrefix package is needed by MUP and NPFS drivers.
by ion＠svn.reactos.com 07 Nov '05

07 Nov '05

- 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; }

1 0

[hpoussin] 19032: Add missing files to revision 19031
by hpoussin＠svn.reactos.com 06 Nov '05

06 Nov '05

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

1 0

[hpoussin] 19031: - Fix header mess by using a common header setupapi_private.h
by hpoussin＠svn.reactos.com 06 Nov '05

06 Nov '05

- 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);

1 0

[ekohl] 19030: - Read a services optional display name from the registry.
by ekohl＠svn.reactos.com 06 Nov '05

06 Nov '05

- 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); }

1 0

[turner] 19029: make the output visually pleasing.
by turner＠svn.reactos.com 06 Nov '05

06 Nov '05

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

1 0

[turner] 19028: %foo% where foo is not a envir var should be returned as %foo% not as "".
by turner＠svn.reactos.com 06 Nov '05

06 Nov '05

%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

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs