Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [USER32_APITEST] Move <strsafe.h> #inclusion
by Katayama Hirofumi MZ 26 Jul '19

26 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c5d8cf7db3c1f5c2b52a… commit 9c5d8cf7db3c1f5c2b52a4bf11b68d87fa6de29c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 26 21:30:36 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Jul 26 21:30:36 2019 +0900 [USER32_APITEST] Move <strsafe.h> #inclusion --- modules/rostests/apitests/user32/MessageStateAnalyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/user32/MessageStateAnalyzer.c b/modules/rostests/apitests/user32/MessageStateAnalyzer.c index 490b69d3e69..e6e1f40436a 100644 --- a/modules/rostests/apitests/user32/MessageStateAnalyzer.c +++ b/modules/rostests/apitests/user32/MessageStateAnalyzer.c @@ -4,9 +4,9 @@ * PURPOSE: debugging and analysis of message states * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#include <strsafe.h> #include "undocuser.h" #include "winxx.h" +#include <strsafe.h> static void MsgDumpPrintf(LPCSTR fmt, ...) {

1 0

[reactos] 01/01: [WIN32SS][NTGDI] text/font vertical alignment patch CORE-16133
by Katayama Hirofumi MZ 26 Jul '19

26 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e4db883e5727569b5c3a… commit 0e4db883e5727569b5c3a35da3a6f8c5e921bbf3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 26 19:13:00 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Jul 26 19:13:00 2019 +0900 [WIN32SS][NTGDI] text/font vertical alignment patch CORE-16133 Based on Doug Lyons' patch. It partially fix CORE-16246 and CORE-16133. Selection area is not fixed yet. --- win32ss/gdi/ntgdi/freetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 4e4d4f6f8fd..162df2a2708 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5916,9 +5916,9 @@ IntExtTextOutW( * Process the vertical alignment and determine the yoff. */ #define VALIGN_MASK (TA_TOP | TA_BASELINE | TA_BOTTOM) - if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BASELINE) + if ((pdcattr->flTextAlign & VALIGN_MASK) == TA_BASELINE) yoff = 0; - else if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BOTTOM) + else if ((pdcattr->flTextAlign & VALIGN_MASK) == TA_BOTTOM) yoff = -(fixDescender >> 6); else /* TA_TOP */ yoff = fixAscender >> 6;

1 0

[reactos] 01/01: [CODEOWNERS] Add UniATA (#1689)
by Serge Gautherie 24 Jul '19

24 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c00dc468637ebfe0708ae… commit c00dc468637ebfe0708ae040eca991d6ac4e9a0a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Jul 24 19:59:07 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jul 24 19:59:07 2019 +0200 [CODEOWNERS] Add UniATA (#1689) --- CODEOWNERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index a6a954d82dc..07865197b38 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -239,6 +239,11 @@ CMakeLists.txt @learn-more @ThFabba # S: Maintained /dll/shellext @learn-more +# UniATA +# M: ThFabba, Thomas Faber +# S: Upstream +/drivers/storage/ide/uniata/ @ThFabba + # Upstream File Systems # M: HeisSpiter, Pierre Schweitzer # S: Upstream

1 0

[reactos] 01/01: [TRANSLATION] Hebrew Translations For Setup (#1750)
by Shy Zedaka 24 Jul '19

24 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=112127593bab56ef59961… commit 112127593bab56ef5996163a3cdd5e952c27170e Author: Shy Zedaka <shaytzedaka(a)outlook.com> AuthorDate: Wed Jul 24 20:56:48 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jul 24 19:56:48 2019 +0200 [TRANSLATION] Hebrew Translations For Setup (#1750) --- base/setup/reactos/lang/he-IL.rc | 52 ++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index 809ee4b34ae..2e6e9f750bc 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -1,4 +1,4 @@ -/* Translated by Baruch Rutman */ +/* Translated by Baruch Rutman, Additional Translations By Shy Zedaka */ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT @@ -8,8 +8,8 @@ CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "ברוכים הבאים לאשף ההתקנה של ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "עדיין אי אפשר להתקין את ReactOS ישירות מהתקליטור הזה! נא אתחל מחדש מחשבך מהדיסק כדי להתקין את ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "לחץ על סיום כדי לסיים את ההתקנה.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "אתה לא יכול להתקין את ReactOS מהדיסק הזה ברגע זה! נע הפעל מחדש את המחשב מהדיסק הזה בשביל להתקין את ReactOS", IDC_STATIC, 115, 40, 195, 100 + LTEXT "לחץ על 'סיום' כדי לסיים את ההתקנה.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 @@ -21,7 +21,7 @@ BEGIN LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "תיקון או עדכון גרסה קיימת", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "לחץ על הבא כדי להגדיר את ההתקנים", IDC_STATIC, 7, 128, 297, 8 + LTEXT "לחץ על 'הבא' כדי להגדיר את ההתקנים.", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -31,7 +31,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 - PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 + PUSHBUTTON "אל תשדרג", IDC_SKIPUPGRADE, 230, 128, 80, 14 LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END @@ -46,7 +46,7 @@ BEGIN CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "תצוגה:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "לחץ על הבא כדי להגדיר את התקן ההתקנה.", IDC_STATIC, 7, 128, 297, 8 + LTEXT "לחץ על 'הבא' כדי להגדיר את התקן ההתקנה.", IDC_STATIC, 7, 128, 297, 8 END IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -59,7 +59,7 @@ BEGIN PUSHBUTTON "מחק", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "טעינת מנהל התקן", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "אפשרויות מתקדמות...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - // LTEXT "לחץ על הבא כדי לראות סיכום.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "לחץ על 'הבא' כדי לראות סיכום.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -68,10 +68,10 @@ CAPTION "יצירת מחיצה" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13 - CONTROL "יצירת ואתחול המחיצה", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 + CONTROL "יצירה ואתחול מחיצה", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 LTEXT "גודל:", IDC_STATIC, 13, 24, 27, 9 EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP - LTEXT "ג""ב", IDC_UNIT, 117, 24, 14, 9 + LTEXT "GB", IDC_UNIT, 117, 24, 14, 9 LTEXT "מערכת קבצים:", IDC_STATIC, 13, 46, 42, 9 CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50 PUSHBUTTON "אישור", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP @@ -98,17 +98,17 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + LTEXT "סוג התקנה:", IDC_STATIC, 18, 5, 74, 11 EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + LTEXT "מחשב:", IDC_STATIC, 18, 41, 74, 11 EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + LTEXT "תצוגה:", IDC_STATIC, 18, 53, 74, 11 EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + LTEXT "מקלדת:", IDC_STATIC, 18, 65, 74, 11 EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP @@ -124,7 +124,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "התקן קבצים...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 END @@ -136,14 +136,14 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "כאשר תלחץ על 'סיים' המחשב שלך יפעיל את עצמו מחדש", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "'אם יש דיסק בכונן, הסר אותו ואז, בשביל מחדש את המחשב לחץ על 'סיום", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN - IDS_TYPETITLE "ברוכים הבאים אל תכנית ההתקנה של ReactOS" + IDS_TYPETITLE "ברוכים הבאים לתוכנית ההתקנה של ReactOS" IDS_TYPESUBTITLE "בחירת סוג התקנה." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Set the settings of display and keyboard." @@ -153,25 +153,25 @@ BEGIN IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" IDS_RESTARTTITLE "First stage of setup finished" IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_SUMMARYTITLE "Installation Summary" + IDS_SUMMARYTITLE "סיכום ההתקנה" IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" - IDS_ABORTSETUP2 "Abort installation?" + IDS_ABORTSETUP2 "לבטל את ההתקנה?" IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "התקנת ReactOS" END STRINGTABLE BEGIN - IDS_INSTALLATION_NAME "Name" - IDS_INSTALLATION_PATH "Installation Path" - IDS_INSTALLATION_VENDOR "Vendor Name" + IDS_INSTALLATION_NAME "שם" + IDS_INSTALLATION_PATH "נתיב ההתקנה" + IDS_INSTALLATION_VENDOR "שם הספק" END STRINGTABLE BEGIN - IDS_PARTITION_NAME "Name" - IDS_PARTITION_TYPE "Type" - IDS_PARTITION_SIZE "Size" - IDS_PARTITION_STATUS "Status" + IDS_PARTITION_NAME "שם" + IDS_PARTITION_TYPE "סוג" + IDS_PARTITION_SIZE "גודל" + IDS_PARTITION_STATUS "מצב" END

1 0

[reactos] 01/01: [DSOUND_NEW] Remove unused dsound_convert.c file (#1748)
by Oleg Dubinskiy 24 Jul '19

24 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a84d120a60727a77c430… commit 1a84d120a60727a77c4303ed2300d89284cd63cb Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Jul 24 20:56:33 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jul 24 19:56:33 2019 +0200 [DSOUND_NEW] Remove unused dsound_convert.c file (#1748) --- dll/directx/dsound_new/dsound_convert.c | 435 -------------------------------- 1 file changed, 435 deletions(-) diff --git a/dll/directx/dsound_new/dsound_convert.c b/dll/directx/dsound_new/dsound_convert.c deleted file mode 100644 index 0a6e474d09d..00000000000 --- a/dll/directx/dsound_new/dsound_convert.c +++ /dev/null @@ -1,435 +0,0 @@ -/* DirectSound format conversion and mixing routines - * - * Copyright 2007 Maarten Lankhorst - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* 8 bits is unsigned, the rest is signed. - * First I tried to reuse existing stuff from alsa-lib, after that - * didn't work, I gave up and just went for individual hacks. - * - * 24 bit is expensive to do, due to unaligned access. - * In dlls/winex11.drv/dib_convert.c convert_888_to_0888_asis there is a way - * around it, but I'm happy current code works, maybe something for later. - * - * The ^ 0x80 flips the signed bit, this is the conversion from - * signed (-128.. 0.. 127) to unsigned (0...255) - * This is only temporary: All 8 bit data should be converted to signed. - * then when fed to the sound card, it should be converted to unsigned again. - * - * Sound is LITTLE endian - */ - -#include "config.h" - -#include <stdarg.h> - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "mmsystem.h" -#include "winternl.h" -#include "wine/debug.h" -#include "dsound.h" -#include "dsdriver.h" -#include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound); - -#ifdef WORDS_BIGENDIAN -#define le16(x) RtlUshortByteSwap((x)) -#define le32(x) RtlUlongByteSwap((x)) -#else -#define le16(x) (x) -#define le32(x) (x) -#endif - -static inline void src_advance(const void **src, UINT stride, INT *count, UINT *freqAcc, UINT adj) -{ - *freqAcc += adj; - if (*freqAcc >= (1 << DSOUND_FREQSHIFT)) - { - ULONG adv = (*freqAcc >> DSOUND_FREQSHIFT); - *freqAcc &= (1 << DSOUND_FREQSHIFT) - 1; - *(const char **)src += adv * stride; - *count -= adv; - } -} - -static void convert_8_to_8 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - *(BYTE *)dst = *(const BYTE *)src; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_8_to_16 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - WORD dest = *(const BYTE *)src, *dest16 = dst; - *dest16 = le16(dest * 257 - 32768); - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_8_to_24 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - BYTE dest = *(const BYTE *)src; - BYTE *dest24 = dst; - dest24[0] = dest; - dest24[1] = dest; - dest24[2] = dest - 0x80; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_8_to_32 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - DWORD dest = *(const BYTE *)src, *dest32 = dst; - *dest32 = le32(dest * 16843009 - 2147483648U); - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_16_to_8 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - BYTE *dst8 = dst; - *dst8 = (le16(*(const WORD *)src)) / 256; - *dst8 -= 0x80; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_16_to_16 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - *(WORD *)dst = *(const WORD *)src; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_16_to_24 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - WORD dest = le16(*(const WORD *)src); - BYTE *dest24 = dst; - - dest24[0] = dest / 256; - dest24[1] = dest; - dest24[2] = dest / 256; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_16_to_32 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - DWORD dest = *(const WORD *)src, *dest32 = dst; - *dest32 = dest * 65537; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_24_to_8 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - BYTE *dst8 = dst; - *dst8 = ((const BYTE *)src)[2]; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_24_to_16 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - WORD *dest16 = dst; - const BYTE *source = src; - *dest16 = le16(source[2] * 256 + source[1]); - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_24_to_24 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - BYTE *dest24 = dst; - const BYTE *src24 = src; - - dest24[0] = src24[0]; - dest24[1] = src24[1]; - dest24[2] = src24[2]; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_24_to_32 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - DWORD *dest32 = dst; - const BYTE *source = src; - *dest32 = le32(source[2] * 16777217 + source[1] * 65536 + source[0] * 256); - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_32_to_8 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - BYTE *dst8 = dst; - *dst8 = (le32(*(const DWORD *)src) / 16777216); - *dst8 -= 0x80; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_32_to_16 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - WORD *dest16 = dst; - *dest16 = le16(le32(*(const DWORD *)src) / 65536); - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_32_to_24 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - DWORD dest = le32(*(const DWORD *)src); - BYTE *dest24 = dst; - - dest24[0] = dest / 256; - dest24[1] = dest / 65536; - dest24[2] = dest / 16777216; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_32_to_32 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - DWORD *dest = dst; - *dest = *(const DWORD *)src; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -const bitsconvertfunc convertbpp[4][4] = { - { convert_8_to_8, convert_8_to_16, convert_8_to_24, convert_8_to_32 }, - { convert_16_to_8, convert_16_to_16, convert_16_to_24, convert_16_to_32 }, - { convert_24_to_8, convert_24_to_16, convert_24_to_24, convert_24_to_32 }, - { convert_32_to_8, convert_32_to_16, convert_32_to_24, convert_32_to_32 }, -}; - -static void mix8(signed char *src, INT *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - while (len--) - /* 8-bit WAV is unsigned, it's here converted to signed, normalize function will convert it back again */ - *(dst++) += (signed char)((BYTE)*(src++) - (BYTE)0x80); -} - -static void mix16(SHORT *src, INT *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - len /= 2; - while (len--) - { - *dst += le16(*src); - ++dst; ++src; - } -} - -static void mix24(BYTE *src, INT *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - len /= 3; - while (len--) - { - DWORD field; - field = ((DWORD)src[2] << 16) + ((DWORD)src[1] << 8) + (DWORD)src[0]; - if (src[2] & 0x80) - field |= 0xFF000000U; - *(dst++) += field; - ++src; - } -} - -static void mix32(INT *src, LONGLONG *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - len /= 4; - while (len--) - *(dst++) += le32(*(src++)); -} - -const mixfunc mixfunctions[4] = { - (mixfunc)mix8, - (mixfunc)mix16, - (mixfunc)mix24, - (mixfunc)mix32 -}; - -static void norm8(INT *src, signed char *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - while (len--) - { - *dst = (*src) + 0x80; - if (*src < -0x80) - *dst = 0; - else if (*src > 0x7f) - *dst = 0xff; - ++dst; - ++src; - } -} - -static void norm16(INT *src, SHORT *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - len /= 2; - while (len--) - { - *dst = le16(*src); - if (*src <= -0x8000) - *dst = le16(0x8000); - else if (*src > 0x7fff) - *dst = le16(0x7fff); - ++dst; - ++src; - } -} - -static void norm24(INT *src, BYTE *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - len /= 3; - while (len--) - { - if (*src <= -0x800000) - { - dst[0] = 0; - dst[1] = 0; - dst[2] = 0x80; - } - else if (*src > 0x7fffff) - { - dst[0] = 0xff; - dst[1] = 0xff; - dst[2] = 0x7f; - } - else - { - dst[0] = *src; - dst[1] = *src >> 8; - dst[2] = *src >> 16; - } - ++dst; - ++src; - } -} - -static void norm32(LONGLONG *src, INT *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - len /= 4; - while (len--) - { - *dst = le32(*src); - if (*src <= -(LONGLONG)0x80000000) - *dst = le32(0x80000000); - else if (*src > 0x7fffffff) - *dst = le32(0x7fffffff); - ++dst; - ++src; - } -} - -const normfunc normfunctions[4] = { - (normfunc)norm8, - (normfunc)norm16, - (normfunc)norm24, - (normfunc)norm32, -};

1 0

[reactos] 01/01: [USER32_APITEST][INCLUDE] Add MessageStateAnalyzer testcase (#1732)
by Katayama Hirofumi MZ 24 Jul '19

24 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=782160bbc02dcfd312e9c… commit 782160bbc02dcfd312e9c80cdf6d4932a21df8b7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 25 01:45:55 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 25 01:45:55 2019 +0900 [USER32_APITEST][INCLUDE] Add MessageStateAnalyzer testcase (#1732) I want to visualize the message stream and verify the states of each message. ROSTESTS-328 - Add a testcase named MessageStateAnalyzer into user32_apitest. - Also fix type casts in <windowsx.h>. --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + .../apitests/user32/MessageStateAnalyzer.c | 569 +++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 + sdk/include/psdk/windowsx.h | 24 +- sdk/include/reactos/msgdump.h | 5 +- 5 files changed, 588 insertions(+), 13 deletions(-) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 5652cc76bfa..24a6921472b 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -23,6 +23,7 @@ list(APPEND SOURCE InitializeLpkHooks.c LoadImage.c LookupIconIdFromDirectoryEx.c + MessageStateAnalyzer.c NextDlgItem.c PrivateExtractIcons.c RealGetWindowClass.c diff --git a/modules/rostests/apitests/user32/MessageStateAnalyzer.c b/modules/rostests/apitests/user32/MessageStateAnalyzer.c new file mode 100644 index 00000000000..490b69d3e69 --- /dev/null +++ b/modules/rostests/apitests/user32/MessageStateAnalyzer.c @@ -0,0 +1,569 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: debugging and analysis of message states + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ +#include <strsafe.h> +#include "undocuser.h" +#include "winxx.h" + +static void MsgDumpPrintf(LPCSTR fmt, ...) +{ + static char s_szText[1024]; + va_list va; + va_start(va, fmt); + StringCbVPrintfA(s_szText, sizeof(s_szText), fmt, va); + trace("%s", s_szText); + va_end(va); +} +#define MSGDUMP_TPRINTF MsgDumpPrintf +static char s_prefix[16] = ""; +#define MSGDUMP_PREFIX s_prefix +#include "msgdump.h" /* msgdump.h needs MSGDUMP_TPRINTF and MSGDUMP_PREFIX */ + +typedef enum STAGE_TYPE +{ + STAGE_TYPE_SEQUENCE, + STAGE_TYPE_COUNTING +} STAGE_TYPE; + +typedef struct STAGE +{ + INT nLine; + UINT uParentMsg; + INT nLevel; + STAGE_TYPE nType; + INT iFirstAction; + INT nCount; + UINT uMessages[10]; + INT iActions[10]; + INT nCounters[10]; +} STAGE; + +/* variables */ +static INT s_iStage; +static INT s_iStep; +static INT s_nLevel; +static BOOL s_bNextStage; +static INT s_nCounters[10]; +static UINT s_msgStack[32]; +static const STAGE *s_pStages; +static INT s_cStages; + +/* macros */ +#define TIMEOUT_TIMER 999 +#define TOTAL_TIMEOUT (5 * 1000) +#define WIDTH 300 +#define HEIGHT 200 +#define PARENT_MSG s_msgStack[s_nLevel - 1] + +static void DoInitialize(const STAGE *pStages, INT cStages) +{ + s_iStage = s_iStep = s_nLevel = 0; + s_bNextStage = FALSE; + ZeroMemory(s_nCounters, sizeof(s_nCounters)); + ZeroMemory(s_msgStack, sizeof(s_msgStack)); + s_pStages = pStages; + s_cStages = cStages; +} + +static void DoFinish(void) +{ + ok_int(s_iStage, s_cStages); + if (s_iStage != s_cStages) + { + skip("Some stage(s) skipped (Step: %d)\n", s_iStep); + } +} + +typedef enum ACTION +{ + ACTION_ZERO = 0, + ACTION_FIRSTMINMAX, + ACTION_NCCREATE, + ACTION_SHOW, + ACTION_IME_SETCONTEXT_OPEN, + ACTION_IME_NOTIFY_OPEN, + ACTION_DESTROY, + ACTION_IME_SETCONTEXT_CLOSE, + ACTION_IME_NOTIFY_CLOSE, + ACTION_HIDE, + ACTION_DEACTIVATE, + ACTION_ACTIVATE +} ACTION; + +static void DoAction(HWND hwnd, INT iAction, WPARAM wParam, LPARAM lParam) +{ + RECT rc; + switch (iAction) + { + case ACTION_ZERO: + /* does nothing */ + break; + case ACTION_FIRSTMINMAX: + GetWindowRect(hwnd, &rc); + ok_long(rc.right - rc.left, 0); + ok_long(rc.bottom - rc.top, 0); + ok_int(IsWindowVisible(hwnd), FALSE); + break; + case ACTION_NCCREATE: + GetWindowRect(hwnd, &rc); + ok_long(rc.right - rc.left, WIDTH); + ok_long(rc.bottom - rc.top, HEIGHT); + ok_int(IsWindowVisible(hwnd), FALSE); + break; + case ACTION_SHOW: + ShowWindow(hwnd, SW_SHOWNORMAL); + break; + case ACTION_IME_SETCONTEXT_OPEN: + ok(wParam == 1, "Step %d: wParam was %p\n", s_iStep, (void *)wParam); + ok(lParam == 0xC000000F, "Step %d: lParam was %p\n", s_iStep, (void *)lParam); + break; + case ACTION_IME_NOTIFY_OPEN: + ok(wParam == 2, "Step %d: wParam was %p\n", s_iStep, (void *)wParam); + ok(lParam == 0, "Step %d: lParam was %p\n", s_iStep, (void *)lParam); + break; + case ACTION_DESTROY: + DestroyWindow(hwnd); + break; + case ACTION_IME_SETCONTEXT_CLOSE: + ok(wParam == 0, "Step %d: wParam was %p\n", s_iStep, (void *)wParam); + ok(lParam == 0xC000000F, "Step %d: lParam was %p\n", s_iStep, (void *)lParam); + break; + case ACTION_IME_NOTIFY_CLOSE: + ok(wParam == 1, "Step %d: wParam was %p\n", s_iStep, (void *)wParam); + ok(lParam == 0, "Step %d: lParam was %p\n", s_iStep, (void *)lParam); + break; + case ACTION_HIDE: + ShowWindow(hwnd, SW_HIDE); + break; + case ACTION_DEACTIVATE: + SetForegroundWindow(GetDesktopWindow()); + break; + case ACTION_ACTIVATE: + SetForegroundWindow(hwnd); + break; + } +} + +static void NextStage(HWND hwnd) +{ + INT i, iAction; + const STAGE *pStage = &s_pStages[s_iStage]; + + if (pStage->nType == STAGE_TYPE_COUNTING) + { + /* check counters */ + for (i = 0; i < pStage->nCount; ++i) + { + if (pStage->nCounters[i] > 0) + { + ok(pStage->nCounters[i] == s_nCounters[i], + "Line %d: s_nCounters[%d] expected %d but %d.\n", + pStage->nLine, i, pStage->nCounters[i], s_nCounters[i]); + } + } + } + + /* go to next stage */ + ++s_iStage; + if (s_iStage >= s_cStages) + { + DestroyWindow(hwnd); + return; + } + trace("Stage %d (Line %d)\n", s_iStage, s_pStages[s_iStage].nLine); + + s_iStep = 0; + ZeroMemory(s_nCounters, sizeof(s_nCounters)); + + iAction = s_pStages[s_iStage].iFirstAction; + if (iAction) + PostMessage(hwnd, WM_COMMAND, iAction, 0); +} + +static void DoStage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + INT i, iAction; + const STAGE *pStage; + s_bNextStage = FALSE; + + if (s_iStage >= s_cStages) + return; + + pStage = &s_pStages[s_iStage]; + switch (pStage->nType) + { + case STAGE_TYPE_SEQUENCE: + if (pStage->uMessages[s_iStep] == uMsg) + { + ok_int(1, 1); + ok(s_nLevel == pStage->nLevel, + "Line %d, Step %d: Level expected %d but %d.\n", + pStage->nLine, s_iStep, pStage->nLevel, s_nLevel); + ok(PARENT_MSG == pStage->uParentMsg, + "Line %d, Step %d: PARENT_MSG expected %u but %u.\n", + pStage->nLine, s_iStep, pStage->uParentMsg, PARENT_MSG); + + iAction = pStage->iActions[s_iStep]; + if (iAction) + DoAction(hwnd, iAction, wParam, lParam); + + ++s_iStep; + if (s_iStep >= pStage->nCount) + s_bNextStage = TRUE; + } + break; + case STAGE_TYPE_COUNTING: + for (i = 0; i < pStage->nCount; ++i) + { + if (pStage->uMessages[i] == uMsg) + { + ok_int(1, 1); + ok(s_nLevel == pStage->nLevel, + "Line %d: Level expected %d but %d.\n", + pStage->nLine, pStage->nLevel, s_nLevel); + ok(PARENT_MSG == pStage->uParentMsg, + "Line %d: PARENT_MSG expected %u but %u.\n", + pStage->nLine, pStage->uParentMsg, PARENT_MSG); + + iAction = pStage->iActions[i]; + if (iAction) + DoAction(hwnd, iAction, wParam, lParam); + + ++s_nCounters[i]; + + if (i == pStage->nCount - 1) + s_bNextStage = TRUE; + break; + } + } + break; + } + + if (s_bNextStage) + { + NextStage(hwnd); + } +} + +static LRESULT CALLBACK +InnerWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_COMMAND: + DoAction(hwnd, LOWORD(wParam), 0, 0); + break; + case WM_TIMER: + KillTimer(hwnd, (UINT)wParam); + if (wParam == TIMEOUT_TIMER) + DestroyWindow(hwnd); + break; + case WM_DESTROY: + PostQuitMessage(0); + break; + case WM_NCCREATE: + SetTimer(hwnd, TIMEOUT_TIMER, TOTAL_TIMEOUT, NULL); + /* FALL THROUGH */ + default: + return DefWindowProc(hwnd, uMsg, wParam, lParam); + } + return 0; +} + +static void DoBuildPrefix(void) +{ + DWORD Flags = InSendMessageEx(NULL); + INT i = 0; + + if (Flags & ISMEX_CALLBACK) + s_prefix[i++] = 'C'; + if (Flags & ISMEX_NOTIFY) + s_prefix[i++] = 'N'; + if (Flags & ISMEX_REPLIED) + s_prefix[i++] = 'R'; + if (Flags & ISMEX_SEND) + s_prefix[i++] = 'S'; + if (i == 0) + s_prefix[i++] = 'P'; + + s_prefix[i++] = ':'; + s_prefix[i++] = ' '; + s_prefix[i] = 0; +} + +static const STAGE s_GeneralStages[] = +{ + /* Stage 0 */ + { + __LINE__, WM_NULL, 1, STAGE_TYPE_SEQUENCE, 0, + 4, + { WM_GETMINMAXINFO, WM_NCCREATE, WM_NCCALCSIZE, WM_CREATE }, + { ACTION_FIRSTMINMAX, ACTION_NCCREATE, 0, 0 }, + }, + /* Stage 1 */ + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, ACTION_SHOW, + 6, + { WM_SHOWWINDOW, WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGING, + WM_ACTIVATEAPP, WM_NCACTIVATE, WM_ACTIVATE }, + }, + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, ACTION_DESTROY, + 6, + { WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGED, WM_NCACTIVATE, + WM_ACTIVATE, WM_ACTIVATEAPP, WM_KILLFOCUS }, + }, + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, 0, + 2, + { WM_DESTROY, WM_NCDESTROY }, + }, +}; + +static LRESULT CALLBACK +WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + LRESULT lResult; + + /* build s_prefix */ + DoBuildPrefix(); + + /* message dump */ + MD_msgdump(hwnd, uMsg, wParam, lParam); + + ++s_nLevel; + s_msgStack[s_nLevel] = uMsg; + { + /* do inner task */ + DoStage(hwnd, uMsg, wParam, lParam); + lResult = InnerWindowProc(hwnd, uMsg, wParam, lParam); + } + --s_nLevel; + + /* message return */ + StringCbCopyA(s_prefix, sizeof(s_prefix), "R: "); + MD_msgresult(hwnd, uMsg, wParam, lParam, lResult); + return lResult; +} + +static void General_DoTest(void) +{ + WNDCLASSA wc; + HWND hwnd; + MSG msg; + static const char s_szName[] = "MessageStateAnalyzerGeneral"; + + trace("General_DoTest\n"); + DoInitialize(s_GeneralStages, ARRAYSIZE(s_GeneralStages)); + + /* register window class */ + ZeroMemory(&wc, sizeof(wc)); + wc.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; + wc.lpfnWndProc = WindowProc; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); + wc.lpszClassName = s_szName; + if (!RegisterClassA(&wc)) + { + skip("RegisterClassW failed.\n"); + return; + } + + /* create a window */ + hwnd = CreateWindowA(s_szName, s_szName, WS_OVERLAPPEDWINDOW, + 0, 0, WIDTH, HEIGHT, NULL, NULL, + GetModuleHandleW(NULL), NULL); + if (!hwnd) + { + skip("CreateWindowW failed.\n"); + return; + } + + /* message loop */ + while (GetMessageA(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + ok_int(UnregisterClassA(s_szName, GetModuleHandleA(NULL)), TRUE); + + DoFinish(); +} + +static const STAGE s_IMEStages[] = +{ + /* Stage 0 */ + { + __LINE__, WM_NULL, 1, STAGE_TYPE_SEQUENCE, 0, + 4, + { WM_GETMINMAXINFO, WM_NCCREATE, WM_NCCALCSIZE, WM_CREATE }, + { ACTION_FIRSTMINMAX, ACTION_NCCREATE, 0, 0 }, + }, + /* Stage 1 */ + // show + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, ACTION_SHOW, + 6, + { WM_SHOWWINDOW, WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGING, + WM_ACTIVATEAPP, WM_NCACTIVATE, WM_ACTIVATE }, + }, + { + __LINE__, WM_ACTIVATE, 3, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_SETCONTEXT }, + { ACTION_IME_SETCONTEXT_OPEN }, + }, + { + __LINE__, WM_IME_SETCONTEXT, 4, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_NOTIFY }, + { ACTION_IME_NOTIFY_OPEN }, + }, + // hide + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, ACTION_HIDE, + 8, + { WM_SHOWWINDOW, WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGED, + WM_NCACTIVATE, WM_ACTIVATE, WM_ACTIVATEAPP, WM_KILLFOCUS, + WM_IME_SETCONTEXT }, + { 0, 0, 0, 0, 0, 0, 0, ACTION_IME_SETCONTEXT_CLOSE } + }, + { + __LINE__, WM_IME_SETCONTEXT, 3, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_NOTIFY }, + { ACTION_IME_NOTIFY_CLOSE } + }, + // show again + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, 3, + 6, + { WM_SHOWWINDOW, WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGING, + WM_ACTIVATEAPP, WM_NCACTIVATE, WM_ACTIVATE }, + }, + { + __LINE__, WM_ACTIVATE, 3, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_SETCONTEXT }, + { ACTION_IME_SETCONTEXT_OPEN }, + }, + { + __LINE__, WM_IME_SETCONTEXT, 4, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_NOTIFY }, + { ACTION_IME_NOTIFY_OPEN }, + }, + // deactivate + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, ACTION_DEACTIVATE, + 4, + { WM_NCACTIVATE, WM_ACTIVATE, WM_ACTIVATEAPP, WM_KILLFOCUS }, + }, + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_SETCONTEXT }, + { ACTION_IME_SETCONTEXT_CLOSE } + }, + { + __LINE__, WM_IME_SETCONTEXT, 3, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_NOTIFY }, + { ACTION_IME_NOTIFY_CLOSE } + }, + // activate + { + __LINE__, WM_ACTIVATE, 3, STAGE_TYPE_SEQUENCE, ACTION_ACTIVATE, + 1, + { WM_IME_SETCONTEXT }, + { ACTION_IME_SETCONTEXT_OPEN } + }, + { + __LINE__, WM_IME_SETCONTEXT, 4, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_NOTIFY }, + { ACTION_IME_NOTIFY_OPEN }, + }, + // destroy + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, ACTION_DESTROY, + 2, + { WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGED }, + }, + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_SETCONTEXT }, + { ACTION_IME_SETCONTEXT_CLOSE } + }, + { + __LINE__, WM_IME_SETCONTEXT, 3, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_NOTIFY }, + { ACTION_IME_NOTIFY_CLOSE } + }, + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, 0, + 2, + { WM_DESTROY, WM_NCDESTROY }, + }, +}; + +static void IME_DoTest(void) +{ + WNDCLASSA wc; + HWND hwnd; + MSG msg; + static const char s_szName[] = "MessageStateAnalyzerIME"; + + trace("IME_DoTest\n"); + DoInitialize(s_IMEStages, ARRAYSIZE(s_IMEStages)); + + /* register window class */ + ZeroMemory(&wc, sizeof(wc)); + wc.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; + wc.lpfnWndProc = WindowProc; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); + wc.lpszClassName = s_szName; + if (!RegisterClassA(&wc)) + { + skip("RegisterClassW failed.\n"); + return; + } + + /* create a window */ + hwnd = CreateWindowA(s_szName, s_szName, WS_OVERLAPPEDWINDOW, + 0, 0, WIDTH, HEIGHT, NULL, NULL, + GetModuleHandleW(NULL), NULL); + if (!hwnd) + { + skip("CreateWindowW failed.\n"); + return; + } + + /* message loop */ + while (GetMessageA(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + ok_int(UnregisterClassA(s_szName, GetModuleHandleA(NULL)), TRUE); + + DoFinish(); +} + +START_TEST(MessageStateAnalyzer) +{ + General_DoTest(); + IME_DoTest(); +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index 82af0c926de..0118bf23b69 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -25,6 +25,7 @@ extern void func_GetWindowPlacement(void); extern void func_InitializeLpkHooks(void); extern void func_LoadImage(void); extern void func_LookupIconIdFromDirectoryEx(void); +extern void func_MessageStateAnalyzer(void); extern void func_NextDlgItem(void); extern void func_PrivateExtractIcons(void); extern void func_RealGetWindowClass(void); @@ -71,6 +72,7 @@ const struct test winetest_testlist[] = { "InitializeLpkHooks", func_InitializeLpkHooks }, { "LoadImage", func_LoadImage }, { "LookupIconIdFromDirectoryEx", func_LookupIconIdFromDirectoryEx }, + { "MessageStateAnalyzer", func_MessageStateAnalyzer }, { "NextDlgItem", func_NextDlgItem }, { "PrivateExtractIcons", func_PrivateExtractIcons }, { "RealGetWindowClass", func_RealGetWindowClass }, diff --git a/sdk/include/psdk/windowsx.h b/sdk/include/psdk/windowsx.h index 2064c00eafa..15dc2053bc4 100644 --- a/sdk/include/psdk/windowsx.h +++ b/sdk/include/psdk/windowsx.h @@ -313,13 +313,13 @@ #define HANDLE_WM_COPY(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) #define HANDLE_WM_COPYDATA(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(PCOPYDATASTRUCT)(lParam)),0) #define HANDLE_WM_CREATE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(LPCREATESTRUCT)(lParam)) ? 0 : (LRESULT)-1L) -#define HANDLE_WM_CTLCOLORBTN(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_BTN) -#define HANDLE_WM_CTLCOLORDLG(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_DLG) -#define HANDLE_WM_CTLCOLOREDIT(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_EDIT) -#define HANDLE_WM_CTLCOLORLISTBOX(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_LISTBOX) -#define HANDLE_WM_CTLCOLORMSGBOX(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_MSGBOX) -#define HANDLE_WM_CTLCOLORSCROLLBAR(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_SCROLLBAR) -#define HANDLE_WM_CTLCOLORSTATIC(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_STATIC) +#define HANDLE_WM_CTLCOLORBTN(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_BTN) +#define HANDLE_WM_CTLCOLORDLG(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_DLG) +#define HANDLE_WM_CTLCOLOREDIT(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_EDIT) +#define HANDLE_WM_CTLCOLORLISTBOX(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_LISTBOX) +#define HANDLE_WM_CTLCOLORMSGBOX(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_MSGBOX) +#define HANDLE_WM_CTLCOLORSCROLLBAR(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_SCROLLBAR) +#define HANDLE_WM_CTLCOLORSTATIC(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_STATIC) #define HANDLE_WM_CUT(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) #define HANDLE_WM_DEADCHAR(hwnd,wParam,lParam,fn) ((fn)((hwnd),(TCHAR)(wParam),(int)(short)LOWORD(lParam)),0) #define HANDLE_WM_DELETEITEM(hwnd,wParam,lParam,fn) ((fn)((hwnd),(const DELETEITEMSTRUCT*)(lParam)),0) @@ -337,7 +337,7 @@ #define HANDLE_WM_ERASEBKGND(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(BOOL)(fn)((hwnd),(HDC)(wParam)) #define HANDLE_WM_FONTCHANGE(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) #define HANDLE_WM_GETDLGCODE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)(hwnd,(LPMSG)(lParam)) -#define HANDLE_WM_GETFONT(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HFONT)(fn)(hwnd) +#define HANDLE_WM_GETFONT(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HFONT)(fn)(hwnd) #define HANDLE_WM_GETMINMAXINFO(hwnd,wParam,lParam,fn) ((fn)((hwnd),(LPMINMAXINFO)(lParam)),0) #define HANDLE_WM_GETTEXT(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)((hwnd),(int)(wParam),(LPTSTR)(lParam)) #define HANDLE_WM_GETTEXTLENGTH(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)(hwnd) @@ -361,12 +361,12 @@ #define HANDLE_WM_MDICASCADE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(fn)((hwnd),(UINT)(wParam)) #define HANDLE_WM_MDICREATE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)((hwnd),(LPMDICREATESTRUCT)(lParam)) #define HANDLE_WM_MDIDESTROY(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0) -#define HANDLE_WM_MDIGETACTIVE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)(hwnd) +#define HANDLE_WM_MDIGETACTIVE(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HWND)(fn)(hwnd) #define HANDLE_WM_MDIICONARRANGE(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) #define HANDLE_WM_MDIMAXIMIZE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0) #define HANDLE_WM_MDINEXT(hwnd,wParam,lParam,fn) (LRESULT)(HWND)(fn)((hwnd),(HWND)(wParam),(BOOL)lParam) #define HANDLE_WM_MDIRESTORE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0) -#define HANDLE_WM_MDISETMENU(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)((hwnd),(BOOL)(wParam),(HMENU)(wParam),(HMENU)(lParam)) +#define HANDLE_WM_MDISETMENU(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HMENU)(fn)((hwnd),(BOOL)(wParam),(HMENU)(wParam),(HMENU)(lParam)) #define HANDLE_WM_MDITILE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(fn)((hwnd),(UINT)(wParam)) #define HANDLE_WM_MEASUREITEM(hwnd,wParam,lParam,fn) ((fn)((hwnd),(MEASUREITEMSTRUCT*)(lParam)),0) #define HANDLE_WM_MENUCHAR(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(fn)((hwnd),(UINT)(LOWORD(wParam)),(UINT)HIWORD(wParam),(HMENU)(lParam)) @@ -391,7 +391,7 @@ #define HANDLE_WM_NCRBUTTONDBLCLK(hwnd,wParam,lParam,fn) ((fn)((hwnd),TRUE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0) #define HANDLE_WM_NCRBUTTONDOWN(hwnd,wParam,lParam,fn) ((fn)((hwnd),FALSE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0) #define HANDLE_WM_NCRBUTTONUP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0) -#define HANDLE_WM_NEXTDLGCTL(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HWND)(fn)((hwnd),(HWND)(wParam),(BOOL)(lParam)) +#define HANDLE_WM_NEXTDLGCTL(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HWND)(fn)((hwnd),(HWND)(wParam),(BOOL)(lParam)) #define HANDLE_WM_PAINT(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) #define HANDLE_WM_PAINTCLIPBOARD(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(const LPPAINTSTRUCT)GlobalLock((HGLOBAL)(lParam))),GlobalUnlock((HGLOBAL)(lParam)),0) #define HANDLE_WM_PALETTECHANGED(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0) @@ -409,7 +409,7 @@ #define HANDLE_WM_RBUTTONDOWN(hwnd,wParam,lParam,fn) ((fn)((hwnd),FALSE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0) #define HANDLE_WM_RBUTTONUP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0) #define HANDLE_WM_RENDERALLFORMATS(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) -#define HANDLE_WM_RENDERFORMAT(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HANDLE)(fn)((hwnd),(UINT)(wParam)) +#define HANDLE_WM_RENDERFORMAT(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(fn)((hwnd),(UINT)(wParam)) #define HANDLE_WM_SETCURSOR(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(BOOL)(fn)((hwnd),(HWND)(wParam),(UINT)LOWORD(lParam),(UINT)HIWORD(lParam)) #define HANDLE_WM_SETFOCUS(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0) #define HANDLE_WM_SETFONT(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HFONT)(wParam),(BOOL)(lParam)),0) diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h index 79341481d4e..2284437fc2c 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 10 /* Version 10 */ +#define _INC_MSGDUMP 11 /* Version 11 */ /* * NOTE: MD_msgdump function in this file provides Win32API message dump feature. @@ -17,6 +17,9 @@ #ifndef _INC_WINXX #include "winxx.h" /* An unofficial extension of <windowsx.h>. */ #endif +#ifndef _INC_SHELLAPI + #include <shellapi.h> +#endif #include <strsafe.h> #ifndef MSGDUMP_TPRINTF

1 0

[reactos] 01/01: [USER32][NTUSER] Fix menu arrow drawing (of DrawFrameControl) (#1752)
by Katayama Hirofumi MZ 24 Jul '19

24 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e91a1690d554c771d703… commit 1e91a1690d554c771d703f12416321bbe4c5b53f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 25 01:40:33 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 25 01:40:33 2019 +0900 [USER32][NTUSER] Fix menu arrow drawing (of DrawFrameControl) (#1752) CORE-13211 user32!DrawFrameControl drawed invalid menu arrow when the width is shorter than the height. - Use the squared rectangle. - Draw it in the transparent background mode. - Save the old background mode of HDC. This PR will fix UltraISO's bug. --- win32ss/user/ntuser/draw.c | 46 ++++++++++++++++++++++++-------------- win32ss/user/user32/windows/draw.c | 12 +++++++--- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/win32ss/user/ntuser/draw.c b/win32ss/user/ntuser/draw.c index f648287c554..4b30a325a86 100644 --- a/win32ss/user/ntuser/draw.c +++ b/win32ss/user/ntuser/draw.c @@ -666,7 +666,10 @@ BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL HFONT hFont, hOldFont; int i; WCHAR OutRight, OutLeft, InRight, InLeft, Center; + RECT myr; + INT cxy, nBkMode; + cxy = UITOOLS_MakeSquareRect(r, &myr); if (Radio) { OutRight = 'j'; // Outer right @@ -684,7 +687,7 @@ BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL } RtlZeroMemory(&lf, sizeof(LOGFONTW)); - lf.lfHeight = r->top - r->bottom; + lf.lfHeight = cxy; lf.lfWidth = 0; lf.lfWeight = FW_NORMAL; lf.lfCharSet = DEFAULT_CHARSET; @@ -692,16 +695,18 @@ BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL hFont = GreCreateFontIndirectW(&lf); hOldFont = NtGdiSelectFont(dc, hFont); + nBkMode = GreGetBkMode(dc); + if(Radio && ((uFlags & 0xff) == DFCS_BUTTONRADIOMASK)) { IntGdiSetBkMode(dc, OPAQUE); IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWFRAME)); - GreTextOutW(dc, r->left, r->top, &Center, 1); + GreTextOutW(dc, myr.left, myr.top, &Center, 1); IntGdiSetBkMode(dc, TRANSPARENT); IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWFRAME)); - GreTextOutW(dc, r->left, r->top, &OutRight, 1); + GreTextOutW(dc, myr.left, myr.top, &OutRight, 1); IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWFRAME)); - GreTextOutW(dc, r->left, r->top, &OutLeft, 1); + GreTextOutW(dc, myr.left, myr.top, &OutLeft, 1); } else { @@ -710,26 +715,26 @@ BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL /* Center section, white for active, grey for inactive */ i= !(uFlags & (DFCS_INACTIVE|DFCS_PUSHED)) ? COLOR_WINDOW : COLOR_BTNFACE; IntGdiSetTextColor(dc, IntGetSysColor(i)); - GreTextOutW(dc, r->left, r->top, &Center, 1); + GreTextOutW(dc, myr.left, myr.top, &Center, 1); if(uFlags & (DFCS_FLAT | DFCS_MONO)) { IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWFRAME)); - GreTextOutW(dc, r->left, r->top, &OutRight, 1); - GreTextOutW(dc, r->left, r->top, &OutLeft, 1); - GreTextOutW(dc, r->left, r->top, &InRight, 1); - GreTextOutW(dc, r->left, r->top, &InLeft, 1); + GreTextOutW(dc, myr.left, myr.top, &OutRight, 1); + GreTextOutW(dc, myr.left, myr.top, &OutLeft, 1); + GreTextOutW(dc, myr.left, myr.top, &InRight, 1); + GreTextOutW(dc, myr.left, myr.top, &InLeft, 1); } else { IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNSHADOW)); - GreTextOutW(dc, r->left, r->top, &OutRight, 1); + GreTextOutW(dc, myr.left, myr.top, &OutRight, 1); IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); - GreTextOutW(dc, r->left, r->top, &OutLeft, 1); + GreTextOutW(dc, myr.left, myr.top, &OutLeft, 1); IntGdiSetTextColor(dc, IntGetSysColor(COLOR_3DDKSHADOW)); - GreTextOutW(dc, r->left, r->top, &InRight, 1); + GreTextOutW(dc, myr.left, myr.top, &InRight, 1); IntGdiSetTextColor(dc, IntGetSysColor(COLOR_3DLIGHT)); - GreTextOutW(dc, r->left, r->top, &InLeft, 1); + GreTextOutW(dc, myr.left, myr.top, &InLeft, 1); } } @@ -738,12 +743,13 @@ BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL WCHAR Check = (Radio) ? 'i' : 'b'; IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWTEXT)); - GreTextOutW(dc, r->left, r->top, &Check, 1); + GreTextOutW(dc, myr.left, myr.top, &Check, 1); } IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWTEXT)); NtGdiSelectFont(dc, hOldFont); GreDeleteObject(hFont); + IntGdiSetBkMode(dc, nBkMode); return TRUE; } @@ -944,9 +950,13 @@ BOOL FASTCALL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags) BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) { + // TODO: DFCS_TRANSPARENT upon DFCS_MENUARROWUP or DFCS_MENUARROWDOWN LOGFONTW lf; HFONT hFont, hOldFont; WCHAR Symbol; + RECT myr; + INT cxy, nBkMode; + cxy = UITOOLS_MakeSquareRect(r, &myr); switch(uFlags & 0xff) { case DFCS_MENUARROWUP: @@ -981,7 +991,7 @@ BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) } /* acquire ressources only if valid menu */ RtlZeroMemory(&lf, sizeof(LOGFONTW)); - lf.lfHeight = r->bottom - r->top; + lf.lfHeight = cxy; lf.lfWidth = 0; lf.lfWeight = FW_NORMAL; lf.lfCharSet = DEFAULT_CHARSET; @@ -998,13 +1008,15 @@ BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) { /* draw shadow */ IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); - GreTextOutW(dc, r->left + 1, r->top + 1, &Symbol, 1); + GreTextOutW(dc, myr.left + 1, myr.top + 1, &Symbol, 1); } #endif IntGdiSetTextColor(dc, IntGetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT)); } /* draw selected symbol */ - GreTextOutW(dc, r->left, r->top, &Symbol, 1); + nBkMode = IntGdiSetBkMode(dc, TRANSPARENT); + GreTextOutW(dc, myr.left, myr.top, &Symbol, 1); + IntGdiSetBkMode(dc, nBkMode); /* restore previous settings */ NtGdiSelectFont(dc, hOldFont); GreDeleteObject(hFont); diff --git a/win32ss/user/user32/windows/draw.c b/win32ss/user/user32/windows/draw.c index 40e65db6e70..65bacc848d8 100644 --- a/win32ss/user/user32/windows/draw.c +++ b/win32ss/user/user32/windows/draw.c @@ -972,9 +972,13 @@ static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags) static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) { + // TODO: DFCS_TRANSPARENT upon DFCS_MENUARROWUP or DFCS_MENUARROWDOWN LOGFONTW lf; HFONT hFont, hOldFont; TCHAR Symbol; + RECT myr; + INT cxy, nBkMode; + cxy = UITOOLS_MakeSquareRect(r, &myr); switch(uFlags & 0xff) { case DFCS_MENUARROWUP: @@ -1007,7 +1011,7 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) } /* acquire ressources only if valid menu */ ZeroMemory(&lf, sizeof(LOGFONTW)); - lf.lfHeight = r->bottom - r->top; + lf.lfHeight = cxy; lf.lfWidth = 0; lf.lfWeight = FW_NORMAL; lf.lfCharSet = DEFAULT_CHARSET; @@ -1024,13 +1028,15 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) { /* draw shadow */ SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); - TextOut(dc, r->left + 1, r->top + 1, &Symbol, 1); + TextOut(dc, myr.left + 1, myr.top + 1, &Symbol, 1); } #endif SetTextColor(dc, GetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT)); } /* draw selected symbol */ - TextOut(dc, r->left, r->top, &Symbol, 1); + nBkMode = SetBkMode(dc, TRANSPARENT); + TextOut(dc, myr.left, myr.top, &Symbol, 1); + SetBkMode(dc, nBkMode); /* restore previous settings */ SelectObject(dc, hOldFont); DeleteObject(hFont);

1 0

[reactos] 01/01: [MEDIA][FONTS] RAPPS checkmark fix (#1751)
by Katayama Hirofumi MZ 24 Jul '19

24 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77d3d25ae83e860417eac… commit 77d3d25ae83e860417eac67b7167ad44cf262aee Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jul 24 15:39:10 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 24 15:39:10 2019 +0900 [MEDIA][FONTS] RAPPS checkmark fix (#1751) The checkmarks of RAPPS were strange. This PR will fix the checkmark ("b") of 12px bitmap glyph of Marlett.ttf font file. CORE-14872 --- media/fonts/Marlett.ttf | Bin 16136 -> 16136 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/Marlett.ttf b/media/fonts/Marlett.ttf index 29514b293ab..a5b1cb21299 100644 Binary files a/media/fonts/Marlett.ttf and b/media/fonts/Marlett.ttf differ

1 0

[reactos] 01/01: [MEDIA][FONTS] Add copyright notice of TransGaming Technologies
by Katayama Hirofumi MZ 23 Jul '19

23 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9b494e2ca6e8565af0d4… commit f9b494e2ca6e8565af0d42edfc385eba97b59ecf Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 23 21:55:38 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jul 23 21:55:38 2019 +0900 [MEDIA][FONTS] Add copyright notice of TransGaming Technologies With some font error fixed. CORE-16226 --- media/fonts/Marlett.ttf | Bin 15668 -> 16136 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/Marlett.ttf b/media/fonts/Marlett.ttf index e97a94fd900..29514b293ab 100644 Binary files a/media/fonts/Marlett.ttf and b/media/fonts/Marlett.ttf differ

1 0

[reactos] 01/01: [MEDIA][FONTS] Renewal of Marlett.ttf (#1749)
by Katayama Hirofumi MZ 23 Jul '19

23 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8383b4546d230f854978… commit b8383b4546d230f854978c7642f124fc119e80fb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 23 16:03:30 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 23 16:03:30 2019 +0900 [MEDIA][FONTS] Renewal of Marlett.ttf (#1749) Renewal of Marlett.ttf font file. CORE-16226, CORE-14872 - Based on Ged Murphy's Marlett.ttf (See https://github.com/reactos/reactos/blob/527f2f90577662e8eba1b1b62f958c39b3c…). - Erase the centered triangles. - Adjustment of glyphs. - Clarify the copyright ownership. - Tested with 3 test programs (RadioAndCheck, PixelPerfectGlyph and MarlettCompare). --- media/fonts/Marlett.ttf | Bin 4160 -> 15668 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/Marlett.ttf b/media/fonts/Marlett.ttf index 26b7980bb30..e97a94fd900 100644 Binary files a/media/fonts/Marlett.ttf and b/media/fonts/Marlett.ttf differ

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs