Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/03: [WIN32K:NTUSER] Fix a case where the menu was off-screen on the other side Found by Denis Malikov CORE-15001 CORE-9037
by Mark Jansen 15 Jan '19

15 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=007ec0310c0de0387d6ec… commit 007ec0310c0de0387d6ec69e059d1237f207ad1d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Jan 14 20:49:23 2019 +0100 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Jan 15 14:34:53 2019 +0200 [WIN32K:NTUSER] Fix a case where the menu was off-screen on the other side Found by Denis Malikov CORE-15001 CORE-9037 --- win32ss/user/ntuser/menu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index b8177594df..eb8874c0cb 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2912,8 +2912,9 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl if( x + width > monitor->rcMonitor.right) { - /* If we would flip around our origin, would we go off screen on the other side? */ - if (x - width < monitor->rcMonitor.left) + /* If we would flip around our origin, would we go off screen on the other side? + Or is our origin itself too far to the right already? */ + if (x - width < monitor->rcMonitor.left || x > monitor->rcMonitor.right) x = monitor->rcMonitor.right - width; else x -= width; @@ -2935,8 +2936,9 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl if( y + height > monitor->rcMonitor.bottom) { - /* If we would flip around our origin, would we go off screen on the other side? */ - if (y - height < monitor->rcMonitor.top) + /* If we would flip around our origin, would we go off screen on the other side? + Or is our origin itself too far to the bottom already? */ + if (y - height < monitor->rcMonitor.top || y > monitor->rcMonitor.bottom) y = monitor->rcMonitor.bottom - height; else y -= height;

1 0

[reactos] 01/01: [WIN32SS][USER32] Make IsHungAppWindow check FNID (#1245)
by Katayama Hirofumi MZ 15 Jan '19

15 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a4732703cd4ebedecbbd… commit 1a4732703cd4ebedecbbdf384bb6e3a5a745dbec Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 15 20:32:23 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 15 20:32:23 2019 +0900 [WIN32SS][USER32] Make IsHungAppWindow check FNID (#1245) CORE-11944 --- win32ss/user/user32/windows/window.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index 4485c24d82..ccf0670bc1 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -1841,13 +1841,16 @@ InternalGetWindowText(HWND hWnd, LPWSTR lpString, int nMaxCount) BOOL WINAPI IsHungAppWindow(HWND hwnd) { + PWND Window; UNICODE_STRING ClassName; WCHAR szClass[16]; static const UNICODE_STRING GhostClass = RTL_CONSTANT_STRING(L"Ghost"); /* Ghost is a hung window */ RtlInitEmptyUnicodeString(&ClassName, szClass, sizeof(szClass)); - if (NtUserGetClassName(hwnd, FALSE, &ClassName) && + Window = ValidateHwnd(hwnd); + if (Window && Window->fnid == FNID_GHOST && + NtUserGetClassName(hwnd, FALSE, &ClassName) && RtlEqualUnicodeString(&ClassName, &GhostClass, TRUE)) { return TRUE;

1 0

[reactos] 01/01: [WIN32SS][USER32] Ghost is a hung window (#1244)
by Katayama Hirofumi MZ 15 Jan '19

15 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9285bd19dedc1331f9eff… commit 9285bd19dedc1331f9effe9741282e06c629e58f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 15 19:40:34 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 15 19:40:34 2019 +0900 [WIN32SS][USER32] Ghost is a hung window (#1244) IsHungAppWindow(a ghost window) == TRUE. CORE-11944 --- win32ss/user/user32/windows/window.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index 7624c63835..4485c24d82 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -1841,6 +1841,18 @@ InternalGetWindowText(HWND hWnd, LPWSTR lpString, int nMaxCount) BOOL WINAPI IsHungAppWindow(HWND hwnd) { + UNICODE_STRING ClassName; + WCHAR szClass[16]; + static const UNICODE_STRING GhostClass = RTL_CONSTANT_STRING(L"Ghost"); + + /* Ghost is a hung window */ + RtlInitEmptyUnicodeString(&ClassName, szClass, sizeof(szClass)); + if (NtUserGetClassName(hwnd, FALSE, &ClassName) && + RtlEqualUnicodeString(&ClassName, &GhostClass, TRUE)) + { + return TRUE; + } + return (NtUserQueryWindow(hwnd, QUERY_WINDOW_ISHUNG) != 0); }

1 0

[reactos] 01/01: [DOXYGEN] Update Doxyfile for our build of Doxygen 1.8.15.
by Colin Finck 15 Jan '19

15 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2440df762ce0e4172cdaa… commit 2440df762ce0e4172cdaaae03f2cdd19f32006ef Author: Colin Finck <colin(a)reactos.org> AuthorDate: Tue Jan 15 09:37:54 2019 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Tue Jan 15 09:37:54 2019 +0100 [DOXYGEN] Update Doxyfile for our build of Doxygen 1.8.15. --- Doxyfile | 195 ++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 118 insertions(+), 77 deletions(-) diff --git a/Doxyfile b/Doxyfile index 74dd35fc27..0ee5e8fdd5 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.15 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -17,11 +17,11 @@ # Project related configuration options #--------------------------------------------------------------------------- -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all text -# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# This tag specifies the encoding used for all characters in the configuration +# file that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -94,6 +94,14 @@ ALLOW_UNICODE_NAMES = NO OUTPUT_LANGUAGE = English +# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all generated output in the proper direction. +# Possible values are: None, LTR, RTL and Context. +# The default value is: None. + +OUTPUT_TEXT_DIRECTION = None + # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member # descriptions after the members that are listed in the file and class # documentation (similar to Javadoc). Set to NO to disable this. @@ -237,7 +245,12 @@ TAB_SIZE = 4 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. +# When you need a literal { or } or , in the value part of an alias you have to +# escape them by means of a backslash (\), this can lead to conflicts with the +# commands \{ and \} for these it is advised to use the version @{ and @} or use +# a double escape (\\{ and \\}) ALIASES = @@ -275,17 +288,26 @@ OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO +# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice +# sources only. Doxygen will then generate output that is more tailored for that +# language. For instance, namespaces will be presented as modules, types will be +# separated into more groups, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_SLICE = NO + # Doxygen selects the parser to use depending on the extension of the files it # parses. With this tag you can assign which parser to use for a given # extension. Doxygen has a built-in mapping, but you can override or extend it # using this tag. The format is ext=language, where ext is a file extension, and # language is one of the parsers supported by doxygen: IDL, Java, Javascript, -# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: -# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: -# Fortran. In the later case the parser tries to guess whether the code is fixed -# or free formatted code, this is the default for Fortran type files), VHDL. For -# instance to make doxygen treat .inc files as Fortran files (default is PHP), -# and .f files as C (default is Fortran), use: inc=Fortran f=C. +# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, +# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran: +# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser +# tries to guess whether the code is fixed or free formatted code, this is the +# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat +# .inc files as Fortran files (default is PHP), and .f files as C (default is +# Fortran), use: inc=Fortran f=C. # # Note: For files without extension you can use no_extension as a placeholder. # @@ -296,7 +318,7 @@ EXTENSION_MAPPING = # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments # according to the Markdown format, which allows for more readable -# documentation. See http://daringfireball.net/projects/markdown/ for details. +# documentation. See https://daringfireball.net/projects/markdown/ for details. # The output of markdown processing is further processed by doxygen, so you can # mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in # case of backward compatibilities issues. @@ -338,7 +360,7 @@ BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -709,7 +731,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -754,7 +776,8 @@ WARN_IF_DOC_ERROR = YES # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that # are documented, but have no documentation for their parameters or return # value. If set to NO, doxygen will only warn about wrong or incomplete -# parameter documentation, but not about the absence of documentation. +# parameter documentation, but not about the absence of documentation. If +# EXTRACT_ALL is set to YES then this flag will automatically be disabled. # The default value is: NO. WARN_NO_PARAMDOC = NO @@ -796,7 +819,7 @@ INPUT = # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -814,7 +837,7 @@ INPUT_ENCODING = UTF-8 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, # *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, -# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf. +# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice. FILE_PATTERNS = *.c *.cc *.cxx *.cpp *.h *.hh *.hxx *.hpp *.idl @@ -969,7 +992,7 @@ INLINE_SOURCES = YES STRIP_CODE_COMMENTS = YES # If the REFERENCED_BY_RELATION tag is set to YES then for each documented -# function all documented functions referencing it will be listed. +# entity all documented functions referencing it will be listed. # The default value is: NO. REFERENCED_BY_RELATION = YES @@ -1001,12 +1024,12 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: # - Install the latest version of global -# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file # - Make sure the INPUT points to the root of the source tree # - Run doxygen as normal # @@ -1028,25 +1051,6 @@ USE_HTAGS = NO VERBATIM_HEADERS = YES -# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the -# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the -# cost of reduced performance. This can be particularly helpful with template -# rich C++ code for which doxygen's built-in parser lacks the necessary type -# information. -# Note: The availability of this option depends on whether or not doxygen was -# generated with the -Duse-libclang=ON option for CMake. -# The default value is: NO. - -CLANG_ASSISTED_PARSING = NO - -# If clang assisted parsing is enabled you can provide the compiler with command -# line options that you would normally use when invoking the compiler. Note that -# the include paths will already be set by doxygen for the files and directories -# specified with INPUT and INCLUDE_PATH. -# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. - -CLANG_OPTIONS = - #--------------------------------------------------------------------------- # Configuration options related to the alphabetical class index #--------------------------------------------------------------------------- @@ -1165,7 +1169,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1201,6 +1205,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = YES +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1224,13 +1239,13 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with -# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a +# environment (see: https://developer.apple.com/xcode/), introduced with OSX +# 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html -# for more information. +# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy +# genXcode/_index.html for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1269,7 +1284,7 @@ DOCSET_PUBLISHER_NAME = Publisher # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three # additional HTML index files: index.hhp, index.hhc, and index.hhk. The # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop -# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on # Windows. # # The HTML Help Workshop contains a compiler that can convert all HTML output @@ -1345,7 +1360,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1353,7 +1368,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- +# Folders (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual- # folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1362,7 +1377,7 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom- # filters). # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1370,7 +1385,7 @@ QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom- # filters). # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1378,7 +1393,7 @@ QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1471,7 +1486,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1483,7 +1498,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1510,11 +1525,11 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/. # This tag requires that the tag USE_MATHJAX is set to YES. -MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest +MATHJAX_RELPATH = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/ # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example @@ -1572,7 +1587,7 @@ SERVER_BASED_SEARCH = YES # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1585,7 +1600,7 @@ EXTERNAL_SEARCH = YES # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1637,21 +1652,34 @@ LATEX_OUTPUT = latex # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. # -# Note that when enabling USE_PDFLATEX this option is only used for generating -# bitmaps for formulas in the HTML output, but not in the Makefile that is -# written to the output directory. -# The default file is: latex. +# Note that when not enabling USE_PDFLATEX the default is latex when enabling +# USE_PDFLATEX the default is pdflatex and when in the later case latex is +# chosen this is overwritten by pdflatex. For specific output languages the +# default can have been set differently, this depends on the implementation of +# the output language. # This tag requires that the tag GENERATE_LATEX is set to YES. -LATEX_CMD_NAME = latex +LATEX_CMD_NAME = # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate # index for LaTeX. +# Note: This tag is used in the Makefile / make.bat. +# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file +# (.tex). # The default file is: makeindex. # This tag requires that the tag GENERATE_LATEX is set to YES. MAKEINDEX_CMD_NAME = makeindex +# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to +# generate index for LaTeX. +# Note: This tag is used in the generated output file (.tex). +# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat. +# The default value is: \makeindex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_MAKEINDEX_CMD = \makeindex + # If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX # documents. This may be useful for small projects and may help to save some # trees in general. @@ -1772,7 +1800,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1786,6 +1814,14 @@ LATEX_BIB_STYLE = plain LATEX_TIMESTAMP = NO +# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute) +# path from which the emoji images will be read. If a relative path is entered, +# it will be relative to the LATEX_OUTPUT directory. If left blank the +# LATEX_OUTPUT directory will be used. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_EMOJI_DIRECTORY = + #--------------------------------------------------------------------------- # Configuration options related to the RTF output #--------------------------------------------------------------------------- @@ -1825,9 +1861,9 @@ COMPACT_RTF = NO RTF_HYPERLINKS = NO -# Load stylesheet definitions from file. Syntax is similar to doxygen's config -# file, i.e. a series of assignments. You only have to provide replacements, -# missing definitions are set to their default value. +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# configuration file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. # # See also section "Doxygen usage" for information on how to generate the # default style sheet that doxygen normally uses. @@ -1836,8 +1872,8 @@ RTF_HYPERLINKS = NO RTF_STYLESHEET_FILE = # Set optional variables used in the generation of an RTF document. Syntax is -# similar to doxygen's config file. A template extensions file can be generated -# using doxygen -e rtf extensionFile. +# similar to doxygen's configuration file. A template extensions file can be +# generated using doxygen -e rtf extensionFile. # This tag requires that the tag GENERATE_RTF is set to YES. RTF_EXTENSIONS_FILE = @@ -1923,6 +1959,13 @@ XML_OUTPUT = xml XML_PROGRAMLISTING = YES +# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include +# namespace members in file scope as well, matching the HTML output. +# The default value is: NO. +# This tag requires that the tag GENERATE_XML is set to YES. + +XML_NS_MEMB_FILE_SCOPE = NO + #--------------------------------------------------------------------------- # Configuration options related to the DOCBOOK output #--------------------------------------------------------------------------- @@ -1955,9 +1998,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO @@ -2170,7 +2213,7 @@ HIDE_UNDOC_RELATIONS = YES # http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent # Bell Labs. The other options in this section have no effect if this option is # set to NO -# The default value is: YES. +# The default value is: NO. HAVE_DOT = YES @@ -2326,9 +2369,7 @@ DIRECTORY_GRAPH = YES # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order # to make the SVG files visible in IE 9+ (other browsers do not have this # requirement). -# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd, -# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo, -# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo, +# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo, # png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and # png:gdiplus:gdiplus. # The default value is: png.

1 0

[reactos] 01/01: [WIN32SS][NTUSER] Don't freeze Task Bar in switching the app (#1243)
by Katayama Hirofumi MZ 15 Jan '19

15 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ca854251a89f45a90db8… commit 8ca854251a89f45a90db8f60f607a477e7e8dbde Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 15 13:45:28 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 15 13:45:28 2019 +0900 [WIN32SS][NTUSER] Don't freeze Task Bar in switching the app (#1243) This avoids taskbar hung up. --- win32ss/user/ntuser/simplecall.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index 67377de4a8..7cd2c8490d 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -515,6 +515,11 @@ NtUserCallTwoParam( { break; } + if (MsqIsHung(Window->head.pti)) + { + // TODO: Make the window ghosted and activate. + break; + } if (fAltTab) { if (Window->style & WS_MINIMIZE)

1 0

[reactos] 01/01: [MMSYS] Move global variables into a GLOBAL_DATA struct and free allocated memory on WM_DESTROY.
by Eric Kohl 13 Jan '19

13 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f11c16ca87bdb6528462… commit 5f11c16ca87bdb6528462198a2a5ef284678c7e7 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 13 23:19:25 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 13 23:19:25 2019 +0100 [MMSYS] Move global variables into a GLOBAL_DATA struct and free allocated memory on WM_DESTROY. --- dll/cpl/mmsys/sounds.c | 237 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 155 insertions(+), 82 deletions(-) diff --git a/dll/cpl/mmsys/sounds.c b/dll/cpl/mmsys/sounds.c index 1fc9fb9e8c..3250432a9e 100644 --- a/dll/cpl/mmsys/sounds.c +++ b/dll/cpl/mmsys/sounds.c @@ -17,47 +17,48 @@ #include <debug.h> -struct __APP_MAP__; - -typedef struct __LABEL_MAP__ +typedef struct _LABEL_MAP { - TCHAR * szName; - TCHAR * szDesc; - TCHAR * szIcon; - struct __APP_MAP__ * AppMap; - struct __LABEL_MAP__ * Next; + TCHAR *szName; + TCHAR *szDesc; + TCHAR *szIcon; + struct _APP_MAP *AppMap; + struct _LABEL_MAP *Next; } LABEL_MAP, *PLABEL_MAP; -typedef struct __APP_MAP__ +typedef struct _APP_MAP { TCHAR szName[MAX_PATH]; TCHAR szDesc[MAX_PATH]; TCHAR szIcon[MAX_PATH]; - struct __APP_MAP__ *Next; + struct _APP_MAP *Next; PLABEL_MAP LabelMap; } APP_MAP, *PAPP_MAP; -typedef struct __LABEL_CONTEXT__ +typedef struct _LABEL_CONTEXT { PLABEL_MAP LabelMap; PAPP_MAP AppMap; TCHAR szValue[MAX_PATH]; - struct __LABEL_CONTEXT__ *Next; + struct _LABEL_CONTEXT *Next; } LABEL_CONTEXT, *PLABEL_CONTEXT; -typedef struct __SOUND_SCHEME_CONTEXT__ +typedef struct _SOUND_SCHEME_CONTEXT { TCHAR szName[MAX_PATH]; TCHAR szDesc[MAX_PATH]; PLABEL_CONTEXT LabelContext; } SOUND_SCHEME_CONTEXT, *PSOUND_SCHEME_CONTEXT; -static PLABEL_MAP s_Map = NULL; -static PAPP_MAP s_App = NULL; +typedef struct _GLOBAL_DATA +{ + TCHAR szDefault[MAX_PATH]; + HIMAGELIST hSoundsImageList; + PLABEL_MAP pLabelMap; + PAPP_MAP pAppMap; +} GLOBAL_DATA, *PGLOBAL_DATA; -TCHAR szDefault[MAX_PATH]; -HIMAGELIST hSoundsImageList = NULL; /* A filter string is a list separated by NULL and ends with double NULLs. */ LPWSTR MakeFilter(LPWSTR psz) @@ -77,9 +78,9 @@ LPWSTR MakeFilter(LPWSTR psz) return psz; } -PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName) +PLABEL_MAP FindLabel(PGLOBAL_DATA pGlobalData, PAPP_MAP pAppMap, TCHAR * szName) { - PLABEL_MAP pMap = s_Map; + PLABEL_MAP pMap = pGlobalData->pLabelMap; while (pMap) { @@ -115,20 +116,20 @@ PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName) } pMap->AppMap = pAppMap; - pMap->Next = s_Map; - s_Map = pMap; + pMap->Next = pGlobalData->pLabelMap; + pGlobalData->pLabelMap = pMap; return pMap; } -VOID RemoveLabel(PLABEL_MAP pMap) +VOID RemoveLabel(PGLOBAL_DATA pGlobalData, PLABEL_MAP pMap) { - PLABEL_MAP pCurMap = s_Map; + PLABEL_MAP pCurMap = pGlobalData->pLabelMap; if (pCurMap == pMap) { - s_Map = s_Map->Next; + pGlobalData->pLabelMap = pGlobalData->pLabelMap->Next; return; } @@ -143,10 +144,23 @@ VOID RemoveLabel(PLABEL_MAP pMap) } } +static +VOID +FreeLabelMap(PGLOBAL_DATA pGlobalData) +{ + PLABEL_MAP pCurMap; -PAPP_MAP FindApp(TCHAR * szName) + while (pGlobalData->pLabelMap) + { + pCurMap = pGlobalData->pLabelMap->Next; + HeapFree(GetProcessHeap(), 0, pGlobalData->pLabelMap); + pGlobalData->pLabelMap = pCurMap; + } +} + +PAPP_MAP FindApp(PGLOBAL_DATA pGlobalData, TCHAR *szName) { - PAPP_MAP pMap = s_App; + PAPP_MAP pMap = pGlobalData->pAppMap; while (pMap) { @@ -159,8 +173,21 @@ PAPP_MAP FindApp(TCHAR * szName) return NULL; } +static +VOID +FreeAppMap(PGLOBAL_DATA pGlobalData) +{ + PAPP_MAP pCurMap; + + while (pGlobalData->pAppMap) + { + pCurMap = pGlobalData->pAppMap->Next; + HeapFree(GetProcessHeap(), 0, pGlobalData->pAppMap); + pGlobalData->pAppMap = pCurMap; + } +} -PLABEL_CONTEXT FindLabelContext(PSOUND_SCHEME_CONTEXT pSoundScheme, TCHAR * AppName, TCHAR * LabelName) +PLABEL_CONTEXT FindLabelContext(PGLOBAL_DATA pGlobalData, PSOUND_SCHEME_CONTEXT pSoundScheme, TCHAR * AppName, TCHAR * LabelName) { PLABEL_CONTEXT pLabelContext; @@ -182,8 +209,8 @@ PLABEL_CONTEXT FindLabelContext(PSOUND_SCHEME_CONTEXT pSoundScheme, TCHAR * AppN if (!pLabelContext) return NULL; - pLabelContext->AppMap = FindApp(AppName); - pLabelContext->LabelMap = FindLabel(pLabelContext->AppMap, LabelName); + pLabelContext->AppMap = FindApp(pGlobalData, AppName); + pLabelContext->LabelMap = FindLabel(pGlobalData, pLabelContext->AppMap, LabelName); ASSERT(pLabelContext->AppMap); ASSERT(pLabelContext->LabelMap); pLabelContext->szValue[0] = _T('\0'); @@ -195,7 +222,7 @@ PLABEL_CONTEXT FindLabelContext(PSOUND_SCHEME_CONTEXT pSoundScheme, TCHAR * AppN BOOL -LoadEventLabel(HKEY hKey, TCHAR * szSubKey) +LoadEventLabel(PGLOBAL_DATA pGlobalData, HKEY hKey, TCHAR * szSubKey) { HKEY hSubKey; DWORD cbValue; @@ -241,26 +268,27 @@ LoadEventLabel(HKEY hKey, TCHAR * szSubKey) { return FALSE; } + pMap->szName = _tcsdup(szSubKey); pMap->szDesc = _tcsdup(szDesc); pMap->szIcon = _tcsdup(szData); - if (s_Map) + if (pGlobalData->pLabelMap) { - pMap->Next = s_Map; - s_Map = pMap; + pMap->Next = pGlobalData->pLabelMap; + pGlobalData->pLabelMap = pMap; } else { - s_Map = pMap; - s_Map->Next = 0; + pGlobalData->pLabelMap = pMap; + pGlobalData->pLabelMap->Next = NULL; } return TRUE; } BOOL -LoadEventLabels() +LoadEventLabels(PGLOBAL_DATA pGlobalData) { HKEY hSubKey; DWORD dwCurKey; @@ -293,7 +321,7 @@ LoadEventLabels() if (dwResult == ERROR_SUCCESS) { - if (LoadEventLabel(hSubKey, szName)) + if (LoadEventLabel(pGlobalData, hSubKey, szName)) { dwCount++; } @@ -368,26 +396,24 @@ AddSoundProfile(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault) DWORD -EnumerateSoundProfiles(HWND hwndDlg, HKEY hKey) +EnumerateSoundProfiles(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey) { HKEY hSubKey; DWORD dwName, dwCurKey, dwResult, dwNumSchemes; DWORD cbDefault; TCHAR szName[MAX_PATH]; - cbDefault = sizeof(szDefault); + cbDefault = sizeof(pGlobalData->szDefault); if (RegQueryValueEx(hKey, NULL, NULL, NULL, - (LPBYTE)szDefault, + (LPBYTE)pGlobalData->szDefault, &cbDefault) != ERROR_SUCCESS) { return FALSE; } - - if (RegOpenKeyEx(hKey, _T("Names"), 0, @@ -413,7 +439,7 @@ EnumerateSoundProfiles(HWND hwndDlg, HKEY hKey) if (dwResult == ERROR_SUCCESS) { - if (AddSoundProfile(hwndDlg, hSubKey, szName, (!_tcsicmp(szName, szDefault)))) + if (AddSoundProfile(hwndDlg, hSubKey, szName, (!_tcsicmp(szName, pGlobalData->szDefault)))) { dwNumSchemes++; } @@ -431,16 +457,18 @@ PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, TCHAR * szName) { LRESULT lCount, lIndex, lResult; PSOUND_SCHEME_CONTEXT pScheme; + HWND hwndComboBox; - lCount = ComboBox_GetCount(GetDlgItem(hwndDlg, IDC_SOUND_SCHEME)); + hwndComboBox = GetDlgItem(hwndDlg, IDC_SOUND_SCHEME); + lCount = ComboBox_GetCount(hwndComboBox); if (lCount == CB_ERR) { return NULL; } - for(lIndex = 0; lIndex < lCount; lIndex++) + for (lIndex = 0; lIndex < lCount; lIndex++) { - lResult = ComboBox_GetItemData(GetDlgItem(hwndDlg, IDC_SOUND_SCHEME), lIndex); + lResult = ComboBox_GetItemData(hwndComboBox, lIndex); if (lResult == CB_ERR) { continue; @@ -455,9 +483,43 @@ PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, TCHAR * szName) return NULL; } +static +VOID +FreeSoundProfiles(HWND hwndDlg) +{ + LRESULT lCount, lIndex, lResult; + PSOUND_SCHEME_CONTEXT pScheme; + PLABEL_CONTEXT pLabelContext; + HWND hwndComboBox; + + hwndComboBox = GetDlgItem(hwndDlg, IDC_SOUND_SCHEME); + lCount = ComboBox_GetCount(hwndComboBox); + if (lCount == CB_ERR) + return; + + for (lIndex = 0; lIndex < lCount; lIndex++) + { + lResult = ComboBox_GetItemData(hwndComboBox, lIndex); + if (lResult == CB_ERR) + { + continue; + } + + pScheme = (PSOUND_SCHEME_CONTEXT)lResult; + + while (pScheme->LabelContext) + { + pLabelContext = pScheme->LabelContext->Next; + HeapFree(GetProcessHeap(), 0, pScheme->LabelContext); + pScheme->LabelContext = pLabelContext; + } + + HeapFree(GetProcessHeap(), 0, pScheme); + } +} BOOL -ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName, PAPP_MAP AppMap, PLABEL_MAP LabelMap) +ImportSoundLabel(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName, PAPP_MAP AppMap, PLABEL_MAP LabelMap) { HKEY hSubKey; TCHAR szValue[MAX_PATH]; @@ -470,7 +532,7 @@ ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName //MessageBox(hwndDlg, szProfile, szLabelName, MB_OK); bCurrentProfile = !_tcsicmp(szProfile, _T(".Current")); - bActiveProfile = !_tcsicmp(szProfile, szDefault); + bActiveProfile = !_tcsicmp(szProfile, pGlobalData->szDefault); if (RegOpenKeyEx(hKey, szProfile, @@ -493,7 +555,7 @@ ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName } if (bCurrentProfile) - pScheme = FindSoundProfile(hwndDlg, szDefault); + pScheme = FindSoundProfile(hwndDlg, pGlobalData->szDefault); else pScheme = FindSoundProfile(hwndDlg, szProfile); @@ -502,7 +564,7 @@ ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName //MessageBox(hwndDlg, szProfile, _T("no profile!!"), MB_OK); return FALSE; } - pLabelContext = FindLabelContext(pScheme, AppMap->szName, LabelMap->szName); + pLabelContext = FindLabelContext(pGlobalData, pScheme, AppMap->szName, LabelMap->szName); cchLength = ExpandEnvironmentStrings(szValue, szBuffer, _countof(szBuffer)); if (cchLength == 0 || cchLength > _countof(szBuffer)) @@ -521,7 +583,7 @@ ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName DWORD -ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName, PAPP_MAP pAppMap) +ImportSoundEntry(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName, PAPP_MAP pAppMap) { HKEY hSubKey; DWORD dwNumProfiles; @@ -539,10 +601,10 @@ ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName { return FALSE; } - pLabel = FindLabel(pAppMap, szLabelName); + pLabel = FindLabel(pGlobalData, pAppMap, szLabelName); ASSERT(pLabel); - RemoveLabel(pLabel); + RemoveLabel(pGlobalData, pLabel); pLabel->AppMap = pAppMap; pLabel->Next = pAppMap->LabelMap; @@ -564,7 +626,7 @@ ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName if (dwResult == ERROR_SUCCESS) { - if (ImportSoundLabel(hwndDlg, hSubKey, szProfile, szLabelName, szAppName, pAppMap, pLabel)) + if (ImportSoundLabel(pGlobalData, hwndDlg, hSubKey, szProfile, szLabelName, szAppName, pAppMap, pLabel)) { dwNumProfiles++; } @@ -580,7 +642,7 @@ ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName DWORD -ImportAppProfile(HWND hwndDlg, HKEY hKey, TCHAR * szAppName) +ImportAppProfile(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, TCHAR * szAppName) { HKEY hSubKey; TCHAR szDefault[MAX_PATH]; @@ -638,8 +700,8 @@ ImportAppProfile(HWND hwndDlg, HKEY hKey, TCHAR * szAppName) _tcscpy(AppMap->szDesc, szDefault); _tcscpy(AppMap->szIcon, szIcon); - AppMap->Next = s_App; - s_App = AppMap; + AppMap->Next = pGlobalData->pAppMap; + pGlobalData->pAppMap = AppMap; dwCurKey = 0; @@ -657,7 +719,7 @@ ImportAppProfile(HWND hwndDlg, HKEY hKey, TCHAR * szAppName) NULL); if (dwResult == ERROR_SUCCESS) { - if (ImportSoundEntry(hwndDlg, hSubKey, szName, szAppName, AppMap)) + if (ImportSoundEntry(pGlobalData, hwndDlg, hSubKey, szName, szAppName, AppMap)) { dwNumEntry++; } @@ -671,7 +733,7 @@ ImportAppProfile(HWND hwndDlg, HKEY hKey, TCHAR * szAppName) BOOL -ImportSoundProfiles(HWND hwndDlg, HKEY hKey) +ImportSoundProfiles(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey) { DWORD dwCurKey; DWORD dwResult; @@ -699,7 +761,7 @@ ImportSoundProfiles(HWND hwndDlg, HKEY hKey) if (dwResult == ERROR_SUCCESS) { - if (ImportAppProfile(hwndDlg, hSubKey, szName)) + if (ImportAppProfile(pGlobalData, hwndDlg, hSubKey, szName)) { dwNumApps++; } @@ -714,7 +776,7 @@ ImportSoundProfiles(HWND hwndDlg, HKEY hKey) BOOL -LoadSoundProfiles(HWND hwndDlg) +LoadSoundProfiles(PGLOBAL_DATA pGlobalData, HWND hwndDlg) { HKEY hSubKey; DWORD dwNumSchemes; @@ -728,13 +790,13 @@ LoadSoundProfiles(HWND hwndDlg) return FALSE; } - dwNumSchemes = EnumerateSoundProfiles(hwndDlg, hSubKey); + dwNumSchemes = EnumerateSoundProfiles(pGlobalData, hwndDlg, hSubKey); if (dwNumSchemes) { //MessageBox(hwndDlg, _T("importing sound profiles..."), NULL, MB_OK); - ImportSoundProfiles(hwndDlg, hSubKey); + ImportSoundProfiles(pGlobalData, hwndDlg, hSubKey); } RegCloseKey(hSubKey); @@ -808,7 +870,7 @@ LoadSoundFiles(HWND hwndDlg) BOOL -ShowSoundScheme(HWND hwndDlg) +ShowSoundScheme(PGLOBAL_DATA pGlobalData, HWND hwndDlg) { LRESULT lIndex; PSOUND_SCHEME_CONTEXT pScheme; @@ -822,9 +884,9 @@ ShowSoundScheme(HWND hwndDlg) hDlgCtrl = GetDlgItem(hwndDlg, IDC_SOUND_SCHEME); hList = GetDlgItem(hwndDlg, IDC_SCHEME_LIST); - if (hSoundsImageList != NULL) + if (pGlobalData->hSoundsImageList != NULL) { - TreeView_SetImageList(hList, hSoundsImageList, TVSIL_NORMAL); + TreeView_SetImageList(hList, pGlobalData->hSoundsImageList, TVSIL_NORMAL); } lIndex = SendMessage(hDlgCtrl, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); @@ -840,9 +902,9 @@ ShowSoundScheme(HWND hwndDlg) } pScheme = (PSOUND_SCHEME_CONTEXT)lIndex; - _tcscpy(szDefault, pScheme->szName); + _tcscpy(pGlobalData->szDefault, pScheme->szName); - pAppMap = s_App; + pAppMap = pGlobalData->pAppMap; while (pAppMap) { ZeroMemory(&tvItem, sizeof(tvItem)); @@ -862,10 +924,10 @@ ShowSoundScheme(HWND hwndDlg) pLabelMap = pAppMap->LabelMap; while (pLabelMap) { - pLabelContext = FindLabelContext(pScheme, pAppMap->szName, pLabelMap->szName); + pLabelContext = FindLabelContext(pGlobalData, pScheme, pAppMap->szName, pLabelMap->szName); ZeroMemory(&tvItem, sizeof(tvItem)); - tvItem.hParent = /*TVI_ROOT;*/ hTreeItem; + tvItem.hParent = hTreeItem; tvItem.hInsertAfter = TVI_SORT; tvItem.item.mask = TVIF_STATE | TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; @@ -882,7 +944,7 @@ ShowSoundScheme(HWND hwndDlg) tvItem.item.iImage = IMAGE_SOUND_NONE; tvItem.item.iSelectedImage = IMAGE_SOUND_NONE; } - tvItem.item.lParam = (LPARAM)FindLabelContext(pScheme, pAppMap->szName, pLabelMap->szName); + tvItem.item.lParam = (LPARAM)FindLabelContext(pGlobalData, pScheme, pAppMap->szName, pLabelMap->szName); TreeView_InsertItem(hList, &tvItem); @@ -1031,32 +1093,39 @@ SoundsDlgProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { + PGLOBAL_DATA pGlobalData; + OPENFILENAMEW ofn; WCHAR filename[MAX_PATH]; WCHAR szFilter[256], szTitle[256]; LPWSTR pFileName; LRESULT lResult; + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch (uMsg) { case WM_INITDIALOG: { UINT NumWavOut = waveOutGetNumDevs(); + pGlobalData = (PGLOBAL_DATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + SendMessage(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), BM_SETIMAGE,(WPARAM)IMAGE_ICON, (LPARAM)(HANDLE)LoadIcon(hApplet, MAKEINTRESOURCE(IDI_PLAY_ICON))); - hSoundsImageList = InitImageList(IDI_SOUND_SECTION, - IDI_SOUND_ASSIGNED, - GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CXSMICON), - IMAGE_ICON); + pGlobalData->hSoundsImageList = InitImageList(IDI_SOUND_SECTION, + IDI_SOUND_ASSIGNED, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CXSMICON), + IMAGE_ICON); - LoadEventLabels(); - LoadSoundProfiles(hwndDlg); + LoadEventLabels(pGlobalData); + LoadSoundProfiles(pGlobalData, hwndDlg); LoadSoundFiles(hwndDlg); - ShowSoundScheme(hwndDlg); + ShowSoundScheme(pGlobalData, hwndDlg); if (!NumWavOut) { @@ -1132,7 +1201,7 @@ SoundsDlgProc(HWND hwndDlg, if (HIWORD(wParam) == CBN_SELENDOK) { (void)TreeView_DeleteAllItems(GetDlgItem(hwndDlg, IDC_SCHEME_LIST)); - ShowSoundScheme(hwndDlg); + ShowSoundScheme(pGlobalData, hwndDlg); EnableWindow(GetDlgItem(hwndDlg, IDC_SOUND_LIST), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_SOUND), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE); @@ -1205,8 +1274,12 @@ SoundsDlgProc(HWND hwndDlg, } case WM_DESTROY: { - if (hSoundsImageList) - ImageList_Destroy(hSoundsImageList); + FreeSoundProfiles(hwndDlg); + FreeAppMap(pGlobalData); + FreeLabelMap(pGlobalData); + if (pGlobalData->hSoundsImageList) + ImageList_Destroy(pGlobalData->hSoundsImageList); + HeapFree(GetProcessHeap(), 0, pGlobalData); break; } case WM_NOTIFY:

1 0

[reactos] 01/01: [TASKMGR] adjust widths for status bar parts
by Denis Malikov 13 Jan '19

13 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=473e0bfc838ddb7f84ebe… commit 473e0bfc838ddb7f84ebeaafc86acf3873d99c10 Author: Denis Malikov <filedem(a)gmail.com> AuthorDate: Mon Jan 14 00:57:50 2019 +0700 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Jan 13 21:33:44 2019 +0200 [TASKMGR] adjust widths for status bar parts Now "commit charge" not clipped --- base/applications/taskmgr/taskmgr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index c5da7f13fd..5e7fed2f7c 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -46,8 +46,8 @@ typedef struct _IO_COUNTERS { #define RUN_PERF_PAGE #define STATUS_WINDOW 2001 -#define STATUS_SIZE1 80 -#define STATUS_SIZE2 210 +#define STATUS_SIZE1 85 +#define STATUS_SIZE2 190 #define STATUS_SIZE3 400 typedef struct

1 0

[reactos] 01/01: [MMSYS] Add icons for the sound tree (#1235)
by Stanislav Motylkov 13 Jan '19

13 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0d80a4ab60a41e94fa7e… commit e0d80a4ab60a41e94fa7e48bd4c78371adaa6c53 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Jan 13 21:13:20 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 13 19:13:20 2019 +0100 [MMSYS] Add icons for the sound tree (#1235) CORE-15584 --- dll/cpl/mmsys/mmsys.rc | 4 +- dll/cpl/mmsys/resource.h | 7 +++ dll/cpl/mmsys/resources/4366.ico | Bin 318 -> 22486 bytes dll/cpl/mmsys/sounds.c | 99 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 106 insertions(+), 4 deletions(-) diff --git a/dll/cpl/mmsys/mmsys.rc b/dll/cpl/mmsys/mmsys.rc index 603ad5d47a..3d0a87380f 100644 --- a/dll/cpl/mmsys/mmsys.rc +++ b/dll/cpl/mmsys/mmsys.rc @@ -27,8 +27,8 @@ IDI_JOY_ICON ICON "resources/4361.ico" 4363 ICON "resources/4363.ico" IDI_CAMERA_ICON ICON "resources/4364.ico" 4365 ICON "resources/4365.ico" -4366 ICON "resources/4366.ico" -4367 ICON "resources/4367.ico" +IDI_SOUND_SECTION ICON "resources/4366.ico" +IDI_SOUND_ASSIGNED ICON "resources/4367.ico" 4368 ICON "resources/4368.ico" 4369 ICON "resources/4369.ico" 4370 ICON "resources/4370.ico" diff --git a/dll/cpl/mmsys/resource.h b/dll/cpl/mmsys/resource.h index 246f9ef2d0..e5aff82484 100644 --- a/dll/cpl/mmsys/resource.h +++ b/dll/cpl/mmsys/resource.h @@ -7,6 +7,8 @@ #define IDI_MIDICON 3007 #define IDI_JOY_ICON 4361 #define IDI_CAMERA_ICON 4364 +#define IDI_SOUND_SECTION 4366 +#define IDI_SOUND_ASSIGNED 4367 #define IDI_SHUTDOWN_ICON 3009 #define IDI_NO_HW 4390 #define IDI_MUTED_ICON 4393 @@ -77,3 +79,8 @@ #define IDS_CPLDESCRIPTION 1001 #define IDS_NO_SOUND 1002 #define IDS_NO_DEVICES 1003 + +/* Sounds Image List */ +#define IMAGE_SOUND_SECTION 0 +#define IMAGE_SOUND_ASSIGNED 1 +#define IMAGE_SOUND_NONE 2 diff --git a/dll/cpl/mmsys/resources/4366.ico b/dll/cpl/mmsys/resources/4366.ico index 16972b9024..34bde78121 100644 Binary files a/dll/cpl/mmsys/resources/4366.ico and b/dll/cpl/mmsys/resources/4366.ico differ diff --git a/dll/cpl/mmsys/sounds.c b/dll/cpl/mmsys/sounds.c index 4976e2322f..1fc9fb9e8c 100644 --- a/dll/cpl/mmsys/sounds.c +++ b/dll/cpl/mmsys/sounds.c @@ -57,6 +57,7 @@ static PLABEL_MAP s_Map = NULL; static PAPP_MAP s_App = NULL; TCHAR szDefault[MAX_PATH]; +HIMAGELIST hSoundsImageList = NULL; /* A filter string is a list separated by NULL and ends with double NULLs. */ LPWSTR MakeFilter(LPWSTR psz) @@ -813,6 +814,7 @@ ShowSoundScheme(HWND hwndDlg) PSOUND_SCHEME_CONTEXT pScheme; PAPP_MAP pAppMap; PLABEL_MAP pLabelMap; + PLABEL_CONTEXT pLabelContext; HWND hDlgCtrl, hList; TVINSERTSTRUCT tvItem; HTREEITEM hTreeItem; @@ -820,6 +822,11 @@ ShowSoundScheme(HWND hwndDlg) hDlgCtrl = GetDlgItem(hwndDlg, IDC_SOUND_SCHEME); hList = GetDlgItem(hwndDlg, IDC_SCHEME_LIST); + if (hSoundsImageList != NULL) + { + TreeView_SetImageList(hList, hSoundsImageList, TVSIL_NORMAL); + } + lIndex = SendMessage(hDlgCtrl, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); if (lIndex == CB_ERR) { @@ -842,10 +849,12 @@ ShowSoundScheme(HWND hwndDlg) tvItem.hParent = TVI_ROOT; tvItem.hInsertAfter = TVI_FIRST; - tvItem.item.mask = TVIF_STATE | TVIF_TEXT | TVIF_PARAM; + tvItem.item.mask = TVIF_STATE | TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; tvItem.item.state = TVIS_EXPANDED; tvItem.item.stateMask = TVIS_EXPANDED; tvItem.item.pszText = pAppMap->szDesc; + tvItem.item.iImage = IMAGE_SOUND_SECTION; + tvItem.item.iSelectedImage = IMAGE_SOUND_SECTION; tvItem.item.lParam = (LPARAM)NULL; hTreeItem = TreeView_InsertItem(hList, &tvItem); @@ -853,14 +862,26 @@ ShowSoundScheme(HWND hwndDlg) pLabelMap = pAppMap->LabelMap; while (pLabelMap) { + pLabelContext = FindLabelContext(pScheme, pAppMap->szName, pLabelMap->szName); + ZeroMemory(&tvItem, sizeof(tvItem)); tvItem.hParent = /*TVI_ROOT;*/ hTreeItem; tvItem.hInsertAfter = TVI_SORT; - tvItem.item.mask = TVIF_STATE | TVIF_TEXT | TVIF_PARAM; + tvItem.item.mask = TVIF_STATE | TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; tvItem.item.state = TVIS_EXPANDED; tvItem.item.stateMask = TVIS_EXPANDED; tvItem.item.pszText = pLabelMap->szDesc; + if (pLabelContext->szValue && _tcslen(pLabelContext->szValue) > 0) + { + tvItem.item.iImage = IMAGE_SOUND_ASSIGNED; + tvItem.item.iSelectedImage = IMAGE_SOUND_ASSIGNED; + } + else + { + tvItem.item.iImage = IMAGE_SOUND_NONE; + tvItem.item.iSelectedImage = IMAGE_SOUND_NONE; + } tvItem.item.lParam = (LPARAM)FindLabelContext(pScheme, pAppMap->szName, pLabelMap->szName); TreeView_InsertItem(hList, &tvItem); @@ -940,6 +961,68 @@ ApplyChanges(HWND hwndDlg) } +HIMAGELIST +InitImageList(UINT StartResource, + UINT EndResource, + UINT Width, + UINT Height, + ULONG type) +{ + HANDLE hImage; + HIMAGELIST himl; + UINT i; + INT ret; + + /* Create the toolbar icon image list */ + himl = ImageList_Create(Width, + Height, + ILC_MASK | ILC_COLOR32, + EndResource - StartResource, + 0); + if (himl == NULL) + return NULL; + + ret = 0; + for (i = StartResource; i <= EndResource && ret != -1; i++) + { + hImage = LoadImageW(hApplet, + MAKEINTRESOURCEW(i), + type, + Width, + Height, + LR_LOADTRANSPARENT); + if (hImage == NULL) + { + ImageList_Destroy(himl); + himl = NULL; + break; + } + + if (type == IMAGE_BITMAP) + { + ret = ImageList_AddMasked(himl, + hImage, + RGB(255, 0, 128)); + } + else if (type == IMAGE_ICON) + { + ret = ImageList_AddIcon(himl, + hImage); + } + + DeleteObject(hImage); + } + + if (ret == -1) + { + ImageList_Destroy(himl); + himl = NULL; + } + + return himl; +} + + /* Sounds property page dialog callback */ INT_PTR CALLBACK @@ -964,6 +1047,12 @@ SoundsDlgProc(HWND hwndDlg, BM_SETIMAGE,(WPARAM)IMAGE_ICON, (LPARAM)(HANDLE)LoadIcon(hApplet, MAKEINTRESOURCE(IDI_PLAY_ICON))); + hSoundsImageList = InitImageList(IDI_SOUND_SECTION, + IDI_SOUND_ASSIGNED, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CXSMICON), + IMAGE_ICON); + LoadEventLabels(); LoadSoundProfiles(hwndDlg); LoadSoundFiles(hwndDlg); @@ -1114,6 +1203,12 @@ SoundsDlgProc(HWND hwndDlg, } break; } + case WM_DESTROY: + { + if (hSoundsImageList) + ImageList_Destroy(hSoundsImageList); + break; + } case WM_NOTIFY: { PLABEL_CONTEXT pLabelContext;

1 0

[reactos] 01/01: [COMCTL32] add padding for status bar text
by Denis Malikov 13 Jan '19

13 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da9accfba6e8eb769dcd3… commit da9accfba6e8eb769dcd317185a9b57d161275b7 Author: Denis Malikov <filedem(a)gmail.com> AuthorDate: Sun Jan 13 22:55:45 2019 +0700 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Jan 13 18:21:36 2019 +0200 [COMCTL32] add padding for status bar text --- dll/win32/comctl32/status.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/comctl32/status.c b/dll/win32/comctl32/status.c index 02e26b0a9d..cfee259cd8 100644 --- a/dll/win32/comctl32/status.c +++ b/dll/win32/comctl32/status.c @@ -201,6 +201,8 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART } else { r.left += x; #ifdef __REACTOS__ + r.left += 3; + r.right -= 3; if (!theme) DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS); else

1 0

[reactos] 01/01: [GDIPLUS] Fix a regression painting gradient CORE-15479
by Joachim Henze 13 Jan '19

13 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=daadcc61414330c909625… commit daadcc61414330c909625c08fe2b909c0bf5621f Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 13 17:14:41 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 13 17:14:41 2019 +0100 [GDIPLUS] Fix a regression painting gradient CORE-15479 patch is import of Wine commit 0937186f7d15fed60f77fa2014d650f4d0b6b20b by Nikolay Sivov --- dll/win32/gdiplus/brush.c | 67 ++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/dll/win32/gdiplus/brush.c b/dll/win32/gdiplus/brush.c index d06832045a..f726023982 100644 --- a/dll/win32/gdiplus/brush.c +++ b/dll/win32/gdiplus/brush.c @@ -428,8 +428,8 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF* rect, GpLineGradient **line) { GpPointF start, end; + float far_x, angle; GpStatus stat; - float far_x, far_y; TRACE("(%p, %x, %x, %d, %d, %p)\n", rect, startcolor, endcolor, mode, wrap, line); @@ -437,45 +437,33 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF* rect, if(!line || !rect) return InvalidParameter; - far_x = rect->X + rect->Width; - far_y = rect->Y + rect->Height; - switch (mode) { - case LinearGradientModeHorizontal: - start.X = min(rect->X, far_x); - start.Y = rect->Y; - end.X = max(rect->X, far_x); - end.Y = rect->Y; - break; case LinearGradientModeVertical: - start.X = rect->X; - start.Y = min(rect->Y, far_y); - end.X = rect->X; - end.Y = max(rect->Y, far_y); + angle = 90.0f; break; case LinearGradientModeForwardDiagonal: - start.X = min(rect->X, far_x); - start.Y = min(rect->Y, far_y); - end.X = max(rect->X, far_x); - end.Y = max(rect->Y, far_y); + angle = 45.0f; break; case LinearGradientModeBackwardDiagonal: - start.X = max(rect->X, far_x); - start.Y = min(rect->Y, far_y); - end.X = min(rect->X, far_x); - end.Y = max(rect->Y, far_y); + angle = 135.0f; break; + case LinearGradientModeHorizontal: + far_x = rect->X + rect->Width; + + start.X = min(rect->X, far_x); + start.Y = rect->Y; + end.X = max(rect->X, far_x); + end.Y = rect->Y; + stat = GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); + if (stat == Ok) + (*line)->rect = *rect; + return stat; default: return InvalidParameter; } - stat = GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); - - if (stat == Ok) - (*line)->rect = *rect; - - return stat; + return GdipCreateLineBrushFromRectWithAngle(rect, startcolor, endcolor, angle, TRUE, wrap, line); } GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, @@ -503,9 +491,9 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect GpLineGradient **line) { GpStatus stat; - LinearGradientMode mode; - REAL exofs, eyofs; + REAL exofs, eyofs, far_x, far_y; REAL sin_angle, cos_angle, sin_cos_angle; + GpPointF start, end; TRACE("(%p, %x, %x, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable, wrap, line); @@ -544,12 +532,25 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect cos_angle = cosf(angle); sin_cos_angle = sin_angle * cos_angle; + far_x = rect->X + rect->Width; + far_y = rect->Y + rect->Height; + if (sin_cos_angle >= 0) - mode = LinearGradientModeForwardDiagonal; + { + start.X = min(rect->X, far_x); + start.Y = min(rect->Y, far_y); + end.X = max(rect->X, far_x); + end.Y = max(rect->Y, far_y); + } else - mode = LinearGradientModeBackwardDiagonal; + { + start.X = max(rect->X, far_x); + start.Y = min(rect->Y, far_y); + end.X = min(rect->X, far_x); + end.Y = max(rect->Y, far_y); + } - stat = GdipCreateLineBrushFromRect(rect, startcolor, endcolor, mode, wrap, line); + stat = GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); if (stat == Ok) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs