Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[fireball] 50394: - Solve one of the most visible and historical drawing problem of arwinss: improper clipping. E.g. child windows borders being "visible" in an explorer window is an example, FAP d...

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 15 21:33:09 2011 New Revision: 50394 URL: http://svn.reactos.org/svn/reactos?rev=50394&view=rev Log: - Solve one of the most visible and historical drawing problem of arwinss: improper clipping. E.g. child windows borders being "visible" in an explorer window is an example, FAP drawing issues an another. All redrawing bugs should be retested to see what's fixed. - Add a "clipchildren" property to the DC. This property affects only those DCs which have a root window (screen) selected. A better name for this variable would be welcome. - Important! The change in behaviour introduced by ClipChildren is currently commented out until some issues it brings are solved. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Sat Jan 15 21:33:09 2011 @@ -169,6 +169,7 @@ /* Create an empty combined clipping region */ pNewDC->CombinedClip = EngCreateClip(); pNewDC->Clipping = NULL; + pNewDC->ClipChildren = FALSE; /* Set default palette */ pNewDC->dclevel.hpal = StockObjects[DEFAULT_PALETTE]; @@ -487,6 +488,12 @@ return; } + /* Root window's visibility may be ignored */ + if ((pDC->pWindow == &SwmRoot) && !pDC->ClipChildren) + { + //IgnoreVisibility = TRUE; + } + /* window visibility X user clipping (if any) X underlying surface */ /* Acquire SWM lock */ @@ -598,6 +605,10 @@ /* Set the clipping object */ pDC->Clipping = create_region_from_rects(pSafeRects, count); } + else + { + pDC->Clipping = create_empty_region(); + } DPRINT("RosGdiSetDeviceClipping() for DC %x, bounding rect (%d,%d)-(%d, %d)\n", physDev, rcSafeBounds.left, rcSafeBounds.top, rcSafeBounds.right, rcSafeBounds.bottom); @@ -693,6 +704,10 @@ pDC->pWindow = NULL; DPRINT("hdc %x, restricting any drawing\n", physDev); } + + pDC->ClipChildren = clipChildren; + + RosGdiUpdateClipping(pDC, FALSE); /* Release the object */ DC_UnlockDc(pDC); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Sat Jan 15 21:33:09 2011 @@ -38,6 +38,7 @@ struct region *Clipping; CLIPOBJ *CombinedClip; PSWM_WINDOW pWindow; + BOOLEAN ClipChildren; } DC, *PDC; #define DC_LockDc(hDC) \

13 years, 8 months

[gadamopoulos] 50393: swm isn't always the best solution. Instead of reinverting the well we can also use win32 api

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Jan 15 20:13:44 2011 New Revision: 50393 URL: http://svn.reactos.org/svn/reactos?rev=50393&view=rev Log: swm isn't always the best solution. Instead of reinverting the well we can also use win32 api Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c branches/arwinss/reactos/include/reactos/wine/rosuser.h branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Sat Jan 15 20:13:44 2011 @@ -178,7 +178,7 @@ } /* get the window handle from cursor position */ - hwnd = SwmGetWindowFromPoint(pt.x, pt.y); + hwnd = ChildWindowFromPointEx(GetDesktopWindow(), pt, CWP_SKIPINVISIBLE); if (flags & MOUSEEVENTF_MOVE) { Modified: branches/arwinss/reactos/include/reactos/wine/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/rosuser.h [iso-8859-1] Sat Jan 15 20:13:44 2011 @@ -230,9 +230,6 @@ VOID NTAPI SwmPosChanged(GR_WINDOW_ID Wid, const RECT *WindowRect, const RECT *OldRect, HWND hWndAfter, UINT SwpFlags); -HWND NTAPI -SwmGetWindowFromPoint(LONG x, LONG y); - VOID NTAPI SwmShowWindow(GR_WINDOW_ID Wid, BOOLEAN Show, UINT SwpFlags); Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Sat Jan 15 20:13:44 2011 @@ -887,47 +887,6 @@ /* Release the lock */ SwmRelease(); -} - -HWND -NTAPI -SwmGetWindowFromPoint(LONG x, LONG y) -{ - PLIST_ENTRY Current; - PSWM_WINDOW Window; - - /* Acquire the lock */ - SwmAcquire(); - - /* Traverse the list to find our window */ - Current = SwmWindows.Flink; - while(Current != &SwmWindows) - { - Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); - - /* Skip hidden windows */ - if (Window->Hidden) - { - /* Advance to the next window */ - Current = Current->Flink; - continue; - } - - if (point_in_region(Window->Visible, x, y)) - { - /* Release the lock */ - SwmRelease(); - - return Window->hwnd; - } - /* Advance to the next window */ - Current = Current->Flink; - } - - /* Release the lock */ - SwmRelease(); - - return 0; } VOID Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Jan 15 20:13:44 2011 @@ -91,6 +91,5 @@ SwmDestroyWindow 1 SwmSetForeground 1 SwmPosChanged 5 -SwmGetWindowFromPoint 2 SwmShowWindow 3 NtUserInitialize 3

13 years, 8 months

[tkreuzer] 50392: [WIN32K] Set correct error value on failure in NtUserSetCursor. Patch by Victor Martinez.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 15 19:42:56 2011 New Revision: 50392 URL: http://svn.reactos.org/svn/reactos?rev=50392&view=rev Log: [WIN32K] Set correct error value on failure in NtUserSetCursor. Patch by Victor Martinez. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sat Jan 15 19:42:56 2011 @@ -869,7 +869,7 @@ pcurNew = UserGetCurIconObject(hCursor); if (!pcurNew) { - EngSetLastError(ERROR_INVALID_HANDLE); + EngSetLastError(ERROR_INVALID_CURSOR_HANDLE); goto leave; } }

13 years, 8 months

[tkreuzer] 50391: [NTOSKRNL] Fix comments and reduce code complexity.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 15 19:13:22 2011 New Revision: 50391 URL: http://svn.reactos.org/svn/reactos?rev=50391&view=rev Log: [NTOSKRNL] Fix comments and reduce code complexity. Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Sat Jan 15 19:13:22 2011 @@ -127,7 +127,7 @@ NTAPI PsGetNextProcess(IN PEPROCESS OldProcess) { - PLIST_ENTRY Entry, ListHead; + PLIST_ENTRY Entry; PEPROCESS FoundProcess = NULL; PAGED_CODE(); PSTRACE(PS_PROCESS_DEBUG, "Process: %p\n", OldProcess); @@ -147,11 +147,10 @@ Entry = PsActiveProcessHead.Flink; } - /* Set the list head and start looping */ - ListHead = &PsActiveProcessHead; - while (ListHead != Entry) - { - /* Get the Thread */ + /* Loop the process list */ + while (Entry != &PsActiveProcessHead) + { + /* Get the process */ FoundProcess = CONTAINING_RECORD(Entry, EPROCESS, ActiveProcessLinks); /* Reference the process */ @@ -165,7 +164,7 @@ /* Release the lock */ KeReleaseGuardedMutex(&PspActiveProcessMutex); - /* Reference the Process we had referenced earlier */ + /* Dereference the Process we had referenced earlier */ if (OldProcess) ObDereferenceObject(OldProcess); return FoundProcess; } @@ -621,7 +620,7 @@ SeAuditProcessCreationInfo. ImageFileName); if (!NT_SUCCESS(Status)) goto CleanupWithRef; - + // // We need a PEB // @@ -641,7 +640,7 @@ ASSERTMSG("No support for cloning yet\n", FALSE); } else - { + { /* This is the initial system process */ Flags &= ~PS_LARGE_PAGES; Status = MmInitializeProcessAddressSpace(Process, @@ -713,7 +712,7 @@ RtlZeroMemory(&InitialPeb, sizeof(INITIAL_PEB)); InitialPeb.Mutant = (HANDLE)-1; InitialPeb.ImageUsesLargePages = 0; // FIXME: Not yet supported - + // // Create it only if we have an image section // @@ -850,7 +849,7 @@ /* Run the Notification Routines */ PspRunCreateProcessNotifyRoutines(Process, TRUE); - + /* If 12 processes have been created, enough of user-mode is ready */ if (++ProcessCount == 12) Ki386PerfEnd();

13 years, 8 months

[ekohl] 50390: [NTOSKRNL] Simplify SepPrivilegeCheck. Patch by Timo Kreuzer.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 15 14:35:26 2011 New Revision: 50390 URL: http://svn.reactos.org/svn/reactos?rev=50390&view=rev Log: [NTOSKRNL] Simplify SepPrivilegeCheck. Patch by Timo Kreuzer. Modified: trunk/reactos/ntoskrnl/se/priv.c Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=503… ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Sat Jan 15 14:35:26 2011 @@ -118,54 +118,46 @@ { ULONG i; ULONG j; - ULONG k; + ULONG Required; DPRINT("SepPrivilegeCheck() called\n"); PAGED_CODE(); if (PreviousMode == KernelMode) - { return TRUE; - } - - k = 0; - if (PrivilegeCount > 0) - { - for (i = 0; i < Token->PrivilegeCount; i++) - { - for (j = 0; j < PrivilegeCount; j++) + + /* Get the number of privileges that are required to match */ + Required = (PrivilegeControl & PRIVILEGE_SET_ALL_NECESSARY) ? PrivilegeCount : 1; + + /* Loop all requested privileges until we found the required ones */ + for (i = 0; i < PrivilegeCount && Required > 0; i++) + { + /* Loop the privileges of the token */ + for (j = 0; j < Token->PrivilegeCount; j++) + { + /* Check if the LUIDs match */ + if (Token->Privileges[j].Luid.LowPart == Privileges[i].Luid.LowPart && + Token->Privileges[j].Luid.HighPart == Privileges[i].Luid.HighPart) { - if (Token->Privileges[i].Luid.LowPart == Privileges[j].Luid.LowPart && - Token->Privileges[i].Luid.HighPart == Privileges[j].Luid.HighPart) + DPRINT("Found privilege. Attributes: %lx\n", + Token->Privileges[j].Attributes); + + /* Check if the privilege is enabled */ + if (Token->Privileges[j].Attributes & SE_PRIVILEGE_ENABLED) { - DPRINT("Found privilege\n"); - DPRINT("Privilege attributes %lx\n", - Token->Privileges[i].Attributes); - - if (Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) - { - Privileges[j].Attributes |= SE_PRIVILEGE_USED_FOR_ACCESS; - k++; - } + Privileges[i].Attributes |= SE_PRIVILEGE_USED_FOR_ACCESS; + Required--; } + + /* Leave the inner loop */ + break; } } } - if ((PrivilegeControl & PRIVILEGE_SET_ALL_NECESSARY) && - PrivilegeCount == k) - { - return TRUE; - } - - if (k > 0 && - !(PrivilegeControl & PRIVILEGE_SET_ALL_NECESSARY)) - { - return TRUE; - } - - return FALSE; + /* Return whether we found all required privileges */ + return (Required == 0); } NTSTATUS

13 years, 8 months

[tkreuzer] 50389: [PING] Fix MyLoadString. Patch by menone7 at gmail dot com.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 15 12:58:05 2011 New Revision: 50389 URL: http://svn.reactos.org/svn/reactos?rev=50389&view=rev Log: [PING] Fix MyLoadString. Patch by menone7 at gmail dot com. Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Sat Jan 15 12:58:05 2011 @@ -114,7 +114,8 @@ { HRSRC hres; HGLOBAL hResData; - LPWSTR pwsz; + WCHAR *pwsz; + UINT string_num, i; hres = FindResourceW(NULL, MAKEINTRESOURCEW((LOWORD(uID) >> 4) + 1), RT_STRING); if (!hres) return NULL; @@ -124,6 +125,11 @@ pwsz = LockResource(hResData); if (!pwsz) return NULL; + + string_num = uID & 15; + for (i = 0; i < string_num; i++) + pwsz += *pwsz + 1; + return pwsz + 1; }

13 years, 8 months

[fireball] 50388: - Don't use an unitialized rect offset.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 15 12:10:51 2011 New Revision: 50388 URL: http://svn.reactos.org/svn/reactos?rev=50388&view=rev Log: - Don't use an unitialized rect offset. Modified: branches/arwinss/reactos/dll/win32/winent.drv/window.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] Sat Jan 15 12:10:51 2011 @@ -680,8 +680,8 @@ if (flags & DCX_CLIPCHILDREN) escape.clip_children = TRUE; } - TRACE("hdc %x, hwnd %x, top %x\n win_rect %s, top_rect %s\n", hdc, hwnd, top, - wine_dbgstr_rect(win_rect), wine_dbgstr_rect(top_rect)); + TRACE("hdc %x, hwnd %x, top %x\n win_rect %s, top_rect %s, clipchildren %d\n", hdc, hwnd, top, + wine_dbgstr_rect(win_rect), wine_dbgstr_rect(top_rect), escape.clip_children); ExtEscape( hdc, NTDRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } @@ -689,7 +689,7 @@ void CDECL RosDrv_ReleaseDC( HWND hwnd, HDC hdc ) { struct ntdrv_escape_set_drawable escape; - RECTL virtual_screen_rect; + RECT virtual_screen_rect; escape.code = NTDRV_SET_DRAWABLE; escape.drawable = root_window; @@ -701,6 +701,8 @@ virtual_screen_rect.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); virtual_screen_rect.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); virtual_screen_rect.left = 0; virtual_screen_rect.top = 0; + + escape.drawable_rect = virtual_screen_rect; SetRect( &escape.dc_rect, 0, 0, virtual_screen_rect.right - virtual_screen_rect.left, virtual_screen_rect.bottom - virtual_screen_rect.top );

13 years, 8 months

[tkreuzer] 50387: [CRT] Fix uninitialized warning

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 15 11:18:01 2011 New Revision: 50387 URL: http://svn.reactos.org/svn/reactos?rev=50387&view=rev Log: [CRT] Fix uninitialized warning Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Sat Jan 15 11:18:01 2011 @@ -173,6 +173,7 @@ // FIXME: TODO case _T('f'): + default: /* Shift the decimal point and round */ fpval2 = round(sign * fpval * pow(10., precision)); break;

13 years, 8 months

[gadamopoulos] 50386: Revert 50381 and 50382. Altough it reduces number of reboots in the test server, it somehow reveals a registry corruption and cripples completely automated testing

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Jan 14 23:20:26 2011 New Revision: 50386 URL: http://svn.reactos.org/svn/reactos?rev=50386&view=rev Log: Revert 50381 and 50382. Altough it reduces number of reboots in the test server, it somehow reveals a registry corruption and cripples completely automated testing Removed: trunk/rostests/rosautotest/CDialogSurpass.cpp trunk/rostests/rosautotest/CDialogSurpass.h Modified: trunk/rostests/rosautotest/CMakeLists.txt trunk/rostests/rosautotest/main.cpp trunk/rostests/rosautotest/precomp.h trunk/rostests/rosautotest/rosautotest.rbuild Removed: trunk/rostests/rosautotest/CDialogSurpass.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CDialogSurpas… ============================================================================== --- trunk/rostests/rosautotest/CDialogSurpass.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CDialogSurpass.cpp (removed) @@ -1,97 +1,0 @@ -/* - * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation - * PURPOSE: Class for managing all the configuration parameters - * COPYRIGHT: Copyright 2011 - */ - -#include "precomp.h" - -BOOL CALLBACK PrintWindow(HWND hwnd, LPARAM lParam) -{ - CHAR WindowTitle[100]; - int lenght; - - lenght = GetWindowTextA(hwnd, WindowTitle, 100); - if(lenght == 0) - return TRUE; - - StringOut( string(WindowTitle) + "\n" ); - - return TRUE; -} - - -void CALLBACK WinEventProc(HWINEVENTHOOK hWinEventHook, - DWORD event, - HWND hwnd, - LONG idObject, - LONG idChild, - DWORD dwEventThread, - DWORD dwmsEventTime) -{ - /* make sure we got the correct event */ - if(event == EVENT_SYSTEM_DIALOGSTART) - { - /* wait for some time to make sure that the dialog is hung */ - Sleep(30 * 1000); - - /* Check if it is still open */ - if(IsWindow(hwnd)) - { - /* Print an error message */ - StringOut("Closing following dialog box:\n"); - PrintWindow(hwnd, NULL); - EnumChildWindows(hwnd, PrintWindow, NULL); - - /* Close the dialog */ - SendMessage(hwnd, WM_CLOSE, 0, 0); - } - } -} - - -DWORD WINAPI DialogSurpassThread(LPVOID lpThreadParameter) -{ - MSG dummy; - - /* Install event notifications */ - SetWinEventHook(EVENT_SYSTEM_DIALOGSTART, - EVENT_SYSTEM_DIALOGSTART, - NULL, - WinEventProc, - 0, - 0, - WINEVENT_OUTOFCONTEXT); - - while(GetMessage(&dummy, 0,0,0)) - { - /* There is no need to dispatch messages here */ - /* Actually this block will never be executed */ - } - - return 0; -} - -CDialogSurpass::CDialogSurpass() -{ - /* Creat the trhead that will receive notifications */ - hThread = CreateThread(NULL, - 0, - DialogSurpassThread, - NULL, - 0, - &ThreadID); -} - -CDialogSurpass::~CDialogSurpass() -{ - /* Notify the thread to close */ - PostThreadMessage(ThreadID, WM_QUIT, 0, 0); - - /* Wait for it close */ - WaitForSingleObject(hThread, INFINITE); - - /* Now close its handle*/ - CloseHandle(hThread); -} Removed: trunk/rostests/rosautotest/CDialogSurpass.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CDialogSurpas… ============================================================================== --- trunk/rostests/rosautotest/CDialogSurpass.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CDialogSurpass.h (removed) @@ -1,17 +1,0 @@ -/* - * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation - * PURPOSE: Class for managing all the configuration parameters - * COPYRIGHT: Copyright 2011 - */ - -class CDialogSurpass -{ -private: - - DWORD ThreadID; - HANDLE hThread; -public: - CDialogSurpass(); - ~CDialogSurpass(); -}; Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.tx… ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Fri Jan 14 23:20:26 2011 @@ -4,7 +4,6 @@ list(APPEND SOURCE CConfiguration.cpp - CDialogSurpass.cpp CFatalException.cpp CInvalidParameterException.cpp CJournaledTestList.cpp Modified: trunk/rostests/rosautotest/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/main.cpp?rev=… ============================================================================== --- trunk/rostests/rosautotest/main.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/main.cpp [iso-8859-1] Fri Jan 14 23:20:26 2011 @@ -48,7 +48,6 @@ { CWineTest WineTest; int ReturnValue = 1; - CDialogSurpass s; try { Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Fri Jan 14 23:20:26 2011 @@ -20,7 +20,6 @@ /* Class includes */ #include "auto_array_ptr.h" #include "CConfiguration.h" -#include "CDialogSurpass.h" #include "CFatalException.h" #include "CInvalidParameterException.h" #include "CProcess.h" Modified: trunk/rostests/rosautotest/rosautotest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/rosautotest.r… ============================================================================== --- trunk/rostests/rosautotest/rosautotest.rbuild [iso-8859-1] (original) +++ trunk/rostests/rosautotest/rosautotest.rbuild [iso-8859-1] Fri Jan 14 23:20:26 2011 @@ -8,7 +8,6 @@ <library>user32</library> <library>wininet</library> <file>CConfiguration.cpp</file> - <file>CDialogSurpass.cpp</file> <file>CFatalException.cpp</file> <file>CInvalidParameterException.cpp</file> <file>CJournaledTestList.cpp</file>

13 years, 8 months

[tkreuzer] 50385: [CRT] Fix miscalculation of number of decimal points to shift for %f format. Should fix shlwapi:string tests and bug 5818.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jan 14 20:00:10 2011 New Revision: 50385 URL: http://svn.reactos.org/svn/reactos?rev=50385&view=rev Log: [CRT] Fix miscalculation of number of decimal points to shift for %f format. Should fix shlwapi:string tests and bug 5818. Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Fri Jan 14 20:00:10 2011 @@ -115,14 +115,6 @@ exponent = get_exp(fpval); sign = fpval < 0 ? -1 : 1; - /* Shift the decimal point and round */ - fpval2 = round(sign * fpval * pow(10., precision - exponent)); - if (fpval2 >= (unsigned __int64)pow(10., precision + 1)) - { - exponent++; - fpval2 = round(sign * fpval * pow(10., precision - exponent)); - } - switch (chr) { case _T('G'): @@ -131,6 +123,9 @@ if (precision > 0) precision--; if (exponent < -4 || exponent >= precision) goto case_e; + /* Shift the decimal point and round */ + fpval2 = round(sign * fpval * pow(10., precision)); + /* Skip trailing zeroes */ while (precision && (unsigned __int64)fpval2 % 10 == 0) { @@ -143,6 +138,16 @@ digits = digits_u; case _T('e'): case_e: + /* Shift the decimal point and round */ + fpval2 = round(sign * fpval * pow(10., precision - exponent)); + + /* Compensate for changed exponent through rounding */ + if (fpval2 >= (unsigned __int64)pow(10., precision + 1)) + { + exponent++; + fpval2 = round(sign * fpval * pow(10., precision - exponent)); + } + val32 = exponent >= 0 ? exponent : -exponent; // FIXME: handle length of exponent field: @@ -168,6 +173,8 @@ // FIXME: TODO case _T('f'): + /* Shift the decimal point and round */ + fpval2 = round(sign * fpval * pow(10., precision)); break; }

13 years, 8 months

← Newer
1
...
17
18
19
20
21
22
23
...
34
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 January 2011