Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 40877: Bug 4485: Fixed wrong syntax in options.exe by Daniel Zimmermann Commited the ChangeLog.txt from the release.
by dreimer＠svn.reactos.org 10 May '09

10 May '09

Author: dreimer Date: Sun May 10 16:58:02 2009 New Revision: 40877 URL: http://svn.reactos.org/svn/reactos?rev=40877&view=rev Log: Bug 4485: Fixed wrong syntax in options.exe by Daniel Zimmermann Commited the ChangeLog.txt from the release. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Sun May 10 16:58:02 2009 @@ -10,13 +10,13 @@ $host.ui.RawUI.WindowTitle = "Options" -if "%ROS_ARCH%" == "amd64" ( - $options=$_ROSBE_BASEDIR\Tools\options64.exe - $cfgfile=$ENV:APPDATA\RosBE\rosbe-options-amd64.cmd -else - $options=$_ROSBE_BASEDIR\Tools\options.exe - $cfgfile=$ENV:APPDATA\RosBE\rosbe-options.cmd -) +if ("$ROS_ARCH" -eq "amd64") { + $options="$_ROSBE_BASEDIR\Tools\options64.exe" + $cfgfile="$ENV:APPDATA\RosBE\rosbe-options-amd64.cmd" +} else { + $options="$_ROSBE_BASEDIR\Tools\options.exe" + $cfgfile="$ENV:APPDATA\RosBE\rosbe-options.cmd" +} # # Run options.exe Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sun May 10 16:58:02 2009 @@ -14,6 +14,7 @@ * Let the Installer change the Security Level of Powershell to Remote Signed. * Generate Shortcuts for the PS Versions. * Fix some typos in the PS files to fully work with the new GCC +- sSVN can show the Log Files now. ONLY in the PS Version (Daniel Reimer) *** April 07th, 2009 - RosBE 1.4.1 Released

1 0

[janderwald] 40876: - Fix build
by janderwald＠svn.reactos.org 10 May '09

10 May '09

Author: janderwald Date: Sun May 10 05:10:00 2009 New Revision: 40876 URL: http://svn.reactos.org/svn/reactos?rev=40876&view=rev Log: - Fix build Modified: trunk/reactos/dll/win32/shell32/folders.c Modified: trunk/reactos/dll/win32/shell32/folders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.c [iso-8859-1] Sun May 10 05:10:00 2009 @@ -26,8 +26,6 @@ DWORD NumIconOverlayHandlers = 0; IShellIconOverlayIdentifier ** Handlers = NULL; -const GUID IID_IShellIconOverlayIdentifier = {0x0c6c4200L, 0xc589, 0x11d0, {0x99, 0x9a, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1}}; - static HRESULT getIconLocationForFolder(LPCITEMIDLIST pidl, UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) {

1 0

[janderwald] 40875: - Add IShellIconOverlayIdentifier interface
by janderwald＠svn.reactos.org 09 May '09

09 May '09

Author: janderwald Date: Sun May 10 00:03:53 2009 New Revision: 40875 URL: http://svn.reactos.org/svn/reactos?rev=40875&view=rev Log: - Add IShellIconOverlayIdentifier interface Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Sun May 10 00:03:53 2009 @@ -1599,6 +1599,25 @@ #endif +#define INTERFACE IShellIconOverlayIdentifier + +DEFINE_GUID(IID_IShellIconOverlayIdentifier, 0x0c6c4200L, 0xc589, 0x11d0, 0x99, 0x9a, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); +DECLARE_INTERFACE_(IShellIconOverlayIdentifier, IUnknown) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + + STDMETHOD (IsMemberOf)(THIS_ LPCWSTR pwszPath, DWORD dwAttrib) PURE; + STDMETHOD (GetOverlayInfo)(THIS_ LPWSTR pwszIconFile, int cchMax, int * pIndex, DWORD * pdwFlags) PURE; + STDMETHOD (GetPriority)(THIS_ int * pIPriority) PURE; +}; + +#define ISIOI_ICONFILE 0x00000001 +#define ISIOI_ICONINDEX 0x00000002 + +#undef INTERFACE + /***************************************************************************** * IBanneredBar interface */

1 0

[janderwald] 40874: - Implement loading IShellIconOverlayIdentifier - Implement retrieving overlay icon
by janderwald＠svn.reactos.org 09 May '09

09 May '09

Author: janderwald Date: Sun May 10 00:03:08 2009 New Revision: 40874 URL: http://svn.reactos.org/svn/reactos?rev=40874&view=rev Log: - Implement loading IShellIconOverlayIdentifier - Implement retrieving overlay icon Modified: trunk/reactos/dll/win32/shell32/folders.c trunk/reactos/dll/win32/shell32/shell32_main.c trunk/reactos/dll/win32/shell32/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/folders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.c [iso-8859-1] Sun May 10 00:03:08 2009 @@ -23,6 +23,11 @@ WCHAR swShell32Name[MAX_PATH]; +DWORD NumIconOverlayHandlers = 0; +IShellIconOverlayIdentifier ** Handlers = NULL; + +const GUID IID_IShellIconOverlayIdentifier = {0x0c6c4200L, 0xc589, 0x11d0, {0x99, 0x9a, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1}}; + static HRESULT getIconLocationForFolder(LPCITEMIDLIST pidl, UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) { @@ -72,6 +77,111 @@ } return S_OK; +} + +void InitIconOverlays(void) +{ + HKEY hKey; + DWORD dwIndex, dwResult, dwSize; + WCHAR szName[MAX_PATH]; + WCHAR szValue[100]; + CLSID clsid; + IShellIconOverlayIdentifier * Overlay; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ShellIconOverlayIdentifiers",0, KEY_READ, &hKey) != ERROR_SUCCESS) + return; + + if (RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &dwResult, NULL, NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return; + } + + Handlers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwResult * sizeof(IShellIconOverlayIdentifier*)); + if (!Handlers) + { + RegCloseKey(hKey); + return; + } + + dwIndex = 0; + + CoInitialize(0); + + do + { + dwSize = sizeof(szName) / sizeof(WCHAR); + dwResult = RegEnumKeyExW(hKey, dwIndex, szName, &dwSize, NULL, NULL, NULL, NULL); + + if (dwResult == ERROR_NO_MORE_ITEMS) + break; + + if (dwResult == ERROR_SUCCESS) + { + dwSize = sizeof(szValue) / sizeof(WCHAR); + if (RegGetValueW(hKey, szName, NULL, RRF_RT_REG_SZ, NULL, szValue, &dwSize) == ERROR_SUCCESS) + { + + CLSIDFromString(szValue, &clsid); + dwResult = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&Overlay); + if (dwResult == S_OK) + { + Handlers[NumIconOverlayHandlers] = Overlay; + NumIconOverlayHandlers++; + } + } + } + + dwIndex++; + + }while(1); + + RegCloseKey(hKey); +} + +BOOL +GetIconOverlay(LPCITEMIDLIST pidl, WCHAR * wTemp, int* pIndex) +{ + DWORD Index; + HRESULT hResult; + int Priority; + int HighestPriority; + ULONG IconIndex; + ULONG Flags; + WCHAR szPath[MAX_PATH]; + + if(!SHGetPathFromIDListW(pidl, szPath)) + return FALSE; + + + HighestPriority = 101; + IconIndex = NumIconOverlayHandlers; + for(Index = 0; Index < NumIconOverlayHandlers; Index++) + { + hResult = Handlers[Index]->lpVtbl->IsMemberOf(Handlers[Index], szPath, SFGAO_FILESYSTEM); + if (hResult == S_OK) + { + hResult = Handlers[Index]->lpVtbl->GetPriority(Handlers[Index], &Priority); + if (hResult == S_OK) + { + if (Priority < HighestPriority) + { + HighestPriority = Priority; + IconIndex = Index; + } + } + } + } + + if (IconIndex == NumIconOverlayHandlers) + return FALSE; + + hResult = Handlers[IconIndex]->lpVtbl->GetOverlayInfo(Handlers[IconIndex], wTemp, MAX_PATH, pIndex, &Flags); + + if (hResult == S_OK) + return TRUE; + else + return FALSE; } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] Sun May 10 00:03:08 2009 @@ -1324,6 +1324,7 @@ SIC_Initialize(); InitChangeNotifications(); + InitIconOverlays(); break; case DLL_PROCESS_DETACH: Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Sun May 10 00:03:08 2009 @@ -148,6 +148,7 @@ /* Change Notification */ void InitChangeNotifications(void); void FreeChangeNotifications(void); +void InitIconOverlays(void); /* file operation */ #define ASK_DELETE_FILE 1

1 0

[mjmartin] 40873: - NtAllocateVirtualMemory, NtProtectVirtualMemory: Page Protection cannot be any combination of Memory Protection Constants, see MSDN. Add checks to handle non compatible combinations are fail. Fixes 6 more kernel32_winetest for virtual memory.
by mjmartin＠svn.reactos.org 09 May '09

09 May '09

Author: mjmartin Date: Sat May 9 21:00:18 2009 New Revision: 40873 URL: http://svn.reactos.org/svn/reactos?rev=40873&view=rev Log: - NtAllocateVirtualMemory, NtProtectVirtualMemory: Page Protection cannot be any combination of Memory Protection Constants, see MSDN. Add checks to handle non compatible combinations are fail. Fixes 6 more kernel32_winetest for virtual memory. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sat May 9 21:00:18 2009 @@ -550,10 +550,7 @@ * AllocationType = Indicates the type of virtual memory you like to * allocated, can be a combination of MEM_COMMIT, * MEM_RESERVE, MEM_RESET, MEM_TOP_DOWN. - * Protect = Indicates the protection type of the pages allocated, can be - * a combination of PAGE_READONLY, PAGE_READWRITE, - * PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE, PAGE_GUARD, - * PAGE_NOACCESS + * Protect = Indicates the protection type of the pages allocated. * RETURNS: Status */ { @@ -567,6 +564,7 @@ ULONG RegionSize; PVOID PBaseAddress; ULONG PRegionSize; + ULONG MemProtection; PHYSICAL_ADDRESS BoundaryAddressMultiple; KPROCESSOR_MODE PreviousMode; @@ -578,7 +576,15 @@ Protect); /* Check for valid protection flags */ - if (!Protect || Protect & ~PAGE_FLAGS_VALID_FROM_USER_MODE) + MemProtection = Protect & ~(PAGE_GUARD|PAGE_NOCACHE); + if (MemProtection != PAGE_NOACCESS && + MemProtection != PAGE_READONLY && + MemProtection != PAGE_READWRITE && + MemProtection != PAGE_WRITECOPY && + MemProtection != PAGE_EXECUTE && + MemProtection != PAGE_EXECUTE_READ && + MemProtection != PAGE_EXECUTE_READWRITE && + MemProtection != PAGE_EXECUTE_WRITECOPY) { DPRINT1("Invalid page protection\n"); return STATUS_INVALID_PAGE_PROTECTION; Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Sat May 9 21:00:18 2009 @@ -844,10 +844,25 @@ { PEPROCESS Process; ULONG OldAccessProtection; + ULONG Protection; PVOID BaseAddress = NULL; SIZE_T NumberOfBytesToProtect = 0; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; + + /* Check for valid protection flags */ + Protection = NewAccessProtection & ~(PAGE_GUARD|PAGE_NOCACHE); + if (Protection != PAGE_NOACCESS && + Protection != PAGE_READONLY && + Protection != PAGE_READWRITE && + Protection != PAGE_WRITECOPY && + Protection != PAGE_EXECUTE && + Protection != PAGE_EXECUTE_READ && + Protection != PAGE_EXECUTE_READWRITE && + Protection != PAGE_EXECUTE_WRITECOPY) + { + return STATUS_INVALID_PAGE_PROTECTION; + } /* Check if we came from user mode */ if (PreviousMode != KernelMode)

1 0

[dgorbachev] 40871: Bulgarian translation of Mplay32 by CCTAHEB. Bug #4427.
by dgorbachev＠svn.reactos.org 09 May '09

09 May '09

Author: dgorbachev Date: Sat May 9 18:56:51 2009 New Revision: 40871 URL: http://svn.reactos.org/svn/reactos?rev=40871&view=rev Log: Bulgarian translation of Mplay32 by CCTAHEB. Bug #4427. Added: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc (with props) Added: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/bg-BG.rc (added) +++ trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] Sat May 9 18:56:51 2009 @@ -1,0 +1,29 @@ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&Ôàéë" + BEGIN + MENUITEM "&Îòâàðÿíå...", IDM_OPEN_FILE + MENUITEM "&Çàòâàðÿíå", IDM_CLOSE_FILE + MENUITEM SEPARATOR + MENUITEM "Èç&õîä", IDM_EXIT + END + POPUP "Ïîìî&ù" + BEGIN + MENUITEM "&Çà...", IDM_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ALL_TYPES_FILTER "Âñè÷êè ïîääúðæàíè (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_TOOLTIP_PLAY "Ïóñêàíå" + IDS_TOOLTIP_STOP "Ñïèðàíå" + IDS_TOOLTIP_EJECT "Èçâàæäàíå" + IDS_TOOLTIP_BACKWARD "Ïðåñêà÷àíå íàçàä" + IDS_TOOLTIP_SEEKBACK "Òúðñåíå íàçàä" + IDS_TOOLTIP_SEEKFORW "Òúðñåíå íàïðåä" + IDS_TOOLTIP_FORWARD "Òúðñåíå íàïðåä" + IDS_APPTITLE "Ìóëòèìåäèéíèÿò âúçïðîèçâîäèòåë íà ÐåàêòÎÑ" +END Propchange: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 40870: Tag the RosBE-Unix 1.4.2 release
by cfinck＠svn.reactos.org 09 May '09

09 May '09

Author: cfinck Date: Sat May 9 18:15:56 2009 New Revision: 40870 URL: http://svn.reactos.org/svn/reactos?rev=40870&view=rev Log: Tag the RosBE-Unix 1.4.2 release Added: tags/RosBE-Unix-1.4.2/ - copied from r40842, trunk/

1 0

[cfinck] 40869: Tag the RosBE-Unix 1.4 release
by cfinck＠svn.reactos.org 09 May '09

09 May '09

Author: cfinck Date: Sat May 9 18:07:28 2009 New Revision: 40869 URL: http://svn.reactos.org/svn/reactos?rev=40869&view=rev Log: Tag the RosBE-Unix 1.4 release Added: tags/RosBE-Unix-1.4/ - copied from r39604, trunk/

1 0

[dreimer] 40868: Add a view Log Feature to ssvn. This will not be added to the cmd version, because batch has no while loop...
by dreimer＠svn.reactos.org 09 May '09

09 May '09

Author: dreimer Date: Sat May 9 17:03:17 2009 New Revision: 40868 URL: http://svn.reactos.org/svn/reactos?rev=40868&view=rev Log: Add a view Log Feature to ssvn. This will not be added to the cmd version, because batch has no while loop... Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Sat May 9 17:03:17 2009 @@ -8,14 +8,38 @@ # function UP { - "Local $OFFSVN" - "Online HEAD $ONSVN" + $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | select-string "Revision:" + $OFFSVN = $OFFSVN -replace "(.*)Revision: ",'' + $OFFSVN = [CONVERT]::ToInt32($OFFSVN,10) + $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | select-string "Revision:" + $ONSVN = $ONSVN -replace "(.*)Revision: ",'' + $ONSVN = [CONVERT]::ToInt32($ONSVN,10) + "Local Revision: $OFFSVN" + "Online HEAD Revision: $ONSVN" "" if ($OFFSVN -lt $ONSVN) { - "Your tree is not up to date. Do you want to update it?" - $UP = Read-Host "Please enter 'yes' or 'no': " - if (($UP -eq "yes") -or ($UP -eq "y")) { - IEX "&'$_ROSBE_BASEDIR\ssvn' update" + if ($_ROSBE_SSVN_JOB -eq "status") { + "Your tree is not up to date. Do you want to update it?" + $UP = Read-Host "Please enter 'yes' or 'no': " + if (($UP -eq "yes") -or ($UP -eq "y")) { + $_ROSBE_SSVN_JOB = "update" + } + } + if ($_ROSBE_SSVN_JOB -eq "update") { + if ($args[1] -ne $null) { + $temparg = $args[1] + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" + } else { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" + } + } + "Do you want to see the changelog?" + $CL = Read-Host "Please enter 'yes' or 'no': " + if (($CL -eq "yes") -or ($CL -eq "y")) { + while ($OFFSVN -lt $ONSVN) { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' log -r $OFFSVN" + $OFFSVN += 1 + } } } if ($OFFSVN -eq $ONSVN) { @@ -37,12 +61,8 @@ $host.ui.RawUI.WindowTitle = "SVN Updating..." "This might take a while, so please be patient." "" - if ($args[1] -ne $null) { - $temparg = $args[1] - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" - } else { - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" - } + $_ROSBE_SSVN_JOB = "update" + UP } elseif ($args[0] -eq "cleanup") { $host.ui.RawUI.WindowTitle = "SVN Cleaning..." @@ -76,8 +96,7 @@ $host.ui.RawUI.WindowTitle = "SVN Status" "This might take a while, so please be patient." "" - $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | select-string "Revision:" - $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | select-string "Revision:" + $_ROSBE_SSVN_JOB = "status" UP } @@ -95,5 +114,7 @@ $OFFSVN = $null $ONSVN = $null $UP = $null +$CL = $null $dir = dir $temparg = $null +$_ROSBE_SSVN_JOB = $null

1 0

[dchapyshev] 40867: - Set error code if directory does not exist - NtCreateFile -> NtOpenFile
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 16:44:39 2009 New Revision: 40867 URL: http://svn.reactos.org/svn/reactos?rev=40867&view=rev Log: - Set error code if directory does not exist - NtCreateFile -> NtOpenFile Modified: trunk/reactos/dll/win32/kernel32/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Sat May 9 16:44:39 2009 @@ -531,7 +531,10 @@ &NtPathU, NULL, NULL)) + { + SetLastError(ERROR_PATH_NOT_FOUND); return FALSE; + } InitializeObjectAttributes(&ObjectAttributes, &NtPathU, @@ -541,21 +544,14 @@ TRACE("NtPathU '%S'\n", NtPathU.Buffer); - Status = NtCreateFile (&DirectoryHandle, - DELETE, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_DIRECTORY, /* 0x7 */ - 0, - FILE_OPEN, - FILE_DIRECTORY_FILE, /* 0x204021 */ - NULL, - 0); - - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NtPathU.Buffer); + Status = NtOpenFile(&DirectoryHandle, + DELETE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); + + RtlFreeUnicodeString(&NtPathU); if (!NT_SUCCESS(Status)) {

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