Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[jimtabor] 66177: [Win32ss] - Validate the parent window before locking it. Attempt to fix CORE-9117.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Feb 5 23:46:57 2015 New Revision: 66177 URL: http://svn.reactos.org/svn/reactos?rev=66177&view=rev Log: [Win32ss] - Validate the parent window before locking it. Attempt to fix CORE-9117. Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Thu Feb 5 23:46:57 2015 @@ -1473,7 +1473,7 @@ if ( (pWindow->style & (WS_CHILD | WS_POPUP)) == WS_CHILD && !(pWindow->style & WS_EX_NOPARENTNOTIFY)) { - if (pWindow->spwndParent && pWindow->spwndParent != UserGetDesktopWindow()) + if (VerifyWnd(pWindow->spwndParent) && pWindow->spwndParent != UserGetDesktopWindow()) { USER_REFERENCE_ENTRY Ref; UserRefObjectCo(pWindow->spwndParent, &Ref);

9 years, 7 months

[akhaldi] 66176: [DLLs] Revert r66167 (Privatize the exports that should be so). Fixes MSVC build. Of course the glorious GCC toolchain is oblivious to this.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Feb 5 22:12:55 2015 New Revision: 66176 URL: http://svn.reactos.org/svn/reactos?rev=66176&view=rev Log: [DLLs] Revert r66167 (Privatize the exports that should be so). Fixes MSVC build. Of course the glorious GCC toolchain is oblivious to this. Modified: trunk/reactos/dll/win32/msxml3/msxml3.spec trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/rsaenh/rsaenh.spec Modified: trunk/reactos/dll/win32/msxml3/msxml3.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.sp… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.spec [iso-8859-1] Thu Feb 5 22:12:55 2015 @@ -7,6 +7,6 @@ 12 stub MSXML3_12 @ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Thu Feb 5 22:12:55 2015 @@ -133,7 +133,7 @@ @ stdcall CreateStreamOnHGlobal(ptr long ptr) # DcomChannelSetHResult @ stdcall DllDebugObjectRPCHook(long ptr) -@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall DllGetClassObject(ptr ptr ptr) @ stub DllGetClassObjectWOW @ stdcall -private DllRegisterServer() @ stdcall DoDragDrop(ptr ptr long ptr) Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.sp… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.spec [iso-8859-1] Thu Feb 5 22:12:55 2015 @@ -23,5 +23,5 @@ @ stdcall CPSetProvParam(long long ptr long) RSAENH_CPSetProvParam @ stdcall CPSignHash(long long long wstr long ptr ptr) RSAENH_CPSignHash @ stdcall CPVerifySignature(long long ptr long long wstr long) RSAENH_CPVerifySignature -@ stdcall -private DllRegisterServer() -@ stdcall -private DllUnregisterServer() +@ stdcall DllRegisterServer() +@ stdcall DllUnregisterServer()

9 years, 7 months

[jimtabor] 66175: [User32] - Return timeout if the count and wait time is zero. This is a wine hack and fixes two related mgs:test_MsgWait* tests. Attempt to fix CORE-9117. Not sure if MsgWaitForMu...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Feb 5 21:31:05 2015 New Revision: 66175 URL: http://svn.reactos.org/svn/reactos?rev=66175&view=rev Log: [User32] - Return timeout if the count and wait time is zero. This is a wine hack and fixes two related mgs:test_MsgWait* tests. Attempt to fix CORE-9117. Not sure if MsgWaitForMultipleObjects is the problem. Modified: trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Thu Feb 5 21:31:05 2015 @@ -3107,7 +3107,7 @@ if ( (pcti->fsChangeBits & LOWORD(dwWakeMask)) || ( (dwFlags & MWMO_INPUTAVAILABLE) && (pcti->fsWakeBits & LOWORD(dwWakeMask)) ) ) { - //FIXME("Chg 0x%x Wake 0x%x Mask 0x%x nCnt %d\n",pcti->fsChangeBits, pcti->fsWakeBits, dwWakeMask, nCount); + //FIXME("Return Chg 0x%x Wake 0x%x Mask 0x%x nCnt %d\n",pcti->fsChangeBits, pcti->fsWakeBits, dwWakeMask, nCount); return nCount; } } @@ -3130,12 +3130,22 @@ RtlCopyMemory(RealHandles, pHandles, nCount * sizeof(HANDLE)); RealHandles[nCount] = MessageQueueHandle; - Result = WaitForMultipleObjectsEx(nCount + 1, RealHandles, - dwFlags & MWMO_WAITALL, - dwMilliseconds, dwFlags & MWMO_ALERTABLE); + //FIXME("1 Chg 0x%x Wake 0x%x Mask 0x%x nCnt %d\n",pcti->fsChangeBits, pcti->fsWakeBits, dwWakeMask, nCount); + + Result = WaitForMultipleObjectsEx( nCount + 1, + RealHandles, + dwFlags & MWMO_WAITALL, + dwMilliseconds, + dwFlags & MWMO_ALERTABLE ); + + //FIXME("2 Chg 0x%x Wake 0x%x Mask 0x%x nCnt %d\n",pcti->fsChangeBits, pcti->fsWakeBits, dwWakeMask, nCount); HeapFree(GetProcessHeap(), 0, RealHandles); NtUserxMsqClearWakeMask(); + + // wine hack! MSDN: If dwMilliseconds is zero,,specified objects are not signaled; it always returns immediately. + if (!Result && !nCount && !dwMilliseconds) Result = WAIT_TIMEOUT; + //FIXME("Result 0X%x\n",Result); return Result; }

9 years, 7 months

[hbelusca] 66174: [FREELDR]: Remove some extra newlines at the end of error messages that are displayed via message boxes, and also for few of them, use the fact that our message boxes implement pr...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Feb 5 21:24:26 2015 New Revision: 66174 URL: http://svn.reactos.org/svn/reactos?rev=66174&view=rev Log: [FREELDR]: Remove some extra newlines at the end of error messages that are displayed via message boxes, and also for few of them, use the fact that our message boxes implement printf-like features. Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/miscboot.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -384,7 +384,7 @@ PcrBasePage = Pcr >> MM_PAGE_SHIFT; if (Pcr == 0) { - UiMessageBox("Can't allocate PCR\n"); + UiMessageBox("Can't allocate PCR."); return; } RtlZeroMemory((PVOID)Pcr, 2 * MM_PAGE_SIZE); @@ -400,7 +400,7 @@ GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); if (GdtIdt == NULL) { - UiMessageBox("Can't allocate pages for GDT+IDT!\n"); + UiMessageBox("Can't allocate pages for GDT+IDT!"); return; } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -30,16 +30,15 @@ #ifndef _MSC_VER VOID DriveMapMapDrivesInSection(PCSTR SectionName) { - CHAR SettingName[80]; - CHAR SettingValue[80]; - CHAR ErrorText[260]; - CHAR Drive1[80]; - CHAR Drive2[80]; - ULONG SectionId; - ULONG SectionItemCount; - ULONG Index; - ULONG Index2; - DRIVE_MAP_LIST DriveMapList; + CHAR SettingName[80]; + CHAR SettingValue[80]; + CHAR Drive1[80]; + CHAR Drive2[80]; + ULONG SectionId; + ULONG SectionItemCount; + ULONG Index; + ULONG Index2; + DRIVE_MAP_LIST DriveMapList; RtlZeroMemory(&DriveMapList, sizeof(DRIVE_MAP_LIST)); @@ -62,8 +61,7 @@ // Make sure we haven't exceeded the drive map max count if (DriveMapList.DriveMapCount >= 4) { - sprintf(ErrorText, "Max DriveMap count exceeded in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue); - UiMessageBox(ErrorText); + UiMessageBox("Max DriveMap count exceeded in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue); continue; } @@ -88,8 +86,7 @@ // Make sure we got good values before we add them to the map if (!DriveMapIsValidDriveString(Drive1) || !DriveMapIsValidDriveString(Drive2)) { - sprintf(ErrorText, "Error in DriveMap setting in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue); - UiMessageBox(ErrorText); + UiMessageBox("Error in DriveMap setting in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue); continue; } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -365,7 +365,7 @@ if (Pcr == 0) { - UiMessageBox("Can't allocate PCR\n"); + UiMessageBox("Can't allocate PCR."); return; } @@ -384,7 +384,7 @@ if (GdtIdt == NULL) { - UiMessageBox("Can't allocate pages for GDT+IDT!\n"); + UiMessageBox("Can't allocate pages for GDT+IDT!"); return; } Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -155,7 +155,7 @@ // if (Information.EndingAddress.HighPart != 0) { - UiMessageBox("RAM disk too big\n"); + UiMessageBox("RAM disk too big."); FsCloseFile(RamFile); return FALSE; } @@ -172,7 +172,7 @@ gRamDiskBase = MmAllocateMemoryWithType(gRamDiskSize, LoaderXIPRom); if (!gRamDiskBase) { - UiMessageBox("Failed to allocate memory for RAM disk\n"); + UiMessageBox("Failed to allocate memory for RAM disk."); FsCloseFile(RamFile); return FALSE; } @@ -222,7 +222,7 @@ gRamDiskBase = NULL; gRamDiskSize = 0; FsCloseFile(RamFile); - UiMessageBox("Failed to read RAM disk\n"); + UiMessageBox("Failed to read RAM disk."); return FALSE; } } Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -41,13 +41,13 @@ if (!UiInitialize(FALSE)) { - UiMessageBoxCritical("Unable to initialize UI.\n"); + UiMessageBoxCritical("Unable to initialize UI."); goto Quit; } if (!MmInitializeMemoryManager()) { - UiMessageBoxCritical("Unable to initialize memory manager"); + UiMessageBoxCritical("Unable to initialize memory manager."); goto Quit; } Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -82,7 +82,6 @@ PCSTR Description = OperatingSystem->LoadIdentifier; PFILE LinuxKernel = 0; PFILE LinuxInitrdFile = 0; - CHAR TempString[260]; UiDrawBackdrop(); @@ -102,8 +101,7 @@ LinuxKernel = FsOpenFile(LinuxKernelName); if (!LinuxKernel) { - sprintf(TempString, "Linux kernel \'%s\' not found.", LinuxKernelName); - UiMessageBox(TempString); + UiMessageBox("Linux kernel \'%s\' not found.", LinuxKernelName); goto LinuxBootFailed; } @@ -113,8 +111,7 @@ LinuxInitrdFile = FsOpenFile(LinuxInitrdName); if (!LinuxInitrdFile) { - sprintf(TempString, "Linux initrd image \'%s\' not found.", LinuxInitrdName); - UiMessageBox(TempString); + UiMessageBox("Linux initrd image \'%s\' not found.", LinuxInitrdName); goto LinuxBootFailed; } } @@ -212,7 +209,6 @@ BOOLEAN LinuxParseIniSection(PCSTR SectionName) { ULONG_PTR SectionId; - CHAR SettingName[260]; /* Find all the message box settings and run them */ UiShowMessageBoxesInSection(SectionName); @@ -220,8 +216,7 @@ /* Try to open the operating system section in the .ini file */ if (!IniOpenSection(SectionName, &SectionId)) { - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", SectionName); - UiMessageBox(SettingName); + UiMessageBox("Section [%s] not found in freeldr.ini.", SectionName); return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/miscb… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -34,7 +34,6 @@ CHAR FileName[260]; PFILE FilePointer; ULONG BytesRead; - CHAR SettingName[80]; /* Find all the message box settings and run them */ UiShowMessageBoxesInSection(SectionName); @@ -42,8 +41,7 @@ /* Try to open the operating system section in the .ini file */ if (!IniOpenSection(SectionName, &SectionId)) { - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", SectionName); - UiMessageBox(SettingName); + UiMessageBox("Section [%s] not found in freeldr.ini.", SectionName); return; } @@ -56,8 +54,7 @@ FilePointer = FsOpenFile(FileName); if (!FilePointer) { - strcat(FileName, " not found."); - UiMessageBox(FileName); + UiMessageBox("%s not found.", FileName); return; } @@ -97,7 +94,6 @@ { ULONG_PTR SectionId; PCSTR SectionName = OperatingSystem->SystemPartition; - CHAR SettingName[80]; CHAR SettingValue[80]; PARTITION_TABLE_ENTRY PartitionTableEntry; UCHAR DriveNumber; @@ -109,8 +105,7 @@ /* Try to open the operating system section in the .ini file */ if (!IniOpenSection(SectionName, &SectionId)) { - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", SectionName); - UiMessageBox(SettingName); + UiMessageBox("Section [%s] not found in freeldr.ini.", SectionName); return; } @@ -175,7 +170,6 @@ { ULONG_PTR SectionId; PCSTR SectionName = OperatingSystem->SystemPartition; - CHAR SettingName[80]; CHAR SettingValue[80]; UCHAR DriveNumber; @@ -185,8 +179,7 @@ /* Try to open the operating system section in the .ini file */ if (!IniOpenSection(SectionName, &SectionId)) { - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", SectionName); - UiMessageBox(SettingName); + UiMessageBox("Section [%s] not found in freeldr.ini.", SectionName); return; } Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -282,7 +282,7 @@ Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { - //UiMessageBox("Can not open the file"); + // UiMessageBox("Can not open the file."); return FALSE; } @@ -290,7 +290,7 @@ Status = ArcRead(FileId, HeadersBuffer, SECTOR_SIZE * 2, &BytesRead); if (Status != ESUCCESS) { - UiMessageBox("Error reading from file"); + UiMessageBox("Error reading from file."); ArcClose(FileId); return FALSE; } @@ -299,8 +299,8 @@ NtHeaders = RtlImageNtHeader(HeadersBuffer); if (!NtHeaders) { - //Print(L"Error - no NT header found in %s\n", FileName); - UiMessageBox("Error - no NT header found"); + // Print(L"Error - no NT header found in %s\n", FileName); + UiMessageBox("Error - no NT header found."); ArcClose(FileId); return FALSE; } @@ -308,8 +308,8 @@ /* Ensure this is executable image */ if (((NtHeaders->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE) == 0)) { - //Print(L"Not an executable image %s\n", FileName); - UiMessageBox("Not an executable image"); + // Print(L"Not an executable image %s\n", FileName); + UiMessageBox("Not an executable image."); ArcClose(FileId); return FALSE; } @@ -330,8 +330,8 @@ if (PhysicalBase == NULL) { - //Print(L"Failed to alloc pages for image %s\n", FileName); - UiMessageBox("Failed to alloc pages for image"); + // Print(L"Failed to alloc pages for image %s\n", FileName); + UiMessageBox("Failed to alloc pages for image."); ArcClose(FileId); return FALSE; } @@ -347,7 +347,7 @@ Status = ArcSeek(FileId, &Position, SeekAbsolute); if (Status != ESUCCESS) { - UiMessageBox("Error seeking to start of file"); + UiMessageBox("Error seeking to start of file."); ArcClose(FileId); return FALSE; } @@ -355,8 +355,8 @@ Status = ArcRead(FileId, PhysicalBase, NtHeaders->OptionalHeader.SizeOfHeaders, &BytesRead); if (Status != ESUCCESS) { - //Print(L"Error reading headers %s\n", FileName); - UiMessageBox("Error reading headers"); + // Print(L"Error reading headers %s\n", FileName); + UiMessageBox("Error reading headers."); ArcClose(FileId); return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -682,7 +682,7 @@ /* Load the ramdisk */ if (!RamDiskLoadVirtualFile(FileName)) { - UiMessageBox("Failed to load RAM disk file %s\n", FileName); + UiMessageBox("Failed to load RAM disk file %s", FileName); return; } } Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -220,7 +220,7 @@ MemoryMap = MmGetMemoryMap(&NoEntries); if (MemoryMap == NULL) { - UiMessageBox("Can not retrieve the current memory map"); + UiMessageBox("Can not retrieve the current memory map."); return FALSE; } @@ -334,7 +334,7 @@ /*Status = MempSetupPaging(OsLoaderBase >> MM_PAGE_SHIFT, OsLoaderSize >> MM_PAGE_SHIFT); if (!Status) { - UiMessageBox("Error during MempSetupPaging"); + UiMessageBox("Error during MempSetupPaging."); return; }*/ Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -437,8 +437,7 @@ return TRUE; Failure: - //UiMessageBox("Error reading NLS file %s\n", Filename); - UiMessageBox("Error reading NLS file!"); + UiMessageBox("Error reading NLS file %s", FileName); return FALSE; }

9 years, 7 months

[hbelusca] 66173: [FREELDR]: Fix initialization of BootPath variable, and add some explanation comment as requested long time ago by Pierre.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Feb 5 21:17:35 2015 New Revision: 66173 URL: http://svn.reactos.org/svn/reactos?rev=66173&view=rev Log: [FREELDR]: Fix initialization of BootPath variable, and add some explanation comment as requested long time ago by Pierre. Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c 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] Thu Feb 5 21:17:35 2015 @@ -183,8 +183,16 @@ if (!HasSection || !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) { + /* + * IMPROVE: I don't want to call MachDiskGetBootPath here as a + * default choice because I can call it after (see few lines below). + * Also doing the strcpy call as it is done in winldr.c is not + * really what we want. Instead I reset BootPath here so that + * we can build the full path using the general code from below. + */ // MachDiskGetBootPath(BootPath, sizeof(BootPath)); // strcpy(BootPath, SectionName); + BootPath[0] = '\0'; } /* @@ -239,7 +247,7 @@ /* Load the ramdisk */ if (!RamDiskLoadVirtualFile(FileName)) { - UiMessageBox("Failed to load RAM disk file %s\n", FileName); + UiMessageBox("Failed to load RAM disk file %s", FileName); return; } } @@ -256,7 +264,7 @@ SystemPath = SourcePaths[i]; if (!SystemPath) { - UiMessageBox("Failed to open txtsetup.sif\n"); + UiMessageBox("Failed to open txtsetup.sif"); return; } strcpy(File, SystemPath);

9 years, 7 months

[tkreuzer] 66172: [W32KNAPI] Load NtGdiFlushUserBatch dynamically to allow loading on Win 2003, where the function does not exist. ROSTESTS-131 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 5 10:10:33 2015 New Revision: 66172 URL: http://svn.reactos.org/svn/reactos?rev=66172&view=rev Log: [W32KNAPI] Load NtGdiFlushUserBatch dynamically to allow loading on Win 2003, where the function does not exist. ROSTESTS-131 #resolve Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiFlushUserBatch.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiFlushUserBatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiFlushUserBatch.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiFlushUserBatch.c [iso-8859-1] Thu Feb 5 10:10:33 2015 @@ -1,3 +1,8 @@ + + +NTSTATUS +(NTAPI +*pNtGdiFlushUserBatch)(VOID); INT Test_NtGdiFlushUserBatch(PTESTINFO pti) @@ -5,10 +10,14 @@ PVOID pRet; PTEB pTeb; + pNtGdiFlushUserBatch = (PVOID)GetProcAddress(g_hModule, "NtGdiFlushUserBatch"); + if (pNtGdiFlushUserBatch == NULL) + return APISTATUS_NOT_FOUND; + pTeb = NtCurrentTeb(); ASSERT(pTeb); - pRet = (PVOID)NtGdiFlushUserBatch(); + pRet = (PVOID)pNtGdiFlushUserBatch(); TEST(pRet != 0); TEST(pRet == &pTeb->RealClientId); @@ -23,7 +32,7 @@ pTeb->GdiTebBatch.Offset = 21; pTeb->GdiTebBatch.HDC = (HDC)123; - pRet = (PVOID)NtGdiFlushUserBatch(); + pRet = (PVOID)pNtGdiFlushUserBatch(); TEST(pRet == &pTeb->RealClientId); TEST(pTeb->InDbgPrint == 0);

9 years, 7 months

[tkreuzer] 66171: [GDI32] CORE-8350 #comment Fix return value on error in RealizePalette. #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 5 09:35:54 2015 New Revision: 66171 URL: http://svn.reactos.org/svn/reactos?rev=66171&view=rev Log: [GDI32] CORE-8350 #comment Fix return value on error in RealizePalette. #resolve Modified: trunk/reactos/win32ss/gdi/gdi32/objects/palette.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/palette.c [iso-8859-1] Thu Feb 5 09:35:54 2015 @@ -139,6 +139,12 @@ _In_ HDC hdc) /* [in] Handle of device context */ { HANDLE_METADC0P(UINT, RealizePalette, GDI_ERROR, hdc); + + if (GDI_HANDLE_GET_TYPE(hdc) != GDILoObjType_LO_DC_TYPE) + { + return GDI_ERROR; + } + return UserRealizePalette(hdc); }

9 years, 7 months

[aandrejevic] 66170: [FAST486] Implement FRNDINT.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Feb 5 01:03:09 2015 New Revision: 66170 URL: http://svn.reactos.org/svn/reactos?rev=66170&view=rev Log: [FAST486] Implement FRNDINT. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6617… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Thu Feb 5 01:03:09 2015 @@ -34,59 +34,24 @@ /* 0.00 */ static const FAST486_FPU_DATA_REG FpuZero = {0ULL, 0, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = 0, -// .Mantissa = 0ULL -// }; /* 1.00 */ static const FAST486_FPU_DATA_REG FpuOne = {0x8000000000000000ULL, FPU_REAL10_BIAS, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = FPU_REAL10_BIAS, -// .Mantissa = 0x8000000000000000ULL -// }; /* Pi */ static const FAST486_FPU_DATA_REG FpuPi = {0xC90FDAA22168C234ULL, FPU_REAL10_BIAS + 1, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = FPU_REAL10_BIAS + 1, -// .Mantissa = 0xC90FDAA22168C234ULL -// }; /* lb(10) */ static const FAST486_FPU_DATA_REG FpuL2Ten = {0xD49A784BCD1D8AFEULL, FPU_REAL10_BIAS + 1, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = FPU_REAL10_BIAS + 1, -// .Mantissa = 0xD49A784BCD1D8AFEULL -// }; /* lb(e) */ static const FAST486_FPU_DATA_REG FpuL2E = {0xB8AA3B295C17F0BBULL, FPU_REAL10_BIAS, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = FPU_REAL10_BIAS, -// .Mantissa = 0xB8AA3B295C17F0BBULL -// }; /* lg(2) */ static const FAST486_FPU_DATA_REG FpuLgTwo = {0x9A209A84FBCFF798ULL, FPU_REAL10_BIAS - 2, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = FPU_REAL10_BIAS - 2, -// .Mantissa = 0x9A209A84FBCFF798ULL -// }; /* ln(2) */ static const FAST486_FPU_DATA_REG FpuLnTwo = {0xB17217F7D1CF79ABULL, FPU_REAL10_BIAS - 1, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = FPU_REAL10_BIAS - 1, -// .Mantissa = 0xB17217F7D1CF79ABULL -// }; /* PRIVATE FUNCTIONS **********************************************************/ @@ -201,6 +166,52 @@ } static inline VOID FASTCALL +Fast486FpuRound(PFAST486_STATE State, + PULONGLONG Result, + BOOLEAN Sign, + ULONGLONG Remainder, + INT RemainderHighBit) +{ + switch (State->FpuControl.Rc) + { + case FPU_ROUND_NEAREST: + { + /* Check if the highest bit of the remainder is set */ + if (Remainder & (1ULL << RemainderHighBit)) + { + (*Result)++; + + /* Check if all the other bits are clear */ + if (!(Remainder & ((1ULL << RemainderHighBit) - 1))) + { + /* Round to even */ + *Result &= ~1; + } + } + + break; + } + + case FPU_ROUND_DOWN: + { + if ((Remainder != 0ULL) && Sign) (*Result)++; + break; + } + + case FPU_ROUND_UP: + { + if ((Remainder != 0ULL) && !Sign) (*Result)++; + break; + } + + default: + { + /* Leave it truncated */ + } + } +} + +static inline VOID FASTCALL Fast486FpuFromInteger(PFAST486_STATE State, LONGLONG Value, PFAST486_FPU_DATA_REG Result) @@ -265,43 +276,8 @@ /* The result must be positive here */ ASSERT(*Result >= 0LL); - switch (State->FpuControl.Rc) - { - case FPU_ROUND_NEAREST: - { - /* Check if the highest bit of the remainder is set */ - if (Remainder & (1 << (Bits - 1))) - { - (*Result)++; - - /* Check if all the other bits are clear */ - if (!(Remainder & ((1 << (Bits - 1)) - 1))) - { - /* Round to even */ - *Result &= ~1; - } - } - - break; - } - - case FPU_ROUND_DOWN: - { - if ((Remainder != 0ULL) && Value->Sign) (*Result)++; - break; - } - - case FPU_ROUND_UP: - { - if ((Remainder != 0ULL) && !Value->Sign) (*Result)++; - break; - } - - default: - { - /* Leave it truncated */ - } - } + /* Perform rounding */ + Fast486FpuRound(State, (PULONGLONG)Result, Value->Sign, Remainder, Bits - 1); if (Value->Sign) *Result = -*Result; return TRUE; @@ -335,6 +311,7 @@ { ULONGLONG Remainder; SHORT UnbiasedExp = (SHORT)Value->Exponent - FPU_REAL10_BIAS; + ULONGLONG Result64; if (FPU_IS_ZERO(Value)) { @@ -392,43 +369,10 @@ /* Calculate the remainder */ Remainder = Value->Mantissa & ((1ULL << 40) - 1); - switch (State->FpuControl.Rc) - { - case FPU_ROUND_NEAREST: - { - /* Check if the highest bit of the remainder is set */ - if (Remainder & (1ULL << 39)) - { - (*Result)++; - - /* Check if all the other bits are clear */ - if (!(Remainder & ((1ULL << 39) - 1))) - { - /* Round to even */ - *Result &= ~1; - } - } - - break; - } - - case FPU_ROUND_DOWN: - { - if ((Remainder != 0ULL) && Value->Sign) (*Result)++; - break; - } - - case FPU_ROUND_UP: - { - if ((Remainder != 0ULL) && !Value->Sign) (*Result)++; - break; - } - - default: - { - /* Leave it truncated */ - } - } + /* Perform rounding */ + Result64 = (ULONGLONG)*Result; + Fast486FpuRound(State, &Result64, Value->Sign, Remainder, 39); + *Result = (ULONG)Result64; /* Store the biased exponent */ *Result |= (ULONG)(UnbiasedExp + FPU_REAL4_BIAS) << 23; @@ -524,43 +468,8 @@ /* Calculate the remainder */ Remainder = Value->Mantissa & ((1 << 11) - 1); - switch (State->FpuControl.Rc) - { - case FPU_ROUND_NEAREST: - { - /* Check if the highest bit of the remainder is set */ - if (Remainder & (1 << 10)) - { - (*Result)++; - - /* Check if all the other bits are clear */ - if (!(Remainder & ((1 << 10) - 1))) - { - /* Round to even */ - *Result &= ~1; - } - } - - break; - } - - case FPU_ROUND_DOWN: - { - if ((Remainder != 0ULL) && Value->Sign) (*Result)++; - break; - } - - case FPU_ROUND_UP: - { - if ((Remainder != 0ULL) && !Value->Sign) (*Result)++; - break; - } - - default: - { - /* Leave it truncated */ - } - } + /* Perform rounding */ + Fast486FpuRound(State, Result, Value->Sign, Remainder, 10); /* Store the biased exponent */ *Result |= (ULONGLONG)(UnbiasedExp + FPU_REAL8_BIAS) << 52; @@ -1628,8 +1537,44 @@ /* FRNDINT */ case 0x3C: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + INT Bits; + ULONGLONG Result = 0ULL; + ULONGLONG Remainder; + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + if (!FPU_IS_NORMALIZED(&FPU_ST(0))) + { + State->FpuStatus.De = TRUE; + + if (!State->FpuControl.Dm) + { + Fast486FpuException(State); + break; + } + } + + Bits = min(max(0, (INT)FPU_ST(0).Exponent - FPU_REAL10_BIAS + 1), 64); + if (Bits == 64) break; + + if (Bits) + { + Result = FPU_ST(0).Mantissa >> (64 - Bits); + Remainder = FPU_ST(0).Mantissa & ((1 << (64 - Bits)) - 1); + } + else Remainder = FPU_ST(0).Mantissa; + + /* Perform the rounding */ + Fast486FpuRound(State, &Result, FPU_ST(0).Sign, Remainder, 63 - Bits); + + State->FpuStatus.Pe = TRUE; + if (!State->FpuControl.Pm) Fast486FpuException(State); break; }

9 years, 7 months

[hbelusca] 66169: [FREELDR]: Add some debug information when searching for PCI routing tables.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Feb 5 00:43:39 2015 New Revision: 66169 URL: http://svn.reactos.org/svn/reactos?rev=66169&view=rev Log: [FREELDR]: Add some debug information when searching for PCI routing tables. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] Thu Feb 5 00:43:39 2015 @@ -44,7 +44,7 @@ if (Table->TableSize < FIELD_OFFSET(PCI_IRQ_ROUTING_TABLE, Slot) || Table->TableSize % 16 != 0) { - ERR("Invalid routing table size (%u) at %p. Continue searching...\n", Table->TableSize, Table); + ERR("Invalid routing table size (%u) at 0x%p. Continue searching...\n", Table->TableSize, Table); Table = (PPCI_IRQ_ROUTING_TABLE)((ULONG_PTR)Table + 0x10); continue; } @@ -58,11 +58,11 @@ if ((Sum & 0xFF) != 0) { - ERR("Invalid routing table checksum (%#lx) at %p. Continue searching...\n", Sum & 0xFF, Table); + ERR("Invalid routing table checksum (%#lx) at 0x%p. Continue searching...\n", Sum & 0xFF, Table); } else { - TRACE("Valid checksum\n"); + TRACE("Valid checksum (%#lx): found routing table at 0x%p\n", Sum & 0xFF, Table); return Table; } }

9 years, 7 months

[jimtabor] 66168: - Missed this one.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Feb 5 00:13:51 2015 New Revision: 66168 URL: http://svn.reactos.org/svn/reactos?rev=66168&view=rev Log: - Missed this one. 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… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Thu Feb 5 00:13:51 2015 @@ -1213,6 +1213,7 @@ case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: case WM_APPCOMMAND: + case WM_SETCURSOR: { LRESULT lResult; NtUserMessageCall( hWnd, Msg, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, !bUnicode);

9 years, 7 months

← Newer
1
...
31
32
33
34
35
36
37
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015