Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[tfaber] 69707: [USER32_APITEST] - Add a test for the bug in win32k highlighted by the recent ATL breakage CORE-10413

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 26 12:03:09 2015 New Revision: 69707 URL: http://svn.reactos.org/svn/reactos?rev=69707&view=rev Log: [USER32_APITEST] - Add a test for the bug in win32k highlighted by the recent ATL breakage CORE-10413 Added: trunk/rostests/apitests/user32/CreateWindowEx.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Mon Oct 26 12:03:09 2015 @@ -4,10 +4,12 @@ helper.c CreateDialog.c CreateIconFromResourceEx.c + CreateWindowEx.c DeferWindowPos.c DestroyCursorIcon.c DrawIconEx.c desktop.c + DestroyWindow.c EnumDisplaySettings.c GetDCEx.c GetIconInfo.c Added: trunk/rostests/apitests/user32/CreateWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CreateWin… ============================================================================== --- trunk/rostests/apitests/user32/CreateWindowEx.c (added) +++ trunk/rostests/apitests/user32/CreateWindowEx.c [iso-8859-1] Mon Oct 26 12:03:09 2015 @@ -0,0 +1,28 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for CreateWindowEx + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> +#include <winuser.h> + + +START_TEST(CreateWindowEx) +{ + HWND hWnd; + DWORD dwError; + + SetLastError(0x1234); + hWnd = CreateWindowExW(0, L"BUTTON", NULL, WS_CHILD, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + dwError = GetLastError(); + ok(hWnd == NULL, "hWnd = %p\n", hWnd); + ok(dwError == ERROR_TLW_WITH_WSCHILD, "error = %lu\n", dwError); + + SetLastError(0x1234); + hWnd = CreateWindowExW(0, L"BUTTON", NULL, WS_CHILD, 0, 0, 0, 0, (HWND)(LONG_PTR)-1, NULL, NULL, NULL); + dwError = GetLastError(); + ok(hWnd == NULL, "hWnd = %p\n", hWnd); + ok(dwError == ERROR_INVALID_WINDOW_HANDLE, "error = %lu\n", dwError); +} Propchange: trunk/rostests/apitests/user32/CreateWindowEx.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Mon Oct 26 12:03:09 2015 @@ -6,10 +6,12 @@ extern void func_AttachThreadInput(void); extern void func_CreateDialog(void); extern void func_CreateIconFromResourceEx(void); +extern void func_CreateWindowEx(void); extern void func_DeferWindowPos(void); extern void func_DestroyCursorIcon(void); extern void func_DrawIconEx(void); extern void func_desktop(void); +extern void func_DestroyWindow(void); extern void func_EnumDisplaySettings(void); extern void func_GetDCEx(void); extern void func_GetIconInfo(void); @@ -41,10 +43,12 @@ { "AttachThreadInput", func_AttachThreadInput }, { "CreateDialog", func_CreateDialog }, { "CreateIconFromResourceEx", func_CreateIconFromResourceEx }, + { "CreateWindowEx", func_CreateWindowEx }, { "DeferWindowPos", func_DeferWindowPos }, { "DestroyCursorIcon", func_DestroyCursorIcon }, { "DrawIconEx", func_DrawIconEx }, { "desktop", func_desktop }, + { "DestroyWindow", func_DestroyWindow }, { "EnumDisplaySettings", func_EnumDisplaySettings }, { "GetDCEx", func_GetDCEx }, { "GetIconInfo", func_GetIconInfo },

9 years, 1 month

[gedmurphy] 69706: [DEVMGR] - Highlight unused resources - Patch by Ștefan Fulea CORE-6109

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Oct 26 11:41:47 2015 New Revision: 69706 URL: http://svn.reactos.org/svn/reactos?rev=69706&view=rev Log: [DEVMGR] - Highlight unused resources - Patch by Ștefan Fulea CORE-6109 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 26 11:41:47 2015 @@ -64,8 +64,8 @@ IDS_DEV_DISABLED "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ÑÐ¾ Ð½Ðµ Ðµ Ð²ÐºÐ»ÑÑÐµÐ½Ð¾." IDS_DEV_DISABLED2 "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ÑÐ¾ Ðµ Ð·Ð°Ð±ÑÐ°Ð½ÐµÐ½Ð¾." IDS_DEV_DEVLOADER_NOT_READY "ÐÐ°ÑÐµÐ¶Ð´Ð°ÑÐ¸ÑÐµ Ð·Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ÑÐ¾ Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ Ð´Ð° Ð·Ð°ÑÐµÐ´ÑÑ Ð²Ð¾Ð´Ð°ÑÐ¸ÑÐµ." - IDS_DEV_DEVLOADER_NOT_READY2 "ÐÐ¸Ð´ÐµÐ¾ÐºÐ°ÑÑÐ°ÑÐ° ÑÐ°Ð±Ð¾ÑÐ¸ Ð¿ÑÐ°Ð²Ð¸Ð»Ð½Ð¾." - IDS_DEV_DEVLOADER_NOT_READY3 "ÐÐ°ÑÐµÐ¶Ð´Ð°ÑÐ¸ÑÐµ Ð·Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ÑÐ¾ Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ Ð´Ð° Ð·Ð°ÑÐµÐ´ÑÑ Ð²Ð¾Ð´Ð°ÑÐ¸ÑÐµ." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Ð¢Ð¾Ð²Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð»Ð¸Ð¿ÑÐ²Ð°, Ð½Ðµ ÑÐ°Ð±Ð¾ÑÐ¸ Ð¿ÑÐ°Ð²Ð¸Ð»Ð½Ð¾ Ð¸Ð»Ð¸ Ð½Ðµ Ð²ÑÐ¸ÑÐºÐ¸ÑÐµ Ð¼Ñ Ð²Ð¾Ð´Ð°ÑÐ¸ ÑÐ° ÑÐ»Ð¾Ð¶ÐµÐ½Ð¸." IDS_DEV_MOVED "Ð ÐµÐ°ÐºÑÐÐ¡ Ð²ÑÐµ Ð¾ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹Ð²Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ÑÐ¾." IDS_DEV_TOO_EARLY "Ð ÐµÐ°ÐºÑÐÐ¡ Ð²ÑÐµ Ð¾ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹Ð²Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ÑÐ¾." 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 26 11:41:47 2015 @@ -69,8 +69,8 @@ IDS_DEV_DISABLED "Toto zaÅÃzenÃ nenÃ spuÅ¡tÄno." IDS_DEV_DISABLED2 "Toto zaÅÃzenÃ je vypnuto." IDS_DEV_DEVLOADER_NOT_READY "Loadery tohoto zaÅÃzenÃ nemohou naÄÃst poÅ¾adovanÃ© ovladaÄe." - IDS_DEV_DEVLOADER_NOT_READY2 "Tento zobrazovacÃ adaptÃ©r funguje sprÃ¡vnÄ." - IDS_DEV_DEVLOADER_NOT_READY3 "Loadery tohoto zaÅÃzenÃ nemohou naÄÃst poÅ¾adovanÃ© ovladaÄe." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "ZaÅÃzenÃ nenÃ pÅÃtomno, nepracuje sprÃ¡vnÄ nebo nemÃ¡ nainstalovanÃ© vÅ¡echny ovladaÄe." IDS_DEV_MOVED "ReactOS prÃ¡vÄ nastavuje toto zaÅÃzenÃ." IDS_DEV_TOO_EARLY "ReactOS prÃ¡vÄ nastavuje toto zaÅÃzenÃ." 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 26 11:41:47 2015 @@ -66,8 +66,8 @@ IDS_DEV_DISABLED "Dieses GerÃ¤t ist nicht gestartet." IDS_DEV_DISABLED2 "Dieses GerÃ¤t ist deaktiviert." IDS_DEV_DEVLOADER_NOT_READY "Der Lader fÃ¼r dieses GerÃ¤t kann die benÃ¶tigten Treiber nicht laden." - IDS_DEV_DEVLOADER_NOT_READY2 "Diese Grafikkarte funktioniert einwandfrei." - IDS_DEV_DEVLOADER_NOT_READY3 "Die Lader fÃ¼r dieses GerÃ¤t kÃ¶nnen die benÃ¶tigten Treiber nicht laden." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Dieses GerÃ¤t ist entweder nicht vorhanden, funktioniert nicht korrekt, oder es sind nicht alle Treiber installiert." IDS_DEV_MOVED "ReactOS ist dabei dieses GerÃ¤t zu aktivieren." IDS_DEV_TOO_EARLY "ReactOS ist dabei dieses GerÃ¤t zu aktivieren." 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 26 11:41:47 2015 @@ -66,8 +66,8 @@ IDS_DEV_DISABLED "ÎÏÏÎ® Î· ÏÏÏÎºÎµÏÎ® Î´ÎµÎ½ Î¾ÎµÎºÎ¯Î½Î·ÏÎµ." IDS_DEV_DISABLED2 "ÎÏÏÎ® Î· ÏÏÏÎºÎµÏÎ® ÎµÎ¯Î½Î±Î¹ Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½Î·." IDS_DEV_DEVLOADER_NOT_READY "The loaders for this device cannot load the required drivers." - IDS_DEV_DEVLOADER_NOT_READY2 "ÎÏÏÏÏ Î¿ ÏÏÎ¿ÏÎ±ÏÎ¼Î¿Î³ÎÎ±Ï Î¿Î¸ÏÎ½Î·Ï Î»ÎµÎ¹ÏÎ¿ÏÏÎ³ÎµÎ¯ ÎºÎ±Î½Î¿Î½Î¹ÎºÎ¬." - IDS_DEV_DEVLOADER_NOT_READY3 "The loaders for this device cannot load the required drivers." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." 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 26 11:41:47 2015 @@ -64,8 +64,8 @@ IDS_DEV_DISABLED "This device is not started." IDS_DEV_DISABLED2 "This device is disabled." IDS_DEV_DEVLOADER_NOT_READY "The loaders for this device cannot load the required drivers." - IDS_DEV_DEVLOADER_NOT_READY2 "This display adapter is functioning correctly." - IDS_DEV_DEVLOADER_NOT_READY3 "The loaders for this device cannot load the required drivers." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." 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 26 11:41:47 2015 @@ -66,8 +66,8 @@ IDS_DEV_DISABLED "Este dispositivo no ha sido inicializado." IDS_DEV_DISABLED2 "Este dispositivo ha sido deshabilitado." IDS_DEV_DEVLOADER_NOT_READY "Los cargadores para este dispositivo no pueden cargar los controladors requeridos." - IDS_DEV_DEVLOADER_NOT_READY2 "Este adaptador de video esta funcionando correctamente." - IDS_DEV_DEVLOADER_NOT_READY3 "Los cargadores para este dispositivo no pueden cargar los controladors requeridos." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Este dispositivo no esta presente, no trabaja correctamente, o no tiene todos los controladors instalados." IDS_DEV_MOVED "ReactOS estÃ¡ en el proceso de instalaciÃ³n de este dispositivo." IDS_DEV_TOO_EARLY "ReactOS estÃ¡ en el proceso de instalaciÃ³n de este dispositivo." 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 26 11:41:47 2015 @@ -65,8 +65,8 @@ IDS_DEV_DISABLED "Ce pÃ©riphÃ©rique n'est pas dÃ©marrÃ©." IDS_DEV_DISABLED2 "Ce pÃ©riphÃ©rique est dÃ©sactivÃ©." IDS_DEV_DEVLOADER_NOT_READY "Les chargeurs de ce pÃ©riphÃ©rique ne peuvent pas charger les drivers requis." - IDS_DEV_DEVLOADER_NOT_READY2 "Cet Ã©cran fonctionne correctement." - IDS_DEV_DEVLOADER_NOT_READY3 "Les chargeurs de ce pÃ©riphÃ©rique ne peuvent pas charger les drivers requis." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Ce pÃ©riphÃ©rique est soit non prÃ©sent, soit ne fonctionne pas correctement, ou n'a pas tous les pilotes installÃ©s." IDS_DEV_MOVED "ReactOS est en train de mettre en place ce pÃ©riphÃ©rique." IDS_DEV_TOO_EARLY "ReactOS est en train de mettre en place ce pÃ©riphÃ©rique." 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 26 11:41:47 2015 @@ -66,8 +66,8 @@ IDS_DEV_DISABLED "This device is not started." IDS_DEV_DISABLED2 "This device is disabled." IDS_DEV_DEVLOADER_NOT_READY "The loaders for this device cannot load the required drivers." - IDS_DEV_DEVLOADER_NOT_READY2 "This display adapter is functioning correctly." - IDS_DEV_DEVLOADER_NOT_READY3 "The loaders for this device cannot load the required drivers." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." 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 26 11:41:47 2015 @@ -65,8 +65,8 @@ IDS_DEV_DISABLED "Az eszkÃ¶z nincs bekapcsolva." IDS_DEV_DISABLED2 "Az eszkÃ¶z nincs bekapcsolva." IDS_DEV_DEVLOADER_NOT_READY "Nem lehet betÃ¶lteni az igÃ©nyelt eszkÃ¶z illesztÃµprogramjait." - IDS_DEV_DEVLOADER_NOT_READY2 "Ez a megjelenÃtÃµ megfelelÃµen mÃ»kÃ¶dik." - IDS_DEV_DEVLOADER_NOT_READY3 "Nem lehet betÃ¶lteni az igÃ©nyelt eszkÃ¶z illesztÃµprogramjait." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Ez az eszkÃ¶z mÃ¡r nincs jelen, elromlott vagy nincs minden illesztÃµprogram feltelepÃtve hozzÃ¡." IDS_DEV_MOVED "A ReactOS Ã©pp az eszkÃ¶zt telepÃti." IDS_DEV_TOO_EARLY "A ReactOS Ã©pp az eszkÃ¶zt telepÃti." 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 26 11:41:47 2015 @@ -66,8 +66,8 @@ IDS_DEV_DISABLED "Device ini tidak dimulai." IDS_DEV_DISABLED2 "Device ini dimatikan." IDS_DEV_DEVLOADER_NOT_READY "Pengambil device ini tidak bisa mengambil driver yang dibutuhkan." - IDS_DEV_DEVLOADER_NOT_READY2 "Adapter tampilan ini berfungsi dengan baik." - IDS_DEV_DEVLOADER_NOT_READY3 "Pengambil device ini tidak bisa mengambil driver yang dibutuhkan." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Device ini baik tidak ada, tidak bekerja dengan baik, ataupun drivernya tidak semua terinstalasi." IDS_DEV_MOVED "ReactOS sedang dalam proses menyiapkan device ini." IDS_DEV_TOO_EARLY "ReactOS sedang dalam proses menyiapkan device ini." 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 26 11:41:47 2015 @@ -66,8 +66,8 @@ IDS_DEV_DISABLED "Questo dispositivo non Ã¨ avviato." IDS_DEV_DISABLED2 "Questo dispositivo Ã¨ disabilitato." IDS_DEV_DEVLOADER_NOT_READY "Il loader del dispositivo non puÃ² caricare i driver necessari." - IDS_DEV_DEVLOADER_NOT_READY2 "L'adattatore per il monitor funziona regolarmente." - IDS_DEV_DEVLOADER_NOT_READY3 "Il loader del dispositivo non puÃ² caricare i driver necessari." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Il dispositivo puÃ² essere assente, malfunzionante o non ha tutti i driver necessari." IDS_DEV_MOVED "ReactOS sta per attivare questo dispositivo." IDS_DEV_TOO_EARLY "ReactOS sta per attivare questo dispositivo." 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 26 11:41:47 2015 @@ -66,8 +66,8 @@ IDS_DEV_DISABLED "Denne enheten er ikke startet." IDS_DEV_DISABLED2 "Denne enheten er deaktivert." IDS_DEV_DEVLOADER_NOT_READY "Oppstartlasteren for denne enheten kan ikke laste de nÃ¸dvendige filene." - IDS_DEV_DEVLOADER_NOT_READY2 "Dette skjermkortet fungerer som det skal." - IDS_DEV_DEVLOADER_NOT_READY3 "Oppstartlasteren for denne enheten kan ikke laste de nÃ¸dvendige driverene." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Denne enheten er heller ikke valgt, eller vil ikke fungere riktig, eller sÃ¥ har den ikke alle driverene som trengs." IDS_DEV_MOVED "ReactOS starter prosessen for Ã¥ setter opp denne enheten." IDS_DEV_TOO_EARLY "ReactOS er i prosessen for Ã¥ setter opp denne enheten." 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 26 11:41:47 2015 @@ -74,8 +74,8 @@ IDS_DEV_DISABLED "UrzÄdzenie nie zostaÅo uruchomione." IDS_DEV_DISABLED2 "UrzÄdzenie jest wyÅÄczone." IDS_DEV_DEVLOADER_NOT_READY "Systemy Åadowania sprzÄtu nie mÃ³gÅy zaÅadowaÄ wymaganego sterownika." - IDS_DEV_DEVLOADER_NOT_READY2 "Karta graficzna dziaÅa prawidÅowo." - IDS_DEV_DEVLOADER_NOT_READY3 "Systemy Åadowania sprzÄtu nie mÃ³gÅy zaÅadowaÄ wymaganego sterownika." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "UrzÄdzenie nie jest obecne, nie dziaÅa poprawnie lub nie wszystkie sterowniki urzÄdzenia zostaÅy zainstalowane." IDS_DEV_MOVED "ReactOS jest w trakcie konfigurowania tego urzÄdzenia." IDS_DEV_TOO_EARLY "ReactOS jest w trakcie konfigurowania tego urzÄdzenia." 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 26 11:41:47 2015 @@ -66,8 +66,8 @@ IDS_DEV_DISABLED "Este dispositivo nÃ£o foi inicializado." IDS_DEV_DISABLED2 "Este dispositivo estÃ¡ desativado." IDS_DEV_DEVLOADER_NOT_READY "Os carregadores para este dispositivo nÃ£o puderam carregar os drivers necessÃ¡rios." - IDS_DEV_DEVLOADER_NOT_READY2 "Este adaptador de vÃdeo estÃ¡ funcionando corretamente." - IDS_DEV_DEVLOADER_NOT_READY3 "Os carregadores para este dispositivo nÃ£o puderam carregar os drivers necessÃ¡rios." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Este dispositivo nÃ£o estÃ¡ presente, nÃ£o estÃ¡ funcionando corretamente ou nÃ£o tem todos os drivers instalados." IDS_DEV_MOVED "O ReactOS estÃ¡ no processo de configuraÃ§Ã£o deste dispositivo." IDS_DEV_TOO_EARLY "O ReactOS estÃ¡ no processo de configuraÃ§Ã£o deste dispositivo." 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 26 11:41:47 2015 @@ -69,8 +69,8 @@ IDS_DEV_DISABLED "Acest dispozitiv nu este pornit." IDS_DEV_DISABLED2 "Acest dispozitiv este dezactivat." IDS_DEV_DEVLOADER_NOT_READY "Nu se pot Ã®ncÄrca toate modulele-pilot necesare." - IDS_DEV_DEVLOADER_NOT_READY2 "Nu se pot Ã®ncÄrca toate modulele-pilot necesare." - IDS_DEV_DEVLOADER_NOT_READY3 "Nu se pot Ã®ncÄrca toate modulele-pilot necesare." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Acest dispozitiv fie nu este prezent, fie nu funcÈioneazÄ corect, fie nu are instalate toate modulele-pilot." IDS_DEV_MOVED "Pentru moment acest dispozitiv Ã®ncÄ nu este pe deplin instalat." IDS_DEV_TOO_EARLY "Pentru moment acest dispozitiv Ã®ncÄ nu este pe deplin instalat." 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 26 11:41:47 2015 @@ -66,8 +66,8 @@ IDS_DEV_DISABLED "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ðµ Ð·Ð°Ð¿ÑÑÐµÐ½Ð¾." IDS_DEV_DISABLED2 "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð¾." IDS_DEV_DEVLOADER_NOT_READY "ÐÐ°Ð³ÑÑÐ·ÑÐ¸Ðº ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ÑÐµ Ð´ÑÐ°Ð¹Ð²ÐµÑÑ." - IDS_DEV_DEVLOADER_NOT_READY2 "ÐÑÐ¾Ñ Ð°Ð´Ð°Ð¿ÑÐµÑ ÑÐºÑÐ°Ð½Ð° ÑÑÐ½ÐºÑÐ¸Ð¾Ð½Ð¸ÑÑÐµÑ ÐºÐ¾ÑÑÐµÐºÑÐ½Ð¾." - IDS_DEV_DEVLOADER_NOT_READY3 "ÐÐ°Ð³ÑÑÐ·ÑÐ¸Ðº ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ÑÐµ Ð´ÑÐ°Ð¹Ð²ÐµÑÑ." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð¾ÑÑÑÑÑÑÐ²ÑÐµÑ, ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ Ð¸Ð»Ð¸ Ð´Ð»Ñ Ð½ÐµÐ³Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð½Ðµ Ð²ÑÐµ Ð´ÑÐ°Ð¹Ð²ÐµÑÑ." IDS_DEV_MOVED "ReactOS Ð½Ð°ÑÑÑÐ°Ð¸Ð²Ð°ÐµÑ ÑÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾." IDS_DEV_TOO_EARLY "ReactOS Ð½Ð°ÑÑÑÐ°Ð¸Ð²Ð°ÐµÑ ÑÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾." 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 26 11:41:47 2015 @@ -69,8 +69,8 @@ IDS_DEV_DISABLED "Toto zariadenie nie je spustenÃ©." IDS_DEV_DISABLED2 "Toto zariadenie je zakÃ¡zanÃ©." IDS_DEV_DEVLOADER_NOT_READY "The loaders for this device cannot load the required drivers." - IDS_DEV_DEVLOADER_NOT_READY2 "This display adapter is functioning correctly." - IDS_DEV_DEVLOADER_NOT_READY3 "The loaders for this device cannot load the required drivers." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." 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 26 11:41:47 2015 @@ -68,8 +68,8 @@ IDS_DEV_DISABLED "Kjo pajisje nuk Ã«shtÃ« nisur." IDS_DEV_DISABLED2 "Kjo pajisje Ã«shtÃ« gjymtuar." IDS_DEV_DEVLOADER_NOT_READY "Ngarkuesit pÃ«r kÃ«tÃ« pajisje nuk mund tÃ« ngarkojnÃ« komanduesin e kÃ«rkuar." - IDS_DEV_DEVLOADER_NOT_READY2 "Kjo pÃ«rshtatÃ«s ekrani Ã«shtÃ« duke funksionuar si duhet." - IDS_DEV_DEVLOADER_NOT_READY3 "Ngarkuesit pÃ«r kÃ«tÃ« pajisje nuk mund tÃ« ngarkojnÃ« komanduesin e kÃ«rkuar." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Kjo pajisje ose nuk Ã«shtÃ« e pranishme, nuk punon si duhet, ose nuk ka tÃ« gjithÃ« komanduesit e instaluar." IDS_DEV_MOVED "ReactOS Ã«shtÃ« nÃ« procesin e krijimit tÃ« kÃ«saj pajisje." IDS_DEV_TOO_EARLY "ReactOS Ã«shtÃ« nÃ« procesin e krijimit tÃ« kÃ«saj pajisje." 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 26 11:41:47 2015 @@ -66,8 +66,8 @@ IDS_DEV_DISABLED "Bu aygÄ±t baÅlamamÄ±Å." IDS_DEV_DISABLED2 "Bu aygÄ±t edilgin." IDS_DEV_DEVLOADER_NOT_READY "Bu aygÄ±t iÃ§in yÃ¼kleyiciler gerekli sÃ¼rÃ¼cÃ¼leri yÃ¼kleyemiyor." - IDS_DEV_DEVLOADER_NOT_READY2 "Bu gÃ¶rÃ¼ntÃ¼ baÄdaÅtÄ±rÄ±cÄ±sÄ± doÄru Ã§alÄ±ÅÄ±yor." - IDS_DEV_DEVLOADER_NOT_READY3 "Bu aygÄ±t iÃ§in yÃ¼kleyiciler gerekli sÃ¼rÃ¼cÃ¼leri yÃ¼kleyemiyor." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Bu aygÄ±t; ya yok, ya dÃ¼zgÃ¼n Ã§alÄ±ÅmÄ±yor, ya da bu aygÄ±tÄ±n kurulu tÃ¼m sÃ¼rÃ¼cÃ¼leri yok." IDS_DEV_MOVED "ReactOS, bu aygÄ±tÄ± kurma iÅleminde." IDS_DEV_TOO_EARLY "ReactOS, bu aygÄ±tÄ± kurma iÅleminde." 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 26 11:41:47 2015 @@ -72,8 +72,8 @@ IDS_DEV_DISABLED "Ð¦ÐµÐ¹ Ð¿ÑÐ¸ÑÑÑÑÐ¹ Ð½Ðµ Ð·Ð°Ð¿ÑÑÐµÐ½Ð¸Ð¹." IDS_DEV_DISABLED2 "Ð¦ÐµÐ¹ Ð¿ÑÐ¸ÑÑÑÑÐ¹ Ð²ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð¸Ð¹." IDS_DEV_DEVLOADER_NOT_READY "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐ²Ð°ÑÑ ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ Ð½Ð° Ð¼Ð¾Ð¶ÑÑÑ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¸." - IDS_DEV_DEVLOADER_NOT_READY2 "Ð¦ÐµÐ¹ Ð°Ð´Ð°Ð¿ÑÑÐµÑ Ð´Ð¸ÑÐ¿Ð»ÐµÑ ÑÑÐ½ÐºÑÑÐ¾Ð½ÑÑ ÐºÐ¾ÑÐµÐºÑÐ½Ð¾." - IDS_DEV_DEVLOADER_NOT_READY3 "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐ²Ð°ÑÑ ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ Ð½Ð° Ð¼Ð¾Ð¶ÑÑÑ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¸." + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Ð¦ÐµÐ¹ Ð¿ÑÐ¸ÑÑÑÑÐ¹ Ð²ÑÐ´ÑÑÑÐ½ÑÐ¹, Ð¿ÑÐ°ÑÑÑ Ð½ÐµÐºÐ¾ÑÐµÐºÑÐ½Ð¾ Ð°Ð±Ð¾ Ð½Ðµ Ð¼Ð°Ñ Ð²ÑÑÑ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÑÐ²." IDS_DEV_MOVED "ReactOS Ð½Ð°Ð»Ð°ÑÑÐ¾Ð²ÑÑ ÑÐµÐ¹ Ð¿ÑÐ¸ÑÑÑÑÐ¹." IDS_DEV_TOO_EARLY "ReactOS Ð½Ð°Ð»Ð°ÑÑÐ¾Ð²ÑÑ ÑÐµÐ¹ Ð¿ÑÐ¸ÑÑÑÑÐ¹."

9 years, 1 month

[tfaber] 69705: [ATL] - Revert broken math change in ATL::thunkCode::Init

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 26 11:38:30 2015 New Revision: 69705 URL: http://svn.reactos.org/svn/reactos?rev=69705&view=rev Log: [ATL] - Revert broken math change in ATL::thunkCode::Init Modified: trunk/reactos/lib/atl/atlwin.h Modified: trunk/reactos/lib/atl/atlwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlwin.h?rev=69705… ============================================================================== --- trunk/reactos/lib/atl/atlwin.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlwin.h [iso-8859-1] Mon Oct 26 11:38:30 2015 @@ -154,7 +154,7 @@ m_mov = 0x042444C7; m_this = PtrToUlong(pThis); m_jmp = 0xe9; - m_relproc = DWORD((INT_PTR)proc - (INT_PTR)this + sizeof(thunkCode)); + m_relproc = DWORD(reinterpret_cast<char *>(proc) - (reinterpret_cast<char *>(this) + sizeof(thunkCode))); FlushInstructionCache(GetCurrentProcess(), this, sizeof(thunkCode)); } };

9 years, 1 month

[gedmurphy] 69704: [DEVMGR] - Hide legacy devices and volumes by default - Patch by Eric Kohl CORE-10396

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Oct 26 08:40:14 2015 New Revision: 69704 URL: http://svn.reactos.org/svn/reactos?rev=69704&view=rev Log: [DEVMGR] - Hide legacy devices and volumes by default - Patch by Eric Kohl CORE-10396 Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] Mon Oct 26 08:40:14 2015 @@ -196,8 +196,13 @@ NULL); if (cr == CR_SUCCESS) { - return ((m_Status & DN_NO_SHOW_IN_DM) != 0); - } + if (m_Status & DN_NO_SHOW_IN_DM) + return true; + } + + if (IsEqualGUID(*GetClassGuid(), GUID_DEVCLASS_LEGACYDRIVER) || + IsEqualGUID(*GetClassGuid(), GUID_DEVCLASS_VOLUME)) + return true; return false; } Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Mon Oct 26 08:40:14 2015 @@ -460,6 +460,18 @@ if (IsEqualGUID(ClassGuid, GUID_DEVCLASS_UNKNOWN)) bClassUnknown = true; + // Check if this is a hidden class + if (IsEqualGUID(ClassGuid, GUID_DEVCLASS_LEGACYDRIVER) || + IsEqualGUID(ClassGuid, GUID_DEVCLASS_VOLUME)) + { + // Ignore this device if we aren't displaying hidden devices + if (m_ShowHidden == FALSE) + { + ClassIndex++; + continue; + } + } + do { // Get a handle to all the devices in this class

9 years, 1 month

[hbelusca] 69703: A parenthesis trolled me.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 25 23:13:37 2015 New Revision: 69703 URL: http://svn.reactos.org/svn/reactos?rev=69703&view=rev Log: A parenthesis trolled me. Modified: trunk/reactos/lib/atl/atlwin.h Modified: trunk/reactos/lib/atl/atlwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlwin.h?rev=69703… ============================================================================== --- trunk/reactos/lib/atl/atlwin.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlwin.h [iso-8859-1] Sun Oct 25 23:13:37 2015 @@ -154,7 +154,7 @@ m_mov = 0x042444C7; m_this = PtrToUlong(pThis); m_jmp = 0xe9; - m_relproc = DWORD((INT_PTR)proc - (INT_PTR)this + sizeof(thunkCode))); + m_relproc = DWORD((INT_PTR)proc - (INT_PTR)this + sizeof(thunkCode)); FlushInstructionCache(GetCurrentProcess(), this, sizeof(thunkCode)); } };

9 years, 2 months

[hbelusca] 69702: [ATL] - Fix exception specifier (Ged or Thomas, can you double-check those please? :) ) - ATL can be used in code not using the C++11 standard aka. fix build when double '>' chara...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 25 23:10:43 2015 New Revision: 69702 URL: http://svn.reactos.org/svn/reactos?rev=69702&view=rev Log: [ATL] - Fix exception specifier (Ged or Thomas, can you double-check those please? :) ) - ATL can be used in code not using the C++11 standard aka. fix build when double '>' characters are present, for example in template<foo bar<stuff>> . Modified: trunk/reactos/lib/atl/atlcoll.h trunk/reactos/lib/atl/atlstr.h Modified: trunk/reactos/lib/atl/atlcoll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlcoll.h?rev=6970… ============================================================================== --- trunk/reactos/lib/atl/atlcoll.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlcoll.h [iso-8859-1] Sun Oct 25 23:10:43 2015 @@ -136,7 +136,7 @@ { }; -template<typename E, class ETraits = CElementTraits<E>> +template<typename E, class ETraits = CElementTraits<E> > class CAtlList { private: @@ -178,7 +178,7 @@ E& GetNext(_Inout_ POSITION& pos); const E& GetNext(_Inout_ POSITION& pos) const; E& GetPrev(_Inout_ POSITION& pos); - const E& GetPrev(_Inout_ POSITION& pos) const throw(); + const E& GetPrev(_Inout_ POSITION& pos) const; E& GetAt(_In_ POSITION pos); const E& GetAt(_In_ POSITION pos) const; @@ -189,7 +189,7 @@ E RemoveHead(); E RemoveTail(); void RemoveAll(); - void RemoveAt(_In_ POSITION pos) throw(); + void RemoveAt(_In_ POSITION pos); POSITION Find( INARGTYPE element, Modified: trunk/reactos/lib/atl/atlstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlstr.h?rev=69702… ============================================================================== --- trunk/reactos/lib/atl/atlstr.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlstr.h [iso-8859-1] Sun Oct 25 23:10:43 2015 @@ -106,7 +106,7 @@ }; -template <typename _BaseType = wchar_t, class StringIterator = ChTraitsOS<_BaseType>> +template<typename _BaseType = wchar_t, class StringIterator = ChTraitsOS<_BaseType> > class StrTraitATL : public StringIterator { @@ -123,7 +123,7 @@ }; -typedef CStringT<wchar_t, StrTraitATL<wchar_t, ChTraitsCRT<wchar_t>>> CAtlStringW; +typedef CStringT< wchar_t, StrTraitATL< wchar_t, ChTraitsCRT<wchar_t> > > CAtlStringW; }

9 years, 2 months

[hbelusca] 69701: [ATL] - Flush the CPU instruction cache after the ATL window proc thunk code is patched into memory. - Implement some (not all) CAtlList methods that I will need later on. - Imple...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 25 22:55:18 2015 New Revision: 69701 URL: http://svn.reactos.org/svn/reactos?rev=69701&view=rev Log: [ATL] - Flush the CPU instruction cache after the ATL window proc thunk code is patched into memory. - Implement some (not all) CAtlList methods that I will need later on. - Implement some (not all) CStringT and CSimpleStringT methods & operators that I will need later on. Modified: trunk/reactos/lib/atl/atlcoll.h trunk/reactos/lib/atl/atlsimpstr.h trunk/reactos/lib/atl/atlwin.h trunk/reactos/lib/atl/cstringt.h Modified: trunk/reactos/lib/atl/atlcoll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlcoll.h?rev=6970… ============================================================================== --- trunk/reactos/lib/atl/atlcoll.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlcoll.h [iso-8859-1] Sun Oct 25 22:55:18 2015 @@ -54,12 +54,11 @@ inline void Destroy() { CAtlPlex* Block; + CAtlPlex* Next; Block = this; while (Block != NULL) { - CAtlPlex* Next; - Next = Block->m_Next; HeapFree(GetProcessHeap(), 0, Block); Block = Next; @@ -170,20 +169,32 @@ CAtlList(_In_ UINT nBlockSize = 10); ~CAtlList(); + size_t GetCount() const; bool IsEmpty() const; POSITION GetHeadPosition() const; - - E& GetNext( - _Inout_ POSITION &Position - ); - - POSITION AddTail( - INARGTYPE element - ); - + POSITION GetTailPosition() const; + + E& GetNext(_Inout_ POSITION& pos); + const E& GetNext(_Inout_ POSITION& pos) const; + E& GetPrev(_Inout_ POSITION& pos); + const E& GetPrev(_Inout_ POSITION& pos) const throw(); + + E& GetAt(_In_ POSITION pos); + const E& GetAt(_In_ POSITION pos) const; + + POSITION AddHead(INARGTYPE element); + POSITION AddTail(INARGTYPE element); + + E RemoveHead(); E RemoveTail(); void RemoveAll(); + void RemoveAt(_In_ POSITION pos) throw(); + + POSITION Find( + INARGTYPE element, + _In_opt_ POSITION posStartAfter = NULL) const; + POSITION FindIndex(_In_ size_t iElement) const; private: CNode* CreateNode( @@ -225,31 +236,94 @@ } template<typename E, class ETraits> -inline bool CAtlList< E, ETraits >::IsEmpty(void) const +inline size_t CAtlList< E, ETraits >::GetCount() const +{ + return m_NumElements; +} + +template<typename E, class ETraits> +inline bool CAtlList< E, ETraits >::IsEmpty() const { return (m_NumElements == 0); } template<typename E, class ETraits> -inline POSITION CAtlList<E, ETraits>::GetHeadPosition(void) const +inline POSITION CAtlList<E, ETraits>::GetHeadPosition() const { return (POSITION)m_HeadNode; } template<typename E, class ETraits> -inline E& CAtlList< E, ETraits >::GetNext( - _Inout_ POSITION& Position - ) -{ - CNode* Node = (CNode*)Position; - Position = (POSITION)Node->m_Next; +inline POSITION CAtlList<E, ETraits>::GetTailPosition() const +{ + return (POSITION)m_TailNode; +} + +template<typename E, class ETraits> +inline E& CAtlList< E, ETraits >::GetNext(_Inout_ POSITION& pos) +{ + CNode* Node = (CNode*)pos; + pos = (POSITION)Node->m_Next; return Node->m_Element; } template<typename E, class ETraits> -POSITION CAtlList<E, ETraits>::AddTail( - INARGTYPE element - ) +inline const E& CAtlList< E, ETraits >::GetNext(_Inout_ POSITION& pos) const +{ + CNode* Node = (CNode*)pos; + pos = (POSITION)Node->m_Next; + return Node->m_Element; +} + +template<typename E, class ETraits> +inline E& CAtlList< E, ETraits >::GetPrev(_Inout_ POSITION& pos) +{ + CNode* Node = (CNode*)pos; + pos = (POSITION)Node->m_Prev; + return Node->m_Element; +} + +template<typename E, class ETraits> +inline const E& CAtlList< E, ETraits >::GetPrev(_Inout_ POSITION& pos) const +{ + CNode* Node = (CNode*)pos; + pos = (POSITION)Node->m_Prev; + return Node->m_Element; +} + +template<typename E, class ETraits> +inline E& CAtlList< E, ETraits >::GetAt(_In_ POSITION pos) +{ + CNode* Node = (CNode*)pos; + return Node->m_Element; +} + +template<typename E, class ETraits> +inline const E& CAtlList< E, ETraits >::GetAt(_In_ POSITION pos) const +{ + CNode* Node = (CNode*)pos; + return Node->m_Element; +} + +template<typename E, class ETraits> +POSITION CAtlList<E, ETraits>::AddHead(INARGTYPE element) +{ + CNode* Node = CreateNode(element, NULL, m_HeadNode); + if (m_HeadNode) + { + m_HeadNode->m_Prev = Node; + } + else + { + m_TailNode = Node; + } + m_HeadNode = Node; + + return (POSITION)Node; +} + +template<typename E, class ETraits> +POSITION CAtlList<E, ETraits>::AddTail(INARGTYPE element) { CNode* Node = CreateNode(element, m_TailNode, NULL); if (m_TailNode) @@ -266,10 +340,29 @@ } template<typename E, class ETraits> -E CAtlList<E, ETraits>::RemoveTail(void) +E CAtlList<E, ETraits>::RemoveHead() +{ + CNode* Node = m_HeadNode; + E Element(Node->m_Element); + + m_HeadNode = Node->m_Next; + if (m_HeadNode) + { + m_HeadNode->m_Prev = NULL; + } + else + { + m_TailNode = NULL; + } + FreeNode(Node); + + return Element; +} + +template<typename E, class ETraits> +E CAtlList<E, ETraits>::RemoveTail() { CNode* Node = m_TailNode; - E Element(Node->m_Element); m_TailNode = Node->m_Prev; @@ -287,7 +380,7 @@ } template<typename E, class ETraits> -void CAtlList<E, ETraits >::RemoveAll(void) +void CAtlList<E, ETraits >::RemoveAll() { while (m_NumElements > 0) { @@ -305,6 +398,73 @@ m_Blocks->Destroy(); m_Blocks = NULL; } +} + +template<typename E, class ETraits> +void CAtlList<E, ETraits >::RemoveAt(_In_ POSITION pos) +{ + ATLASSERT(pos != NULL); + + CNode* OldNode = (CNode*)pos; + if (OldNode == m_HeadNode) + { + m_HeadNode = OldNode->m_Next; + } + else + { + OldNode->m_Prev->m_Next = OldNode->m_Next; + } + if (OldNode == m_TailNode) + { + m_TailNode = OldNode->m_Prev; + } + else + { + OldNode->m_Next->m_Prev = OldNode->m_Prev; + } + FreeNode(OldNode); +} + +template<typename E, class ETraits> +POSITION CAtlList< E, ETraits >::Find( + INARGTYPE element, + _In_opt_ POSITION posStartAfter) const +{ + CNode* Node = (CNode*)posStartAfter; + if (Node == NULL) + { + Node = m_HeadNode; + } + else + { + Node = Node->m_Next; + } + + for (; Node != NULL; Node = Node->m_Next) + { + if (ETraits::CompareElements(Node->m_Element, element)) + return (POSITION)Node; + } + + return NULL; +} + +template<typename E, class ETraits> +POSITION CAtlList< E, ETraits >::FindIndex(_In_ size_t iElement) const +{ + if (iElement >= m_NumElements) + return NULL; + + if (m_HeadNode == NULL) + return NULL; + + CNode* Node = m_HeadNode; + for (size_t i = 0; i < iElement; i++) + { + Node = Node->m_Next; + } + + return (POSITION)Node; } @@ -351,7 +511,7 @@ } template<typename E, class ETraits> -typename CAtlList<E, ETraits>::CNode* CAtlList< E, ETraits>::GetFreeNode(void) +typename CAtlList<E, ETraits>::CNode* CAtlList< E, ETraits>::GetFreeNode() { if (m_FreeNode) { Modified: trunk/reactos/lib/atl/atlsimpstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlsimpstr.h?rev=6… ============================================================================== --- trunk/reactos/lib/atl/atlsimpstr.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlsimpstr.h [iso-8859-1] Sun Oct 25 22:55:18 2015 @@ -103,8 +103,20 @@ }; -template< typename BaseType = wchar_t > +template< typename BaseType = char > class ChTraitsBase +{ +public: + typedef char XCHAR; + typedef LPSTR PXSTR; + typedef LPCSTR PCXSTR; + typedef wchar_t YCHAR; + typedef LPWSTR PYSTR; + typedef LPCWSTR PCYSTR; +}; + +template<> +class ChTraitsBase<wchar_t> { public: typedef wchar_t XCHAR; @@ -118,9 +130,6 @@ template< typename BaseType, bool t_bMFCDLL = false> class CSimpleStringT { -private: - LPWSTR m_pszData; - public: typedef typename ChTraitsBase<BaseType>::XCHAR XCHAR; typedef typename ChTraitsBase<BaseType>::PXSTR PXSTR; @@ -129,6 +138,9 @@ typedef typename ChTraitsBase<BaseType>::PYSTR PYSTR; typedef typename ChTraitsBase<BaseType>::PCYSTR PCYSTR; +private: + PXSTR m_pszData; + public: explicit CSimpleStringT(_Inout_ IAtlStringMgr* pStringMgr) { @@ -143,6 +155,44 @@ Attach(pNewData); } + CSimpleStringT( + _In_z_ PCXSTR pszSrc, + _Inout_ IAtlStringMgr* pStringMgr) + { + int nLength = StringLength(pszSrc); + CStringData* pData = pStringMgr->Allocate(nLength, sizeof(XCHAR)); + if (pData == NULL) + { + throw; // ThrowMemoryException(); + } + Attach(pData); + SetLength(nLength); + CopyChars(m_pszData, nLength, pszSrc, nLength); + } + + CSimpleStringT( + _In_count_(nLength) const XCHAR* pchSrc, + _In_ int nLength, + _Inout_ IAtlStringMgr* pStringMgr) + { + if (pchSrc == NULL && nLength != 0) + throw; + + CStringData* pData = pStringMgr->Allocate(nLength, sizeof(XCHAR)); + if (pData == NULL) + { + throw; // ThrowMemoryException(); + } + Attach(pData); + SetLength(nLength); + CopyChars(m_pszData, nLength, pchSrc, nLength); + } + + ~CSimpleStringT() throw() + { + CStringData* pData = GetData(); + pData->Release(); + } CSimpleStringT& operator=(_In_opt_z_ PCXSTR pszSrc) { @@ -150,12 +200,22 @@ return *this; } + CSimpleStringT& operator+=(_In_ const CSimpleStringT& strSrc) + { + Append(strSrc); + return *this; + } + + CSimpleStringT& operator+=(_In_z_ PCXSTR pszSrc) + { + Append(pszSrc); + return *this; + } operator PCXSTR() const throw() { return m_pszData; } - void Empty() throw() { @@ -173,6 +233,44 @@ CStringData* pNewData = pStringMgr->GetNilString(); Attach(pNewData); } + } + + void Append( + _In_count_(nLength) PCXSTR pszSrc, + _In_ int nLength) + { + UINT_PTR nOffset = pszSrc - GetString(); + + int nOldLength = GetLength(); + if (nOldLength < 0) + nOldLength = 0; + + ATLASSERT(nLength >= 0); + +#if 0 // FIXME: See comment for StringLengthN below. + nLength = StringLengthN(pszSrc, nLength); + if (!(INT_MAX - nLength >= nOldLength)) + throw; +#endif + + int nNewLength = nOldLength + nLength; + PXSTR pszBuffer = GetBuffer(nNewLength); + if (nOffset <= (UINT_PTR)nOldLength) + { + pszSrc = pszBuffer + nOffset; + } + CopyChars(pszBuffer + nOldLength, nLength, pszSrc, nLength); + ReleaseBufferSetLength(nNewLength); + } + + void Append(_In_z_ PCXSTR pszSrc) + { + Append(pszSrc, StringLength(pszSrc)); + } + + void Append(_In_ const CSimpleStringT& strSrc) + { + Append(strSrc.GetString(), strSrc.GetLength()); } void SetString(_In_opt_z_ PCXSTR pszSrc) @@ -206,12 +304,6 @@ } } - static int __cdecl StringLength(_In_opt_z_ const wchar_t* psz) throw() - { - if (psz == NULL) return 0; - return (int)wcslen(psz); - } - PXSTR GetBuffer() { CStringData* pData = GetData(); @@ -257,7 +349,41 @@ CStringData* GetData() const throw() { - return reinterpret_cast<CStringData*>(m_pszData) - 1; + return (reinterpret_cast<CStringData*>(m_pszData) - 1); + } + + IAtlStringMgr* GetManager() const throw() + { + IAtlStringMgr* pStringMgr = GetData()->pStringMgr; + return (pStringMgr ? pStringMgr->Clone() : NULL); + } + +public: + friend CSimpleStringT operator+( + _In_ const CSimpleStringT& str1, + _In_ const CSimpleStringT& str2) + { + CSimpleStringT s(str1.GetManager()); + Concatenate(s, str1, str1.GetLength(), str2, str2.GetLength()); + return s; + } + + friend CSimpleStringT operator+( + _In_ const CSimpleStringT& str1, + _In_z_ PCXSTR psz2) + { + CSimpleStringT s(str1.GetManager()); + Concatenate(s, str1, str1.GetLength(), psz2, StringLength(psz2)); + return s; + } + + friend CSimpleStringT operator+( + _In_z_ PCXSTR psz1, + _In_ const CSimpleStringT& str2) + { + CSimpleStringT s(str2.GetManager()); + Concatenate(s, psz1, StringLength(psz1), str2, str2.GetLength()); + return s; } static void __cdecl CopyChars( @@ -278,13 +404,58 @@ memmove(pchDest, pchSrc, nChars * sizeof(XCHAR)); } + static int __cdecl StringLength(_In_opt_z_ const char* psz) throw() + { + if (psz == NULL) return 0; + return (int)strlen(psz); + } + + static int __cdecl StringLength(_In_opt_z_ const wchar_t* psz) throw() + { + if (psz == NULL) return 0; + return (int)wcslen(psz); + } + +#if 0 // For whatever reason we do not link with strnlen / wcsnlen. Please investigate! + // strnlen / wcsnlen are available in MSVCRT starting Vista+. + static int __cdecl StringLengthN( + _In_opt_z_count_(sizeInXChar) const char* psz, + _In_ size_t sizeInXChar) throw() + { + if (psz == NULL) return 0; + return (int)strnlen(psz, sizeInXChar); + } + + static int __cdecl StringLengthN( + _In_opt_z_count_(sizeInXChar) const wchar_t* psz, + _In_ size_t sizeInXChar) throw() + { + if (psz == NULL) return 0; + return (int)wcsnlen(psz, sizeInXChar); + } +#endif + +protected: + static void __cdecl Concatenate( + _Inout_ CSimpleStringT& strResult, + _In_count_(nLength1) PCXSTR psz1, + _In_ int nLength1, + _In_count_(nLength2) PCXSTR psz2, + _In_ int nLength2) + { + int nNewLength = nLength1 + nLength2; + PXSTR pszBuffer = strResult.GetBuffer(nNewLength); + CopyChars(pszBuffer, nLength1, psz1, nLength1); + CopyChars(pszBuffer + nLength1, nLength2, psz2, nLength2); + strResult.ReleaseBufferSetLength(nNewLength); + } private: - void Attach(_Inout_ CStringData* pData) throw() { m_pszData = static_cast<PXSTR>(pData->data()); } + __declspec(noinline) void Fork(_In_ int nLength) { CStringData* pOldData = GetData(); @@ -301,7 +472,6 @@ pOldData->Release(); Attach(pNewData); } - PXSTR PrepareWrite(_In_ int nLength) { @@ -356,7 +526,10 @@ return; } CStringData* pNewData = pStringMgr->Reallocate(pOldData, nLength, sizeof(XCHAR)); - if (pNewData == NULL) throw; + if (pNewData == NULL) + { + throw; // ThrowMemoryException(); + } Attach(pNewData); } @@ -386,14 +559,17 @@ else { pNewData = pNewStringMgr->Allocate(pData->nDataLength, sizeof(XCHAR)); - if (pNewData == NULL) throw; + if (pNewData == NULL) + { + throw; // ThrowMemoryException(); + } pNewData->nDataLength = pData->nDataLength; CopyChars(PXSTR(pNewData->data()), pData->nDataLength + 1, PCXSTR(pData->data()), pData->nDataLength + 1); } - return(pNewData); + return pNewData; } }; Modified: trunk/reactos/lib/atl/atlwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlwin.h?rev=69701… ============================================================================== --- trunk/reactos/lib/atl/atlwin.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlwin.h [iso-8859-1] Sun Oct 25 22:55:18 2015 @@ -154,7 +154,8 @@ m_mov = 0x042444C7; m_this = PtrToUlong(pThis); m_jmp = 0xe9; - m_relproc = DWORD(reinterpret_cast<char *>(proc) - (reinterpret_cast<char *>(this) + sizeof(thunkCode))); + m_relproc = DWORD((INT_PTR)proc - (INT_PTR)this + sizeof(thunkCode))); + FlushInstructionCache(GetCurrentProcess(), this, sizeof(thunkCode)); } }; #pragma pack(pop) @@ -178,6 +179,7 @@ m_mov_rax = 0xb848; m_proc = (ULONG64)proc; m_jmp = 0xe0ff; + FlushInstructionCache(GetCurrentProcess(), this, sizeof(thunkCode)); } }; #pragma pack(pop) @@ -199,6 +201,7 @@ m_mov_pc = 0xE59FF000; m_this = (DWORD)pThis; m_proc = (DWORD)proc; + FlushInstructionCache(GetCurrentProcess(), this, sizeof(thunkCode)); } }; #pragma pack(pop) Modified: trunk/reactos/lib/atl/cstringt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/cstringt.h?rev=697… ============================================================================== --- trunk/reactos/lib/atl/cstringt.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/cstringt.h [iso-8859-1] Sun Oct 25 22:55:18 2015 @@ -98,9 +98,43 @@ { } + CStringT(_In_opt_z_ const XCHAR* pszSrc) : + CThisSimpleString( StringTraits::GetDefaultManager() ) + { + // FIXME: Check whether pszSrc is not a resource string ID! + *this = pszSrc; + } + + CStringT( + _In_opt_z_ const XCHAR* pszSrc, + _In_ IAtlStringMgr* pStringMgr) : + CThisSimpleString( pStringMgr ) + { + // FIXME: Check whether pszSrc is not a resource string ID! + *this = pszSrc; + } + + CStringT& operator=(_In_ const CStringT& strSrc) + { + CThisSimpleString::operator=(strSrc); + return *this; + } + CStringT& operator=(_In_opt_z_ PCXSTR pszSrc) { CThisSimpleString::operator=(pszSrc); + return *this; + } + + CStringT& operator+=(_In_ const CThisSimpleString& str) + { + CThisSimpleString::operator+=(str); + return *this; + } + + CStringT& operator+=(_In_z_ PCXSTR pszSrc) + { + CThisSimpleString::operator+=(pszSrc); return *this; }

9 years, 2 months

[gedmurphy] 69700: [DEVMGR] - Fix overlay icon for problem devices

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sun Oct 25 17:01:19 2015 New Revision: 69700 URL: http://svn.reactos.org/svn/reactos?rev=69700&view=rev Log: [DEVMGR] - Fix overlay icon for problem devices Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] Sun Oct 25 17:01:19 2015 @@ -96,17 +96,20 @@ } - // Set the overlay if the device has a problem + // Check if the device has a problem if (HasProblem()) { - m_OverlayImage = 1; - } - - // The disabled overlay takes precidence over the problem overlay - if (IsDisabled()) - { - m_OverlayImage = 2; - } + if (IsDisabled()) + { + m_OverlayImage = OverlayDisabled; + } + else + { + m_OverlayImage = OverlayProblem; + } + } + + // Get the class guid for this device @@ -227,7 +230,7 @@ NULL); if (cr == CR_SUCCESS) { - return ((m_ProblemNumber & (CM_PROB_DISABLED | CM_PROB_HARDWARE_DISABLED)) != 0); + return ((m_ProblemNumber == CM_PROB_DISABLED) || (m_ProblemNumber == CM_PROB_HARDWARE_DISABLED)); } return false; Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h [iso-8859-1] Sun Oct 25 17:01:19 2015 @@ -1,5 +1,12 @@ #pragma once #include "Node.h" + +enum IconOverlays +{ + OverlayProblem = 1, + OverlayDisabled, + OverlayInfo +}; class CDeviceNode : public CNode {

9 years, 2 months

[akhaldi] 69699: [UNIATA] Update to v45j1. CORE-10189

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 25 14:45:48 2015 New Revision: 69699 URL: http://svn.reactos.org/svn/reactos?rev=69699&view=rev Log: [UNIATA] Update to v45j1. CORE-10189 Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/srb.h trunk/reactos/drivers/storage/ide/uniata/tools.h trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/tools.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…

9 years, 2 months

[hbelusca] 69698: [ATL]: Use _AtlGetConversionACP() instead of hadcoded CP_THREAD_ACP value.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 25 14:37:33 2015 New Revision: 69698 URL: http://svn.reactos.org/svn/reactos?rev=69698&view=rev Log: [ATL]: Use _AtlGetConversionACP() instead of hadcoded CP_THREAD_ACP value. Modified: trunk/reactos/lib/atl/cstringt.h Modified: trunk/reactos/lib/atl/cstringt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/cstringt.h?rev=696… ============================================================================== --- trunk/reactos/lib/atl/cstringt.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/cstringt.h [iso-8859-1] Sun Oct 25 14:37:33 2015 @@ -35,7 +35,7 @@ _In_reads_(nLength) LPCWSTR pszSource, _In_ int nLength) throw() { - return ::WideCharToMultiByte(CP_THREAD_ACP, 0, pszSource, nLength, NULL, 0, NULL, NULL); + return ::WideCharToMultiByte(_AtlGetConversionACP(), 0, pszSource, nLength, NULL, 0, NULL, NULL); } static void __cdecl ConvertToBaseType(

9 years, 2 months

← Newer
1
...
4
5
6
7
8
9
10
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2015