Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 01/01: [MEDIA][FONTS] Add Verdana fonts (#1881)
by Katayama Hirofumi MZ 26 Aug '19

26 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca967db5ca65d289e3dc2… commit ca967db5ca65d289e3dc2ed05e5e1b49673ed3e5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 26 22:19:06 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 26 22:19:06 2019 +0900 [MEDIA][FONTS] Add Verdana fonts (#1881) - Add "Verdana", "Verdana Bold", "Verdana Bold Italic" and "Verdana Italic" fonts by duplicating "Bitstream Vera Sans" fonts and renaming them. - Delete some "Verdana" font substitutes. - Add LICENSE file. I made these font files by using FontForge. Their family name is "Verdana". Their display names are "Verdana", "Verdana Bold", "Verdana Bold Italic" and "Verdana Italic". Their font filenames are verdana.ttf, verdanab.ttf, verdanaz.ttf and verdanai.ttf. The Underline Positions are hacked by adding an integer value for workaround of FontForge's bug. CORE-16264 --- media/fonts/CMakeLists.txt | 6 +- media/fonts/doc/Verdana/COPYRIGHT.TXT | 124 ++++++++++++++++++++++++++++++++++ media/fonts/doc/Verdana/README.txt | 3 + media/fonts/verdana.ttf | Bin 0 -> 38412 bytes media/fonts/verdanab.ttf | Bin 0 -> 36204 bytes media/fonts/verdanai.ttf | Bin 0 -> 34016 bytes media/fonts/verdanaz.ttf | Bin 0 -> 37124 bytes 7 files changed, 132 insertions(+), 1 deletion(-) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 51a7d9e2282..e7a5aa6de0a 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -165,7 +165,11 @@ list(APPEND FONT_FILES trebucbd.ttf trebucbi.ttf trebucit.ttf - UniVGA16.ttf) + UniVGA16.ttf + verdanab.ttf + verdanaz.ttf + verdanai.ttf + verdana.ttf) foreach(item ${FONT_FILES}) add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/Fonts FOR all) diff --git a/media/fonts/doc/Verdana/COPYRIGHT.TXT b/media/fonts/doc/Verdana/COPYRIGHT.TXT new file mode 100644 index 00000000000..e651be1c4fe --- /dev/null +++ b/media/fonts/doc/Verdana/COPYRIGHT.TXT @@ -0,0 +1,124 @@ +Bitstream Vera Fonts Copyright + +The fonts have a generous copyright, allowing derivative works (as +long as "Bitstream" or "Vera" are not in the names), and full +redistribution (so long as they are not *sold* by themselves). They +can be be bundled, redistributed and sold with any software. + +The fonts are distributed under the following copyright: + +Copyright +========= + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream +Vera is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute +the Font Software, including without limitation the rights to use, +copy, merge, publish, distribute, and/or sell copies of the Font +Software, and to permit persons to whom the Font Software is furnished +to do so, subject to the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Bitstream" or the word "Vera". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Bitstream Vera" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +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 +BITSTREAM OR THE GNOME FOUNDATION 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. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font +Software without prior written authorization from the Gnome Foundation +or Bitstream Inc., respectively. For further information, contact: +fonts at gnome dot org. + +Copyright FAQ +============= + + 1. I don't understand the resale restriction... What gives? + + Bitstream is giving away these fonts, but wishes to ensure its + competitors can't just drop the fonts as is into a font sale system + and sell them as is. It seems fair that if Bitstream can't make money + from the Bitstream Vera fonts, their competitors should not be able to + do so either. You can sell the fonts as part of any software package, + however. + + 2. I want to package these fonts separately for distribution and + sale as part of a larger software package or system. Can I do so? + + Yes. A RPM or Debian package is a "larger software package" to begin + with, and you aren't selling them independently by themselves. + See 1. above. + + 3. Are derivative works allowed? + Yes! + + 4. Can I change or add to the font(s)? + Yes, but you must change the name(s) of the font(s). + + 5. Under what terms are derivative works allowed? + + You must change the name(s) of the fonts. This is to ensure the + quality of the fonts, both to protect Bitstream and Gnome. We want to + ensure that if an application has opened a font specifically of these + names, it gets what it expects (though of course, using fontconfig, + substitutions could still could have occurred during font + opening). You must include the Bitstream copyright. Additional + copyrights can be added, as per copyright law. Happy Font Hacking! + + 6. If I have improvements for Bitstream Vera, is it possible they might get + adopted in future versions? + + Yes. The contract between the Gnome Foundation and Bitstream has + provisions for working with Bitstream to ensure quality additions to + the Bitstream Vera font family. Please contact us if you have such + additions. Note, that in general, we will want such additions for the + entire family, not just a single font, and that you'll have to keep + both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add + glyphs to the font, they must be stylistically in keeping with Vera's + design. Vera cannot become a "ransom note" font. Jim Lyles will be + providing a document describing the design elements used in Vera, as a + guide and aid for people interested in contributing to Vera. + + 7. I want to sell a software package that uses these fonts: Can I do so? + + Sure. Bundle the fonts with your software and sell your software + with the fonts. That is the intent of the copyright. + + 8. If applications have built the names "Bitstream Vera" into them, + can I override this somehow to use fonts of my choosing? + + This depends on exact details of the software. Most open source + systems and software (e.g., Gnome, KDE, etc.) are now converting to + use fontconfig (see www.fontconfig.org) to handle font configuration, + selection and substitution; it has provisions for overriding font + names and subsituting alternatives. An example is provided by the + supplied local.conf file, which chooses the family Bitstream Vera for + "sans", "serif" and "monospace". Other software (e.g., the XFree86 + core server) has other mechanisms for font substitution. + diff --git a/media/fonts/doc/Verdana/README.txt b/media/fonts/doc/Verdana/README.txt new file mode 100644 index 00000000000..365bc5eb550 --- /dev/null +++ b/media/fonts/doc/Verdana/README.txt @@ -0,0 +1,3 @@ +ReactOS Verdana fonts are based on "Bitstream Vera Sans" fonts. + +See also COPYRIGHT.TXT. diff --git a/media/fonts/verdana.ttf b/media/fonts/verdana.ttf new file mode 100644 index 00000000000..1a55bafcf3c Binary files /dev/null and b/media/fonts/verdana.ttf differ diff --git a/media/fonts/verdanab.ttf b/media/fonts/verdanab.ttf new file mode 100644 index 00000000000..7b56d8f2783 Binary files /dev/null and b/media/fonts/verdanab.ttf differ diff --git a/media/fonts/verdanai.ttf b/media/fonts/verdanai.ttf new file mode 100644 index 00000000000..2b7628696e8 Binary files /dev/null and b/media/fonts/verdanai.ttf differ diff --git a/media/fonts/verdanaz.ttf b/media/fonts/verdanaz.ttf new file mode 100644 index 00000000000..f1a96c4f128 Binary files /dev/null and b/media/fonts/verdanaz.ttf differ

1 0

[reactos] 01/01: [ROSAPPS][SHLEXTDBG] Delete DbgPrint hack for gcc (fix build)
by Katayama Hirofumi MZ 26 Aug '19

26 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e85e396438f9cde018dbd… commit e85e396438f9cde018dbd7e4467571c0f1d53663 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 26 21:35:05 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Aug 26 21:36:59 2019 +0900 [ROSAPPS][SHLEXTDBG] Delete DbgPrint hack for gcc (fix build) --- modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp b/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp index 3e1a29feea2..cbb7f9bc477 100644 --- a/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp +++ b/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp @@ -12,8 +12,6 @@ #include <atlstr.h> #include <atlsimpcoll.h> #include <conio.h> - // hack for gcc: -#define DbgPrint(...) printf(__VA_ARGS__) #include <shellutils.h> enum WaitType

1 0

[reactos] 01/01: [MEDIA][FONTS] Make MS Sans Serif ells sans serif CORE-16166
by Katayama Hirofumi MZ 26 Aug '19

26 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f06035c9b7df474ef622… commit 0f06035c9b7df474ef622fcd85036253afcb223b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 26 10:07:56 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Aug 26 10:07:56 2019 +0900 [MEDIA][FONTS] Make MS Sans Serif ells sans serif CORE-16166 --- media/fonts/ssee1255.fon | Bin 69168 -> 69168 bytes media/fonts/ssee1256.fon | Bin 71632 -> 71632 bytes media/fonts/ssee874.fon | Bin 71792 -> 71792 bytes media/fonts/sserife.fon | Bin 64560 -> 64560 bytes media/fonts/sserifeg.fon | Bin 65456 -> 65456 bytes media/fonts/sserifer.fon | Bin 68848 -> 68848 bytes media/fonts/sserifet.fon | Bin 64304 -> 64304 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/ssee1255.fon b/media/fonts/ssee1255.fon index 59de17288bb..87c4b6319fd 100644 Binary files a/media/fonts/ssee1255.fon and b/media/fonts/ssee1255.fon differ diff --git a/media/fonts/ssee1256.fon b/media/fonts/ssee1256.fon index 7e27d99027c..8e3804388e8 100644 Binary files a/media/fonts/ssee1256.fon and b/media/fonts/ssee1256.fon differ diff --git a/media/fonts/ssee874.fon b/media/fonts/ssee874.fon index aefe77a6978..4f6db4f0a9e 100644 Binary files a/media/fonts/ssee874.fon and b/media/fonts/ssee874.fon differ diff --git a/media/fonts/sserife.fon b/media/fonts/sserife.fon index 5bcce146c91..264757092cb 100644 Binary files a/media/fonts/sserife.fon and b/media/fonts/sserife.fon differ diff --git a/media/fonts/sserifeg.fon b/media/fonts/sserifeg.fon index fad4c7a2172..fd7d539e784 100644 Binary files a/media/fonts/sserifeg.fon and b/media/fonts/sserifeg.fon differ diff --git a/media/fonts/sserifer.fon b/media/fonts/sserifer.fon index 163668f5f62..600d9fe251d 100644 Binary files a/media/fonts/sserifer.fon and b/media/fonts/sserifer.fon differ diff --git a/media/fonts/sserifet.fon b/media/fonts/sserifet.fon index 25c4c94db85..6aa8dc2ddc9 100644 Binary files a/media/fonts/sserifet.fon and b/media/fonts/sserifet.fon differ

1 0

[reactos] 01/01: [MEDIA][FONTS] Adjust internal leading of Baltic MS Sans Serif
by Katayama Hirofumi MZ 25 Aug '19

25 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24e5d36d5d29ecc9b8f21… commit 24e5d36d5d29ecc9b8f211d8113ebdf21b3ea0ec Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 26 03:36:48 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Aug 26 03:36:48 2019 +0900 [MEDIA][FONTS] Adjust internal leading of Baltic MS Sans Serif --- media/fonts/ssee1257.fon | Bin 65424 -> 65424 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/ssee1257.fon b/media/fonts/ssee1257.fon index ee1bbcda616..42a43a7a612 100644 Binary files a/media/fonts/ssee1257.fon and b/media/fonts/ssee1257.fon differ

1 0

[reactos] 01/01: [NETAPI32] Implement DsEnumerateDomainTrustsW
by Eric Kohl 25 Aug '19

25 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=324afc252cef7c2b9a316… commit 324afc252cef7c2b9a316b37dbbf34a01c7d2b46 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 25 18:23:38 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 25 18:23:38 2019 +0200 [NETAPI32] Implement DsEnumerateDomainTrustsW --- dll/win32/netapi32/netlogon.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dll/win32/netapi32/netlogon.c b/dll/win32/netapi32/netlogon.c index 293b482aee5..8a03e887b19 100644 --- a/dll/win32/netapi32/netlogon.c +++ b/dll/win32/netapi32/netlogon.c @@ -657,9 +657,30 @@ DsEnumerateDomainTrustsW( _Out_ PDS_DOMAIN_TRUSTSW *Domains, _Out_ PULONG DomainCount) { - FIXME("DsEnumerateDomainTrustsW(%s, %x, %p, %p)\n", + NETLOGON_TRUSTED_DOMAIN_ARRAY DomainsArray = {0, NULL}; + NET_API_STATUS status; + + TRACE("DsEnumerateDomainTrustsW(%s, %x, %p, %p)\n", debugstr_w(ServerName), Flags, Domains, DomainCount); - return ERROR_CALL_NOT_IMPLEMENTED; + + RpcTryExcept + { + status = DsrEnumerateDomainTrusts(ServerName, + Flags, + &DomainsArray); + if (status == NERR_Success) + { + *Domains = DomainsArray.Domains; + *DomainCount = DomainsArray.DomainCount; + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; }

1 0

[reactos] 01/01: Fix build
by Ioannis Adamopoulos 25 Aug '19

25 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7eb28dd0a9251f4db040a… commit 7eb28dd0a9251f4db040ac81903aad4e45f808eb Author: Ioannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Aug 25 14:53:52 2019 +0300 Commit: Ioannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Aug 25 14:56:12 2019 +0300 Fix build --- modules/rostests/apitests/shell32/IShellFolderViewCB.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/rostests/apitests/shell32/IShellFolderViewCB.cpp b/modules/rostests/apitests/shell32/IShellFolderViewCB.cpp index a1fd664fe63..392321166c8 100644 --- a/modules/rostests/apitests/shell32/IShellFolderViewCB.cpp +++ b/modules/rostests/apitests/shell32/IShellFolderViewCB.cpp @@ -8,13 +8,6 @@ #include "shelltest.h" #include <atlsimpcoll.h> #include <stdio.h> - -#if 1 -#define DbgPrint(...) trace(__VA_ARGS__) -#else -EXTERN_C -void DbgPrint(PCSTR, ...); -#endif #include <shellutils.h> //#include <msgtrace.h>

1 0

[reactos] 01/01: [NETAPI32] Implement DsAddressToSiteNamesA and DsAddressToSiteNamesExA
by Eric Kohl 25 Aug '19

25 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abeb3324fbfc6871299b9… commit abeb3324fbfc6871299b9bf96276a61d6917d1a1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 25 11:39:12 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 25 11:39:53 2019 +0200 [NETAPI32] Implement DsAddressToSiteNamesA and DsAddressToSiteNamesExA --- dll/win32/netapi32/netlogon.c | 242 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 238 insertions(+), 4 deletions(-) diff --git a/dll/win32/netapi32/netlogon.c b/dll/win32/netapi32/netlogon.c index 539d0c1f64d..293b482aee5 100644 --- a/dll/win32/netapi32/netlogon.c +++ b/dll/win32/netapi32/netlogon.c @@ -112,9 +112,98 @@ DsAddressToSiteNamesA( _In_ PSOCKET_ADDRESS SocketAddresses, _Out_ LPSTR **SiteNames) { - FIXME("DsAddressToSiteNamesA(%s, %lu, %p, %p)\n", + PWSTR pComputerNameW = NULL, *pSiteNamesW = NULL; + PSTR *pSiteNamesA = NULL, Ptr; + UNICODE_STRING UnicodeString; + ANSI_STRING AnsiString; + ULONG BufferSize, i; + NTSTATUS Status; + NET_API_STATUS status = NERR_Success; + + TRACE("DsAddressToSiteNamesA(%s, %lu, %p, %p)\n", debugstr_a(ComputerName), EntryCount, SocketAddresses, SiteNames); - return ERROR_CALL_NOT_IMPLEMENTED; + + if (EntryCount == 0) + return ERROR_INVALID_PARAMETER; + + if (ComputerName != NULL) + { + pComputerNameW = NetpAllocWStrFromAnsiStr((PSTR)ComputerName); + if (pComputerNameW == NULL) + { + status = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + } + + /* Call the Unicode function */ + status = DsAddressToSiteNamesW(pComputerNameW, + EntryCount, + SocketAddresses, + &pSiteNamesW); + if (status != NERR_Success) + goto done; + + /* Calculate the required site names buffer size */ + BufferSize = EntryCount * sizeof(PSTR); + for (i = 0; i < EntryCount; i++) + { + if (pSiteNamesW[i] != NULL) + { + RtlInitUnicodeString(&UnicodeString, + pSiteNamesW[i]); + BufferSize += RtlUnicodeStringToAnsiSize(&UnicodeString); + } + } + + /* Allocate the site names ANSI buffer */ + status = NetApiBufferAllocate(BufferSize, (PVOID*)&pSiteNamesA); + if (status != NERR_Success) + goto done; + + /* Convert the site names */ + Ptr = (PSTR)((ULONG_PTR)pSiteNamesA + EntryCount * sizeof(PSTR)); + BufferSize -= EntryCount * sizeof(PSTR); + + for (i = 0; i < EntryCount; i++) + { + if (pSiteNamesW[i] != NULL) + { + pSiteNamesA[i] = Ptr; + RtlInitUnicodeString(&UnicodeString, + pSiteNamesW[i]); + AnsiString.Length = 0; + AnsiString.MaximumLength = BufferSize; + AnsiString.Buffer = Ptr; + + Status = RtlUnicodeStringToAnsiString(&AnsiString, + &UnicodeString, + FALSE); + if (!NT_SUCCESS(Status)) + { + status = RtlNtStatusToDosError(Status); + goto done; + } + + Ptr = Ptr + AnsiString.Length + sizeof(CHAR); + BufferSize -= AnsiString.Length + sizeof(CHAR); + } + } + + *SiteNames = pSiteNamesA; + pSiteNamesA = NULL; + +done: + if (pSiteNamesA != NULL) + NetApiBufferFree(pSiteNamesA); + + if (pSiteNamesW != NULL) + NetApiBufferFree(pSiteNamesW); + + if (pComputerNameW != NULL) + NetApiBufferFree(pComputerNameW); + + return status; } @@ -199,10 +288,155 @@ DsAddressToSiteNamesExA( _Out_ LPSTR **SiteNames, _Out_ LPSTR **SubnetNames) { - FIXME("DsAddressToSiteNamesExA(%s, %lu, %p, %p, %p)\n", + PWSTR pComputerNameW = NULL, *pSiteNamesW = NULL; + PWSTR *pSubnetNamesW = NULL; + PSTR *pSiteNamesA = NULL, *pSubnetNamesA = NULL, Ptr; + UNICODE_STRING UnicodeString; + ANSI_STRING AnsiString; + ULONG BufferSize, i; + NTSTATUS Status; + NET_API_STATUS status = NERR_Success; + + TRACE("DsAddressToSiteNamesExA(%s, %lu, %p, %p, %p)\n", debugstr_a(ComputerName), EntryCount, SocketAddresses, SiteNames, SubnetNames); - return ERROR_CALL_NOT_IMPLEMENTED; + + if (EntryCount == 0) + return ERROR_INVALID_PARAMETER; + + if (ComputerName != NULL) + { + pComputerNameW = NetpAllocWStrFromAnsiStr((PSTR)ComputerName); + if (pComputerNameW == NULL) + { + status = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + } + + /* Call the Unicode function */ + status = DsAddressToSiteNamesExW(pComputerNameW, + EntryCount, + SocketAddresses, + &pSiteNamesW, + &pSubnetNamesW); + if (status != NERR_Success) + goto done; + + /* Calculate the required site names buffer size */ + BufferSize = EntryCount * sizeof(PSTR); + for (i = 0; i < EntryCount; i++) + { + if (pSiteNamesW[i] != NULL) + { + RtlInitUnicodeString(&UnicodeString, + pSiteNamesW[i]); + BufferSize += RtlUnicodeStringToAnsiSize(&UnicodeString); + } + } + + /* Allocate the site names ANSI buffer */ + status = NetApiBufferAllocate(BufferSize, (PVOID*)&pSiteNamesA); + if (status != NERR_Success) + goto done; + + /* Convert the site names */ + Ptr = (PSTR)((ULONG_PTR)pSiteNamesA + EntryCount * sizeof(PSTR)); + BufferSize -= EntryCount * sizeof(PSTR); + + for (i = 0; i < EntryCount; i++) + { + if (pSiteNamesW[i] != NULL) + { + pSiteNamesA[i] = Ptr; + RtlInitUnicodeString(&UnicodeString, + pSiteNamesW[i]); + AnsiString.Length = 0; + AnsiString.MaximumLength = BufferSize; + AnsiString.Buffer = Ptr; + + Status = RtlUnicodeStringToAnsiString(&AnsiString, + &UnicodeString, + FALSE); + if (!NT_SUCCESS(Status)) + { + status = RtlNtStatusToDosError(Status); + goto done; + } + + Ptr = Ptr + AnsiString.Length + sizeof(CHAR); + BufferSize -= AnsiString.Length + sizeof(CHAR); + } + } + + /* Calculate the required subnet names buffer size */ + BufferSize = EntryCount * sizeof(PSTR); + for (i = 0; i < EntryCount; i++) + { + if (pSubnetNamesW[i] != NULL) + { + RtlInitUnicodeString(&UnicodeString, + pSubnetNamesW[i]); + BufferSize += RtlUnicodeStringToAnsiSize(&UnicodeString); + } + } + + /* Allocate the subnet names ANSI buffer */ + status = NetApiBufferAllocate(BufferSize, (PVOID*)&pSubnetNamesA); + if (status != NERR_Success) + goto done; + + /* Convert the subnet names */ + Ptr = (PSTR)((ULONG_PTR)pSubnetNamesA + EntryCount * sizeof(PSTR)); + BufferSize -= EntryCount * sizeof(PSTR); + + for (i = 0; i < EntryCount; i++) + { + if (pSubnetNamesW[i] != NULL) + { + pSubnetNamesA[i] = Ptr; + RtlInitUnicodeString(&UnicodeString, + pSubnetNamesW[i]); + AnsiString.Length = 0; + AnsiString.MaximumLength = BufferSize; + AnsiString.Buffer = Ptr; + + Status = RtlUnicodeStringToAnsiString(&AnsiString, + &UnicodeString, + FALSE); + if (!NT_SUCCESS(Status)) + { + status = RtlNtStatusToDosError(Status); + goto done; + } + + Ptr = Ptr + AnsiString.Length + sizeof(CHAR); + BufferSize -= AnsiString.Length + sizeof(CHAR); + } + } + + *SiteNames = pSiteNamesA; + *SubnetNames = pSubnetNamesA; + pSiteNamesA = NULL; + pSubnetNamesA = NULL; + +done: + if (pSubnetNamesA != NULL) + NetApiBufferFree(pSubnetNamesA); + + if (pSiteNamesA != NULL) + NetApiBufferFree(pSiteNamesA); + + if (pSubnetNamesW != NULL) + NetApiBufferFree(pSubnetNamesW); + + if (pSiteNamesW != NULL) + NetApiBufferFree(pSiteNamesW); + + if (pComputerNameW != NULL) + NetApiBufferFree(pComputerNameW); + + return status; }

1 0

[reactos] 01/01: [HEADERS] Move some helpers from undocshell.h to shellutils.h as they didn't cover anything undocumented. Merge traycmd.h in undocshell.h as both contain just undocumented shell definitions.
by Ioannis Adamopoulos 25 Aug '19

25 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e419195d37594b1cea64a… commit e419195d37594b1cea64a23df49aecd9de8a662d Author: Ioannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Aug 25 12:17:42 2019 +0300 Commit: Ioannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Aug 25 12:20:52 2019 +0300 [HEADERS] Move some helpers from undocshell.h to shellutils.h as they didn't cover anything undocumented. Merge traycmd.h in undocshell.h as both contain just undocumented shell definitions. --- base/shell/explorer/traywnd.cpp | 1 - dll/shellext/acppage/ACPPage.cpp | 30 ---- dll/shellext/zipfldr/precomp.h | 1 - dll/win32/shell32/CShellDispatch.cpp | 1 - modules/rostests/apitests/browseui/ACListISF.cpp | 1 + modules/rostests/apitests/shell32/CFSFolder.cpp | 1 + modules/rostests/apitests/shell32/CMyComputer.cpp | 1 + .../rostests/apitests/shell32/CShellDesktop.cpp | 1 + modules/rostests/apitests/shell32/CShellLink.cpp | 1 + .../apitests/shell32/SHCreateFileExtractIconW.cpp | 3 +- modules/rostests/apitests/shell32/ShellState.cpp | 1 + sdk/include/reactos/shellutils.h | 133 +++++++++++++++++ sdk/include/reactos/traycmd.h | 49 ------- sdk/include/reactos/undocshell.h | 159 ++++----------------- 14 files changed, 165 insertions(+), 218 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 466e766da14..49d3ae40886 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -21,7 +21,6 @@ #include "precomp.h" #include <commoncontrols.h> -#include <traycmd.h> HRESULT TrayWindowCtxMenuCreator(ITrayWindow * TrayWnd, IN HWND hWndOwner, IContextMenu ** ppCtxMenu); diff --git a/dll/shellext/acppage/ACPPage.cpp b/dll/shellext/acppage/ACPPage.cpp index 18d035fb9cf..14f4f632b01 100644 --- a/dll/shellext/acppage/ACPPage.cpp +++ b/dll/shellext/acppage/ACPPage.cpp @@ -82,36 +82,6 @@ struct CCoInit HRESULT hres; }; -EXTERN_C -inline ULONG -Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) -{ - char Buffer[512]; - char* Current = Buffer; - size_t Length = _countof(Buffer); - const char* fname = strrchr(filename, '\\'); - if (fname == NULL) - { - fname = strrchr(filename, '/'); - if (fname != NULL) - fname++; - } - else - fname++; - - if (fname == NULL) - fname = filename; - - StringCchPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, "%s:%d: ", fname, line); - va_list ArgList; - va_start(ArgList, lpFormat); - StringCchVPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, lpFormat, ArgList); - va_end(ArgList); - OutputDebugStringA(Buffer); - return 0; -} - - EXTERN_C BOOL WINAPI GetExeFromLnk(PCWSTR pszLnk, PWSTR pszExe, size_t cchSize) { diff --git a/dll/shellext/zipfldr/precomp.h b/dll/shellext/zipfldr/precomp.h index 06c82a8b15d..e25e2f19024 100644 --- a/dll/shellext/zipfldr/precomp.h +++ b/dll/shellext/zipfldr/precomp.h @@ -37,7 +37,6 @@ EXTERN_C const GUID CLSID_ZipFolderExtractAllCommand; extern LONG g_ModuleRefCnt; -#define Win32DbgPrint(file, line, warn, func) DbgPrint("(%s:%d) " warn, file, line, func) WCHAR* guid2string(REFCLSID iid); diff --git a/dll/win32/shell32/CShellDispatch.cpp b/dll/win32/shell32/CShellDispatch.cpp index b07a42f89d7..d021bf5ea2b 100644 --- a/dll/win32/shell32/CShellDispatch.cpp +++ b/dll/win32/shell32/CShellDispatch.cpp @@ -8,7 +8,6 @@ #include "precomp.h" #include "winsvc.h" -#include <traycmd.h> // tray commands WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/modules/rostests/apitests/browseui/ACListISF.cpp b/modules/rostests/apitests/browseui/ACListISF.cpp index 59607dd58ad..7ae0d10b4c4 100644 --- a/modules/rostests/apitests/browseui/ACListISF.cpp +++ b/modules/rostests/apitests/browseui/ACListISF.cpp @@ -17,6 +17,7 @@ // Yes, gcc at it again, let's validate everything found inside unused templates! ULONG DbgPrint(PCH Format,...); +#include <stdio.h> #include <shellutils.h> #include <shlwapi.h> #include <strsafe.h> diff --git a/modules/rostests/apitests/shell32/CFSFolder.cpp b/modules/rostests/apitests/shell32/CFSFolder.cpp index 57c015b3511..b4be49fcc1c 100644 --- a/modules/rostests/apitests/shell32/CFSFolder.cpp +++ b/modules/rostests/apitests/shell32/CFSFolder.cpp @@ -9,6 +9,7 @@ #define NDEBUG #include <debug.h> +#include <stdio.h> #include <shellutils.h> LPITEMIDLIST _CreateDummyPidl() diff --git a/modules/rostests/apitests/shell32/CMyComputer.cpp b/modules/rostests/apitests/shell32/CMyComputer.cpp index 85f04fc7383..0d77ea23afb 100644 --- a/modules/rostests/apitests/shell32/CMyComputer.cpp +++ b/modules/rostests/apitests/shell32/CMyComputer.cpp @@ -9,6 +9,7 @@ #define NDEBUG #include <debug.h> +#include <stdio.h> #include <shellutils.h> #define INVALID_POINTER ((PVOID)(ULONG_PTR)0xdeadbeefdeadbeefULL) diff --git a/modules/rostests/apitests/shell32/CShellDesktop.cpp b/modules/rostests/apitests/shell32/CShellDesktop.cpp index 764e1508818..885e2251639 100644 --- a/modules/rostests/apitests/shell32/CShellDesktop.cpp +++ b/modules/rostests/apitests/shell32/CShellDesktop.cpp @@ -9,6 +9,7 @@ #include "shelltest.h" #include <ndk/rtlfuncs.h> +#include <stdio.h> #include <shellutils.h> // We would normally use S_LESSTHAN and S_GREATERTHAN, but w2k3 returns numbers like 3 and -3... diff --git a/modules/rostests/apitests/shell32/CShellLink.cpp b/modules/rostests/apitests/shell32/CShellLink.cpp index 223ad5bfde2..67e72405091 100644 --- a/modules/rostests/apitests/shell32/CShellLink.cpp +++ b/modules/rostests/apitests/shell32/CShellLink.cpp @@ -9,6 +9,7 @@ #define NDEBUG #include <debug.h> +#include <stdio.h> #include <shellutils.h> /* Test IShellLink::SetPath with environment-variables, existing, non-existing, ...*/ diff --git a/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp b/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp index 144ce8128e0..9b7dda200bc 100644 --- a/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp +++ b/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp @@ -9,8 +9,7 @@ #include <wincon.h> #include <wingdi.h> - -ULONG DbgPrint(PCH Format,...); +#include <stdio.h> #include <shellutils.h> HRESULT (STDAPICALLTYPE *pSHCreateFileExtractIconW)(LPCWSTR pszFile, DWORD dwFileAttributes, REFIID riid, void **ppv); diff --git a/modules/rostests/apitests/shell32/ShellState.cpp b/modules/rostests/apitests/shell32/ShellState.cpp index 94a4a38cff6..fb79eccab98 100644 --- a/modules/rostests/apitests/shell32/ShellState.cpp +++ b/modules/rostests/apitests/shell32/ShellState.cpp @@ -8,6 +8,7 @@ #define NDEBUG #include <debug.h> +#include <stdio.h> #include <shellutils.h> #include <strsafe.h> diff --git a/sdk/include/reactos/shellutils.h b/sdk/include/reactos/shellutils.h index f7f6bd03353..2f5d72ece0f 100644 --- a/sdk/include/reactos/shellutils.h +++ b/sdk/include/reactos/shellutils.h @@ -23,6 +23,42 @@ extern "C" { #endif /* defined(__cplusplus) */ +static inline ULONG +Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) +{ + char szMsg[512]; + char *szMsgStart; + const char *fname; + va_list vl; + ULONG uRet; + + fname = strrchr(filename, '\\'); + if (fname == NULL) + { + fname = strrchr(filename, '/'); + if (fname != NULL) + fname++; + } + else + fname++; + + if (fname == NULL) + fname = filename; + + szMsgStart = szMsg + sprintf(szMsg, "%s:%d: ", fname, line); + + va_start(vl, lpFormat); + uRet = (ULONG) vsprintf(szMsgStart, lpFormat, vl); + va_end(vl); + + OutputDebugStringA(szMsg); + + return uRet; +} + +#define DbgPrint(fmt, ...) \ + Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__) + #ifdef __cplusplus # define IID_PPV_ARG(Itype, ppType) IID_##Itype, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) # define IID_NULL_PPV_ARG(Itype, ppType) IID_##Itype, NULL, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) @@ -372,6 +408,103 @@ HRESULT inline SHSetStrRet(LPSTRRET pStrRet, HINSTANCE hInstance, DWORD resId) return SHSetStrRet(pStrRet, Buffer); } +static inline void DbgDumpMenuInternal(HMENU hmenu, char* padding, int padlevel) +{ + WCHAR label[128]; + int i; + int count = GetMenuItemCount(hmenu); + + padding[padlevel] = '.'; + padding[padlevel + 1] = '.'; + padding[padlevel + 2] = 0; + + for (i = 0; i < count; i++) + { + MENUITEMINFOW mii = { 0 }; + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STRING | MIIM_FTYPE | MIIM_SUBMENU | MIIM_STATE | MIIM_ID; + mii.dwTypeData = label; + mii.cch = _countof(label); + + GetMenuItemInfoW(hmenu, i, TRUE, &mii); + + if (mii.fType & MFT_BITMAP) + DbgPrint("%s%2d - %08x: BITMAP %08p (state=%d, has submenu=%s)\n", padding, i, mii.wID, mii.hbmpItem, mii.fState, mii.hSubMenu ? "TRUE" : "FALSE"); + else if (mii.fType & MFT_SEPARATOR) + DbgPrint("%s%2d - %08x ---SEPARATOR---\n", padding, i, mii.wID); + else + DbgPrint("%s%2d - %08x: %S (state=%d, has submenu=%s)\n", padding, i, mii.wID, mii.dwTypeData, mii.fState, mii.hSubMenu ? "TRUE" : "FALSE"); + + if (mii.hSubMenu) + DbgDumpMenuInternal(mii.hSubMenu, padding, padlevel + 2); + + } + + padding[padlevel] = 0; +} + +static __inline void DbgDumpMenu(HMENU hmenu) +{ + char padding[128]; + DbgDumpMenuInternal(hmenu, padding, 0); +} + + +static inline +void DumpIdList(LPCITEMIDLIST pcidl) +{ + DbgPrint("Begin IDList Dump\n"); + + for (; pcidl != NULL; pcidl = ILGetNext(pcidl)) + { + int i; + int cb = pcidl->mkid.cb; + BYTE * sh = (BYTE*) &(pcidl->mkid); + if (cb == 0) // ITEMIDLISTs are terminatedwith a null SHITEMID. + break; + DbgPrint("Begin SHITEMID (cb=%d)\n", cb); + if ((cb & 3) != 0) + DbgPrint(" - WARNING: cb is not a multiple of 4\n"); + for (i = 0; (i + 4) <= cb; i += 4) + { + DbgPrint(" - abID[%08x]: %02x %02x %02x %02x\n", + i, + sh[i + 0], + sh[i + 1], + sh[i + 2], + sh[i + 3]); + } + if (i < cb) + { + cb -= i; + if (cb == 3) + { + DbgPrint(" - abID[%08x]: %02x %02x %02x --\n", + i, + sh[i + 0], + sh[i + 1], + sh[i + 2]); + } + else if (cb == 2) + { + DbgPrint(" - abID[%08x]: %02x %02x -- --\n", + i, + sh[i + 0], + sh[i + 1]); + } + else if (cb == 1) + { + DbgPrint(" - abID[%08x]: %02x -- -- --\n", + i, + sh[i + 0]); + } + } + DbgPrint("End SHITEMID\n"); + } + DbgPrint("End IDList Dump.\n"); +} + #endif /* __cplusplus */ #define S_LESSTHAN 0xffff diff --git a/sdk/include/reactos/traycmd.h b/sdk/include/reactos/traycmd.h deleted file mode 100644 index 7273caaa373..00000000000 --- a/sdk/include/reactos/traycmd.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Tray Commands - * - * Copyright 2018 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> - * - * this library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * this library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef TRAYCMD_H_ -#define TRAYCMD_H_ - -/* TODO: Add more and implement them */ -#define TRAYCMD_STARTMENU 305 /* Same as IDMA_START. */ -#define TRAYCMD_RUN_DIALOG 401 /* Implemented. Same as IDM_RUN. */ -#define TRAYCMD_LOGOFF_DIALOG 402 /* Implemented. Same as IDM_LOGOFF. */ -#define TRAYCMD_CASCADE 403 /* */ -#define TRAYCMD_TILE_H 404 /* */ -#define TRAYCMD_TILE_V 405 /* */ -#define TRAYCMD_TOGGLE_DESKTOP 407 /* Implemented. */ -#define TRAYCMD_DATE_AND_TIME 408 /* Implemented. */ -#define TRAYCMD_TASKBAR_PROPERTIES 413 /* Implemented. Same as IDM_TASKBARANDSTARTMENU. */ -#define TRAYCMD_MINIMIZE_ALL 415 /* Implemented. */ -#define TRAYCMD_RESTORE_ALL 416 /* Implemented. Same as IDMA_RESTORE_OPEN. */ -#define TRAYCMD_SHOW_DESKTOP 419 /* Implemented. */ -#define TRAYCMD_SHOW_TASK_MGR 420 /* Implemented. */ -#define TRAYCMD_CUSTOMIZE_TASKBAR 421 /* */ -#define TRAYCMD_LOCK_TASKBAR 424 /* Implemented. */ -#define TRAYCMD_HELP_AND_SUPPORT 503 /* Implemented. Same as IDM_HELPANDSUPPORT. */ -#define TRAYCMD_CONTROL_PANEL 505 /* Same as IDM_CONTROLPANEL. */ -#define TRAYCMD_SHUTDOWN_DIALOG 506 /* Implemented. Same as IDM_SHUTDOWN. */ -#define TRAYCMD_PRINTERS_AND_FAXES 510 /* Same as IDM_PRINTERSANDFAXES. */ -#define TRAYCMD_LOCK_DESKTOP 517 /* */ -#define TRAYCMD_SWITCH_USER_DIALOG 5000 /* */ -#define TRAYCMD_SEARCH_FILES 41093 /* Implemented. Same as IDMA_SEARCH. */ -#define TRAYCMD_SEARCH_COMPUTERS 41094 /* Implemented. */ - -#endif /* ndef TRAYCMD_H_ */ diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index a93fcdd0706..570c69d806d 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -618,140 +618,6 @@ BOOL WINAPI GUIDFromStringW( _Out_ LPGUID pguid ); -static inline ULONG -Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) -{ - char szMsg[512]; - char *szMsgStart; - const char *fname; - va_list vl; - ULONG uRet; - - fname = strrchr(filename, '\\'); - if (fname == NULL) - { - fname = strrchr(filename, '/'); - if (fname != NULL) - fname++; - } - else - fname++; - - if (fname == NULL) - fname = filename; - - szMsgStart = szMsg + sprintf(szMsg, "%s:%d: ", fname, line); - - va_start(vl, lpFormat); - uRet = (ULONG) vsprintf(szMsgStart, lpFormat, vl); - va_end(vl); - - OutputDebugStringA(szMsg); - - return uRet; -} - -#define DbgPrint(fmt, ...) \ - Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__) - -static inline void DbgDumpMenuInternal(HMENU hmenu, char* padding, int padlevel) -{ - WCHAR label[128]; - int i; - int count = GetMenuItemCount(hmenu); - - padding[padlevel] = '.'; - padding[padlevel + 1] = '.'; - padding[padlevel + 2] = 0; - - for (i = 0; i < count; i++) - { - MENUITEMINFOW mii = { 0 }; - - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STRING | MIIM_FTYPE | MIIM_SUBMENU | MIIM_STATE | MIIM_ID; - mii.dwTypeData = label; - mii.cch = _countof(label); - - GetMenuItemInfoW(hmenu, i, TRUE, &mii); - - if (mii.fType & MFT_BITMAP) - DbgPrint("%s%2d - %08x: BITMAP %08p (state=%d, has submenu=%s)\n", padding, i, mii.wID, mii.hbmpItem, mii.fState, mii.hSubMenu ? "TRUE" : "FALSE"); - else if (mii.fType & MFT_SEPARATOR) - DbgPrint("%s%2d - %08x ---SEPARATOR---\n", padding, i, mii.wID); - else - DbgPrint("%s%2d - %08x: %S (state=%d, has submenu=%s)\n", padding, i, mii.wID, mii.dwTypeData, mii.fState, mii.hSubMenu ? "TRUE" : "FALSE"); - - if (mii.hSubMenu) - DbgDumpMenuInternal(mii.hSubMenu, padding, padlevel + 2); - - } - - padding[padlevel] = 0; -} - -static __inline void DbgDumpMenu(HMENU hmenu) -{ - char padding[128]; - DbgDumpMenuInternal(hmenu, padding, 0); -} - - -static inline -void DumpIdList(LPCITEMIDLIST pcidl) -{ - DbgPrint("Begin IDList Dump\n"); - - for (; pcidl != NULL; pcidl = ILGetNext(pcidl)) - { - int i; - int cb = pcidl->mkid.cb; - BYTE * sh = (BYTE*) &(pcidl->mkid); - if (cb == 0) // ITEMIDLISTs are terminatedwith a null SHITEMID. - break; - DbgPrint("Begin SHITEMID (cb=%d)\n", cb); - if ((cb & 3) != 0) - DbgPrint(" - WARNING: cb is not a multiple of 4\n"); - for (i = 0; (i + 4) <= cb; i += 4) - { - DbgPrint(" - abID[%08x]: %02x %02x %02x %02x\n", - i, - sh[i + 0], - sh[i + 1], - sh[i + 2], - sh[i + 3]); - } - if (i < cb) - { - cb -= i; - if (cb == 3) - { - DbgPrint(" - abID[%08x]: %02x %02x %02x --\n", - i, - sh[i + 0], - sh[i + 1], - sh[i + 2]); - } - else if (cb == 2) - { - DbgPrint(" - abID[%08x]: %02x %02x -- --\n", - i, - sh[i + 0], - sh[i + 1]); - } - else if (cb == 1) - { - DbgPrint(" - abID[%08x]: %02x -- -- --\n", - i, - sh[i + 0]); - } - } - DbgPrint("End SHITEMID\n"); - } - DbgPrint("End IDList Dump.\n"); -} - - /***************************************************************************** * Shell32 resources */ @@ -785,6 +651,31 @@ void DumpIdList(LPCITEMIDLIST pcidl) #define SMSET_UNKNOWN08 0x08 #define SMSET_UNKNOWN10 0x10 +// explorer tray commands +#define TRAYCMD_STARTMENU 305 +#define TRAYCMD_RUN_DIALOG 401 +#define TRAYCMD_LOGOFF_DIALOG 402 +#define TRAYCMD_CASCADE 403 +#define TRAYCMD_TILE_H 404 +#define TRAYCMD_TILE_V 405 +#define TRAYCMD_TOGGLE_DESKTOP 407 +#define TRAYCMD_DATE_AND_TIME 408 +#define TRAYCMD_TASKBAR_PROPERTIES 413 +#define TRAYCMD_MINIMIZE_ALL 415 +#define TRAYCMD_RESTORE_ALL 416 +#define TRAYCMD_SHOW_DESKTOP 419 +#define TRAYCMD_SHOW_TASK_MGR 420 +#define TRAYCMD_CUSTOMIZE_TASKBAR 421 +#define TRAYCMD_LOCK_TASKBAR 424 +#define TRAYCMD_HELP_AND_SUPPORT 503 +#define TRAYCMD_CONTROL_PANEL 505 +#define TRAYCMD_SHUTDOWN_DIALOG 506 +#define TRAYCMD_PRINTERS_AND_FAXES 510 +#define TRAYCMD_LOCK_DESKTOP 517 +#define TRAYCMD_SWITCH_USER_DIALOG 5000 +#define TRAYCMD_SEARCH_FILES 41093 +#define TRAYCMD_SEARCH_COMPUTERS 41094 + void WINAPI ShellDDEInit(BOOL bInit); DWORD WINAPI WinList_Init(void);

1 0

[reactos] 01/01: [NETAPI32] Fix a typo in DsDeregisterDnsHostRecordsA
by Eric Kohl 25 Aug '19

25 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=121f0a5c50f4cf5bde88f… commit 121f0a5c50f4cf5bde88f79e05c298159ba54877 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 25 11:15:00 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 25 11:15:00 2019 +0200 [NETAPI32] Fix a typo in DsDeregisterDnsHostRecordsA Thank you very much UserNT and Thomas for the hint! --- dll/win32/netapi32/netlogon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/netapi32/netlogon.c b/dll/win32/netapi32/netlogon.c index 73a0324f0fa..539d0c1f64d 100644 --- a/dll/win32/netapi32/netlogon.c +++ b/dll/win32/netapi32/netlogon.c @@ -341,7 +341,7 @@ DsDeregisterDnsHostRecordsA( } } - pDnsHostNameW = NetpAllocWStrFromAnsiStr((PSTR)DnsDomainName); + pDnsHostNameW = NetpAllocWStrFromAnsiStr((PSTR)DnsHostName); if (pDnsHostNameW == NULL) { status = ERROR_NOT_ENOUGH_MEMORY;

1 0

[reactos] 01/01: [SETUPLIB][USETUP] Fix build about switch
by Katayama Hirofumi MZ 25 Aug '19

25 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfea773ee564e51769788… commit bfea773ee564e51769788d4b7608b771e7680f9a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 25 12:07:31 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Aug 25 12:07:31 2019 +0900 [SETUPLIB][USETUP] Fix build about switch --- base/setup/usetup/usetup.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 9f4f6b2a6d4..921347caa0f 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -5106,6 +5106,9 @@ RunUSetup(VOID) case REBOOT_PAGE: case RECOVERY_PAGE: break; + + default: + break; } }

1 0

Jump to page:

2025

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