Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 01/01: [SHELL32] CDefView: Improve the context menu positioning Previously we would always show a menu on the focused item, but this should only be done when it is also selected.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c96ba1aff2a681184f9ae… commit c96ba1aff2a681184f9aefd66327224d59e7d08a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Aug 8 21:01:19 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 11:28:31 2019 +0200 [SHELL32] CDefView: Improve the context menu positioning Previously we would always show a menu on the focused item, but this should only be done when it is also selected. --- dll/win32/shell32/CDefView.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index df076f5263a..acaa2e66383 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1443,15 +1443,19 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b /* There is no position requested, so try to find one */ if (lParam == ~0) { - int lvIndex; + HWND hFocus = ::GetFocus(); + int lvIndex = -1; POINT pt; - /* Do we have a focused item, */ - if ((lvIndex = m_ListView.GetNextItem(-1, LVIS_FOCUSED)) < 0) + if (hFocus == m_ListView.m_hWnd || m_ListView.IsChild(hFocus)) { - /* or a selected item? */ - lvIndex = m_ListView.GetNextItem(-1, LVIS_SELECTED); + /* Is there an item focused and selected? */ + lvIndex = m_ListView.GetNextItem(-1, LVIS_SELECTED|LVIS_FOCUSED); + /* If not, find the first selected item */ + if (lvIndex < 0) + lvIndex = m_ListView.GetNextItem(-1, LVIS_SELECTED); } + /* We got something */ if (lvIndex > -1) {

5 years, 4 months

[reactos] 01/01: [WININET_APITEST] Add Download testcase (#1832)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7464241adabfbdfec5a05… commit 7464241adabfbdfec5a058697632a8d3938479fb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 15 17:50:57 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 15 17:50:57 2019 +0900 [WININET_APITEST] Add Download testcase (#1832) CORE-16310 --- modules/rostests/apitests/wininet/CMakeLists.txt | 4 +- modules/rostests/apitests/wininet/Download.c | 83 ++++++++++++++++++++++++ modules/rostests/apitests/wininet/testlist.c | 2 + 3 files changed, 87 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/wininet/CMakeLists.txt b/modules/rostests/apitests/wininet/CMakeLists.txt index fb18c91ac17..45baa402dda 100644 --- a/modules/rostests/apitests/wininet/CMakeLists.txt +++ b/modules/rostests/apitests/wininet/CMakeLists.txt @@ -1,7 +1,7 @@ -add_executable(wininet_apitest InternetOpen.c testlist.c) +add_executable(wininet_apitest Download.c InternetOpen.c testlist.c) target_link_libraries(wininet_apitest wine) set_module_type(wininet_apitest win32cui) #add_delay_importlibs(wininet_apitest wininet) -add_importlibs(wininet_apitest msvcrt kernel32 ntdll) +add_importlibs(wininet_apitest wininet msvcrt kernel32 ntdll) add_rostests_file(TARGET wininet_apitest) diff --git a/modules/rostests/apitests/wininet/Download.c b/modules/rostests/apitests/wininet/Download.c new file mode 100644 index 00000000000..307f532f065 --- /dev/null +++ b/modules/rostests/apitests/wininet/Download.c @@ -0,0 +1,83 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: wininet Download testcase + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#include <apitest.h> +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <windef.h> +#include <wininet.h> + +#define FILENAME "download-testdata.txt" +#define TESTDATA "This is a test data.\r\n" + +static void DoDownload1(const char *url, const char *filename) +{ + HANDLE hFile; + HINTERNET hInternet, hConnect; + static const char s_header[] = "Accept: */" "*\r\n\r\n"; + BYTE buffer[256]; + DWORD cbRead; + BOOL ret; + + hFile = CreateFileA(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(hFile != INVALID_HANDLE_VALUE, "hFile was INVALID_HANDLE_VALUE.\n"); + + hInternet = InternetOpenA(NULL, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + ok(hInternet != NULL, "hInternet was NULL.\n"); + + hConnect = InternetOpenUrlA(hInternet, url, s_header, lstrlenA(s_header), + INTERNET_FLAG_DONT_CACHE, 0); + ok(hConnect != NULL, "hConnect was NULL.\n"); + + for (;;) + { + Sleep(100); + + ret = InternetReadFile(hConnect, buffer, ARRAYSIZE(buffer), &cbRead); + if (!ret || !cbRead) + break; + + if (!WriteFile(hFile, buffer, cbRead, &cbRead, NULL)) + { + ok(0, "WriteFile returns FALSE.\n"); + break; + } + } + + ok_int(InternetCloseHandle(hConnect), TRUE); + ok_int(InternetCloseHandle(hInternet), TRUE); + CloseHandle(hFile); +} + +static void DoDownload2(const char *url, const char *filename) +{ + FILE *fp; + char buf[256]; + DoDownload1(url, filename); + ok_int(GetFileAttributesA(FILENAME) != INVALID_FILE_ATTRIBUTES, TRUE); + fp = fopen(FILENAME, "rb"); + ok(fp != NULL, "fp was NULL.\n"); + ok(fgets(buf, ARRAYSIZE(buf), fp) != NULL, "fgets failed.\n"); + ok_str(buf, TESTDATA); + fclose(fp); + DeleteFileA(FILENAME); +} + +START_TEST(Download) +{ + // https://tinyurl.com/y4cpy2fu + // --> + // https://raw.githubusercontent.com/katahiromz/downloads/master/download-test… + DoDownload2("https://tinyurl.com/y4cpy2fu", FILENAME); + + DoDownload2( + "https://raw.githubusercontent.com/katahiromz/downloads/master/download-test…", + FILENAME); +} diff --git a/modules/rostests/apitests/wininet/testlist.c b/modules/rostests/apitests/wininet/testlist.c index 16c84d6f87f..801c8c4d42e 100644 --- a/modules/rostests/apitests/wininet/testlist.c +++ b/modules/rostests/apitests/wininet/testlist.c @@ -3,10 +3,12 @@ #define STANDALONE #include <apitest.h> +extern void func_Download(void); extern void func_InternetOpen(void); const struct test winetest_testlist[] = { + { "Download", func_Download }, { "InternetOpen", func_InternetOpen }, { 0, 0 }

5 years, 4 months

[reactos] 01/01: [MEDIA][FONTS] Add Baltic MS Sans Serif (ssee1257.fon) CORE-16166

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9990169aaa7f5b3530dbb… commit 9990169aaa7f5b3530dbbb768431511eb9c1d13d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 15 10:23:50 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Aug 15 10:24:20 2019 +0900 [MEDIA][FONTS] Add Baltic MS Sans Serif (ssee1257.fon) CORE-16166 --- media/fonts/CMakeLists.txt | 1 + media/fonts/ssee1257.fon | Bin 0 -> 65424 bytes 2 files changed, 1 insertion(+) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index bc4a5bf3191..f445391bb3b 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -151,6 +151,7 @@ list(APPEND FONT_FILES SourceCodePro-SemiboldIt.ttf #ssee1255.fon #ssee1256.fon + #ssee1257.fon #sserife.fon #sserifeg.fon #sserifer.fon diff --git a/media/fonts/ssee1257.fon b/media/fonts/ssee1257.fon new file mode 100644 index 00000000000..ee1bbcda616 Binary files /dev/null and b/media/fonts/ssee1257.fon differ

5 years, 4 months

[reactos] 01/01: [FREELDR] Minor fixes.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=423d1e2e091ba08b08925… commit 423d1e2e091ba08b08925bf35985d7440a4a8fb3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 14 15:59:01 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 14 16:36:50 2019 +0200 [FREELDR] Minor fixes. - Add some forgotten, or move some misplaced ArcClose() calls so as to avoid leakages in failure paths. (Thanks to Serge Gautherie for having caught some of them.) - Simplify some code; remove unneeded casts; use string-safe functions. --- boot/freeldr/freeldr/lib/inifile/ini_init.c | 1 + boot/freeldr/freeldr/miscboot.c | 19 ++-- boot/freeldr/freeldr/ntldr/wlregistry.c | 129 +++++++++++++--------------- 3 files changed, 74 insertions(+), 75 deletions(-) diff --git a/boot/freeldr/freeldr/lib/inifile/ini_init.c b/boot/freeldr/freeldr/lib/inifile/ini_init.c index 52a24bcdfdc..f9c7e1c26ad 100644 --- a/boot/freeldr/freeldr/lib/inifile/ini_init.c +++ b/boot/freeldr/freeldr/lib/inifile/ini_init.c @@ -63,6 +63,7 @@ BOOLEAN IniFileInitialize(VOID) if (Status != ESUCCESS || FileInformation.EndingAddress.HighPart != 0) { UiMessageBoxCritical("Error while getting informations about freeldr.ini.\nYou need to re-install FreeLoader."); + ArcClose(FileId); return FALSE; } FreeLoaderIniFileSize = FileInformation.EndingAddress.LowPart; diff --git a/boot/freeldr/freeldr/miscboot.c b/boot/freeldr/freeldr/miscboot.c index 535f9d6efab..f7a0e2a912e 100644 --- a/boot/freeldr/freeldr/miscboot.c +++ b/boot/freeldr/freeldr/miscboot.c @@ -31,6 +31,7 @@ LoadAndBootBootSector( IN PCHAR Argv[], IN PCHAR Envp[]) { + ARC_STATUS Status; PCSTR FileName; ULONG FileId; ULONG BytesRead; @@ -54,14 +55,14 @@ LoadAndBootBootSector( } /* Read boot sector */ - if ((ArcRead(FileId, (PVOID)0x7c00, 512, &BytesRead) != ESUCCESS) || (BytesRead != 512)) + Status = ArcRead(FileId, (PVOID)0x7c00, 512, &BytesRead); + ArcClose(FileId); + if ((Status != ESUCCESS) || (BytesRead != 512)) { UiMessageBox("Unable to read boot sector."); return EIO; } - ArcClose(FileId); - /* Check for validity */ if (*((USHORT*)(0x7c00 + 0x1fe)) != 0xaa55) { @@ -93,6 +94,7 @@ LoadAndBootPartitionOrDrive( IN UCHAR DriveNumber, IN ULONG PartitionNumber OPTIONAL) { + ARC_STATUS Status; ULONG FileId; ULONG BytesRead; CHAR ArcPath[MAX_PATH]; @@ -100,7 +102,10 @@ LoadAndBootPartitionOrDrive( /* Construct the corresponding ARC path */ ConstructArcPath(ArcPath, "", DriveNumber, PartitionNumber); *strrchr(ArcPath, '\\') = ANSI_NULL; // Trim the trailing path separator. - if (ArcOpen(ArcPath, OpenReadOnly, &FileId) != ESUCCESS) + + /* Open the volume */ + Status = ArcOpen(ArcPath, OpenReadOnly, &FileId); + if (Status != ESUCCESS) { UiMessageBox("Unable to open %s", ArcPath); return ENOENT; @@ -110,7 +115,9 @@ LoadAndBootPartitionOrDrive( * Now try to read the partition boot sector or the MBR (when PartitionNumber == 0). * If this fails then abort. */ - if ((ArcRead(FileId, (PVOID)0x7c00, 512, &BytesRead) != ESUCCESS) || (BytesRead != 512)) + Status = ArcRead(FileId, (PVOID)0x7c00, 512, &BytesRead); + ArcClose(FileId); + if ((Status != ESUCCESS) || (BytesRead != 512)) { if (PartitionNumber != 0) UiMessageBox("Unable to read partition's boot sector."); @@ -119,8 +126,6 @@ LoadAndBootPartitionOrDrive( return EIO; } - ArcClose(FileId); - /* Check for validity */ if (*((USHORT*)(0x7c00 + 0x1fe)) != 0xaa55) { diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index 1e39ec78961..c4a3e0ba9c9 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -41,14 +41,14 @@ WinLdrLoadSystemHive( ARC_STATUS Status; FILEINFORMATION FileInfo; ULONG HiveFileSize; - ULONG_PTR HiveDataPhysical; + PVOID HiveDataPhysical; PVOID HiveDataVirtual; ULONG BytesRead; PCWSTR FsService; /* Concatenate path and filename to get the full name */ - strcpy(FullHiveName, DirectoryPath); - strcat(FullHiveName, HiveName); + RtlStringCbCopyA(FullHiveName, sizeof(FullHiveName), DirectoryPath); + RtlStringCbCatA(FullHiveName, sizeof(FullHiveName), HiveName); Status = ArcOpen(FullHiveName, OpenReadOnly, &FileId); if (Status != ESUCCESS) @@ -69,11 +69,11 @@ WinLdrLoadSystemHive( HiveFileSize = FileInfo.EndingAddress.LowPart; /* Round up the size to page boundary and alloc memory */ - HiveDataPhysical = (ULONG_PTR)MmAllocateMemoryWithType( + HiveDataPhysical = MmAllocateMemoryWithType( MM_SIZE_TO_PAGES(HiveFileSize + MM_PAGE_SIZE - 1) << MM_PAGE_SHIFT, LoaderRegistryData); - if (HiveDataPhysical == 0) + if (HiveDataPhysical == NULL) { ArcClose(FileId); UiMessageBox("Unable to alloc memory for a hive!"); @@ -81,14 +81,14 @@ WinLdrLoadSystemHive( } /* Convert address to virtual */ - HiveDataVirtual = PaToVa((PVOID)HiveDataPhysical); + HiveDataVirtual = PaToVa(HiveDataPhysical); /* Fill LoaderBlock's entries */ LoaderBlock->RegistryLength = HiveFileSize; LoaderBlock->RegistryBase = HiveDataVirtual; /* Finally read from file to the memory */ - Status = ArcRead(FileId, (PVOID)HiveDataPhysical, HiveFileSize, &BytesRead); + Status = ArcRead(FileId, HiveDataPhysical, HiveFileSize, &BytesRead); if (Status != ESUCCESS) { ArcClose(FileId); @@ -131,7 +131,7 @@ WinLdrInitSystemHive( if (Setup) { - strcpy(SearchPath, SystemRoot); + RtlStringCbCopyA(SearchPath, sizeof(SearchPath), SystemRoot); HiveName = "SETUPREG.HIV"; } else @@ -140,8 +140,8 @@ WinLdrInitSystemHive( // fails, then give system.alt a try, and finally try a system.sav // FIXME: For now we only try system - strcpy(SearchPath, SystemRoot); - strcat(SearchPath, "system32\\config\\"); + RtlStringCbCopyA(SearchPath, sizeof(SearchPath), SystemRoot); + RtlStringCbCatA(SearchPath, sizeof(SearchPath), "system32\\config\\"); HiveName = "SYSTEM"; } @@ -191,8 +191,8 @@ BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, TRACE("NLS data %s %s %s\n", AnsiName, OemName, LangName); /* Load NLS data */ - strcpy(SearchPath, SystemRoot); - strcat(SearchPath, "system32\\"); + RtlStringCbCopyA(SearchPath, sizeof(SearchPath), SystemRoot); + RtlStringCbCatA(SearchPath, sizeof(SearchPath), "system32\\"); Success = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); TRACE("NLS data loading %s\n", Success ? "successful" : "failed"); @@ -224,7 +224,7 @@ WinLdrGetNLSNames(PSTR AnsiName, &hKey); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "Couldn't open CodePage registry key"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't open CodePage registry key"); return FALSE; } @@ -233,7 +233,7 @@ WinLdrGetNLSNames(PSTR AnsiName, rc = RegQueryValue(hKey, L"ACP", NULL, (PUCHAR)szIdBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "Couldn't get ACP NLS setting"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't get ACP NLS setting"); return FALSE; } @@ -241,7 +241,7 @@ WinLdrGetNLSNames(PSTR AnsiName, rc = RegQueryValue(hKey, szIdBuffer, NULL, (PUCHAR)NameBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "ACP NLS Setting exists, but isn't readable"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "ACP NLS Setting exists, but isn't readable"); //return FALSE; wcscpy(NameBuffer, L"c_1252.nls"); // HACK: ReactOS bug CORE-6105 } @@ -252,7 +252,7 @@ WinLdrGetNLSNames(PSTR AnsiName, rc = RegQueryValue(hKey, L"OEMCP", NULL, (PUCHAR)szIdBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "Couldn't get OEMCP NLS setting"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't get OEMCP NLS setting"); return FALSE; } @@ -260,7 +260,7 @@ WinLdrGetNLSNames(PSTR AnsiName, rc = RegQueryValue(hKey, szIdBuffer, NULL, (PUCHAR)NameBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "OEMCP NLS setting exists, but isn't readable"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "OEMCP NLS setting exists, but isn't readable"); //return FALSE; wcscpy(NameBuffer, L"c_437.nls"); // HACK: ReactOS bug CORE-6105 } @@ -272,7 +272,7 @@ WinLdrGetNLSNames(PSTR AnsiName, &hKey); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "Couldn't open Language registry key"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't open Language registry key"); return FALSE; } @@ -281,7 +281,7 @@ WinLdrGetNLSNames(PSTR AnsiName, rc = RegQueryValue(hKey, L"Default", NULL, (PUCHAR)szIdBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "Couldn't get Language Default setting"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't get Language Default setting"); return FALSE; } @@ -289,7 +289,7 @@ WinLdrGetNLSNames(PSTR AnsiName, rc = RegQueryValue(hKey, szIdBuffer, NULL, (PUCHAR)NameBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "Language Default setting exists, but isn't readable"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Language Default setting exists, but isn't readable"); return FALSE; } sprintf(LangName, "%S", NameBuffer); @@ -305,12 +305,10 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, IN PCSTR LanguageFileName) { CHAR FileName[255]; - ULONG AnsiFileId; - ULONG OemFileId; - ULONG LanguageFileId; + ULONG FileId; ULONG AnsiFileSize, OemFileSize, LanguageFileSize; ULONG TotalSize; - ULONG_PTR NlsDataBase; + PVOID NlsDataBase; PVOID NlsVirtual; BOOLEAN AnsiEqualsOem = FALSE; FILEINFORMATION FileInfo; @@ -322,21 +320,21 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, AnsiEqualsOem = TRUE; /* Open file with ANSI and store its size */ - strcpy(FileName, DirectoryPath); - strcat(FileName, AnsiFileName); - Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); + RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); + RtlStringCbCatA(FileName, sizeof(FileName), AnsiFileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; } - Status = ArcGetFileInformation(AnsiFileId, &FileInfo); + Status = ArcGetFileInformation(FileId, &FileInfo); + ArcClose(FileId); if (Status != ESUCCESS) goto Failure; AnsiFileSize = FileInfo.EndingAddress.LowPart; TRACE("AnsiFileSize: %d\n", AnsiFileSize); - ArcClose(AnsiFileId); /* Open OEM file and store its length */ if (AnsiEqualsOem) @@ -346,128 +344,123 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, else { //Print(L"Loading %s...\n", Filename); - strcpy(FileName, DirectoryPath); - strcat(FileName, OemFileName); - Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); + RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); + RtlStringCbCatA(FileName, sizeof(FileName), OemFileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; } - Status = ArcGetFileInformation(OemFileId, &FileInfo); + Status = ArcGetFileInformation(FileId, &FileInfo); + ArcClose(FileId); if (Status != ESUCCESS) goto Failure; OemFileSize = FileInfo.EndingAddress.LowPart; - ArcClose(OemFileId); } TRACE("OemFileSize: %d\n", OemFileSize); /* And finally open the language codepage file and store its length */ //Print(L"Loading %s...\n", Filename); - strcpy(FileName, DirectoryPath); - strcat(FileName, LanguageFileName); - Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); + RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); + RtlStringCbCatA(FileName, sizeof(FileName), LanguageFileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; } - Status = ArcGetFileInformation(LanguageFileId, &FileInfo); + Status = ArcGetFileInformation(FileId, &FileInfo); + ArcClose(FileId); if (Status != ESUCCESS) goto Failure; LanguageFileSize = FileInfo.EndingAddress.LowPart; - ArcClose(LanguageFileId); TRACE("LanguageFileSize: %d\n", LanguageFileSize); /* Sum up all three length, having in mind that every one of them must start at a page boundary => thus round up each file to a page */ TotalSize = MM_SIZE_TO_PAGES(AnsiFileSize) + - MM_SIZE_TO_PAGES(OemFileSize) + - MM_SIZE_TO_PAGES(LanguageFileSize); + MM_SIZE_TO_PAGES(OemFileSize) + + MM_SIZE_TO_PAGES(LanguageFileSize); /* Store it for later marking the pages as NlsData type */ TotalNLSSize = TotalSize; - NlsDataBase = (ULONG_PTR)MmAllocateMemoryWithType(TotalSize*MM_PAGE_SIZE, LoaderNlsData); - - if (NlsDataBase == 0) + NlsDataBase = MmAllocateMemoryWithType(TotalSize*MM_PAGE_SIZE, LoaderNlsData); + if (NlsDataBase == NULL) goto Failure; - NlsVirtual = PaToVa((PVOID)NlsDataBase); + NlsVirtual = PaToVa(NlsDataBase); LoaderBlock->NlsData->AnsiCodePageData = NlsVirtual; - LoaderBlock->NlsData->OemCodePageData = (PVOID)((PUCHAR)NlsVirtual + + LoaderBlock->NlsData->OemCodePageData = (PVOID)((ULONG_PTR)NlsVirtual + (MM_SIZE_TO_PAGES(AnsiFileSize) << MM_PAGE_SHIFT)); - LoaderBlock->NlsData->UnicodeCodePageData = (PVOID)((PUCHAR)NlsVirtual + + LoaderBlock->NlsData->UnicodeCodePageData = (PVOID)((ULONG_PTR)NlsVirtual + (MM_SIZE_TO_PAGES(AnsiFileSize) << MM_PAGE_SHIFT) + - (MM_SIZE_TO_PAGES(OemFileSize) << MM_PAGE_SHIFT)); + (MM_SIZE_TO_PAGES(OemFileSize) << MM_PAGE_SHIFT)); /* Ansi and OEM data are the same - just set pointers to the same area */ if (AnsiEqualsOem) LoaderBlock->NlsData->OemCodePageData = LoaderBlock->NlsData->AnsiCodePageData; - /* Now actually read the data into memory, starting with Ansi file */ - strcpy(FileName, DirectoryPath); - strcat(FileName, AnsiFileName); - Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); + RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); + RtlStringCbCatA(FileName, sizeof(FileName), AnsiFileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; } - Status = ArcRead(AnsiFileId, VaToPa(LoaderBlock->NlsData->AnsiCodePageData), AnsiFileSize, &BytesRead); + Status = ArcRead(FileId, VaToPa(LoaderBlock->NlsData->AnsiCodePageData), AnsiFileSize, &BytesRead); + ArcClose(FileId); if (Status != ESUCCESS) { WARN("Error while reading '%s', Status: %u\n", FileName, Status); goto Failure; } - ArcClose(AnsiFileId); - /* OEM now, if it doesn't equal Ansi of course */ if (!AnsiEqualsOem) { - strcpy(FileName, DirectoryPath); - strcat(FileName, OemFileName); - Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); + RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); + RtlStringCbCatA(FileName, sizeof(FileName), OemFileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; } - Status = ArcRead(OemFileId, VaToPa(LoaderBlock->NlsData->OemCodePageData), OemFileSize, &BytesRead); + Status = ArcRead(FileId, VaToPa(LoaderBlock->NlsData->OemCodePageData), OemFileSize, &BytesRead); + ArcClose(FileId); if (Status != ESUCCESS) { WARN("Error while reading '%s', Status: %u\n", FileName, Status); goto Failure; } - - ArcClose(OemFileId); } - /* finally the language file */ - strcpy(FileName, DirectoryPath); - strcat(FileName, LanguageFileName); - Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); + /* Finally the language file */ + RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); + RtlStringCbCatA(FileName, sizeof(FileName), LanguageFileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; } - Status = ArcRead(LanguageFileId, VaToPa(LoaderBlock->NlsData->UnicodeCodePageData), LanguageFileSize, &BytesRead); + Status = ArcRead(FileId, VaToPa(LoaderBlock->NlsData->UnicodeCodePageData), LanguageFileSize, &BytesRead); + ArcClose(FileId); if (Status != ESUCCESS) { WARN("Error while reading '%s', Status: %u\n", FileName, Status); goto Failure; } - ArcClose(LanguageFileId); - // // THIS IS HAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACK // Should go to WinLdrLoadOemHalFont(), when it will be implemented

5 years, 4 months

[reactos] 01/01: [FREELDR] Minor enhancements for disk/partition boot and UI.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85d44fca5923089cd10e0… commit 85d44fca5923089cd10e03efe58c4854a2b8b176 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Aug 13 17:34:57 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 13 23:07:01 2019 +0200 [FREELDR] Minor enhancements for disk/partition boot and UI. - Factor out disk & partition opening in LoadAndBootPartition() and LoadAndBootDrive() into a LoadAndBootPartitionOrDrive() helper. - Use ARC paths and ArcOpen()/ArcRead() instead of calling the machine-specific BIOS-oriented DiskGetPartitionEntry() and MachDiskReadLogicalSectors() functions to open the disk/partition and read their boot sectors. - Don't forget to close the opened boot sector file in LoadAndBootBootSector(). - Add assertions for DiskReadBufferSize in PcMemFinalizeMemoryMap() and EnumerateHarddisks(). - x86/amd64 only: * Add a DisableA20 helper for disabling the A20 line, before rebooting back, or chain-load a boot sector, into 16-bit world. Also pulse the output port of the keyboard controller to clear out its state after having set the state of the A20 line. * In addition to disabling the A20 line when rebooting or chain-loading a boot sector, reset the video back to 80x25 text mode. - Reset the cursor position back to the origin when initializing or terminating the TUI. --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 4 +- boot/freeldr/freeldr/arch/i386/pcmem.c | 2 + boot/freeldr/freeldr/arch/realmode/helpers.inc | 35 ++++++- boot/freeldr/freeldr/disk/disk.c | 2 +- boot/freeldr/freeldr/include/arch/pc/pcbios.h | 1 - boot/freeldr/freeldr/miscboot.c | 125 ++++++++++++------------- boot/freeldr/freeldr/ui/tui.c | 2 + 7 files changed, 102 insertions(+), 69 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index 853d37f0981..fde0d8acf89 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -152,7 +152,7 @@ DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) MaxSectors = DiskReadBufferSize / Context->SectorSize; SectorOffset = Context->SectorNumber + Context->SectorOffset; - // If MaxSectors is 0, this will lead to infinite loop + // If MaxSectors is 0, this will lead to infinite loop. // In release builds assertions are disabled, however we also have sanity checks in DiskOpen() ASSERT(MaxSectors > 0); @@ -319,6 +319,8 @@ EnumerateHarddisks(OUT PBOOLEAN BootDriveReported) DiskCount = 0; DriveNumber = 0x80; + ASSERT(DiskReadBufferSize > 0); + /* * There are some really broken BIOSes out there. There are even BIOSes * that happily report success when you ask them to read from non-existent diff --git a/boot/freeldr/freeldr/arch/i386/pcmem.c b/boot/freeldr/freeldr/arch/i386/pcmem.c index 4dd709b247c..b3b5761d957 100644 --- a/boot/freeldr/freeldr/arch/i386/pcmem.c +++ b/boot/freeldr/freeldr/arch/i386/pcmem.c @@ -571,6 +571,8 @@ PcMemFinalizeMemoryMap( TRACE("DiskReadBuffer=0x%p, DiskReadBufferSize=0x%lx\n", DiskReadBuffer, DiskReadBufferSize); + ASSERT(DiskReadBufferSize > 0); + /* Now reserve the range for the disk read buffer */ ReserveMemory(MemoryMap, (ULONG_PTR)DiskReadBuffer, diff --git a/boot/freeldr/freeldr/arch/realmode/helpers.inc b/boot/freeldr/freeldr/arch/realmode/helpers.inc index 8f5db395892..981354826ae 100644 --- a/boot/freeldr/freeldr/arch/realmode/helpers.inc +++ b/boot/freeldr/freeldr/arch/realmode/helpers.inc @@ -18,6 +18,24 @@ EnableA20: mov al, HEX(0DF) // A20 on out HEX(060), al call Empty8042 + mov al, HEX(0FF) // pulse output port + out HEX(064), al + call Empty8042 + popa + ret + +DisableA20: + pusha + call Empty8042 + mov al, HEX(0D1) // command write + out HEX(064), al + call Empty8042 + mov al, HEX(0DD) // A20 off + out HEX(060), al + call Empty8042 + mov al, HEX(0FF) // pulse output port + out HEX(064), al + call Empty8042 popa ret @@ -95,6 +113,13 @@ writehex_common: Reboot: cli + /* Disable A20 address line */ + call DisableA20 + + /* Set the video back to 80x25 text mode */ + mov ax, HEX(0003) + int HEX(10) + /* Set the word at location 40h:72h to 0 (cold reboot) */ mov word ptr ds:[HEX(0472)], HEX(0) @@ -103,8 +128,16 @@ Reboot: ChainLoadBiosBootSectorCode: - /* Load segment registers */ cli + + /* Disable A20 address line */ + call DisableA20 + + /* Set the video back to 80x25 text mode */ + mov ax, HEX(0003) + int HEX(10) + + /* Load segment registers */ xor ax, ax mov ds, ax mov es, ax diff --git a/boot/freeldr/freeldr/disk/disk.c b/boot/freeldr/freeldr/disk/disk.c index 11cc0a7a63d..e9579a0beab 100644 --- a/boot/freeldr/freeldr/disk/disk.c +++ b/boot/freeldr/freeldr/disk/disk.c @@ -81,7 +81,7 @@ PCSTR DiskGetErrorCodeString(ULONG ErrorCode) case 0xE0: return "fixed disk status error/Error reg = 0"; case 0xFF: return "sense operation failed"; - default: return "unknown error code"; + default: return "unknown error code"; } } diff --git a/boot/freeldr/freeldr/include/arch/pc/pcbios.h b/boot/freeldr/freeldr/include/arch/pc/pcbios.h index 5ad273f0442..6faeb06986d 100644 --- a/boot/freeldr/freeldr/include/arch/pc/pcbios.h +++ b/boot/freeldr/freeldr/include/arch/pc/pcbios.h @@ -160,7 +160,6 @@ int __cdecl Int386(int ivec, REGS* in, REGS* out); // If CF is set then the call failed (usually) #define INT386_SUCCESS(regs) ((regs.x.eflags & EFLAGS_CF) == 0) -void EnableA20(void); VOID __cdecl ChainLoadBiosBootSectorCode(VOID); // Implemented in boot.S VOID __cdecl Reboot(VOID); // Implemented in boot.S VOID DetectHardware(VOID); // Implemented in hardware.c diff --git a/boot/freeldr/freeldr/miscboot.c b/boot/freeldr/freeldr/miscboot.c index 0d12e4bc2c6..535f9d6efab 100644 --- a/boot/freeldr/freeldr/miscboot.c +++ b/boot/freeldr/freeldr/miscboot.c @@ -54,13 +54,14 @@ LoadAndBootBootSector( } /* Read boot sector */ - if (ArcRead(FileId, (void*)0x7c00, 512, &BytesRead) != ESUCCESS || - (BytesRead != 512)) + if ((ArcRead(FileId, (PVOID)0x7c00, 512, &BytesRead) != ESUCCESS) || (BytesRead != 512)) { UiMessageBox("Unable to read boot sector."); return EIO; } + ArcClose(FileId); + /* Check for validity */ if (*((USHORT*)(0x7c00 + 0x1fe)) != 0xaa55) { @@ -81,56 +82,45 @@ LoadAndBootBootSector( * result in a read error. */ // DiskStopFloppyMotor(); - // DisableA20(); + /* NOTE: Don't touch FrldrBootDrive */ ChainLoadBiosBootSectorCode(); + Reboot(); /* Must not return! */ return ESUCCESS; } -ARC_STATUS -LoadAndBootPartition( - IN ULONG Argc, - IN PCHAR Argv[], - IN PCHAR Envp[]) +static ARC_STATUS +LoadAndBootPartitionOrDrive( + IN UCHAR DriveNumber, + IN ULONG PartitionNumber OPTIONAL) { - PCSTR ArgValue; - PARTITION_TABLE_ENTRY PartitionTableEntry; - UCHAR DriveNumber; - ULONG PartitionNumber; - - /* Find all the message box settings and run them */ - UiShowMessageBoxesInArgv(Argc, Argv); - - /* Read the boot drive */ - ArgValue = GetArgumentValue(Argc, Argv, "BootDrive"); - if (!ArgValue) - { - UiMessageBox("Boot drive not specified for selected OS!"); - return EINVAL; - } - DriveNumber = DriveMapGetBiosDriveNumber(ArgValue); - - /* Read the boot partition */ - ArgValue = GetArgumentValue(Argc, Argv, "BootPartition"); - if (!ArgValue) - { - UiMessageBox("Boot partition not specified for selected OS!"); - return EINVAL; - } - PartitionNumber = atoi(ArgValue); + ULONG FileId; + ULONG BytesRead; + CHAR ArcPath[MAX_PATH]; - /* Get the partition table entry */ - if (!DiskGetPartitionEntry(DriveNumber, PartitionNumber, &PartitionTableEntry)) + /* Construct the corresponding ARC path */ + ConstructArcPath(ArcPath, "", DriveNumber, PartitionNumber); + *strrchr(ArcPath, '\\') = ANSI_NULL; // Trim the trailing path separator. + if (ArcOpen(ArcPath, OpenReadOnly, &FileId) != ESUCCESS) { + UiMessageBox("Unable to open %s", ArcPath); return ENOENT; } - /* Now try to read the partition boot sector. If this fails then abort. */ - if (!MachDiskReadLogicalSectors(DriveNumber, PartitionTableEntry.SectorCountBeforePartition, 1, (PVOID)0x7C00)) + /* + * Now try to read the partition boot sector or the MBR (when PartitionNumber == 0). + * If this fails then abort. + */ + if ((ArcRead(FileId, (PVOID)0x7c00, 512, &BytesRead) != ESUCCESS) || (BytesRead != 512)) { - UiMessageBox("Unable to read partition's boot sector."); + if (PartitionNumber != 0) + UiMessageBox("Unable to read partition's boot sector."); + else + UiMessageBox("Unable to read MBR boot sector."); return EIO; } + ArcClose(FileId); + /* Check for validity */ if (*((USHORT*)(0x7c00 + 0x1fe)) != 0xaa55) { @@ -151,20 +141,22 @@ LoadAndBootPartition( * result in a read error. */ // DiskStopFloppyMotor(); - // DisableA20(); FrldrBootDrive = DriveNumber; + FrldrBootPartition = PartitionNumber; ChainLoadBiosBootSectorCode(); + Reboot(); /* Must not return! */ return ESUCCESS; } ARC_STATUS -LoadAndBootDrive( +LoadAndBootPartition( IN ULONG Argc, IN PCHAR Argv[], IN PCHAR Envp[]) { PCSTR ArgValue; UCHAR DriveNumber; + ULONG PartitionNumber; /* Find all the message box settings and run them */ UiShowMessageBoxesInArgv(Argc, Argv); @@ -178,37 +170,40 @@ LoadAndBootDrive( } DriveNumber = DriveMapGetBiosDriveNumber(ArgValue); - /* Now try to read the boot sector (or mbr). If this fails then abort. */ - if (!MachDiskReadLogicalSectors(DriveNumber, 0, 1, (PVOID)0x7C00)) + /* Read the boot partition */ + ArgValue = GetArgumentValue(Argc, Argv, "BootPartition"); + if (!ArgValue) { - UiMessageBox("Unable to read boot sector"); - return EIO; + UiMessageBox("Boot partition not specified for selected OS!"); + return EINVAL; } + PartitionNumber = atoi(ArgValue); - /* Check for validity */ - if (*((USHORT*)(0x7c00 + 0x1fe)) != 0xaa55) + return LoadAndBootPartitionOrDrive(DriveNumber, PartitionNumber); +} + +ARC_STATUS +LoadAndBootDrive( + IN ULONG Argc, + IN PCHAR Argv[], + IN PCHAR Envp[]) +{ + PCSTR ArgValue; + UCHAR DriveNumber; + + /* Find all the message box settings and run them */ + UiShowMessageBoxesInArgv(Argc, Argv); + + /* Read the boot drive */ + ArgValue = GetArgumentValue(Argc, Argv, "BootDrive"); + if (!ArgValue) { - UiMessageBox("Invalid boot sector magic (0xaa55)"); - return ENOEXEC; + UiMessageBox("Boot drive not specified for selected OS!"); + return EINVAL; } + DriveNumber = DriveMapGetBiosDriveNumber(ArgValue); - UiUnInitialize("Booting..."); - IniCleanup(); - - /* - * Don't stop the floppy drive motor when we - * are just booting a bootsector, or drive, or partition. - * If we were to stop the floppy motor then - * the BIOS wouldn't be informed and if the - * next read is to a floppy then the BIOS will - * still think the motor is on and this will - * result in a read error. - */ - // DiskStopFloppyMotor(); - // DisableA20(); - FrldrBootDrive = DriveNumber; - ChainLoadBiosBootSectorCode(); - return ESUCCESS; + return LoadAndBootPartitionOrDrive(DriveNumber, 0); } #endif // _M_IX86 diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index 8fd16aabc72..44f80163a5b 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -52,6 +52,7 @@ int TuiPrintf(const char *Format, ...) BOOLEAN TuiInitialize(VOID) { MachVideoHideShowTextCursor(FALSE); + MachVideoSetTextCursorPosition(0, 0); MachVideoClearScreen(ATTR(COLOR_GRAY, COLOR_BLACK)); TextVideoBuffer = VideoAllocateOffScreenBuffer(); @@ -75,6 +76,7 @@ VOID TuiUnInitialize(VOID) } MachVideoClearScreen(ATTR(COLOR_GRAY, COLOR_BLACK)); + MachVideoSetTextCursorPosition(0, 0); MachVideoHideShowTextCursor(TRUE); }

5 years, 4 months

[reactos] 01/01: [OSK] Romanian translation update (#1820)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4578ee3e2098647c8c425… commit 4578ee3e2098647c8c4254f3ceb532c0b5815176 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Aug 12 20:58:39 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 12 20:58:39 2019 +0200 [OSK] Romanian translation update (#1820) --- base/applications/osk/lang/ro-RO.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc index bc30611f975..21cae9a49d5 100644 --- a/base/applications/osk/lang/ro-RO.rc +++ b/base/applications/osk/lang/ro-RO.rc @@ -256,11 +256,11 @@ BEGIN POPUP "Tastatură" BEGIN - MENUITEM "Tastatură îmbunătățită", IDM_ENHANCED_KB, CHECKED + MENUITEM "Tastatură extinsă", IDM_ENHANCED_KB, CHECKED MENUITEM "Tastatură standard", IDM_STANDARD_KB MENUITEM SEPARATOR - MENUITEM "Aspect regular", IDM_REG_LAYOUT, CHECKED, GRAYED - MENUITEM "Aspect pe blocuri", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM "Structură standard", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Structură bloc", IDM_BLOCK_LAYOUT, GRAYED MENUITEM SEPARATOR MENUITEM "101 taste", IDM_101_KEYS, CHECKED, GRAYED MENUITEM "102 taste", IDM_102_KEYS, GRAYED @@ -269,20 +269,20 @@ BEGIN POPUP "Setări" BEGIN - MENUITEM "Întotdeauna în sus", IDM_ON_TOP, CHECKED + MENUITEM "Întotdeauna în față", IDM_ON_TOP, CHECKED MENUITEM SEPARATOR - MENUITEM "&Folosește sunetul de clic", IDM_CLICK_SOUND + MENUITEM "&Utilizare sunetul de clic", IDM_CLICK_SOUND MENUITEM SEPARATOR - MENUITEM "&Modalitatea de scriere...", IDM_TYPE_MODE, GRAYED + MENUITEM "&Mod tastare...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Tip de caracter...", IDM_FONT, GRAYED + MENUITEM "&Font...", IDM_FONT, GRAYED END POPUP "Ajutor" BEGIN MENUITEM "&Manual", IDM_HELP_TOPICS, GRAYED MENUITEM SEPARATOR - MENUITEM "&Despre tastatură virtuală...", IDM_ABOUT + MENUITEM "&Despre Tastatura virtuală...", IDM_ABOUT END END

5 years, 4 months

[reactos] 01/01: [ATL_APITEST] Simplify code by using ok_int etc. (#1824)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14c267a3a3aec09e73a10… commit 14c267a3a3aec09e73a10d78d677e59d70a01dc0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 12 23:10:47 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 12 23:10:47 2019 +0900 [ATL_APITEST] Simplify code by using ok_int etc. (#1824) Simplify the code by using ok_int, ok_long etc. --- modules/rostests/apitests/atl/CAtlArray.cpp | 96 +++++++++--------- modules/rostests/apitests/atl/CAtlList.cpp | 8 +- modules/rostests/apitests/atl/CComQIPtr.cpp | 42 ++++---- modules/rostests/apitests/atl/CSimpleArray.cpp | 102 +++++++++---------- modules/rostests/apitests/atl/CSimpleMap.cpp | 134 ++++++++++++------------- 5 files changed, 191 insertions(+), 191 deletions(-) diff --git a/modules/rostests/apitests/atl/CAtlArray.cpp b/modules/rostests/apitests/atl/CAtlArray.cpp index b1e654bf109..8d4bc70dda0 100644 --- a/modules/rostests/apitests/atl/CAtlArray.cpp +++ b/modules/rostests/apitests/atl/CAtlArray.cpp @@ -61,71 +61,71 @@ START_TEST(CAtlArray) { CAtlArray<CCreature> array1; - ok(CCreature::s_nCtorCount == 0, "Expected CCreature::s_nCtorCount is zero, was: %d\n", CCreature::s_nCtorCount); - ok(CCreature::s_nCtorCount_Default == 0, "Expected CCreature::s_nCtorCount_Default is zero, was: %d\n", CCreature::s_nCtorCount_Default); - ok(CCreature::s_nCCtorCount == 0, "Expected CCreature::s_nCCtorCount is zero, was: %d\n", CCreature::s_nCCtorCount); - ok(CCreature::s_nDtorCount == 0, "Expected CCreature::s_nDtorCount is zero, was: %d\n", CCreature::s_nDtorCount); - ok(CCreature::s_nOpIsCount == 0, "Expected CCreature::s_nOpIsCount is zero, was: %d\n", CCreature::s_nOpIsCount); + ok_int(CCreature::s_nCtorCount, 0); + ok_int(CCreature::s_nCtorCount_Default, 0); + ok_int(CCreature::s_nCCtorCount, 0); + ok_int(CCreature::s_nDtorCount, 0); + ok_int(CCreature::s_nOpIsCount, 0); array1.SetCount(2); - ok(CCreature::s_nCtorCount == 2, "Expected CCreature::s_nCtorCount is 2, was: %d\n", CCreature::s_nCtorCount); - ok(CCreature::s_nCtorCount_Default == 2, "Expected CCreature::s_nCtorCount_Default is 2, was: %d\n", CCreature::s_nCtorCount_Default); - ok(CCreature::s_nCCtorCount == 0, "Expected CCreature::s_nCCtorCount is zero, was: %d\n", CCreature::s_nCCtorCount); - ok(CCreature::s_nDtorCount == 0, "Expected CCreature::s_nDtorCount is zero, was: %d\n", CCreature::s_nDtorCount); - ok(CCreature::s_nOpIsCount == 0, "Expected CCreature::s_nOpIsCount is zero, was: %d\n", CCreature::s_nOpIsCount); + ok_int(CCreature::s_nCtorCount, 2); + ok_int(CCreature::s_nCtorCount_Default, 2); + ok_int(CCreature::s_nCCtorCount, 0); + ok_int(CCreature::s_nDtorCount, 0); + ok_int(CCreature::s_nOpIsCount, 0); array1.SetCount(1); - ok(CCreature::s_nCtorCount == 2, "Expected CCreature::s_nCtorCount is 2, was: %d\n", CCreature::s_nCtorCount); - ok(CCreature::s_nCtorCount_Default == 2, "Expected CCreature::s_nCtorCount_Default is 2, was: %d\n", CCreature::s_nCtorCount_Default); - ok(CCreature::s_nCCtorCount == 0, "Expected CCreature::s_nCCtorCount is zero, was: %d\n", CCreature::s_nCCtorCount); - ok(CCreature::s_nDtorCount == 1, "Expected CCreature::s_nDtorCount is 1, was: %d\n", CCreature::s_nDtorCount); - ok(CCreature::s_nOpIsCount == 0, "Expected CCreature::s_nOpIsCount is zero, was: %d\n", CCreature::s_nOpIsCount); + ok_int(CCreature::s_nCtorCount, 2); + ok_int(CCreature::s_nCtorCount_Default, 2); + ok_int(CCreature::s_nCCtorCount, 0); + ok_int(CCreature::s_nDtorCount, 1); + ok_int(CCreature::s_nOpIsCount, 0); CCreature test(111); - ok(CCreature::s_nCtorCount == 3, "Expected CCreature::s_nCtorCount is 3, was: %d\n", CCreature::s_nCtorCount); - ok(CCreature::s_nCtorCount_Default == 2, "Expected CCreature::s_nCtorCount_Default is 2, was: %d\n", CCreature::s_nCtorCount_Default); - ok(CCreature::s_nCCtorCount == 0, "Expected CCreature::s_nCCtorCount is zero, was: %d\n", CCreature::s_nCCtorCount); - ok(CCreature::s_nDtorCount == 1, "Expected CCreature::s_nDtorCount is 1, was: %d\n", CCreature::s_nDtorCount); - ok(CCreature::s_nOpIsCount == 0, "Expected CCreature::s_nOpIsCount is zero, was: %d\n", CCreature::s_nOpIsCount); + ok_int(CCreature::s_nCtorCount, 3); + ok_int(CCreature::s_nCtorCount_Default, 2); + ok_int(CCreature::s_nCCtorCount, 0); + ok_int(CCreature::s_nDtorCount, 1); + ok_int(CCreature::s_nOpIsCount, 0); - ok(array1.GetCount() == 1u, "Expected GetCount() to be 1, was %u\n", array1.GetCount()); - ok(array1[0].m_id == 0x123456, "Got %d\n", array1[0].m_id); - ok(array1.GetAt(0).m_id == 0x123456, "Got %d\n", array1.GetAt(0).m_id); + ok_size_t(array1.GetCount(), 1u); + ok_int(array1[0].m_id, 0x123456); + ok_int(array1.GetAt(0).m_id, 0x123456); array1.Add(test); - ok(CCreature::s_nCtorCount == 3, "Expected CCreature::s_nCtorCount is 3, was: %d\n", CCreature::s_nCtorCount); - ok(CCreature::s_nCtorCount_Default == 2, "Expected CCreature::s_nCtorCount_Default is 2, was: %d\n", CCreature::s_nCtorCount_Default); - ok(CCreature::s_nCCtorCount == 1, "Expected CCreature::s_nCCtorCount is 1, was: %d\n", CCreature::s_nCCtorCount); - ok(CCreature::s_nDtorCount == 1, "Expected CCreature::s_nDtorCount is 1, was: %d\n", CCreature::s_nDtorCount); - ok(CCreature::s_nOpIsCount == 0, "Expected CCreature::s_nOpIsCount is zero, was: %d\n", CCreature::s_nOpIsCount); + ok_int(CCreature::s_nCtorCount, 3); + ok_int(CCreature::s_nCtorCount_Default, 2); + ok_int(CCreature::s_nCCtorCount, 1); + ok_int(CCreature::s_nDtorCount, 1); + ok_int(CCreature::s_nOpIsCount, 0); - ok(array1.GetCount() == 2u, "Expected GetCount() to be 2, was %u\n", array1.GetCount()); - ok(array1[0].m_id == 0x123456, "Got %d\n", array1[0].m_id); - ok(array1.GetAt(0).m_id == 0x123456, "Got %d\n", array1.GetAt(0).m_id); - ok(array1[1].m_id == 111, "Got %d\n", array1[1].m_id); - ok(array1.GetAt(1).m_id == 111, "Got %d\n", array1.GetAt(1).m_id); + ok_size_t(array1.GetCount(), 2u); + ok_int(array1[0].m_id, 0x123456); + ok_int(array1.GetAt(0).m_id, 0x123456); + ok_int(array1[1].m_id, 111); + ok_int(array1.GetAt(1).m_id, 111); test.m_id = 222; array1[0] = test; - ok(CCreature::s_nCtorCount == 3, "Expected CCreature::s_nCtorCount is 3, was: %d\n", CCreature::s_nCtorCount); - ok(CCreature::s_nCtorCount_Default == 2, "Expected CCreature::s_nCtorCount_Default is 2, was: %d\n", CCreature::s_nCtorCount_Default); - ok(CCreature::s_nCCtorCount == 1, "Expected CCreature::s_nCCtorCount is 1, was: %d\n", CCreature::s_nCCtorCount); - ok(CCreature::s_nDtorCount == 1, "Expected CCreature::s_nDtorCount is 1, was: %d\n", CCreature::s_nDtorCount); - ok(CCreature::s_nOpIsCount == 1, "Expected CCreature::s_nOpIsCount is 1, was: %d\n", CCreature::s_nOpIsCount); + ok_int(CCreature::s_nCtorCount, 3); + ok_int(CCreature::s_nCtorCount_Default, 2); + ok_int(CCreature::s_nCCtorCount, 1); + ok_int(CCreature::s_nDtorCount, 1); + ok_int(CCreature::s_nOpIsCount, 1); // Default traits does not call anything when relocating objects! array1.SetCount(100); - ok(CCreature::s_nCtorCount == 101, "Expected CCreature::s_nCtorCount is 101, was: %d\n", CCreature::s_nCtorCount); - ok(CCreature::s_nCtorCount_Default == 100, "Expected CCreature::s_nCtorCount_Default is 100, was: %d\n", CCreature::s_nCtorCount_Default); - ok(CCreature::s_nCCtorCount == 1, "Expected CCreature::s_nCCtorCount is 1, was: %d\n", CCreature::s_nCCtorCount); - ok(CCreature::s_nDtorCount == 1, "Expected CCreature::s_nDtorCount is 1, was: %d\n", CCreature::s_nDtorCount); - ok(CCreature::s_nOpIsCount == 1, "Expected CCreature::s_nOpIsCount is 1, was: %d\n", CCreature::s_nOpIsCount); + ok_int(CCreature::s_nCtorCount, 101); + ok_int(CCreature::s_nCtorCount_Default, 100); + ok_int(CCreature::s_nCCtorCount, 1); + ok_int(CCreature::s_nDtorCount, 1); + ok_int(CCreature::s_nOpIsCount, 1); // Does not compile: //CAtlArray<CCreature> array2(array1); @@ -136,9 +136,9 @@ START_TEST(CAtlArray) } // Objects are cleaned up when the list goes away - ok(CCreature::s_nCtorCount == 101, "Expected CCreature::s_nCtorCount is 101, was: %d\n", CCreature::s_nCtorCount); - ok(CCreature::s_nCtorCount_Default == 100, "Expected CCreature::s_nCtorCount_Default is 100, was: %d\n", CCreature::s_nCtorCount_Default); - ok(CCreature::s_nCCtorCount == 1, "Expected CCreature::s_nCCtorCount is 1, was: %d\n", CCreature::s_nCCtorCount); - ok(CCreature::s_nDtorCount == 102, "Expected CCreature::s_nDtorCount is 102, was: %d\n", CCreature::s_nDtorCount); - ok(CCreature::s_nOpIsCount == 1, "Expected CCreature::s_nOpIsCount is 1, was: %d\n", CCreature::s_nOpIsCount); + ok_int(CCreature::s_nCtorCount, 101); + ok_int(CCreature::s_nCtorCount_Default, 100); + ok_int(CCreature::s_nCCtorCount, 1); + ok_int(CCreature::s_nDtorCount, 102); + ok_int(CCreature::s_nOpIsCount, 1); } diff --git a/modules/rostests/apitests/atl/CAtlList.cpp b/modules/rostests/apitests/atl/CAtlList.cpp index 1f5e4c7d789..8f83703b996 100644 --- a/modules/rostests/apitests/atl/CAtlList.cpp +++ b/modules/rostests/apitests/atl/CAtlList.cpp @@ -20,13 +20,13 @@ START_TEST(CAtlList) { CAtlList<int> list1; - ok(list1.GetCount() == 0, "Expected list1's size is zero, was %d\n", list1.GetCount()); + ok_size_t(list1.GetCount(), 0); list1.AddTail(56); - ok(list1.GetCount() == 1, "Expected list1's size is 1, was %d\n", list1.GetCount()); + ok_size_t(list1.GetCount(), 1); POSITION head = list1.AddHead(12); - ok(list1.GetCount() == 2, "Expected list1's size is 2, was %d\n", list1.GetCount()); + ok_size_t(list1.GetCount(), 2); POSITION tail = list1.AddTail(90); - ok(list1.GetCount() == 3, "Expected list1's size is 3, was %d\n", list1.GetCount()); + ok_size_t(list1.GetCount(), 3); list1.InsertBefore(head, -123); list1.InsertAfter(head, 34); // no longer head, but the POSITION should still be valid.. diff --git a/modules/rostests/apitests/atl/CComQIPtr.cpp b/modules/rostests/apitests/atl/CComQIPtr.cpp index f662d15028b..1ab179bb176 100644 --- a/modules/rostests/apitests/atl/CComQIPtr.cpp +++ b/modules/rostests/apitests/atl/CComQIPtr.cpp @@ -88,50 +88,50 @@ START_TEST(CComQIPtr) { CQITestObject testObject; IUnknown* unk = static_cast<IPersist*>(&testObject); - ok(testObject.m_dwRef == 1, "Expected m_dwRef 1, got %lu\n", testObject.m_dwRef); - ok(g_QI == 0, "Expected g_QI 0, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 1); + ok_long(g_QI, 0); { DECLARE_QIPTR(IPersist) ppPersist(unk); - ok(testObject.m_dwRef == 2, "Expected m_dwRef 2, got %lu\n", testObject.m_dwRef); - ok(g_QI == 1, "Expected g_QI 1, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 2); + ok_long(g_QI, 1); DECLARE_QIPTR(IStdMarshalInfo) ppMarshal(ppPersist); - ok(testObject.m_dwRef == 3, "Expected m_dwRef 3, got %lu\n", testObject.m_dwRef); - ok(g_QI == 2, "Expected g_QI 2, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 3); + ok_long(g_QI, 2); } - ok(testObject.m_dwRef == 1, "Expected m_dwRef 1, got %lu\n", testObject.m_dwRef); + ok_long(testObject.m_dwRef, 1); { DECLARE_QIPTR(IStdMarshalInfo) ppMarshal; - ok(testObject.m_dwRef == 1, "Expected m_dwRef 1, got %lu\n", testObject.m_dwRef); - ok(g_QI == 2, "Expected g_QI 2, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 1); + ok_long(g_QI, 2); ppMarshal = unk; - ok(testObject.m_dwRef == 2, "Expected m_dwRef 2, got %lu\n", testObject.m_dwRef); - ok(g_QI == 3, "Expected g_QI 3, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 2); + ok_long(g_QI, 3); ppMarshal = static_cast<IUnknown*>(NULL); - ok(testObject.m_dwRef == 1, "Expected m_dwRef 1, got %lu\n", testObject.m_dwRef); - ok(g_QI == 3, "Expected g_QI 3, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 1); + ok_long(g_QI, 3); CComPtr<IUnknown> spUnk(unk); - ok(testObject.m_dwRef == 2, "Expected m_dwRef 2, got %lu\n", testObject.m_dwRef); - ok(g_QI == 3, "Expected g_QI 3, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 2); + ok_long(g_QI, 3); ppMarshal = spUnk; - ok(testObject.m_dwRef == 3, "Expected m_dwRef 3, got %lu\n", testObject.m_dwRef); - ok(g_QI == 4, "Expected g_QI 4, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 3); + ok_long(g_QI, 4); spUnk.Release(); - ok(testObject.m_dwRef == 2, "Expected m_dwRef 2, got %lu\n", testObject.m_dwRef); - ok(g_QI == 4, "Expected g_QI 4, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 2); + ok_long(g_QI, 4); spUnk = ppMarshal; - ok(testObject.m_dwRef == 3, "Expected m_dwRef 3, got %lu\n", testObject.m_dwRef); + ok_long(testObject.m_dwRef, 3); #ifdef __REACTOS__ // CORE-12710 todo_if(1) #endif - ok(g_QI == 5, "Expected g_QI 5, got %lu\n", g_QI); + ok_long(g_QI, 5); } } diff --git a/modules/rostests/apitests/atl/CSimpleArray.cpp b/modules/rostests/apitests/atl/CSimpleArray.cpp index dcb6c5661cf..9176feb14ff 100644 --- a/modules/rostests/apitests/atl/CSimpleArray.cpp +++ b/modules/rostests/apitests/atl/CSimpleArray.cpp @@ -45,24 +45,24 @@ START_TEST(CSimpleArray) { CSimpleArray<int> array1; - ok(array1.GetSize() == 0, "Expected array1's size is zero, was %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 0); array1.Add(123); - ok(array1.GetSize() == 1, "Expected array1's size is 1, was %d\n", array1.GetSize()); - ok(array1.GetData()[0] == 123, "Expected array1.GetData()[0] is 123, was %d\n", array1.GetData()[0]); - ok(array1[0] == 123, "Expected array1[0] is 123, was %d\n", array1[0]); + ok_int(array1.GetSize(), 1); + ok_int(array1.GetData()[0], 123); + ok_int(array1[0], 123); array1.Add(456); - ok(array1.GetSize() == 2, "Expected array1's size is 2, was %d\n", array1.GetSize()); - ok(array1.GetData()[0] == 123, "Expected array1.GetData()[0] is 123, was %d\n", array1.GetData()[0]); - ok(array1[0] == 123, "Expected array1[0] is 123, was %d\n", array1[0]); - ok(array1.GetData()[1] == 456, "Expected array1.GetData()[1] is 456, was %d\n", array1.GetData()[1]); - ok(array1[1] == 456, "Expected array1[1] is 456, was %d\n", array1[1]); + ok_int(array1.GetSize(), 2); + ok_int(array1.GetData()[0], 123); + ok_int(array1[0], 123); + ok_int(array1.GetData()[1], 456); + ok_int(array1[1], 456); array1.RemoveAll(); - ok(array1.GetSize() == 0, "Expected array1's size is 0, was %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 0); array1.Add(1); array1.Add(1); @@ -70,92 +70,92 @@ START_TEST(CSimpleArray) array1.Add(2); array1.Add(2); array1.Add(3); - ok(array1.GetSize() == 6, "Expected array1's size is 6, was %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 6); array1.Remove(2); - ok(array1.GetSize() == 5, "Expected array1's size is 5, was %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 5); array1.Remove(1); - ok(array1.GetSize() == 4, "Expected array1's size is 4, was %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 4); - ok(array1[0] == 1, "Expected array1[0] is 1, was %d\n", array1[0]); - ok(array1[1] == 1, "Expected array1[1] is 1, was %d\n", array1[1]); - ok(array1[2] == 2, "Expected array1[2] is 2, was %d\n", array1[2]); - ok(array1[3] == 3, "Expected array1[3] is 3, was %d\n", array1[3]); + ok_int(array1[0], 1); + ok_int(array1[1], 1); + ok_int(array1[2], 2); + ok_int(array1[3], 3); - ok(CCreature::s_nCount == 0, "Expected CCreature::s_nCount is zero, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 0); + ok_int(CCreature::s_nCopyCount, 0); CSimpleArray<CCreature> array2; { CCreature creature1, creature2; - ok(CCreature::s_nCount == 2, "Expected CCreature::s_nCount is 2, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 2); + ok_int(CCreature::s_nCopyCount, 0); array2.Add(creature1); - ok(CCreature::s_nCount == 3, "Expected CCreature::s_nCount is 3, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 3); + ok_int(CCreature::s_nCopyCount, 0); array2.Add(creature2); - ok(CCreature::s_nCount == 4, "Expected CCreature::s_nCount is 4, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 4); + ok_int(CCreature::s_nCopyCount, 0); } - ok(CCreature::s_nCount == 2, "Expected CCreature::s_nCount is 2, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 2); + ok_int(CCreature::s_nCopyCount, 0); { CSimpleArray<CCreature> array3(array2), array4, array5; - ok(CCreature::s_nCount == 4, "Expected CCreature::s_nCount is 4, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 4); + ok_int(CCreature::s_nCopyCount, 0); array4 = array2; - ok(CCreature::s_nCount == 6, "Expected CCreature::s_nCount is 6, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 6); + ok_int(CCreature::s_nCopyCount, 0); CCreature creature1; - ok(CCreature::s_nCount == 7, "Expected CCreature::s_nCount is 7, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 7); + ok_int(CCreature::s_nCopyCount, 0); array4.Add(creature1); - ok(CCreature::s_nCount == 8, "Expected CCreature::s_nCount is 8, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 8); + ok_int(CCreature::s_nCopyCount, 0); array3 = array4; - ok(CCreature::s_nCount == 9, "Expected CCreature::s_nCount is 9, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 9); + ok_int(CCreature::s_nCopyCount, 0); array5 = array2; - ok(CCreature::s_nCount == 11, "Expected CCreature::s_nCount is 11, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 11); + ok_int(CCreature::s_nCopyCount, 0); array5 = array2; - ok(CCreature::s_nCount == 11, "Expected CCreature::s_nCount is 11, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 11); + ok_int(CCreature::s_nCopyCount, 0); } - ok(CCreature::s_nCount == 2, "Expected CCreature::s_nCount is 2, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 2); + ok_int(CCreature::s_nCopyCount, 0); array2.RemoveAll(); - ok(CCreature::s_nCount == 0, "Expected CCreature::s_nCount is zero, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 0); + ok_int(CCreature::s_nCopyCount, 0); array1.RemoveAll(); - ok(array1.GetSize() == 0, "Expected array1.GetSize() is zero, was: %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 0); for (int i = 0; i < 100; ++i) { array1.Add(i); } - ok(array1.GetSize() == 100, "Expected array1.GetSize() is 100, was: %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 100); array1.RemoveAll(); - ok(array1.GetSize() == 0, "Expected array1.GetSize() is zero, was: %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 0); array1.Add(123); array1.Add(321); ok(!!array1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n"); - ok(array1.GetSize() == 1, "Expected array1.GetSize() is 1, was: %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 1); if (array1.GetSize() == 1) { - ok(array1[0] == 321, "Expected array1[0] is 321, was %d\n", array1[0]); + ok_int(array1[0], 321); } ok(!!array1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n"); - ok(array1.GetSize() == 0, "Expected array1.GetSize() is 0, was: %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 0); } diff --git a/modules/rostests/apitests/atl/CSimpleMap.cpp b/modules/rostests/apitests/atl/CSimpleMap.cpp index f21e9831be4..09b22055bf2 100644 --- a/modules/rostests/apitests/atl/CSimpleMap.cpp +++ b/modules/rostests/apitests/atl/CSimpleMap.cpp @@ -45,137 +45,137 @@ START_TEST(CSimpleMap) { CSimpleMap<int, int> map1; - ok(map1.GetSize() == 0, "Expected map1's size is zero, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 0); map1.Add(1, 2); - ok(map1.GetSize() == 1, "Expected map1's size is 1, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 1); map1.Add(2, 3); - ok(map1.GetSize() == 2, "Expected map1's size is 2, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 2); - ok(map1.Lookup(1) == 2, "Expected map1.Lookup(1) is 2, was %d\n", map1.Lookup(1)); - ok(map1.Lookup(2) == 3, "Expected map1.Lookup(2) is 3, was %d\n", map1.Lookup(2)); - ok(map1.Lookup(-1) == 0, "Expected map1.Lookup(-1) is 0, was %d\n", map1.Lookup(-1)); + ok_int(map1.Lookup(1), 2); + ok_int(map1.Lookup(2), 3); + ok_int(map1.Lookup(-1), 0); - ok(map1.ReverseLookup(2) == 1, "Expected map1.ReverseLookup(2) is 1, was %d\n", map1.ReverseLookup(2)); - ok(map1.ReverseLookup(3) == 2, "Expected map1.ReverseLookup(3) is 2, was %d\n", map1.ReverseLookup(3)); + ok_int(map1.ReverseLookup(2), 1); + ok_int(map1.ReverseLookup(3), 2); - ok(map1.GetKeyAt(0) == 1, "Expected map1.GetKeyAt(0) is 1, was %d\n", map1.GetKeyAt(0)); - ok(map1.GetKeyAt(1) == 2, "Expected map1.GetKeyAt(1) is 2, was %d\n", map1.GetKeyAt(1)); + ok_int(map1.GetKeyAt(0), 1); + ok_int(map1.GetKeyAt(1), 2); - ok(map1.GetValueAt(0) == 2, "Expected map1.GetValueAt(0) is 2, was %d\n", map1.GetValueAt(0)); - ok(map1.GetValueAt(1) == 3, "Expected map1.GetValueAt(1) is 3, was %d\n", map1.GetValueAt(1)); + ok_int(map1.GetValueAt(0), 2); + ok_int(map1.GetValueAt(1), 3); map1.SetAt(2, 4); - ok(map1.Lookup(1) == 2, "Expected map1.Lookup(1) is 2, was %d\n", map1.Lookup(1)); - ok(map1.Lookup(2) == 4, "Expected map1.Lookup(2) is 4, was %d\n", map1.Lookup(2)); + ok_int(map1.Lookup(1), 2); + ok_int(map1.Lookup(2), 4); - ok(map1.ReverseLookup(2) == 1, "Expected map1.ReverseLookup(2) is 1, was %d\n", map1.ReverseLookup(2)); - ok(map1.ReverseLookup(4) == 2, "Expected map1.ReverseLookup(4) is 2, was %d\n", map1.ReverseLookup(4)); + ok_int(map1.ReverseLookup(2), 1); + ok_int(map1.ReverseLookup(4), 2); map1.Remove(1); - ok(map1.GetSize() == 1, "Expected map1's size is 1, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 1); map1.Remove(2); - ok(map1.GetSize() == 0, "Expected map1's size is 0, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 0); map1.Add(1, 4); - ok(map1.GetSize() == 1, "Expected map1's size is 1, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 1); map1.Add(2, 8); - ok(map1.GetSize() == 2, "Expected map1's size is 2, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 2); map1.Add(3, 12); - ok(map1.GetSize() == 3, "Expected map1's size is 3, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 3); map1.RemoveAll(); - ok(map1.GetSize() == 0, "Expected map1's size is 0, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 0); - ok(CMonster::s_nCount == 0, "Expected CMonster::s_nCount is 0, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 0); + ok_int(CMonster::s_nCopyCount, 0); CSimpleMap<CMonster, CMonster> map2; - ok(map2.GetSize() == 0, "Expected map2's size is zero, was %d\n", map2.GetSize()); + ok_int(map2.GetSize(), 0); - ok(CMonster::s_nCount == 0, "Expected CMonster::s_nCount is 0, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 0); + ok_int(CMonster::s_nCopyCount, 0); { CMonster m1; - ok(CMonster::s_nCount == 1, "Expected CMonster::s_nCount is 1, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 1); + ok_int(CMonster::s_nCopyCount, 0); CMonster m2; - ok(CMonster::s_nCount == 2, "Expected CMonster::s_nCount is 2, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 2); + ok_int(CMonster::s_nCopyCount, 0); map2.Add(m1, m2); - ok(CMonster::s_nCount == 4, "Expected CMonster::s_nCount is 4, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 4); + ok_int(CMonster::s_nCopyCount, 0); } - ok(map2.GetSize() == 1, "Expected map2's size is 1, was %d\n", map2.GetSize()); - ok(CMonster::s_nCount == 2, "Expected CMonster::s_nCount is 2, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(map2.GetSize(), 1); + ok_int(CMonster::s_nCount, 2); + ok_int(CMonster::s_nCopyCount, 0); { CMonster m1; - ok(CMonster::s_nCount == 3, "Expected CMonster::s_nCount is 3, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 3); + ok_int(CMonster::s_nCopyCount, 0); CMonster m2; - ok(CMonster::s_nCount == 4, "Expected CMonster::s_nCount is 4, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 4); + ok_int(CMonster::s_nCopyCount, 0); map2.Add(m1, m2); - ok(CMonster::s_nCount == 6, "Expected CMonster::s_nCount is 6, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 6); + ok_int(CMonster::s_nCopyCount, 0); } - ok(map2.GetSize() == 2, "Expected map2's size is 2, was %d\n", map2.GetSize()); - ok(CMonster::s_nCount == 4, "Expected CMonster::s_nCount is 4, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(map2.GetSize(), 2); + ok_int(CMonster::s_nCount, 4); + ok_int(CMonster::s_nCopyCount, 0); map2.RemoveAt(0); - ok(CMonster::s_nCount == 2, "Expected CMonster::s_nCount is 2, was %d\n", CMonster::s_nCount); - ok(map2.GetSize() == 1, "Expected map2's size is 1, was %d\n", map2.GetSize()); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 2); + ok_int(map2.GetSize(), 1); + ok_int(CMonster::s_nCopyCount, 0); map2.RemoveAt(0); - ok(CMonster::s_nCount == 0, "Expected CMonster::s_nCount is 0, was %d\n", CMonster::s_nCount); - ok(map2.GetSize() == 0, "Expected map2's size is 0, was %d\n", map2.GetSize()); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 0); + ok_int(map2.GetSize(), 0); + ok_int(CMonster::s_nCopyCount, 0); CSimpleMap<int, CMonster> map3; - ok(map3.GetSize() == 0, "Expected map3's size is 0, was %d\n", map3.GetSize()); + ok_int(map3.GetSize(), 0); CMonster m3; - ok(CMonster::s_nCount == 1, "Expected CMonster::s_nCount is 1, was %d\n", CMonster::s_nCount); + ok_int(CMonster::s_nCount, 1); map3.Add(1, m3); - ok(map3.GetSize() == 1, "Expected map3's size is 1, was %d\n", map3.GetSize()); - ok(CMonster::s_nCount == 2, "Expected CMonster::s_nCount is 2, was %d\n", CMonster::s_nCount); + ok_int(map3.GetSize(), 1); + ok_int(CMonster::s_nCount, 2); map3.Add(2, m3); - ok(map3.GetSize() == 2, "Expected map3's size is 2, was %d\n", map3.GetSize()); - ok(CMonster::s_nCount == 3, "Expected CMonster::s_nCount is 3, was %d\n", CMonster::s_nCount); + ok_int(map3.GetSize(), 2); + ok_int(CMonster::s_nCount, 3); map3.Add(3, m3); - ok(map3.GetSize() == 3, "Expected map3's size is 3, was %d\n", map3.GetSize()); - ok(CMonster::s_nCount == 4, "Expected CMonster::s_nCount is 4, was %d\n", CMonster::s_nCount); + ok_int(map3.GetSize(), 3); + ok_int(CMonster::s_nCount, 4); map3.Remove(2); - ok(map3.GetSize() == 2, "Expected map3's size is 2, was %d\n", map3.GetSize()); - ok(CMonster::s_nCount == 3, "Expected CMonster::s_nCount is 3, was %d\n", CMonster::s_nCount); + ok_int(map3.GetSize(), 2); + ok_int(CMonster::s_nCount, 3); map3.RemoveAll(); - ok(map3.GetSize() == 0, "Expected map3's size is 0, was %d\n", map3.GetSize()); - ok(CMonster::s_nCount == 1, "Expected CMonster::s_nCount is 1, was %d\n", CMonster::s_nCount); + ok_int(map3.GetSize(), 0); + ok_int(CMonster::s_nCount, 1); map1.Add(1, 2); - ok(map1.GetSize() == 1, "Expected map1's size is 1, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 1); map1.Add(2, 3); - ok(map1.GetSize() == 2, "Expected map1's size is 2, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 2); ok(!!map1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n"); - ok(map1.GetSize() == 1, "Expected map1's size is 1, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 1); ok(!!map1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n"); - ok(map1.GetSize() == 0, "Expected map1's size is 0, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 0); }

5 years, 4 months

[reactos] 01/01: [MEDIA][FONTS] Total adjustment of MS Sans Serif

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=211fdcdba733ba5a5471c… commit 211fdcdba733ba5a5471cbb2c5a80f820de9ab10 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 12 22:19:55 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Aug 12 22:19:55 2019 +0900 [MEDIA][FONTS] Total adjustment of MS Sans Serif --- media/fonts/ssee1255.fon | Bin 69152 -> 69168 bytes media/fonts/ssee1256.fon | Bin 71616 -> 71632 bytes media/fonts/sserife.fon | Bin 64576 -> 64560 bytes media/fonts/sserifeg.fon | Bin 65440 -> 65456 bytes media/fonts/sserifer.fon | Bin 68832 -> 68848 bytes media/fonts/sserifet.fon | Bin 64288 -> 64304 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/ssee1255.fon b/media/fonts/ssee1255.fon index c0ecc32bb89..59de17288bb 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 1f71c91f261..7e27d99027c 100644 Binary files a/media/fonts/ssee1256.fon and b/media/fonts/ssee1256.fon differ diff --git a/media/fonts/sserife.fon b/media/fonts/sserife.fon index a17442b55c5..5bcce146c91 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 ce4a199b808..fad4c7a2172 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 4aa44ae2cbb..163668f5f62 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 51d9919c5b1..25c4c94db85 100644 Binary files a/media/fonts/sserifet.fon and b/media/fonts/sserifet.fon differ

5 years, 4 months

[reactos] 01/01: [SDK][INCLUDE] Update msgdump.h and winxx.h

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3dc5f2a739ea190be1f6… commit d3dc5f2a739ea190be1f619a9eb277862512f6f7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 12 19:31:44 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Aug 12 19:31:44 2019 +0900 [SDK][INCLUDE] Update msgdump.h and winxx.h --- sdk/include/reactos/msgdump.h | 585 +++++++++++++++++++++++++++++++++++++++++- sdk/include/reactos/winxx.h | 165 +++++++++++- 2 files changed, 744 insertions(+), 6 deletions(-) diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h index 2284437fc2c..fde8758f66d 100644 --- a/sdk/include/reactos/msgdump.h +++ b/sdk/include/reactos/msgdump.h @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2018-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #ifndef _INC_MSGDUMP -#define _INC_MSGDUMP 11 /* Version 11 */ +#define _INC_MSGDUMP 15 /* Version 15 */ /* * NOTE: MD_msgdump function in this file provides Win32API message dump feature. @@ -490,11 +490,172 @@ MD_OnCopyData(HWND hwnd, HWND hwndFrom, PCOPYDATASTRUCT pcds) return FALSE; } +static __inline LPCTSTR MSGDUMP_API +MD_GetNotifyCode(HWND hwndFrom, UINT code) +{ + TCHAR szClass[24], sz[2]; + static TCHAR s_szText[64]; + + switch (code) + { + case NM_OUTOFMEMORY: return TEXT("NM_OUTOFMEMORY"); + case NM_CLICK: return TEXT("NM_CLICK"); + case NM_DBLCLK: return TEXT("NM_DBLCLK"); + case NM_RETURN: return TEXT("NM_RETURN"); + case NM_RCLICK: return TEXT("NM_RCLICK"); + case NM_RDBLCLK: return TEXT("NM_RDBLCLK"); + case NM_SETFOCUS: return TEXT("NM_SETFOCUS"); + case NM_KILLFOCUS: return TEXT("NM_KILLFOCUS"); +#if (_WIN32_IE >= 0x0300) + case NM_CUSTOMDRAW: return TEXT("NM_CUSTOMDRAW"); + case NM_HOVER: return TEXT("NM_HOVER"); +#endif +#if (_WIN32_IE >= 0x0400) + case NM_NCHITTEST: return TEXT("NM_NCHITTEST"); + case NM_KEYDOWN: return TEXT("NM_KEYDOWN"); + case NM_RELEASEDCAPTURE: return TEXT("NM_RELEASEDCAPTURE"); + case NM_SETCURSOR: return TEXT("NM_SETCURSOR"); + case NM_CHAR: return TEXT("NM_CHAR"); +#endif +#if (_WIN32_IE >= 0x0401) + case NM_TOOLTIPSCREATED: return TEXT("NM_TOOLTIPSCREATED"); +#endif +#if (_WIN32_IE >= 0x0500) + case NM_LDOWN: return TEXT("NM_LDOWN"); + case NM_RDOWN: return TEXT("NM_RDOWN"); +#endif + } + + szClass[0] = 0; + GetClassName(hwndFrom, szClass, ARRAYSIZE(szClass)); + sz[0] = szClass[0]; + sz[1] = 0; + CharUpper(sz); + + if (sz[0] == TEXT('R') && lstrcmpi(szClass, RICHEDIT_CLASS) == 0) + { + switch (code) + { + case EN_MSGFILTER: return TEXT("EN_MSGFILTER"); + case EN_REQUESTRESIZE: return TEXT("EN_REQUESTRESIZE"); + case EN_SELCHANGE: return TEXT("EN_SELCHANGE"); + case EN_DROPFILES: return TEXT("EN_DROPFILES"); + case EN_PROTECTED: return TEXT("EN_PROTECTED"); + case EN_CORRECTTEXT: return TEXT("EN_CORRECTTEXT"); + case EN_STOPNOUNDO: return TEXT("EN_STOPNOUNDO"); + case EN_IMECHANGE: return TEXT("EN_IMECHANGE"); + case EN_SAVECLIPBOARD: return TEXT("EN_SAVECLIPBOARD"); + case EN_OLEOPFAILED: return TEXT("EN_OLEOPFAILED"); + case EN_OBJECTPOSITIONS: return TEXT("EN_OBJECTPOSITIONS"); + case EN_LINK: return TEXT("EN_LINK"); + case EN_DRAGDROPDONE: return TEXT("EN_DRAGDROPDONE"); + case EN_PARAGRAPHEXPANDED: return TEXT("EN_PARAGRAPHEXPANDED"); + case EN_PAGECHANGE: return TEXT("EN_PAGECHANGE"); + case EN_LOWFIRTF: return TEXT("EN_LOWFIRTF"); + case EN_ALIGNLTR: return TEXT("EN_ALIGNLTR"); + case EN_ALIGNRTL: return TEXT("EN_ALIGNRTL"); +#if _RICHEDIT_VER >= 0x0800 + case EN_CLIPFORMAT: return TEXT("EN_CLIPFORMAT"); + case EN_STARTCOMPOSITION: return TEXT("EN_STARTCOMPOSITION"); + case EN_ENDCOMPOSITION: return TEXT("EN_ENDCOMPOSITION"); +#endif + } + } + else if (sz[0] == TEXT('S') && lstrcmpi(szClass, WC_LISTVIEW) == 0) + { + switch (code) + { + case LVN_ITEMCHANGING: return TEXT("LVN_ITEMCHANGING"); + case LVN_ITEMCHANGED: return TEXT("LVN_ITEMCHANGED"); + case LVN_INSERTITEM: return TEXT("LVN_INSERTITEM"); + case LVN_DELETEITEM: return TEXT("LVN_DELETEITEM"); + case LVN_DELETEALLITEMS: return TEXT("LVN_DELETEALLITEMS"); + case LVN_BEGINLABELEDITA: return TEXT("LVN_BEGINLABELEDITA"); + case LVN_BEGINLABELEDITW: return TEXT("LVN_BEGINLABELEDITW"); + case LVN_ENDLABELEDITA: return TEXT("LVN_ENDLABELEDITA"); + case LVN_ENDLABELEDITW: return TEXT("LVN_ENDLABELEDITW"); + case LVN_COLUMNCLICK: return TEXT("LVN_COLUMNCLICK"); + case LVN_BEGINDRAG: return TEXT("LVN_BEGINDRAG"); + case LVN_BEGINRDRAG: return TEXT("LVN_BEGINRDRAG"); + case LVN_ODCACHEHINT: return TEXT("LVN_ODCACHEHINT"); + case LVN_ODFINDITEMA: return TEXT("LVN_ODFINDITEMA"); + case LVN_ODFINDITEMW: return TEXT("LVN_ODFINDITEMW"); + case LVN_ITEMACTIVATE: return TEXT("LVN_ITEMACTIVATE"); + case LVN_ODSTATECHANGED: return TEXT("LVN_ODSTATECHANGED"); + case LVN_HOTTRACK: return TEXT("LVN_HOTTRACK"); + case LVN_GETDISPINFOA: return TEXT("LVN_GETDISPINFOA"); + case LVN_GETDISPINFOW: return TEXT("LVN_GETDISPINFOW"); + case LVN_SETDISPINFOA: return TEXT("LVN_SETDISPINFOA"); + case LVN_SETDISPINFOW: return TEXT("LVN_SETDISPINFOW"); + case LVN_KEYDOWN: return TEXT("LVN_KEYDOWN"); + case LVN_MARQUEEBEGIN: return TEXT("LVN_MARQUEEBEGIN"); + case LVN_GETINFOTIPA: return TEXT("LVN_GETINFOTIPA"); + case LVN_GETINFOTIPW: return TEXT("LVN_GETINFOTIPW"); + case LVN_INCREMENTALSEARCHA: return TEXT("LVN_INCREMENTALSEARCHA"); + case LVN_INCREMENTALSEARCHW: return TEXT("LVN_INCREMENTALSEARCHW"); +#if NTDDI_VERSION >= 0x06000000 + case LVN_COLUMNDROPDOWN: return TEXT("LVN_COLUMNDROPDOWN"); + case LVN_COLUMNOVERFLOWCLICK: return TEXT("LVN_COLUMNOVERFLOWCLICK"); +#endif + case LVN_BEGINSCROLL: return TEXT("LVN_BEGINSCROLL"); + case LVN_ENDSCROLL: return TEXT("LVN_ENDSCROLL"); +#if NTDDI_VERSION >= 0x06000000 + case LVN_LINKCLICK: return TEXT("LVN_LINKCLICK"); + case LVN_GETEMPTYMARKUP: return TEXT("LVN_GETEMPTYMARKUP"); +#endif + } + } + else if (sz[0] == TEXT('S') && lstrcmpi(szClass, WC_TREEVIEW) == 0) + { + switch (code) + { + case TVN_SELCHANGINGA: return TEXT("TVN_SELCHANGINGA"); + case TVN_SELCHANGINGW: return TEXT("TVN_SELCHANGINGW"); + case TVN_SELCHANGEDA: return TEXT("TVN_SELCHANGEDA"); + case TVN_SELCHANGEDW: return TEXT("TVN_SELCHANGEDW"); + case TVN_GETDISPINFOA: return TEXT("TVN_GETDISPINFOA"); + case TVN_GETDISPINFOW: return TEXT("TVN_GETDISPINFOW"); + case TVN_SETDISPINFOA: return TEXT("TVN_SETDISPINFOA"); + case TVN_SETDISPINFOW: return TEXT("TVN_SETDISPINFOW"); + case TVN_ITEMEXPANDINGA: return TEXT("TVN_ITEMEXPANDINGA"); + case TVN_ITEMEXPANDINGW: return TEXT("TVN_ITEMEXPANDINGW"); + case TVN_ITEMEXPANDEDA: return TEXT("TVN_ITEMEXPANDEDA"); + case TVN_ITEMEXPANDEDW: return TEXT("TVN_ITEMEXPANDEDW"); + case TVN_BEGINDRAGA: return TEXT("TVN_BEGINDRAGA"); + case TVN_BEGINDRAGW: return TEXT("TVN_BEGINDRAGW"); + case TVN_BEGINRDRAGA: return TEXT("TVN_BEGINRDRAGA"); + case TVN_BEGINRDRAGW: return TEXT("TVN_BEGINRDRAGW"); + case TVN_DELETEITEMA: return TEXT("TVN_DELETEITEMA"); + case TVN_DELETEITEMW: return TEXT("TVN_DELETEITEMW"); + case TVN_BEGINLABELEDITA: return TEXT("TVN_BEGINLABELEDITA"); + case TVN_BEGINLABELEDITW: return TEXT("TVN_BEGINLABELEDITW"); + case TVN_ENDLABELEDITA: return TEXT("TVN_ENDLABELEDITA"); + case TVN_ENDLABELEDITW: return TEXT("TVN_ENDLABELEDITW"); + case TVN_KEYDOWN: return TEXT("TVN_KEYDOWN"); + case TVN_GETINFOTIPA: return TEXT("TVN_GETINFOTIPA"); + case TVN_GETINFOTIPW: return TEXT("TVN_GETINFOTIPW"); + case TVN_SINGLEEXPAND: return TEXT("TVN_SINGLEEXPAND"); +#ifdef TVN_ITEMCHANGINGA + case TVN_ITEMCHANGINGA: return TEXT("TVN_ITEMCHANGINGA"); + case TVN_ITEMCHANGINGW: return TEXT("TVN_ITEMCHANGINGW"); + case TVN_ITEMCHANGEDA: return TEXT("TVN_ITEMCHANGEDA"); + case TVN_ITEMCHANGEDW: return TEXT("TVN_ITEMCHANGEDW"); + case TVN_ASYNCDRAW: return TEXT("TVN_ASYNCDRAW"); +#endif + } + } + + StringCbPrintf(s_szText, sizeof(s_szText), TEXT("%u"), code); + return s_szText; +} + static __inline LRESULT MSGDUMP_API MD_OnNotify(HWND hwnd, int idFrom, LPNMHDR pnmhdr) { - MSGDUMP_TPRINTF(TEXT("%sWM_NOTIFY(hwnd:%p, idFrom:%d, pnmhdr:%p)\n"), - MSGDUMP_PREFIX, (void *)hwnd, idFrom, (void *)pnmhdr); + MSGDUMP_TPRINTF(TEXT("%sWM_NOTIFY(hwnd:%p, idFrom:%d, pnmhdr:%p, hwndFrom:%p, pnmhdr->idFrom:%d, code:%s)\n"), + MSGDUMP_PREFIX, (void *)hwnd, idFrom, (void *)pnmhdr, + pnmhdr->hwndFrom, pnmhdr->idFrom, + MD_GetNotifyCode(pnmhdr->hwndFrom, pnmhdr->code)); return 0; } @@ -4182,6 +4343,320 @@ MD_TreeView_OnEditLabelW(HWND hwnd, HTREEITEM hitem) } #endif +static __inline LRESULT MSGDUMP_API +MD_RichEdit_OnCanPaste(HWND hwnd, UINT uFormat) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_CANPASTE(hwnd:%p, uFormat:%u)\n"), + MSGDUMP_PREFIX, (void *)hwnd, uFormat); + return 0; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnDisplayBand(HWND hwnd, LPRECT lprc) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_DISPLAYBAND(hwnd:%p, lprc:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)lprc); + return FALSE; +} + +static __inline void MSGDUMP_API +MD_RichEdit_OnExGetSel(HWND hwnd, CHARRANGE *lpchr) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_EXGETSEL(hwnd:%p, lpchr:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpchr); +} + +static __inline void MSGDUMP_API +MD_RichEdit_OnExLimitText(HWND hwnd, DWORD cchTextMax) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_EXLIMITTEXT(hwnd:%p, cchTextMax:%ld)\n"), + MSGDUMP_PREFIX, (void *)hwnd, cchTextMax); +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnExLineFromChar(HWND hwnd, DWORD ichCharPos) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_EXLINEFROMCHAR(hwnd:%p, ichCharPos:0x%08lX)\n"), + MSGDUMP_PREFIX, (void *)hwnd, ichCharPos); + return 0; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnExSetSel(HWND hwnd, INT ichChar) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_EXSETSEL(hwnd:%p, ichChar:%d)\n"), + MSGDUMP_PREFIX, (void *)hwnd, ichChar); + return 0; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnFindText(HWND hwnd, UINT fuFlags, FINDTEXT *lpFindText) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_FINDTEXT(hwnd:%p, fuFlags:%u, lpFindText:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fuFlags, (void *)lpFindText); + return 0; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnFormatRange(HWND hwnd, BOOL fRender, FORMATRANGE *lpFmt) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_FORMATRANGE(hwnd:%p, fRender:%d, lpFmt:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fRender, (void *)lpFmt); + return 0; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnGetCharFormat(HWND hwnd, BOOL fSelection, CHARFORMAT *lpFmt) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETCHARFORMAT(hwnd:%p, fSelection:%d, lpFmt:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fSelection, (void *)lpFmt); + return 0; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnGetEventMask(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETEVENTMASK(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnGetOleInterface(HWND hwnd, LPVOID *ppObject) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETOLEINTERFACE(hwnd:%p, ppObject:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)ppObject); + return FALSE; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnGetParaFormat(HWND hwnd, PARAFORMAT *lpFmt) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETPARAFORMAT(hwnd:%p, lpFmt:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpFmt); + return 0; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnGetSelText(HWND hwnd, LPTSTR lpBuf) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETSELTEXT(hwnd:%p, lpBuf:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpBuf); + return 0; +} + +static __inline void MSGDUMP_API +MD_RichEdit_OnHideSelection(HWND hwnd, BOOL fHide, BOOL fChangeStyle) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_HIDESELECTION(hwnd:%p, fHide:%d, fChangeStyle:%d)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fHide, fChangeStyle); +} + +static __inline void MSGDUMP_API +MD_RichEdit_OnPasteSpecial(HWND hwnd, UINT uFormat, REPASTESPECIAL *lpRePasteSpecial) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_PASTESPECIAL(hwnd:%p, uFormat:%u, lpRePasteSpecial:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, uFormat, (void *)lpRePasteSpecial); +} + +static __inline void MSGDUMP_API +MD_RichEdit_OnRequestResize(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_REQUESTRESIZE(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnSelectionType(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SELECTIONTYPE(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline COLORREF MSGDUMP_API +MD_RichEdit_OnSetBkgndColor(HWND hwnd, BOOL fUseSysColor, COLORREF clr) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETBKGNDCOLOR(hwnd:%p, fUseSysColor:%d, clr:0x%08lX)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fUseSysColor, clr); + return 0; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnSetCharFormat(HWND hwnd, UINT uFlags, CHARFORMAT *lpFmt) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETCHARFORMAT(hwnd:%p, uFlags:%u, lpFmt:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, uFlags, (void *)lpFmt); + return FALSE; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnSetEventMask(HWND hwnd, DWORD dwMask) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETEVENTMASK(hwnd:%p, dwMask:0x%08lX)\n"), + MSGDUMP_PREFIX, (void *)hwnd, dwMask); + return 0; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnSetOleCallback(HWND hwnd, void *pCallback) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETOLECALLBACK(hwnd:%p, pCallback:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, pCallback); + return FALSE; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnSetParaFormat(HWND hwnd, PARAFORMAT *lpFmt) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETPARAFORMAT(hwnd:%p, lpFmt:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpFmt); + return FALSE; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnSetTargetDevice(HWND hwnd, HDC hdcTarget, INT cxLineWidth) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETTARGETDEVICE(hwnd:%p, hdcTarget:%p, cxLineWidth:%d)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)hdcTarget, cxLineWidth); + return FALSE; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnStreamIn(HWND hwnd, UINT uFormat, EDITSTREAM *lpStream) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_STREAMIN(hwnd:%p, uFormat:%u, lpStream:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, uFormat, (void *)lpStream); + return 0; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnStreamOut(HWND hwnd, UINT uFormat, EDITSTREAM *lpStream) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_STREAMOUT(hwnd:%p, uFormat:%u, lpStream:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, uFormat, (void *)lpStream); + return 0; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnGetTextRange(HWND hwnd, TEXTRANGE *lpRange) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETTEXTRANGE(hwnd:%p, lpRange:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpRange); + return 0; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnFindWordBreak(HWND hwnd, UINT code, DWORD ichStart) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_FINDWORDBREAK(hwnd:%p, code:%u, ichStart:0x%08lX)\n"), + MSGDUMP_PREFIX, (void *)hwnd, code, ichStart); + return 0; +} + +static __inline UINT MSGDUMP_API +MD_RichEdit_OnSetOptions(HWND hwnd, UINT fOperation, UINT fOptions) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETOPTIONS(hwnd:%p, fOperation:%u, fOptions:%u)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fOperation, fOptions); + return 0; +} + +static __inline UINT MSGDUMP_API +MD_RichEdit_OnGetOptions(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETOPTIONS(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnFindTextEx(HWND hwnd, UINT fuFlags, FINDTEXTEX *lpFindText) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_FINDTEXTEX(hwnd:%p, fuFlags:%u, lpFindText:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fuFlags, (void *)lpFindText); + return 0; +} + +static __inline void *MSGDUMP_API +MD_RichEdit_OnGetWordBreakProcEx(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETWORDBREAKPROC(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return NULL; +} + +static __inline void *MSGDUMP_API +MD_RichEdit_OnSetWordBreakProcEx(HWND hwnd, void *pfn) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETWORDBREAKPROC(hwnd:%p, pfn:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, pfn); + return NULL; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnSetUndoLimit(HWND hwnd, DWORD dwMaxUndo) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETUNDOLIMIT(hwnd:%p, dwMaxUndo:%ld)\n"), + MSGDUMP_PREFIX, (void *)hwnd, dwMaxUndo); + return 0; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnRedo(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_REDO(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return FALSE; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnCanRedo(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_CANREDO(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return FALSE; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnGetUndoName(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETUNDONAME(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnGetRedoName(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETREDONAME(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline void MSGDUMP_API +MD_RichEdit_OnStopGroupTyping(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_STOPGROUPTYPING(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnSetTextMode(HWND hwnd, DWORD dwTextMode) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETTEXTMODE(hwnd:%p, dwTextMode:0x%08lX)\n"), + MSGDUMP_PREFIX, (void *)hwnd, dwTextMode); + return FALSE; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnGetTextMode(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETTEXTMODE(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + static __inline LRESULT MSGDUMP_API MD_msgdump(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -4191,7 +4666,56 @@ MD_msgdump(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) sz[0] = szClass[0]; sz[1] = 0; CharUpper(sz); - if (sz[0] == TEXT('E') && lstrcmpi(szClass, TEXT("EDIT")) == 0) + + if (sz[0] == TEXT('R') && lstrcmpi(szClass, RICHEDIT_CLASS) == 0) + { + switch (uMsg) + { + HANDLE_MSG(hwnd, EM_CANPASTE, MD_RichEdit_OnCanPaste); + HANDLE_MSG(hwnd, EM_DISPLAYBAND, MD_RichEdit_OnDisplayBand); + HANDLE_MSG(hwnd, EM_EXGETSEL, MD_RichEdit_OnExGetSel); + HANDLE_MSG(hwnd, EM_EXLIMITTEXT, MD_RichEdit_OnExLimitText); + HANDLE_MSG(hwnd, EM_EXLINEFROMCHAR, MD_RichEdit_OnExLineFromChar); + HANDLE_MSG(hwnd, EM_EXSETSEL, MD_RichEdit_OnExSetSel); + HANDLE_MSG(hwnd, EM_FINDTEXT, MD_RichEdit_OnFindText); + HANDLE_MSG(hwnd, EM_FORMATRANGE, MD_RichEdit_OnFormatRange); + HANDLE_MSG(hwnd, EM_GETCHARFORMAT, MD_RichEdit_OnGetCharFormat); + HANDLE_MSG(hwnd, EM_GETEVENTMASK, MD_RichEdit_OnGetEventMask); + HANDLE_MSG(hwnd, EM_GETOLEINTERFACE, MD_RichEdit_OnGetOleInterface); + HANDLE_MSG(hwnd, EM_GETPARAFORMAT, MD_RichEdit_OnGetParaFormat); + HANDLE_MSG(hwnd, EM_GETSELTEXT, MD_RichEdit_OnGetSelText); + HANDLE_MSG(hwnd, EM_HIDESELECTION, MD_RichEdit_OnHideSelection); + HANDLE_MSG(hwnd, EM_PASTESPECIAL, MD_RichEdit_OnPasteSpecial); + HANDLE_MSG(hwnd, EM_REQUESTRESIZE, MD_RichEdit_OnRequestResize); + HANDLE_MSG(hwnd, EM_SELECTIONTYPE, MD_RichEdit_OnSelectionType); + HANDLE_MSG(hwnd, EM_SETBKGNDCOLOR, MD_RichEdit_OnSetBkgndColor); + HANDLE_MSG(hwnd, EM_SETCHARFORMAT, MD_RichEdit_OnSetCharFormat); + HANDLE_MSG(hwnd, EM_SETEVENTMASK, MD_RichEdit_OnSetEventMask); + HANDLE_MSG(hwnd, EM_SETOLECALLBACK, MD_RichEdit_OnSetOleCallback); + HANDLE_MSG(hwnd, EM_SETPARAFORMAT, MD_RichEdit_OnSetParaFormat); + HANDLE_MSG(hwnd, EM_SETTARGETDEVICE, MD_RichEdit_OnSetTargetDevice); + HANDLE_MSG(hwnd, EM_STREAMIN, MD_RichEdit_OnStreamIn); + HANDLE_MSG(hwnd, EM_STREAMOUT, MD_RichEdit_OnStreamOut); + HANDLE_MSG(hwnd, EM_GETTEXTRANGE, MD_RichEdit_OnGetTextRange); + HANDLE_MSG(hwnd, EM_FINDWORDBREAK, MD_RichEdit_OnFindWordBreak); + HANDLE_MSG(hwnd, EM_SETOPTIONS, MD_RichEdit_OnSetOptions); + HANDLE_MSG(hwnd, EM_GETOPTIONS, MD_RichEdit_OnGetOptions); + HANDLE_MSG(hwnd, EM_FINDTEXTEX, MD_RichEdit_OnFindTextEx); + HANDLE_MSG(hwnd, EM_GETWORDBREAKPROCEX, MD_RichEdit_OnGetWordBreakProcEx); + HANDLE_MSG(hwnd, EM_SETWORDBREAKPROCEX, MD_RichEdit_OnSetWordBreakProcEx); + HANDLE_MSG(hwnd, EM_SETUNDOLIMIT, MD_RichEdit_OnSetUndoLimit); + HANDLE_MSG(hwnd, EM_REDO, MD_RichEdit_OnRedo); + HANDLE_MSG(hwnd, EM_CANREDO, MD_RichEdit_OnCanRedo); + HANDLE_MSG(hwnd, EM_GETUNDONAME, MD_RichEdit_OnGetUndoName); + HANDLE_MSG(hwnd, EM_GETREDONAME, MD_RichEdit_OnGetRedoName); + HANDLE_MSG(hwnd, EM_STOPGROUPTYPING, MD_RichEdit_OnStopGroupTyping); + HANDLE_MSG(hwnd, EM_SETTEXTMODE, MD_RichEdit_OnSetTextMode); + HANDLE_MSG(hwnd, EM_GETTEXTMODE, MD_RichEdit_OnGetTextMode); + } + } + + if ((sz[0] == TEXT('E') && lstrcmpi(szClass, TEXT("EDIT")) == 0) || + (sz[0] == TEXT('R') && lstrcmpi(szClass, RICHEDIT_CLASS) == 0)) { switch (uMsg) { @@ -4567,6 +5091,7 @@ MD_msgdump(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) #endif } } + switch (uMsg) { HANDLE_MSG(hwnd, WM_NULL, MD_OnNull); @@ -4848,7 +5373,56 @@ MD_msgresult(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT lResult sz[0] = szClass[0]; sz[1] = 0; CharUpper(sz); - if (sz[0] == TEXT('E') && lstrcmpi(szClass, TEXT("EDIT")) == 0) + + if (sz[0] == TEXT('R') && lstrcmpi(szClass, RICHEDIT_CLASS) == 0) + { + switch (uMsg) + { + DEFINE_RESULT(EM_CANPASTE); + DEFINE_RESULT(EM_DISPLAYBAND); + DEFINE_RESULT(EM_EXGETSEL); + DEFINE_RESULT(EM_EXLIMITTEXT); + DEFINE_RESULT(EM_EXLINEFROMCHAR); + DEFINE_RESULT(EM_EXSETSEL); + DEFINE_RESULT(EM_FINDTEXT); + DEFINE_RESULT(EM_FORMATRANGE); + DEFINE_RESULT(EM_GETCHARFORMAT); + DEFINE_RESULT(EM_GETEVENTMASK); + DEFINE_RESULT(EM_GETOLEINTERFACE); + DEFINE_RESULT(EM_GETPARAFORMAT); + DEFINE_RESULT(EM_GETSELTEXT); + DEFINE_RESULT(EM_HIDESELECTION); + DEFINE_RESULT(EM_PASTESPECIAL); + DEFINE_RESULT(EM_REQUESTRESIZE); + DEFINE_RESULT(EM_SELECTIONTYPE); + DEFINE_RESULT(EM_SETBKGNDCOLOR); + DEFINE_RESULT(EM_SETCHARFORMAT); + DEFINE_RESULT(EM_SETEVENTMASK); + DEFINE_RESULT(EM_SETOLECALLBACK); + DEFINE_RESULT(EM_SETPARAFORMAT); + DEFINE_RESULT(EM_SETTARGETDEVICE); + DEFINE_RESULT(EM_STREAMIN); + DEFINE_RESULT(EM_STREAMOUT); + DEFINE_RESULT(EM_GETTEXTRANGE); + DEFINE_RESULT(EM_FINDWORDBREAK); + DEFINE_RESULT(EM_SETOPTIONS); + DEFINE_RESULT(EM_GETOPTIONS); + DEFINE_RESULT(EM_FINDTEXTEX); + DEFINE_RESULT(EM_GETWORDBREAKPROCEX); + DEFINE_RESULT(EM_SETWORDBREAKPROCEX); + DEFINE_RESULT(EM_SETUNDOLIMIT); + DEFINE_RESULT(EM_REDO); + DEFINE_RESULT(EM_CANREDO); + DEFINE_RESULT(EM_GETUNDONAME); + DEFINE_RESULT(EM_GETREDONAME); + DEFINE_RESULT(EM_STOPGROUPTYPING); + DEFINE_RESULT(EM_SETTEXTMODE); + DEFINE_RESULT(EM_GETTEXTMODE); + } + } + + if ((sz[0] == TEXT('E') && lstrcmpi(szClass, TEXT("EDIT")) == 0) || + (sz[0] == TEXT('R') && lstrcmpi(szClass, RICHEDIT_CLASS) == 0)) { switch (uMsg) { @@ -5224,6 +5798,7 @@ MD_msgresult(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT lResult #endif } } + switch (uMsg) { DEFINE_RESULT(WM_NULL); diff --git a/sdk/include/reactos/winxx.h b/sdk/include/reactos/winxx.h index 7c662c7816e..e4acbbd8d6c 100644 --- a/sdk/include/reactos/winxx.h +++ b/sdk/include/reactos/winxx.h @@ -6,7 +6,7 @@ */ #ifndef _INC_WINXX -#define _INC_WINXX 6 /* Version 6 */ +#define _INC_WINXX 7 /* Version 7 */ #pragma once @@ -19,6 +19,9 @@ #ifndef _INC_COMMCTRL #include <commctrl.h> #endif +#ifndef _RICHEDIT_ + #include <richedit.h> +#endif /* additional message crackers */ @@ -1882,4 +1885,164 @@ #endif #endif +/* LRESULT RichEdit_OnCanPaste(HWND hwnd, UINT uFormat) */ +#define HANDLE_EM_CANPASTE(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), (UINT)(wParam)) + +/* BOOL RichEdit_OnDisplayBand(HWND hwnd, LPRECT lprc) */ +#define HANDLE_EM_DISPLAYBAND(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (LPRECT)(lParam)) + +/* void RichEdit_OnExGetSel(HWND hwnd, CHARRANGE *lpchr) */ +#define HANDLE_EM_EXGETSEL(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (CHARRANGE *)(lParam)), 0L) + +/* void RichEdit_OnExLimitText(HWND hwnd, DWORD cchTextMax) */ +#define HANDLE_EM_EXLIMITTEXT(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (DWORD)(lParam)), 0L) + +/* INT RichEdit_OnExLineFromChar(HWND hwnd, DWORD ichCharPos) */ +#define HANDLE_EM_EXLINEFROMCHAR(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd), (DWORD)(wParam)) + +/* INT RichEdit_OnExSetSel(HWND hwnd, INT ichChar) */ +#define HANDLE_EM_EXSETSEL(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd), (INT)(INT_PTR)(lParam)) + +/* INT RichEdit_OnFindText(HWND hwnd, UINT fuFlags, FINDTEXT *lpFindText) */ +#define HANDLE_EM_FINDTEXT(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd), (UINT)(wParam), (FINDTEXT *)(lParam)) + +/* INT RichEdit_OnFormatRange(HWND hwnd, BOOL fRender, FORMATRANGE *lpFmt) */ +#define HANDLE_EM_FORMATRANGE(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd), (BOOL)(wParam), (FORMATRANGE *)(lParam)) + +/* DWORD RichEdit_OnGetCharFormat(HWND hwnd, BOOL fSelection, CHARFORMAT *lpFmt) */ +#define HANDLE_EM_GETCHARFORMAT(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (BOOL)(wParam), (CHARFORMAT *)(lParam)) + +/* DWORD RichEdit_OnGetEventMask(HWND hwnd) */ +#define HANDLE_EM_GETEVENTMASK(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd)) + +/* BOOL RichEdit_OnOleInterface(HWND hwnd, LPVOID *ppObject) */ +#define HANDLE_EM_GETOLEINTERFACE(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (LPVOID *)(lParam)) + +/* DWORD RichEdit_OnGetParaFormat(HWND hwnd, PARAFORMAT *lpFmt) */ +#define HANDLE_EM_GETPARAFORMAT(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (PARAFORMAT *)(lParam)) + +/* INT RichEdit_OnGetSelText(HWND hwnd, LPTSTR lpBuf) */ +#define HANDLE_EM_GETSELTEXT(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd), (LPTSTR)(lParam)) + +/* void RichEdit_OnHideSelection(HWND hwnd, BOOL fHide, BOOL fChangeStyle) */ +#define HANDLE_EM_HIDESELECTION(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (BOOL)(wParam), (BOOL)(lParam)), 0L) + +/* void RichEdit_OnPasteSpecial(HWND hwnd, UINT uFormat, REPASTESPECIAL *lpRePasteSpecial) */ +#define HANDLE_EM_PASTESPECIAL(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (UINT)(wParam), (REPASTESPECIAL *)(lParam)), 0L) + +/* void RichEdit_OnRequestResize(HWND hwnd) */ +#define HANDLE_EM_REQUESTRESIZE(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) + +/* DWORD RichEdit_OnSelectionType(HWND hwnd) */ +#define HANDLE_EM_SELECTIONTYPE(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd)) + +/* COLORREF RichEdit_OnSetBkgndColor(HWND hwnd, BOOL fUseSysColor, COLORREF clr) */ +#define HANDLE_EM_SETBKGNDCOLOR(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (BOOL)(wParam), (COLORREF)(lParam)) + +/* BOOL RichEdit_OnSetCharFormat(HWND hwnd, UINT uFlags, CHARFORMAT *lpFmt) */ +#define HANDLE_EM_SETCHARFORMAT(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (UINT)(wParam), (CHARFORMAT *)(lParam)) + +/* DWORD RichEdit_OnSetEventMask(HWND hwnd, DWORD dwMask) */ +#define HANDLE_EM_SETEVENTMASK(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (DWORD)(lParam)) + +/* BOOL RichEdit_OnSetOleCallback(HWND hwnd, void *pCallback) */ +#define HANDLE_EM_SETOLECALLBACK(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (void *)(lParam)) + +/* BOOL RichEdit_OnSetParaFormat(HWND hwnd, PARAFORMAT *lpFmt) */ +#define HANDLE_EM_SETPARAFORMAT(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (PARAFORMAT *)(lParam)) + +/* BOOL RichEdit_OnSetTargetDevice(HWND hwnd, HDC hdcTarget, INT cxLineWidth) */ +#define HANDLE_EM_SETTARGETDEVICE(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (HDC)(wParam), (INT)(lParam)) + +/* DWORD RichEdit_OnStreamIn(HWND hwnd, UINT uFormat, EDITSTREAM *lpStream) */ +#define HANDLE_EM_STREAMIN(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (UINT)(wParam), (EDITSTREAM *)(lParam)) + +/* DWORD RichEdit_OnStreamOut(HWND hwnd, UINT uFormat, EDITSTREAM *lpStream) */ +#define HANDLE_EM_STREAMOUT(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (UINT)(wParam), (EDITSTREAM *)(lParam)) + +/* DWORD RichEdit_OnGetTextRange(HWND hwnd, TEXTRANGE *lpRange) */ +#define HANDLE_EM_GETTEXTRANGE(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (TEXTRANGE *)(lParam)) + +/* DWORD RichEdit_OnFindWordBreak(HWND hwnd, UINT code, DWORD ichStart) */ +#define HANDLE_EM_FINDWORDBREAK(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (UINT)(wParam), (DWORD)(lParam)) + +/* UINT RichEdit_OnSetOptions(HWND hwnd, UINT fOperation, UINT fOptions) */ +#define HANDLE_EM_SETOPTIONS(hwnd, wParam, lParam, fn) \ + (UINT)(fn)((hwnd), (UINT)(wParam), (UINT)(lParam)) + +/* UINT RichEdit_OnGetOptions(HWND hwnd) */ +#define HANDLE_EM_GETOPTIONS(hwnd, wParam, lParam, fn) \ + (UINT)(fn)((hwnd)) + +/* INT RichEdit_OnFindTextEx(HWND hwnd, UINT fuFlags, FINDTEXTEX *lpFindText) */ +#define HANDLE_EM_FINDTEXTEX(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd), (UINT)(wParam), (FINDTEXTEX *)(lParam)) + +/* void *RichEdit_OnGetWordBreakProcEx(HWND hwnd) */ +#define HANDLE_EM_GETWORDBREAKPROCEX(hwnd, wParam, lParam, fn) \ + (LRESULT)(void *)(fn)((hwnd)) + +/* void *RichEdit_OnSetWordBreakProcEx(HWND hwnd, void *pfn) */ +#define HANDLE_EM_SETWORDBREAKPROCEX(hwnd, wParam, lParam, fn) \ + (LRESULT)(void *)(fn)((hwnd), (void *)(lParam)) + +/* DWORD RichEdit_OnSetUndoLimit(HWND hwnd, DWORD dwMaxUndo) */ +#define HANDLE_EM_SETUNDOLIMIT(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (DWORD)(wParam)) + +/* BOOL RichEdit_OnRedo(HWND hwnd) */ +#define HANDLE_EM_REDO(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd)) + +/* BOOL RichEdit_OnCanRedo(HWND hwnd) */ +#define HANDLE_EM_CANREDO(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd)) + +/* INT RichEdit_OnGetUndoName(HWND hwnd) */ +#define HANDLE_EM_GETUNDONAME(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd)) + +/* INT RichEdit_OnGetRedoName(HWND hwnd) */ +#define HANDLE_EM_GETREDONAME(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd)) + +/* void RichEdit_OnStopGroupTyping(HWND hwnd) */ +#define HANDLE_EM_STOPGROUPTYPING(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) + +/* BOOL RichEdit_OnSetTextMode(HWND hwnd, DWORD dwTextMode) */ +#define HANDLE_EM_SETTEXTMODE(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (DWORD)(wParam)) + +/* DWORD RichEdit_OnGetTextMode(HWND hwnd) */ +#define HANDLE_EM_GETTEXTMODE(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd)) + #endif

5 years, 4 months

[reactos] 01/01: [ATL_APITEST] Add 'atltest.h' and use it (#1822)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a800fa7bb2277771be141… commit a800fa7bb2277771be14196f1a0f012776f8b260 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 12 19:24:08 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 12 19:24:08 2019 +0900 [ATL_APITEST] Add 'atltest.h' and use it (#1822) - Add "atltest.h" header file for common use in atl_apitest. - Delete the duplicated and simplify. --- modules/rostests/apitests/atl/CAtlArray.cpp | 27 +---- modules/rostests/apitests/atl/CAtlFileMapping.cpp | 59 +-------- modules/rostests/apitests/atl/CAtlList.cpp | 27 +---- modules/rostests/apitests/atl/CComObject.cpp | 27 +---- modules/rostests/apitests/atl/CComQIPtr.cpp | 27 +---- modules/rostests/apitests/atl/CImage.cpp | 27 +---- modules/rostests/apitests/atl/CSimpleArray.cpp | 27 +---- modules/rostests/apitests/atl/CSimpleMap.cpp | 27 +---- modules/rostests/apitests/atl/CString.cpp | 59 +-------- modules/rostests/apitests/atl/atltest.h | 138 ++++++++++++++++++++++ 10 files changed, 147 insertions(+), 298 deletions(-) diff --git a/modules/rostests/apitests/atl/CAtlArray.cpp b/modules/rostests/apitests/atl/CAtlArray.cpp index 8527c4ac47d..b1e654bf109 100644 --- a/modules/rostests/apitests/atl/CAtlArray.cpp +++ b/modules/rostests/apitests/atl/CAtlArray.cpp @@ -9,27 +9,7 @@ #ifdef HAVE_APITEST #include <apitest.h> #else - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> - int g_tests_executed = 0; - int g_tests_failed = 0; - void ok_func(const char *file, int line, bool value, const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - if (!value) - { - printf("%s (%d): ", file, line); - vprintf(fmt, va); - g_tests_failed++; - } - g_tests_executed++; - va_end(va); - } - #undef ok - #define ok(value, ...) ok_func(__FILE__, __LINE__, value, __VA_ARGS__) - #define START_TEST(x) int main(void) + #include "atltest.h" #endif #include <atlbase.h> @@ -161,9 +141,4 @@ START_TEST(CAtlArray) ok(CCreature::s_nCCtorCount == 1, "Expected CCreature::s_nCCtorCount is 1, was: %d\n", CCreature::s_nCCtorCount); ok(CCreature::s_nDtorCount == 102, "Expected CCreature::s_nDtorCount is 102, was: %d\n", CCreature::s_nDtorCount); ok(CCreature::s_nOpIsCount == 1, "Expected CCreature::s_nOpIsCount is 1, was: %d\n", CCreature::s_nOpIsCount); - -#ifndef HAVE_APITEST - printf("CAtlArray: %i tests executed (0 marked as todo, %i failures), 0 skipped.\n", g_tests_executed, g_tests_failed); - return g_tests_failed; -#endif } diff --git a/modules/rostests/apitests/atl/CAtlFileMapping.cpp b/modules/rostests/apitests/atl/CAtlFileMapping.cpp index 0e0ef5909c9..c0e2348d170 100644 --- a/modules/rostests/apitests/atl/CAtlFileMapping.cpp +++ b/modules/rostests/apitests/atl/CAtlFileMapping.cpp @@ -10,59 +10,7 @@ #ifdef HAVE_APITEST #include <apitest.h> #else - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> - #include <windows.h> - int g_tests_executed = 0; - int g_tests_failed = 0; - int g_tests_skipped = 0; - const char *g_file = NULL; - int g_line = 0; - void set_location(const char *file, int line) - { - g_file = file; - g_line = line; - } - void ok_func(int value, const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - if (!value) - { - printf("%s (%d): ", g_file, g_line); - vprintf(fmt, va); - g_tests_failed++; - } - g_tests_executed++; - va_end(va); - } - void skip_func(const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - printf("%s (%d): test skipped: ", g_file, g_line); - vprintf(fmt, va); - g_tests_skipped++; - va_end(va); - } - #undef ok - #define ok(value, ...) do { \ - set_location(__FILE__, __LINE__); \ - ok_func(value, __VA_ARGS__); \ - } while (0) - #define ok_(x1,x2) set_location(x1,x2); ok_func - #define skip(...) do { \ - set_location(__FILE__, __LINE__); \ - skip_func(__VA_ARGS__); \ - } while (0) - #define START_TEST(x) int main() - char *wine_dbgstr_w(const wchar_t *wstr) - { - static char buf[512]; - WideCharToMultiByte(CP_ACP, 0, wstr, -1, buf, _countof(buf), NULL, NULL); - return buf; - } + #include "atltest.h" #endif struct TestData @@ -246,9 +194,4 @@ START_TEST(CAtlFileMapping) { test_SharedMem(); test_FileMapping(); - -#ifndef HAVE_APITEST - printf("CAtlFile: %i tests executed (0 marked as todo, %i failures), %i skipped.\n", g_tests_executed, g_tests_failed, g_tests_skipped); - return g_tests_failed; -#endif } diff --git a/modules/rostests/apitests/atl/CAtlList.cpp b/modules/rostests/apitests/atl/CAtlList.cpp index eb8cb761620..1f5e4c7d789 100644 --- a/modules/rostests/apitests/atl/CAtlList.cpp +++ b/modules/rostests/apitests/atl/CAtlList.cpp @@ -9,27 +9,7 @@ #ifdef HAVE_APITEST #include <apitest.h> #else - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> - int g_tests_executed = 0; - int g_tests_failed = 0; - void ok_func(const char *file, int line, bool value, const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - if (!value) - { - printf("%s (%d): ", file, line); - vprintf(fmt, va); - g_tests_failed++; - } - g_tests_executed++; - va_end(va); - } - #undef ok - #define ok(value, ...) ok_func(__FILE__, __LINE__, value, __VA_ARGS__) - #define START_TEST(x) int main(void) + #include "atltest.h" #endif #include <atlbase.h> @@ -73,9 +53,4 @@ START_TEST(CAtlList) index++; } ok(it == NULL, "it does still point to something!\n"); - -#ifndef HAVE_APITEST - printf("CAtlList: %i tests executed (0 marked as todo, %i failures), 0 skipped.\n", g_tests_executed, g_tests_failed); - return g_tests_failed; -#endif } diff --git a/modules/rostests/apitests/atl/CComObject.cpp b/modules/rostests/apitests/atl/CComObject.cpp index e40e0b8f691..396290dfd5e 100644 --- a/modules/rostests/apitests/atl/CComObject.cpp +++ b/modules/rostests/apitests/atl/CComObject.cpp @@ -12,27 +12,7 @@ #ifdef HAVE_APITEST #include <apitest.h> #else - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> - int g_tests_executed = 0; - int g_tests_failed = 0; - void ok_func(const char *file, int line, BOOL value, const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - if (!value) - { - printf("%s (%d): ", file, line); - vprintf(fmt, va); - g_tests_failed++; - } - g_tests_executed++; - va_end(va); - } - #undef ok - #define ok(value, ...) ok_func(__FILE__, __LINE__, value, __VA_ARGS__) - #define START_TEST(x) int main(void) + #include "atltest.h" #endif @@ -141,9 +121,4 @@ START_TEST(CComObject) ok(g_DTOR == 1, "Expected 1, got %lu\n", g_DTOR); ok(g_BLIND == 1, "Expected 1, got %lu\n", g_BLIND); } - -#ifndef HAVE_APITEST - printf("CComObject: %i tests executed (0 marked as todo, %i failures), 0 skipped.\n", g_tests_executed, g_tests_failed); - return g_tests_failed; -#endif } diff --git a/modules/rostests/apitests/atl/CComQIPtr.cpp b/modules/rostests/apitests/atl/CComQIPtr.cpp index 677e6231890..f662d15028b 100644 --- a/modules/rostests/apitests/atl/CComQIPtr.cpp +++ b/modules/rostests/apitests/atl/CComQIPtr.cpp @@ -11,27 +11,7 @@ #ifdef HAVE_APITEST #include <apitest.h> #else - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> - int g_tests_executed = 0; - int g_tests_failed = 0; - void ok_func(const char *file, int line, BOOL value, const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - if (!value) - { - printf("%s (%d): ", file, line); - vprintf(fmt, va); - g_tests_failed++; - } - g_tests_executed++; - va_end(va); - } - #undef ok - #define ok(value, ...) ok_func(__FILE__, __LINE__, value, __VA_ARGS__) - #define START_TEST(x) int main(void) + #include "atltest.h" #endif @@ -154,9 +134,4 @@ START_TEST(CComQIPtr) #endif ok(g_QI == 5, "Expected g_QI 5, got %lu\n", g_QI); } - -#ifndef HAVE_APITEST - printf("CComQIPtr: %i tests executed (0 marked as todo, %i failures), 0 skipped.\n", g_tests_executed, g_tests_failed); - return g_tests_failed; -#endif } diff --git a/modules/rostests/apitests/atl/CImage.cpp b/modules/rostests/apitests/atl/CImage.cpp index 1692cd71a48..f2dd08481ec 100644 --- a/modules/rostests/apitests/atl/CImage.cpp +++ b/modules/rostests/apitests/atl/CImage.cpp @@ -11,27 +11,7 @@ #ifdef HAVE_APITEST #include <apitest.h> #else - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> - int g_tests_executed = 0; - int g_tests_failed = 0; - void ok_func(const char *file, int line, BOOL value, const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - if (!value) - { - printf("%s (%d): ", file, line); - vprintf(fmt, va); - g_tests_failed++; - } - g_tests_executed++; - va_end(va); - } - #undef ok - #define ok(value, ...) ok_func(__FILE__, __LINE__, value, __VA_ARGS__) - #define START_TEST(x) int main(void) + #include "atltest.h" #endif const TCHAR* szFiles[] = { @@ -331,9 +311,4 @@ START_TEST(CImage) ok(lstrcmpA(psz, "All Image Files|*.BMP;*.DIB;*.RLE;*.JPG;*.JPEG;*.JPE;*.JFIF;*.GIF;*.EMF;*.WMF;*.TIF;*.TIFF;*.PNG;*.ICO|BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|GIF (*.GIF)|*.GIF|EMF (*.EMF)|*.EMF|WMF (*.WMF)|*.WMF|TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|PNG (*.PNG)|*.PNG|ICO (*.ICO)|*.ICO||") == 0, "The exporter filter string is bad, was: %s\n", psz); #endif - -#ifndef HAVE_APITEST - printf("CImage: %i tests executed (0 marked as todo, %i failures), 0 skipped.\n", g_tests_executed, g_tests_failed); - return g_tests_failed; -#endif } diff --git a/modules/rostests/apitests/atl/CSimpleArray.cpp b/modules/rostests/apitests/atl/CSimpleArray.cpp index 80603066440..dcb6c5661cf 100644 --- a/modules/rostests/apitests/atl/CSimpleArray.cpp +++ b/modules/rostests/apitests/atl/CSimpleArray.cpp @@ -8,27 +8,7 @@ #ifdef HAVE_APITEST #include <apitest.h> #else - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> - int g_tests_executed = 0; - int g_tests_failed = 0; - void ok_func(const char *file, int line, bool value, const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - if (!value) - { - printf("%s (%d): ", file, line); - vprintf(fmt, va); - g_tests_failed++; - } - g_tests_executed++; - va_end(va); - } - #undef ok - #define ok(value, ...) ok_func(__FILE__, __LINE__, value, __VA_ARGS__) - #define START_TEST(x) int main(void) + #include "atltest.h" #endif #include <atlbase.h> @@ -178,9 +158,4 @@ START_TEST(CSimpleArray) } ok(!!array1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n"); ok(array1.GetSize() == 0, "Expected array1.GetSize() is 0, was: %d\n", array1.GetSize()); - -#ifndef HAVE_APITEST - printf("CSimpleArray: %i tests executed (0 marked as todo, %i failures), 0 skipped.\n", g_tests_executed, g_tests_failed); - return g_tests_failed; -#endif } diff --git a/modules/rostests/apitests/atl/CSimpleMap.cpp b/modules/rostests/apitests/atl/CSimpleMap.cpp index 2d1afb9c8d7..f21e9831be4 100644 --- a/modules/rostests/apitests/atl/CSimpleMap.cpp +++ b/modules/rostests/apitests/atl/CSimpleMap.cpp @@ -8,27 +8,7 @@ #ifdef HAVE_APITEST #include <apitest.h> #else - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> - int g_tests_executed = 0; - int g_tests_failed = 0; - void ok_func(const char *file, int line, bool value, const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - if (!value) - { - printf("%s (%d): ", file, line); - vprintf(fmt, va); - g_tests_failed++; - } - g_tests_executed++; - va_end(va); - } - #undef ok - #define ok(value, ...) ok_func(__FILE__, __LINE__, value, __VA_ARGS__) - #define START_TEST(x) int main(void) + #include "atltest.h" #endif #include <atlbase.h> @@ -198,9 +178,4 @@ START_TEST(CSimpleMap) ok(map1.GetSize() == 1, "Expected map1's size is 1, was %d\n", map1.GetSize()); ok(!!map1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n"); ok(map1.GetSize() == 0, "Expected map1's size is 0, was %d\n", map1.GetSize()); - -#ifndef HAVE_APITEST - printf("CSimpleMap: %i tests executed (0 marked as todo, %i failures), 0 skipped.\n", g_tests_executed, g_tests_failed); - return g_tests_failed; -#endif } diff --git a/modules/rostests/apitests/atl/CString.cpp b/modules/rostests/apitests/atl/CString.cpp index 22ce8dfc0dc..bb96f3f7d8b 100644 --- a/modules/rostests/apitests/atl/CString.cpp +++ b/modules/rostests/apitests/atl/CString.cpp @@ -12,59 +12,7 @@ #ifdef HAVE_APITEST #include <apitest.h> #else - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> - #include <windows.h> - int g_tests_executed = 0; - int g_tests_failed = 0; - int g_tests_skipped = 0; - const char *g_file = NULL; - int g_line = 0; - void set_location(const char *file, int line) - { - g_file = file; - g_line = line; - } - void ok_func(int value, const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - if (!value) - { - printf("%s (%d): ", g_file, g_line); - vprintf(fmt, va); - g_tests_failed++; - } - g_tests_executed++; - va_end(va); - } - void skip_func(const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - printf("%s (%d): test skipped: ", g_file, g_line); - vprintf(fmt, va); - g_tests_skipped++; - va_end(va); - } - #undef ok - #define ok(value, ...) do { \ - set_location(__FILE__, __LINE__); \ - ok_func(value, __VA_ARGS__); \ - } while (0) - #define ok_(x1,x2) set_location(x1,x2); ok_func - #define skip(...) do { \ - set_location(__FILE__, __LINE__); \ - skip_func(__VA_ARGS__); \ - } while (0) - #define START_TEST(x) int main(void) - char *wine_dbgstr_w(const wchar_t *wstr) - { - static char buf[512]; - WideCharToMultiByte(CP_ACP, 0, wstr, -1, buf, _countof(buf), NULL, NULL); - return buf; - } + #include "atltest.h" #endif struct traits_test @@ -256,9 +204,4 @@ START_TEST(CString) test_bstrW(); test_bstrA(); - -#ifndef HAVE_APITEST - printf("CString: %i tests executed (0 marked as todo, %i failures), %i skipped.\n", g_tests_executed, g_tests_failed, g_tests_skipped); - return g_tests_failed; -#endif } diff --git a/modules/rostests/apitests/atl/atltest.h b/modules/rostests/apitests/atl/atltest.h new file mode 100644 index 00000000000..9fb1ede6ac5 --- /dev/null +++ b/modules/rostests/apitests/atl/atltest.h @@ -0,0 +1,138 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Testing + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#ifndef ATLTEST_H_ +#define ATLTEST_H_ + +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <string.h> +#ifndef _INC_WINDOWS + #include <windows.h> +#endif + +int g_atltest_executed = 0; +int g_atltest_failed = 0; +int g_atltest_skipped = 0; + +const char *g_atltest_file = NULL; +int g_atltest_line = 0; + +void atltest_set_location(const char *file, int line) +{ + g_atltest_file = file; + g_atltest_line = line; +} + +void atltest_ok(int value, const char *fmt, ...) +{ + va_list va; + va_start(va, fmt); + if (!value) + { + printf("%s (%d): ", g_atltest_file, g_atltest_line); + vprintf(fmt, va); + g_atltest_failed++; + } + g_atltest_executed++; + va_end(va); +} + +void atltest_skip(const char *fmt, ...) +{ + va_list va; + va_start(va, fmt); + printf("%s (%d): test skipped: ", g_atltest_file, g_atltest_line); + vprintf(fmt, va); + g_atltest_skipped++; + va_end(va); +} + +#undef ok +#define ok(value, ...) do { \ + atltest_set_location(__FILE__, __LINE__); \ + atltest_ok(value, __VA_ARGS__); \ +} while (0) +#define ok_(x1,x2) atltest_set_location(x1,x2); atltest_ok + +#undef skip +#define skip(...) do { \ + atltest_set_location(__FILE__, __LINE__); \ + atltest_skip(__VA_ARGS__); \ +} while (0) + +#undef trace +#define trace printf + +static void atltest_start_test(void); +extern const char *g_atltest_name; + +#define START_TEST(x) \ + const char *g_atltest_name = #x; \ + static void atltest_start_test(void) + +int main(void) +{ + atltest_start_test(); + printf("%s: %d tests executed (0 marked as todo, %d failures), %d skipped.\n", + g_atltest_name, g_atltest_executed, g_atltest_failed, g_atltest_skipped); + return g_atltest_failed; +} + +char *wine_dbgstr_w(const wchar_t *wstr) +{ + static char buf[512]; + WideCharToMultiByte(CP_ACP, 0, wstr, -1, buf, _countof(buf), NULL, NULL); + return buf; +} + +#define ok_hex(expression, result) \ + do { \ + int _value = (expression); \ + ok(_value == (result), "Wrong value for '%s', expected: " #result " (0x%x), got: 0x%x\n", \ + #expression, (int)(result), _value); \ + } while (0) + +#define ok_dec(expression, result) \ + do { \ + int _value = (expression); \ + ok(_value == (result), "Wrong value for '%s', expected: " #result " (%d), got: %d\n", \ + #expression, (int)(result), _value); \ + } while (0) + +#define ok_ptr(expression, result) \ + do { \ + void *_value = (expression); \ + ok(_value == (result), "Wrong value for '%s', expected: " #result " (%p), got: %p\n", \ + #expression, (void*)(result), _value); \ + } while (0) + +#define ok_size_t(expression, result) \ + do { \ + size_t _value = (expression); \ + ok(_value == (result), "Wrong value for '%s', expected: " #result " (%Ix), got: %Ix\n", \ + #expression, (size_t)(result), _value); \ + } while (0) + +#define ok_char(expression, result) ok_hex(expression, result) + +#define ok_err(error) \ + ok(GetLastError() == (error), "Wrong last error. Expected " #error ", got 0x%lx\n", GetLastError()) + +#define ok_str(x, y) \ + ok(strcmp(x, y) == 0, "Wrong string. Expected '%s', got '%s'\n", y, x) + +#define ok_wstr(x, y) \ + ok(wcscmp(x, y) == 0, "Wrong string. Expected '%S', got '%S'\n", y, x) + +#define ok_long(expression, result) ok_hex(expression, result) +#define ok_int(expression, result) ok_dec(expression, result) +#define ok_ntstatus(status, expected) ok_hex(status, expected) +#define ok_hdl ok_ptr + +#endif /* ndef ATLTEST_H_ */

5 years, 4 months

← Newer
1
...
16
17
18
19
20
21
22
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2019