Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[greatlrd] 27676: add ignore *.vcproj
by greatlrd＠svn.reactos.org 15 Jul '07

15 Jul '07

Author: greatlrd Date: Sun Jul 15 16:04:41 2007 New Revision: 27676 URL: http://svn.reactos.org/svn/reactos?rev=27676&view=rev Log: add ignore *.vcproj Modified: trunk/reactos/dll/directx/ (props changed) trunk/reactos/dll/directx/d3d8/ (props changed) trunk/reactos/dll/directx/d3d8thk/ (props changed) trunk/reactos/dll/directx/d3d9/ (props changed) trunk/reactos/dll/directx/ddraw/ (props changed) trunk/reactos/dll/directx/ddraw/Clipper/ (props changed) trunk/reactos/dll/directx/ddraw/Color/ (props changed) trunk/reactos/dll/directx/ddraw/Ddraw/ (props changed) trunk/reactos/dll/directx/ddraw/Gamma/ (props changed) trunk/reactos/dll/directx/ddraw/Kernel/ (props changed) trunk/reactos/dll/directx/ddraw/Palette/ (props changed) trunk/reactos/dll/directx/ddraw/Surface/ (props changed) trunk/reactos/dll/directx/ddraw/Videoport/ (props changed) trunk/reactos/dll/directx/ddraw/Vtable/ (props changed) trunk/reactos/dll/directx/ddraw/thunks/ (props changed) trunk/reactos/dll/directx/devenum/ (props changed) trunk/reactos/dll/directx/dinput/ (props changed) trunk/reactos/dll/directx/dinput8/ (props changed) trunk/reactos/dll/directx/dplay/ (props changed) trunk/reactos/dll/directx/dplayx/ (props changed) trunk/reactos/dll/directx/dsound/ (props changed) trunk/reactos/dll/directx/dsound/dxroslayer/ (props changed) trunk/reactos/dll/directx/dsound/tests/ (props changed) trunk/reactos/dll/directx/dxdiagn/ (props changed) Propchange: trunk/reactos/dll/directx/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/d3d8/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/d3d8thk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,13 +1,1 @@ -temp.exp -*.a -*.o -*.bin -*.dll -*.lib -*.coff -*.sym -*.tmp -*.map -GNUmakefile *.vcproj -*.user Propchange: trunk/reactos/dll/directx/d3d9/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/ddraw/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,3 +1,1 @@ -GNUmakefile *.vcproj -*.user Propchange: trunk/reactos/dll/directx/ddraw/Clipper/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/ddraw/Color/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/ddraw/Gamma/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/ddraw/Kernel/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/ddraw/Palette/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/ddraw/Surface/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/ddraw/Videoport/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/ddraw/Vtable/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/ddraw/thunks/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/devenum/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,13 +1,1 @@ -*.coff -*.dll -*.d -*.a -*.o -*.sym -*.map -*.tmp -devenum.spec.def -devenum.stubs.c -GNUmakefile *.vcproj -*.user Propchange: trunk/reactos/dll/directx/dinput/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,16 +1,1 @@ -*.coff -*.dll -*.d -*.a -*.o -*.sym -*.map -*.tmp -*.spec.def -*.stubs.c -*.ico -*.bmp -*.cur -GNUmakefile *.vcproj -*.user Propchange: trunk/reactos/dll/directx/dinput8/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,16 +1,1 @@ -*.coff -*.dll -*.d -*.a -*.o -*.sym -*.map -*.tmp -*.spec.def -*.stubs.c -*.ico -*.bmp -*.cur -GNUmakefile *.vcproj -*.user Propchange: trunk/reactos/dll/directx/dplay/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,3 +1,1 @@ -GNUmakefile *.vcproj -*.user Propchange: trunk/reactos/dll/directx/dplayx/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,3 +1,1 @@ -GNUmakefile *.vcproj -*.user Propchange: trunk/reactos/dll/directx/dsound/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,13 +1,1 @@ -*.coff -*.dll -*.d -*.a -*.o -*.sym -*.map -*.tmp -dsound.spec.def -dsound.stubs.c -GNUmakefile *.vcproj -*.user Propchange: trunk/reactos/dll/directx/dsound/dxroslayer/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/dsound/tests/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/directx/dxdiagn/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Jul 15 16:04:41 2007 @@ -1,3 +1,1 @@ -GNUmakefile *.vcproj -*.user

1 0

[gedmurphy] 27675: fix the start menu icon to be the right way up
by gedmurphy＠svn.reactos.org 15 Jul '07

15 Jul '07

Author: gedmurphy Date: Sun Jul 15 15:57:52 2007 New Revision: 27675 URL: http://svn.reactos.org/svn/reactos?rev=27675&view=rev Log: fix the start menu icon to be the right way up Modified: trunk/reactos/dll/win32/shell32/res/icons/40.ico Modified: trunk/reactos/dll/win32/shell32/res/icons/40.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available.

1 0

[cfinck] 27674: Add a "shutdown" utility written by Frode Lillerud (frode AT enkelt DOT no), which is more compatible with the syntax of the Windows "shutdown" utility I applied the second patch of bug #2379 and made the following changes to it: - Removed the LocalFree line LocalFree can only be used if the memory is allocated with LocalAlloc. The memory doesn't need to be freed explicitly here. - Removed the "uncertain if this is needed. Do boolean struct members default to TRUE?" comment Indep
by cfinck＠svn.reactos.org 15 Jul '07

15 Jul '07

Author: cfinck Date: Sun Jul 15 15:15:27 2007 New Revision: 27674 URL: http://svn.reactos.org/svn/reactos?rev=27674&view=rev Log: Add a "shutdown" utility written by Frode Lillerud (frode AT enkelt DOT no), which is more compatible with the syntax of the Windows "shutdown" utility I applied the second patch of bug #2379 and made the following changes to it: - Removed the LocalFree line LocalFree can only be used if the memory is allocated with LocalAlloc. The memory doesn't need to be freed explicitly here. - Removed the "uncertain if this is needed. Do boolean struct members default to TRUE?" comment Independent of the value, this setting is needed here. - Removed a wrong 'exitOpts.shouldExit = TRUE;' in line 101. shouldExit was already set before and resetting it here to TRUE would also lead to TRUE if the user only sets opts.force, but not any of the other shutdown options. - Use a consistent indentation and coding style - Modified the Usage text a little bit, so all lines fit into console lines (max. 80 characters) See issue #2379 for more details. Modified: trunk/reactos/base/applications/shutdown/shutdown.c Modified: trunk/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/shutdown.c (original) +++ trunk/reactos/base/applications/shutdown/shutdown.c Sun Jul 15 15:15:27 2007 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS shutdown/logoff utility - * FILE: apps/utils/shutdown/shutdown.c + * FILE: base/application/shutdown/shutdown.c * PURPOSE: Initiate logoff, shutdown or reboot of the system */ @@ -9,162 +9,188 @@ #include <stdlib.h> #include <windows.h> #include <tchar.h> +#include <reason.h> //shutdown codes -static void -PrintUsage(LPCTSTR Cmd) -{ - _ftprintf(stderr, _T("usage: %s [action] [flag]\n"), Cmd); - _ftprintf(stderr, _T(" action = \"logoff\", \"reboot\", \"shutdown\" or \"poweroff\"\n")); - _ftprintf(stderr, _T(" flag = \"force\"\n")); +// Print information about which commandline arguments the program accepts. +static void PrintUsage() { + _tprintf("Usage: shutdown [-?] [-l | -s | -r] [-f]\n"); + _tprintf("\n No args or -?\t\tDisplay this message"); + _tprintf("\n -l\t\t\tLog off"); + _tprintf("\n -s\t\t\tShutdown the computer"); + _tprintf("\n -r\t\t\tShutdown and restart the computer"); + _tprintf("\n -f\t\t\tForces running applications to close without warnings"); + _tprintf("\n"); } -int -_tmain(int argc, TCHAR *argv[]) +struct CommandLineOptions { + BOOL abort; // Not used yet + BOOL force; + BOOL logoff; + BOOL restart; + BOOL shutdown; +}; + +struct ExitOptions { + // This flag is used to distinguish between a user-initiated LOGOFF (which has value 0) + // and an underdetermined situation because user didn't give an argument to start Exit. + BOOL shouldExit; + // flags is the type of shutdown to do - EWX_LOGOFF, EWX_REBOOT, EWX_POWEROFF, etc.. + UINT flags; + // reason is the System Shutdown Reason code. F.instance SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED. + DWORD reason; +}; + +// Takes the commandline arguments, and creates a struct which matches the arguments supplied. +static struct CommandLineOptions ParseArguments(int argc, TCHAR *argv[]) { - static struct - { - TCHAR *Name; - UINT ExitType; - UINT ExitFlags; - } - Options[] = - { - { _T("logoff"), EWX_LOGOFF, 0 }, - { _T("logout"), EWX_LOGOFF, 0 }, - { _T("poweroff"), EWX_POWEROFF, 0 }, - { _T("powerdown"), EWX_POWEROFF, 0 }, - { _T("reboot"), EWX_REBOOT, 0 }, - { _T("restart"), EWX_REBOOT, 0 }, - { _T("shutdown"), EWX_SHUTDOWN, 0 }, - { _T("force"), 0, EWX_FORCE }, - { _T("forceifhung"), 0, EWX_FORCEIFHUNG }, - { _T("ifhung"), 0, EWX_FORCEIFHUNG }, - { _T("hung"), 0, EWX_FORCEIFHUNG }, - }; - UINT ExitType, ExitFlags; - HANDLE hToken; - TOKEN_PRIVILEGES npr; - TCHAR *Arg; - TCHAR BaseName[_MAX_FNAME]; - unsigned i, j; - BOOL HaveType, Matched; + struct CommandLineOptions opts; + int i; + + // Reset all flags in struct + opts.abort = FALSE; + opts.force = FALSE; + opts.logoff = FALSE; + opts.restart = FALSE; + opts.shutdown = FALSE; + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '-' || argv[i][0] == '/') + { + switch(argv[i][1]) { + case '?': PrintUsage(); exit(0); + case 'f': opts.force = TRUE; break; + case 'l': opts.logoff = TRUE; break; + case 'r': opts.restart = TRUE; break; + case 's': opts.shutdown = TRUE; break; + default: + // Unknown arguments will exit program. + PrintUsage(); + exit(0); + break; + } + } + } + + return opts; +} - ExitType = 0; - ExitFlags = 0; - HaveType = FALSE; +// Converts the commandline arguments to flags used to shutdown computer +static struct ExitOptions ParseCommandLineOptionsToExitOptions(struct CommandLineOptions opts) +{ + struct ExitOptions exitOpts; + exitOpts.shouldExit = TRUE; + + // Sets ONE of the exit type flags + if (opts.logoff) + exitOpts.flags = EWX_LOGOFF; + else if (opts.restart) + exitOpts.flags = EWX_REBOOT; + else if(opts.shutdown) + exitOpts.flags = EWX_POWEROFF; + else + { + exitOpts.flags = 0; + exitOpts.shouldExit = FALSE; + } + + // Sets additional flags + if (opts.force) + exitOpts.flags = exitOpts.flags | EWX_FORCE; + + // Reason for shutdown + // Hardcoded to "Other (Planned)" + exitOpts.reason = SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED; + + return exitOpts; +} - _tsplitpath(argv[0], NULL, NULL, BaseName, NULL); +// Writes the last error as both text and error code to the console. +void DisplayLastError() +{ + int errorCode = GetLastError(); + LPTSTR lpMsgBuf; + + // Display the error message to the user + FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + errorCode, + LANG_USER_DEFAULT, + (LPTSTR) &lpMsgBuf, + 0, + NULL); + + _ftprintf(stderr, lpMsgBuf); + _ftprintf(stderr, _T("Error code: %d\n"), errorCode); +} - /* Process optional arguments */ - for (i = 1; i < (unsigned) argc; i++) - { - /* Allow e.g. "/s" or "-l" for shutdown resp. logoff */ - Arg = argv[i]; - if (_T('/') == *Arg || _T('-') == *Arg) - { - Arg++; - } +void EnableShutdownPrivileges() +{ + HANDLE token; + TOKEN_PRIVILEGES privs; + + // Check to see if the choosen action is allowed by the user. Everyone can call LogOff, but only privilieged users can shutdown/restart etc. + if (! OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) + { + DisplayLastError(); + exit(1); + } + + // Get LUID (Locally Unique Identifier) for the privilege we need + if (!LookupPrivilegeValue( + NULL, // system - NULL is localsystem + SE_SHUTDOWN_NAME, // name of the privilege + &privs.Privileges[0].Luid) // output + ) + { + DisplayLastError(); + exit(1); + } + // and give our current process (i.e. shutdown.exe) the privilege to shutdown the machine. + privs.PrivilegeCount = 1; + privs.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + if (AdjustTokenPrivileges( + token, + FALSE, + &privs, + 0, + (PTOKEN_PRIVILEGES)NULL, // previous state. Set to NULL, we don't care about previous state. + NULL + ) == 0) // return value 0 means failure + { + DisplayLastError(); + exit(1); + } +} + + // Main entry for program +int _tmain(int argc, TCHAR *argv[]) +{ + struct CommandLineOptions opts; + struct ExitOptions exitOpts; + + if (argc == 1) // i.e. no commandline arguments given + { + PrintUsage(); + exit(0); + } - /* Search known options */ - Matched = FALSE; - for (j = 0; j < sizeof(Options) / sizeof(Options[0]) && ! Matched; j++) - { - /* Match if arg starts the same as the option name */ - if (0 == _tcsnicmp(Options[j].Name, Arg, _tcslen(Arg))) - { - if (0 == Options[j].ExitFlags) - { - /* Can have only 1 type */ - if (HaveType) - { - PrintUsage(BaseName); - exit(1); - } - ExitType = Options[j].ExitType; - HaveType = TRUE; - } - else - { - /* Can have only 1 flag */ - if (0 != ExitFlags) - { - PrintUsage(BaseName); - exit(1); - } - ExitFlags |= Options[j].ExitFlags; - } - Matched = TRUE; - } - } + opts = ParseArguments(argc, argv); + exitOpts = ParseCommandLineOptionsToExitOptions(opts); - /* Was the argument processed? */ - if (! Matched) - { - PrintUsage(BaseName); - exit(1); - } - } + // Perform the shutdown/restart etc. action + if (exitOpts.shouldExit) + { + EnableShutdownPrivileges(); + + if (!ExitWindowsEx(exitOpts.flags, exitOpts.reason)) + { + DisplayLastError(); + exit(1); + } + } + return 0; +} - /* Check command name if user didn't explicitly specify action */ - if (! HaveType) - { - for (j = 0; j < sizeof(Options) / sizeof(Options[0]); j++) - { - if (0 == _tcsicmp(Options[j].Name, BaseName) && 0 == Options[j].ExitFlags) - { - ExitType = Options[j].ExitType; - HaveType = TRUE; - } - } - } - - /* Still not sure what to do? */ - if (! HaveType) - { - PrintUsage(BaseName); - exit(1); - } - - /* Everyone can logoff, for the other actions you need the appropriate privilege */ - if (EWX_LOGOFF != ExitType) - { - /* enable shutdown privilege for current process */ - if (! OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) - { - _ftprintf(stderr, _T("OpenProcessToken failed with error %d\n"), (int) GetLastError()); - exit(1); - } - npr.PrivilegeCount = 1; - npr.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - if (! LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, &npr.Privileges[0].Luid)) - { - CloseHandle(hToken); - _ftprintf(stderr, _T("LookupPrivilegeValue failed with error %d\n"), (int) GetLastError()); - exit(1); - } - if (! AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0) - || ERROR_SUCCESS != GetLastError()) - { - if (ERROR_NOT_ALL_ASSIGNED == GetLastError()) - { - _ftprintf(stderr, _T("You are not authorized to shutdown the system\n")); - } - else - { - _ftprintf(stderr, _T("AdjustTokenPrivileges failed with error %d\n"), (int) GetLastError()); - } - CloseHandle(hToken); - exit(1); - } - CloseHandle(hToken); - } - - /* Finally do it */ - if (! ExitWindowsEx(ExitType | ExitFlags, 0)) - { - _ftprintf(stderr, _T("ExitWindowsEx failed with error %d\n"), (int) GetLastError()); - exit(1); - } - - return 0; -} +// EOF

1 0

[weiden] 27673: Finally get the fake (and broken by design) DOS device check to work
by weiden＠svn.reactos.org 15 Jul '07

15 Jul '07

Author: weiden Date: Sun Jul 15 12:33:49 2007 New Revision: 27673 URL: http://svn.reactos.org/svn/reactos?rev=27673&view=rev Log: Finally get the fake (and broken by design) DOS device check to work Modified: trunk/reactos/dll/win32/kernel32/file/find.c Modified: trunk/reactos/dll/win32/kernel32/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/find.c (original) +++ trunk/reactos/dll/win32/kernel32/file/find.c Sun Jul 15 12:33:49 2007 @@ -350,7 +350,7 @@ UNICODE_STRING NtPathU, FileName, PathFileName; NTSTATUS Status; PWSTR NtPathBuffer; - BOOLEAN RemovedSlash = FALSE; + BOOLEAN RemovedLastChar = FALSE; BOOL bResult; CURDIR DirInfo; ULONG DeviceNameInfo; @@ -406,13 +406,20 @@ } } - /* Remove a trailing backslash from the path, unless it's a DOS drive directly */ - if (NtPathU.Length > 3 * sizeof(WCHAR) && - NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 1] == L'\\' && + /* Remove the last character of the path (Unless the path is a drive and + ends with ":\"). If the caller however supplies a path to a device, such + as "C:\NUL" then the last character gets cut off, which later results in + NtOpenFile to return STATUS_OBJECT_NAME_NOT_FOUND, which in turn triggers + a fake DOS device check with RtlIsDosDeviceName_U. However, if there is a + real device with a name eg. "NU" in the system, FindFirstFile will succeed, + rendering the fake DOS device check useless... Why would they invent such a + stupid and broken behavior?! */ + if (NtPathU.Length >= 2 * sizeof(WCHAR) && + NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 1] != L'\\' && NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 2] != L':') { NtPathU.Length -= sizeof(WCHAR); - RemovedSlash = TRUE; + RemovedLastChar = TRUE; } DPRINT("lpFileName: \"%ws\"\n", lpFileName); @@ -433,10 +440,10 @@ FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); - if (!NT_SUCCESS(Status) && RemovedSlash) - { - /* Try again, this time with the trailing slash... */ - NtPathU.Length -= sizeof(WCHAR); + if (Status == STATUS_NOT_A_DIRECTORY && RemovedLastChar) + { + /* Try again, this time with the last character ... */ + NtPathU.Length += sizeof(WCHAR); Status = NtOpenFile (&hDirectory, FILE_LIST_DIRECTORY | SYNCHRONIZE, @@ -444,6 +451,8 @@ &IoStatusBlock, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); + + NtPathU.Length += sizeof(WCHAR); } if (!NT_SUCCESS(Status))

1 0

[tkreuzer] 27672: - fix IntValidateParent - validate Parent windows on moving pixels (both was fine earlier, but has been messed up recently) - move sending of WM_SIZE and WM_MOVE from co_WinPosShowWindow to co_WinPosSetWindowPos co_WinPosSetWindowPos: - instantly erase when drawing windows or exposing region - Invalidate child windows on BeginPaint This should fix most window redrawing bugs and also (hopefully) speed up the gui (less redrawing).
by tkreuzer＠svn.reactos.org 15 Jul '07

15 Jul '07

Author: tkreuzer Date: Sun Jul 15 07:30:03 2007 New Revision: 27672 URL: http://svn.reactos.org/svn/reactos?rev=27672&view=rev Log: - fix IntValidateParent - validate Parent windows on moving pixels (both was fine earlier, but has been messed up recently) - move sending of WM_SIZE and WM_MOVE from co_WinPosShowWindow to co_WinPosSetWindowPos co_WinPosSetWindowPos: - instantly erase when drawing windows or exposing region - Invalidate child windows on BeginPaint This should fix most window redrawing bugs and also (hopefully) speed up the gui (less redrawing). Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Sun Jul 15 07:30:03 2007 @@ -82,12 +82,9 @@ } BOOL FASTCALL -IntValidateParent(PWINDOW_OBJECT Child, BOOL Recurse) +IntValidateParent(PWINDOW_OBJECT Child, HRGN hValidateRgn, BOOL Recurse) { PWINDOW_OBJECT ParentWindow = Child->Parent; - - while (ParentWindow && ParentWindow->Style & WS_CHILD) - ParentWindow = ParentWindow->Parent; while (ParentWindow) { @@ -99,7 +96,7 @@ if (Recurse) return FALSE; - IntInvalidateWindows(ParentWindow, Child->UpdateRegion, + IntInvalidateWindows(ParentWindow, hValidateRgn, RDW_VALIDATE | RDW_NOCHILDREN); } @@ -243,7 +240,7 @@ { if (Window->UpdateRegion) { - if (!IntValidateParent(Window, Recurse)) + if (!IntValidateParent(Window, Window->UpdateRegion, Recurse)) return; } @@ -813,6 +810,7 @@ IntGetClientRect(Window, &Ps.rcPaint); } GDIOBJ_SetOwnership(GdiHandleTable, Window->UpdateRegion, PsGetCurrentProcess()); + /* The region is part of the dc now and belongs to the process! */ Window->UpdateRegion = NULL; } else @@ -833,6 +831,17 @@ else { Ps.fErase = FALSE; + } + if (Window->UpdateRegion) + { + if (!(Window->Style & WS_CLIPCHILDREN)) + { + PWINDOW_OBJECT Child; + for (Child = Window->FirstChild; Child; Child = Child->NextSibling) + { + IntInvalidateWindows(Child, Window->UpdateRegion, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); + } + } } Status = MmCopyToCaller(UnsafePs, &Ps, sizeof(PAINTSTRUCT)); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c Sun Jul 15 07:30:03 2007 @@ -167,7 +167,7 @@ UserRefObjectCo(Parent, &Ref); co_UserRedrawWindow(Parent, NULL, Temp, - RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | + RDW_FRAME | RDW_ERASE | RDW_ERASENOW | RDW_INVALIDATE | RDW_ALLCHILDREN); UserDerefObjectCo(Parent); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Sun Jul 15 07:30:03 2007 @@ -969,7 +969,7 @@ } WvrFlags = co_WinPosDoNCCALCSize(Window, &WinPos, &NewWindowRect, &NewClientRect); - + //DPRINT1("co_WinPosDoNCCALCSize"); /* Relink windows. (also take into account shell window in hwndShellWindow) */ @@ -1197,6 +1197,7 @@ CopyRect.left + (OldWindowRect.left - NewWindowRect.left), CopyRect.top + (OldWindowRect.top - NewWindowRect.top), SRCCOPY, 0, 0); UserReleaseDC(Window, Dc, FALSE); + IntValidateParent(Window, CopyRgn, FALSE); NtGdiOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top); } else if(VisRgn) @@ -1223,14 +1224,6 @@ } if (RgnType != ERROR && RgnType != NULLREGION) { - /* old code - NtGdiOffsetRgn(DirtyRgn, Window->WindowRect.left, Window->WindowRect.top); - IntInvalidateWindows(Window, DirtyRgn, - RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); - } - NtGdiDeleteObject(DirtyRgn); - */ - PWINDOW_OBJECT Parent = Window->Parent; NtGdiOffsetRgn(DirtyRgn, @@ -1241,13 +1234,16 @@ !(Parent->Style & WS_CLIPCHILDREN)) { IntInvalidateWindows(Parent, DirtyRgn, - RDW_ERASE | RDW_INVALIDATE); - co_IntPaintWindows(Parent, RDW_ERASENOW, FALSE); + RDW_ERASE | RDW_INVALIDATE | RDW_NOCHILDREN); + co_IntPaintWindows(Parent, RDW_ERASENOW | RDW_NOCHILDREN, FALSE); + IntInvalidateWindows(Window, DirtyRgn, + RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } else { - IntInvalidateWindows(Window, DirtyRgn, - RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + IntInvalidateWindows(Window, DirtyRgn, + RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + co_IntPaintWindows(Window, RDW_ERASENOW, FALSE); } } NtGdiDeleteObject(DirtyRgn); @@ -1298,6 +1294,33 @@ if ((WinPos.flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) co_IntPostOrSendMessage(WinPos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM) &WinPos); + + if ((Window->Flags & WINDOWOBJECT_NEED_SIZE) && + !(Window->Status & WINDOWSTATUS_DESTROYING)) + { + WPARAM wParam = SIZE_RESTORED; + + Window->Flags &= ~WINDOWOBJECT_NEED_SIZE; + if (Window->Style & WS_MAXIMIZE) + { + wParam = SIZE_MAXIMIZED; + } + else if (Window->Style & WS_MINIMIZE) + { + wParam = SIZE_MINIMIZED; + } + + co_IntSendMessage(Window->hSelf, WM_SIZE, wParam, + MAKELONG(Window->ClientRect.right - + Window->ClientRect.left, + Window->ClientRect.bottom - + Window->ClientRect.top)); + co_IntSendMessage(Window->hSelf, WM_MOVE, 0, + MAKELONG(Window->ClientRect.left, + Window->ClientRect.top)); + IntEngWindowChanged(Window, WOC_RGN_CLIENT); + + } return TRUE; } @@ -1467,33 +1490,6 @@ /* FIXME: Check for window destruction. */ - if ((Window->Flags & WINDOWOBJECT_NEED_SIZE) && - !(Window->Status & WINDOWSTATUS_DESTROYING)) - { - WPARAM wParam = SIZE_RESTORED; - - Window->Flags &= ~WINDOWOBJECT_NEED_SIZE; - if (Window->Style & WS_MAXIMIZE) - { - wParam = SIZE_MAXIMIZED; - } - else if (Window->Style & WS_MINIMIZE) - { - wParam = SIZE_MINIMIZED; - } - - co_IntSendMessage(Window->hSelf, WM_SIZE, wParam, - MAKELONG(Window->ClientRect.right - - Window->ClientRect.left, - Window->ClientRect.bottom - - Window->ClientRect.top)); - co_IntSendMessage(Window->hSelf, WM_MOVE, 0, - MAKELONG(Window->ClientRect.left, - Window->ClientRect.top)); - IntEngWindowChanged(Window, WOC_RGN_CLIENT); - - } - /* Activate the window if activation is not requested and the window is not minimized */ /* if (!(Swp & (SWP_NOACTIVATE | SWP_HIDEWINDOW)) && !(Window->Style & WS_MINIMIZE))

1 0

[greatlrd] 27671: Copied remotely CMIDriver to Trunk on silverblade request
by greatlrd＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: greatlrd Date: Sun Jul 15 03:52:33 2007 New Revision: 27671 URL: http://svn.reactos.org/svn/reactos?rev=27671&view=rev Log: Copied remotely CMIDriver to Trunk on silverblade request Added: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/ - copied from r27670, vendor/CMIDriver/current/

1 0

[greatlrd] 27670: import Open Source WDM Drivers for C-Media 8738/8768 based soundcards release 1.1.3 The source code of the driver is distributed under the terms of the BSD license.
by greatlrd＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: greatlrd Date: Sun Jul 15 03:47:43 2007 New Revision: 27670 URL: http://svn.reactos.org/svn/reactos?rev=27670&view=rev Log: import Open Source WDM Drivers for C-Media 8738/8768 based soundcards release 1.1.3 The source code of the driver is distributed under the terms of the BSD license. Added: vendor/CMIDriver/current/ vendor/CMIDriver/current/CHANGELOG.txt (with props) vendor/CMIDriver/current/CM8738-x32-WaveRT.inf (with props) vendor/CMIDriver/current/CM8738-x32.inf (with props) vendor/CMIDriver/current/CM8738-x64-WaveRT.inf (with props) vendor/CMIDriver/current/CM8738-x64.inf (with props) vendor/CMIDriver/current/HowToBuild.txt (with props) vendor/CMIDriver/current/adapter.cpp (with props) vendor/CMIDriver/current/adapter.hpp (with props) vendor/CMIDriver/current/build-all.bat (with props) vendor/CMIDriver/current/build-release-x64-WaveRT.bat (with props) vendor/CMIDriver/current/build-release-x64.bat (with props) vendor/CMIDriver/current/build-release-x86-WaveRT.bat (with props) vendor/CMIDriver/current/build-release-x86.bat (with props) vendor/CMIDriver/current/cmicontrol/ vendor/CMIDriver/current/cmicontrol/main.cpp (with props) vendor/CMIDriver/current/cmicontrol/main.h (with props) vendor/CMIDriver/current/cmicontrol/makefile (with props) vendor/CMIDriver/current/cmicontrol/resource.h (with props) vendor/CMIDriver/current/cmicontrol/sources (with props) vendor/CMIDriver/current/cmicontrol/window.aps (with props) vendor/CMIDriver/current/cmicontrol/window.ico (with props) vendor/CMIDriver/current/cmicontrol/window.ico-license.txt (with props) vendor/CMIDriver/current/cmicontrol/window.rc (with props) vendor/CMIDriver/current/cmipci.rc (with props) vendor/CMIDriver/current/cmireg.hpp (with props) vendor/CMIDriver/current/common.cpp (with props) vendor/CMIDriver/current/common.hpp (with props) vendor/CMIDriver/current/cpl/ vendor/CMIDriver/current/cpl/cmicpl.cpp (with props) vendor/CMIDriver/current/cpl/cmicpl.def (with props) vendor/CMIDriver/current/cpl/cmicpl.rc (with props) vendor/CMIDriver/current/cpl/makefile (with props) vendor/CMIDriver/current/cpl/resource.h (with props) vendor/CMIDriver/current/cpl/sources (with props) vendor/CMIDriver/current/debug.hpp (with props) vendor/CMIDriver/current/distclean.bat (with props) vendor/CMIDriver/current/envars.bat (with props) vendor/CMIDriver/current/installer/ vendor/CMIDriver/current/installer/main.cpp (with props) vendor/CMIDriver/current/installer/main.h (with props) vendor/CMIDriver/current/installer/makefile (with props) vendor/CMIDriver/current/installer/resource.h (with props) vendor/CMIDriver/current/installer/sources (with props) vendor/CMIDriver/current/installer/window.rc (with props) vendor/CMIDriver/current/interfaces.hpp (with props) vendor/CMIDriver/current/make.bat (with props) vendor/CMIDriver/current/makefile (with props) vendor/CMIDriver/current/mintopo.cpp (with props) vendor/CMIDriver/current/mintopo.hpp (with props) vendor/CMIDriver/current/mintopotables.hpp (with props) vendor/CMIDriver/current/minwave.cpp (with props) vendor/CMIDriver/current/minwave.hpp (with props) vendor/CMIDriver/current/minwavetables.hpp (with props) vendor/CMIDriver/current/property.h (with props) vendor/CMIDriver/current/sources (with props) vendor/CMIDriver/current/update.bat (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/CMIDriver/current/CHANGELOG.txt URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/CHANGELOG.txt?r… Added: vendor/CMIDriver/current/CM8738-x32-WaveRT.inf URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/CM8738-x32-Wave… Added: vendor/CMIDriver/current/CM8738-x32.inf URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/CM8738-x32.inf?… Added: vendor/CMIDriver/current/CM8738-x64-WaveRT.inf URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/CM8738-x64-Wave… Added: vendor/CMIDriver/current/CM8738-x64.inf URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/CM8738-x64.inf?… Added: vendor/CMIDriver/current/HowToBuild.txt URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/HowToBuild.txt?… Added: vendor/CMIDriver/current/adapter.cpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/adapter.cpp?rev… Added: vendor/CMIDriver/current/adapter.hpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/adapter.hpp?rev… Added: vendor/CMIDriver/current/build-all.bat URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/build-all.bat?r… Added: vendor/CMIDriver/current/build-release-x64-WaveRT.bat URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/build-release-x… Added: vendor/CMIDriver/current/build-release-x64.bat URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/build-release-x… Added: vendor/CMIDriver/current/build-release-x86-WaveRT.bat URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/build-release-x… Added: vendor/CMIDriver/current/build-release-x86.bat URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/build-release-x… Added: vendor/CMIDriver/current/cmicontrol/main.cpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cmicontrol/main… Added: vendor/CMIDriver/current/cmicontrol/main.h URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cmicontrol/main… Added: vendor/CMIDriver/current/cmicontrol/makefile URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cmicontrol/make… Added: vendor/CMIDriver/current/cmicontrol/resource.h URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cmicontrol/reso… Added: vendor/CMIDriver/current/cmicontrol/sources URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cmicontrol/sour… Added: vendor/CMIDriver/current/cmicontrol/window.aps URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cmicontrol/wind… Added: vendor/CMIDriver/current/cmicontrol/window.ico URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cmicontrol/wind… Added: vendor/CMIDriver/current/cmicontrol/window.ico-license.txt URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cmicontrol/wind… Added: vendor/CMIDriver/current/cmicontrol/window.rc URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cmicontrol/wind… Added: vendor/CMIDriver/current/cmipci.rc URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cmipci.rc?rev=2… Added: vendor/CMIDriver/current/cmireg.hpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cmireg.hpp?rev=… Added: vendor/CMIDriver/current/common.cpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/common.cpp?rev=… Added: vendor/CMIDriver/current/common.hpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/common.hpp?rev=… Added: vendor/CMIDriver/current/cpl/cmicpl.cpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cpl/cmicpl.cpp?… Added: vendor/CMIDriver/current/cpl/cmicpl.def URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cpl/cmicpl.def?… Added: vendor/CMIDriver/current/cpl/cmicpl.rc URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cpl/cmicpl.rc?r… Added: vendor/CMIDriver/current/cpl/makefile URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cpl/makefile?re… Added: vendor/CMIDriver/current/cpl/resource.h URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cpl/resource.h?… Added: vendor/CMIDriver/current/cpl/sources URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/cpl/sources?rev… Added: vendor/CMIDriver/current/debug.hpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/debug.hpp?rev=2… Added: vendor/CMIDriver/current/distclean.bat URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/distclean.bat?r… Added: vendor/CMIDriver/current/envars.bat URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/envars.bat?rev=… Added: vendor/CMIDriver/current/installer/main.cpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/installer/main.… Added: vendor/CMIDriver/current/installer/main.h URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/installer/main.… Added: vendor/CMIDriver/current/installer/makefile URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/installer/makef… Added: vendor/CMIDriver/current/installer/resource.h URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/installer/resou… Added: vendor/CMIDriver/current/installer/sources URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/installer/sourc… Added: vendor/CMIDriver/current/installer/window.rc URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/installer/windo… Added: vendor/CMIDriver/current/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/interfaces.hpp?… Added: vendor/CMIDriver/current/make.bat URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/make.bat?rev=27… Added: vendor/CMIDriver/current/makefile URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/makefile?rev=27… Added: vendor/CMIDriver/current/mintopo.cpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/mintopo.cpp?rev… Added: vendor/CMIDriver/current/mintopo.hpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/mintopo.hpp?rev… Added: vendor/CMIDriver/current/mintopotables.hpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/mintopotables.h… Added: vendor/CMIDriver/current/minwave.cpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/minwave.cpp?rev… Added: vendor/CMIDriver/current/minwave.hpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/minwave.hpp?rev… Added: vendor/CMIDriver/current/minwavetables.hpp URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/minwavetables.h… Added: vendor/CMIDriver/current/property.h URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/property.h?rev=… Added: vendor/CMIDriver/current/sources URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/sources?rev=276… Added: vendor/CMIDriver/current/update.bat URL: http://svn.reactos.org/svn/reactos/vendor/CMIDriver/current/update.bat?rev=…

1 0

[greatlrd] 27669: prepare vendor drop for opensource driven http://cmediadrivers.googlepages.com/ for -Media 8738/8768 based soundcards requested by silverblade
by greatlrd＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: greatlrd Date: Sun Jul 15 03:36:20 2007 New Revision: 27669 URL: http://svn.reactos.org/svn/reactos?rev=27669&view=rev Log: prepare vendor drop for opensource driven http://cmediadrivers.googlepages.com/ for -Media 8738/8768 based soundcards requested by silverblade Added: vendor/CMIDriver/

1 0

[weiden] 27668: Simplify code
by weiden＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: weiden Date: Sun Jul 15 02:49:47 2007 New Revision: 27668 URL: http://svn.reactos.org/svn/reactos?rev=27668&view=rev Log: Simplify code Modified: trunk/reactos/dll/win32/kernel32/file/find.c Modified: trunk/reactos/dll/win32/kernel32/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/find.c (original) +++ trunk/reactos/dll/win32/kernel32/file/find.c Sun Jul 15 02:49:47 2007 @@ -371,7 +371,7 @@ if (FALSE == bResult) { SetLastError(ERROR_PATH_NOT_FOUND); - return NULL; + return INVALID_HANDLE_VALUE; } /* Save the buffer pointer for later, we need to free it! */ @@ -473,7 +473,7 @@ } SetLastErrorByStatus (Status); - return(NULL); + return INVALID_HANDLE_VALUE; } if (PathFileName.Length == 0) @@ -484,7 +484,7 @@ 0, NtPathBuffer); SetLastError(ERROR_FILE_NOT_FOUND); - return NULL; + return INVALID_HANDLE_VALUE; } IHeader = RtlAllocateHeap (hProcessHeap, @@ -499,7 +499,7 @@ NtClose(hDirectory); SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; + return INVALID_HANDLE_VALUE; } IHeader->Type = FileFind; @@ -532,7 +532,7 @@ if (!bResult) { FindClose((HANDLE)IHeader); - return NULL; + return INVALID_HANDLE_VALUE; } RtlInitializeCriticalSection(&IData->Lock); @@ -680,8 +680,6 @@ LPVOID lpSearchFilter, DWORD dwAdditionalFlags) { - HANDLE Handle; - if (fInfoLevelId != FindExInfoStandard) { SetLastError(ERROR_INVALID_PARAMETER); @@ -696,17 +694,10 @@ return INVALID_HANDLE_VALUE; } - Handle = InternalFindFirstFile (lpFileName, - fSearchOp == FindExSearchLimitToDirectories, - lpFindFileData, - TRUE); - if (Handle == NULL) - { - DPRINT("Failing request\n"); - return INVALID_HANDLE_VALUE; - } - - return Handle; + return InternalFindFirstFile (lpFileName, + fSearchOp == FindExSearchLimitToDirectories, + lpFindFileData, + TRUE); } SetLastError(ERROR_INVALID_PARAMETER); @@ -758,13 +749,6 @@ FALSE); RtlFreeUnicodeString (&FileNameU); - - if (Handle == NULL) - { - DPRINT("Failing request\n"); - return INVALID_HANDLE_VALUE; - } - return Handle; }

1 0

[weiden] 27667: - Fix caching of directory queries, FindFirstFile(Ex) should no longer return garbage occasionally - These changes re-introduce the problem with searches for fake DOS devices that I claimed to have fixed in r27634
by weiden＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: weiden Date: Sun Jul 15 02:29:42 2007 New Revision: 27667 URL: http://svn.reactos.org/svn/reactos?rev=27667&view=rev Log: - Fix caching of directory queries, FindFirstFile(Ex) should no longer return garbage occasionally - These changes re-introduce the problem with searches for fake DOS devices that I claimed to have fixed in r27634 Modified: trunk/reactos/dll/win32/kernel32/file/find.c Modified: trunk/reactos/dll/win32/kernel32/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/find.c (original) +++ trunk/reactos/dll/win32/kernel32/file/find.c Sun Jul 15 02:29:42 2007 @@ -19,15 +19,19 @@ /* TYPES ********************************************************************/ -#define FIND_DATA_SIZE (16*1024) +#define FIND_DATA_SIZE 0x4000 #define FIND_DEVICE_HANDLE ((HANDLE)0x1) typedef struct _KERNEL32_FIND_FILE_DATA { HANDLE DirectoryHandle; + RTL_CRITICAL_SECTION Lock; + PFILE_BOTH_DIR_INFORMATION pFileInfo; BOOLEAN DirectoryOnly; - PFILE_BOTH_DIR_INFORMATION pFileInfo; + BOOLEAN HasMoreData; + BOOLEAN HasData; + BOOLEAN LockInitialized; } KERNEL32_FIND_FILE_DATA, *PKERNEL32_FIND_FILE_DATA; typedef struct _KERNEL32_FIND_STREAM_DATA @@ -51,7 +55,7 @@ /* FUNCTIONS ****************************************************************/ -HANDLE +static HANDLE InternalCopyDeviceFindDataW(LPWIN32_FIND_DATAW lpFindFileData, LPCWSTR lpFileName, ULONG DeviceNameInfo) @@ -72,7 +76,7 @@ return FIND_DEVICE_HANDLE; } -HANDLE +static HANDLE InternalCopyDeviceFindDataA(LPWIN32_FIND_DATAA lpFindFileData, PUNICODE_STRING FileName, ULONG DeviceNameInfo) @@ -90,10 +94,6 @@ RtlUnicodeStringToAnsiString (&BufferA, &DeviceName, FALSE); else RtlUnicodeStringToOemString (&BufferA, &DeviceName, FALSE); - - /* NOTE: Free the string before we try to write the results to the caller, - this way we prevent a memory leak in case of a fault... */ - RtlFreeUnicodeString(FileName); /* Return the data */ RtlZeroMemory(lpFindFileData, @@ -106,7 +106,7 @@ return FIND_DEVICE_HANDLE; } -VOID +static VOID InternalCopyFindDataW(LPWIN32_FIND_DATAW lpFindFileData, PFILE_BOTH_DIR_INFORMATION lpFileInfo) { @@ -131,7 +131,7 @@ lpFindFileData->cAlternateFileName[lpFileInfo->ShortNameLength / sizeof(WCHAR)] = 0; } -VOID +static VOID InternalCopyFindDataA(LPWIN32_FIND_DATAA lpFindFileData, PFILE_BOTH_DIR_INFORMATION lpFileInfo) { @@ -189,23 +189,23 @@ BOOL STDCALL InternalFindNextFile ( - HANDLE hFindFile, - PUNICODE_STRING SearchPattern - ) -{ - PKERNEL32_FIND_DATA_HEADER IHeader; - PKERNEL32_FIND_FILE_DATA IData; - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - DPRINT("InternalFindNextFile(%lx)\n", hFindFile); - - if (hFindFile == FIND_DEVICE_HANDLE) - { - SetLastError (ERROR_NO_MORE_FILES); - return FALSE; - } - + HANDLE hFindFile, + PUNICODE_STRING SearchPattern, + PVOID lpFindFileData, + BOOL bUnicode + ) +{ + PKERNEL32_FIND_DATA_HEADER IHeader; + PKERNEL32_FIND_FILE_DATA IData; + IO_STATUS_BLOCK IoStatusBlock; + BOOLEAN Locked = FALSE; + PFILE_BOTH_DIR_INFORMATION Buffer, FoundFile = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("InternalFindNextFile(%lx, %wZ)\n", hFindFile, SearchPattern); + + if (hFindFile != FIND_DEVICE_HANDLE) + { IHeader = (PKERNEL32_FIND_DATA_HEADER)hFindFile; if (hFindFile == NULL || hFindFile == INVALID_HANDLE_VALUE || IHeader->Type != FileFind) @@ -215,41 +215,119 @@ } IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); - - while (1) - { - if (IData->pFileInfo->NextEntryOffset != 0) - { - IData->pFileInfo = (PVOID)((ULONG_PTR)IData->pFileInfo + IData->pFileInfo->NextEntryOffset); + Buffer = (PFILE_BOTH_DIR_INFORMATION)((ULONG_PTR)IData + sizeof(KERNEL32_FIND_FILE_DATA)); + + if (SearchPattern == NULL) + { + RtlEnterCriticalSection(&IData->Lock); + Locked = TRUE; + } + + do + { + if (IData->HasData) + { + if (!IData->DirectoryOnly || (IData->pFileInfo->FileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + FoundFile = IData->pFileInfo; + } + + if (IData->pFileInfo->NextEntryOffset != 0) + { + ULONG_PTR BufferEnd; + + IData->pFileInfo = (PFILE_BOTH_DIR_INFORMATION)((ULONG_PTR)IData->pFileInfo + IData->pFileInfo->NextEntryOffset); + + /* Be paranoid and make sure that the next entry is completely there */ + BufferEnd = (ULONG_PTR)Buffer + FIND_DATA_SIZE; + if (BufferEnd < (ULONG_PTR)IData->pFileInfo || + BufferEnd < (ULONG_PTR)&IData->pFileInfo->FileNameLength + sizeof(IData->pFileInfo->FileNameLength) || + BufferEnd <= (ULONG_PTR)&IData->pFileInfo->FileName[IData->pFileInfo->FileNameLength]) + { + goto NeedMoreData; + } + } + else + { +NeedMoreData: + IData->HasData = FALSE; + + if (!IData->HasMoreData) + break; + } } else { - IData->pFileInfo = (PVOID)((ULONG_PTR)IData + sizeof(KERNEL32_FIND_FILE_DATA)); - IData->pFileInfo->FileIndex = 0; - Status = NtQueryDirectoryFile (IData->DirectoryHandle, - NULL, + IData->pFileInfo = Buffer; + IData->pFileInfo->NextEntryOffset = 0; + Status = NtQueryDirectoryFile (IData->DirectoryHandle, + NULL, NULL, NULL, &IoStatusBlock, (PVOID)IData->pFileInfo, FIND_DATA_SIZE, FileBothDirectoryInformation, - SearchPattern ? TRUE : FALSE, + FALSE, SearchPattern, - SearchPattern ? TRUE : FALSE); + SearchPattern != NULL); + + if (Status == STATUS_BUFFER_OVERFLOW) + { + IData->HasMoreData = TRUE; + Status = STATUS_SUCCESS; + } + else + { + if (!NT_SUCCESS(Status)) + break; + + IData->HasMoreData = FALSE; + } + + IData->HasData = TRUE; SearchPattern = NULL; - if (!NT_SUCCESS(Status)) + } + + } while (FoundFile == NULL); + + if (FoundFile != NULL) + { + _SEH_TRY + { + if (bUnicode) { - SetLastErrorByStatus (Status); - return FALSE; - } + InternalCopyFindDataW(lpFindFileData, + FoundFile); + } + else + { + InternalCopyFindDataA(lpFindFileData, + FoundFile); + } } - if (!IData->DirectoryOnly || IData->pFileInfo->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) + _SEH_HANDLE { - DPRINT("Found %.*S\n",IData->pFileInfo->FileNameLength/sizeof(WCHAR), IData->pFileInfo->FileName); - return TRUE; } + _SEH_END; } + + if (Locked) + RtlLeaveCriticalSection(&IData->Lock); + } + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus (Status); + return FALSE; + } + else if (FoundFile == NULL) + { + SetLastError (ERROR_NO_MORE_FILES); + return FALSE; + } + + return TRUE; } @@ -261,7 +339,8 @@ InternalFindFirstFile ( LPCWSTR lpFileName, BOOLEAN DirectoryOnly, - PULONG DeviceNameInfo + PVOID lpFindFileData, + BOOL bUnicode ) { OBJECT_ATTRIBUTES ObjectAttributes; @@ -274,12 +353,12 @@ BOOLEAN RemovedSlash = FALSE; BOOL bResult; CURDIR DirInfo; - HANDLE hDirectory = NULL; + ULONG DeviceNameInfo; + HANDLE hDirectory = NULL; DPRINT("FindFirstFileW(lpFileName %S)\n", lpFileName); - *DeviceNameInfo = 0; RtlZeroMemory(&PathFileName, sizeof(PathFileName)); RtlInitUnicodeString(&FileName, @@ -329,8 +408,8 @@ /* Remove a trailing backslash from the path, unless it's a DOS drive directly */ if (NtPathU.Length > 3 * sizeof(WCHAR) && - NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 2] != L':' && - NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 1] != L'\\') + NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 1] == L'\\' && + NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 2] != L':') { NtPathU.Length -= sizeof(WCHAR); RemovedSlash = TRUE; @@ -348,11 +427,11 @@ NULL); Status = NtOpenFile (&hDirectory, - FILE_LIST_DIRECTORY, + FILE_LIST_DIRECTORY | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_DIRECTORY_FILE); + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status) && RemovedSlash) { @@ -360,25 +439,38 @@ NtPathU.Length -= sizeof(WCHAR); Status = NtOpenFile (&hDirectory, - FILE_LIST_DIRECTORY, + FILE_LIST_DIRECTORY | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_DIRECTORY_FILE); - - NtPathU.Length -= sizeof(WCHAR); + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); } if (!NT_SUCCESS(Status)) { - RtlFreeHeap (hProcessHeap, - 0, - NtPathBuffer); + RtlFreeHeap (hProcessHeap, + 0, + NtPathBuffer); /* See if the application tries to look for a DOS device */ - *DeviceNameInfo = RtlIsDosDeviceName_U((PWSTR)((ULONG_PTR)lpFileName)); - if (*DeviceNameInfo != 0) + DeviceNameInfo = RtlIsDosDeviceName_U((PWSTR)((ULONG_PTR)lpFileName)); + if (DeviceNameInfo != 0) + { + if (bUnicode) + { + InternalCopyDeviceFindDataW(lpFindFileData, + lpFileName, + DeviceNameInfo); + } + else + { + InternalCopyDeviceFindDataA(lpFindFileData, + &FileName, + DeviceNameInfo); + } + return FIND_DEVICE_HANDLE; + } SetLastErrorByStatus (Status); return(NULL); @@ -413,6 +505,7 @@ IHeader->Type = FileFind; IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); IData->DirectoryHandle = hDirectory; + IData->HasMoreData = TRUE; /* change pattern: "*.*" --> "*" */ if (PathFileName.Length == 6 && @@ -427,7 +520,10 @@ IData->pFileInfo->FileIndex = 0; IData->DirectoryOnly = DirectoryOnly; - bResult = InternalFindNextFile((HANDLE)IHeader, &PathFileName); + bResult = InternalFindNextFile((HANDLE)IHeader, + &PathFileName, + lpFindFileData, + bUnicode); RtlFreeHeap (hProcessHeap, 0, @@ -438,6 +534,9 @@ FindClose((HANDLE)IHeader); return NULL; } + + RtlInitializeCriticalSection(&IData->Lock); + IData->LockInitialized = TRUE; return (HANDLE)IHeader; } @@ -453,52 +552,12 @@ LPWIN32_FIND_DATAA lpFindFileData ) { - PKERNEL32_FIND_DATA_HEADER IHeader; - PKERNEL32_FIND_FILE_DATA IData; - UNICODE_STRING FileNameU; - ANSI_STRING FileName; - ULONG DeviceNameInfo; - - RtlInitAnsiString (&FileName, - (LPSTR)lpFileName); - - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - RtlAnsiStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - else - RtlOemStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - - IHeader = InternalFindFirstFile (FileNameU.Buffer, FALSE, &DeviceNameInfo); - - if (IHeader == NULL) - { - RtlFreeUnicodeString (&FileNameU); - DPRINT("Failing request\n"); - return INVALID_HANDLE_VALUE; - } - - if ((HANDLE)IHeader == FIND_DEVICE_HANDLE) - { - /* NOTE: FileNameU will be freed in InternalCopyDeviceFindDataA */ - return InternalCopyDeviceFindDataA(lpFindFileData, &FileNameU, DeviceNameInfo); - } - - RtlFreeUnicodeString (&FileNameU); - - IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); - - DPRINT("IData->pFileInfo->FileNameLength %d\n", - IData->pFileInfo->FileNameLength); - - /* copy data into WIN32_FIND_DATA structure */ - InternalCopyFindDataA(lpFindFileData, IData->pFileInfo); - - - return (HANDLE)IHeader; + return FindFirstFileExA (lpFileName, + FindExInfoStandard, + (LPVOID)lpFindFileData, + FindExSearchNameMatch, + NULL, + 0); } @@ -511,23 +570,10 @@ HANDLE hFindFile, LPWIN32_FIND_DATAA lpFindFileData) { - PKERNEL32_FIND_FILE_DATA IData; - - if (!InternalFindNextFile (hFindFile, NULL)) - { - DPRINT("InternalFindNextFile() failed\n"); - return FALSE; - } - - IData = (PKERNEL32_FIND_FILE_DATA)((PKERNEL32_FIND_DATA_HEADER)hFindFile + 1); - - DPRINT("IData->pFileInfo->FileNameLength %d\n", - IData->pFileInfo->FileNameLength); - - /* copy data into WIN32_FIND_DATA structure */ - InternalCopyFindDataA(lpFindFileData, IData->pFileInfo); - - return TRUE; + return InternalFindNextFile (hFindFile, + NULL, + lpFindFileData, + FALSE); } @@ -561,6 +607,8 @@ { PKERNEL32_FIND_FILE_DATA IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); CloseHandle (IData->DirectoryHandle); + if (IData->LockInitialized) + RtlDeleteCriticalSection(&IData->Lock); break; } @@ -595,13 +643,12 @@ LPWIN32_FIND_DATAW lpFindFileData ) { - - return FindFirstFileExW (lpFileName, - FindExInfoStandard, - (LPVOID)lpFindFileData, - FindExSearchNameMatch, - NULL, - 0); + return FindFirstFileExW (lpFileName, + FindExInfoStandard, + (LPVOID)lpFindFileData, + FindExSearchNameMatch, + NULL, + 0); } /* @@ -614,20 +661,10 @@ LPWIN32_FIND_DATAW lpFindFileData ) { - PKERNEL32_FIND_FILE_DATA IData; - - if (!InternalFindNextFile(hFindFile, NULL)) - { - DPRINT("Failing request\n"); - return FALSE; - } - - IData = (PKERNEL32_FIND_FILE_DATA)((PKERNEL32_FIND_DATA_HEADER)hFindFile + 1); - - /* copy data into WIN32_FIND_DATA structure */ - InternalCopyFindDataW(lpFindFileData, IData->pFileInfo); - - return TRUE; + return InternalFindNextFile (hFindFile, + NULL, + lpFindFileData, + TRUE); } @@ -643,15 +680,14 @@ LPVOID lpSearchFilter, DWORD dwAdditionalFlags) { - PKERNEL32_FIND_DATA_HEADER IHeader; - PKERNEL32_FIND_FILE_DATA IData; - ULONG DeviceNameInfo; + HANDLE Handle; if (fInfoLevelId != FindExInfoStandard) { SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } + if (fSearchOp == FindExSearchNameMatch || fSearchOp == FindExSearchLimitToDirectories) { if (lpSearchFilter) @@ -660,23 +696,19 @@ return INVALID_HANDLE_VALUE; } - IHeader = InternalFindFirstFile (lpFileName, fSearchOp == FindExSearchLimitToDirectories ? TRUE : FALSE, &DeviceNameInfo); - if (IHeader == NULL) + Handle = InternalFindFirstFile (lpFileName, + fSearchOp == FindExSearchLimitToDirectories, + lpFindFileData, + TRUE); + if (Handle == NULL) { DPRINT("Failing request\n"); return INVALID_HANDLE_VALUE; } - if ((HANDLE)IHeader == FIND_DEVICE_HANDLE) - return InternalCopyDeviceFindDataW((LPWIN32_FIND_DATAW)lpFindFileData, lpFileName, DeviceNameInfo); - - IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); - - /* copy data into WIN32_FIND_DATA structure */ - InternalCopyFindDataW((LPWIN32_FIND_DATAW)lpFindFileData, IData->pFileInfo); - - return (HANDLE)IHeader; - } + return Handle; + } + SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } @@ -695,11 +727,9 @@ DWORD dwAdditionalFlags ) { - PKERNEL32_FIND_DATA_HEADER IHeader; - PKERNEL32_FIND_FILE_DATA IData; UNICODE_STRING FileNameU; ANSI_STRING FileNameA; - ULONG DeviceNameInfo; + HANDLE Handle; if (fInfoLevelId != FindExInfoStandard) { @@ -713,39 +743,31 @@ SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } - + RtlInitAnsiString (&FileNameA, (LPSTR)lpFileName); - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) + /* convert ansi (or oem) string to unicode */ + if (bIsFileApiAnsi) RtlAnsiStringToUnicodeString (&FileNameU, &FileNameA, TRUE); - else + else RtlOemStringToUnicodeString (&FileNameU, &FileNameA, TRUE); - IHeader = InternalFindFirstFile (FileNameU.Buffer, FALSE, &DeviceNameInfo); - - if (IHeader == NULL) - { - RtlFreeUnicodeString (&FileNameU); - DPRINT("Failing request\n"); - return INVALID_HANDLE_VALUE; - } - - if ((HANDLE)IHeader == FIND_DEVICE_HANDLE) - { - /* NOTE: FileNameU will be freed in InternalCopyDeviceFindDataA */ - return InternalCopyDeviceFindDataA(lpFindFileData, &FileNameU, DeviceNameInfo); - } - - RtlFreeUnicodeString (&FileNameU); - - IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); - - /* copy data into WIN32_FIND_DATA structure */ - InternalCopyFindDataA(lpFindFileData, IData->pFileInfo); - - return (HANDLE)IHeader; - } + Handle = InternalFindFirstFile (FileNameU.Buffer, + fSearchOp == FindExSearchLimitToDirectories, + lpFindFileData, + FALSE); + + RtlFreeUnicodeString (&FileNameU); + + if (Handle == NULL) + { + DPRINT("Failing request\n"); + return INVALID_HANDLE_VALUE; + } + + return Handle; + } + SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; }

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007