Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [WIN32SS] Improve selection of 'closest graphic mode'
by Hervé Poussineau 01 May '22

01 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14d50cc6c088a5b8bf14c… commit 14d50cc6c088a5b8bf14c84b22ce44e18e9b6b1f Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 1 14:35:02 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun May 1 16:36:48 2022 +0200 [WIN32SS] Improve selection of 'closest graphic mode' If color depth is not provided (in registry), try to find a 32 bit one. If not found, fall back to first available graphic mode. CORE-18027 --- win32ss/gdi/eng/ldevobj.c | 98 ++++++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 36 deletions(-) diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index cf618635735..cb6a8bbbe32 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -669,6 +669,31 @@ LDEVOBJ_bBuildDevmodeList( return TRUE; } +static +BOOL +LDEVOBJ_bGetClosestMode( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, + _In_ PDEVMODEW RequestedMode, + _Out_ PDEVMODEW *pSelectedMode) +{ + if (pGraphicsDevice->cDevModes == 0) + return FALSE; + + /* Search a 32bit mode (if not already specified) */ + if (!(RequestedMode->dmFields & DM_BITSPERPEL)) + { + RequestedMode->dmBitsPerPel = 32; + RequestedMode->dmFields |= DM_BITSPERPEL; + } + if (LDEVOBJ_bProbeAndCaptureDevmode(pGraphicsDevice, RequestedMode, pSelectedMode, FALSE)) + return TRUE; + + /* Fall back to first mode */ + WARN("Fall back to first available mode\n"); + *pSelectedMode = pGraphicsDevice->pDevModeList[0].pdm; + return TRUE; +} + BOOL LDEVOBJ_bProbeAndCaptureDevmode( _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, @@ -683,46 +708,47 @@ LDEVOBJ_bProbeAndCaptureDevmode( if (!LDEVOBJ_bBuildDevmodeList(pGraphicsDevice)) return FALSE; - /* Search if requested mode exists */ - for (i = 0; i < pGraphicsDevice->cDevModes; i++) + if (bSearchClosestMode) { - pdmCurrent = pGraphicsDevice->pDevModeList[i].pdm; - - /* Compare asked DEVMODE fields - * Only compare those that are valid in both DEVMODE structs */ - dwFields = pdmCurrent->dmFields & RequestedMode->dmFields; - - /* For now, we only need those */ - if ((dwFields & DM_BITSPERPEL) && - (pdmCurrent->dmBitsPerPel != RequestedMode->dmBitsPerPel)) continue; - if ((dwFields & DM_PELSWIDTH) && - (pdmCurrent->dmPelsWidth != RequestedMode->dmPelsWidth)) continue; - if ((dwFields & DM_PELSHEIGHT) && - (pdmCurrent->dmPelsHeight != RequestedMode->dmPelsHeight)) continue; - if ((dwFields & DM_DISPLAYFREQUENCY) && - (pdmCurrent->dmDisplayFrequency != RequestedMode->dmDisplayFrequency)) continue; - - pdmSelected = pdmCurrent; - break; + /* Search the closest mode */ + if (!LDEVOBJ_bGetClosestMode(pGraphicsDevice, RequestedMode, &pdmSelected)) + return FALSE; + ASSERT(pdmSelected); } - - if (!pdmSelected) + else { - WARN("Requested mode not found (%dx%dx%d %d Hz)\n", - RequestedMode->dmFields & DM_PELSWIDTH ? RequestedMode->dmPelsWidth : 0, - RequestedMode->dmFields & DM_PELSHEIGHT ? RequestedMode->dmPelsHeight : 0, - RequestedMode->dmFields & DM_BITSPERPEL ? RequestedMode->dmBitsPerPel : 0, - RequestedMode->dmFields & DM_DISPLAYFREQUENCY ? RequestedMode->dmDisplayFrequency : 0); - if (!bSearchClosestMode || pGraphicsDevice->cDevModes == 0) - return FALSE; + /* Search if requested mode exists */ + for (i = 0; i < pGraphicsDevice->cDevModes; i++) + { + pdmCurrent = pGraphicsDevice->pDevModeList[i].pdm; + + /* Compare asked DEVMODE fields + * Only compare those that are valid in both DEVMODE structs */ + dwFields = pdmCurrent->dmFields & RequestedMode->dmFields; + + /* For now, we only need those */ + if ((dwFields & DM_BITSPERPEL) && + (pdmCurrent->dmBitsPerPel != RequestedMode->dmBitsPerPel)) continue; + if ((dwFields & DM_PELSWIDTH) && + (pdmCurrent->dmPelsWidth != RequestedMode->dmPelsWidth)) continue; + if ((dwFields & DM_PELSHEIGHT) && + (pdmCurrent->dmPelsHeight != RequestedMode->dmPelsHeight)) continue; + if ((dwFields & DM_DISPLAYFREQUENCY) && + (pdmCurrent->dmDisplayFrequency != RequestedMode->dmDisplayFrequency)) continue; + + pdmSelected = pdmCurrent; + break; + } - /* FIXME: need to search the closest mode instead of taking the first one */ - pdmSelected = pGraphicsDevice->pDevModeList[0].pdm; - WARN("Replacing it by %dx%dx%d %d Hz\n", - pdmSelected->dmFields & DM_PELSWIDTH ? pdmSelected->dmPelsWidth : 0, - pdmSelected->dmFields & DM_PELSHEIGHT ? pdmSelected->dmPelsHeight : 0, - pdmSelected->dmFields & DM_BITSPERPEL ? pdmSelected->dmBitsPerPel : 0, - pdmSelected->dmFields & DM_DISPLAYFREQUENCY ? pdmSelected->dmDisplayFrequency : 0); + if (!pdmSelected) + { + WARN("Requested mode not found (%dx%dx%d %d Hz)\n", + RequestedMode->dmFields & DM_PELSWIDTH ? RequestedMode->dmPelsWidth : 0, + RequestedMode->dmFields & DM_PELSHEIGHT ? RequestedMode->dmPelsHeight : 0, + RequestedMode->dmFields & DM_BITSPERPEL ? RequestedMode->dmBitsPerPel : 0, + RequestedMode->dmFields & DM_DISPLAYFREQUENCY ? RequestedMode->dmDisplayFrequency : 0); + return FALSE; + } } /* Allocate memory for output */

1 0

[reactos] 01/01: [WIN32SS] In PDEVOBJ_vRefreshModeList, do not change current stored mode
by Hervé Poussineau 30 Apr '22

30 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8b3402fe60d47fbd8bde… commit d8b3402fe60d47fbd8bde77d3048249c3aaf71c7 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Apr 30 23:26:53 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Apr 30 23:33:42 2022 +0200 [WIN32SS] In PDEVOBJ_vRefreshModeList, do not change current stored mode When changing current devmode, we must not only change ppdev->pdmwDev pointer, but also update lots of other structures. This work is done by PDEVOBJ_lChangeDisplaySettings. CORE-18169 --- win32ss/gdi/eng/pdevobj.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index 5ef22da825f..65469cfce76 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -379,7 +379,6 @@ PDEVOBJ_vRefreshModeList( { PGRAPHICS_DEVICE pGraphicsDevice; PDEVMODEINFO pdminfo, pdmiNext; - PDEVMODEW newDevMode; /* Lock the PDEV */ EngAcquireSemaphore(ppdev->hsemDevLock); @@ -398,12 +397,8 @@ PDEVOBJ_vRefreshModeList( ExFreePoolWithTag(pGraphicsDevice->pDevModeList, GDITAG_GDEVICE); pGraphicsDevice->pDevModeList = NULL; - /* Search an available display mode */ - if (LDEVOBJ_bProbeAndCaptureDevmode(pGraphicsDevice, ppdev->pdmwDev, &newDevMode, TRUE)) - { - ExFreePoolWithTag(ppdev->pdmwDev, GDITAG_DEVMODE); - ppdev->pdmwDev = newDevMode; - } + /* Update available display mode list */ + LDEVOBJ_bBuildDevmodeList(pGraphicsDevice); /* Unlock PDEV */ EngReleaseSemaphore(ppdev->hsemDevLock);

1 0

[reactos] 01/01: [WIN32SS] Set DISPLAY_DEVICE_PRIMARY_DEVICE flag
by Hervé Poussineau 30 Apr '22

30 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1cd80c861eba0bb8c2e6… commit d1cd80c861eba0bb8c2e665110deae0d7c2bef35 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Apr 30 21:59:44 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Apr 30 22:02:28 2022 +0200 [WIN32SS] Set DISPLAY_DEVICE_PRIMARY_DEVICE flag This flag was not set anymore since 2d2824f1b98b772eb36e4e2b75185b48cbeed618 Note that this is still wrong for multi-monitor. CORE-18169 --- win32ss/gdi/eng/pdevobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index 77dce0b0bfa..5ef22da825f 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -493,7 +493,7 @@ PDEVOBJ_Create( { RtlCopyMemory(ppdev->pdmwDev, pdm, pdm->dmSize + pdm->dmDriverExtra); /* FIXME: this must be done in a better way */ - pGraphicsDevice->StateFlags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + pGraphicsDevice->StateFlags |= DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; } }

1 0

[reactos] 01/01: [DESK] Remove call to SetupDiRestartDevices()
by Hervé Poussineau 30 Apr '22

30 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d66a0aa19b534329ceae… commit 1d66a0aa19b534329ceae990d3beeca2ed824ac1 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Apr 30 13:57:54 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Apr 30 14:05:05 2022 +0200 [DESK] Remove call to SetupDiRestartDevices() This effectively reverts a6005299c685bb7669ad7ecb1d9c765bcc494c08, and parts of c3da00c42c472d07f7a4a4c02d6907ad2956ea66. This call is not required, as umpnpmgr already does what is needed. However, keep the call to EnumDisplayDevices(), so win32k knows that a new graphic card has been installed. CORE-18168 --- dll/cpl/desk/classinst.c | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/dll/cpl/desk/classinst.c b/dll/cpl/desk/classinst.c index 2c73aced777..c0038cfa635 100644 --- a/dll/cpl/desk/classinst.c +++ b/dll/cpl/desk/classinst.c @@ -246,35 +246,9 @@ DisplayClassInstaller( /* FIXME: install OpenGLSoftwareSettings section */ - /* Start the device */ - if (SetupDiRestartDevices(DeviceInfoSet, DeviceInfoData)) - { - /* Reenumerate display devices ; this will rescan for potential new devices */ - DisplayDevice.cb = sizeof(DISPLAY_DEVICE); - EnumDisplayDevices(NULL, 0, &DisplayDevice, 0); - } - else - { - rc = GetLastError(); - DPRINT("SetupDiRestartDevices() failed with error 0x%lx. Will reboot later.\n", rc); - - /* Mark device as needing a restart */ - InstallParams.cbSize = sizeof(InstallParams); - if (!SetupDiGetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams)) - { - rc = GetLastError(); - DPRINT("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", rc); - goto cleanup; - } - InstallParams.Flags |= DI_NEEDRESTART; - result = SetupDiSetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams); - if (!result) - { - rc = GetLastError(); - DPRINT("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", rc); - goto cleanup; - } - } + /* Reenumerate display devices ; this will rescan for potential new devices */ + DisplayDevice.cb = sizeof(DISPLAY_DEVICE); + EnumDisplayDevices(NULL, 0, &DisplayDevice, 0); rc = ERROR_SUCCESS;

1 0

[reactos] 01/01: [SETUPAPI] Clarify what functions are exported starting with NT 5.2
by Stanislav Motylkov 30 Apr '22

30 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dea51f78300364315edff… commit dea51f78300364315edffc9725032511450ffa2d Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Apr 30 13:36:25 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Apr 30 13:36:25 2022 +0300 [SETUPAPI] Clarify what functions are exported starting with NT 5.2 CORE-18168 --- dll/win32/setupapi/setupapi.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec index 1d96d8bcb16..cc849483b99 100644 --- a/dll/win32/setupapi/setupapi.spec +++ b/dll/win32/setupapi/setupapi.spec @@ -1,4 +1,3 @@ -# Functions exported by Win2003 SP1 @ stdcall CMP_GetBlockedDriverInfo(wstr ptr long ptr) @ stdcall CMP_GetServerSideDeviceInstallFlags(ptr long ptr) @ stdcall CMP_Init_Detection(long) @@ -236,8 +235,8 @@ @ stdcall SetupCommitFileQueue(long long ptr ptr) SetupCommitFileQueueA @ stdcall SetupCommitFileQueueA(long long ptr ptr) @ stdcall SetupCommitFileQueueW(long long ptr ptr) -@ stub SetupConfigureWmiFromInfSectionA -@ stub SetupConfigureWmiFromInfSectionW +@ stub -version=0x502+ SetupConfigureWmiFromInfSectionA +@ stub -version=0x502+ SetupConfigureWmiFromInfSectionW @ stdcall SetupCopyErrorA(long str str str str str long long str long ptr) @ stdcall SetupCopyErrorW(long wstr wstr wstr wstr wstr long long wstr long ptr) @ stdcall SetupCopyOEMInfA(str str long long ptr long ptr ptr) @@ -291,8 +290,8 @@ @ stdcall SetupDiEnumDeviceInterfaces(long ptr ptr long ptr) @ stdcall SetupDiEnumDriverInfoA(long ptr long long ptr) @ stdcall SetupDiEnumDriverInfoW(long ptr long long ptr) -@ stub SetupDiGetActualModelsSectionA -@ stub SetupDiGetActualModelsSectionW +@ stub -version=0x502+ SetupDiGetActualModelsSectionA +@ stub -version=0x502+ SetupDiGetActualModelsSectionW @ stdcall SetupDiGetActualSectionToInstallA(long str str long ptr ptr) @ stdcall SetupDiGetActualSectionToInstallExA(long str ptr str long ptr ptr ptr) @ stdcall SetupDiGetActualSectionToInstallExW(long wstr ptr wstr long ptr ptr ptr) @@ -369,7 +368,7 @@ @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) @ stdcall SetupDiRemoveDevice(ptr ptr) @ stdcall SetupDiRemoveDeviceInterface(ptr ptr) -@ stdcall SetupDiRestartDevices(ptr ptr) +@ stdcall -version=0x502+ SetupDiRestartDevices(ptr ptr) @ stdcall SetupDiSelectBestCompatDrv(ptr ptr) @ stdcall SetupDiSelectDevice(ptr ptr) @ stub SetupDiSelectOEMDrv @@ -565,7 +564,7 @@ @ stdcall pSetupInstallCatalog(wstr wstr ptr) @ stub pSetupInstallStopEx @ stdcall pSetupIsGuidNull(ptr) -@ stub pSetupIsLocalSystem +@ stub -version=0x502+ pSetupIsLocalSystem @ stdcall pSetupIsUserAdmin() @ stub pSetupMakeSurePathExists @ stdcall pSetupMalloc(long) MyMalloc

1 0

[reactos] 01/01: [CRT] Fix MinGW-arm intrin minor bug in _byteswap_ushort (#4475)
by Julen Urizar Compains 29 Apr '22

29 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=748d5c694eba293b1d4a3… commit 748d5c694eba293b1d4a3db4e111a4783cb13d82 Author: Julen Urizar Compains <julenuri(a)hotmail.com> AuthorDate: Sat Apr 30 00:24:49 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 30 01:24:49 2022 +0300 [CRT] Fix MinGW-arm intrin minor bug in _byteswap_ushort (#4475) A little bug were in the CRT, found with RosBE and cegcc compiler: ../sdk/include/crt/mingw32/intrin_arm.h:44:32: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context] Thanks to @HBelusca for suggesting the fix. CORE-17604 --- sdk/include/crt/mingw32/intrin_arm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/crt/mingw32/intrin_arm.h b/sdk/include/crt/mingw32/intrin_arm.h index f5a07b381fb..7799f15bdd6 100644 --- a/sdk/include/crt/mingw32/intrin_arm.h +++ b/sdk/include/crt/mingw32/intrin_arm.h @@ -41,7 +41,7 @@ __INTRIN_INLINE void __break(unsigned int value) { __asm__ __volatile__("bkpt %0 __INTRIN_INLINE unsigned short _byteswap_ushort(unsigned short value) { - return (value >> 8) || (value << 8); + return (value >> 8) | (value << 8); } __INTRIN_INLINE unsigned _CountLeadingZeros(long Mask)

1 0

[reactos] 01/01: [ROSTESTS] Fix crash in winhttp:winhttp test (#4303)
by Doug Lyons 29 Apr '22

29 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbc7eeb47e5527bdad0cf… commit dbc7eeb47e5527bdad0cf3366a2f6644544ae423 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Fri Apr 29 13:50:54 2022 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 29 21:50:54 2022 +0300 [ROSTESTS] Fix crash in winhttp:winhttp test (#4303) Fix regression crash in wine_dbgstr_wn. ROSTESTS-377 This brings most of Wine's current wine_dbgstr_wn code into ReactOS. It's not possible to completely sync this with latest Wine because there is Wine-specific code regarding "debug_info" and their TEB in remaining code. Confirmed by @ThFabba. --- sdk/include/reactos/wine/test.h | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/sdk/include/reactos/wine/test.h b/sdk/include/reactos/wine/test.h index 414215ab0c4..0cbc40010b5 100644 --- a/sdk/include/reactos/wine/test.h +++ b/sdk/include/reactos/wine/test.h @@ -698,28 +698,22 @@ const char *wine_dbgstr_an( const CHAR *str, intptr_t n ) const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n ) { - char *dst, *res; - size_t size; + char *res; + static const char hex[16] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; + char buffer[300], *dst = buffer; + if (!str) return "(null)"; if (!((ULONG_PTR)str >> 16)) { - if (!str) return "(null)"; res = get_temp_buffer( 6 ); sprintf( res, "#%04x", LOWORD(str) ); return res; } - if (n == -1) - { - const WCHAR *end = str; - while (*end) end++; - n = end - str; - } - if (n < 0) n = 0; - size = 12 + min( 300, n * 5 ); - dst = res = get_temp_buffer( size ); + if (IsBadStringPtrW(str,n)) return "(invalid)"; + if (n == -1) for (n = 0; str[n]; n++) ; *dst++ = 'L'; *dst++ = '"'; - while (n-- > 0 && dst <= res + size - 10) + while (n-- > 0 && dst <= buffer + sizeof(buffer) - 10) { WCHAR c = *str++; switch (c) @@ -730,14 +724,15 @@ const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n ) case '"': *dst++ = '\\'; *dst++ = '"'; break; case '\\': *dst++ = '\\'; *dst++ = '\\'; break; default: - if (c >= ' ' && c <= 126) - *dst++ = (char)c; - else + if (c < ' ' || c >= 127) { *dst++ = '\\'; - sprintf(dst,"%04x",c); - dst+=4; + *dst++ = hex[(c >> 12) & 0x0f]; + *dst++ = hex[(c >> 8) & 0x0f]; + *dst++ = hex[(c >> 4) & 0x0f]; + *dst++ = hex[c & 0x0f]; } + else *dst++ = (char)c; } } *dst++ = '"'; @@ -747,8 +742,10 @@ const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n ) *dst++ = '.'; *dst++ = '.'; } - *dst++ = 0; - release_temp_buffer( res, dst - res ); + *dst = 0; + + res = get_temp_buffer(strlen(buffer + 1)); + strcpy(res, buffer); return res; }

1 0

[reactos] 01/01: [FREELDR:NTLDR] Add '\n' to debug logs (#4474)
by Serge Gautherie 29 Apr '22

29 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57d7f6f6b31fc6bd701ac… commit 57d7f6f6b31fc6bd701ac60adb27eba328dad0da Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Apr 29 17:20:36 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 29 18:20:36 2022 +0300 [FREELDR:NTLDR] Add '\n' to debug logs (#4474) --- boot/freeldr/freeldr/ntldr/arch/i386/winldr.c | 2 +- boot/freeldr/freeldr/ntldr/wlregistry.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c index e28778b553f..ec91b7313a1 100644 --- a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c @@ -212,7 +212,7 @@ MempAllocatePageTables(VOID) if (Buffer + (TotalSize - NumPageTables*MM_PAGE_SIZE) != PhysicalPageTablesBuffer) { - TRACE("There was a problem allocating two adjacent blocks of memory!"); + TRACE("There was a problem allocating two adjacent blocks of memory!\n"); } if (Buffer == NULL || PhysicalPageTablesBuffer == NULL) diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index 23fda355ef9..cea9c2544db 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -65,7 +65,7 @@ WinLdrLoadSystemHive( Status = ArcGetFileInformation(FileId, &FileInfo); if (Status != ESUCCESS) { - WARN("Hive file has 0 size!"); + WARN("Hive file has 0 size!\n"); ArcClose(FileId); return FALSE; } @@ -78,7 +78,7 @@ WinLdrLoadSystemHive( if (HiveDataPhysical == NULL) { - WARN("Could not alloc memory for hive!"); + WARN("Could not alloc memory for hive!\n"); ArcClose(FileId); return FALSE; } @@ -226,7 +226,7 @@ WinLdrGetNLSNames( rc = RegOpenKey(ControlSet, L"Control\\NLS\\CodePage", &hKey); if (rc != ERROR_SUCCESS) { - //TRACE("Couldn't open CodePage registry key"); + //TRACE("Couldn't open CodePage registry key\n"); return FALSE; } @@ -235,7 +235,7 @@ WinLdrGetNLSNames( rc = RegQueryValue(hKey, L"ACP", NULL, (PUCHAR)szIdBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //TRACE("Couldn't get ACP NLS setting"); + //TRACE("Couldn't get ACP NLS setting\n"); goto Quit; } @@ -244,7 +244,7 @@ WinLdrGetNLSNames( (PUCHAR)AnsiFileName->Buffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //TRACE("ACP NLS Setting exists, but isn't readable"); + //TRACE("ACP NLS Setting exists, but isn't readable\n"); //goto Quit; AnsiFileName->Length = 0; RtlAppendUnicodeToString(AnsiFileName, L"c_1252.nls"); // HACK: ReactOS bug CORE-6105 @@ -259,7 +259,7 @@ WinLdrGetNLSNames( rc = RegQueryValue(hKey, L"OEMCP", NULL, (PUCHAR)szIdBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //TRACE("Couldn't get OEMCP NLS setting"); + //TRACE("Couldn't get OEMCP NLS setting\n"); goto Quit; } @@ -268,7 +268,7 @@ WinLdrGetNLSNames( (PUCHAR)OemFileName->Buffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //TRACE("OEMCP NLS setting exists, but isn't readable"); + //TRACE("OEMCP NLS setting exists, but isn't readable\n"); //goto Quit; OemFileName->Length = 0; RtlAppendUnicodeToString(OemFileName, L"c_437.nls"); // HACK: ReactOS bug CORE-6105 @@ -284,7 +284,7 @@ WinLdrGetNLSNames( (PUCHAR)OemHalFileName->Buffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //TRACE("Couldn't get OEMHAL NLS setting"); + //TRACE("Couldn't get OEMHAL NLS setting\n"); //goto Quit; RtlInitEmptyUnicodeString(OemHalFileName, NULL, 0); } @@ -299,7 +299,7 @@ WinLdrGetNLSNames( rc = RegOpenKey(ControlSet, L"Control\\NLS\\Language", &hKey); if (rc != ERROR_SUCCESS) { - //TRACE("Couldn't open Language registry key"); + //TRACE("Couldn't open Language registry key\n"); return FALSE; } @@ -308,7 +308,7 @@ WinLdrGetNLSNames( rc = RegQueryValue(hKey, L"Default", NULL, (PUCHAR)szIdBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //TRACE("Couldn't get Language Default setting"); + //TRACE("Couldn't get Language Default setting\n"); goto Quit; } @@ -317,7 +317,7 @@ WinLdrGetNLSNames( (PUCHAR)LangFileName->Buffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //TRACE("Language Default setting exists, but isn't readable"); + //TRACE("Language Default setting exists, but isn't readable\n"); //goto Quit; LangFileName->Length = 0; RtlAppendUnicodeToString(LangFileName, L"l_intl.nls");

1 0

[reactos] 01/01: [GDI32_APITEST] Add CursorIcon tests to GetObject test (#3955)
by Jose Carlos Jesus 29 Apr '22

29 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f72e9c9b06a8be0d0c62… commit 4f72e9c9b06a8be0d0c625adadd508419abd40d0 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Fri Apr 29 14:45:02 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 29 16:45:02 2022 +0300 [GDI32_APITEST] Add CursorIcon tests to GetObject test (#3955) Thanks to @Doug-Lyons for testing. CORE-17752 --- modules/rostests/apitests/gdi32/GetObject.c | 44 +++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/modules/rostests/apitests/gdi32/GetObject.c b/modules/rostests/apitests/gdi32/GetObject.c index 6cd0d1c8ac5..7af4132e0de 100644 --- a/modules/rostests/apitests/gdi32/GetObject.c +++ b/modules/rostests/apitests/gdi32/GetObject.c @@ -11,6 +11,27 @@ #define INVALID_POINTER ((PVOID)(ULONG_PTR)0xdeadbeefdeadbeefULL) +UCHAR src_mask[] = { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,255,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +}; + + void Test_General(void) { @@ -701,6 +722,28 @@ Test_Region(void) DeleteObject(hRgn); } +void Test_CursorIcon() +{ + BITMAP bmp; + HBITMAP hbmMask; + CURSORINFO CursorInfo; + + /* On XP sp3 GetObject reports a 32x32 bitmap. */ + hbmMask = CreateBitmap(32, 64, 1, 1, src_mask); + GetObjectW(hbmMask, sizeof(BITMAP), &bmp); + ok(bmp.bmWidth == (bmp.bmHeight / 2), "ERR UNICODE CursorIcon RECT got %ldx%ld\n", bmp.bmWidth, bmp.bmHeight); + ok(bmp.bmHeight == 64, "ERR UNICODE CursorIcon Height got %ld\n", bmp.bmHeight); + DeleteObject(hbmMask); + + CursorInfo.cbSize = sizeof(CURSORINFO); + GetCursorInfo(&CursorInfo); + ok(CursorInfo.hCursor != NULL, "Invalid HCURSOR Handler\n"); + ok(CursorInfo.flags != 0, "Mouse cursor is hidden\n"); + GetObject(CursorInfo.hCursor, sizeof(BITMAP), &bmp); + ok(bmp.bmWidth == bmp.bmHeight / 2, "ERR CursorIcon RECT got %ldx%ld\n", bmp.bmWidth, bmp.bmHeight); + ok(bmp.bmHeight == 64, "ERR CursorIcon Height got %ld\n", bmp.bmHeight); +} + START_TEST(GetObject) { @@ -716,5 +759,6 @@ START_TEST(GetObject) Test_ExtPen(); // not implemented yet in ROS Test_MetaDC(); Test_Region(); + Test_CursorIcon(); }

1 0

[reactos] 01/01: [NEWDEV] Fix Update Driver wizard dialog position (#4274)
by Jose Carlos Jesus 29 Apr '22

29 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b496432a8e84ccf54e44… commit 3b496432a8e84ccf54e448b24aad33fc752fe7a7 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Fri Apr 29 13:00:52 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 29 15:00:52 2022 +0300 [NEWDEV] Fix Update Driver wizard dialog position (#4274) The Update Driver wizard dialog was not completely visible. A part of the window was off the screen. As in Windows XP the dialog box is positioned slightly below and to the right of the parent window (Z-order). --- dll/win32/newdev/wizard.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dll/win32/newdev/wizard.c b/dll/win32/newdev/wizard.c index 533624607bb..28e3053356b 100644 --- a/dll/win32/newdev/wizard.c +++ b/dll/win32/newdev/wizard.c @@ -1,7 +1,7 @@ /* * New device installer (newdev.dll) * - * Copyright 2006 Herv� Poussineau (hpoussin(a)reactos.org) + * Copyright 2006 Hervé Poussineau (hpoussin(a)reactos.org) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -42,6 +42,13 @@ CenterWindow( GetWindowRect(hWndParent, &rcParent); GetWindowRect(hWnd, &rcWindow); + /* Check if the child window fits inside the parent window */ + if (rcWindow.left < rcParent.left || rcWindow.top < rcParent.top || + rcWindow.right > rcParent.right || rcWindow.bottom > rcParent.bottom) + { + return; + } + SetWindowPos( hWnd, HWND_TOP,

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