Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[ekohl] 65836: [SYSDM] Fix startup and recovery option dialog issues. Patch by Ricardo Hanke. Thanks a lot! CORE-8952 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Dec 26 13:11:57 2014 New Revision: 65836 URL: http://svn.reactos.org/svn/reactos?rev=65836&view=rev Log: [SYSDM] Fix startup and recovery option dialog issues. Patch by Ricardo Hanke. Thanks a lot! CORE-8952 #resolve Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ===================================================================… [View More]=========== --- trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Fri Dec 26 13:11:57 2014 @@ -22,6 +22,7 @@ INT iFreeLdrIni; } STARTINFO, *PSTARTINFO; +BOOL SaveRecoveryOptions; static VOID SetTimeout(HWND hwndDlg, INT Timeout) @@ -544,13 +545,21 @@ HKEY hKey; DWORD lResult; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"System\\CurrentControlSet\\Control\\CrashControl", - 0, - KEY_WRITE, - &hKey) != ERROR_SUCCESS) - { - /* Failed to open key */ + lResult = (DWORD)RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\CrashControl", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + NULL); + if (lResult != ERROR_SUCCESS) + { + /* Failed to open key */ + SetLastError(lResult); + ShowLastWin32Error(hwndDlg); + return; } @@ -587,15 +596,31 @@ { HKEY hKey; WCHAR szName[MAX_PATH]; - DWORD dwValue, dwValueLength, dwType; - - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"System\\CurrentControlSet\\Control\\CrashControl", - 0, - KEY_READ, - &hKey) != ERROR_SUCCESS) + DWORD dwValue, dwValueLength, dwType, dwResult; + + dwResult = (DWORD)RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\CrashControl", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ, + NULL, + &hKey, + NULL); + if (dwResult != ERROR_SUCCESS) { /* Failed to open key */ + SetLastError(dwResult); + ShowLastWin32Error(hwndDlg); + + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECWRITEEVENT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECSENDALERT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECRESTART), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECDEBUGCOMBO), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECDUMPFILE), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECOVERWRITE), FALSE); + + SaveRecoveryOptions = FALSE; return; } @@ -633,7 +658,7 @@ SendDlgItemMessageW(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szName); } - if (LoadString(hApplet, IDS_FULL_DUMP, szName, sizeof(szName) / sizeof(WCHAR))) + if (LoadStringW(hApplet, IDS_FULL_DUMP, szName, sizeof(szName) / sizeof(WCHAR))) { szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; SendDlgItemMessageW(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szName); @@ -653,6 +678,8 @@ SetCrashDlgItems(hwndDlg, pStartInfo); RegCloseKey(hKey); + + SaveRecoveryOptions = TRUE; } @@ -748,7 +775,11 @@ } } - WriteStartupRecoveryOptions(hwndDlg, pStartInfo); + if (SaveRecoveryOptions) + { + WriteStartupRecoveryOptions(hwndDlg, pStartInfo); + } + EndDialog(hwndDlg, LOWORD(wParam)); return TRUE; [View Less]

10 years, 7 months

[hbelusca] 65835: [WIN32K]: Anecdotal formatting/renaming changes before reusing this code in other parts of wijn32k.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Dec 26 12:06:43 2014 New Revision: 65835 URL: http://svn.reactos.org/svn/reactos?rev=65835&view=rev Log: [WIN32K]: Anecdotal formatting/renaming changes before reusing this code in other parts of wijn32k. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/… [View More]win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Fri Dec 26 12:06:43 2014 @@ -726,7 +726,7 @@ classes will be allocated from the shared heap */ UserRegisterSystemClasses(); - while(TRUE) + while (TRUE) { Ret = co_IntGetPeekMessage(&Msg, 0, 0, 0, PM_REMOVE, TRUE); if (Ret) @@ -1892,9 +1892,9 @@ TRACE("IntMapDesktopView called for desktop object 0x%p\n", pdesk); ppi = PsGetCurrentProcessWin32Process(); - PrevLink = &ppi->HeapMappings.Next; /* Find out if another thread already mapped the desktop heap */ + PrevLink = &ppi->HeapMappings.Next; HeapMapping = *PrevLink; while (HeapMapping != NULL) { @@ -1904,7 +1904,7 @@ return STATUS_SUCCESS; } - PrevLink = &HeapMapping->Next; + PrevLink = &HeapMapping->Next; HeapMapping = HeapMapping->Next; } Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Fri Dec 26 12:06:43 2014 @@ -153,7 +153,7 @@ StartTheTimers(); UserLeave(); - for(;;) + for (;;) { if (!ghMouseDevice) { @@ -300,7 +300,7 @@ * CreateSystemThreads * * Called form dedicated thread in CSRSS. RIT is started in context of this - * thread because it needs valid Win32 process with TEB initialized + * thread because it needs valid Win32 process with TEB initialized. */ DWORD NTAPI CreateSystemThreads(UINT Type) Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Fri Dec 26 12:06:43 2014 @@ -53,7 +53,7 @@ static NTSTATUS -CreateProcessInfo(PEPROCESS Process) +UserCreateProcessInfo(PEPROCESS Process) { PPROCESSINFO ppiCurrent; NTSTATUS Status; @@ -94,7 +94,7 @@ TRACE_CH(UserProcess,"Allocated ppi 0x%p for PID:0x%lx\n", ppiCurrent, HandleToUlong(Process->UniqueProcessId)); - /* map the global heap into the process */ + /* Map the global heap into the process */ Offset.QuadPart = 0; Status = MmMapViewOfSection(GlobalUserHeapSection, PsGetCurrentProcess(), @@ -133,14 +133,13 @@ KeInitializeEvent(ppiCurrent->InputIdleEvent, NotificationEvent, FALSE); - - /* map the gdi handle table to user land */ + /* Map the gdi handle table to user land */ Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(Process); Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT; pParams = Process->Peb->ProcessParameters; ppiCurrent->peProcess = Process; - /* setup process flags */ + /* Setup process flags */ ppiCurrent->W32PF_flags = W32PF_THREADCONNECTED; if ( pParams && @@ -150,7 +149,7 @@ ppiCurrent->W32PF_flags |= W32PF_SCREENSAVER; } - // Fixme check if this process is allowed. + // FIXME: check if this process is allowed. ppiCurrent->W32PF_flags |= W32PF_ALLOWFOREGROUNDACTIVATE; // Starting application it will get toggled off. /* Create pools for GDI object attributes */ @@ -171,7 +170,7 @@ static NTSTATUS -DestroyProcessInfo(PEPROCESS Process) +UserDestroyProcessInfo(PEPROCESS Process) { PPROCESSINFO ppiCurrent, *pppi; @@ -288,11 +287,11 @@ if (Create) { - Status = CreateProcessInfo(Process); + Status = UserCreateProcessInfo(Process); } else { - Status = DestroyProcessInfo(Process); + Status = UserDestroyProcessInfo(Process); } UserLeave(); [View Less]

10 years, 7 months

[pschweitzer] 65834: [DXDIAG] Update French translation

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Dec 26 11:40:17 2014 New Revision: 65834 URL: http://svn.reactos.org/svn/reactos?rev=65834&view=rev Log: [DXDIAG] Update French translation Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/… [View More]

10 years, 7 months

[hpoussin] 65833: [FREELDR] Support custom SystemPath and ramdisk in setup phase We can now start ReactOS installation via PXE boot.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Dec 26 11:38:43 2014 New Revision: 65833 URL: http://svn.reactos.org/svn/reactos?rev=65833&view=rev Log: [FREELDR] Support custom SystemPath and ramdisk in setup phase We can now start ReactOS installation via PXE boot. Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/… [View More]boot/freeldr/freeldr/inffi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c [iso-8859-1] Fri Dec 26 11:38:43 2014 @@ -952,8 +952,8 @@ // // Open the .inf file // - FileId = FsOpenFile(FileName); - if (!FileId) + ret = ArcOpen((PCHAR)FileName, OpenReadOnly, &FileId); + if (ret != ESUCCESS) { return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] Fri Dec 26 11:38:43 2014 @@ -138,6 +138,12 @@ LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, IN USHORT OperatingSystemVersion) { + ULONG_PTR SectionId; + PCSTR SectionName = OperatingSystem->SystemPartition; + CHAR SettingsValue[80]; + BOOLEAN HasSection; + CHAR BootOptions2[256]; + PCHAR File; CHAR FileName[512]; CHAR BootPath[512]; LPCSTR LoadOptions; @@ -151,25 +157,74 @@ LPCSTR SystemPath; LPCSTR SourcePaths[] = { - "\\", /* Only for floppy boot */ + "", /* Only for floppy boot */ #if defined(_M_IX86) - "\\I386\\", + "I386\\", #elif defined(_M_MPPC) - "\\PPC\\", + "PPC\\", #elif defined(_M_MRX000) - "\\MIPS\\", + "MIPS\\", #endif - "\\reactos\\", + "reactos\\", NULL }; - /* Get boot path */ - MachDiskGetBootPath(BootPath, sizeof(BootPath)); + /* Get OS setting value */ + SettingsValue[0] = ANSI_NULL; + IniOpenSection("Operating Systems", &SectionId); + IniReadSettingByName(SectionId, SectionName, SettingsValue, sizeof(SettingsValue)); + + /* Open the operating system section specified in the .ini file */ + HasSection = IniOpenSection(SectionName, &SectionId); + + UiDrawBackdrop(); + UiDrawProgressBarCenter(1, 100, "Loading NT..."); + + /* Read the system path is set in the .ini file */ + if (!HasSection || + !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) + { + MachDiskGetBootPath(BootPath, sizeof(BootPath)); + } + + /* Append a backslash */ + if ((strlen(BootPath)==0) || BootPath[strlen(BootPath)] != '\\') + strcat(BootPath, "\\"); + + /* Read booting options */ + if (!HasSection || !IniReadSettingByName(SectionId, "Options", BootOptions2, sizeof(BootOptions2))) + { + /* Get options after the title */ + PCSTR p = SettingsValue; + while (*p == ' ' || *p == '"') + p++; + while (*p != '\0' && *p != '"') + p++; + strcpy(BootOptions2, p); + TRACE("BootOptions: '%s'\n", BootOptions2); + } + + /* Check if a ramdisk file was given */ + File = strstr(BootOptions2, "/RDPATH="); + if (File) + { + /* Copy the file name and everything else after it */ + strcpy(FileName, File + 8); + + /* Null-terminate */ + *strstr(FileName, " ") = ANSI_NULL; + + /* Load the ramdisk */ + RamDiskLoadVirtualFile(FileName); + } + + TRACE("BootPath: '%s'\n", BootPath); /* And check if we booted from floppy */ BootFromFloppy = strstr(BootPath, "fdisk") != NULL; /* Open 'txtsetup.sif' from any of source paths */ + File = BootPath + strlen(BootPath); for (i = BootFromFloppy ? 0 : 1; ; i++) { SystemPath = SourcePaths[i]; @@ -178,10 +233,10 @@ ERR("Failed to open txtsetup.sif\n"); return; } - sprintf(FileName, "%stxtsetup.sif", SystemPath); - if (InfOpenFile (&InfHandle, FileName, &ErrorLine)) + sprintf(File, "%stxtsetup.sif", SystemPath); + if (InfOpenFile (&InfHandle, BootPath, &ErrorLine)) { - strcat(BootPath, SystemPath); + sprintf(File, "%s", SystemPath); break; } } [View Less]

10 years, 7 months

[hpoussin] 65832: [FREELDR] Merge setupldr_pe and freeldr_pe

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Dec 26 11:38:39 2014 New Revision: 65832 URL: http://svn.reactos.org/svn/reactos?rev=65832&view=rev Log: [FREELDR] Merge setupldr_pe and freeldr_pe Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ==============================================================… [View More]================ --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Fri Dec 26 11:38:39 2014 @@ -169,9 +169,14 @@ list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S) endif() +if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") + list(APPEND FREELDR_BASE_SOURCE windows/setupldr.c) +endif() + list(APPEND FREELDR_BASE_SOURCE bootmgr.c # This file is compiled with custom definitions freeldr.c + inffile/inffile.c rtl/libsupp.c) if(NOT MSVC) @@ -233,62 +238,9 @@ add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR livecd NAME_ON_CD setupldr.sys) -list(APPEND SETUPLDR_SOURCE inffile/inffile.c) - -if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") - list(APPEND SETUPLDR_SOURCE windows/setupldr.c) -endif() - -add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) -add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) - -if(NOT MSVC AND SEPARATE_DBG) - set_target_properties(setupldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) - set_target_properties(setupldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) -endif() - -if(MSVC) - add_target_link_flags(setupldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") - add_target_link_flags(setupldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") -else() - add_target_link_flags(setupldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") - add_target_link_flags(setupldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") -endif() - -add_target_compile_definitions(setupldr_pe FREELDR_REACTOS_SETUP) -add_target_compile_definitions(setupldr_pe_dbg FREELDR_REACTOS_SETUP) - -set_image_base(setupldr_pe 0x10000) -set_subsystem(setupldr_pe native) -set_entrypoint(setupldr_pe RealEntryPoint) - -set_image_base(setupldr_pe_dbg 0x10000) -set_subsystem(setupldr_pe_dbg native) -set_entrypoint(setupldr_pe_dbg RealEntryPoint) - -if(ARCH STREQUAL "i386") - target_link_libraries(setupldr_pe mini_hal) - target_link_libraries(setupldr_pe_dbg mini_hal) -endif() - -target_link_libraries(setupldr_pe freeldr_common cportlib cmlib rtl libcntpr) -target_link_libraries(setupldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr) - -if(STACK_PROTECTOR) - target_link_libraries(setupldr_pe gcc_ssp) - target_link_libraries(setupldr_pe_dbg gcc_ssp) -elseif(RUNTIME_CHECKS) - target_link_libraries(setupldr_pe runtmchk) - target_link_libraries(setupldr_pe_dbg runtmchk) - add_target_link_flags(setupldr_pe "/MERGE:.rtc=.text") -endif() - -add_dependencies(setupldr_pe asm) -add_dependencies(setupldr_pe_dbg asm) - concatenate_files( ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - setupldr_pe + freeldr_pe ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Fri Dec 26 11:38:39 2014 @@ -35,9 +35,7 @@ OS_LOADING_METHOD Load; } OSLoadingMethods[] = { -#ifdef FREELDR_REACTOS_SETUP {"ReactOSSetup", 0 , LoadReactOSSetup }, -#endif #ifdef _M_IX86 {"BootSector" , 0 , LoadAndBootBootSector}, [View Less]

10 years, 7 months

[hpoussin] 65831: [NTFS] Be verbose only on unimplemented FSCTL requests we're supposed to handle

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Dec 26 11:38:35 2014 New Revision: 65831 URL: http://svn.reactos.org/svn/reactos?rev=65831&view=rev Log: [NTFS] Be verbose only on unimplemented FSCTL requests we're supposed to handle Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== -… [View More]

10 years, 7 months

[hpoussin] 65830: [NTOS:CC] Fix some debug prints

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Dec 26 11:38:31 2014 New Revision: 65830 URL: http://svn.reactos.org/svn/reactos?rev=65830&view=rev Log: [NTOS:CC] Fix some debug prints Modified: trunk/reactos/ntoskrnl/cache/fssup.c trunk/reactos/ntoskrnl/cache/pinsup.c trunk/reactos/ntoskrnl/cache/section/data.c Modified: trunk/reactos/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/fssup.c?rev… ==========================================================… [View More]==================== --- trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] Fri Dec 26 11:38:31 2014 @@ -230,14 +230,13 @@ RtlCopyMemory(&Map->Callbacks, Callbacks, sizeof(*Callbacks)); /* For now ... */ - DPRINT("FileSizes->ValidDataLength %08x%08x\n", - FileSizes->ValidDataLength.HighPart, - FileSizes->ValidDataLength.LowPart); + DPRINT("FileSizes->ValidDataLength %I64x\n", + FileSizes->ValidDataLength.QuadPart); InitializeListHead(&Map->AssociatedBcb); InitializeListHead(&Map->PrivateCacheMaps); InsertTailList(&CcpAllSharedCacheMaps, &Map->Entry); - DPRINT("New Map %x\n", Map); + DPRINT("New Map %p\n", Map); } /* We don't have a private cache map. Link it with the shared cache map to serve as a held reference. When the list in the shared cache map @@ -423,11 +422,9 @@ PVOID PinnedBcb, PinnedBuffer; PNOCC_CACHE_MAP Map = FileObject->SectionObjectPointer->SharedCacheMap; - DPRINT("S %08x%08x E %08x%08x\n", - StartOffset->u.HighPart, - StartOffset->u.LowPart, - EndOffset->u.HighPart, - EndOffset->u.LowPart); + DPRINT("S %I64x E %I64x\n", + StartOffset->QuadPart, + EndOffset->QuadPart); if (!Map) { @@ -449,9 +446,8 @@ ToWrite = MIN(UpperBound.QuadPart - LowerBound.QuadPart, (PAGE_SIZE - LowerBound.QuadPart) & (PAGE_SIZE - 1)); - DPRINT("Zero last half %08x%08x %x\n", - Target.u.HighPart, - Target.u.LowPart, + DPRINT("Zero last half %I64x %lx\n", + Target.QuadPart, ToWrite); Status = MiSimpleRead(FileObject, @@ -467,7 +463,7 @@ RtlRaiseStatus(Status); } - DPRINT1("RtlZeroMemory(%x,%x)\n", + DPRINT1("RtlZeroMemory(%p, %lx)\n", ZeroBuf + LowerBound.QuadPart - Target.QuadPart, ToWrite); @@ -494,9 +490,8 @@ while (UpperBound.QuadPart - Target.QuadPart > PAGE_SIZE) { - DPRINT("Zero full page %08x%08x\n", - Target.u.HighPart, - Target.u.LowPart); + DPRINT("Zero full page %I64x\n", + Target.QuadPart); Status = MiSimpleWrite(FileObject, &Target, @@ -515,9 +510,8 @@ if (UpperBound.QuadPart > Target.QuadPart) { ToWrite = UpperBound.QuadPart - Target.QuadPart; - DPRINT("Zero first half %08x%08x %x\n", - Target.u.HighPart, - Target.u.LowPart, + DPRINT("Zero first half %I64x %lx\n", + Target.QuadPart, ToWrite); Status = MiSimpleRead(FileObject, @@ -563,10 +557,9 @@ if (Bcb->FileOffset.QuadPart + Bcb->Length >= LowerBound.QuadPart && Bcb->FileOffset.QuadPart < UpperBound.QuadPart) { - DPRINT("Bcb #%x (@%08x%08x)\n", + DPRINT("Bcb #%x (@%I64x)\n", Bcb - CcCacheSections, - Bcb->FileOffset.u.HighPart, - Bcb->FileOffset.u.LowPart); + Bcb->FileOffset.QuadPart); Target.QuadPart = MAX(Bcb->FileOffset.QuadPart, LowerBound.QuadPart); Modified: trunk/reactos/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/pinsup.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] Fri Dec 26 11:38:31 2014 @@ -486,10 +486,9 @@ return FALSE; } - DPRINT("CcMapData(F->%x,%08x%08x:%d)\n", + DPRINT("CcMapData(F->%x, %I64x:%d)\n", FileObject, - FileOffset->HighPart, - FileOffset->LowPart, + FileOffset->QuadPart, Length); ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); @@ -510,10 +509,9 @@ *BcbResult = Bcb; *Buffer = ((PCHAR)Bcb->BaseAddress) + (int)(FileOffset->QuadPart - Bcb->FileOffset.QuadPart); - DPRINT("Bcb #%x Buffer maps (%08x%08x) At %x Length %x (Getting %x:%x) %wZ\n", + DPRINT("Bcb #%x Buffer maps (%I64x) At %x Length %x (Getting %p:%x) %wZ\n", Bcb - CcCacheSections, - Bcb->FileOffset.HighPart, - Bcb->FileOffset.LowPart, + Bcb->FileOffset.QuadPart, Bcb->BaseAddress, Bcb->Length, *Buffer, @@ -524,9 +522,8 @@ goto cleanup; } - DPRINT("File size %08x%08x\n", - Map->FileSizes.ValidDataLength.HighPart, - Map->FileSizes.ValidDataLength.LowPart); + DPRINT("File size %I64x\n", + Map->FileSizes.ValidDataLength.QuadPart); /* Not all files have length, in fact filesystems often use stream file objects for various internal purposes and are loose about the file @@ -635,7 +632,6 @@ * in the NOCC_CACHE_MAP. */ Success = TRUE; - //DPRINT("w1n\n"); Bcb->Length = MIN(Map->FileSizes.ValidDataLength.QuadPart - Target.QuadPart, CACHE_STRIPE); @@ -649,10 +645,9 @@ *Buffer = ((PCHAR)Bcb->BaseAddress) + (int)(FileOffset->QuadPart - Bcb->FileOffset.QuadPart); FaultIn = TRUE; - DPRINT("Bcb #%x Buffer maps (%08x%08x) At %x Length %x (Getting %x:%x) %wZ\n", + DPRINT("Bcb #%x Buffer maps (%I64x) At %x Length %x (Getting %p:%lx) %wZ\n", Bcb - CcCacheSections, - Bcb->FileOffset.HighPart, - Bcb->FileOffset.LowPart, + Bcb->FileOffset.QuadPart, Bcb->BaseAddress, Bcb->Length, *Buffer, @@ -663,8 +658,6 @@ ASSERT((EndInterval.QuadPart & ~(CACHE_STRIPE - 1)) == (Bcb->FileOffset.QuadPart & ~(CACHE_STRIPE - 1))); - //DPRINT("TERM!\n"); - cleanup: CcpUnlock(); if (Success) @@ -675,10 +668,9 @@ ULONG i; PCHAR FaultIn = Bcb->BaseAddress; - DPRINT("Faulting in pages at this point: file %wZ %08x%08x:%x\n", + DPRINT("Faulting in pages at this point: file %wZ %I64x:%x\n", &FileObject->FileName, - Bcb->FileOffset.HighPart, - Bcb->FileOffset.LowPart, + Bcb->FileOffset.QuadPart, Bcb->Length); for (i = 0; i < Bcb->Length; i += PAGE_SIZE) @@ -873,15 +865,14 @@ if (Zero) { - DPRINT("Zero fill #%x %08x%08x:%x Buffer %x %wZ\n", + DPRINT("Zero fill #%x %I64x:%x Buffer %x %wZ\n", RealBcb - CcCacheSections, - FileOffset->u.HighPart, - FileOffset->u.LowPart, + FileOffset->QuadPart, Length, *Buffer, &FileObject->FileName); - DPRINT1("RtlZeroMemory(%x,%x)\n", *Buffer, Length); + DPRINT1("RtlZeroMemory(%p, %lx)\n", *Buffer, Length); RtlZeroMemory(*Buffer, Length); } } Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Fri Dec 26 11:38:31 2014 @@ -389,7 +389,7 @@ FileSizes.ValidDataLength = FileInfo.EndOfFile; FileSizes.FileSize = FileInfo.EndOfFile; } - DPRINT("Got %08x\n", FileSizes.ValidDataLength.u.LowPart); + DPRINT("Got %I64x\n", FileSizes.ValidDataLength.QuadPart); /* * FIXME: Revise this once a locking order for file size changes is @@ -399,15 +399,12 @@ */ if (UMaximumSize != NULL && UMaximumSize->QuadPart) { - DPRINT("Taking maximum %x\n", UMaximumSize->LowPart); + DPRINT("Taking maximum %I64x\n", UMaximumSize->QuadPart); MaximumSize.QuadPart = UMaximumSize->QuadPart; } else { - DPRINT("Got file size %08x%08x\n", - FileSizes.FileSize.u.HighPart, - FileSizes.FileSize.u.LowPart); - + DPRINT("Got file size %I64x\n", FileSizes.FileSize.QuadPart); MaximumSize.QuadPart = FileSizes.FileSize.QuadPart; } [View Less]

10 years, 7 months

[pschweitzer] 65829: [CHARMAP] Fix the following issues: - Skip rotated font (font name starting with "@" char) - Fix a comment (misspelled "Richedit") - Fix enlarged preview font in font name is l...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Dec 26 11:02:47 2014 New Revision: 65829 URL: http://svn.reactos.org/svn/reactos?rev=65829&view=rev Log: [CHARMAP] Fix the following issues: - Skip rotated font (font name starting with "@" char) - Fix a comment (misspelled "Richedit") - Fix enlarged preview font in font name is long (it truncated font name in 31 chars when copying) - Fix 2 magic values (255 here is not meaningful, and it doesn't even entirely showing Unicode Plane 0) Patch by Roy Tam. CORE-… [View More]8966 #resolve #comment Thanks. Commited in r65829. Modified: trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/lrgcell.c trunk/reactos/base/applications/charmap/map.c Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] Fri Dec 26 11:02:47 2014 @@ -33,6 +33,9 @@ { HWND hwndCombo = (HWND)lParam; LPWSTR pszName = lpelfe->elfLogFont.lfFaceName; + + /* Skip rotated font */ + if(pszName[0] == L'@') return 1; /* make sure font doesn't already exist in our list */ if(SendMessageW(hwndCombo, @@ -321,7 +324,7 @@ ChangeMapFont(hDlg); - // Configure Richedi control for sending notification changes. + // Configure Richedit control for sending notification changes. evMask = SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_GETEVENTMASK, 0, 0); evMask |= ENM_CHANGE; SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_SETEVENTMASK, 0, (LPARAM)evMask); Modified: trunk/reactos/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] Fri Dec 26 11:02:47 2014 @@ -35,7 +35,7 @@ { SendMessageW(hCombo, WM_GETTEXT, - 31, + Len + 1, (LPARAM)lpFontName); ZeroMemory(&lf, Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/map.c [iso-8859-1] Fri Dec 26 11:02:47 2014 @@ -13,6 +13,8 @@ static const WCHAR szMapWndClass[] = L"FontMapWnd"; static const WCHAR szLrgCellWndClass[] = L"LrgCellWnd"; + +#define MAX_ROWS (0xFFFF / XCELLS) + 1 - YCELLS static VOID @@ -377,7 +379,7 @@ SetGrid(infoPtr); - SetScrollRange(hwnd, SB_VERT, 0, 255, FALSE); + SetScrollRange(hwnd, SB_VERT, 0, MAX_ROWS, FALSE); SetScrollPos(hwnd, SB_VERT, 0, TRUE); Ret = TRUE; @@ -423,7 +425,7 @@ } infoPtr->iYStart = max(0, - min(infoPtr->iYStart, 255*16)); + min(infoPtr->iYStart, MAX_ROWS)); iYDiff = iOldYStart - infoPtr->iYStart; if (iYDiff) [View Less]

10 years, 7 months

[jimtabor] 65828: - Patch by Aric Stewart : Pass WM_IME_CONTROL messages to the IME.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 26 00:44:36 2014 New Revision: 65828 URL: http://svn.reactos.org/svn/reactos?rev=65828&view=rev Log: - Patch by Aric Stewart : Pass WM_IME_CONTROL messages to the IME. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- … [View More]

10 years, 7 months

[tfaber] 65827: [WIN32K:NTUSER] - Don't forget to ProbeForWrite in NtUserProcessConnect - Use SEH in NtUserSetInformationThread:UserThreadCsrApiPort

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Dec 25 23:10:47 2014 New Revision: 65827 URL: http://svn.reactos.org/svn/reactos?rev=65827&view=rev Log: [WIN32K:NTUSER] - Don't forget to ProbeForWrite in NtUserProcessConnect - Use SEH in NtUserSetInformationThread:UserThreadCsrApiPort Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ===================================… [View More]

10 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
39
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 December 2014