Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 70752: [User32] - Update usage comments related to CORE-10855.
by jimtabor＠svn.reactos.org 15 Feb '16

15 Feb '16

Author: jimtabor Date: Mon Feb 15 17:34:17 2016 New Revision: 70752 URL: http://svn.reactos.org/svn/reactos?rev=70752&view=rev Log: [User32] - Update usage comments related to CORE-10855. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Mon Feb 15 17:34:17 2016 @@ -299,7 +299,9 @@ return TRUE; } -/* WARNING: Redundant with /ntuser/defwnd.c!UserPaintCaption !! */ +/* WARNING: Redundant with /ntuser/defwnd.c!UserPaintCaption !! + Use TWOPARAM_ROUTINE_REDRAWTITLE or HWNDLOCK_ROUTINE_REDRAWFRAMEANDHOOK . + */ static void UserPaintCaption(PWND pwnd, INT Flags) {

1 0

[hbelusca] 70751: [USER32][NTUSER] Remove some dead code; fix comments; mention that some code is redundant. This is added to help future people in cleaning up that mess called "win32k/user32".
by hbelusca＠svn.reactos.org 15 Feb '16

15 Feb '16

Author: hbelusca Date: Mon Feb 15 01:20:54 2016 New Revision: 70751 URL: http://svn.reactos.org/svn/reactos?rev=70751&view=rev Log: [USER32][NTUSER] Remove some dead code; fix comments; mention that some code is redundant. This is added to help future people in cleaning up that mess called "win32k/user32". Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/user32/windows/defwnd.c trunk/reactos/win32ss/user/user32/windows/window.c Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Mon Feb 15 01:20:54 2016 @@ -404,7 +404,7 @@ /* * When themes are not enabled we can go on and paint the non client area. * However if we do that with themes enabled we will draw a classic frame. - * This is sovled by sending a themes specific message to notify the themes + * This is solved by sending a themes specific message to notify the themes * engine that the caption needs to be redrawn */ if (gpsi->dwSRVIFlags & SRVINFO_APIHOOK) Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Mon Feb 15 01:20:54 2016 @@ -299,6 +299,7 @@ return TRUE; } +/* WARNING: Redundant with /ntuser/defwnd.c!UserPaintCaption !! */ static void UserPaintCaption(PWND pwnd, INT Flags) { @@ -309,7 +310,7 @@ /* * When themes are not enabled we can go on and paint the non client area. * However if we do that with themes enabled we will draw a classic frame. - * This is sovled by sending a themes specific message to notify the themes + * This is solved by sending a themes specific message to notify the themes * engine that the caption needs to be redrawn */ if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) Modified: trunk/reactos/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Mon Feb 15 01:20:54 2016 @@ -15,7 +15,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); -LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active); void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT *id ); /* FUNCTIONS *****************************************************************/

1 0

[pschweitzer] 70750: [NTFS] Cowardly refuse to continue processing (enumerating/reading) when stumbling upon a compressed entry. This avoids infinite loops when enumerating, incorrect files content...
by pschweitzer＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: pschweitzer Date: Sun Feb 14 22:44:54 2016 New Revision: 70750 URL: http://svn.reactos.org/svn/reactos?rev=70750&view=rev Log: [NTFS] Cowardly refuse to continue processing (enumerating/reading) when stumbling upon a compressed entry. This avoids infinite loops when enumerating, incorrect files contents when reading. CORE-10814 #resolve #comment 'Fixed' with r70750 Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/rw.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Feb 14 22:44:54 2016 @@ -298,6 +298,13 @@ FileInformationClass = Stack->Parameters.QueryDirectory.FileInformationClass; FileIndex = Stack->Parameters.QueryDirectory.FileIndex; + if (NtfsFCBIsCompressed(Fcb)) + { + DPRINT1("Compressed directory!\n"); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + } + if (SearchPattern != NULL) { if (!Ccb->DirectorySearchPattern) Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sun Feb 14 22:44:54 2016 @@ -138,6 +138,12 @@ BOOLEAN +NtfsFCBIsCompressed(PNTFS_FCB Fcb) +{ + return ((Fcb->Entry.FileAttributes & NTFS_FILE_TYPE_COMPRESSED) == NTFS_FILE_TYPE_COMPRESSED); +} + +BOOLEAN NtfsFCBIsRoot(PNTFS_FCB Fcb) { return (wcscmp(Fcb->PathName, L"\\") == 0); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Feb 14 22:44:54 2016 @@ -643,6 +643,9 @@ NtfsFCBIsReparsePoint(PNTFS_FCB Fcb); BOOLEAN +NtfsFCBIsCompressed(PNTFS_FCB Fcb); + +BOOLEAN NtfsFCBIsRoot(PNTFS_FCB Fcb); VOID Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sun Feb 14 22:44:54 2016 @@ -71,6 +71,13 @@ Fcb = (PNTFS_FCB)FileObject->FsContext; + if (NtfsFCBIsCompressed(Fcb)) + { + DPRINT1("Compressed file!\n"); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + } + FileRecord = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerFileRecord, TAG_NTFS); if (FileRecord == NULL) {

1 0

[hbelusca] 70749: [WINHLP32]: This is true that it's Wine help, on Wine.... but not in ReactOS!
by hbelusca＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: hbelusca Date: Sun Feb 14 21:35:14 2016 New Revision: 70749 URL: http://svn.reactos.org/svn/reactos?rev=70749&view=rev Log: [WINHLP32]: This is true that it's Wine help, on Wine.... but not in ReactOS! Modified: trunk/reactos/base/applications/winhlp32/lang/Bg.rc trunk/reactos/base/applications/winhlp32/lang/Cs.rc trunk/reactos/base/applications/winhlp32/lang/Da.rc trunk/reactos/base/applications/winhlp32/lang/De.rc trunk/reactos/base/applications/winhlp32/lang/En.rc trunk/reactos/base/applications/winhlp32/lang/Es.rc trunk/reactos/base/applications/winhlp32/lang/Fi.rc trunk/reactos/base/applications/winhlp32/lang/Fr.rc trunk/reactos/base/applications/winhlp32/lang/He.rc trunk/reactos/base/applications/winhlp32/lang/Hu.rc trunk/reactos/base/applications/winhlp32/lang/It.rc trunk/reactos/base/applications/winhlp32/lang/Ja.rc trunk/reactos/base/applications/winhlp32/lang/Ko.rc trunk/reactos/base/applications/winhlp32/lang/Lt.rc trunk/reactos/base/applications/winhlp32/lang/Nl.rc trunk/reactos/base/applications/winhlp32/lang/No.rc trunk/reactos/base/applications/winhlp32/lang/Pl.rc trunk/reactos/base/applications/winhlp32/lang/Pt.rc trunk/reactos/base/applications/winhlp32/lang/Rm.rc trunk/reactos/base/applications/winhlp32/lang/Ro.rc trunk/reactos/base/applications/winhlp32/lang/Ru.rc trunk/reactos/base/applications/winhlp32/lang/Si.rc trunk/reactos/base/applications/winhlp32/lang/Sk.rc trunk/reactos/base/applications/winhlp32/lang/Sq.rc trunk/reactos/base/applications/winhlp32/lang/Sr.rc trunk/reactos/base/applications/winhlp32/lang/Sv.rc trunk/reactos/base/applications/winhlp32/lang/Tr.rc trunk/reactos/base/applications/winhlp32/lang/Uk.rc trunk/reactos/base/applications/winhlp32/lang/Zh.rc Modified: trunk/reactos/base/applications/winhlp32/lang/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Bg.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Bg.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -72,7 +72,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine ÐÐ¾Ð¼Ð¾Ñ" +STID_WINE_HELP, "ReactOS ÐÐ¾Ð¼Ð¾Ñ" STID_WHERROR, "ÐÐ ÐÐ¨ÐÐ" STID_WARNING, "ÐÐ ÐÐÐ£ÐÐ ÐÐÐÐÐÐÐ" STID_INFO, "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" Modified: trunk/reactos/base/applications/winhlp32/lang/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Cs.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Cs.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -77,7 +77,7 @@ STRINGTABLE { -STID_WINE_HELP, "NÃ¡povÄda Wine" +STID_WINE_HELP, "NÃ¡povÄda ReactOS" STID_WHERROR, "CHYBA" STID_WARNING, "VAROVÃNÃ" STID_INFO, "Informace" Modified: trunk/reactos/base/applications/winhlp32/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Da.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -77,7 +77,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine HjÃ¦lp" +STID_WINE_HELP, "ReactOS HjÃ¦lp" STID_WHERROR, "FEJL" STID_WARNING, "ADVARSEL" STID_INFO, "Information" Modified: trunk/reactos/base/applications/winhlp32/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/De.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine Hilfe" +STID_WINE_HELP, "ReactOS Hilfe" STID_WHERROR, "FEHLER" STID_WARNING, "ACHTUNG" STID_INFO, "Information" Modified: trunk/reactos/base/applications/winhlp32/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/En.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -73,7 +73,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine Help" +STID_WINE_HELP, "ReactOS Help" STID_WHERROR, "ERROR" STID_WARNING, "WARNING" STID_INFO, "Information" Modified: trunk/reactos/base/applications/winhlp32/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Es.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Es.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Ayuda de Wine" +STID_WINE_HELP, "Ayuda de ReactOS" STID_WHERROR, "ERROR" STID_WARNING, "ADVERTENCIA" STID_INFO, "InformaciÃ³n" Modified: trunk/reactos/base/applications/winhlp32/lang/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Fi.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Fi.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -74,7 +74,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine Ohje" +STID_WINE_HELP, "ReactOS Ohje" STID_WHERROR, "VIRHE" STID_WARNING, "VAROITUS" STID_INFO, "Tietoja" Modified: trunk/reactos/base/applications/winhlp32/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Fr.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -77,7 +77,7 @@ STRINGTABLE { -STID_WINE_HELP, "Aide de Wine" +STID_WINE_HELP, "Aide de ReactOS" STID_WHERROR, "ERREUR" STID_WARNING, "ATTENTION" STID_INFO, "Information" Modified: trunk/reactos/base/applications/winhlp32/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/He.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/He.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -76,7 +76,7 @@ STRINGTABLE { -STID_WINE_HELP, "××¢××¨× ×©× Wine" +STID_WINE_HELP, "××¢××¨× ×©× ReactOS" STID_WHERROR, "×©××××" STID_WARNING, "××××¨×" STID_INFO, "××××¢" Modified: trunk/reactos/base/applications/winhlp32/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Hu.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -74,7 +74,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine sÃºgÃ³" +STID_WINE_HELP, "ReactOS sÃºgÃ³" STID_WHERROR, "HIBA" STID_WARNING, "FIGYELMEZTETÃS" STID_INFO, "InformÃ¡ciÃ³" Modified: trunk/reactos/base/applications/winhlp32/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/It.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -76,7 +76,7 @@ STRINGTABLE { -STID_WINE_HELP, "Guida di Wine" +STID_WINE_HELP, "Guida di ReactOS" STID_WHERROR, "ERRORE" STID_WARNING, "ATTENZIONE" STID_INFO, "Informazione" Modified: trunk/reactos/base/applications/winhlp32/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ja.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -76,7 +76,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine ãã«ã" +STID_WINE_HELP, "ReactOS ãã«ã" STID_WHERROR, "ã¨ã©ã¼" STID_WARNING, "è¦å" STID_INFO, "æå ±" Modified: trunk/reactos/base/applications/winhlp32/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ko.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine ëìë§" +STID_WINE_HELP, "ReactOS ëìë§" STID_WHERROR, "ìë¬" STID_WARNING, "ê²½ê³ " STID_INFO, "ì ë³´" Modified: trunk/reactos/base/applications/winhlp32/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Lt.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine Å¾inynas" +STID_WINE_HELP, "ReactOS Å¾inynas" STID_WHERROR, "KLAIDA" STID_WARNING, "Ä®SPÄJIMAS" STID_INFO, "Informacija" Modified: trunk/reactos/base/applications/winhlp32/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Nl.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine Help" +STID_WINE_HELP, "ReactOS Help" STID_WHERROR, "FOUT" STID_WARNING, "WAARSCHUWING" STID_INFO, "Informatie" Modified: trunk/reactos/base/applications/winhlp32/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/No.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -72,7 +72,7 @@ STRINGTABLE { -STID_WINE_HELP, "Hjelp" +STID_WINE_HELP, "ReactOS Hjelp" STID_WHERROR, "FEIL" STID_WARNING, "ADVARSEL" STID_INFO, "Informasjon" Modified: trunk/reactos/base/applications/winhlp32/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Pl.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine - Pomoc" +STID_WINE_HELP, "ReactOS Pomoc" STID_WHERROR, "BÅÄD" STID_WARNING, "OSTRZEÅ»ENIE" STID_INFO, "Informacja" Modified: trunk/reactos/base/applications/winhlp32/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Pt.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -81,7 +81,7 @@ STRINGTABLE { -STID_WINE_HELP, "Ajuda Wine" +STID_WINE_HELP, "Ajuda ReactOS" STID_WHERROR, "ERRO" STID_WARNING, "AVISO" STID_INFO, "InformaÃ§Ã£o" Modified: trunk/reactos/base/applications/winhlp32/lang/Rm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Rm.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Rm.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -79,7 +79,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine agï¿½d" +STID_WINE_HELP, "ReactOS agï¿½d" STID_WHERROR, "SBAGL" STID_WARNING, "ATTENZIUN" STID_INFO, "INFUORMAZIUN" Modified: trunk/reactos/base/applications/winhlp32/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ro.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -77,7 +77,7 @@ STRINGTABLE { -STID_WINE_HELP, "Manual" +STID_WINE_HELP, "Manual ReactOS" STID_WHERROR, "EROARE" STID_WARNING, "AVERTISMENT" STID_INFO, "InformaÈie" Modified: trunk/reactos/base/applications/winhlp32/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ru.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Ð¡Ð¿ÑÐ°Ð²ÐºÐ° Wine" +STID_WINE_HELP, "Ð¡Ð¿ÑÐ°Ð²ÐºÐ° ReactOS" STID_WHERROR, "ÐÐ¨ÐÐÐÐ" STID_WARNING, "ÐÐÐÐÐÐÐÐ" STID_INFO, "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" Modified: trunk/reactos/base/applications/winhlp32/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Si.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -74,7 +74,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine PomoÄ" +STID_WINE_HELP, "ReactOS PomoÄ" STID_WHERROR, "NAPAKA" STID_WARNING, "OPOZORILO" STID_INFO, "Informacija" Modified: trunk/reactos/base/applications/winhlp32/lang/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Sk.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Sk.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -72,7 +72,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine Pomoc" +STID_WINE_HELP, "ReactOS Pomoc" STID_WHERROR, "CHYBA" STID_WARNING, "VAROVANIE" STID_INFO, "InformÃ¡cie" Modified: trunk/reactos/base/applications/winhlp32/lang/Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Sq.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Sq.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -74,7 +74,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine ndihme" +STID_WINE_HELP, "ReactOS ndihme" STID_WHERROR, "ERROR" STID_WARNING, "KuJDES" STID_INFO, "Informacion" Modified: trunk/reactos/base/applications/winhlp32/lang/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Sr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Sr.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine PomoÄ" +STID_WINE_HELP, "ReactOS PomoÄ" STID_WHERROR, "GREÅ KA" STID_WARNING, "UPOZORENJE" STID_INFO, "Informacija" Modified: trunk/reactos/base/applications/winhlp32/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Sv.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -76,7 +76,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine HjÃ¤lp" +STID_WINE_HELP, "ReactOS HjÃ¤lp" STID_WHERROR, "FEL" STID_WARNING, "VARNING" STID_INFO, "Information" Modified: trunk/reactos/base/applications/winhlp32/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Tr.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -72,7 +72,7 @@ STRINGTABLE { -STID_WINE_HELP, "YardÄ±m" +STID_WINE_HELP, "YardÄ±m ReactOS" STID_WHERROR, "YANLIÅLIK" STID_WARNING, "UYARI" STID_INFO, "Bilgi" Modified: trunk/reactos/base/applications/winhlp32/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Uk.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -80,7 +80,7 @@ STRINGTABLE { -STID_WINE_HELP, "ÐÐ¾Ð²ÑÐ´ÐºÐ° Wine" +STID_WINE_HELP, "ÐÐ¾Ð²ÑÐ´ÐºÐ° ReactOS" STID_WHERROR, "ÐÐÐÐÐÐÐ" STID_WARNING, "Ð£ÐÐÐÐ" STID_INFO, "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ" Modified: trunk/reactos/base/applications/winhlp32/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Zh.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -78,7 +78,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine å¸®å©" +STID_WINE_HELP, "ReactOS å¸®å©" STID_WHERROR, "éè¯¯" STID_WARNING, "è¦å" STID_INFO, "ä¿¡æ¯"

1 0

[pschweitzer] 70748: [FASTFAT] [NTFS] Thanks to r70746, now, drop our beloved fix/hack/whatever about non-initialized floppy disks.
by pschweitzer＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: pschweitzer Date: Sun Feb 14 19:56:17 2016 New Revision: 70748 URL: http://svn.reactos.org/svn/reactos?rev=70748&view=rev Log: [FASTFAT] [NTFS] Thanks to r70746, now, drop our beloved fix/hack/whatever about non-initialized floppy disks. Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sun Feb 14 19:56:17 2016 @@ -120,16 +120,6 @@ PartitionInfoIsValid = TRUE; *RecognizedFS = TRUE; } - } - else if (DiskGeometry.MediaType == Unknown) - { - /* - * Floppy disk driver can return Unknown as media type if it - * doesn't know yet what floppy in the drive really is. This is - * perfectly correct to do under Windows. - */ - *RecognizedFS = TRUE; - DiskGeometry.BytesPerSector = 512; } else { Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sun Feb 14 19:56:17 2016 @@ -89,10 +89,6 @@ return STATUS_UNRECOGNIZED_VOLUME; } } - else if (DiskGeometry.MediaType == Unknown) - { - DiskGeometry.BytesPerSector = 512; - } DPRINT1("BytesPerSector: %lu\n", DiskGeometry.BytesPerSector); BootSector = ExAllocatePoolWithTag(NonPagedPool,

1 0

[pschweitzer] 70747: [EXT2] Revert r70746, more appropriate fix was committed in r70746
by pschweitzer＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: pschweitzer Date: Sun Feb 14 19:54:54 2016 New Revision: 70747 URL: http://svn.reactos.org/svn/reactos?rev=70747&view=rev Log: [EXT2] Revert r70746, more appropriate fix was committed in r70746 Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctl.c Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fsctl.c [iso-8859-1] Sun Feb 14 19:54:54 2016 @@ -1496,13 +1496,6 @@ _SEH2_LEAVE; } -#ifdef __REACTOS__ - if (DiskGeometry.MediaType == Unknown) - { - DiskGeometry.BytesPerSector = 512; - } -#endif - Status = IoCreateDevice( MainDeviceObject->DriverObject, sizeof(EXT2_VCB),

1 0

[pschweitzer] 70746: [FLOPPY] When discovering floppy controlers, immediately probe controlers to check whether they have a disk and if so, what's its geometry. This avoids waiting for the first re...
by pschweitzer＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: pschweitzer Date: Sun Feb 14 19:53:47 2016 New Revision: 70746 URL: http://svn.reactos.org/svn/reactos?rev=70746&view=rev Log: [FLOPPY] When discovering floppy controlers, immediately probe controlers to check whether they have a disk and if so, what's its geometry. This avoids waiting for the first read, which will obviously never happen because FSD will try other operations depending on not set geometry. This implies a modification in RWDetermineMediaType() to avoid infinite wait, in case there's no disk at all in the controler. Addendum to r70725 Modified: trunk/reactos/drivers/storage/floppy/floppy.c trunk/reactos/drivers/storage/floppy/readwrite.c trunk/reactos/drivers/storage/floppy/readwrite.h Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Sun Feb 14 19:53:47 2016 @@ -987,6 +987,11 @@ /* 3k: Clear the DO_DEVICE_INITIALIZING flag */ gControllerInfo[i].DriveInfo[j].DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + /* 3l: Attempt to get drive info - if a floppy is already present */ + StartMotor(&gControllerInfo[i].DriveInfo[j]); + RWDetermineMediaType(&gControllerInfo[i].DriveInfo[j], TRUE); + StopMotor(gControllerInfo[i].DriveInfo[j].ControllerInfo); } } Modified: trunk/reactos/drivers/storage/floppy/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea… ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] Sun Feb 14 19:53:47 2016 @@ -149,8 +149,8 @@ } -static NTSTATUS NTAPI -RWDetermineMediaType(PDRIVE_INFO DriveInfo) +NTSTATUS NTAPI +RWDetermineMediaType(PDRIVE_INFO DriveInfo, BOOLEAN OneShot) /* * FUNCTION: Determine the media type of the disk in the drive and fill in the geometry * ARGUMENTS: @@ -177,8 +177,8 @@ /* * This algorithm assumes that a 1.44MB floppy is in the drive. If it's not, - * it works backwards until the read works. Note that only 1.44 has been tested - * at all. + * it works backwards until the read works unless OneShot try is asked. + * Note that only 1.44 has been tested at all. */ do @@ -249,7 +249,10 @@ if(HwReadIdResult(DriveInfo->ControllerInfo, NULL, NULL) != STATUS_SUCCESS) { WARN_(FLOPPY, "RWDetermineMediaType(): ReadIdResult failed; continuing\n"); - continue; + if (OneShot) + break; + else + continue; } /* Found the media; populate the geometry now */ @@ -492,7 +495,7 @@ */ if(DriveInfo->DiskGeometry.MediaType == Unknown) { - if(RWDetermineMediaType(DriveInfo) != STATUS_SUCCESS) + if(RWDetermineMediaType(DriveInfo, FALSE) != STATUS_SUCCESS) { WARN_(FLOPPY, "ReadWritePassive(): unable to determine media type; completing with STATUS_UNSUCCESSFUL\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: trunk/reactos/drivers/storage/floppy/readwrite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea… ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.h [iso-8859-1] Sun Feb 14 19:53:47 2016 @@ -33,3 +33,6 @@ VOID NTAPI ReadWritePassive(PDRIVE_INFO DriveInfo, PIRP Irp); + +NTSTATUS NTAPI +RWDetermineMediaType(PDRIVE_INFO DriveInfo, BOOLEAN OneShot);

1 0

[ekohl] 70745: [USERINIT] Select the current keyboard layout in the keyloard layout list.
by ekohl＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: ekohl Date: Sun Feb 14 18:57:12 2016 New Revision: 70745 URL: http://svn.reactos.org/svn/reactos?rev=70745&view=rev Log: [USERINIT] Select the current keyboard layout in the keyloard layout list. Modified: trunk/reactos/base/system/userinit/livecd.c Modified: trunk/reactos/base/system/userinit/livecd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/livec… ============================================================================== --- trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] Sun Feb 14 18:57:12 2016 @@ -302,12 +302,16 @@ HWND hItemsList) { HKEY hKey; - WCHAR szLayoutID[9], KeyName[MAX_PATH]; + WCHAR szLayoutId[9], szCurrentLayoutId[9]; + WCHAR KeyName[MAX_PATH]; DWORD dwIndex = 0; DWORD dwSize; INT iIndex; LONG lError; - ULONG ulLayoutID; + ULONG ulLayoutId; + + if (!GetKeyboardLayoutNameW(szCurrentLayoutId)) + wcscpy(szCurrentLayoutId, L"00000409"); lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Keyboard Layouts", @@ -319,11 +323,11 @@ while (TRUE) { - dwSize = sizeof(szLayoutID) / sizeof(WCHAR); + dwSize = sizeof(szLayoutId) / sizeof(WCHAR); lError = RegEnumKeyExW(hKey, dwIndex, - szLayoutID, + szLayoutId, &dwSize, NULL, NULL, @@ -332,15 +336,14 @@ if (lError != ERROR_SUCCESS) break; - GetLayoutName(szLayoutID, KeyName); + GetLayoutName(szLayoutId, KeyName); iIndex = (INT)SendMessageW(hItemsList, CB_ADDSTRING, 0, (LPARAM)KeyName); - ulLayoutID = wcstoul(szLayoutID, NULL, 16); - SendMessageW(hItemsList, CB_SETITEMDATA, iIndex, (LPARAM)ulLayoutID); - - // FIXME! - if (wcscmp(szLayoutID, L"00000409") == 0) + ulLayoutId = wcstoul(szLayoutId, NULL, 16); + SendMessageW(hItemsList, CB_SETITEMDATA, iIndex, (LPARAM)ulLayoutId); + + if (wcscmp(szLayoutId, szCurrentLayoutId) == 0) { SendMessageW(hItemsList, CB_SETCURSEL, (WPARAM)iIndex, (LPARAM)0); }

1 0

[hbelusca] 70744: [WIN32K:NTUSER] - Cleanup window clipboard data while the window still exists and is not dereferenced. - When a window is about to be destroyed (just before we send the WM_DESTROY...
by hbelusca＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: hbelusca Date: Sun Feb 14 18:41:49 2016 New Revision: 70744 URL: http://svn.reactos.org/svn/reactos?rev=70744&view=rev Log: [WIN32K:NTUSER] - Cleanup window clipboard data while the window still exists and is not dereferenced. - When a window is about to be destroyed (just before we send the WM_DESTROY message), if it is the current clipboard owner, make it release the clipboard. The WM_RENDERALLFORMATS message is then sent, and if needed, one WM_DRAWCLIPBOARD message. - Send a WM_DRAWCLIPBOARD message when SetClipboardViewer is called. WM_DRAWCLIPBOARD messages are sent as notifications to the corresponding windows. Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c trunk/reactos/win32ss/user/ntuser/clipboard.h trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Sun Feb 14 18:41:49 2016 @@ -346,6 +346,43 @@ pWinSta->cNumClipFormats = 0; } +/* UserClipboardRelease is called from IntSendDestroyMsg in window.c */ +VOID FASTCALL +UserClipboardRelease(PWND pWindow) +{ + PWINSTATION_OBJECT pWinStaObj; + + pWinStaObj = IntGetWinStaForCbAccess(); + if (!pWinStaObj) + return; + + co_IntSendMessage(pWinStaObj->spwndClipOwner->head.h, WM_RENDERALLFORMATS, 0, 0); + + /* If the window being destroyed is the current clipboard owner... */ + if (pWindow == pWinStaObj->spwndClipOwner) + { + /* ... make it release the clipboard */ + pWinStaObj->spwndClipOwner = NULL; + } + + if (pWinStaObj->fClipboardChanged) + { + /* Add synthesized formats - they are rendered later */ + IntAddSynthesizedFormats(pWinStaObj); + + /* Notify viewer windows in chain */ + pWinStaObj->fClipboardChanged = FALSE; + if (pWinStaObj->spwndClipViewer) + { + TRACE("Clipboard: sending WM_DRAWCLIPBOARD to %p\n", pWinStaObj->spwndClipViewer->head.h); + // For 32-bit applications this message is sent as a notification + co_IntSendMessageNoWait(pWinStaObj->spwndClipViewer->head.h, WM_DRAWCLIPBOARD, 0, 0); + } + } + + ObDereferenceObject(pWinStaObj); +} + /* UserClipboardFreeWindow is called from co_UserFreeWindow in window.c */ VOID FASTCALL UserClipboardFreeWindow(PWND pWindow) @@ -356,17 +393,18 @@ if (!pWinStaObj) return; + if (pWindow == pWinStaObj->spwndClipOwner) + { + /* The owner window was destroyed */ + pWinStaObj->spwndClipOwner = NULL; + } + /* Check if clipboard is not locked by this window, if yes, unlock it */ if (pWindow == pWinStaObj->spwndClipOpen) { /* The window that opens the clipboard was destroyed */ pWinStaObj->spwndClipOpen = NULL; pWinStaObj->ptiClipLock = NULL; - } - if (pWindow == pWinStaObj->spwndClipOwner) - { - /* The owner window was destroyed */ - pWinStaObj->spwndClipOwner = NULL; } /* Remove window from window chain */ if (pWindow == pWinStaObj->spwndClipViewer) @@ -500,13 +538,13 @@ IntAddSynthesizedFormats(pWinStaObj); /* Notify viewer windows in chain */ + pWinStaObj->fClipboardChanged = FALSE; if (pWinStaObj->spwndClipViewer) { TRACE("Clipboard: sending WM_DRAWCLIPBOARD to %p\n", pWinStaObj->spwndClipViewer->head.h); - co_IntSendMessage(pWinStaObj->spwndClipViewer->head.h, WM_DRAWCLIPBOARD, 0, 0); + // For 32-bit applications this message is sent as a notification + co_IntSendMessageNoWait(pWinStaObj->spwndClipViewer->head.h, WM_DRAWCLIPBOARD, 0, 0); } - - pWinStaObj->fClipboardChanged = FALSE; } cleanup: @@ -629,6 +667,7 @@ if (pWinStaObj->spwndClipOwner) { TRACE("Clipboard: WM_DESTROYCLIPBOARD to %p\n", pWinStaObj->spwndClipOwner->head.h); + // For 32-bit applications this message is sent as a notification co_IntSendMessageNoWait(pWinStaObj->spwndClipOwner->head.h, WM_DESTROYCLIPBOARD, 0, 0); } @@ -1053,6 +1092,15 @@ /* Set new viewer window */ pWinStaObj->spwndClipViewer = pWindow; + /* Notify viewer windows in chain */ + pWinStaObj->fClipboardChanged = FALSE; + if (pWinStaObj->spwndClipViewer) + { + TRACE("Clipboard: sending WM_DRAWCLIPBOARD to %p\n", pWinStaObj->spwndClipViewer->head.h); + // For 32-bit applications this message is sent as a notification + co_IntSendMessageNoWait(pWinStaObj->spwndClipViewer->head.h, WM_DRAWCLIPBOARD, 0, 0); + } + cleanup: if (pWinStaObj) ObDereferenceObject(pWinStaObj); Modified: trunk/reactos/win32ss/user/ntuser/clipboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.h [iso-8859-1] Sun Feb 14 18:41:49 2016 @@ -9,6 +9,9 @@ UINT APIENTRY UserEnumClipboardFormats(UINT uFormat); + +VOID FASTCALL +UserClipboardRelease(PWND pWindow); VOID FASTCALL UserClipboardFreeWindow(PWND pWindow); Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sun Feb 14 18:41:49 2016 @@ -424,10 +424,14 @@ } } - /* - * Send the WM_DESTROY to the window. - */ - + /* If the window being destroyed is the current clipboard owner... */ + if (ti->ppi->prpwinsta != NULL && Window == ti->ppi->prpwinsta->spwndClipOwner) + { + /* ... make it release the clipboard */ + UserClipboardRelease(Window); + } + + /* Send the WM_DESTROY to the window */ co_IntSendMessage(hWnd, WM_DESTROY, 0, 0); /* @@ -554,6 +558,8 @@ co_IntSendMessage(UserHMGetHandle(Window), WM_NCDESTROY, 0, 0); } + UserClipboardFreeWindow(Window); + DestroyTimersForWindow(ThreadData, Window); /* Unregister hot keys */ @@ -664,8 +670,6 @@ UserFreeWindowInfo(Window->head.pti, Window); UserDereferenceObject(Window); - - UserClipboardFreeWindow(Window); return 0; }

1 0

[hbelusca] 70743: [WIN32K]: Some whitespace fixes.
by hbelusca＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: hbelusca Date: Sun Feb 14 18:26:23 2016 New Revision: 70743 URL: http://svn.reactos.org/svn/reactos?rev=70743&view=rev Log: [WIN32K]: Some whitespace fixes. Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sun Feb 14 18:26:23 2016 @@ -394,8 +394,9 @@ if (Window) { - /* Look whether the focus is within the tree of windows we will - * be destroying. + /* + * Look whether the focus is within the tree of windows + * we will be destroying. */ // Rule #1 if ( ti->MessageQueue->spwndActive == Window || // Fixes CORE-106 RegSvr32 exit and return focus to CMD. @@ -433,7 +434,6 @@ * This WM_DESTROY message can trigger re-entrant calls to DestroyWindow * make sure that the window still exists when we come back. */ - if (IntIsWindow(hWnd)) { HWND* pWndArray; @@ -480,13 +480,12 @@ } /*********************************************************************** - * IntDestroyWindow + * co_UserFreeWindow * * Destroy storage associated to a window. "Internals" p.358 * - * This is the "functional" DestroyWindows function ei. all stuff - * done in CreateWindow is undone here and not in DestroyWindow:-P - + * This is the "functional" DestroyWindows function i.e. all stuff + * done in CreateWindow is undone here and not in DestroyWindow :-P */ LRESULT co_UserFreeWindow(PWND Window, PPROCESSINFO ProcessData, @@ -503,7 +502,7 @@ if(Window->state2 & WNDS2_INDESTROY) { - TRACE("Tried to call IntDestroyWindow() twice\n"); + TRACE("Tried to call co_UserFreeWindow() twice\n"); return 0; } Window->state2 |= WNDS2_INDESTROY; @@ -513,7 +512,7 @@ /* remove the window already at this point from the thread window list so we don't get into trouble when destroying the thread windows while we're still - in IntDestroyWindow() */ + in co_UserFreeWindow() */ RemoveEntryList(&Window->ThreadListEntry); BelongsToThreadData = IntWndBelongsToThread(Window, ThreadData); @@ -528,7 +527,7 @@ { if ((Child = IntGetWindowObject(*ChildHandle))) { - if(!IntWndBelongsToThread(Child, ThreadData)) + if (!IntWndBelongsToThread(Child, ThreadData)) { /* send WM_DESTROY messages to windows not belonging to the same thread */ co_IntSendMessage( UserHMGetHandle(Child), WM_ASYNC_DESTROYWINDOW, 0, 0 ); @@ -542,7 +541,7 @@ ExFreePoolWithTag(Children, USERTAG_WINDOWLIST); } - if(SendMessages) + if (SendMessages) { /* * Clear the update region to make sure no WM_PAINT messages will be @@ -551,7 +550,7 @@ co_UserRedrawWindow(Window, NULL, 0, RDW_VALIDATE | RDW_NOFRAME | RDW_NOERASE | RDW_NOINTERNALPAINT | RDW_NOCHILDREN); - if(BelongsToThreadData) + if (BelongsToThreadData) co_IntSendMessage(UserHMGetHandle(Window), WM_NCDESTROY, 0, 0); } @@ -570,7 +569,7 @@ /* don't remove the WINDOWSTATUS_DESTROYING bit */ /* reset shell window handles */ - if(ThreadData->rpdesk) + if (ThreadData->rpdesk) { if (Window->head.h == ThreadData->rpdesk->rpwinstaParent->ShellWindow) ThreadData->rpdesk->rpwinstaParent->ShellWindow = NULL; @@ -617,8 +616,8 @@ Window->IDMenu = 0; } - if(Window->SystemMenu - && (Menu = UserGetMenuObject(Window->SystemMenu))) + if (Window->SystemMenu + && (Menu = UserGetMenuObject(Window->SystemMenu))) { IntDestroyMenuObject(Menu, TRUE); Window->SystemMenu = (HMENU)0; @@ -653,7 +652,7 @@ Window->head.pti->ppi); Window->pcls = NULL; - if(Window->hrgnClip) + if (Window->hrgnClip) { IntGdiSetRegionOwner(Window->hrgnClip, GDI_OBJ_HMGR_POWNED); GreDeleteObject(Window->hrgnClip); @@ -2674,7 +2673,6 @@ IntNotifyWinEvent(EVENT_OBJECT_DESTROY, Window, OBJID_WINDOW, CHILDID_SELF, 0); /* Send destroy messages */ - IntSendDestroyMsg(UserHMGetHandle(Window)); if (!IntIsWindow(UserHMGetHandle(Window)))

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