Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 20447: Relicence newdev.dll to LGPL. Christoph von Wittich and I both agree on this licence change.
by hpoussin＠svn.reactos.org 29 Dec '05

29 Dec '05

Relicence newdev.dll to LGPL. Christoph von Wittich and I both agree on this licence change. Do according changes in source to follow Wine way of code Modified: trunk/reactos/lib/newdev/newdev.c Deleted: trunk/reactos/lib/newdev/newdev.def Modified: trunk/reactos/lib/newdev/newdev.h Added: trunk/reactos/lib/newdev/newdev.spec Modified: trunk/reactos/lib/newdev/newdev.xml Modified: trunk/reactos/lib/newdev/stubs.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-12-29 22:43:36 UTC (rev 20446) +++ trunk/reactos/lib/newdev/newdev.c 2005-12-29 22:43:44 UTC (rev 20447) @@ -1,18 +1,29 @@ /* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS New devices installation -* FILE: lib/newdev/newdev.c -* PURPOSE: New devices installation -* -* PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) -* PROGRAMMERS: Christoph von Wittich (Christoph(a)ActiveVB.de) -*/ + * New device installer (newdev.dll) + * + * Copyright 2005 HervÚ Poussineau (hpoussin(a)reactos.org) + * 2005 Christoph von Wittich (Christoph(a)ActiveVB.de) + * + * 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 + */ -//#define NDEBUG -#include <debug.h> - +#define YDEBUG #include "newdev.h" +WINE_DEFAULT_DEBUG_CHANNEL(newdev); + static BOOL SearchDriver ( PDEVINSTDATA DevInstData, LPCTSTR Path ); static BOOL InstallDriver ( PDEVINSTDATA DevInstData ); static DWORD WINAPI FindDriverProc( LPVOID lpParam ); @@ -22,7 +33,7 @@ HINSTANCE hDllInstance; HANDLE hThread; -BOOL +static BOOL CanDisableDevice(IN DEVINST DevInst, IN HMACHINE hMachine, OUT BOOL *CanDisable) @@ -54,7 +65,7 @@ } -BOOL +static BOOL IsDeviceStarted(IN DEVINST DevInst, IN HMACHINE hMachine, OUT BOOL *IsEnabled) @@ -78,7 +89,7 @@ } -BOOL +static BOOL StartDevice(IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DevInfoData OPTIONAL, IN BOOL bEnable, @@ -745,20 +756,20 @@ DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); if (!SetupDiGetDeviceInstallParams(DevInstData->hDevInfo, &DevInstData->devInfoData, &DevInstallParams)) { - DPRINT("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); return FALSE; } DevInstallParams.FlagsEx |= DI_FLAGSEX_ALLOWEXCLUDEDDRVS; if (!SetupDiSetDeviceInstallParams(DevInstData->hDevInfo, &DevInstData->devInfoData, &DevInstallParams)) { - DPRINT("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); return FALSE; } ret = SetupDiBuildDriverInfoList(DevInstData->hDevInfo, &DevInstData->devInfoData, SPDIT_COMPATDRIVER); if (!ret) { - DPRINT("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); return FALSE; } @@ -773,10 +784,10 @@ { if (GetLastError() == ERROR_NO_MORE_ITEMS) return FALSE; - DPRINT("SetupDiEnumDriverInfo() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiEnumDriverInfo() failed with error 0x%lx\n", GetLastError()); return FALSE; } - DPRINT("Installing driver %S: %S\n", DevInstData->drvInfoData.MfgName, DevInstData->drvInfoData.Description); + TRACE("Installing driver %S: %S\n", DevInstData->drvInfoData.MfgName, DevInstData->drvInfoData.Description); return TRUE; } @@ -899,7 +910,7 @@ &DevInstData->devInfoData); if (!ret) { - DPRINT("SetupDiCallClassInstaller(DIF_SELECTBESTCOMPATDRV) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_SELECTBESTCOMPATDRV) failed with error 0x%lx\n", GetLastError()); return FALSE; } @@ -909,7 +920,7 @@ &DevInstData->devInfoData); if (!ret) { - DPRINT("SetupDiCallClassInstaller(DIF_ALLOW_INSTALL) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_ALLOW_INSTALL) failed with error 0x%lx\n", GetLastError()); return FALSE; } @@ -919,7 +930,7 @@ &DevInstData->devInfoData); if (!ret) { - DPRINT("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_PREANALYZE) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_PREANALYZE) failed with error 0x%lx\n", GetLastError()); return FALSE; } @@ -929,7 +940,7 @@ &DevInstData->devInfoData); if (!ret) { - DPRINT("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_POSTANALYZE) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_POSTANALYZE) failed with error 0x%lx\n", GetLastError()); return FALSE; } @@ -939,7 +950,7 @@ &DevInstData->devInfoData); if (!ret) { - DPRINT("SetupDiCallClassInstaller(DIF_INSTALLDEVICEFILES) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_INSTALLDEVICEFILES) failed with error 0x%lx\n", GetLastError()); return FALSE; } @@ -949,7 +960,7 @@ &DevInstData->devInfoData); if (!ret) { - DPRINT("SetupDiCallClassInstaller(DIF_REGISTER_COINSTALLERS) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_REGISTER_COINSTALLERS) failed with error 0x%lx\n", GetLastError()); return FALSE; } @@ -959,7 +970,7 @@ &DevInstData->devInfoData); if (!ret) { - DPRINT("SetupDiCallClassInstaller(DIF_INSTALLINTERFACES) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_INSTALLINTERFACES) failed with error 0x%lx\n", GetLastError()); return FALSE; } @@ -969,7 +980,7 @@ &DevInstData->devInfoData); if (!ret) { - DPRINT("SetupDiCallClassInstaller(DIF_INSTALLDEVICE) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_INSTALLDEVICE) failed with error 0x%lx\n", GetLastError()); return FALSE; } @@ -979,7 +990,7 @@ &DevInstData->devInfoData); if (!ret) { - DPRINT("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_FINISHINSTALL) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_FINISHINSTALL) failed with error 0x%lx\n", GetLastError()); return FALSE; } @@ -989,7 +1000,7 @@ &DevInstData->devInfoData); if (!ret) { - DPRINT("SetupDiCallClassInstaller(DIF_DESTROYPRIVATEDATA) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_DESTROYPRIVATEDATA) failed with error 0x%lx\n", GetLastError()); return FALSE; } @@ -1004,13 +1015,13 @@ if (DevInstData.devInfoData.cbSize != 0) { if (!SetupDiDestroyDriverInfoList(DevInstData.hDevInfo, &DevInstData.devInfoData, SPDIT_COMPATDRIVER)) - DPRINT("SetupDiDestroyDriverInfoList() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiDestroyDriverInfoList() failed with error 0x%lx\n", GetLastError()); } if (DevInstData.hDevInfo != INVALID_HANDLE_VALUE) { if (!SetupDiDestroyDeviceInfoList(DevInstData.hDevInfo)) - DPRINT("SetupDiDestroyDeviceInfoList() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiDestroyDeviceInfoList() failed with error 0x%lx\n", GetLastError()); } if (DevInstData.buffer) @@ -1018,6 +1029,9 @@ } +/* +* @implemented +*/ BOOL WINAPI DevInstallW( IN HWND hWndParent, @@ -1046,7 +1060,7 @@ DevInstData.hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); if (DevInstData.hDevInfo == INVALID_HANDLE_VALUE) { - DPRINT("SetupDiCreateDeviceInfoListExW() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCreateDeviceInfoListExW() failed with error 0x%lx\n", GetLastError()); CleanUp(); return FALSE; } @@ -1060,7 +1074,7 @@ &DevInstData.devInfoData); if (!ret) { - DPRINT("SetupDiOpenDeviceInfoW() failed with error 0x%lx (InstanceId %S)\n", GetLastError(), InstanceId); + TRACE("SetupDiOpenDeviceInfoW() failed with error 0x%lx (InstanceId %S)\n", GetLastError(), InstanceId); DevInstData.devInfoData.cbSize = 0; CleanUp(); return FALSE; @@ -1080,7 +1094,7 @@ DevInstData.buffer = HeapAlloc(GetProcessHeap(), 0, DevInstData.requiredSize); if (!DevInstData.buffer) { - DPRINT("HeapAlloc() failed\n"); + TRACE("HeapAlloc() failed\n"); SetLastError(ERROR_NOT_ENOUGH_MEMORY); } else @@ -1096,7 +1110,7 @@ } if (!ret) { - DPRINT("SetupDiGetDeviceRegistryProperty() failed with error 0x%lx (InstanceId %S)\n", GetLastError(), InstanceId); + TRACE("SetupDiGetDeviceRegistryProperty() failed with error 0x%lx (InstanceId %S)\n", GetLastError(), InstanceId); CleanUp(); return FALSE; } @@ -1123,7 +1137,7 @@ } */ - DPRINT("Installing %S (%S)\n", DevInstData.buffer, InstanceId); + TRACE("Installing %S (%S)\n", DevInstData.buffer, InstanceId); if ((!FindDriver(&DevInstData)) && (Show != SW_HIDE)) { @@ -1191,6 +1205,9 @@ return TRUE; } +/* +* @unimplemented +*/ BOOL WINAPI ClientSideInstallW(IN HWND hWndOwner, IN DWORD dwUnknownFlags, _____ Deleted: trunk/reactos/lib/newdev/newdev.def --- trunk/reactos/lib/newdev/newdev.def 2005-12-29 22:43:36 UTC (rev 20446) +++ trunk/reactos/lib/newdev/newdev.def 2005-12-29 22:43:44 UTC (rev 20447) @@ -1,16 +0,0 @@ -LIBRARY newdev.dll - -EXPORTS -ClientSideInstallW@12 -DevInstallW@16 -;InstallDevInst -;InstallDevInstEx -InstallNewDevice@12 -;InstallSelectedDevice -InstallSelectedDriverW@20 -;InstallWindowsUpdateDriver -;RollbackDriver -UpdateDriverForPlugAndPlayDevicesA@20 -UpdateDriverForPlugAndPlayDevicesW@20 - -;EOF \ No newline at end of file _____ Modified: trunk/reactos/lib/newdev/newdev.h --- trunk/reactos/lib/newdev/newdev.h 2005-12-29 22:43:36 UTC (rev 20446) +++ trunk/reactos/lib/newdev/newdev.h 2005-12-29 22:43:44 UTC (rev 20447) @@ -4,13 +4,12 @@ #include <setupapi.h> #include <cfgmgr32.h> #include <tchar.h> +#include <wine/debug.h> #include <stdio.h> #include "resource.h" -ULONG DbgPrint(PCH Format,...); - typedef struct _DEVINSTDATA { HFONT hTitleFont; _____ Added: trunk/reactos/lib/newdev/newdev.spec --- trunk/reactos/lib/newdev/newdev.spec 2005-12-29 22:43:36 UTC (rev 20446) +++ trunk/reactos/lib/newdev/newdev.spec 2005-12-29 22:43:44 UTC (rev 20447) @@ -0,0 +1,11 @@ +@ stdcall ClientSideInstallW(ptr long wstr) +@ stdcall DevInstallW(ptr ptr wstr long) +@ stub InstallDevInst +@ stub InstallDevInstEx +@ stdcall InstallNewDevice(ptr ptr ptr) +@ stub InstallSelectedDevice +@ stdcall InstallSelectedDriverW(ptr ptr wstr long ptr) +@ stub InstallWindowsUpdateDriver +@ stub RollbackDriver +@ stdcall UpdateDriverForPlugAndPlayDevicesA(ptr str str long ptr) +@ stdcall UpdateDriverForPlugAndPlayDevicesW(ptr wstr wstr long ptr) _____ Modified: trunk/reactos/lib/newdev/newdev.xml --- trunk/reactos/lib/newdev/newdev.xml 2005-12-29 22:43:36 UTC (rev 20446) +++ trunk/reactos/lib/newdev/newdev.xml 2005-12-29 22:43:44 UTC (rev 20447) @@ -2,12 +2,14 @@ <include base="newdev">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <importlibrary definition="newdev.def" /> + <importlibrary definition="newdev.spec.def" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <file>newdev.c</file> <file>stubs.c</file> <file>newdev.rc</file> + <file>newdev.spec</file> + <library>wine</library> <library>gdi32</library> <library>comctl32</library> <library>ntdll</library> _____ Modified: trunk/reactos/lib/newdev/stubs.c --- trunk/reactos/lib/newdev/stubs.c 2005-12-29 22:43:36 UTC (rev 20446) +++ trunk/reactos/lib/newdev/stubs.c 2005-12-29 22:43:44 UTC (rev 20447) @@ -1,17 +1,30 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS New devices installation - * FILE: lib/newdev/stubs.c - * PURPOSE: Stubs + * New device installer (newdev.dll) * - * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) + * Copyright 2005 HervÚ Poussineau (hpoussin(a)reactos.org) + * + * 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 */ -//#define NDEBUG -#include <debug.h> - #include "newdev.h" +WINE_DEFAULT_DEBUG_CHANNEL(newdev); + +/* +* @unimplemented +*/ BOOL WINAPI InstallNewDevice( IN HWND hwndParent, @@ -23,6 +36,9 @@ return FALSE; } +/* +* @unimplemented +*/ BOOL WINAPI InstallSelectedDriverW( IN HWND hwndParent, @@ -35,7 +51,3 @@ SetLastError(ERROR_GEN_FAILURE); return FALSE; } - - - -

1 0

[greatlrd] 20446: sorry did commit debug on by mistake
by greatlrd＠svn.reactos.org 29 Dec '05

29 Dec '05

sorry did commit debug on by mistake Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-12-29 22:38:56 UTC (rev 20445) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-12-29 22:43:36 UTC (rev 20446) @@ -15,8 +15,7 @@ /* INCLUDES *****************************************************************/ #include <advapi32.h> -//#define NDEBUG -#define YDEBUG +#define NDEBUG #include <wine/debug.h> /* DEFINES ******************************************************************/

1 0

[greatlrd] 20445: new icon from mf
by greatlrd＠svn.reactos.org 29 Dec '05

29 Dec '05

new icon from mf Modified: trunk/reactos/lib/advapi32/reg/reg.c Modified: trunk/reactos/subsys/system/explorer/res/apps.ico _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-12-29 22:24:19 UTC (rev 20444) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-12-29 22:38:56 UTC (rev 20445) @@ -15,7 +15,8 @@ /* INCLUDES *****************************************************************/ #include <advapi32.h> -#define NDEBUG +//#define NDEBUG +#define YDEBUG #include <wine/debug.h> /* DEFINES ******************************************************************/ _____ Modified: trunk/reactos/subsys/system/explorer/res/apps.ico (Binary files differ)

1 0

[turner] 20444: Correctly open the registry when using MOVEFILE_DELAY_UNTIL_REBOOT
by turner＠svn.reactos.org 29 Dec '05

29 Dec '05

Correctly open the registry when using MOVEFILE_DELAY_UNTIL_REBOOT Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-12-29 22:02:14 UTC (rev 20443) +++ trunk/reactos/lib/kernel32/file/move.c 2005-12-29 22:24:19 UTC (rev 20444) @@ -72,14 +72,12 @@ static const WCHAR ValueName[] = {'P','e','n','d','i','n','g', 'F','i','l','e','R','e','n','a','m','e', 'O','p','e','r','a','t','i','o','n','s',0}; - static const WCHAR SessionW[] = {'M','a','c','h','i','n','e','\\', - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\' , - 'C','o','n','t','r','o','l','\\', - 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; + + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Co ntrol\\Session Manager"); + static const int info_size = FIELD_OFFSET( KEY_VALUE_PARTIAL_INFORMATION, Data ); - OBJECT_ATTRIBUTES attr; + OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING nameW, source_name, dest_name; KEY_VALUE_PARTIAL_INFORMATION *info; BOOL rc = FALSE; @@ -88,6 +86,7 @@ DWORD DataSize = 0; BYTE *Buffer = NULL; WCHAR *p; + NTSTATUS Status; DPRINT("Add support to smss for keys created by MOVEFILE_DELAY_UNTIL_REBOOT\n"); @@ -104,18 +103,30 @@ return FALSE; } - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, SessionW ); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); - if (NtCreateKey( &Reboot, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) + Status = NtOpenKey(&Reboot, + KEY_ALL_ACCESS, + &ObjectAttributes); + + if (!NT_SUCCESS(Status)) { - DPRINT1("Error creating key for reboot managment [%s]\n", - "SYSTEM\\CurrentControlSet\\Control\\Session Manager"); + Status = NtCreateKey(&Reboot, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); + } + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); RtlFreeUnicodeString( &source_name ); RtlFreeUnicodeString( &dest_name ); return FALSE;

1 0

[hpoussin] 20443: Set DI_FLAGSEX_ALLOWEXCLUDEDDRVS flag when searching a driver for a PnP device
by hpoussin＠svn.reactos.org 29 Dec '05

29 Dec '05

Set DI_FLAGSEX_ALLOWEXCLUDEDDRVS flag when searching a driver for a PnP device Modified: trunk/reactos/lib/newdev/newdev.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-12-29 21:46:40 UTC (rev 20442) +++ trunk/reactos/lib/newdev/newdev.c 2005-12-29 22:02:14 UTC (rev 20443) @@ -739,9 +739,22 @@ FindDriver( IN PDEVINSTDATA DevInstData) { - + SP_DEVINSTALL_PARAMS DevInstallParams = {0,}; BOOL ret; + DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (!SetupDiGetDeviceInstallParams(DevInstData->hDevInfo, &DevInstData->devInfoData, &DevInstallParams)) + { + DPRINT("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + DevInstallParams.FlagsEx |= DI_FLAGSEX_ALLOWEXCLUDEDDRVS; + if (!SetupDiSetDeviceInstallParams(DevInstData->hDevInfo, &DevInstData->devInfoData, &DevInstallParams)) + { + DPRINT("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + ret = SetupDiBuildDriverInfoList(DevInstData->hDevInfo, &DevInstData->devInfoData, SPDIT_COMPATDRIVER); if (!ret) {

1 0

[greatlrd] 20442: Fix Bug 1217 with patch from bugzila by ravelo "If you type > or < in cmd and hit ENTER, cmd.exe crashes"
by greatlrd＠svn.reactos.org 29 Dec '05

29 Dec '05

Fix Bug 1217 with patch from bugzila by ravelo "If you type > or < in cmd and hit ENTER, cmd.exe crashes" Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-12-29 21:45:17 UTC (rev 20441) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-12-29 21:46:40 UTC (rev 20442) @@ -1385,9 +1385,10 @@ tmp = commandline; tmp += _tcsspn(tmp,_T(" \t")); /* first we find and skip and pre-redirections... */ - while ( _tcschr(_T("<>"),*tmp) + while (( tmp ) && + ( _tcschr(_T("<>"),*tmp) || !_tcsncmp(tmp,_T("1>"),2) - || !_tcsncmp(tmp,_T("2>"),2) ) + || !_tcsncmp(tmp,_T("2>"),2) )) { if ( _istdigit(*tmp) ) tmp += 2; @@ -1402,7 +1403,8 @@ } else tmp = _tcspbrk(tmp,_T(" \t")); - tmp += _tcsspn(tmp,_T(" \t")); + if ( tmp ) + tmp += _tcsspn(tmp,_T(" \t")); } /* we should now be pointing to the actual command * (if there is one yet)*/

1 0

[weiden] 20441: add some missing constants
by weiden＠svn.reactos.org 29 Dec '05

29 Dec '05

add some missing constants Modified: trunk/reactos/w32api/include/setupapi.h _____ Modified: trunk/reactos/w32api/include/setupapi.h --- trunk/reactos/w32api/include/setupapi.h 2005-12-29 21:43:21 UTC (rev 20440) +++ trunk/reactos/w32api/include/setupapi.h 2005-12-29 21:45:17 UTC (rev 20441) @@ -98,6 +98,13 @@ #define DI_FLAGSEX_RESERVED1 0x00400000 #define DI_FLAGSEX_EXCLUDE_OLD_INET_DRIVERS 0x00800000 #define DI_FLAGSEX_POWERPAGE_ADDED 0x01000000 +#if (_SETUPAPI_VER >= 0x0501) +#define DI_FLAGSEX_FILTERSIMILARDRIVERS 0x02000000 +#define DI_FLAGSEX_INSTALLEDDRIVER 0x04000000 +#define DI_FLAGSEX_NO_CLASSLIST_NODE_MERGE 0x08000000 +#define DI_FLAGSEX_ALTPLATFORM_DRVSEARCH 0x10000000 +#define DI_FLAGSEX_RESTART_DEVICE_ONLY 0x20000000 +#endif #define DIBCI_NOINSTALLCLASS 0x00000001 #define DIBCI_NODISPLAYCLASS 0x00000002 #define DICD_GENERATE_ID 0x00000001

1 0

[weiden] 20440: add the driver details dialog (not fully implemented)
by weiden＠svn.reactos.org 29 Dec '05

29 Dec '05

add the driver details dialog (not fully implemented) Modified: trunk/reactos/lib/devmgr/De.rc Modified: trunk/reactos/lib/devmgr/En.rc Modified: trunk/reactos/lib/devmgr/advprop.c Modified: trunk/reactos/lib/devmgr/misc.c Modified: trunk/reactos/lib/devmgr/precomp.h Modified: trunk/reactos/lib/devmgr/resource.h _____ Modified: trunk/reactos/lib/devmgr/De.rc --- trunk/reactos/lib/devmgr/De.rc 2005-12-29 21:01:51 UTC (rev 20439) +++ trunk/reactos/lib/devmgr/De.rc 2005-12-29 21:43:21 UTC (rev 20440) @@ -143,3 +143,4 @@ LTEXT "Treiberversion:", -1, 37, 67, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY END + _____ Modified: trunk/reactos/lib/devmgr/En.rc --- trunk/reactos/lib/devmgr/En.rc 2005-12-29 21:01:51 UTC (rev 20439) +++ trunk/reactos/lib/devmgr/En.rc 2005-12-29 21:43:21 UTC (rev 20440) @@ -24,6 +24,9 @@ IDS_PROPERTIES "P&roperties" IDS_UPDATEDRV "U&pdate Driver..." IDS_REBOOT "Restart &Computer..." + IDS_NOTAVAILABLE "Not available" + IDS_NOTDIGITALLYSIGNED "Not digitally signed" + IDS_NODRIVERS "No driver files are required or have been loaded for this device." END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -141,4 +144,31 @@ EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Driver version:", -1, 37, 67, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Digital Signer:", -1, 37, 81, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX END + +IDD_DRIVERDETAILS DIALOG DISCARDABLE 0, 0, 224, 250 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Driver File Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "&Driver files:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LTEXT "Provider:", -1, 14, 134, 50, 8 + LTEXT "", IDC_FILEPROVIDER, 66, 134, 155, 8 + LTEXT "File version:", -1, 14, 150, 50, 8 + LTEXT "", IDC_FILEVERSION, 66, 150, 155, 8 + LTEXT "Copyright:", -1, 14, 166, 50, 8 + LTEXT "", IDC_FILECOPYRIGHT, 66, 166, 155, 8 + LTEXT "Digital Signer:", -1, 14, 182, 50, 8 + LTEXT "", IDC_DIGITALSIGNER, 66, 182, 155, 8 + PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 +END + _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-12-29 21:01:51 UTC (rev 20439) +++ trunk/reactos/lib/devmgr/advprop.c 2005-12-29 21:43:21 UTC (rev 20440) @@ -76,10 +76,210 @@ /* struct may be dynamically expanded here! */ } DEVADVPROP_INFO, *PDEVADVPROP_INFO; + +typedef struct _ENUMDRIVERFILES_CONTEXT +{ + HWND hDriversListView; + UINT nCount; +} ENUMDRIVERFILES_CONTEXT, *PENUMDRIVERFILES_CONTEXT; + #define PM_INITIALIZE (WM_APP + 0x101) +static UINT WINAPI +EnumDeviceDriverFilesCallback(IN PVOID Context, + IN UINT Notification, + IN UINT_PTR Param1, + IN UINT_PTR Param2) +{ + LVITEM li; + PENUMDRIVERFILES_CONTEXT EnumDriverFilesContext = (PENUMDRIVERFILES_CONTEXT)Context; + + li.mask = LVIF_TEXT | LVIF_STATE; + li.iItem = EnumDriverFilesContext->nCount++; + li.iSubItem = 0; + li.state = (li.iItem == 0 ? LVIS_SELECTED : 0); + li.stateMask = LVIS_SELECTED; + li.pszText = (LPWSTR)Param1; + ListView_InsertItem(EnumDriverFilesContext->hDriversListView, + &li); + return NO_ERROR; +} + + static VOID +UpdateDriverDetailsDlg(IN HWND hwndDlg, + IN HWND hDriversListView, + IN PDEVADVPROP_INFO dap) +{ + HDEVINFO DeviceInfoSet; + PSP_DEVINFO_DATA DeviceInfoData; + SP_DRVINFO_DATA DriverInfoData; + ENUMDRIVERFILES_CONTEXT EnumDriverFilesContext; + + if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) + { + DeviceInfoSet = dap->CurrentDeviceInfoSet; + DeviceInfoData = &dap->CurrentDeviceInfoData; + } + else + { + DeviceInfoSet = dap->DeviceInfoSet; + DeviceInfoData = &dap->DeviceInfoData; + } + + /* set the device image */ + SendDlgItemMessage(hwndDlg, + IDC_DEVICON, + STM_SETICON, + (WPARAM)dap->hDevIcon, + 0); + + /* set the device name edit control text */ + SetDlgItemText(hwndDlg, + IDC_DEVNAME, + dap->szDevName); + + /* fill the driver files list view */ + EnumDriverFilesContext.hDriversListView = hDriversListView; + EnumDriverFilesContext.nCount = 0; + + ListView_DeleteAllItems(EnumDriverFilesContext.hDriversListView); + DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA); + if (FindCurrentDriver(DeviceInfoSet, + DeviceInfoData, + &DriverInfoData) && + SetupDiSetSelectedDriver(DeviceInfoSet, + DeviceInfoData, + &DriverInfoData)) + { + HSPFILEQ queueHandle; + + queueHandle = SetupOpenFileQueue(); + if (queueHandle != (HSPFILEQ)INVALID_HANDLE_VALUE) + { + SP_DEVINSTALL_PARAMS DeviceInstallParams = {0}; + DeviceInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParams(DeviceInfoSet, + DeviceInfoData, + &DeviceInstallParams)) + { + DeviceInstallParams.FileQueue = queueHandle; + DeviceInstallParams.Flags |= DI_NOVCP; + + if (SetupDiSetDeviceInstallParams(DeviceInfoSet, + DeviceInfoData, + &DeviceInstallParams) && + SetupDiCallClassInstaller(DIF_INSTALLDEVICEFILES, + DeviceInfoSet, + DeviceInfoData)) + { + DWORD scanResult; + RECT rcClient; + LVCOLUMN lvc; + + /* enumerate the driver files */ + SetupScanFileQueue(queueHandle, + SPQ_SCAN_USE_CALLBACK, + NULL, + EnumDeviceDriverFilesCallback, + &EnumDriverFilesContext, + &scanResult); + + /* update the list view column width */ + GetClientRect(hDriversListView, + &rcClient); + lvc.mask = LVCF_WIDTH; + lvc.cx = rcClient.right; + ListView_SetColumn(hDriversListView, + 0, + &lvc); + } + } + + SetupCloseFileQueue(queueHandle); + } + } +} + + +static INT_PTR +CALLBACK +DriverDetailsDlgProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PDEVADVPROP_INFO dap; + INT_PTR Ret = FALSE; + + dap = (PDEVADVPROP_INFO)GetWindowLongPtr(hwndDlg, + DWL_USER); + + if (dap != NULL || uMsg == WM_INITDIALOG) + { + switch (uMsg) + { + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDOK: + { + EndDialog(hwndDlg, + IDOK); + break; + } + } + break; + } + + case WM_CLOSE: + { + EndDialog(hwndDlg, + IDCANCEL); + break; + } + + case WM_INITDIALOG: + { + LV_COLUMN lvc; + HWND hDriversListView; + + dap = (PDEVADVPROP_INFO)lParam; + if (dap != NULL) + { + SetWindowLongPtr(hwndDlg, + DWL_USER, + (DWORD_PTR)dap); + + hDriversListView = GetDlgItem(hwndDlg, + IDC_DRIVERFILES); + + /* add a column to the list view control */ + lvc.mask = LVCF_FMT | LVCF_WIDTH; + lvc.fmt = LVCFMT_LEFT; + lvc.cx = 0; + ListView_InsertColumn(hDriversListView, + 0, + &lvc); + + UpdateDriverDetailsDlg(hwndDlg, + hDriversListView, + dap); + } + + Ret = TRUE; + break; + } + } + } + + return Ret; +} + + +static VOID UpdateDriverDlg(IN HWND hwndDlg, IN PDEVADVPROP_INFO dap) { @@ -161,6 +361,23 @@ { switch (uMsg) { + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_DRIVERDETAILS: + { + DialogBoxParam(hDllInstance, + MAKEINTRESOURCE(IDD_DRIVERDETAILS), + hwndDlg, + DriverDetailsDlgProc, + (ULONG_PTR)dap); + break; + } + } + break; + } + case WM_NOTIFY: { NMHDR *hdr = (NMHDR*)lParam; _____ Modified: trunk/reactos/lib/devmgr/misc.c --- trunk/reactos/lib/devmgr/misc.c 2005-12-29 21:01:51 UTC (rev 20439) +++ trunk/reactos/lib/devmgr/misc.c 2005-12-29 21:43:21 UTC (rev 20440) @@ -27,6 +27,9 @@ */ #include <precomp.h> +#define NDEBUG +#include <debug.h> + HINSTANCE hDllInstance = NULL; @@ -566,7 +569,7 @@ { /* unable to query the information */ if (LoadString(hDllInstance, - IDS_UNKNOWN, + IDS_NOTAVAILABLE, szBuffer, BufferSize)) { @@ -632,7 +635,7 @@ { /* unable to query the information */ if (LoadString(hDllInstance, - IDS_UNKNOWN, + IDS_NOTAVAILABLE, szBuffer, BufferSize)) { @@ -882,6 +885,189 @@ } +BOOL +FindCurrentDriver(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT PSP_DRVINFO_DATA DriverInfoData) +{ + HKEY hKey = INVALID_HANDLE_VALUE; + SP_DEVINSTALL_PARAMS InstallParams = {0}; + SP_DRVINFO_DETAIL_DATA DriverInfoDetailData = {0}; + WCHAR InfPath[MAX_PATH]; + WCHAR InfSection[LINE_LEN]; + DWORD dwType, dwLength; + DWORD i = 0; + LONG rc; + BOOL Ret = FALSE; + + /* Steps to find the right driver: + * 1) Get the device install parameters + * 2) Open the driver registry key + * 3) Read the .inf file name + * 4) Update install params, by setting DI_ENUMSINGLEINF and .inf file name + * 5) Build class driver list + * 6) Read inf section and inf section extension from registry + * 7) Enumerate drivers + * 8) Find the one who is in the same section as current driver? + */ + + /* 1) Get the install params */ + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (!SetupDiGetDeviceInstallParams(DeviceInfoSet, + DeviceInfoData, + &InstallParams)) + { + DPRINT1("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); + goto Cleanup; + } + +#ifdef DI_FLAGSEX_INSTALLEDDRIVER + InstallParams.FlagsEx |= (DI_FLAGSEX_INSTALLEDDRIVER | DI_FLAGSEX_ALLOWEXCLUDEDDRVS); + if (SetupDiSetDeviceInstallParams(DeviceInfoSet, + DeviceInfoData, + &InstallParams)) + { + if (SetupDiBuildDriverInfoList(DeviceInfoSet, + DeviceInfoData, + SPDIT_CLASSDRIVER) && + SetupDiEnumDriverInfo(DeviceInfoSet, + DeviceInfoData, + SPDIT_CLASSDRIVER, + 0, + DriverInfoData)) + { + Ret = TRUE; + } + + goto Cleanup; + } + InstallParams.FlagsEx &= ~(DI_FLAGSEX_INSTALLEDDRIVER | DI_FLAGSEX_ALLOWEXCLUDEDDRVS); +#endif + + /* 2) Open the driver registry key */ + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DRV, + KEY_QUERY_VALUE); + if (hKey == INVALID_HANDLE_VALUE) + { + DPRINT1("SetupDiOpenDevRegKey() failed with error 0x%lx\n", GetLastError()); + goto Cleanup; + } + + /* 3) Read the .inf file name */ + dwLength = (sizeof(InfPath) / sizeof(InfPath[0])) - 1; + rc = RegQueryValueEx(hKey, + REGSTR_VAL_INFPATH, + 0, + &dwType, + (LPBYTE)InfPath, + &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + DPRINT1("RegQueryValueEx() failed with error 0x%lx\n", GetLastError()); + goto Cleanup; + } + else if (dwType != REG_SZ) + { + SetLastError(ERROR_GEN_FAILURE); + DPRINT1("Expected registry type REG_SZ (%lu), got %lu\n", REG_SZ, dwType); + goto Cleanup; + } + InfPath[(dwLength / sizeof(WCHAR)) - 1] = L'\0'; + + /* 4) Update install params, by setting DI_ENUMSINGLEINF and .inf file name */ + InstallParams.Flags |= DI_ENUMSINGLEINF; + InstallParams.FlagsEx |= DI_FLAGSEX_ALLOWEXCLUDEDDRVS; + wcscpy(InstallParams.DriverPath, InfPath); + if (!SetupDiSetDeviceInstallParams(DeviceInfoSet, + DeviceInfoData, + &InstallParams)) + { + DPRINT1("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); + goto Cleanup; + } + + /* 5) Build class driver list */ + if (!SetupDiBuildDriverInfoList(DeviceInfoSet, + DeviceInfoData, + SPDIT_CLASSDRIVER)) + { + DPRINT1("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); + goto Cleanup; + } + + /* 6) Read inf section and from registry */ + dwLength = (sizeof(InfSection) / sizeof(InfSection[0])) - 1; + rc = RegQueryValueEx(hKey, + REGSTR_VAL_INFSECTION, + 0, + &dwType, + (LPBYTE)InfSection, + &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + DPRINT1("RegQueryValueEx() failed with error 0x%lx\n", GetLastError()); + goto Cleanup; + } + else if (dwType != REG_SZ) + { + SetLastError(ERROR_GEN_FAILURE); + DPRINT1("Expected registry type REG_SZ (%lu), got %lu\n", REG_SZ, dwType); + goto Cleanup; + } + InfPath[(dwLength / sizeof(WCHAR)) - 1] = L'\0'; + + /* 7) Enumerate drivers */ + DriverInfoData->cbSize = sizeof(SP_DRVINFO_DATA); + DriverInfoDetailData.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA); + while (SetupDiEnumDriverInfo(DeviceInfoSet, + DeviceInfoData, + SPDIT_CLASSDRIVER, + i, + DriverInfoData)) + { + /* 8) Find the one who is in the same section as current driver */ + if (!SetupDiGetDriverInfoDetail(DeviceInfoSet, + DeviceInfoData, + DriverInfoData, + &DriverInfoDetailData, + DriverInfoDetailData.cbSize, + NULL) && + GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + DPRINT1("SetupDiGetDriverInfoDetail() failed with error 0x%lx\n", GetLastError()); + goto Cleanup; + } + if (!wcsicmp(DriverInfoDetailData.SectionName, + InfSection) != 0) + { + /* We have found the right driver */ + Ret = TRUE; + goto Cleanup; + } + + i++; + } + if (GetLastError() != ERROR_NO_MORE_ITEMS) + { + DPRINT1("SetupDiEnumDriverInfo() failed with error 0x%lx\n", GetLastError()); + goto Cleanup; + } + + SetLastError(ERROR_NO_DRIVER_SELECTED); + +Cleanup: + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + return Ret; +} + + HINSTANCE LoadAndInitComctl32(VOID) { _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-12-29 21:01:51 UTC (rev 20439) +++ trunk/reactos/lib/devmgr/precomp.h 2005-12-29 21:43:21 UTC (rev 20440) @@ -313,6 +313,11 @@ OUT LPWSTR szBuffer, IN DWORD BufferSize); +BOOL +FindCurrentDriver(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT PSP_DRVINFO_DATA DriverInfoData); + #endif /* __DEVMGR_H */ /* EOF */ _____ Modified: trunk/reactos/lib/devmgr/resource.h --- trunk/reactos/lib/devmgr/resource.h 2005-12-29 21:01:51 UTC (rev 20439) +++ trunk/reactos/lib/devmgr/resource.h 2005-12-29 21:43:21 UTC (rev 20440) @@ -7,6 +7,7 @@ #define IDD_DEVICEGENERAL 101 #define IDD_DEVICEDRIVER 102 #define IDD_DEVICERESOURCES 103 +#define IDD_DRIVERDETAILS 104 #define IDC_DEVICON 0x57B #define IDC_DEVNAME 0x57C @@ -29,6 +30,12 @@ #define IDC_DRVPROVIDER 0x58D #define IDC_DRVDATE 0x58E #define IDC_DRVVERSION 0x58F +#define IDC_DIGITALSIGNER 0x590 +#define IDC_DRIVERDETAILS 0x591 +#define IDC_DRIVERFILES 0x592 +#define IDC_FILEPROVIDER 0x593 +#define IDC_FILEVERSION 0x594 +#define IDC_FILECOPYRIGHT 0x594 #define IDS_NAME 0x100 #define IDS_TYPE 0x101 @@ -50,6 +57,9 @@ #define IDS_UPDATEDRV 0x111 #define IDS_REINSTALLDRV 0x112 #define IDS_REBOOT 0x113 +#define IDS_NOTAVAILABLE 0x114 +#define IDS_NOTDIGITALLYSIGNED 0x115 +#define IDS_NODRIVERS 0x116 #define IDS_DEV_NO_PROBLEM 0x200 #define IDS_DEV_NOT_CONFIGURED 0x201

1 0

[greatlrd] 20439: do not call on NtQuerySecurityObject in RegGetKeySecurity for it will always fail on reactos.
by greatlrd＠svn.reactos.org 29 Dec '05

29 Dec '05

do not call on NtQuerySecurityObject in RegGetKeySecurity for it will always fail on reactos. adding #ifndef __REACTOS__ around that code and should be remove when we have that call implement in reactos. Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-12-29 20:51:14 UTC (rev 20438) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-12-29 21:01:51 UTC (rev 20439) @@ -2507,12 +2507,13 @@ TRACE("MapDefaultKey() failed (Status %lx)\n", Status); return RtlNtStatusToDosError (Status); } - +#ifndef __REACTOS__ Status = NtQuerySecurityObject(KeyHandle, SecurityInformation, pSecurityDescriptor, *lpcbSecurityDescriptor, lpcbSecurityDescriptor); +#endif ClosePredefKey(KeyHandle);

1 0

[weiden] 20438: fixed uninitialized variable error
by weiden＠svn.reactos.org 29 Dec '05

29 Dec '05

fixed uninitialized variable error Modified: trunk/reactos/ntoskrnl/ex/error.c _____ Modified: trunk/reactos/ntoskrnl/ex/error.c --- trunk/reactos/ntoskrnl/ex/error.c 2005-12-29 20:31:22 UTC (rev 20437) +++ trunk/reactos/ntoskrnl/ex/error.c 2005-12-29 20:51:14 UTC (rev 20438) @@ -99,7 +99,7 @@ IN ULONG ValidResponseOptions, OUT PULONG Response) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PULONG_PTR SafeParams = NULL; ULONG SafeResponse; UNICODE_STRING SafeString;

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