Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/16: [FREELDR] Fix 64 bit issues
by Timo Kreuzer 04 Aug '18

04 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6dcf3c29e0ef73c138bd7… commit 6dcf3c29e0ef73c138bd7e3455ca635d613acc48 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Feb 6 01:17:11 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 4 19:19:34 2018 +0200 [FREELDR] Fix 64 bit issues --- boot/freeldr/freeldr/arch/i386/machpc.c | 2 +- boot/freeldr/freeldr/disk/partition.c | 5 +++-- boot/freeldr/freeldr/include/mm.h | 3 ++- boot/freeldr/freeldr/lib/debug.c | 14 ++++++++++---- boot/freeldr/freeldr/lib/fs/pxe.c | 14 +++++++------- boot/freeldr/freeldr/ntldr/registry.c | 2 +- 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/machpc.c index 64b6a43a86..527b944dee 100644 --- a/boot/freeldr/freeldr/arch/i386/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/machpc.c @@ -643,7 +643,7 @@ DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey) for (i = 0; i < MAX_COM_PORTS; i++, BasePtr++) { Base = (ULONG) * BasePtr; - if (Base == 0 || !CpDoesPortExist((PUCHAR)Base)) + if ((Base == 0) || !CpDoesPortExist(UlongToPtr(Base))) continue; TRACE("Found COM%u port at 0x%x\n", i + 1, Base); diff --git a/boot/freeldr/freeldr/disk/partition.c b/boot/freeldr/freeldr/disk/partition.c index df2d1a7055..1feaf5105c 100644 --- a/boot/freeldr/freeldr/disk/partition.c +++ b/boot/freeldr/freeldr/disk/partition.c @@ -253,6 +253,7 @@ BOOLEAN DiskReadBootRecord(UCHAR DriveNumber, ULONGLONG LogicalSectorNumber, PMA return TRUE; } +#ifndef _M_AMD64 NTSTATUS NTAPI IopReadBootRecord( @@ -261,7 +262,7 @@ IopReadBootRecord( IN ULONG SectorSize, OUT PMASTER_BOOT_RECORD BootRecord) { - ULONG FileId = (ULONG)DeviceObject; + ULONG_PTR FileId = (ULONG_PTR)DeviceObject; LARGE_INTEGER Position; ULONG BytesRead; ARC_STATUS Status; @@ -399,5 +400,5 @@ IoReadPartitionTable( *PartitionBuffer = Partitions; return STATUS_SUCCESS; } - +#endif // _M_AMD64 #endif diff --git a/boot/freeldr/freeldr/include/mm.h b/boot/freeldr/freeldr/include/mm.h index d9ada754cb..d29fe6087f 100644 --- a/boot/freeldr/freeldr/include/mm.h +++ b/boot/freeldr/freeldr/include/mm.h @@ -176,7 +176,8 @@ FrLdrHeapFree(PVOID MemoryPointer, ULONG Tag) FORCEINLINE PVOID FrLdrTempAlloc( - ULONG Size, ULONG Tag) + _In_ SIZE_T Size, + _In_ ULONG Tag) { return FrLdrHeapAllocateEx(FrLdrTempHeap, Size, Tag); } diff --git a/boot/freeldr/freeldr/lib/debug.c b/boot/freeldr/freeldr/lib/debug.c index a0520a99be..d2143ad599 100644 --- a/boot/freeldr/freeldr/lib/debug.c +++ b/boot/freeldr/freeldr/lib/debug.c @@ -454,7 +454,7 @@ MsgBoxPrint(const char *Format, ...) return 0; } -// DECLSPEC_NORETURN +DECLSPEC_NORETURN VOID NTAPI KeBugCheckEx( @@ -465,9 +465,15 @@ KeBugCheckEx( IN ULONG_PTR BugCheckParameter4) { char Buffer[70]; - sprintf(Buffer, "*** STOP: 0x%08lX (0x%08lX, 0x%08lX, 0x%08lX, 0x%08lX)", - BugCheckCode, BugCheckParameter1, BugCheckParameter2, - BugCheckParameter3, BugCheckParameter4); + + sprintf(Buffer, + "*** STOP: 0x%08lX (0x%p,0x%p,0x%p,0x%p)", + BugCheckCode, + (PVOID)BugCheckParameter1, + (PVOID)BugCheckParameter2, + (PVOID)BugCheckParameter3, + (PVOID)BugCheckParameter4); + UiMessageBoxCritical(Buffer); ASSERT(FALSE); for (;;); diff --git a/boot/freeldr/freeldr/lib/fs/pxe.c b/boot/freeldr/freeldr/lib/fs/pxe.c index ea91710a4f..71f7e37bdd 100644 --- a/boot/freeldr/freeldr/lib/fs/pxe.c +++ b/boot/freeldr/freeldr/lib/fs/pxe.c @@ -45,9 +45,9 @@ FindPxeStructure(VOID) /* Find the '!PXE' structure */ Ptr = (PPXE)0xA0000; - while ((ULONG)Ptr > 0x10000) + while ((ULONG_PTR)Ptr > 0x10000) { - Ptr = (PPXE)((ULONG)Ptr - 0x10); + Ptr = (PPXE)((ULONG_PTR)Ptr - 0x10); /* Look for signature */ if (memcmp(Ptr, "!PXE", 4) != 0) @@ -224,8 +224,8 @@ static ARC_STATUS PxeRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) return EBADF; RtlZeroMemory(&readData, sizeof(readData)); - readData.Buffer.segment = ((UINT32)_Packet & 0xf0000) / 16; - readData.Buffer.offset = (UINT32)_Packet & 0xffff; + readData.Buffer.segment = ((ULONG_PTR)_Packet & 0xf0000) / 16; + readData.Buffer.offset = (ULONG_PTR)_Packet & 0xffff; // Get new packets as required while (N > 0) @@ -276,8 +276,8 @@ static ARC_STATUS PxeSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMo } RtlZeroMemory(&readData, sizeof(readData)); - readData.Buffer.segment = ((UINT32)_Packet & 0xf0000) / 16; - readData.Buffer.offset = (UINT32)_Packet & 0xffff; + readData.Buffer.segment = ((ULONG_PTR)_Packet & 0xf0000) / 16; + readData.Buffer.offset = (ULONG_PTR)_Packet & 0xffff; // Get new packets as required while (Position->LowPart > _CachedLength) @@ -363,7 +363,7 @@ static BOOLEAN GetCachedInfo(VOID) return FALSE; if (Data.BufferSize < 36) return FALSE; - Packet = (UCHAR*)((UINT32)(Data.Buffer.segment << 4) + Data.Buffer.offset); + Packet = (UCHAR*)((ULONG_PTR)(Data.Buffer.segment << 4) + Data.Buffer.offset); RtlCopyMemory(&_ServerIP, Packet + 20, sizeof(IP4)); return TRUE; } diff --git a/boot/freeldr/freeldr/ntldr/registry.c b/boot/freeldr/freeldr/ntldr/registry.c index 0c84127a14..6b826bc23c 100644 --- a/boot/freeldr/freeldr/ntldr/registry.c +++ b/boot/freeldr/freeldr/ntldr/registry.c @@ -204,7 +204,7 @@ GetNextPathElement( RemainingPath->Length -= sizeof(WCHAR); } - NextElement->Length = (RemainingPath->Buffer - NextElement->Buffer) * sizeof(WCHAR); + NextElement->Length = (USHORT)(RemainingPath->Buffer - NextElement->Buffer) * sizeof(WCHAR); NextElement->MaximumLength = NextElement->Length; /* Check if the path element ended with a path separator */

1 0

02/02: [ROSTESTS] Fix 64 bit issues
by Timo Kreuzer 04 Aug '18

04 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7cf7b27a3a989d8c4f65e… commit 7cf7b27a3a989d8c4f65eaa1b1a11b3e9b59f3ab Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 14 12:32:57 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 4 14:39:13 2018 +0200 [ROSTESTS] Fix 64 bit issues --- .../rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c | 8 +++---- .../apitests/advapi32/LockServiceDatabase.c | 4 ++-- modules/rostests/apitests/appshim/genral_hooks.c | 2 +- modules/rostests/apitests/appshim/layer_hooks.c | 2 +- .../apitests/browseui/SHExplorerParseCmdLine.c | 8 +++---- modules/rostests/apitests/uxtheme/CloseThemeData.c | 2 +- .../apitests/uxtheme/DrawThemeParentBackground.c | 10 ++++----- modules/rostests/apitests/uxtheme/SetWindowTheme.c | 2 +- modules/rostests/apitests/wlanapi/wlanapi.c | 2 +- modules/rostests/apitests/ws2_32/WSARecv.c | 2 +- modules/rostests/winetests/advpack/install.c | 20 +++++++++++++++++ modules/rostests/winetests/dplayx/dplayx.c | 26 ++++++++++++++++++++++ 12 files changed, 67 insertions(+), 21 deletions(-) diff --git a/modules/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c b/modules/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c index cec975f5b0..818a8b7500 100644 --- a/modules/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c +++ b/modules/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c @@ -144,7 +144,7 @@ Test_CreateOpenKey(void) ok_key_name(ClassesRootKey, &HKLM_ClassesPath, L"Apitest_HKLM"); /* Try opening it in HKCU */ - UserKey = (HKEY)0xCAFEF00D; + UserKey = (HKEY)(ULONG_PTR)0xCAFEF00DCAFEF00DULL; ErrorCode = RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\\Classes\\Apitest_HKLM", @@ -186,7 +186,7 @@ Test_CreateOpenKey(void) ok(!IS_HKCR(MachineKey), "\n"); /* But not in HKCU */ - UserKey = (HKEY)0xCAFEF00D; + UserKey = (HKEY)(ULONG_PTR)0xCAFEF00DCAFEF00DULL; ErrorCode = RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\\Classes\\Apitest_HKCR", @@ -205,7 +205,7 @@ Test_CreateOpenKey(void) RegCloseKey(MachineKey); /* Test that it is really not present anymore */ - MachineKey = (HKEY)0xCAFEF00D; + MachineKey = (HKEY)(ULONG_PTR)0xCAFEF00DCAFEF00DULL; ErrorCode = RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Classes\\Apitest_HKCR", @@ -258,7 +258,7 @@ Test_CreateOpenKey(void) RegCloseKey(UserKey); /* Test that it is really not present anymore */ - UserKey = (HKEY)0xCAFEF00D; + UserKey = (HKEY)(ULONG_PTR)0xCAFEF00DCAFEF00DULL; ErrorCode = RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\\Classes\\Apitest_HKCU", diff --git a/modules/rostests/apitests/advapi32/LockServiceDatabase.c b/modules/rostests/apitests/advapi32/LockServiceDatabase.c index d52610a030..a567315771 100644 --- a/modules/rostests/apitests/advapi32/LockServiceDatabase.c +++ b/modules/rostests/apitests/advapi32/LockServiceDatabase.c @@ -24,7 +24,7 @@ static void Test_LockUnlockServiceDatabase(void) ok_err(ERROR_INVALID_HANDLE); SetLastError(0xdeadbeef); - hScm = (SC_HANDLE)0xdeadbeef; + hScm = (SC_HANDLE)(ULONG_PTR)0xdeadbeefdeadbeefull; hLock = LockServiceDatabase(hScm); ok(hLock == NULL, "hLock = 0x%p, expected 0\n", hLock); ok_err(ERROR_INVALID_HANDLE); @@ -38,7 +38,7 @@ static void Test_LockUnlockServiceDatabase(void) /*****************************************************************************************/ SetLastError(0xdeadbeef); - hLock = (SC_LOCK)0xdeadbeef; + hLock = (SC_LOCK)(ULONG_PTR)0xdeadbeefdeadbeefull; bError = UnlockServiceDatabase(hLock); ok(bError == FALSE, "bError = %u, expected FALSE\n", bError); ok_err(ERROR_INVALID_SERVICE_LOCK); diff --git a/modules/rostests/apitests/appshim/genral_hooks.c b/modules/rostests/apitests/appshim/genral_hooks.c index 72680c75a8..2e9887c64b 100644 --- a/modules/rostests/apitests/appshim/genral_hooks.c +++ b/modules/rostests/apitests/appshim/genral_hooks.c @@ -71,7 +71,7 @@ static const char* safe_str(const char* ptr) return ptr; index ^= 1; - StringCchPrintfA(buffer[index], _countof(buffer[index]), "#%d", (int)ptr); + StringCchPrintfA(buffer[index], _countof(buffer[index]), "#%Id", (intptr_t)ptr); return buffer[index]; } diff --git a/modules/rostests/apitests/appshim/layer_hooks.c b/modules/rostests/apitests/appshim/layer_hooks.c index e47d9aad29..e1568629bf 100644 --- a/modules/rostests/apitests/appshim/layer_hooks.c +++ b/modules/rostests/apitests/appshim/layer_hooks.c @@ -61,7 +61,7 @@ static const char* safe_str(const char* ptr) return ptr; index ^= 1; - StringCchPrintfA(buffer[index], _countof(buffer[index]), "#%d", (int)ptr); + StringCchPrintfA(buffer[index], _countof(buffer[index]), "#%Id", (intptr_t)ptr); return buffer[index]; } diff --git a/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c b/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c index bc9023a08e..c01eba1a5d 100644 --- a/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c +++ b/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c @@ -35,7 +35,7 @@ typedef struct _EXPLORER_INFO ULONG Padding[PADDING_SIZE]; } EXPLORER_INFO, *PEXPLORER_INFO; -UINT (WINAPI *SHExplorerParseCmdLine)(_Out_ PEXPLORER_INFO Info); +UINT_PTR (WINAPI *SHExplorerParseCmdLine)(_Out_ PEXPLORER_INFO Info); #define PIDL_IS_UNTOUCHED -1 #define PIDL_IS_NULL -2 @@ -87,7 +87,7 @@ _In_ PCWSTR PidlPath, _Out_opt_ PUINT PWriteEnd) { EXPLORER_INFO Info; - UINT Ret; + UINT_PTR Ret; ULONG i; PDWORD InfoWords = (PDWORD) &Info; @@ -99,7 +99,7 @@ _Out_opt_ PUINT PWriteEnd) if (ExpectedRet == -1) ok((LPITEMIDLIST) Ret == Info.pidl, "Ret = %x, expected %p\n", Ret, Info.pidl); else - ok(Ret == ExpectedRet, "Ret = %x, expected %p\n", Ret, (PVOID) ExpectedRet); + ok(Ret == ExpectedRet, "Ret = %x, expected %08x\n", Ret, ExpectedRet); if (ExpectedFileName == NULL) ok(Info.FileName == InvalidPointer, "FileName = %p\n", Info.FileName); @@ -410,7 +410,7 @@ START_TEST(SHExplorerParseCmdLine) WCHAR winDir[MAX_PATH]; HMODULE browseui = LoadLibraryA("browseui.dll"); - SHExplorerParseCmdLine = (UINT (__stdcall *)(PEXPLORER_INFO))GetProcAddress(browseui, MAKEINTRESOURCEA(107)); + SHExplorerParseCmdLine = (UINT_PTR (__stdcall *)(PEXPLORER_INFO))GetProcAddress(browseui, MAKEINTRESOURCEA(107)); if (!SHExplorerParseCmdLine) { skip("SHExplorerParseCmdLine not found, NT 6.0?\n"); diff --git a/modules/rostests/apitests/uxtheme/CloseThemeData.c b/modules/rostests/apitests/uxtheme/CloseThemeData.c index 367525b129..4811cd6801 100644 --- a/modules/rostests/apitests/uxtheme/CloseThemeData.c +++ b/modules/rostests/apitests/uxtheme/CloseThemeData.c @@ -23,7 +23,7 @@ START_TEST(CloseThemeData) pVEH = AddVectoredExceptionHandler(1, VEHandler); - hr = CloseThemeData((HTHEME)0xdeaddead); + hr = CloseThemeData((HTHEME)(ULONG_PTR)0xdeaddeaddeaddeadULL); ok( hr == E_HANDLE, "Expected E_HANDLE, got 0x%lx\n", hr); RemoveVectoredExceptionHandler(pVEH); diff --git a/modules/rostests/apitests/uxtheme/DrawThemeParentBackground.c b/modules/rostests/apitests/uxtheme/DrawThemeParentBackground.c index 28abdb8d97..aef329fafe 100644 --- a/modules/rostests/apitests/uxtheme/DrawThemeParentBackground.c +++ b/modules/rostests/apitests/uxtheme/DrawThemeParentBackground.c @@ -138,13 +138,13 @@ void Test_Params() hr = DrawThemeParentBackground(NULL, NULL, NULL); ok (hr == E_HANDLE, "Expected E_HANDLE got 0x%lx error\n", hr); - hr = DrawThemeParentBackground((HWND)0xdeaddead, NULL, NULL); + hr = DrawThemeParentBackground((HWND)(ULONG_PTR)0xdeaddeaddeaddeadULL, NULL, NULL); ok (hr == E_HANDLE, "Expected E_HANDLE got 0x%lx error\n", hr); - hr = DrawThemeParentBackground(NULL, (HDC)0xdeaddead, NULL); + hr = DrawThemeParentBackground(NULL, (HDC)(ULONG_PTR)0xdeaddeaddeaddeadULL, NULL); ok (hr == E_HANDLE, "Expected E_HANDLE got 0x%lx error\n", hr); - hr = DrawThemeParentBackground((HWND)0xdeaddead, (HDC)0xdeaddead, NULL); + hr = DrawThemeParentBackground((HWND)(ULONG_PTR)0xdeaddeaddeaddeadULL, (HDC)(ULONG_PTR)0xdeaddeaddeaddeadULL, NULL); ok (hr == E_HANDLE, "Expected E_HANDLE got 0x%lx error\n", hr); RemoveVectoredExceptionHandler(pVEH); @@ -173,11 +173,11 @@ void Test_Params() hr = DrawThemeParentBackground(hWnd1, hdc, NULL); ok (hr == S_OK, "Expected success got 0x%lx error\n", hr); - hr = DrawThemeParentBackground(hWnd1, (HDC)0xdeaddead, NULL); + hr = DrawThemeParentBackground(hWnd1, (HDC)(ULONG_PTR)0xdeaddeaddeaddeadULL, NULL); ok (hr == S_OK, "Expected success got 0x%lx error\n", hr); pVEH = AddVectoredExceptionHandler(1, VEHandler_2); - hr = DrawThemeParentBackground(hWnd1, hdc, (RECT*)0xdeaddead); + hr = DrawThemeParentBackground(hWnd1, hdc, (RECT*)(ULONG_PTR)0xdeaddeaddeaddeadULL); ok (hr == E_POINTER, "Expected success got 0x%lx error\n", hr); RemoveVectoredExceptionHandler(pVEH); ok (bGotException == TRUE, "Excepted a handled exception\n"); diff --git a/modules/rostests/apitests/uxtheme/SetWindowTheme.c b/modules/rostests/apitests/uxtheme/SetWindowTheme.c index f429a0bed1..6adf17c0f0 100644 --- a/modules/rostests/apitests/uxtheme/SetWindowTheme.c +++ b/modules/rostests/apitests/uxtheme/SetWindowTheme.c @@ -17,7 +17,7 @@ void TestParams(HWND hwnd) hr = SetWindowTheme(0, NULL, NULL); ok (hr == E_HANDLE, "Expected E_HANDLE got 0x%lx error\n", hr); - hr = SetWindowTheme((HWND)0xdeaddead, NULL, NULL); + hr = SetWindowTheme((HWND)(ULONG_PTR)0xdeaddeaddeaddeadULL, NULL, NULL); ok (hr == E_HANDLE, "Expected E_HANDLE got 0x%lx error\n", hr); hr = SetWindowTheme(hwnd, NULL, NULL); diff --git a/modules/rostests/apitests/wlanapi/wlanapi.c b/modules/rostests/apitests/wlanapi/wlanapi.c index 3d8f1382f1..e9ea3f0046 100644 --- a/modules/rostests/apitests/wlanapi/wlanapi.c +++ b/modules/rostests/apitests/wlanapi/wlanapi.c @@ -56,7 +56,7 @@ static void WlanOpenHandle_test(void) static void WlanCloseHandle_test(void) { DWORD ret; - HANDLE hClientHandle = (HANDLE) 0xdeadbeef; + HANDLE hClientHandle = (HANDLE)(ULONG_PTR)0xdeadbeefdeadbeef; /* invalid pReserved */ ret = WlanCloseHandle(hClientHandle, (PVOID) 1); diff --git a/modules/rostests/apitests/ws2_32/WSARecv.c b/modules/rostests/apitests/ws2_32/WSARecv.c index 4a076b2f96..89f500f706 100644 --- a/modules/rostests/apitests/ws2_32/WSARecv.c +++ b/modules/rostests/apitests/ws2_32/WSARecv.c @@ -27,7 +27,7 @@ CALLBACK completion( ok(lpOverlapped != NULL, "lpOverlapped %p\n", lpOverlapped); if (lpOverlapped) { - ok(lpOverlapped->hEvent != INVALID_HANDLE_VALUE, "lpOverlapped->hEvent %d\n", (int)lpOverlapped->hEvent); + ok(lpOverlapped->hEvent != INVALID_HANDLE_VALUE, "lpOverlapped->hEvent %p\n", lpOverlapped->hEvent); if (lpOverlapped->hEvent != INVALID_HANDLE_VALUE) WSASetEvent(lpOverlapped->hEvent); } diff --git a/modules/rostests/winetests/advpack/install.c b/modules/rostests/winetests/advpack/install.c index 16593d1c5e..5aa5888fd3 100644 --- a/modules/rostests/winetests/advpack/install.c +++ b/modules/rostests/winetests/advpack/install.c @@ -91,7 +91,11 @@ static void test_RunSetupCommand(void) ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); /* try to run a nonexistent exe */ +#ifdef __REACTOS__ + hexe = (HANDLE)(ULONG_PTR)0xdeadbeefdeadbeefull; +#else hexe = (HANDLE)0xdeadbeef; +#endif hr = pRunSetupCommand(NULL, "idontexist.exe", "Install", systemdir, "Title", &hexe, 0, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %d\n", hr); @@ -99,7 +103,11 @@ static void test_RunSetupCommand(void) ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); /* try a bad directory */ +#ifdef __REACTOS__ + hexe = (HANDLE)(ULONG_PTR)0xdeadbeefdeadbeefull; +#else hexe = (HANDLE)0xdeadbeef; +#endif hr = pRunSetupCommand(NULL, "winver.exe", "Install", "non\\existent\\directory", "Title", &hexe, 0, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY), "Expected HRESULT_FROM_WIN32(ERROR_DIRECTORY), got %d\n", hr); @@ -107,14 +115,26 @@ static void test_RunSetupCommand(void) ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); /* try to run an exe with the RSC_FLAG_INF flag */ +#ifdef __REACTOS__ + hexe = (HANDLE)(ULONG_PTR)0xdeadbeefdeadbeefull; +#else hexe = (HANDLE)0xdeadbeef; +#endif hr = pRunSetupCommand(NULL, "winver.exe", "Install", systemdir, "Title", &hexe, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); ok(is_spapi_err(hr), "Expected a setupapi error, got %d\n", hr); +#ifdef __REACTOS__ + ok(hexe == (HANDLE)(ULONG_PTR)0xdeadbeefdeadbeefull, "Expected hexe to be 0xdeadbeef\n"); +#else ok(hexe == (HANDLE)0xdeadbeef, "Expected hexe to be 0xdeadbeef\n"); +#endif ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); /* run winver.exe */ +#ifdef __REACTOS__ + hexe = (HANDLE)(ULONG_PTR)0xdeadbeefdeadbeefull; +#else hexe = (HANDLE)0xdeadbeef; +#endif hr = pRunSetupCommand(NULL, "winver.exe", "Install", systemdir, "Title", &hexe, 0, NULL); ok(hr == S_ASYNCHRONOUS, "Expected S_ASYNCHRONOUS, got %d\n", hr); ok(hexe != NULL, "Expected hexe to be non-NULL\n"); diff --git a/modules/rostests/winetests/dplayx/dplayx.c b/modules/rostests/winetests/dplayx/dplayx.c index f4e7301da7..c67d1b78e9 100644 --- a/modules/rostests/winetests/dplayx/dplayx.c +++ b/modules/rostests/winetests/dplayx/dplayx.c @@ -6548,17 +6548,30 @@ static void test_COM(void) IDirectPlay3A *dp3A; IDirectPlay3 *dp3; IDirectPlay4A *dp4A; +#ifdef __REACTOS__ + IDirectPlay4 *dp4 = (IDirectPlay4*)(ULONG_PTR)0xdeadbeefdeadbeefull; +#else IDirectPlay4 *dp4 = (IDirectPlay4*)0xdeadbeef; +#endif IUnknown *unk; ULONG refcount; HRESULT hr; /* COM aggregation */ +#ifdef __REACTOS__ + hr = CoCreateInstance(&CLSID_DirectPlay, (IUnknown*)(ULONG_PTR)0xdeadbeefdeadbeefull, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dp4); +#else hr = CoCreateInstance(&CLSID_DirectPlay, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dp4); +#endif ok(hr == CLASS_E_NOAGGREGATION || broken(hr == E_INVALIDARG), "DirectPlay create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); +#ifdef __REACTOS__ + ok(!dp4 || dp4 == (IDirectPlay4*)(ULONG_PTR)0xdeadbeefdeadbeefull, "dp4 = %p\n", dp4); +#else ok(!dp4 || dp4 == (IDirectPlay4*)0xdeadbeef, "dp4 = %p\n", dp4); +#endif /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectPlay, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayLobby, @@ -6630,7 +6643,11 @@ static void test_COM(void) static void test_COM_dplobby(void) { +#ifdef __REACTOS__ + IDirectPlayLobby *dpl = (IDirectPlayLobby*)(ULONG_PTR)0xdeadbeefdeadbeefull; +#else IDirectPlayLobby *dpl = (IDirectPlayLobby*)0xdeadbeef; +#endif IDirectPlayLobbyA *dplA; IDirectPlayLobby2A *dpl2A; IDirectPlayLobby2 *dpl2; @@ -6641,11 +6658,20 @@ static void test_COM_dplobby(void) HRESULT hr; /* COM aggregation */ +#ifdef __REACTOS__ + hr = CoCreateInstance(&CLSID_DirectPlayLobby, (IUnknown*)(ULONG_PTR)0xdeadbeefdeadbeefull, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dpl); +#else hr = CoCreateInstance(&CLSID_DirectPlayLobby, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dpl); +#endif ok(hr == CLASS_E_NOAGGREGATION || broken(hr == E_INVALIDARG), "DirectPlayLobby create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); +#ifdef __REACTOS__ + ok(!dpl || dpl == (IDirectPlayLobby*)(ULONG_PTR)0xdeadbeefdeadbeefull, "dpl = %p\n", dpl); +#else ok(!dpl || dpl == (IDirectPlayLobby*)0xdeadbeef, "dpl = %p\n", dpl); +#endif /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectPlayLobby, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay,

1 0

01/02: [KMTESTS] Fix 64 bit issues
by Timo Kreuzer 04 Aug '18

04 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a265dc9ce1ba3349c7d70… commit a265dc9ce1ba3349c7d701f61452ba6f32e5487a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Mar 5 12:07:15 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 4 14:39:13 2018 +0200 [KMTESTS] Fix 64 bit issues --- modules/rostests/kmtests/ntos_ex/ExDoubleList.c | 2 +- modules/rostests/kmtests/ntos_ex/ExSingleList.c | 2 +- .../kmtests/ntos_mm/NtCreateSection_user.c | 2 +- .../kmtests/ntos_mm/ZwAllocateVirtualMemory.c | 2 +- .../rostests/kmtests/ntos_mm/ZwMapViewOfSection.c | 16 +++++----- modules/rostests/kmtests/ntos_ob/ObHandle.c | 36 +++++++++++----------- modules/rostests/kmtests/tcpip/connect.c | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/modules/rostests/kmtests/ntos_ex/ExDoubleList.c b/modules/rostests/kmtests/ntos_ex/ExDoubleList.c index c33059c093..177e72ba26 100644 --- a/modules/rostests/kmtests/ntos_ex/ExDoubleList.c +++ b/modules/rostests/kmtests/ntos_ex/ExDoubleList.c @@ -27,7 +27,7 @@ LIST_ENTRY Entries[5]; #define ok_eq_free2(Value, Expected) do \ { \ if (KmtIsCheckedBuild) \ - ok_eq_pointer(Value, (PVOID)0xBADDD0FF); \ + ok_eq_pointer(Value, (PVOID)(ULONG_PTR)0xBADDD0FFBADDD0FFULL); \ else \ ok_eq_pointer(Value, Expected); \ } while (0) diff --git a/modules/rostests/kmtests/ntos_ex/ExSingleList.c b/modules/rostests/kmtests/ntos_ex/ExSingleList.c index 95671ef60a..91a165325d 100644 --- a/modules/rostests/kmtests/ntos_ex/ExSingleList.c +++ b/modules/rostests/kmtests/ntos_ex/ExSingleList.c @@ -16,7 +16,7 @@ struct _SINGLE_LIST_ENTRY *__stdcall ExInterlockedPopEntryList(struct _SINGLE_LI #define ok_eq_free2(Value, Expected) do \ { \ if (KmtIsCheckedBuild) \ - ok_eq_pointer(Value, (PVOID)0xBADDD0FF); \ + ok_eq_pointer(Value, (PVOID)(ULONG_PTR)0xBADDD0FFBADDD0FFULL); \ else \ ok_eq_pointer(Value, Expected); \ } while (0) diff --git a/modules/rostests/kmtests/ntos_mm/NtCreateSection_user.c b/modules/rostests/kmtests/ntos_mm/NtCreateSection_user.c index 6c68c451bd..39cdcd6149 100644 --- a/modules/rostests/kmtests/ntos_mm/NtCreateSection_user.c +++ b/modules/rostests/kmtests/ntos_mm/NtCreateSection_user.c @@ -10,7 +10,7 @@ START_TEST(NtCreateSection) { PVOID Buffer; - ULONG FileSize; + SIZE_T FileSize; NTSTATUS Status; LARGE_INTEGER MaxFileSize; HANDLE Handle, SectionHandle; diff --git a/modules/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c b/modules/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c index 52e973d754..e8188dedfe 100644 --- a/modules/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c +++ b/modules/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c @@ -105,7 +105,7 @@ SimpleErrorChecks(VOID) //HANDLE TESTS ALLOC_MEMORY_WITH_FREE(NtCurrentProcess(), Base, 0, RegionSize, (MEM_COMMIT | MEM_RESERVE), PAGE_READWRITE, STATUS_SUCCESS, STATUS_SUCCESS); ALLOC_MEMORY_WITH_FREE(NULL, Base, 0, RegionSize, (MEM_COMMIT | MEM_RESERVE), PAGE_READWRITE, STATUS_INVALID_HANDLE, STATUS_INVALID_HANDLE); - ALLOC_MEMORY_WITH_FREE((HANDLE)0xdeadbeef, Base, 0, RegionSize, (MEM_COMMIT | MEM_RESERVE), PAGE_READWRITE, STATUS_INVALID_HANDLE, STATUS_INVALID_HANDLE); + ALLOC_MEMORY_WITH_FREE((HANDLE)(ULONG_PTR)0xDEADBEEFDEADBEEFull, Base, 0, RegionSize, (MEM_COMMIT | MEM_RESERVE), PAGE_READWRITE, STATUS_INVALID_HANDLE, STATUS_INVALID_HANDLE); //BASE ADDRESS TESTS Base = (PVOID)0x00567A20; diff --git a/modules/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c b/modules/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c index ee8b494f40..b6e6146536 100644 --- a/modules/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c +++ b/modules/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c @@ -124,31 +124,31 @@ SimpleErrorChecks(HANDLE FileHandleReadOnly, HANDLE FileHandleWriteOnly, HANDLE //section handle TestMapView(WriteSectionHandle, NtCurrentProcess(), &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_SUCCESS, STATUS_SUCCESS); - TestMapView((HANDLE)0xDEADBEEF, NtCurrentProcess(), &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_INVALID_HANDLE, IGNORE); + TestMapView((HANDLE)(ULONG_PTR)0xDEADBEEFDEADBEEFull, NtCurrentProcess(), &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_INVALID_HANDLE, IGNORE); TestMapView(INVALID_HANDLE_VALUE, NtCurrentProcess(), &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_OBJECT_TYPE_MISMATCH, IGNORE); TestMapView(NULL, NtCurrentProcess(), &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_INVALID_HANDLE, IGNORE); //process handle - TestMapView(WriteSectionHandle, (HANDLE)0xDEADBEEF, &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_INVALID_HANDLE, IGNORE); + TestMapView(WriteSectionHandle, (HANDLE)(ULONG_PTR)0xDEADBEEFDEADBEEFull, &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_INVALID_HANDLE, IGNORE); TestMapView(WriteSectionHandle, (HANDLE)NULL, &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_INVALID_HANDLE, IGNORE); //base address - BaseAddress = (PVOID)0x00567A20; + BaseAddress = (PVOID)(ULONG_PTR)0x00567A20; TestMapView(WriteSectionHandle, NtCurrentProcess(), &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_MAPPED_ALIGNMENT, IGNORE); - BaseAddress = (PVOID) 0x60000000; + BaseAddress = (PVOID)(ULONG_PTR)0x60000000; TestMapView(WriteSectionHandle, NtCurrentProcess(), &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_SUCCESS, STATUS_SUCCESS); BaseAddress = (PVOID)((char *)MmSystemRangeStart + 200); TestMapView(WriteSectionHandle, NtCurrentProcess(), &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_INVALID_PARAMETER_3, IGNORE); //invalid section handle AND unaligned base address - BaseAddress = (PVOID)0x00567A20; - TestMapView((HANDLE)0xDEADBEEF, NtCurrentProcess(), &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_INVALID_HANDLE, IGNORE); + BaseAddress = (PVOID)(ULONG_PTR)0x00567A20; + TestMapView((HANDLE)(ULONG_PTR)0xDEADBEEFDEADBEEFull, NtCurrentProcess(), &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_INVALID_HANDLE, IGNORE); //invalid process handle AND unaligned base address - BaseAddress = (PVOID)0x00567A20; - TestMapView(WriteSectionHandle, (HANDLE)0xDEADBEEF, &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_INVALID_HANDLE, IGNORE); + BaseAddress = (PVOID)(ULONG_PTR)0x00567A20; + TestMapView(WriteSectionHandle, (HANDLE)(ULONG_PTR)0xDEADBEEFDEADBEEFull, &BaseAddress, 0, 0, NULL, &ViewSize, ViewUnmap, 0, PAGE_READWRITE, STATUS_INVALID_HANDLE, IGNORE); //try mapping section to an already mapped address Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &AllocBase, 0, &AllocSize, MEM_COMMIT, PAGE_READWRITE); diff --git a/modules/rostests/kmtests/ntos_ob/ObHandle.c b/modules/rostests/kmtests/ntos_ob/ObHandle.c index 2b659dfc4f..bd1dd51763 100644 --- a/modules/rostests/kmtests/ntos_ob/ObHandle.c +++ b/modules/rostests/kmtests/ntos_ob/ObHandle.c @@ -184,19 +184,19 @@ START_TEST(ObHandle) Status = NtClose(NULL); ok_eq_hex(Status, STATUS_INVALID_HANDLE); DPRINT("Closing null kernel handle (NtClose)\n"); - Status = NtClose((HANDLE)0x80000000); + Status = NtClose(LongToHandle(0x80000000)); ok_eq_hex(Status, STATUS_INVALID_HANDLE); DPRINT("Closing -1 handle (NtClose)\n"); - Status = NtClose((HANDLE)0x7FFFFFFF); + Status = NtClose(LongToHandle(0x7FFFFFFF)); ok_eq_hex(Status, STATUS_INVALID_HANDLE); DPRINT("Closing -1 kernel handle (NtClose)\n"); - Status = NtClose((HANDLE)0xFFFFFFFF); + Status = NtClose(LongToHandle(0xFFFFFFFF)); ok_eq_hex(Status, STATUS_INVALID_HANDLE); DPRINT("Closing 123 handle (NtClose)\n"); - Status = NtClose((HANDLE)123); + Status = NtClose(LongToHandle(123)); ok_eq_hex(Status, STATUS_INVALID_HANDLE); DPRINT("Closing 123 kernel handle (NtClose)\n"); - Status = NtClose((HANDLE)(123 | 0x80000000)); + Status = NtClose(LongToHandle(123 | 0x80000000)); ok_eq_hex(Status, STATUS_INVALID_HANDLE); /* ObCloseHandle with UserMode accepts everything */ @@ -204,19 +204,19 @@ START_TEST(ObHandle) Status = ObCloseHandle(NULL, UserMode); ok_eq_hex(Status, STATUS_INVALID_HANDLE); DPRINT("Closing null kernel handle (ObCloseHandle, UserMode)\n"); - Status = ObCloseHandle((HANDLE)0x80000000, UserMode); + Status = ObCloseHandle(LongToHandle(0x80000000), UserMode); ok_eq_hex(Status, STATUS_INVALID_HANDLE); DPRINT("Closing -1 handle (ObCloseHandle, UserMode)\n"); - Status = ObCloseHandle((HANDLE)0x7FFFFFFF, UserMode); + Status = ObCloseHandle(LongToHandle(0x7FFFFFFF), UserMode); ok_eq_hex(Status, STATUS_INVALID_HANDLE); DPRINT("Closing -1 kernel handle (ObCloseHandle, UserMode)\n"); - Status = ObCloseHandle((HANDLE)0xFFFFFFFF, UserMode); + Status = ObCloseHandle(LongToHandle(0xFFFFFFFF), UserMode); ok_eq_hex(Status, STATUS_INVALID_HANDLE); DPRINT("Closing 123 handle (ObCloseHandle, UserMode)\n"); - Status = ObCloseHandle((HANDLE)123, UserMode); + Status = ObCloseHandle(LongToHandle(123), UserMode); ok_eq_hex(Status, STATUS_INVALID_HANDLE); DPRINT("Closing 123 kernel handle (ObCloseHandle, UserMode)\n"); - Status = ObCloseHandle((HANDLE)(123 | 0x80000000), UserMode); + Status = ObCloseHandle(LongToHandle(123 | 0x80000000), UserMode); ok_eq_hex(Status, STATUS_INVALID_HANDLE); /* ZwClose only accepts 0 and -1 */ @@ -224,32 +224,32 @@ START_TEST(ObHandle) Status = ZwClose(NULL); ok_eq_hex(Status, STATUS_INVALID_HANDLE); DPRINT("Closing null kernel handle (ZwClose)\n"); - Status = ZwClose((HANDLE)0x80000000); + Status = ZwClose(LongToHandle(0x80000000)); ok_eq_hex(Status, STATUS_INVALID_HANDLE); /* INVALID_KERNEL_HANDLE, 0x7FFFFFFF Status = ZwClose((HANDLE)0x7FFFFFFF);*/ DPRINT("Closing -1 kernel handle (ZwClose)\n"); - Status = ZwClose((HANDLE)0xFFFFFFFF); + Status = ZwClose(LongToHandle(0xFFFFFFFF)); ok_eq_hex(Status, STATUS_INVALID_HANDLE); /* INVALID_KERNEL_HANDLE, 0x7B, 1, 0, 0 - Status = ZwClose((HANDLE)123); - Status = ZwClose((HANDLE)(123 | 0x80000000));*/ + Status = ZwClose(LongToHandle(123)); + Status = ZwClose(LongToHandle(123 | 0x80000000));*/ /* ObCloseHandle with KernelMode accepts only 0 and -1 */ DPRINT("Closing null handle (ObCloseHandle, KernelMode)\n"); Status = ObCloseHandle(NULL, KernelMode); ok_eq_hex(Status, STATUS_INVALID_HANDLE); DPRINT("Closing null kernel handle (ObCloseHandle, KernelMode)\n"); - Status = ObCloseHandle((HANDLE)0x80000000, KernelMode); + Status = ObCloseHandle(LongToHandle(0x80000000), KernelMode); ok_eq_hex(Status, STATUS_INVALID_HANDLE); /* INVALID_KERNEL_HANDLE, 0x7FFFFFFF, 1, 0, 0 Status = ObCloseHandle((HANDLE)0x7FFFFFFF, KernelMode);*/ DPRINT("Closing -1 kernel handle (ObCloseHandle, KernelMode)\n"); - Status = ObCloseHandle((HANDLE)0xFFFFFFFF, KernelMode); + Status = ObCloseHandle(LongToHandle(0xFFFFFFFF), KernelMode); ok_eq_hex(Status, STATUS_INVALID_HANDLE); /* INVALID_KERNEL_HANDLE, 0x7B, 1, 0, 0 - Status = ObCloseHandle((HANDLE)123, KernelMode); - Status = ObCloseHandle((HANDLE)(123 | 0x80000000), KernelMode);*/ + Status = ObCloseHandle(LongToHandle(123), KernelMode); + Status = ObCloseHandle(LongToHandle(123 | 0x80000000), KernelMode);*/ KmtEndSeh(STATUS_SUCCESS); if (SystemProcessHandle) diff --git a/modules/rostests/kmtests/tcpip/connect.c b/modules/rostests/kmtests/tcpip/connect.c index d548a636c2..89fc75849a 100644 --- a/modules/rostests/kmtests/tcpip/connect.c +++ b/modules/rostests/kmtests/tcpip/connect.c @@ -59,7 +59,7 @@ TestTcpConnect(void) ULONG FileInfoSize; IN_ADDR InAddr; LPCWSTR AddressTerminator; - CONNECTION_CONTEXT ConnectionContext = (CONNECTION_CONTEXT)0xC0CAC01A; + CONNECTION_CONTEXT ConnectionContext = (CONNECTION_CONTEXT)(ULONG_PTR)0xC0CAC01AC0CAC01AULL; KEVENT Event; TDI_CONNECTION_INFORMATION RequestInfo, ReturnInfo;

1 0

01/01: [TRANSLATIONS] Fix spanish translations for some resources (#725)
by Julio Carchi 03 Aug '18

03 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7559e23546e74b9ba099… commit d7559e23546e74b9ba099f254957d402f7becf56 Author: Julio Carchi <contacto(a)julcar.info.tm> AuthorDate: Fri Aug 3 08:08:13 2018 -0500 Commit: David Quintana <gigaherz(a)gmail.com> CommitDate: Fri Aug 3 15:08:13 2018 +0200 [TRANSLATIONS] Fix spanish translations for some resources (#725) Setup wizard Network settings wizard Input CPL Open file dialogs Devmgr Explorer --- base/setup/reactos/lang/es-ES.rc | 22 +++++---- base/shell/explorer/lang/es-ES.rc | 91 +++++++++++++++++++------------------ dll/cpl/input/lang/es-ES.rc | 15 ++++-- dll/shellext/netshell/lang/es-ES.rc | 67 +++++++++++++++------------ dll/win32/comdlg32/lang/cdlg_Es.rc | 38 +++++++++------- dll/win32/devmgr/lang/es-ES.rc | 17 +++++-- 6 files changed, 142 insertions(+), 108 deletions(-) diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index 33cd82b7a6..4d86cadbd4 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -1,4 +1,10 @@ -/* Spanish translation by Javier Remacha <2008> */ +/* + * PROJECT: ReactOS Setup + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Spanish locale file + * COPYRIGHT: Javier Remacha 2008 + * Julio Carchi Ruiz 2018 + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -18,9 +24,9 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10 - 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 - AUTORADIOBUTTON "Actualizar o reparar una versión instalada de ReactOS", 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 + LTEXT "Instala una nueva copia de ReactOS. Esta opción no proteje sus archivos, programas y ajustes. Usted puede realizar cambios a su disco duro y particiones.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Actualizar o reparar una instalación existente de ReactOS", IDC_UPDATE, 7, 50, 277, 10 + LTEXT "Actualiza o repara una instalación existente de ReactOS. Esta opción proteje sus archivos, programas y ajustes. Esta opción sólo está disponible si ha instalado ReactOS previamente en esta computadora.", IDC_UPDATETEXT, 18, 61, 269, 30 LTEXT "Presione Siguiente para instalar los dispositivos.", IDC_STATIC, 7, 128, 297, 8 END @@ -127,13 +133,13 @@ BEGIN IDS_SUMMARYSUBTITLE "Lista las propiedades de la instalación para su verificación antes de aplicarlas al dispositivo instalado" IDS_ABORTSETUP "ReactOS no está completamente instalado en su equipo. Si sale de la instalación ahora, tendrá que ejecutar el instalador otra vez para instalar ReactOS. ¿Realmente quiere salir?" IDS_ABORTSETUP2 "¿Abortar instalación?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "No se pudo encontrar 'txtsetup.sif'\nLa instalación no puede continuar." IDS_CAPTION "Instalación de ReactOS" END STRINGTABLE BEGIN - IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" - IDS_PARTITION_TYPE "Type" + IDS_PARTITION_NAME "Nombre" + IDS_PARTITION_SIZE "Tamaño" + IDS_PARTITION_TYPE "Tipo" END diff --git a/base/shell/explorer/lang/es-ES.rc b/base/shell/explorer/lang/es-ES.rc index c37a5fca98..dd51961bc1 100644 --- a/base/shell/explorer/lang/es-ES.rc +++ b/base/shell/explorer/lang/es-ES.rc @@ -6,6 +6,7 @@ * TRANSLATOR: 2007 Marc Piulachs (marc [dot] piulachs [at] codexchange [dot] net) * UPDATED: 2009-07 Gabriel Ilardi (gabrielilardi [at] hotmail [dot] it) * UPDATED: 2014-12-31 Ismael Ferreras Morezuelas (swyterzone [plus] ros [at] gmail [dot] com) + * UPDATED: 2018-08-01 Julio Carchi Ruiz (contacto [at] julcar [dot] info [dot] tm) */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -87,7 +88,7 @@ BEGIN GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 AUTOCHECKBOX "Re&loj", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED + AUTOCHECKBOX "Mostrar segundos", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED LTEXT "Puede mantener libre el área de notifación ocultando iconos que no se han usadon recientemente.", IDC_STATIC, 13, 169, 223, 16 AUTOCHECKBOX "Ocultar &iconos inactivos", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 184, 191, 50, 14 @@ -110,66 +111,66 @@ END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Customize Notifications" +CAPTION "Personalizar notificaciones" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS displays icons for active and urgent notifications, and hides inactive ones. You can change this behavior for items in the list below.", IDC_STATIC, 6, 6, 220, 30 - LTEXT "Select an item, then choose its notification behavior:", IDC_STATIC, 6, 40, 220, 10 + LTEXT "ReactOS muestra íconos para tareas activas o urgentes, y oculta las inactivas. Usted puede cambiar este comportamiento en la siguiente lista.", IDC_STATIC, 6, 6, 220, 30 + LTEXT "Seleccione un elemento, entonces elija su comportamiento:", IDC_STATIC, 6, 40, 220, 10 CONTROL "", IDC_NOTIFICATION_LIST, "SysListView32", WS_CLIPSIBLINGS | WS_BORDER | 0x00008005, 6, 50, 220, 128 COMBOBOX IDC_NOTIFICATION_BEHAVIOUR, 103, 178, 78, 200, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_CLIPSIBLINGS - PUSHBUTTON "&Restore Defaults", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 - DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + PUSHBUTTON "Valor por &defecto", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 122, 220, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 176, 220, 50, 14 END IDD_CLASSICSTART_CUSTOMIZE DIALOGEX 0, 0, 232, 240, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Customize Classic Start Menu" +CAPTION "Personalizar Menú Inicio clásico" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Start menu", IDC_STATIC, 8, 7, 218, 114 + GROUPBOX "Menú Inicio", IDC_STATIC, 8, 7, 218, 114 ICON IDI_STARTMENU2, IDC_STATIC, 19, 17, 20, 20 - LTEXT "You can customize your Start menu by adding or removing items.", IDC_STATIC, 48, 17, 108, 39 - PUSHBUTTON "A&dd...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 - PUSHBUTTON "&Remove...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 - PUSHBUTTON "Ad&vanced", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 - PUSHBUTTON "&Sort", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 + LTEXT "Usted puede personalizar su Menú Inicio añadiendo or removiendo elementos.", IDC_STATIC, 48, 17, 108, 39 + PUSHBUTTON "&Añadir...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 + PUSHBUTTON "&Remover...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 + PUSHBUTTON "A&vanzado", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 + PUSHBUTTON "&Ordenar", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 ICON IDI_RECYCLEBIN, IDC_STATIC, 20, 85, 20, 20 - LTEXT "To remove records of recently accessed documents, programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33 - PUSHBUTTON "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 - LTEXT "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 8 - CONTROL "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE - DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + LTEXT "Para eliminar registros de documentos, programas y sitios web abiertos recientemente, haga click en Borrar.", IDC_STATIC, 49, 85, 108, 33 + PUSHBUTTON "&Borrar", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 + LTEXT "&Opciones avanzadas del Menú Inicio:", IDC_STATIC, 8, 129, 150, 8 + CONTROL "A&justes del Menú Inicio", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE + DEFPUSHBUTTON "Aceptar", IDOK, 122, 220, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 176, 220, 50, 14 END IDD_FILENAME_WARNING DIALOGEX 0, 0, 272, 81, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "File Name Warning" +CAPTION "Aviso sobre nombre de archivo" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&Ignore", IDIGNORE, 215, 60, 50, 14 - PUSHBUTTON "&Rename", IDC_FILE_RENAME, 159, 60, 50, 14 + DEFPUSHBUTTON "&Ignorar", IDIGNORE, 215, 60, 50, 14 + PUSHBUTTON "&Renombrar", IDC_FILE_RENAME, 159, 60, 50, 14 LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP - AUTOCHECKBOX "&Don't perform this check at startup", IDC_NOTCHECK, 7, 62, 139, 10 + AUTOCHECKBOX "&No ejecutar esta revisión al iniciar el sistema", IDC_NOTCHECK, 7, 62, 139, 10 ICON 32515, IDC_STATIC, 7, 7, 21, 20 - LTEXT "There is a file or folder on your computer called %s which could cause certain applications to not function correctly. Renaming it to %s would solve this problem. Would you like to rename it now?", IDC_STATIC, 34, 7, 224, 37 + LTEXT "Ya existe un archivo o carpeta en su computadora con el nombre %s el cual podría causar que ciertos programas dejen de funcionar correctamente. Renombrarlo a %s resolvería este problema. ¿Le gustaría renombrarlo ahora?", IDC_STATIC, 34, 7, 224, 37 END IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 STYLE DS_SETFONT | WS_CAPTION | WS_CHILD | WS_DISABLED -CAPTION "Advanced" +CAPTION "Avanzado" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Start menu settings ", IDC_STATIC, 7, 7, 238, 42 - AUTOCHECKBOX "&Open submenus when I pause on them with my mouse", IDC_AUTOOPEN, 14, 21, 224, 10 - AUTOCHECKBOX "Highlight &newly installed programs", IDC_HIGHLIGHT, 14, 35, 224, 10 - LTEXT "Start &menu items:", IDC_STATIC, 7, 53, 238, 8 - CONTROL "StartMenuSe&ttings", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE - GROUPBOX "Recent documents ", IDC_STATIC, 7, 133, 238, 56 - LTEXT "Select this option to provide quick access to the documents you opened most recently. Clearing this list does not delete the documents.", IDC_STATIC, 14, 144, 224, 21 - AUTOCHECKBOX "List my most &recently opened documents", IDC_RECENTLY, 14, 168, 147, 10 - PUSHBUTTON "&Clear List", IDC_CLEAR, 182, 168, 55, 14 + GROUPBOX "Ajustes del Menú Inicio", IDC_STATIC, 7, 7, 238, 42 + AUTOCHECKBOX "Abrir &Sub menús al posar el puntero del ratón sobre ellos", IDC_AUTOOPEN, 14, 21, 224, 10 + AUTOCHECKBOX "&Resaltar programas instalados recientemente", IDC_HIGHLIGHT, 14, 35, 224, 10 + LTEXT "&Elementos del Menú Inicio:", IDC_STATIC, 7, 53, 238, 8 + CONTROL "A&justes del Menú Inicio", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE + GROUPBOX "Documentos recientes", IDC_STATIC, 7, 133, 238, 56 + LTEXT "Seleccione esta opción para tener acceso rápido a documentos abiertos recientemente. Borrar esta lista no elimina los archivos.", IDC_STATIC, 14, 144, 224, 21 + AUTOCHECKBOX "&Listar documentos abiertos recientemente", IDC_RECENTLY, 14, 168, 147, 10 + PUSHBUTTON "&Borrar lista", IDC_CLEAR, 182, 168, 55, 14 END IDD_MODERNSTART_GENERAL DIALOGEX 0, 0, 251, 198 @@ -177,21 +178,21 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_DLGFRAME CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Select an icon size for programs ", IDC_STATIC, 7, 7, 238, 37 + GROUPBOX "Seleccione el tamaño de los íconos", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE ICON IDC_SMALLICON, 151, 18, 20, 20, SS_CENTERIMAGE - AUTORADIOBUTTON "&Large icons", IDC_CHOOSELARGE, 43, 25, 53, 10 - AUTORADIOBUTTON "&Small icons", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP - GROUPBOX "Programs ", IDC_STATIC, 7, 49, 238, 70 - LTEXT "The Start menu contains shortcuts to the programs you use most often. Clearing the list of shortcuts does not delete the programs.", IDC_STATIC, 14, 63, 224, 20 - LTEXT "&Number of programs on Start menu:", IDC_STATIC, 14, 86, 112, 8 + AUTORADIOBUTTON "Íconos &grandes", IDC_CHOOSELARGE, 43, 25, 53, 10 + AUTORADIOBUTTON "Íconos &pequeños", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP + GROUPBOX "Programas ", IDC_STATIC, 7, 49, 238, 70 + LTEXT "El Menú Inicio contiene accesos directos a los programas más usados. Borrar esta lista no desinstala los programas.", IDC_STATIC, 14, 63, 224, 20 + LTEXT "&Número de programas en el Menú Inicio:", IDC_STATIC, 14, 86, 112, 8 EDITTEXT IDC_NUMBEROFPROGRAMS, 133, 84, 27, 12, ES_LEFT | ES_RIGHT | ES_NUMBER CONTROL "", IDC_NUMBERUPDOWN, "msctls_updown32", WS_BORDER | 0x000000B6, 160, 84, 11, 12 - PUSHBUTTON "&Clear List", IDC_CLEARLIST, 182, 98, 57, 14 - GROUPBOX "Show on Start menu ", IDC_STATIC, 7, 126, 238, 63 + PUSHBUTTON "&Borrar lista", IDC_CLEARLIST, 182, 98, 57, 14 + GROUPBOX "Mostrar en el Menú Inicio", IDC_STATIC, 7, 126, 238, 63 AUTOCHECKBOX "&Internet:", IDC_SHOWINTERNET, 14, 140, 42, 10 COMBOBOX IDC_INTERNETDEFAULTAPP, 98, 138, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL - AUTOCHECKBOX "&E-mail:", IDC_SHOWEMAIL, 14, 157, 37, 10 + AUTOCHECKBOX "&Correo electrónico:", IDC_SHOWEMAIL, 14, 157, 37, 10 COMBOBOX IDC_EMAILDEFAULTAPP, 98, 155, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL END @@ -207,5 +208,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Propiedades de la Barra de tareas y del Menú Inicio" - IDS_RESTORE_ALL "&Show Open Windows" + IDS_RESTORE_ALL "&Mostrar ventanas abiertas" END diff --git a/dll/cpl/input/lang/es-ES.rc b/dll/cpl/input/lang/es-ES.rc index 3a776808ca..091459faec 100644 --- a/dll/cpl/input/lang/es-ES.rc +++ b/dll/cpl/input/lang/es-ES.rc @@ -1,4 +1,11 @@ -/* Spanish translation by Javier Remacha 2008 and Ismael Ferreras Morezuelas (Swyter) */ +/* + * PROJECT: ReactOS Input CPL + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Spanish locale file + * COPYRIGHT: Javier Remacha 2008 + * Ismael Ferreras Morezuelas 2014 + * Julio Carchi Ruiz 2018 + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -103,12 +110,12 @@ BEGIN IDS_LAYOUT "Distribución del teclado" IDS_REM_QUESTION "¿Quiere eliminar la distribución del teclado seleccionada?" IDS_CONFIRMATION "Confirmación" - IDS_LAYOUT_EXISTS "Esta distribución y existe." - IDS_LAYOUT_EXISTS2 "Esta distribución y existe y no puede ser añadida." + IDS_LAYOUT_EXISTS "Esta distribución ya existe." + IDS_LAYOUT_EXISTS2 "Esta distribución ya existe y no puede ser añadida." IDS_CTRL_SHIFT "Ctrl+Mayús" IDS_LEFT_ALT_SHIFT "Alt Izq+Mayús" IDS_SWITCH_BET_INLANG "Cambiar entre los idiomas de entrada" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW, "¿Reiniciar ahora?" END STRINGTABLE diff --git a/dll/shellext/netshell/lang/es-ES.rc b/dll/shellext/netshell/lang/es-ES.rc index 09f8674b95..1d22fa0cea 100644 --- a/dll/shellext/netshell/lang/es-ES.rc +++ b/dll/shellext/netshell/lang/es-ES.rc @@ -1,4 +1,11 @@ -/* Spanish translation by ??? and Swyter */ +/* + * PROJECT: ReactOS Network Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Spanish locale file + * COPYRIGHT: Ismael Ferreras Morezuelas + * Julio Carchi Ruiz + */ + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_NETPROPERTIES DIALOGEX 0, 0, 246, 246 @@ -79,44 +86,44 @@ END IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Instalador de ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 - LTEXT "Choose whether to use typical or custom settings:", IDC_STATIC, 53, 7, 240, 20 - AUTORADIOBUTTON "Typical Settings", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Custom Settings", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP - LTEXT "Creates network connections using the Client for ReactOS Networks, File and Print Sharing for ReactOS Networks, and the TCP/IP transport protocol with automatic addressing.", IDC_STATIC, 65, 45, 240, 30 - LTEXT "Allows you to manually configure network components.", IDC_STATIC, 65, 90, 243, 20 + LTEXT "Elija entre usar una configuración típica o personalizada:", IDC_STATIC, 53, 7, 240, 20 + AUTORADIOBUTTON "Configuración típica", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Configuración personalizada", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP + LTEXT "Crea conexiones de red usando el Cliente para Redes de ReactOS, Archivos e Impresoras Compartidas para Redes de ReactOS, y el protocolo TCP/IP con direccionamiento automático.", IDC_STATIC, 65, 45, 240, 30 + LTEXT "Le permite configurar manualmente componentes de red.", IDC_STATIC, 65, 90, 243, 20 END IDD_NETWORKCOMPONENTPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Instalador de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "For Device:", IDC_STATIC, 33, 2, 100, 20 - LTEXT "n/a", IDC_NETWORK_DEVICE, 75, 2, 253, 20 - LTEXT "Components checked are used by this connection:", IDC_STATIC, 33, 12, 253, 20 + LTEXT "Dispositivo:", IDC_STATIC, 33, 2, 100, 20 + LTEXT "n/d", IDC_NETWORK_DEVICE, 75, 2, 253, 20 + LTEXT "Los componentes marcados son usados por esta conexión:", IDC_STATIC, 33, 12, 253, 20 CONTROL "", IDC_COMPONENT_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 33, 22, 250, 50 - PUSHBUTTON "&Install...", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Uninstall", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Properties", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP - GROUPBOX "Description", IDC_STATIC, 33, 90, 250, 50, BS_GROUPBOX + PUSHBUTTON "&Instalar...", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Desinstalar", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Propiedades", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP + GROUPBOX "Descripción", IDC_STATIC, 33, 90, 250, 50, BS_GROUPBOX END IDD_NETWORKDOMAINPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Instalador de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Do you want this computer to be a member of a domain?\n\ -(You can obtain this information from your network administrator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP - LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 + LTEXT "¿Desea que esta computadora sea miembro de un dominio?\n\ +(Puede obtener más información de su administrador de red.)", IDC_STATIC, 33, 2, 263, 50 + AUTORADIOBUTTON "No, esta computadora será parte de un grupo de trabajo.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Si, esta computadora será parte de un dominio.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP + LTEXT "Nombre del dominio o grupo de trabajo:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "NOTE: If this computer isn't going to be part of a network, you don't have sufficient rights to join a domain, or you don't know what to enter, then just choose workgroup for now. These options can be changed at a later time.", IDC_STATIC, 33, 107, 263, 50 + LTEXT "NOTE: Si esta computadora no va a ser parte de una red, usted no tiene suficientes privilegios para unirse a un dominio, o si simplemente no sabe qué elejir, entonces seleccione ""Grupo de trabajo"" por ahora. Éstas opciones pueden ser cambiadas después.", IDC_STATIC, 33, 107, 263, 50 END STRINGTABLE @@ -166,12 +173,12 @@ END STRINGTABLE BEGIN - IDS_NETWORKSETTINGSTITLE "Network Settings" - IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." - IDS_NETWORKCOMPONENTTITLE "Network Components" - IDS_NETWORKCOMPONENTSUBTITLE "Determine which networking components are used on your computer. To add new components, click on Install." - IDS_NETWORKDOMAINTITLE "Workgroup or Computer Domain" - IDS_NETWORKDOMAINSUBTITLE "A domain is a group of computers defined by a network administrator. A workgroup is a group of computers sharing the same workgroup name." - IDS_REACTOS_SETUP "ReactOS Setup" - IDS_WZD_DOMAIN_NAME "Setup cannot continue until you\nenter the name of your domain\nor workgroup." + IDS_NETWORKSETTINGSTITLE "Configuración de red" + IDS_NETWORKSETTINGSSUBTITLE "Instala aplicaciones de red necesarias para conectarse a otras redes, equipos, y la Internet." + IDS_NETWORKCOMPONENTTITLE "Componetes de red" + IDS_NETWORKCOMPONENTSUBTITLE "Determina cuáles componentes de red se usarán en su equipo. Para añadir nuevos componentes, haga click en Instalar." + IDS_NETWORKDOMAINTITLE "Grupo de trabajo o dominio del equipo" + IDS_NETWORKDOMAINSUBTITLE "Un dominio es un grupo de equipos definido por un administrador de red. Un grupo de trabajo es un grupo de equipos que comparten el mismo nombre." + IDS_REACTOS_SETUP "Instalador de ReactOS" + IDS_WZD_DOMAIN_NAME "La instalación no puede continuar\nhasta que ingrese el nombre de\nsu dominio o grupo de trabajo." END diff --git a/dll/win32/comdlg32/lang/cdlg_Es.rc b/dll/win32/comdlg32/lang/cdlg_Es.rc index 595700842e..f72298ffb1 100644 --- a/dll/win32/comdlg32/lang/cdlg_Es.rc +++ b/dll/win32/comdlg32/lang/cdlg_Es.rc @@ -4,6 +4,12 @@ * Copyright 1999 Bertho Stultiens * Copyright 1999 Klaas van Gend * + * Spanish translations by + * + * 2004, 2005 José Manuel Ferrer Ortiz + * 2014 Ismael Ferreras Morezuelas + * 2018 Julio Carchi Ruiz + * * 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 @@ -138,7 +144,7 @@ STRINGTABLE IDS_SAVE_AS "&Guardar como" IDS_OPEN_FILE "Abrir archivo" IDS_SELECT_FOLDER "Elegir carpeta" - IDS_FONT_SIZE_INPUT "Font size has to be a number." + IDS_FONT_SIZE_INPUT "El tamaño de la fuente debe ser un número." } /* @@ -150,17 +156,17 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Abrir" FONT 8, "MS Shell Dlg" { - LTEXT "Nombre de &archivo:", stc3, 6, 6, 76, 9 + LTEXT "&Nombre de archivo:", stc3, 6, 6, 76, 9 EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "&Directorios:", -1, 110, 6, 92, 9 LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Mostrar archivos de tipo:", stc2, 6, 104, 90, 9 + LTEXT "Mostrar archivos de &tipo:", stc2, 6, 104, 90, 9 COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "U&nidades:", stc4, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Abrir", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Abrir", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "A&yuda", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP CHECKBOX "Sólo &lectura", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP @@ -458,14 +464,14 @@ FONT 8, "MS Shell Dlg" LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - LTEXT "Nombre de &archivo:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY + LTEXT "&Nombre de archivo:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 - LTEXT "Archivos de &tipo:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY + LTEXT "&Tipos de archivo:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Abrir como &sólo lectura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,148,150,10 + CONTROL "Abrir como sólo &lectura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,148,150,10 DEFPUSHBUTTON "&Abrir", IDOK,222,110,54,14 PUSHBUTTON "Cancelar", IDCANCEL,222,128,54,14 @@ -474,28 +480,28 @@ FONT 8, "MS Shell Dlg" NEWFILEOPENV2ORD DIALOG 0, 0, 370, 237 STYLE DS_MODALFRAME | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "Open" +CAPTION "Abrir" FONT 8, "MS Shell Dlg" { - LTEXT "Look &in:", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY + LTEXT "Buscar &en:", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY + LTEXT "&Nombre de archivo:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY EDITTEXT IDC_FILENAME, 123, 180, 180, 12, ES_AUTOHSCROLL CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 123, 180, 180, 150 - LTEXT "Files of &type:", IDC_FILETYPESTATIC, 65, 200, 56, 16, SS_NOTIFY + LTEXT "&Tipos de archivo:", IDC_FILETYPESTATIC, 65, 200, 56, 16, SS_NOTIFY COMBOBOX IDC_FILETYPE, 123, 198, 180, 53, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Open as &read-only", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 + CONTROL "Abrir como sólo &lectura", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 - DEFPUSHBUTTON "&Open", IDOK, 310, 180, 54, 14 - PUSHBUTTON "Cancel", IDCANCEL, 310, 198, 54, 14 - PUSHBUTTON "&Help", pshHelp, 310, 215, 54, 14 + DEFPUSHBUTTON "&Abrir", IDOK, 310, 180, 54, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 310, 198, 54, 14 + PUSHBUTTON "A&yuda", pshHelp, 310, 215, 54, 14 } NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300 @@ -507,7 +513,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Nombre de archivo:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS | ES_AUTOHSCROLL - LTEXT "Archivos de &tipo:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS + LTEXT "&Tipos de archivo:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS COMBOBOX IDC_FILETYPE, 226, 256, 100, 60, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | WS_CLIPSIBLINGS | CBS_HASSTRINGS | CBS_DROPDOWNLIST diff --git a/dll/win32/devmgr/lang/es-ES.rc b/dll/win32/devmgr/lang/es-ES.rc index 0e4c2bede4..ead90e98c8 100644 --- a/dll/win32/devmgr/lang/es-ES.rc +++ b/dll/win32/devmgr/lang/es-ES.rc @@ -1,4 +1,11 @@ -/* Spanish translation by Ismael Ferreras Morezuelas (Swyter) */ +/* + * PROJECT: ReactOS Device Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Spanish locale file + * COPYRIGHT: Ismael Ferreras Morezuelas + * Julio Carchi Ruiz + */ + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -179,10 +186,10 @@ BEGIN LTEXT "Ver detalles de los archivos del controlador.", -1, 106, 105, 132, 17, SS_NOPREFIX PUSHBUTTON "&Actualizar controlador...", IDC_UPDATEDRIVER, 7, 134, 90, 15 LTEXT "Actualizar el controlador del dispositivo.", -1, 106, 138, 132, 17, SS_NOPREFIX - PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 90, 15 - LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 106, 162, 132, 25, SS_NOPREFIX - PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 90, 15 - LTEXT "To uninstall the driver (Advanced).", -1, 106, 194, 132, 17, SS_NOPREFIX + PUSHBUTTON "&Restaurar controlador", IDC_ROLLBACKDRIVER, 7, 162, 90, 15 + LTEXT "Si el dispositivo deja de funcionar luego de actualizar el controlador, restaura el controlador anterior.", -1, 106, 162, 132, 25, SS_NOPREFIX + PUSHBUTTON "&Desinstalar", IDC_UNINSTALLDRIVER, 7, 190, 90, 15 + LTEXT "Desinstalar el controlador (Avanzado).", -1, 106, 194, 132, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230

1 0

01/01: [TRANSLATION][TASKKILL] Add Italian translation (#717)
by Bișoc George 03 Aug '18

03 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=adc2e996908958798bb27… commit adc2e996908958798bb27431599fc597edf46381 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri Aug 3 12:12:29 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 3 12:12:29 2018 +0200 [TRANSLATION][TASKKILL] Add Italian translation (#717) --- base/applications/cmdutils/taskkill/lang/it-IT.rc | 26 +++++++++++++++++++++++ base/applications/cmdutils/taskkill/taskkill.rc | 3 +++ 2 files changed, 29 insertions(+) diff --git a/base/applications/cmdutils/taskkill/lang/it-IT.rc b/base/applications/cmdutils/taskkill/lang/it-IT.rc new file mode 100644 index 0000000000..0a2cb322ae --- /dev/null +++ b/base/applications/cmdutils/taskkill/lang/it-IT.rc @@ -0,0 +1,26 @@ +/* + * PROJECT: Task termination utility + * LICENSE: See COPYING in the top level directory + * PURPOSE: Italian resource file + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Uso: taskkill [/?] [/f] [/im NomeProcesso | /pid IDProcesso]\n" + STRING_INVALID_OPTION, "Errore: L'opzione specificata è invalida o sconosciuta.\n" + STRING_INVALID_PARAM, "Errore: Il parametro di comando a riga è invalido.\n" + STRING_MISSING_OPTION, "Errore: Specifica una delle opzioni /im oppure /pid.\n" + STRING_MISSING_PARAM, "Errore: L'opzione %1 necessita un parametro a riga di comando.\n" + STRING_MUTUAL_EXCLUSIVE, "Errore: Le opzioni /im e /pid si escludono reciprocamente.\n" + STRING_CLOSE_PID_SEARCH, "Alla finestra del processo con PID %1!u! è stato inviato un messaggio di chiusura.\n" + STRING_CLOSE_PROC_SRCH, "Alla finestra del processo ""%1"" con PID %2!u! è stato inviato un messaggio di chiusura.\n" + STRING_TERM_PID_SEARCH, "Il processo con PID %1!u! è stato terminato forzatamente.\n" + STRING_TERM_PROC_SEARCH, "Il processo ""%1"" con PID %2!u! è stato terminato con forza.\n" + STRING_SEARCH_FAILED, "Errore: Impossibile trovare il processo ""%1"".\n" + STRING_ENUM_FAILED, "Errore: Impossibile enumerare la lista dei processi.\n" + STRING_TERMINATE_FAILED, "Errore: Impossibile terminare il processo ""%1"".\n" + STRING_SELF_TERMINATION, "Errore: L'auto-terminazione non è consentita.\n" +} diff --git a/base/applications/cmdutils/taskkill/taskkill.rc b/base/applications/cmdutils/taskkill/taskkill.rc index 4e9ca9dbab..9577bbed86 100644 --- a/base/applications/cmdutils/taskkill/taskkill.rc +++ b/base/applications/cmdutils/taskkill/taskkill.rc @@ -36,6 +36,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 0

01/01: [MSPAINT] Added Vietnamese translation. (#722)
by Nguyễn Thanh Sơn 03 Aug '18

03 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ad27c73becab91a76448… commit 1ad27c73becab91a764484122df2a7e0b3d22c33 Author: Nguyễn Thanh Sơn <41716684+Dummynosrev(a)users.noreply.github.com> AuthorDate: Fri Aug 3 17:10:16 2018 +0700 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 3 12:10:16 2018 +0200 [MSPAINT] Added Vietnamese translation. (#722) --- base/applications/mspaint/lang/vi-VN.rc | 228 ++++++++++++++++++++++++++++++++ base/applications/mspaint/rsrc.rc | 3 + 2 files changed, 231 insertions(+) diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc new file mode 100644 index 0000000000..12291f7669 --- /dev/null +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -0,0 +1,228 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint/lang/vi-VN.rc + * PURPOSE: VN-Vietnamese Language resource file + * TRANSLATORS: first times touched from en-US.rc file by Dummynosrev (Nguyễn Thanh Sơn) + */ + +LANGUAGE LANG_VIETNAMESE, SUBLANG_VIETNAMESE_VIETNAM + +ID_MENU MENU +BEGIN + POPUP "&Tập tin" + BEGIN + MENUITEM "&Mới\tCtrl+N", IDM_FILENEW + MENUITEM "&Mở...\tCtrl+O", IDM_FILEOPEN + MENUITEM "&Lưu\tCtrl+S", IDM_FILESAVE + MENUITEM "Lưu &Thành...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Từ Máy quét hay Máy ảnh...", IDM_FILEFROMSCANNERORCAMERA + MENUITEM SEPARATOR + MENUITEM "Xem trang", IDM_FILEPAGEVIEW + MENUITEM "Cài đặt trang...", IDM_FILEPAGESETUP + MENUITEM "&In...\tCtrl+P", IDM_FILEPRINT + MENUITEM SEPARATOR + MENUITEM "Gửi...", IDM_FILESEND + MENUITEM SEPARATOR + MENUITEM "Đặt làm hình nền (Xếp chồng)", IDM_FILEASWALLPAPERPLANE + MENUITEM "Đặt làm hình nền (Canh giữa)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "Đặt làm hình nền (Kéo giãn)", IDM_FILEASWALLPAPERSTRETCHED + MENUITEM SEPARATOR + MENUITEM "Tập tin đã dùng gần đây", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED + MENUITEM SEPARATOR + MENUITEM "T&hoát\tAlt+F4", IDM_FILEEXIT + END + POPUP "&Chỉnh sửa" + BEGIN + MENUITEM "&Quay về trạng thái trước\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Quay về trạng thái sau đó\tCtrl+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "Cắ&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Sao chép\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Dán\tCtrl+V", IDM_EDITPASTE + MENUITEM "Xó&a phần đã chọn\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Nghịch đảo phần chọn", IDM_EDITINVERTSELECTION + MENUITEM "Chọn &Tất cả\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "S&ao chép đến...", IDM_EDITCOPYTO + MENUITEM "Dán &từ...", IDM_EDITPASTEFROM + END + POPUP "&Xem" + BEGIN + MENUITEM "&Hộp dụng cụ\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "&Bảng màu\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "&Thanh trạng thái", IDM_VIEWSTATUSBAR, CHECKED + MENUITEM "T&hanh công cụ viết chữ", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM SEPARATOR + POPUP "&Thu/Phóng" + BEGIN + POPUP "&Tùy chỉnh" + BEGIN + MENUITEM "12.5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Hiện &đường kẻ\tCtrl+G", IDM_VIEWSHOWGRID + MENUITEM "H&iện ảnh nhỏ", IDM_VIEWSHOWMINIATURE + END + MENUITEM "&Toàn màn hình\tCtrl+F", IDM_VIEWFULLSCREEN + END + POPUP "&Hình ảnh" + BEGIN + MENUITEM "Xoay/&Lật hình ảnh...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Kéo dãn/Nghiêng...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Cắt hình ảnh", IDM_IMAGECROP + MENUITEM "&Nghịch đảo màu sắc (âm bản)\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Thuộc tính...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Xóa hình ảnh\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Vẽ nét mờ", IDM_IMAGEDRAWOPAQUE + END + POPUP "&Màu sắc" + BEGIN + MENUITEM "&Chỉnh sửa bảng màu...", IDM_COLORSEDITPALETTE + MENUITEM SEPARATOR + MENUITEM "Bảng màu hiện tại", IDM_COLORSMODERNPALETTE + MENUITEM "Bảng màu cũ", IDM_COLORSOLDPALETTE + END + POPUP "&Trợ giúp" + BEGIN + MENUITEM "&Trợ giúp về vấn đề...", IDM_HELPHELPTOPICS + MENUITEM SEPARATOR + MENUITEM "&Thông tin", IDM_HELPINFO + END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^N", IDM_FILENEW + "^O", IDM_FILEOPEN + "^S", IDM_FILESAVE + "^Z", IDM_EDITUNDO + "^Y", IDM_EDITREDO + "^X", IDM_EDITCUT + "^C", IDM_EDITCOPY + "^V", IDM_EDITPASTE + VK_DELETE, IDM_EDITDELETESELECTION, VIRTKEY + "^A", IDM_EDITSELECTALL + "^T", IDM_VIEWTOOLBOX + "^L", IDM_VIEWCOLORPALETTE + "^G", IDM_VIEWSHOWGRID + "^F", IDM_VIEWFULLSCREEN + "^R", IDM_IMAGEROTATEMIRROR + "^W", IDM_IMAGESTRETCHSKEW + "^I", IDM_IMAGEINVERTCOLORS + "^E", IDM_IMAGEATTRIBUTES + "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY +END + +IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Xoay và lật hình ảnh" +BEGIN + GROUPBOX "Xoay hoặc lật", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86 + AUTORADIOBUTTON "Lật hình ảnh &theo chiều ngang", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP + AUTORADIOBUTTON "Lật hình ảnh &theo chiều dọc", IDD_MIRRORROTATERB2, 12, 30, 100, 10 + AUTORADIOBUTTON "&Xoay hình ảnh theo một góc", IDD_MIRRORROTATERB3, 12, 42, 100, 10 + AUTORADIOBUTTON "&90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED + AUTORADIOBUTTON "&180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED + AUTORADIOBUTTON "&270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED + DEFPUSHBUTTON "Đồng ý", IDOK, 125, 8, 48, 14 + PUSHBUTTON "Hủy", IDCANCEL, 125, 24, 48, 14 +END + +IDD_ATTRIBUTES DIALOGEX 100, 100, 225, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Thuộc tính" +BEGIN + EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 + EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 + LTEXT "&Chiều rộng:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Chiều cao:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "Ngày tạo &tập tin:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "Kích thước &tập tin :", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "&Độ phân giải:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "Không có sẵn", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 + LTEXT "Không có sẵn", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 + LTEXT "Không có sẵn", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 + GROUPBOX "Đơn vị", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 + AUTORADIOBUTTON "&Inch (1 inch = 2,54 cm)", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "&Điểm ảnh", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + GROUPBOX "Màu sắc", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 + AUTORADIOBUTTON "&Đen trắng", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "Màu &sắc", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + DEFPUSHBUTTON "Đồng ý", IDOK, 170, 8, 48, 14 + PUSHBUTTON "Hủy", IDCANCEL, 170, 24, 48, 14 + PUSHBUTTON "Mặc định", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 +END + +IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Kéo dãn và nghiêng hình ảnh" +BEGIN + GROUPBOX "Kéo dãn theo chiều", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 + ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 + LTEXT "Ngang:", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10 + EDITTEXT IDD_STRETCHSKEWEDITHSTRETCH, 90, 23, 32, 12 + LTEXT "%", IDD_STRETCHSKEWTEXTHPERCENT, 125, 24, 15, 10 + ICON IDI_VERTSTRETCH, IDD_STRETCHSKEWICONVSTRETCH, 12, 43, 32, 32 + LTEXT "Dọc:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 + EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12 + LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10 + GROUPBOX "Nghiêng theo phương", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 + ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32 + LTEXT "Ngang:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 + EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12 + LTEXT "độ", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 + ICON IDI_VERTSKEW, IDD_STRETCHSKEWICONVSKEW, 12, 113, 32, 32 + LTEXT "Dọc:", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10 + EDITTEXT IDD_STRETCHSKEWEDITVSKEW, 90, 118, 32, 12 + LTEXT "độ", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 + DEFPUSHBUTTON "Đồng ý", IDOK, 170, 8, 48, 14 + PUSHBUTTON "Hủy", IDCANCEL, 170, 24, 48, 14 +END + +STRINGTABLE +BEGIN + IDS_PROGRAMNAME "Vẽ" + IDS_WINDOWTITLE "%s - Vẽ" + IDS_INFOTITLE "Trình Vẽ cho ReactOS" + IDS_INFOTEXT "Trình Vẽ cho ReactOS được cung cấp theo điều lệ trong GNU Lesser General Public License (LGPL, xem www.gnu.org)" + IDS_SAVEPROMPTTEXT "Bạn có muốn lưu lại những thay đổi trong %s?" + IDS_DEFAULTFILENAME "Khongten.bmp" + IDS_MINIATURETITLE "Ảnh nhỏ" + IDS_TOOLTIP1 "Chọn tự do" + IDS_TOOLTIP2 "Chọn" + IDS_TOOLTIP3 "Xóa" + IDS_TOOLTIP4 "Tô màu" + IDS_TOOLTIP5 "Chọn màu" + IDS_TOOLTIP6 "Thu nhỏ/Phóng to" + IDS_TOOLTIP7 "Bút chì" + IDS_TOOLTIP8 "Cọ vẽ" + IDS_TOOLTIP9 "Cọ khí" + IDS_TOOLTIP10 "Chữ" + IDS_TOOLTIP11 "Dòng" + IDS_TOOLTIP12 "Đường cong Bézier" + IDS_TOOLTIP13 "Hình vuông" + IDS_TOOLTIP14 "Hình đa giác" + IDS_TOOLTIP15 "Hình Elip" + IDS_TOOLTIP16 "Hình vuông góc vo tròn" + IDS_ALLFILES "Tất cả tập tin" + IDS_ALLPICTUREFILES "Tất cả tập tin hình ảnh" + IDS_FILESIZE "%d byte" + IDS_PRINTRES "%d x %d điểm ảnh trong một mét" + IDS_INTNUMBERS "Xin vui lòng chỉ nhập số tự nhiên khác không (0)!" + IDS_PERCENTAGE "Giá trị phần trăm phải ở giữa 1 và 500." + IDS_ANGLE "Giá trị của góc phải ở giữa -89 và 89." + IDS_LOADERRORTEXT "Không thể tải tập tin %s." + IDS_ENLARGEPROMPTTEXT "Hình ảnh bạn định dán lớn hơn hình bitmap này.\n Bạn có muốn nới rộng hình bitmap?" +END diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc index d237d385a9..0e9c0ffd3a 100644 --- a/base/applications/mspaint/rsrc.rc +++ b/base/applications/mspaint/rsrc.rc @@ -119,6 +119,9 @@ IDI_VERTSKEW ICON "icons/vertskew.ico" #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_VI_VN + #include "lang/vi-VN.rc" +#endif #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif

1 0

01/01: [INPUT] Fix a truncated text
by Bișoc George 03 Aug '18

03 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd4cc2c2ffc1ee1af74b6… commit dd4cc2c2ffc1ee1af74b60f1da10ec49f169a32a Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Thu Aug 2 15:32:30 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 3 12:08:41 2018 +0200 [INPUT] Fix a truncated text --- dll/cpl/input/lang/fr-FR.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/cpl/input/lang/fr-FR.rc b/dll/cpl/input/lang/fr-FR.rc index e8da479877..0bc0e2036c 100644 --- a/dll/cpl/input/lang/fr-FR.rc +++ b/dll/cpl/input/lang/fr-FR.rc @@ -37,7 +37,7 @@ BEGIN LTEXT "Action", -1, 14, 47, 60, 9 RTEXT "Séquence de touches", -1, 177, 47, 79, 9 CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE - PUSHBUTTON "&Changer la séquence de touches...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP + PUSHBUTTON "&Changer la séquence de touches...", IDC_CHANGE_KEY_SEQ_BTN, 140, 113, 118, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "Annuler", IDCANCEL, 146, 140, 70, 14 END @@ -65,12 +65,12 @@ BEGIN LTEXT "Maj", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 - AUTORADIOBUTTON "&ALT Gauche", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTORADIOBUTTON "&ALT Gauche", IDC_LEFT_ALT_LANG, 29, 45, 50, 12 AUTOCHECKBOX "Changer les dispositions clavier", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 LTEXT "Maj", -1, 74, 87, 27, 12 CTEXT "+", -1, 63, 87, 8, 9 AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 - AUTORADIOBUTTON "A&LT Gauche", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + AUTORADIOBUTTON "A&LT Gauche", IDC_LEFT_ALT_LAYOUT, 30, 95, 50, 12 DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 172, 27, 50, 14 END

1 0

01/01: [I8042PRT] Move DMI/SMBIOS parsing functions into library
by Stanislav Motylkov 02 Aug '18

02 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0854c69a7537bbe47b641… commit 0854c69a7537bbe47b641216f24b93da6b17cc7a Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jul 31 00:22:35 2018 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 2 21:29:57 2018 +0200 [I8042PRT] Move DMI/SMBIOS parsing functions into library --- drivers/input/i8042prt/CMakeLists.txt | 4 + drivers/input/i8042prt/hwhacks.c | 119 +---------------------- sdk/lib/CMakeLists.txt | 1 + sdk/lib/dmilib/CMakeLists.txt | 8 ++ {drivers/input/i8042prt => sdk/lib/dmilib}/dmi.h | 7 ++ sdk/lib/dmilib/dmilib.c | 113 +++++++++++++++++++++ sdk/lib/dmilib/dmilib.h | 34 +++++++ sdk/lib/dmilib/precomp.h | 9 ++ 8 files changed, 179 insertions(+), 116 deletions(-) diff --git a/drivers/input/i8042prt/CMakeLists.txt b/drivers/input/i8042prt/CMakeLists.txt index 2e8c6ee9ab..808367f069 100644 --- a/drivers/input/i8042prt/CMakeLists.txt +++ b/drivers/input/i8042prt/CMakeLists.txt @@ -1,4 +1,7 @@ +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/lib/dmilib) + list(APPEND SOURCE createclose.c hwhacks.c @@ -18,6 +21,7 @@ add_library(i8042prt SHARED i8042prt.rc) set_module_type(i8042prt kernelmodedriver) +target_link_libraries(i8042prt dmilib) add_importlibs(i8042prt ntoskrnl hal) add_pch(i8042prt i8042prt.h SOURCE) add_cd_file(TARGET i8042prt DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/input/i8042prt/hwhacks.c b/drivers/input/i8042prt/hwhacks.c index 885f0a25a5..d6d81f20aa 100644 --- a/drivers/input/i8042prt/hwhacks.c +++ b/drivers/input/i8042prt/hwhacks.c @@ -12,7 +12,7 @@ #include <wmiguid.h> #include <wmidata.h> #include <wmistr.h> -#include "dmi.h" +#include <dmilib.h> #define NDEBUG #include <debug.h> @@ -21,25 +21,6 @@ const GUID MSSmBios_RawSMBiosTables_GUID = SMBIOS_DATA_GUID; PVOID i8042SMBiosTables; ULONG i8042HwFlags; -enum _ID_STRINGS -{ - ID_NONE = 0, - BIOS_VENDOR, - BIOS_VERSION, - BIOS_DATE, - SYS_VENDOR, - SYS_PRODUCT, - SYS_VERSION, - SYS_SERIAL, - BOARD_VENDOR, - BOARD_NAME, - BOARD_VERSION, - BOARD_SERIAL, - BOARD_ASSET_TAG, - - ID_STRINGS_MAX, -}; - typedef struct _MATCHENTRY { ULONG Type; @@ -75,110 +56,16 @@ const HARDWARE_TABLE i8042HardwareTable[] = -static -PCHAR -GetDmiString( - _In_ PDMI_HEADER Header, - _In_ ULONG FieldOffset) -{ - ULONG StringIndex; - PCHAR String; - - StringIndex = ((PUCHAR)Header)[FieldOffset]; - if (StringIndex == 0) - { - return NULL; - } - - String = (PCHAR)Header + Header->Length; - - while (--StringIndex != 0) - { - while (*String != 0) - String++; - - String++; - } - - return String; -} - - static VOID i8042ParseSMBiosTables( _In_reads_bytes_(TableSize) PVOID SMBiosTables, _In_ ULONG TableSize) { - PMSSmBios_RawSMBiosTables BiosTablesHeader = SMBiosTables; - PDMI_HEADER Header; - ULONG Remaining, i, j; - PCHAR Data; + ULONG i, j; PCHAR Strings[ID_STRINGS_MAX] = { 0 }; - Header = (PDMI_HEADER)(&BiosTablesHeader->SMBiosData); - Remaining = BiosTablesHeader->Size; - - while (Remaining >= sizeof(*Header)) - { - - if (Header->Type == DMI_ENTRY_END_OF_TABLE) - break; - - switch (Header->Type) - { - case DMI_ENTRY_BIOS: - if (Remaining < DMI_BIOS_SIZE) - return; - Strings[BIOS_VENDOR] = GetDmiString(Header, DMI_BIOS_VENDOR); - Strings[BIOS_VERSION] = GetDmiString(Header, DMI_BIOS_VERSION); - Strings[BIOS_DATE] = GetDmiString(Header, DMI_BIOS_DATE); - break; - - case DMI_ENTRY_SYSTEM: - if (Remaining < DMI_SYS_SIZE) - return; - Strings[SYS_VENDOR] = GetDmiString(Header, DMI_SYS_VENDOR); - Strings[SYS_PRODUCT] = GetDmiString(Header, DMI_SYS_PRODUCT); - Strings[SYS_VERSION] = GetDmiString(Header, DMI_SYS_VERSION); - Strings[SYS_SERIAL] = GetDmiString(Header, DMI_SYS_SERIAL); - break; - - case DMI_ENTRY_BASEBOARD: - if (Remaining < DMI_BOARD_SIZE) - return; - Strings[BOARD_VENDOR] = GetDmiString(Header, DMI_BOARD_VENDOR); - Strings[BOARD_NAME] = GetDmiString(Header, DMI_BOARD_NAME); - Strings[BOARD_VERSION] = GetDmiString(Header, DMI_BOARD_VERSION); - Strings[BOARD_SERIAL] = GetDmiString(Header, DMI_BOARD_SERIAL); - Strings[BOARD_ASSET_TAG] = GetDmiString(Header, DMI_BOARD_ASSET_TAG); - break; - - case DMI_ENTRY_CHASSIS: - case DMI_ENTRY_ONBOARD_DEVICE: - case DMI_ENTRY_OEMSTRINGS: - // DMI_ENTRY_IPMI_DEV? - // DMI_ENTRY_ONBOARD_DEV_EXT? - break; - } - - Remaining -= Header->Length; - Data = (PCHAR)Header + Header->Length; - - /* Now loop until we find 2 zeroes */ - while ((Remaining >= 2) && ((Data[0] != 0) || (Data[1] != 0))) - { - Data++; - Remaining--; - } - - if (Remaining < 2) - break; - - /* Go to the next header */ - Remaining -= 2; - Header = (PDMI_HEADER)((PUCHAR)Data + 2); - } + ParseSMBiosTables(SMBiosTables, TableSize, Strings); #if 0 // DBG DbgPrint("i8042prt: Dumping DMI data:\n"); diff --git a/sdk/lib/CMakeLists.txt b/sdk/lib/CMakeLists.txt index 700a332f30..99c68493aa 100644 --- a/sdk/lib/CMakeLists.txt +++ b/sdk/lib/CMakeLists.txt @@ -18,6 +18,7 @@ if(MSVC) endif() add_subdirectory(delayimp) +add_subdirectory(dmilib) #add_subdirectory(dnslib) Nothing links to this lib. add_subdirectory(drivers) add_subdirectory(dxguid) diff --git a/sdk/lib/dmilib/CMakeLists.txt b/sdk/lib/dmilib/CMakeLists.txt new file mode 100644 index 0000000000..a3ad96ca00 --- /dev/null +++ b/sdk/lib/dmilib/CMakeLists.txt @@ -0,0 +1,8 @@ + +list(APPEND SOURCE + dmilib.c + precomp.h) + +add_library(dmilib ${SOURCE}) +add_pch(dmilib precomp.h SOURCE) +add_dependencies(dmilib psdk) diff --git a/drivers/input/i8042prt/dmi.h b/sdk/lib/dmilib/dmi.h similarity index 91% rename from drivers/input/i8042prt/dmi.h rename to sdk/lib/dmilib/dmi.h index ba562e50a3..855b69703e 100644 --- a/drivers/input/i8042prt/dmi.h +++ b/sdk/lib/dmilib/dmi.h @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS DMI/SMBIOS Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dmi.h + * PURPOSE: SMBIOS table parsing functions + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ #pragma once diff --git a/sdk/lib/dmilib/dmilib.c b/sdk/lib/dmilib/dmilib.c new file mode 100644 index 0000000000..7571fcaf71 --- /dev/null +++ b/sdk/lib/dmilib/dmilib.c @@ -0,0 +1,113 @@ +/* + * PROJECT: ReactOS DMI/SMBIOS Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dmilib.c + * PURPOSE: SMBIOS table parsing functions + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * REFERENCES: http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.0.0.p… + */ + +#include "precomp.h" + +static +PCHAR +GetDmiString( + _In_ PDMI_HEADER Header, + _In_ ULONG FieldOffset) +{ + ULONG StringIndex; + PCHAR String; + + StringIndex = ((PUCHAR)Header)[FieldOffset]; + if (StringIndex == 0) + { + return NULL; + } + + String = (PCHAR)Header + Header->Length; + + while (--StringIndex != 0) + { + while (*String != 0) + String++; + + String++; + } + + return String; +} + +VOID +ParseSMBiosTables( + _In_reads_bytes_(TableSize) PVOID SMBiosTables, + _In_ ULONG TableSize, + _Inout_updates_(ID_STRINGS_MAX) PCHAR * Strings) +{ + PMSSmBios_RawSMBiosTables BiosTablesHeader = SMBiosTables; + PDMI_HEADER Header; + ULONG Remaining; + PCHAR Data; + + Header = (PDMI_HEADER)(&BiosTablesHeader->SMBiosData); + Remaining = BiosTablesHeader->Size; + + while (Remaining >= sizeof(*Header)) + { + if (Header->Type == DMI_ENTRY_END_OF_TABLE) + break; + + switch (Header->Type) + { + case DMI_ENTRY_BIOS: + if (Remaining < DMI_BIOS_SIZE) + return; + Strings[BIOS_VENDOR] = GetDmiString(Header, DMI_BIOS_VENDOR); + Strings[BIOS_VERSION] = GetDmiString(Header, DMI_BIOS_VERSION); + Strings[BIOS_DATE] = GetDmiString(Header, DMI_BIOS_DATE); + break; + + case DMI_ENTRY_SYSTEM: + if (Remaining < DMI_SYS_SIZE) + return; + Strings[SYS_VENDOR] = GetDmiString(Header, DMI_SYS_VENDOR); + Strings[SYS_PRODUCT] = GetDmiString(Header, DMI_SYS_PRODUCT); + Strings[SYS_VERSION] = GetDmiString(Header, DMI_SYS_VERSION); + Strings[SYS_SERIAL] = GetDmiString(Header, DMI_SYS_SERIAL); + break; + + case DMI_ENTRY_BASEBOARD: + if (Remaining < DMI_BOARD_SIZE) + return; + Strings[BOARD_VENDOR] = GetDmiString(Header, DMI_BOARD_VENDOR); + Strings[BOARD_NAME] = GetDmiString(Header, DMI_BOARD_NAME); + Strings[BOARD_VERSION] = GetDmiString(Header, DMI_BOARD_VERSION); + Strings[BOARD_SERIAL] = GetDmiString(Header, DMI_BOARD_SERIAL); + Strings[BOARD_ASSET_TAG] = GetDmiString(Header, DMI_BOARD_ASSET_TAG); + break; + + case DMI_ENTRY_CHASSIS: + case DMI_ENTRY_ONBOARD_DEVICE: + case DMI_ENTRY_OEMSTRINGS: + // DMI_ENTRY_IPMI_DEV? + // DMI_ENTRY_ONBOARD_DEV_EXT? + break; + } + + Remaining -= Header->Length; + Data = (PCHAR)Header + Header->Length; + + /* Now loop until we find 2 zeroes */ + while ((Remaining >= 2) && ((Data[0] != 0) || (Data[1] != 0))) + { + Data++; + Remaining--; + } + + if (Remaining < 2) + break; + + /* Go to the next header */ + Remaining -= 2; + Header = (PDMI_HEADER)((PUCHAR)Data + 2); + } +} diff --git a/sdk/lib/dmilib/dmilib.h b/sdk/lib/dmilib/dmilib.h new file mode 100644 index 0000000000..22f2331725 --- /dev/null +++ b/sdk/lib/dmilib/dmilib.h @@ -0,0 +1,34 @@ +/* + * PROJECT: ReactOS DMI/SMBIOS Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dmilib.h + * PURPOSE: SMBIOS table parsing functions + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#pragma once + +enum _ID_STRINGS +{ + ID_NONE = 0, + BIOS_VENDOR, + BIOS_VERSION, + BIOS_DATE, + SYS_VENDOR, + SYS_PRODUCT, + SYS_VERSION, + SYS_SERIAL, + BOARD_VENDOR, + BOARD_NAME, + BOARD_VERSION, + BOARD_SERIAL, + BOARD_ASSET_TAG, + + ID_STRINGS_MAX, +}; + +VOID +ParseSMBiosTables( + _In_reads_bytes_(TableSize) PVOID SMBiosTables, + _In_ ULONG TableSize, + _Inout_updates_(ID_STRINGS_MAX) PCHAR * Strings); diff --git a/sdk/lib/dmilib/precomp.h b/sdk/lib/dmilib/precomp.h new file mode 100644 index 0000000000..550611e4fc --- /dev/null +++ b/sdk/lib/dmilib/precomp.h @@ -0,0 +1,9 @@ +#ifndef _DMILIB_PCH_ +#define _DMILIB_PCH_ + +#include <ntdef.h> +#include <wmidata.h> +#include "dmi.h" +#include "dmilib.h" + +#endif /* _DMILIB_PCH_ */

1 0

03/03: [KERNEL32] Implement System Firmware functions
by Stanislav Motylkov 02 Aug '18

02 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d956eafda8b91384537fa… commit d956eafda8b91384537fa4a167f2e9ebb600915f Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Jul 29 23:50:15 2018 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 2 21:15:28 2018 +0200 [KERNEL32] Implement System Firmware functions - Implement EnumSystemFirmwareTables - Implement GetSystemFirmwareTable These functions currently using registry workaround and can be improved later. CORE-12105 --- dll/win32/kernel32/client/sysinfo.c | 282 +++++++++++++++++++++++++++++++++++- 1 file changed, 274 insertions(+), 8 deletions(-) diff --git a/dll/win32/kernel32/client/sysinfo.c b/dll/win32/kernel32/client/sysinfo.c index f57717a33d..92474d050a 100644 --- a/dll/win32/kernel32/client/sysinfo.c +++ b/dll/win32/kernel32/client/sysinfo.c @@ -7,6 +7,7 @@ * Christoph von Wittich * Thomas Weidenmueller * Gunnar Andre Dalsnes + * Stanislav Motylkov */ /* INCLUDES *******************************************************************/ @@ -74,6 +75,82 @@ GetSystemInfoInternal(IN PSYSTEM_BASIC_INFORMATION BasicInfo, } } +UINT +WINAPI +GetRawSMBiosTableFromRegistry(OUT PVOID pData) +{ + static const LPCWSTR RegistryKey = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\mssmbios\\Data"; + static const LPCWSTR ValueNameStr = L"SMBiosData"; + + PKEY_VALUE_PARTIAL_INFORMATION KeyInfo = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE KeyHandle; + ULONG KeyInfoSize; + ULONG ReturnSize = 0; + NTSTATUS Status; + + RtlInitUnicodeString(&KeyName, RegistryKey); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenKey(&KeyHandle, + KEY_READ, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return 0; + } + + // 256 KiB is more than enough for raw SMBIOS dump + KeyInfoSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 256 * 1024; + KeyInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, KeyInfoSize); + if (KeyInfo == NULL) + { + NtClose(KeyHandle); + goto cleanup; + } + + RtlInitUnicodeString(&ValueName, ValueNameStr); + + Status = NtQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + KeyInfo, + KeyInfoSize, + &ReturnSize); + + NtClose(KeyHandle); + ReturnSize = 0; + + if (!NT_SUCCESS(Status)) + { + goto cleanup; + } + + if (KeyInfo->Type != REG_BINARY) + { + goto cleanup; + } + + ReturnSize = KeyInfo->DataLength; + if (pData) + { + RtlCopyMemory(pData, KeyInfo->Data, KeyInfo->DataLength); + } + +cleanup: + if (KeyInfo) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); + } + return ReturnSize; +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -423,8 +500,32 @@ SetFirmwareEnvironmentVariableA(IN LPCSTR lpName, return 0; } -/* - * @unimplemented +/** + * @name EnumSystemFirmwareTables + * @implemented + * + * Obtains firmware table identifiers. + * https://msdn.microsoft.com/en-us/library/windows/desktop/ms724259(v=vs.85).… + * + * @param FirmwareTableProviderSignature + * Can be either ACPI, FIRM, or RSMB. + * + * @param pFirmwareTableBuffer + * Pointer to the output buffer, can be NULL. + * + * @param BufferSize + * Size of the output buffer. + * + * @return + * Actual size of the data in case of success, 0 otherwise. + * + * @remarks + * Data would be written to buffer only if the specified size is + * larger or equal to the actual size, in the other case Last Error + * value would be set to ERROR_INSUFFICIENT_BUFFER. + * In case of incorrect provider signature, Last Error value would be + * set to ERROR_INVALID_FUNCTION. + * */ UINT WINAPI @@ -432,12 +533,104 @@ EnumSystemFirmwareTables(IN DWORD FirmwareTableProviderSignature, OUT PVOID pFirmwareTableBuffer, IN DWORD BufferSize) { - STUB; - return 0; + UINT uSize = 0; + UINT uCount = 0; + DWORD dwError = ERROR_SUCCESS; + PDWORD pBuffer = NULL; + + switch (FirmwareTableProviderSignature) + { + case 'ACPI': + { + /* FIXME: Not implemented yet */ + dwError = ERROR_CALL_NOT_IMPLEMENTED; + break; + } + case 'FIRM': + { + /* FIXME: Not implemented yet */ + dwError = ERROR_CALL_NOT_IMPLEMENTED; + break; + } + case 'RSMB': + { + if (GetRawSMBiosTableFromRegistry(NULL) > 0) + { + uCount = 1; + uSize = uCount * sizeof(DWORD); + pBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, uSize); + if (!pBuffer) + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + *pBuffer = 0; + } + break; + } + default: + { + dwError = ERROR_INVALID_FUNCTION; + } + } + + if (dwError == ERROR_SUCCESS) + { + if (uSize > 0 && BufferSize >= uSize) + { + /* Write to buffer */ + if (pFirmwareTableBuffer) + { + RtlMoveMemory(pFirmwareTableBuffer, pBuffer, uSize); + } + } + else if (BufferSize < uSize) + { + dwError = ERROR_INSUFFICIENT_BUFFER; + } + } + + if (pBuffer) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pBuffer); + } + SetLastError(dwError); + return uSize; } -/* - * @unimplemented +/** + * @name GetSystemFirmwareTable + * @implemented + * + * Obtains the firmware table data. + * https://msdn.microsoft.com/en-us/library/windows/desktop/ms724379(v=vs.85).… + * + * @param FirmwareTableProviderSignature + * Can be either ACPI, FIRM, or RSMB. + * + * @param FirmwareTableID + * Correct table identifier. + * + * @param pFirmwareTableBuffer + * Pointer to the output buffer, can be NULL. + * + * @param BufferSize + * Size of the output buffer. + * + * @return + * Actual size of the data in case of success, 0 otherwise. + * + * @remarks + * Data would be written to buffer only if the specified size is + * larger or equal to the actual size, in the other case Last Error + * value would be set to ERROR_INSUFFICIENT_BUFFER. + * In case of incorrect provider signature, Last Error value would be + * set to ERROR_INVALID_FUNCTION. + * Also Last Error value becomes ERROR_NOT_FOUND if incorrect + * table identifier was specified along with ACPI provider, and + * ERROR_INVALID_PARAMETER along with FIRM provider. The RSMB provider + * accepts any table identifier. + * */ UINT WINAPI @@ -446,8 +639,81 @@ GetSystemFirmwareTable(IN DWORD FirmwareTableProviderSignature, OUT PVOID pFirmwareTableBuffer, IN DWORD BufferSize) { - STUB; - return 0; + /* This function currently obtains data using a hack (registry workaround) + which is located here: drivers/input/i8042prt/hwhacks.c + i8042StoreSMBiosTables is responsible for writing SMBIOS table into registry + + Should be implemented correctly using NtQuerySystemInformation + along with SystemFirmwareTableInformation class + + Reference: https://github.com/hfiref0x/VMDE/blob/master/src/vmde/sup.c + */ + + UINT uSize = 0; + DWORD dwError = ERROR_SUCCESS; + PVOID pBuffer = NULL; + + switch (FirmwareTableProviderSignature) + { + case 'ACPI': + { + /* FIXME: Not implemented yet */ + dwError = ERROR_CALL_NOT_IMPLEMENTED; + break; + } + case 'FIRM': + { + /* FIXME: Not implemented yet */ + dwError = ERROR_CALL_NOT_IMPLEMENTED; + break; + } + case 'RSMB': + { + uSize = GetRawSMBiosTableFromRegistry(NULL); + if (uSize > 0) + { + pBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, uSize); + if (!pBuffer) + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + GetRawSMBiosTableFromRegistry(pBuffer); + } + else + { + dwError = ERROR_NOT_FOUND; + } + break; + } + default: + { + dwError = ERROR_INVALID_FUNCTION; + } + } + + if (dwError == ERROR_SUCCESS) + { + if (uSize > 0 && BufferSize >= uSize) + { + /* Write to buffer */ + if (pFirmwareTableBuffer) + { + RtlMoveMemory(pFirmwareTableBuffer, pBuffer, uSize); + } + } + else if (BufferSize < uSize) + { + dwError = ERROR_INSUFFICIENT_BUFFER; + } + } + + if (pBuffer) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pBuffer); + } + SetLastError(dwError); + return uSize; } /*

1 0

02/03: [KERNEL32_APITEST] Add SystemFirmware tests
by Stanislav Motylkov 02 Aug '18

02 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8acc68dd986316b59061c… commit 8acc68dd986316b59061cb2d3e8b8a312a7c93d6 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Jul 29 17:43:10 2018 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 2 21:15:28 2018 +0200 [KERNEL32_APITEST] Add SystemFirmware tests CORE-12105 --- modules/rostests/apitests/kernel32/CMakeLists.txt | 1 + .../rostests/apitests/kernel32/SystemFirmware.c | 466 +++++++++++++++++++++ modules/rostests/apitests/kernel32/testlist.c | 2 + 3 files changed, 469 insertions(+) diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index c329031929..37c5b6adc8 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -28,6 +28,7 @@ list(APPEND SOURCE SetConsoleWindowInfo.c SetCurrentDirectory.c SetUnhandledExceptionFilter.c + SystemFirmware.c TerminateProcess.c TunnelCache.c WideCharToMultiByte.c diff --git a/modules/rostests/apitests/kernel32/SystemFirmware.c b/modules/rostests/apitests/kernel32/SystemFirmware.c new file mode 100644 index 0000000000..5ba946d815 --- /dev/null +++ b/modules/rostests/apitests/kernel32/SystemFirmware.c @@ -0,0 +1,466 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for System Firmware functions + * COPYRIGHT: Copyright 2018 Stanislav Motylkov + */ + +#include "precomp.h" + +static UINT (WINAPI * pEnumSystemFirmwareTables)(DWORD, PVOID, DWORD); +static UINT (WINAPI * pGetSystemFirmwareTable)(DWORD, DWORD, PVOID, DWORD); + +typedef struct ENTRY +{ + DWORD Signature; + DWORD ErrInsuff; + DWORD ErrSuccess; +} ENTRY; + +static +VOID +test_EnumBuffer( + DWORD Signature, + PVOID Buffer, + DWORD dwSize, + UINT * pTableCount, + DWORD * pFirstTableID, + DWORD ErrInsuff, + DWORD ErrSuccess +) +{ + DWORD dwError; + DWORD dwBufferSize; + DWORD dwException; + UINT uResultSize; + + dwException = Buffer && IsBadWritePtr(Buffer, dwSize) ? STATUS_ACCESS_VIOLATION : STATUS_SUCCESS; + + // Test size = 0 + if (Buffer && dwException == STATUS_SUCCESS) + { + FillMemory(Buffer, dwSize, 0xFF); + } + SetLastError(0xbeeffeed); + dwError = GetLastError(); + dwBufferSize = 0; + uResultSize = 0; + StartSeh() + uResultSize = pEnumSystemFirmwareTables(Signature, Buffer, dwBufferSize); + dwError = GetLastError(); + EndSeh(STATUS_SUCCESS); + + if (uResultSize > 0) + { + ok(dwError == ErrInsuff, + "GetLastError() returned %ld, expected %ld\n", + dwError, ErrInsuff); + } + else + { + ok(dwError == ErrSuccess, + "GetLastError() returned %ld, expected %ld\n", + dwError, ErrSuccess); + } + if (ErrSuccess == ERROR_SUCCESS) + { + ok(uResultSize % sizeof(DWORD) == 0, + "uResultSize is %u, expected %% sizeof(DWORD)\n", + uResultSize); + } + else + { + ok(uResultSize == 0, + "uResultSize is %u, expected == 0\n", + uResultSize); + } + if (Buffer && dwException == STATUS_SUCCESS) + { + ok(*(BYTE *)Buffer == 0xFF, + "Buffer should be clean at offset 0, got %x\n", + *(BYTE *)Buffer); + } + + // Test size = 2 + if (Buffer && dwException == STATUS_SUCCESS) + { + FillMemory(Buffer, dwSize, 0xFF); + } + SetLastError(0xbeeffeed); + dwError = GetLastError(); + dwBufferSize = 2; + uResultSize = 0; + StartSeh() + uResultSize = pEnumSystemFirmwareTables(Signature, Buffer, dwBufferSize); + dwError = GetLastError(); + EndSeh(STATUS_SUCCESS); + + if (uResultSize > 0) + { + ok(dwError == ErrInsuff, + "GetLastError() returned %ld, expected %ld\n", + dwError, ErrInsuff); + } + else + { + ok(dwError == ErrSuccess, + "GetLastError() returned %ld, expected %ld\n", + dwError, ErrSuccess); + } + if (ErrSuccess == ERROR_SUCCESS) + { + ok(uResultSize % sizeof(DWORD) == 0, + "uResultSize is %u, expected %% sizeof(DWORD)\n", + uResultSize); + } + else + { + ok(uResultSize == 0, + "uResultSize is %u, expected == 0\n", + uResultSize); + } + if (Buffer && dwException == STATUS_SUCCESS) + { + ok(*(WORD *)Buffer == 0xFFFF, + "Buffer should be clean at offset 0, got %x\n", + *(WORD *)Buffer); + } + + // Test full size + if (Buffer && dwException == STATUS_SUCCESS) + { + FillMemory(Buffer, dwSize, 0xFF); + } + if (uResultSize > 0) + { + SetLastError(0xbeeffeed); + dwError = GetLastError(); + dwBufferSize = uResultSize; + uResultSize = 0; + StartSeh() + uResultSize = pEnumSystemFirmwareTables(Signature, Buffer, dwBufferSize); + dwError = GetLastError(); + EndSeh(ErrSuccess == ERROR_SUCCESS ? dwException : STATUS_SUCCESS); + // Windows 7: does not throw exception here + + if (dwException == STATUS_SUCCESS || ErrSuccess == ERROR_INVALID_FUNCTION) + { + ok(dwError == ErrSuccess, + "GetLastError() returned %ld, expected %ld\n", + dwError, ErrSuccess); + if (ErrSuccess == ERROR_SUCCESS) + { + ok(uResultSize == dwBufferSize, + "uResultSize is not equal dwBufferSize, expected %ld\n", + dwBufferSize); + } + else + { + ok(uResultSize == 0, + "uResultSize is %u, expected == 0\n", + uResultSize); + } + } + else + { + // Windows 7: returns ERROR_NOACCESS here + ok(dwError == 0xbeeffeed, + "GetLastError() returned %ld, expected %u\n", + dwError, 0xbeeffeed); + // Windows 7: returns correct size here + ok(uResultSize == 0, + "uResultSize is %u, expected == 0\n", + uResultSize); + } + } + + if (pTableCount && pFirstTableID) + { + if (uResultSize > 0) + { + if (Signature == 'RSMB') + { + // Raw SMBIOS have only one table with ID 0 + ok(*(DWORD *)Buffer == 0, + "Buffer should be filled at offset 0, got %lx\n", + *(DWORD *)Buffer); + } + else + { + // In other cases ID can be different + if (ErrSuccess == ERROR_SUCCESS) + { + ok(*(DWORD *)Buffer != 0xFFFFFFFF, + "Buffer should be filled at offset 0\n"); + } + else + { + ok(*(DWORD *)Buffer == 0xFFFFFFFF, + "Buffer should be clean at offset 0\n"); + } + } + } + *pTableCount = uResultSize / sizeof(DWORD); + *pFirstTableID = *(DWORD *)Buffer; + } +} + +static +VOID +test_GetBuffer( + DWORD Signature, + DWORD TableID, + PVOID Buffer, + DWORD dwSize, + BOOL TestFakeID, + DWORD ErrInsuff, + DWORD ErrSuccess +) +{ + DWORD dwError; + DWORD dwBufferSize; + DWORD dwException; + DWORD dwErrCase; + UINT uResultSize; + + dwException = Buffer && IsBadWritePtr(Buffer, dwSize) ? STATUS_ACCESS_VIOLATION : STATUS_SUCCESS; + switch (Signature) + { + case 'ACPI': + { + dwErrCase = ERROR_NOT_FOUND; + break; + } + case 'FIRM': + { + dwErrCase = ERROR_INVALID_PARAMETER; + break; + } + default: + { + dwErrCase = ErrInsuff; + } + } + + // Test size = 0 + if (Buffer && dwException == STATUS_SUCCESS) + { + FillMemory(Buffer, dwSize, 0xFF); + } + SetLastError(0xbeeffeed); + dwError = GetLastError(); + dwBufferSize = 0; + uResultSize = 0; + StartSeh() + uResultSize = pGetSystemFirmwareTable(Signature, TableID, Buffer, dwBufferSize); + dwError = GetLastError(); + EndSeh(STATUS_SUCCESS); + + ok(dwError == (TestFakeID ? dwErrCase : ErrInsuff), + "GetLastError() returned %ld, expected %ld\n", + dwError, (TestFakeID ? dwErrCase : ErrInsuff)); + if (ErrSuccess == ERROR_SUCCESS && (!TestFakeID || dwErrCase == ErrInsuff)) + { + ok(uResultSize > 0, + "uResultSize is %u, expected > 0\n", + uResultSize); + } + else + { + ok(uResultSize == 0, + "uResultSize is %u, expected == 0\n", + uResultSize); + } + if (Buffer && dwException == STATUS_SUCCESS) + { + ok(*(BYTE *)Buffer == 0xFF, + "Buffer should be clean at offset 0, got %x\n", + *(BYTE *)Buffer); + } + + // Test size = 2 + if (Buffer && dwException == STATUS_SUCCESS) + { + FillMemory(Buffer, dwSize, 0xFF); + } + SetLastError(0xbeeffeed); + dwError = GetLastError(); + dwBufferSize = 2; + uResultSize = 0; + StartSeh() + uResultSize = pGetSystemFirmwareTable(Signature, TableID, Buffer, dwBufferSize); + dwError = GetLastError(); + EndSeh(STATUS_SUCCESS); + + ok(dwError == (TestFakeID ? dwErrCase : ErrInsuff), + "GetLastError() returned %ld, expected %ld\n", + dwError, (TestFakeID ? dwErrCase : ErrInsuff)); + if (ErrSuccess == ERROR_SUCCESS && (!TestFakeID || dwErrCase == ErrInsuff)) + { + ok(uResultSize > 0, + "uResultSize is %u, expected > 0\n", + uResultSize); + } + else + { + ok(uResultSize == 0, + "uResultSize is %u, expected == 0\n", + uResultSize); + } + if (Buffer && dwException == STATUS_SUCCESS) + { + ok(*(WORD *)Buffer == 0xFFFF, + "Buffer should be clean at offset 0, got %x\n", + *(WORD *)Buffer); + } + + // Test full size + if (Buffer && dwException == STATUS_SUCCESS) + { + FillMemory(Buffer, dwSize, 0xFF); + } + if (uResultSize == 0) + { + return; + } + SetLastError(0xbeeffeed); + dwError = GetLastError(); + dwBufferSize = uResultSize; + uResultSize = 0; + StartSeh() + uResultSize = pGetSystemFirmwareTable(Signature, TableID, Buffer, dwBufferSize); + dwError = GetLastError(); + EndSeh(ErrSuccess == ERROR_SUCCESS ? dwException : STATUS_SUCCESS); + // Windows 7: does not throw exception here + + if (dwException == STATUS_SUCCESS || ErrSuccess == ERROR_INVALID_FUNCTION) + { + ok(dwError == ErrSuccess, + "GetLastError() returned %ld, expected %ld\n", + dwError, ErrSuccess); + if (ErrSuccess == ERROR_SUCCESS) + { + ok(uResultSize == dwBufferSize, + "uResultSize is not equal dwBufferSize, expected %ld\n", + dwBufferSize); + } + else + { + ok(uResultSize == 0, + "uResultSize is %u, expected == 0\n", + uResultSize); + } + } + else + { + // Windows 7: returns ERROR_NOACCESS here + ok(dwError == 0xbeeffeed, + "GetLastError() returned %ld, expected %u\n", + dwError, 0xbeeffeed); + // Windows 7: returns correct size here + ok(uResultSize == 0, + "uResultSize is %u, expected == 0\n", + uResultSize); + } + + if (Buffer && dwException == STATUS_SUCCESS) + { + if (ErrSuccess == ERROR_SUCCESS) + { + ok(*(DWORD *)Buffer != 0xFFFFFFFF, + "Buffer should be filled at offset 0\n"); + } + else + { + ok(*(DWORD *)Buffer == 0xFFFFFFFF, + "Buffer should be clean at offset 0\n"); + } + } +} + +START_TEST(SystemFirmware) +{ + static const ENTRY Entries[] = + { + { 'ACPI', ERROR_INSUFFICIENT_BUFFER, ERROR_SUCCESS }, + { 'FIRM', ERROR_INSUFFICIENT_BUFFER, ERROR_SUCCESS }, + { 'RSMB', ERROR_INSUFFICIENT_BUFFER, ERROR_SUCCESS }, + /* This entry should be last */ + { 0xDEAD, ERROR_INVALID_FUNCTION, ERROR_INVALID_FUNCTION }, + }; + HANDLE hKernel; + CHAR Buffer[262144]; // 256 KiB should be enough + CHAR Sign[sizeof(DWORD) + 1]; + UINT TableCount[_countof(Entries)]; + DWORD FirstTableID[_countof(Entries)]; + int i; + + hKernel = GetModuleHandleW(L"kernel32.dll"); + if (!hKernel) + { + skip("kernel32.dll module not found. Can't proceed\n"); + return; + } + + pEnumSystemFirmwareTables = (void *)GetProcAddress(hKernel, "EnumSystemFirmwareTables"); + pGetSystemFirmwareTable = (void *)GetProcAddress(hKernel, "GetSystemFirmwareTable"); + + if (!pEnumSystemFirmwareTables) + { + skip("EnumSystemFirmwareTables not found. Can't proceed\n"); + return; + } + if (!pGetSystemFirmwareTable) + { + skip("GetSystemFirmwareTable not found. Can't proceed\n"); + return; + } + + // Test EnumSystemFirmwareTables + for (i = 0; i < _countof(Entries); i++) + { + // Test with NULL buffer + test_EnumBuffer(Entries[i].Signature, NULL, sizeof(Buffer), NULL, NULL, + Entries[i].ErrInsuff, Entries[i].ErrSuccess); + // Test with wrong buffer + test_EnumBuffer(Entries[i].Signature, (PVOID *)0xbeeffeed, sizeof(Buffer), NULL, NULL, + Entries[i].ErrInsuff, Entries[i].ErrSuccess); + // Test with correct buffer + test_EnumBuffer(Entries[i].Signature, &Buffer, sizeof(Buffer), &TableCount[i], &FirstTableID[i], + Entries[i].ErrInsuff, Entries[i].ErrSuccess); + } + + // Test GetSystemFirmwareTable + for (i = 0; i < _countof(Entries); i++) + { + // Test with fake ID and NULL buffer + test_GetBuffer(Entries[i].Signature, 0xbeeffeed, NULL, sizeof(Buffer), + TRUE, Entries[i].ErrInsuff, Entries[i].ErrSuccess); + // Test with fake ID and wrong buffer + test_GetBuffer(Entries[i].Signature, 0xbeeffeed, (PVOID *)0xbeeffeed, sizeof(Buffer), + TRUE, Entries[i].ErrInsuff, Entries[i].ErrSuccess); + // Test with fake ID and correct buffer + test_GetBuffer(Entries[i].Signature, 0xbeeffeed, &Buffer, sizeof(Buffer), + TRUE, Entries[i].ErrInsuff, Entries[i].ErrSuccess); + if (TableCount[i] == 0) + { + if (i < _countof(Entries) - 1) + { + ZeroMemory(&Sign, sizeof(Sign)); + *(DWORD *)&Sign = _byteswap_ulong(Entries[i].Signature); + skip("No tables for %s found. Skipping\n", + Sign); + } + continue; + } + // Test with correct ID and NULL buffer + test_GetBuffer(Entries[i].Signature, FirstTableID[i], NULL, sizeof(Buffer), + FALSE, Entries[i].ErrInsuff, Entries[i].ErrSuccess); + // Test with correct ID and wrong buffer + test_GetBuffer(Entries[i].Signature, FirstTableID[i], (PVOID *)0xbeeffeed, sizeof(Buffer), + FALSE, Entries[i].ErrInsuff, Entries[i].ErrSuccess); + // Test with correct ID and correct buffer + test_GetBuffer(Entries[i].Signature, FirstTableID[i], &Buffer, sizeof(Buffer), + FALSE, Entries[i].ErrInsuff, Entries[i].ErrSuccess); + } +} diff --git a/modules/rostests/apitests/kernel32/testlist.c b/modules/rostests/apitests/kernel32/testlist.c index 0bf5e424dc..6364cab804 100644 --- a/modules/rostests/apitests/kernel32/testlist.c +++ b/modules/rostests/apitests/kernel32/testlist.c @@ -27,6 +27,7 @@ extern void func_PrivMoveFileIdentityW(void); extern void func_SetConsoleWindowInfo(void); extern void func_SetCurrentDirectory(void); extern void func_SetUnhandledExceptionFilter(void); +extern void func_SystemFirmware(void); extern void func_TerminateProcess(void); extern void func_TunnelCache(void); extern void func_WideCharToMultiByte(void); @@ -57,6 +58,7 @@ const struct test winetest_testlist[] = { "SetConsoleWindowInfo", func_SetConsoleWindowInfo }, { "SetCurrentDirectory", func_SetCurrentDirectory }, { "SetUnhandledExceptionFilter", func_SetUnhandledExceptionFilter }, + { "SystemFirmware", func_SystemFirmware }, { "TerminateProcess", func_TerminateProcess }, { "TunnelCache", func_TunnelCache }, { "WideCharToMultiByte", func_WideCharToMultiByte },

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