Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[khornicek] 75800: [WIN32SS|KBDHID] - fix some typos and copypastas

by khornicek＠svn.reactos.org

Author: khornicek Date: Fri Sep 8 20:20:34 2017 New Revision: 75800 URL: http://svn.reactos.org/svn/reactos?rev=75800&view=rev Log: [WIN32SS|KBDHID] - fix some typos and copypastas Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/kbdhid/kbdhid.… ============================================================================== --- trunk/reactos/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Fri Sep 8 20:20:34 2017 @@ -372,7 +372,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUSE_ATTRIBUTES)) { /* invalid request */ - DPRINT1("[MOUHID] IOCTL_MOUSE_QUERY_ATTRIBUTES Buffer too small\n"); + DPRINT1("[KBDHID] IOCTL_KEYBOARD_QUERY_ATTRIBUTES Buffer too small\n"); Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_BUFFER_TOO_SMALL; Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Fri Sep 8 20:20:34 2017 @@ -436,7 +436,7 @@ /* CBM_CREATDIB needs Data. */ if (pbmiConverted == NULL) { - DPRINT1("CBM_CREATDIB needs a BITMAINFO!\n"); + DPRINT1("CBM_CREATDIB needs a BITMAPINFO!\n"); goto Exit; } Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Fri Sep 8 20:20:34 2017 @@ -382,7 +382,7 @@ ahDC[1] = UsesSource ? hdcSrc : NULL; if (!GDIOBJ_bLockMultipleObjects(2, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { - WARN("Invalid dc handle (dest=0x%p, src=0x%p) passed to NtGdiAlphaBlend\n", hdcDest, hdcSrc); + WARN("Invalid dc handle (dest=0x%p, src=0x%p) passed to NtGdiMaskBlt\n", hdcDest, hdcSrc); EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -393,7 +393,7 @@ if (NULL == DCDest) { if(DCSrc) DC_UnlockDc(DCSrc); - WARN("Invalid destination dc handle (0x%p) passed to NtGdiBitBlt\n", hdcDest); + WARN("Invalid destination dc handle (0x%p) passed to NtGdiMaskBlt\n", hdcDest); return FALSE; }

7 years, 2 months

[mjansen] 75799: [APPHELP][ACPPAGE][SHIMLIB] Update license headers

by mjansen＠svn.reactos.org

Author: mjansen Date: Fri Sep 8 20:19:51 2017 New Revision: 75799 URL: http://svn.reactos.org/svn/reactos?rev=75799&view=rev Log: [APPHELP][ACPPAGE][SHIMLIB] Update license headers Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt trunk/reactos/dll/appcompat/apphelp/apphelp.c trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/dbgheap.c trunk/reactos/dll/appcompat/apphelp/hsdb.c trunk/reactos/dll/appcompat/apphelp/layer.c trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c trunk/reactos/dll/appcompat/apphelp/sdbpapi.h trunk/reactos/dll/appcompat/apphelp/sdbread.c trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h trunk/reactos/dll/appcompat/apphelp/sdbtagid.h trunk/reactos/dll/appcompat/apphelp/sdbtypes.h trunk/reactos/dll/appcompat/apphelp/sdbwrite.c trunk/reactos/dll/appcompat/apphelp/sdbwrite.h trunk/reactos/dll/appcompat/apphelp/shimeng.c trunk/reactos/dll/appcompat/apphelp/shimeng.h trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h trunk/reactos/dll/shellext/acppage/ACPPage.cpp trunk/reactos/dll/shellext/acppage/CLayerStringList.hpp trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/CMak… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -19,11 +19,20 @@ sdbwrite.c shimeng.c apphelp.spec + ${CMAKE_CURRENT_BINARY_DIR}/apphelp_stubs.c) + +list(APPEND HEADERS apphelp.h - ${CMAKE_CURRENT_BINARY_DIR}/apphelp_stubs.c) + sdbpapi.h + sdbstringtable.h + sdbtagid.h + sdbtypes.h + sdbwrite.h + shimeng.h) add_library(apphelp SHARED ${SOURCE} + ${HEADERS} apphelp.rc ${CMAKE_CURRENT_BINARY_DIR}/apphelp.def) Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.c [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,21 +1,10 @@ /* - * Copyright 2011 AndrÃ© Hentschel - * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: apphelp entrypoint / generic interface functions + * COPYRIGHT: Copyright 2011 AndrÃ© Hentschel + * Copyright 2013 Mislav BlaÅ¾evic + * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ #define WIN32_NO_STATUS Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,20 +1,9 @@ /* - * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: common structures / functions + * COPYRIGHT: Copyright 2013 Mislav BlaÅ¾eviÄ + * Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef APPHELP_H Modified: trunk/reactos/dll/appcompat/apphelp/dbgheap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/dbgh… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/dbgheap.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/dbgheap.c [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,19 +1,8 @@ /* - * Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: SDB Debug heap functionality + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) */ #define WIN32_NO_STATUS Modified: trunk/reactos/dll/appcompat/apphelp/hsdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/hsdb… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/hsdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/hsdb.c [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,21 +1,10 @@ /* - * Copyright 2011 AndrÃ© Hentschel - * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Shim matching / data (un)packing + * COPYRIGHT: Copyright 2011 AndrÃ© Hentschel + * Copyright 2013 Mislav BlaÅ¾evic + * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ #define WIN32_NO_STATUS Modified: trunk/reactos/dll/appcompat/apphelp/layer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/laye… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/layer.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/layer.c [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,19 +1,8 @@ /* - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Registry layer manipulation functions + * COPYRIGHT: Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ #define WIN32_NO_STATUS Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,21 +1,10 @@ /* - * Copyright 2011 AndrÃ© Hentschel - * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Sdb low level glue layer + * COPYRIGHT: Copyright 2011 AndrÃ© Hentschel + * Copyright 2013 Mislav BlaÅ¾evic + * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ #include "ntndk.h" Modified: trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbf… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,21 +1,10 @@ -/* - * Copyright 2011 André Hentschel - * Copyright 2013 Mislav Blaevic - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +ï»¿/* + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Query file attributes used to match exe's + * COPYRIGHT: Copyright 2011 AndrÃ© Hentschel + * Copyright 2013 Mislav BlaÅ¾evic + * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ #define WIN32_NO_STATUS Modified: trunk/reactos/dll/appcompat/apphelp/sdbpapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbp… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbpapi.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbpapi.h [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,20 +1,9 @@ /* - * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Shim engine private functions + * COPYRIGHT: Copyright 2013 Mislav BlaÅ¾eviÄ + * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef SDBPAPI_H Modified: trunk/reactos/dll/appcompat/apphelp/sdbread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbr… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbread.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbread.c [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,21 +1,10 @@ -/* - * Copyright 2011 André Hentschel - * Copyright 2013 Mislav Blaevic - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +ï»¿/* + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Shim database query functions + * COPYRIGHT: Copyright 2011 AndrÃ© Hentschel + * Copyright 2013 Mislav BlaÅ¾evic + * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ #include "windef.h" Modified: trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbs… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,19 +1,8 @@ /* - * Copyright 2016 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Shim database string table builder + * COPYRIGHT: Copyright 2016 Mark Jansen (mark.jansen(a)reactos.org) */ #if !defined(SDBWRITE_HOSTTOOL) Modified: trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbs… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,19 +1,8 @@ /* - * Copyright 2016 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Shim database string table interface + * COPYRIGHT: Copyright 2016 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef SDBSTRINGTABLE_H Modified: trunk/reactos/dll/appcompat/apphelp/sdbtagid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbt… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbtagid.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbtagid.h [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,20 +1,9 @@ /* - * Copyright 2013 Mislav Blaevic - * Copyright 2015,2016 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: All tags + * COPYRIGHT: Copyright 2013 Mislav BlaÅ¾eviÄ + * Copyright 2015,2016 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef SDBTAGID_H Modified: trunk/reactos/dll/appcompat/apphelp/sdbtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbt… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbtypes.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbtypes.h [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,20 +1,9 @@ /* - * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Sdb core definitions + * COPYRIGHT: Copyright 2013 Mislav BlaÅ¾eviÄ + * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef SDBTYPES_H Modified: trunk/reactos/dll/appcompat/apphelp/sdbwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbw… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,21 +1,10 @@ /* - * Copyright 2011 AndrÃ© Hentschel - * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Shim database manipulation functions + * COPYRIGHT: Copyright 2011 AndrÃ© Hentschel + * Copyright 2013 Mislav BlaÅ¾eviÄ + * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ #if !defined(SDBWRITE_HOSTTOOL) Modified: trunk/reactos/dll/appcompat/apphelp/sdbwrite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbw… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbwrite.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbwrite.h [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,20 +1,10 @@ /* - * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2015,2016 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Shim database manipulation interface + * COPYRIGHT: Copyright 2011 AndrÃ© Hentschel + * Copyright 2013 Mislav BlaÅ¾eviÄ + * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef SDBWRITE_H Modified: trunk/reactos/dll/appcompat/apphelp/shimeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/shim… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/shimeng.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/shimeng.c [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,19 +1,8 @@ /* - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Shim engine core + * COPYRIGHT: Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ #define WIN32_NO_STATUS Modified: trunk/reactos/dll/appcompat/apphelp/shimeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/shim… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/shimeng.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/shimeng.h [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,19 +1,8 @@ /* - * Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Application compatibility module + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Shim engine structures + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef SHIMENG_H Modified: trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,9 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Shim library - * FILE: dll/appcompat/shims/shimlib/implement_shim.inl - * PURPOSE: Shimlib helper file, used to register shims setup with macro's from setup_shim.inl - * PROGRAMMER: Mark Jansen + * PROJECT: ReactOS Shim helper library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Shimlib helper file, used to register shims setup with macro's from setup_shim.inl + * COPYRIGHT: Copyright 2016,2017 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef SHIM_NS Modified: trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Shim library - * FILE: dll/appcompat/shims/shimlib/setup_shim.inl - * PURPOSE: Shimlib helper file, used for setting up the macro's used when registering a shim. - * PROGRAMMER: Mark Jansen + * PROJECT: ReactOS Shim helper library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Shimlib helper file, used for setting up the macro's used when registering a shim. + * COPYRIGHT: Copyright 2016,2017 Mark Jansen (mark.jansen(a)reactos.org) */ - #ifndef SHIM_NS #error "A namespace should be provided in SHIM_NS before including this file!" Modified: trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,9 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Shim library - * FILE: dll/appcompat/shims/shimlib/shimlib.c - * PURPOSE: Shim helper functions - * PROGRAMMER: Mark Jansen (mark.jansen(a)reactos.org) + * PROJECT: ReactOS Shim helper library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Shim helper functions + * COPYRIGHT: Copyright 2016,2017 Mark Jansen (mark.jansen(a)reactos.org) */ #define WIN32_NO_STATUS Modified: trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,9 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Shim Engine - * FILE: dll/appcompat/shims/shimlib/shimlib.h - * PURPOSE: ReactOS Shim Engine - * PROGRAMMER: Mark Jansen (mark.jansen(a)reactos.org) + * PROJECT: ReactOS Shim helper library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: ReactOS Shim Engine common functions / structures + * COPYRIGHT: Copyright 2016,2017 Mark Jansen (mark.jansen(a)reactos.org) */ #pragma once Modified: trunk/reactos/dll/shellext/acppage/ACPPage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/ACPPa… ============================================================================== --- trunk/reactos/dll/shellext/acppage/ACPPage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/ACPPage.cpp [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,19 +1,8 @@ /* - * Copyright 2015 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Compatibility Layer Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: acppage entrypoint + * COPYRIGHT: Copyright 2015 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" Modified: trunk/reactos/dll/shellext/acppage/CLayerStringList.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerStringList.hpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/CLayerStringList.hpp [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,19 +1,8 @@ /* - * Copyright 2015-2017 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Compatibility Layer Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: CLayerStringList implementation + * COPYRIGHT: Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,19 +1,8 @@ /* - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Compatibility Layer Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: CLayerUIPropPage implementation + * COPYRIGHT: Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp [iso-8859-1] Fri Sep 8 20:19:51 2017 @@ -1,21 +1,9 @@ /* - * Copyright 2015-2017 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Compatibility Layer Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: CLayerUIPropPage definition + * COPYRIGHT: Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ - class CLayerUIPropPage : public CComCoClass<CLayerUIPropPage, &CLSID_CLayerUIPropPage>,

7 years, 2 months

[khornicek] 75798: [SHELL32] - some tweaks, optimizations and fixes for the free/used disk space pie chart drawing code to properly cover all corner cases and remove minor drawing artifacts CORE-8757

by khornicek＠svn.reactos.org

Author: khornicek Date: Fri Sep 8 20:00:59 2017 New Revision: 75798 URL: http://svn.reactos.org/svn/reactos?rev=75798&view=rev Log: [SHELL32] - some tweaks, optimizations and fixes for the free/used disk space pie chart drawing code to properly cover all corner cases and remove minor drawing artifacts CORE-8757 Modified: trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp [iso-8859-1] Fri Sep 8 20:00:59 2017 @@ -211,63 +211,65 @@ { HBRUSH hBlueBrush = CreateSolidBrush(RGB(0, 0, 255)); HBRUSH hMagBrush = CreateSolidBrush(RGB(255, 0, 255)); + HBRUSH hbrOld; HPEN hDarkBluePen = CreatePen(PS_SOLID, 1, RGB(0, 0, 128)); HPEN hDarkMagPen = CreatePen(PS_SOLID, 1, RGB(128, 0, 128)); - - INT xCenter = (pDrawItem->rcItem.left + pDrawItem->rcItem.right)/2; - INT yCenter = (pDrawItem->rcItem.top + pDrawItem->rcItem.bottom - 10)/2; + HPEN hOldPen = (HPEN)SelectObject(pDrawItem->hDC, hDarkMagPen); + INT xCenter = (pDrawItem->rcItem.left + pDrawItem->rcItem.right) / 2; + INT yCenter = (pDrawItem->rcItem.top + pDrawItem->rcItem.bottom - 10) / 2; INT cx = pDrawItem->rcItem.right - pDrawItem->rcItem.left; INT cy = pDrawItem->rcItem.bottom - pDrawItem->rcItem.top - 10; - TRACE("FreeSpace %u a %f cx %d\n", m_FreeSpacePerc, M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f, cx); - - HBRUSH hbrOld = (HBRUSH)SelectObject(pDrawItem->hDC, hMagBrush); - INT xRadial = xCenter + (INT)(cos(M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f)*cx/2); - INT yRadial = yCenter - (INT)(sin(M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f)*cy/2); - if (m_FreeSpacePerc > 0) - { - Pie(pDrawItem->hDC, - pDrawItem->rcItem.left, - pDrawItem->rcItem.top, - pDrawItem->rcItem.right, - pDrawItem->rcItem.bottom - 10, - pDrawItem->rcItem.left, - yCenter, - xRadial, - yRadial); - - SelectObject(pDrawItem->hDC, hBlueBrush); - Pie(pDrawItem->hDC, - pDrawItem->rcItem.left, - pDrawItem->rcItem.top, - pDrawItem->rcItem.right, - pDrawItem->rcItem.bottom - 10, - xRadial, - yRadial, - pDrawItem->rcItem.left, - yCenter); - SelectObject(pDrawItem->hDC, hbrOld); - } - else - { - SelectObject(pDrawItem->hDC, hBlueBrush); - Ellipse(pDrawItem->hDC, - pDrawItem->rcItem.left, - pDrawItem->rcItem.top, - pDrawItem->rcItem.right, - pDrawItem->rcItem.bottom - 10); - } - HPEN hOldPen = (HPEN)SelectObject(pDrawItem->hDC, hDarkMagPen); + INT xRadial = xCenter + (INT)(cos(M_PI + m_FreeSpacePerc / 100.0f * M_PI * 2.0f) * cx / 2); + INT yRadial = yCenter - (INT)(sin(M_PI + m_FreeSpacePerc / 100.0f * M_PI * 2.0f) * cy / 2); + + TRACE("FreeSpace %u a %f cx %d\n", m_FreeSpacePerc, M_PI+m_FreeSpacePerc / 100.0f * M_PI * 2.0f, cx); + for (INT x = pDrawItem->rcItem.left; x < pDrawItem->rcItem.right; ++x) { + double cos_val = (x - xCenter) * 2.0f / cx; + INT y = yCenter + (INT)(sin(acos(cos_val)) * cy / 2) - 1; + if (m_FreeSpacePerc < 50 && x == xRadial) SelectObject(pDrawItem->hDC, hDarkBluePen); - double cos_val = (x - xCenter)*2.0f/cx; - INT y = yCenter+(INT)(sin(acos(cos_val))*cy/2); MoveToEx(pDrawItem->hDC, x, y, NULL); LineTo(pDrawItem->hDC, x, y + 10); } + SelectObject(pDrawItem->hDC, hOldPen); + + if (m_FreeSpacePerc > 50) + { + hbrOld = (HBRUSH)SelectObject(pDrawItem->hDC, hMagBrush); + + Ellipse(pDrawItem->hDC, pDrawItem->rcItem.left, pDrawItem->rcItem.top, + pDrawItem->rcItem.right, pDrawItem->rcItem.bottom - 10); + + SelectObject(pDrawItem->hDC, hBlueBrush); + + if (m_FreeSpacePerc < 100) + { + Pie(pDrawItem->hDC, pDrawItem->rcItem.left, pDrawItem->rcItem.top, pDrawItem->rcItem.right, + pDrawItem->rcItem.bottom - 10, xRadial, yRadial, pDrawItem->rcItem.left, yCenter); + } + } + else + { + hbrOld = (HBRUSH)SelectObject(pDrawItem->hDC, hBlueBrush); + + Ellipse(pDrawItem->hDC, pDrawItem->rcItem.left, pDrawItem->rcItem.top, + pDrawItem->rcItem.right, pDrawItem->rcItem.bottom - 10); + + SelectObject(pDrawItem->hDC, hMagBrush); + + if (m_FreeSpacePerc > 0) + { + Pie(pDrawItem->hDC, pDrawItem->rcItem.left, pDrawItem->rcItem.top, pDrawItem->rcItem.right, + pDrawItem->rcItem.bottom - 10, pDrawItem->rcItem.left, yCenter, xRadial, yRadial); + } + } + + SelectObject(pDrawItem->hDC, hbrOld); DeleteObject(hBlueBrush); DeleteObject(hMagBrush);

7 years, 2 months

[khornicek] 75797: [NOTEPAD] - don't allow multiple instances of the find/replace dialog CORE-13744

by khornicek＠svn.reactos.org

Author: khornicek Date: Fri Sep 8 19:09:48 2017 New Revision: 75797 URL: http://svn.reactos.org/svn/reactos?rev=75797&view=rev Log: [NOTEPAD] - don't allow multiple instances of the find/replace dialog CORE-13744 Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Fri Sep 8 19:09:48 2017 @@ -1043,6 +1043,12 @@ static VOID DIALOG_SearchDialog(FINDPROC pfnProc) { + if (Globals.hFindReplaceDlg != NULL) + { + SetFocus(Globals.hFindReplaceDlg); + return; + } + ZeroMemory(&Globals.find, sizeof(Globals.find)); Globals.find.lStructSize = sizeof(Globals.find); Globals.find.hwndOwner = Globals.hMainWnd; @@ -1057,7 +1063,7 @@ /* notify us of incoming events using hMainWnd Window Messages */ Globals.hFindReplaceDlg = pfnProc(&Globals.find); - assert(Globals.hFindReplaceDlg != 0); + assert(Globals.hFindReplaceDlg != NULL); } VOID DIALOG_Search(VOID)

7 years, 2 months