Ros-diffs April 2022

ros-diffs@reactos.org

22 participants
157 discussions

[reactos] 01/01: [WIN32SS] In PDEVOBJ_vRefreshModeList, do not change current stored mode

by Hervé Poussineau

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);

2 years, 7 months

[reactos] 01/01: [WIN32SS] Set DISPLAY_DEVICE_PRIMARY_DEVICE flag

by Hervé Poussineau

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; } }

2 years, 7 months

[reactos] 01/01: [DESK] Remove call to SetupDiRestartDevices()

by Hervé Poussineau

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;

2 years, 7 months

[reactos] 01/01: [SETUPAPI] Clarify what functions are exported starting with NT 5.2

by Stanislav Motylkov

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

2 years, 7 months

[reactos] 01/01: [CRT] Fix MinGW-arm intrin minor bug in _byteswap_ushort (#4475)

by Julen Urizar Compains

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)

2 years, 7 months

[reactos] 01/01: [ROSTESTS] Fix crash in winhttp:winhttp test (#4303)

by Doug Lyons

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; }

2 years, 7 months

[reactos] 01/01: [FREELDR:NTLDR] Add '\n' to debug logs (#4474)

by Serge Gautherie

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");

2 years, 7 months

[reactos] 01/01: [GDI32_APITEST] Add CursorIcon tests to GetObject test (#3955)

by Jose Carlos Jesus

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(); }

2 years, 7 months

[reactos] 01/01: [NEWDEV] Fix Update Driver wizard dialog position (#4274)

by Jose Carlos Jesus

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,

2 years, 7 months

[reactos] 01/01: [TRANSLATION] Improve Portuguese (pt-PT) translation (#4445)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f111d4a7035ea16fa0e21… commit f111d4a7035ea16fa0e219733c4b599f40428145 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Thu Apr 28 16:14:33 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 28 18:14:33 2022 +0300 [TRANSLATION] Improve Portuguese (pt-PT) translation (#4445) * [RAPPS][EXPLORER] Improve pt-PT translation * [BROWSEUI][COMCTL32][SHELL32] Improve pt-PT translation * [INPUT][INTL][POWERCFG] Improve pt-PT translation * [MAIN] Adjust object position to fit all text * [SYSSETUP][USERENV] Update pt-PT translation * [INF] Update pt-PT translation --- base/applications/rapps/lang/pt-PT.rc | 2 +- base/shell/explorer/lang/pt-PT.rc | 6 +++--- dll/cpl/input/lang/pt-PT.rc | 12 ++++++------ dll/cpl/intl/lang/pt-PT.rc | 8 ++++---- dll/cpl/main/lang/pt-PT.rc | 2 +- dll/cpl/powercfg/lang/pt-PT.rc | 2 +- dll/win32/browseui/lang/pt-PT.rc | 18 +++++++++--------- dll/win32/comctl32/lang/comctl_Pt.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 6 +++--- dll/win32/syssetup/lang/pt-PT.rc | 30 +++++++++++++++--------------- dll/win32/userenv/lang/pt-PT.rc | 6 +++--- media/inf/shortcuts.inf | 12 ++++++------ 12 files changed, 53 insertions(+), 53 deletions(-) diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index c7c0fbded2f..358ec0db154 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -111,7 +111,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Instalar" IDS_TOOLTIP_UNINSTALL "Desinstalar" IDS_TOOLTIP_MODIFY "Modificar" - IDS_TOOLTIP_SETTINGS "Configurações" + IDS_TOOLTIP_SETTINGS "Definições" IDS_TOOLTIP_REFRESH "Actualizar" IDS_TOOLTIP_UPDATE_DB "Actualizar Base de dados" IDS_TOOLTIP_EXIT "Sair" diff --git a/base/shell/explorer/lang/pt-PT.rc b/base/shell/explorer/lang/pt-PT.rc index 31c3877bbc0..94107915b1a 100644 --- a/base/shell/explorer/lang/pt-PT.rc +++ b/base/shell/explorer/lang/pt-PT.rc @@ -40,7 +40,7 @@ BEGIN BEGIN MENUITEM "(Vazio)", -1, MFT_STRING, MFS_GRAYED END - POPUP "&Configurações", IDM_SETTINGS + POPUP "D&efinições", IDM_SETTINGS BEGIN MENUITEM "&Painel de Controle", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED MENUITEM "", -1, MFT_SEPARATOR @@ -190,11 +190,11 @@ BEGIN IDS_PROPERTIES "P&ropriedades" IDS_OPEN_ALL_USERS "A&brir Todos os Utilizadores" IDS_EXPLORE_ALL_USERS "E&xplorar Todos os Utilizadores" - IDS_STARTUP_ERROR "O sistema não pode iniciar o explorer porque o registo está corrompido ou inacessível." + IDS_STARTUP_ERROR "O sistema não pode iniciar o Explorador porque o registo está corrompido ou inacessível." END STRINGTABLE BEGIN - IDS_TASKBAR_STARTMENU_PROP_CAPTION "da Barra de Tarefas e Menu Iniciar" + IDS_TASKBAR_STARTMENU_PROP_CAPTION "Barra de Tarefas e Menu Iniciar" IDS_RESTORE_ALL "&Mostrar janelas abertas" END diff --git a/dll/cpl/input/lang/pt-PT.rc b/dll/cpl/input/lang/pt-PT.rc index 49b531b69b2..01df2d6d4a6 100644 --- a/dll/cpl/input/lang/pt-PT.rc +++ b/dll/cpl/input/lang/pt-PT.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Configurações" +CAPTION "Definições" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Seleccione os serviços desejados para cada idioma de entrada mostrado na lista. Use os botões 'Adicionar' e 'Remover' para modificar a lista.", -1, 9, 6, 238, 25 @@ -12,17 +12,17 @@ BEGIN PUSHBUTTON "&Remover", IDC_REMOVE_BUTTON, 101, 142, 70, 14 PUSHBUTTON "&Propriedades...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "Preferências", -1, 7, 185, 240, 36 - PUSHBUTTON "&Configurações de tecla...", IDC_KEY_SET_BTN, 14, 198, 110, 14 + PUSHBUTTON "&Definições de tecla...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Configurações avançadas" +CAPTION "Definições avançadas" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Configurações de sistema", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Desabilitar serviços de texto avançado", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 - LTEXT "Marque esta caixa de selecção para desabilitar os serviços de texto avançado em todos os programas. Isto não é recomendado para utilizadores do Leste Asiático porque irá fechar a barra de idiomas.", -1, 14, 40, 230, 35 + GROUPBOX "Configuração do sistema", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Desactivar os serviços avançados de texto", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 + LTEXT "Seleccione esta caixa de verificação para desligar os serviços avançados de texto em todos os programas. Isto não é recomendado para utilizadores do Leste Asiático porque fecha a barra de idiomas.", -1, 14, 40, 230, 35 END IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 diff --git a/dll/cpl/intl/lang/pt-PT.rc b/dll/cpl/intl/lang/pt-PT.rc index f2a0f8ffc69..f57d9fe6f41 100644 --- a/dll/cpl/intl/lang/pt-PT.rc +++ b/dll/cpl/intl/lang/pt-PT.rc @@ -35,9 +35,9 @@ BEGIN LTEXT "Para ver ou modificar os idiomas ou métodos que pode utilizar para introduzir texto, clique em 'Detalhes'.", -1, 12, 15, 220, 18 PUSHBUTTON "&Detalhes...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Suporte a idiomas adicionais", -1, 5, 62, 234, 82 - LTEXT "A maioria dos idiomas são instalados por predefinição. Para instalar idiomas adicionais, seleccione abaixo, a caixa de verificação adequada.", -1, 12, 72, 220, 18 - AUTOCHECKBOX "I&nstalar arquivos para idiomas de escrita complexa e da direita para a esquerda", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP - AUTOCHECKBOX "In&stalar arquivos para idiomas do Leste Asiático", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP + LTEXT "A maioria dos idiomas são instalados por predefinição. Para instalar idiomas adicionais, seleccione abaixo, a caixa de verificação adequada.", -1, 12, 72, 225, 18 + AUTOCHECKBOX "I&nstalar ficheiros para idiomas de escrita complexa e da direita para a esquerda", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + AUTOCHECKBOX "In&stalar ficheiros para idiomas do Leste Asiático", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -48,7 +48,7 @@ BEGIN GROUPBOX "Idioma para programas não-Unicode", -1, 5, 5, 234, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Esta definição de sistema permite aos programas não-Unicode apresentar menus e diálogos no seu idioma de origem. Não afecta os programas Unicode, mas se aplica a todos os utilizadores deste computador.", -1, 14, 18, 223, 33 - LTEXT "&Seleccione um idioma que corresponda à versão dos programas traduzidos não-Unicode que deseja usar:", -1, 14, 55, 223, 18 + LTEXT "&Seleccione um idioma que corresponda à versão dos programas traduzidos não-Unicode que deseja utilizar:", -1, 14, 55, 223, 18 GROUPBOX "&Tabelas de conversão de páginas de código", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Predefinições de conta de utilizador", -1, 5, 193, 234, 32 diff --git a/dll/cpl/main/lang/pt-PT.rc b/dll/cpl/main/lang/pt-PT.rc index 42c8b3cfe4a..378a43a1ad1 100644 --- a/dll/cpl/main/lang/pt-PT.rc +++ b/dll/cpl/main/lang/pt-PT.rc @@ -20,7 +20,7 @@ BEGIN EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 116, 216, 14, WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Velocidade de intermitência do cursor:", -1, 5, 145, 236, 50 LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 - LTEXT "Nenhuma", -1, 40, 165, 25, 10 + LTEXT "Nenhuma", -1, 35, 165, 30, 10 LTEXT "Alta", -1, 200, 165, 30, 10 CONTROL "", IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17 END diff --git a/dll/cpl/powercfg/lang/pt-PT.rc b/dll/cpl/powercfg/lang/pt-PT.rc index c35323abba9..5a65f5d1977 100644 --- a/dll/cpl/powercfg/lang/pt-PT.rc +++ b/dll/cpl/powercfg/lang/pt-PT.rc @@ -136,7 +136,7 @@ END STRINGTABLE BEGIN - IDS_CPLNAME_1 "de Opções de energia" + IDS_CPLNAME_1 "Opções de energia" IDS_CPLDESCRIPTION_1 "Defina as configurações de poupança de energia para o seu computador." IDS_PERCENT "%i%%" IDS_SOUND "Som" diff --git a/dll/win32/browseui/lang/pt-PT.rc b/dll/win32/browseui/lang/pt-PT.rc index e74a36e457c..1995124629f 100644 --- a/dll/win32/browseui/lang/pt-PT.rc +++ b/dll/win32/browseui/lang/pt-PT.rc @@ -21,7 +21,7 @@ END IDM_CABINET_MAINMENU MENUEX BEGIN - POPUP "&Arquivo", FCIDM_MENU_FILE + POPUP "F&icheiro", FCIDM_MENU_FILE BEGIN MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Fechar", IDM_FILE_CLOSE @@ -30,14 +30,14 @@ BEGIN BEGIN MENUITEM "", -1, MFT_SEPARATOR END - POPUP "E&xibir", FCIDM_MENU_VIEW + POPUP "&Mostrar", FCIDM_MENU_VIEW BEGIN POPUP "&Barras de ferramentas", IDM_VIEW_TOOLBARS BEGIN MENUITEM "", -1, MFT_SEPARATOR END - MENUITEM "Barra de &status", IDM_VIEW_STATUSBAR - POPUP "Barra do E&xplorer", IDM_VIEW_EXPLORERBAR + MENUITEM "Barra de &estado", IDM_VIEW_STATUSBAR + POPUP "Barra do E&xplorador", IDM_VIEW_EXPLORERBAR BEGIN MENUITEM "&Pesquisa\tCtrl+E", IDM_EXPLORERBAR_SEARCH MENUITEM "&Favoritos\tCtrl+I", IDM_EXPLORERBAR_FAVORITES @@ -105,7 +105,7 @@ BEGIN MENUITEM "Icones &pequenos", IDM_SMALL_ICONS END MENUITEM "&Abrir pasta", IDM_OPEN_FOLDER - MENUITEM "&Exibir texto", IDM_SHOW_TEXT + MENUITEM "&Mostrar texto", IDM_SHOW_TEXT END END @@ -233,7 +233,7 @@ STRINGTABLE BEGIN 9281 "Volta à página anterior." 9282 "Vai para a próxima página." - 9283 "Permite que você altere as configurações." + 9283 "Permite alterar as configurações." 9285 "Vai para a sua página inicial." END @@ -305,7 +305,7 @@ END STRINGTABLE BEGIN - IDS_UP "Acima" + IDS_UP "Nível acima" END STRINGTABLE @@ -317,7 +317,7 @@ END STRINGTABLE BEGIN - IDS_STANDARD_TOOLBAR, "|Voltar|Avançar|Acima|Pesquisar|Pastas|Mover para|Copiar para|Excluir|Desfazer|Modos de exibição|Parar|Actualizar|Página inicial|Mapear unidade|Desconectar|Favoritos|Histórico|Tela inteira|Propriedades|Recortar|Copiar|Colar|Opções de pasta||" + IDS_STANDARD_TOOLBAR, "|Voltar|Avançar|Acima|Pesquisar|Pastas|Mover para|Copiar para|Excluir|Desfazer|Modos de exibição|Parar|Actualizar|Página inicial|Mapear unidade|Desconectar|Favoritos|Histórico|Ecrã inteiro|Propriedades|Recortar|Copiar|Colar|Opções de pasta||" END STRINGTABLE @@ -342,5 +342,5 @@ END STRINGTABLE BEGIN IDS_PARSE_ADDR_ERR_TITLE "Explorador do ReactOS" - IDS_PARSE_ADDR_ERR_TEXT "O explorador do ReactOS não encontrou '%1'. Verifique a ortografia e tente novamente." + IDS_PARSE_ADDR_ERR_TEXT "O Explorador do ReactOS não encontrou '%1'. Verifique a ortografia e tente novamente." END diff --git a/dll/win32/comctl32/lang/comctl_Pt.rc b/dll/win32/comctl32/lang/comctl_Pt.rc index 26ab202ab04..8033006f671 100644 --- a/dll/win32/comctl32/lang/comctl_Pt.rc +++ b/dll/win32/comctl32/lang/comctl_Pt.rc @@ -54,7 +54,7 @@ STRINGTABLE IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriedades para %s" +CAPTION "Propriedades de %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 418ac9ce86a..54a2e0083ca 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -863,9 +863,9 @@ BEGIN IDS_DESKTOPDIRECTORY "Ambiente de Trabalho" IDS_NETHOOD "Vizinhança na rede" IDS_TEMPLATES "Modelos" - IDS_APPDATA "Dados de Aplicação" + IDS_APPDATA "Dados de Programas" IDS_PRINTHOOD "PrintHood" - IDS_LOCAL_APPDATA "Definições locais\\Dados de Aplicação" + IDS_LOCAL_APPDATA "Definições locais\\Dados de Programas" IDS_INTERNET_CACHE "Definições locais\\Ficheiros Temporários da Internet" IDS_COOKIES "Cookies" IDS_HISTORY "Definições locais\\Histórico" @@ -877,7 +877,7 @@ BEGIN IDS_COMMON_MUSIC "Os Meus Documentos\\As Minhas Músicas" IDS_COMMON_PICTURES "Os Meus Documentos\\As Minhas Imagens" IDS_COMMON_VIDEO "Os Meus Documentos\\Os Meus Vídeos" - IDS_CDBURN_AREA "Definições locais\\Dados de Aplicação\\Microsoft\\CD Burning" + IDS_CDBURN_AREA "Definições locais\\Dados de Programas\\Microsoft\\CD Burning" IDS_NETWORKPLACE "Os Meus Locais da Rede" IDS_NEWFOLDER "Nova Pasta" diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index bc93c59c3a0..9f26c6beeef 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -112,9 +112,9 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "A registar componentes", IDC_TASKTEXT1, 65, 27, 232, 8 - LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 - LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "A instalar itens do menu iniciar", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Guardando as configurações", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "A remover ficheiros temporários", IDC_TASKTEXT4, 65, 63, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END @@ -159,12 +159,12 @@ BEGIN LTEXT "Relatórios por segundo", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL RTEXT "&Detecção da roda:", -1, 27, 55, 90, 8 - COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 120, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL RTEXT "&Tamanho da memória intermédia:", -1, 27, 75, 90, 8 LTEXT "pacotes", -1, 169, 75, 26, 8 EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 - AUTOCHECKBOX "&Inicialização rápida", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + AUTOCHECKBOX "&Iniciação rápida", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 PUSHBUTTON "&Predefinições", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 END @@ -172,8 +172,8 @@ STRINGTABLE BEGIN IDS_ACKTITLE "Agradecimentos" IDS_ACKSUBTITLE "Os ombros nos quais o ReactOS se apoia e informações de licença" - IDS_OWNERTITLE "Personalize seu Software" - IDS_OWNERSUBTITLE "A Instalação utiliza esta informação para personalizar o ReactOS." + IDS_OWNERTITLE "Personalize o seu Software" + IDS_OWNERSUBTITLE "A Instalação utiliza estas informações para personalizar o ReactOS." IDS_COMPUTERTITLE "Nome do computador e palavra-passe do administrador" IDS_COMPUTERSUBTITLE "Deve fornecer um nome e palavra-passe de administrador para o seu computador." IDS_LOCALETITLE "Configurações Regionais" @@ -182,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "O método e idioma de entrada de texto padrão é: Estilo de teclado %s" IDS_DATETIMETITLE "Data e Hora" IDS_DATETIMESUBTITLE "Definir a data e a hora correctas para o seu computador." - IDS_PROCESSTITLE "Finishing the Installation" - IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." + IDS_PROCESSTITLE "Finalizando a instalação." + IDS_PROCESSSUBTITLE "Aguarde enquanto a Instalação conclui as etapas finais." IDS_THEMESELECTIONTITLE "Aparência" IDS_THEMESELECTIONSUBTITLE "Seleccione o tema perferido." END @@ -227,15 +227,15 @@ END /* ATTENTION: Synchronize these strings with dll/win32/shell32/lang */ STRINGTABLE BEGIN - IDS_PROGRAMFILES "%SystemDrive%\\Arquivos de programas" - IDS_COMMONFILES "Arquivos comuns" + IDS_PROGRAMFILES "%SystemDrive%\\Ficheiros de programas" + IDS_COMMONFILES "Ficheiros comuns" END STRINGTABLE BEGIN IDS_DETECTIONDISABLED "Detecção desabilitada" - IDS_LOOKFORWHEEL "A detectar o roda do rato" - IDS_ASSUMEPRESENT "Assume roda está presente" + IDS_LOOKFORWHEEL "Detectar a roda do rato" + IDS_ASSUMEPRESENT "Assumir que roda está presente" END STRINGTABLE @@ -252,7 +252,7 @@ BEGIN IDS_PRODUCTSUBTITLE "Pode escolher uma opção de produto que afecta o comportamento do sistema." IDS_PRODUCTSERVERNAME "Servidor ReactOS" IDS_PRODUCTWORKSTATIONNAME "Estação de trabalho ReactOS" - IDS_PRODUCTSERVERINFO "O sistema será reconhecido como um servidor. As pastas privadas ""Minhas imagens"", ""Meus vídeos"" e ""Minhas músicas"" são independentes de ""Meus documentos""." - IDS_PRODUCTWORKSTATIONINFO "O sistema será reconhecido como uma estação de trabalho. As pastas privadas ""Minhas imagens"", ""Meus vídeos"" e ""Minhas músicas"" estão em ""Meus documentos""." + IDS_PRODUCTSERVERINFO "O sistema será reconhecido como um servidor. As pastas privadas ""Minhas imagens"", ""Meus vídeos"" e ""Minhas músicas"" serão independentes de ""Meus documentos""." + IDS_PRODUCTWORKSTATIONINFO "O sistema será reconhecido como uma estação de trabalho. As pastas privadas ""Minhas imagens"", ""Meus vídeos"" e ""Minhas músicas"" ficarão em ""Meus documentos""." IDS_DEFAULT "(Padrão)" END diff --git a/dll/win32/userenv/lang/pt-PT.rc b/dll/win32/userenv/lang/pt-PT.rc index ad502cd6b07..c8e5842ee3e 100644 --- a/dll/win32/userenv/lang/pt-PT.rc +++ b/dll/win32/userenv/lang/pt-PT.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documentos e definições" - IDS_APPDATA "Dados de aplicativos" + IDS_APPDATA "Dados de Programas" IDS_DESKTOP "Ambiente de trabalho" IDS_FAVORITES "Favoritos" IDS_MYDOCUMENTS "Meus Documentos" @@ -17,9 +17,9 @@ BEGIN IDS_PROGRAMS "Menu Iniciar\\Programas" IDS_STARTUP "Menu Iniciar\\Programas\\Inicializar" IDS_LOCALSETTINGS "Configurações locais" - IDS_LOCALAPPDATA "Configurações locais\\Dados de aplicativos" + IDS_LOCALAPPDATA "Configurações locais\\Dados de Programas" IDS_TEMP "Configurações locais\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ - IDS_CACHE "Configurações locais\\Temporary Internet Files" + IDS_CACHE "Configurações locais\\Ficheiros temporários da Internet" IDS_HISTORY "Configurações locais\\Histórico" IDS_COOKIES "Cookies" END diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index e8769425c18..c374cdfd2bd 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -1276,9 +1276,9 @@ WORDPAD_TITLE=WordPad WORDPAD_DESC=Iniciar Editor de Documentos de texto MSPAINT_TITLE=Paint MSPAINT_DESC=Iniciar Paint -CHARMAP_TITLE=Character Map +CHARMAP_TITLE=Mapa de Caracteres CHARMAP_DESC=Mapa de Caracteres -CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_TITLE=Visualizador da área de transferência CLIPBRD_DESC=Visualizador da área de transferência KBSWITCH_TITLE=Alterar Estilo do Teclado KBSWITCH_DESC=Alterar Estilo do Teclado @@ -1288,15 +1288,15 @@ DXDIAG_TITLE=Diagnóstico ReactX DXDIAG_DESC=Iniciar Diagnóstico ReactX MAGNIFY_TITLE=Lupa MAGNIFY_DESC=Ampliar -OSK_TITLE=Em Tela Teclado -OSK_DESC=Lançamento em Tela Teclado +OSK_TITLE=Teclado no ecrã +OSK_DESC=Iniciar Teclado no ecrã MPLAY_TITLE=Multimedia Player -MPLAY_DESC=Iniciar Player Multimídia +MPLAY_DESC=Iniciar Multimedia Player SNDVOL_TITLE=Control de Volume SNDVOL_DESC=Iniciar Controle de Volume SNDREC32_TITLE=Gravador de Som SNDREC32_DESC=Iniciar Gravador de Som -SOL_TITLE=Solitaire +SOL_TITLE=Solitário SOL_DESC=Paciência WINMINE_TITLE=WineMine WINMINE_DESC=WineMine

2 years, 8 months

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 2022