Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[akhaldi] 70397: [0.4.0] * Merge rapps fixes by Thomas Faber in revisions 70339 and 70340.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 18 15:19:56 2015 New Revision: 70397 URL: http://svn.reactos.org/svn/reactos?rev=70397&view=rev Log: [0.4.0] * Merge rapps fixes by Thomas Faber in revisions 70339 and 70340. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/media/rapps/putty.txt branches/ros-branch-0_4_0/reactos/media/rapps/utorrent.txt Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 18 15:19:56 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 18 15:19:56 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388 Modified: branches/ros-branch-0_4_0/reactos/media/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/media/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/media/rapps/putty.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/media/rapps/putty.txt [iso-8859-1] Fri Dec 18 15:19:56 2015 @@ -10,7 +10,7 @@ Size = 1.84 MB Category = 5 URLSite = http://www.chiark.greenend.org.uk/~sgtatham/putty/ -URLDownload = http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.65-installer.exe +URLDownload = http://the.earth.li/~sgtatham/putty/0.65/x86/putty-0.65-installer.exe SHA1 = 119261bd53b792e13e7fd27384e86ea960597a7e CDPath = none Modified: branches/ros-branch-0_4_0/reactos/media/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/media/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/media/rapps/utorrent.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/media/rapps/utorrent.txt [iso-8859-1] Fri Dec 18 15:19:56 2015 @@ -4,14 +4,13 @@ [Section] Name = ÂµTorrent -Version = 3.4.3 +Version = 3.4.5 License = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. -Size = 1.66 MB +Size = 1.93 MB Category = 5 URLSite = http://www.utorrent.com/ URLDownload = http://download-new.utorrent.com/endpoint/utorrent/os/windows/track/stable/… -SHA1 = 8fffab0df9bf581c209337fc07ea93d2ba22cc8c CDPath = none [Section.0407]

8 years, 9 months

[fireball] 70396: [RTL] - Improve implementation of RtlActivateActivationContextUnsafeFast / RtlDeactivateActivationContextUnsafeFast by replace magic numbers by flag values, which are already defi...

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 18 14:58:32 2015 New Revision: 70396 URL: http://svn.reactos.org/svn/reactos?rev=70396&view=rev Log: [RTL] - Improve implementation of RtlActivateActivationContextUnsafeFast / RtlDeactivateActivationContextUnsafeFast by replace magic numbers by flag values, which are already defined in rtltypes.h, and adding various debugging checks. Two of them are triggered for yet unknown reason: * Assert in RtlActivateActivationContextUnsafeFast * "Trying to activate already activated activation context" They are commented out in trunk not to annoy everyone. Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=70396… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Fri Dec 18 14:58:32 2015 @@ -5416,67 +5416,128 @@ RtlActivateActivationContextUnsafeFast(IN PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame, IN PVOID Context) { + RTL_ACTIVATION_CONTEXT_STACK_FRAME *NewFrame; RTL_ACTIVATION_CONTEXT_STACK_FRAME *ActiveFrame; - /* Get the curren active frame */ + /* Get the current active frame */ ActiveFrame = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame; DPRINT("ActiveSP %p, ActiveFrame %p, &Frame->Frame %p, Context %p\n", NtCurrentTeb()->ActivationContextStackPointer, ActiveFrame, &Frame->Frame, Context); + /* Ensure it's in the right format and at least fits basic info */ + ASSERT(Frame->Format == RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER); + ASSERT(Frame->Size >= sizeof(RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_BASIC)); + + /* Set debug info if size allows*/ + if (Frame->Size >= sizeof(RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED)) + { + Frame->Extra1 = (PVOID)(~(ULONG_PTR)ActiveFrame); + Frame->Extra2 = (PVOID)(~(ULONG_PTR)Context); + //Frame->Extra3 = ...; + } + + if (ActiveFrame) + { + /*ASSERT((ActiveFrame->Flags & + (RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_ACTIVATED | + RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_DEACTIVATED | + RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_NOT_REALLY_ACTIVATED)) == RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_ACTIVATED);*/ + + if (!(ActiveFrame->Flags & RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_HEAP_ALLOCATED)) + { + // TODO: Perform some additional checks if it was not heap allocated + } + } + + /* Save pointer to the new activation frame */ + NewFrame = &Frame->Frame; + /* Actually activate it */ Frame->Frame.Previous = ActiveFrame; Frame->Frame.ActivationContext = Context; - Frame->Frame.Flags = 0; + Frame->Frame.Flags = RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_ACTIVATED; /* Check if we can activate this context */ if ((ActiveFrame && (ActiveFrame->ActivationContext != Context)) || Context) { /* Set new active frame */ - NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = &Frame->Frame; - return &Frame->Frame; + DPRINT("Setting new active frame %p instead of old %p\n", NewFrame, ActiveFrame); + NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = NewFrame; + return NewFrame; } /* We can get here only one way: it was already activated */ - DPRINT("Trying to activate improper activation context\n"); + DPRINT("Trying to activate already activated activation context\n"); /* Activate only if we are allowing multiple activation */ +#if 0 if (!RtlpNotAllowingMultipleActivation) { - NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = &Frame->Frame; - } - else - { - /* Set flag */ - Frame->Frame.Flags = 0x30; - } + Frame->Frame.Flags = RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_ACTIVATED | RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_NOT_REALLY_ACTIVATED; + NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = NewFrame; + } +#else + // Activate it anyway + NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = NewFrame; +#endif /* Return pointer to the activation frame */ - return &Frame->Frame; + return NewFrame; } PRTL_ACTIVATION_CONTEXT_STACK_FRAME FASTCALL RtlDeactivateActivationContextUnsafeFast(IN PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame) { - RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame; - //RTL_ACTIVATION_CONTEXT_STACK_FRAME *top; + PRTL_ACTIVATION_CONTEXT_STACK_FRAME ActiveFrame, NewFrame; + + ActiveFrame = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame; + + /* Ensure it's in the right format and at least fits basic info */ + ASSERT(Frame->Format == RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER); + ASSERT(Frame->Size >= sizeof(RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_BASIC)); + + /* Make sure it is not deactivated and it is activated */ + ASSERT((Frame->Frame.Flags & RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_DEACTIVATED) == 0); + ASSERT(Frame->Frame.Flags & RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_ACTIVATED); + ASSERT((Frame->Frame.Flags & (RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_ACTIVATED | RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_DEACTIVATED)) == RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_ACTIVATED); + + /* Check debug info if it is present */ + if (Frame->Size >= sizeof(RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED)) + { + ASSERT(Frame->Extra1 == (PVOID)(~(ULONG_PTR)Frame->Frame.Previous)); + ASSERT(Frame->Extra2 == (PVOID)(~(ULONG_PTR)Frame->Frame.ActivationContext)); + //Frame->Extra3 = ...; + } + + if (ActiveFrame) + { + // TODO: Perform some additional checks here + } + + /* Special handling for not-really-activated */ + if (Frame->Frame.Flags & RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_NOT_REALLY_ACTIVATED) + { + DPRINT1("Deactivating not really activated activation context\n"); + Frame->Frame.Flags |= RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_DEACTIVATED; + return &Frame->Frame; + } /* find the right frame */ - //top = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame; - frame = &Frame->Frame; - - if (!frame) - { - DPRINT1("No top frame!\n"); - RtlRaiseStatus( STATUS_SXS_INVALID_DEACTIVATION ); - } - - DPRINT("Deactivated actctx %p, active frame %p, new active frame %p\n", NtCurrentTeb()->ActivationContextStackPointer, frame, frame->Previous); - /* pop everything up to and including frame */ - NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = frame->Previous; - - return frame; -} + NewFrame = &Frame->Frame; + if (ActiveFrame != NewFrame) + { + DPRINT1("Deactivating wrong active frame: %p != %p\n", ActiveFrame, NewFrame); + } + + DPRINT("Deactivated actctx %p, active frame %p, new active frame %p\n", NtCurrentTeb()->ActivationContextStackPointer, NewFrame, NewFrame->Previous); + + /* Pop everything up to and including frame */ + NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = NewFrame->Previous; + + Frame->Frame.Flags |= RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_DEACTIVATED; + return NewFrame->Previous; +}

8 years, 9 months

[rnaumann] 70395: [MSPAINT] Fix some English strings, to match Windows behaviour. Patch by Henry Tang Ih CORE-10716

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Fri Dec 18 12:31:57 2015 New Revision: 70395 URL: http://svn.reactos.org/svn/reactos?rev=70395&view=rev Log: [MSPAINT] Fix some English strings, to match Windows behaviour. Patch by Henry Tang Ih CORE-10716 Modified: trunk/reactos/base/applications/mspaint/lang/en-GB.rc trunk/reactos/base/applications/mspaint/lang/en-US.rc Modified: trunk/reactos/base/applications/mspaint/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/en-GB.rc [iso-8859-1] Fri Dec 18 12:31:57 2015 @@ -21,9 +21,9 @@ MENUITEM "Page Setup...", IDM_FILEPAGESETUP MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR - MENUITEM "Set as wallpaper (tiled)", IDM_FILEASWALLPAPERPLANE - MENUITEM "Set as wallpaper (centered)", IDM_FILEASWALLPAPERCENTERED - MENUITEM "Set as wallpaper (stretched)", IDM_FILEASWALLPAPERSTRETCHED + MENUITEM "Set as wallpaper (Tiled)", IDM_FILEASWALLPAPERPLANE + MENUITEM "Set as wallpaper (Centered)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "Set as wallpaper (Stretched)", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR MENUITEM "&Quit\tAlt+F4", IDM_FILEEXIT END Modified: trunk/reactos/base/applications/mspaint/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/en-US.rc [iso-8859-1] Fri Dec 18 12:31:57 2015 @@ -21,9 +21,9 @@ MENUITEM "Page Setup...", IDM_FILEPAGESETUP MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR - MENUITEM "Set as wallpaper (tiled)", IDM_FILEASWALLPAPERPLANE - MENUITEM "Set as wallpaper (centered)", IDM_FILEASWALLPAPERCENTERED - MENUITEM "Set as wallpaper (stretched)", IDM_FILEASWALLPAPERSTRETCHED + MENUITEM "Set as wallpaper (Tiled)", IDM_FILEASWALLPAPERPLANE + MENUITEM "Set as wallpaper (Centered)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "Set as wallpaper (Stretched)", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR MENUITEM "&Quit\tAlt+F4", IDM_FILEEXIT END

8 years, 9 months

[rnaumann] 70394: [LOGON.SCR] - improve the bitmaps - remove the enterprise part (we are ReactOS and only ReactOS) - Add an Application icon

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Fri Dec 18 12:29:01 2015 New Revision: 70394 URL: http://svn.reactos.org/svn/reactos?rev=70394&view=rev Log: [LOGON.SCR] - improve the bitmaps - remove the enterprise part (we are ReactOS and only ReactOS) - Add an Application icon Added: trunk/reactos/base/applications/screensavers/logon/res/icon_logon.ico (with props) Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/screensavers/logon/res/0.bmp trunk/reactos/base/applications/screensavers/logon/res/1.bmp Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] Fri Dec 18 12:29:01 2015 @@ -5,6 +5,8 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_ICON ICON DISCARDABLE "res/icon_logon.ico" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Logon ScreenSaver" Modified: trunk/reactos/base/applications/screensavers/logon/res/0.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/screensavers/logon/res/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== Binary files - no diff available. Added: trunk/reactos/base/applications/screensavers/logon/res/icon_logon.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/screensavers/logon/res/icon_logon.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

8 years, 9 months

[akhaldi] 70393: [0.4.0] * Apply the hackfix from CORE-9836 by Joachim Henze.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 18 11:04:11 2015 New Revision: 70393 URL: http://svn.reactos.org/svn/reactos?rev=70393&view=rev Log: [0.4.0] * Apply the hackfix from CORE-9836 by Joachim Henze. Modified: branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/class.c Modified: branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Fri Dec 18 11:04:11 2015 @@ -267,8 +267,11 @@ if (Class->spicn) UserDereferenceObject(Class->spicn); - if (Class->spcur) + if (Class->spcur && !UserObjectInDestroy(Class->spcur)) + { UserDereferenceObject(Class->spcur); + Class->spcur = NULL; + } if (Class->spicnSm) { UserDereferenceObject(Class->spicnSm);

8 years, 9 months

[akhaldi] 70392: [0.4.0] * Merge the Add New Bitmap to the New Menu fix by Jared Smudde in r70385. CORE-10668

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 18 10:49:29 2015 New Revision: 70392 URL: http://svn.reactos.org/svn/reactos?rev=70392&view=rev Log: [0.4.0] * Merge the Add New Bitmap to the New Menu fix by Jared Smudde in r70385. CORE-10668 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/boot/bootdata/hivecls.inf Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 18 10:49:29 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384,70387-70388 +/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 18 10:49:29 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384,70387-70388 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388 Modified: branches/ros-branch-0_4_0/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_4_0/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Fri Dec 18 10:49:29 2015 @@ -177,6 +177,8 @@ ; Bitmap Images HKCR,".bmp","",0x00000000,"bmpfile" HKCR,"bmpfile","",0x00000000,"Bitmap Image" +HKCR,".bmp\shellnew","",0x00000000,"" +HKCR,".bmp\shellnew","NullFile",0x00020000,"" HKCR,"bmpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shimgvw.dll,-304" HKCR,"bmpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,1" HKCR,"bmpfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1"

8 years, 9 months

[akhaldi] 70391: [0.4.0] * Merge the styled lines and pen implementation fixes by Timo Kreuzer in revisions 70387 and 70388. CORE-9984

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 18 10:32:42 2015 New Revision: 70391 URL: http://svn.reactos.org/svn/reactos?rev=70391&view=rev Log: [0.4.0] * Merge the styled lines and pen implementation fixes by Timo Kreuzer in revisions 70387 and 70388. CORE-9984 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/lineto.c branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/brush.cpp branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/brush.h branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/pen.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 18 10:32:42 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384 +/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384,70387-70388 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 18 10:32:42 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384,70387-70388 Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] Fri Dec 18 10:32:42 2015 @@ -28,6 +28,63 @@ } } +LONG +HandleStyles( + BRUSHOBJ *pbo, + POINTL* Translate, + LONG x, + LONG y, + LONG deltax, + LONG deltay, + LONG dx, + LONG dy, + PULONG piStyle) +{ + PEBRUSHOBJ pebo = (PEBRUSHOBJ)pbo; + PULONG pulStyles = pebo->pbrush->pStyle; + ULONG iStyle, cStyles = pebo->pbrush->dwStyleCount; + LONG diStyle, offStyle, lStyleMax; + + if (cStyles > 0) + { + if (deltax > deltay) + { + offStyle = (- Translate->x) % pebo->pbrush->ulStyleSize; + diStyle = dx; + lStyleMax = x; + } + else + { + offStyle = (- Translate->y) % pebo->pbrush->ulStyleSize; + diStyle = dy; + lStyleMax = y; + } + + /* Now loop until we have found the style index */ + for (iStyle = 0; offStyle >= pulStyles[iStyle]; iStyle++) + { + offStyle -= pulStyles[iStyle]; + } + + if (diStyle > 0) + { + lStyleMax += pulStyles[iStyle] - offStyle; + } + else + { + lStyleMax -= offStyle + 1; + } + } + else + { + iStyle = 0; + lStyleMax = MAX_COORD; + } + + *piStyle = iStyle; + return lStyleMax; +} + /* * Draw a line from top-left to bottom-right */ @@ -43,6 +100,12 @@ RECT_ENUM RectEnum; ULONG Pixel = pbo->iSolidColor; LONG delta; + PEBRUSHOBJ pebo = (PEBRUSHOBJ)pbo; + PULONG pulStyles = pebo->pbrush->pStyle; + ULONG iStyle, cStyles = pebo->pbrush->dwStyleCount; + LONG lStyleMax; + + lStyleMax = HandleStyles(pbo, Translate, x, y, deltax, deltay, 1, 1, &iStyle); CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); EnumMore = CLIPOBJ_bEnum(Clip, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); @@ -72,7 +135,7 @@ } if (ClipRect < RectEnum.arcl + RectEnum.c) /* If there's no current clip rect we're done */ { - if (ClipRect->left <= x && ClipRect->top <= y) + if ((ClipRect->left <= x && ClipRect->top <= y) && ((iStyle & 1) == 0)) { DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_PutPixel( OutputObj, x, y, Pixel); @@ -80,6 +143,11 @@ if (deltax < deltay) { y++; + if (y == lStyleMax) + { + iStyle = (iStyle + 1) % cStyles; + lStyleMax = y + pulStyles[iStyle]; + } error = error + deltax; if (deltay <= error) { @@ -90,6 +158,11 @@ else { x++; + if (x == lStyleMax) + { + iStyle = (iStyle + 1) % cStyles; + lStyleMax = x + pulStyles[iStyle]; + } error = error + deltay; if (deltax <= error) { @@ -114,6 +187,12 @@ RECT_ENUM RectEnum; ULONG Pixel = pbo->iSolidColor; LONG delta; + PEBRUSHOBJ pebo = (PEBRUSHOBJ)pbo; + PULONG pulStyles = pebo->pbrush->pStyle; + ULONG iStyle, cStyles = pebo->pbrush->dwStyleCount; + LONG lStyleMax; + + lStyleMax = HandleStyles(pbo, Translate, x, y, deltax, deltay, 1, -1, &iStyle); CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_RIGHTUP, 0); EnumMore = CLIPOBJ_bEnum(Clip, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); @@ -142,7 +221,7 @@ } if (ClipRect < RectEnum.arcl + RectEnum.c) { - if (ClipRect->left <= x && y < ClipRect->bottom) + if ((ClipRect->left <= x && y < ClipRect->bottom) && ((iStyle & 1) == 0)) { DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_PutPixel( OutputObj, x, y, Pixel); @@ -150,6 +229,11 @@ if (deltax < deltay) { y--; + if (y == lStyleMax) + { + iStyle = (iStyle - 1) % cStyles; + lStyleMax = y - pulStyles[iStyle]; + } error = error + deltax; if (deltay <= error) { @@ -160,6 +244,11 @@ else { x++; + if (x == lStyleMax) + { + iStyle = (iStyle + 1) % cStyles; + lStyleMax = x + pulStyles[iStyle]; + } error = error + deltay; if (deltax <= error) { @@ -184,6 +273,12 @@ RECT_ENUM RectEnum; ULONG Pixel = pbo->iSolidColor; LONG delta; + PEBRUSHOBJ pebo = (PEBRUSHOBJ)pbo; + PULONG pulStyles = pebo->pbrush->pStyle; + ULONG iStyle, cStyles = pebo->pbrush->dwStyleCount; + LONG lStyleMax; + + lStyleMax = HandleStyles(pbo, Translate, x, y, deltax, deltay, -1, 1, &iStyle); CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_LEFTDOWN, 0); EnumMore = CLIPOBJ_bEnum(Clip, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); @@ -212,7 +307,7 @@ } if (ClipRect < RectEnum.arcl + RectEnum.c) { - if (x < ClipRect->right && ClipRect->top <= y) + if ((x < ClipRect->right && ClipRect->top <= y) && ((iStyle & 1) == 0)) { DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_PutPixel( OutputObj, x, y, Pixel); @@ -220,6 +315,11 @@ if (deltax < deltay) { y++; + if (y == lStyleMax) + { + iStyle = (iStyle + 1) % cStyles; + lStyleMax = y + pulStyles[iStyle]; + } error = error + deltax; if (deltay <= error) { @@ -230,6 +330,11 @@ else { x--; + if (x == lStyleMax) + { + iStyle = (iStyle - 1) % cStyles; + lStyleMax = x - pulStyles[iStyle]; + } error = error + deltay; if (deltax <= error) { @@ -254,6 +359,12 @@ RECT_ENUM RectEnum; ULONG Pixel = pbo->iSolidColor; LONG delta; + PEBRUSHOBJ pebo = (PEBRUSHOBJ)pbo; + PULONG pulStyles = pebo->pbrush->pStyle; + ULONG iStyle, cStyles = pebo->pbrush->dwStyleCount; + LONG lStyleMax; + + lStyleMax = HandleStyles(pbo, Translate, x, y, deltax, deltay, -1, -1, &iStyle); CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_LEFTUP, 0); EnumMore = CLIPOBJ_bEnum(Clip, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); @@ -282,7 +393,7 @@ } if (ClipRect < RectEnum.arcl + RectEnum.c) { - if (x < ClipRect->right && y < ClipRect->bottom) + if ((x < ClipRect->right && y < ClipRect->bottom) && ((iStyle & 1) == 0)) { DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_PutPixel( OutputObj, x, y, Pixel); @@ -290,6 +401,11 @@ if (deltax < deltay) { y--; + if (y == lStyleMax) + { + iStyle = (iStyle - 1) % cStyles; + lStyleMax = y - pulStyles[iStyle]; + } error = error + deltax; if (deltay <= error) { @@ -300,6 +416,11 @@ else { x--; + if (x == lStyleMax) + { + iStyle = (iStyle - 1) % cStyles; + lStyleMax = x - pulStyles[iStyle]; + } error = error + deltay; if (deltax <= error) { @@ -337,6 +458,8 @@ RECT_ENUM RectEnum; BOOL EnumMore; CLIPOBJ *pcoPriv = NULL; + PEBRUSHOBJ pebo = (PEBRUSHOBJ)pbo; + ULONG cStyles = pebo->pbrush->dwStyleCount; if (x1 < x2) { @@ -413,7 +536,7 @@ vy = y1; } - if (y1 == y2) + if ((y1 == y2) && (cStyles == 0)) { CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); do @@ -437,7 +560,7 @@ } while (EnumMore); } - else if (x1 == x2) + else if ((x1 == x2) && (cStyles == 0)) { CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); do Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/brush.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/brush.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/brush.cpp [iso-8859-1] Fri Dec 18 10:32:42 2015 @@ -45,6 +45,11 @@ this->ulSurfTime = 0; this->pvRBrush = NULL; this->hdev = NULL; + + /* FIXME: should be done only in PEN constructor, + but our destructor needs it! */ + this->dwStyleCount = 0; + this->pStyle = NULL; } BRUSH::~BRUSH( @@ -62,6 +67,12 @@ { GreSetBitmapOwner(this->hbmPattern, BASEOBJECT::OWNER::POWNED); GreDeleteObject(this->hbmPattern); + } + + /* Delete styles */ + if ((this->pStyle != NULL) && !(this->flAttrs & BR_IS_DEFAULTSTYLE)) + { + ExFreePoolWithTag(this->pStyle, GDITAG_PENSTYLE); } } Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Fri Dec 18 10:32:42 2015 @@ -43,7 +43,8 @@ INT iBrushStyle; // 0x070 //PREGION prgn; // 0x074 //DWORD unk078; // 0x078 - DWORD unk07c; // 0x07c + //DWORD unk07c; // 0x07c + ULONG ulStyleSize; LIST_ENTRY ListHead; // 0x080 } BRUSHBODY; Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/pen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] Fri Dec 18 10:32:42 2015 @@ -86,11 +86,12 @@ { HPEN hPen; PBRUSH pbrushPen; - static const BYTE PatternAlternate[] = {0x55, 0x55, 0x55, 0}; - static const BYTE PatternDash[] = {0xFF, 0xFF, 0xC0, 0}; - static const BYTE PatternDot[] = {0xE3, 0x8E, 0x38, 0}; - static const BYTE PatternDashDot[] = {0xFF, 0x81, 0xC0, 0}; - static const BYTE PatternDashDotDot[] = {0xFF, 0x8E, 0x38, 0}; + static ULONG aulStyleAlternate[] = { 1, 1 }; + static ULONG aulStyleDash[] = { 6, 2 }; + static ULONG aulStyleDot[] = { 1, 1 }; + static ULONG aulStyleDashDot[] = { 3, 2, 1, 2 }; + static ULONG aulStyleDashDotDot[] = { 3, 1, 1, 1, 1, 1 }; + ULONG i; dwWidth = abs(dwWidth); @@ -127,8 +128,9 @@ pbrushPen->iBrushStyle = ulBrushStyle; // FIXME: Copy the bitmap first ? pbrushPen->hbmClient = (HANDLE)ulClientHatch; - pbrushPen->dwStyleCount = dwStyleCount; - pbrushPen->pStyle = pStyle; + pbrushPen->dwStyleCount = 0; + pbrushPen->pStyle = NULL; + pbrushPen->ulStyleSize = 0; pbrushPen->flAttrs = bOldStylePen ? BR_IS_OLDSTYLEPEN : BR_IS_PEN; @@ -150,28 +152,33 @@ break; case PS_ALTERNATE: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); + pbrushPen->flAttrs |= BR_IS_SOLID | BR_IS_DEFAULTSTYLE; + pbrushPen->pStyle = aulStyleAlternate; + pbrushPen->dwStyleCount = _countof(aulStyleAlternate); break; case PS_DOT: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDot); + pbrushPen->flAttrs |= BR_IS_SOLID | BR_IS_DEFAULTSTYLE; + pbrushPen->pStyle = aulStyleDot; + pbrushPen->dwStyleCount = _countof(aulStyleDot); break; case PS_DASH: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDash); + pbrushPen->flAttrs |= BR_IS_SOLID | BR_IS_DEFAULTSTYLE; + pbrushPen->pStyle = aulStyleDash; + pbrushPen->dwStyleCount = _countof(aulStyleDash); break; case PS_DASHDOT: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDot); + pbrushPen->flAttrs |= BR_IS_SOLID | BR_IS_DEFAULTSTYLE; + pbrushPen->pStyle = aulStyleDashDot; + pbrushPen->dwStyleCount = _countof(aulStyleDashDot); break; case PS_DASHDOTDOT: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDotDot); + pbrushPen->flAttrs |= BR_IS_SOLID | BR_IS_DEFAULTSTYLE; + pbrushPen->pStyle = aulStyleDashDotDot; + pbrushPen->dwStyleCount = _countof(aulStyleDashDotDot); break; case PS_INSIDEFRAME: @@ -179,14 +186,6 @@ break; case PS_USERSTYLE: - if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) - { - /* FIXME: PS_USERSTYLE workaround */ - DPRINT1("PS_COSMETIC | PS_USERSTYLE not handled\n"); - pbrushPen->flAttrs |= BR_IS_SOLID; - break; - } - else { UINT i; BOOL has_neg = FALSE, all_zero = TRUE; @@ -203,13 +202,25 @@ } } /* FIXME: What style here? */ - pbrushPen->flAttrs |= 0; + pbrushPen->flAttrs |= BR_IS_SOLID; + pbrushPen->dwStyleCount = dwStyleCount; + pbrushPen->pStyle = pStyle; break; default: DPRINT1("IntGdiExtCreatePen unknown penstyle %x\n", dwPenStyle); goto ExitCleanup; } + + if (pbrushPen->pStyle != NULL) + { + for (i = 0; i < pbrushPen->dwStyleCount; i++) + { + pbrushPen->ulStyleSize += pbrushPen->pStyle[i]; + } + } + + NT_ASSERT((pbrushPen->dwStyleCount == 0) || (pbrushPen->pStyle != NULL)); PEN_UnlockPen(pbrushPen); return hPen; @@ -278,8 +289,9 @@ } else { - // FIXME: Can we trust in dwStyleCount being <= 16? - cbRetCount = sizeof(EXTLOGPEN) - sizeof(DWORD) + pbrushPen->dwStyleCount * sizeof(DWORD); + DWORD dwStyleCount = (pbrushPen->flAttrs & BR_IS_DEFAULTSTYLE) ? + 0 : pbrushPen->dwStyleCount; + cbRetCount = sizeof(EXTLOGPEN) - sizeof(DWORD) + dwStyleCount * sizeof(DWORD); if (pBuffer) { ULONG i; @@ -291,8 +303,8 @@ pExtLogPen->elpBrushStyle = pbrushPen->iBrushStyle; pExtLogPen->elpColor = pbrushPen->BrushAttr.lbColor; pExtLogPen->elpHatch = (ULONG_PTR)pbrushPen->hbmClient; - pExtLogPen->elpNumEntries = pbrushPen->dwStyleCount; - for (i = 0; i < pExtLogPen->elpNumEntries; i++) + pExtLogPen->elpNumEntries = dwStyleCount; + for (i = 0; i < dwStyleCount; i++) { pExtLogPen->elpStyleEntry[i] = pbrushPen->pStyle[i]; } @@ -358,6 +370,39 @@ return 0; } + if (((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) && + (ulBrushStyle != BS_SOLID)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (((dwPenStyle & PS_STYLE_MASK) == PS_NULL) || + (ulBrushStyle == BS_NULL)) + { + return StockObjects[NULL_PEN]; + } + + + if ((ulBrushStyle == BS_PATTERN) || + (ulBrushStyle == BS_DIBPATTERN) || + (ulBrushStyle == BS_DIBPATTERNPT)) + { + ulColor = 0; + } + else if ((ulBrushStyle != BS_SOLID) && + (ulBrushStyle != BS_HATCHED)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if ((dwPenStyle & PS_STYLE_MASK) != PS_USERSTYLE) + { + dwStyleCount = 0; + pUnsafeStyle = NULL; + } + if (dwStyleCount > 0) { if (pUnsafeStyle == NULL) @@ -378,8 +423,8 @@ { ProbeForRead(pUnsafeStyle, dwStyleCount * sizeof(DWORD), 1); RtlCopyMemory(pSafeStyle, - pUnsafeStyle, - dwStyleCount * sizeof(DWORD)); + pUnsafeStyle, + dwStyleCount * sizeof(DWORD)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

8 years, 9 months

[hbelusca] 70390: [DBGHELP][RTL] Fix usage of VirtualSize wrt. SizeOfRawData. CORE-10523 CORE-9548 #comment Please retest with revision >= 70390

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 17 23:10:56 2015 New Revision: 70390 URL: http://svn.reactos.org/svn/reactos?rev=70390&view=rev Log: [DBGHELP][RTL] Fix usage of VirtualSize wrt. SizeOfRawData. CORE-10523 CORE-9548 #comment Please retest with revision >= 70390 Modified: trunk/reactos/dll/win32/dbghelp/compat.c trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/dll/win32/dbghelp/compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/compat.c… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/compat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/compat.c [iso-8859-1] Thu Dec 17 23:10:56 2015 @@ -61,11 +61,11 @@ while (Count--) { Va = SWAPD(Section->VirtualAddress); - if ((Va <= Rva) && - (Rva < Va + SWAPD(Section->Misc.VirtualSize))) + if ((Va <= Rva) && (Rva < Va + SWAPD(Section->SizeOfRawData))) return Section; Section++; } + return NULL; } @@ -83,9 +83,9 @@ if ((Section == NULL) || (Rva < SWAPD(Section->VirtualAddress)) || - (Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->Misc.VirtualSize))) - { - Section = RtlImageRvaToSection (NtHeader, BaseAddress, Rva); + (Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->SizeOfRawData))) + { + Section = RtlImageRvaToSection(NtHeader, BaseAddress, Rva); if (Section == NULL) return NULL; @@ -93,9 +93,8 @@ *SectionHeader = Section; } - return (PVOID)((ULONG_PTR)BaseAddress + - Rva + - SWAPD(Section->PointerToRawData) - + return (PVOID)((ULONG_PTR)BaseAddress + Rva + + (ULONG_PTR)SWAPD(Section->PointerToRawData) - (ULONG_PTR)SWAPD(Section->VirtualAddress)); } @@ -132,7 +131,7 @@ if (MappedAsImage || Va < SWAPD(NtHeader->OptionalHeader.SizeOfHeaders)) return (PVOID)((ULONG_PTR)BaseAddress + Va); - /* image mapped as ordinary file, we must find raw pointer */ + /* Image mapped as ordinary file, we must find raw pointer */ return RtlImageRvaToVa(NtHeader, BaseAddress, Va, NULL); } Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=70390&… ============================================================================== --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Thu Dec 17 23:10:56 2015 @@ -301,10 +301,9 @@ if (MappedAsImage || Va < SWAPD(NtHeader->OptionalHeader.SizeOfHeaders)) return (PVOID)((ULONG_PTR)BaseAddress + Va); - /* image mapped as ordinary file, we must find raw pointer */ + /* Image mapped as ordinary file, we must find raw pointer */ return RtlImageRvaToVa(NtHeader, BaseAddress, Va, NULL); } - /* * @implemented @@ -326,14 +325,13 @@ while (Count--) { Va = SWAPD(Section->VirtualAddress); - if ((Va <= Rva) && - (Rva < Va + SWAPD(Section->Misc.VirtualSize))) + if ((Va <= Rva) && (Rva < Va + SWAPD(Section->SizeOfRawData))) return Section; Section++; } + return NULL; } - /* * @implemented @@ -353,9 +351,9 @@ if ((Section == NULL) || (Rva < SWAPD(Section->VirtualAddress)) || - (Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->Misc.VirtualSize))) - { - Section = RtlImageRvaToSection (NtHeader, BaseAddress, Rva); + (Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->SizeOfRawData))) + { + Section = RtlImageRvaToSection(NtHeader, BaseAddress, Rva); if (Section == NULL) return NULL; @@ -363,9 +361,8 @@ *SectionHeader = Section; } - return (PVOID)((ULONG_PTR)BaseAddress + - Rva + - SWAPD(Section->PointerToRawData) - + return (PVOID)((ULONG_PTR)BaseAddress + Rva + + (ULONG_PTR)SWAPD(Section->PointerToRawData) - (ULONG_PTR)SWAPD(Section->VirtualAddress)); }

8 years, 9 months

[ekohl] 70389: [SYSSETUP] Initialize the defauls users locale settings based on the selected locale Id from first stage setup. #CORE-5989 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Dec 17 22:22:16 2015 New Revision: 70389 URL: http://svn.reactos.org/svn/reactos?rev=70389&view=rev Log: [SYSSETUP] Initialize the defauls users locale settings based on the selected locale Id from first stage setup. #CORE-5989 #resolve Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu Dec 17 22:22:16 2015 @@ -30,6 +30,7 @@ #include <tchar.h> #include <wincon.h> +#include <winnls.h> #include <winsvc.h> #include <userenv.h> #include <shlobj.h> @@ -974,7 +975,117 @@ return 0; } -DWORD WINAPI + +static +VOID +InitializeDefaultUserLocale(VOID) +{ + WCHAR szBuffer[80]; + PWSTR ptr; + HKEY hLocaleKey; + DWORD ret; + DWORD dwSize; + LCID lcid; + INT i; + + struct {LCTYPE LCType; PWSTR pValue;} LocaleData[] = { + /* Number */ + {LOCALE_SDECIMAL, L"sDecimal"}, + {LOCALE_STHOUSAND, L"sThousand"}, + {LOCALE_SNEGATIVESIGN, L"sNegativeSign"}, + {LOCALE_SPOSITIVESIGN, L"sPositiveSign"}, + {LOCALE_SGROUPING, L"sGrouping"}, + {LOCALE_SLIST, L"sList"}, + {LOCALE_SNATIVEDIGITS, L"sNativeDigits"}, + {LOCALE_INEGNUMBER, L"iNegNumber"}, + {LOCALE_IDIGITS, L"iDigits"}, + {LOCALE_ILZERO, L"iLZero"}, + {LOCALE_IMEASURE, L"iMeasure"}, + {LOCALE_IDIGITSUBSTITUTION, L"NumShape"}, + + /* Currency */ + {LOCALE_SCURRENCY, L"sCurrency"}, + {LOCALE_SMONDECIMALSEP, L"sMonDecimalSep"}, + {LOCALE_SMONTHOUSANDSEP, L"sMonThousandSep"}, + {LOCALE_SMONGROUPING, L"sMonGrouping"}, + {LOCALE_ICURRENCY, L"iCurrency"}, + {LOCALE_INEGCURR, L"iNegCurr"}, + {LOCALE_ICURRDIGITS, L"iCurrDigits"}, + + /* Time */ + {LOCALE_STIMEFORMAT, L"sTimeFormat"}, + {LOCALE_STIME, L"sTime"}, + {LOCALE_S1159, L"s1159"}, + {LOCALE_S2359, L"s2359"}, + {LOCALE_ITIME, L"iTime"}, + {LOCALE_ITIMEMARKPOSN, L"iTimePrefix"}, + {LOCALE_ITLZERO, L"iTLZero"}, + + /* Date */ + {LOCALE_SLONGDATE, L"sLongDate"}, + {LOCALE_SSHORTDATE, L"sShortDate"}, + {LOCALE_SDATE, L"sDate"}, + {LOCALE_IFIRSTDAYOFWEEK, L"iFirstDayOfWeek"}, + {LOCALE_IFIRSTWEEKOFYEAR, L"iFirstWeekOfYear"}, + {LOCALE_IDATE, L"iDate"}, + {LOCALE_ICALENDARTYPE, L"iCalendarType"}, + + /* Misc */ + {LOCALE_SCOUNTRY, L"sCountry"}, + {LOCALE_SLANGUAGE, L"sLanguage"}, + {LOCALE_ICOUNTRY, L"iCountry"}, + {0, NULL}}; + + ret = RegOpenKeyExW(HKEY_USERS, + L".DEFAULT\\Control Panel\\International", + 0, + KEY_READ | KEY_WRITE, + &hLocaleKey); + if (ret != ERROR_SUCCESS) + { + return; + } + + dwSize = 9 * sizeof(WCHAR); + ret = RegQueryValueExW(hLocaleKey, + L"Locale", + NULL, + NULL, + (PBYTE)szBuffer, + &dwSize); + if (ret != ERROR_SUCCESS) + goto done; + + lcid = (LCID)wcstoul(szBuffer, &ptr, 16); + if (lcid == 0) + goto done; + + i = 0; + while (LocaleData[i].pValue != NULL) + { + if (GetLocaleInfo(lcid, + LocaleData[i].LCType | LOCALE_NOUSEROVERRIDE, + szBuffer, + sizeof(szBuffer) / sizeof(WCHAR))) + { + RegSetValueExW(hLocaleKey, + LocaleData[i].pValue, + 0, + REG_SZ, + (PBYTE)szBuffer, + (wcslen(szBuffer) + 1) * sizeof(WCHAR)); + } + + i++; + } + +done: + RegCloseKey(hLocaleKey); +} + + +DWORD +WINAPI InstallReactOS(HINSTANCE hInstance) { TCHAR szBuffer[MAX_PATH]; @@ -996,6 +1107,8 @@ CreateTempDir(L"TEMP"); CreateTempDir(L"TMP"); + + InitializeDefaultUserLocale(); if (GetWindowsDirectory(szBuffer, sizeof(szBuffer) / sizeof(TCHAR))) {

8 years, 9 months

[tkreuzer] 70388: [WIN32K] Fix bugs in pen implementation: - Do not use the x coordinate to adjust styles, instead they start where the lines start - Don't leak allocated styles - Make sure the PEN...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 17 22:05:06 2015 New Revision: 70388 URL: http://svn.reactos.org/svn/reactos?rev=70388&view=rev Log: [WIN32K] Fix bugs in pen implementation: - Do not use the x coordinate to adjust styles, instead they start where the lines start - Don't leak allocated styles - Make sure the PEN fields are initialized correctly, even for BRUSHES, so that the destructor can do it's cleanup work - Fix numerous parameter checks gdi32_apitest:pen now shows 0 failures! Modified: trunk/reactos/win32ss/gdi/eng/lineto.c trunk/reactos/win32ss/gdi/ntgdi/brush.cpp trunk/reactos/win32ss/gdi/ntgdi/pen.c Modified: trunk/reactos/win32ss/gdi/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/lineto.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] Thu Dec 17 22:05:06 2015 @@ -49,13 +49,13 @@ { if (deltax > deltay) { - offStyle = (x - Translate->x) % pebo->pbrush->ulStyleSize; + offStyle = (- Translate->x) % pebo->pbrush->ulStyleSize; diStyle = dx; lStyleMax = x; } else { - offStyle = (y - Translate->y) % pebo->pbrush->ulStyleSize; + offStyle = (- Translate->y) % pebo->pbrush->ulStyleSize; diStyle = dy; lStyleMax = y; } Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.cp… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.cpp [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.cpp [iso-8859-1] Thu Dec 17 22:05:06 2015 @@ -45,6 +45,11 @@ this->ulSurfTime = 0; this->pvRBrush = NULL; this->hdev = NULL; + + /* FIXME: should be done only in PEN constructor, + but our destructor needs it! */ + this->dwStyleCount = 0; + this->pStyle = NULL; } BRUSH::~BRUSH( @@ -62,6 +67,12 @@ { GreSetBitmapOwner(this->hbmPattern, BASEOBJECT::OWNER::POWNED); GreDeleteObject(this->hbmPattern); + } + + /* Delete styles */ + if ((this->pStyle != NULL) && !(this->flAttrs & BR_IS_DEFAULTSTYLE)) + { + ExFreePoolWithTag(this->pStyle, GDITAG_PENSTYLE); } } Modified: trunk/reactos/win32ss/gdi/ntgdi/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/pen.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] Thu Dec 17 22:05:06 2015 @@ -128,7 +128,7 @@ pbrushPen->iBrushStyle = ulBrushStyle; // FIXME: Copy the bitmap first ? pbrushPen->hbmClient = (HANDLE)ulClientHatch; - pbrushPen->dwStyleCount = dwStyleCount; + pbrushPen->dwStyleCount = 0; pbrushPen->pStyle = NULL; pbrushPen->ulStyleSize = 0; @@ -152,31 +152,31 @@ break; case PS_ALTERNATE: - pbrushPen->flAttrs |= BR_IS_SOLID; + pbrushPen->flAttrs |= BR_IS_SOLID | BR_IS_DEFAULTSTYLE; pbrushPen->pStyle = aulStyleAlternate; pbrushPen->dwStyleCount = _countof(aulStyleAlternate); break; case PS_DOT: - pbrushPen->flAttrs |= BR_IS_SOLID; + pbrushPen->flAttrs |= BR_IS_SOLID | BR_IS_DEFAULTSTYLE; pbrushPen->pStyle = aulStyleDot; pbrushPen->dwStyleCount = _countof(aulStyleDot); break; case PS_DASH: - pbrushPen->flAttrs |= BR_IS_SOLID; + pbrushPen->flAttrs |= BR_IS_SOLID | BR_IS_DEFAULTSTYLE; pbrushPen->pStyle = aulStyleDash; pbrushPen->dwStyleCount = _countof(aulStyleDash); break; case PS_DASHDOT: - pbrushPen->flAttrs |= BR_IS_SOLID; + pbrushPen->flAttrs |= BR_IS_SOLID | BR_IS_DEFAULTSTYLE; pbrushPen->pStyle = aulStyleDashDot; pbrushPen->dwStyleCount = _countof(aulStyleDashDot); break; case PS_DASHDOTDOT: - pbrushPen->flAttrs |= BR_IS_SOLID; + pbrushPen->flAttrs |= BR_IS_SOLID | BR_IS_DEFAULTSTYLE; pbrushPen->pStyle = aulStyleDashDotDot; pbrushPen->dwStyleCount = _countof(aulStyleDashDotDot); break; @@ -186,14 +186,6 @@ break; case PS_USERSTYLE: - if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) - { - /* FIXME: PS_USERSTYLE workaround */ - DPRINT1("PS_COSMETIC | PS_USERSTYLE not handled\n"); - pbrushPen->flAttrs |= BR_IS_SOLID; - break; - } - else { UINT i; BOOL has_neg = FALSE, all_zero = TRUE; @@ -227,6 +219,8 @@ pbrushPen->ulStyleSize += pbrushPen->pStyle[i]; } } + + NT_ASSERT((pbrushPen->dwStyleCount == 0) || (pbrushPen->pStyle != NULL)); PEN_UnlockPen(pbrushPen); return hPen; @@ -295,8 +289,9 @@ } else { - // FIXME: Can we trust in dwStyleCount being <= 16? - cbRetCount = sizeof(EXTLOGPEN) - sizeof(DWORD) + pbrushPen->dwStyleCount * sizeof(DWORD); + DWORD dwStyleCount = (pbrushPen->flAttrs & BR_IS_DEFAULTSTYLE) ? + 0 : pbrushPen->dwStyleCount; + cbRetCount = sizeof(EXTLOGPEN) - sizeof(DWORD) + dwStyleCount * sizeof(DWORD); if (pBuffer) { ULONG i; @@ -308,8 +303,8 @@ pExtLogPen->elpBrushStyle = pbrushPen->iBrushStyle; pExtLogPen->elpColor = pbrushPen->BrushAttr.lbColor; pExtLogPen->elpHatch = (ULONG_PTR)pbrushPen->hbmClient; - pExtLogPen->elpNumEntries = pbrushPen->dwStyleCount; - for (i = 0; i < pExtLogPen->elpNumEntries; i++) + pExtLogPen->elpNumEntries = dwStyleCount; + for (i = 0; i < dwStyleCount; i++) { pExtLogPen->elpStyleEntry[i] = pbrushPen->pStyle[i]; } @@ -375,6 +370,39 @@ return 0; } + if (((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) && + (ulBrushStyle != BS_SOLID)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (((dwPenStyle & PS_STYLE_MASK) == PS_NULL) || + (ulBrushStyle == BS_NULL)) + { + return StockObjects[NULL_PEN]; + } + + + if ((ulBrushStyle == BS_PATTERN) || + (ulBrushStyle == BS_DIBPATTERN) || + (ulBrushStyle == BS_DIBPATTERNPT)) + { + ulColor = 0; + } + else if ((ulBrushStyle != BS_SOLID) && + (ulBrushStyle != BS_HATCHED)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if ((dwPenStyle & PS_STYLE_MASK) != PS_USERSTYLE) + { + dwStyleCount = 0; + pUnsafeStyle = NULL; + } + if (dwStyleCount > 0) { if (pUnsafeStyle == NULL) @@ -395,8 +423,8 @@ { ProbeForRead(pUnsafeStyle, dwStyleCount * sizeof(DWORD), 1); RtlCopyMemory(pSafeStyle, - pUnsafeStyle, - dwStyleCount * sizeof(DWORD)); + pUnsafeStyle, + dwStyleCount * sizeof(DWORD)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

8 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
26
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 December 2015