Ros-diffs

ros-diffs@reactos.org

81390 discussions

[frik85] 20196: RosCMS update:
by frik85＠svn.reactos.com 15 Dec '05

15 Dec '05

RosCMS update: * user accounts admin interface page: improve the navigation Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php 2005-12-15 19:12:37 UTC (rev 20195) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php 2005-12-15 19:49:52 UTC (rev 20196) @@ -105,10 +105,6 @@ else { echo '<a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt=all&langid='.$rpm_lang_id.'">all users</a>'; } - if ($rpm_filt == "history") { - echo ' | history'; - $ros_cms_intern_users_filt = "WHERE user_name = '".$rpm_opt."'"; - } echo ''; if ($rpm_sort == "") { @@ -195,17 +191,221 @@ // Setting: $roscms_intern_items_per_page = 50; - $roscms_SET_curpos = ""; +$roscms_SET_letter = ""; if (array_key_exists("curpos", $_GET)) $roscms_SET_curpos=htmlspecialchars($_GET["curpos"]); +if (array_key_exists("letter", $_GET)) $roscms_SET_letter=htmlspecialchars($_GET["letter"]); + + + + echo ''; + + if ($roscms_SET_letter == "all" || $roscms_SET_letter == "") { + echo ' All '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=all" class="letterbarlink">All</a> '; + } + + if ($roscms_SET_letter == "a") { + echo ' A '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=a" class="letterbarlink">A</a> '; + } + + if ($roscms_SET_letter == "b") { + echo ' B '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=b" class="letterbarlink">B</a> '; + } + + if ($roscms_SET_letter == "c") { + echo ' C '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=c" class="letterbarlink">C</a> '; + } + + if ($roscms_SET_letter == "d") { + echo ' D '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=d" class="letterbarlink">D</a> '; + } + + if ($roscms_SET_letter == "e") { + echo ' E '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=e" class="letterbarlink">E</a> '; + } + + if ($roscms_SET_letter == "f") { + echo ' F '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=f" class="letterbarlink">F</a> '; + } + + if ($roscms_SET_letter == "g") { + echo ' G '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=g" class="letterbarlink">G</a> '; + } + + if ($roscms_SET_letter == "h") { + echo ' H '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=h" class="letterbarlink">H</a> '; + } + + if ($roscms_SET_letter == "i") { + echo ' I '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=i" class="letterbarlink">I</a> '; + } + + if ($roscms_SET_letter == "j") { + echo ' J '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=j" class="letterbarlink">J</a> '; + } + + if ($roscms_SET_letter == "k") { + echo ' K '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=k" class="letterbarlink">K</a> '; + } + + if ($roscms_SET_letter == "l") { + echo ' L '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=l" class="letterbarlink">L</a> '; + } + + if ($roscms_SET_letter == "m") { + echo ' M '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=m" class="letterbarlink">M</a> '; + } + + if ($roscms_SET_letter == "n") { + echo ' N '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=n" class="letterbarlink">N</a> '; + } + + if ($roscms_SET_letter == "o") { + echo ' O '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=o" class="letterbarlink">O</a> '; + } + + if ($roscms_SET_letter == "p") { + echo ' P '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=p" class="letterbarlink">P</a> '; + } + + if ($roscms_SET_letter == "q") { + echo ' Q '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=q" class="letterbarlink">Q</a> '; + } + + if ($roscms_SET_letter == "r") { + echo ' R '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=r" class="letterbarlink">R</a> '; + } + + if ($roscms_SET_letter == "s") { + echo ' S '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=s" class="letterbarlink">S</a> '; + } + + if ($roscms_SET_letter == "t") { + echo ' T '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=t" class="letterbarlink">T</a> '; + } + + if ($roscms_SET_letter == "u") { + echo ' U '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=u" class="letterbarlink">U</a> '; + } + + if ($roscms_SET_letter == "v") { + echo ' V '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=v" class="letterbarlink">V</a> '; + } + + if ($roscms_SET_letter == "w") { + echo ' W '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=w" class="letterbarlink">W</a> '; + } + + if ($roscms_SET_letter == "x") { + echo ' X '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=x" class="letterbarlink">X</a> '; + } + + if ($roscms_SET_letter == "y") { + echo ' Y '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=y" class="letterbarlink">Y</a> '; + } + + if ($roscms_SET_letter == "z") { + echo ' Z '; + } + else { + echo ' <a href="?page=admin&sec=users&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'&amp ;letter=z" class="letterbarlink">Z</a> '; + } + + echo ""; + + + if (!$roscms_SET_curpos) { $roscms_SET_curpos = 0; } +if ($roscms_SET_letter == "all") { + $roscms_SET_letter = "%"; +} + $query_count_cat=mysql_query("SELECT COUNT('user_id') FROM `users` WHERE `user_account_enabled` = 'yes' AND `user_account_hidden` = 'no' + AND `user_name` LIKE '" . $roscms_SET_letter . "%' ORDER BY `user_name` ASC ;"); $result_count_cat = mysql_fetch_row($query_count_cat); @@ -217,7 +417,7 @@ echo "".$j." "; } else { - echo "<a href='?page=admin&sec=users&sec2=view&sort=".$rpm_sort."&amp ;filt=".$rpm_filt."&opt=".$rpm_opt."&langid=".$rpm_lang_id."&amp ;curpos=".$i."'>".$j."</a> "; + echo "<a href='?page=admin&sec=users&sec2=view&sort=".$rpm_sort."&amp ;filt=".$rpm_filt."&opt=".$rpm_opt."&langid=".$rpm_lang_id."&amp ;letter=".$roscms_SET_letter."&curpos=".$i."'>".$j."</a> "; } } $j=0; @@ -240,9 +440,10 @@ <td width="10%"> <div align="center">Lang</div></td> </tr> <?php + $query_page = mysql_query("SELECT * FROM users - $ros_cms_intern_users_filt $ros_cms_intern_users_lang + $ros_cms_intern_users_filt $ros_cms_intern_users_lang AND `user_name` LIKE '" . $roscms_SET_letter . "%' ORDER BY '$ros_cms_intern_users_sortby' $ros_cms_intern_users_sort LIMIT ". $roscms_SET_curpos ." , ". $roscms_intern_items_per_page ." ;") ; /* if($roscms_intern_account_level==100) {

1 0

[amunger] 20195: *Tweetmerge -r 20194:20193 . *Yellow Card* Revert 20194. *g*
by amunger＠svn.reactos.com 15 Dec '05

15 Dec '05

*Tweetmerge -r 20194:20193 . *Yellow Card* Revert 20194. *g* Modified: branches/ros-branch-0_2_9/reactos/bootdata/hivesys.inf _____ Modified: branches/ros-branch-0_2_9/reactos/bootdata/hivesys.inf --- branches/ros-branch-0_2_9/reactos/bootdata/hivesys.inf 2005-12-15 18:53:33 UTC (rev 20194) +++ branches/ros-branch-0_2_9/reactos/bootdata/hivesys.inf 2005-12-15 19:12:37 UTC (rev 20195) @@ -749,9 +749,9 @@ HKLM,"SYSTEM\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDr ivers",0x00010000,"framebuf" HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.VRefresh",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.BitsPerPel",0x00010001,16 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.XResolution",0x00010001,800 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.YResolution",0x00010001,600 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.BitsPerPel",0x00010001,8 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.XResolution",0x00010001,640 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.YResolution",0x00010001,480 ; VGA miniport driver HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0 x00000000

1 0

[turner] 20194: set default res to 800x600x16
by turner＠svn.reactos.com 15 Dec '05

15 Dec '05

set default res to 800x600x16 Modified: branches/ros-branch-0_2_9/reactos/bootdata/hivesys.inf _____ Modified: branches/ros-branch-0_2_9/reactos/bootdata/hivesys.inf --- branches/ros-branch-0_2_9/reactos/bootdata/hivesys.inf 2005-12-15 18:22:34 UTC (rev 20193) +++ branches/ros-branch-0_2_9/reactos/bootdata/hivesys.inf 2005-12-15 18:53:33 UTC (rev 20194) @@ -749,9 +749,9 @@ HKLM,"SYSTEM\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDr ivers",0x00010000,"framebuf" HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.VRefresh",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.BitsPerPel",0x00010001,8 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.XResolution",0x00010001,640 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.YResolution",0x00010001,480 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.BitsPerPel",0x00010001,16 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.XResolution",0x00010001,800 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.YResolution",0x00010001,600 ; VGA miniport driver HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0 x00000000

1 0

[hpoussin] 20193: Merge from trunk:
by hpoussin＠svn.reactos.com 15 Dec '05

15 Dec '05

Merge from trunk: Add message box to tell the user to reboot after the installation of a network card Modified: branches/ros-branch-0_2_9/reactos/lib/netcfgx/netcfgx.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/netcfgx/netcfgx.c --- branches/ros-branch-0_2_9/reactos/lib/netcfgx/netcfgx.c 2005-12-15 18:20:21 UTC (rev 20192) +++ branches/ros-branch-0_2_9/reactos/lib/netcfgx/netcfgx.c 2005-12-15 18:22:34 UTC (rev 20193) @@ -346,6 +346,11 @@ goto cleanup; } + /* HACK: hpoussin, Dec 2005. TCP/IP driver is not able to manage devices + * which are installed after its startup. So, we have to reboot to take + * this new netcard into account. + */ + MessageBox(NULL, TEXT("You need to reboot to finish the installation of your network card."), TEXT("Reboot required"), MB_OK | MB_ICONWARNING); rc = ERROR_SUCCESS; cleanup:

1 0

[hpoussin] 20192: Add message box to tell the user to reboot after the installation of a network card
by hpoussin＠svn.reactos.com 15 Dec '05

15 Dec '05

Add message box to tell the user to reboot after the installation of a network card Modified: trunk/reactos/lib/netcfgx/netcfgx.c _____ Modified: trunk/reactos/lib/netcfgx/netcfgx.c --- trunk/reactos/lib/netcfgx/netcfgx.c 2005-12-15 17:40:50 UTC (rev 20191) +++ trunk/reactos/lib/netcfgx/netcfgx.c 2005-12-15 18:20:21 UTC (rev 20192) @@ -346,6 +346,11 @@ goto cleanup; } + /* HACK: hpoussin, Dec 2005. TCP/IP driver is not able to manage devices + * which are installed after its startup. So, we have to reboot to take + * this new netcard into account. + */ + MessageBox(NULL, TEXT("You need to reboot to finish the installation of your network card."), TEXT("Reboot required"), MB_OK | MB_ICONWARNING); rc = ERROR_SUCCESS; cleanup:

1 0

[hpoussin] 20191: Add a hack to enable "Do not show this dialog anymore" (still doesn't work)
by hpoussin＠svn.reactos.com 15 Dec '05

15 Dec '05

Add a hack to enable "Do not show this dialog anymore" (still doesn't work) Rename IsDeviceEnabled to IsDeviceStarted and EnableDevice to StartDevice Modified: trunk/reactos/lib/newdev/newdev.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-12-15 16:35:15 UTC (rev 20190) +++ trunk/reactos/lib/newdev/newdev.c 2005-12-15 17:40:50 UTC (rev 20191) @@ -27,6 +27,10 @@ IN HMACHINE hMachine, OUT BOOL *CanDisable) { +#if 0 + /* hpoussin, Dec 2005. I've disabled this code because + * ntoskrnl never sets the DN_DISABLEABLE flag. + */ CONFIGRET cr; ULONG Status, ProblemNumber; BOOL Ret = FALSE; @@ -43,11 +47,15 @@ } return Ret; +#else + *CanDisable = TRUE; + return TRUE; +#endif } BOOL -IsDeviceEnabled(IN DEVINST DevInst, +IsDeviceStarted(IN DEVINST DevInst, IN HMACHINE hMachine, OUT BOOL *IsEnabled) { @@ -71,11 +79,11 @@ BOOL -EnableDevice(IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DevInfoData OPTIONAL, - IN BOOL bEnable, - IN DWORD HardwareProfile OPTIONAL, - OUT BOOL *bNeedReboot OPTIONAL) +StartDevice(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DevInfoData OPTIONAL, + IN BOOL bEnable, + IN DWORD HardwareProfile OPTIONAL, + OUT BOOL *bNeedReboot OPTIONAL) { SP_PROPCHANGE_PARAMS pcp; SP_DEVINSTALL_PARAMS dp; @@ -546,7 +554,7 @@ DevInstData->hDevInfo, &DevInstData->devInfoData, SPDRP_CONFIGFLAGS, - NULL, 0 ); + (BYTE *)&config_flags, sizeof(config_flags) ); } PostMessage(DevInstData->hDialog, WM_SEARCH_FINISHED, 0, 0); @@ -691,24 +699,24 @@ case PSN_WIZFINISH: { BOOL DisableableDevice = FALSE; - BOOL IsEnabled = FALSE; + BOOL IsStarted = FALSE; if (CanDisableDevice(DevInstData->devInfoData.DevInst, NULL, &DisableableDevice) && DisableableDevice && - IsDeviceEnabled(DevInstData->devInfoData.DevInst, + IsDeviceStarted(DevInstData->devInfoData.DevInst, NULL, - &IsEnabled) && - IsEnabled && + &IsStarted) && + !IsStarted && SendDlgItemMessage(hwndDlg, IDC_DONOTSHOWDLG, BM_GETCHECK, (WPARAM) 0, (LPARAM) 0) == BST_CHECKED) { /* disable the device */ - EnableDevice(DevInstData->hDevInfo, - &DevInstData->devInfoData, - FALSE, - 0, - NULL); + StartDevice(DevInstData->hDevInfo, + &DevInstData->devInfoData, + FALSE, + 0, + NULL); } break; }

1 0

[hpoussin] 20190: Allow DIF_PROPERTYCHANGE as valid install code in SetupDiSetClassInstallParamsW
by hpoussin＠svn.reactos.com 15 Dec '05

15 Dec '05

Allow DIF_PROPERTYCHANGE as valid install code in SetupDiSetClassInstallParamsW Better stub for SetupDiChangeState Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-15 14:15:18 UTC (rev 20189) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-15 16:35:15 UTC (rev 20190) @@ -79,7 +79,7 @@ IN LPFNADDPROPSHEETPAGE fAddFunc, IN LPARAM lParam); typedef BOOL -(CALLBACK* UPDATE_CLASS_PARAM_HANDLER) ( +(*UPDATE_CLASS_PARAM_HANDLER) ( IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, @@ -95,6 +95,13 @@ PVOID PrivateData; }; +static BOOL +PropertyChangeHandler( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, + IN DWORD ClassInstallParamsSize); + static UPDATE_CLASS_PARAM_HANDLER UpdateClassInstallParamHandlers[] = { NULL, /* DIF_SELECTDEVICE */ NULL, /* DIF_INSTALLDEVICE */ @@ -113,7 +120,7 @@ NULL, /* DIF_DETECT */ NULL, /* DIF_INSTALLWIZARD */ NULL, /* DIF_DESTROYWIZARDDATA */ - NULL, /* DIF_PROPERTYCHANGE */ + PropertyChangeHandler, /* DIF_PROPERTYCHANGE */ NULL, /* DIF_ENABLECLASS */ NULL, /* DIF_DETECTVERIFY */ NULL, /* DIF_INSTALLDEVICEFILES */ @@ -2292,6 +2299,12 @@ return TRUE; } +static BOOL DestroyClassInstallParams(struct ClassInstallParams* installParams) +{ + HeapFree(GetProcessHeap(), 0, installParams->PropChange); + return TRUE; +} + static BOOL DestroyDeviceInfoElement(struct DeviceInfoElement* deviceInfo) { PLIST_ENTRY ListEntry; @@ -2309,6 +2322,7 @@ ListEntry = RemoveHeadList(&deviceInfo->InterfaceListHead); HeapFree(GetProcessHeap(), 0, ListEntry); } + DestroyClassInstallParams(&deviceInfo->ClassInstallParams); HeapFree(GetProcessHeap(), 0, deviceInfo); return TRUE; } @@ -2328,6 +2342,7 @@ if (list->HKLM != HKEY_LOCAL_MACHINE) RegCloseKey(list->HKLM); CM_Disconnect_Machine(list->hMachine); + DestroyClassInstallParams(&list->ClassInstallParams); HeapFree(GetProcessHeap(), 0, list); return TRUE; } @@ -3358,7 +3373,7 @@ } else if (UpdateClassInstallParamHandlers[ClassInstallParams->InstallFunction - DIF_SELECTDEVICE] == NULL) { - FIXME("InstallFunction code is valid, but no associated update handler\n"); + FIXME("InstallFunction %u is valid, but has no associated update handler\n", ClassInstallParams->InstallFunction); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); goto done; } @@ -3380,6 +3395,63 @@ return ret; } +static BOOL PropertyChangeHandler( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, + IN DWORD ClassInstallParamsSize) +{ + PSP_PROPCHANGE_PARAMS PropChangeParams = (PSP_PROPCHANGE_PARAMS)ClassInstallParams; + BOOL ret = FALSE; + + if (ClassInstallParamsSize != sizeof(SP_PROPCHANGE_PARAMS)) + SetLastError(ERROR_INVALID_PARAMETER); + else if (PropChangeParams && PropChangeParams->StateChange != DICS_ENABLE + && PropChangeParams->StateChange != DICS_DISABLE && PropChangeParams->StateChange != DICS_PROPCHANGE + && PropChangeParams->StateChange != DICS_START && PropChangeParams->StateChange != DICS_STOP) + SetLastError(ERROR_INVALID_FLAGS); + else if (PropChangeParams && PropChangeParams->Scope != DICS_FLAG_GLOBAL + && PropChangeParams->Scope != DICS_FLAG_CONFIGSPECIFIC) + SetLastError(ERROR_INVALID_FLAGS); + else if (PropChangeParams + && (PropChangeParams->StateChange == DICS_START || PropChangeParams->StateChange == DICS_STOP) + && PropChangeParams->Scope != DICS_FLAG_CONFIGSPECIFIC) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + PSP_PROPCHANGE_PARAMS *CurrentPropChangeParams; + if (!DeviceInfoData) + { + struct DeviceInfoSet *list = (struct DeviceInfoSet *)DeviceInfoSet; + CurrentPropChangeParams = &list->ClassInstallParams.PropChange; + } + else + { + struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + CurrentPropChangeParams = &deviceInfo->ClassInstallParams.PropChange; + } + if (*CurrentPropChangeParams) + { + MyFree(*CurrentPropChangeParams); + *CurrentPropChangeParams = NULL; + } + if (PropChangeParams) + { + *CurrentPropChangeParams = MyMalloc(sizeof(SP_PROPCHANGE_PARAMS)); + if (!*CurrentPropChangeParams) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto done; + } + memcpy(*CurrentPropChangeParams, PropChangeParams, sizeof(SP_PROPCHANGE_PARAMS)); + } + ret = TRUE; + } + +done: + return ret; +} + static DWORD GetFunctionPointer( IN PWSTR InstallerName, @@ -6280,10 +6352,29 @@ BOOL WINAPI SetupDiChangeState( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData) + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { + PSP_PROPCHANGE_PARAMS PropChange; + BOOL ret = FALSE; + + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + + if (!DeviceInfoData) + PropChange = ((struct DeviceInfoSet *)DeviceInfoSet)->ClassInstallParams.PropChange; + else + PropChange = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->ClassInstallParams.PropChange; + if (!PropChange) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto done; + } + FIXME("Stub %p %p\n", DeviceInfoSet, DeviceInfoData); - return ERROR_CALL_NOT_IMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + +done: + TRACE("Returning %d\n", ret); + return ret; } /*********************************************************************** _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-12-15 14:15:18 UTC (rev 20189) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-12-15 16:35:15 UTC (rev 20190) @@ -84,6 +84,11 @@ struct InfFileDetails *InfFileDetails; }; +struct ClassInstallParams +{ + PSP_PROPCHANGE_PARAMS PropChange; +}; + struct DeviceInfoElement /* Element of DeviceInfoSet.ListHead */ { LIST_ENTRY ListEntry; @@ -130,6 +135,9 @@ /* List of interfaces implemented by this device */ LIST_ENTRY InterfaceListHead; /* List of struct DeviceInterface */ + /* Used by SetupDiGetClassInstallParamsW/SetupDiSetClassInstallParamsW */ + struct ClassInstallParams ClassInstallParams; + WCHAR Data[ANYSIZE_ARRAY]; }; @@ -148,6 +156,9 @@ LIST_ENTRY ListHead; /* List of struct DeviceInfoElement */ + /* Used by SetupDiGetClassInstallParamsW/SetupDiSetClassInstallParamsW */ + struct ClassInstallParams ClassInstallParams; + /* Contains the name of the remote computer ('\\COMPUTERNAME' for example), * or NULL if related to local machine. Points into szData field at the * end of the structure */

1 0

[hpoussin] 20189: Set the ConfigFlags value in registry if not present
by hpoussin＠svn.reactos.com 15 Dec '05

15 Dec '05

Set the ConfigFlags value in registry if not present Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-12-15 13:48:26 UTC (rev 20188) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-12-15 14:15:18 UTC (rev 20189) @@ -996,7 +996,7 @@ UNICODE_STRING KeyName; HANDLE LogConfKey; ULONG ResCount; - ULONG ListSize; + ULONG ListSize, ResultLength; NTSTATUS Status; DPRINT("IopSetDeviceInstanceData() called\n"); @@ -1051,6 +1051,26 @@ ZwClose(LogConfKey); } + /* Set the 'ConfigFlags' value */ + RtlInitUnicodeString(&KeyName, L"ConfigFlags"); + Status = ZwQueryValueKey(InstanceKey, + &KeyName, + KeyValueBasicInformation, + NULL, + 0, + &ResultLength); + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* Write the default value */ + ULONG DefaultConfigFlags = 0; + Status = ZwSetValueKey(InstanceKey, + &KeyName, + 0, + REG_DWORD, + &DefaultConfigFlags, + sizeof(DefaultConfigFlags)); + } + #if 0 if (DeviceNode->PhysicalDeviceObject != NULL) {

1 0

[hpoussin] 20188: Implement SetupDiSetClassInstallParamsW
by hpoussin＠svn.reactos.com 15 Dec '05

15 Dec '05

Implement SetupDiSetClassInstallParamsW Handle DIF_PROPERTYCHANGE in SetupDiCallClassInstaller Add stub for SetupDiChangeState Rename a label (nextfile -> nextservice) Remove a useless test in DelayedMove Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/misc.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-15 09:07:32 UTC (rev 20187) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-15 13:48:26 UTC (rev 20188) @@ -29,6 +29,7 @@ static const WCHAR Class[] = {'C','l','a','s','s',0}; static const WCHAR ClassInstall32[] = {'C','l','a','s','s','I','n','s','t','a','l','l','3','2',0}; static const WCHAR DeviceInstance[] = {'D','e','v','i','c','e','I','n','s','t','a','n','c','e',0}; +static const WCHAR InterfaceInstall32[] = {'I','n','t','e','r','f','a','c','e','I','n','s','t','a','l','l','3','2' ,0}; static const WCHAR NoDisplayClass[] = {'N','o','D','i','s','p','l','a','y','C','l','a','s','s',0}; static const WCHAR NoInstallClass[] = {'N','o','I','s','t','a','l','l','C','l','a','s','s',0}; static const WCHAR NoUseClass[] = {'N','o','U','s','e','C','l','a','s','s',0}; @@ -77,6 +78,12 @@ IN PSP_PROPSHEETPAGE_REQUEST PropPageRequest, IN LPFNADDPROPSHEETPAGE fAddFunc, IN LPARAM lParam); +typedef BOOL +(CALLBACK* UPDATE_CLASS_PARAM_HANDLER) ( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, + IN DWORD ClassInstallParamsSize); struct CoInstallerElement { @@ -88,6 +95,51 @@ PVOID PrivateData; }; +static UPDATE_CLASS_PARAM_HANDLER UpdateClassInstallParamHandlers[] = { + NULL, /* DIF_SELECTDEVICE */ + NULL, /* DIF_INSTALLDEVICE */ + NULL, /* DIF_ASSIGNRESOURCES */ + NULL, /* DIF_PROPERTIES */ + NULL, /* DIF_REMOVE */ + NULL, /* DIF_FIRSTTIMESETUP */ + NULL, /* DIF_FOUNDDEVICE */ + NULL, /* DIF_SELECTCLASSDRIVERS */ + NULL, /* DIF_VALIDATECLASSDRIVERS */ + NULL, /* DIF_INSTALLCLASSDRIVERS */ + NULL, /* DIF_CALCDISKSPACE */ + NULL, /* DIF_DESTROYPRIVATEDATA */ + NULL, /* DIF_VALIDATEDRIVER */ + NULL, /* DIF_MOVEDEVICE */ + NULL, /* DIF_DETECT */ + NULL, /* DIF_INSTALLWIZARD */ + NULL, /* DIF_DESTROYWIZARDDATA */ + NULL, /* DIF_PROPERTYCHANGE */ + NULL, /* DIF_ENABLECLASS */ + NULL, /* DIF_DETECTVERIFY */ + NULL, /* DIF_INSTALLDEVICEFILES */ + NULL, /* DIF_UNREMOVE */ + NULL, /* DIF_SELECTBESTCOMPATDRV */ + NULL, /* DIF_ALLOW_INSTALL */ + NULL, /* DIF_REGISTERDEVICE */ + NULL, /* DIF_NEWDEVICEWIZARD_PRESELECT */ + NULL, /* DIF_NEWDEVICEWIZARD_SELECT */ + NULL, /* DIF_NEWDEVICEWIZARD_PREANALYZE */ + NULL, /* DIF_NEWDEVICEWIZARD_POSTANALYZE */ + NULL, /* DIF_NEWDEVICEWIZARD_FINISHINSTALL */ + NULL, /* DIF_UNUSED1 */ + NULL, /* DIF_INSTALLINTERFACES */ + NULL, /* DIF_DETECTCANCEL */ + NULL, /* DIF_REGISTER_COINSTALLERS */ + NULL, /* DIF_ADDPROPERTYPAGE_ADVANCED */ + NULL, /* DIF_ADDPROPERTYPAGE_BASIC */ + NULL, /* DIF_RESERVED1 */ + NULL, /* DIF_TROUBLESHOOTER */ + NULL, /* DIF_POWERMESSAGEWAKE */ + NULL, /* DIF_ADDREMOTEPROPERTYPAGE_ADVANCED */ + NULL, /* DIF_UPDATEDRIVER_UI */ + NULL /* DIF_RESERVED2 */ +}; + /*********************************************************************** * SetupDiBuildClassInfoList (SETUPAPI.@) */ @@ -2752,7 +2804,7 @@ SetLastError(ERROR_INVALID_HANDLE); else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); - else if (DeviceInfoData) + else if (!DeviceInfoData) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -3042,7 +3094,7 @@ INVALID_HANDLE_VALUE, NULL); - /* FIXME: More code! */ + /* FIXME: Process InterfaceInstall32 section */ if (bFileQueueCreated) SetupCloseFileQueue(FileQueue); @@ -3260,14 +3312,72 @@ * SetupDiSetClassInstallParamsW (SETUPAPI.@) */ BOOL WINAPI SetupDiSetClassInstallParamsW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_CLASSINSTALL_HEADER ClassInstallParams, - DWORD ClassInstallParamsSize) + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, + IN DWORD ClassInstallParamsSize) { - FIXME("%p %p %x %lu\n",DeviceInfoSet, DeviceInfoData, - ClassInstallParams->InstallFunction, ClassInstallParamsSize); - return FALSE; + struct DeviceInfoSet *list; + BOOL ret = FALSE; + + TRACE("%p %p %p %lu\n", DeviceInfoSet, DeviceInfoData, + ClassInstallParams, ClassInstallParamsSize); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (ClassInstallParams && ClassInstallParams->cbSize != sizeof(SP_CLASSINSTALL_HEADER)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (ClassInstallParams && ClassInstallParamsSize < sizeof(SP_CLASSINSTALL_HEADER)) + SetLastError(ERROR_INVALID_PARAMETER); + else if (!ClassInstallParams && ClassInstallParamsSize != 0) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + SP_DEVINSTALL_PARAMS_W InstallParams; + BOOL Result; + + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + Result = SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + if (!Result) + goto done; + + if (ClassInstallParams) + { + /* Check parameters in ClassInstallParams */ + if (ClassInstallParams->InstallFunction < DIF_SELECTDEVICE + || ClassInstallParams->InstallFunction - DIF_SELECTDEVICE >= sizeof(UpdateClassInstallParamHandlers)/sizeof(UpdateClassInstallParamHa ndlers[0])) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + goto done; + } + else if (UpdateClassInstallParamHandlers[ClassInstallParams->InstallFunction - DIF_SELECTDEVICE] == NULL) + { + FIXME("InstallFunction code is valid, but no associated update handler\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + goto done; + } + ret = UpdateClassInstallParamHandlers[ClassInstallParams->InstallFunction - DIF_SELECTDEVICE](DeviceInfoSet, DeviceInfoData, ClassInstallParams, ClassInstallParamsSize); + if (!ret) + goto done; + InstallParams.Flags |= DI_CLASSINSTALLPARAMS; + } + else + { + InstallParams.Flags &= ~DI_CLASSINSTALLPARAMS; + } + + ret = SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + } + +done: + TRACE("Returning %d\n", ret); + return ret; } static DWORD @@ -3404,6 +3514,10 @@ case DIF_NEWDEVICEWIZARD_PREANALYZE: CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; break; + case DIF_PROPERTYCHANGE: + CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiChangeState; + break; case DIF_REGISTER_COINSTALLERS: CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; DefaultHandler = SetupDiRegisterCoDeviceInstallers; @@ -6161,6 +6275,18 @@ } /*********************************************************************** + * SetupDiChangeState (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiChangeState( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + FIXME("Stub %p %p\n", DeviceInfoSet, DeviceInfoData); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/********************************************************************** * * SetupDiSelectBestCompatDrv (SETUPAPI.@) */ BOOL WINAPI @@ -6611,7 +6737,7 @@ NULL, 0, &RequiredSize); if (!Result) - goto nextfile; + goto nextservice; if (RequiredSize > 0) { /* We got the needed size for the buffer */ @@ -6619,7 +6745,7 @@ if (!ServiceName) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto nextfile; + goto nextservice; } Result = SetupGetStringFieldW( &ContextService, @@ -6627,7 +6753,7 @@ ServiceName, RequiredSize, &RequiredSize); if (!Result) - goto nextfile; + goto nextservice; } Result = SetupGetIntField( &ContextService, @@ -6653,7 +6779,7 @@ Result = TRUE; } else - goto nextfile; + goto nextservice; } if (RequiredSize > 0) { @@ -6662,7 +6788,7 @@ if (!ServiceSection) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto nextfile; + goto nextservice; } Result = SetupGetStringFieldW( &ContextService, @@ -6670,7 +6796,7 @@ ServiceSection, RequiredSize, &RequiredSize); if (!Result) - goto nextfile; + goto nextservice; SetLastError(ERROR_SUCCESS); Result = SetupInstallServicesFromInfSectionExW( @@ -6684,7 +6810,7 @@ if (GetLastError() == ERROR_SUCCESS_REBOOT_REQUIRED) RebootRequired = TRUE; } -nextfile: +nextservice: HeapFree(GetProcessHeap(), 0, ServiceName); HeapFree(GetProcessHeap(), 0, ServiceSection); if (!Result) _____ Modified: trunk/reactos/lib/setupapi/misc.c --- trunk/reactos/lib/setupapi/misc.c 2005-12-15 09:07:32 UTC (rev 20187) +++ trunk/reactos/lib/setupapi/misc.c 2005-12-15 13:48:26 UTC (rev 20188) @@ -467,12 +467,6 @@ */ BOOL WINAPI DelayedMove(LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName) { - if (OsVersionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT) - { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } - return MoveFileExW(lpExistingFileName, lpNewFileName, MOVEFILE_REPLACE_EXISTING | MOVEFILE_DELAY_UNTIL_REBOOT); } _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-12-15 09:07:32 UTC (rev 20187) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-12-15 13:48:26 UTC (rev 20188) @@ -272,7 +272,7 @@ @ stdcall SetupDiBuildDriverInfoList(long ptr long) @ stdcall SetupDiCallClassInstaller(long ptr ptr) @ stub SetupDiCancelDriverInfoSearch -@ stub SetupDiChangeState +@ stdcall SetupDiChangeState(ptr ptr) @ stdcall SetupDiClassGuidsFromNameA(str ptr long ptr) @ stdcall SetupDiClassGuidsFromNameExA(str ptr long ptr str ptr) @ stdcall SetupDiClassGuidsFromNameExW(wstr ptr long ptr wstr ptr)

1 0

[hpoussin] 20187: Set DNF_ASSIGNING_RESOURCES, DNF_RESOURCE_ASSIGNED, DNF_RESOURCE_REPORTED and DNF_NO_RESOURCE_REQUIRED flags
by hpoussin＠svn.reactos.com 15 Dec '05

15 Dec '05

Set DNF_ASSIGNING_RESOURCES, DNF_RESOURCE_ASSIGNED, DNF_RESOURCE_REPORTED and DNF_NO_RESOURCE_REQUIRED flags Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-12-15 01:47:36 UTC (rev 20186) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-12-15 09:07:32 UTC (rev 20187) @@ -1112,6 +1112,8 @@ return STATUS_SUCCESS; } + IopDeviceNodeSetFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); + /* FIXME: that's here that PnP arbiter should go */ /* Actually, simply use resource list #0 as assigned resource list */ ResourceList = &DeviceNode->ResourceRequirements->List[0]; @@ -1315,6 +1317,8 @@ DeviceNode->ResourceList->List[0].PartialResourceList.Count = NumberOfResources; DeviceNode->ResourceListTranslated->List[0].PartialResourceList.Count = NumberOfResources; + IopDeviceNodeClearFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); + IopDeviceNodeSetFlag(DeviceNode, DNF_RESOURCE_ASSIGNED); return STATUS_SUCCESS; ByeBye: @@ -1329,6 +1333,7 @@ DeviceNode->ResourceListTranslated = NULL; } + IopDeviceNodeClearFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); return Status; } @@ -1867,14 +1872,18 @@ &IoStatusBlock, IRP_MN_QUERY_RESOURCE_REQUIREMENTS, NULL); - if (NT_SUCCESS(Status) && IoStatusBlock.Information) + if (NT_SUCCESS(Status)) { DeviceNode->ResourceRequirements = (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information; + if (IoStatusBlock.Information) + IopDeviceNodeSetFlag(DeviceNode, DNF_RESOURCE_REPORTED); + else + IopDeviceNodeSetFlag(DeviceNode, DNF_NO_RESOURCE_REQUIRED); } else { - DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status); + DPRINT("IopInitiatePnpIrp() failed (Status %08lx)\n", Status); DeviceNode->ResourceRequirements = NULL; }

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