Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 75844: [NTOSKRNL] Fix the way the paging IO MDLs are issued by Cc on read. Similar to r75834. Fixes tests from r75842.
by pschweitzer＠svn.reactos.org 15 Sep '17

15 Sep '17

Author: pschweitzer Date: Fri Sep 15 11:49:55 2017 New Revision: 75844 URL: http://svn.reactos.org/svn/reactos?rev=75844&view=rev Log: [NTOSKRNL] Fix the way the paging IO MDLs are issued by Cc on read. Similar to r75834. Fixes tests from r75842. Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=758… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Fri Sep 15 11:49:55 2017 @@ -86,14 +86,29 @@ return STATUS_INSUFFICIENT_RESOURCES; } - MmBuildMdlForNonPagedPool(Mdl); - Mdl->MdlFlags |= MDL_IO_PAGE_READ; - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoPageRead(Vacb->SharedCacheMap->FileObject, Mdl, &Vacb->FileOffset, &Event, &IoStatus); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatus.Status; + Status = STATUS_SUCCESS; + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, KernelMode, IoWriteAccess); + } + _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + KeBugCheck(CACHE_MANAGER); + } _SEH2_END; + + if (NT_SUCCESS(Status)) + { + Mdl->MdlFlags |= MDL_IO_PAGE_READ; + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = IoPageRead(Vacb->SharedCacheMap->FileObject, Mdl, &Vacb->FileOffset, &Event, &IoStatus); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + MmUnlockPages(Mdl); } IoFreeMdl(Mdl);

1 0

[pschweitzer] 75843: [KMTESTS:CC] That wasn't meant to be committed
by pschweitzer＠svn.reactos.org 15 Sep '17

15 Sep '17

Author: pschweitzer Date: Fri Sep 15 11:24:38 2017 New Revision: 75843 URL: http://svn.reactos.org/svn/reactos?rev=75843&view=rev Log: [KMTESTS:CC] That wasn't meant to be committed Modified: trunk/rostests/kmtests/ntos_cc/CMakeLists.txt Modified: trunk/rostests/kmtests/ntos_cc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_cc/CMakeList… ============================================================================== --- trunk/rostests/kmtests/ntos_cc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_cc/CMakeLists.txt [iso-8859-1] Fri Sep 15 11:24:38 2017 @@ -15,18 +15,3 @@ add_target_compile_definitions(cccopyread_drv KMT_STANDALONE_DRIVER) #add_pch(cccopyread_drv ../include/kmt_test.h) add_rostests_file(TARGET cccopyread_drv) - -# -# CcInitializeCacheMap -# -list(APPEND CCINITIALIZECACHEMAP_DRV_SOURCE - ../kmtest_drv/kmtest_standalone.c - CcInitializeCacheMap_drv.c) - -add_library(ccinitializecachemap_drv SHARED ${CCINITIALIZECACHEMAP_DRV_SOURCE}) -set_module_type(ccinitializecachemap_drv kernelmodedriver) -target_link_libraries(ccinitializecachemap_drv kmtest_printf ${PSEH_LIB}) -add_importlibs(ccinitializecachemap_drv ntoskrnl hal) -add_target_compile_definitions(ccinitializecachemap_drv KMT_STANDALONE_DRIVER) -#add_pch(ccinitializecachemap_drv ../include/kmt_test.h) -add_rostests_file(TARGET ccinitializecachemap_drv)

1 0

[pschweitzer] 75842: [KMTESTS:CC] Tests for paging IO MDL for read operations. Equivalent to r75833 (and r75840). They fail in ROS.
by pschweitzer＠svn.reactos.org 15 Sep '17

15 Sep '17

Author: pschweitzer Date: Fri Sep 15 10:37:00 2017 New Revision: 75842 URL: http://svn.reactos.org/svn/reactos?rev=75842&view=rev Log: [KMTESTS:CC] Tests for paging IO MDL for read operations. Equivalent to r75833 (and r75840). They fail in ROS. Modified: trunk/rostests/kmtests/ntos_cc/CMakeLists.txt trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c Modified: trunk/rostests/kmtests/ntos_cc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_cc/CMakeList… ============================================================================== --- trunk/rostests/kmtests/ntos_cc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_cc/CMakeLists.txt [iso-8859-1] Fri Sep 15 10:37:00 2017 @@ -2,7 +2,7 @@ include_directories(../include) # -# IoCreateFile +# CcCopyRead # list(APPEND CCCOPYREAD_DRV_SOURCE ../kmtest_drv/kmtest_standalone.c @@ -15,3 +15,18 @@ add_target_compile_definitions(cccopyread_drv KMT_STANDALONE_DRIVER) #add_pch(cccopyread_drv ../include/kmt_test.h) add_rostests_file(TARGET cccopyread_drv) + +# +# CcInitializeCacheMap +# +list(APPEND CCINITIALIZECACHEMAP_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + CcInitializeCacheMap_drv.c) + +add_library(ccinitializecachemap_drv SHARED ${CCINITIALIZECACHEMAP_DRV_SOURCE}) +set_module_type(ccinitializecachemap_drv kernelmodedriver) +target_link_libraries(ccinitializecachemap_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(ccinitializecachemap_drv ntoskrnl hal) +add_target_compile_definitions(ccinitializecachemap_drv KMT_STANDALONE_DRIVER) +#add_pch(ccinitializecachemap_drv ../include/kmt_test.h) +add_rostests_file(TARGET ccinitializecachemap_drv) Modified: trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_cc/CcCopyRea… ============================================================================== --- trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c [iso-8859-1] Fri Sep 15 10:37:00 2017 @@ -269,6 +269,8 @@ } else { + PMDL Mdl; + ok((Offset.QuadPart % PAGE_SIZE == 0 || Offset.QuadPart == 0), "Offset is not aligned: %I64i\n", Offset.QuadPart); ok(Length % PAGE_SIZE == 0, "Length is not aligned: %I64i\n", Length); @@ -282,6 +284,12 @@ { *(PUSHORT)((ULONG_PTR)Buffer + (ULONG_PTR)(1000LL - Offset.QuadPart)) = 0xFFFF; } + + Mdl = Irp->MdlAddress; + ok(Mdl != NULL, "Null pointer for MDL!\n"); + ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) != 0, "MDL not locked\n"); + ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0, "MDL from non paged\n"); + ok((Irp->Flags & IRP_PAGING_IO) != 0, "Non paging IO\n"); } if (NT_SUCCESS(Status))

1 0

[pschweitzer] 75841: [KMTESTS:MM] Revert r75840. It's no use that way
by pschweitzer＠svn.reactos.org 15 Sep '17

15 Sep '17

Author: pschweitzer Date: Fri Sep 15 10:32:22 2017 New Revision: 75841 URL: http://svn.reactos.org/svn/reactos?rev=75841&view=rev Log: [KMTESTS:MM] Revert r75840. It's no use that way Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/NtCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c [iso-8859-1] Fri Sep 15 10:32:22 2017 @@ -318,18 +318,10 @@ } else { - PMDL Mdl; - ok(Irp->AssociatedIrp.SystemBuffer == NULL, "A SystemBuffer was allocated!\n"); Buffer = MapAndLockUserBuffer(Irp, Length); ok(Buffer != NULL, "Null pointer!\n"); RtlFillMemory(Buffer, Length, 0xBA); - - Mdl = Irp->MdlAddress; - ok(Mdl != NULL, "Null pointer for MDL!\n"); - ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) != 0, "MDL not locked\n"); - ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0, "MDL from non paged\n"); - ok((Irp->Flags & IRP_PAGING_IO) != 0, "Non paging IO\n"); Status = STATUS_SUCCESS; }

1 0

[pschweitzer] 75840: [KMTESTS:MM] Tests for paging IO MDL for read operations. Equivalent to r75833.
by pschweitzer＠svn.reactos.org 15 Sep '17

15 Sep '17

Author: pschweitzer Date: Fri Sep 15 08:16:14 2017 New Revision: 75840 URL: http://svn.reactos.org/svn/reactos?rev=75840&view=rev Log: [KMTESTS:MM] Tests for paging IO MDL for read operations. Equivalent to r75833. Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/NtCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c [iso-8859-1] Fri Sep 15 08:16:14 2017 @@ -318,10 +318,18 @@ } else { + PMDL Mdl; + ok(Irp->AssociatedIrp.SystemBuffer == NULL, "A SystemBuffer was allocated!\n"); Buffer = MapAndLockUserBuffer(Irp, Length); ok(Buffer != NULL, "Null pointer!\n"); RtlFillMemory(Buffer, Length, 0xBA); + + Mdl = Irp->MdlAddress; + ok(Mdl != NULL, "Null pointer for MDL!\n"); + ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) != 0, "MDL not locked\n"); + ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0, "MDL from non paged\n"); + ok((Irp->Flags & IRP_PAGING_IO) != 0, "Non paging IO\n"); Status = STATUS_SUCCESS; }

1 0

[mjansen] 75839: [LIBTIRPC] Do not add makefiles in the CMakeLists.txt
by mjansen＠svn.reactos.org 14 Sep '17

14 Sep '17

Author: mjansen Date: Thu Sep 14 20:31:53 2017 New Revision: 75839 URL: http://svn.reactos.org/svn/reactos?rev=75839&view=rev Log: [LIBTIRPC] Do not add makefiles in the CMakeLists.txt Modified: trunk/reactos/dll/3rdparty/libtirpc/CMakeLists.txt Modified: trunk/reactos/dll/3rdparty/libtirpc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtirpc/CMak… ============================================================================== --- trunk/reactos/dll/3rdparty/libtirpc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtirpc/CMakeLists.txt [iso-8859-1] Thu Sep 14 20:31:53 2017 @@ -40,8 +40,8 @@ src/key_call.c src/key_prot_xdr.c src/libtirpc.def - src/makefile - src/Makefile.am + #src/makefile + #src/Makefile.am src/mt_misc.c src/netname.c src/netnamer.c

1 0

[pschweitzer] 75838: [RAPPS] Update French translation
by pschweitzer＠svn.reactos.org 14 Sep '17

14 Sep '17

Author: pschweitzer Date: Thu Sep 14 16:00:01 2017 New Revision: 75838 URL: http://svn.reactos.org/svn/reactos?rev=75838&view=rev Log: [RAPPS] Update French translation Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Thu Sep 14 16:00:01 2017 @@ -152,13 +152,13 @@ STRINGTABLE BEGIN IDS_AINFO_VERSION "\nVersion : " - IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: " + IDS_AINFO_AVAILABLEVERSION "\nVersion disponible : " IDS_AINFO_DESCRIPTION "\nDescription : " IDS_AINFO_SIZE "\nTaille : " IDS_AINFO_URLSITE "\nSite internet : " IDS_AINFO_LICENSE "\nLicence : " IDS_AINFO_URLDOWNLOAD "\nTÃ©lÃ©charger : " - IDS_AINFO_LANGUAGES "\nLanguages: " + IDS_AINFO_LANGUAGES "\nLangues : " END STRINGTABLE @@ -187,7 +187,7 @@ IDS_INSTALL "Installer" IDS_UNINSTALL "DÃ©sinstaller" IDS_MODIFY "Modifier" - IDS_APPS_COUNT "Nombre d'applications : %d; Selected: %d" + IDS_APPS_COUNT "Nombre d'applications : %d ; SÃ©lectionnÃ©es : %d" IDS_WELCOME_TITLE "Bienvenue dans ReactOS Applications Manager !\n\n" IDS_WELCOME_TEXT "Choisissez une catÃ©gorie Ã gauche, ensuite choisissez une application Ã installer ou dÃ©sinstaller.\nSite internet de ReactOS : " IDS_WELCOME_URL "http://www.reactos.org" @@ -200,28 +200,28 @@ IDS_APP_REG_REMOVE "Ãtes-vous sÃ»r de vouloir supprimer du registre les donnÃ©es du programme installÃ© ?" IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Impossible de tÃ©lÃ©charger le paquet : adresse introuvable !" - IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" + IDS_UNABLE_TO_DOWNLOAD2 "Impossible de tÃ©lÃ©charger le paquet : vÃ©rifiez votre connexion Ã Internet !" IDS_UNABLE_TO_REMOVE "Impossible de supprimer du registre les donnÃ©es du programme !" - IDS_UNABLE_TO_INSTALL "Unable to open installer!" + IDS_UNABLE_TO_INSTALL "Impossible d'ouvrir l'installeur !" IDS_CERT_DOES_NOT_MATCH "La vÃ©rification du certificat SSL a Ã©chouÃ©." IDS_INTEG_CHECK_TITLE "VÃ©rification de l'intÃ©gritÃ© du paquet..." IDS_INTEG_CHECK_FAIL "Le contrÃ´le d'intÃ©gritÃ© du paquet a Ã©chouÃ©, il se peut qu'il ait Ã©tÃ© corrompu ou altÃ©rÃ© au cours du tÃ©lÃ©chargement. L'exÃ©cution du programme n'est pas recommandÃ©e." - IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." - IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_SELECT_ALL "Select/Deselect All" - IDS_INSTALL_SELECTED "Install Selected" -END - -STRINGTABLE -BEGIN - IDS_STATUS_INSTALLED "Installed" - IDS_STATUS_NOTINSTALLED "Not installed" - IDS_STATUS_DOWNLOADED "Downloaded" - IDS_STATUS_UPDATE_AVAILABLE "Update available" - IDS_STATUS_DOWNLOADING "Downloadingâ¦" - IDS_STATUS_INSTALLING "Installingâ¦" - IDS_STATUS_WAITING "Waiting to installâ¦" - IDS_STATUS_FINISHED "Finished" + IDS_INTERRUPTED_DOWNLOAD "Le tÃ©lÃ©chargement a Ã©tÃ© interrompu. VÃ©rifiez votre connexion Ã Internet." + IDS_UNABLE_TO_WRITE "Impossible d'Ã©crire sur le disque. Votre disque pourrait Ãªtre plein." + IDS_SELECT_ALL "SÃ©lectionner/DÃ©sÃ©lectionner tout" + IDS_INSTALL_SELECTED "Installer les sÃ©lectionnÃ©s" +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALLED "InstallÃ©" + IDS_STATUS_NOTINSTALLED "Non installÃ©" + IDS_STATUS_DOWNLOADED "TÃ©lÃ©chargÃ©" + IDS_STATUS_UPDATE_AVAILABLE "Mise Ã jour disponible" + IDS_STATUS_DOWNLOADING "TÃ©lÃ©chargementâ¦" + IDS_STATUS_INSTALLING "Installationâ¦" + IDS_STATUS_WAITING "En attente d'installationâ¦" + IDS_STATUS_FINISHED "TerminÃ©" END STRINGTABLE @@ -233,16 +233,16 @@ STRINGTABLE BEGIN - IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language" - IDS_LANGUAGE_NO_TRANSLATION "Supports other languages" - IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English" - IDS_LANGUAGE_SINGLE "Single language" + IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supporte votre langue" + IDS_LANGUAGE_NO_TRANSLATION "Supporte d'autres langues" + IDS_LANGUAGE_ENGLISH_TRANSLATION "Supporte l'Anglais" + IDS_LANGUAGE_SINGLE "Langue unique" IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)" IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)" END STRINGTABLE BEGIN - IDS_DL_DIALOG_DB_DISP "Applications Database" - IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..." -END + IDS_DL_DIALOG_DB_DISP "Base de donnÃ©es d'applications" + IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Mise Ã jour de la base de donnÃ©es..." +END

1 0

[ashaposhnikov] 75837: [RAPPS] Toggle toolbar captions on resize - Implemented hiding toolbar captions when buttons are about to intersect with the searchbar - Minor style changes
by ashaposhnikov＠svn.reactos.org 14 Sep '17

14 Sep '17

Author: ashaposhnikov Date: Thu Sep 14 15:56:19 2017 New Revision: 75837 URL: http://svn.reactos.org/svn/reactos?rev=75837&view=rev Log: [RAPPS] Toggle toolbar captions on resize - Implemented hiding toolbar captions when buttons are about to intersect with the searchbar - Minor style changes Modified: trunk/reactos/base/applications/rapps/gui.cpp Modified: trunk/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/gu… ============================================================================== --- trunk/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Thu Sep 14 15:56:19 2017 @@ -209,7 +209,8 @@ class CMainToolbar : public CUiWindow< CToolbar<> > { -#define TOOLBAR_HEIGHT 24 + const INT m_iToolbarHeight; + DWORD m_dButtonsWidthMax; WCHAR szInstallBtn[MAX_STR_LEN]; WCHAR szUninstallBtn[MAX_STR_LEN]; @@ -223,8 +224,8 @@ if (!(hImage = (HICON) LoadImageW(hInst, MAKEINTRESOURCE(ImageIndex), IMAGE_ICON, - TOOLBAR_HEIGHT, - TOOLBAR_HEIGHT, + m_iToolbarHeight, + m_iToolbarHeight, 0))) { /* TODO: Error message */ @@ -239,8 +240,8 @@ HIMAGELIST hImageList; /* Create the toolbar icon image list */ - hImageList = ImageList_Create(TOOLBAR_HEIGHT,//GetSystemMetrics(SM_CXSMICON), - TOOLBAR_HEIGHT,//GetSystemMetrics(SM_CYSMICON), + hImageList = ImageList_Create(m_iToolbarHeight,//GetSystemMetrics(SM_CXSMICON), + m_iToolbarHeight,//GetSystemMetrics(SM_CYSMICON), ILC_MASK | GetSystemColorDepth(), 1, 1); if (!hImageList) @@ -262,6 +263,10 @@ } public: + CMainToolbar() : m_iToolbarHeight(24) + { + } + VOID OnGetDispInfo(LPTOOLTIPTEXT lpttt) { UINT idButton = (UINT) lpttt->hdr.idFrom; @@ -300,21 +305,19 @@ HWND Create(HWND hwndParent) { - HIMAGELIST hImageList; - - // buttons - static TBBUTTON Buttons[] = + /* Create buttons */ + TBBUTTON Buttons[] = { /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ - { 0, ID_INSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szInstallBtn }, - { 1, ID_UNINSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szUninstallBtn }, - { 2, ID_MODIFY, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szModifyBtn }, - { 3, ID_CHECK_ALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szSelectAll}, - {-1, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, - { 4, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, - { 5, ID_RESETDB, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, - {-1, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, - { 6, ID_SETTINGS, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, - { 7, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, + { 0, ID_INSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szInstallBtn }, + { 1, ID_UNINSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szUninstallBtn }, + { 2, ID_MODIFY, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szModifyBtn }, + { 3, ID_CHECK_ALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szSelectAll }, + { -1, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, + { 4, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, + { 5, ID_RESETDB, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, + { -1, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, + { 6, ID_SETTINGS, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, + { 7, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, }; LoadStringW(hInst, IDS_INSTALL, szInstallBtn, _countof(szInstallBtn)); @@ -337,7 +340,8 @@ SendMessageW(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS); SetButtonStructSize(); - hImageList = InitImageList(); + /* Set image list */ + HIMAGELIST hImageList = InitImageList(); if (!hImageList) { @@ -349,7 +353,29 @@ AddButtons(_countof(Buttons), Buttons); + /* Remember ideal width to use as a max width of buttons */ + SIZE size; + GetIdealSize(FALSE, &size); + m_dButtonsWidthMax = size.cx; + return m_hWnd; + } + + VOID HideButtonCaption() + { + DWORD dCurrentExStyle = (DWORD) SendMessageW(TB_GETEXTENDEDSTYLE, 0, 0); + SendMessageW(TB_SETEXTENDEDSTYLE, 0, dCurrentExStyle | TBSTYLE_EX_MIXEDBUTTONS); + } + + VOID ShowButtonCaption() + { + DWORD dCurrentExStyle = (DWORD) SendMessageW(TB_GETEXTENDEDSTYLE, 0, 0); + SendMessageW(TB_SETEXTENDEDSTYLE, 0, dCurrentExStyle & ~TBSTYLE_EX_MIXEDBUTTONS); + } + + DWORD GetMaxButtonsWidth() const + { + return m_dButtonsWidthMax; } }; @@ -616,6 +642,13 @@ public CWindow { public: + const INT m_Width; + const INT m_Height; + + CSearchBar() : m_Width(200), m_Height(22) + { + } + VOID SetText(LPCWSTR lpszText) { SendMessageW(SB_SETTEXT, SBT_NOBORDERS, (LPARAM) lpszText); @@ -626,7 +659,7 @@ ATL::CStringW szBuf; m_hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Edit", NULL, WS_CHILD | WS_VISIBLE | ES_LEFT | ES_AUTOHSCROLL, - 0, 0, 200, 22, + 0, 0, m_Width, m_Height, hwndParent, (HMENU) NULL, hInst, 0); @@ -661,6 +694,7 @@ BOOL bSearchEnabled; BOOL bUpdating; + public: CMainWindow() : m_ClientPanel(NULL), @@ -676,13 +710,13 @@ /* Add columns to ListView */ szText.LoadStringW(IDS_APP_NAME); - m_ListView->AddColumn(0, szText, 200, LVCFMT_LEFT); + m_ListView->AddColumn(0, szText, 250, LVCFMT_LEFT); szText.LoadStringW(IDS_APP_INST_VERSION); m_ListView->AddColumn(1, szText, 90, LVCFMT_RIGHT); szText.LoadStringW(IDS_APP_DESCRIPTION); - m_ListView->AddColumn(3, szText, 250, LVCFMT_LEFT); + m_ListView->AddColumn(3, szText, 300, LVCFMT_LEFT); // Unnesesary since the list updates on every TreeView selection // UpdateApplicationsList(ENUM_ALL_COMPONENTS); @@ -797,7 +831,7 @@ m_HSplitter->m_HorizontalAlignment = UiAlign_Stretch; m_HSplitter->m_DynamicFirst = TRUE; m_HSplitter->m_Horizontal = TRUE; - m_HSplitter->m_Pos = INT_MAX; //set INT_MAX to use lowest possible position (m_MinSecond) + m_HSplitter->m_Pos = INT_MAX; //set INT_MAX to use lowest possible position (m_MinSecond) m_HSplitter->m_MinFirst = 10; m_HSplitter->m_MinSecond = 140; m_VSplitter->Second().Append(m_HSplitter); @@ -810,7 +844,7 @@ m_SearchBar = new CUiWindow<CSearchBar>(); m_SearchBar->m_VerticalAlignment = UiAlign_LeftTop; m_SearchBar->m_HorizontalAlignment = UiAlign_RightBtm; - m_SearchBar->m_Margin.top = 6; + m_SearchBar->m_Margin.top = 4; m_SearchBar->m_Margin.right = 6; return m_SearchBar->Create(m_Toolbar->m_hWnd) != NULL; @@ -880,11 +914,25 @@ VOID OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam) { + /* Size status bar */ m_StatusBar->SendMessage(WM_SIZE, 0, 0); /* Size tool bar */ m_Toolbar->AutoSize(); + + /* Automatically hide captions */ + DWORD dToolbarTreshold = m_Toolbar->GetMaxButtonsWidth(); + DWORD dSearchbarMargin = (LOWORD(lParam) - m_SearchBar->m_Width); + + if (dSearchbarMargin > dToolbarTreshold) + { + m_Toolbar->ShowButtonCaption(); + } + else if (dSearchbarMargin < dToolbarTreshold) + { + m_Toolbar->HideButtonCaption(); + } RECT r = {0, 0, LOWORD(lParam), HIWORD(lParam)}; HDWP hdwp = NULL; @@ -894,10 +942,11 @@ if (hdwp) { hdwp = m_ClientPanel->OnParentSize(r, hdwp); - } - if (hdwp) - { - EndDeferWindowPos(hdwp); + if (hdwp) + { + EndDeferWindowPos(hdwp); + } + } // TODO: Sub-layouts for children of children @@ -906,11 +955,12 @@ if (hdwp) { hdwp = m_SearchBar->OnParentSize(r, hdwp); - } - if (hdwp) - { - EndDeferWindowPos(hdwp); - } + if (hdwp) + { + EndDeferWindowPos(hdwp); + } + } + } BOOL ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT& theResult, DWORD dwMapId) @@ -920,7 +970,7 @@ { case WM_CREATE: if (!InitControls()) - ::PostMessage(hwnd, WM_CLOSE, 0, 0); + ::PostMessageW(hwnd, WM_CLOSE, 0, 0); break; case WM_DESTROY:

1 0

[pschweitzer] 75836: [BTRFS] Disable the MountMgr thread; given the current storage stack state, it's useless and can even cause troubles CORE-13769
by pschweitzer＠svn.reactos.org 14 Sep '17

14 Sep '17

Author: pschweitzer Date: Thu Sep 14 09:04:32 2017 New Revision: 75836 URL: http://svn.reactos.org/svn/reactos?rev=75836&view=rev Log: [BTRFS] Disable the MountMgr thread; given the current storage stack state, it's useless and can even cause troubles CORE-13769 Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.c Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… ============================================================================== --- trunk/reactos/drivers/filesystems/btrfs/btrfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/btrfs/btrfs.c [iso-8859-1] Thu Sep 14 09:04:32 2017 @@ -5588,9 +5588,11 @@ KeInitializeEvent(&mountmgr_thread_event, NotificationEvent, FALSE); +#ifndef __REACTOS__ Status = PsCreateSystemThread(&mountmgr_thread_handle, 0, NULL, NULL, NULL, mountmgr_thread, NULL); if (!NT_SUCCESS(Status)) WARN("PsCreateSystemThread returned %08x\n", Status); +#endif IoRegisterFileSystem(DeviceObject);

1 0

[pschweitzer] 75835: [KMTESTS:MM] Few tests for MmBuildMdlForNonPagedPool() I wrote earlier. They all pass fine on ROS.
by pschweitzer＠svn.reactos.org 13 Sep '17

13 Sep '17

Author: pschweitzer Date: Wed Sep 13 16:38:32 2017 New Revision: 75835 URL: http://svn.reactos.org/svn/reactos?rev=75835&view=rev Log: [KMTESTS:MM] Few tests for MmBuildMdlForNonPagedPool() I wrote earlier. They all pass fine on ROS. Modified: trunk/rostests/kmtests/ntos_mm/MmMdl.c Modified: trunk/rostests/kmtests/ntos_mm/MmMdl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMdl.c?r… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMdl.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmMdl.c [iso-8859-1] Wed Sep 13 16:38:32 2017 @@ -188,7 +188,56 @@ } } +static +VOID +TestMmBuildMdlForNonPagedPool(VOID) +{ + PVOID Page; + PMDL Mdl; + + Page = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, 'Test'); + ok(Page != NULL, "ExAllocatePoolWithTag failed\n"); + if (skip(Page != NULL, "No buffer\n")) + return; + + Mdl = IoAllocateMdl(Page, PAGE_SIZE, FALSE, FALSE, NULL); + ok(Mdl != NULL, "IoAllocateMdl failed\n"); + if (skip(Mdl != NULL, "No MDL\n")) + return; + + ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) == 0, "MDL locked\n"); + ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0, "MDL from non paged\n"); + + MmBuildMdlForNonPagedPool(Mdl); + ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) == 0, "MDL locked\n"); + ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) != 0, "MDL from paged\n"); + + IoFreeMdl(Mdl); + ExFreePoolWithTag(Page, 'Test'); + + Page = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, 'Test'); + ok(Page != NULL, "ExAllocatePoolWithTag failed\n"); + if (skip(Page != NULL, "No buffer\n")) + return; + + Mdl = IoAllocateMdl(Page, PAGE_SIZE, FALSE, FALSE, NULL); + ok(Mdl != NULL, "IoAllocateMdl failed\n"); + if (skip(Mdl != NULL, "No MDL\n")) + return; + + ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) == 0, "MDL locked\n"); + ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0, "MDL from non paged\n"); + + MmBuildMdlForNonPagedPool(Mdl); + ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) == 0, "MDL locked\n"); + ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) != 0, "MDL from paged\n"); + + IoFreeMdl(Mdl); + ExFreePoolWithTag(Page, 'Test'); +} + START_TEST(MmMdl) { TestMmAllocatePagesForMdl(); + TestMmBuildMdlForNonPagedPool(); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs