Ros-diffs September 2012

ros-diffs@reactos.org

17 participants
236 discussions

[tkreuzer] 57286: [GDI32] Fix SetTextAlign: - return GDI_ERROR (-1) not 0 on error - properly handle LAYOUT_RTL
by tkreuzer＠svn.reactos.org 12 Sep '12

12 Sep '12

Author: tkreuzer Date: Wed Sep 12 18:17:10 2012 New Revision: 57286 URL: http://svn.reactos.org/svn/reactos?rev=57286&view=rev Log: [GDI32] Fix SetTextAlign: - return GDI_ERROR (-1) not 0 on error - properly handle LAYOUT_RTL Modified: trunk/reactos/win32ss/gdi/gdi32/objects/text.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/text.c [iso-8859-1] Wed Sep 12 18:17:10 2012 @@ -572,7 +572,7 @@ UINT fMode) { PDC_ATTR Dc_Attr; - INT OldMode = 0; + INT OldMode; #if 0 if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -593,17 +593,16 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return OldMode; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return GDI_ERROR; OldMode = Dc_Attr->lTextAlign; Dc_Attr->lTextAlign = fMode; // Raw if (Dc_Attr->dwLayout & LAYOUT_RTL) { - if(!(fMode & TA_CENTER)) fMode |= TA_RIGHT; - } - Dc_Attr->flTextAlign = fMode & (TA_BASELINE|TA_UPDATECP|TA_CENTER); + if ((fMode & TA_CENTER) != TA_CENTER) fMode ^= TA_RIGHT; + } + Dc_Attr->flTextAlign = fMode & TA_MASK; return OldMode; - }

1 0

[ion] 57285: [NTOSKRNL]: I fail.
by ion＠svn.reactos.org 12 Sep '12

12 Sep '12

Author: ion Date: Wed Sep 12 17:06:49 2012 New Revision: 57285 URL: http://svn.reactos.org/svn/reactos?rev=57285&view=rev Log: [NTOSKRNL]: I fail. Modified: trunk/reactos/ntoskrnl/include/internal/se.h Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Wed Sep 12 17:06:49 2012 @@ -184,16 +184,21 @@ #define SepAcquireTokenLockExclusive(Token) \ +{ \ KeEnterCriticalRegion(); \ ExAcquireResourceExclusive(((PTOKEN)Token)->TokenLock, TRUE); \ - +} #define SepAcquireTokenLockShared(Token) \ +{ \ KeEnterCriticalRegion(); \ ExAcquireResourceShared(((PTOKEN)Token)->TokenLock, TRUE); \ +} #define SepReleaseTokenLock(Token) \ +{ \ ExReleaseResource(((PTOKEN)Token)->TokenLock); \ KeLeaveCriticalRegion(); \ +} // // Token Functions

1 0

[ion] 57284: [NTOSKRNL]: Use the token lock acquire/release macros that were already written instead of manually doing it. Also fix the macros since they didn't work in GCC. No functional change, j...
by ion＠svn.reactos.org 12 Sep '12

12 Sep '12

Author: ion Date: Wed Sep 12 16:29:28 2012 New Revision: 57284 URL: http://svn.reactos.org/svn/reactos?rev=57284&view=rev Log: [NTOSKRNL]: Use the token lock acquire/release macros that were already written instead of manually doing it. Also fix the macros since they didn't work in GCC. No functional change, just code cleanup. Modified: trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/se/access.c trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Wed Sep 12 16:29:28 2012 @@ -1,4 +1,28 @@ #pragma once + +typedef struct _KNOWN_ACE +{ + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG SidStart; +} KNOWN_ACE, *PKNOWN_ACE; + +typedef struct _KNOWN_OBJECT_ACE +{ + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG Flags; + ULONG SidStart; +} KNOWN_OBJECT_ACE, *PKNOWN_OBJECT_ACE; + +typedef struct _KNOWN_COMPOUND_ACE +{ + ACE_HEADER Header; + ACCESS_MASK Mask; + USHORT CompoundAceType; + USHORT Reserved; + ULONG SidStart; +} KNOWN_COMPOUND_ACE, *PKNOWN_COMPOUND_ACE; PSID FORCEINLINE @@ -75,6 +99,8 @@ return Descriptor->Sacl; } } + +#ifndef RTL_H /* SID Authorities */ extern SID_IDENTIFIER_AUTHORITY SeNullSidAuthority; @@ -156,6 +182,19 @@ extern PSECURITY_DESCRIPTOR SeSystemDefaultSd; extern PSECURITY_DESCRIPTOR SeUnrestrictedSd; + +#define SepAcquireTokenLockExclusive(Token) \ + KeEnterCriticalRegion(); \ + ExAcquireResourceExclusive(((PTOKEN)Token)->TokenLock, TRUE); \ + +#define SepAcquireTokenLockShared(Token) \ + KeEnterCriticalRegion(); \ + ExAcquireResourceShared(((PTOKEN)Token)->TokenLock, TRUE); \ + +#define SepReleaseTokenLock(Token) \ + ExReleaseResource(((PTOKEN)Token)->TokenLock); \ + KeLeaveCriticalRegion(); \ + // // Token Functions // @@ -434,24 +473,6 @@ OUT PACCESS_TOKEN* NewToken ); -#define SepAcquireTokenLockExclusive(Token) \ - do { \ - KeEnterCriticalRegion(); \ - ExAcquireResourceExclusive(((PTOKEN)Token)->TokenLock, TRUE); \ - while(0) - -#define SepAcquireTokenLockShared(Token) \ - do { \ - KeEnterCriticalRegion(); \ - ExAcquireResourceShared(((PTOKEN)Token)->TokenLock, TRUE); \ - while(0) - -#define SepReleaseTokenLock(Token) \ - do { \ - ExReleaseResource(((PTOKEN)Token)->TokenLock); \ - KeLeaveCriticalRegion(); \ - while(0) - VOID NTAPI SeQuerySecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, OUT PACCESS_MASK DesiredAccess); @@ -460,4 +481,6 @@ SeSetSecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, OUT PACCESS_MASK DesiredAccess); +#endif + /* EOF */ Modified: trunk/reactos/ntoskrnl/se/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/access.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] Wed Sep 12 16:29:28 2012 @@ -130,11 +130,7 @@ ASSERT(Sid != NULL); /* Lock the token if needed */ - if (!TokenLocked) - { - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(Token->TokenLock, TRUE); - } + if (!TokenLocked) SepAcquireTokenLockShared(Token); /* Check if the owner SID is found, handling restricted case as well */ Result = SepSidInToken(Token, Sid); @@ -144,11 +140,7 @@ } /* Release the lock if we had acquired it */ - if (!TokenLocked) - { - ExReleaseResourceLite(Token->TokenLock); - KeLeaveCriticalRegion(); - } + if (!TokenLocked) SepReleaseTokenLock(Token); /* Return the result */ return Result; @@ -168,15 +160,13 @@ TokenControl->TokenSource = Token->TokenSource; /* Lock the token */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(Token->TokenLock, TRUE); + SepAcquireTokenLockShared(Token); /* Capture the modified it */ TokenControl->ModifiedId = Token->ModifiedId; /* Unlock it */ - ExReleaseResourceLite(Token->TokenLock); - KeLeaveCriticalRegion(); + SepReleaseTokenLock(Token); } NTSTATUS @@ -327,13 +317,11 @@ ClientToken = SubjectContext->ClientToken; /* Always lock the primary */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(PrimaryToken->TokenLock, TRUE); + SepAcquireTokenLockShared(PrimaryToken); /* Lock the impersonation one if it's there */ if (!ClientToken) return; - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(ClientToken->TokenLock, TRUE); + SepAcquireTokenLockShared(ClientToken); } /* @@ -351,13 +339,11 @@ ClientToken = SubjectContext->ClientToken; /* Always unlock the primary one */ - ExReleaseResourceLite(PrimaryToken->TokenLock); - KeLeaveCriticalRegion(); + SepReleaseTokenLock(PrimaryToken); /* Unlock the impersonation one if it's there */ if (!ClientToken) return; - ExReleaseResourceLite(ClientToken->TokenLock); - KeLeaveCriticalRegion(); + SepReleaseTokenLock(ClientToken); } /* Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Wed Sep 12 16:29:28 2012 @@ -952,8 +952,7 @@ SeCaptureSubjectContext(&SubjectSecurityContext); /* Lock the token */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(Token->TokenLock, TRUE); + SepAcquireTokenLockShared(Token); /* Check if the token is the owner and grant WRITE_DAC and READ_CONTROL rights */ if (DesiredAccess & (WRITE_DAC | READ_CONTROL | MAXIMUM_ALLOWED)) @@ -990,8 +989,7 @@ /* Release subject context and unlock the token */ SeReleaseSubjectContext(&SubjectSecurityContext); - ExReleaseResourceLite(Token->TokenLock); - KeLeaveCriticalRegion(); + SepReleaseTokenLock(Token); /* Release the captured security descriptor */ SeReleaseSecurityDescriptor(CapturedSecurityDescriptor,

1 0

[tkreuzer] 57283: [FREELDR] Finally commit the patch to improve freeldr disk performance by Carlo Bramini. Obviously someone wants to read 0 bytes and that should not fail.
by tkreuzer＠svn.reactos.org 11 Sep '12

11 Sep '12

Author: tkreuzer Date: Tue Sep 11 21:15:39 2012 New Revision: 57283 URL: http://svn.reactos.org/svn/reactos?rev=57283&view=rev Log: [FREELDR] Finally commit the patch to improve freeldr disk performance by Carlo Bramini. Obviously someone wants to read 0 bytes and that should not fail. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Tue Sep 11 21:15:39 2012 @@ -114,31 +114,45 @@ { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); UCHAR* Ptr = (UCHAR*)Buffer; - ULONG i, Length; + ULONG Length, TotalSectors, MaxSectors, ReadSectors; BOOLEAN ret; - - *Count = 0; - i = 0; - while (N > 0) - { - Length = N; - if (Length > Context->SectorSize) - Length = Context->SectorSize; + ULONGLONG SectorOffset; + + TotalSectors = (N + Context->SectorSize - 1) / Context->SectorSize; + MaxSectors = DISKREADBUFFER_SIZE / Context->SectorSize; + SectorOffset = Context->SectorNumber + Context->SectorOffset; + + ret = 1; + + while (TotalSectors) + { + ReadSectors = TotalSectors; + if (ReadSectors > MaxSectors) + ReadSectors = MaxSectors; + ret = MachDiskReadLogicalSectors( Context->DriveNumber, - Context->SectorNumber + Context->SectorOffset + i, - 1, + SectorOffset, + ReadSectors, (PVOID)DISKREADBUFFER); if (!ret) - return EIO; + break; + + Length = ReadSectors * Context->SectorSize; + if (Length > N) + Length = N; + RtlCopyMemory(Ptr, (PVOID)DISKREADBUFFER, Length); + Ptr += Length; - *Count += Length; N -= Length; - i++; - } - - return ESUCCESS; + SectorOffset += ReadSectors; + TotalSectors -= ReadSectors; + } + + *Count = Ptr - (UCHAR *)Buffer; + + return (!ret) ? EIO : ESUCCESS; } static LONG DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode)

1 0

[tfaber] 57282: [KMIXER] - Fix Pin_fnFastWrite return value in failure case. Patch by Vincenzo Cotugno
by tfaber＠svn.reactos.org 11 Sep '12

11 Sep '12

Author: tfaber Date: Tue Sep 11 21:13:21 2012 New Revision: 57282 URL: http://svn.reactos.org/svn/reactos?rev=57282&view=rev Log: [KMIXER] - Fix Pin_fnFastWrite return value in failure case. Patch by Vincenzo Cotugno Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Tue Sep 11 21:13:21 2012 @@ -673,7 +673,7 @@ if (NT_SUCCESS(Status)) return TRUE; else - return TRUE; + return FALSE; } static KSDISPATCH_TABLE PinTable =

1 0

[tkreuzer] 57281: [FREELDR] Revert once again. testbot hates me. sigh...
by tkreuzer＠svn.reactos.org 11 Sep '12

11 Sep '12

Author: tkreuzer Date: Tue Sep 11 19:11:56 2012 New Revision: 57281 URL: http://svn.reactos.org/svn/reactos?rev=57281&view=rev Log: [FREELDR] Revert once again. testbot hates me. sigh... Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Tue Sep 11 19:11:56 2012 @@ -114,45 +114,31 @@ { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); UCHAR* Ptr = (UCHAR*)Buffer; - ULONG Length, TotalSectors, MaxSectors, ReadSectors; + ULONG i, Length; BOOLEAN ret; - ULONGLONG SectorOffset; - - TotalSectors = (N + Context->SectorSize - 1) / Context->SectorSize; - MaxSectors = 1;//DISKREADBUFFER_SIZE / Context->SectorSize; - SectorOffset = Context->SectorNumber + Context->SectorOffset; - - ret = 0; - + + *Count = 0; + i = 0; while (N > 0) { - ReadSectors = TotalSectors; - if (ReadSectors > MaxSectors) - ReadSectors = MaxSectors; - + Length = N; + if (Length > Context->SectorSize) + Length = Context->SectorSize; ret = MachDiskReadLogicalSectors( Context->DriveNumber, - SectorOffset, - ReadSectors, + Context->SectorNumber + Context->SectorOffset + i, + 1, (PVOID)DISKREADBUFFER); if (!ret) - break; - - Length = ReadSectors * Context->SectorSize; - if (Length > N) - Length = N; - + return EIO; RtlCopyMemory(Ptr, (PVOID)DISKREADBUFFER, Length); - Ptr += Length; + *Count += Length; N -= Length; - SectorOffset += ReadSectors; - TotalSectors -= ReadSectors; - } - - *Count = Ptr - (UCHAR *)Buffer; - - return (!ret) ? EIO : ESUCCESS; + i++; + } + + return ESUCCESS; } static LONG DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode)

1 0

[akhaldi] 57280: [FREELDR/SETUPLDR] * Make freeldr_common depend on bugcodes and remove this dependency from the other targets. * Improve those conditions readability a bit.
by akhaldi＠svn.reactos.org 11 Sep '12

11 Sep '12

Author: akhaldi Date: Tue Sep 11 18:10:29 2012 New Revision: 57280 URL: http://svn.reactos.org/svn/reactos?rev=57280&view=rev Log: [FREELDR/SETUPLDR] * Make freeldr_common depend on bugcodes and remove this dependency from the other targets. * Improve those conditions readability a bit. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Tue Sep 11 18:10:29 2012 @@ -148,12 +148,12 @@ #TBD endif() -if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7) +if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) add_library(freeldr_common OBJECT ${FREELDR_COMMON_SOURCE}) else() add_library(freeldr_common ${FREELDR_COMMON_SOURCE}) - add_dependencies(freeldr_common bugcodes) -endif() +endif() +add_dependencies(freeldr_common bugcodes) if(ARCH STREQUAL "i386" AND NOT MSVC) list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S) @@ -168,12 +168,9 @@ list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def) endif() - -if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7) +if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) - add_dependencies(freeldr_pe bugcodes) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) - add_dependencies(freeldr_pe_dbg bugcodes) else() add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE}) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) @@ -231,11 +228,9 @@ list(APPEND SETUPLDR_SOURCE windows/setupldr.c) endif() -if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7) +if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) - add_dependencies(setupldr_pe bugcodes) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) - add_dependencies(setupldr_pe_dbg bugcodes) else() add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) @@ -265,7 +260,7 @@ target_link_libraries(setupldr_pe_dbg mini_hal) endif() -if(MSVC OR NOT CMAKE_VERSION VERSION_GREATER 2.8.7) +if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7)) target_link_libraries(setupldr_pe freeldr_common) target_link_libraries(setupldr_pe_dbg freeldr_common) endif()

1 0

[tfaber] 57277: [SYSSETUP] - Use a writable buffer for lpCommandLine in CreateProcessW. Simplify starting of control panel applets. Patch by Hermès Bélusca. - CORE-6570 #resolve #comment We need Fi...
by tfaber＠svn.reactos.org 11 Sep '12

11 Sep '12

Author: tfaber Date: Tue Sep 11 17:08:38 2012 New Revision: 57277 URL: http://svn.reactos.org/svn/reactos?rev=57277&view=rev Log: [SYSSETUP] - Use a writable buffer for lpCommandLine in CreateProcessW. Simplify starting of control panel applets. Patch by Hermès Bélusca. - CORE-6570 #resolve #comment We need FishEye ;) Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Tue Sep 11 17:08:38 2012 @@ -786,33 +786,45 @@ static BOOL -RunControlPanelApplet(HWND hwnd, WCHAR *lpCommandLine) -{ - STARTUPINFOW StartupInfo; - PROCESS_INFORMATION ProcessInformation; - - ZeroMemory(&StartupInfo, sizeof(STARTUPINFOW)); - StartupInfo.cb = sizeof(STARTUPINFOW); - - if (!CreateProcessW(NULL, - lpCommandLine, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &StartupInfo, - &ProcessInformation)) - { - MessageBoxW(hwnd, L"Error: failed to launch rundll32", NULL, MB_ICONERROR); +RunControlPanelApplet(HWND hwnd, PCWSTR pwszCPLParameters) +{ + if (pwszCPLParameters) + { + STARTUPINFOW StartupInfo; + PROCESS_INFORMATION ProcessInformation; + WCHAR CmdLine[MAX_PATH] = L"rundll32.exe shell32.dll,Control_RunDLL "; + + ZeroMemory(&StartupInfo, sizeof(STARTUPINFOW)); + StartupInfo.cb = sizeof(STARTUPINFOW); + + ASSERT(_countof(CmdLine) > wcslen(CmdLine) + wcslen(pwszCPLParameters)); + wcscat(CmdLine, pwszCPLParameters); + + if (!CreateProcessW(NULL, + CmdLine, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &StartupInfo, + &ProcessInformation)) + { + MessageBoxW(hwnd, L"Error: Failed to launch the Control Panel Applet.", NULL, MB_ICONERROR); + return FALSE; + } + + WaitForSingleObject(ProcessInformation.hProcess, INFINITE); + CloseHandle(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hProcess); + return TRUE; + } + else + { + MessageBoxW(hwnd, L"Error: Failed to launch the Control Panel Applet.", NULL, MB_ICONERROR); return FALSE; } - - WaitForSingleObject(ProcessInformation.hProcess, INFINITE); - CloseHandle(ProcessInformation.hThread); - CloseHandle(ProcessInformation.hProcess); - return TRUE; } static VOID @@ -866,12 +878,12 @@ switch (LOWORD(wParam)) { case IDC_CUSTOMLOCALE: - RunControlPanelApplet(hwndDlg, L"rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,5"); + RunControlPanelApplet(hwndDlg, L"intl.cpl,,5"); /* FIXME: Update input locale name */ break; case IDC_CUSTOMLAYOUT: - RunControlPanelApplet(hwndDlg, L"rundll32.exe shell32.dll,Control_RunDLL input.dll,@1"); + RunControlPanelApplet(hwndDlg, L"input.dll,@1"); break; } } @@ -888,13 +900,18 @@ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (SetupData->UnattendSetup) { - WCHAR wszPath[MAX_PATH], wszBuf[1024]; + WCHAR wszPath[MAX_PATH]; if (GetRosInstallCD(wszPath, _countof(wszPath))) - swprintf(wszBuf, L"rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,/f:\"%sreactos\\unattend.inf\"", wszPath); + { + WCHAR wszParams[1024]; + swprintf(wszParams, L"intl.cpl,,/f:\"%sreactos\\unattend.inf\"", wszPath); + RunControlPanelApplet(hwndDlg, wszParams); + } else - wcscpy(wszBuf, L"rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,/f:\"unattend.inf\""); - - RunControlPanelApplet(hwndDlg, wszBuf); + { + RunControlPanelApplet(hwndDlg, L"intl.cpl,,/f:\"unattend.inf\""); + } + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); return TRUE; }

1 0

[tkreuzer] 57276: [FREELDR] - Remove the FILESYSBUFFER from the memory layout, grow the DISKREADBUFFER to 64 KB
by tkreuzer＠svn.reactos.org 11 Sep '12

11 Sep '12

Author: tkreuzer Date: Tue Sep 11 14:45:24 2012 New Revision: 57276 URL: http://svn.reactos.org/svn/reactos?rev=57276&view=rev Log: [FREELDR] - Remove the FILESYSBUFFER from the memory layout, grow the DISKREADBUFFER to 64 KB Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Tue Sep 11 14:45:24 2012 @@ -29,15 +29,13 @@ #define MAX_BIOS_DESCRIPTORS 32 #define FREELDR_BASE_PAGE (FREELDR_BASE / PAGE_SIZE) -#define FILEBUF_BASE_PAGE (FILESYSBUFFER / PAGE_SIZE) #define DISKBUF_BASE_PAGE (DISKREADBUFFER / PAGE_SIZE) -#define STACK_BASE_PAGE (DISKBUF_BASE_PAGE + 1) +#define STACK_BASE_PAGE (STACKLOWLIMIT / PAGE_SIZE) #define STACK_END_PAGE (STACK32ADDR / PAGE_SIZE) #define BIOSBUF_BASE_PAGE (BIOSCALLBUFFER / PAGE_SIZE) -#define FREELDR_PAGE_COUNT (FILEBUF_BASE_PAGE - FREELDR_BASE_PAGE) -#define FILEBUF_PAGE_COUNT (DISKBUF_BASE_PAGE - FILEBUF_BASE_PAGE) -#define DISKBUF_PAGE_COUNT (1) +#define FREELDR_PAGE_COUNT (DISKBUF_BASE_PAGE - FREELDR_BASE_PAGE) +#define DISKBUF_PAGE_COUNT (STACK_BASE_PAGE - DISKBUF_BASE_PAGE) #define STACK_PAGE_COUNT (STACK_END_PAGE - STACK_BASE_PAGE) #define BIOSBUF_PAGE_COUNT (1) @@ -49,7 +47,6 @@ { LoaderFirmwarePermanent, 0x00, 1 }, // realmode int vectors { LoaderFirmwareTemporary, 0x01, FREELDR_BASE_PAGE - 1 }, // freeldr stack + cmdline { LoaderLoadedProgram, FREELDR_BASE_PAGE, FREELDR_PAGE_COUNT }, // freeldr image - { LoaderFirmwareTemporary, FILEBUF_BASE_PAGE, FILEBUF_PAGE_COUNT }, // File system read buffer. FILESYSBUFFER { LoaderFirmwareTemporary, DISKBUF_BASE_PAGE, DISKBUF_PAGE_COUNT }, // Disk read buffer for int 13h. DISKREADBUFFER { LoaderOsloaderStack, STACK_BASE_PAGE, STACK_PAGE_COUNT }, // prot mode stack. { LoaderFirmwareTemporary, BIOSBUF_BASE_PAGE, BIOSBUF_PAGE_COUNT }, // BIOSCALLBUFFER Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Tue Sep 11 14:45:24 2012 @@ -13,12 +13,12 @@ #define BSS_START HEX(6F00) #define FREELDR_BASE HEX(F800) #define FREELDR_PE_BASE HEX(10000) -#define FILESYSBUFFER HEX(80000) /* Buffer to store file system data (e.g. cluster buffer for FAT) */ -#define DISKREADBUFFER HEX(90000) /* Buffer to store data read in from the disk via the BIOS */ +#define DISKREADBUFFER HEX(80000) /* Buffer to store data read in from the disk via the BIOS */ +#define STACKLOWLIMIT HEX(90000) #define STACK32ADDR HEX(98000) /* The 32-bit stack top will be at 9000:8000, or 0xA8000 */ #define STACK64ADDR HEX(98000) /* The 64-bit stack top will be at 98000 */ #define BIOSCALLBUFFER HEX(98000) /* Buffer to store temporary data for any Int386() call */ -#define DISKREADBUFFER_SIZE 512 +#define DISKREADBUFFER_SIZE HEX(10000) #define BIOSCALLBUFSEGMENT (BIOSCALLBUFFER/16) /* Buffer to store temporary data for any Int386() call */ #define BIOSCALLBUFOFFSET HEX(0000) /* Buffer to store temporary data for any Int386() call */

1 0

[tkreuzer] 57275: revert r57274. Looks like testbot doesn't like it.
by tkreuzer＠svn.reactos.org 11 Sep '12

11 Sep '12

Author: tkreuzer Date: Tue Sep 11 12:17:38 2012 New Revision: 57275 URL: http://svn.reactos.org/svn/reactos?rev=57275&view=rev Log: revert r57274. Looks like testbot doesn't like it. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Tue Sep 11 12:17:38 2012 @@ -113,47 +113,32 @@ static LONG DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); - UCHAR * Ptr = (UCHAR*)Buffer; - ULONG Length, TotalSectors, MaxSectors, ReadSectors; - BOOLEAN ret; - ULONGLONG SectorOffset; - - TotalSectors = (N + Context->SectorSize - 1) / Context->SectorSize; - MaxSectors = DISKREADBUFFER_SIZE / Context->SectorSize; - SectorOffset = Context->SectorNumber + Context->SectorOffset; - - ret = 0; - - while (TotalSectors) - { - ReadSectors = TotalSectors; - if (ReadSectors > MaxSectors) - ReadSectors = MaxSectors; - + UCHAR* Ptr = (UCHAR*)Buffer; + ULONG i, Length; + BOOLEAN ret; + + *Count = 0; + i = 0; + while (N > 0) + { + Length = N; + if (Length > Context->SectorSize) + Length = Context->SectorSize; ret = MachDiskReadLogicalSectors( Context->DriveNumber, - SectorOffset, - ReadSectors, + Context->SectorNumber + Context->SectorOffset + i, + 1, (PVOID)DISKREADBUFFER); if (!ret) - break; - - Length = ReadSectors * Context->SectorSize; - if (Length > N) - Length = N; - + return EIO; RtlCopyMemory(Ptr, (PVOID)DISKREADBUFFER, Length); - Ptr += Length; - N -= Length; - - SectorOffset += ReadSectors; - TotalSectors -= ReadSectors; - } - - *Count = Ptr - (UCHAR *)Buffer; - - return (!ret) ? EIO : ESUCCESS; + *Count += Length; + N -= Length; + i++; + } + + return ESUCCESS; } static LONG DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Tue Sep 11 12:17:38 2012 @@ -29,13 +29,15 @@ #define MAX_BIOS_DESCRIPTORS 32 #define FREELDR_BASE_PAGE (FREELDR_BASE / PAGE_SIZE) +#define FILEBUF_BASE_PAGE (FILESYSBUFFER / PAGE_SIZE) #define DISKBUF_BASE_PAGE (DISKREADBUFFER / PAGE_SIZE) -#define STACK_BASE_PAGE (STACKLOWLIMIT / PAGE_SIZE) +#define STACK_BASE_PAGE (DISKBUF_BASE_PAGE + 1) #define STACK_END_PAGE (STACK32ADDR / PAGE_SIZE) #define BIOSBUF_BASE_PAGE (BIOSCALLBUFFER / PAGE_SIZE) -#define FREELDR_PAGE_COUNT (DISKBUF_BASE_PAGE - FREELDR_BASE_PAGE) -#define DISKBUF_PAGE_COUNT (STACK_BASE_PAGE - DISKBUF_BASE_PAGE) +#define FREELDR_PAGE_COUNT (FILEBUF_BASE_PAGE - FREELDR_BASE_PAGE) +#define FILEBUF_PAGE_COUNT (DISKBUF_BASE_PAGE - FILEBUF_BASE_PAGE) +#define DISKBUF_PAGE_COUNT (1) #define STACK_PAGE_COUNT (STACK_END_PAGE - STACK_BASE_PAGE) #define BIOSBUF_PAGE_COUNT (1) @@ -47,6 +49,7 @@ { LoaderFirmwarePermanent, 0x00, 1 }, // realmode int vectors { LoaderFirmwareTemporary, 0x01, FREELDR_BASE_PAGE - 1 }, // freeldr stack + cmdline { LoaderLoadedProgram, FREELDR_BASE_PAGE, FREELDR_PAGE_COUNT }, // freeldr image + { LoaderFirmwareTemporary, FILEBUF_BASE_PAGE, FILEBUF_PAGE_COUNT }, // File system read buffer. FILESYSBUFFER { LoaderFirmwareTemporary, DISKBUF_BASE_PAGE, DISKBUF_PAGE_COUNT }, // Disk read buffer for int 13h. DISKREADBUFFER { LoaderOsloaderStack, STACK_BASE_PAGE, STACK_PAGE_COUNT }, // prot mode stack. { LoaderFirmwareTemporary, BIOSBUF_BASE_PAGE, BIOSBUF_PAGE_COUNT }, // BIOSCALLBUFFER Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Tue Sep 11 12:17:38 2012 @@ -13,12 +13,12 @@ #define BSS_START HEX(6F00) #define FREELDR_BASE HEX(F800) #define FREELDR_PE_BASE HEX(10000) -#define DISKREADBUFFER HEX(80000) /* Buffer to store data read in from the disk via the BIOS */ -#define STACKLOWLIMIT HEX(90000) +#define FILESYSBUFFER HEX(80000) /* Buffer to store file system data (e.g. cluster buffer for FAT) */ +#define DISKREADBUFFER HEX(90000) /* Buffer to store data read in from the disk via the BIOS */ #define STACK32ADDR HEX(98000) /* The 32-bit stack top will be at 9000:8000, or 0xA8000 */ #define STACK64ADDR HEX(98000) /* The 64-bit stack top will be at 98000 */ #define BIOSCALLBUFFER HEX(98000) /* Buffer to store temporary data for any Int386() call */ -#define DISKREADBUFFER_SIZE HEX(10000) +#define DISKREADBUFFER_SIZE 512 #define BIOSCALLBUFSEGMENT (BIOSCALLBUFFER/16) /* Buffer to store temporary data for any Int386() call */ #define BIOSCALLBUFOFFSET HEX(0000) /* Buffer to store temporary data for any Int386() call */

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
24
Older →

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 September 2012