Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [WIN32K] Don't trust the BITMAPINFOHEADER size This is not entirely correct yet, but less wrong than before CORE-16621
by Mark Jansen 26 Jan '20

26 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53c9a6deaa61091f5bf68… commit 53c9a6deaa61091f5bf681483cd3f36cc388c51b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jan 11 13:15:12 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jan 26 13:08:53 2020 +0100 [WIN32K] Don't trust the BITMAPINFOHEADER size This is not entirely correct yet, but less wrong than before CORE-16621 --- win32ss/gdi/ntgdi/dibobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/dibobj.c b/win32ss/gdi/ntgdi/dibobj.c index f935bc5d543..93208665b39 100644 --- a/win32ss/gdi/ntgdi/dibobj.c +++ b/win32ss/gdi/ntgdi/dibobj.c @@ -1288,7 +1288,7 @@ NtGdiStretchDIBitsInternal( BitmapFormat(pbmi->bmiHeader.biBitCount, pbmi->bmiHeader.biCompression), pbmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, - pbmi->bmiHeader.biSizeImage, + cjMaxBits, pvBits, 0);

1 0

[reactos] 01/01: [ROSTESTS] fix x64 build and fix/disable warnings
by Timo Kreuzer 26 Jan '20

26 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42d2d5ec9c76588624412… commit 42d2d5ec9c76588624412f95114d26f36373959f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu May 30 17:12:28 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 26 11:50:37 2020 +0100 [ROSTESTS] fix x64 build and fix/disable warnings --- modules/rostests/apitests/CMakeLists.txt | 6 +-- .../rostests/apitests/advapi32/RegQueryValueExW.c | 2 +- modules/rostests/apitests/advapi32/ServiceArgs.c | 2 +- modules/rostests/apitests/advapi32/svchlp.c | 2 +- modules/rostests/apitests/dbghelp/pdb.c | 4 -- .../rostests/apitests/iphlpapi/GetInterfaceName.c | 18 ++++--- .../rostests/apitests/iphlpapi/GetNetworkParams.c | 2 +- .../rostests/apitests/kernel32/GetComputerNameEx.c | 4 +- .../kernel32/SetUnhandledExceptionFilter.c | 38 +++++++++++++- .../rostests/apitests/kernel32/SystemFirmware.c | 6 +-- .../apitests/kernel32/WideCharToMultiByte.c | 8 +-- modules/rostests/apitests/kernel32/lstrcpynW.c | 2 +- modules/rostests/apitests/kernel32/lstrlen.c | 4 +- modules/rostests/apitests/localspl/service.c | 2 +- modules/rostests/apitests/localspl/tests.c | 2 +- modules/rostests/apitests/mspatcha/mspatcha.c | 8 +-- .../apitests/msvcrt/CmdLineUtil/CmdLineUtil.c | 4 +- modules/rostests/apitests/msvcrt/CommandLine.c | 6 +-- modules/rostests/apitests/ntdll/LdrEnumResources.c | 2 +- modules/rostests/apitests/ntdll/NtContinue.c | 30 +++++++++++ .../rostests/apitests/ntdll/NtMapViewOfSection.c | 2 +- modules/rostests/apitests/ntdll/StackOverflow.c | 4 ++ modules/rostests/apitests/psapi/psapi.c | 4 +- .../apitests/setupapi/SetupDiInstallClassExA.c | 4 +- .../SetupInstallServicesFromInfSectionEx.c | 2 +- modules/rostests/apitests/shell32/CIDLData.cpp | 2 +- .../apitests/shell32/SHCreateDataObject.cpp | 2 +- modules/rostests/apitests/shell32/menu.cpp | 2 +- .../apitests/shlwapi/PathUnExpandEnvStrings.c | 10 ++-- .../apitests/spoolss/MarshallDownStructuresArray.c | 2 +- modules/rostests/apitests/win32nt/CMakeLists.txt | 61 +++++++--------------- .../win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c | 24 ++++----- .../apitests/win32nt/ntgdi/NtGdiCreateBitmap.c | 6 +-- .../apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c | 6 +-- .../apitests/win32nt/ntgdi/NtGdiExtTextOutW.c | 2 +- .../apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c | 4 +- .../apitests/win32nt/ntuser/NtUserProcessConnect.c | 4 +- .../apitests/win32nt/ntuser/NtUserScrollDC.c | 2 +- .../win32nt/ntuser/NtUserSystemParametersInfo.c | 14 ++--- modules/rostests/apitests/ws2_32/WSARecv.c | 2 +- modules/rostests/apitests/ws2_32/getaddrinfo.c | 2 +- modules/rostests/apitests/ws2_32/gethostname.c | 10 ++-- modules/rostests/apitests/ws2_32/helpers.c | 2 +- modules/rostests/kmtests/kmtest/fltsupport.c | 4 +- modules/rostests/kmtests/npfs/NpfsHelpers.c | 2 +- modules/rostests/kmtests/ntos_io/IoFilesystem.c | 4 +- modules/rostests/kmtests/rtl/RtlStrSafe.c | 4 +- .../rostests/rosautotest/CJournaledTestList.cpp | 4 +- modules/rostests/rosautotest/CWebService.cpp | 2 +- modules/rostests/win32/cmd/batch.c | 2 +- modules/rostests/win32/user32/biditext/biditext.c | 14 ++--- modules/rostests/win32/user32/psmtest/psmtest.c | 8 +-- modules/rostests/winetests/CMakeLists.txt | 14 ++++- sdk/include/crt/xmmintrin.h | 4 ++ sdk/include/psdk/shlwapi.h | 6 ++- sdk/lib/atl/atlbase.h | 7 +-- 56 files changed, 229 insertions(+), 171 deletions(-) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index a0418480c27..9f1d6ce225b 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -20,9 +20,7 @@ add_subdirectory(fontext) add_subdirectory(gdi32) add_subdirectory(gditools) add_subdirectory(iphlpapi) -if(NOT ARCH STREQUAL "amd64") - add_subdirectory(kernel32) -endif() +add_subdirectory(kernel32) add_subdirectory(localspl) add_subdirectory(mountmgr) add_subdirectory(msgina) @@ -46,7 +44,7 @@ add_subdirectory(user32) add_subdirectory(user32_dynamic) add_subdirectory(userenv) add_subdirectory(uxtheme) -if(NOT ARCH STREQUAL "amd64" AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") +if(NOT CMAKE_BUILD_TYPE STREQUAL "Release") add_subdirectory(win32u) add_subdirectory(win32nt) endif() diff --git a/modules/rostests/apitests/advapi32/RegQueryValueExW.c b/modules/rostests/apitests/advapi32/RegQueryValueExW.c index 14384570692..dcabb6e34f1 100644 --- a/modules/rostests/apitests/advapi32/RegQueryValueExW.c +++ b/modules/rostests/apitests/advapi32/RegQueryValueExW.c @@ -216,7 +216,7 @@ START_TEST(RegQueryValueExW) { ok(1, "RegSetValueExW failed: %lx, %lx\n", ret, GetLastError()); } - if ((ret = RegSetValueExW(hkey_main, L"LONGSTRING", 0, REG_SZ, (const BYTE *)string22W, (wcslen(string22W)+1) * sizeof(WCHAR))) != ERROR_SUCCESS) + if ((ret = RegSetValueExW(hkey_main, L"LONGSTRING", 0, REG_SZ, (const BYTE *)string22W, (lstrlenW(string22W)+1) * sizeof(WCHAR))) != ERROR_SUCCESS) { ok(1, "RegSetValueExW failed: %lx, %lx\n", ret, GetLastError()); } diff --git a/modules/rostests/apitests/advapi32/ServiceArgs.c b/modules/rostests/apitests/advapi32/ServiceArgs.c index e50ca7bf9fc..46421d110f2 100644 --- a/modules/rostests/apitests/advapi32/ServiceArgs.c +++ b/modules/rostests/apitests/advapi32/ServiceArgs.c @@ -26,7 +26,7 @@ static void send_msg(const char *type, const char *msg) char buf[512]; StringCbPrintfA(buf, sizeof(buf), "%s:%s", type, msg); - WriteFile(pipe_handle, buf, strlen(buf)+1, &written, NULL); + WriteFile(pipe_handle, buf, lstrlenA(buf)+1, &written, NULL); } #if 0 diff --git a/modules/rostests/apitests/advapi32/svchlp.c b/modules/rostests/apitests/advapi32/svchlp.c index 7a3aca65e78..1d0bf62c59f 100644 --- a/modules/rostests/apitests/advapi32/svchlp.c +++ b/modules/rostests/apitests/advapi32/svchlp.c @@ -30,7 +30,7 @@ void send_msg(const char *type, const char *msg) char buf[512]; StringCbPrintfA(buf, sizeof(buf), "%s:%s", type, msg); - WriteFile(hClientPipe, buf, strlen(buf)+1, &written, NULL); + WriteFile(hClientPipe, buf, lstrlenA(buf)+1, &written, NULL); } void service_trace(const char *msg, ...) diff --git a/modules/rostests/apitests/dbghelp/pdb.c b/modules/rostests/apitests/dbghelp/pdb.c index dc56ae74b08..68aab4942bb 100644 --- a/modules/rostests/apitests/dbghelp/pdb.c +++ b/modules/rostests/apitests/dbghelp/pdb.c @@ -565,9 +565,7 @@ START_TEST(pdb) { char szDllName[MAX_PATH]; char szDllPath[MAX_PATH], szOldDir[MAX_PATH]; -#ifdef _M_IX86 HMODULE hMod; -#endif DWORD64 BaseAddress; DWORD dwErr, Options; @@ -608,7 +606,6 @@ START_TEST(pdb) test_SymRegCallback(proc(), szDllName, TRUE); test_SymRegCallback(proc(), szDllName, FALSE); -#ifdef _M_IX86 hMod = LoadLibraryA(szDllName); if (hMod) { @@ -631,7 +628,6 @@ START_TEST(pdb) FreeLibrary(hMod); } -#endif cleanup_msvc_dll(); } diff --git a/modules/rostests/apitests/iphlpapi/GetInterfaceName.c b/modules/rostests/apitests/iphlpapi/GetInterfaceName.c index 76078cc39ff..d49e600d343 100644 --- a/modules/rostests/apitests/iphlpapi/GetInterfaceName.c +++ b/modules/rostests/apitests/iphlpapi/GetInterfaceName.c @@ -27,6 +27,7 @@ test_NhGetInterfaceNameFromGuid(GUID AdapterGUID, DWORD par1, DWORD par2) ULONG ulOutBufLen; WCHAR Name[MAX_INTERFACE_NAME_LEN + 4]; GUID UniqueGUID = MY_TEST_GUID; + SIZE_T Length; // Test NULL GUID SetLastError(0xbeeffeed); @@ -104,11 +105,11 @@ test_NhGetInterfaceNameFromGuid(GUID AdapterGUID, DWORD par1, DWORD par2) ok(ulOutBufLen > 0, "ulOutBufLen is %ld, expected > 0\n", ulOutBufLen); - Error = wcslen(Name); - ok(Error > 0, + Length = wcslen(Name); + ok(Length > 0, "wcslen(Name) is %ld, expected > 0\n", - Error); - if (Error > 0) + Length); + if (Length > 0) trace("Adapter name: \"%S\"\n", Name); // Test correct values, but with new unique GUID @@ -159,6 +160,7 @@ test_NhGetInterfaceNameFromDeviceGuid(GUID AdapterGUID, DWORD par1, DWORD par2) ULONG ulOutBufLen; WCHAR Name[MAX_INTERFACE_NAME_LEN]; GUID UniqueGUID = MY_TEST_GUID; + SIZE_T Length; // Test NULL GUID // Windows XP: NhGetInterfaceNameFromDeviceGuid throws exception here @@ -241,11 +243,11 @@ test_NhGetInterfaceNameFromDeviceGuid(GUID AdapterGUID, DWORD par1, DWORD par2) ok(ulOutBufLen > 0, "ulOutBufLen is %ld, expected > 0\n", ulOutBufLen); - Error = wcslen(Name); - ok(Error > 0, + Length = wcslen(Name); + ok(Length > 0, "wcslen(Name) is %ld, expected > 0\n", - Error); - if (Error > 0) + Length); + if (Length > 0) trace("Adapter name: \"%S\"\n", Name); // Test correct values, but with new unique GUID diff --git a/modules/rostests/apitests/iphlpapi/GetNetworkParams.c b/modules/rostests/apitests/iphlpapi/GetNetworkParams.c index 697e66004e4..ef0bd6a768e 100644 --- a/modules/rostests/apitests/iphlpapi/GetNetworkParams.c +++ b/modules/rostests/apitests/iphlpapi/GetNetworkParams.c @@ -76,7 +76,7 @@ WriteRegistryValue(PCHAR ValueName, PCHAR Value) 0, REG_SZ, (LPBYTE)Value, - strlen(Value) + 1); + lstrlenA(Value) + 1); /* Close the key */ RegCloseKey(ParametersKey); diff --git a/modules/rostests/apitests/kernel32/GetComputerNameEx.c b/modules/rostests/apitests/kernel32/GetComputerNameEx.c index 3e93165821b..2fbcbf6c61b 100644 --- a/modules/rostests/apitests/kernel32/GetComputerNameEx.c +++ b/modules/rostests/apitests/kernel32/GetComputerNameEx.c @@ -30,7 +30,7 @@ TestGetComputerNameEx( return; } trace("[%d] Reference is %ls\n", NameType, Reference); - ReferenceLen = wcslen(Reference); + ReferenceLen = lstrlenW(Reference); ok(ReferenceLen < RTL_NUMBER_OF(Reference), "[%d] Unexpected ReferenceLen %lu\n", NameType, ReferenceLen); if (NameType != ComputerNameDnsDomain && NameType != ComputerNamePhysicalDnsDomain) @@ -278,7 +278,7 @@ WriteRegistryValue(PCHAR ValueName, PCHAR Value) 0, REG_SZ, (LPBYTE)Value, - strlen(Value) + 1); + lstrlenA(Value) + 1); /* Close the key */ RegCloseKey(ParametersKey); diff --git a/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c b/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c index fb7e9f73815..e59d5e1e7d1 100644 --- a/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c +++ b/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c @@ -54,7 +54,13 @@ static LONG WINAPI ExceptionFilterSSESupport(LPEXCEPTION_POINTERS exp) ok((ctx->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL, "Context does not contain control register.\n"); +#ifdef _M_IX86 ctx->Eip += 3; +#elif defined(_M_AMD64) + ctx->Rip += 3; +#else +#error Architecture not handled +#endif return EXCEPTION_CONTINUE_EXECUTION; } @@ -65,12 +71,17 @@ static LONG WINAPI ExceptionFilterSSEException(LPEXCEPTION_POINTERS exp) { PEXCEPTION_RECORD rec = exp->ExceptionRecord; PCONTEXT ctx = exp->ContextRecord; +#ifdef _M_AMD64 + ULONG ExpectedExceptionCode = STATUS_FLOAT_DIVIDE_BY_ZERO; +#else + ULONG ExpectedExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS; +#endif trace("Exception raised while dividing by 0.\n"); - ok(rec->ExceptionCode == STATUS_FLOAT_MULTIPLE_TRAPS, "Exception code is 0x%08x.\n", (unsigned int)rec->ExceptionCode); + ok(rec->ExceptionCode == ExpectedExceptionCode, "Exception code is 0x%08x.\n", (unsigned int)rec->ExceptionCode); - if(rec->ExceptionCode != STATUS_FLOAT_MULTIPLE_TRAPS) + if(rec->ExceptionCode != ExpectedExceptionCode) { trace("Unexpected exception code, terminating!\n"); return EXCEPTION_EXECUTE_HANDLER; @@ -80,7 +91,13 @@ static LONG WINAPI ExceptionFilterSSEException(LPEXCEPTION_POINTERS exp) ExceptionCaught = TRUE; +#ifdef _M_IX86 ctx->Eip += 3; +#elif defined(_M_AMD64) + ctx->Rip += 3; +#else +#error Architecture not handled +#endif return EXCEPTION_CONTINUE_EXECUTION; } @@ -96,11 +113,19 @@ VOID TestSSEExceptions(VOID) p = SetUnhandledExceptionFilter(ExceptionFilterSSESupport); ok(p == NULL, "Previous filter should be NULL\n"); #ifdef _MSC_VER +#if defined(_M_AMD64) + { + __m128 xmm = { { 0 } }; + xmm = _mm_xor_ps(xmm, xmm); + if (!ExceptionCaught) supportsSSE = TRUE; + } +#else __asm { xorps xmm0, xmm0 mov supportsSSE, 0x1 } +#endif #else __asm__( "xorps %%xmm0, %%xmm0\n" @@ -124,6 +149,14 @@ VOID TestSSEExceptions(VOID) /* We can't use _mm_div_ps, as it masks the exception before performing anything*/ #if defined(_MSC_VER) +#if defined(_M_AMD64) + { + __m128 xmm1 = { { 1., 1. } }, xmm2 = { { 0 } }; + /* Wait, aren't exceptions masked? Yes, but actually no. */ + xmm1 = _mm_div_ps(xmm1, xmm2); + if (!ExceptionCaught) supportsSSE = TRUE; + } +#else __asm { xorps xmm0, xmm0 @@ -140,6 +173,7 @@ VOID TestSSEExceptions(VOID) /* Clean up */ add esp, 16 } +#endif #else __asm__ ( "xorps %%xmm0, %%xmm0\n" diff --git a/modules/rostests/apitests/kernel32/SystemFirmware.c b/modules/rostests/apitests/kernel32/SystemFirmware.c index c052761b458..47ef3a33bac 100644 --- a/modules/rostests/apitests/kernel32/SystemFirmware.c +++ b/modules/rostests/apitests/kernel32/SystemFirmware.c @@ -468,7 +468,7 @@ test_Functions() 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, + test_EnumBuffer(Entries[i].Signature, (PVOID *)(LONG_PTR)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], @@ -482,7 +482,7 @@ test_Functions() 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), + test_GetBuffer(Entries[i].Signature, 0xbeeffeed, (PVOID *)(LONG_PTR)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), @@ -502,7 +502,7 @@ test_Functions() 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), + test_GetBuffer(Entries[i].Signature, FirstTableID[i], (PVOID *)(LONG_PTR)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), diff --git a/modules/rostests/apitests/kernel32/WideCharToMultiByte.c b/modules/rostests/apitests/kernel32/WideCharToMultiByte.c index 80b56a6a2e9..db3384e7c71 100644 --- a/modules/rostests/apitests/kernel32/WideCharToMultiByte.c +++ b/modules/rostests/apitests/kernel32/WideCharToMultiByte.c @@ -19,8 +19,8 @@ Utf8Convert_( _In_ PCSTR File, _In_ INT Line) { - size_t WideLen; - size_t Utf8Len; + int WideLen; + int Utf8Len; char Buffer[32]; int Ret; ULONG i; @@ -28,8 +28,8 @@ Utf8Convert_( PCSTR ExpectedUtf8; ExpectedUtf8 = ntv6(1) ? ExpectedUtf8_Vista : ExpectedUtf8_2003; - WideLen = wcslen(WideString); - Utf8Len = strlen(ExpectedUtf8); + WideLen = lstrlenW(WideString); + Utf8Len = lstrlenA(ExpectedUtf8); /* Get length only */ Ret = WideCharToMultiByte(CP_UTF8, 0, WideString, WideLen, NULL, 0, NULL, NULL); diff --git a/modules/rostests/apitests/kernel32/lstrcpynW.c b/modules/rostests/apitests/kernel32/lstrcpynW.c index 6bc49c63200..e855e314cd9 100644 --- a/modules/rostests/apitests/kernel32/lstrcpynW.c +++ b/modules/rostests/apitests/kernel32/lstrcpynW.c @@ -20,5 +20,5 @@ START_TEST(lstrcpynW) ok(!lstrcmpW(buffer, L"Copy this"), "Copy went wrong.\n"); /* Test some invalid buffer */ - ok(lstrcpynW((LPWSTR)0xbaadf00d, L"Copy this string", 256) == NULL, "lstrncpyW should have returned NULL.\n"); + ok(lstrcpynW((LPWSTR)(LONG_PTR)0xbaadf00d, L"Copy this string", 256) == NULL, "lstrncpyW should have returned NULL.\n"); } diff --git a/modules/rostests/apitests/kernel32/lstrlen.c b/modules/rostests/apitests/kernel32/lstrlen.c index 45dbc582c8c..25d82c5196c 100644 --- a/modules/rostests/apitests/kernel32/lstrlen.c +++ b/modules/rostests/apitests/kernel32/lstrlen.c @@ -47,7 +47,7 @@ RemoveVectoredExceptionHandler(pVEH); * Use Vectored Exception Handling to monitor for first-chance exceptions. */ pVEH = AddVectoredExceptionHandler(1, VEHandler_2); - ok(lstrlenA( (LPSTR)0xbaadf00d) == 0, "lstrlenA should have returned 0.\n"); - ok(lstrlenW((LPWSTR)0xbaadf00d) == 0, "lstrlenW should have returned 0.\n"); + ok(lstrlenA( (LPSTR)(LONG_PTR)0xbaadf00d) == 0, "lstrlenA should have returned 0.\n"); + ok(lstrlenW((LPWSTR)(LONG_PTR)0xbaadf00d) == 0, "lstrlenW should have returned 0.\n"); RemoveVectoredExceptionHandler(pVEH); } diff --git a/modules/rostests/apitests/localspl/service.c b/modules/rostests/apitests/localspl/service.c index e8465f1a297..54ccaad287d 100644 --- a/modules/rostests/apitests/localspl/service.c +++ b/modules/rostests/apitests/localspl/service.c @@ -52,7 +52,7 @@ _DoDLLInjection() } wcscpy(p, L".dll"); - cbDLLPath = (wcslen(wszFilePath) + 1) * sizeof(WCHAR); + cbDLLPath = (lstrlenW(wszFilePath) + 1) * sizeof(WCHAR); // Create a snapshot of the currently running processes. hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); diff --git a/modules/rostests/apitests/localspl/tests.c b/modules/rostests/apitests/localspl/tests.c index e5c1cc0e380..c992bcce20b 100644 --- a/modules/rostests/apitests/localspl/tests.c +++ b/modules/rostests/apitests/localspl/tests.c @@ -167,7 +167,7 @@ _RunRemoteTest(const char* szTestName) } // Send the test name. - if (!WriteFile(hCommandPipe, szTestName, strlen(szTestName) + sizeof(char), &cbWritten, NULL)) + if (!WriteFile(hCommandPipe, szTestName, lstrlenA(szTestName) + sizeof(char), &cbWritten, NULL)) { skip("WriteFile failed with error %lu!\n", GetLastError()); goto Cleanup; diff --git a/modules/rostests/apitests/mspatcha/mspatcha.c b/modules/rostests/apitests/mspatcha/mspatcha.c index 1c01eedd771..c2550e254c7 100644 --- a/modules/rostests/apitests/mspatcha/mspatcha.c +++ b/modules/rostests/apitests/mspatcha/mspatcha.c @@ -142,7 +142,7 @@ BOOL extract2(char* filename, const unsigned char* data, size_t len) return FALSE; } - bRet = WriteFile(hFile, data, len, &dwWritten, NULL); + bRet = WriteFile(hFile, data, (DWORD)len, &dwWritten, NULL); CloseHandle(hFile); bRet = bRet && (dwWritten == len); @@ -187,7 +187,7 @@ void compare_file_(char* filename, const unsigned char* data, size_t len, const if (buf) { DWORD dwRead; - if (ReadFile(hFile, buf, size, &dwRead, NULL) && dwRead == size) + if (ReadFile(hFile, buf, (DWORD)size, &dwRead, NULL) && dwRead == size) { ok(!memcmp(buf, data, min(size,len)), "Data mismatch, %s\n", test_name); } @@ -333,10 +333,10 @@ static void validate_patch(patch_data* current) { UINT crc; - crc = crc32(~0, current->patch.data, current->patch.len); + crc = crc32(~0, current->patch.data, (UINT)current->patch.len); ok(crc == 0, "Invalid patch crc 0x%x for %s\n", crc, current->name); - crc = crc32(~0, current->patch_header.data, current->patch_header.len); + crc = crc32(~0, current->patch_header.data, (UINT)current->patch_header.len); ok(crc == 0, "Invalid patch_header crc 0x%x for %s\n", crc, current->name); } diff --git a/modules/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c b/modules/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c index e2c4e55cb87..a75cadd25b7 100644 --- a/modules/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c +++ b/modules/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c @@ -45,7 +45,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, */ /* 1- Write the WinMain's command line. */ - dwStringSize = (wcslen(lpCmdLine) + 1) * sizeof(WCHAR); + dwStringSize = (lstrlenW(lpCmdLine) + 1) * sizeof(WCHAR); WriteFile(hFile, &dwStringSize, @@ -60,7 +60,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, NULL); /* 2- Write the Win32 mode command line. */ - dwStringSize = (wcslen(CmdLine) + 1) * sizeof(WCHAR); + dwStringSize = (lstrlenW(CmdLine) + 1) * sizeof(WCHAR); WriteFile(hFile, &dwStringSize, diff --git a/modules/rostests/apitests/msvcrt/CommandLine.c b/modules/rostests/apitests/msvcrt/CommandLine.c index 86ac7d3f872..af8588594e6 100644 --- a/modules/rostests/apitests/msvcrt/CommandLine.c +++ b/modules/rostests/apitests/msvcrt/CommandLine.c @@ -264,14 +264,14 @@ static void Test_CommandLine(IN ULONG TestNumber, /* * Now check the results. */ - dwStringSize = min(wcslen(WinMainCmdLine), wcslen(Win32CmdLine)); + dwStringSize = min(lstrlenW(WinMainCmdLine), lstrlenW(Win32CmdLine)); ok(wcslen(WinMainCmdLine) == wcslen(Win32CmdLine), "Test %lu - WinMain and Win32 command lines do not have the same length !\n", TestNumber); ok(wcsncmp(WinMainCmdLine, Win32CmdLine, dwStringSize) == 0, "Test %lu - WinMain and Win32 command lines are different !\n", TestNumber); - dwStringSize = min(wcslen(WinMainCmdLine), NTCmdLine.Length / sizeof(WCHAR)); + dwStringSize = min(lstrlenW(WinMainCmdLine), NTCmdLine.Length / sizeof(WCHAR)); ok(wcsncmp(WinMainCmdLine, NTCmdLine.Buffer, dwStringSize) == 0, "Test %lu - WinMain and NT command lines are different !\n", TestNumber); - dwStringSize = min(wcslen(Win32CmdLine), NTCmdLine.Length / sizeof(WCHAR)); + dwStringSize = min(lstrlenW(Win32CmdLine), NTCmdLine.Length / sizeof(WCHAR)); ok(wcsncmp(Win32CmdLine, NTCmdLine.Buffer, dwStringSize) == 0, "Test %lu - Win32 and NT command lines are different !\n", TestNumber); } } diff --git a/modules/rostests/apitests/ntdll/LdrEnumResources.c b/modules/rostests/apitests/ntdll/LdrEnumResources.c index c18aab8e193..7dfd08b5991 100644 --- a/modules/rostests/apitests/ntdll/LdrEnumResources.c +++ b/modules/rostests/apitests/ntdll/LdrEnumResources.c @@ -65,7 +65,7 @@ InitializeNamedEntry( DirEntry->OffsetToData = (PUCHAR)Data - (PUCHAR)Resource; if (DirEntry < Resource->Lang1Entries) DirEntry->DataIsDirectory = 1; - Resource->StringBuffer[Resource->StringIndex] = wcslen(Name); + Resource->StringBuffer[Resource->StringIndex] = (USHORT)wcslen(Name); wcscpy(&Resource->StringBuffer[Resource->StringIndex + 1], Name); Resource->StringIndex += Resource->StringBuffer[Resource->StringIndex] * 2 + 1; } diff --git a/modules/rostests/apitests/ntdll/NtContinue.c b/modules/rostests/apitests/ntdll/NtContinue.c index 0a57bab7cd8..334c85056a2 100644 --- a/modules/rostests/apitests/ntdll/NtContinue.c +++ b/modules/rostests/apitests/ntdll/NtContinue.c @@ -58,6 +58,13 @@ static ULONG randULONG(void) return n; } +#ifdef _M_AMD64 +static ULONG64 randULONG64(void) +{ + return (ULONG64)randULONG() << 32 | randULONG(); +} +#endif + void check(CONTEXT * pContext) { #ifdef _M_IX86 @@ -159,6 +166,29 @@ START_TEST(NtContinue) continueContext.Eip = (ULONG)((ULONG_PTR)continuePoint & 0xFFFFFFF); /* Can't do a lot about segments */ +#elif defined(_M_AMD64) + continueContext.ContextFlags = CONTEXT_FULL; + + /* Fill the integer registers with random values */ + continueContext.Rdi = randULONG64(); + continueContext.Rsi = randULONG64(); + continueContext.Rbx = randULONG64(); + continueContext.Rdx = randULONG64(); + continueContext.Rcx = randULONG64(); + continueContext.Rax = randULONG64(); + continueContext.Rbp = randULONG64(); + + /* Randomize all the allowed flags (determined experimentally with WinDbg) */ + continueContext.EFlags = randULONG64() & 0x3C0CD5; + + /* Randomize the stack pointer as much as possible */ + continueContext.Rsp = (((ULONG_PTR)&bogus)) + + sizeof(bogus) - (randULONG() & 0xF) * 4; + + /* continuePoint() is implemented in assembler */ + //continueContext.Rip = ((ULONG_PTR)continuePoint); + skip("NtContinue test does not yet work on x64."); + return; #endif NtContinue(&continueContext, FALSE); diff --git a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c index 081ddc7b7d7..2df52007c41 100644 --- a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c +++ b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c @@ -1542,7 +1542,7 @@ Test_Truncate(VOID) HANDLE Handle; HANDLE SectionHandle; - ULONG Length; + SIZE_T Length; BOOL Success; DWORD Written, Error; VOID* BaseAddress; diff --git a/modules/rostests/apitests/ntdll/StackOverflow.c b/modules/rostests/apitests/ntdll/StackOverflow.c index 794e2fe0ffb..175142d01a3 100644 --- a/modules/rostests/apitests/ntdll/StackOverflow.c +++ b/modules/rostests/apitests/ntdll/StackOverflow.c @@ -7,6 +7,10 @@ #include "precomp.h" +#ifdef _MSC_VER +#pragma warning(disable : 4717) // disable warning about recursive function +#endif + static int iteration = 0; static PVOID StackAllocationBase; static PVOID LastStackAllocation; diff --git a/modules/rostests/apitests/psapi/psapi.c b/modules/rostests/apitests/psapi/psapi.c index 99e700d0876..03be85357a8 100644 --- a/modules/rostests/apitests/psapi/psapi.c +++ b/modules/rostests/apitests/psapi/psapi.c @@ -88,13 +88,13 @@ static BOOLEAN IntGetModuleInformation(LPCSTR Module, BOOLEAN IsDriver, BOOLEAN if (BaseName) { strcpy(Info->Path, Module); - Info->Len = strlen(Info->Path); + Info->Len = lstrlenA(Info->Path); } else { /* Skip disk */ strcpy(Info->Path, System + 2); - Info->Len = strlen(Info->Path); + Info->Len = lstrlenA(Info->Path); } return TRUE; diff --git a/modules/rostests/apitests/setupapi/SetupDiInstallClassExA.c b/modules/rostests/apitests/setupapi/SetupDiInstallClassExA.c index 73bf2739373..5d00ed90666 100644 --- a/modules/rostests/apitests/setupapi/SetupDiInstallClassExA.c +++ b/modules/rostests/apitests/setupapi/SetupDiInstallClassExA.c @@ -39,7 +39,7 @@ static void create_inf_file(LPCSTR filename, const char *data) HANDLE handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(handle != INVALID_HANDLE_VALUE); - ret = WriteFile(handle, data, strlen(data), &res, NULL); + ret = WriteFile(handle, data, lstrlenA(data), &res, NULL); assert(ret != 0); CloseHandle(handle); } @@ -277,7 +277,7 @@ static void test_SetupDiInstallClassExA(void) START_TEST(SetupDiInstallClassExA) { char temp_path[MAX_PATH], prev_path[MAX_PATH]; - DWORD len; + SIZE_T len; GetCurrentDirectoryA(MAX_PATH, prev_path); GetTempPathA(MAX_PATH, temp_path); diff --git a/modules/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c b/modules/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c index 20255faf291..c54df8751ba 100644 --- a/modules/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c +++ b/modules/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c @@ -39,7 +39,7 @@ static void create_inf_file(LPCSTR filename, const char *data) HANDLE handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(handle != INVALID_HANDLE_VALUE); - ret = WriteFile(handle, data, strlen(data), &res, NULL); + ret = WriteFile(handle, data, lstrlenA(data), &res, NULL); assert(ret != 0); CloseHandle(handle); } diff --git a/modules/rostests/apitests/shell32/CIDLData.cpp b/modules/rostests/apitests/shell32/CIDLData.cpp index f64fb3f7178..502a1b321fa 100644 --- a/modules/rostests/apitests/shell32/CIDLData.cpp +++ b/modules/rostests/apitests/shell32/CIDLData.cpp @@ -111,7 +111,7 @@ static void TestHDROP(PVOID pData, SIZE_T Size, LPCWSTR ExpectRoot, LPCWSTR Expe LPCWSTR Expected[2] = { ExpectPath1, ExpectPath2 }; - DWORD offset = pDropFiles->pFiles; + SIZE_T offset = pDropFiles->pFiles; UINT Count = 0; for (;;Count++) { diff --git a/modules/rostests/apitests/shell32/SHCreateDataObject.cpp b/modules/rostests/apitests/shell32/SHCreateDataObject.cpp index 9a47e9d603b..927afa28d23 100644 --- a/modules/rostests/apitests/shell32/SHCreateDataObject.cpp +++ b/modules/rostests/apitests/shell32/SHCreateDataObject.cpp @@ -114,7 +114,7 @@ static void TestHDROP(PVOID pData, SIZE_T Size, LPCWSTR ExpectRoot, LPCWSTR Expe LPCWSTR Expected[2] = { ExpectPath1, ExpectPath2 }; - DWORD offset = pDropFiles->pFiles; + SIZE_T offset = pDropFiles->pFiles; UINT Count = 0; for (;;Count++) { diff --git a/modules/rostests/apitests/shell32/menu.cpp b/modules/rostests/apitests/shell32/menu.cpp index 49efa1e7d08..673d4f457cc 100644 --- a/modules/rostests/apitests/shell32/menu.cpp +++ b/modules/rostests/apitests/shell32/menu.cpp @@ -16,7 +16,7 @@ BOOL CheckWindowClass(HWND hwnd, PCWSTR className) { - ULONG size = (wcslen(className) + 1)* sizeof(WCHAR); + ULONG size = (lstrlenW(className) + 1)* sizeof(WCHAR); PWCHAR buffer = (PWCHAR)malloc(size); if (GetClassNameW(hwnd, buffer, size ) == 0) { diff --git a/modules/rostests/apitests/shlwapi/PathUnExpandEnvStrings.c b/modules/rostests/apitests/shlwapi/PathUnExpandEnvStrings.c index c7da336ee42..daaebb2b50b 100644 --- a/modules/rostests/apitests/shlwapi/PathUnExpandEnvStrings.c +++ b/modules/rostests/apitests/shlwapi/PathUnExpandEnvStrings.c @@ -64,12 +64,12 @@ START_TEST(PathUnExpandEnvStrings) */ ret = GetEnvironmentVariableW(L"SystemRoot", TestStr, _countof(TestStr)); ok(ret, "got %lu\n", ret); - len = wcslen(TestStr); + len = lstrlenW(TestStr); ret = GetEnvironmentVariableW(L"SystemRoot", TestStr + len, _countof(TestStr) - len); ok(ret, "got %lu\n", ret); StringCchCopyW(ExpStr, _countof(ExpStr), L"%SystemRoot%"); - len = wcslen(ExpStr); + len = lstrlenW(ExpStr); ret = GetEnvironmentVariableW(L"SystemRoot", ExpStr + len, _countof(ExpStr) - len); ok(ret, "got %lu\n", ret); DO_TEST(TRUE, TestStr, ExpStr); @@ -79,7 +79,7 @@ START_TEST(PathUnExpandEnvStrings) * Unexpansion fails. */ StringCchCopyW(TestStr, _countof(TestStr), L"%SystemRoot%\\"); - len = wcslen(TestStr); + len = lstrlenW(TestStr); ret = GetEnvironmentVariableW(L"ProgramFiles", TestStr + len, _countof(TestStr) - len); ok(ret, "got %lu\n", ret); DO_TEST(FALSE, TestStr, L"%SystemRoot%\\%ProgramFiles%"); @@ -100,7 +100,7 @@ START_TEST(PathUnExpandEnvStrings) ret = GetEnvironmentVariableW(L"SystemRoot", TestStr, _countof(TestStr)); ok(ret, "got %lu\n", ret); StringCchCatW(TestStr, _countof(TestStr), L"\\notepad.exe "); - len = wcslen(TestStr); + len = lstrlenW(TestStr); ret = GetEnvironmentVariableW(L"SystemRoot", TestStr + len, _countof(TestStr) - len); ok(ret, "got %lu\n", ret); StringCchCatW(TestStr, _countof(TestStr), L"\\file.txt"); @@ -111,7 +111,7 @@ START_TEST(PathUnExpandEnvStrings) * Unexpansion succeeds only on the first path. */ StringCchCopyW(ExpStr, _countof(ExpStr), L"%SystemRoot%\\notepad.exe "); - len = wcslen(ExpStr); + len = lstrlenW(ExpStr); ret = GetEnvironmentVariableW(L"SystemRoot", ExpStr + len, _countof(ExpStr) - len); ok(ret, "got %lu\n", ret); StringCchCatW(ExpStr, _countof(ExpStr), L"\\file.txt"); diff --git a/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c b/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c index 7f37a117096..6f926ec033b 100644 --- a/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c +++ b/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c @@ -35,7 +35,7 @@ START_TEST(MarshallDownStructuresArray) PPORT_INFO_2W pPortInfo2Test; PBYTE pPortInfoEnd; PCWSTR pwszStrings[] = { L"PortName", L"MonitorName", L"Description" }; - DWORD cbPortInfo2Size = cElements * (sizeof(PORT_INFO_2W) + (wcslen(pwszStrings[0]) + 1 + wcslen(pwszStrings[1]) + 1 + wcslen(pwszStrings[2]) + 1) * sizeof(WCHAR)); + SIZE_T cbPortInfo2Size = cElements * (sizeof(PORT_INFO_2W) + (wcslen(pwszStrings[0]) + 1 + wcslen(pwszStrings[1]) + 1 + wcslen(pwszStrings[2]) + 1) * sizeof(WCHAR)); DWORD fPortType = 1337; DWORD Reserved = 42; diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt index bdda9755197..35cd83eea1f 100644 --- a/modules/rostests/apitests/win32nt/CMakeLists.txt +++ b/modules/rostests/apitests/win32nt/CMakeLists.txt @@ -67,47 +67,22 @@ list(APPEND SOURCE #osver.c win32nt.h) -add_library(win32knt_static STATIC ${SOURCE} w32knapi.rc) -add_dependencies(win32knt_static xdk) -add_pch(win32knt_static win32nt.h SOURCE) +add_executable(win32knt_apitest + ${SOURCE} + testlist.c + w32knapi.rc) -set(WIN32KNT_IMPORTLIBS gdi32 user32 shell32 advapi32 msvcrt kernel32 ntdll) - -if(1) # ros - add_executable(win32knt_apitest testlist.c) - target_link_libraries(win32knt_apitest ${PSEH_LIB} win32knt_static gditools) - set_module_type(win32knt_apitest win32cui) - add_importlibs(win32knt_apitest win32u ${WIN32KNT_IMPORTLIBS}) - - add_rostests_file(TARGET win32knt_apitest) -endif() - -if(0) # Specify 1 if you want 2ksp4 version - # See also ../win32u/CMakeLists.txt - add_executable(win32knt_2ksp4_apitest testlist.c) - target_link_libraries(win32knt_2ksp4_apitest ${PSEH_LIB} win32knt_static gditools) - set_module_type(win32knt_2ksp4_apitest win32cui) - add_importlibs(win32knt_2ksp4_apitest win32u_2ksp4 ${WIN32KNT_IMPORTLIBS}) -endif() - -if(1) # xpsp2 - add_executable(win32knt_xpsp2_apitest testlist.c) - target_link_libraries(win32knt_xpsp2_apitest ${PSEH_LIB} win32knt_static gditools) - set_module_type(win32knt_xpsp2_apitest win32cui) - add_importlibs(win32knt_xpsp2_apitest win32u_xpsp2 ${WIN32KNT_IMPORTLIBS}) -endif() - -if(1) # 2k3sp2 - add_executable(win32knt_2k3sp2_apitest testlist.c) - target_link_libraries(win32knt_2k3sp2_apitest ${PSEH_LIB} win32knt_static gditools) - set_module_type(win32knt_2k3sp2_apitest win32cui) - add_importlibs(win32knt_2k3sp2_apitest win32u_2k3sp2 ${WIN32KNT_IMPORTLIBS}) -endif() - -if(0) # Specify 1 if you want vista version - # See also ../win32u/CMakeLists.txt - add_executable(win32knt_vista_apitest testlist.c) - target_link_libraries(win32knt_vista_apitest ${PSEH_LIB} win32knt_static gditools) - set_module_type(win32knt_vista_apitest win32cui) - add_importlibs(win32knt_vista_apitest win32u_vista ${WIN32KNT_IMPORTLIBS}) -endif() +target_link_libraries(win32knt_apitest ${PSEH_LIB} gditools) +set_module_type(win32knt_apitest win32cui) +add_importlibs(win32knt_apitest + gdi32 + user32 + shell32 + advapi32 + msvcrt + kernel32 + ntdll) +add_delay_importlibs(win32knt_apitest win32u) +add_dependencies(win32knt_apitest xdk) +add_pch(win32knt_apitest win32nt.h SOURCE) +add_rostests_file(TARGET win32knt_apitest) diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c index e682b7d25fe..0f9bc623f31 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c @@ -196,7 +196,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) // pHalInfo->vmiData->dwAlphaAlign /* the primary display address */ - RTEST( ( (DWORD)pHalInfo->vmiData.pvPrimary & (~0x80000000)) != 0 ); + RTEST( ( (DWORD_PTR)pHalInfo->vmiData.pvPrimary & (~0x80000000)) != 0 ); /* test see if we got back the pvmList here * acording msdn vmiData.dwNumHeaps and vmiData.pvmList @@ -231,8 +231,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) if (pHalInfo->dwFlags != 0) { RTEST( (pHalInfo->dwFlags & (DDHALINFO_GETDRIVERINFOSET | DDHALINFO_GETDRIVERINFO2)) != 0 ); - RTEST( ( (DWORD)pHalInfo->GetDriverInfo & 0x80000000) != 0 ); - ASSERT( ((DWORD)pHalInfo->GetDriverInfo & 0x80000000) != 0 ); + RTEST( ( (DWORD_PTR)pHalInfo->GetDriverInfo & 0x80000000) != 0 ); + ASSERT( ((DWORD_PTR)pHalInfo->GetDriverInfo & 0x80000000) != 0 ); } /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ @@ -244,9 +244,9 @@ START_TEST(NtGdiDdQueryDirectDrawObject) * * point to kmode direcly to the win32k.sys, win32k.sys is kmode and it is kmode address we getting back */ - RTEST( ( (DWORD)pHalInfo->lpD3DGlobalDriverData & (~0x80000000)) != 0 ); - RTEST( ( (DWORD)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); - RTEST( ( (DWORD)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); + RTEST( ( (DWORD_PTR)pHalInfo->lpD3DGlobalDriverData & (~0x80000000)) != 0 ); + RTEST( ( (DWORD_PTR)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); + RTEST( ( (DWORD_PTR)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); } /* Backup DD_HALINFO so we do not need resting it */ @@ -504,7 +504,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) if (puD3dBufferCallbacks->dwFlags & DDHAL_D3DBUFCB32_CANCREATED3DBUF) { /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ - RTEST( ( (DWORD)puD3dBufferCallbacks->CanCreateD3DBuffer & (~0x80000000)) != 0 ); + RTEST( ( (DWORD_PTR)puD3dBufferCallbacks->CanCreateD3DBuffer & (~0x80000000)) != 0 ); } else { @@ -514,7 +514,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) if (puD3dBufferCallbacks->dwFlags & DDHAL_D3DBUFCB32_CREATED3DBUF) { /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ - RTEST( ( (DWORD)puD3dBufferCallbacks->CreateD3DBuffer & (~0x80000000)) != 0 ); + RTEST( ( (DWORD_PTR)puD3dBufferCallbacks->CreateD3DBuffer & (~0x80000000)) != 0 ); } else { @@ -524,7 +524,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) if (puD3dBufferCallbacks->dwFlags & DDHAL_D3DBUFCB32_DESTROYD3DBUF) { /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ - RTEST( ( (DWORD)puD3dBufferCallbacks->DestroyD3DBuffer & (~0x80000000)) != 0 ); + RTEST( ( (DWORD_PTR)puD3dBufferCallbacks->DestroyD3DBuffer & (~0x80000000)) != 0 ); } else { @@ -534,7 +534,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) if (puD3dBufferCallbacks->dwFlags & DDHAL_D3DBUFCB32_LOCKD3DBUF) { /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ - RTEST( ( (DWORD)puD3dBufferCallbacks->LockD3DBuffer & (~0x80000000)) != 0 ); + RTEST( ( (DWORD_PTR)puD3dBufferCallbacks->LockD3DBuffer & (~0x80000000)) != 0 ); } else { @@ -544,7 +544,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) if (puD3dBufferCallbacks->dwFlags & DDHAL_D3DBUFCB32_UNLOCKD3DBUF) { /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ - RTEST( ( (DWORD)puD3dBufferCallbacks->UnlockD3DBuffer & (~0x80000000)) != 0 ); + RTEST( ( (DWORD_PTR)puD3dBufferCallbacks->UnlockD3DBuffer & (~0x80000000)) != 0 ); } else { @@ -653,7 +653,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) } RTEST(myDesc->ddsCaps.dwCaps == DDSCAPS_TEXTURE); - myDesc = (DDSURFACEDESC *) (((DWORD) myDesc) + sizeof(DDSURFACEDESC)); + myDesc = (DDSURFACEDESC *) (((DWORD_PTR) myDesc) + sizeof(DDSURFACEDESC)); } } diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c index b6f2afad9ea..fd0bd1601a7 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c @@ -51,7 +51,7 @@ void Test_NtGdiCreateBitmap_Params(void) /* Test negative cy and invalid bits */ SetLastError(ERROR_SUCCESS); - ok_ptr(NtGdiCreateBitmap(1, -2, 1, 1, (BYTE*)0x80001234), NULL); + ok_ptr(NtGdiCreateBitmap(1, -2, 1, 1, (BYTE*)(LONG_PTR)0x80001234), NULL); ok_long(GetLastError(), ERROR_SUCCESS); /* Test huge size */ @@ -66,7 +66,7 @@ void Test_NtGdiCreateBitmap_Params(void) /* Test huge size and invalid bits */ SetLastError(ERROR_SUCCESS); - ok_ptr(NtGdiCreateBitmap(100000, 100000, 1, 1, (BYTE*)0x80001234), NULL); + ok_ptr(NtGdiCreateBitmap(100000, 100000, 1, 1, (BYTE*)(LONG_PTR)0x80001234), NULL); ok_long(GetLastError(), ERROR_SUCCESS); /* Test cPlanes == 0 */ @@ -148,7 +148,7 @@ void Test_NtGdiCreateBitmap_Params(void) /* Test bad pointer */ SetLastError(ERROR_SUCCESS); - ok_ptr(NtGdiCreateBitmap(1, 1, 1, 1, (BYTE*)0x80001234), NULL); + ok_ptr(NtGdiCreateBitmap(1, 1, 1, 1, (BYTE*)(LONG_PTR)0x80001234), NULL); ok_long(GetLastError(), ERROR_SUCCESS); /* Test pointer alignment */ diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c index 0a69fe41ddf..b6f90e18000 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c @@ -104,7 +104,7 @@ START_TEST(NtGdiCreateDIBSection) /* Test a wrong HDC */ SetLastError(0); pvBits = 0; - hbmp = NtGdiCreateDIBSection((HDC)0xdeadbeef, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + hbmp = NtGdiCreateDIBSection((HDC)(LONG_PTR)0xdeadbeef, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); TEST(pvBits != 0); TEST(hbmp != 0); TEST(GetLastError() == 8); @@ -122,7 +122,7 @@ START_TEST(NtGdiCreateDIBSection) /* Test invalid pbmi */ SetLastError(0); pvBits = (PVOID)-1; - hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, (PVOID)0x80001234, 0, cjHeader, 0, 0, &pvBits); + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, (PVOID)(LONG_PTR)0x80001234, 0, cjHeader, 0, 0, &pvBits); TEST(pvBits == (PVOID)-1); TEST(hbmp == 0); TEST(GetLastError() == ERROR_INVALID_PARAMETER); @@ -131,7 +131,7 @@ START_TEST(NtGdiCreateDIBSection) /* Test invalid pbmi */ SetLastError(0); pvBits = (PVOID)-1; - hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, (PVOID)1, 0, cjHeader, 0, 0, &pvBits); + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, (PVOID)(LONG_PTR)1, 0, cjHeader, 0, 0, &pvBits); TEST(pvBits == (PVOID)-1); TEST(hbmp == 0); TEST(GetLastError() == ERROR_INVALID_PARAMETER); diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c index be471ea6500..044a0cde567 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c @@ -40,7 +40,7 @@ START_TEST(NtGdiExtTextOutW) hDC = GetDC(hWnd); lpstr = L"Hallo"; - len = wcslen(lpstr); + len = lstrlenW(lpstr); ret = NtGdiExtTextOutW(hDC, 0, 0, 0, &rect, lpstr, len, Dx, 0); ok_int(ret, 1); diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c index 4b9ffc4d54d..daf0840abbf 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c @@ -128,7 +128,7 @@ Test_Params(void) TEST(GetLastError() == 0); SetLastError(0); - ret = NtGdiPolyPolyDraw(hDC, Points, (PVOID)0x81000000, 2, 1); + ret = NtGdiPolyPolyDraw(hDC, Points, (PVOID)(LONG_PTR)0x81000000, 2, 1); TEST(ret == 0); TEST(GetLastError() == 0); @@ -138,7 +138,7 @@ Test_Params(void) TEST(GetLastError() == 0); SetLastError(0); - ret = NtGdiPolyPolyDraw(hDC, (PVOID)0x81000000, Count1, 2, 1); + ret = NtGdiPolyPolyDraw(hDC, (PVOID)(LONG_PTR)0x81000000, Count1, 2, 1); TEST(ret == 0); TEST(GetLastError() == 0); diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c b/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c index ba9542b326f..e89a65b7073 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c @@ -16,7 +16,7 @@ START_TEST(NtUserProcessConnect) hProcess = GetCurrentProcess(); UserConnect.ulVersion = MAKELONG(0, 5); - Status = NtUserProcessConnect(hProcess, (USERCONNECT*)&UserConnect, sizeof(USERCONNECT)); + Status = NtUserProcessConnect(hProcess, &UserConnect, sizeof(USERCONNECT)); TEST(NT_SUCCESS(Status)); printf("UserConnect.ulVersion = 0x%lx\n", UserConnect.ulVersion); @@ -25,6 +25,6 @@ START_TEST(NtUserProcessConnect) printf("UserConnect.siClient.psi = 0x%p\n", UserConnect.siClient.psi); printf("UserConnect.siClient.aheList = 0x%p\n", UserConnect.siClient.aheList); printf("UserConnect.siClient.pDispInfo = 0x%p\n", UserConnect.siClient.pDispInfo); - printf("UserConnect.siClient.ulSharedDelta = 0x%lx\n", UserConnect.siClient.ulSharedDelta); + printf("UserConnect.siClient.ulSharedDelta = 0x%Ix\n", UserConnect.siClient.ulSharedDelta); } diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c b/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c index e002aaee0c6..4d9534563d0 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c @@ -84,7 +84,7 @@ START_TEST(NtUserScrollDC) /* Test invalid update rect */ SetLastError(ERROR_SUCCESS); - Result = NtUserScrollDC(hDC, 10, 20, &rcScroll, &rcClip, hRgn, (PVOID)0x80001000); + Result = NtUserScrollDC(hDC, 10, 20, &rcScroll, &rcClip, hRgn, (PVOID)(LONG_PTR)0x80001000); RTEST(Result == 0); RTEST(GetLastError() == ERROR_NOACCESS); diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c index 1f0dfedbc95..518ed8e0e07 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c @@ -313,7 +313,7 @@ Test_NtUserSystemParametersInfo_Params(void) #endif /* Test invalid pointer */ SetLastError(ERROR_SUCCESS); - TEST(NtUserSystemParametersInfo(SPI_GETFOCUSBORDERHEIGHT, 0, (PVOID)0x80000000, 0) == FALSE); + TEST(NtUserSystemParametersInfo(SPI_GETFOCUSBORDERHEIGHT, 0, (PVOID)(LONG_PTR)0x80000000, 0) == FALSE); TEST(GetLastError() == ERROR_NOACCESS); for(i = 0; i < 1000; i++) data[i] = 0xdeadbeef; @@ -452,7 +452,7 @@ Test_UserPref(UINT uiGet, UINT uiSet, DWORD dwPrefMask) TEST((dwUserPref & (~dwPrefMask)) == (dwUserPrefOrg & (~dwPrefMask))); /* Restore original value */ - NtUserSystemParametersInfo(uiSet, 0, (PVOID)bOrig, SPIF_UPDATEINIFILE); + NtUserSystemParametersInfo(uiSet, 0, (PVOID)(ULONG_PTR)bOrig, SPIF_UPDATEINIFILE); } @@ -744,7 +744,7 @@ Test_SPI_SETNONCLIENTMETRICS(void) metrics.cbSize = sizeof(NONCLIENTMETRICSW); TEST(NtUserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &metrics, 0) == 1); - TEST(NtUserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), (PVOID)0xdeadbeef, 0) == 0); + TEST(NtUserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), (PVOID)(LONG_PTR)0xdeadbeef, 0) == 0); origMetrics = metrics; @@ -764,7 +764,7 @@ Test_SPI_SETMINIMIZEDMETRICS(void) metrics.cbSize = sizeof(MINIMIZEDMETRICS); TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS), (PVOID)&metrics, 0) == 1); - TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS), (PVOID)0xdeadbeef, 0) == 0); + TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS), (PVOID)(LONG_PTR)0xdeadbeef, 0) == 0); origMetrics = metrics; @@ -784,7 +784,7 @@ Test_SPI_SETICONMETRICS(void) metrics.cbSize = sizeof(ICONMETRICSW); TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICSW), (PVOID)&metrics, 0) == 1); - TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICSW), (PVOID)0xdeadbeef, 0) == 0); + TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICSW), (PVOID)(LONG_PTR)0xdeadbeef, 0) == 0); origMetrics = metrics; @@ -817,7 +817,7 @@ Test_SPI_SETWORKAREA(void) TEST(NtUserSystemParametersInfo(SPI_GETWORKAREA, 1, &rc, 0) == 1); TEST(NtUserSystemParametersInfo(SPI_GETWORKAREA, -1, &rc, 0) == 1); TEST(NtUserSystemParametersInfo(SPI_GETWORKAREA, 0xdeadbeef, &rc, 0) == 1); - TEST(NtUserSystemParametersInfo(SPI_GETWORKAREA, 0, (PVOID)0xdeadbeef, 0) == 0); + TEST(NtUserSystemParametersInfo(SPI_GETWORKAREA, 0, (PVOID)(LONG_PTR)0xdeadbeef, 0) == 0); /* Test values */ rc = rcOrig; rc.left = -1; @@ -1032,7 +1032,7 @@ Test_SPI_SETMENUANIMATION(void) /* Restore original values */ - NtUserSystemParametersInfo(SPI_SETMENUANIMATION, 0, (PVOID)bOrig, SPIF_UPDATEINIFILE); + NtUserSystemParametersInfo(SPI_SETMENUANIMATION, 0, (PVOID)(ULONG_PTR)bOrig, SPIF_UPDATEINIFILE); } // Test_SPI_SETCOMBOBOXANIMATION(); diff --git a/modules/rostests/apitests/ws2_32/WSARecv.c b/modules/rostests/apitests/ws2_32/WSARecv.c index 89f500f7066..c81b775b9ce 100644 --- a/modules/rostests/apitests/ws2_32/WSARecv.c +++ b/modules/rostests/apitests/ws2_32/WSARecv.c @@ -95,7 +95,7 @@ void Test_WSARecv() /* Send the GET request */ buffers.buf = szGetRequest; - buffers.len = strlen(szGetRequest); + buffers.len = lstrlenA(szGetRequest); dwSent = 0; iResult = WSASend(sck, &buffers, 1, &dwSent, 0, &overlapped, NULL); err = WSAGetLastError(); diff --git a/modules/rostests/apitests/ws2_32/getaddrinfo.c b/modules/rostests/apitests/ws2_32/getaddrinfo.c index 068881a07f5..c06ca268c16 100644 --- a/modules/rostests/apitests/ws2_32/getaddrinfo.c +++ b/modules/rostests/apitests/ws2_32/getaddrinfo.c @@ -13,7 +13,7 @@ ok_dec((ai)->ai_family, family); \ ok_dec((ai)->ai_socktype, socktype); \ ok_dec((ai)->ai_protocol, protocol); \ - ok_dec((ai)->ai_addrlen, addrlen); \ + ok_dec((int)(ai)->ai_addrlen, addrlen); \ } while (0) #define ok_sockaddr_in(sockaddr, family, port, addr) do \ diff --git a/modules/rostests/apitests/ws2_32/gethostname.c b/modules/rostests/apitests/ws2_32/gethostname.c index 4bfb3c4a3db..c1e87d87c1b 100644 --- a/modules/rostests/apitests/ws2_32/gethostname.c +++ b/modules/rostests/apitests/ws2_32/gethostname.c @@ -57,7 +57,7 @@ GetHostnameFromCommand( goto Cleanup; /* Delete the expected ending line feed character */ - len = strlen(pszHostnameBuffer); + len = lstrlenA(pszHostnameBuffer); if (pszHostnameBuffer[len-1] == '\r' || pszHostnameBuffer[len-1] == '\n') pszHostnameBuffer[len-1] = ANSI_NULL; @@ -143,7 +143,7 @@ START_TEST(gethostname) /* Change Hostname in the Registry */ szHostNameNew[0] = ANSI_NULL; strcat(szHostNameNew, "ROSHOSTNAME1"); - cbData = strlen(szHostNameNew) + 1; + cbData = lstrlenA(szHostNameNew) + 1; Error = RegSetValueExA(hKeyHN, "Hostname", 0, REG_SZ, (LPBYTE)szHostNameNew, cbData); ok(Error == ERROR_SUCCESS, "Error setting new registry value (%ld).\n", GetLastError()); @@ -176,7 +176,7 @@ START_TEST(gethostname) ok(pos == 0, "hostbuffer '%s' should have been szHostNameNew '%s'.\n", hostbuffer, szHostNameNew); /* Reset the original registry entry */ - cbData = strlen(szHostNameOld) + 1; + cbData = lstrlenA(szHostNameOld) + 1; Error = RegSetValueExA(hKeyHN, "Hostname", 0, REG_SZ, (LPBYTE)szHostNameOld, cbData); ok(Error == ERROR_SUCCESS, "Error resetting new registry value back (%ld).\n", GetLastError()); @@ -204,7 +204,7 @@ START_TEST(gethostname) /* Change Hostname in the Registry */ szHostNameNew[0] = ANSI_NULL; strcat(szHostNameNew, "ROSHOSTNAME1"); - cbData = strlen(szHostNameNew) + 1; + cbData = lstrlenA(szHostNameNew) + 1; Error = RegSetValueExA(hKeyHN, "Hostname", 0, REG_SZ, (LPBYTE)szHostNameNew, cbData); ok(Error == ERROR_SUCCESS, "Error setting new registry value (%ld).\n", GetLastError()); @@ -222,7 +222,7 @@ START_TEST(gethostname) ok(pos == 0, "szHostNameNew '%s' should be hostbuffer '%s'.\n", szHostNameNew, hostbuffer); /* Reset the original registry entry */ - cbData = strlen(szHostNameOld) + 1; + cbData = lstrlenA(szHostNameOld) + 1; Error = RegSetValueExA(hKeyHN, "Hostname", 0, REG_SZ, (LPBYTE)szHostNameOld, cbData); ok(Error == ERROR_SUCCESS, "Error resetting new registry value back (%ld).\n", GetLastError()); diff --git a/modules/rostests/apitests/ws2_32/helpers.c b/modules/rostests/apitests/ws2_32/helpers.c index 702ac3654a7..0bc985a3fac 100644 --- a/modules/rostests/apitests/ws2_32/helpers.c +++ b/modules/rostests/apitests/ws2_32/helpers.c @@ -49,7 +49,7 @@ int GetRequestAndWait(SOCKET sck) struct fd_set readable; /* Send the GET request */ - SCKTEST(send(sck, szGetRequest, strlen(szGetRequest), 0)); + SCKTEST(send(sck, szGetRequest, lstrlenA(szGetRequest), 0)); ok(iResult == strlen(szGetRequest), "iResult = %d\n", iResult); #if 0 /* breaks windows too */ /* Shutdown the SEND connection */ diff --git a/modules/rostests/kmtests/kmtest/fltsupport.c b/modules/rostests/kmtests/kmtest/fltsupport.c index 1488a44a183..ae0cb05abb4 100644 --- a/modules/rostests/kmtests/kmtest/fltsupport.c +++ b/modules/rostests/kmtests/kmtest/fltsupport.c @@ -481,7 +481,7 @@ KmtFltAddAltitude( 0, REG_SZ, (LPBYTE)DefaultInstance, - (wcslen(DefaultInstance) + 1) * sizeof(WCHAR)); + (lstrlenW(DefaultInstance) + 1) * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { goto Quit; @@ -498,7 +498,7 @@ KmtFltAddAltitude( 0, REG_SZ, (LPBYTE)Altitude, - (wcslen(Altitude) + 1) * sizeof(WCHAR)); + (lstrlenW(Altitude) + 1) * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { goto Quit; diff --git a/modules/rostests/kmtests/npfs/NpfsHelpers.c b/modules/rostests/kmtests/npfs/NpfsHelpers.c index 4ba7271792c..10a9fa58fc4 100644 --- a/modules/rostests/kmtests/npfs/NpfsHelpers.c +++ b/modules/rostests/kmtests/npfs/NpfsHelpers.c @@ -291,7 +291,7 @@ NpWaitPipe( ok_eq_hex(IoStatusBlock.Status, Status); ok_eq_ulongptr(IoStatusBlock.Information, FILE_OPENED); - NameLength = wcslen(PipeName) * sizeof(WCHAR); + NameLength = (ULONG)(wcslen(PipeName) * sizeof(WCHAR)); BufferSize = FIELD_OFFSET(FILE_PIPE_WAIT_FOR_BUFFER, Name[NameLength / sizeof(WCHAR)]); WaitForBuffer = ExAllocatePoolWithTag(NonPagedPool, BufferSize, 'WPmK'); diff --git a/modules/rostests/kmtests/ntos_io/IoFilesystem.c b/modules/rostests/kmtests/ntos_io/IoFilesystem.c index ff3a502f537..0c3f04db9bb 100644 --- a/modules/rostests/kmtests/ntos_io/IoFilesystem.c +++ b/modules/rostests/kmtests/ntos_io/IoFilesystem.c @@ -242,8 +242,8 @@ Substitute( PWCHAR Dest = Buffer; UNICODE_STRING String; - SystemDriveLength = wcslen(SystemDriveName) * sizeof(WCHAR); - SystemRootLength = wcslen(SystemRootName) * sizeof(WCHAR); + SystemDriveLength = (ULONG)wcslen(SystemDriveName) * sizeof(WCHAR); + SystemRootLength = (ULONG)wcslen(SystemRootName) * sizeof(WCHAR); RtlInitUnicodeString(&String, Template); ASSERT(String.Length % sizeof(WCHAR) == 0); diff --git a/modules/rostests/kmtests/rtl/RtlStrSafe.c b/modules/rostests/kmtests/rtl/RtlStrSafe.c index 82c2fe512cc..3bb8d30355a 100644 --- a/modules/rostests/kmtests/rtl/RtlStrSafe.c +++ b/modules/rostests/kmtests/rtl/RtlStrSafe.c @@ -24,7 +24,7 @@ Test_RtlUnicodeStringPrintf() { NTSTATUS Status; PWSTR pBuffer = NULL; - size_t BufferSize; + USHORT BufferSize; size_t EqualBytes; UNICODE_STRING UsString; @@ -103,7 +103,7 @@ Test_RtlUnicodeStringPrintfEx() { NTSTATUS Status; PWSTR pBuffer = NULL; - size_t BufferSize; + USHORT BufferSize; size_t EqualBytes; UNICODE_STRING RemString; UNICODE_STRING UsString; diff --git a/modules/rostests/rosautotest/CJournaledTestList.cpp b/modules/rostests/rosautotest/CJournaledTestList.cpp index 925a408b71f..ef1787d7e09 100644 --- a/modules/rostests/rosautotest/CJournaledTestList.cpp +++ b/modules/rostests/rosautotest/CJournaledTestList.cpp @@ -90,7 +90,7 @@ void CJournaledTestList::SerializeIntoJournal(const string& String) { DWORD BytesWritten; - WriteFile(m_hJournal, String.c_str(), String.size() + 1, &BytesWritten, NULL); + WriteFile(m_hJournal, String.c_str(), (ULONG)String.size() + 1, &BytesWritten, NULL); FlushFileBuffers(m_hJournal); } @@ -106,7 +106,7 @@ void CJournaledTestList::SerializeIntoJournal(const wstring& String) { DWORD BytesWritten; - WriteFile(m_hJournal, String.c_str(), (String.size() + 1) * sizeof(WCHAR), &BytesWritten, NULL); + WriteFile(m_hJournal, String.c_str(), ((ULONG)String.size() + 1) * sizeof(WCHAR), &BytesWritten, NULL); FlushFileBuffers(m_hJournal); } diff --git a/modules/rostests/rosautotest/CWebService.cpp b/modules/rostests/rosautotest/CWebService.cpp index 1a8ae3710d5..9edcebe7433 100644 --- a/modules/rostests/rosautotest/CWebService.cpp +++ b/modules/rostests/rosautotest/CWebService.cpp @@ -77,7 +77,7 @@ CWebService::DoRequest(const string& InputData) Data.reset(new char[InputData.size() + 1]); strcpy(Data, InputData.c_str()); - if(!HttpSendRequestW(m_hHTTPRequest, szHeaders, wcslen(szHeaders), Data, InputData.size())) + if(!HttpSendRequestW(m_hHTTPRequest, szHeaders, lstrlenW(szHeaders), Data, (DWORD)InputData.size())) FATAL("HttpSendRequestW failed\n"); /* Get the response */ diff --git a/modules/rostests/win32/cmd/batch.c b/modules/rostests/win32/cmd/batch.c index e1db7c9ec90..e6a77d95d77 100644 --- a/modules/rostests/win32/cmd/batch.c +++ b/modules/rostests/win32/cmd/batch.c @@ -71,7 +71,7 @@ static const char* convert_input_data(const char *data, DWORD size, DWORD *new_s } *ptr = '\0'; - *new_size = strlen(new_data); + *new_size = lstrlenA(new_data); return new_data; } diff --git a/modules/rostests/win32/user32/biditext/biditext.c b/modules/rostests/win32/user32/biditext/biditext.c index ee11d56b79b..6d0c263c8c9 100644 --- a/modules/rostests/win32/user32/biditext/biditext.c +++ b/modules/rostests/win32/user32/biditext/biditext.c @@ -190,7 +190,7 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) const WCHAR szString[] = {ALEF, BET, GIMEL, DALET, HEY, 'A', 'B', 'C', 'D', VAV, ZAYIN, HET, TET, YUD, 0}; const WCHAR szReversedString[] = {HEY, DALET, GIMEL, BET, ALEF, 'A', 'B', 'C', 'D', YUD, TET, HET, ZAYIN, VAV, 0}; - int Len = wcslen(szString); + int Len = lstrlenW(szString); int i, xpos, tempLength; WCHAR tempString[20] = { 0 }; WCHAR Glyphs[100] = { 0 }; @@ -247,15 +247,15 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) for (i = 0, xpos = 10; i < Len; i++, xpos += 30) { StringCchPrintfW(tempString, 20, L"%d", i); - tempLength = wcslen(tempString); + tempLength = lstrlenW(tempString); TextOutW(hdc, xpos, 430, tempString, tempLength); StringCchPrintfW(tempString, 20, L"%d", lpOrder[i]); - tempLength = wcslen(tempString); + tempLength = lstrlenW(tempString); TextOutW(hdc, xpos, 450, tempString, tempLength); StringCchPrintfW(tempString, 20, L"%d", lpCaretPos[i]); - tempLength = wcslen(tempString); + tempLength = lstrlenW(tempString); TextOutW(hdc, xpos, 470, tempString, tempLength); TextOutW(hdc, xpos, 490, &szString[i], 1); @@ -271,15 +271,15 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) for (i = 0, xpos = 10; i < Len; i++, xpos += 30) { StringCchPrintfW(tempString, 20, L"%d", i); - tempLength = wcslen(tempString); + tempLength = lstrlenW(tempString); TextOutW(hdc, xpos, 530, tempString, tempLength); StringCchPrintfW(tempString, 20, L"%d", lpOrder[i]); - tempLength = wcslen(tempString); + tempLength = lstrlenW(tempString); TextOutW(hdc, xpos, 550, tempString, tempLength); StringCchPrintfW(tempString, 20, L"%d", lpCaretPos[i]); - tempLength = wcslen(tempString); + tempLength = lstrlenW(tempString); TextOutW(hdc, xpos, 570, tempString, tempLength); TextOutW(hdc, xpos, 590, &szString[i], 1); diff --git a/modules/rostests/win32/user32/psmtest/psmtest.c b/modules/rostests/win32/user32/psmtest/psmtest.c index 1299bcc21f1..39b5b60003d 100644 --- a/modules/rostests/win32/user32/psmtest/psmtest.c +++ b/modules/rostests/win32/user32/psmtest/psmtest.c @@ -32,15 +32,15 @@ static void DrawTest(HDC hdc, int ypos, LPCWSTR str, DWORD dwFlags, int testtype if (testtype == LPK) { - ret = LpkPSMTextOut(hdc, 0, ypos, str, (!str) ? 10 : wcslen(str), dwFlags); + ret = LpkPSMTextOut(hdc, 0, ypos, str, (!str) ? 10 : lstrlenW(str), dwFlags); StringCchPrintfW(Result, 100, L"Return Value = %d", ret); - TextOutW(hdc, 200, ypos, Result, wcslen(Result)); + TextOutW(hdc, 200, ypos, Result, lstrlenW(Result)); } else if (testtype == USERLPK) { - ret = UserLpkPSMTextOut(hdc, 400, ypos, str, wcslen(str), dwFlags); + ret = UserLpkPSMTextOut(hdc, 400, ypos, str, lstrlenW(str), dwFlags); StringCchPrintfW(Result, 100, L"Return Value = %d", ret); - TextOutW(hdc, 600, ypos, Result, wcslen(Result)); + TextOutW(hdc, 600, ypos, Result, lstrlenW(Result)); } } diff --git a/modules/rostests/winetests/CMakeLists.txt b/modules/rostests/winetests/CMakeLists.txt index 3049c7d7860..8bb0f90d9f4 100644 --- a/modules/rostests/winetests/CMakeLists.txt +++ b/modules/rostests/winetests/CMakeLists.txt @@ -1,8 +1,18 @@ add_definitions(-D__ROS_LONG64__) -if (MSVC AND ARCH STREQUAL "amd64") - add_compile_flags("/wd4312") +if (MSVC) + add_compile_flags("/wd4090") # C4090: 'function': different 'const' qualifiers + add_compile_flags("/wd4133") # C4133: 'function': incompatible types - from '<enum> *' to 'UINT *' + add_compile_flags("/wd4146") # C4146: unary minus operator applied to unsigned type, result still unsigned + add_compile_flags("/wd4189") # C4189: 'x': local variable is initialized but not referenced + add_compile_flags("/wd4267") # C4267: '=': conversion from 'size_t' to 'int', possible loss of data + add_compile_flags("/wd4305") # C4305: '=': truncation from 'double' to 'FLOAT' + if (ARCH STREQUAL "amd64") + add_compile_flags("/wd4101") # C4101: 'x': unreferenced local variable + add_compile_flags("/wd4312") # C4312: 'type cast': conversion from 'unsigned int' to 'char *' of greater size + add_compile_flags("/wd4334") # C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) + endif() endif() add_subdirectory(advapi32) diff --git a/sdk/include/crt/xmmintrin.h b/sdk/include/crt/xmmintrin.h index 2db9fb0ea2a..59a1732875d 100644 --- a/sdk/include/crt/xmmintrin.h +++ b/sdk/include/crt/xmmintrin.h @@ -31,12 +31,16 @@ extern "C" { extern __m128 _mm_load_ss(float const*); extern int _mm_cvt_ss2si(__m128); +__m128 _mm_xor_ps(__m128 a, __m128 b); +__m128 _mm_div_ps(__m128 a, __m128 b); #ifdef _MSC_VER unsigned int _mm_getcsr(void); #pragma intrinsic(_mm_getcsr) void _mm_setcsr(unsigned int); #pragma intrinsic(_mm_setcsr) +#pragma intrinsic(_mm_xor_ps) +#pragma intrinsic(_mm_div_ps) #else #ifndef __INTRIN_INLINE diff --git a/sdk/include/psdk/shlwapi.h b/sdk/include/psdk/shlwapi.h index 40fefc512b4..65f9db98312 100644 --- a/sdk/include/psdk/shlwapi.h +++ b/sdk/include/psdk/shlwapi.h @@ -2072,7 +2072,11 @@ BOOL WINAPI IsOS(DWORD); typedef struct { const IID *piid; - int dwOffset; +#if defined(__REACTOS__) || (WINVER >= _WIN32_WINNT_WIN10) + DWORD dwOffset; +#else + int dwOffset; +#endif } QITAB, *LPQITAB; HRESULT diff --git a/sdk/lib/atl/atlbase.h b/sdk/lib/atl/atlbase.h index fc0755c1743..7edacf328e9 100644 --- a/sdk/lib/atl/atlbase.h +++ b/sdk/lib/atl/atlbase.h @@ -1367,15 +1367,16 @@ protected: // get the total size of a multistring static ULONG _GetMultiStringSize(LPCTSTR pszz) { - int count = 0; + size_t count = 0; do { - int len = _tcslen(pszz); + size_t len = _tcslen(pszz); count += len + 1; pszz += len + 1; } while (*pszz != TEXT('\0')); ++count; - return count * sizeof(TCHAR); + ATLASSERT(count * sizeof(TCHAR) <= ULONGMAX); + return (ULONG)count * sizeof(TCHAR); } // delete key recursively

1 0

[reactos] 01/01: [NETID] Implement DNS suffix and NetBIOS computer name support
by Eric Kohl 26 Jan '20

26 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a6745089310cc15e9185… commit 6a6745089310cc15e918527dc38bc6d484bbf534 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 26 09:57:55 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 26 10:04:44 2020 +0100 [NETID] Implement DNS suffix and NetBIOS computer name support - Load and store the non volatile host, domain and computer names instead of the volatile ones. - Validate the domain name before it is stored. - Update the full computer name whenever the host or domain name changes. --- dll/win32/netid/CMakeLists.txt | 2 +- dll/win32/netid/netid.c | 485 ++++++++++++++++++++++++++++------------- 2 files changed, 335 insertions(+), 152 deletions(-) diff --git a/dll/win32/netid/CMakeLists.txt b/dll/win32/netid/CMakeLists.txt index 1f3b87fc348..b3fe7610604 100644 --- a/dll/win32/netid/CMakeLists.txt +++ b/dll/win32/netid/CMakeLists.txt @@ -8,5 +8,5 @@ list(APPEND SOURCE add_library(netid MODULE ${SOURCE}) set_module_type(netid win32dll UNICODE) -add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 msvcrt kernel32 ntdll) +add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 dnsapi msvcrt kernel32 ntdll) add_cd_file(TARGET netid DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/netid/netid.c b/dll/win32/netid/netid.c index a9e30b01bbf..bab3a34c15f 100644 --- a/dll/win32/netid/netid.c +++ b/dll/win32/netid/netid.c @@ -14,6 +14,7 @@ #include <winbase.h> #include <winuser.h> #include <winreg.h> +#include <windns.h> #include <tchar.h> #include <lm.h> #include <prsht.h> @@ -23,32 +24,145 @@ #define MAX_COMPUTERDESCRIPTION_LENGTH 256 -static INT_PTR CALLBACK -NetIDPageProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam); +typedef struct _NETIDDATA +{ + WCHAR szHostName[256]; + WCHAR szDomainName[256]; + WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + BOOL bHostNameChanged; + BOOL bDomainNameChanged; + BOOL bEnable; +} NETIDDATA, *PNETIDDATA; + static HINSTANCE hDllInstance; +static +BOOL +GetComputerNames( + PNETIDDATA pNetIdData) +{ + HKEY KeyHandle; + DWORD dwSize; + DWORD dwError; + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\TcpIp\\Parameters", + 0, + KEY_QUERY_VALUE, + &KeyHandle); + if (dwError == ERROR_SUCCESS) + { + dwSize = sizeof(pNetIdData->szHostName); + RegQueryValueExW(KeyHandle, + L"NV HostName", + 0, + NULL, + (LPBYTE)&pNetIdData->szHostName, + &dwSize); + + dwSize = sizeof(pNetIdData->szDomainName); + RegQueryValueExW(KeyHandle, + L"NV Domain", + 0, + NULL, + (LPBYTE)&pNetIdData->szDomainName, + &dwSize); + + RegCloseKey(KeyHandle); + } + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\ComputerName\\ComputerName", + 0, + KEY_QUERY_VALUE, + &KeyHandle); + if (dwError == ERROR_SUCCESS) + { + dwSize = sizeof(pNetIdData->szComputerName); + RegQueryValueExW(KeyHandle, + L"ComputerName", + 0, + NULL, + (LPBYTE)&pNetIdData->szComputerName, + &dwSize); + + RegCloseKey(KeyHandle); + } + + return TRUE; +} + +static +BOOL +IsValidDomainName( + HWND hDlg, + UINT uId) +{ + WCHAR szDomainName[256]; + DWORD dwError; + + GetDlgItemTextW(hDlg, uId, szDomainName, ARRAYSIZE(szDomainName)); + dwError = DnsValidateName_W(szDomainName, DnsNameDomain); + if (dwError != ERROR_SUCCESS) + { + /* FIXME: Show error message */ + return FALSE; + } + + return TRUE; +} static INT_PTR CALLBACK DNSSuffixPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) { + PNETIDDATA pNetIdData; + + pNetIdData = (PNETIDDATA)GetWindowLongPtr(hDlg, DWLP_USER); + switch (Msg) { + case WM_INITDIALOG: + pNetIdData = (PNETIDDATA)lParam; + if (pNetIdData != NULL) + { + SetWindowLongPtr(hDlg, DWLP_USER, (LONG_PTR)pNetIdData); + + SetDlgItemTextW(hDlg, 1011, pNetIdData->szDomainName); + + SetDlgItemTextW(hDlg, 1013, pNetIdData->szComputerName); + EnableWindow(GetDlgItem(hDlg, IDOK), FALSE); + } + return TRUE; + case WM_COMMAND: - { switch (LOWORD(wParam)) { - case IDCANCEL: + case 1011: + if (HIWORD(wParam) == EN_CHANGE) + { + EnableWindow(GetDlgItem(hDlg, IDOK), TRUE); + } + break; + case IDOK: - EndDialog(hDlg, LOWORD(wParam)); + if (!IsValidDomainName(hDlg, 1011)) + { + SetFocus(GetDlgItem(hDlg, 1011)); + break; + } + + GetDlgItemTextW(hDlg, 1011, pNetIdData->szDomainName, ARRAYSIZE(pNetIdData->szDomainName)); + pNetIdData->bDomainNameChanged = TRUE; + EndDialog(hDlg, TRUE); + break; + + case IDCANCEL: + EndDialog(hDlg, FALSE); break; } - } - break; + break; } return FALSE; @@ -74,10 +188,15 @@ DisableControls(HWND hDlg) static BOOL -IsValidComputerName(LPCWSTR s) +IsValidComputerName( + HWND hDlg, + UINT uId) { + WCHAR szMsgText[512], szText[256], s[256]; int i; + GetWindowText(GetDlgItem(hDlg, uId), s, ARRAYSIZE(s)); + for (i = 0; i <= wcslen(s); i++) { if (s[i] == L'!' || s[i] == L'@' || s[i] == L'#' || s[i] == L'$' @@ -88,40 +207,104 @@ IsValidComputerName(LPCWSTR s) || s[i] == L'<' || s[i] == L'>' || s[i] == L'?' || s[i] == L'[' || s[i] == L']' || s[i] == L'`' || s[i] == L'%' || s[i] == L'_' || s[i] == L'.') + { + LoadStringW(hDllInstance, 1030, szText, ARRAYSIZE(szText)); + swprintf(szMsgText, szText, s); + MessageBoxW(hDlg, szMsgText, NULL, MB_OK | MB_ICONERROR); return FALSE; + } } return TRUE; } static -INT_PTR CALLBACK -NetworkPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) +VOID +SetFullComputerName( + HWND hDlg, + UINT uId, + PNETIDDATA pNetIdData) { - switch (Msg) + WCHAR szFullComputerName[512]; + + swprintf(szFullComputerName, L"%s.%s", pNetIdData->szHostName, pNetIdData->szDomainName); + SetDlgItemText(hDlg, uId, szFullComputerName); +} + +static +VOID +UpdateFullComputerName( + HWND hDlg, + UINT uId, + PNETIDDATA pNetIdData) +{ + WCHAR szFullComputerName[512]; + WCHAR szHostName[256]; + + GetWindowText(GetDlgItem(hDlg, 1002), szHostName, ARRAYSIZE(szHostName)); + + swprintf(szFullComputerName, L"%s.%s", szHostName, pNetIdData->szDomainName); + SetDlgItemText(hDlg, uId, szFullComputerName); +} + +static +VOID +NetworkDlg_OnInitDialog( + HWND hDlg, + PNETIDDATA pNetIdData) +{ + LPWKSTA_INFO_101 wki = NULL; + TCHAR MsgText[MAX_PATH * 2]; + LPWSTR JoinName = NULL; + NETSETUP_JOIN_STATUS JoinStatus; + + if (LoadString(hDllInstance, 25, MsgText, sizeof(MsgText) / sizeof(TCHAR))) + SetDlgItemText(hDlg, 1017, MsgText); + +// SendMessage(GetDlgItem(hDlg, 1002), EM_SETLIMITTEXT, MAX_COMPUTERNAME_LENGTH, 0); + + SetDlgItemText(hDlg, 1002, pNetIdData->szHostName); + SetFullComputerName(hDlg, 1001, pNetIdData); + + if (NetGetJoinInformation(NULL, &JoinName, &JoinStatus) != NERR_Success) { - case WM_INITDIALOG: + SetRadioBtnState(hDlg, FALSE); + + if (NetWkstaGetInfo(NULL, + 101, + (LPBYTE*)&wki) == NERR_Success) { - LPWKSTA_INFO_101 wki = NULL; - DWORD Size = MAX_COMPUTERNAME_LENGTH + 1; - TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; - TCHAR MsgText[MAX_PATH * 2]; - LPWSTR JoinName; - NETSETUP_JOIN_STATUS JoinStatus; + SetDlgItemText(hDlg, + 1007, + wki->wki101_langroup); + } + else + { + DisableControls(hDlg); + } - if (LoadString(hDllInstance, 25, MsgText, sizeof(MsgText) / sizeof(TCHAR))) - SetDlgItemText(hDlg, 1017, MsgText); + if (wki) + NetApiBufferFree(wki); + } + else + { + switch (JoinStatus) + { + case NetSetupDomainName: + SetDlgItemText(hDlg, 116, JoinName); + SetRadioBtnState(hDlg, TRUE); + break; - SendMessage(GetDlgItem(hDlg, 1002), EM_SETLIMITTEXT, MAX_COMPUTERNAME_LENGTH, 0); + case NetSetupWorkgroupName: + SetDlgItemText(hDlg, 1007, JoinName); + SetRadioBtnState(hDlg, FALSE); + break; - if (GetComputerName(ComputerName, &Size)) - { - SetDlgItemText(hDlg, 1002, ComputerName); - SetDlgItemText(hDlg, 1001, ComputerName); - } + case NetSetupUnjoined: + break; - if (NetGetJoinInformation(NULL, &JoinName, &JoinStatus) != NERR_Success) - { + case NetSetupUnknownStatus: + default: SetRadioBtnState(hDlg, FALSE); if (NetWkstaGetInfo(NULL, @@ -132,63 +315,92 @@ NetworkPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) 1007, wki->wki101_langroup); } - else DisableControls(hDlg); - - if (wki) NetApiBufferFree(wki); - } - else - { - switch (JoinStatus) + else { - case NetSetupDomainName: - SetDlgItemText(hDlg, 116, JoinName); - SetRadioBtnState(hDlg, TRUE); - break; + DisableControls(hDlg); + } - case NetSetupWorkgroupName: - SetDlgItemText(hDlg, 1007, JoinName); - SetRadioBtnState(hDlg, FALSE); - break; + if (wki) + NetApiBufferFree(wki); + break; + } - case NetSetupUnjoined: - break; + if (JoinName) + NetApiBufferFree(JoinName); + } +} - case NetSetupUnknownStatus: - default: - { - SetRadioBtnState(hDlg, FALSE); +static +BOOL +NetworkDlg_OnOK( + HWND hDlg, + PNETIDDATA pNetIdData) +{ + WCHAR szMsgText[MAX_PATH], szMsgTitle[MAX_PATH]; - if (NetWkstaGetInfo(NULL, - 101, - (LPBYTE*)&wki) == NERR_Success) - { - SetDlgItemText(hDlg, - 1007, - wki->wki101_langroup); - } - else DisableControls(hDlg); - - if (wki) NetApiBufferFree(wki); - break; - } - } + if (pNetIdData->bHostNameChanged) + { + if (!IsValidComputerName(hDlg, 1002)) + { + SetFocus(GetDlgItem(hDlg, 1002)); + return FALSE; + } - if (JoinName) NetApiBufferFree(JoinName); - } + GetWindowText(GetDlgItem(hDlg, 1002), pNetIdData->szHostName, ARRAYSIZE(pNetIdData->szHostName)); + + if (!SetComputerNameExW(ComputerNamePhysicalDnsHostname, pNetIdData->szHostName)) + { + LoadStringW(hDllInstance, 4001, szMsgText, ARRAYSIZE(szMsgText)); + MessageBoxW(hDlg, szMsgText, NULL, MB_OK | MB_ICONERROR); + return FALSE; } - break; + } - case WM_COMMAND: + if (pNetIdData->bDomainNameChanged) + { + if (!SetComputerNameExW(ComputerNamePhysicalDnsDomain, pNetIdData->szDomainName)) { + /* FIXME: Show error message */ + return FALSE; + } + } + + LoadStringW(hDllInstance, 4000, szMsgTitle, ARRAYSIZE(szMsgTitle)); + LoadStringW(hDllInstance, 24, szMsgText, ARRAYSIZE(szMsgText)); + MessageBoxW(hDlg, szMsgText, szMsgTitle, MB_OK | MB_ICONINFORMATION); + + return TRUE; +} + +static +INT_PTR CALLBACK +NetworkPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + PNETIDDATA pNetIdData; + + pNetIdData = (PNETIDDATA)GetWindowLongPtr(hDlg, DWLP_USER); + + switch (Msg) + { + case WM_INITDIALOG: + pNetIdData = (PNETIDDATA)lParam; + if (pNetIdData != NULL) + { + SetWindowLongPtr(hDlg, DWLP_USER, (LONG_PTR)pNetIdData); + NetworkDlg_OnInitDialog(hDlg, pNetIdData); + EnableWindow(GetDlgItem(hDlg, IDOK), FALSE); + } + return TRUE; + + case WM_COMMAND: switch (LOWORD(wParam)) { case 1002: if (HIWORD(wParam) == EN_CHANGE) { - TCHAR szText[MAX_COMPUTERNAME_LENGTH + 1]; - - GetWindowText(GetDlgItem(hDlg, 1002), szText, MAX_COMPUTERNAME_LENGTH + 1); - SetDlgItemText(hDlg, 1001, szText); + UpdateFullComputerName(hDlg, 1001, pNetIdData); + pNetIdData->bHostNameChanged = TRUE; + EnableWindow(GetDlgItem(hDlg, IDOK), TRUE); } break; @@ -201,70 +413,27 @@ NetworkPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) break; case 1003: - DialogBox(hDllInstance, - MAKEINTRESOURCE(IDD_PROPPAGEDNSANDNETBIOS), - hDlg, - DNSSuffixPropDlgProc); - break; - - case IDOK: - { - DWORD Size = MAX_COMPUTERNAME_LENGTH + 1; - TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; - TCHAR NewComputerName[MAX_COMPUTERNAME_LENGTH + 1]; - - if (GetComputerName(ComputerName, &Size)) + if (DialogBoxParam(hDllInstance, + MAKEINTRESOURCE(IDD_PROPPAGEDNSANDNETBIOS), + hDlg, + DNSSuffixPropDlgProc, + (LPARAM)pNetIdData)) { - if (GetWindowText(GetDlgItem(hDlg, 1002), - NewComputerName, - (MAX_COMPUTERNAME_LENGTH + 1))) - { - if (_tcscmp(ComputerName, NewComputerName) != 0) - { - if (!IsValidComputerName(NewComputerName)) - { - TCHAR szText[MAX_PATH], szMsgText[MAX_PATH]; - - LoadString(hDllInstance, 1030, szText, sizeof(szText) / sizeof(TCHAR)); - - swprintf(szMsgText, szText, NewComputerName); - MessageBox(hDlg, szMsgText, NULL, MB_OK | MB_ICONERROR); - SetFocus(GetDlgItem(hDlg, 1002)); - break; - } - else if (!SetComputerNameExW(ComputerNamePhysicalDnsHostname, NewComputerName)) - { - TCHAR szMsgText[MAX_PATH]; - - LoadString(hDllInstance, 4001, szMsgText, sizeof(szMsgText) / sizeof(TCHAR)); - - MessageBox(hDlg, szMsgText, NULL, MB_OK | MB_ICONERROR); - } - else - { - TCHAR szMsgTitle[MAX_PATH], szMsgText[MAX_PATH]; - - LoadString(hDllInstance, 4000, szMsgTitle, sizeof(szMsgTitle) / sizeof(TCHAR)); - LoadString(hDllInstance, 24, szMsgText, sizeof(szMsgText) / sizeof(TCHAR)); - - MessageBox(hDlg, szMsgText, szMsgTitle, MB_OK | MB_ICONINFORMATION); - - NetIDPageProc(GetParent(hDlg), WM_INITDIALOG, 0, 0); - } - } - } + UpdateFullComputerName(hDlg, 1001, pNetIdData); + EnableWindow(GetDlgItem(hDlg, IDOK), TRUE); } + break; - EndDialog(hDlg, LOWORD(wParam)); - } - break; + case IDOK: + if (NetworkDlg_OnOK(hDlg, pNetIdData)) + EndDialog(hDlg, TRUE); + break; case IDCANCEL: - EndDialog(hDlg, LOWORD(wParam)); + EndDialog(hDlg, FALSE); break; } - } - break; + break; } return FALSE; @@ -273,12 +442,11 @@ NetworkPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) static VOID NetIDPage_OnInitDialog( - HWND hwndDlg) + HWND hwndDlg, + PNETIDDATA pNetIdData) { WCHAR ComputerDescription[MAX_COMPUTERDESCRIPTION_LENGTH + 1]; - WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD RegSize = sizeof(ComputerDescription); - DWORD Size = MAX_COMPUTERNAME_LENGTH + 1; HKEY KeyHandle; LPWKSTA_INFO_101 wki; LONG lError; @@ -308,11 +476,6 @@ NetIDPage_OnInitDialog( RegCloseKey(KeyHandle); } - if (GetComputerName(ComputerName, &Size)) - { - SetDlgItemText(hwndDlg, IDC_COMPUTERNAME, ComputerName); - } - if (NetWkstaGetInfo(NULL, 101, (LPBYTE*)&wki) == NERR_Success) { SetDlgItemText(hwndDlg, IDC_WORKGROUPDOMAIN_NAME, wki->wki101_langroup); @@ -383,16 +546,23 @@ NetIDPageProc(IN HWND hwndDlg, IN WPARAM wParam, IN LPARAM lParam) { - static BOOL bEnable = FALSE; - INT_PTR Ret = 0; + PNETIDDATA pNetIdData; + + pNetIdData = (PNETIDDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: - NetIDPage_OnInitDialog(hwndDlg); - bEnable = TRUE; - Ret = TRUE; - break; + pNetIdData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NETIDDATA)); + if (pNetIdData != NULL) + { + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pNetIdData); + GetComputerNames(pNetIdData); + SetFullComputerName(hwndDlg, IDC_COMPUTERNAME, pNetIdData); + NetIDPage_OnInitDialog(hwndDlg, pNetIdData); + pNetIdData->bEnable = TRUE; + } + return TRUE; case WM_NOTIFY: switch (((LPNMHDR)lParam)->code) @@ -407,21 +577,34 @@ NetIDPageProc(IN HWND hwndDlg, switch (LOWORD(wParam)) { case IDC_COMPDESC: - if (HIWORD(wParam) == EN_CHANGE && bEnable == TRUE) + if (HIWORD(wParam) == EN_CHANGE && pNetIdData->bEnable == TRUE) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_NETWORK_PROPERTY: - DialogBox(hDllInstance, - MAKEINTRESOURCE(IDD_PROPPAGECOMPNAMECHENGE), - hwndDlg, - NetworkPropDlgProc); + if (DialogBoxParam(hDllInstance, + MAKEINTRESOURCE(IDD_PROPPAGECOMPNAMECHENGE), + hwndDlg, + NetworkPropDlgProc, + (LPARAM)pNetIdData)) + { + UpdateFullComputerName(hwndDlg, IDC_COMPUTERNAME, pNetIdData); + } break; } break; + + case WM_DESTROY: + if (pNetIdData != NULL) + { + HeapFree(GetProcessHeap(), 0, pNetIdData); + pNetIdData = NULL; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)NULL); + } + break; } - return Ret; + return FALSE; } HPROPSHEETPAGE WINAPI

1 0

[reactos] 01/01: [NTDLL] Add policy kill-switch for manifest based automatic shimming CORE-16631
by Mark Jansen 25 Jan '20

25 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8381e29467be1a80b6dce… commit 8381e29467be1a80b6dce7109925557835ccb54a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Jan 24 20:06:11 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 25 13:23:54 2020 +0100 [NTDLL] Add policy kill-switch for manifest based automatic shimming CORE-16631 --- dll/ntdll/ldr/ldrinit.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index 37e731c5960..955c9a23b8c 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -1537,6 +1537,40 @@ LdrpValidateImageForMp(IN PLDR_DATA_TABLE_ENTRY LdrDataTableEntry) UNIMPLEMENTED; } +BOOLEAN +NTAPI +LdrpDisableProcessCompatGuidDetection(VOID) +{ + UNICODE_STRING PolicyKey = RTL_CONSTANT_STRING(L"\\Registry\\MACHINE\\Software\\Policies\\Microsoft\\Windows\\AppCompat"); + UNICODE_STRING DisableDetection = RTL_CONSTANT_STRING(L"DisableCompatGuidDetection"); + OBJECT_ATTRIBUTES PolicyKeyAttributes = RTL_CONSTANT_OBJECT_ATTRIBUTES(&PolicyKey, OBJ_CASE_INSENSITIVE); + KEY_VALUE_PARTIAL_INFORMATION KeyInfo; + ULONG ResultLength; + NTSTATUS Status; + HANDLE KeyHandle; + + Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &PolicyKeyAttributes); + if (NT_SUCCESS(Status)) + { + Status = NtQueryValueKey(KeyHandle, + &DisableDetection, + KeyValuePartialInformation, + &KeyInfo, + sizeof(KeyInfo), + &ResultLength); + NtClose(KeyHandle); + if ((NT_SUCCESS(Status)) && + (KeyInfo.Type == REG_DWORD) && + (KeyInfo.DataLength == sizeof(ULONG)) && + (KeyInfo.Data[0] == TRUE)) + { + return TRUE; + } + } + return FALSE; +} + + VOID NTAPI LdrpInitializeProcessCompat(PVOID pProcessActctx, PVOID* pOldShimData) @@ -1610,6 +1644,12 @@ LdrpInitializeProcessCompat(PVOID pProcessActctx, PVOID* pOldShimData) if (ContextCompatInfo->Elements[n].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS && RtlCompareMemory(&ContextCompatInfo->Elements[n].Id, KnownCompatGuids[cur].Guid, sizeof(GUID)) == sizeof(GUID)) { + if (LdrpDisableProcessCompatGuidDetection()) + { + DPRINT1("LdrpInitializeProcessCompat: Not applying automatic fix for winver 0x%x due to policy\n", KnownCompatGuids[cur].Version); + return; + } + /* If this process did not need shim data before, allocate and store it */ if (pShimData == NULL) {

1 0

[reactos] 01/01: [COMCTL] Use DIALOG instead of DIALOGEX resources This is needed, because property sheets can modify the dialog resource, and example code (and some existing applications) expect DIALOG. One such application is the VB6 setup. CORE-16650
by Mark Jansen 25 Jan '20

25 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea35843c300f381845b69… commit ea35843c300f381845b69c634e51ba849a0ea5a7 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Jan 24 20:46:16 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 25 12:58:27 2020 +0100 [COMCTL] Use DIALOG instead of DIALOGEX resources This is needed, because property sheets can modify the dialog resource, and example code (and some existing applications) expect DIALOG. One such application is the VB6 setup. CORE-16650 --- dll/win32/comctl32/lang/comctl_Bg.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Cs.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Da.rc | 6 +++--- dll/win32/comctl32/lang/comctl_De.rc | 6 +++--- dll/win32/comctl32/lang/comctl_El.rc | 6 +++--- dll/win32/comctl32/lang/comctl_En.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Eo.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Es.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Et.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Fr.rc | 6 +++--- dll/win32/comctl32/lang/comctl_He.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Hi.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Hu.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Id.rc | 6 +++--- dll/win32/comctl32/lang/comctl_It.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Ja.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Ko.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Lt.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Nl.rc | 6 +++--- dll/win32/comctl32/lang/comctl_No.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Pl.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Pt.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Ro.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Ru.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Si.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Sk.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Sq.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Sr.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Sv.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Th.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Tr.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Tw.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Uk.rc | 6 +++--- dll/win32/comctl32/lang/comctl_Zh.rc | 6 +++--- 34 files changed, 102 insertions(+), 102 deletions(-) diff --git a/dll/win32/comctl32/lang/comctl_Bg.rc b/dll/win32/comctl32/lang/comctl_Bg.rc index acc9f7d83a6..0e455dbb733 100644 --- a/dll/win32/comctl32/lang/comctl_Bg.rc +++ b/dll/win32/comctl32/lang/comctl_Bg.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Свойства на %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Wizard" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Персонализиране на лентата с инструменти" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Cs.rc b/dll/win32/comctl32/lang/comctl_Cs.rc index 21caa2049d9..1a7cedbf49e 100644 --- a/dll/win32/comctl32/lang/comctl_Cs.rc +++ b/dll/win32/comctl32/lang/comctl_Cs.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Vlastnosti %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Průvodce" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Nastavení panelu" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Da.rc b/dll/win32/comctl32/lang/comctl_Da.rc index 8776b00c7e5..f2e6abba19a 100644 --- a/dll/win32/comctl32/lang/comctl_Da.rc +++ b/dll/win32/comctl32/lang/comctl_Da.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Egenskaper for %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Guide" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Tilpas Værktøjslinje" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_De.rc b/dll/win32/comctl32/lang/comctl_De.rc index ff4fc93e6aa..670be5162ff 100644 --- a/dll/win32/comctl32/lang/comctl_De.rc +++ b/dll/win32/comctl32/lang/comctl_De.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Schließen" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Eigenschaften für %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Assistent" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Symbolleiste einrichten" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_El.rc b/dll/win32/comctl32/lang/comctl_El.rc index e5176ed2cab..0560d6447b9 100644 --- a/dll/win32/comctl32/lang/comctl_El.rc +++ b/dll/win32/comctl32/lang/comctl_El.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Ιδιότητες για %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Βοηθός" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Παραμετροποίηση Μπάρας Εργαλείων" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_En.rc b/dll/win32/comctl32/lang/comctl_En.rc index 366434039bd..590d3e9efe5 100644 --- a/dll/win32/comctl32/lang/comctl_En.rc +++ b/dll/win32/comctl32/lang/comctl_En.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Properties for %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Wizard" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Customize Toolbar" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Eo.rc b/dll/win32/comctl32/lang/comctl_Eo.rc index 83cd9468e4c..b4e8eedf84a 100644 --- a/dll/win32/comctl32/lang/comctl_Eo.rc +++ b/dll/win32/comctl32/lang/comctl_Eo.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Ecoj laŭ %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Estrita Proceduro" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Agordu stangon de la iloj" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Es.rc b/dll/win32/comctl32/lang/comctl_Es.rc index 2d789d4bf11..dc2eddbf55a 100644 --- a/dll/win32/comctl32/lang/comctl_Es.rc +++ b/dll/win32/comctl32/lang/comctl_Es.rc @@ -53,7 +53,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Propiedades de %s" FONT 8, "MS Shell Dlg" @@ -66,7 +66,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Asistente" FONT 8, "MS Shell Dlg" @@ -82,7 +82,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Personalizar barra de herramientas" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Et.rc b/dll/win32/comctl32/lang/comctl_Et.rc index 7dda761322e..463757a7310 100644 --- a/dll/win32/comctl32/lang/comctl_Et.rc +++ b/dll/win32/comctl32/lang/comctl_Et.rc @@ -53,7 +53,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Sule" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "%s atribuudid" FONT 8, "MS Shell Dlg" @@ -66,7 +66,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Viisard" FONT 8, "MS Shell Dlg" @@ -82,7 +82,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kohanda tööriistariba" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Fr.rc b/dll/win32/comctl32/lang/comctl_Fr.rc index 209d7e196bd..5c7791bbd75 100644 --- a/dll/win32/comctl32/lang/comctl_Fr.rc +++ b/dll/win32/comctl32/lang/comctl_Fr.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Propriétés de %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Assistant" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Personnaliser la barre d'outils" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_He.rc b/dll/win32/comctl32/lang/comctl_He.rc index 9768ba7ebc7..f3f852a4ff9 100644 --- a/dll/win32/comctl32/lang/comctl_He.rc +++ b/dll/win32/comctl32/lang/comctl_He.rc @@ -54,7 +54,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "מאפיינים של %s" FONT 8, "MS Shell Dlg" @@ -67,7 +67,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "אשף" FONT 8, "MS Shell Dlg" @@ -83,7 +83,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "התאמת סרגל כלים" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Hi.rc b/dll/win32/comctl32/lang/comctl_Hi.rc index 010213fb380..13fb4440f12 100644 --- a/dll/win32/comctl32/lang/comctl_Hi.rc +++ b/dll/win32/comctl32/lang/comctl_Hi.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&बंद करे" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "%s के गुण" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "विज़ार्ड" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "टूलबार कस्टमाइज़ करें" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Hu.rc b/dll/win32/comctl32/lang/comctl_Hu.rc index 4f4a764dea6..351e3e23ddc 100644 --- a/dll/win32/comctl32/lang/comctl_Hu.rc +++ b/dll/win32/comctl32/lang/comctl_Hu.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Bezárás" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Tulajdonságok: %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Varázsló" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Eszköztár testreszabása" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Id.rc b/dll/win32/comctl32/lang/comctl_Id.rc index bea2cf2edd7..cc20524f1ce 100644 --- a/dll/win32/comctl32/lang/comctl_Id.rc +++ b/dll/win32/comctl32/lang/comctl_Id.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Tutup" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Properties for %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Penuntun" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Sesuaikan Bilah Alat" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_It.rc b/dll/win32/comctl32/lang/comctl_It.rc index 30c0a2de102..a19c0bd2d6c 100644 --- a/dll/win32/comctl32/lang/comctl_It.rc +++ b/dll/win32/comctl32/lang/comctl_It.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Proprietà di %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Procedura guidata" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Personalizza la barra degli strumenti" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Ja.rc b/dll/win32/comctl32/lang/comctl_Ja.rc index 3ec783bbdf7..6462a2ed2ea 100644 --- a/dll/win32/comctl32/lang/comctl_Ja.rc +++ b/dll/win32/comctl32/lang/comctl_Ja.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "%sのプロパティ" FONT 9, "MS UI Gothic" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "ウィザード" FONT 9, "MS UI Gothic" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ツールバーのカスタマイズ" FONT 9, "MS UI Gothic" diff --git a/dll/win32/comctl32/lang/comctl_Ko.rc b/dll/win32/comctl32/lang/comctl_Ko.rc index 6c98669d9a2..ecb0fed62d9 100644 --- a/dll/win32/comctl32/lang/comctl_Ko.rc +++ b/dll/win32/comctl32/lang/comctl_Ko.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "%s 속성" FONT 9, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "마법사" FONT 9, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "도구바 사용자 정의" FONT 9, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Lt.rc b/dll/win32/comctl32/lang/comctl_Lt.rc index 4b6586fa716..365ad0c8919 100644 --- a/dll/win32/comctl32/lang/comctl_Lt.rc +++ b/dll/win32/comctl32/lang/comctl_Lt.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "%s savybės" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Vediklis" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Tinkinti mygtukų juostą" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Nl.rc b/dll/win32/comctl32/lang/comctl_Nl.rc index 37c51872cce..764b118df87 100644 --- a/dll/win32/comctl32/lang/comctl_Nl.rc +++ b/dll/win32/comctl32/lang/comctl_Nl.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Eigenschappen voor %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Assistent" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Gereedschappenbalk aanpassen" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_No.rc b/dll/win32/comctl32/lang/comctl_No.rc index 76688c74512..fbe9d66771e 100644 --- a/dll/win32/comctl32/lang/comctl_No.rc +++ b/dll/win32/comctl32/lang/comctl_No.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Egenskaper for %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Veiviser" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Tilpass verktøylinje" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Pl.rc b/dll/win32/comctl32/lang/comctl_Pl.rc index f0beb2c4cc3..f889050c976 100644 --- a/dll/win32/comctl32/lang/comctl_Pl.rc +++ b/dll/win32/comctl32/lang/comctl_Pl.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Zamknij" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Właściwości: %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Kreator" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Dostosowywanie paska narzędzi" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Pt.rc b/dll/win32/comctl32/lang/comctl_Pt.rc index 6da5846ee33..0d49a877efe 100644 --- a/dll/win32/comctl32/lang/comctl_Pt.rc +++ b/dll/win32/comctl32/lang/comctl_Pt.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Fechar" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Propriedades %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Assistente" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Personalizar a barra de ferramentas" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Ro.rc b/dll/win32/comctl32/lang/comctl_Ro.rc index 1c3e904b9c1..2f274749af2 100644 --- a/dll/win32/comctl32/lang/comctl_Ro.rc +++ b/dll/win32/comctl32/lang/comctl_Ro.rc @@ -54,7 +54,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Închide" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Proprietăți pentru %s" FONT 8, "MS Shell Dlg" @@ -67,7 +67,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Asistent" FONT 8, "MS Shell Dlg" @@ -83,7 +83,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Personalizare panou de instrumente" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Ru.rc b/dll/win32/comctl32/lang/comctl_Ru.rc index 2152c99bbd1..a51f6b0c12c 100644 --- a/dll/win32/comctl32/lang/comctl_Ru.rc +++ b/dll/win32/comctl32/lang/comctl_Ru.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Свойства: %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Мастер" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Настройка панели инструментов" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Si.rc b/dll/win32/comctl32/lang/comctl_Si.rc index bee6d507b51..2ac77745fe1 100644 --- a/dll/win32/comctl32/lang/comctl_Si.rc +++ b/dll/win32/comctl32/lang/comctl_Si.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Lastnosti %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Čarovnik" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Prilagoditev orodne vrstice" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Sk.rc b/dll/win32/comctl32/lang/comctl_Sk.rc index d1ebd015bdc..c9addc8886e 100644 --- a/dll/win32/comctl32/lang/comctl_Sk.rc +++ b/dll/win32/comctl32/lang/comctl_Sk.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "%s - vlastnosti" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Sprievodca" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Prispôsobenie panela nástrojov" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Sq.rc b/dll/win32/comctl32/lang/comctl_Sq.rc index 5c17bdeea28..23e70715164 100644 --- a/dll/win32/comctl32/lang/comctl_Sq.rc +++ b/dll/win32/comctl32/lang/comctl_Sq.rc @@ -53,7 +53,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Properties for %s" FONT 8, "MS Shell Dlg" @@ -66,7 +66,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Wizard" FONT 8, "MS Shell Dlg" @@ -82,7 +82,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Konfiguro Toolbarin" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Sr.rc b/dll/win32/comctl32/lang/comctl_Sr.rc index b200342d550..f8ee2e08dd0 100644 --- a/dll/win32/comctl32/lang/comctl_Sr.rc +++ b/dll/win32/comctl32/lang/comctl_Sr.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Svojstva za %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Vodič" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Prilagodi alatnicu" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Sv.rc b/dll/win32/comctl32/lang/comctl_Sv.rc index a9037d83b42..46b11c4d5f5 100644 --- a/dll/win32/comctl32/lang/comctl_Sv.rc +++ b/dll/win32/comctl32/lang/comctl_Sv.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Egenskaper för %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Guide" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Anpassa verktygsfältet" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Th.rc b/dll/win32/comctl32/lang/comctl_Th.rc index 3633f682685..0a7f6512a55 100644 --- a/dll/win32/comctl32/lang/comctl_Th.rc +++ b/dll/win32/comctl32/lang/comctl_Th.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "คุณสมบัติของ %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Wizard" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ปรับแต่งแถบเครื่องมือ" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Tr.rc b/dll/win32/comctl32/lang/comctl_Tr.rc index 0ce649e6da8..a42da0e42c9 100644 --- a/dll/win32/comctl32/lang/comctl_Tr.rc +++ b/dll/win32/comctl32/lang/comctl_Tr.rc @@ -51,7 +51,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "%s Husûsiyetleri" FONT 8, "MS Shell Dlg" @@ -64,7 +64,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Yardımcı" FONT 8, "MS Shell Dlg" @@ -80,7 +80,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Araç Çubuğunu Husûsileştir" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Tw.rc b/dll/win32/comctl32/lang/comctl_Tw.rc index 2b62111be4e..51d9c75acd2 100644 --- a/dll/win32/comctl32/lang/comctl_Tw.rc +++ b/dll/win32/comctl32/lang/comctl_Tw.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "關閉(&C)" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "%s內容" FONT 9, "新細明體" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "精靈" FONT 9, "新細明體" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "自訂工具列" FONT 9, "新細明體" diff --git a/dll/win32/comctl32/lang/comctl_Uk.rc b/dll/win32/comctl32/lang/comctl_Uk.rc index 42715da32be..4e8d09f22b6 100644 --- a/dll/win32/comctl32/lang/comctl_Uk.rc +++ b/dll/win32/comctl32/lang/comctl_Uk.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Властивості для %s" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Майстер" FONT 8, "MS Shell Dlg" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Настройка панелі інструментів" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/comctl32/lang/comctl_Zh.rc b/dll/win32/comctl32/lang/comctl_Zh.rc index 766139c54a5..3167a3b59a2 100644 --- a/dll/win32/comctl32/lang/comctl_Zh.rc +++ b/dll/win32/comctl32/lang/comctl_Zh.rc @@ -52,7 +52,7 @@ STRINGTABLE IDS_BUTTON_CLOSE "关闭(&C)" } -IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 +IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "%s属性" FONT 9, "宋体" @@ -65,7 +65,7 @@ BEGIN END -IDD_WIZARD DIALOGEX 0, 0, 290, 159 +IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "向导" FONT 9, "宋体" @@ -81,7 +81,7 @@ BEGIN END -IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "自定义工具栏" FONT 9, "宋体"

1 0

[reactos] 01/01: [MSPAINT] Shorten the license string that is displayed in ShellAbout() dialog. CORE-12356
by Hermès Bélusca-Maïto 24 Jan '20

24 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15bc263b07186fce778e6… commit 15bc263b07186fce778e6c0da60ff85a52d9bfba Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jan 24 23:40:32 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jan 24 23:40:32 2020 +0100 [MSPAINT] Shorten the license string that is displayed in ShellAbout() dialog. CORE-12356 [MPLAY32][REGEDIT][TASKMGR][WORDPAD][BROWSEUI] Use NULL for empty handles / string pointers in ShellAbout() calls. --- base/applications/mplay32/mplay32.c | 2 +- base/applications/mspaint/lang/bg-BG.rc | 2 +- base/applications/mspaint/lang/cs-CZ.rc | 2 +- base/applications/mspaint/lang/de-DE.rc | 2 +- base/applications/mspaint/lang/en-GB.rc | 2 +- base/applications/mspaint/lang/en-US.rc | 2 +- base/applications/mspaint/lang/es-ES.rc | 2 +- base/applications/mspaint/lang/et-EE.rc | 2 +- base/applications/mspaint/lang/eu-ES.rc | 2 +- base/applications/mspaint/lang/fr-FR.rc | 2 +- base/applications/mspaint/lang/he-IL.rc | 2 +- base/applications/mspaint/lang/hu-HU.rc | 2 +- base/applications/mspaint/lang/id-ID.rc | 2 +- base/applications/mspaint/lang/it-IT.rc | 2 +- base/applications/mspaint/lang/ja-JP.rc | 2 +- base/applications/mspaint/lang/nl-NL.rc | 2 +- base/applications/mspaint/lang/no-NO.rc | 2 +- base/applications/mspaint/lang/pl-PL.rc | 2 +- base/applications/mspaint/lang/pt-BR.rc | 2 +- base/applications/mspaint/lang/pt-PT.rc | 2 +- base/applications/mspaint/lang/ro-RO.rc | 2 +- base/applications/mspaint/lang/ru-RU.rc | 2 +- base/applications/mspaint/lang/sk-SK.rc | 2 +- base/applications/mspaint/lang/sq-AL.rc | 2 +- base/applications/mspaint/lang/sv-SE.rc | 2 +- base/applications/mspaint/lang/tr-TR.rc | 2 +- base/applications/mspaint/lang/uk-UA.rc | 2 +- base/applications/mspaint/lang/vi-VN.rc | 2 +- base/applications/mspaint/lang/zh-CN.rc | 2 +- base/applications/mspaint/lang/zh-TW.rc | 2 +- base/applications/regedit/about.c | 2 +- base/applications/taskmgr/about.c | 2 +- base/applications/wordpad/wordpad.c | 4 ++-- dll/win32/browseui/shellbrowser.cpp | 2 +- 34 files changed, 35 insertions(+), 35 deletions(-) diff --git a/base/applications/mplay32/mplay32.c b/base/applications/mplay32/mplay32.c index 2b70c1d0de6..06694d517ae 100644 --- a/base/applications/mplay32/mplay32.c +++ b/base/applications/mplay32/mplay32.c @@ -1447,7 +1447,7 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) case IDM_ABOUT: { HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN)); - ShellAbout(hwnd, szAppTitle, 0, mplayIcon); + ShellAbout(hwnd, szAppTitle, NULL, mplayIcon); DeleteObject(mplayIcon); break; } diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 161faeb2e98..de891b5254f 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Рисуване" IDS_WINDOWTITLE "%s - рисуване" IDS_INFOTITLE "Рисувач (Paint) за РеактОС" - IDS_INFOTEXT "Рисувач (Paint) за РеактОС е достъпен под GNU Lesser General Public License (LGPL, see www.gnu.org)" + IDS_INFOTEXT "Достъпен под GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Искате ли да запишете промените в %s?" IDS_DEFAULTFILENAME "Без име.bmp" IDS_MINIATURETITLE "Изображенийце" diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 71c697f4100..06f9a1a2604 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Malování" IDS_WINDOWTITLE "%s - Malování" IDS_INFOTITLE "ReactOS Malování" - IDS_INFOTEXT "ReactOS Malování je dostupné pod licencí GNU Lesser General Public License (LGPL, viz. www.gnu.org)" + IDS_INFOTEXT "Dostupné pod licencí GNU Lesser General Public License (LGPL, viz. www.gnu.org)" IDS_SAVEPROMPTTEXT "Chcete uložit provedené změny v %s?" IDS_DEFAULTFILENAME "Bez názvu.bmp" IDS_MINIATURETITLE "Miniatura" diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 9487f135d02..029f5f632b7 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint für ReactOS" - IDS_INFOTEXT "Paint für ReactOS steht unter der GNU Lesser General Public License (LGPL, siehe www.gnu.org)" + IDS_INFOTEXT "Unter der GNU Lesser General Public License stehen (LGPL, siehe www.gnu.org)" IDS_SAVEPROMPTTEXT "Möchten Sie die Änderungen an %s speichern?" IDS_DEFAULTFILENAME "Unbenannt.bmp" IDS_MINIATURETITLE "Miniaturansicht" diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 2348597c4d7..f77bc942d2b 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint for ReactOS" - IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" + IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?" IDS_DEFAULTFILENAME "Unnamed.bmp" IDS_MINIATURETITLE "Miniature" diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 55115d5321d..a48eed9516f 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint for ReactOS" - IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" + IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?" IDS_DEFAULTFILENAME "Unnamed.bmp" IDS_MINIATURETITLE "Miniature" diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index fd2272eb89f..32c4c111b64 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -197,7 +197,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint para ReactOS" - IDS_INFOTEXT "Paint para ReactOS está disponible bajo los términos de la GNU Lesser General Public License (LGPL, ver www.gnu.org)" + IDS_INFOTEXT "Disponible bajo los términos de la GNU Lesser General Public License (LGPL, ver www.gnu.org)" IDS_SAVEPROMPTTEXT "¿Guardar cambios a %s?" IDS_DEFAULTFILENAME "Sin título.bmp" IDS_MINIATURETITLE "Miniatura" diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 9f31f984708..336c54d225b 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint ReactOS'ile" - IDS_INFOTEXT "Paint ReactOS'ile on saadaval ""GNU Lesser General Public License"" litsentsi all (LGPL, vaata www.gnu.org)" + IDS_INFOTEXT "On saadaval ""GNU Lesser General Public License"" litsentsi all (LGPL, vaata www.gnu.org)" IDS_SAVEPROMPTTEXT "Kas soovid salvesta muudatusi failis %s?" IDS_DEFAULTFILENAME "Nimetu.bmp" IDS_MINIATURETITLE "Miniatuur" diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index ff951249e5a..6415ba92593 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -188,7 +188,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint para ReactOS" - IDS_INFOTEXT "Paint para ReactOS is available under the GNU Lesser General Public License (LGPL, ver www.gnu.org)" + IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, ver www.gnu.org)" IDS_SAVEPROMPTTEXT "¿Guardar cambios cambios a %s?" IDS_DEFAULTFILENAME "Izegabea.bmp" IDS_MINIATURETITLE "Miniatura" diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 72ea9d5dd46..58545edc433 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -188,7 +188,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint pour ReactOS" - IDS_INFOTEXT "Paint pour ReactOS est mise à disposition sous la Licence publique générale limitée GNU (LGPL, voir www.gnu.org)" + IDS_INFOTEXT "Mis à disposition sous la Licence publique générale limitée GNU (LGPL, voir www.gnu.org)" IDS_SAVEPROMPTTEXT "Voulez-vous enregistrer les modifications de %s?" IDS_DEFAULTFILENAME "Sans titre.bmp" IDS_MINIATURETITLE "Miniature" diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index d1ead45e0ee..c30e98586f0 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -191,7 +191,7 @@ BEGIN IDS_PROGRAMNAME "צייר" IDS_WINDOWTITLE "%s - צייר" IDS_INFOTITLE "צייר עבור ReactOS" - IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" + IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "האם ברצונך לשמור את השינויים של %s?" IDS_DEFAULTFILENAME "ללא שם.bmp" IDS_MINIATURETITLE "ממוזער" diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 02914cbce8a..d291c1c2a6a 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -188,7 +188,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "ReactOS Paint" - IDS_INFOTEXT "A ReactOS Paint a GNU Lesser General Public License (LGPL) alatt érhetõ el (lásd www.gnu.org)" + IDS_INFOTEXT "A GNU Lesser General Public License (LGPL) alatt érhetõ el (lásd www.gnu.org)" IDS_SAVEPROMPTTEXT "Kívánja menteni %s változásait?" IDS_DEFAULTFILENAME "Névtelen.bmp" IDS_MINIATURETITLE "Miniatúra" diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index a4314581e84..794ecce0431 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint untuk ReactOS" - IDS_INFOTEXT "Paint untuk ReactOS tersedia di bawah GNU Lesser General Public License (LGPL, see www.gnu.org)" + IDS_INFOTEXT "Tersedia di bawah GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Ingin menyimpan perubahan untuk %s?" IDS_DEFAULTFILENAME "Tanpa Nama.bmp" IDS_MINIATURETITLE "Miniatur" diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index c5bbb98c272..7179b1696df 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint per ReactOS" - IDS_INFOTEXT "Paint per ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" + IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Volete salvare le modifiche a %s?" IDS_DEFAULTFILENAME "SenzaNome.bmp" IDS_MINIATURETITLE "Miniature" diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 0f9bb1abcdf..f5487657376 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "ペイント" IDS_WINDOWTITLE "%s - ペイント" IDS_INFOTITLE "ReactOS ペイント" - IDS_INFOTEXT "ReactOS ペイントは GNU Lesser General Public License (LGPL, 詳細は www.gnu.org)の下で利用可能です。" + IDS_INFOTEXT "GNU Lesser General Public License (LGPL, 詳細は www.gnu.org) の下で利用可能です。" IDS_SAVEPROMPTTEXT "%s の変更内容を保存しますか?" IDS_DEFAULTFILENAME "無題.bmp" IDS_MINIATURETITLE "縮小図" diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 65f26ab3867..c87ffa6c91e 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint for ReactOS" - IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" + IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Wilt u de wijzigingen die zijn aangebracht in %s opslaan?" IDS_DEFAULTFILENAME "Naamloos.bmp" IDS_MINIATURETITLE "Miniature" diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index ff5bb40f6e8..8c5ee64c77a 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint for ReactOS" - IDS_INFOTEXT "Paint for ReactOS er nå tilgjengelig under GNU Lesser General Public License (LGPL, se http://www.gnu.org/home.nb.html)" + IDS_INFOTEXT "Tilgjengelig under GNU Lesser General Public License (LGPL, se http://www.gnu.org/home.nb.html)" IDS_SAVEPROMPTTEXT "Vil du lagre endringene til %s?" IDS_DEFAULTFILENAME "Utennavn.bmp" IDS_MINIATURETITLE "Miniature" diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 8877628f4fa..47293bd2bbf 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -197,7 +197,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint dla ReactOS" - IDS_INFOTEXT "Paint dla ReactOS jest dostępny na licencji GNU Lesser General Public License (LGPL, www.gnu.org)" + IDS_INFOTEXT "Dostępny na licencji GNU Lesser General Public License (LGPL, www.gnu.org)" IDS_SAVEPROMPTTEXT "Czy chcesz zapisać zmiany do %s?" IDS_DEFAULTFILENAME "bez tytułu.bmp" IDS_MINIATURETITLE "Miniatura" diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index 68cceb64523..135a82ec3bd 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint para ReactOS" - IDS_INFOTEXT "Paint para ReactOS está disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)" + IDS_INFOTEXT "Disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)" IDS_SAVEPROMPTTEXT "Salvar as alterações em %s?" IDS_DEFAULTFILENAME "Imagem.bmp" IDS_MINIATURETITLE "Miniatura" diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index f94304309e0..69ff9a2de61 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint para ReactOS" - IDS_INFOTEXT "Paint para ReactOS está disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)" + IDS_INFOTEXT "Disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)" IDS_SAVEPROMPTTEXT "Pretende guardar as alterações a %s?" IDS_DEFAULTFILENAME "Imagem.bmp" IDS_MINIATURETITLE "Miniature" diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 2e0e97db3bd..68cb073bc0a 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -197,7 +197,7 @@ BEGIN IDS_PROGRAMNAME "Pictare" IDS_WINDOWTITLE "%s - Pictare" IDS_INFOTITLE "Pictare pentru ReactOS" - IDS_INFOTEXT "Pictare pentru ReactOS este disponibilă sub licența GNU Lesser General Public (vedeți www.gnu.org)" + IDS_INFOTEXT "Disponibilă sub licența GNU Lesser General Public (vedeți www.gnu.org)" IDS_SAVEPROMPTTEXT "Doriți păstrarea modificărilor din %s?" IDS_DEFAULTFILENAME "FărăNume.bmp" IDS_MINIATURETITLE "Miniatură" diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index ba42269e775..0740f4bf693 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -188,7 +188,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint для ReactOS" - IDS_INFOTEXT "Paint для ReactOS распространяется под лицензией GNU Lesser General Public License (LGPL, см. www.gnu.org)" + IDS_INFOTEXT "Распространяется под лицензией GNU Lesser General Public License (LGPL, см. www.gnu.org)" IDS_SAVEPROMPTTEXT "Сохранить изменения в %s?" IDS_DEFAULTFILENAME "Безымянный.bmp" IDS_MINIATURETITLE "Эскиз" diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index 6163cab0896..18b9a78f357 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -197,7 +197,7 @@ BEGIN IDS_PROGRAMNAME "Skicár" IDS_WINDOWTITLE "%s - Skicár" IDS_INFOTITLE "Skicár systému ReactOS" - IDS_INFOTEXT "Skicár systému ReactOS je dostupný za podmienok GNU Lesser General Public License (LGPL, viď www.gnu.org)" + IDS_INFOTEXT "Dostupný za podmienok GNU Lesser General Public License (LGPL, viď www.gnu.org)" IDS_SAVEPROMPTTEXT "Chcete uložiť vykonané zmeny do %s?" IDS_DEFAULTFILENAME "Bez názvu.bmp" IDS_MINIATURETITLE "Miniature" diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index 6ae43e5037b..812dbf2d457 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint për ReactOS" - IDS_INFOTEXT "Paint pë ReactOS ësht i disponueshem nën GNU Lesser General Public License (LGPL, see www.gnu.org)" + IDS_INFOTEXT "Ësht i disponueshme nën GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "A doni të ruani ndryshimet tek %s?" IDS_DEFAULTFILENAME "Unnamed.bmp" IDS_MINIATURETITLE "Miniaturë" diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index de83110c08b..fecb9d1c175 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -188,7 +188,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint för ReactOS" - IDS_INFOTEXT "Paint för ReactOS är tillgänglig under GNU Lesser General Public License (LGPL, se www.gnu.org)" + IDS_INFOTEXT "Tillgänglig under GNU Lesser General Public License (LGPL, se www.gnu.org)" IDS_SAVEPROMPTTEXT "Vill du spara ändringarna till %s?" IDS_DEFAULTFILENAME "Namnlös.bmp" IDS_MINIATURETITLE "Miniatyr" diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index d34fa66c2e1..a63328232a2 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "ReactOS için Paint" - IDS_INFOTEXT "ReactOS için Paint, GNU Kısıtlı Genel Kamu Lisansı (LGPL, bakınız: www.gnu.org) altında vardır." + IDS_INFOTEXT "GNU Kısıtlı Genel Kamu Lisansı (LGPL, bakınız: www.gnu.org) altında vardır." IDS_SAVEPROMPTTEXT "%s için yapılan değişiklikleri saklamak ister misiniz?" IDS_DEFAULTFILENAME "Adsız.bmp" IDS_MINIATURETITLE "Küçük Resim" diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 08a95f7f82f..f98ee55c9b1 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint для ReactOS" - IDS_INFOTEXT "Paint для ReactOS доступний згідно з GNU Lesser General Public License (LGPL, дивіться www.gnu.org)" + IDS_INFOTEXT "Доступний згідно з GNU Lesser General Public License (LGPL, дивіться www.gnu.org)" IDS_SAVEPROMPTTEXT "Зберегти зміни до %s?" IDS_DEFAULTFILENAME "Без_імені.bmp" IDS_MINIATURETITLE "Мініатюра" diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 12291f7669d..d51ae33d596 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -196,7 +196,7 @@ 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_INFOTEXT "Đượ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ỏ" diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 1cdd838bf25..b560d1b3320 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -197,7 +197,7 @@ BEGIN IDS_PROGRAMNAME "画图" IDS_WINDOWTITLE "%s - 画图" IDS_INFOTITLE "ReactOS 画图" - IDS_INFOTEXT "ReactOS 画图是在 GNU LGPL 许可证下发布的 (详见 www.gnu.org)" + IDS_INFOTEXT "GNU LGPL 许可证下发布的 (详见 www.gnu.org)" IDS_SAVEPROMPTTEXT "您想把改变保存到 %s 吗？" IDS_DEFAULTFILENAME "未命名.bmp" IDS_MINIATURETITLE "缩略图" diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index c89314dde45..85bedb09d01 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -196,7 +196,7 @@ BEGIN IDS_PROGRAMNAME "畫圖" IDS_WINDOWTITLE "%s - 畫圖" IDS_INFOTITLE "ReactOS 畫圖" - IDS_INFOTEXT "ReactOS 畫圖是在 GNU LGPL 下發佈的 (詳見 www.gnu.org)" + IDS_INFOTEXT "GNU LGPL 下發佈的 (詳見 www.gnu.org)" IDS_SAVEPROMPTTEXT "您想把改變保存到 %s 嗎？" IDS_DEFAULTFILENAME "未命名.bmp" IDS_MINIATURETITLE "縮圖" diff --git a/base/applications/regedit/about.c b/base/applications/regedit/about.c index ad01d6da700..6d4d23f75cc 100644 --- a/base/applications/regedit/about.c +++ b/base/applications/regedit/about.c @@ -26,7 +26,7 @@ void ShowAboutBox(HWND hWnd) { WCHAR AppStr[255]; LoadStringW(hInst, IDS_APP_TITLE, AppStr, COUNT_OF(AppStr)); - ShellAboutW(hWnd, AppStr, L"", LoadIconW(hInst, MAKEINTRESOURCEW(IDI_REGEDIT))); + ShellAboutW(hWnd, AppStr, NULL, LoadIconW(hInst, MAKEINTRESOURCEW(IDI_REGEDIT))); } /* EOF */ diff --git a/base/applications/taskmgr/about.c b/base/applications/taskmgr/about.c index 66510ac98c3..63b9b3f4ad9 100644 --- a/base/applications/taskmgr/about.c +++ b/base/applications/taskmgr/about.c @@ -28,6 +28,6 @@ void OnAbout(void) HICON taskmgrIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER)); LoadStringW(hInst, IDS_APP_TITLE, szTaskmgr, sizeof(szTaskmgr)/sizeof(WCHAR)); - ShellAboutW(hMainWnd, szTaskmgr, 0, taskmgrIcon); + ShellAboutW(hMainWnd, szTaskmgr, NULL, taskmgrIcon); DeleteObject(taskmgrIcon); } diff --git a/base/applications/wordpad/wordpad.c b/base/applications/wordpad/wordpad.c index 23c8120399f..acc8aa08b82 100644 --- a/base/applications/wordpad/wordpad.c +++ b/base/applications/wordpad/wordpad.c @@ -1000,8 +1000,8 @@ static void DialogOpenFile(void) static void dialog_about(void) { - HICON icon = LoadImageW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON, 48, 48, LR_SHARED); - ShellAboutW(hMainWnd, wszAppTitle, 0, icon); + HICON icon = LoadImageW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON, 48, 48, LR_SHARED); + ShellAboutW(hMainWnd, wszAppTitle, NULL, icon); } static INT_PTR CALLBACK formatopts_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 590aa1ad750..dc83e60db98 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -3590,7 +3590,7 @@ LRESULT CShellBrowser::OnDisconnectNetworkDrive(WORD wNotifyCode, WORD wID, HWND LRESULT CShellBrowser::OnAboutReactOS(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - ShellAbout(m_hWnd, _T("ReactOS"), _T(""), NULL); + ShellAbout(m_hWnd, _T("ReactOS"), NULL, NULL); return 0; }

1 0

[reactos] 01/01: [USERENV] Add 'See also' comments for translators
by Katayama Hirofumi MZ 24 Jan '20

24 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cefc378b0d64a30d246f0… commit cefc378b0d64a30d246f0ff7a8f71e97de337f78 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jan 24 21:48:22 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Jan 24 21:48:22 2020 +0900 [USERENV] Add 'See also' comments for translators --- dll/win32/userenv/lang/bg-BG.rc | 1 + dll/win32/userenv/lang/cs-CZ.rc | 1 + dll/win32/userenv/lang/da-DK.rc | 1 + dll/win32/userenv/lang/de-DE.rc | 1 + dll/win32/userenv/lang/el-GR.rc | 1 + dll/win32/userenv/lang/en-US.rc | 1 + dll/win32/userenv/lang/es-ES.rc | 1 + dll/win32/userenv/lang/fi-FI.rc | 1 + dll/win32/userenv/lang/fr-FR.rc | 1 + dll/win32/userenv/lang/he-IL.rc | 1 + dll/win32/userenv/lang/hu-HU.rc | 1 + dll/win32/userenv/lang/id-ID.rc | 1 + dll/win32/userenv/lang/it-IT.rc | 1 + dll/win32/userenv/lang/ja-JP.rc | 1 + dll/win32/userenv/lang/lt-LT.rc | 1 + dll/win32/userenv/lang/nl-NL.rc | 1 + dll/win32/userenv/lang/no-NO.rc | 1 + dll/win32/userenv/lang/pl-PL.rc | 1 + dll/win32/userenv/lang/pt-BR.rc | 1 + dll/win32/userenv/lang/pt-PT.rc | 1 + dll/win32/userenv/lang/ro-RO.rc | 1 + dll/win32/userenv/lang/ru-RU.rc | 1 + dll/win32/userenv/lang/sk-SK.rc | 1 + dll/win32/userenv/lang/sq-AL.rc | 1 + dll/win32/userenv/lang/sv-SE.rc | 1 + dll/win32/userenv/lang/th-TH.rc | 1 + dll/win32/userenv/lang/tr-TR.rc | 1 + dll/win32/userenv/lang/uk-UA.rc | 1 + dll/win32/userenv/lang/zh-CN.rc | 1 + dll/win32/userenv/lang/zh-TW.rc | 1 + 30 files changed, 30 insertions(+) diff --git a/dll/win32/userenv/lang/bg-BG.rc b/dll/win32/userenv/lang/bg-BG.rc index e016f79d21c..21da1b64683 100644 --- a/dll/win32/userenv/lang/bg-BG.rc +++ b/dll/win32/userenv/lang/bg-BG.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Документи и настройки" diff --git a/dll/win32/userenv/lang/cs-CZ.rc b/dll/win32/userenv/lang/cs-CZ.rc index ae60572a59a..49bee685d17 100644 --- a/dll/win32/userenv/lang/cs-CZ.rc +++ b/dll/win32/userenv/lang/cs-CZ.rc @@ -5,6 +5,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/da-DK.rc b/dll/win32/userenv/lang/da-DK.rc index 82fdd044903..9324cf3deeb 100644 --- a/dll/win32/userenv/lang/da-DK.rc +++ b/dll/win32/userenv/lang/da-DK.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Lokale Indstillinger" diff --git a/dll/win32/userenv/lang/de-DE.rc b/dll/win32/userenv/lang/de-DE.rc index ab7a7b4b90d..6bb12707924 100644 --- a/dll/win32/userenv/lang/de-DE.rc +++ b/dll/win32/userenv/lang/de-DE.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Dokumente und Einstellungen" diff --git a/dll/win32/userenv/lang/el-GR.rc b/dll/win32/userenv/lang/el-GR.rc index 7c30252b150..657e1c601cc 100644 --- a/dll/win32/userenv/lang/el-GR.rc +++ b/dll/win32/userenv/lang/el-GR.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/en-US.rc b/dll/win32/userenv/lang/en-US.rc index bd9a787df28..448a99170cc 100644 --- a/dll/win32/userenv/lang/en-US.rc +++ b/dll/win32/userenv/lang/en-US.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/es-ES.rc b/dll/win32/userenv/lang/es-ES.rc index da2debb9006..c5b361df779 100644 --- a/dll/win32/userenv/lang/es-ES.rc +++ b/dll/win32/userenv/lang/es-ES.rc @@ -9,6 +9,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/fi-FI.rc b/dll/win32/userenv/lang/fi-FI.rc index 24fc600e229..fc5e90c4d1f 100644 --- a/dll/win32/userenv/lang/fi-FI.rc +++ b/dll/win32/userenv/lang/fi-FI.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/fr-FR.rc b/dll/win32/userenv/lang/fr-FR.rc index e57e2c78056..0c2dd616c41 100644 --- a/dll/win32/userenv/lang/fr-FR.rc +++ b/dll/win32/userenv/lang/fr-FR.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/he-IL.rc b/dll/win32/userenv/lang/he-IL.rc index 2e684163816..5d2ffedeef5 100644 --- a/dll/win32/userenv/lang/he-IL.rc +++ b/dll/win32/userenv/lang/he-IL.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\מסמכים והגדרות" diff --git a/dll/win32/userenv/lang/hu-HU.rc b/dll/win32/userenv/lang/hu-HU.rc index a856a666ef5..2553f2fd317 100644 --- a/dll/win32/userenv/lang/hu-HU.rc +++ b/dll/win32/userenv/lang/hu-HU.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/id-ID.rc b/dll/win32/userenv/lang/id-ID.rc index e529f6afcb1..6715e746e99 100644 --- a/dll/win32/userenv/lang/id-ID.rc +++ b/dll/win32/userenv/lang/id-ID.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Dokumen dan Setelan" diff --git a/dll/win32/userenv/lang/it-IT.rc b/dll/win32/userenv/lang/it-IT.rc index 835bd787b09..704946d78ef 100644 --- a/dll/win32/userenv/lang/it-IT.rc +++ b/dll/win32/userenv/lang/it-IT.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/ja-JP.rc b/dll/win32/userenv/lang/ja-JP.rc index 70a1b0ac671..b9aef4b977f 100644 --- a/dll/win32/userenv/lang/ja-JP.rc +++ b/dll/win32/userenv/lang/ja-JP.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/lt-LT.rc b/dll/win32/userenv/lang/lt-LT.rc index 4e059d05ed6..3a9fda5b1b9 100644 --- a/dll/win32/userenv/lang/lt-LT.rc +++ b/dll/win32/userenv/lang/lt-LT.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/nl-NL.rc b/dll/win32/userenv/lang/nl-NL.rc index b4188037808..bd648f3b8bf 100644 --- a/dll/win32/userenv/lang/nl-NL.rc +++ b/dll/win32/userenv/lang/nl-NL.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/no-NO.rc b/dll/win32/userenv/lang/no-NO.rc index ab7faaff405..5a1aeaf5481 100644 --- a/dll/win32/userenv/lang/no-NO.rc +++ b/dll/win32/userenv/lang/no-NO.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Dokumenter og innstillinger" diff --git a/dll/win32/userenv/lang/pl-PL.rc b/dll/win32/userenv/lang/pl-PL.rc index baccea8c7ff..46308e7002f 100644 --- a/dll/win32/userenv/lang/pl-PL.rc +++ b/dll/win32/userenv/lang/pl-PL.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/pt-BR.rc b/dll/win32/userenv/lang/pt-BR.rc index b803246736b..ecbee96f31b 100644 --- a/dll/win32/userenv/lang/pt-BR.rc +++ b/dll/win32/userenv/lang/pt-BR.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/pt-PT.rc b/dll/win32/userenv/lang/pt-PT.rc index 7a8bb934136..ad502cd6b07 100644 --- a/dll/win32/userenv/lang/pt-PT.rc +++ b/dll/win32/userenv/lang/pt-PT.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documentos e definições" diff --git a/dll/win32/userenv/lang/ro-RO.rc b/dll/win32/userenv/lang/ro-RO.rc index 54badf18340..99ae7f7f1f5 100644 --- a/dll/win32/userenv/lang/ro-RO.rc +++ b/dll/win32/userenv/lang/ro-RO.rc @@ -6,6 +6,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documente și preferințe" diff --git a/dll/win32/userenv/lang/ru-RU.rc b/dll/win32/userenv/lang/ru-RU.rc index dbc67617d3c..0705a7c4bde 100644 --- a/dll/win32/userenv/lang/ru-RU.rc +++ b/dll/win32/userenv/lang/ru-RU.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/sk-SK.rc b/dll/win32/userenv/lang/sk-SK.rc index 7ce4ac06368..5b476dd5068 100644 --- a/dll/win32/userenv/lang/sk-SK.rc +++ b/dll/win32/userenv/lang/sk-SK.rc @@ -5,6 +5,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/sq-AL.rc b/dll/win32/userenv/lang/sq-AL.rc index affc3637748..763a92b8cc6 100644 --- a/dll/win32/userenv/lang/sq-AL.rc +++ b/dll/win32/userenv/lang/sq-AL.rc @@ -5,6 +5,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SistemDrive%\\Dokumente dhe Cilësime" diff --git a/dll/win32/userenv/lang/sv-SE.rc b/dll/win32/userenv/lang/sv-SE.rc index 6e660126a7e..eb7c1ed3e2e 100644 --- a/dll/win32/userenv/lang/sv-SE.rc +++ b/dll/win32/userenv/lang/sv-SE.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/th-TH.rc b/dll/win32/userenv/lang/th-TH.rc index 8ed187dfed8..e85d0e8b802 100644 --- a/dll/win32/userenv/lang/th-TH.rc +++ b/dll/win32/userenv/lang/th-TH.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\เอกสารและการตั้งค่า" diff --git a/dll/win32/userenv/lang/tr-TR.rc b/dll/win32/userenv/lang/tr-TR.rc index 2a5ef2513c7..c36781f7120 100644 --- a/dll/win32/userenv/lang/tr-TR.rc +++ b/dll/win32/userenv/lang/tr-TR.rc @@ -2,6 +2,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Belgeler ve Ayarlar" diff --git a/dll/win32/userenv/lang/uk-UA.rc b/dll/win32/userenv/lang/uk-UA.rc index 5f4da2723d2..a43432f02af 100644 --- a/dll/win32/userenv/lang/uk-UA.rc +++ b/dll/win32/userenv/lang/uk-UA.rc @@ -1,5 +1,6 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/zh-CN.rc b/dll/win32/userenv/lang/zh-CN.rc index a3f17c7f7a9..dce1b7b9cfc 100644 --- a/dll/win32/userenv/lang/zh-CN.rc +++ b/dll/win32/userenv/lang/zh-CN.rc @@ -6,6 +6,7 @@ English folder names into Chinese, or it may cause problems in the system. */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" diff --git a/dll/win32/userenv/lang/zh-TW.rc b/dll/win32/userenv/lang/zh-TW.rc index 6d854c199b4..142a5d44422 100644 --- a/dll/win32/userenv/lang/zh-TW.rc +++ b/dll/win32/userenv/lang/zh-TW.rc @@ -5,6 +5,7 @@ English folder names into Chinese, or it may cause problems in the system. */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL +/* See also: dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings"

1 0

[reactos] 01/01: [CMAKE] Remove a remnant comment related to 'dll/cpl/console' (#2267)
by Serge Gautherie 24 Jan '20

24 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3badc0451314a0f742ef… commit b3badc0451314a0f742ef72482904db842226148 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Jan 24 13:38:53 2020 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jan 24 13:38:53 2020 +0100 [CMAKE] Remove a remnant comment related to 'dll/cpl/console' (#2267) '#Warning: console\\/lang/cs-CZ.rc:143: unrecognized escape sequence' --- dll/cpl/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/CMakeLists.txt b/dll/cpl/CMakeLists.txt index fcb32a61012..beaa7e200db 100644 --- a/dll/cpl/CMakeLists.txt +++ b/dll/cpl/CMakeLists.txt @@ -1,7 +1,7 @@ add_subdirectory(access) add_subdirectory(appwiz) -add_subdirectory(console)#Warning: console\\/lang/cs-CZ.rc:143: unrecognized escape sequence +add_subdirectory(console) add_subdirectory(desk) add_subdirectory(hdwwiz) add_subdirectory(inetcpl)

1 0

[reactos] 01/01: [SHELL32] Improve comments of shell folder paths
by Katayama Hirofumi MZ 24 Jan '20

24 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aacb9f0ccd689dc7495e5… commit aacb9f0ccd689dc7495e56e765cfce7228074cce Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jan 24 21:32:25 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Jan 24 21:32:25 2020 +0900 [SHELL32] Improve comments of shell folder paths --- dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/es-ES.rc | 2 +- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hi-IN.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/id-ID.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ja-JP.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 2 +- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 81c88858464..985f2a224c7 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -821,7 +821,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Пусков изборник\\Приложения" IDS_PERSONAL "Книжа" IDS_FAVORITES "Любимки" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 5b7e3d51ed0..39362f0ac23 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Start Menu\\Programs" IDS_PERSONAL "My Documents" IDS_FAVORITES "Favorites" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 0999bd245f3..23309ae0886 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -826,7 +826,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Procházet" IDS_RUNDLG_BROWSE_FILTER "Spustitelné soubory (*.exe)\0*.exe\0Všechnysoubory (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Nabídka Start\\Programy" IDS_PERSONAL "Dokumenty" IDS_FAVORITES "Oblíbené" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 12a3f90cf48..f8e4e2cad18 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -826,7 +826,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Start Menu\\Programmer" IDS_PERSONAL "Mine Dokumenter" IDS_FAVORITES "Favoritter" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 39495e5d7ec..b3cd79284bb 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -821,7 +821,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Durchsuchen" IDS_RUNDLG_BROWSE_FILTER "Ausführbare Dateien (*.exe)\0*.exe\0Alle Dateien (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Startmenü\\Programme" IDS_PERSONAL "Eigene Dateien" IDS_FAVORITES "Favoriten" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 2699d7fd27c..6d5b6723089 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Start Menu\\Programs" IDS_PERSONAL "Τα έγγραφά μου" IDS_FAVORITES "Favorites" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 1f0e069167a..51fca668df6 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Start Menu\\Programs" IDS_PERSONAL "My Documents" IDS_FAVORITES "Favorites" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 163a9a4ba3b..ed98c1b7aa8 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Start Menu\\Programs" IDS_PERSONAL "My Documents" IDS_FAVORITES "Favorites" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 971f303c0ec..93e91a4e768 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -828,7 +828,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Examinar" IDS_RUNDLG_BROWSE_FILTER "Archivos ejecutables (*.exe)\0*.exe\0Todos los archivos (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Menú Inicio\\Programas" IDS_PERSONAL "Mis documentos" IDS_FAVORITES "Favoritos" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 6e1459df8e1..a99537ad508 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -827,7 +827,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Sirvi" IDS_RUNDLG_BROWSE_FILTER "Rakendatavad failid (*.exe)\0*.exe\0Kõik failid (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Start Menu\\Programs" IDS_PERSONAL "Minu dokumendid" IDS_FAVORITES "Lemmikud" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 634905f20b5..da4aedfef72 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Käynnistä\\Ohjelmat" IDS_PERSONAL "Omat tiedostot" IDS_FAVORITES "Suosikit" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index f97fb3a98de..5f461fe0515 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Parcourir" IDS_RUNDLG_BROWSE_FILTER "Fichiers exécutables (*.exe)\0*.exe\0Tous les fichiers (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Menu Démarrer\\Programmes" IDS_PERSONAL "Mes documents" IDS_FAVORITES "Favoris" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 7addbf0983e..51e0d2e522d 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -822,7 +822,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "עיון" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "תפריט ההתחלה\\תכניות" IDS_PERSONAL "המסמכים שלי" IDS_FAVORITES "מועדפים" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 108557a5dec..1af9c794021 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -815,7 +815,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "ब्राउज़" IDS_RUNDLG_BROWSE_FILTER "एक्सेक्यूटेबल फ़ाइलें (*.exe)\0*.exe\0सारे फ़ाइलें (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "प्रारंभ मेनू\\प्रोग्राम" IDS_PERSONAL "मेरे डॉक्यूमेंट" IDS_FAVORITES "पसंदीदा" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 1691326ab38..118b7a7119c 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0Minden fájl (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Start menü\\Programok" IDS_PERSONAL "Dokumentumok" IDS_FAVORITES "Kedvencek" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 21935963686..34af528068b 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Menu Mulai\\Program" IDS_PERSONAL "Dokumen Saya" IDS_FAVORITES "Favorit" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 96bd078aa86..8f8a5770b09 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Sfoglia" IDS_RUNDLG_BROWSE_FILTER "File Eseguibili (*.exe)\0*.exe\0Tutti i file (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Menu Avvio\\Programmi" IDS_PERSONAL "Documenti Personali" IDS_FAVORITES "Preferiti" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 83a8fe98e26..d7636305da7 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -817,7 +817,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "参照" IDS_RUNDLG_BROWSE_FILTER "実行可能ファイル (*.exe)\0*.exe\0すべてのファイル (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "スタートメニュー\\プログラム" IDS_PERSONAL "マイドキュメント" IDS_FAVORITES "お気に入り" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 2b8848cd76c..fcd392bda63 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Start Menu\\Programs" IDS_PERSONAL "My Documents" IDS_FAVORITES "Favorites" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 937b14b02e7..b58dc6b6718 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Start Menu\\Programs" IDS_PERSONAL "My Documents" IDS_FAVORITES "Favorites" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 6e76a278a23..095b0f511c8 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Start-meny\\Programmer" IDS_PERSONAL "Mine dokumenter" IDS_FAVORITES "Favoritter" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index a509fe820b6..8070daa7591 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -825,7 +825,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Przeglądaj" IDS_RUNDLG_BROWSE_FILTER "Programy (*.exe)\0*.exe\0Wszystkie pliki (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Menu Start\\Programy" IDS_PERSONAL "Moje dokumenty" IDS_FAVORITES "Ulubione" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index cc2aa88bc95..8163b706296 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Procurar" IDS_RUNDLG_BROWSE_FILTER "Arquivos Executáveis (*.exe)\0*.exe\0Todos os arquivos (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Menu Iniciar\\Programas" IDS_PERSONAL "Meus Documentos" IDS_FAVORITES "Favoritos" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index c906d95d9a9..7be75d988b6 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Arquivos executáveis (*.exe)\0*.exe\0Todos (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Menu Iniciar\\Programas" IDS_PERSONAL "OS Meus Documentos" IDS_FAVORITES "Favoritos" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 3bdc4e3d49b..68da676c032 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -822,7 +822,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Specificare fișiere" IDS_RUNDLG_BROWSE_FILTER "Fișiere executabile (*.exe)\0*.exe\0Orice fișier (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Meniul Pornire\\Programe" IDS_PERSONAL "Documentele mele" IDS_FAVORITES "Favorite" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index e8df7f4febc..d62530482e4 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -827,7 +827,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Обзор" IDS_RUNDLG_BROWSE_FILTER "Исполняемые файлы (*.exe)\0*.exe\0Все файлы (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Главное меню\\Программы" IDS_PERSONAL "Мои документы" IDS_FAVORITES "Избранное" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 5760c756886..ea65f70c084 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Prehľadávať" IDS_RUNDLG_BROWSE_FILTER "Spustiteľné súbory (*.exe)\0*.exe\0Všetky súbory (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Ponuka Štart\\Programy" IDS_PERSONAL "Moje dokumenty" IDS_FAVORITES "Obľúbené položky" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 44ef2b84db4..dcde0fe407e 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Browse" IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Start Menu\\Programs" IDS_PERSONAL "My Documents" IDS_FAVORITES "Favorites" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index ee82a9cffa4..36c13146a68 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -824,7 +824,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Shfletp" IDS_RUNDLG_BROWSE_FILTER "Dokumentë Ekzekutues (*.exe)\0*.exe\0T'gjith Dokumentat (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Fillo Menu\\Programe" IDS_PERSONAL "Dokumentet e'mi" IDS_FAVORITES "Preferuarat" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 4414618e9fb..9cf56008ec0 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Bläddra" IDS_RUNDLG_BROWSE_FILTER "Körbara filer (*.exe)\0*.exe\0Alla filer (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Start-meny\\Program" IDS_PERSONAL "Mina dokument" IDS_FAVORITES "Favoriter" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 50e0ff1b785..63d1e9b53a7 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -822,7 +822,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Göz At" IDS_RUNDLG_BROWSE_FILTER "Çalıştırılabilir Kütükler (*.exe)\0*.exe\0Tüm Kütükler (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Başlat Seçkesi\\İzlenceler" IDS_PERSONAL "Belgelerim" IDS_FAVORITES "Yer İmleri" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 4f70b6f5456..b4570c32c1e 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -820,7 +820,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "Огляд" IDS_RUNDLG_BROWSE_FILTER "Виконувані файли (*.exe)\0*.exe\0Всі Файли (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Головне меню\\Програми" IDS_PERSONAL "Мої документи" IDS_FAVORITES "Обране" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index ce65a180c8d..f70a424ed77 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -828,7 +828,7 @@ BEGIN IDS_RUNDLG_BROWSE_CAPTION "浏览" IDS_RUNDLG_BROWSE_FILTER "可执行文件 (*.exe)\0*.exe\0所有文件 (*.*)\0*.*\0" - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ /* ATTENTION: If there is no special situation, please DO NOT change English folder names into Chinese, or it may cause problems in the system. */ IDS_PROGRAMS "「开始」菜单\\程序" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 7402ad10e2b..6cd59a7841d 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -831,7 +831,7 @@ BEGIN /* ATTENTION: If there is no special situation, please DO NOT change English folder names into Chinese, or it may cause problems in the system. */ - /* shell folder path default values */ + /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "「開始」功能表\\程式" IDS_PERSONAL "我的文件" IDS_FAVORITES "我的最愛"

1 0

[reactos] 01/01: [SHELL32][USERENV] Update Japanese special folder names
by Katayama Hirofumi MZ 24 Jan '20

24 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85474211a1964fd856cdb… commit 85474211a1964fd856cdb9b7c41d1f07a0edad75 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jan 24 21:27:50 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Jan 24 21:27:50 2020 +0900 [SHELL32][USERENV] Update Japanese special folder names --- dll/win32/shell32/lang/ja-JP.rc | 6 +++--- dll/win32/userenv/lang/ja-JP.rc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 06fac587cd4..83a8fe98e26 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -830,9 +830,9 @@ BEGIN IDS_DESKTOPDIRECTORY "デスクトップ" IDS_NETHOOD "近くのネットワーク" IDS_TEMPLATES "テンプレート" - IDS_APPDATA "Application Data" + IDS_APPDATA "アプリのデータ" IDS_PRINTHOOD "近くのプリンタ" - IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_LOCAL_APPDATA "ローカル設定\\アプリのデータ" IDS_INTERNET_CACHE "インターネット一時ファイル" IDS_COOKIES "クッキー" IDS_HISTORY "履歴" @@ -844,7 +844,7 @@ BEGIN IDS_COMMON_MUSIC "共有ドキュメント\\ミュージック" IDS_COMMON_PICTURES "共有ドキュメント\\ピクチャ" IDS_COMMON_VIDEO "共有ドキュメント\\ビデオ" - IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_CDBURN_AREA "ローカル設定\\アプリのデータ\\Microsoft\\CD Burning" IDS_NETWORKPLACE "マイネットワーク" IDS_NEWFOLDER "新しいフォルダ" diff --git a/dll/win32/userenv/lang/ja-JP.rc b/dll/win32/userenv/lang/ja-JP.rc index 1c194f9c81f..70a1b0ac671 100644 --- a/dll/win32/userenv/lang/ja-JP.rc +++ b/dll/win32/userenv/lang/ja-JP.rc @@ -18,7 +18,7 @@ BEGIN IDS_LOCALSETTINGS "ローカル設定" IDS_LOCALAPPDATA "ローカル設定\\アプリのデータ" IDS_TEMP "ローカル設定\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ - IDS_CACHE "ローカル設定\\一時インターネットファイル" + IDS_CACHE "ローカル設定\\インターネット一時ファイル" IDS_HISTORY "ローカル設定\\履歴" IDS_COOKIES "クッキー" END

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