Ros-diffs April 2019

ros-diffs@reactos.org

32 participants
240 discussions

[reactos] 01/01: [KERNEL32] Era first year is GANNEN

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e3826786eaec6f54cf6f… commit 7e3826786eaec6f54cf6f2be1831dc9f106320a6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Apr 16 11:10:00 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Apr 16 11:10:00 2019 +0900 [KERNEL32] Era first year is GANNEN --- dll/win32/kernel32/winnls/string/japanese.c | 40 ++++++++++++++++++++++++++++- dll/win32/kernel32/winnls/string/japanese.h | 1 + dll/win32/kernel32/winnls/string/lcformat.c | 8 ++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dll/win32/kernel32/winnls/string/japanese.c b/dll/win32/kernel32/winnls/string/japanese.c index c3719f51f2..2edbdaeb88 100644 --- a/dll/win32/kernel32/winnls/string/japanese.c +++ b/dll/win32/kernel32/winnls/string/japanese.c @@ -53,6 +53,44 @@ static INT JapaneseEra_Compare(const void *e1, const void *e2) return 0; } +BOOL JapaneseEra_IsFirstYearGannen(void) +{ +#ifdef DONT_USE_REGISTRY + return TRUE; +#else + HANDLE KeyHandle; + DWORD dwIndex; + WCHAR szName[32], szValue[32]; + static BOOL s_bIsCached = FALSE, s_bFirstIsGannen = TRUE; + + if (s_bIsCached) + return s_bFirstIsGannen; + + KeyHandle = NLS_RegOpenKey(NULL, L"\\Registry\\Machine\\System\\" + L"CurrentControlSet\\Control\\Nls\\Calendars\\Japanese"); + if (!KeyHandle) + return TRUE; + + for (dwIndex = 0; dwIndex < 16; ++dwIndex) + { + if (!NLS_RegEnumValue(KeyHandle, dwIndex, szName, sizeof(szName), + szValue, sizeof(szValue))) + { + break; + } + + if (lstrcmpiW(szName, L"InitialEraYear") == 0) + { + s_bFirstIsGannen = (szValue[0] == 0x5143); + s_bIsCached = TRUE; + break; + } + } + + return s_bFirstIsGannen; +#endif +} + /* * SEE ALSO: * https://en.wikipedia.org/wiki/Japanese_era_name @@ -61,7 +99,7 @@ static INT JapaneseEra_Compare(const void *e1, const void *e2) static PCJAPANESE_ERA JapaneseEra_Load(DWORD *pdwCount) { #ifndef DONT_USE_REGISTRY - HANDLE KeyHandle = NULL; + HANDLE KeyHandle; DWORD dwIndex; WCHAR szName[128], szValue[128]; JAPANESE_ERA *pEntry; diff --git a/dll/win32/kernel32/winnls/string/japanese.h b/dll/win32/kernel32/winnls/string/japanese.h index 747ee136ed..a4829bea69 100644 --- a/dll/win32/kernel32/winnls/string/japanese.h +++ b/dll/win32/kernel32/winnls/string/japanese.h @@ -18,4 +18,5 @@ typedef struct JAPANESE_ERA } JAPANESE_ERA, *PJAPANESE_ERA; typedef const JAPANESE_ERA *PCJAPANESE_ERA; +BOOL JapaneseEra_IsFirstYearGannen(void); PCJAPANESE_ERA JapaneseEra_Find(const SYSTEMTIME *pst OPTIONAL); diff --git a/dll/win32/kernel32/winnls/string/lcformat.c b/dll/win32/kernel32/winnls/string/lcformat.c index 8d85351190..441c41b221 100644 --- a/dll/win32/kernel32/winnls/string/lcformat.c +++ b/dll/win32/kernel32/winnls/string/lcformat.c @@ -625,7 +625,15 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, { count = 2; } + dwVal = lpTime->wYear - pEra->wYear + 1; + + if (dwVal == 1 && JapaneseEra_IsFirstYearGannen()) + { + // Gan of 'Gannen' + buff[0] = 0x5143; + buff[1] = 0; + } szAdd = buff; break; }

5 years, 8 months

[reactos] 01/01: [BOOTDATA] Improve AHKAppTests.cmd (follow-up of #1476)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df2a8c40becc5542bf093… commit df2a8c40becc5542bf093238826d795cce70a6c7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Apr 16 10:38:51 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Apr 16 10:38:51 2019 +0900 [BOOTDATA] Improve AHKAppTests.cmd (follow-up of #1476) --- boot/bootdata/bootcdregtest/AHKAppTests.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/bootcdregtest/AHKAppTests.cmd b/boot/bootdata/bootcdregtest/AHKAppTests.cmd index 9278669461..2c969a6745 100644 --- a/boot/bootdata/bootcdregtest/AHKAppTests.cmd +++ b/boot/bootdata/bootcdregtest/AHKAppTests.cmd @@ -5,7 +5,7 @@ for %%X in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) do (if exist %% if not defined DRIVE ( dbgprint "AHK Application testing suite not present, skipping." - dbgprint "Insert ReactOS CD and try again." + dbgprint "Insert ReactOS boot media and try again." exit /b 0 )

5 years, 8 months

[reactos] 04/04: [USBHUB_NEW] Support NULL HubExtension in USBH_PdoRemoveDevice.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7634b8e1d95c1a5d4cfc… commit a7634b8e1d95c1a5d4cfc27f0c70accf14a32643 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Mar 4 20:36:32 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Apr 14 15:32:18 2019 +0200 [USBHUB_NEW] Support NULL HubExtension in USBH_PdoRemoveDevice. Device removal can happen multiple times for PDOs. --- drivers/usb/usbhub_new/pnp.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/usb/usbhub_new/pnp.c b/drivers/usb/usbhub_new/pnp.c index 723c106b4a..5607faa0db 100644 --- a/drivers/usb/usbhub_new/pnp.c +++ b/drivers/usb/usbhub_new/pnp.c @@ -2193,9 +2193,8 @@ USBH_PdoRemoveDevice(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, Port = PortExtension->PortNumber; ASSERT(Port > 0); - ASSERT(HubExtension); - - if (HubExtension->CurrentPowerState.DeviceState != PowerDeviceD0 && + if (HubExtension && + HubExtension->CurrentPowerState.DeviceState != PowerDeviceD0 && (HubExtension->HubFlags & USBHUB_FDO_FLAG_DEVICE_STARTED) != 0) { USBH_HubSetD0(HubExtension); @@ -2231,6 +2230,7 @@ USBH_PdoRemoveDevice(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, { WakeIrp = NULL; + ASSERT(HubExtension); if (!InterlockedDecrement(&HubExtension->PendingRequestCount)) { KeSetEvent(&HubExtension->PendingRequestEvent, @@ -2250,6 +2250,7 @@ USBH_PdoRemoveDevice(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, if (WakeIrp) { + ASSERT(HubExtension); USBH_CompletePowerIrp(HubExtension, WakeIrp, STATUS_CANCELLED); } @@ -2270,6 +2271,7 @@ USBH_PdoRemoveDevice(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, if (DeviceHandle) { + ASSERT(HubExtension); Status = USBD_RemoveDeviceEx(HubExtension, DeviceHandle, 0); if (HubExtension->PortData && @@ -2283,7 +2285,7 @@ USBH_PdoRemoveDevice(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, { PortExtension->PortPdoFlags &= ~USBHUB_PDO_FLAG_DEVICE_STARTED; - if (HubExtension->PortData) + if (HubExtension && HubExtension->PortData) { PortData = &HubExtension->PortData[Port - 1]; @@ -2322,14 +2324,18 @@ USBH_PdoRemoveDevice(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, DPRINT1("USBH_PdoRemoveDevice: call IoWMIRegistrationControl UNIMPLEMENTED. FIXME\n"); - USBHUB_FlushAllTransfers(HubExtension); + if (HubExtension) + USBHUB_FlushAllTransfers(HubExtension); IoDeleteDevice(PortDevice); } } - DPRINT("USBH_PdoRemoveDevice: call USBH_CheckIdleDeferred()\n"); - USBH_CheckIdleDeferred(HubExtension); + if (HubExtension) + { + DPRINT("USBH_PdoRemoveDevice: call USBH_CheckIdleDeferred()\n"); + USBH_CheckIdleDeferred(HubExtension); + } return Status; }

5 years, 8 months

[reactos] 03/04: [USBHUB_NEW] Fix inverted check in USBH_RestoreDevice.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=477cf902e4c89706022e1… commit 477cf902e4c89706022e1508d2d4189a0c21afc3 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Apr 1 14:04:56 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Apr 14 15:32:16 2019 +0200 [USBHUB_NEW] Fix inverted check in USBH_RestoreDevice. This allows re-enabling a disabled device. --- drivers/usb/usbhub_new/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/usbhub_new/pnp.c b/drivers/usb/usbhub_new/pnp.c index c1862574b0..723c106b4a 100644 --- a/drivers/usb/usbhub_new/pnp.c +++ b/drivers/usb/usbhub_new/pnp.c @@ -2068,7 +2068,7 @@ USBH_RestoreDevice(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, ASSERT(PortExtension->PortNumber > 0); PortData = &HubExtension->PortData[PortExtension->PortNumber - 1]; - if (PortExtension->Common.SelfDevice == PortData->DeviceObject) + if (PortExtension->Common.SelfDevice != PortData->DeviceObject) { Status = STATUS_UNSUCCESSFUL; return Status;

5 years, 8 months

[reactos] 02/04: [USBCCGP] Allow unconfiguring the device in USBCCGP_PDOSelectConfiguration.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46b0f6d9deec116523bf8… commit 46b0f6d9deec116523bf8748a05abecc0ac22672 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Apr 7 11:54:43 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Apr 14 15:32:14 2019 +0200 [USBCCGP] Allow unconfiguring the device in USBCCGP_PDOSelectConfiguration. Fixes device removal for USB audio devices. --- drivers/usb/usbccgp/pdo.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/usb/usbccgp/pdo.c b/drivers/usb/usbccgp/pdo.c index 06a549f315..bcd0acb075 100644 --- a/drivers/usb/usbccgp/pdo.c +++ b/drivers/usb/usbccgp/pdo.c @@ -718,6 +718,14 @@ USBCCGP_PDOSelectConfiguration( return STATUS_SUCCESS; } + // + // if there is no configuration descriptor, unconfigure the device + // + if (Urb->UrbSelectConfiguration.ConfigurationDescriptor == NULL) + { + return STATUS_SUCCESS; + } + // sanity checks //C_ASSERT(sizeof(struct _URB_HEADER) == 16); //C_ASSERT(FIELD_OFFSET(struct _URB_SELECT_CONFIGURATION, Interface.Length) == 24);

5 years, 8 months

[reactos] 01/04: [USBCCGP] Do not try to unconfigure a device that is not configured.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=528fc589c006d39dfdd6b… commit 528fc589c006d39dfdd6bc0e2f15de39f8d96466 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 3 18:24:44 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Apr 14 15:32:12 2019 +0200 [USBCCGP] Do not try to unconfigure a device that is not configured. Fixes handling failed IRP_MN_START_DEVICE. --- drivers/usb/usbccgp/fdo.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/usb/usbccgp/fdo.c b/drivers/usb/usbccgp/fdo.c index 7916e8acf3..927d19ef0f 100644 --- a/drivers/usb/usbccgp/fdo.c +++ b/drivers/usb/usbccgp/fdo.c @@ -338,6 +338,13 @@ FDO_CloseConfiguration( FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); + /* Nothing to do if we're not configured */ + if (FDODeviceExtension->ConfigurationDescriptor == NULL || + FDODeviceExtension->InterfaceList == NULL) + { + return STATUS_SUCCESS; + } + /* Now allocate the urb */ Urb = USBD_CreateConfigurationRequestEx(FDODeviceExtension->ConfigurationDescriptor, FDODeviceExtension->InterfaceList);

5 years, 8 months

[reactos] 01/01: [COMCTL32] Remove an unnecessary include.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6122f3f436a4551e2a853… commit 6122f3f436a4551e2a85318b7e6452a6fbada2c5 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Apr 14 14:25:35 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Apr 14 14:35:29 2019 +0200 [COMCTL32] Remove an unnecessary include. --- dll/win32/comctl32/lang/comctl_Sq.rc | 2 -- 1 file changed, 2 deletions(-) diff --git a/dll/win32/comctl32/lang/comctl_Sq.rc b/dll/win32/comctl32/lang/comctl_Sq.rc index fd6e6e7bf7..5c17bdeea2 100644 --- a/dll/win32/comctl32/lang/comctl_Sq.rc +++ b/dll/win32/comctl32/lang/comctl_Sq.rc @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "comctl32.h" - LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE

5 years, 8 months

[reactos] 03/03: [BOOTDATA] Remove stray value.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b7f710fc7d0ddb0b6d57… commit 3b7f710fc7d0ddb0b6d57b1ac5023215bfb80d23 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 14 01:25:35 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 14 01:25:35 2019 +0200 [BOOTDATA] Remove stray value. --- boot/bootdata/hivesft.inf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index f63f87ca96..4387338e3f 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -602,9 +602,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontDPI","LogPixels",0x00010003,96 -; win32k GRE initialization +; Win32k GRE initialization HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize",,0x00000012 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","MS Shell Dlg",0x00000002,"Microsoft Sans Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","FIXEDFON.FON",0x00000002,"vgafix.fon" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","FONTS.FON",0x00000002,"vgasys.fon" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","OEMFONT.FON",0x00000002,"vgaoem.fon"

5 years, 8 months

[reactos] 02/03: [WIN32SS:NTGDI] IntEscapeMatrix(): Use FreeType trigonometric functions instead of CRT ones.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61475b9fede67b4eb2236… commit 61475b9fede67b4eb2236c4ff9a495052c66cda9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 14 01:19:03 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 14 01:19:03 2019 +0200 [WIN32SS:NTGDI] IntEscapeMatrix(): Use FreeType trigonometric functions instead of CRT ones. --- win32ss/gdi/ntgdi/freetype.c | 77 +++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index b5433d3844..a613a9f265 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -336,6 +336,39 @@ SharedFace_Release(PSHARED_FACE Ptr) IntUnLockFreeType(); } + +static __inline void FTVectorToPOINTFX(FT_Vector *vec, POINTFX *pt) +{ + pt->x.value = vec->x >> 6; + pt->x.fract = (vec->x & 0x3f) << 10; + pt->x.fract |= ((pt->x.fract >> 6) | (pt->x.fract >> 12)); + pt->y.value = vec->y >> 6; + pt->y.fract = (vec->y & 0x3f) << 10; + pt->y.fract |= ((pt->y.fract >> 6) | (pt->y.fract >> 12)); +} + +/* + This function builds an FT_Fixed from a float. It puts the integer part + in the highest 16 bits and the decimal part in the lowest 16 bits of the FT_Fixed. + It fails if the integer part of the float number is greater than SHORT_MAX. +*/ +static __inline FT_Fixed FT_FixedFromFloat(FLOAT f) +{ + short value = f; + unsigned short fract = (f - value) * 0xFFFF; + return (FT_Fixed)((long)value << 16 | (unsigned long)fract); +} + +/* + This function builds an FT_Fixed from a FIXED. It simply put f.value + in the highest 16 bits and f.fract in the lowest 16 bits of the FT_Fixed. +*/ +static __inline FT_Fixed FT_FixedFromFIXED(FIXED f) +{ + return (FT_Fixed)((long)f.value << 16 | (unsigned long)f.fract); +} + + #if DBG VOID DumpFontGDI(PFONTGDI FontGDI) { @@ -685,10 +718,11 @@ VOID FASTCALL IntWidthMatrix(FT_Face face, FT_Matrix *pmat, LONG lfWidth) VOID FASTCALL IntEscapeMatrix(FT_Matrix *pmat, LONG lfEscapement) { - double radian = (lfEscapement * M_PI) / 180 / 10; - - pmat->xx = (FT_Fixed)(cos(radian) * (1 << 16)); - pmat->xy = (FT_Fixed)(-sin(radian) * (1 << 16)); + FT_Vector vecAngle; + FT_Angle angle = FT_FixedFromFloat((FLOAT)(lfEscapement * M_PI) / (FLOAT)(180 * 10)); + FT_Vector_Unit(&vecAngle, angle); + pmat->xx = vecAngle.x; + pmat->xy = -vecAngle.y; pmat->yx = -pmat->xy; pmat->yy = pmat->xx; } @@ -2970,37 +3004,6 @@ ftGdiGlyphCacheSet( } -static void FTVectorToPOINTFX(FT_Vector *vec, POINTFX *pt) -{ - pt->x.value = vec->x >> 6; - pt->x.fract = (vec->x & 0x3f) << 10; - pt->x.fract |= ((pt->x.fract >> 6) | (pt->x.fract >> 12)); - pt->y.value = vec->y >> 6; - pt->y.fract = (vec->y & 0x3f) << 10; - pt->y.fract |= ((pt->y.fract >> 6) | (pt->y.fract >> 12)); -} - -/* - This function builds an FT_Fixed from a float. It puts the integer part - in the highest 16 bits and the decimal part in the lowest 16 bits of the FT_Fixed. - It fails if the integer part of the float number is greater than SHORT_MAX. -*/ -static __inline FT_Fixed FT_FixedFromFloat(float f) -{ - short value = f; - unsigned short fract = (f - value) * 0xFFFF; - return (FT_Fixed)((long)value << 16 | (unsigned long)fract); -} - -/* - This function builds an FT_Fixed from a FIXED. It simply put f.value - in the highest 16 bits and f.fract in the lowest 16 bits of the FT_Fixed. -*/ -static __inline FT_Fixed FT_FixedFromFIXED(FIXED f) -{ - return (FT_Fixed)((long)f.value << 16 | (unsigned long)f.fract); -} - static unsigned int get_native_glyph_outline(FT_Outline *outline, unsigned int buflen, char *buf) { TTPOLYGONHEADER *pph; @@ -3545,7 +3548,7 @@ ftGdiGetGlyphOutline( if (aveWidth && potm) { widthRatio = (FLOAT)aveWidth * eM11 / - (FLOAT) potm->otmTextMetrics.tmAveCharWidth; + (FLOAT)potm->otmTextMetrics.tmAveCharWidth; } left = (INT)(ft_face->glyph->metrics.horiBearingX * widthRatio) & -64; @@ -3594,7 +3597,7 @@ ftGdiGetGlyphOutline( FT_Matrix rotationMat; FT_Vector vecAngle; DPRINT("Rotation Trans!\n"); - angle = FT_FixedFromFloat((float)orientation / 10.0); + angle = FT_FixedFromFloat((FLOAT)orientation / 10.0); FT_Vector_Unit(&vecAngle, angle); rotationMat.xx = vecAngle.x; rotationMat.xy = -vecAngle.y;

5 years, 8 months

[reactos] 01/03: [GDI32] Do not 'hard-assert' during the font-unit-test.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7334567211b921220ef82… commit 7334567211b921220ef82f168ef8e4bc7d5b2724 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 14 01:17:15 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 14 01:17:15 2019 +0200 [GDI32] Do not 'hard-assert' during the font-unit-test. --- win32ss/gdi/gdi32/objects/font.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/font.c b/win32ss/gdi/gdi32/objects/font.c index 1b6cfa7296..7a7c23b0b5 100644 --- a/win32ss/gdi/gdi32/objects/font.c +++ b/win32ss/gdi/gdi32/objects/font.c @@ -1340,7 +1340,7 @@ GetOutlineTextMetricsA( else output->otmpFullName = 0; - assert(left == 0); + ASSERT(left == 0); if(output != lpOTM) { @@ -1730,6 +1730,13 @@ VOID DumpFamilyInfo(const FONTFAMILYINFO *Info, LONG Count) VOID DoFontSystemUnittest(VOID) { +#ifndef RTL_SOFT_ASSERT +#define RTL_SOFT_ASSERT(exp) \ + (void)((!(exp)) ? \ + DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE) +#define RTL_SOFT_ASSERT_defined +#endif + LOGFONTW LogFont; FONTFAMILYINFO Info[4]; UNICODE_STRING Str1, Str2; @@ -1744,8 +1751,8 @@ VOID DoFontSystemUnittest(VOID) ret = NtGdiGetFontFamilyInfo(NULL, &LogFont, Info, &InfoCount); DPRINT1("ret: %ld, InfoCount: %ld\n", ret, InfoCount); DumpFamilyInfo(Info, ret); - ASSERT(ret == RTL_NUMBER_OF(Info)); - ASSERT(InfoCount > 32); + RTL_SOFT_ASSERT(ret == RTL_NUMBER_OF(Info)); + RTL_SOFT_ASSERT(InfoCount > 32); /* L"Microsoft Sans Serif" ANSI_CHARSET */ RtlZeroMemory(&LogFont, sizeof(LogFont)); @@ -1755,19 +1762,19 @@ VOID DoFontSystemUnittest(VOID) ret = NtGdiGetFontFamilyInfo(NULL, &LogFont, Info, &InfoCount); DPRINT1("ret: %ld, InfoCount: %ld\n", ret, InfoCount); DumpFamilyInfo(Info, ret); - ASSERT(ret != -1); - ASSERT(InfoCount > 0); - ASSERT(InfoCount < 16); + RTL_SOFT_ASSERT(ret != -1); + RTL_SOFT_ASSERT(InfoCount > 0); + RTL_SOFT_ASSERT(InfoCount < 16); RtlInitUnicodeString(&Str1, Info[0].EnumLogFontEx.elfLogFont.lfFaceName); RtlInitUnicodeString(&Str2, L"Microsoft Sans Serif"); ret = RtlCompareUnicodeString(&Str1, &Str2, TRUE); - ASSERT(ret == 0); + RTL_SOFT_ASSERT(ret == 0); RtlInitUnicodeString(&Str1, Info[0].EnumLogFontEx.elfFullName); RtlInitUnicodeString(&Str2, L"Tahoma"); ret = RtlCompareUnicodeString(&Str1, &Str2, TRUE); - ASSERT(ret == 0); + RTL_SOFT_ASSERT(ret == 0); /* L"Non-Existent" DEFAULT_CHARSET */ RtlZeroMemory(&LogFont, sizeof(LogFont)); @@ -1777,8 +1784,13 @@ VOID DoFontSystemUnittest(VOID) ret = NtGdiGetFontFamilyInfo(NULL, &LogFont, Info, &InfoCount); DPRINT1("ret: %ld, InfoCount: %ld\n", ret, InfoCount); DumpFamilyInfo(Info, ret); - ASSERT(ret == 0); - ASSERT(InfoCount == 0); + RTL_SOFT_ASSERT(ret == 0); + RTL_SOFT_ASSERT(InfoCount == 0); + +#ifdef RTL_SOFT_ASSERT_defined +#undef RTL_SOFT_ASSERT_defined +#undef RTL_SOFT_ASSERT +#endif } #endif @@ -1796,8 +1808,8 @@ CreateFontIndirectW( static BOOL bDidTest = FALSE; if (!bDidTest) { - DoFontSystemUnittest(); bDidTest = TRUE; + DoFontSystemUnittest(); } #endif if (lplf)

5 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
24
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 April 2019