Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 01/01: [FONTS][SETUP] Add Trebuchet MS fonts (#1791)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04a361d091095a96bb3af… commit 04a361d091095a96bb3af376e46daf4c5fe81c63 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 4 12:11:55 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 4 12:11:55 2019 +0900 [FONTS][SETUP] Add Trebuchet MS fonts (#1791) Add "Trebuchet MS" fonts. CORE-16272 - Add "Trebuchet MS", "Trebuchet MS Bold", "Trebuchet MS Bold Italic" and "Trebuchet MS Italic" fonts by duplicating "Open Sans" fonts and renaming them. - Delete some "Trebuchet MS" font substitutes. - Add LICENSE file. I made these font files by using FontForge. Their family name is "Trebuchet MS". Their display names are "Trebuchet MS", "Trebuchet MS Bold", "Trebuchet MS Bold Italic" and "Trebuchet MS Italic". Their font filenames are trebuc.ttf, trebucbd.ttf, trebucbi.ttf and trebucit.ttf. The Underline Positions are hacked by adding an integer value for workaround of FontForge's bug. --- base/setup/lib/muifonts.h | 8 +- media/fonts/CMakeLists.txt | 4 + media/fonts/doc/TrebuchetMS/Apache License.txt | 201 +++++++++++++++++++++++++ media/fonts/trebuc.ttf | Bin 0 -> 174580 bytes media/fonts/trebucbd.ttf | Bin 0 -> 176088 bytes media/fonts/trebucbi.ttf | Bin 0 -> 178820 bytes media/fonts/trebucit.ttf | Bin 0 -> 178916 bytes 7 files changed, 206 insertions(+), 7 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 289d54f3c85..5799f50a27d 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -31,7 +31,6 @@ MUI_SUBFONT LatinFonts[] = { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Times New Roman" }, - { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; @@ -65,7 +64,6 @@ MUI_SUBFONT CyrillicFonts[] = { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Times New Roman" }, - { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; @@ -99,7 +97,6 @@ MUI_SUBFONT GreekFonts[] = { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Times New Roman" }, - { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; @@ -135,7 +132,6 @@ MUI_SUBFONT HebrewFonts[] = { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Times New Roman" }, - { L"Trebuchet MS", L"Open Sans" }, { L"Ubuntu", L"Tahoma" }, { NULL, NULL } }; @@ -386,7 +382,6 @@ MUI_SUBFONT UnicodeFonts[] = { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Times New Roman" }, - { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; @@ -421,7 +416,6 @@ MUI_SUBFONT HindiFonts[] = { L"Times New Roman CYR,204", L"Times New Roman,204" }, { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, - { L"Tms Rmn", L"Liberation Serif" }, - { L"Trebuchet MS", L"Open Sans" }, + { L"Tms Rmn", L"Times New Roman" }, { NULL, NULL } }; diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 659ae00c997..ce5a50c8c4f 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -155,6 +155,10 @@ list(APPEND FONT_FILES timesbd.ttf timesbi.ttf timesi.ttf + trebuc.ttf + trebucbd.ttf + trebucbi.ttf + trebucit.ttf UniVGA16.ttf) foreach(item ${FONT_FILES}) diff --git a/media/fonts/doc/TrebuchetMS/Apache License.txt b/media/fonts/doc/TrebuchetMS/Apache License.txt new file mode 100644 index 00000000000..989e2c59e97 --- /dev/null +++ b/media/fonts/doc/TrebuchetMS/Apache License.txt @@ -0,0 +1,201 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/media/fonts/trebuc.ttf b/media/fonts/trebuc.ttf new file mode 100644 index 00000000000..f3eea179d98 Binary files /dev/null and b/media/fonts/trebuc.ttf differ diff --git a/media/fonts/trebucbd.ttf b/media/fonts/trebucbd.ttf new file mode 100644 index 00000000000..2be8f458c28 Binary files /dev/null and b/media/fonts/trebucbd.ttf differ diff --git a/media/fonts/trebucbi.ttf b/media/fonts/trebucbi.ttf new file mode 100644 index 00000000000..9989bb3d0f5 Binary files /dev/null and b/media/fonts/trebucbi.ttf differ diff --git a/media/fonts/trebucit.ttf b/media/fonts/trebucit.ttf new file mode 100644 index 00000000000..8ae231ae362 Binary files /dev/null and b/media/fonts/trebucit.ttf differ

5 years, 4 months

[reactos] 01/01: [FONTS][SETUP][BOOTDATA] Add Times New Roman fonts (#1790)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbb4432b25dc65b9d65f0… commit dbb4432b25dc65b9d65f02bfc09d47d63b8cd5e5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 4 11:22:51 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 4 11:22:51 2019 +0900 [FONTS][SETUP][BOOTDATA] Add Times New Roman fonts (#1790) Add "Times New Roman" fonts. CORE-16272 - Add "Times New Roman" and "Times New Roman Italic" fonts by duplicating "Liberation Serif" fonts and renaming them. - Delete some "Times New Roman" font substitutes. - Add LICENSE file. I made these font files by using FontForge. Their family name is "Times New Roman". Their display names are "Times New Roman", "Times New Roman Bold", "Times New Roman Bold Italic" and "Times New Roman Italic". Their font filenames are times.ttf, timesbd.ttf, timesbi.ttf and timesi.ttf. The Underline Positions are hacked by adding an integer value for workaround of FontForge's bug. --- base/setup/lib/muifonts.h | 46 ++++++------- boot/bootdata/livecd.inf | 5 +- media/fonts/CMakeLists.txt | 4 ++ media/fonts/doc/TimesNewRoman/LICENSE.txt | 104 ++++++++++++++++++++++++++++++ media/fonts/doc/TimesNewRoman/README.txt | 6 ++ media/fonts/times.ttf | Bin 0 -> 204888 bytes media/fonts/timesbd.ttf | Bin 0 -> 198920 bytes media/fonts/timesbi.ttf | Bin 0 -> 205404 bytes media/fonts/timesi.ttf | Bin 0 -> 207432 bytes 9 files changed, 135 insertions(+), 30 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 9dae43fd2a7..289d54f3c85 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -24,14 +24,13 @@ MUI_SUBFONT LatinFonts[] = { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times", L"Liberation Serif" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, - { L"Tms Rmn", L"Liberation Serif" }, + { L"Tms Rmn", L"Times New Roman" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; @@ -59,14 +58,13 @@ MUI_SUBFONT CyrillicFonts[] = { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times", L"Liberation Serif" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, - { L"Tms Rmn", L"Liberation Serif" }, + { L"Tms Rmn", L"Times New Roman" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; @@ -94,14 +92,13 @@ MUI_SUBFONT GreekFonts[] = { L"System", L"FreeSans" }, { L"Tahoma", L"DejaVu Sans" }, { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times", L"Liberation Serif" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, - { L"Tms Rmn", L"Liberation Serif" }, + { L"Tms Rmn", L"Times New Roman" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; @@ -130,14 +127,14 @@ MUI_SUBFONT HebrewFonts[] = { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times", L"DejaVu Serif" }, + { L"Times", L"Times New Roman" }, { L"Times New Roman", L"DejaVu Serif" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, - { L"Tms Rmn", L"DejaVu Serif" }, + { L"Tms Rmn", L"Times New Roman" }, { L"Trebuchet MS", L"Open Sans" }, { L"Ubuntu", L"Tahoma" }, { NULL, NULL } @@ -178,14 +175,13 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times", L"Liberation Serif" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, - { L"Tms Rmn", L"Liberation Serif" }, + { L"Tms Rmn", L"Times New Roman" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ @@ -232,14 +228,13 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times", L"Liberation Serif" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, - { L"Tms Rmn", L"Liberation Serif" }, + { L"Tms Rmn", L"Times New Roman" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ @@ -284,14 +279,13 @@ MUI_SUBFONT JapaneseFonts[] = { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times", L"Liberation Serif" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, - { L"Tms Rmn", L"Liberation Serif" }, + { L"Tms Rmn", L"Times New Roman" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ @@ -340,14 +334,13 @@ MUI_SUBFONT KoreanFonts[] = { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times", L"Liberation Serif" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, - { L"Tms Rmn", L"Liberation Serif" }, + { L"Tms Rmn", L"Times New Roman" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ @@ -385,14 +378,14 @@ MUI_SUBFONT UnicodeFonts[] = { L"System", L"FreeSans" }, { L"Tahoma", L"DejaVu Sans" }, { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times", L"DejaVu Serif" }, + { L"Times", L"Times New Roman" }, { L"Times New Roman", L"DejaVu Serif" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, - { L"Tms Rmn", L"DejaVu Serif" }, + { L"Tms Rmn", L"Times New Roman" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; @@ -422,8 +415,7 @@ MUI_SUBFONT HindiFonts[] = { L"System", L"FreeSans" }, { L"Tahoma", L"FreeSans" }, { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times", L"Liberation Serif" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index 434a533adef..049c6b7a692 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -58,9 +58,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dl HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Liberation Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Liberation Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" ; FIXME: Registration diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 5394df3eade..659ae00c997 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -151,6 +151,10 @@ list(APPEND FONT_FILES #sserifeg.fon #sserifer.fon #sserifet.fon + times.ttf + timesbd.ttf + timesbi.ttf + timesi.ttf UniVGA16.ttf) foreach(item ${FONT_FILES}) diff --git a/media/fonts/doc/TimesNewRoman/LICENSE.txt b/media/fonts/doc/TimesNewRoman/LICENSE.txt new file mode 100644 index 00000000000..be16b546d90 --- /dev/null +++ b/media/fonts/doc/TimesNewRoman/LICENSE.txt @@ -0,0 +1,104 @@ +Digitized data copyright (c) 2010 Google Corporation + with Reserved Font Arimo, Tinos and Cousine. +Copyright (c) 2012 Red Hat, Inc. + with Reserved Font Name Liberation. +Copyright (c) 2019 Katayama Hirofumi MZ + with renamed as "Times New Roman". + +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + +PREAMBLE The goals of the Open Font License (OFL) are to stimulate +worldwide development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to provide +a free and open framework in which fonts may be shared and improved in +partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. +The fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + + + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. +This may include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components +as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting ? in part or in whole ? +any of the components of the Original Version, by changing formats or +by porting the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical writer +or other person who contributed to the Font Software. + + +PERMISSION & CONDITIONS + +Permission is hereby granted, free of charge, to any person obtaining a +copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components,in + Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the + corresponding Copyright Holder. This restriction only applies to the + primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + +5) The Font Software, modified or unmodified, in part or in whole, must + be distributed entirely under this license, and must not be distributed + under any other license. The requirement for fonts to remain under + this license does not apply to any document created using the Font + Software. + + + +TERMINATION +This license becomes null and void if any of the above conditions are not met. + + + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER +DEALINGS IN THE FONT SOFTWARE. + diff --git a/media/fonts/doc/TimesNewRoman/README.txt b/media/fonts/doc/TimesNewRoman/README.txt new file mode 100644 index 00000000000..e7ca2d4eacb --- /dev/null +++ b/media/fonts/doc/TimesNewRoman/README.txt @@ -0,0 +1,6 @@ +ReactOS "Times New Roman" fonts are based on Liberation Serif. + +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +Please read file "LICENSE" for details. diff --git a/media/fonts/times.ttf b/media/fonts/times.ttf new file mode 100644 index 00000000000..7ba32fb1b45 Binary files /dev/null and b/media/fonts/times.ttf differ diff --git a/media/fonts/timesbd.ttf b/media/fonts/timesbd.ttf new file mode 100644 index 00000000000..b7c59e5779e Binary files /dev/null and b/media/fonts/timesbd.ttf differ diff --git a/media/fonts/timesbi.ttf b/media/fonts/timesbi.ttf new file mode 100644 index 00000000000..b961a68920b Binary files /dev/null and b/media/fonts/timesbi.ttf differ diff --git a/media/fonts/timesi.ttf b/media/fonts/timesi.ttf new file mode 100644 index 00000000000..76684977706 Binary files /dev/null and b/media/fonts/timesi.ttf differ

5 years, 4 months

[reactos] 01/01: [WIN32SS] Improve font loading failure logging

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c057a07d7960a6debdfe6… commit c057a07d7960a6debdfe6c597c1a7edd39d3c9c3 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 4 01:55:18 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Aug 4 01:55:18 2019 +0200 [WIN32SS] Improve font loading failure logging --- win32ss/gdi/ntgdi/freetype.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index e953b52db02..fb8741c8d8b 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1163,10 +1163,12 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont) if (Error) { + UNICODE_STRING MemoryFont = RTL_CONSTANT_STRING(L"MemoryFont"); + PUNICODE_STRING PrintFile = pFileName ? pFileName : &MemoryFont; if (Error == FT_Err_Unknown_File_Format) - DPRINT1("Unknown font file format\n"); + DPRINT1("Unknown font file format (%wZ)\n", PrintFile); else - DPRINT1("Error reading font (FT_Error: %d)\n", Error); + DPRINT1("Error reading font (FT_Error: %d, %wZ)\n", Error, PrintFile); return 0; /* failure */ }

5 years, 4 months

[reactos] 01/01: [WIN32SS] Only access a font face if it was actually loaded

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35dc022e14a9d2eefc89e… commit 35dc022e14a9d2eefc89e2a1e4902a1a8d4ee45a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 4 00:12:34 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Aug 4 00:41:12 2019 +0200 [WIN32SS] Only access a font face if it was actually loaded --- win32ss/gdi/ntgdi/freetype.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index d31178d3f2e..e953b52db02 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1154,8 +1154,11 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont) pLoadFont->Memory->BufferSize, -1, &Face); - FaceCount = Face->num_faces; - FT_Done_Face(Face); + if (!Error) + { + FaceCount = Face->num_faces; + FT_Done_Face(Face); + } IntUnLockFreeType(); if (Error)

5 years, 4 months

[reactos] 01/01: [SYSDM] Fix Re-sizing License Prompt (#1789)

by Shy Zedaka

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce2f52d054315c73d6391… commit ce2f52d054315c73d6391484638f21cf2c5667b9 Author: Shy Zedaka <shaytzedaka(a)outlook.com> AuthorDate: Sun Aug 4 00:34:20 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 3 23:34:20 2019 +0200 [SYSDM] Fix Re-sizing License Prompt (#1789) CORE-16278 --- dll/cpl/sysdm/lang/bg-BG.rc | 2 +- dll/cpl/sysdm/lang/cs-CZ.rc | 2 +- dll/cpl/sysdm/lang/da-DK.rc | 2 +- dll/cpl/sysdm/lang/de-DE.rc | 2 +- dll/cpl/sysdm/lang/el-GR.rc | 2 +- dll/cpl/sysdm/lang/en-US.rc | 2 +- dll/cpl/sysdm/lang/es-ES.rc | 2 +- dll/cpl/sysdm/lang/fr-FR.rc | 2 +- dll/cpl/sysdm/lang/he-IL.rc | 2 +- dll/cpl/sysdm/lang/hu-HU.rc | 2 +- dll/cpl/sysdm/lang/id-ID.rc | 2 +- dll/cpl/sysdm/lang/it-IT.rc | 2 +- dll/cpl/sysdm/lang/ja-JP.rc | 2 +- dll/cpl/sysdm/lang/nl-NL.rc | 2 +- dll/cpl/sysdm/lang/no-NO.rc | 2 +- dll/cpl/sysdm/lang/pl-PL.rc | 2 +- dll/cpl/sysdm/lang/pt-PT.rc | 2 +- dll/cpl/sysdm/lang/ro-RO.rc | 2 +- dll/cpl/sysdm/lang/ru-RU.rc | 2 +- dll/cpl/sysdm/lang/sk-SK.rc | 2 +- dll/cpl/sysdm/lang/sq-AL.rc | 2 +- dll/cpl/sysdm/lang/sv-SE.rc | 2 +- dll/cpl/sysdm/lang/tr-TR.rc | 2 +- dll/cpl/sysdm/lang/uk-UA.rc | 2 +- dll/cpl/sysdm/lang/zh-CN.rc | 2 +- dll/cpl/sysdm/lang/zh-TW.rc | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index bd3a5bc9fe9..41cf3f4c5c7 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -294,7 +294,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Разрешително" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "Добре", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index f16ccb3d5cb..ea91fc822fd 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -299,7 +299,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Licence" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index 21ceef5ba63..5cd459ac9f4 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -294,7 +294,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Licence" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index 29f5d06ff00..b6872296d3c 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -303,7 +303,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Lizenz" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index d8552a3a7f7..5ba87444890 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -294,7 +294,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Άδεια" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index 02941a12319..df6e8f725a4 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -294,7 +294,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "License" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index 1f8f58c1b9b..268dbada225 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -296,7 +296,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Licencia" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "Aceptar", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index 7661696d665..b127d5e40b2 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -294,7 +294,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Licence" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index 057a008bab3..69842dabe97 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -296,7 +296,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "רשיון" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "אישור", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index ef2ee19adfc..2e49d19a381 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -296,7 +296,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Licence" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 4c0f1bc5a8b..d06a56259e8 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -294,7 +294,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Lisensi" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index f11d4b13eb1..d1b1248ff12 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -294,7 +294,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Licenza" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index c992ae20241..ca06f3ea7c8 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -294,7 +294,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "ライセンス" FONT 9, "MS UI Gothic", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 601c91e8363..7b5799bd16d 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -294,7 +294,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Licence" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index 2570df6a967..7849ca7c6c9 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -294,7 +294,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Lisens" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index f4cdac25ad5..47f710be443 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -303,7 +303,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Licencja" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/pt-PT.rc b/dll/cpl/sysdm/lang/pt-PT.rc index 65dec91995b..5ac5ebab7e5 100644 --- a/dll/cpl/sysdm/lang/pt-PT.rc +++ b/dll/cpl/sysdm/lang/pt-PT.rc @@ -298,7 +298,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "License" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index 2a6ad877111..f5b5beb19d8 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -303,7 +303,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Licență" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "Î&nchide", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index b9eccd4e821..cc8e714e4a8 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -294,7 +294,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Лицензионное соглашение" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index f478192e44b..a32a6c207c7 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -302,7 +302,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Licencia" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 1974f3ba3ce..cf76c379ee1 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -294,7 +294,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Liçensë" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 78f6de889ed..bdee46110bc 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -296,7 +296,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Licens" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 90f11345a26..9f9c40c8306 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -296,7 +296,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Ruhsat" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "Tamam", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 116cef429fb..9687265d062 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -302,7 +302,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "Ліцензійна угода" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "OK", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 51c5d1319e4..c80ec8fa361 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -297,7 +297,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "协议" FONT 9, "宋体", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "确定", IDOK, 106, 140, 54, 15 diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index a5cdd973313..cde7e1d1dfd 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -297,7 +297,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "著作權" FONT 9, "新細明體", 0, 0, 0x0 -STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE DEFPUSHBUTTON "確定", IDOK, 106, 140, 54, 15

5 years, 4 months

[reactos] 01/01: [SMSS] Use the appropriate security descriptor when creating the LPC port

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d49a53ca99397d7154898… commit d49a53ca99397d7154898ac1d2c8c804f6ef598e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Aug 3 21:55:28 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 3 21:56:15 2019 +0200 [SMSS] Use the appropriate security descriptor when creating the LPC port --- base/system/smss/sminit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/system/smss/sminit.c b/base/system/smss/sminit.c index 49141ff2d0d..056176aa426 100644 --- a/base/system/smss/sminit.c +++ b/base/system/smss/sminit.c @@ -2441,7 +2441,7 @@ SmpInit(IN PUNICODE_STRING InitialCommand, /* Create the SM API Port */ RtlInitUnicodeString(&PortName, L"\\SmApiPort"); - InitializeObjectAttributes(&ObjectAttributes, &PortName, 0, NULL, NULL); + InitializeObjectAttributes(&ObjectAttributes, &PortName, 0, NULL, SmpApiPortSecurityDescriptor); Status = NtCreatePort(&PortHandle, &ObjectAttributes, sizeof(SB_CONNECTION_INFO),

5 years, 4 months

[reactos] 01/01: [DEVMGR] Change the menu id prefix from IDC_ to IDM_.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=611989943ecbcf66269f3… commit 611989943ecbcf66269f33d014f872dec41a6b42 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 3 21:52:00 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 3 21:52:00 2019 +0200 [DEVMGR] Change the menu id prefix from IDC_ to IDM_. --- dll/win32/devmgr/devmgmt/DeviceView.cpp | 28 ++++---- dll/win32/devmgr/devmgmt/MainWindow.cpp | 109 ++++++++++++++++---------------- dll/win32/devmgr/lang/bg-BG.rc | 20 +++--- dll/win32/devmgr/lang/cs-CZ.rc | 20 +++--- dll/win32/devmgr/lang/de-DE.rc | 20 +++--- dll/win32/devmgr/lang/el-GR.rc | 20 +++--- dll/win32/devmgr/lang/en-US.rc | 20 +++--- dll/win32/devmgr/lang/es-ES.rc | 20 +++--- dll/win32/devmgr/lang/et-EE.rc | 20 +++--- dll/win32/devmgr/lang/fr-FR.rc | 20 +++--- dll/win32/devmgr/lang/he-IL.rc | 20 +++--- dll/win32/devmgr/lang/hu-HU.rc | 20 +++--- dll/win32/devmgr/lang/id-ID.rc | 20 +++--- dll/win32/devmgr/lang/it-IT.rc | 20 +++--- dll/win32/devmgr/lang/ja-JP.rc | 20 +++--- dll/win32/devmgr/lang/no-NO.rc | 20 +++--- dll/win32/devmgr/lang/pl-PL.rc | 20 +++--- dll/win32/devmgr/lang/pt-BR.rc | 20 +++--- dll/win32/devmgr/lang/pt-PT.rc | 20 +++--- dll/win32/devmgr/lang/ro-RO.rc | 20 +++--- dll/win32/devmgr/lang/ru-RU.rc | 20 +++--- dll/win32/devmgr/lang/sk-SK.rc | 20 +++--- dll/win32/devmgr/lang/sq-AL.rc | 20 +++--- dll/win32/devmgr/lang/tr-TR.rc | 20 +++--- dll/win32/devmgr/lang/uk-UA.rc | 18 +++--- dll/win32/devmgr/lang/zh-CN.rc | 18 +++--- dll/win32/devmgr/lang/zh-TW.rc | 20 +++--- dll/win32/devmgr/resource.h | 38 +++++------ 28 files changed, 336 insertions(+), 335 deletions(-) diff --git a/dll/win32/devmgr/devmgmt/DeviceView.cpp b/dll/win32/devmgr/devmgmt/DeviceView.cpp index 690609c73ca..917140efd50 100644 --- a/dll/win32/devmgr/devmgmt/DeviceView.cpp +++ b/dll/win32/devmgr/devmgmt/DeviceView.cpp @@ -225,13 +225,13 @@ CDeviceView::OnAction( { switch (Action) { - case IDC_PROPERTIES: + case IDM_PROPERTIES: { DisplayPropertySheet(); break; } - case IDC_SCAN_HARDWARE: + case IDM_SCAN_HARDWARE: { Refresh(GetCurrentView(), true, @@ -239,7 +239,7 @@ CDeviceView::OnAction( break; } - case IDC_ENABLE_DRV: + case IDM_ENABLE_DRV: { bool NeedsReboot; if (EnableSelectedDevice(true, NeedsReboot) && @@ -250,27 +250,27 @@ CDeviceView::OnAction( break; } - case IDC_DISABLE_DRV: + case IDM_DISABLE_DRV: { bool NeedsReboot; EnableSelectedDevice(false, NeedsReboot); break; } - case IDC_UPDATE_DRV: + case IDM_UPDATE_DRV: { bool NeedsReboot; UpdateSelectedDevice(NeedsReboot); break; } - case IDC_UNINSTALL_DRV: + case IDM_UNINSTALL_DRV: { UninstallSelectedDevice(); break; } - case IDC_ADD_HARDWARE: + case IDM_ADD_HARDWARE: { RunAddHardwareWizard(); break; @@ -878,7 +878,7 @@ CDeviceView::BuildActionMenuForNode( if (DeviceNode->CanUpdate()) { String.LoadStringW(g_hThisInstance, IDS_MENU_UPDATE); - MenuItemInfo.wID = IDC_UPDATE_DRV; + MenuItemInfo.wID = IDM_UPDATE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; @@ -887,7 +887,7 @@ CDeviceView::BuildActionMenuForNode( if (DeviceNode->IsDisabled()) { String.LoadStringW(g_hThisInstance, IDS_MENU_ENABLE); - MenuItemInfo.wID = IDC_ENABLE_DRV; + MenuItemInfo.wID = IDM_ENABLE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; @@ -896,7 +896,7 @@ CDeviceView::BuildActionMenuForNode( if (DeviceNode->CanDisable() && !DeviceNode->IsDisabled()) { String.LoadStringW(g_hThisInstance, IDS_MENU_DISABLE); - MenuItemInfo.wID = IDC_DISABLE_DRV; + MenuItemInfo.wID = IDM_DISABLE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; @@ -905,7 +905,7 @@ CDeviceView::BuildActionMenuForNode( if (DeviceNode->CanUninstall()) { String.LoadStringW(g_hThisInstance, IDS_MENU_UNINSTALL); - MenuItemInfo.wID = IDC_UNINSTALL_DRV; + MenuItemInfo.wID = IDM_UNINSTALL_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; @@ -917,7 +917,7 @@ CDeviceView::BuildActionMenuForNode( // All nodes have the scan option String.LoadStringW(g_hThisInstance, IDS_MENU_SCAN); - MenuItemInfo.wID = IDC_SCAN_HARDWARE; + MenuItemInfo.wID = IDM_SCAN_HARDWARE; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; @@ -925,7 +925,7 @@ CDeviceView::BuildActionMenuForNode( if ((Node->GetNodeType() == RootNode) || (MainMenu == true)) { String.LoadStringW(g_hThisInstance, IDS_MENU_ADD); - MenuItemInfo.wID = IDC_ADD_HARDWARE; + MenuItemInfo.wID = IDM_ADD_HARDWARE; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; @@ -937,7 +937,7 @@ CDeviceView::BuildActionMenuForNode( i++; String.LoadStringW(g_hThisInstance, IDS_MENU_PROPERTIES); - MenuItemInfo.wID = IDC_PROPERTIES; + MenuItemInfo.wID = IDM_PROPERTIES; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; diff --git a/dll/win32/devmgr/devmgmt/MainWindow.cpp b/dll/win32/devmgr/devmgmt/MainWindow.cpp index 5b3c6eb669a..3273aad5bbb 100644 --- a/dll/win32/devmgr/devmgmt/MainWindow.cpp +++ b/dll/win32/devmgr/devmgmt/MainWindow.cpp @@ -30,26 +30,25 @@ HINSTANCE g_hParentInstance = NULL; static const MENU_HINT MainMenuHintTable[] = { // File Menu - { IDC_EXIT, IDS_HINT_EXIT }, + { IDM_EXIT, IDS_HINT_EXIT }, // Action Menu - { IDC_PROPERTIES, IDS_HINT_PROPERTIES }, - { IDC_SCAN_HARDWARE, IDS_HINT_SCAN }, - { IDC_ENABLE_DRV, IDS_HINT_ENABLE }, - { IDC_DISABLE_DRV, IDS_HINT_DISABLE }, - { IDC_UPDATE_DRV, IDS_HINT_UPDATE }, - { IDC_UNINSTALL_DRV, IDS_HINT_UNINSTALL }, - { IDC_ADD_HARDWARE, IDS_HINT_ADD }, - + { IDM_PROPERTIES, IDS_HINT_PROPERTIES }, + { IDM_SCAN_HARDWARE, IDS_HINT_SCAN }, + { IDM_ENABLE_DRV, IDS_HINT_ENABLE }, + { IDM_DISABLE_DRV, IDS_HINT_DISABLE }, + { IDM_UPDATE_DRV, IDS_HINT_UPDATE }, + { IDM_UNINSTALL_DRV, IDS_HINT_UNINSTALL }, + { IDM_ADD_HARDWARE, IDS_HINT_ADD }, // View Menu - { IDC_DEVBYTYPE, IDS_HINT_DEV_BY_TYPE}, - { IDC_DEVBYCONN, IDS_HINT_DEV_BY_CONN}, - { IDC_RESBYTYPE, IDS_HINT_RES_BY_TYPE}, - { IDC_RESBYCONN, IDS_HINT_RES_BY_TYPE}, - { IDC_SHOWHIDDEN, IDS_HINT_SHOW_HIDDEN }, + { IDM_DEVBYTYPE, IDS_HINT_DEV_BY_TYPE}, + { IDM_DEVBYCONN, IDS_HINT_DEV_BY_CONN}, + { IDM_RESBYTYPE, IDS_HINT_RES_BY_TYPE}, + { IDM_RESBYCONN, IDS_HINT_RES_BY_TYPE}, + { IDM_SHOWHIDDEN, IDS_HINT_SHOW_HIDDEN }, - { IDC_ABOUT, IDS_HINT_ABOUT } + { IDM_ABOUT, IDS_HINT_ABOUT } }; @@ -67,13 +66,13 @@ static const MENU_HINT SystemMenuHintTable[] = static TBBUTTON TbButtons[] = { - { BTN_PROPERTIES, IDC_PROPERTIES, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, - { BTN_SCAN_HARDWARE, IDC_SCAN_HARDWARE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_PROPERTIES, IDM_PROPERTIES, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_SCAN_HARDWARE, IDM_SCAN_HARDWARE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, { 2, IDC_STATIC, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0 }, - { BTN_ENABLE_DRV, IDC_ENABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, - { BTN_DISABLE_DRV, IDC_DISABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, - { BTN_UPDATE_DRV, IDC_UPDATE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, - { BTN_UNINSTALL_DRV, IDC_UNINSTALL_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 } + { BTN_ENABLE_DRV, IDM_ENABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_DISABLE_DRV, IDM_DISABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_UPDATE_DRV, IDM_UPDATE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_UNINSTALL_DRV, IDM_UNINSTALL_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 } }; @@ -150,7 +149,7 @@ CDeviceManager::Initialize(_In_z_ LPCTSTR lpCaption, wc.hIcon = LoadIcon(g_hThisInstance, MAKEINTRESOURCEW(IDI_MAIN_ICON)); wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); - wc.lpszMenuName = MAKEINTRESOURCEW(IDR_MAINMENU); + wc.lpszMenuName = MAKEINTRESOURCEW(IDM_MAINMENU); wc.lpszClassName = m_szMainWndClass; wc.hIconSm = (HICON)LoadImage(g_hThisInstance, MAKEINTRESOURCE(IDI_MAIN_ICON), @@ -255,19 +254,19 @@ CDeviceManager::RefreshView(_In_ ViewType Type, switch (Type) { case DevicesByType: - CheckId = IDC_DEVBYTYPE; + CheckId = IDM_DEVBYTYPE; break; case DevicesByConnection: - CheckId = IDC_DEVBYCONN; + CheckId = IDM_DEVBYCONN; break; case ResourcesByType: - CheckId = IDC_RESBYTYPE; + CheckId = IDM_RESBYTYPE; break; case ResourcesByConnection: - CheckId = IDC_RESBYCONN; + CheckId = IDM_RESBYCONN; break; default: @@ -277,8 +276,8 @@ CDeviceManager::RefreshView(_In_ ViewType Type, // Set the new check item CheckMenuRadioItem(m_hMenu, - IDC_DEVBYTYPE, - IDC_RESBYCONN, + IDM_DEVBYTYPE, + IDM_RESBYCONN, CheckId, MF_BYCOMMAND); @@ -378,9 +377,9 @@ void CDeviceManager::UpdateToolbar() { State = TBSTATE_HIDDEN; } - SendMessageW(m_hToolBar, TB_SETSTATE, IDC_PROPERTIES, MAKELPARAM(State, 0)); - SendMessageW(m_hToolBar, TB_SETSTATE, IDC_UPDATE_DRV, MAKELPARAM(State, 0)); //hack - SendMessageW(m_hToolBar, TB_SETSTATE, IDC_UNINSTALL_DRV, MAKELPARAM(State, 0)); // hack + SendMessageW(m_hToolBar, TB_SETSTATE, IDM_PROPERTIES, MAKELPARAM(State, 0)); + SendMessageW(m_hToolBar, TB_SETSTATE, IDM_UPDATE_DRV, MAKELPARAM(State, 0)); //hack + SendMessageW(m_hToolBar, TB_SETSTATE, IDM_UNINSTALL_DRV, MAKELPARAM(State, 0)); // hack // enable driver button if (Node->GetNodeType() == DeviceNode && @@ -392,7 +391,7 @@ void CDeviceManager::UpdateToolbar() { State = TBSTATE_HIDDEN; } - SendMessageW(m_hToolBar, TB_SETSTATE, IDC_ENABLE_DRV, MAKELPARAM(State, 0)); + SendMessageW(m_hToolBar, TB_SETSTATE, IDM_ENABLE_DRV, MAKELPARAM(State, 0)); // disable driver button if (Node->GetNodeType() == DeviceNode && @@ -405,7 +404,7 @@ void CDeviceManager::UpdateToolbar() { State = TBSTATE_HIDDEN; } - SendMessageW(m_hToolBar, TB_SETSTATE, IDC_DISABLE_DRV, MAKELPARAM(State, 0)); + SendMessageW(m_hToolBar, TB_SETSTATE, IDM_DISABLE_DRV, MAKELPARAM(State, 0)); } bool @@ -541,22 +540,22 @@ CDeviceManager::OnNotify(_In_ LPARAM lParam) UINT_PTR idButton = lpttt->hdr.idFrom; switch (idButton) { - case IDC_PROPERTIES: + case IDM_PROPERTIES: lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_PROPERTIES); break; - case IDC_SCAN_HARDWARE: + case IDM_SCAN_HARDWARE: lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_SCAN); break; - case IDC_ENABLE_DRV: + case IDM_ENABLE_DRV: lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_ENABLE); break; - case IDC_DISABLE_DRV: + case IDM_DISABLE_DRV: lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_DISABLE); break; - case IDC_UPDATE_DRV: + case IDM_UPDATE_DRV: lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_UPDATE); break; - case IDC_UNINSTALL_DRV: + case IDM_UNINSTALL_DRV: lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_UNINSTALL); break; } @@ -585,19 +584,19 @@ CDeviceManager::OnCommand(_In_ WPARAM wParam, switch (Msg) { - case IDC_PROPERTIES: - case IDC_SCAN_HARDWARE: - case IDC_ENABLE_DRV: - case IDC_DISABLE_DRV: - case IDC_UPDATE_DRV: - case IDC_UNINSTALL_DRV: - case IDC_ADD_HARDWARE: + case IDM_PROPERTIES: + case IDM_SCAN_HARDWARE: + case IDM_ENABLE_DRV: + case IDM_DISABLE_DRV: + case IDM_UPDATE_DRV: + case IDM_UNINSTALL_DRV: + case IDM_ADD_HARDWARE: { m_DeviceView->OnAction(Msg); break; } - case IDC_ACTIONMENU: + case IDM_ACTIONMENU: { // Create a popup menu with all the actions for the selected node HMENU hMenu = CreatePopupMenu(); @@ -620,38 +619,38 @@ CDeviceManager::OnCommand(_In_ WPARAM wParam, break; } - case IDC_DEVBYTYPE: + case IDM_DEVBYTYPE: { RefreshView(DevicesByType, false); break; } - case IDC_DEVBYCONN: + case IDM_DEVBYCONN: { RefreshView(DevicesByConnection, false); break; } - case IDC_SHOWHIDDEN: + case IDM_SHOWHIDDEN: { // Get the current state - UINT CurCheckState = GetMenuState(m_hMenu, IDC_SHOWHIDDEN, MF_BYCOMMAND); + UINT CurCheckState = GetMenuState(m_hMenu, IDM_SHOWHIDDEN, MF_BYCOMMAND); if (CurCheckState == MF_CHECKED) { m_DeviceView->SetHiddenDevices(false); - CheckMenuItem(m_hMenu, IDC_SHOWHIDDEN, MF_BYCOMMAND | MF_UNCHECKED); + CheckMenuItem(m_hMenu, IDM_SHOWHIDDEN, MF_BYCOMMAND | MF_UNCHECKED); } else if (CurCheckState == MF_UNCHECKED) { m_DeviceView->SetHiddenDevices(true); - CheckMenuItem(m_hMenu, IDC_SHOWHIDDEN, MF_BYCOMMAND | MF_CHECKED); + CheckMenuItem(m_hMenu, IDM_SHOWHIDDEN, MF_BYCOMMAND | MF_CHECKED); } // Refresh the device view RefreshView(m_DeviceView->GetCurrentView(), false); break; } - case IDC_ABOUT: + case IDM_ABOUT: { // Apportion blame MessageBoxW(m_hMainWnd, @@ -664,7 +663,7 @@ CDeviceManager::OnCommand(_In_ WPARAM wParam, break; } - case IDC_EXIT: + case IDM_EXIT: { // Post a close message to the window PostMessageW(m_hMainWnd, diff --git a/dll/win32/devmgr/lang/bg-BG.rc b/dll/win32/devmgr/lang/bg-BG.rc index 2a6ceefa847..47ca6224d5d 100644 --- a/dll/win32/devmgr/lang/bg-BG.rc +++ b/dll/win32/devmgr/lang/bg-BG.rc @@ -247,29 +247,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/cs-CZ.rc b/dll/win32/devmgr/lang/cs-CZ.rc index 58584c3e0e0..e5f8a3903a0 100644 --- a/dll/win32/devmgr/lang/cs-CZ.rc +++ b/dll/win32/devmgr/lang/cs-CZ.rc @@ -251,29 +251,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Soubor" BEGIN - MENUITEM "U&končit", IDC_EXIT + MENUITEM "U&končit", IDM_EXIT END POPUP "Akce" BEGIN - MENUITEM "Vyhledat změny hardwaru", IDC_SCAN_HARDWARE - MENUITEM "Přidat hardware", IDC_ADD_HARDWARE + MENUITEM "Vyhledat změny hardwaru", IDM_SCAN_HARDWARE + MENUITEM "Přidat hardware", IDM_ADD_HARDWARE END POPUP "Zobrazit" BEGIN - MENUITEM "Zařízení podle typu", IDC_DEVBYTYPE - MENUITEM "Zařízení podle připojení", IDC_DEVBYCONN - MENUITEM "Prostředky podle typu", IDC_RESBYTYPE, GRAYED - MENUITEM "Prostředky podle připojení", IDC_RESBYCONN, GRAYED + MENUITEM "Zařízení podle typu", IDM_DEVBYTYPE + MENUITEM "Zařízení podle připojení", IDM_DEVBYCONN + MENUITEM "Prostředky podle typu", IDM_RESBYTYPE, GRAYED + MENUITEM "Prostředky podle připojení", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "SZobrazit skrytá zařízení", IDC_SHOWHIDDEN + MENUITEM "SZobrazit skrytá zařízení", IDM_SHOWHIDDEN END POPUP "Nápověda" BEGIN - MENUITEM "O programu", IDC_ABOUT + MENUITEM "O programu", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/de-DE.rc b/dll/win32/devmgr/lang/de-DE.rc index fdf4db49fe8..529044e83a5 100644 --- a/dll/win32/devmgr/lang/de-DE.rc +++ b/dll/win32/devmgr/lang/de-DE.rc @@ -248,29 +248,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Beenden", IDC_EXIT + MENUITEM "&Beenden", IDM_EXIT END POPUP "Ak&tion" BEGIN - MENUITEM "Nach geänderter Hardware suchen", IDC_SCAN_HARDWARE - MENUITEM "Hardware hinzufügen", IDC_ADD_HARDWARE + MENUITEM "Nach geänderter Hardware suchen", IDM_SCAN_HARDWARE + MENUITEM "Hardware hinzufügen", IDM_ADD_HARDWARE END POPUP "&Ansicht" BEGIN - MENUITEM "Geräte nach &Typ", IDC_DEVBYTYPE - MENUITEM "Garäte nach &Verbindung", IDC_DEVBYCONN - MENUITEM "Ressourcen nac&h Typ", IDC_RESBYTYPE, GRAYED - MENUITEM "Ressourcen nach V&erbindung", IDC_RESBYCONN, GRAYED + MENUITEM "Geräte nach &Typ", IDM_DEVBYTYPE + MENUITEM "Garäte nach &Verbindung", IDM_DEVBYCONN + MENUITEM "Ressourcen nac&h Typ", IDM_RESBYTYPE, GRAYED + MENUITEM "Ressourcen nach V&erbindung", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Ausgeblendete &Geräte anzeigen", IDC_SHOWHIDDEN + MENUITEM "Ausgeblendete &Geräte anzeigen", IDM_SHOWHIDDEN END POPUP "&Hilfe" BEGIN - MENUITEM "Ü&ber", IDC_ABOUT + MENUITEM "Ü&ber", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/el-GR.rc b/dll/win32/devmgr/lang/el-GR.rc index 1d655570890..8aabbd38839 100644 --- a/dll/win32/devmgr/lang/el-GR.rc +++ b/dll/win32/devmgr/lang/el-GR.rc @@ -248,29 +248,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/en-US.rc b/dll/win32/devmgr/lang/en-US.rc index ea212318e6c..faaadd6af82 100644 --- a/dll/win32/devmgr/lang/en-US.rc +++ b/dll/win32/devmgr/lang/en-US.rc @@ -245,29 +245,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "&Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "&View" BEGIN - MENUITEM "D&evices by type", IDC_DEVBYTYPE - MENUITEM "De&vices by connection", IDC_DEVBYCONN - MENUITEM "Resources by t&ype", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by co&nnection", IDC_RESBYCONN, GRAYED + MENUITEM "D&evices by type", IDM_DEVBYTYPE + MENUITEM "De&vices by connection", IDM_DEVBYCONN + MENUITEM "Resources by t&ype", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by co&nnection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Sho&w hidden devices", IDC_SHOWHIDDEN + MENUITEM "Sho&w hidden devices", IDM_SHOWHIDDEN END POPUP "&Help" BEGIN - MENUITEM "&About", IDC_ABOUT + MENUITEM "&About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/es-ES.rc b/dll/win32/devmgr/lang/es-ES.rc index 63b9d57aab4..1a011c8ba7c 100644 --- a/dll/win32/devmgr/lang/es-ES.rc +++ b/dll/win32/devmgr/lang/es-ES.rc @@ -255,29 +255,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Archivo" BEGIN - MENUITEM "&Salir", IDC_EXIT + MENUITEM "&Salir", IDM_EXIT END POPUP "Acción" BEGIN - MENUITEM "Buscar cambios de hardware", IDC_SCAN_HARDWARE - MENUITEM "Añadir dispositivos", IDC_ADD_HARDWARE + MENUITEM "Buscar cambios de hardware", IDM_SCAN_HARDWARE + MENUITEM "Añadir dispositivos", IDM_ADD_HARDWARE END POPUP "Ver" BEGIN - MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE - MENUITEM "Dispositivos por conexión", IDC_DEVBYCONN - MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED - MENUITEM "Recursos por conexión", IDC_RESBYCONN, GRAYED + MENUITEM "Dispositivos por tipo", IDM_DEVBYTYPE + MENUITEM "Dispositivos por conexión", IDM_DEVBYCONN + MENUITEM "Recursos por tipo", IDM_RESBYTYPE, GRAYED + MENUITEM "Recursos por conexión", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Mostrar dispositivos ocultos", IDC_SHOWHIDDEN + MENUITEM "Mostrar dispositivos ocultos", IDM_SHOWHIDDEN END POPUP "Ayuda" BEGIN - MENUITEM "Acerca de", IDC_ABOUT + MENUITEM "Acerca de", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/et-EE.rc b/dll/win32/devmgr/lang/et-EE.rc index e389d8c9c2e..498e86a6611 100644 --- a/dll/win32/devmgr/lang/et-EE.rc +++ b/dll/win32/devmgr/lang/et-EE.rc @@ -252,29 +252,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Fail" BEGIN - MENUITEM "&Välju", IDC_EXIT + MENUITEM "&Välju", IDM_EXIT END POPUP "&Toiming" BEGIN - MENUITEM "Otsi riistvaramuudatusi", IDC_SCAN_HARDWARE - MENUITEM "Lisa riistvara", IDC_ADD_HARDWARE + MENUITEM "Otsi riistvaramuudatusi", IDM_SCAN_HARDWARE + MENUITEM "Lisa riistvara", IDM_ADD_HARDWARE END POPUP "&Vaade" BEGIN - MENUITEM "Seadmed &tüübi järgi", IDC_DEVBYTYPE - MENUITEM "Seadmed &ühenduse järgi", IDC_DEVBYCONN - MENUITEM "R&essursid tüübi järgi", IDC_RESBYTYPE, GRAYED - MENUITEM "&Ressursid ühenduse järgi", IDC_RESBYCONN, GRAYED + MENUITEM "Seadmed &tüübi järgi", IDM_DEVBYTYPE + MENUITEM "Seadmed &ühenduse järgi", IDM_DEVBYCONN + MENUITEM "R&essursid tüübi järgi", IDM_RESBYTYPE, GRAYED + MENUITEM "&Ressursid ühenduse järgi", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "&Näita peidetud seadmeid", IDC_SHOWHIDDEN + MENUITEM "&Näita peidetud seadmeid", IDM_SHOWHIDDEN END POPUP "&Spikker" BEGIN - MENUITEM "&Teave", IDC_ABOUT + MENUITEM "&Teave", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/fr-FR.rc b/dll/win32/devmgr/lang/fr-FR.rc index 000a43d6b82..79c33bba606 100644 --- a/dll/win32/devmgr/lang/fr-FR.rc +++ b/dll/win32/devmgr/lang/fr-FR.rc @@ -247,29 +247,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Fichier" BEGIN - MENUITEM "&Quitter", IDC_EXIT + MENUITEM "&Quitter", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Vérifier les changements de matériel", IDC_SCAN_HARDWARE - MENUITEM "Ajouter un matériel", IDC_ADD_HARDWARE + MENUITEM "Vérifier les changements de matériel", IDM_SCAN_HARDWARE + MENUITEM "Ajouter un matériel", IDM_ADD_HARDWARE END POPUP "Vue" BEGIN - MENUITEM "Périphériques par type", IDC_DEVBYTYPE - MENUITEM "Périphériques par connexion", IDC_DEVBYCONN - MENUITEM "Ressources par type", IDC_RESBYTYPE, GRAYED - MENUITEM "Ressources par connexion", IDC_RESBYCONN, GRAYED + MENUITEM "Périphériques par type", IDM_DEVBYTYPE + MENUITEM "Périphériques par connexion", IDM_DEVBYCONN + MENUITEM "Ressources par type", IDM_RESBYTYPE, GRAYED + MENUITEM "Ressources par connexion", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Afficher les périphériques cachés", IDC_SHOWHIDDEN + MENUITEM "Afficher les périphériques cachés", IDM_SHOWHIDDEN END POPUP "Aide" BEGIN - MENUITEM "À propos", IDC_ABOUT + MENUITEM "À propos", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/he-IL.rc b/dll/win32/devmgr/lang/he-IL.rc index 9115a29851c..c8d0401390b 100644 --- a/dll/win32/devmgr/lang/he-IL.rc +++ b/dll/win32/devmgr/lang/he-IL.rc @@ -248,29 +248,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/hu-HU.rc b/dll/win32/devmgr/lang/hu-HU.rc index 43084284303..3e8f7f8443b 100644 --- a/dll/win32/devmgr/lang/hu-HU.rc +++ b/dll/win32/devmgr/lang/hu-HU.rc @@ -247,29 +247,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/id-ID.rc b/dll/win32/devmgr/lang/id-ID.rc index c3c426b85b8..a7d33717db7 100644 --- a/dll/win32/devmgr/lang/id-ID.rc +++ b/dll/win32/devmgr/lang/id-ID.rc @@ -248,29 +248,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "Be&rkas" BEGIN - MENUITEM "K&eluar", IDC_EXIT + MENUITEM "K&eluar", IDM_EXIT END POPUP "Ak&si" BEGIN - MENUITEM "Pindai perubahan perangkat keras", IDC_SCAN_HARDWARE - MENUITEM "Tambah perangkat keras", IDC_ADD_HARDWARE + MENUITEM "Pindai perubahan perangkat keras", IDM_SCAN_HARDWARE + MENUITEM "Tambah perangkat keras", IDM_ADD_HARDWARE END POPUP "Ta&mpilan" BEGIN - MENUITEM "Jenis perangkat", IDC_DEVBYTYPE - MENUITEM "Sambungan perangkat", IDC_DEVBYCONN - MENUITEM "Jenis sumber daya", IDC_RESBYTYPE, GRAYED - MENUITEM "Sambungan sumber daya", IDC_RESBYCONN, GRAYED + MENUITEM "Jenis perangkat", IDM_DEVBYTYPE + MENUITEM "Sambungan perangkat", IDM_DEVBYCONN + MENUITEM "Jenis sumber daya", IDM_RESBYTYPE, GRAYED + MENUITEM "Sambungan sumber daya", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Tunjukkan perangkat tersembunyi", IDC_SHOWHIDDEN + MENUITEM "Tunjukkan perangkat tersembunyi", IDM_SHOWHIDDEN END POPUP "&Bantuan" BEGIN - MENUITEM "Tentang", IDC_ABOUT + MENUITEM "Tentang", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/it-IT.rc b/dll/win32/devmgr/lang/it-IT.rc index fbd8b80096a..2920ecab544 100644 --- a/dll/win32/devmgr/lang/it-IT.rc +++ b/dll/win32/devmgr/lang/it-IT.rc @@ -249,29 +249,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/ja-JP.rc b/dll/win32/devmgr/lang/ja-JP.rc index 89427bb76e0..3ddfe6f5d50 100644 --- a/dll/win32/devmgr/lang/ja-JP.rc +++ b/dll/win32/devmgr/lang/ja-JP.rc @@ -245,29 +245,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "ファイル(&F)" BEGIN - MENUITEM "終了(&X)", IDC_EXIT + MENUITEM "終了(&X)", IDM_EXIT END POPUP "アクション(&A)" BEGIN - MENUITEM "ハードウェアの変更をスキャン", IDC_SCAN_HARDWARE - MENUITEM "ハードウェアを追加", IDC_ADD_HARDWARE + MENUITEM "ハードウェアの変更をスキャン", IDM_SCAN_HARDWARE + MENUITEM "ハードウェアを追加", IDM_ADD_HARDWARE END POPUP "表示(&V)" BEGIN - MENUITEM "種類別デバイス(&E)", IDC_DEVBYTYPE - MENUITEM "接続別デバイス(&V)", IDC_DEVBYCONN - MENUITEM "種類別リソース(&Y)", IDC_RESBYTYPE, GRAYED - MENUITEM "接続別リソース(&N)", IDC_RESBYCONN, GRAYED + MENUITEM "種類別デバイス(&E)", IDM_DEVBYTYPE + MENUITEM "接続別デバイス(&V)", IDM_DEVBYCONN + MENUITEM "種類別リソース(&Y)", IDM_RESBYTYPE, GRAYED + MENUITEM "接続別リソース(&N)", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "隠しデバイスを表示(&W)", IDC_SHOWHIDDEN + MENUITEM "隠しデバイスを表示(&W)", IDM_SHOWHIDDEN END POPUP "ヘルプ(&H)" BEGIN - MENUITEM "バージョン情報(&A)", IDC_ABOUT + MENUITEM "バージョン情報(&A)", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/no-NO.rc b/dll/win32/devmgr/lang/no-NO.rc index 62c75a5876f..f6ef8e0face 100644 --- a/dll/win32/devmgr/lang/no-NO.rc +++ b/dll/win32/devmgr/lang/no-NO.rc @@ -249,29 +249,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/pl-PL.rc b/dll/win32/devmgr/lang/pl-PL.rc index 62b3767ac24..e85ee6b6371 100644 --- a/dll/win32/devmgr/lang/pl-PL.rc +++ b/dll/win32/devmgr/lang/pl-PL.rc @@ -257,29 +257,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Plik" BEGIN - MENUITEM "Z&akończ", IDC_EXIT + MENUITEM "Z&akończ", IDM_EXIT END POPUP "Akcja" BEGIN - MENUITEM "Skanuj w poszukiwaniu zmian sprzętu", IDC_SCAN_HARDWARE - MENUITEM "Dodaj urządzenie", IDC_ADD_HARDWARE + MENUITEM "Skanuj w poszukiwaniu zmian sprzętu", IDM_SCAN_HARDWARE + MENUITEM "Dodaj urządzenie", IDM_ADD_HARDWARE END POPUP "Widok" BEGIN - MENUITEM "Urządzenia według typów", IDC_DEVBYTYPE - MENUITEM "Urządzenia według połączeń", IDC_DEVBYCONN - MENUITEM "Zasoby według typów", IDC_RESBYTYPE, GRAYED - MENUITEM "Zasoby według połączeń", IDC_RESBYCONN, GRAYED + MENUITEM "Urządzenia według typów", IDM_DEVBYTYPE + MENUITEM "Urządzenia według połączeń", IDM_DEVBYCONN + MENUITEM "Zasoby według typów", IDM_RESBYTYPE, GRAYED + MENUITEM "Zasoby według połączeń", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Pokaż ukryte urządzenia", IDC_SHOWHIDDEN + MENUITEM "Pokaż ukryte urządzenia", IDM_SHOWHIDDEN END POPUP "Pomoc" BEGIN - MENUITEM "Informacje", IDC_ABOUT + MENUITEM "Informacje", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/pt-BR.rc b/dll/win32/devmgr/lang/pt-BR.rc index bc9b1aad877..204129cee1b 100644 --- a/dll/win32/devmgr/lang/pt-BR.rc +++ b/dll/win32/devmgr/lang/pt-BR.rc @@ -249,29 +249,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/pt-PT.rc b/dll/win32/devmgr/lang/pt-PT.rc index dc0ddef30a5..55986eb0356 100644 --- a/dll/win32/devmgr/lang/pt-PT.rc +++ b/dll/win32/devmgr/lang/pt-PT.rc @@ -249,29 +249,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Ficheiro" BEGIN - MENUITEM "&Sair", IDC_EXIT + MENUITEM "&Sair", IDM_EXIT END POPUP "Acção" BEGIN - MENUITEM "Verificar alterações de hardware", IDC_SCAN_HARDWARE - MENUITEM "Adicionar hardware", IDC_ADD_HARDWARE + MENUITEM "Verificar alterações de hardware", IDM_SCAN_HARDWARE + MENUITEM "Adicionar hardware", IDM_ADD_HARDWARE END POPUP "Vista" BEGIN - MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE - MENUITEM "Dispositivos por ligação", IDC_DEVBYCONN - MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED - MENUITEM "Recursos por ligação", IDC_RESBYCONN, GRAYED + MENUITEM "Dispositivos por tipo", IDM_DEVBYTYPE + MENUITEM "Dispositivos por ligação", IDM_DEVBYCONN + MENUITEM "Recursos por tipo", IDM_RESBYTYPE, GRAYED + MENUITEM "Recursos por ligação", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Mostrardispositivos ocultos", IDC_SHOWHIDDEN + MENUITEM "Mostrardispositivos ocultos", IDM_SHOWHIDDEN END POPUP "Ajuda" BEGIN - MENUITEM "Acerca de", IDC_ABOUT + MENUITEM "Acerca de", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/ro-RO.rc b/dll/win32/devmgr/lang/ro-RO.rc index c3ef7dfc7cf..c5fd765ac33 100644 --- a/dll/win32/devmgr/lang/ro-RO.rc +++ b/dll/win32/devmgr/lang/ro-RO.rc @@ -252,29 +252,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Fișier" BEGIN - MENUITEM "I&eșire", IDC_EXIT + MENUITEM "I&eșire", IDM_EXIT END POPUP "A&cțiune" BEGIN - MENUITEM "Scanează configurația fizică", IDC_SCAN_HARDWARE - MENUITEM "Adăugare dispozitiv…", IDC_ADD_HARDWARE + MENUITEM "Scanează configurația fizică", IDM_SCAN_HARDWARE + MENUITEM "Adăugare dispozitiv…", IDM_ADD_HARDWARE END POPUP "&Afișare" BEGIN - MENUITEM "Dispozitive după tip", IDC_DEVBYTYPE - MENUITEM "Dispozitive după conexiune", IDC_DEVBYCONN - MENUITEM "Resurse după tip", IDC_RESBYTYPE, GRAYED - MENUITEM "Resurse după conexiune", IDC_RESBYCONN, GRAYED + MENUITEM "Dispozitive după tip", IDM_DEVBYTYPE + MENUITEM "Dispozitive după conexiune", IDM_DEVBYCONN + MENUITEM "Resurse după tip", IDM_RESBYTYPE, GRAYED + MENUITEM "Resurse după conexiune", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Dispozitive ascunse", IDC_SHOWHIDDEN + MENUITEM "Dispozitive ascunse", IDM_SHOWHIDDEN END POPUP "Aj&utor" BEGIN - MENUITEM "&Despre", IDC_ABOUT + MENUITEM "&Despre", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/ru-RU.rc b/dll/win32/devmgr/lang/ru-RU.rc index a7d32a7683c..0c0612f76d4 100644 --- a/dll/win32/devmgr/lang/ru-RU.rc +++ b/dll/win32/devmgr/lang/ru-RU.rc @@ -248,29 +248,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Файл" BEGIN - MENUITEM "В&ыход", IDC_EXIT + MENUITEM "В&ыход", IDM_EXIT END POPUP "&Действие" BEGIN - MENUITEM "О&бновить конфигурацию оборудования", IDC_SCAN_HARDWARE - MENUITEM "&Добавить устройство", IDC_ADD_HARDWARE + MENUITEM "О&бновить конфигурацию оборудования", IDM_SCAN_HARDWARE + MENUITEM "&Добавить устройство", IDM_ADD_HARDWARE END POPUP "&Вид" BEGIN - MENUITEM "&Устройства по типу", IDC_DEVBYTYPE - MENUITEM "Устройства по под&ключению", IDC_DEVBYCONN - MENUITEM "&Ресурсы по типу", IDC_RESBYTYPE, GRAYED - MENUITEM "Ресурсы по подк&лючению", IDC_RESBYCONN, GRAYED + MENUITEM "&Устройства по типу", IDM_DEVBYTYPE + MENUITEM "Устройства по под&ключению", IDM_DEVBYCONN + MENUITEM "&Ресурсы по типу", IDM_RESBYTYPE, GRAYED + MENUITEM "Ресурсы по подк&лючению", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Показать &скрытые устройства", IDC_SHOWHIDDEN + MENUITEM "Показать &скрытые устройства", IDM_SHOWHIDDEN END POPUP "&Справка" BEGIN - MENUITEM "О &программе...", IDC_ABOUT + MENUITEM "О &программе...", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/sk-SK.rc b/dll/win32/devmgr/lang/sk-SK.rc index 6b97c802ae5..c41ee067209 100644 --- a/dll/win32/devmgr/lang/sk-SK.rc +++ b/dll/win32/devmgr/lang/sk-SK.rc @@ -251,29 +251,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/sq-AL.rc b/dll/win32/devmgr/lang/sq-AL.rc index fd39e72e8d1..84cfc841ff1 100644 --- a/dll/win32/devmgr/lang/sq-AL.rc +++ b/dll/win32/devmgr/lang/sq-AL.rc @@ -250,29 +250,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/tr-TR.rc b/dll/win32/devmgr/lang/tr-TR.rc index 48da09e72ec..9af97e2193c 100644 --- a/dll/win32/devmgr/lang/tr-TR.rc +++ b/dll/win32/devmgr/lang/tr-TR.rc @@ -248,29 +248,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Kütük" BEGIN - MENUITEM "&Çıkış", IDC_EXIT + MENUITEM "&Çıkış", IDM_EXIT END POPUP "&Eylem" BEGIN - MENUITEM "Donanım Değişiklikleri İçin Tara", IDC_SCAN_HARDWARE - MENUITEM "Donanım Ekle", IDC_ADD_HARDWARE + MENUITEM "Donanım Değişiklikleri İçin Tara", IDM_SCAN_HARDWARE + MENUITEM "Donanım Ekle", IDM_ADD_HARDWARE END POPUP "&Görünüm" BEGIN - MENUITEM "&Türe Göre Aygıtlar", IDC_DEVBYTYPE - MENUITEM "&Bağlantıya Göre Aygıtlar", IDC_DEVBYCONN - MENUITEM "T&üre Göre Kaynaklar", IDC_RESBYTYPE, GRAYED - MENUITEM "B&ağlantıya Göre Kaynaklar", IDC_RESBYCONN, GRAYED + MENUITEM "&Türe Göre Aygıtlar", IDM_DEVBYTYPE + MENUITEM "&Bağlantıya Göre Aygıtlar", IDM_DEVBYCONN + MENUITEM "T&üre Göre Kaynaklar", IDM_RESBYTYPE, GRAYED + MENUITEM "B&ağlantıya Göre Kaynaklar", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "&Gizli Aygıtları Göster", IDC_SHOWHIDDEN + MENUITEM "&Gizli Aygıtları Göster", IDM_SHOWHIDDEN END POPUP "&Yardım" BEGIN - MENUITEM "&Üzerine", IDC_ABOUT + MENUITEM "&Üzerine", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/uk-UA.rc b/dll/win32/devmgr/lang/uk-UA.rc index 9806950d168..eb8b5ba55b3 100644 --- a/dll/win32/devmgr/lang/uk-UA.rc +++ b/dll/win32/devmgr/lang/uk-UA.rc @@ -258,25 +258,25 @@ IDR_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/zh-CN.rc b/dll/win32/devmgr/lang/zh-CN.rc index cb9d47e0e41..b4bd5e427b3 100644 --- a/dll/win32/devmgr/lang/zh-CN.rc +++ b/dll/win32/devmgr/lang/zh-CN.rc @@ -251,25 +251,25 @@ IDR_MAINMENU MENU BEGIN POPUP "文件(&F)" BEGIN - MENUITEM "关闭(&X)", IDC_EXIT + MENUITEM "关闭(&X)", IDM_EXIT END POPUP "行动" BEGIN - MENUITEM "扫描检测硬件改动", IDC_SCAN_HARDWARE - MENUITEM "添加硬件", IDC_ADD_HARDWARE + MENUITEM "扫描检测硬件改动", IDM_SCAN_HARDWARE + MENUITEM "添加硬件", IDM_ADD_HARDWARE END POPUP "视图" BEGIN - MENUITEM "按类型设备", IDC_DEVBYTYPE - MENUITEM "依连接排序设备", IDC_DEVBYCONN - MENUITEM "依类型排序资源", IDC_RESBYTYPE, GRAYED - MENUITEM "依连接排序资源", IDC_RESBYCONN, GRAYED + MENUITEM "按类型设备", IDM_DEVBYTYPE + MENUITEM "依连接排序设备", IDM_DEVBYCONN + MENUITEM "依类型排序资源", IDM_RESBYTYPE, GRAYED + MENUITEM "依连接排序资源", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "显示隐藏的设备", IDC_SHOWHIDDEN + MENUITEM "显示隐藏的设备", IDM_SHOWHIDDEN END POPUP "帮助" BEGIN - MENUITEM "关于", IDC_ABOUT + MENUITEM "关于", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/zh-TW.rc b/dll/win32/devmgr/lang/zh-TW.rc index 6cc83d3b1b0..31af160a308 100644 --- a/dll/win32/devmgr/lang/zh-TW.rc +++ b/dll/win32/devmgr/lang/zh-TW.rc @@ -247,29 +247,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "檔案(&F)" BEGIN - MENUITEM "關閉(&X)", IDC_EXIT + MENUITEM "關閉(&X)", IDM_EXIT END POPUP "行動" BEGIN - MENUITEM "掃描檢測硬體改動", IDC_SCAN_HARDWARE - MENUITEM "添加硬體", IDC_ADD_HARDWARE + MENUITEM "掃描檢測硬體改動", IDM_SCAN_HARDWARE + MENUITEM "添加硬體", IDM_ADD_HARDWARE END POPUP "檢視" BEGIN - MENUITEM "按類型裝置", IDC_DEVBYTYPE - MENUITEM "依連線排序裝置", IDC_DEVBYCONN - MENUITEM "依類型排序資源", IDC_RESBYTYPE, GRAYED - MENUITEM "依連線排序資源", IDC_RESBYCONN, GRAYED + MENUITEM "按類型裝置", IDM_DEVBYTYPE + MENUITEM "依連線排序裝置", IDM_DEVBYCONN + MENUITEM "依類型排序資源", IDM_RESBYTYPE, GRAYED + MENUITEM "依連線排序資源", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "顯示隱藏的裝置", IDC_SHOWHIDDEN + MENUITEM "顯示隱藏的裝置", IDM_SHOWHIDDEN END POPUP "說明" BEGIN - MENUITEM "關於", IDC_ABOUT + MENUITEM "關於", IDM_ABOUT END END diff --git a/dll/win32/devmgr/resource.h b/dll/win32/devmgr/resource.h index 70894a2d0b7..bdb4c460718 100644 --- a/dll/win32/devmgr/resource.h +++ b/dll/win32/devmgr/resource.h @@ -12,30 +12,32 @@ #define IDC_TREEVIEW 30 #define IDC_TOOLBAR 31 #define IDC_STATUSBAR 32 -#define IDR_MAINMENU 33 -#define IDR_POPUP 34 + +/* Menus */ +#define IDM_MAINMENU 33 +#define IDM_POPUP 34 /* Actions */ -#define IDC_PROPERTIES 40 -#define IDC_SCAN_HARDWARE 41 -#define IDC_ENABLE_DRV 42 -#define IDC_DISABLE_DRV 43 -#define IDC_UPDATE_DRV 44 -#define IDC_UNINSTALL_DRV 45 -#define IDC_ADD_HARDWARE 46 +#define IDM_PROPERTIES 40 +#define IDM_SCAN_HARDWARE 41 +#define IDM_ENABLE_DRV 42 +#define IDM_DISABLE_DRV 43 +#define IDM_UPDATE_DRV 44 +#define IDM_UNINSTALL_DRV 45 +#define IDM_ADD_HARDWARE 46 /* Menu items */ -#define IDC_ACTIONMENU 50 -#define IDC_ABOUT 51 -#define IDC_EXIT 52 +#define IDM_ACTIONMENU 50 +#define IDM_ABOUT 51 +#define IDM_EXIT 52 /* view menu */ -#define IDC_DEVBYTYPE 60 -#define IDC_DEVBYCONN 61 -#define IDC_RESBYTYPE 62 -#define IDC_RESBYCONN 63 -#define IDC_SHOWHIDDEN 64 +#define IDM_DEVBYTYPE 60 +#define IDM_DEVBYCONN 61 +#define IDM_RESBYTYPE 62 +#define IDM_RESBYCONN 63 +#define IDM_SHOWHIDDEN 64 /* tooltips */ @@ -231,7 +233,7 @@ #define IDC_LOCATION 0x588 #define IDC_STATUS 0x586 #define IDC_TROUBLESHOOT 0x589 -#define IDC_PROPERTIES2 0x58A +#define IDC_PROPERTIES 0x58A #define IDC_DEVUSAGELABEL 0x58B #define IDC_DEVPROBLEM 0x58C #define IDC_DRVPROVIDER 0x58D

5 years, 4 months

[reactos] 01/01: [DEVMGR] Fix the indentation of the menu resources. No code changes!

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38d3c4d8da72cbfb467fb… commit 38d3c4d8da72cbfb467fbe870f6b75a4147ff9ce Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 3 16:37:54 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 3 16:37:54 2019 +0200 [DEVMGR] Fix the indentation of the menu resources. No code changes! --- dll/win32/devmgr/lang/bg-BG.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/cs-CZ.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/de-DE.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/el-GR.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/en-US.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/es-ES.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/et-EE.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/fr-FR.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/he-IL.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/hu-HU.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/id-ID.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/it-IT.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/ja-JP.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/no-NO.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/pl-PL.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/pt-BR.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/pt-PT.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/ro-RO.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/ru-RU.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/sk-SK.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/sq-AL.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/tr-TR.rc | 45 +++++++++++++++++++++--------------------- dll/win32/devmgr/lang/uk-UA.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/zh-CN.rc | 44 ++++++++++++++++++++--------------------- dll/win32/devmgr/lang/zh-TW.rc | 44 ++++++++++++++++++++--------------------- 25 files changed, 551 insertions(+), 550 deletions(-) diff --git a/dll/win32/devmgr/lang/bg-BG.rc b/dll/win32/devmgr/lang/bg-BG.rc index 6b66f97d559..2a6ceefa847 100644 --- a/dll/win32/devmgr/lang/bg-BG.rc +++ b/dll/win32/devmgr/lang/bg-BG.rc @@ -249,28 +249,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", IDC_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE - END - POPUP "View" - BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN - END - POPUP "Help" - BEGIN - MENUITEM "About", IDC_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END + POPUP "View" + BEGIN + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + END + POPUP "Help" + BEGIN + MENUITEM "About", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/cs-CZ.rc b/dll/win32/devmgr/lang/cs-CZ.rc index 97fdb17e8b5..58584c3e0e0 100644 --- a/dll/win32/devmgr/lang/cs-CZ.rc +++ b/dll/win32/devmgr/lang/cs-CZ.rc @@ -253,28 +253,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&Soubor" - BEGIN - MENUITEM "U&končit", IDC_EXIT - END - POPUP "Akce" - BEGIN - MENUITEM "Vyhledat změny hardwaru", IDC_SCAN_HARDWARE - MENUITEM "Přidat hardware", IDC_ADD_HARDWARE - END - POPUP "Zobrazit" - BEGIN - MENUITEM "Zařízení podle typu", IDC_DEVBYTYPE - MENUITEM "Zařízení podle připojení", IDC_DEVBYCONN - MENUITEM "Prostředky podle typu", IDC_RESBYTYPE, GRAYED - MENUITEM "Prostředky podle připojení", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "SZobrazit skrytá zařízení", IDC_SHOWHIDDEN - END - POPUP "Nápověda" - BEGIN - MENUITEM "O programu", IDC_ABOUT - END + POPUP "&Soubor" + BEGIN + MENUITEM "U&končit", IDC_EXIT + END + POPUP "Akce" + BEGIN + MENUITEM "Vyhledat změny hardwaru", IDC_SCAN_HARDWARE + MENUITEM "Přidat hardware", IDC_ADD_HARDWARE + END + POPUP "Zobrazit" + BEGIN + MENUITEM "Zařízení podle typu", IDC_DEVBYTYPE + MENUITEM "Zařízení podle připojení", IDC_DEVBYCONN + MENUITEM "Prostředky podle typu", IDC_RESBYTYPE, GRAYED + MENUITEM "Prostředky podle připojení", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "SZobrazit skrytá zařízení", IDC_SHOWHIDDEN + END + POPUP "Nápověda" + BEGIN + MENUITEM "O programu", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/de-DE.rc b/dll/win32/devmgr/lang/de-DE.rc index 97790767f31..fdf4db49fe8 100644 --- a/dll/win32/devmgr/lang/de-DE.rc +++ b/dll/win32/devmgr/lang/de-DE.rc @@ -250,28 +250,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&Datei" - BEGIN - MENUITEM "&Beenden", IDC_EXIT - END - POPUP "Ak&tion" - BEGIN - MENUITEM "Nach geänderter Hardware suchen", IDC_SCAN_HARDWARE - MENUITEM "Hardware hinzufügen", IDC_ADD_HARDWARE - END - POPUP "&Ansicht" - BEGIN - MENUITEM "Geräte nach &Typ", IDC_DEVBYTYPE - MENUITEM "Garäte nach &Verbindung", IDC_DEVBYCONN - MENUITEM "Ressourcen nac&h Typ", IDC_RESBYTYPE, GRAYED - MENUITEM "Ressourcen nach V&erbindung", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ausgeblendete &Geräte anzeigen", IDC_SHOWHIDDEN - END - POPUP "&Hilfe" - BEGIN - MENUITEM "Ü&ber", IDC_ABOUT - END + POPUP "&Datei" + BEGIN + MENUITEM "&Beenden", IDC_EXIT + END + POPUP "Ak&tion" + BEGIN + MENUITEM "Nach geänderter Hardware suchen", IDC_SCAN_HARDWARE + MENUITEM "Hardware hinzufügen", IDC_ADD_HARDWARE + END + POPUP "&Ansicht" + BEGIN + MENUITEM "Geräte nach &Typ", IDC_DEVBYTYPE + MENUITEM "Garäte nach &Verbindung", IDC_DEVBYCONN + MENUITEM "Ressourcen nac&h Typ", IDC_RESBYTYPE, GRAYED + MENUITEM "Ressourcen nach V&erbindung", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Ausgeblendete &Geräte anzeigen", IDC_SHOWHIDDEN + END + POPUP "&Hilfe" + BEGIN + MENUITEM "Ü&ber", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/el-GR.rc b/dll/win32/devmgr/lang/el-GR.rc index 9b33fdf7e1d..1d655570890 100644 --- a/dll/win32/devmgr/lang/el-GR.rc +++ b/dll/win32/devmgr/lang/el-GR.rc @@ -250,28 +250,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", IDC_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE - END - POPUP "View" - BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN - END - POPUP "Help" - BEGIN - MENUITEM "About", IDC_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END + POPUP "View" + BEGIN + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + END + POPUP "Help" + BEGIN + MENUITEM "About", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/en-US.rc b/dll/win32/devmgr/lang/en-US.rc index cbc49c1028f..ea212318e6c 100644 --- a/dll/win32/devmgr/lang/en-US.rc +++ b/dll/win32/devmgr/lang/en-US.rc @@ -247,28 +247,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", IDC_EXIT - END - POPUP "&Action" - BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE - END - POPUP "&View" - BEGIN - MENUITEM "D&evices by type", IDC_DEVBYTYPE - MENUITEM "De&vices by connection", IDC_DEVBYCONN - MENUITEM "Resources by t&ype", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by co&nnection", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Sho&w hidden devices", IDC_SHOWHIDDEN - END - POPUP "&Help" - BEGIN - MENUITEM "&About", IDC_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + POPUP "&Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END + POPUP "&View" + BEGIN + MENUITEM "D&evices by type", IDC_DEVBYTYPE + MENUITEM "De&vices by connection", IDC_DEVBYCONN + MENUITEM "Resources by t&ype", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by co&nnection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Sho&w hidden devices", IDC_SHOWHIDDEN + END + POPUP "&Help" + BEGIN + MENUITEM "&About", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/es-ES.rc b/dll/win32/devmgr/lang/es-ES.rc index 578401b75db..63b9d57aab4 100644 --- a/dll/win32/devmgr/lang/es-ES.rc +++ b/dll/win32/devmgr/lang/es-ES.rc @@ -257,28 +257,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "&Salir", IDC_EXIT - END - POPUP "Acción" - BEGIN - MENUITEM "Buscar cambios de hardware", IDC_SCAN_HARDWARE - MENUITEM "Añadir dispositivos", IDC_ADD_HARDWARE - END - POPUP "Ver" - BEGIN - MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE - MENUITEM "Dispositivos por conexión", IDC_DEVBYCONN - MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED - MENUITEM "Recursos por conexión", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Mostrar dispositivos ocultos", IDC_SHOWHIDDEN - END - POPUP "Ayuda" - BEGIN - MENUITEM "Acerca de", IDC_ABOUT - END + POPUP "&Archivo" + BEGIN + MENUITEM "&Salir", IDC_EXIT + END + POPUP "Acción" + BEGIN + MENUITEM "Buscar cambios de hardware", IDC_SCAN_HARDWARE + MENUITEM "Añadir dispositivos", IDC_ADD_HARDWARE + END + POPUP "Ver" + BEGIN + MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE + MENUITEM "Dispositivos por conexión", IDC_DEVBYCONN + MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED + MENUITEM "Recursos por conexión", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Mostrar dispositivos ocultos", IDC_SHOWHIDDEN + END + POPUP "Ayuda" + BEGIN + MENUITEM "Acerca de", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/et-EE.rc b/dll/win32/devmgr/lang/et-EE.rc index 081b8d11da5..e389d8c9c2e 100644 --- a/dll/win32/devmgr/lang/et-EE.rc +++ b/dll/win32/devmgr/lang/et-EE.rc @@ -254,28 +254,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&Fail" - BEGIN - MENUITEM "&Välju", IDC_EXIT - END - POPUP "&Toiming" - BEGIN - MENUITEM "Otsi riistvaramuudatusi", IDC_SCAN_HARDWARE - MENUITEM "Lisa riistvara", IDC_ADD_HARDWARE - END - POPUP "&Vaade" - BEGIN - MENUITEM "Seadmed &tüübi järgi", IDC_DEVBYTYPE - MENUITEM "Seadmed &ühenduse järgi", IDC_DEVBYCONN - MENUITEM "R&essursid tüübi järgi", IDC_RESBYTYPE, GRAYED - MENUITEM "&Ressursid ühenduse järgi", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Näita peidetud seadmeid", IDC_SHOWHIDDEN - END - POPUP "&Spikker" - BEGIN - MENUITEM "&Teave", IDC_ABOUT - END + POPUP "&Fail" + BEGIN + MENUITEM "&Välju", IDC_EXIT + END + POPUP "&Toiming" + BEGIN + MENUITEM "Otsi riistvaramuudatusi", IDC_SCAN_HARDWARE + MENUITEM "Lisa riistvara", IDC_ADD_HARDWARE + END + POPUP "&Vaade" + BEGIN + MENUITEM "Seadmed &tüübi järgi", IDC_DEVBYTYPE + MENUITEM "Seadmed &ühenduse järgi", IDC_DEVBYCONN + MENUITEM "R&essursid tüübi järgi", IDC_RESBYTYPE, GRAYED + MENUITEM "&Ressursid ühenduse järgi", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Näita peidetud seadmeid", IDC_SHOWHIDDEN + END + POPUP "&Spikker" + BEGIN + MENUITEM "&Teave", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/fr-FR.rc b/dll/win32/devmgr/lang/fr-FR.rc index b4c8658e7d5..000a43d6b82 100644 --- a/dll/win32/devmgr/lang/fr-FR.rc +++ b/dll/win32/devmgr/lang/fr-FR.rc @@ -249,28 +249,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&Fichier" - BEGIN - MENUITEM "&Quitter", IDC_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Vérifier les changements de matériel", IDC_SCAN_HARDWARE - MENUITEM "Ajouter un matériel", IDC_ADD_HARDWARE - END - POPUP "Vue" - BEGIN - MENUITEM "Périphériques par type", IDC_DEVBYTYPE - MENUITEM "Périphériques par connexion", IDC_DEVBYCONN - MENUITEM "Ressources par type", IDC_RESBYTYPE, GRAYED - MENUITEM "Ressources par connexion", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Afficher les périphériques cachés", IDC_SHOWHIDDEN - END - POPUP "Aide" - BEGIN - MENUITEM "À propos", IDC_ABOUT - END + POPUP "&Fichier" + BEGIN + MENUITEM "&Quitter", IDC_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Vérifier les changements de matériel", IDC_SCAN_HARDWARE + MENUITEM "Ajouter un matériel", IDC_ADD_HARDWARE + END + POPUP "Vue" + BEGIN + MENUITEM "Périphériques par type", IDC_DEVBYTYPE + MENUITEM "Périphériques par connexion", IDC_DEVBYCONN + MENUITEM "Ressources par type", IDC_RESBYTYPE, GRAYED + MENUITEM "Ressources par connexion", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Afficher les périphériques cachés", IDC_SHOWHIDDEN + END + POPUP "Aide" + BEGIN + MENUITEM "À propos", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/he-IL.rc b/dll/win32/devmgr/lang/he-IL.rc index 9a8ce7a7560..9115a29851c 100644 --- a/dll/win32/devmgr/lang/he-IL.rc +++ b/dll/win32/devmgr/lang/he-IL.rc @@ -250,28 +250,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", IDC_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE - END - POPUP "View" - BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN - END - POPUP "Help" - BEGIN - MENUITEM "About", IDC_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END + POPUP "View" + BEGIN + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + END + POPUP "Help" + BEGIN + MENUITEM "About", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/hu-HU.rc b/dll/win32/devmgr/lang/hu-HU.rc index 7bb8acf0a6e..43084284303 100644 --- a/dll/win32/devmgr/lang/hu-HU.rc +++ b/dll/win32/devmgr/lang/hu-HU.rc @@ -249,28 +249,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", IDC_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE - END - POPUP "View" - BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN - END - POPUP "Help" - BEGIN - MENUITEM "About", IDC_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END + POPUP "View" + BEGIN + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + END + POPUP "Help" + BEGIN + MENUITEM "About", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/id-ID.rc b/dll/win32/devmgr/lang/id-ID.rc index 5492df9a755..c3c426b85b8 100644 --- a/dll/win32/devmgr/lang/id-ID.rc +++ b/dll/win32/devmgr/lang/id-ID.rc @@ -250,28 +250,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "Be&rkas" - BEGIN - MENUITEM "K&eluar", IDC_EXIT - END - POPUP "Ak&si" - BEGIN - MENUITEM "Pindai perubahan perangkat keras", IDC_SCAN_HARDWARE - MENUITEM "Tambah perangkat keras", IDC_ADD_HARDWARE - END - POPUP "Ta&mpilan" - BEGIN - MENUITEM "Jenis perangkat", IDC_DEVBYTYPE - MENUITEM "Sambungan perangkat", IDC_DEVBYCONN - MENUITEM "Jenis sumber daya", IDC_RESBYTYPE, GRAYED - MENUITEM "Sambungan sumber daya", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Tunjukkan perangkat tersembunyi", IDC_SHOWHIDDEN - END - POPUP "&Bantuan" - BEGIN - MENUITEM "Tentang", IDC_ABOUT - END + POPUP "Be&rkas" + BEGIN + MENUITEM "K&eluar", IDC_EXIT + END + POPUP "Ak&si" + BEGIN + MENUITEM "Pindai perubahan perangkat keras", IDC_SCAN_HARDWARE + MENUITEM "Tambah perangkat keras", IDC_ADD_HARDWARE + END + POPUP "Ta&mpilan" + BEGIN + MENUITEM "Jenis perangkat", IDC_DEVBYTYPE + MENUITEM "Sambungan perangkat", IDC_DEVBYCONN + MENUITEM "Jenis sumber daya", IDC_RESBYTYPE, GRAYED + MENUITEM "Sambungan sumber daya", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Tunjukkan perangkat tersembunyi", IDC_SHOWHIDDEN + END + POPUP "&Bantuan" + BEGIN + MENUITEM "Tentang", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/it-IT.rc b/dll/win32/devmgr/lang/it-IT.rc index 3c920c200f5..fbd8b80096a 100644 --- a/dll/win32/devmgr/lang/it-IT.rc +++ b/dll/win32/devmgr/lang/it-IT.rc @@ -251,28 +251,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", IDC_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE - END - POPUP "View" - BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN - END - POPUP "Help" - BEGIN - MENUITEM "About", IDC_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END + POPUP "View" + BEGIN + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + END + POPUP "Help" + BEGIN + MENUITEM "About", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/ja-JP.rc b/dll/win32/devmgr/lang/ja-JP.rc index f066fa93fb0..89427bb76e0 100644 --- a/dll/win32/devmgr/lang/ja-JP.rc +++ b/dll/win32/devmgr/lang/ja-JP.rc @@ -247,28 +247,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "ファイル(&F)" - BEGIN - MENUITEM "終了(&X)", IDC_EXIT - END - POPUP "アクション(&A)" - BEGIN - MENUITEM "ハードウェアの変更をスキャン", IDC_SCAN_HARDWARE - MENUITEM "ハードウェアを追加", IDC_ADD_HARDWARE - END - POPUP "表示(&V)" - BEGIN - MENUITEM "種類別デバイス(&E)", IDC_DEVBYTYPE - MENUITEM "接続別デバイス(&V)", IDC_DEVBYCONN - MENUITEM "種類別リソース(&Y)", IDC_RESBYTYPE, GRAYED - MENUITEM "接続別リソース(&N)", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "隠しデバイスを表示(&W)", IDC_SHOWHIDDEN - END - POPUP "ヘルプ(&H)" - BEGIN - MENUITEM "バージョン情報(&A)", IDC_ABOUT - END + POPUP "ファイル(&F)" + BEGIN + MENUITEM "終了(&X)", IDC_EXIT + END + POPUP "アクション(&A)" + BEGIN + MENUITEM "ハードウェアの変更をスキャン", IDC_SCAN_HARDWARE + MENUITEM "ハードウェアを追加", IDC_ADD_HARDWARE + END + POPUP "表示(&V)" + BEGIN + MENUITEM "種類別デバイス(&E)", IDC_DEVBYTYPE + MENUITEM "接続別デバイス(&V)", IDC_DEVBYCONN + MENUITEM "種類別リソース(&Y)", IDC_RESBYTYPE, GRAYED + MENUITEM "接続別リソース(&N)", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "隠しデバイスを表示(&W)", IDC_SHOWHIDDEN + END + POPUP "ヘルプ(&H)" + BEGIN + MENUITEM "バージョン情報(&A)", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/no-NO.rc b/dll/win32/devmgr/lang/no-NO.rc index 6025a692817..62c75a5876f 100644 --- a/dll/win32/devmgr/lang/no-NO.rc +++ b/dll/win32/devmgr/lang/no-NO.rc @@ -251,28 +251,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", IDC_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE - END - POPUP "View" - BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN - END - POPUP "Help" - BEGIN - MENUITEM "About", IDC_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END + POPUP "View" + BEGIN + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + END + POPUP "Help" + BEGIN + MENUITEM "About", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/pl-PL.rc b/dll/win32/devmgr/lang/pl-PL.rc index 3715b6e9b90..62b3767ac24 100644 --- a/dll/win32/devmgr/lang/pl-PL.rc +++ b/dll/win32/devmgr/lang/pl-PL.rc @@ -259,28 +259,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&Plik" - BEGIN - MENUITEM "Z&akończ", IDC_EXIT - END - POPUP "Akcja" - BEGIN - MENUITEM "Skanuj w poszukiwaniu zmian sprzętu", IDC_SCAN_HARDWARE - MENUITEM "Dodaj urządzenie", IDC_ADD_HARDWARE - END - POPUP "Widok" - BEGIN - MENUITEM "Urządzenia według typów", IDC_DEVBYTYPE - MENUITEM "Urządzenia według połączeń", IDC_DEVBYCONN - MENUITEM "Zasoby według typów", IDC_RESBYTYPE, GRAYED - MENUITEM "Zasoby według połączeń", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pokaż ukryte urządzenia", IDC_SHOWHIDDEN - END - POPUP "Pomoc" - BEGIN - MENUITEM "Informacje", IDC_ABOUT - END + POPUP "&Plik" + BEGIN + MENUITEM "Z&akończ", IDC_EXIT + END + POPUP "Akcja" + BEGIN + MENUITEM "Skanuj w poszukiwaniu zmian sprzętu", IDC_SCAN_HARDWARE + MENUITEM "Dodaj urządzenie", IDC_ADD_HARDWARE + END + POPUP "Widok" + BEGIN + MENUITEM "Urządzenia według typów", IDC_DEVBYTYPE + MENUITEM "Urządzenia według połączeń", IDC_DEVBYCONN + MENUITEM "Zasoby według typów", IDC_RESBYTYPE, GRAYED + MENUITEM "Zasoby według połączeń", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Pokaż ukryte urządzenia", IDC_SHOWHIDDEN + END + POPUP "Pomoc" + BEGIN + MENUITEM "Informacje", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/pt-BR.rc b/dll/win32/devmgr/lang/pt-BR.rc index 7b2b100eae0..bc9b1aad877 100644 --- a/dll/win32/devmgr/lang/pt-BR.rc +++ b/dll/win32/devmgr/lang/pt-BR.rc @@ -251,28 +251,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", IDC_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE - END - POPUP "View" - BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN - END - POPUP "Help" - BEGIN - MENUITEM "About", IDC_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END + POPUP "View" + BEGIN + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + END + POPUP "Help" + BEGIN + MENUITEM "About", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/pt-PT.rc b/dll/win32/devmgr/lang/pt-PT.rc index 70930cbc69f..dc0ddef30a5 100644 --- a/dll/win32/devmgr/lang/pt-PT.rc +++ b/dll/win32/devmgr/lang/pt-PT.rc @@ -251,28 +251,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&Ficheiro" - BEGIN - MENUITEM "&Sair", IDC_EXIT - END - POPUP "Acção" - BEGIN - MENUITEM "Verificar alterações de hardware", IDC_SCAN_HARDWARE - MENUITEM "Adicionar hardware", IDC_ADD_HARDWARE - END - POPUP "Vista" - BEGIN - MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE - MENUITEM "Dispositivos por ligação", IDC_DEVBYCONN - MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED - MENUITEM "Recursos por ligação", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Mostrardispositivos ocultos", IDC_SHOWHIDDEN - END - POPUP "Ajuda" - BEGIN - MENUITEM "Acerca de", IDC_ABOUT - END + POPUP "&Ficheiro" + BEGIN + MENUITEM "&Sair", IDC_EXIT + END + POPUP "Acção" + BEGIN + MENUITEM "Verificar alterações de hardware", IDC_SCAN_HARDWARE + MENUITEM "Adicionar hardware", IDC_ADD_HARDWARE + END + POPUP "Vista" + BEGIN + MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE + MENUITEM "Dispositivos por ligação", IDC_DEVBYCONN + MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED + MENUITEM "Recursos por ligação", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Mostrardispositivos ocultos", IDC_SHOWHIDDEN + END + POPUP "Ajuda" + BEGIN + MENUITEM "Acerca de", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/ro-RO.rc b/dll/win32/devmgr/lang/ro-RO.rc index 2f2bcc171e3..c3ef7dfc7cf 100644 --- a/dll/win32/devmgr/lang/ro-RO.rc +++ b/dll/win32/devmgr/lang/ro-RO.rc @@ -254,28 +254,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&Fișier" - BEGIN - MENUITEM "I&eșire", IDC_EXIT - END - POPUP "A&cțiune" - BEGIN - MENUITEM "Scanează configurația fizică", IDC_SCAN_HARDWARE - MENUITEM "Adăugare dispozitiv…", IDC_ADD_HARDWARE - END - POPUP "&Afișare" - BEGIN - MENUITEM "Dispozitive după tip", IDC_DEVBYTYPE - MENUITEM "Dispozitive după conexiune", IDC_DEVBYCONN - MENUITEM "Resurse după tip", IDC_RESBYTYPE, GRAYED - MENUITEM "Resurse după conexiune", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Dispozitive ascunse", IDC_SHOWHIDDEN - END - POPUP "Aj&utor" - BEGIN - MENUITEM "&Despre", IDC_ABOUT - END + POPUP "&Fișier" + BEGIN + MENUITEM "I&eșire", IDC_EXIT + END + POPUP "A&cțiune" + BEGIN + MENUITEM "Scanează configurația fizică", IDC_SCAN_HARDWARE + MENUITEM "Adăugare dispozitiv…", IDC_ADD_HARDWARE + END + POPUP "&Afișare" + BEGIN + MENUITEM "Dispozitive după tip", IDC_DEVBYTYPE + MENUITEM "Dispozitive după conexiune", IDC_DEVBYCONN + MENUITEM "Resurse după tip", IDC_RESBYTYPE, GRAYED + MENUITEM "Resurse după conexiune", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Dispozitive ascunse", IDC_SHOWHIDDEN + END + POPUP "Aj&utor" + BEGIN + MENUITEM "&Despre", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/ru-RU.rc b/dll/win32/devmgr/lang/ru-RU.rc index 472e38315f4..a7d32a7683c 100644 --- a/dll/win32/devmgr/lang/ru-RU.rc +++ b/dll/win32/devmgr/lang/ru-RU.rc @@ -250,28 +250,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&Файл" - BEGIN - MENUITEM "В&ыход", IDC_EXIT - END - POPUP "&Действие" - BEGIN - MENUITEM "О&бновить конфигурацию оборудования", IDC_SCAN_HARDWARE - MENUITEM "&Добавить устройство", IDC_ADD_HARDWARE - END - POPUP "&Вид" - BEGIN - MENUITEM "&Устройства по типу", IDC_DEVBYTYPE - MENUITEM "Устройства по под&ключению", IDC_DEVBYCONN - MENUITEM "&Ресурсы по типу", IDC_RESBYTYPE, GRAYED - MENUITEM "Ресурсы по подк&лючению", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Показать &скрытые устройства", IDC_SHOWHIDDEN - END - POPUP "&Справка" - BEGIN - MENUITEM "О &программе...", IDC_ABOUT - END + POPUP "&Файл" + BEGIN + MENUITEM "В&ыход", IDC_EXIT + END + POPUP "&Действие" + BEGIN + MENUITEM "О&бновить конфигурацию оборудования", IDC_SCAN_HARDWARE + MENUITEM "&Добавить устройство", IDC_ADD_HARDWARE + END + POPUP "&Вид" + BEGIN + MENUITEM "&Устройства по типу", IDC_DEVBYTYPE + MENUITEM "Устройства по под&ключению", IDC_DEVBYCONN + MENUITEM "&Ресурсы по типу", IDC_RESBYTYPE, GRAYED + MENUITEM "Ресурсы по подк&лючению", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Показать &скрытые устройства", IDC_SHOWHIDDEN + END + POPUP "&Справка" + BEGIN + MENUITEM "О &программе...", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/sk-SK.rc b/dll/win32/devmgr/lang/sk-SK.rc index 864c5afd114..6b97c802ae5 100644 --- a/dll/win32/devmgr/lang/sk-SK.rc +++ b/dll/win32/devmgr/lang/sk-SK.rc @@ -253,28 +253,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", IDC_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE - END - POPUP "View" - BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN - END - POPUP "Help" - BEGIN - MENUITEM "About", IDC_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END + POPUP "View" + BEGIN + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + END + POPUP "Help" + BEGIN + MENUITEM "About", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/sq-AL.rc b/dll/win32/devmgr/lang/sq-AL.rc index d375bd16227..fd39e72e8d1 100644 --- a/dll/win32/devmgr/lang/sq-AL.rc +++ b/dll/win32/devmgr/lang/sq-AL.rc @@ -252,28 +252,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", IDC_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE - END - POPUP "View" - BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN - END - POPUP "Help" - BEGIN - MENUITEM "About", IDC_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END + POPUP "View" + BEGIN + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + END + POPUP "Help" + BEGIN + MENUITEM "About", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/tr-TR.rc b/dll/win32/devmgr/lang/tr-TR.rc index ffc84e9d968..48da09e72ec 100644 --- a/dll/win32/devmgr/lang/tr-TR.rc +++ b/dll/win32/devmgr/lang/tr-TR.rc @@ -250,28 +250,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&Kütük" - BEGIN - MENUITEM "&Çıkış", IDC_EXIT - END - POPUP "&Eylem" - BEGIN - MENUITEM "Donanım Değişiklikleri İçin Tara", IDC_SCAN_HARDWARE - MENUITEM "Donanım Ekle", IDC_ADD_HARDWARE - END - POPUP "&Görünüm" - BEGIN - MENUITEM "&Türe Göre Aygıtlar", IDC_DEVBYTYPE - MENUITEM "&Bağlantıya Göre Aygıtlar", IDC_DEVBYCONN - MENUITEM "T&üre Göre Kaynaklar", IDC_RESBYTYPE, GRAYED - MENUITEM "B&ağlantıya Göre Kaynaklar", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Gizli Aygıtları Göster", IDC_SHOWHIDDEN - END - POPUP "&Yardım" - BEGIN - MENUITEM "&Üzerine", IDC_ABOUT - END + POPUP "&Kütük" + BEGIN + MENUITEM "&Çıkış", IDC_EXIT + END + POPUP "&Eylem" + BEGIN + MENUITEM "Donanım Değişiklikleri İçin Tara", IDC_SCAN_HARDWARE + MENUITEM "Donanım Ekle", IDC_ADD_HARDWARE + END + POPUP "&Görünüm" + BEGIN + MENUITEM "&Türe Göre Aygıtlar", IDC_DEVBYTYPE + MENUITEM "&Bağlantıya Göre Aygıtlar", IDC_DEVBYCONN + MENUITEM "T&üre Göre Kaynaklar", IDC_RESBYTYPE, GRAYED + MENUITEM "B&ağlantıya Göre Kaynaklar", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Gizli Aygıtları Göster", IDC_SHOWHIDDEN + END + POPUP "&Yardım" + BEGIN + MENUITEM "&Üzerine", IDC_ABOUT + END END @@ -281,6 +281,7 @@ BEGIN IDS_CONFIRM_DISABLE "Bu aygıtı edilginleştirmek işleyiş durmasına neden olacaktır.\r\nOnu edilginleştirmeyi gerçekten istiyor musunuz?" IDS_CONFIRM_UNINSTALL "Uyarı: Bu aygıtı dizgenizden kaldırmak üzeresiniz.\r\nSürdürmek istiyor musunuz?" END + STRINGTABLE DISCARDABLE BEGIN IDS_MENU_UPDATE "Sürücü Yazılımını Şimdikileştir..." diff --git a/dll/win32/devmgr/lang/uk-UA.rc b/dll/win32/devmgr/lang/uk-UA.rc index 95eb8cb47d7..9806950d168 100644 --- a/dll/win32/devmgr/lang/uk-UA.rc +++ b/dll/win32/devmgr/lang/uk-UA.rc @@ -256,28 +256,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", IDC_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE - END - POPUP "View" - BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN - END - POPUP "Help" - BEGIN - MENUITEM "About", IDC_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END + POPUP "View" + BEGIN + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + END + POPUP "Help" + BEGIN + MENUITEM "About", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/zh-CN.rc b/dll/win32/devmgr/lang/zh-CN.rc index 63d48cd2362..cb9d47e0e41 100644 --- a/dll/win32/devmgr/lang/zh-CN.rc +++ b/dll/win32/devmgr/lang/zh-CN.rc @@ -249,28 +249,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "文件(&F)" - BEGIN - MENUITEM "关闭(&X)", IDC_EXIT - END - POPUP "行动" - BEGIN - MENUITEM "扫描检测硬件改动", IDC_SCAN_HARDWARE - MENUITEM "添加硬件", IDC_ADD_HARDWARE - END - POPUP "视图" - BEGIN - MENUITEM "按类型设备", IDC_DEVBYTYPE - MENUITEM "依连接排序设备", IDC_DEVBYCONN - MENUITEM "依类型排序资源", IDC_RESBYTYPE, GRAYED - MENUITEM "依连接排序资源", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "显示隐藏的设备", IDC_SHOWHIDDEN - END - POPUP "帮助" - BEGIN - MENUITEM "关于", IDC_ABOUT - END + POPUP "文件(&F)" + BEGIN + MENUITEM "关闭(&X)", IDC_EXIT + END + POPUP "行动" + BEGIN + MENUITEM "扫描检测硬件改动", IDC_SCAN_HARDWARE + MENUITEM "添加硬件", IDC_ADD_HARDWARE + END + POPUP "视图" + BEGIN + MENUITEM "按类型设备", IDC_DEVBYTYPE + MENUITEM "依连接排序设备", IDC_DEVBYCONN + MENUITEM "依类型排序资源", IDC_RESBYTYPE, GRAYED + MENUITEM "依连接排序资源", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "显示隐藏的设备", IDC_SHOWHIDDEN + END + POPUP "帮助" + BEGIN + MENUITEM "关于", IDC_ABOUT + END END diff --git a/dll/win32/devmgr/lang/zh-TW.rc b/dll/win32/devmgr/lang/zh-TW.rc index 08d7e64867a..6cc83d3b1b0 100644 --- a/dll/win32/devmgr/lang/zh-TW.rc +++ b/dll/win32/devmgr/lang/zh-TW.rc @@ -249,28 +249,28 @@ END IDR_MAINMENU MENU BEGIN - POPUP "檔案(&F)" - BEGIN - MENUITEM "關閉(&X)", IDC_EXIT - END - POPUP "行動" - BEGIN - MENUITEM "掃描檢測硬體改動", IDC_SCAN_HARDWARE - MENUITEM "添加硬體", IDC_ADD_HARDWARE - END - POPUP "檢視" - BEGIN - MENUITEM "按類型裝置", IDC_DEVBYTYPE - MENUITEM "依連線排序裝置", IDC_DEVBYCONN - MENUITEM "依類型排序資源", IDC_RESBYTYPE, GRAYED - MENUITEM "依連線排序資源", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "顯示隱藏的裝置", IDC_SHOWHIDDEN - END - POPUP "說明" - BEGIN - MENUITEM "關於", IDC_ABOUT - END + POPUP "檔案(&F)" + BEGIN + MENUITEM "關閉(&X)", IDC_EXIT + END + POPUP "行動" + BEGIN + MENUITEM "掃描檢測硬體改動", IDC_SCAN_HARDWARE + MENUITEM "添加硬體", IDC_ADD_HARDWARE + END + POPUP "檢視" + BEGIN + MENUITEM "按類型裝置", IDC_DEVBYTYPE + MENUITEM "依連線排序裝置", IDC_DEVBYCONN + MENUITEM "依類型排序資源", IDC_RESBYTYPE, GRAYED + MENUITEM "依連線排序資源", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "顯示隱藏的裝置", IDC_SHOWHIDDEN + END + POPUP "說明" + BEGIN + MENUITEM "關於", IDC_ABOUT + END END

5 years, 4 months

[reactos] 01/01: [WINLOGON] Load the notification dlls on demand

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d4f69bf35c610a092564… commit 5d4f69bf35c610a09256422e1398568d20778c0a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 3 15:04:50 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 3 15:05:20 2019 +0200 [WINLOGON] Load the notification dlls on demand Do not keep the notifications loaded until shutdown. Load and unload them when a notification routine must be called. --- base/system/winlogon/notify.c | 330 +++++++++++++++++++++++++----------------- 1 file changed, 200 insertions(+), 130 deletions(-) diff --git a/base/system/winlogon/notify.c b/base/system/winlogon/notify.c index 6c20e0f613b..c0b78dc7b9b 100644 --- a/base/system/winlogon/notify.c +++ b/base/system/winlogon/notify.c @@ -35,15 +35,14 @@ static PSTR FuncNames[LastHandler] = typedef struct _NOTIFICATION_ITEM { LIST_ENTRY ListEntry; - - HINSTANCE hInstance; + PWSTR pszKeyName; + PWSTR pszDllName; BOOL bEnabled; BOOL bAsynchronous; BOOL bSafe; BOOL bImpersonate; BOOL bSmartCardLogon; DWORD dwMaxWait; - PWLX_NOTIFY_HANDLER Handler[LastHandler]; } NOTIFICATION_ITEM, *PNOTIFICATION_ITEM; @@ -52,140 +51,145 @@ static LIST_ENTRY NotificationDllListHead; /* FUNCTIONS *****************************************************************/ -PWLX_NOTIFY_HANDLER -GetNotificationHandler( - HKEY hDllKey, - HINSTANCE hInstance, - PSTR pNotification) -{ - CHAR szFuncBuffer[128]; - DWORD dwSize; - DWORD dwType; - LONG lError; - - dwSize = 128; - lError = RegQueryValueExA(hDllKey, - pNotification, - NULL, - &dwType, - (PBYTE)szFuncBuffer, - &dwSize); - if (lError == ERROR_SUCCESS) - { - return (PWLX_NOTIFY_HANDLER)GetProcAddress(hInstance, szFuncBuffer); - } - - return NULL; -} - - static VOID -LoadNotificationDll( +AddNotificationDll( HKEY hNotifyKey, - PWSTR pKeyName) + PWSTR pszKeyName) { HKEY hDllKey = NULL; PNOTIFICATION_ITEM NotificationDll = NULL; - LONG lError; - WCHAR szBuffer[80]; - DWORD dwSize; - DWORD dwType; - HINSTANCE hInstance; - NOTIFICATION_TYPE i; + DWORD dwSize, dwType; + DWORD dwError; - TRACE("LoadNotificationDll(%p %S)\n", hNotifyKey, pKeyName); + TRACE("AddNotificationDll(%p %S)\n", hNotifyKey, pszKeyName); - lError = RegOpenKeyExW(hNotifyKey, - pKeyName, - 0, - KEY_READ, - &hDllKey); - if (lError != ERROR_SUCCESS) + dwError = RegOpenKeyExW(hNotifyKey, + pszKeyName, + 0, + KEY_READ, + &hDllKey); + if (dwError != ERROR_SUCCESS) return; - dwSize = 80 * sizeof(WCHAR); - lError = RegQueryValueExW(hDllKey, - L"DllName", - NULL, - &dwType, - (PBYTE)szBuffer, - &dwSize); - if (lError == ERROR_SUCCESS) + NotificationDll = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(NOTIFICATION_ITEM)); + if (NotificationDll == NULL) { - hInstance = LoadLibraryW(szBuffer); - if (hInstance == NULL) - return; - - NotificationDll = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(NOTIFICATION_ITEM)); - if (NotificationDll == NULL) - { - FreeLibrary(hInstance); - return; - } + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + NotificationDll->pszKeyName = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + (wcslen(pszKeyName) + 1) * sizeof(WCHAR)); + if (NotificationDll->pszKeyName == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + wcscpy(NotificationDll->pszKeyName, pszKeyName); + + dwSize = 0; + RegQueryValueExW(hDllKey, + L"DllName", + NULL, + &dwType, + NULL, + &dwSize); + if (dwSize == 0) + { + dwError = ERROR_FILE_NOT_FOUND; + goto done; + } - NotificationDll->bEnabled = TRUE; - NotificationDll->dwMaxWait = 30; /* FIXME: ??? */ - NotificationDll->hInstance = hInstance; - - dwSize = sizeof(BOOL); - RegQueryValueExW(hDllKey, - L"Asynchronous", - NULL, - &dwType, - (PBYTE)&NotificationDll->bAsynchronous, - &dwSize); - - dwSize = sizeof(BOOL); - RegQueryValueExW(hDllKey, - L"Enabled", - NULL, - &dwType, - (PBYTE)&NotificationDll->bEnabled, - &dwSize); - - dwSize = sizeof(BOOL); - RegQueryValueExW(hDllKey, - L"Impersonate", - NULL, - &dwType, - (PBYTE)&NotificationDll->bImpersonate, - &dwSize); - - dwSize = sizeof(BOOL); - RegQueryValueExW(hDllKey, - L"Safe", - NULL, - &dwType, - (PBYTE)&NotificationDll->bSafe, - &dwSize); - - dwSize = sizeof(BOOL); - RegQueryValueExW(hDllKey, - L"SmartCardLogonNotify", - NULL, - &dwType, - (PBYTE)&NotificationDll->bSmartCardLogon, - &dwSize); - - dwSize = sizeof(DWORD); - RegQueryValueExW(hDllKey, - L"MaxWait", - NULL, - &dwType, - (PBYTE)&NotificationDll->dwMaxWait, - &dwSize); - - for (i = LogonHandler; i < LastHandler; i++) + NotificationDll->pszDllName = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwSize); + if (NotificationDll->pszDllName == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + dwError = RegQueryValueExW(hDllKey, + L"DllName", + NULL, + &dwType, + (PBYTE)NotificationDll->pszDllName, + &dwSize); + if (dwError != ERROR_SUCCESS) + goto done; + + NotificationDll->bEnabled = TRUE; + NotificationDll->dwMaxWait = 30; /* FIXME: ??? */ + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"Asynchronous", + NULL, + &dwType, + (PBYTE)&NotificationDll->bAsynchronous, + &dwSize); + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"Enabled", + NULL, + &dwType, + (PBYTE)&NotificationDll->bEnabled, + &dwSize); + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"Impersonate", + NULL, + &dwType, + (PBYTE)&NotificationDll->bImpersonate, + &dwSize); + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"Safe", + NULL, + &dwType, + (PBYTE)&NotificationDll->bSafe, + &dwSize); + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"SmartCardLogonNotify", + NULL, + &dwType, + (PBYTE)&NotificationDll->bSmartCardLogon, + &dwSize); + + dwSize = sizeof(DWORD); + RegQueryValueExW(hDllKey, + L"MaxWait", + NULL, + &dwType, + (PBYTE)&NotificationDll->dwMaxWait, + &dwSize); + + InsertHeadList(&NotificationDllListHead, + &NotificationDll->ListEntry); + +done: + if (dwError != ERROR_SUCCESS) + { + if (NotificationDll != NULL) { - NotificationDll->Handler[i] = GetNotificationHandler(hDllKey, hInstance, FuncNames[i]); - TRACE("%s: %p\n", FuncNames[i], NotificationDll->Handler[i]); - } + if (NotificationDll->pszKeyName != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, NotificationDll->pszKeyName); + + if (NotificationDll->pszDllName != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, NotificationDll->pszDllName); - InsertHeadList(&NotificationDllListHead, - &NotificationDll->ListEntry); + RtlFreeHeap(RtlGetProcessHeap(), 0, NotificationDll); + } } RegCloseKey(hDllKey); @@ -232,7 +236,7 @@ InitNotifications(VOID) break; TRACE("Notification DLL: %S\n", szKeyName); - LoadNotificationDll(hNotifyKey, szKeyName); + AddNotificationDll(hNotifyKey, szKeyName); dwIndex++; } @@ -245,6 +249,57 @@ InitNotifications(VOID) } +static +VOID +CallNotificationDll( + HKEY hNotifyKey, + PNOTIFICATION_ITEM NotificationDll, + NOTIFICATION_TYPE Type, + PWLX_NOTIFICATION_INFO pInfo) +{ + HKEY hDllKey = NULL; + HMODULE hModule = NULL; + CHAR szFuncBuffer[128]; + DWORD dwSize; + DWORD dwType; + DWORD dwError; + PWLX_NOTIFY_HANDLER pNotifyHandler; + + dwError = RegOpenKeyExW(hNotifyKey, + NotificationDll->pszKeyName, + 0, + KEY_READ, + &hDllKey); + if (dwError != ERROR_SUCCESS) + { + TRACE("RegOpenKeyExW()\n"); + return; + } + + dwSize = sizeof(szFuncBuffer); + dwError = RegQueryValueExA(hDllKey, + FuncNames[Type], + NULL, + &dwType, + (PBYTE)szFuncBuffer, + &dwSize); + if (dwError == ERROR_SUCCESS) + { + hModule = LoadLibraryW(NotificationDll->pszDllName); + if (hModule != NULL) + { + pNotifyHandler = (PWLX_NOTIFY_HANDLER)GetProcAddress(hModule, szFuncBuffer); + if (pNotifyHandler != NULL) + pNotifyHandler(pInfo); + + FreeLibrary(hModule); + } + } + + RegCloseKey(hDllKey); +} + + VOID CallNotificationDlls( PWLSESSION pSession, @@ -253,9 +308,22 @@ CallNotificationDlls( PLIST_ENTRY ListEntry; PNOTIFICATION_ITEM NotificationDll; WLX_NOTIFICATION_INFO Info; + HKEY hNotifyKey = NULL; + DWORD dwError; TRACE("CallNotificationDlls()\n"); + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon\\Notify", + 0, + KEY_READ | KEY_ENUMERATE_SUB_KEYS, + &hNotifyKey); + if (dwError != ERROR_SUCCESS) + { + TRACE("RegOpenKeyExW()\n"); + return; + } + Info.Size = sizeof(WLX_NOTIFICATION_INFO); switch (Type) @@ -303,14 +371,12 @@ TRACE("ListEntry %p\n", ListEntry); ListEntry); TRACE("NotificationDll: %p\n", NotificationDll); if (NotificationDll != NULL && NotificationDll->bEnabled) - { -TRACE("NotificationDll->Handler: %p\n", NotificationDll->Handler[Type]); - if (NotificationDll->Handler[Type] != NULL) - NotificationDll->Handler[Type](&Info); - } + CallNotificationDll(hNotifyKey, NotificationDll, Type, &Info); ListEntry = ListEntry->Flink; } + + RegCloseKey(hNotifyKey); } @@ -328,7 +394,11 @@ CleanupNotifications(VOID) ListEntry); if (NotificationDll != NULL) { - FreeLibrary(NotificationDll->hInstance); + if (NotificationDll->pszKeyName != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, NotificationDll->pszKeyName); + + if (NotificationDll->pszDllName != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, NotificationDll->pszDllName); } ListEntry = ListEntry->Flink;

5 years, 4 months

[reactos] 01/01: [USBAUDIO] Fix compilation issues

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47303268e1da2acb27651… commit 47303268e1da2acb27651d175eeff97363c12e4a Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Thu Aug 1 23:37:35 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 3 14:55:57 2019 +0200 [USBAUDIO] Fix compilation issues --- drivers/usb/usbaudio/filter.c | 2 -- drivers/usb/usbaudio/pin.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/usb/usbaudio/filter.c b/drivers/usb/usbaudio/filter.c index 040dbcb0801..69e61e77af7 100644 --- a/drivers/usb/usbaudio/filter.c +++ b/drivers/usb/usbaudio/filter.c @@ -326,7 +326,6 @@ CountTopologyComponents( PUSB_AUDIO_CONTROL_INPUT_TERMINAL_DESCRIPTOR InputTerminalDescriptor; PUSB_AUDIO_CONTROL_FEATURE_UNIT_DESCRIPTOR FeatureUnitDescriptor; PUSB_AUDIO_CONTROL_MIXER_UNIT_DESCRIPTOR MixerUnitDescriptor; - PUSB_AUDIO_CONTROL_SELECTOR_UNIT_DESCRIPTOR SelectorUnitDescriptor; ULONG NodeCount = 0, Length, Index; ULONG DescriptorCount = 0; UCHAR Value; @@ -387,7 +386,6 @@ CountTopologyComponents( } else if (InputTerminalDescriptor->bDescriptorSubtype == 0x05 /* SELECTOR_UNIT */) { - SelectorUnitDescriptor = (PUSB_AUDIO_CONTROL_SELECTOR_UNIT_DESCRIPTOR)InputTerminalDescriptor; DescriptorCount++; NodeCount++; } diff --git a/drivers/usb/usbaudio/pin.c b/drivers/usb/usbaudio/pin.c index a9a7814cf77..350b61375bc 100644 --- a/drivers/usb/usbaudio/pin.c +++ b/drivers/usb/usbaudio/pin.c @@ -697,7 +697,7 @@ InitStreamPin( ULONG GetDataRangeIndexForFormat( IN PKSDATARANGE ConnectionFormat, - IN PKSDATARANGE * DataRanges, + IN const PKSDATARANGE * DataRanges, IN ULONG DataRangesCount) { ULONG Index;

5 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2019