Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 50452: [NPFS] Initialize only the required parts of the return buffer. This will enable the driver to return information about multiple pipes in a single request.
by ekohl＠svn.reactos.org 20 Jan '11

20 Jan '11

Author: ekohl Date: Thu Jan 20 21:48:06 2011 New Revision: 50452 URL: http://svn.reactos.org/svn/reactos?rev=50452&view=rev Log: [NPFS] Initialize only the required parts of the return buffer. This will enable the driver to return information about multiple pipes in a single request. Modified: trunk/reactos/drivers/filesystems/npfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/npfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] Thu Jan 20 21:48:06 2011 @@ -37,6 +37,7 @@ PFILE_DIRECTORY_INFORMATION DirectoryBuffer; PFILE_FULL_DIR_INFORMATION FullDirBuffer; PFILE_BOTH_DIR_INFORMATION BothDirBuffer; + ULONG InfoSize = 0; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -109,11 +110,36 @@ DPRINT("Buffer = %p tofind = %wZ\n", Buffer, &Ccb->u.Directory.SearchPattern); + switch (FileInformationClass) + { + case FileDirectoryInformation: + InfoSize = sizeof(FILE_DIRECTORY_INFORMATION) - sizeof(WCHAR); + break; + + case FileFullDirectoryInformation: + InfoSize = sizeof(FILE_FULL_DIR_INFORMATION) - sizeof(WCHAR); + break; + + case FileBothDirectoryInformation: + InfoSize = sizeof(FILE_BOTH_DIR_INFORMATION) - sizeof(WCHAR); + break; + + case FileNamesInformation: + InfoSize = sizeof(FILE_NAMES_INFORMATION) - sizeof(WCHAR); + break; + + default: + DPRINT1("Invalid information class: %lu\n", FileInformationClass); + return STATUS_INVALID_INFO_CLASS; + } + PipeIndex = 0; Vcb = Ccb->Fcb->Vcb; CurrentEntry = Vcb->PipeListHead.Flink; - while (CurrentEntry != &Vcb->PipeListHead && Found == FALSE) + while (CurrentEntry != &Vcb->PipeListHead && + Found == FALSE && + Status == STATUS_SUCCESS) { /* Get the FCB of the next pipe */ PipeFcb = CONTAINING_RECORD(CurrentEntry, @@ -134,7 +160,7 @@ if (PipeIndex >= FileIndex) { - RtlZeroMemory(Buffer, BufferLength); + RtlZeroMemory(Buffer, InfoSize); switch (FileInformationClass) { @@ -149,7 +175,7 @@ RtlCopyMemory(DirectoryBuffer->FileName, PipeFcb->PipeName.Buffer, PipeFcb->PipeName.Length); - *Size = sizeof(FILE_DIRECTORY_INFORMATION) + PipeFcb->PipeName.Length - sizeof(WCHAR); + *Size = InfoSize + PipeFcb->PipeName.Length; Status = STATUS_SUCCESS; break; @@ -164,7 +190,7 @@ RtlCopyMemory(FullDirBuffer->FileName, PipeFcb->PipeName.Buffer, PipeFcb->PipeName.Length); - *Size = sizeof(FILE_FULL_DIR_INFORMATION) + PipeFcb->PipeName.Length - sizeof(WCHAR); + *Size = InfoSize + PipeFcb->PipeName.Length; Status = STATUS_SUCCESS; break; @@ -179,7 +205,7 @@ RtlCopyMemory(BothDirBuffer->FileName, PipeFcb->PipeName.Buffer, PipeFcb->PipeName.Length); - *Size = sizeof(FILE_BOTH_DIR_INFORMATION) + PipeFcb->PipeName.Length - sizeof(WCHAR); + *Size = InfoSize + PipeFcb->PipeName.Length; Status = STATUS_SUCCESS; break; @@ -191,7 +217,7 @@ RtlCopyMemory(NamesBuffer->FileName, PipeFcb->PipeName.Buffer, PipeFcb->PipeName.Length); - *Size = sizeof(FILE_NAMES_INFORMATION) + PipeFcb->PipeName.Length - sizeof(WCHAR); + *Size = InfoSize + PipeFcb->PipeName.Length; Status = STATUS_SUCCESS; break;

1 0

[fireball] 50451: - Allow size change for a minimized window. This fixes the famous "unable to restore a minimized window" bug. Now you can freely minimize/maximize windows using taskbar as you wou...
by fireball＠svn.reactos.org 20 Jan '11

20 Jan '11

Author: fireball Date: Thu Jan 20 21:36:07 2011 New Revision: 50451 URL: http://svn.reactos.org/svn/reactos?rev=50451&view=rev Log: - Allow size change for a minimized window. This fixes the famous "unable to restore a minimized window" bug. Now you can freely minimize/maximize windows using taskbar as you would usually do in trunk/windows. Modified: branches/arwinss/reactos/dll/win32/winent.drv/window.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] Thu Jan 20 21:36:07 2011 @@ -319,8 +319,6 @@ LONG width, height; LONG x, y; - if (data->iconic) return; - SwmPosChanged(data->whole_window, &data->whole_rect, old_whole_rect, NULL, swp_flags); width = data->whole_rect.right - data->whole_rect.left; @@ -862,9 +860,6 @@ if ((new_style & WS_VISIBLE) && ((new_style & WS_MINIMIZE) || is_window_rect_mapped( window_rect ))) { - //if (!data->mapped || (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED))) - //set_wm_hints( display, data ); - if (!data->mapped) { map_window( data, new_style ); @@ -872,11 +867,7 @@ else if ((swp_flags & SWP_STATECHANGED) && (!data->iconic != !(new_style & WS_MINIMIZE))) { data->iconic = (new_style & WS_MINIMIZE) != 0; - FIXME( "changing win %p iconic state to %u\n", data->hwnd, data->iconic ); - //if (data->iconic) - // XIconifyWindow( display, data->whole_window, DefaultScreen(display) ); - //else if (is_window_rect_mapped( rectWindow )) - // XMapWindow( display, data->whole_window ); + TRACE( "changing win %p iconic state to %u\n", data->hwnd, data->iconic ); } } }

1 0

[tkreuzer] 50450: [ROSSYM] The function dexec uses the varable p only in one location where its checked against nil, It neither initialized, not used anywhere else. This is probably a typo and b->p...
by tkreuzer＠svn.reactos.org 20 Jan '11

20 Jan '11

Author: tkreuzer Date: Thu Jan 20 15:39:55 2011 New Revision: 50450 URL: http://svn.reactos.org/svn/reactos?rev=50450&view=rev Log: [ROSSYM] The function dexec uses the varable p only in one location where its checked against nil, It neither initialized, not used anywhere else. This is probably a typo and b->p was meant. Yes I'm completely guessing, but this code doesn't give any other chance then guessing and it will probably not be worse then using an uninitialized variable... @original author: please review. Modified: branches/cmake-bringup/lib/rossym/dwarfcfa.c Modified: branches/cmake-bringup/lib/rossym/dwarfcfa.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfc… ============================================================================== --- branches/cmake-bringup/lib/rossym/dwarfcfa.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/dwarfcfa.c [iso-8859-1] Thu Jan 20 15:39:55 2011 @@ -1,11 +1,11 @@ /* * Dwarf call frame unwinding. * - * The call frame unwinding values are encoded using a state machine - * like the pc<->line mapping, but it's a different machine. - * The expressions to generate the old values are similar in function to the + * The call frame unwinding values are encoded using a state machine + * like the pc<->line mapping, but it's a different machine. + * The expressions to generate the old values are similar in function to the * ``dwarf expressions'' used for locations in the code, but of course not - * the same encoding. + * the same encoding. */ #define NTOSAPI @@ -103,7 +103,7 @@ /* * XXX This turns out to be much more expensive than the actual * running of the machine in dexec. It probably makes sense to - * cache the last 10 or so fde's we've found, since stack traces + * cache the last 10 or so fde's we've found, since stack traces * will keep asking for the same info over and over. */ static int @@ -173,7 +173,7 @@ } werrstr("cannot find call frame information for pc 0x%lux", pc); return -1; - + } static int @@ -191,7 +191,7 @@ { int c; long arg1, arg2; - DwarfExpr *e, **p; + DwarfExpr *e; for(;;){ if(b->p == b->ep){ @@ -215,7 +215,7 @@ if(locstop) return 0; continue; - + case 2: /* offset rule */ arg1 = c&0x3F; arg2 = dwarfget128(b); @@ -310,7 +310,7 @@ free(e); return -1; } - if(p == nil){ + if(b->p == nil){ free(e); return -1; } @@ -342,12 +342,12 @@ s->cfa->offset = arg2; continue; - case 0x0D: /* def cfa register */ + case 0x0D: /* def cfa register */ arg1 = dwarfget128(b); if(trace) werrstr("cfa reg r%ld\n", arg1); if(s->cfa->type != RuleRegOff){ werrstr("change CFA register but CFA not in register+offset form"); - return -1; + return -1; } if(checkreg(s, arg1) < 0) return -1; @@ -401,7 +401,7 @@ return -1; } } - /* not reached */ + /* not reached */ }

1 0

[tkreuzer] 50449: [CMAKE] Disable format warnings for winetest_ok
by tkreuzer＠svn.reactos.org 20 Jan '11

20 Jan '11

Author: tkreuzer Date: Thu Jan 20 14:30:15 2011 New Revision: 50449 URL: http://svn.reactos.org/svn/reactos?rev=50449&view=rev Log: [CMAKE] Disable format warnings for winetest_ok Modified: branches/cmake-bringup/include/reactos/wine/test.h Modified: branches/cmake-bringup/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/test.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/test.h [iso-8859-1] Thu Jan 20 14:30:15 2011 @@ -96,7 +96,7 @@ #ifdef __GNUC__ -extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); +extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ); extern void __winetest_cdecl winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2)));

1 0

[tkreuzer] 50448: [CMAKE] cast some fprintf parameters explicitly to the required type to fix warnings.
by tkreuzer＠svn.reactos.org 20 Jan '11

20 Jan '11

Author: tkreuzer Date: Thu Jan 20 12:53:47 2011 New Revision: 50448 URL: http://svn.reactos.org/svn/reactos?rev=50448&view=rev Log: [CMAKE] cast some fprintf parameters explicitly to the required type to fix warnings. Modified: branches/cmake-bringup/include/reactos/wine/test.h Modified: branches/cmake-bringup/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/test.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/test.h [iso-8859-1] Thu Jan 20 12:53:47 2011 @@ -558,10 +558,10 @@ if (winetest_debug) { fprintf( stdout, "%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - test->name, (int)successes + failures + todo_successes + todo_failures, - (int)todo_successes, (int)failures + todo_failures, + test->name, (int)(successes + failures + todo_successes + todo_failures), + (int)todo_successes, (int)(failures + todo_failures), (failures + todo_failures != 1) ? "failures" : "failure", - skipped ); + (int)skipped ); } status = (failures + todo_failures < 255) ? failures + todo_failures : 255; return status;

1 0

[tkreuzer] 50447: [CMAKE] Define __ROS_LONG64__ for all winetests
by tkreuzer＠svn.reactos.org 20 Jan '11

20 Jan '11

Author: tkreuzer Date: Thu Jan 20 12:52:41 2011 New Revision: 50447 URL: http://svn.reactos.org/svn/reactos?rev=50447&view=rev Log: [CMAKE] Define __ROS_LONG64__ for all winetests Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Thu Jan 20 12:52:41 2011 @@ -1,3 +1,5 @@ + +add_definitions(-D__ROS_LONG64__) add_subdirectory(advapi32) add_subdirectory(advpack)

1 0

[fireball] 50446: - Maarten Kroese: Properly hide minimized top level windows. Fixes bug 5207.
by fireball＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: fireball Date: Wed Jan 19 21:42:46 2011 New Revision: 50446 URL: http://svn.reactos.org/svn/reactos?rev=50446&view=rev Log: - Maarten Kroese: Properly hide minimized top level windows. Fixes bug 5207. Modified: branches/arwinss/reactos/dll/win32/user32/winpos.c Modified: branches/arwinss/reactos/dll/win32/user32/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/winpos.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/winpos.c [iso-8859-1] Wed Jan 19 21:42:46 2011 @@ -822,6 +822,13 @@ int xspacing, yspacing; parent = GetAncestor( hwnd, GA_PARENT ); + if (parent == GetDesktopWindow()) + { + /* ReactOS doesn't support iconic minimize to desktop */ + pt.x = pt.y = -32000; + return pt; + } + GetClientRect( parent, &rectParent ); if ((pt.x >= rectParent.left) && (pt.x + GetSystemMetrics(SM_CXICON) < rectParent.right) && (pt.y >= rectParent.top) && (pt.y + GetSystemMetrics(SM_CYICON) < rectParent.bottom))

1 0

[fireball] 50445: - Maarten Kroese: Fix SM_CX/YMAXIMIZED calculation too.
by fireball＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: fireball Date: Wed Jan 19 20:00:10 2011 New Revision: 50445 URL: http://svn.reactos.org/svn/reactos?rev=50445&view=rev Log: - Maarten Kroese: Fix SM_CX/YMAXIMIZED calculation too. Modified: branches/arwinss/reactos/dll/win32/user32/sysparams.c Modified: branches/arwinss/reactos/dll/win32/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] Wed Jan 19 20:00:10 2011 @@ -2679,12 +2679,8 @@ case SM_CYMENU: return GetSystemMetrics(SM_CYMENUSIZE) + 1; case SM_CXFULLSCREEN: - /* see the remark for SM_CXMAXIMIZED, at least this formulation is - * correct */ return GetSystemMetrics( SM_CXMAXIMIZED) - 2 * GetSystemMetrics( SM_CXFRAME); case SM_CYFULLSCREEN: - /* see the remark for SM_CYMAXIMIZED, at least this formulation is - * correct */ return GetSystemMetrics( SM_CYMAXIMIZED) - GetSystemMetrics( SM_CYMIN); case SM_CYKANJIWINDOW: return 0; @@ -2799,11 +2795,17 @@ case SM_CYMAXTRACK: return GetSystemMetrics(SM_CYVIRTUALSCREEN) + 4 + 2 * GetSystemMetrics(SM_CYFRAME); case SM_CXMAXIMIZED: - /* FIXME: subtract the width of any vertical application toolbars*/ - return GetSystemMetrics(SM_CXSCREEN) + 2 * GetSystemMetrics(SM_CXFRAME); + { + RECT workarea; + SystemParametersInfoW(SPI_GETWORKAREA, 0, &workarea, 0); + return workarea.right - workarea.left; + } case SM_CYMAXIMIZED: - /* FIXME: subtract the width of any horizontal application toolbars*/ - return GetSystemMetrics(SM_CYSCREEN) + 2 * GetSystemMetrics(SM_CYCAPTION); + { + RECT workarea; + SystemParametersInfoW(SPI_GETWORKAREA, 0, &workarea, 0); + return workarea.bottom - workarea.top; + } case SM_NETWORK: return 3; /* FIXME */ case SM_CLEANBOOT:

1 0

[akhaldi] 50444: [CMAKE] - Revert r50441. Please note that the recent revisions around this define are for testing.
by akhaldi＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: akhaldi Date: Wed Jan 19 19:01:37 2011 New Revision: 50444 URL: http://svn.reactos.org/svn/reactos?rev=50444&view=rev Log: [CMAKE] - Revert r50441. Please note that the recent revisions around this define are for testing. Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Wed Jan 19 19:01:37 2011 @@ -1,5 +1,3 @@ - -add_definitions(-D__WINESRC__) add_subdirectory(advapi32) add_subdirectory(advpack)

1 0

[tkreuzer] 50443: [GDI32] Fix broken portable implementation of _lrintf, 2nd try :)
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 18:10:50 2011 New Revision: 50443 URL: http://svn.reactos.org/svn/reactos?rev=50443&view=rev Log: [GDI32] Fix broken portable implementation of _lrintf, 2nd try :) Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Wed Jan 19 18:10:50 2011 @@ -413,7 +413,7 @@ } #else /* slow, but portable */ - return (int)(x >= 0 ? x+0.5 : x-0.5); + return (int)(f >= 0 ? f+0.5 : f-0.5); #endif }

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