Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[akhaldi] 64560: [CMAKE] * Don't add a dependency on a file.
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:22:07 2014 New Revision: 64560 URL: http://svn.reactos.org/svn/reactos?rev=64560&view=rev Log: [CMAKE] * Don't add a dependency on a file. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=64560… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Mon Oct 6 18:22:07 2014 @@ -283,7 +283,6 @@ else() # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other add_library(${_libname} STATIC EXCLUDE_FROM_ALL ${_asm_stubs_file}) - add_dependencies(${_libname} ${_def_file}) # set correct "link rule" set_target_properties(${_libname} PROPERTIES LINKER_LANGUAGE "IMPLIB") endif()

1 0

[ekohl] 64559: [DEVMGR] Fix indentation. No code changes!
by ekohl＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: ekohl Date: Mon Oct 6 15:33:56 2014 New Revision: 64559 URL: http://svn.reactos.org/svn/reactos?rev=64559&view=rev Log: [DEVMGR] Fix indentation. No code changes! Modified: trunk/reactos/dll/win32/devmgr/stubs.c Modified: trunk/reactos/dll/win32/devmgr/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] Mon Oct 6 15:33:56 2014 @@ -51,8 +51,8 @@ LPCSTR lpMachineName, int nCmdShow) { - UNIMPLEMENTED; - return FALSE; + UNIMPLEMENTED; + return FALSE; } @@ -88,8 +88,8 @@ LPCWSTR lpMachineName, int nCmdShow) { - UNIMPLEMENTED; - return FALSE; + UNIMPLEMENTED; + return FALSE; } @@ -127,7 +127,7 @@ LPCSTR lpDeviceCmd, int nCmdShow) { - UNIMPLEMENTED; + UNIMPLEMENTED; } @@ -165,7 +165,7 @@ LPCWSTR lpDeviceCmd, int nCmdShow) { - UNIMPLEMENTED; + UNIMPLEMENTED; } @@ -208,8 +208,8 @@ UINT uNumberOfGuids, LPGUID lpGuids) { - UNIMPLEMENTED; - return FALSE; + UNIMPLEMENTED; + return FALSE; } @@ -252,6 +252,6 @@ UINT uNumberOfGuids, LPGUID lpGuids) { - UNIMPLEMENTED; - return FALSE; -} + UNIMPLEMENTED; + return FALSE; +}

1 0

[ekohl] 64558: [NEWDEV] - Implement InstallDevInst. - Display different wizard titles for the instller and update wizard. - Add header titles to the wizard pages. - Add new header file for private ...
by ekohl＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: ekohl Date: Mon Oct 6 14:23:36 2014 New Revision: 64558 URL: http://svn.reactos.org/svn/reactos?rev=64558&view=rev Log: [NEWDEV] - Implement InstallDevInst. - Display different wizard titles for the instller and update wizard. - Add header titles to the wizard pages. - Add new header file for private functions. Added: trunk/reactos/include/reactos/dll/newdevp.h (with props) Modified: trunk/reactos/dll/win32/newdev/lang/bg-BG.rc trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc trunk/reactos/dll/win32/newdev/lang/de-DE.rc trunk/reactos/dll/win32/newdev/lang/el-GR.rc trunk/reactos/dll/win32/newdev/lang/en-US.rc trunk/reactos/dll/win32/newdev/lang/es-ES.rc trunk/reactos/dll/win32/newdev/lang/fr-FR.rc trunk/reactos/dll/win32/newdev/lang/he-IL.rc trunk/reactos/dll/win32/newdev/lang/hu-HU.rc trunk/reactos/dll/win32/newdev/lang/id-ID.rc trunk/reactos/dll/win32/newdev/lang/it-IT.rc trunk/reactos/dll/win32/newdev/lang/ja-JP.rc trunk/reactos/dll/win32/newdev/lang/nl-NL.rc trunk/reactos/dll/win32/newdev/lang/no-NO.rc trunk/reactos/dll/win32/newdev/lang/pl-PL.rc trunk/reactos/dll/win32/newdev/lang/ro-RO.rc trunk/reactos/dll/win32/newdev/lang/ru-RU.rc trunk/reactos/dll/win32/newdev/lang/sk-SK.rc trunk/reactos/dll/win32/newdev/lang/sq-AL.rc trunk/reactos/dll/win32/newdev/lang/th-TH.rc trunk/reactos/dll/win32/newdev/lang/tr-TR.rc trunk/reactos/dll/win32/newdev/lang/uk-UA.rc trunk/reactos/dll/win32/newdev/newdev.c trunk/reactos/dll/win32/newdev/newdev.spec trunk/reactos/dll/win32/newdev/newdev_private.h trunk/reactos/dll/win32/newdev/resource.h trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/dll/win32/newdev/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/bg-BG.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -85,3 +85,12 @@ LTEXT "ÐÐ°ÑÐ¸ÑÐ½ÐµÑÐµ âÐÑÐ°Ð¹â Ð·Ð° Ð·Ð°ÑÐ²Ð°ÑÑÐ½Ðµ Ð½Ð° Ð²ÑÐ»ÑÐµÐ±Ð½Ð¸ÐºÐ°.", IDC_STATIC, 120, 174, 179, 11 LTEXT "ÐÐÐÐÐÐÐ¡Ð¢ÐÐ Ð£Ð¡Ð¢Ð ÐÐÐ¡Ð¢ÐÐ", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -90,3 +90,12 @@ LTEXT "KliknutÃm na DokonÄit zavÅete prÅ¯vodce.", IDC_STATIC, 120, 174, 179, 11 LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/de-DE.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -85,3 +85,12 @@ LTEXT "Klicken Sie zum Beenden der Installation auf Fertigstellen.", IDC_STATIC, 120, 174, 190, 11 LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/el-G… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/el-GR.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -85,3 +85,12 @@ LTEXT "Î Î±ÏÎ®ÏÏÎµ 'ÎÎ»Î¿ÎºÎ»Î®ÏÏÏÎ·' Î³Î¹Î± Î½Î± ÎºÎ»ÎµÎ¯ÏÎµÏÎµ ÏÎ¿ Î²Î¿Î·Î¸Ï.", IDC_STATIC, 120, 174, 179, 11 LTEXT "ÎÎÎÎ©Î£Î¤Î Î£Î¥Î£ÎÎÎ¥Î", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/en-US.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -85,3 +85,12 @@ LTEXT "Click Finish to close the wizard.", IDC_STATIC, 120, 174, 179, 11 LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/es-ES.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -85,3 +85,12 @@ LTEXT "Haga clic en Finalizar parar cerrar el asistente.", IDC_STATIC, 120, 174, 179, 11 LTEXT "DISPOSITIVO DESCONOCIDO", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/fr-FR.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -85,3 +85,12 @@ LTEXT "Cliquer sur Terminer pour fermer l'assistant.", IDC_STATIC, 115, 174, 179, 11 LTEXT "MATERIEL INCONNU", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/he-IL.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -85,3 +85,12 @@ LTEXT "×××¥ ×¡××× ××× ××¡×××¨ ××ª ×××©×£.", IDC_STATIC, 120, 174, 179, 11 LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/hu-H… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/hu-HU.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -87,3 +87,12 @@ LTEXT "A kilÃ©pÃ©shez kattints a BefejezÃ©s gombra.", IDC_STATIC, 120, 174, 179, 11 LTEXT "Ismeretlen eszkÃ¶z!", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/id-ID.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -85,3 +85,12 @@ LTEXT "Klik Selesai untuk menutup bimbingan.", IDC_STATIC, 120, 174, 179, 11 LTEXT "DEVICE TIDAK DIKENAL", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/it-IT.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -87,3 +87,12 @@ LTEXT "Selezionare Fine per chiudere questa procedura guidata.", IDC_STATIC, 120, 174, 179, 11 LTEXT "DISPOSITIVO SCONOSCIUTO", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -85,3 +85,12 @@ LTEXT "[å®äº] ãã¯ãªãã¯ããã¨ã¦ã£ã¶ã¼ããéãã¾ãã", IDC_STATIC, 120, 174, 179, 11 LTEXT "ä¸æãªããã¤ã¹", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/nl-N… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/nl-NL.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -92,3 +92,12 @@ LTEXT "Klik op Voltooien om de wizard te sluiten.", IDC_STATIC, 120, 174, 179, 11 LTEXT "ONBEKEND APPARAAT", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/no-NO.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -87,3 +87,12 @@ LTEXT "Trykk FullfÃ¸r for Ã¥ avslutte veiviseren.", IDC_STATIC, 120, 174, 179, 11 LTEXT "UKJENT ENHET", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/pl-PL.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -93,3 +93,12 @@ LTEXT "NaciÅnij ZakoÅcz, aby zamknÄÄ kreator.", IDC_STATIC, 120, 174, 179, 11 LTEXT "NIEZNANE URZÄDZENIE", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/ro-RO.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -94,3 +94,12 @@ LTEXT "ApÄsaÈi âSfÃ¢rÈitâ pentru a Ã®ncheia instalarea.", IDC_STATIC, 120, 174, 179, 11 LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/ru-RU.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -85,3 +85,12 @@ LTEXT "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ""ÐÐ¾ÑÐ¾Ð²Ð¾"" Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ñ Ð¼Ð°ÑÑÐµÑÐ°.", IDC_STATIC, 120, 174, 179, 11 LTEXT "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/sk-SK.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -90,3 +90,12 @@ LTEXT "KliknutÃm na tlaÄidlo DokonÄiÅ¥ zavriete sprievodcu.", IDC_STATIC, 120, 174, 179, 11 LTEXT "NEZNÃME ZARIADENIE", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/sq-A… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/sq-AL.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -89,3 +89,12 @@ LTEXT "Kliko Mbaro pÃ«r tÃ« mbyllur magjistar.", IDC_STATIC, 120, 174, 179, 11 LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/th-T… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/th-TH.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -87,3 +87,12 @@ LTEXT "à¸à¸à¹à¸¥à¸·à¸à¸à¹à¸ªà¸£à¹à¸à¸ªà¸´à¹à¸à¹à¸à¸·à¹à¸à¸à¸´à¸à¸à¸²à¸£à¸à¸´à¸à¸à¸±à¹à¸à¸à¸±à¸à¹à¸à¸¡à¸±à¸à¸´", IDC_STATIC, 120, 174, 179, 11 LTEXT "à¹à¸¡à¹à¸£à¸¹à¹à¸à¸±à¸à¸à¸¸à¸à¸à¸£à¸à¹", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/tr-TR.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -87,3 +87,12 @@ LTEXT "Bu yardÄ±mcÄ±yÄ± kapatmak iÃ§in Bitir'e tÄ±klayÄ±nÄ±z.", IDC_STATIC, 120, 174, 179, 11 LTEXT "BÄ°LÄ°NMEYEN AYGIT", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/uk-UA.rc [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -93,3 +93,12 @@ LTEXT "ÐÐ°ÑÐ¸ÑÐ½ÑÑÑ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÐ¸"" Ð´Ð»Ñ Ð²Ð¸ÑÐ¾Ð´Ñ Ð· Ð¼Ð°Ð¹ÑÑÑÐ°.", IDC_STATIC, 120, 174, 179, 11 LTEXT "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐ¡Ð¢Ð ÐÐ", IDC_DEVICE, 148, 53, 147, 12 END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "New hardware wizard" + IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_CHSOURCE_TITLE "Choose search and install options" + IDS_SEARCHDRV_TITLE "Searching..." + IDS_INSTALLDRV_TITLE "Installing..." +END Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -804,6 +804,118 @@ return retval; } + +BOOL +WINAPI +InstallDevInst( + IN HWND hWndParent, + IN LPCWSTR InstanceId, + IN BOOL bUpdate, + OUT LPDWORD lpReboot) +{ + PDEVINSTDATA DevInstData = NULL; + BOOL ret; + BOOL retval = FALSE; + + TRACE("InstllDevInst(%p, %s, %d, %p)\n", hWndParent, debugstr_w(InstanceId), bUpdate, lpReboot); + + DevInstData = HeapAlloc(GetProcessHeap(), 0, sizeof(DEVINSTDATA)); + if (!DevInstData) + { + TRACE("HeapAlloc() failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + /* Clear devinst data */ + ZeroMemory(DevInstData, sizeof(DEVINSTDATA)); + DevInstData->devInfoData.cbSize = 0; /* Tell if the devInfoData is valid */ + DevInstData->bUpdate = bUpdate; + + /* Fill devinst data */ + DevInstData->hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); + if (DevInstData->hDevInfo == INVALID_HANDLE_VALUE) + { + TRACE("SetupDiCreateDeviceInfoListExW() failed with error 0x%x\n", GetLastError()); + goto cleanup; + } + + DevInstData->devInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + ret = SetupDiOpenDeviceInfoW( + DevInstData->hDevInfo, + InstanceId, + NULL, + 0, /* Open flags */ + &DevInstData->devInfoData); + if (!ret) + { + TRACE("SetupDiOpenDeviceInfoW() failed with error 0x%x (InstanceId %s)\n", + GetLastError(), debugstr_w(InstanceId)); + DevInstData->devInfoData.cbSize = 0; + goto cleanup; + } + + SetLastError(ERROR_GEN_FAILURE); + ret = SetupDiGetDeviceRegistryProperty( + DevInstData->hDevInfo, + &DevInstData->devInfoData, + SPDRP_DEVICEDESC, + &DevInstData->regDataType, + NULL, 0, + &DevInstData->requiredSize); + + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER && DevInstData->regDataType == REG_SZ) + { + DevInstData->buffer = HeapAlloc(GetProcessHeap(), 0, DevInstData->requiredSize); + if (!DevInstData->buffer) + { + TRACE("HeapAlloc() failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + ret = SetupDiGetDeviceRegistryPropertyW( + DevInstData->hDevInfo, + &DevInstData->devInfoData, + SPDRP_DEVICEDESC, + &DevInstData->regDataType, + DevInstData->buffer, DevInstData->requiredSize, + &DevInstData->requiredSize); + } + } + + if (!ret) + { + TRACE("SetupDiGetDeviceRegistryProperty() failed with error 0x%x (InstanceId %s)\n", + GetLastError(), debugstr_w(InstanceId)); + goto cleanup; + } + + /* Prepare the wizard, and display it */ + TRACE("Need to show install wizard\n"); + retval = DisplayWizard(DevInstData, hWndParent, IDD_WELCOMEPAGE); + +cleanup: + if (DevInstData) + { + if (DevInstData->devInfoData.cbSize != 0) + { + if (!SetupDiDestroyDriverInfoList(DevInstData->hDevInfo, &DevInstData->devInfoData, SPDIT_COMPATDRIVER)) + TRACE("SetupDiDestroyDriverInfoList() failed with error 0x%lx\n", GetLastError()); + } + if (DevInstData->hDevInfo != INVALID_HANDLE_VALUE) + { + if (!SetupDiDestroyDeviceInfoList(DevInstData->hDevInfo)) + TRACE("SetupDiDestroyDeviceInfoList() failed with error 0x%lx\n", GetLastError()); + } + HeapFree(GetProcessHeap(), 0, DevInstData->buffer); + HeapFree(GetProcessHeap(), 0, DevInstData); + } + + return retval; +} + + /* * @implemented */ Modified: trunk/reactos/dll/win32/newdev/newdev.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.sp… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev.spec [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -1,6 +1,6 @@ @ stdcall ClientSideInstallW(ptr ptr wstr long) @ stdcall DevInstallW(ptr ptr wstr long) -@ stub InstallDevInst +@ stdcall InstallDevInst(ptr wstr long ptr) @ stub InstallDevInstEx @ stdcall InstallNewDevice(ptr ptr ptr) @ stub InstallSelectedDevice Modified: trunk/reactos/dll/win32/newdev/newdev_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev_pr… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev_private.h [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -17,6 +17,7 @@ #include <windowsx.h> #include <newdev.h> #include <regstr.h> +#include <dll/newdevp.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(newdev); @@ -28,6 +29,7 @@ typedef struct _DEVINSTDATA { HFONT hTitleFont; + BOOL bUpdate; PBYTE buffer; DWORD requiredSize; DWORD regDataType; Modified: trunk/reactos/dll/win32/newdev/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/resource.… ============================================================================== --- trunk/reactos/dll/win32/newdev/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/resource.h [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -27,3 +27,9 @@ #define IDD_NEEDREBOOT 6 #define IDD_FINISHPAGE 7 #define IDD_MAXIMUMPAGE IDD_FINISHPAGE + +#define IDS_INSTALLWIZARDTITLE 1000 +#define IDS_UPDATEWIZARDTITLE 1001 +#define IDS_CHSOURCE_TITLE 1002 +#define IDS_SEARCHDRV_TITLE 1003 +#define IDS_INSTALLDRV_TITLE 1004 Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -1252,51 +1252,55 @@ /* Create the Welcome page */ ZeroMemory(&psp, sizeof(PROPSHEETPAGE)); psp.dwSize = sizeof(PROPSHEETPAGE); - psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE; psp.hInstance = hDllInstance; psp.lParam = (LPARAM)DevInstData; + psp.pszTitle = MAKEINTRESOURCE(DevInstData->bUpdate ? IDS_UPDATEWIZARDTITLE : IDS_INSTALLWIZARDTITLE); psp.pfnDlgProc = WelcomeDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE); ahpsp[IDD_WELCOMEPAGE] = CreatePropertySheetPage(&psp); /* Create the Select Source page */ - psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_CHSOURCE_TITLE); psp.pfnDlgProc = CHSourceDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_CHSOURCE); ahpsp[IDD_CHSOURCE] = CreatePropertySheetPage(&psp); /* Create the Search driver page */ - psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_SEARCHDRV_TITLE); psp.pfnDlgProc = SearchDrvDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_SEARCHDRV); ahpsp[IDD_SEARCHDRV] = CreatePropertySheetPage(&psp); /* Create the Install driver page */ - psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_INSTALLDRV_TITLE); psp.pfnDlgProc = InstallDrvDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLDRV); ahpsp[IDD_INSTALLDRV] = CreatePropertySheetPage(&psp); /* Create the No driver page */ - psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE; psp.pfnDlgProc = NoDriverDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_NODRIVER); ahpsp[IDD_NODRIVER] = CreatePropertySheetPage(&psp); /* Create the Install failed page */ - psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE; psp.pfnDlgProc = InstallFailedDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLFAILED); ahpsp[IDD_INSTALLFAILED] = CreatePropertySheetPage(&psp); /* Create the Need reboot page */ - psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE; psp.pfnDlgProc = NeedRebootDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_NEEDREBOOT); ahpsp[IDD_NEEDREBOOT] = CreatePropertySheetPage(&psp); /* Create the Finish page */ - psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE; psp.pfnDlgProc = FinishDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE); ahpsp[IDD_FINISHPAGE] = CreatePropertySheetPage(&psp); Added: trunk/reactos/include/reactos/dll/newdevp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/newdev… ============================================================================== --- trunk/reactos/include/reactos/dll/newdevp.h (added) +++ trunk/reactos/include/reactos/dll/newdevp.h [iso-8859-1] Mon Oct 6 14:23:36 2014 @@ -0,0 +1,27 @@ +/* + * newdevp.h + * + * Private header for newdev.dll + * + */ + +#ifndef __NEWDEVP__H +#define __NEWDEVP__H + +BOOL +WINAPI +DevInstallW( + IN HWND hWndParent, + IN HINSTANCE hInstance, + IN LPCWSTR InstanceId, + IN INT Show); + +BOOL +WINAPI +InstallDevInst( + IN HWND hWndParent, + IN LPCWSTR InstanceId, + IN BOOL bUpdate, + OUT LPDWORD lpReboot); + +#endif /* __NEWDEVP__H */ Propchange: trunk/reactos/include/reactos/dll/newdevp.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 64557: [DEVMGR] Add a space between the hexadecimal and decimal IRQ numbers in the device resource list.
by ekohl＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: ekohl Date: Mon Oct 6 12:36:11 2014 New Revision: 64557 URL: http://svn.reactos.org/svn/reactos?rev=64557&view=rev Log: [DEVMGR] Add a space between the hexadecimal and decimal IRQ numbers in the device resource list. Modified: trunk/reactos/dll/win32/devmgr/hwresource.c Modified: trunk/reactos/dll/win32/devmgr/hwresource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/hwresourc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/hwresource.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/hwresource.c [iso-8859-1] Mon Oct 6 12:36:11 2014 @@ -278,7 +278,7 @@ { if (LoadString(hDllInstance, IDS_RESOURCE_INTERRUPT, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) { - wsprintf(szDetail, L"0x%08x(%d)", Descriptor->u.Interrupt.Level, Descriptor->u.Interrupt.Vector); + wsprintf(szDetail, L"0x%08x (%d)", Descriptor->u.Interrupt.Level, Descriptor->u.Interrupt.Vector); InsertListItem(hWndDevList, ItemCount, szBuffer, szDetail); ItemCount++; }

1 0

[ekohl] 64556: [DEVMGR] Fix the width of the resource list view.
by ekohl＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: ekohl Date: Mon Oct 6 08:44:20 2014 New Revision: 64556 URL: http://svn.reactos.org/svn/reactos?rev=64556&view=rev Log: [DEVMGR] Fix the width of the resource list view. Modified: trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc trunk/reactos/dll/win32/devmgr/lang/de-DE.rc trunk/reactos/dll/win32/devmgr/lang/el-GR.rc trunk/reactos/dll/win32/devmgr/lang/en-US.rc trunk/reactos/dll/win32/devmgr/lang/es-ES.rc trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc trunk/reactos/dll/win32/devmgr/lang/he-IL.rc trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc trunk/reactos/dll/win32/devmgr/lang/id-ID.rc trunk/reactos/dll/win32/devmgr/lang/it-IT.rc trunk/reactos/dll/win32/devmgr/lang/no-NO.rc trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc trunk/reactos/dll/win32/devmgr/lang/sq-AL.rc trunk/reactos/dll/win32/devmgr/lang/tr-TR.rc trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -225,7 +225,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -229,7 +229,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -226,7 +226,7 @@ LTEXT "Ressourcen-Einstellungen:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/el-G… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -226,7 +226,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -224,7 +224,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/es-ES.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -226,7 +226,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -225,7 +225,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/he-IL.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -226,7 +226,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/hu-H… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -225,7 +225,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/id-ID.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -226,7 +226,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -226,7 +226,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -226,7 +226,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -234,7 +234,7 @@ LTEXT "Ustawienia zasobÃ³w:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pt-B… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -226,7 +226,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -226,7 +226,7 @@ LTEXT "ConfiguraÈie de resurse:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -224,7 +224,7 @@ LTEXT "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐµÑÑÑÑÐ¾Ð²:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -229,7 +229,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/sq-A… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/sq-AL.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -228,7 +228,7 @@ LTEXT "Konfigurime Burimesh:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/tr-TR.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -226,7 +226,7 @@ LTEXT "Kaynak AyarlarÄ±:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 Modified: trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc [iso-8859-1] Mon Oct 6 08:44:20 2014 @@ -232,7 +232,7 @@ LTEXT "Resource settings:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 END IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218

1 0

[hbelusca] 64555: These are the keyboard status flags (unused at the moment).
by hbelusca＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: hbelusca Date: Sun Oct 5 22:48:56 2014 New Revision: 64555 URL: http://svn.reactos.org/svn/reactos?rev=64555&view=rev Log: These are the keyboard status flags (unused at the moment). Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] Sun Oct 5 22:48:56 2014 @@ -95,7 +95,7 @@ BYTE Reserved5[2]; // 0x90 BYTE Reserved6[2]; // 0x92 BYTE Reserved7[2]; // 0x94 - WORD Reserved8; // 0x96 + WORD KeybdStatusFlags; // 0x96 DWORD Reserved9; // 0x98 DWORD Reserved10; // 0x9c DWORD Reserved11[2]; // 0xa0

1 0

[hbelusca] 64554: Fix comment.
by hbelusca＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: hbelusca Date: Sun Oct 5 22:48:13 2014 New Revision: 64554 URL: http://svn.reactos.org/svn/reactos?rev=64554&view=rev Log: Fix comment. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sun Oct 5 22:48:13 2014 @@ -618,7 +618,8 @@ /* Disable interrupts */ setIF(0); - // FIXME: Check the word at 0040h:0072h and do one of the following actions: + // FIXME: Check the word at 0040h:0072h (Bda->SoftReset) and do one of the + // following actions: // - if the word is 1234h, perform a warm reboot (aka. Ctrl-Alt-Del); // - if the word is 0000h, perform a cold reboot (aka. Reset).

1 0

[hbelusca] 64553: [NTVDM]: disable the cpu level dprints.
by hbelusca＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: hbelusca Date: Sun Oct 5 22:47:37 2014 New Revision: 64553 URL: http://svn.reactos.org/svn/reactos?rev=64553&view=rev Log: [NTVDM]: disable the cpu level dprints. Modified: trunk/reactos/subsystems/ntvdm/cpu/cpu.c Modified: trunk/reactos/subsystems/ntvdm/cpu/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/cpu.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/cpu/cpu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/cpu.c [iso-8859-1] Sun Oct 5 22:47:37 2014 @@ -124,12 +124,12 @@ return; } CpuCallLevel++; - DPRINT1("CpuSimulate --> Level %d\n", CpuCallLevel); + DPRINT("CpuSimulate --> Level %d\n", CpuCallLevel); CpuRunning = TRUE; while (VdmRunning && CpuRunning) ClockUpdate(); - DPRINT1("CpuSimulate <-- Level %d\n", CpuCallLevel); + DPRINT("CpuSimulate <-- Level %d\n", CpuCallLevel); CpuCallLevel--; if (CpuCallLevel < 0) CpuCallLevel = 0;

1 0

[hpoussin] 64552: [MKHIVE] Create reparse points, and use them instead of pseudo-connections between cells
by hpoussin＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: hpoussin Date: Sun Oct 5 21:30:57 2014 New Revision: 64552 URL: http://svn.reactos.org/svn/reactos?rev=64552&view=rev Log: [MKHIVE] Create reparse points, and use them instead of pseudo-connections between cells Modified: trunk/reactos/tools/mkhive/cmi.c trunk/reactos/tools/mkhive/cmi.h trunk/reactos/tools/mkhive/mkhive.h trunk/reactos/tools/mkhive/registry.c trunk/reactos/tools/mkhive/registry.h Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=645… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] Sun Oct 5 21:30:57 2014 @@ -330,16 +330,19 @@ NTSTATUS CmiAddSubKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE ParentKeyCell, IN HCELL_INDEX ParentKeyCellOffset, IN PCUNICODE_STRING SubKeyName, IN ULONG CreateOptions, OUT PCM_KEY_NODE *pSubKeyCell, OUT HCELL_INDEX *pBlockOffset) { + PCM_KEY_NODE ParentKeyCell; HCELL_INDEX NKBOffset; NTSTATUS Status; + ParentKeyCell = (PCM_KEY_NODE)HvGetCell(&RegistryHive->Hive, ParentKeyCellOffset); + if (!ParentKeyCell) + return STATUS_UNSUCCESSFUL; VERIFY_KEY_CELL(ParentKeyCell); /* Create the new key */ @@ -396,18 +399,22 @@ NTSTATUS CmiScanForSubKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, + IN HCELL_INDEX ParentKeyCellOffset, IN PCUNICODE_STRING SubKeyName, IN ULONG Attributes, OUT PCM_KEY_NODE *pSubKeyCell, OUT HCELL_INDEX *pBlockOffset) { + PCM_KEY_NODE KeyCell; PCM_KEY_FAST_INDEX HashBlock; PCM_KEY_NODE CurSubKeyCell; BOOLEAN CaseInsensitive; ULONG Storage; ULONG i; + KeyCell = (PCM_KEY_NODE)HvGetCell(&RegistryHive->Hive, ParentKeyCellOffset); + if (!KeyCell) + return STATUS_UNSUCCESSFUL; VERIFY_KEY_CELL(KeyCell); ASSERT(RegistryHive); @@ -528,13 +535,13 @@ NTSTATUS CmiAddValueKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, IN HCELL_INDEX KeyCellOffset, IN PCUNICODE_STRING ValueName, OUT PCM_KEY_VALUE *pValueCell, OUT HCELL_INDEX *pValueCellOffset) { PVALUE_LIST_CELL ValueListCell; + PCM_KEY_NODE KeyCell; PCM_KEY_VALUE NewValueCell; HCELL_INDEX ValueListCellOffset; HCELL_INDEX NewValueCellOffset; @@ -542,6 +549,9 @@ HSTORAGE_TYPE Storage; NTSTATUS Status; + KeyCell = HvGetCell(&RegistryHive->Hive, KeyCellOffset); + if (!KeyCell) + return STATUS_UNSUCCESSFUL; Storage = (KeyCell->Flags & KEY_IS_VOLATILE) ? Volatile : Stable; if (KeyCell->ValueList.List == HCELL_NIL) { @@ -614,15 +624,19 @@ NTSTATUS CmiScanForValueKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, + IN HCELL_INDEX KeyCellOffset, IN PCUNICODE_STRING ValueName, OUT PCM_KEY_VALUE *pValueCell, OUT HCELL_INDEX *pValueCellOffset) { + PCM_KEY_NODE KeyCell; PVALUE_LIST_CELL ValueListCell; PCM_KEY_VALUE CurValueCell; ULONG i; + KeyCell = (PCM_KEY_NODE)HvGetCell(&RegistryHive->Hive, KeyCellOffset); + if (!KeyCell) + return STATUS_UNSUCCESSFUL; *pValueCell = NULL; *pValueCellOffset = HCELL_NIL; Modified: trunk/reactos/tools/mkhive/cmi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.h?rev=645… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/cmi.h [iso-8859-1] Sun Oct 5 21:30:57 2014 @@ -33,7 +33,6 @@ NTSTATUS CmiAddSubKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE ParentKeyCell, IN HCELL_INDEX ParentKeyCellOffset, IN PCUNICODE_STRING SubKeyName, IN ULONG CreateOptions, @@ -43,7 +42,7 @@ NTSTATUS CmiScanForSubKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, + IN HCELL_INDEX ParentKeyCellOffset, IN PCUNICODE_STRING SubKeyName, IN ULONG Attributes, OUT PCM_KEY_NODE *pSubKeyCell, @@ -52,7 +51,6 @@ NTSTATUS CmiAddValueKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, IN HCELL_INDEX KeyCellOffset, IN PCUNICODE_STRING ValueName, OUT PCM_KEY_VALUE *pValueCell, @@ -61,7 +59,7 @@ NTSTATUS CmiScanForValueKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, + IN HCELL_INDEX KeyCellOffset, IN PCUNICODE_STRING ValueName, OUT PCM_KEY_VALUE *pValueCell, OUT HCELL_INDEX *pValueCellOffset); Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] Sun Oct 5 21:30:57 2014 @@ -51,6 +51,9 @@ #define BitScanForward64 _BitScanForward64 #define BitScanReverse64 _BitScanReverse64 #endif + +typedef DWORD REGSAM; +typedef LPVOID LPSECURITY_ATTRIBUTES; NTSTATUS NTAPI RtlAnsiStringToUnicodeString( Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Sun Oct 5 21:30:57 2014 @@ -51,8 +51,7 @@ static PMEMKEY CreateInMemoryStructure( IN PCMHIVE RegistryHive, - IN HCELL_INDEX KeyCellOffset, - IN PCUNICODE_STRING KeyName) + IN HCELL_INDEX KeyCellOffset) { PMEMKEY Key; @@ -60,54 +59,50 @@ if (!Key) return NULL; - InitializeListHead (&Key->SubKeyList); - InitializeListHead (&Key->KeyList); - Key->RegistryHive = RegistryHive; - Key->KeyCellOffset = Key->KeyCellOffsetInParentHive = KeyCellOffset; - Key->KeyCell = (PCM_KEY_NODE)HvGetCell (&RegistryHive->Hive, Key->KeyCellOffset); - if (!Key->KeyCell) - { - free(Key); - return NULL; - } - Key->KeyCell->SubKeyLists[Stable] = HCELL_NIL; - Key->KeyCell->SubKeyLists[Volatile] = HCELL_NIL; + Key->KeyCellOffset = KeyCellOffset; return Key; } + +LIST_ENTRY CmiReparsePointsHead; static LONG RegpOpenOrCreateKey( IN HKEY hParentKey, IN PCWSTR KeyName, IN BOOL AllowCreation, + IN BOOL Volatile, OUT PHKEY Key) { PWSTR LocalKeyName; PWSTR End; UNICODE_STRING KeyString; NTSTATUS Status; - PMEMKEY ParentKey; + PREPARSE_POINT CurrentReparsePoint; PMEMKEY CurrentKey; + PCMHIVE ParentRegistryHive; + HCELL_INDEX ParentCellOffset; PLIST_ENTRY Ptr; PCM_KEY_NODE SubKeyCell; HCELL_INDEX BlockOffset; - BOOLEAN ParentIsSystem = FALSE; DPRINT("RegpCreateOpenKey('%S')\n", KeyName); if (*KeyName == L'\\') { KeyName++; - ParentKey = RootKey; + ParentRegistryHive = RootKey->RegistryHive; + ParentCellOffset = RootKey->KeyCellOffset; } else if (hParentKey == NULL) { - ParentKey = RootKey; + ParentRegistryHive = RootKey->RegistryHive; + ParentCellOffset = RootKey->KeyCellOffset; } else { - ParentKey = HKEY_TO_MEMKEY(RootKey); + ParentRegistryHive = HKEY_TO_MEMKEY(RootKey)->RegistryHive; + ParentCellOffset = HKEY_TO_MEMKEY(RootKey)->KeyCellOffset; } LocalKeyName = (PWSTR)KeyName; @@ -130,77 +125,55 @@ } } - /* Redirect from 'CurrentControlSet' to 'ControlSet001' */ - if (!strncmpiW(LocalKeyName, L"CurrentControlSet", 17) && ParentIsSystem) - { - RtlInitUnicodeString(&KeyString, L"ControlSet001"); - ParentIsSystem = FALSE; - } - else - { - ParentIsSystem = (strncmpiW(LocalKeyName, L"SYSTEM", 6) == 0); - } - Status = CmiScanForSubKey( - ParentKey->RegistryHive, - ParentKey->KeyCell, + ParentRegistryHive, + ParentCellOffset, &KeyString, OBJ_CASE_INSENSITIVE, &SubKeyCell, &BlockOffset); if (NT_SUCCESS(Status)) { - /* Check subkey in memory structure */ - Ptr = ParentKey->SubKeyList.Flink; - while (Ptr != &ParentKey->SubKeyList) + /* Search for a possible reparse point */ + Ptr = CmiReparsePointsHead.Flink; + while (Ptr != &CmiReparsePointsHead) { - CurrentKey = CONTAINING_RECORD(Ptr, MEMKEY, KeyList); - if (CurrentKey->KeyCellOffsetInParentHive == BlockOffset) + CurrentReparsePoint = CONTAINING_RECORD(Ptr, REPARSE_POINT, ListEntry); + if (CurrentReparsePoint->SourceHive == ParentRegistryHive && + CurrentReparsePoint->SourceKeyCellOffset == BlockOffset) { - goto nextsubkey; + ParentRegistryHive = CurrentReparsePoint->DestinationHive; + BlockOffset = CurrentReparsePoint->DestinationKeyCellOffset; + break; } - Ptr = Ptr->Flink; } - /* If we go there, this means that key exists, but we don't know it */ - ASSERT(FALSE); } - - if (AllowCreation && Status == STATUS_OBJECT_NAME_NOT_FOUND) + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND && AllowCreation) { Status = CmiAddSubKey( - ParentKey->RegistryHive, - ParentKey->KeyCell, - ParentKey->KeyCellOffset, + ParentRegistryHive, + ParentCellOffset, &KeyString, - 0, + Volatile ? REG_OPTION_VOLATILE : 0, &SubKeyCell, &BlockOffset); - if (NT_SUCCESS(Status)) - { - /* Now, SubKeyCell/BlockOffset are valid */ - CurrentKey = CreateInMemoryStructure( - ParentKey->RegistryHive, - BlockOffset, - &KeyString); - if (!CurrentKey) - return ERROR_OUTOFMEMORY; - /* Add CurrentKey in ParentKey */ - InsertTailList(&ParentKey->SubKeyList, &CurrentKey->KeyList); - } } if (!NT_SUCCESS(Status)) return ERROR_UNSUCCESSFUL; nextsubkey: - ParentKey = CurrentKey; + ParentCellOffset = BlockOffset; if (End) LocalKeyName = End + 1; else break; } - *Key = MEMKEY_TO_HKEY(ParentKey); + CurrentKey = CreateInMemoryStructure(ParentRegistryHive, ParentCellOffset); + if (!CurrentKey) + return ERROR_OUTOFMEMORY; + *Key = MEMKEY_TO_HKEY(CurrentKey); return ERROR_SUCCESS; } @@ -211,7 +184,7 @@ IN LPCWSTR lpSubKey, OUT PHKEY phkResult) { - return RegpOpenOrCreateKey(hKey, lpSubKey, TRUE, phkResult); + return RegpOpenOrCreateKey(hKey, lpSubKey, TRUE, FALSE, phkResult); } static PWSTR @@ -270,7 +243,26 @@ IN LPCWSTR lpSubKey, OUT PHKEY phkResult) { - return RegpOpenOrCreateKey(hKey, lpSubKey, FALSE, phkResult); + return RegpOpenOrCreateKey(hKey, lpSubKey, FALSE, FALSE, phkResult); +} + +LONG WINAPI +RegCreateKeyExW( + IN HKEY hKey, + IN LPCWSTR lpSubKey, + IN DWORD Reserved, + IN LPWSTR lpClass OPTIONAL, + IN DWORD dwOptions, + IN REGSAM samDesired, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes OPTIONAL, + OUT PHKEY phkResult, + OUT LPDWORD lpdwDisposition OPTIONAL) +{ + return RegpOpenOrCreateKey(hKey, + lpSubKey, + TRUE, + (dwOptions & REG_OPTION_VOLATILE) != 0, + phkResult); } LONG WINAPI @@ -308,7 +300,7 @@ Status = CmiScanForValueKey( ParentKey->RegistryHive, - ParentKey->KeyCell, + ParentKey->KeyCellOffset, &ValueString, ValueCell, ValueCellOffset); @@ -316,7 +308,6 @@ { Status = CmiAddValueKey( ParentKey->RegistryHive, - ParentKey->KeyCell, ParentKey->KeyCellOffset, &ValueString, ValueCell, @@ -427,9 +418,6 @@ HvMarkCellDirty(&Key->RegistryHive->Hive, ValueCell->Data, FALSE); HvMarkCellDirty(&Key->RegistryHive->Hive, ValueCellOffset, FALSE); } - - if (cbData > Key->KeyCell->MaxValueDataLen) - Key->KeyCell->MaxValueDataLen = cbData; HvMarkCellDirty(&Key->RegistryHive->Hive, Key->KeyCellOffset, FALSE); @@ -482,27 +470,46 @@ IN LPCWSTR Path) { NTSTATUS Status; + PREPARSE_POINT ReparsePoint; PMEMKEY NewKey; LONG rc; + ReparsePoint = (PREPARSE_POINT)malloc(sizeof(REPARSE_POINT)); + if (!ReparsePoint) + return FALSE; + Status = CmiInitializeTempHive(HiveToConnect); if (!NT_SUCCESS(Status)) { DPRINT1("CmiInitializeTempHive() failed with status 0x%08x\n", Status); + free(ReparsePoint); return FALSE; } /* Create key */ - rc = RegCreateKeyW( + rc = RegCreateKeyExW( RootKey, Path, - (PHKEY)&NewKey); + 0, + NULL, + REG_OPTION_VOLATILE, + 0, + NULL, + (PHKEY)&NewKey, + NULL); if (rc != ERROR_SUCCESS) + { + free(ReparsePoint); return FALSE; - + } + + ReparsePoint->SourceHive = NewKey->RegistryHive; + ReparsePoint->SourceKeyCellOffset = NewKey->KeyCellOffset; NewKey->RegistryHive = HiveToConnect; NewKey->KeyCellOffset = HiveToConnect->Hive.BaseBlock->RootCell; - NewKey->KeyCell = (PCM_KEY_NODE)HvGetCell (&HiveToConnect->Hive, NewKey->KeyCellOffset); + ReparsePoint->DestinationHive = NewKey->RegistryHive; + ReparsePoint->DestinationKeyCellOffset = NewKey->KeyCellOffset; + InsertTailList(&CmiReparsePointsHead, &ReparsePoint->ListEntry); return TRUE; } @@ -513,9 +520,11 @@ { UNICODE_STRING RootKeyName = RTL_CONSTANT_STRING(L"\\"); NTSTATUS Status; - HKEY ControlSetKey; + PMEMKEY ControlSetKey, CurrentControlSetKey; + PREPARSE_POINT ReparsePoint; InitializeListHead(&CmiHiveListHead); + InitializeListHead(&CmiReparsePointsHead); Status = CmiInitializeTempHive(&RootHive); if (!NT_SUCCESS(Status)) @@ -526,8 +535,7 @@ RootKey = CreateInMemoryStructure( &RootHive, - RootHive.Hive.BaseBlock->RootCell, - &RootKeyName); + RootHive.Hive.BaseBlock->RootCell); /* Create DEFAULT key */ ConnectRegistry( @@ -563,7 +571,27 @@ RegCreateKeyW( NULL, L"Registry\\Machine\\SYSTEM\\ControlSet001", - &ControlSetKey); + (HKEY*)&ControlSetKey); + + /* Create 'CurrentControlSet' key */ + RegCreateKeyExW( + NULL, + L"Registry\\Machine\\SYSTEM\\CurrentControlSet", + 0, + NULL, + REG_OPTION_VOLATILE, + 0, + NULL, + (HKEY*)&CurrentControlSetKey, + NULL); + + /* Connect 'CurrentControlSet' to 'ControlSet001' */ + ReparsePoint = (PREPARSE_POINT)malloc(sizeof(REPARSE_POINT)); + ReparsePoint->SourceHive = CurrentControlSetKey->RegistryHive; + ReparsePoint->SourceKeyCellOffset = CurrentControlSetKey->KeyCellOffset; + ReparsePoint->DestinationHive = ControlSetKey->RegistryHive; + ReparsePoint->DestinationKeyCellOffset = ControlSetKey->KeyCellOffset; + InsertTailList(&CmiReparsePointsHead, &ReparsePoint->ListEntry); } VOID Modified: trunk/reactos/tools/mkhive/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.h?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.h [iso-8859-1] Sun Oct 5 21:30:57 2014 @@ -6,15 +6,19 @@ #pragma once +typedef struct _REPARSE_POINT +{ + LIST_ENTRY ListEntry; + PCMHIVE SourceHive; + HCELL_INDEX SourceKeyCellOffset; + PCMHIVE DestinationHive; + HCELL_INDEX DestinationKeyCellOffset; +} REPARSE_POINT, *PREPARSE_POINT; + typedef struct _MEMKEY { - LIST_ENTRY KeyList; - LIST_ENTRY SubKeyList; - /* Information on hard disk structure */ - HCELL_INDEX KeyCellOffsetInParentHive; HCELL_INDEX KeyCellOffset; - PCM_KEY_NODE KeyCell; PCMHIVE RegistryHive; } MEMKEY, *PMEMKEY;

1 0

[jgardou] 64551: [NTOS/MM] - Silence some DPRINTs
by jgardou＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: jgardou Date: Sun Oct 5 20:37:30 2014 New Revision: 64551 URL: http://svn.reactos.org/svn/reactos?rev=64551&view=rev Log: [NTOS/MM] - Silence some DPRINTs Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Oct 5 20:37:30 2014 @@ -906,7 +906,7 @@ PMMPFN Pfn1; MMPTE TempPte; PMMPTE PointerToPteForProtoPage; - DPRINT1("Transition fault on 0x%p with PTE 0x%p in process %s\n", + DPRINT("Transition fault on 0x%p with PTE 0x%p in process %s\n", FaultingAddress, PointerPte, CurrentProcess->ImageFileName); /* Windowss does this check */ @@ -923,7 +923,7 @@ /* Get the PFN and the PFN entry */ PageFrameIndex = TempPte.u.Trans.PageFrameNumber; - DPRINT1("Transition PFN: %lx\n", PageFrameIndex); + DPRINT("Transition PFN: %lx\n", PageFrameIndex); Pfn1 = MiGetPfnEntry(PageFrameIndex); /* One more transition fault! */ @@ -957,7 +957,7 @@ if (Pfn1->u3.e1.PageLocation == ActiveAndValid) { /* All Windows does here is a bunch of sanity checks */ - DPRINT1("Transition in active list\n"); + DPRINT("Transition in active list\n"); ASSERT((Pfn1->PteAddress >= MiAddressToPte(MmPagedPoolStart)) && (Pfn1->PteAddress <= MiAddressToPte(MmPagedPoolEnd))); ASSERT(Pfn1->u2.ShareCount != 0); @@ -966,7 +966,7 @@ else { /* Otherwise, the page is removed from its list */ - DPRINT1("Transition page in free/zero list\n"); + DPRINT("Transition page in free/zero list\n"); MiUnlinkPageFromList(Pfn1); MiReferenceUnusedPageAndBumpLockCount(Pfn1); }

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014