Ros-diffs

ros-diffs@reactos.org

81390 discussions

[khornicek] 55866: Fix build?
by khornicek＠svn.reactos.org 25 Feb '12

25 Feb '12

Author: khornicek Date: Sat Feb 25 21:09:28 2012 New Revision: 55866 URL: http://svn.reactos.org/svn/reactos?rev=55866&view=rev Log: Fix build? Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] Sat Feb 25 21:09:28 2012 @@ -55,11 +55,6 @@ }; } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; -typedef struct _FILE_ATTRIBUTE_TAG_INFORMATION { - ULONG FileAttributes; - ULONG ReparseTag; -} FILE_ATTRIBUTE_TAG_INFORMATION, *PFILE_ATTRIBUTE_TAG_INFORMATION; - /* FUNCTIONS *****************************************************************/ /*

1 0

[sir_richard] 55865: [NTOS]: Implementation of the "Generic DPC" functionality from Windows NT 5.2, which is a forced-synchronization all-CPU DPC callback mechanism. Implemented, and exported all A...
by sir_richard＠svn.reactos.org 25 Feb '12

25 Feb '12

Author: sir_richard Date: Sat Feb 25 20:40:06 2012 New Revision: 55865 URL: http://svn.reactos.org/svn/reactos?rev=55865&view=rev Log: [NTOS]: Implementation of the "Generic DPC" functionality from Windows NT 5.2, which is a forced-synchronization all-CPU DPC callback mechanism. Implemented, and exported all APIs requireted, and added to NDK. NOTE: This implementation only works for Single Processor systems (NT_UP) since this is all that ReactOS currently works on. This is needed for poolmon/querying pool tags. Modified: trunk/reactos/include/ndk/kefuncs.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ntoskrnl.spec Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Sat Feb 25 20:40:06 2012 @@ -209,6 +209,28 @@ ); // +// Generic DPC Routines +// +VOID +NTAPI +KeGenericCallDpc( + IN PKDEFERRED_ROUTINE Routine, + IN PVOID Context +); + +VOID +NTAPI +KeSignalCallDpcDone( + IN PVOID SystemArgument1 +); + +BOOLEAN +NTAPI +KeSignalCallDpcSynchronize( + IN PVOID SystemArgument2 +); + +// // ARC Configuration Functions. Only enabled if you have ARC Support // #ifdef _ARC_ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sat Feb 25 20:40:06 2012 @@ -35,6 +35,12 @@ PKINTERRUPT_ROUTINE ChainedDispatch; PKINTERRUPT_ROUTINE *FlatDispatch; } DISPATCH_INFO, *PDISPATCH_INFO; + +typedef struct _DEFERRED_REVERSE_BARRIER +{ + ULONG Barrier; + ULONG TotalProcessors; +} DEFERRED_REVERSE_BARRIER, *PDEFERRED_REVERSE_BARRIER; typedef struct _KI_SAMPLE_MAP { Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=5586… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] Sat Feb 25 20:40:06 2012 @@ -958,4 +958,60 @@ Dpc->Number = Number + MAXIMUM_PROCESSORS; } +/* + * @implemented + */ +VOID +NTAPI +KeGenericCallDpc(IN PKDEFERRED_ROUTINE Routine, + IN PVOID Context) +{ + ULONG Barrier = KeNumberProcessors; + KIRQL OldIrql; + DEFERRED_REVERSE_BARRIER ReverseBarrier; + ASSERT(KeGetCurrentIrql () < DISPATCH_LEVEL); + + // + // The barrier is the number of processors, each processor will decrement it + // by one, so when all processors have run the DPC, the barrier reaches zero + // + ReverseBarrier.Barrier = Barrier; + ReverseBarrier.TotalProcessors = Barrier; + + // + // But we don't need the barrier on UP, since we can simply call the routine + // directly while at DISPATCH_LEVEL and not worry about anything else + // + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + Routine(&KeGetCurrentPrcb()->CallDpc, Context, &Barrier, &ReverseBarrier); + KeLowerIrql(OldIrql); +} + +/* + * @implemented + */ +VOID +NTAPI +KeSignalCallDpcDone(IN PVOID SystemArgument1) +{ + // + // Decrement the barrier, which is actually the processor count + // + InterlockedDecrement((PLONG)SystemArgument1); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +KeSignalCallDpcSynchronize(IN PVOID SystemArgument2) +{ + // + // There is nothing to do on UP systems -- the processor calling this wins + // + UNREFERENCED_PARAMETER(SystemArgument2); + return TRUE; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Sat Feb 25 20:40:06 2012 @@ -583,7 +583,7 @@ @ stdcall KeFindConfigurationNextEntry(ptr long long ptr ptr) @ stdcall KeFlushEntireTb(long long) @ stdcall KeFlushQueuedDpcs() -;KeGenericCallDpc +@ stdcall KeGenericCallDpc(ptr ptr) @ stdcall KeGetCurrentThread() @ stdcall KeGetPreviousMode() @ stdcall KeGetRecommendedSharedDataAlignment() @@ -696,8 +696,8 @@ @ stdcall KeSetTimeIncrement(long long) @ stdcall KeSetTimer(ptr long long ptr) @ stdcall KeSetTimerEx(ptr long long long ptr) -;KeSignalCallDpcDone -;KeSignalCallDpcSynchronize +@ stdcall KeSignalCallDpcDone(ptr) +@ stdcall KeSignalCallDpcSynchronize(ptr) @ stdcall KeStackAttachProcess(ptr ptr) @ stdcall KeSynchronizeExecution(ptr ptr ptr) @ stdcall KeTerminateThread(long)

1 0

[ion] 55864: [NDK]: Add missing type to NDK.
by ion＠svn.reactos.org 25 Feb '12

25 Feb '12

Author: ion Date: Sat Feb 25 20:38:20 2012 New Revision: 55864 URL: http://svn.reactos.org/svn/reactos?rev=55864&view=rev Log: [NDK]: Add missing type to NDK. Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/iotypes.h [iso-8859-1] Sat Feb 25 20:38:20 2012 @@ -598,6 +598,12 @@ PVOID ApcContext; IO_STATUS_BLOCK IoStatusBlock; } FILE_IO_COMPLETION_INFORMATION, *PFILE_IO_COMPLETION_INFORMATION; + +typedef struct _FILE_ATTRIBUTE_TAG_INFORMATION +{ + ULONG FileAttributes; + ULONG ReparseTag; +} FILE_ATTRIBUTE_TAG_INFORMATION, *PFILE_ATTRIBUTE_TAG_INFORMATION; // // File System Information structures for NtQueryInformationFile

1 0

[ion] 55863: [CSRSRV]: Quiet, you!
by ion＠svn.reactos.org 25 Feb '12

25 Feb '12

Author: ion Date: Sat Feb 25 20:31:28 2012 New Revision: 55863 URL: http://svn.reactos.org/svn/reactos?rev=55863&view=rev Log: [CSRSRV]: Quiet, you! Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Sat Feb 25 20:31:28 2012 @@ -23,7 +23,7 @@ HANDLE CsrSmApiPort; HANDLE hSbApiPort = (HANDLE) 0; HANDLE CsrApiPort = (HANDLE) 0; -ULONG CsrDebug = 0xFFFFFFFF; +ULONG CsrDebug = 0;//0xFFFFFFFF; ULONG CsrMaxApiRequestThreads; ULONG CsrTotalPerProcessDataLength; ULONG SessionId;

1 0

[gadamopoulos] 55862: [win32k] - move wallpaper info from WINSTATION_OBJECT to SPIVALUES. Also remove some unused fields from WINSTATION_OBJECT
by gadamopoulos＠svn.reactos.org 25 Feb '12

25 Feb '12

Author: gadamopoulos Date: Sat Feb 25 20:06:15 2012 New Revision: 55862 URL: http://svn.reactos.org/svn/reactos?rev=55862&view=rev Log: [win32k] - move wallpaper info from WINSTATION_OBJECT to SPIVALUES. Also remove some unused fields from WINSTATION_OBJECT Modified: trunk/reactos/subsystems/win32/win32k/include/sysparams.h trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/include/sysparams.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] Sat Feb 25 20:06:15 2012 @@ -33,6 +33,13 @@ UPM_UIEFFECTS = 0x80000000, UPM_DEFAULT = 0x80003E9E } USERPREFMASKS; + +typedef enum +{ + wmCenter = 0, + wmTile, + wmStretch +} WALLPAPER_MODE; typedef struct _SPIVALUES { @@ -129,11 +136,16 @@ TEXTMETRICW tmMenuFont; TEXTMETRICW tmCaptionFont; + /* Wallpaper */ + HANDLE hbmWallpaper; + ULONG cxWallpaper, cyWallpaper; + WALLPAPER_MODE WallpaperMode; + UNICODE_STRING ustrWallpaper; + WCHAR awcWallpaper[MAX_PATH]; + BOOL bHandHeld; BOOL bFastTaskSwitch; UINT uiGridGranularity; - UNICODE_STRING ustrWallpaper; - WCHAR awcWallpaper[MAX_PATH]; ANIMATIONINFO animationinfo; BOOL bSnapToDefBtn; Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] Sat Feb 25 20:06:15 2012 @@ -7,19 +7,8 @@ #define WSS_LOCKED (1) #define WSS_NOINTERACTIVE (2) -typedef enum -{ - wmCenter = 0, - wmTile, - wmStretch -} WALLPAPER_MODE; - typedef struct _WINSTATION_OBJECT { - PVOID SharedHeap; /* Points to kmode memory! */ - - CSHORT Type; - CSHORT Size; KSPIN_LOCK Lock; UNICODE_STRING Name; LIST_ENTRY DesktopListHead; @@ -27,11 +16,6 @@ HANDLE SystemMenuTemplate; HANDLE ShellWindow; HANDLE ShellListView; - - /* Wallpaper */ - HANDLE hbmWallpaper; - ULONG cxWallpaper, cyWallpaper; - WALLPAPER_MODE WallpaperMode; ULONG Flags; struct _DESKTOP* ActiveDesktop; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sat Feb 25 20:06:15 2012 @@ -1238,8 +1238,6 @@ COLORREF color_old; UINT align_old; int mode_old; - PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PWINSTATION_OBJECT WinSta = pti->rpdesk->rpwinstaParent; DECLARE_RETURN(BOOL); UserEnterExclusive(); @@ -1262,7 +1260,7 @@ /* * Paint desktop background */ - if (WinSta->hbmWallpaper != NULL) + if (gspv.hbmWallpaper != NULL) { SIZE sz; int x, y; @@ -1271,8 +1269,8 @@ sz.cx = WndDesktop->rcWindow.right - WndDesktop->rcWindow.left; sz.cy = WndDesktop->rcWindow.bottom - WndDesktop->rcWindow.top; - if (WinSta->WallpaperMode == wmStretch || - WinSta->WallpaperMode == wmTile) + if (gspv.WallpaperMode == wmStretch || + gspv.WallpaperMode == wmTile) { x = 0; y = 0; @@ -1280,8 +1278,8 @@ else { /* Find the upper left corner, can be negtive if the bitmap is bigger then the screen */ - x = (sz.cx / 2) - (WinSta->cxWallpaper / 2); - y = (sz.cy / 2) - (WinSta->cyWallpaper / 2); + x = (sz.cx / 2) - (gspv.cxWallpaper / 2); + y = (sz.cy / 2) - (gspv.cyWallpaper / 2); } hWallpaperDC = NtGdiCreateCompatibleDC(hDC); @@ -1303,9 +1301,9 @@ /*Do not fill the background after it is painted no matter the size of the picture */ doPatBlt = FALSE; - hOldBitmap = NtGdiSelectBitmap(hWallpaperDC, WinSta->hbmWallpaper); - - if (WinSta->WallpaperMode == wmStretch) + hOldBitmap = NtGdiSelectBitmap(hWallpaperDC, gspv.hbmWallpaper); + + if (gspv.WallpaperMode == wmStretch) { if(Rect.right && Rect.bottom) NtGdiStretchBlt(hDC, @@ -1316,24 +1314,24 @@ hWallpaperDC, 0, 0, - WinSta->cxWallpaper, - WinSta->cyWallpaper, + gspv.cxWallpaper, + gspv.cyWallpaper, SRCCOPY, 0); } - else if (WinSta->WallpaperMode == wmTile) + else if (gspv.WallpaperMode == wmTile) { /* Paint the bitmap across the screen then down */ - for(y = 0; y < Rect.bottom; y += WinSta->cyWallpaper) + for(y = 0; y < Rect.bottom; y += gspv.cyWallpaper) { - for(x = 0; x < Rect.right; x += WinSta->cxWallpaper) + for(x = 0; x < Rect.right; x += gspv.cxWallpaper) { NtGdiBitBlt(hDC, x, y, - WinSta->cxWallpaper, - WinSta->cyWallpaper, + gspv.cxWallpaper, + gspv.cyWallpaper, hWallpaperDC, 0, 0, @@ -1348,8 +1346,8 @@ NtGdiBitBlt(hDC, x, y, - WinSta->cxWallpaper, - WinSta->cyWallpaper, + gspv.cxWallpaper, + gspv.cyWallpaper, hWallpaperDC, 0, 0, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Sat Feb 25 20:06:15 2012 @@ -592,7 +592,6 @@ HBITMAP hbmp, hOldBitmap; SURFACE *psurfBmp; ULONG ulTile, ulStyle; - PWINSTATION_OBJECT gpwinstaCurrent = GetW32ProcessInfo()->prpwinsta; REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); @@ -654,9 +653,9 @@ return 0; } - gpwinstaCurrent->cxWallpaper = psurfBmp->SurfObj.sizlBitmap.cx; - gpwinstaCurrent->cyWallpaper = psurfBmp->SurfObj.sizlBitmap.cy; - gpwinstaCurrent->WallpaperMode = wmCenter; + gspv.cxWallpaper = psurfBmp->SurfObj.sizlBitmap.cx; + gspv.cyWallpaper = psurfBmp->SurfObj.sizlBitmap.cy; + gspv.WallpaperMode = wmCenter; SURFACE_ShareUnlockSurface(psurfBmp); @@ -671,23 +670,23 @@ /* Check the values we found in the registry */ if(ulTile && !ulStyle) { - gpwinstaCurrent->WallpaperMode = wmTile; + gspv.WallpaperMode = wmTile; } else if(!ulTile && ulStyle == 2) { - gpwinstaCurrent->WallpaperMode = wmStretch; + gspv.WallpaperMode = wmStretch; } } else { /* Remove wallpaper */ - gpwinstaCurrent->cxWallpaper = 0; - gpwinstaCurrent->cyWallpaper = 0; + gspv.cxWallpaper = 0; + gspv.cyWallpaper = 0; hbmp = 0; } /* Take care of the old wallpaper, if any */ - hOldBitmap = gpwinstaCurrent->hbmWallpaper; + hOldBitmap = gspv.hbmWallpaper; if(hOldBitmap != NULL) { /* Delete the old wallpaper */ @@ -696,7 +695,7 @@ } /* Set the new wallpaper */ - gpwinstaCurrent->hbmWallpaper = hbmp; + gspv.hbmWallpaper = hbmp; NtUserRedrawWindow(UserGetShellWindow(), NULL, NULL, RDW_INVALIDATE | RDW_ERASE);

1 0

[pschweitzer] 55861: [USER32] Correct user32 japanese translation (and fix build as well)
by pschweitzer＠svn.reactos.org 25 Feb '12

25 Feb '12

Author: pschweitzer Date: Sat Feb 25 19:28:00 2012 New Revision: 55861 URL: http://svn.reactos.org/svn/reactos?rev=55861&view=rev Log: [USER32] Correct user32 japanese translation (and fix build as well) Modified: trunk/reactos/dll/win32/user32/lang/ja-JP.rc Modified: trunk/reactos/dll/win32/user32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/user32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/lang/ja-JP.rc [iso-8859-1] Sat Feb 25 19:28:00 2012 @@ -29,7 +29,7 @@ MENUITEM SEPARATOR MENUITEM "åãåã(&T)", WM_CUT MENUITEM "ã³ãã¼(&C)", WM_COPY - MENUITEM "è²¼\ãä»ã(&P)", WM_PASTE + MENUITEM "è²¼ãä»ã(&P)", WM_PASTE MENUITEM "åé¤(&D)", WM_CLEAR MENUITEM SEPARATOR MENUITEM "ãã¹ã¦é¸æ(&A)", EM_SETSEL

1 0

[akhaldi] 55860: [SHELL32] * Misses these.
by akhaldi＠svn.reactos.org 25 Feb '12

25 Feb '12

Author: akhaldi Date: Sat Feb 25 19:02:49 2012 New Revision: 55860 URL: http://svn.reactos.org/svn/reactos?rev=55860&view=rev Log: [SHELL32] * Misses these. Modified: trunk/reactos/dll/win32/shell32/shell32.rc trunk/reactos/dll/win32/shell32/shell32_version.rc Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rc [iso-8859-1] Sat Feb 25 19:02:49 2012 @@ -22,7 +22,7 @@ #include "shlobj.h" #include "shresdef.h" -#include "version.rc" +#include "shell32_version.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/shell32/shell32_version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_version.rc [iso-8859-1] Sat Feb 25 19:02:49 2012 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "version.h" +#include "shell32_version.h" #define WINE_OLESELFREGISTER #define WINE_FILEVERSION WINE_FILEVERSION_MAJOR,WINE_FILEVERSION_MINOR,WINE_FILEVERSION_BUILD,WINE_FILEVERSION_PLATFORMID

1 0

[akhaldi] 55859: [SHELL32] * Prefix the local version.h and version.rc with shell32_. * Include the rgs resource files in a portable way.
by akhaldi＠svn.reactos.org 25 Feb '12

25 Feb '12

Author: akhaldi Date: Sat Feb 25 18:52:16 2012 New Revision: 55859 URL: http://svn.reactos.org/svn/reactos?rev=55859&view=rev Log: [SHELL32] * Prefix the local version.h and version.rc with shell32_. * Include the rgs resource files in a portable way. Added: trunk/reactos/dll/win32/shell32/shell32_version.h - copied unchanged from r55853, trunk/reactos/dll/win32/shell32/version.h trunk/reactos/dll/win32/shell32/shell32_version.rc - copied unchanged from r55853, trunk/reactos/dll/win32/shell32/version.rc Removed: trunk/reactos/dll/win32/shell32/version.h trunk/reactos/dll/win32/shell32/version.rc Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc trunk/reactos/dll/win32/shell32/shell32_main.cpp Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rgs_res.… ============================================================================== --- trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] Sat Feb 25 18:52:16 2012 @@ -2,24 +2,24 @@ // // REGISTRY // -IDR_ADMINFOLDERSHORTCUT REGISTRY "res\\rgs\\adminfoldershortcut.rgs" -IDR_AUTOCOMPLETE REGISTRY "res\\rgs\\autocomplete.rgs" -IDR_CONTROLPANEL REGISTRY "res\\rgs\\controlpanel.rgs" -IDR_DRAGDROPHELPER REGISTRY "res\\rgs\\dragdrophelper.rgs" -IDR_FOLDEROPTIONS REGISTRY "res\\rgs\\folderoptions.rgs" -IDR_FOLDERSHORTCUT REGISTRY "res\\rgs\\foldershortcut.rgs" -IDR_FONTSFOLDERSHORTCUT REGISTRY "res\\rgs\\fontsfoldershortcut.rgs" -IDR_MENUBANDSITE REGISTRY "res\\rgs\\menubandsite.rgs" -IDR_MYCOMPUTER REGISTRY "res\\rgs\\mycomputer.rgs" -IDR_MYDOCUMENTS REGISTRY "res\\rgs\\mydocuments.rgs" -IDR_NETWORKPLACES REGISTRY "res\\rgs\\networkplaces.rgs" -IDR_NEWMENU REGISTRY "res\\rgs\\newmenu.rgs" -IDR_PRINTERS REGISTRY "res\\rgs\\printers.rgs" -IDR_RECYCLEBIN REGISTRY "res\\rgs\\recyclebin.rgs" -IDR_SHELLDESKTOP REGISTRY "res\\rgs\\shelldesktop.rgs" -IDR_SHELLFSFOLDER REGISTRY "res\\rgs\\shellfsfolder.rgs" -IDR_SHELLLINK REGISTRY "res\\rgs\\shelllink.rgs" -IDR_STARTMENU REGISTRY "res\\rgs\\startmenu.rgs" -IDR_OPENWITHMENU REGISTRY "res\\rgs\\openwithmenu.rgs" -IDR_FILEDEFEXT REGISTRY "res\\rgs\\shellfiledefext.rgs" -IDR_DRVDEFEXT REGISTRY "res\\rgs\\shelldrvdefext.rgs" +IDR_ADMINFOLDERSHORTCUT REGISTRY "res/rgs/adminfoldershortcut.rgs" +IDR_AUTOCOMPLETE REGISTRY "res/rgs/autocomplete.rgs" +IDR_CONTROLPANEL REGISTRY "res/rgs/controlpanel.rgs" +IDR_DRAGDROPHELPER REGISTRY "res/rgs/dragdrophelper.rgs" +IDR_FOLDEROPTIONS REGISTRY "res/rgs/folderoptions.rgs" +IDR_FOLDERSHORTCUT REGISTRY "res/rgs/foldershortcut.rgs" +IDR_FONTSFOLDERSHORTCUT REGISTRY "res/rgs/fontsfoldershortcut.rgs" +IDR_MENUBANDSITE REGISTRY "res/rgs/menubandsite.rgs" +IDR_MYCOMPUTER REGISTRY "res/rgs/mycomputer.rgs" +IDR_MYDOCUMENTS REGISTRY "res/rgs/mydocuments.rgs" +IDR_NETWORKPLACES REGISTRY "res/rgs/networkplaces.rgs" +IDR_NEWMENU REGISTRY "res/rgs/newmenu.rgs" +IDR_PRINTERS REGISTRY "res/rgs/printers.rgs" +IDR_RECYCLEBIN REGISTRY "res/rgs/recyclebin.rgs" +IDR_SHELLDESKTOP REGISTRY "res/rgs/shelldesktop.rgs" +IDR_SHELLFSFOLDER REGISTRY "res/rgs/shellfsfolder.rgs" +IDR_SHELLLINK REGISTRY "res/rgs/shelllink.rgs" +IDR_STARTMENU REGISTRY "res/rgs/startmenu.rgs" +IDR_OPENWITHMENU REGISTRY "res/rgs/openwithmenu.rgs" +IDR_FILEDEFEXT REGISTRY "res/rgs/shellfiledefext.rgs" +IDR_DRVDEFEXT REGISTRY "res/rgs/shelldrvdefext.rgs" Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sat Feb 25 18:52:16 2012 @@ -20,7 +20,7 @@ */ #include <precomp.h> -#include "version.h" +#include "shell32_version.h" #include <reactos/version.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); Removed: trunk/reactos/dll/win32/shell32/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/version.… ============================================================================== --- trunk/reactos/dll/win32/shell32/version.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/version.h (removed) @@ -1,28 +1,0 @@ -/* - * Shared Resource/DllGetVersion version information - * - * Copyright (C) 2004 Robert Shearman - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#define WINE_FILEVERSION_MAJOR 5 -#define WINE_FILEVERSION_MINOR 0 -#define WINE_FILEVERSION_BUILD 3900 -#define WINE_FILEVERSION_PLATFORMID 6975 - -/* FIXME: when libs/wpp gets fixed to support concatenation we can remove - * this and define it in version.rc */ -#define WINE_FILEVERSION_STR "5.0.3900.6975" Removed: trunk/reactos/dll/win32/shell32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/version.… ============================================================================== --- trunk/reactos/dll/win32/shell32/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/version.rc (removed) @@ -1,27 +1,0 @@ -/* - * version information for shell32.dll - * - * Copyright (C) 2003 John K. Hohm - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "version.h" - -#define WINE_OLESELFREGISTER -#define WINE_FILEVERSION WINE_FILEVERSION_MAJOR,WINE_FILEVERSION_MINOR,WINE_FILEVERSION_BUILD,WINE_FILEVERSION_PLATFORMID -#define WINE_FILENAME_STR "shell32.dll" - -#include <wine/wine_common_ver.rc>

1 0

[sir_richard] 55858: [NTOS]: Compute the size of, and allocate, the Pool Tracker Table and the Big Page Tracker Table, which are the core data structures that make pool tagging functionality work.
by sir_richard＠svn.reactos.org 25 Feb '12

25 Feb '12

Author: sir_richard Date: Sat Feb 25 18:51:21 2012 New Revision: 55858 URL: http://svn.reactos.org/svn/reactos?rev=55858&view=rev Log: [NTOS]: Compute the size of, and allocate, the Pool Tracker Table and the Big Page Tracker Table, which are the core data structures that make pool tagging functionality work. Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sat Feb 25 18:51:21 2012 @@ -24,8 +24,11 @@ POOL_DESCRIPTOR NonPagedPoolDescriptor; PPOOL_DESCRIPTOR ExpPagedPoolDescriptor[16 + 1]; PPOOL_DESCRIPTOR PoolVector[2]; -PVOID PoolTrackTable; PKGUARDED_MUTEX ExpPagedPoolMutex; +SIZE_T PoolTrackTableSize, PoolTrackTableMask; +SIZE_T PoolBigPageTableSize, PoolBigPageTableHash; +PPOOL_TRACKER_TABLE PoolTrackTable, PoolBigPageTable; +KSPIN_LOCK ExpTaggedPoolLock; /* Pool block/header/list access macros */ #define POOL_ENTRY(x) (PPOOL_HEADER)((ULONG_PTR)(x) - sizeof(POOL_HEADER)) @@ -329,6 +332,11 @@ ExpInitializePoolListHead(NextEntry); NextEntry++; } + + // + // Note that ReactOS does not support Session Pool Yet + // + ASSERT(PoolType != PagedPoolSession); } VOID @@ -338,12 +346,178 @@ IN ULONG Threshold) { PPOOL_DESCRIPTOR Descriptor; + SIZE_T TableSize; + ULONG i; // // Check what kind of pool this is // if (PoolType == NonPagedPool) { + // + // Compute the track table size and convert it from a power of two to an + // actual byte size + // + // NOTE: On checked builds, we'll assert if the registry table size was + // invalid, while on retail builds we'll just break out of the loop at + // that point. + // + TableSize = min(PoolTrackTableSize, MmSizeOfNonPagedPoolInBytes >> 8); + for (i = 0; i < 32; i++) + { + if (TableSize & 1) + { + ASSERT((TableSize & ~1) == 0); + if (!(TableSize & ~1)) break; + } + TableSize >>= 1; + } + + // + // If we hit bit 32, than no size was defined in the registry, so + // we'll use the default size of 2048 entries. + // + // Otherwise, use the size from the registry, as long as it's not + // smaller than 64 entries. + // + if (i == 32) + { + PoolTrackTableSize = 2048; + } + else + { + PoolTrackTableSize = max(1 << i, 64); + } + + // + // Loop trying with the biggest specified size first, and cut it down + // by a power of two each iteration in case not enough memory exist + // + while (TRUE) + { + // + // Do not allow overflow + // + if ((PoolTrackTableSize + 1) > (MAXULONG_PTR / sizeof(POOL_TRACKER_TABLE))) + { + PoolTrackTableSize >>= 1; + continue; + } + + // + // Allocate the tracker table and exit the loop if this worked + // + PoolTrackTable = MiAllocatePoolPages(NonPagedPool, + (PoolTrackTableSize + 1) * + sizeof(POOL_TRACKER_TABLE)); + if (PoolTrackTable) break; + + // + // Otherwise, as long as we're not down to the last bit, keep + // iterating + // + if (PoolTrackTableSize == 1) + { + KeBugCheckEx(MUST_SUCCEED_POOL_EMPTY, + TableSize, + 0xFFFFFFFF, + 0xFFFFFFFF, + 0xFFFFFFFF); + } + PoolTrackTableSize >>= 1; + } + + // + // Finally, add one entry, compute the hash, and zero the table + // + PoolTrackTableSize++; + PoolTrackTableMask = PoolTrackTableSize - 2; + + RtlZeroMemory(PoolTrackTable, + PoolTrackTableSize * sizeof(POOL_TRACKER_TABLE)); + + // + // We now do the exact same thing with the tracker table for big pages + // + TableSize = min(PoolBigPageTableSize, MmSizeOfNonPagedPoolInBytes >> 8); + for (i = 0; i < 32; i++) + { + if (TableSize & 1) + { + ASSERT((TableSize & ~1) == 0); + if (!(TableSize & ~1)) break; + } + TableSize >>= 1; + } + + // + // For big pages, the default tracker table is 4096 entries, while the + // minimum is still 64 + // + if (i == 32) + { + PoolBigPageTableSize = 4096; + } + else + { + PoolBigPageTableSize = max(1 << i, 64); + } + + // + // Again, run the exact same loop we ran earlier, but this time for the + // big pool tracker instead + // + while (TRUE) + { + if ((PoolBigPageTableSize + 1) > (MAXULONG_PTR / sizeof(POOL_TRACKER_BIG_PAGES))) + { + PoolBigPageTableSize >>= 1; + continue; + } + + PoolBigPageTable = MiAllocatePoolPages(NonPagedPool, + PoolBigPageTableSize * + sizeof(POOL_TRACKER_BIG_PAGES)); + if (PoolBigPageTable) break; + + if (PoolBigPageTableSize == 1) + { + KeBugCheckEx(MUST_SUCCEED_POOL_EMPTY, + TableSize, + 0xFFFFFFFF, + 0xFFFFFFFF, + 0xFFFFFFFF); + } + + PoolBigPageTableSize >>= 1; + } + + // + // An extra entry is not needed for for the big pool tracker, so just + // compute the hash and zero it + // + PoolBigPageTableHash = PoolBigPageTableSize - 1; + RtlZeroMemory(PoolBigPageTable, + PoolBigPageTableSize * sizeof(POOL_TRACKER_BIG_PAGES)); + + // + // During development, print this out so we can see what's happening + // + DPRINT1("EXPOOL: Pool Tracker Table at: 0x%p with 0x%lx bytes\n", + PoolTrackTable, PoolTrackTableSize * sizeof(POOL_TRACKER_TABLE)); + DPRINT1("EXPOOL: Big Pool Tracker Table at: 0x%p with 0x%lx bytes\n", + PoolBigPageTable, PoolBigPageTableSize * sizeof(POOL_TRACKER_BIG_PAGES)); + + // + // No support for NUMA systems at this time + // + ASSERT(KeNumberNodes == 1); + + // + // Initialize the tag spinlock + // + KeInitializeSpinLock(&ExpTaggedPoolLock); + // // Initialize the nonpaged pool descriptor // @@ -356,6 +530,11 @@ } else { + // + // No support for NUMA systems at this time + // + ASSERT(KeNumberNodes == 1); + // // Allocate the pool descriptor // Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Feb 25 18:51:21 2012 @@ -345,10 +345,29 @@ C_ASSERT(sizeof(POOL_HEADER) == POOL_BLOCK_SIZE); C_ASSERT(POOL_BLOCK_SIZE == sizeof(LIST_ENTRY)); +typedef struct _POOL_TRACKER_TABLE +{ + ULONG Key; + ULONG NonPagedAllocs; + ULONG NonPagedFrees; + SIZE_T NonPagedBytes; + ULONG PagedAllocs; + ULONG PagedFrees; + SIZE_T PagedBytes; +} POOL_TRACKER_TABLE, *PPOOL_TRACKER_TABLE; + +typedef struct _POOL_TRACKER_BIG_PAGES +{ + PVOID Va; + ULONG Key; + ULONG NumberOfPages; + PVOID QuotaObject; +} POOL_TRACKER_BIG_PAGES, *PPOOL_TRACKER_BIG_PAGES; + extern ULONG ExpNumberOfPagedPools; extern POOL_DESCRIPTOR NonPagedPoolDescriptor; extern PPOOL_DESCRIPTOR ExpPagedPoolDescriptor[16 + 1]; -extern PVOID PoolTrackTable; +extern PPOOL_TRACKER_TABLE PoolTrackTable; // // END FIXFIX

1 0

[gadamopoulos] 55857: [win32k] - null terminate DesktopObject->pDeskInfo->szDesktopName and WindowStationObject->Name - null terminate the buffer when NtUserGetObjectInformation is called with UOI_...
by gadamopoulos＠svn.reactos.org 25 Feb '12

25 Feb '12

Author: gadamopoulos Date: Sat Feb 25 18:26:05 2012 New Revision: 55857 URL: http://svn.reactos.org/svn/reactos?rev=55857&view=rev Log: [win32k] - null terminate DesktopObject->pDeskInfo->szDesktopName and WindowStationObject->Name - null terminate the buffer when NtUserGetObjectInformation is called with UOI_NAME parameter - should fix a random failure in user32:desktop tests Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sat Feb 25 18:26:05 2012 @@ -845,7 +845,7 @@ { ProbeForRead( ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), 1); - Status = IntSafeCopyUnicodeString(&DesktopName, ObjectAttributes->ObjectName); + Status = IntSafeCopyUnicodeStringTerminateNULL(&DesktopName, ObjectAttributes->ObjectName); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -886,7 +886,7 @@ RETURN(NULL); } - DesktopInfoSize = sizeof(DESKTOPINFO) + DesktopName.Length; + DesktopInfoSize = sizeof(DESKTOPINFO) + DesktopName.Length + sizeof(WCHAR); DesktopObject->pDeskInfo = RtlAllocateHeap(DesktopObject->pheapDesktop, HEAP_NO_SERIALIZE, @@ -906,7 +906,7 @@ DesktopObject->pDeskInfo->pvDesktopLimit = (PVOID)((ULONG_PTR)DesktopHeapSystemBase + HeapSize); RtlCopyMemory(DesktopObject->pDeskInfo->szDesktopName, DesktopName.Buffer, - DesktopName.Length); + DesktopName.Length + sizeof(WCHAR)); /* Initialize some local (to win32k) desktop state. */ InitializeListHead(&DesktopObject->PtiList); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Sat Feb 25 18:26:05 2012 @@ -364,7 +364,7 @@ _SEH2_TRY { ProbeForRead( ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), 1); - Status = IntSafeCopyUnicodeString(&WindowStationName, ObjectAttributes->ObjectName); + Status = IntSafeCopyUnicodeStringTerminateNULL(&WindowStationName, ObjectAttributes->ObjectName); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -653,14 +653,14 @@ case UOI_NAME: if (WinStaObject != NULL) { - pvData = ((PUNICODE_STRING)GET_DESKTOP_NAME(WinStaObject))->Buffer; - nDataSize = ((PUNICODE_STRING)GET_DESKTOP_NAME(WinStaObject))->Length + 2; + pvData = WinStaObject->Name.Buffer; + nDataSize = WinStaObject->Name.Length + sizeof(WCHAR); Status = STATUS_SUCCESS; } else if (DesktopObject != NULL) { - pvData = ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Buffer; - nDataSize = ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Length + 2; + pvData = DesktopObject->pDeskInfo->szDesktopName; + nDataSize = (wcslen(DesktopObject->pDeskInfo->szDesktopName) + 1) * sizeof(WCHAR); Status = STATUS_SUCCESS; } else @@ -671,13 +671,13 @@ if (WinStaObject != NULL) { pvData = L"WindowStation"; - nDataSize = (wcslen(pvData) + 1) * sizeof(WCHAR); + nDataSize = sizeof(L"WindowStation"); Status = STATUS_SUCCESS; } else if (DesktopObject != NULL) { pvData = L"Desktop"; - nDataSize = (wcslen(pvData) + 1) * sizeof(WCHAR); + nDataSize = sizeof(L"Desktop"); Status = STATUS_SUCCESS; } else

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