Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[mjansen] 73816: [DBGHELP_APITEST] Add tests for pdb and rsym parsing. CORE-12773

by mjansen＠svn.reactos.org

Author: mjansen Date: Fri Feb 17 16:15:49 2017 New Revision: 73816 URL: http://svn.reactos.org/svn/reactos?rev=73816&view=rev Log: [DBGHELP_APITEST] Add tests for pdb and rsym parsing. CORE-12773 Added: trunk/rostests/apitests/dbghelp/ trunk/rostests/apitests/dbghelp/CMakeLists.txt (with props) trunk/rostests/apitests/dbghelp/data.c (with props) trunk/rostests/apitests/dbghelp/pdb.c (with props) trunk/rostests/apitests/dbghelp/resource.rc (with props) trunk/rostests/apitests/dbghelp/rsym.c (with props) trunk/rostests/apitests/dbghelp/testdata/ trunk/rostests/apitests/dbghelp/testdata/gcc_uffs.dll.compr (with props) trunk/rostests/apitests/dbghelp/testdata/msvc_uffs.dll.compr (with props) trunk/rostests/apitests/dbghelp/testdata/msvc_uffs.pdb.compr (with props) trunk/rostests/apitests/dbghelp/testlist.c (with props) Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Fri Feb 17 16:15:49 2017 @@ -7,6 +7,7 @@ add_subdirectory(browseui) add_subdirectory(com) add_subdirectory(crt) +add_subdirectory(dbghelp) add_subdirectory(dciman32) add_subdirectory(dnsapi) add_subdirectory(gdi32) Added: trunk/rostests/apitests/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dbghelp/CMakeLis… ============================================================================== --- trunk/rostests/apitests/dbghelp/CMakeLists.txt (added) +++ trunk/rostests/apitests/dbghelp/CMakeLists.txt [iso-8859-1] Fri Feb 17 16:15:49 2017 @@ -0,0 +1,20 @@ + +add_definitions(-D__ROS_LONG64__ -DWINETEST_USE_DBGSTR_LONGLONG) + +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib + ${REACTOS_SOURCE_DIR}/sdk/tools/rsym +) + +list(APPEND SOURCE + pdb.c + rsym.c + data.c + testlist.c) + +add_executable(dbghelp_apitest ${SOURCE} resource.rc) +set_module_type(dbghelp_apitest win32cui) +target_link_libraries(dbghelp_apitest zlib) +add_delay_importlibs(dbghelp_apitest dbghelp) +add_importlibs(dbghelp_apitest msvcrt kernel32 ntdll) +add_rostests_file(TARGET dbghelp_apitest) Propchange: trunk/rostests/apitests/dbghelp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dbghelp/data.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dbghelp/data.c?r… ============================================================================== --- trunk/rostests/apitests/dbghelp/data.c (added) +++ trunk/rostests/apitests/dbghelp/data.c [iso-8859-1] Fri Feb 17 16:15:49 2017 @@ -0,0 +1,277 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Support functions for dbghelp api test + * PROGRAMMER: Mark Jansen + */ + +#include <windows.h> +#include <stdio.h> +#include <zlib.h> + +#include "wine/test.h" + +extern IMAGE_DOS_HEADER __ImageBase; + +static char szTempPath[MAX_PATH]; + +static const char* tmpdir() +{ + if (szTempPath[0] == '\0') + { + GetTempPathA(MAX_PATH, szTempPath); + lstrcatA(szTempPath, "dbghelp_tst"); + } + return szTempPath; +} + +static int extract_one(const char* filename, const char* resid) +{ + HMODULE mod = (HMODULE)&__ImageBase; + HGLOBAL glob; + PVOID data, decompressed; + uLongf size, dstsize; + DWORD gccSize, dwErr; + HANDLE file; + int ret; + HRSRC rsrc = FindResourceA(mod, resid, MAKEINTRESOURCEA(RT_RCDATA)); + ok(rsrc != 0, "Failed finding '%s' res\n", resid); + if (!rsrc) + return 0; + + size = SizeofResource(mod, rsrc); + glob = LoadResource(mod, rsrc); + ok(glob != NULL, "Failed loading '%s' res\n", resid); + if (!glob) + return 0; + + data = LockResource(glob); + + dstsize = 1024 * 256; + decompressed = malloc(dstsize); + + if (uncompress(decompressed, &dstsize, data, size) != Z_OK) + { + ok(0, "uncompress failed for %s\n", resid); + free(decompressed); + return 0; + } + + + file = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + gccSize = size; + ret = WriteFile(file, decompressed, dstsize, &gccSize, NULL); + dwErr = GetLastError(); + CloseHandle(file); + free(decompressed); + ok(ret, "WriteFile failed (%d)\n", dwErr); + return ret && dstsize == gccSize; +} + + +int extract_msvc_exe(char szFile[MAX_PATH]) +{ + const char* dir = tmpdir(); + BOOL ret = CreateDirectoryA(dir, NULL); + ok(ret, "CreateDirectoryA failed(%d)\n", GetLastError()); + + sprintf(szFile, "%s\\uffs.pdb", dir); + if (!extract_one(szFile, "msvc_uffs.pdb")) + return 0; + + sprintf(szFile, "%s\\uffs.dll", dir); + if (!extract_one(szFile, "msvc_uffs.dll")) + return 0; + + return 1; +} + +void cleanup_msvc_exe() +{ + char szFile[MAX_PATH]; + BOOL ret; + const char* dir = tmpdir(); + + sprintf(szFile, "%s\\uffs.pdb", dir); + ret = DeleteFileA(szFile); + ok(ret, "DeleteFileA failed(%d)\n", GetLastError()); + + sprintf(szFile, "%s\\uffs.dll", dir); + ret = DeleteFileA(szFile); + ok(ret, "DeleteFileA failed(%d)\n", GetLastError()); + ret = RemoveDirectoryA(dir); + ok(ret, "RemoveDirectoryA failed(%d)\n", GetLastError()); +} + +int extract_gcc_exe(char szFile[MAX_PATH]) +{ + const char* dir = tmpdir(); + BOOL ret = CreateDirectoryA(dir, NULL); + ok(ret, "CreateDirectoryA failed(%d)\n", GetLastError()); + + sprintf(szFile, "%s\\uffs.dll", dir); + if (!extract_one(szFile, "gcc_uffs.dll")) + return 0; + + return 1; +} + +void cleanup_gcc_exe() +{ + char szFile[MAX_PATH]; + BOOL ret; + const char* dir = tmpdir(); + + sprintf(szFile, "%s\\uffs.dll", dir); + ret = DeleteFileA(szFile); + ok(ret, "DeleteFileA failed(%d)\n", GetLastError()); + ret = RemoveDirectoryA(dir); + ok(ret, "RemoveDirectoryA failed(%d)\n", GetLastError()); +} + + +#if 0 +static int compress_one(const char* src, const char* dest) +{ + DWORD size, size2, res; + FILE* file = fopen(src, "rb"); + fseek(file, 0, SEEK_END); + size = ftell(file); + fseek(file, 0, SEEK_SET); + + Bytef* buffer, *buffer2; + DWORD dwErr = GetLastError(); + + buffer = malloc(size); + res = fread(buffer, 1, size, file); + + fclose(file); + + if (res != size) + { + printf("Could not read file: 0x%x\n", dwErr); + free(buffer); + CloseHandle(file); + return 0; + } + size2 = size *2; + buffer2 = malloc(size2); + res = compress(buffer2, &size2, buffer, size); + + free(buffer); + + if (Z_OK != res) + { + free(buffer2); + return 0; + } + + file = fopen(dest, "wb"); + res = fwrite(buffer2, 1, size2, file); + fclose(file); + + free(buffer2); + + return size2 == res; +} + +void create_compressed_files() +{ + SetCurrentDirectoryA("R:/src/trunk/reactos/modules/rostests/apitests/dbghelp"); + if (!compress_one("testdata/msvc_uffs.dll", "testdata/msvc_uffs.dll.compr")) + printf("msvc_uffs.dll failed\n"); + if (!compress_one("testdata/msvc_uffs.pdb", "testdata/msvc_uffs.pdb.compr")) + printf("msvc_uffs.pdb failed\n"); + if (!compress_one("testdata/gcc_uffs.dll", "testdata/gcc_uffs.dll.compr")) + printf("gcc_uffs.dll failed\n"); +} +#endif + +#if 0 +typedef struct _SYMBOLFILE_HEADER { + ULONG SymbolsOffset; + ULONG SymbolsLength; + ULONG StringsOffset; + ULONG StringsLength; +} SYMBOLFILE_HEADER, *PSYMBOLFILE_HEADER; + +typedef struct _ROSSYM_ENTRY { + ULONG Address; + ULONG FunctionOffset; + ULONG FileOffset; + ULONG SourceLine; +} ROSSYM_ENTRY, *PROSSYM_ENTRY; + + +static int is_metadata(const char* name) +{ + size_t len = name ? strlen(name) : 0; + return len > 3 && name[0] == '_' && name[1] != '_' && name[len-1] == '_' && name[len-2] == '_'; +}; + +static void dump_rsym_internal(void* data) +{ + PSYMBOLFILE_HEADER RosSymHeader = (PSYMBOLFILE_HEADER)data; + PROSSYM_ENTRY Entries = (PROSSYM_ENTRY)((char *)data + RosSymHeader->SymbolsOffset); + size_t symbols = RosSymHeader->SymbolsLength / sizeof(ROSSYM_ENTRY); + size_t i; + char *Strings = (char *)data + RosSymHeader->StringsOffset; + + for (i = 0; i < symbols; i++) + { + PROSSYM_ENTRY Entry = Entries + i; + if (!Entry->FileOffset) + { + if (Entry->SourceLine) + printf("ERR: SOURCELINE (%D) ", Entry->SourceLine); + if (is_metadata(Strings + Entry->FunctionOffset)) + printf("metadata: %s: 0x%x\n", Strings + Entry->FunctionOffset, Entry->Address); + else + printf("0x%x: %s\n", Entry->Address, Strings + Entry->FunctionOffset); + } + else + { + printf("0x%x: %s (%s:%u)\n", Entry->Address, + Strings + Entry->FunctionOffset, + Strings + Entry->FileOffset, + Entry->SourceLine); + } + } + +} + +void dump_rsym(const char* filename) +{ + char* data; + long size, res; + PIMAGE_FILE_HEADER PEFileHeader; + PIMAGE_OPTIONAL_HEADER PEOptHeader; + PIMAGE_SECTION_HEADER PESectionHeaders; + WORD i; + + FILE* f = fopen(filename, "rb"); + + fseek(f, 0, SEEK_END); + size = ftell(f); + fseek(f, 0, SEEK_SET); + + data = malloc(size); + res = fread(data, 1, size, f); + fclose(f); + + PEFileHeader = (PIMAGE_FILE_HEADER)((char *)data + ((PIMAGE_DOS_HEADER)data)->e_lfanew + sizeof(ULONG)); + PEOptHeader = (PIMAGE_OPTIONAL_HEADER)(PEFileHeader + 1); + PESectionHeaders = (PIMAGE_SECTION_HEADER)((char *)PEOptHeader + PEFileHeader->SizeOfOptionalHeader); + + for (i = 0; i < PEFileHeader->NumberOfSections; i++) + { + if (!strcmp((char *)PESectionHeaders[i].Name, ".rossym")) + { + dump_rsym_internal(data + PESectionHeaders[i].PointerToRawData); + break; + } + } + free(data); +} + +#endif Propchange: trunk/rostests/apitests/dbghelp/data.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dbghelp/pdb.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dbghelp/pdb.c?re… ============================================================================== --- trunk/rostests/apitests/dbghelp/pdb.c (added) +++ trunk/rostests/apitests/dbghelp/pdb.c [iso-8859-1] Fri Feb 17 16:15:49 2017 @@ -0,0 +1,378 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for dbghelp PDB functions + * PROGRAMMER: Mark Jansen + */ + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <dbghelp.h> +#include <cvconst.h> // SymTagXXX +#include <stdio.h> + +#include "wine/test.h" + +#define ok_ulonglong(expression, result) \ + do { \ + ULONG64 _value = (expression); \ + ULONG64 _result = (result); \ + ok(_value == (result), "Wrong value for '%s', expected: " #result " (%s), got: %s\n", \ + #expression, wine_dbgstr_longlong(_result), wine_dbgstr_longlong(_value)); \ + } while (0) + + +// data.c +void create_compressed_files(); +int extract_msvc_exe(char szFile[MAX_PATH]); +void cleanup_msvc_exe(); + +static HANDLE proc() +{ + return GetCurrentProcess(); +} + +static BOOL init_sym_imp(const char* file, int line) +{ + if (!SymInitialize(proc(), NULL, FALSE)) + { + DWORD err = GetLastError(); + ok_(file, line)(0, "Failed to init: 0x%x\n", err); + return FALSE; + } + return TRUE; +} + +static void deinit_sym() +{ + SymCleanup(proc()); +} + +#define init_sym() init_sym_imp(__FILE__, __LINE__) + +#define INIT_PSYM(buff) do { \ + memset((buff), 0, sizeof((buff))); \ + ((PSYMBOL_INFO)(buff))->SizeOfStruct = sizeof(SYMBOL_INFO); \ + ((PSYMBOL_INFO)(buff))->MaxNameLen = MAX_SYM_NAME; \ +} while (0) + + +/* Maybe our dbghelp.dll is too old? */ +static BOOL can_enumerate(HANDLE hProc, DWORD64 BaseAddress) +{ + IMAGEHLP_MODULE64 ModuleInfo; + BOOL Ret; + + memset(&ModuleInfo, 0, sizeof(ModuleInfo)); + ModuleInfo.SizeOfStruct = sizeof(ModuleInfo); + Ret = SymGetModuleInfo64(hProc, BaseAddress, &ModuleInfo); + + return Ret && ModuleInfo.SymType == SymPdb; +} + + +static void test_SymFromName(HANDLE hProc, const char* szModuleName) +{ + BOOL Ret; + char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)]; + PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer; + + DWORD64 BaseAddress; + DWORD dwErr; + + if (!init_sym()) + return; + + SetLastError(ERROR_SUCCESS); + BaseAddress = SymLoadModule64(hProc, NULL, szModuleName, NULL, 0x600000, 0); + dwErr = GetLastError(); + + ok_ulonglong(BaseAddress, 0x600000); + ok_hex(dwErr, ERROR_SUCCESS); + + if (!can_enumerate(hProc, BaseAddress)) + { + skip("dbghelp.dll too old or cannot enumerate symbols!\n"); + } + else + { + INIT_PSYM(buffer); + Ret = SymFromName(hProc, "DllMain", pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, 0); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1010); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "DllMain"); + + INIT_PSYM(buffer); + Ret = SymFromName(hProc, "_DllMain@12", pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, 0x400000); // ?? + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1010); + ok_hex(pSymbol->Tag, SymTagPublicSymbol); + ok_str(pSymbol->Name, "_DllMain@12"); + + INIT_PSYM(buffer); + Ret = SymFromName(hProc, "FfsChkdsk", pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, 0); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1040); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "FfsChkdsk"); + + INIT_PSYM(buffer); + Ret = SymFromName(hProc, "_FfsChkdsk@24", pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, 0x400000); // ?? + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1040); + ok_hex(pSymbol->Tag, SymTagPublicSymbol); + ok_str(pSymbol->Name, "_FfsChkdsk@24"); + + INIT_PSYM(buffer); + Ret = SymFromName(hProc, "FfsFormat", pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, 0); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1070); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "FfsFormat"); + + INIT_PSYM(buffer); + Ret = SymFromName(hProc, "_FfsFormat@24", pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, 0x400000); // ?? + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1070); + ok_hex(pSymbol->Tag, SymTagPublicSymbol); + ok_str(pSymbol->Name, "_FfsFormat@24"); + } + + deinit_sym(); +} + +static void test_SymFromAddr(HANDLE hProc, const char* szModuleName) +{ + BOOL Ret; + char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)]; + PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer; + + DWORD64 BaseAddress, Displacement; + DWORD dwErr; + + if (!init_sym()) + return; + + SetLastError(ERROR_SUCCESS); + BaseAddress = SymLoadModule64(hProc, NULL, szModuleName, NULL, 0x600000, 0); + dwErr = GetLastError(); + + ok_ulonglong(BaseAddress, 0x600000); + ok_hex(dwErr, ERROR_SUCCESS); + + /* No address found before load address of module */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress -1, &Displacement, pSymbol); + dwErr = GetLastError(); + ok_int(Ret, FALSE); + ok_hex(dwErr, ERROR_MOD_NOT_FOUND); + + /* Right at the start of the module is recognized as the first symbol found */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress, &Displacement, pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(Displacement, 0xffffffffffffffff); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, 0); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1010); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "DllMain"); + + /* The actual first instruction of the function */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress + 0x1010, &Displacement, pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(Displacement, 0); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, 0); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1010); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "DllMain"); + + /* The last instruction in the function */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress + 0x102D, &Displacement, pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(Displacement, 0x1d); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, 0); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1010); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "DllMain"); + + /* The padding below the function */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress + 0x102E, &Displacement, pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(Displacement, 0x1e); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, 0); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1010); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "DllMain"); + + /* One byte before the next function */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress + 0x103f, &Displacement, pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(Displacement, 0x2f); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, 0); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1010); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "DllMain"); + + /* First byte of the next function */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress + 0x1040, &Displacement, pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(Displacement, 0); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, 0); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1040); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "FfsChkdsk"); + + if (!can_enumerate(hProc, BaseAddress)) + { + skip("dbghelp.dll too old or cannot read this symbol!\n"); + } + else + { + /* .idata */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress + 0x2000, &Displacement, pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(Displacement, 0); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, 0); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x2000); + ok_hex(pSymbol->Tag, SymTagPublicSymbol); + ok_str(pSymbol->Name, "__imp__DbgPrint"); + } + + deinit_sym(); +} + +typedef struct _test_context +{ + DWORD64 BaseAddress; + SIZE_T Index; +} test_context; + +static struct _test_data { + DWORD64 AddressOffset; + ULONG Size; + ULONG Tag; + const char* Name; +} test_data[] = { + /* TODO: Order is based on magic, should find entries based on name, and mark as 'seen' */ + { 0x1070, 36, SymTagFunction, "FfsFormat" }, + { 0x1010, 32, SymTagFunction, "DllMain" }, + { 0x1040, 36, SymTagFunction, "FfsChkdsk" }, + + { 0x2100, 0, SymTagPublicSymbol, "__IMPORT_DESCRIPTOR_ntdll" }, + { 0x109a, 0, SymTagPublicSymbol, "_DbgPrint" }, + { 0x2004, 0, SymTagPublicSymbol, "\x7fntdll_NULL_THUNK_DATA" }, + { 0x2000, 0, SymTagPublicSymbol, "__imp__DbgPrint" }, + { 0x2114, 0, SymTagPublicSymbol, "__NULL_IMPORT_DESCRIPTOR" }, +}; + +static BOOL CALLBACK EnumSymProc(PSYMBOL_INFO pSymInfo, ULONG SymbolSize, PVOID UserContext) +{ + test_context* ctx = UserContext; + + if (ctx->Index < ARRAYSIZE(test_data)) + { + ok_ulonglong(pSymInfo->ModBase, ctx->BaseAddress); + ok_ulonglong(pSymInfo->Address, ctx->BaseAddress + test_data[ctx->Index].AddressOffset); + ok_hex(pSymInfo->Tag, test_data[ctx->Index].Tag); + ok_str(pSymInfo->Name, test_data[ctx->Index].Name); + + ctx->Index++; + } + else + { + ok(0, "Out of bounds (%lu), max is: %i!\n", ctx->Index, ARRAYSIZE(test_data)); + } + + return TRUE; +} + +static void test_SymEnumSymbols(HANDLE hProc, const char* szModuleName) +{ + BOOL Ret; + DWORD dwErr; + + test_context ctx; + + if (!init_sym()) + return; + + ctx.Index = 0; + SetLastError(ERROR_SUCCESS); + ctx.BaseAddress = SymLoadModule64(hProc, NULL, szModuleName, NULL, 0x600000, 0); + dwErr = GetLastError(); + + ok_ulonglong(ctx.BaseAddress, 0x600000); + ok_hex(dwErr, ERROR_SUCCESS); + + if (!can_enumerate(hProc, ctx.BaseAddress)) + { + skip("dbghelp.dll too old or cannot enumerate symbols!\n"); + } + else + { + Ret = SymEnumSymbols(hProc, ctx.BaseAddress, NULL, EnumSymProc, &ctx); + ok_int(Ret, TRUE); + ok_int(ctx.Index, ARRAYSIZE(test_data)); + } + + deinit_sym(); +} + + +START_TEST(pdb) +{ + char szDllName[MAX_PATH]; + //create_compressed_files(); + + DWORD Options = SymGetOptions(); + Options &= ~(SYMOPT_UNDNAME); + //Options |= SYMOPT_DEBUG; + SymSetOptions(Options); + + if (!extract_msvc_exe(szDllName)) + { + ok(0, "Failed extracting files\n"); + return; + } + + test_SymFromName(proc(), szDllName); + test_SymFromAddr(proc(), szDllName); + test_SymEnumSymbols(proc(), szDllName); + + cleanup_msvc_exe(); +} Propchange: trunk/rostests/apitests/dbghelp/pdb.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dbghelp/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dbghelp/resource… ============================================================================== --- trunk/rostests/apitests/dbghelp/resource.rc (added) +++ trunk/rostests/apitests/dbghelp/resource.rc [iso-8859-1] Fri Feb 17 16:15:49 2017 @@ -0,0 +1,5 @@ +#include "windef.h" + +msvc_uffs.dll RCDATA testdata/msvc_uffs.dll.compr +msvc_uffs.pdb RCDATA testdata/msvc_uffs.pdb.compr +gcc_uffs.dll RCDATA testdata/gcc_uffs.dll.compr Propchange: trunk/rostests/apitests/dbghelp/resource.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dbghelp/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dbghelp/rsym.c?r… ============================================================================== --- trunk/rostests/apitests/dbghelp/rsym.c (added) +++ trunk/rostests/apitests/dbghelp/rsym.c [iso-8859-1] Fri Feb 17 16:15:49 2017 @@ -0,0 +1,369 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for dbghelp rsym functions + * PROGRAMMER: Mark Jansen + * + * These tests are based on the PDB tests. + */ + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <dbghelp.h> +#include <cvconst.h> // SymTagXXX +#include <stdio.h> + +#include "wine/test.h" + +#define ok_ulonglong(expression, result) \ + do { \ + ULONG64 _value = (expression); \ + ULONG64 _result = (result); \ + ok(_value == (result), "Wrong value for '%s', expected: " #result " (%s), got: %s\n", \ + #expression, wine_dbgstr_longlong(_result), wine_dbgstr_longlong(_value)); \ + } while (0) + +#define ok_ulonglong_(file, line, expression, result) \ + do { \ + ULONG64 _value = (expression); \ + ULONG64 _result = (result); \ + ok_(file, line)(_value == (result), "Wrong value for '%s', expected: " #result " (%s), got: %s\n", \ + #expression, wine_dbgstr_longlong(_result), wine_dbgstr_longlong(_value)); \ + } while (0) + +#define ok_hex_(file, line, expression, result) \ + do { \ + int _value = (expression); \ + ok_(file, line)(_value == (result), "Wrong value for '%s', expected: " #result " (0x%x), got: 0x%x\n", \ + #expression, (int)(result), _value); \ + } while (0) + +#define ok_str_(file, line, x, y) \ + ok_(file, line)(strcmp(x, y) == 0, "Wrong string. Expected '%s', got '%s'\n", y, x) + + +// data.c +void dump_rsym(const char* filename); +int extract_gcc_exe(char szFile[MAX_PATH]); +void cleanup_gcc_exe(); + +static HANDLE proc() +{ + return GetCurrentProcess(); +} + +static BOOL init_sym_imp(const char* file, int line) +{ + if (!SymInitialize(proc(), NULL, FALSE)) + { + DWORD err = GetLastError(); + ok_(file, line)(0, "Failed to init: 0x%x\n", err); + return FALSE; + } + return TRUE; +} + +static void deinit_sym() +{ + SymCleanup(proc()); +} + +static BOOL supports_rsym(HANDLE hProc, DWORD64 BaseAddress) +{ + IMAGEHLP_MODULE64 ModuleInfo; + BOOL Ret; + + memset(&ModuleInfo, 0, sizeof(ModuleInfo)); + ModuleInfo.SizeOfStruct = sizeof(ModuleInfo); + Ret = SymGetModuleInfo64(hProc, BaseAddress, &ModuleInfo); + + return Ret && + ModuleInfo.SymType == SymDia && + ModuleInfo.CVSig == ('R' | ('S' << 8) | ('Y' << 16) | ('M' << 24)); +} + +#define init_sym() init_sym_imp(__FILE__, __LINE__) + +#define INIT_PSYM(buff) do { \ + memset((buff), 0, sizeof((buff))); \ + ((PSYMBOL_INFO)(buff))->SizeOfStruct = sizeof(SYMBOL_INFO); \ + ((PSYMBOL_INFO)(buff))->MaxNameLen = MAX_SYM_NAME; \ +} while (0) + + +static void test_SymFromName(HANDLE hProc, const char* szModuleName) +{ + BOOL Ret; + char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)]; + PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer; + + DWORD64 BaseAddress; + DWORD dwErr; + + if (!init_sym()) + return; + + SetLastError(ERROR_SUCCESS); + BaseAddress = SymLoadModule64(hProc, NULL, szModuleName, NULL, 0x600000, 0); + dwErr = GetLastError(); + + if (supports_rsym(hProc, BaseAddress)) + { + ok_ulonglong(BaseAddress, 0x600000); + ok_hex(dwErr, ERROR_SUCCESS); + + INIT_PSYM(buffer); + Ret = SymFromName(hProc, "DllMain", pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, SYMFLAG_FUNCTION); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1000); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "DllMain"); + + INIT_PSYM(buffer); + Ret = SymFromName(hProc, "FfsChkdsk", pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, SYMFLAG_FUNCTION); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x103F); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "FfsChkdsk"); + + INIT_PSYM(buffer); + Ret = SymFromName(hProc, "FfsFormat", pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, SYMFLAG_FUNCTION); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x100C); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "FfsFormat"); + } + else + { + skip("dbghelp.dll cannot parse rsym\n"); + } + + deinit_sym(); +} + +static void test_SymFromAddr(HANDLE hProc, const char* szModuleName) +{ + BOOL Ret; + char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)]; + PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer; + + DWORD64 BaseAddress, Displacement; + DWORD dwErr; + + if (!init_sym()) + return; + + SetLastError(ERROR_SUCCESS); + BaseAddress = SymLoadModule64(hProc, NULL, szModuleName, NULL, 0x600000, 0); + dwErr = GetLastError(); + + if (supports_rsym(hProc, BaseAddress)) + { + ok_ulonglong(BaseAddress, 0x600000); + ok_hex(dwErr, ERROR_SUCCESS); + + /* No address found before load address of module */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress -1, &Displacement, pSymbol); + dwErr = GetLastError(); + ok_int(Ret, FALSE); + ok_hex(dwErr, ERROR_MOD_NOT_FOUND); + + /* Right at the start of the module is recognized as the first symbol found */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress, &Displacement, pSymbol); + /* Our dbghelp.dll does not recognize this yet */ + todo_if(!Ret) + { + ok_int(Ret, TRUE); + ok_ulonglong(Displacement, 0xffffffffffffffff); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, SYMFLAG_FUNCTION); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1000); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "DllMain"); + } + + /* The actual first instruction of the function */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress + 0x1000, &Displacement, pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(Displacement, 0); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, SYMFLAG_FUNCTION); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1000); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "DllMain"); + + /* The last instruction in the function */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress + 0x1009, &Displacement, pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(Displacement, 0x9); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, SYMFLAG_FUNCTION); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x1000); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "DllMain"); + + /* First byte of the next function */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress + 0x103F, &Displacement, pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(Displacement, 0); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, SYMFLAG_FUNCTION); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x103F); + ok_hex(pSymbol->Tag, SymTagFunction); + ok_str(pSymbol->Name, "FfsChkdsk"); + + /* .idata */ + Displacement = 0; + INIT_PSYM(buffer); + Ret = SymFromAddr(hProc, BaseAddress + 0x4000, &Displacement, pSymbol); + ok_int(Ret, TRUE); + ok_ulonglong(Displacement, 0); + ok_ulonglong(pSymbol->ModBase, BaseAddress); + ok_hex(pSymbol->Flags, SYMFLAG_EXPORT); + ok_ulonglong(pSymbol->Address, BaseAddress + 0x4000); + ok_hex(pSymbol->Tag, SymTagPublicSymbol); + ok_str(pSymbol->Name, "_head_dll_ntdll_libntdll_a"); + } + else + { + skip("dbghelp.dll cannot parse rsym\n"); + } + + deinit_sym(); +} + +typedef struct _test_context +{ + DWORD64 BaseAddress; + SIZE_T Index; +} test_context; + +static struct _test_data { + DWORD64 AddressOffset; + ULONG Size; + ULONG Tag; + const char* Name; + int Line; +} test_data[] = { + + /* TODO: Order is based on magic, should find entries based on name, and mark as 'seen' */ + { 0x107c, 0, SymTagPublicSymbol, "__CTOR_LIST__", __LINE__ }, + { 0x2074, 0, SymTagPublicSymbol, "__RUNTIME_PSEUDO_RELOC_LIST_END__", __LINE__ }, + { 0x1000, 12, SymTagPublicSymbol, "EntryPoint", __LINE__ }, + { 0x100c, 51, SymTagFunction, "FfsFormat", __LINE__ }, + { 0x4030, 0, SymTagPublicSymbol, "_imp__DbgPrint", __LINE__ }, + { 0x1084, 0, SymTagPublicSymbol, "__DTOR_LIST__", __LINE__ }, + { 0x103f, 53, SymTagFunction, "FfsChkdsk", __LINE__ }, + { 0x2074, 0, SymTagPublicSymbol, "_rt_psrelocs_end", __LINE__ }, + { 0x103f, 53, SymTagPublicSymbol, "ChkdskEx", __LINE__ }, + { 0x4048, 0, SymTagPublicSymbol, "_dll_ntdll_libntdll_a_iname", __LINE__ }, + + + + { 0x2074, 0, SymTagPublicSymbol, "_rt_psrelocs_start", __LINE__ }, + { 0x1000, 12, SymTagFunction, "DllMain", __LINE__ }, + { 0x100c, 0, SymTagPublicSymbol, "FormatEx", __LINE__ }, + { 0x1074, 0, SymTagPublicSymbol, "DbgPrint", __LINE__ }, + { 0x68900000, 0, SymTagPublicSymbol, "__ImageBase", __LINE__ }, + { 0x68902074, 0, SymTagPublicSymbol, "__RUNTIME_PSEUDO_RELOC_LIST__", __LINE__ }, + { 0x4000, 0, SymTagPublicSymbol, "_head_dll_ntdll_libntdll_a", __LINE__ }, +}; + +BOOL CALLBACK EnumSymProc(PSYMBOL_INFO pSymInfo, ULONG SymbolSize, PVOID UserContext) +{ + test_context* ctx = UserContext; + + if (ctx->Index < ARRAYSIZE(test_data)) + { + ok_ulonglong_(__FILE__, test_data[ctx->Index].Line, pSymInfo->ModBase, ctx->BaseAddress); + if (test_data[ctx->Index].AddressOffset > 0x100000) + ok_ulonglong_(__FILE__, test_data[ctx->Index].Line, pSymInfo->Address, test_data[ctx->Index].AddressOffset); + else + ok_ulonglong_(__FILE__, test_data[ctx->Index].Line, pSymInfo->Address, ctx->BaseAddress + test_data[ctx->Index].AddressOffset); + ok_hex_(__FILE__, test_data[ctx->Index].Line, pSymInfo->Tag, test_data[ctx->Index].Tag); + ok_str_(__FILE__, test_data[ctx->Index].Line, pSymInfo->Name, test_data[ctx->Index].Name); + + ctx->Index++; + } + else + { + ok(0, "Out of bounds (%lu), max is: %i!\n", ctx->Index, ARRAYSIZE(test_data)); + } + + return TRUE; +} + +static void test_SymEnumSymbols(HANDLE hProc, const char* szModuleName) +{ + BOOL Ret; + DWORD dwErr; + + test_context ctx; + + if (!init_sym()) + return; + + ctx.Index = 0; + SetLastError(ERROR_SUCCESS); + ctx.BaseAddress = SymLoadModule64(hProc, NULL, szModuleName, NULL, 0x600000, 0); + dwErr = GetLastError(); + + if (supports_rsym(hProc, ctx.BaseAddress)) + { + ok_ulonglong(ctx.BaseAddress, 0x600000); + ok_hex(dwErr, ERROR_SUCCESS); + + Ret = SymEnumSymbols(hProc, ctx.BaseAddress, NULL, EnumSymProc, &ctx); + ok_int(Ret, TRUE); + ok_int(ctx.Index, ARRAYSIZE(test_data)); + } + else + { + skip("dbghelp.dll cannot parse rsym\n"); + } + + deinit_sym(); +} + + + + +START_TEST(rsym) +{ + char szDllName[MAX_PATH]; + //dump_rsym("R:\\src\\trunk\\reactos\\modules\\rostests\\apitests\\dbghelp\\testdata\\gcc_uffs.dll"); + + DWORD Options = SymGetOptions(); + Options &= ~(SYMOPT_UNDNAME); + //Options |= SYMOPT_DEBUG; + SymSetOptions(Options); + + if (!extract_gcc_exe(szDllName)) + { + ok(0, "Failed extracting files\n"); + return; + } + + test_SymFromName(proc(), szDllName); + test_SymFromAddr(proc(), szDllName); + test_SymEnumSymbols(proc(), szDllName); + + cleanup_gcc_exe(); +} Propchange: trunk/rostests/apitests/dbghelp/rsym.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dbghelp/testdata/gcc_uffs.dll.compr URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dbghelp/testdata… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/dbghelp/testdata/gcc_uffs.dll.compr ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/apitests/dbghelp/testdata/msvc_uffs.dll.compr URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dbghelp/testdata… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/dbghelp/testdata/msvc_uffs.dll.compr ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/apitests/dbghelp/testdata/msvc_uffs.pdb.compr URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dbghelp/testdata… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/dbghelp/testdata/msvc_uffs.pdb.compr ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/apitests/dbghelp/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dbghelp/testlist… ============================================================================== --- trunk/rostests/apitests/dbghelp/testlist.c (added) +++ trunk/rostests/apitests/dbghelp/testlist.c [iso-8859-1] Fri Feb 17 16:15:49 2017 @@ -0,0 +1,13 @@ + +#define STANDALONE +#include <wine/test.h> + +extern void func_pdb(void); +extern void func_rsym(void); + +const struct test winetest_testlist[] = +{ + { "pdb", func_pdb }, + { "rsym", func_rsym }, + { 0, 0 } +}; Propchange: trunk/rostests/apitests/dbghelp/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 7 months

[mjansen] 73815: [SDK][KERNEL32] Add defines for PEB.AppCompatFlags CORE-12768 #resolve

by mjansen＠svn.reactos.org

Author: mjansen Date: Fri Feb 17 16:12:19 2017 New Revision: 73815 URL: http://svn.reactos.org/svn/reactos?rev=73815&view=rev Log: [SDK][KERNEL32] Add defines for PEB.AppCompatFlags CORE-12768 #resolve Modified: trunk/reactos/dll/win32/kernel32/client/path.c trunk/reactos/sdk/include/ndk/pstypes.h Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Fri Feb 17 16:12:19 2017 @@ -1861,7 +1861,7 @@ if (GetFileAttributesW(lpszLongPath) == INVALID_FILE_ATTRIBUTES) { /* Windows checks for an application compatibility flag to allow this */ - if (!(NtCurrentPeb()) || !(NtCurrentPeb()->AppCompatFlags.LowPart & 1)) + if (!(NtCurrentPeb()) || !(NtCurrentPeb()->AppCompatFlags.LowPart & GetShortPathNameNT4)) { /* It doesn't, so fail */ ReturnLength = 0; Modified: trunk/reactos/sdk/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/pstypes.h?… ============================================================================== --- trunk/reactos/sdk/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/pstypes.h [iso-8859-1] Fri Feb 17 16:12:19 2017 @@ -735,6 +735,31 @@ } Wx86ThreadState, *PWx86ThreadState; #endif +// +// PEB.AppCompatFlags +// Tag FLAG_MASK_KERNEL +// +typedef enum _APPCOMPAT_FLAGS +{ + GetShortPathNameNT4 = 0x1, + GetDiskFreeSpace2GB = 0x8, + FTMFromCurrentAPI = 0x20, + DisallowCOMBindingNotifications = 0x40, + Ole32ValidatePointers = 0x80, + DisableCicero = 0x100, + Ole32EnableAsyncDocFile = 0x200, + EnableLegacyExceptionHandlinginOLE = 0x400, + DisableAdvanceRPCClientHardening = 0x800, + DisableMaybeNULLSizeisConsistencycheck = 0x1000, + DisableAdvancedRPCrangeCheck = 0x4000, + EnableLegacyExceptionHandlingInRPC = 0x8000, + EnableLegacyNTFSFlagsForDocfileOpens = 0x10000, + DisableNDRIIDConsistencyCheck = 0x20000, + UserDisableForwarderPatch = 0x40000, + DisableNewWMPAINTDispatchInOLE = 0x100000, + DoNotAddToCache = 0x80000000, +} APPCOMPAT_FLAGS; + // // Process Environment Block (PEB)

7 years, 7 months

[tfaber] 73814: [LIBTIFF] - Fix GCC non-PCH build CORE-12775

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Feb 17 13:58:26 2017 New Revision: 73814 URL: http://svn.reactos.org/svn/reactos?rev=73814&view=rev Log: [LIBTIFF] - Fix GCC non-PCH build CORE-12775 Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tif_config.h trunk/reactos/sdk/include/reactos/libs/libtiff/tiffconf.h Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tif_config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libtiff/tif_config.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libtiff/tif_config.h [iso-8859-1] Fri Feb 17 13:58:26 2017 @@ -42,13 +42,21 @@ #define TIFF_INT64_FORMAT "%I64d" /* Signed 64-bit type */ +#ifdef __GNUC__ +#define TIFF_INT64_T signed long long +#else #define TIFF_INT64_T signed __int64 +#endif /* Unsigned 64-bit type formatter */ #define TIFF_UINT64_FORMAT "%I64u" /* Unsigned 64-bit type */ +#ifdef __GNUC__ +#define TIFF_UINT64_T unsigned long long +#else #define TIFF_UINT64_T unsigned __int64 +#endif #if _WIN64 /* Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tiffconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libtiff/tiffconf.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libtiff/tiffconf.h [iso-8859-1] Fri Feb 17 13:58:26 2017 @@ -47,13 +47,21 @@ #define TIFF_INT64_FORMAT "%I64d" /* Signed 64-bit type */ +#ifdef __GNUC__ +#define TIFF_INT64_T signed long long +#else #define TIFF_INT64_T signed __int64 +#endif /* Unsigned 64-bit type formatter */ #define TIFF_UINT64_FORMAT "%I64u" /* Unsigned 64-bit type */ +#ifdef __GNUC__ +#define TIFF_UINT64_T unsigned long long +#else #define TIFF_UINT64_T unsigned __int64 +#endif #if _WIN64 /*

7 years, 7 months

[tfaber] 73813: [LIBTIFF] - Update to version 4.0.7 CORE-12775 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Feb 17 13:43:05 2017 New Revision: 73813 URL: http://svn.reactos.org/svn/reactos?rev=73813&view=rev Log: [LIBTIFF] - Update to version 4.0.7 CORE-12775 #resolve Added: trunk/reactos/dll/3rdparty/libtiff/tif_stream.cxx (with props) Modified: trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt trunk/reactos/dll/3rdparty/libtiff/libtiff.def trunk/reactos/dll/3rdparty/libtiff/mkg3states.c trunk/reactos/dll/3rdparty/libtiff/tif_aux.c trunk/reactos/dll/3rdparty/libtiff/tif_close.c trunk/reactos/dll/3rdparty/libtiff/tif_codec.c trunk/reactos/dll/3rdparty/libtiff/tif_color.c trunk/reactos/dll/3rdparty/libtiff/tif_compress.c trunk/reactos/dll/3rdparty/libtiff/tif_dir.c trunk/reactos/dll/3rdparty/libtiff/tif_dirinfo.c trunk/reactos/dll/3rdparty/libtiff/tif_dirread.c trunk/reactos/dll/3rdparty/libtiff/tif_dirwrite.c trunk/reactos/dll/3rdparty/libtiff/tif_dumpmode.c trunk/reactos/dll/3rdparty/libtiff/tif_extension.c trunk/reactos/dll/3rdparty/libtiff/tif_fax3.c trunk/reactos/dll/3rdparty/libtiff/tif_getimage.c trunk/reactos/dll/3rdparty/libtiff/tif_jpeg.c trunk/reactos/dll/3rdparty/libtiff/tif_jpeg_12.c trunk/reactos/dll/3rdparty/libtiff/tif_luv.c trunk/reactos/dll/3rdparty/libtiff/tif_lzma.c trunk/reactos/dll/3rdparty/libtiff/tif_lzw.c trunk/reactos/dll/3rdparty/libtiff/tif_next.c trunk/reactos/dll/3rdparty/libtiff/tif_ojpeg.c trunk/reactos/dll/3rdparty/libtiff/tif_open.c trunk/reactos/dll/3rdparty/libtiff/tif_packbits.c trunk/reactos/dll/3rdparty/libtiff/tif_pixarlog.c trunk/reactos/dll/3rdparty/libtiff/tif_predict.c trunk/reactos/dll/3rdparty/libtiff/tif_print.c trunk/reactos/dll/3rdparty/libtiff/tif_read.c trunk/reactos/dll/3rdparty/libtiff/tif_strip.c trunk/reactos/dll/3rdparty/libtiff/tif_swab.c trunk/reactos/dll/3rdparty/libtiff/tif_thunder.c trunk/reactos/dll/3rdparty/libtiff/tif_tile.c trunk/reactos/dll/3rdparty/libtiff/tif_unix.c trunk/reactos/dll/3rdparty/libtiff/tif_win32.c trunk/reactos/dll/3rdparty/libtiff/tif_write.c trunk/reactos/dll/3rdparty/libtiff/tif_zip.c trunk/reactos/sdk/include/reactos/libs/libtiff/tif_config.h trunk/reactos/sdk/include/reactos/libs/libtiff/tif_config.vc.h trunk/reactos/sdk/include/reactos/libs/libtiff/tif_fax3.h trunk/reactos/sdk/include/reactos/libs/libtiff/tif_predict.h trunk/reactos/sdk/include/reactos/libs/libtiff/tiff.h trunk/reactos/sdk/include/reactos/libs/libtiff/tiffconf.h trunk/reactos/sdk/include/reactos/libs/libtiff/tiffconf.vc.h trunk/reactos/sdk/include/reactos/libs/libtiff/tiffio.h trunk/reactos/sdk/include/reactos/libs/libtiff/tiffiop.h trunk/reactos/sdk/include/reactos/libs/libtiff/tiffvers.h trunk/reactos/sdk/include/reactos/libs/libtiff/uvcode.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/CMake… Modified: trunk/reactos/dll/3rdparty/libtiff/libtiff.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/libti… Modified: trunk/reactos/dll/3rdparty/libtiff/mkg3states.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/mkg3s… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_aux.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_a… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_c… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_codec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_c… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_c… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_compress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_c… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_d… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_dirinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_d… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_dirread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_d… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_dirwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_d… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_dumpmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_d… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_extension.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_e… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_fax3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_f… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_getimage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_g… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_jpeg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_j… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_jpeg_12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_j… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_luv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_l… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_lzma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_l… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_lzw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_l… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_next.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_n… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_ojpeg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_o… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_open.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_o… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_packbits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_p… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_pixarlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_p… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_predict.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_p… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_p… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_r… Added: trunk/reactos/dll/3rdparty/libtiff/tif_stream.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_s… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_strip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_s… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_swab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_s… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_thunder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_t… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_tile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_t… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_unix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_u… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_w… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_w… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_zip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_z… Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tif_config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tif_config.vc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tif_fax3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tif_predict.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tiff.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tiffconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tiffconf.vc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tiffio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tiffiop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tiffvers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/uvcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l…

7 years, 7 months

[khornicek] 73812: [WIN32K] - The pattern bitmap can get deleted during the GDI cleanup for process before the brush itself. - Gets rid of some of those pesky "GreDeleteObject: Trying to delete inv...

by khornicek＠svn.reactos.org

Author: khornicek Date: Fri Feb 17 13:13:36 2017 New Revision: 73812 URL: http://svn.reactos.org/svn/reactos?rev=73812&view=rev Log: [WIN32K] - The pattern bitmap can get deleted during the GDI cleanup for process before the brush itself. - Gets rid of some of those pesky "GreDeleteObject: Trying to delete invalid object" debug prints. Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.cpp Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.cp… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.cpp [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.cpp [iso-8859-1] Fri Feb 17 13:13:36 2017 @@ -62,8 +62,8 @@ GdiPoolFree(GetBrushAttrPool(), this->pBrushAttr); } - /* Delete the pattern bitmap */ - if (this->hbmPattern != NULL) + /* Delete the pattern bitmap (may have already been deleted during gdi cleanup) */ + if (this->hbmPattern != NULL && GreIsHandleValid(this->hbmPattern)) { GreSetBitmapOwner(this->hbmPattern, BASEOBJECT::OWNER::POWNED); GreDeleteObject(this->hbmPattern);

7 years, 7 months

[tfaber] 73811: [LIBTIFF] - Use the official libtiff 4.0.3 def file to determine exported functions (instead of exporting everything in GCC builds, nothing in MSVC builds) - Remove unused ROS-diffs...

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Feb 17 13:05:50 2017 New Revision: 73811 URL: http://svn.reactos.org/svn/reactos?rev=73811&view=rev Log: [LIBTIFF] - Use the official libtiff 4.0.3 def file to determine exported functions (instead of exporting everything in GCC builds, nothing in MSVC builds) - Remove unused ROS-diffs CORE-6898 CORE-12275 Removed: trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch trunk/reactos/sdk/include/reactos/libs/libtiff/rosdiff.patch Modified: trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt trunk/reactos/dll/3rdparty/libtiff/libtiff.def Modified: trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Fri Feb 17 13:05:50 2017 @@ -51,7 +51,7 @@ tif_zip.c precomp.h) -add_library(libtiff SHARED ${SOURCE}) +add_library(libtiff SHARED ${SOURCE} libtiff.def) set_module_type(libtiff win32dll) target_link_libraries(libtiff zlib getopt) add_importlibs(libtiff user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/3rdparty/libtiff/libtiff.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/libti… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/libtiff.def [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/libtiff.def [iso-8859-1] Fri Feb 17 13:05:50 2017 @@ -12,12 +12,19 @@ TIFFGetTagListEntry TIFFGetTagListCount TIFFReadDirectory + TIFFScanlineSize64 TIFFScanlineSize + TIFFStripSize64 TIFFStripSize + TIFFVStripSize64 TIFFVStripSize + TIFFRawStripSize64 TIFFRawStripSize + TIFFTileRowSize64 TIFFTileRowSize + TIFFTileSize64 TIFFTileSize + TIFFVTileSize64 TIFFVTileSize TIFFFileno TIFFSetFileno @@ -86,17 +93,20 @@ TIFFWriteEncodedTile TIFFWriteRawTile TIFFSetWriteOffset + TIFFSwabFloat TIFFSwabDouble TIFFSwabShort TIFFSwabLong TIFFSwabArrayOfShort TIFFSwabArrayOfLong + TIFFSwabArrayOfFloat TIFFSwabArrayOfDouble TIFFSwabArrayOfTriples TIFFReverseBits TIFFGetBitRevTable TIFFDefaultStripSize TIFFDefaultTileSize + TIFFRasterScanlineSize64 TIFFRasterScanlineSize _TIFFmalloc _TIFFrealloc @@ -104,13 +114,17 @@ _TIFFmemset _TIFFmemcpy _TIFFmemcmp + _TIFFCheckMalloc TIFFCreateDirectory TIFFSetTagExtender - TIFFMergeFieldInfo - TIFFFindFieldInfo - TIFFFindFieldInfoByName TIFFFieldWithName TIFFFieldWithTag + TIFFFieldTag + TIFFFieldName + TIFFFieldDataType + TIFFFieldPassCount + TIFFFieldReadCount + TIFFFieldWriteCount TIFFCurrentDirOffset TIFFWriteCheck TIFFRGBAImageOK @@ -137,4 +151,8 @@ TIFFAccessTagMethods TIFFGetClientInfo TIFFSetClientInfo - TIFFReassignTagToIgnore + TIFFSwabLong8 + TIFFSwabArrayOfLong8 + TIFFFindField + TIFFUnsetField + TIFFMergeFieldInfo Removed: trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/rosdi… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch (removed) @@ -1,15 +0,0 @@ -Index: tif_open.c -=================================================================== ---- tif_open.c (revision 48037) -+++ tif_open.c (working copy) -@@ -516,6 +516,9 @@ - TIFFSetClientdata(TIFF* tif, thandle_t newvalue) - { - thandle_t m = tif->tif_clientdata; -+#ifdef USE_WIN32_FILEIO -+ newvalue = (thandle_t)_get_osfhandle((int)newvalue); -+#endif /* USE_WIN32_FILEIO */ - tif->tif_clientdata = newvalue; - return m; - } - Removed: trunk/reactos/sdk/include/reactos/libs/libtiff/rosdiff.patch URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libtiff/rosdiff.patch [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libtiff/rosdiff.patch (removed) @@ -1,445 +0,0 @@ -Index: tiffio.h -=================================================================== ---- tiffio.h (revision 48037) -+++ tiffio.h (working copy) -@@ -27,6 +27,30 @@ - #ifndef _TIFFIO_ - #define _TIFFIO_ - -+#ifndef __GNUC__ -+# define __DLL_IMPORT__ __declspec(dllimport) -+# define __DLL_EXPORT__ __declspec(dllexport) -+#else -+# define __DLL_IMPORT__ __attribute__((dllimport)) extern -+# define __DLL_EXPORT__ __attribute__((dllexport)) extern -+#endif -+ -+#if (defined __WIN32__) || (defined _WIN32) -+# ifdef BUILD_LIBTIFF_DLL -+# define LIBTIFF_DLL_IMPEXP __DLL_EXPORT__ -+# elif defined(LIBTIFF_STATIC) -+# define LIBTIFF_DLL_IMPEXP -+# elif defined (USE_LIBTIFF_DLL) -+# define LIBTIFF_DLL_IMPEXP __DLL_IMPORT__ -+# elif defined (USE_LIBTIFF_STATIC) -+# define LIBTIFF_DLL_IMPEXP -+# else /* assume USE_LIBTIFF_DLL */ -+# define LIBTIFF_DLL_IMPEXP __DLL_IMPORT__ -+# endif -+#else /* __WIN32__ */ -+# define LIBTIFF_DLL_IMPEXP -+#endif -+ - /* - * TIFF I/O Library Definitions. - */ -@@ -80,10 +104,20 @@ - */ - - #if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows) -+# define BINMODE "b" - # if !defined(__CYGWIN) && !defined(AVOID_WIN32_FILEIO) && !defined(USE_WIN32_FILEIO) - # define AVOID_WIN32_FILEIO - # endif --#endif -+# include <fcntl.h> -+# include <io.h> -+# ifdef SET_BINARY -+# undef SET_BINARY -+# endif /* SET_BINARY */ -+# define SET_BINARY(f) do {if (!_isatty(f)) _setmode(f,_O_BINARY);} while (0) -+#else /* Windows */ -+# define BINMODE -+# define SET_BINARY(f) (void)0 -+#endif /* Windows */ - - #if defined(USE_WIN32_FILEIO) - # define VC_EXTRALEAN -@@ -268,30 +302,30 @@ - typedef void (*TIFFUnmapFileProc)(thandle_t, tdata_t, toff_t); - typedef void (*TIFFExtendProc)(TIFF*); - --extern const char* TIFFGetVersion(void); -+LIBTIFF_DLL_IMPEXP const char* TIFFGetVersion(void); - --extern const TIFFCodec* TIFFFindCODEC(uint16); --extern TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod); --extern void TIFFUnRegisterCODEC(TIFFCodec*); --extern int TIFFIsCODECConfigured(uint16); --extern TIFFCodec* TIFFGetConfiguredCODECs(void); -+LIBTIFF_DLL_IMPEXP const TIFFCodec* TIFFFindCODEC(uint16); -+LIBTIFF_DLL_IMPEXP TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod); -+LIBTIFF_DLL_IMPEXP void TIFFUnRegisterCODEC(TIFFCodec*); -+LIBTIFF_DLL_IMPEXP int TIFFIsCODECConfigured(uint16); -+LIBTIFF_DLL_IMPEXP TIFFCodec* TIFFGetConfiguredCODECs(void); - - /* - * Auxiliary functions. - */ - --extern tdata_t _TIFFmalloc(tsize_t); --extern tdata_t _TIFFrealloc(tdata_t, tsize_t); --extern void _TIFFmemset(tdata_t, int, tsize_t); --extern void _TIFFmemcpy(tdata_t, const tdata_t, tsize_t); --extern int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t); --extern void _TIFFfree(tdata_t); -+LIBTIFF_DLL_IMPEXP tdata_t _TIFFmalloc(tsize_t); -+LIBTIFF_DLL_IMPEXP tdata_t _TIFFrealloc(tdata_t, tsize_t); -+LIBTIFF_DLL_IMPEXP void _TIFFmemset(tdata_t, int, tsize_t); -+LIBTIFF_DLL_IMPEXP void _TIFFmemcpy(tdata_t, const tdata_t, tsize_t); -+LIBTIFF_DLL_IMPEXP int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t); -+LIBTIFF_DLL_IMPEXP void _TIFFfree(tdata_t); - - /* - ** Stuff, related to tag handling and creating custom tags. - */ --extern int TIFFGetTagListCount( TIFF * ); --extern ttag_t TIFFGetTagListEntry( TIFF *, int tag_index ); -+LIBTIFF_DLL_IMPEXP int TIFFGetTagListCount( TIFF * ); -+LIBTIFF_DLL_IMPEXP ttag_t TIFFGetTagListEntry( TIFF *, int tag_index ); - - #define TIFF_ANY TIFF_NOTYPE /* for field descriptor searching */ - #define TIFF_VARIABLE -1 /* marker for variable length tags */ -@@ -317,12 +351,12 @@ - void *value; - } TIFFTagValue; - --extern void TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], int); --extern const TIFFFieldInfo* TIFFFindFieldInfo(TIFF*, ttag_t, TIFFDataType); --extern const TIFFFieldInfo* TIFFFindFieldInfoByName(TIFF* , const char *, -+LIBTIFF_DLL_IMPEXP void TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], int); -+LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFindFieldInfo(TIFF*, ttag_t, TIFFDataType); -+LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFindFieldInfoByName(TIFF* , const char *, - TIFFDataType); --extern const TIFFFieldInfo* TIFFFieldWithTag(TIFF*, ttag_t); --extern const TIFFFieldInfo* TIFFFieldWithName(TIFF*, const char *); -+LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFieldWithTag(TIFF*, ttag_t); -+LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFieldWithName(TIFF*, const char *); - - typedef int (*TIFFVSetMethod)(TIFF*, ttag_t, va_list); - typedef int (*TIFFVGetMethod)(TIFF*, ttag_t, va_list); -@@ -334,180 +368,180 @@ - TIFFPrintMethod printdir; /* directory print routine */ - } TIFFTagMethods; - --extern TIFFTagMethods *TIFFAccessTagMethods( TIFF * ); --extern void *TIFFGetClientInfo( TIFF *, const char * ); --extern void TIFFSetClientInfo( TIFF *, void *, const char * ); -+LIBTIFF_DLL_IMPEXP TIFFTagMethods *TIFFAccessTagMethods( TIFF * ); -+LIBTIFF_DLL_IMPEXP void *TIFFGetClientInfo( TIFF *, const char * ); -+LIBTIFF_DLL_IMPEXP void TIFFSetClientInfo( TIFF *, void *, const char * ); - --extern void TIFFCleanup(TIFF*); --extern void TIFFClose(TIFF*); --extern int TIFFFlush(TIFF*); --extern int TIFFFlushData(TIFF*); --extern int TIFFGetField(TIFF*, ttag_t, ...); --extern int TIFFVGetField(TIFF*, ttag_t, va_list); --extern int TIFFGetFieldDefaulted(TIFF*, ttag_t, ...); --extern int TIFFVGetFieldDefaulted(TIFF*, ttag_t, va_list); --extern int TIFFReadDirectory(TIFF*); --extern int TIFFReadCustomDirectory(TIFF*, toff_t, const TIFFFieldInfo[], -+LIBTIFF_DLL_IMPEXP void TIFFCleanup(TIFF*); -+LIBTIFF_DLL_IMPEXP void TIFFClose(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFFlush(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFFlushData(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFGetField(TIFF*, ttag_t, ...); -+LIBTIFF_DLL_IMPEXP int TIFFVGetField(TIFF*, ttag_t, va_list); -+LIBTIFF_DLL_IMPEXP int TIFFGetFieldDefaulted(TIFF*, ttag_t, ...); -+LIBTIFF_DLL_IMPEXP int TIFFVGetFieldDefaulted(TIFF*, ttag_t, va_list); -+LIBTIFF_DLL_IMPEXP int TIFFReadDirectory(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFReadCustomDirectory(TIFF*, toff_t, const TIFFFieldInfo[], - size_t); --extern int TIFFReadEXIFDirectory(TIFF*, toff_t); --extern tsize_t TIFFScanlineSize(TIFF*); --extern tsize_t TIFFOldScanlineSize(TIFF*); --extern tsize_t TIFFNewScanlineSize(TIFF*); --extern tsize_t TIFFRasterScanlineSize(TIFF*); --extern tsize_t TIFFStripSize(TIFF*); --extern tsize_t TIFFRawStripSize(TIFF*, tstrip_t); --extern tsize_t TIFFVStripSize(TIFF*, uint32); --extern tsize_t TIFFTileRowSize(TIFF*); --extern tsize_t TIFFTileSize(TIFF*); --extern tsize_t TIFFVTileSize(TIFF*, uint32); --extern uint32 TIFFDefaultStripSize(TIFF*, uint32); --extern void TIFFDefaultTileSize(TIFF*, uint32*, uint32*); --extern int TIFFFileno(TIFF*); --extern int TIFFSetFileno(TIFF*, int); --extern thandle_t TIFFClientdata(TIFF*); --extern thandle_t TIFFSetClientdata(TIFF*, thandle_t); --extern int TIFFGetMode(TIFF*); --extern int TIFFSetMode(TIFF*, int); --extern int TIFFIsTiled(TIFF*); --extern int TIFFIsByteSwapped(TIFF*); --extern int TIFFIsUpSampled(TIFF*); --extern int TIFFIsMSB2LSB(TIFF*); --extern int TIFFIsBigEndian(TIFF*); --extern TIFFReadWriteProc TIFFGetReadProc(TIFF*); --extern TIFFReadWriteProc TIFFGetWriteProc(TIFF*); --extern TIFFSeekProc TIFFGetSeekProc(TIFF*); --extern TIFFCloseProc TIFFGetCloseProc(TIFF*); --extern TIFFSizeProc TIFFGetSizeProc(TIFF*); --extern TIFFMapFileProc TIFFGetMapFileProc(TIFF*); --extern TIFFUnmapFileProc TIFFGetUnmapFileProc(TIFF*); --extern uint32 TIFFCurrentRow(TIFF*); --extern tdir_t TIFFCurrentDirectory(TIFF*); --extern tdir_t TIFFNumberOfDirectories(TIFF*); --extern uint32 TIFFCurrentDirOffset(TIFF*); --extern tstrip_t TIFFCurrentStrip(TIFF*); --extern ttile_t TIFFCurrentTile(TIFF*); --extern int TIFFReadBufferSetup(TIFF*, tdata_t, tsize_t); --extern int TIFFWriteBufferSetup(TIFF*, tdata_t, tsize_t); --extern int TIFFSetupStrips(TIFF *); --extern int TIFFWriteCheck(TIFF*, int, const char *); --extern void TIFFFreeDirectory(TIFF*); --extern int TIFFCreateDirectory(TIFF*); --extern int TIFFLastDirectory(TIFF*); --extern int TIFFSetDirectory(TIFF*, tdir_t); --extern int TIFFSetSubDirectory(TIFF*, uint32); --extern int TIFFUnlinkDirectory(TIFF*, tdir_t); --extern int TIFFSetField(TIFF*, ttag_t, ...); --extern int TIFFVSetField(TIFF*, ttag_t, va_list); --extern int TIFFWriteDirectory(TIFF *); --extern int TIFFCheckpointDirectory(TIFF *); --extern int TIFFRewriteDirectory(TIFF *); --extern int TIFFReassignTagToIgnore(enum TIFFIgnoreSense, int); -+LIBTIFF_DLL_IMPEXP int TIFFReadEXIFDirectory(TIFF*, toff_t); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFScanlineSize(TIFF*); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFOldScanlineSize(TIFF*); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFNewScanlineSize(TIFF*); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFRasterScanlineSize(TIFF*); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFStripSize(TIFF*); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFRawStripSize(TIFF*, tstrip_t); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFVStripSize(TIFF*, uint32); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFTileRowSize(TIFF*); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFTileSize(TIFF*); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFVTileSize(TIFF*, uint32); -+LIBTIFF_DLL_IMPEXP uint32 TIFFDefaultStripSize(TIFF*, uint32); -+LIBTIFF_DLL_IMPEXP void TIFFDefaultTileSize(TIFF*, uint32*, uint32*); -+LIBTIFF_DLL_IMPEXP int TIFFFileno(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFSetFileno(TIFF*, int); -+LIBTIFF_DLL_IMPEXP thandle_t TIFFClientdata(TIFF*); -+LIBTIFF_DLL_IMPEXP thandle_t TIFFSetClientdata(TIFF*, thandle_t); -+LIBTIFF_DLL_IMPEXP int TIFFGetMode(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFSetMode(TIFF*, int); -+LIBTIFF_DLL_IMPEXP int TIFFIsTiled(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFIsByteSwapped(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFIsUpSampled(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFIsMSB2LSB(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFIsBigEndian(TIFF*); -+LIBTIFF_DLL_IMPEXP TIFFReadWriteProc TIFFGetReadProc(TIFF*); -+LIBTIFF_DLL_IMPEXP TIFFReadWriteProc TIFFGetWriteProc(TIFF*); -+LIBTIFF_DLL_IMPEXP TIFFSeekProc TIFFGetSeekProc(TIFF*); -+LIBTIFF_DLL_IMPEXP TIFFCloseProc TIFFGetCloseProc(TIFF*); -+LIBTIFF_DLL_IMPEXP TIFFSizeProc TIFFGetSizeProc(TIFF*); -+LIBTIFF_DLL_IMPEXP TIFFMapFileProc TIFFGetMapFileProc(TIFF*); -+LIBTIFF_DLL_IMPEXP TIFFUnmapFileProc TIFFGetUnmapFileProc(TIFF*); -+LIBTIFF_DLL_IMPEXP uint32 TIFFCurrentRow(TIFF*); -+LIBTIFF_DLL_IMPEXP tdir_t TIFFCurrentDirectory(TIFF*); -+LIBTIFF_DLL_IMPEXP tdir_t TIFFNumberOfDirectories(TIFF*); -+LIBTIFF_DLL_IMPEXP uint32 TIFFCurrentDirOffset(TIFF*); -+LIBTIFF_DLL_IMPEXP tstrip_t TIFFCurrentStrip(TIFF*); -+LIBTIFF_DLL_IMPEXP ttile_t TIFFCurrentTile(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFReadBufferSetup(TIFF*, tdata_t, tsize_t); -+LIBTIFF_DLL_IMPEXP int TIFFWriteBufferSetup(TIFF*, tdata_t, tsize_t); -+LIBTIFF_DLL_IMPEXP int TIFFSetupStrips(TIFF *); -+LIBTIFF_DLL_IMPEXP int TIFFWriteCheck(TIFF*, int, const char *); -+LIBTIFF_DLL_IMPEXP void TIFFFreeDirectory(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFCreateDirectory(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFLastDirectory(TIFF*); -+LIBTIFF_DLL_IMPEXP int TIFFSetDirectory(TIFF*, tdir_t); -+LIBTIFF_DLL_IMPEXP int TIFFSetSubDirectory(TIFF*, uint32); -+LIBTIFF_DLL_IMPEXP int TIFFUnlinkDirectory(TIFF*, tdir_t); -+LIBTIFF_DLL_IMPEXP int TIFFSetField(TIFF*, ttag_t, ...); -+LIBTIFF_DLL_IMPEXP int TIFFVSetField(TIFF*, ttag_t, va_list); -+LIBTIFF_DLL_IMPEXP int TIFFWriteDirectory(TIFF *); -+LIBTIFF_DLL_IMPEXP int TIFFCheckpointDirectory(TIFF *); -+LIBTIFF_DLL_IMPEXP int TIFFRewriteDirectory(TIFF *); -+LIBTIFF_DLL_IMPEXP int TIFFReassignTagToIgnore(enum TIFFIgnoreSense, int); - - #if defined(c_plusplus) || defined(__cplusplus) --extern void TIFFPrintDirectory(TIFF*, FILE*, long = 0); --extern int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t = 0); --extern int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t = 0); --extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0); --extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, -+LIBTIFF_DLL_IMPEXP void TIFFPrintDirectory(TIFF*, FILE*, long = 0); -+LIBTIFF_DLL_IMPEXP int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t = 0); -+LIBTIFF_DLL_IMPEXP int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t = 0); -+LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0); -+LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, - int = ORIENTATION_BOTLEFT, int = 0); - #else --extern void TIFFPrintDirectory(TIFF*, FILE*, long); --extern int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t); --extern int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t); --extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int); --extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int); -+LIBTIFF_DLL_IMPEXP void TIFFPrintDirectory(TIFF*, FILE*, long); -+LIBTIFF_DLL_IMPEXP int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t); -+LIBTIFF_DLL_IMPEXP int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t); -+LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int); -+LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int); - #endif - --extern int TIFFReadRGBAStrip(TIFF*, tstrip_t, uint32 * ); --extern int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * ); --extern int TIFFRGBAImageOK(TIFF*, char [1024]); --extern int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]); --extern int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32); --extern void TIFFRGBAImageEnd(TIFFRGBAImage*); --extern TIFF* TIFFOpen(const char*, const char*); -+LIBTIFF_DLL_IMPEXP int TIFFReadRGBAStrip(TIFF*, tstrip_t, uint32 * ); -+LIBTIFF_DLL_IMPEXP int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * ); -+LIBTIFF_DLL_IMPEXP int TIFFRGBAImageOK(TIFF*, char [1024]); -+LIBTIFF_DLL_IMPEXP int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]); -+LIBTIFF_DLL_IMPEXP int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32); -+LIBTIFF_DLL_IMPEXP void TIFFRGBAImageEnd(TIFFRGBAImage*); -+LIBTIFF_DLL_IMPEXP TIFF* TIFFOpen(const char*, const char*); - # ifdef __WIN32__ --extern TIFF* TIFFOpenW(const wchar_t*, const char*); -+LIBTIFF_DLL_IMPEXP TIFF* TIFFOpenW(const wchar_t*, const char*); - # endif /* __WIN32__ */ --extern TIFF* TIFFFdOpen(int, const char*, const char*); --extern TIFF* TIFFClientOpen(const char*, const char*, -+LIBTIFF_DLL_IMPEXP TIFF* TIFFFdOpen(int, const char*, const char*); -+LIBTIFF_DLL_IMPEXP TIFF* TIFFClientOpen(const char*, const char*, - thandle_t, - TIFFReadWriteProc, TIFFReadWriteProc, - TIFFSeekProc, TIFFCloseProc, - TIFFSizeProc, - TIFFMapFileProc, TIFFUnmapFileProc); --extern const char* TIFFFileName(TIFF*); --extern const char* TIFFSetFileName(TIFF*, const char *); --extern void TIFFError(const char*, const char*, ...) __attribute__((format (printf,2,3))); --extern void TIFFErrorExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); --extern void TIFFWarning(const char*, const char*, ...) __attribute__((format (printf,2,3))); --extern void TIFFWarningExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); --extern TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler); --extern TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt); --extern TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler); --extern TIFFErrorHandlerExt TIFFSetWarningHandlerExt(TIFFErrorHandlerExt); --extern TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc); --extern ttile_t TIFFComputeTile(TIFF*, uint32, uint32, uint32, tsample_t); --extern int TIFFCheckTile(TIFF*, uint32, uint32, uint32, tsample_t); --extern ttile_t TIFFNumberOfTiles(TIFF*); --extern tsize_t TIFFReadTile(TIFF*, -+LIBTIFF_DLL_IMPEXP const char* TIFFFileName(TIFF*); -+LIBTIFF_DLL_IMPEXP const char* TIFFSetFileName(TIFF*, const char *); -+LIBTIFF_DLL_IMPEXP void TIFFError(const char*, const char*, ...) __attribute__((format (printf,2,3))); -+LIBTIFF_DLL_IMPEXP void TIFFErrorExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); -+LIBTIFF_DLL_IMPEXP void TIFFWarning(const char*, const char*, ...) __attribute__((format (printf,2,3))); -+LIBTIFF_DLL_IMPEXP void TIFFWarningExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); -+LIBTIFF_DLL_IMPEXP TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler); -+LIBTIFF_DLL_IMPEXP TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt); -+LIBTIFF_DLL_IMPEXP TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler); -+LIBTIFF_DLL_IMPEXP TIFFErrorHandlerExt TIFFSetWarningHandlerExt(TIFFErrorHandlerExt); -+LIBTIFF_DLL_IMPEXP TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc); -+LIBTIFF_DLL_IMPEXP ttile_t TIFFComputeTile(TIFF*, uint32, uint32, uint32, tsample_t); -+LIBTIFF_DLL_IMPEXP int TIFFCheckTile(TIFF*, uint32, uint32, uint32, tsample_t); -+LIBTIFF_DLL_IMPEXP ttile_t TIFFNumberOfTiles(TIFF*); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFReadTile(TIFF*, - tdata_t, uint32, uint32, uint32, tsample_t); --extern tsize_t TIFFWriteTile(TIFF*, -+LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteTile(TIFF*, - tdata_t, uint32, uint32, uint32, tsample_t); --extern tstrip_t TIFFComputeStrip(TIFF*, uint32, tsample_t); --extern tstrip_t TIFFNumberOfStrips(TIFF*); --extern tsize_t TIFFReadEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); --extern tsize_t TIFFReadRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); --extern tsize_t TIFFReadEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); --extern tsize_t TIFFReadRawTile(TIFF*, ttile_t, tdata_t, tsize_t); --extern tsize_t TIFFWriteEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); --extern tsize_t TIFFWriteRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); --extern tsize_t TIFFWriteEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); --extern tsize_t TIFFWriteRawTile(TIFF*, ttile_t, tdata_t, tsize_t); --extern int TIFFDataWidth(TIFFDataType); /* table of tag datatype widths */ --extern void TIFFSetWriteOffset(TIFF*, toff_t); --extern void TIFFSwabShort(uint16*); --extern void TIFFSwabLong(uint32*); --extern void TIFFSwabDouble(double*); --extern void TIFFSwabArrayOfShort(uint16*, unsigned long); --extern void TIFFSwabArrayOfTriples(uint8*, unsigned long); --extern void TIFFSwabArrayOfLong(uint32*, unsigned long); --extern void TIFFSwabArrayOfDouble(double*, unsigned long); --extern void TIFFReverseBits(unsigned char *, unsigned long); --extern const unsigned char* TIFFGetBitRevTable(int); -+LIBTIFF_DLL_IMPEXP tstrip_t TIFFComputeStrip(TIFF*, uint32, tsample_t); -+LIBTIFF_DLL_IMPEXP tstrip_t TIFFNumberOfStrips(TIFF*); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFReadEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFReadRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFReadEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFReadRawTile(TIFF*, ttile_t, tdata_t, tsize_t); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); -+LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteRawTile(TIFF*, ttile_t, tdata_t, tsize_t); -+LIBTIFF_DLL_IMPEXP int TIFFDataWidth(TIFFDataType); /* table of tag datatype widths */ -+LIBTIFF_DLL_IMPEXP void TIFFSetWriteOffset(TIFF*, toff_t); -+LIBTIFF_DLL_IMPEXP void TIFFSwabShort(uint16*); -+LIBTIFF_DLL_IMPEXP void TIFFSwabLong(uint32*); -+LIBTIFF_DLL_IMPEXP void TIFFSwabDouble(double*); -+LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfShort(uint16*, unsigned long); -+LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfTriples(uint8*, unsigned long); -+LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfLong(uint32*, unsigned long); -+LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfDouble(double*, unsigned long); -+LIBTIFF_DLL_IMPEXP void TIFFReverseBits(unsigned char *, unsigned long); -+LIBTIFF_DLL_IMPEXP const unsigned char* TIFFGetBitRevTable(int); - - #ifdef LOGLUV_PUBLIC - #define U_NEU 0.210526316 - #define V_NEU 0.473684211 - #define UVSCALE 410. --extern double LogL16toY(int); --extern double LogL10toY(int); --extern void XYZtoRGB24(float*, uint8*); --extern int uv_decode(double*, double*, int); --extern void LogLuv24toXYZ(uint32, float*); --extern void LogLuv32toXYZ(uint32, float*); -+LIBTIFF_DLL_IMPEXP double LogL16toY(int); -+LIBTIFF_DLL_IMPEXP double LogL10toY(int); -+LIBTIFF_DLL_IMPEXP void XYZtoRGB24(float*, uint8*); -+LIBTIFF_DLL_IMPEXP int uv_decode(double*, double*, int); -+LIBTIFF_DLL_IMPEXP void LogLuv24toXYZ(uint32, float*); -+LIBTIFF_DLL_IMPEXP void LogLuv32toXYZ(uint32, float*); - #if defined(c_plusplus) || defined(__cplusplus) --extern int LogL16fromY(double, int = SGILOGENCODE_NODITHER); --extern int LogL10fromY(double, int = SGILOGENCODE_NODITHER); --extern int uv_encode(double, double, int = SGILOGENCODE_NODITHER); --extern uint32 LogLuv24fromXYZ(float*, int = SGILOGENCODE_NODITHER); --extern uint32 LogLuv32fromXYZ(float*, int = SGILOGENCODE_NODITHER); -+LIBTIFF_DLL_IMPEXP int LogL16fromY(double, int = SGILOGENCODE_NODITHER); -+LIBTIFF_DLL_IMPEXP int LogL10fromY(double, int = SGILOGENCODE_NODITHER); -+LIBTIFF_DLL_IMPEXP int uv_encode(double, double, int = SGILOGENCODE_NODITHER); -+LIBTIFF_DLL_IMPEXP uint32 LogLuv24fromXYZ(float*, int = SGILOGENCODE_NODITHER); -+LIBTIFF_DLL_IMPEXP uint32 LogLuv32fromXYZ(float*, int = SGILOGENCODE_NODITHER); - #else --extern int LogL16fromY(double, int); --extern int LogL10fromY(double, int); --extern int uv_encode(double, double, int); --extern uint32 LogLuv24fromXYZ(float*, int); --extern uint32 LogLuv32fromXYZ(float*, int); -+LIBTIFF_DLL_IMPEXP int LogL16fromY(double, int); -+LIBTIFF_DLL_IMPEXP int LogL10fromY(double, int); -+LIBTIFF_DLL_IMPEXP int uv_encode(double, double, int); -+LIBTIFF_DLL_IMPEXP uint32 LogLuv24fromXYZ(float*, int); -+LIBTIFF_DLL_IMPEXP uint32 LogLuv32fromXYZ(float*, int); - #endif - #endif /* LOGLUV_PUBLIC */ - --extern int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, TIFFDisplay *, float*); --extern void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32, -+LIBTIFF_DLL_IMPEXP int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, TIFFDisplay *, float*); -+LIBTIFF_DLL_IMPEXP void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32, - float *, float *, float *); --extern void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float, -+LIBTIFF_DLL_IMPEXP void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float, - uint32 *, uint32 *, uint32 *); - --extern int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*); --extern void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32, -+LIBTIFF_DLL_IMPEXP int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*); -+LIBTIFF_DLL_IMPEXP void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32, - uint32 *, uint32 *, uint32 *); - - #if defined(c_plusplus) || defined(__cplusplus)

7 years, 7 months

[khornicek] 73810: [PING] - Addendum to r73626. Convert the print specifiers too so that ping doesn't only output the old specifiers themselves.

by khornicek＠svn.reactos.org

Author: khornicek Date: Fri Feb 17 12:30:14 2017 New Revision: 73810 URL: http://svn.reactos.org/svn/reactos?rev=73810&view=rev Log: [PING] - Addendum to r73626. Convert the print specifiers too so that ping doesn't only output the old specifiers themselves. Modified: trunk/reactos/base/applications/network/ping/lang/bg-BG.rc trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc trunk/reactos/base/applications/network/ping/lang/de-DE.rc trunk/reactos/base/applications/network/ping/lang/en-US.rc trunk/reactos/base/applications/network/ping/lang/es-ES.rc trunk/reactos/base/applications/network/ping/lang/fr-FR.rc trunk/reactos/base/applications/network/ping/lang/it-IT.rc trunk/reactos/base/applications/network/ping/lang/pl-PL.rc trunk/reactos/base/applications/network/ping/lang/ro-RO.rc trunk/reactos/base/applications/network/ping/lang/ru-RU.rc trunk/reactos/base/applications/network/ping/lang/sq-AL.rc trunk/reactos/base/applications/network/ping/lang/sv-SE.rc trunk/reactos/base/applications/network/ping/lang/tr-TR.rc trunk/reactos/base/applications/network/ping/lang/uk-UA.rc trunk/reactos/base/applications/network/ping/lang/zh-CN.rc trunk/reactos/base/applications/network/ping/lang/zh-TW.rc Modified: trunk/reactos/base/applications/network/ping/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/bg-BG.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -33,34 +33,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "Not enough resources available.\n" IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %1.\n" - IDS_BAD_OPTION "Bad option %1.\n" - IDS_BAD_PARAMETER "Bad parameter %1.\n" - IDS_BAD_VALUE "Bad value for option %1, valid range is from %2!d! to %3!u!.\n" - IDS_WRONG_FAMILY "The option %1 is only supported for %2.\n" - IDS_UNKNOWN_HOST "Ping could not find host %1. Please check the name and try again.\n" - IDS_PINGING_ADDRESS "\nPinging %1 %0" - IDS_PINGING_HOSTNAME "\nPinging %1 [%2] %0" - IDS_SOURCE_ADDRESS "from %1!s! %0" - IDS_PING_SIZE "with %1!d! bytes of data:\n\n" - IDS_REPLY_FROM "Reply from %1: %0" - IDS_REPLY_BYTES "bytes=%1!d! %0" - IDS_REPLY_TIME_MS "time=%1!d!ms %0" - IDS_REPLY_TIME_0MS "time<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo reply returned %1.\n" + IDS_MISSING_VALUE "Value must be supplied for option %s.\n" + IDS_BAD_OPTION "Bad option %s.\n" + IDS_BAD_PARAMETER "Bad parameter %s.\n" + IDS_BAD_VALUE "Bad value for option %s, valid range is from %u to %u.\n" + IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" + IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_PINGING_ADDRESS "\nPinging %s " + IDS_PINGING_HOSTNAME "\nPinging %s [%s] " + IDS_SOURCE_ADDRESS "from %s %s" + IDS_PING_SIZE "with %lu bytes of data:\n\n" + IDS_REPLY_FROM "Reply from %s: " + IDS_REPLY_BYTES "bytes=%d " + IDS_REPLY_TIME_MS "time=%lums " + IDS_REPLY_TIME_0MS "time<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" IDS_REQUEST_TIMED_OUT "Request timed out.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" IDS_STATISTICS "\n\ -Ping statistics for %1!s!:\n\ - Packets: Sent = %2!d!, Received = %3!d!, Lost %4!d! (%5!u!%% loss),\n" +Ping statistics for %s:\n\ + Packets: Sent = %d, Received = %d, Lost %d (%d%% loss),\n" IDS_APPROXIMATE_RTT "Approximate round-trip time in milliseconds:\n\ - Minimum = %1!u!ms, Maximum = %2!u!ms, Average = %3!u!ms\n" + Minimum = %lums, Maximum = %lums, Average = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -33,34 +33,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "NenÃ k dispozici dostatek volnÃ½ch zdrojÅ¯.\n" IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %1.\n" - IDS_BAD_OPTION "NesprÃ¡vnÃ¡ volba %1.\n" - IDS_BAD_PARAMETER "NesprÃ¡vnÃ½ parametr %1.\n" - IDS_BAD_VALUE "NesprÃ¡vnÃ¡ hodnota volby %1, platnÃ½ rozsah je od %2!d! do %3!u!.\n" - IDS_WRONG_FAMILY "The option %1 is only supported for %2.\n" - IDS_UNKNOWN_HOST "Ping could not find host %1. Please check the name and try again.\n" - IDS_PINGING_ADDRESS "\nPinging %1 %0" - IDS_PINGING_HOSTNAME "\nPinging %1 [%2] %0" - IDS_SOURCE_ADDRESS "from %1!s! %0" - IDS_PING_SIZE "with %1!d! bytes of data:\n\n" - IDS_REPLY_FROM "OdpovÄÄ od %1: %0" - IDS_REPLY_BYTES "bajtÅ¯=%1!d! %0" - IDS_REPLY_TIME_MS "Äas=%1!d!ms %0" - IDS_REPLY_TIME_0MS "Äas<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo reply returned %1.\n" + IDS_MISSING_VALUE "Value must be supplied for option %s.\n" + IDS_BAD_OPTION "NesprÃ¡vnÃ¡ volba %s.\n" + IDS_BAD_PARAMETER "NesprÃ¡vnÃ½ parametr %s.\n" + IDS_BAD_VALUE "NesprÃ¡vnÃ¡ hodnota volby %s, platnÃ½ rozsah je od %u do %u.\n" + IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" + IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_PINGING_ADDRESS "\nPinging %s " + IDS_PINGING_HOSTNAME "\nPinging %s [%s] " + IDS_SOURCE_ADDRESS "from %s %s" + IDS_PING_SIZE "with %lu bytes of data:\n\n" + IDS_REPLY_FROM "OdpovÄÄ od %s: " + IDS_REPLY_BYTES "bajtÅ¯=%d " + IDS_REPLY_TIME_MS "Äas=%lums " + IDS_REPLY_TIME_0MS "Äas<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" IDS_REQUEST_TIMED_OUT "ÄasovÃ½ limit Å¾Ã¡dosti vyprÅ¡el.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" IDS_STATISTICS "\n\ -Statistika pro %1!s!:\n\ - Pakety: OdeslÃ¡no = %2!d!, PÅijato = %3!d!, Ztraceno %4!d! (%5!u!%% ztrÃ¡ta),\n" +Statistika pro %s:\n\ + Pakety: OdeslÃ¡no = %d, PÅijato = %d, Ztraceno %d (%d%% ztrÃ¡ta),\n" IDS_APPROXIMATE_RTT "PÅibliÅ¾nÃ¡ doba do pÅijetÃ odezvy v milisekundÃ¡ch:\n\ - Minimum = %1!u!ms, Maximum = %2!u!ms, PrÅ¯mÄr = %3!u!ms\n" + Minimum = %lums, Maximum = %lums, PrÅ¯mÄr = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/de-DE.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -32,34 +32,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "Nicht genÃ¼gend freie Resourcen verfÃ¼gbar.\n" IDS_MISSING_ADDRESS "Name oder IP-Adresse des Zielhosts muss angegeben werden.\n" - IDS_MISSING_VALUE "Fehlender Wert fÃ¼r Option %1.\n" - IDS_BAD_OPTION "UngÃ¼ltige Option %1.\n" - IDS_BAD_PARAMETER "UngÃ¼ltiger Parameter %1.\n" - IDS_BAD_VALUE "UngÃ¼ltiger Wert fÃ¼r Option %1, Erlaubter Bereich ist von %2!d! bis %3!u!.\n" - IDS_WRONG_FAMILY "Die Option %1 ist nur erlaubt fÃ¼r %2.\n" - IDS_UNKNOWN_HOST "Unbekannter Host %1.\n" - IDS_PINGING_ADDRESS "\nPing wird ausgefÃ¼hrt fÃ¼r %1 %0" - IDS_PINGING_HOSTNAME "\nPing wird ausgefÃ¼hrt fÃ¼r %1 [%2] %0" - IDS_SOURCE_ADDRESS "von %1!s! %0" - IDS_PING_SIZE "mit %1!d! Bytes Daten:\n\n" - IDS_REPLY_FROM "Antwort von %1: %0" - IDS_REPLY_BYTES "Bytes=%1!d! %0" - IDS_REPLY_TIME_MS "Zeit=%1!d!ms %0" - IDS_REPLY_TIME_0MS "Zeit<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo antwortete mit %1.\n" + IDS_MISSING_VALUE "Fehlender Wert fÃ¼r Option %s.\n" + IDS_BAD_OPTION "UngÃ¼ltige Option %s.\n" + IDS_BAD_PARAMETER "UngÃ¼ltiger Parameter %s.\n" + IDS_BAD_VALUE "UngÃ¼ltiger Wert fÃ¼r Option %s, Erlaubter Bereich ist von %u bis %u.\n" + IDS_WRONG_FAMILY "Die Option %s ist nur erlaubt fÃ¼r %s.\n" + IDS_UNKNOWN_HOST "Unbekannter Host %s.\n" + IDS_PINGING_ADDRESS "\nPing wird ausgefÃ¼hrt fÃ¼r %s " + IDS_PINGING_HOSTNAME "\nPing wird ausgefÃ¼hrt fÃ¼r %s [%s] " + IDS_SOURCE_ADDRESS "von %s %s" + IDS_PING_SIZE "mit %lu Bytes Daten:\n\n" + IDS_REPLY_FROM "Antwort von %s: " + IDS_REPLY_BYTES "Bytes=%d " + IDS_REPLY_TIME_MS "Zeit=%lums " + IDS_REPLY_TIME_0MS "Zeit<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "Echo antwortete mit %lu.\n" IDS_DEST_HOST_UNREACHABLE "Zielhost nicht erreichbar.\n" IDS_DEST_NET_UNREACHABLE "Zielnetz nicht erreichbar.\n" IDS_REQUEST_TIMED_OUT "ZeitÃ¼berschreitung der Anforderung.\n" IDS_TTL_EXPIRED "TTL Ã¼berschritten.\n" - IDS_TRANSMIT_FAILED "PING: Ãbertragung fehlgeschlagen. (Fehler %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: Ãbertragung fehlgeschlagen. (Fehler %u)\n" IDS_STATISTICS "\n\ -Ping Statistik fÃ¼r %1!s!:\n\ - Pakete: Gesendet = %2!d!, Empfangen = %3!d!, Verloren %4!d! (%5!u!%% Verlust),\n" +Ping Statistik fÃ¼r %s:\n\ + Pakete: Gesendet = %d, Empfangen = %d, Verloren %d (%d%% Verlust),\n" IDS_APPROXIMATE_RTT "Durchschnittliche Antwortzeit in Millisekunden:\n\ - Minimum = %1!u!ms, Maximum = %2!u!ms, Durchschnitt = %3!u!ms\n" + Minimum = %lums, Maximum = %lums, Durchschnitt = %lums\n" - IDS_WINSOCK_FAIL "Fehler beim Initialisieren von WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "Fehler beim Initialisieren von WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/en-US.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -33,34 +33,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "Not enough resources available.\n" IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %1.\n" - IDS_BAD_OPTION "Bad option %1.\n" - IDS_BAD_PARAMETER "Bad parameter %1.\n" - IDS_BAD_VALUE "Bad value for option %1, valid range is from %2!d! to %3!u!.\n" - IDS_WRONG_FAMILY "The option %1 is only supported for %2.\n" - IDS_UNKNOWN_HOST "Ping could not find host %1. Please check the name and try again.\n" - IDS_PINGING_ADDRESS "\nPinging %1 %0" - IDS_PINGING_HOSTNAME "\nPinging %1 [%2] %0" - IDS_SOURCE_ADDRESS "from %1!s! %0" - IDS_PING_SIZE "with %1!d! bytes of data:\n\n" - IDS_REPLY_FROM "Reply from %1: %0" - IDS_REPLY_BYTES "bytes=%1!d! %0" - IDS_REPLY_TIME_MS "time=%1!d!ms %0" - IDS_REPLY_TIME_0MS "time<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo reply returned %1.\n" + IDS_MISSING_VALUE "Value must be supplied for option %s.\n" + IDS_BAD_OPTION "Bad option %s.\n" + IDS_BAD_PARAMETER "Bad parameter %s.\n" + IDS_BAD_VALUE "Bad value for option %s, valid range is from %u to %u.\n" + IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" + IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_PINGING_ADDRESS "\nPinging %s " + IDS_PINGING_HOSTNAME "\nPinging %s [%s] " + IDS_SOURCE_ADDRESS "from %s %s" + IDS_PING_SIZE "with %lu bytes of data:\n\n" + IDS_REPLY_FROM "Reply from %s: " + IDS_REPLY_BYTES "bytes=%d " + IDS_REPLY_TIME_MS "time=%lums " + IDS_REPLY_TIME_0MS "time<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" IDS_REQUEST_TIMED_OUT "Request timed out.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" IDS_STATISTICS "\n\ -Ping statistics for %1!s!:\n\ - Packets: Sent = %2!d!, Received = %3!d!, Lost %4!d! (%5!u!%% loss),\n" +Ping statistics for %s:\n\ + Packets: Sent = %d, Received = %d, Lost %d (%d%% loss),\n" IDS_APPROXIMATE_RTT "Approximate round-trip time in milliseconds:\n\ - Minimum = %1!u!ms, Maximum = %2!u!ms, Average = %3!u!ms\n" + Minimum = %lums, Maximum = %lums, Average = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/es-ES.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -33,34 +33,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "No hay suficientes recursos libres disponibles.\n" IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %1.\n" - IDS_BAD_OPTION "La opciÃ³n %1 no es vÃ¡lida.\n" - IDS_BAD_PARAMETER "El parÃ¡metro %1 no es vÃ¡lido.\n" - IDS_BAD_VALUE "El valor para la opciÃ³n %1 no es vÃ¡lido, debe de estar entre %2!d! y %3!u!.\n" - IDS_WRONG_FAMILY "The option %1 is only supported for %2.\n" - IDS_UNKNOWN_HOST "Ping could not find host %1. Please check the name and try again.\n" - IDS_PINGING_ADDRESS "\nHaciendo ping a %1 %0" - IDS_PINGING_HOSTNAME "\nHaciendo ping a %1 [%2] %0" - IDS_SOURCE_ADDRESS "from %1!s! %0" - IDS_PING_SIZE "con %1!d! bytes de datos:\n\n" - IDS_REPLY_FROM "Respuesta desde %1: %0" - IDS_REPLY_BYTES "bytes=%1!d! %0" - IDS_REPLY_TIME_MS "tiempo=%1!d!ms %0" - IDS_REPLY_TIME_0MS "tiempo<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo reply returned %1.\n" + IDS_MISSING_VALUE "Value must be supplied for option %s.\n" + IDS_BAD_OPTION "La opciÃ³n %s no es vÃ¡lida.\n" + IDS_BAD_PARAMETER "El parÃ¡metro %s no es vÃ¡lido.\n" + IDS_BAD_VALUE "El valor para la opciÃ³n %s no es vÃ¡lido, debe de estar entre %u y %u.\n" + IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" + IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_PINGING_ADDRESS "\nHaciendo ping a %s " + IDS_PINGING_HOSTNAME "\nHaciendo ping a %s [%s] " + IDS_SOURCE_ADDRESS "from %s %s" + IDS_PING_SIZE "con %lu bytes de datos:\n\n" + IDS_REPLY_FROM "Respuesta desde %s: " + IDS_REPLY_BYTES "bytes=%d " + IDS_REPLY_TIME_MS "tiempo=%lums " + IDS_REPLY_TIME_0MS "tiempo<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" IDS_REQUEST_TIMED_OUT "La peticiÃ³n ha caducado.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" IDS_STATISTICS "\n\ -EstadÃsticas de ping para %1!s!:\n\ - Paquetes: enviados = %2!d!, recibidos = %3!d!, perdidos %4!d! (%5!u!%% perdidos),\n" +EstadÃsticas de ping para %s:\n\ + Paquetes: enviados = %d, recibidos = %d, perdidos %d (%d%% perdidos),\n" IDS_APPROXIMATE_RTT "Tiempos aproximados de ida y vuelta en milisegundos:\n\ - MÃnimo = %1!u!ms, MÃ¡ximo = %2!u!ms, Media = %3!u!ms\n" + MÃnimo = %lums, MÃ¡ximo = %lums, Media = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/fr-FR.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -33,34 +33,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "Ressources libres disponibles insuffisantes.\n" IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %1.\n" - IDS_BAD_OPTION "Option incorrecte %1.\n" - IDS_BAD_PARAMETER "ParamÃ¨tre incorrect %1.\n" - IDS_BAD_VALUE "Valeur incorrecte pour l'option %1, elle doit Ãªtre entre %2!d! et %3!u!.\n" - IDS_WRONG_FAMILY "The option %1 is only supported for %2.\n" - IDS_UNKNOWN_HOST "Ping could not find host %1. Please check the name and try again.\n" - IDS_PINGING_ADDRESS "\nPing de %1 %0" - IDS_PINGING_HOSTNAME "\nPing de %1 [%2] %0" - IDS_SOURCE_ADDRESS "from %1!s! %0" - IDS_PING_SIZE "avec %1!d! octets de donnÃ©es :\n\n" - IDS_REPLY_FROM "RÃ©ponse de %1 : %0" - IDS_REPLY_BYTES "octets=%1!d! %0" - IDS_REPLY_TIME_MS "durÃ©e=%1!d!ms %0" - IDS_REPLY_TIME_0MS "durÃ©e<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo reply returned %1.\n" + IDS_MISSING_VALUE "Value must be supplied for option %s.\n" + IDS_BAD_OPTION "Option incorrecte %s.\n" + IDS_BAD_PARAMETER "ParamÃ¨tre incorrect %s.\n" + IDS_BAD_VALUE "Valeur incorrecte pour l'option %s, elle doit Ãªtre entre %u et %u.\n" + IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" + IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_PINGING_ADDRESS "\nPing de %s " + IDS_PINGING_HOSTNAME "\nPing de %s [%s] " + IDS_SOURCE_ADDRESS "from %s %s" + IDS_PING_SIZE "avec %lu octets de donnÃ©es :\n\n" + IDS_REPLY_FROM "RÃ©ponse de %s : " + IDS_REPLY_BYTES "octets=%d " + IDS_REPLY_TIME_MS "durÃ©e=%lums " + IDS_REPLY_TIME_0MS "durÃ©e<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" IDS_REQUEST_TIMED_OUT "Expiration du dÃ©lai d'attente.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" IDS_STATISTICS "\n\ -Statistiques du ping de %1!s! :\n\ - Paquets : EnvoyÃ©s = %2!d!, ReÃ§us = %3!d!, Perdus %4!d! (%5!u!%% de perte),\n" +Statistiques du ping de %s :\n\ + Paquets : EnvoyÃ©s = %d, ReÃ§us = %d, Perdus %d (%d%% de perte),\n" IDS_APPROXIMATE_RTT "DÃ©lai approximatif de rÃ©ponse en millisecondes :\n\ - Minimum = %1!u!ms, Maximum = %2!u!ms, Moyenne = %3!u!ms\n" + Minimum = %lums, Maximum = %lums, Moyenne = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/it-IT.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -33,34 +33,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "Risorse disponibili insufficienti.\n" IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %1.\n" - IDS_BAD_OPTION "Opzione errata %1.\n" - IDS_BAD_PARAMETER "Parametro errato %1.\n" - IDS_BAD_VALUE "Valore errato per il parametro %1, Ã¨ valido un valore tra %2!d! to %3!u!.\n" - IDS_WRONG_FAMILY "The option %1 is only supported for %2.\n" - IDS_UNKNOWN_HOST "Ping could not find host %1. Please check the name and try again.\n" - IDS_PINGING_ADDRESS "\nPing in corso %1 %0" - IDS_PINGING_HOSTNAME "\nPing in corso %1 [%2] %0" - IDS_SOURCE_ADDRESS "from %1!s! %0" - IDS_PING_SIZE "con %1!d! bytes di dati:\n\n" - IDS_REPLY_FROM "Risposta da %1: %0" - IDS_REPLY_BYTES "bytes=%1!d! %0" - IDS_REPLY_TIME_MS "time=%1!d!ms %0" - IDS_REPLY_TIME_0MS "time<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo reply returned %1.\n" + IDS_MISSING_VALUE "Value must be supplied for option %s.\n" + IDS_BAD_OPTION "Opzione errata %s.\n" + IDS_BAD_PARAMETER "Parametro errato %s.\n" + IDS_BAD_VALUE "Valore errato per il parametro %s, Ã¨ valido un valore tra %u to %u.\n" + IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" + IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_PINGING_ADDRESS "\nPing in corso %s " + IDS_PINGING_HOSTNAME "\nPing in corso %s [%s] " + IDS_SOURCE_ADDRESS "from %s %s" + IDS_PING_SIZE "con %lu bytes di dati:\n\n" + IDS_REPLY_FROM "Risposta da %s: " + IDS_REPLY_BYTES "bytes=%d " + IDS_REPLY_TIME_MS "time=%lums " + IDS_REPLY_TIME_0MS "time<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" IDS_REQUEST_TIMED_OUT "Richiesta scaduta.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" IDS_STATISTICS "\n\ -Statistiche di Ping per %1!s!:\n\ - Pacchetti: Inviati = %2!d!, Ricevuti = %3!d!, Persi %4!d! (%5!u!%% perdita),\n" +Statistiche di Ping per %s:\n\ + Pacchetti: Inviati = %d, Ricevuti = %d, Persi %d (%d%% perdita),\n" IDS_APPROXIMATE_RTT "Tempo approssimato di andata e ritorno in milli-secondi:\n\ - Minimo = %1!u!ms, Massimo = %2!u!ms, Media = %3!u!ms\n" + Minimo = %lums, Massimo = %lums, Media = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/pl-PL.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -33,34 +33,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "Brak dostÄpnych zasobÃ³w.\n" IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %1.\n" - IDS_BAD_OPTION "NieprawidÅowa opcja %1.\n" - IDS_BAD_PARAMETER "NieprawidÅowy parametr %1.\n" - IDS_BAD_VALUE "NieprawidÅowa wartoÅÄ dla opcji %1, wymagana liczba naturalna od %2!d! do %3!u!.\n" - IDS_WRONG_FAMILY "The option %1 is only supported for %2.\n" - IDS_UNKNOWN_HOST "Ping could not find host %1. Please check the name and try again.\n" - IDS_PINGING_ADDRESS "\nPingowanie %1 %0" - IDS_PINGING_HOSTNAME "\nPingowanie %1 [%2] %0" - IDS_SOURCE_ADDRESS "z %1!s! %0" - IDS_PING_SIZE "przy uÅ¼yciu %1!d! bajtÃ³w danych:\n\n" - IDS_REPLY_FROM "OdpowiedÅº z %1: %0" - IDS_REPLY_BYTES "bajtÃ³w=%1!d! %0" - IDS_REPLY_TIME_MS "czas=%1!d!ms %0" - IDS_REPLY_TIME_0MS "czas<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo reply returned %1.\n" + IDS_MISSING_VALUE "Value must be supplied for option %s.\n" + IDS_BAD_OPTION "NieprawidÅowa opcja %s.\n" + IDS_BAD_PARAMETER "NieprawidÅowy parametr %s.\n" + IDS_BAD_VALUE "NieprawidÅowa wartoÅÄ dla opcji %s, wymagana liczba naturalna od %u do %u.\n" + IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" + IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_PINGING_ADDRESS "\nPingowanie %s " + IDS_PINGING_HOSTNAME "\nPingowanie %s [%s] " + IDS_SOURCE_ADDRESS "z %s %s" + IDS_PING_SIZE "przy uÅ¼yciu %lu bajtÃ³w danych:\n\n" + IDS_REPLY_FROM "OdpowiedÅº z %s: " + IDS_REPLY_BYTES "bajtÃ³w=%d " + IDS_REPLY_TIME_MS "czas=%lums " + IDS_REPLY_TIME_0MS "czas<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" IDS_REQUEST_TIMED_OUT "Brak odpowiedzi.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" IDS_STATISTICS "\n\ -Statystyka rezultatu badania hosta %1!s!:\n\ - Pakiety: WysÅane = %2!d!, Odebrane = %3!d!, Utracone %4!d! (%5!u!%% strat),\n" +Statystyka rezultatu badania hosta %s:\n\ + Pakiety: WysÅane = %d, Odebrane = %d, Utracone %d (%d%% strat),\n" IDS_APPROXIMATE_RTT "CaÅkowity, przybliÅ¼ony czas podrÃ³Å¼y pakietu w millisekundach:\n\ - Minimum = %1!u!ms, Maksimum = %2!u!ms, UÅredniony = %3!u!ms\n" + Minimum = %lums, Maksimum = %lums, UÅredniony = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/ro-RO.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -34,34 +34,34 @@ IDS_CTRL_C "Ctrl-C\n" IDS_NO_RESOURCES "Nu existÄ suficiente resurse disponibile.\n" IDS_MISSING_ADDRESS "Este necesarÄ specificarea unei adrese IP.\n" - IDS_MISSING_VALUE "Nu a fost furnizatÄ nici o valoare pentru opÈiunea %1.\n" - IDS_BAD_OPTION "%1 este o opÈiune eronatÄ.\n" - IDS_BAD_PARAMETER "Parametru eronat: %1.\n" - IDS_BAD_VALUE "Valoare eronatÄ pentru opÈiunea %1, domeniul valid este %2!d! - %3!u!.\n" - IDS_WRONG_FAMILY "OpÈiunea %1 este acceptatÄ doar pentru %2.\n" - IDS_UNKNOWN_HOST "EÈec la localizarea gazdei %1. VerificaÈi numele apoi reÃ®ncercaÈi.\n" - IDS_PINGING_ADDRESS "\nTransmitere cÄtre %1 %0" - IDS_PINGING_HOSTNAME "\nTransmitere cÄtre %1 [%2] %0" - IDS_SOURCE_ADDRESS "de la %1!s! %0" - IDS_PING_SIZE "cu %1!d! octeÈi de date:\n\n" - IDS_REPLY_FROM "RÄspuns de %1: %0" - IDS_REPLY_BYTES "octeÈi=%1!d! %0" - IDS_REPLY_TIME_MS "timp=%1!d!ms %0" - IDS_REPLY_TIME_0MS "timp<1ms %0" - IDS_REPLY_TTL "TDV=%1!d!\n" - IDS_REPLY_STATUS "RÄspunsul ecou este %1.\n" + IDS_MISSING_VALUE "Nu a fost furnizatÄ nici o valoare pentru opÈiunea %s.\n" + IDS_BAD_OPTION "%s este o opÈiune eronatÄ.\n" + IDS_BAD_PARAMETER "Parametru eronat: %s.\n" + IDS_BAD_VALUE "Valoare eronatÄ pentru opÈiunea %s, domeniul valid este %u - %u.\n" + IDS_WRONG_FAMILY "OpÈiunea %s este acceptatÄ doar pentru %s.\n" + IDS_UNKNOWN_HOST "EÈec la localizarea gazdei %s. VerificaÈi numele apoi reÃ®ncercaÈi.\n" + IDS_PINGING_ADDRESS "\nTransmitere cÄtre %s " + IDS_PINGING_HOSTNAME "\nTransmitere cÄtre %s [%s] " + IDS_SOURCE_ADDRESS "de la %s %s" + IDS_PING_SIZE "cu %lu octeÈi de date:\n\n" + IDS_REPLY_FROM "RÄspuns de %s: " + IDS_REPLY_BYTES "octeÈi=%d " + IDS_REPLY_TIME_MS "timp=%lums " + IDS_REPLY_TIME_0MS "timp<1ms " + IDS_REPLY_TTL "TDV=%d\n" + IDS_REPLY_STATUS "RÄspunsul ecou este %lu.\n" IDS_DEST_HOST_UNREACHABLE "Gazda de destinaÈie nu este accesibilÄ.\n" IDS_DEST_NET_UNREACHABLE "ReÈeaua de destinaÈie nu este accesibilÄ.\n" IDS_REQUEST_TIMED_OUT "Cererea a expirat.\n" IDS_TTL_EXPIRED "TDV a expirat Ã®n tranzit.\n" - IDS_TRANSMIT_FAILED "PING: eÈec la transmisie. (Eroare %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: eÈec la transmisie. (Eroare %u)\n" IDS_STATISTICS "\n\ -statistici de transmisie pentru %1!s!:\n\ - pachete: transmise = %2!d!, recepÈionate = %3!d!, pierdute %4!d! (%5!u!%% pierderi),\n" +statistici de transmisie pentru %s:\n\ + pachete: transmise = %d, recepÈionate = %d, pierdute %d (%d%% pierderi),\n" IDS_APPROXIMATE_RTT "timpul aproximativ de tur-retur, in milisecunde:\n\ - minim = %1!u!ms, maxim = %2!u!ms, mediu = %3!u!ms\n" + minim = %lums, maxim = %lums, mediu = %lums\n" - IDS_WINSOCK_FAIL "EÈec la iniÈializarea WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "EÈec la iniÈializarea WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/ru-RU.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -34,34 +34,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÑÐ´ÐµÐ»Ð¸ÑÑ ÑÑÐµÐ±ÑÐµÐ¼ÑÑ Ð¿Ð°Ð¼ÑÑÑ.\n" IDS_MISSING_ADDRESS "ÐÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ ÑÐºÐ°Ð·Ð°ÑÑ Ð°Ð´ÑÐµÑ IP.\n" - IDS_MISSING_VALUE "ÐÐ»Ñ Ð¾Ð¿ÑÐ¸Ð¸ %1 Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±ÑÑÑ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ.\n" - IDS_BAD_OPTION "ÐÐµÐ²ÐµÑÐ½Ð°Ñ Ð¾Ð¿ÑÐ¸Ñ %1.\n" - IDS_BAD_PARAMETER "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ %1.\n" - IDS_BAD_VALUE "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° %1, Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½ Ñ %2!d! Ð¿Ð¾ %3!u!.\n" - IDS_WRONG_FAMILY "ÐÐ¿ÑÐ¸Ñ %1 Ð´Ð¾ÑÑÑÐ¿Ð½Ð° ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ %2.\n" - IDS_UNKNOWN_HOST "Ping Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐ·ÐµÐ» %1. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ Ð¸Ð¼Ñ Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¿ÑÑÐºÑ.\n" - IDS_PINGING_ADDRESS "\nÐÐ±Ð¼ÐµÐ½ Ð¿Ð°ÐºÐµÑÐ°Ð¼Ð¸ Ñ %1 %0" - IDS_PINGING_HOSTNAME "\nÐÐ±Ð¼ÐµÐ½ Ð¿Ð°ÐºÐµÑÐ°Ð¼Ð¸ Ñ %1 [%2] %0" - IDS_SOURCE_ADDRESS "from %1!s! %0"/* unused string */ - IDS_PING_SIZE "Ð¿Ð¾ %1!d! Ð±Ð°Ð¹ÑÐ° Ð´Ð°Ð½Ð½ÑÑ:\n\n" - IDS_REPLY_FROM "ÐÑÐ²ÐµÑ Ð¾Ñ %1: %0" - IDS_REPLY_BYTES "ÑÐ¸ÑÐ»Ð¾ Ð±Ð°Ð¹Ñ=%1!d! %0" - IDS_REPLY_TIME_MS "Ð²ÑÐµÐ¼Ñ=%1!d!Ð¼Ñ %0" - IDS_REPLY_TIME_0MS "Ð²ÑÐµÐ¼Ñ<1Ð¼Ñ %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "ÐÑÐ²ÐµÑ Ð¾Ñ %1.\n" + IDS_MISSING_VALUE "ÐÐ»Ñ Ð¾Ð¿ÑÐ¸Ð¸ %s Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±ÑÑÑ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ.\n" + IDS_BAD_OPTION "ÐÐµÐ²ÐµÑÐ½Ð°Ñ Ð¾Ð¿ÑÐ¸Ñ %s.\n" + IDS_BAD_PARAMETER "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ %s.\n" + IDS_BAD_VALUE "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° %s, Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½ Ñ %u Ð¿Ð¾ %u.\n" + IDS_WRONG_FAMILY "ÐÐ¿ÑÐ¸Ñ %s Ð´Ð¾ÑÑÑÐ¿Ð½Ð° ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ %s.\n" + IDS_UNKNOWN_HOST "Ping Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐ·ÐµÐ» %s. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ Ð¸Ð¼Ñ Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¿ÑÑÐºÑ.\n" + IDS_PINGING_ADDRESS "\nÐÐ±Ð¼ÐµÐ½ Ð¿Ð°ÐºÐµÑÐ°Ð¼Ð¸ Ñ %s " + IDS_PINGING_HOSTNAME "\nÐÐ±Ð¼ÐµÐ½ Ð¿Ð°ÐºÐµÑÐ°Ð¼Ð¸ Ñ %s [%s] " + IDS_SOURCE_ADDRESS "from %s %s"/* unused string */ + IDS_PING_SIZE "Ð¿Ð¾ %lu Ð±Ð°Ð¹ÑÐ° Ð´Ð°Ð½Ð½ÑÑ:\n\n" + IDS_REPLY_FROM "ÐÑÐ²ÐµÑ Ð¾Ñ %s: " + IDS_REPLY_BYTES "ÑÐ¸ÑÐ»Ð¾ Ð±Ð°Ð¹Ñ=%d " + IDS_REPLY_TIME_MS "Ð²ÑÐµÐ¼Ñ=%luÐ¼Ñ " + IDS_REPLY_TIME_0MS "Ð²ÑÐµÐ¼Ñ<1Ð¼Ñ " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "ÐÑÐ²ÐµÑ Ð¾Ñ %lu.\n" IDS_DEST_HOST_UNREACHABLE "ÐÐ°Ð´Ð°Ð½Ð½ÑÐ¹ ÑÐ·ÐµÐ» Ð½ÐµÐ´Ð¾ÑÑÑÐ¿ÐµÐ½.\n" IDS_DEST_NET_UNREACHABLE "ÐÐ°Ð´Ð°Ð½Ð½Ð°Ñ ÑÐµÑÑ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð°.\n" IDS_REQUEST_TIMED_OUT "ÐÑÐµÐ²ÑÑÐµÐ½ Ð¸Ð½ÑÐµÑÐ²Ð°Ð» Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð¿ÑÐ¾ÑÐ°.\n" IDS_TTL_EXPIRED "ÐÑÐµÐ²ÑÑÐµÐ½ ÑÑÐ¾Ðº Ð¶Ð¸Ð·Ð½Ð¸ (TTL) Ð¿ÑÐ¸ Ð¿ÐµÑÐµÐ´Ð°ÑÐµ Ð¿Ð°ÐºÐµÑÐ°.\n" - IDS_TRANSMIT_FAILED "PING: ÑÐ±Ð¾Ð¹ Ð¿ÐµÑÐµÐ´Ð°ÑÐ¸. (ÐÑÐ¸Ð±ÐºÐ° %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: ÑÐ±Ð¾Ð¹ Ð¿ÐµÑÐµÐ´Ð°ÑÐ¸. (ÐÑÐ¸Ð±ÐºÐ° %u)\n" IDS_STATISTICS "\n\ -Ð¡ÑÐ°ÑÐ¸ÑÑÐ¸ÐºÐ° Ping Ð´Ð»Ñ %1!s!:\n\ - ÐÐ°ÐºÐµÑÐ¾Ð²: Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾ = %2!d!, Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¾ = %3!d!, Ð¿Ð¾ÑÐµÑÑÐ½Ð¾ %4!d! (%5!u!%% Ð¿Ð¾ÑÐµÑÑ),\n" +Ð¡ÑÐ°ÑÐ¸ÑÑÐ¸ÐºÐ° Ping Ð´Ð»Ñ %s:\n\ + ÐÐ°ÐºÐµÑÐ¾Ð²: Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾ = %d, Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¾ = %d, Ð¿Ð¾ÑÐµÑÑÐ½Ð¾ %d (%d%% Ð¿Ð¾ÑÐµÑÑ),\n" IDS_APPROXIMATE_RTT "ÐÑÐ¸Ð±Ð»Ð¸Ð·Ð¸ÑÐµÐ»ÑÐ½Ð¾Ðµ Ð²ÑÐµÐ¼Ñ Ð¿ÑÐ¸ÐµÐ¼Ð°-Ð¿ÐµÑÐµÐ´Ð°ÑÐ¸ Ð² Ð¼Ñ:\n\ - ÐÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½Ð¾Ðµ = %1!u!Ð¼Ñ, ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¾Ðµ = %2!u!Ð¼Ñ, Ð¡ÑÐµÐ´Ð½ÐµÐµ = %3!u!Ð¼Ñ\n" + ÐÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½Ð¾Ðµ = %luÐ¼Ñ, ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¾Ðµ = %luÐ¼Ñ, Ð¡ÑÐµÐ´Ð½ÐµÐµ = %luÐ¼Ñ\n" - IDS_WINSOCK_FAIL "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/sq-AL.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -33,34 +33,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "Nuk mjaftojne burimet ne dispozicion.\n" IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %1.\n" - IDS_BAD_OPTION "Opsion i keq %1.\n" - IDS_BAD_PARAMETER "Parametra i keq %1.\n" - IDS_BAD_VALUE "Vlere e keqe per opsion %1, varh i vlefshem nga %2!d! nÃ« %3!u!.\n" - IDS_WRONG_FAMILY "The option %1 is only supported for %2.\n" - IDS_UNKNOWN_HOST "Ping could not find host %1. Please check the name and try again.\n" - IDS_PINGING_ADDRESS "\nPing ne vazhdim %1 %0" - IDS_PINGING_HOSTNAME "\nPing ne vazhdim %1 [%2] %0" - IDS_SOURCE_ADDRESS "from %1!s! %0" - IDS_PING_SIZE "me %1!d! bytes data:\n\n" - IDS_REPLY_FROM "Reply from %1: %0" - IDS_REPLY_BYTES "bytes=%1!d! %0" - IDS_REPLY_TIME_MS "time=%1!d!ms %0" - IDS_REPLY_TIME_0MS "time<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo reply returned %1.\n" + IDS_MISSING_VALUE "Value must be supplied for option %s.\n" + IDS_BAD_OPTION "Opsion i keq %s.\n" + IDS_BAD_PARAMETER "Parametra i keq %s.\n" + IDS_BAD_VALUE "Vlere e keqe per opsion %s, varh i vlefshem nga %u nÃ« %u.\n" + IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" + IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_PINGING_ADDRESS "\nPing ne vazhdim %s " + IDS_PINGING_HOSTNAME "\nPing ne vazhdim %s [%s] " + IDS_SOURCE_ADDRESS "from %s %s" + IDS_PING_SIZE "me %lu bytes data:\n\n" + IDS_REPLY_FROM "Reply from %s: " + IDS_REPLY_BYTES "bytes=%d " + IDS_REPLY_TIME_MS "time=%lums " + IDS_REPLY_TIME_0MS "time<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" IDS_REQUEST_TIMED_OUT "Kerkese kohe mbaroj.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" IDS_STATISTICS "\n\ -Statistikat e Ping pÃ«r %1!s!:\n\ - Packeta: DÃ«rguar = %2!d!, Marr = %3!d!, Humbur %4!d! (%5!u!%% loss),\n" +Statistikat e Ping pÃ«r %s:\n\ + Packeta: DÃ«rguar = %d, Marr = %d, Humbur %d (%d%% loss),\n" IDS_APPROXIMATE_RTT "Afersisht koha e matjes nÃ« mili-sekonda:\n\ - Minimum = %1!u!ms, Maximum = %2!u!ms, Mesatar = %3!u!ms\n" + Minimum = %lums, Maximum = %lums, Mesatar = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/sv-SE.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -33,34 +33,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "Inte tillrÃ¤ckliga resurser tillgÃ¤nliga.\n" IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %1.\n" - IDS_BAD_OPTION "Ogiltigt alternativ %1.\n" - IDS_BAD_PARAMETER "Ogiltig parameter %1.\n" - IDS_BAD_VALUE "Ogiltigt vÃ¤rde fÃ¶r alternativ %1, giltig intervall Ã¤r frÃ¥n %2!d! till %3!u!.\n" - IDS_WRONG_FAMILY "The option %1 is only supported for %2.\n" - IDS_UNKNOWN_HOST "Ping could not find host %1. Please check the name and try again.\n" - IDS_PINGING_ADDRESS "\nPingar %1 %0" - IDS_PINGING_HOSTNAME "\nPingar %1 [%2] %0" - IDS_SOURCE_ADDRESS "from %1!s! %0" - IDS_PING_SIZE "med %1!d! bytes data:\n\n" - IDS_REPLY_FROM "Svar frÃ¥n %1: %0" - IDS_REPLY_BYTES "bytes=%1!d! %0" - IDS_REPLY_TIME_MS "tid=%1!d!ms %0" - IDS_REPLY_TIME_0MS "tid<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo reply returned %1.\n" + IDS_MISSING_VALUE "Value must be supplied for option %s.\n" + IDS_BAD_OPTION "Ogiltigt alternativ %s.\n" + IDS_BAD_PARAMETER "Ogiltig parameter %s.\n" + IDS_BAD_VALUE "Ogiltigt vÃ¤rde fÃ¶r alternativ %s, giltig intervall Ã¤r frÃ¥n %u till %u.\n" + IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" + IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_PINGING_ADDRESS "\nPingar %s " + IDS_PINGING_HOSTNAME "\nPingar %s [%s] " + IDS_SOURCE_ADDRESS "from %s %s" + IDS_PING_SIZE "med %lu bytes data:\n\n" + IDS_REPLY_FROM "Svar frÃ¥n %s: " + IDS_REPLY_BYTES "bytes=%d " + IDS_REPLY_TIME_MS "tid=%lums " + IDS_REPLY_TIME_0MS "tid<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" IDS_REQUEST_TIMED_OUT "FÃ¶rfrÃ¥gan gjorde timeout.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" IDS_STATISTICS "\n\ -Ping statistk fÃ¶r %1!s!:\n\ - Packet: SÃ¤nda = %2!d!, Mottagna = %3!d!, FÃ¶rlorade %4!d! (%5!u!%% fÃ¶rlust),\n" +Ping statistk fÃ¶r %s:\n\ + Packet: SÃ¤nda = %d, Mottagna = %d, FÃ¶rlorade %d (%d%% fÃ¶rlust),\n" IDS_APPROXIMATE_RTT "UngefÃ¤rliga slingtider i millisekunder:\n\ - Minimum = %1!u!ms, Maximum = %2!u!ms, Genomsnittlig = %3!u!ms\n" + Minimum = %lums, Maximum = %lums, Genomsnittlig = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/tr-TR.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -33,34 +33,34 @@ IDS_CTRL_C "Denetim+C\n" IDS_NO_RESOURCES "KullanÄ±labilir yeterli boÅ kaynak yok.\n" IDS_MISSING_ADDRESS "IP adresi belirtilmelidir.\n" - IDS_MISSING_VALUE "DeÄer %1 seÃ§eneÄi iÃ§in saÄlanmalÄ±dÄ±r.\n" - IDS_BAD_OPTION "GeÃ§ersiz seÃ§enek: %1.\n" - IDS_BAD_PARAMETER "GeÃ§ersiz deÄiÅken: %1.\n" - IDS_BAD_VALUE "%1 seÃ§eneÄi iÃ§in geÃ§ersiz deÄer, geÃ§erli aralÄ±k %2!d!'den %3!u!'e dektir.\n" - IDS_WRONG_FAMILY "%1 seÃ§eneÄi yalnÄ±zca %2 iÃ§in desteklenmektedir.\n" - IDS_UNKNOWN_HOST "Ping %1 anabilgisayarÄ±nÄ± bulamadÄ±. LÃ¼tfen adÄ± gÃ¶zden geÃ§irip yeniden deneyiniz.\n" - IDS_PINGING_ADDRESS "\nPing yapÄ±lÄ±yor: %1 %0" - IDS_PINGING_HOSTNAME "\nPing yapÄ±lÄ±yor: %1 [%2] %0" - IDS_SOURCE_ADDRESS "%1!s!'den %0" - IDS_PING_SIZE " %1!d! Ã§oklu veriyle:\n\n" - IDS_REPLY_FROM "%1 varÄ±ÅÄ±ndan yanÄ±t: %0" - IDS_REPLY_BYTES "Ã§oklu=%1!d! %0" - IDS_REPLY_TIME_MS "sÃ¼re=%1!d!ms %0" - IDS_REPLY_TIME_0MS "sÃ¼re<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "YankÄ± yanÄ±tÄ± geri dÃ¶ndÃ¼ %1.\n" + IDS_MISSING_VALUE "DeÄer %s seÃ§eneÄi iÃ§in saÄlanmalÄ±dÄ±r.\n" + IDS_BAD_OPTION "GeÃ§ersiz seÃ§enek: %s.\n" + IDS_BAD_PARAMETER "GeÃ§ersiz deÄiÅken: %s.\n" + IDS_BAD_VALUE "%s seÃ§eneÄi iÃ§in geÃ§ersiz deÄer, geÃ§erli aralÄ±k %u'den %u'e dektir.\n" + IDS_WRONG_FAMILY "%s seÃ§eneÄi yalnÄ±zca %s iÃ§in desteklenmektedir.\n" + IDS_UNKNOWN_HOST "Ping %s anabilgisayarÄ±nÄ± bulamadÄ±. LÃ¼tfen adÄ± gÃ¶zden geÃ§irip yeniden deneyiniz.\n" + IDS_PINGING_ADDRESS "\nPing yapÄ±lÄ±yor: %s " + IDS_PINGING_HOSTNAME "\nPing yapÄ±lÄ±yor: %s [%s] " + IDS_SOURCE_ADDRESS "%s'den %s" + IDS_PING_SIZE " %lu Ã§oklu veriyle:\n\n" + IDS_REPLY_FROM "%s varÄ±ÅÄ±ndan yanÄ±t: " + IDS_REPLY_BYTES "Ã§oklu=%d " + IDS_REPLY_TIME_MS "sÃ¼re=%lums " + IDS_REPLY_TIME_0MS "sÃ¼re<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "YankÄ± yanÄ±tÄ± geri dÃ¶ndÃ¼ %lu.\n" IDS_DEST_HOST_UNREACHABLE "VarÄ±Å anabilgisayarÄ± eriÅilemez.\n" IDS_DEST_NET_UNREACHABLE "VarÄ±Å aÄÄ± eriÅilemez.\n" IDS_REQUEST_TIMED_OUT "Ä°stek sÃ¼re aÅÄ±mÄ±na uÄradÄ±.\n" IDS_TTL_EXPIRED "GeÃ§iÅte yaÅama sÃ¼resi bitti.\n" - IDS_TRANSMIT_FAILED "PING: GeÃ§iÅ baÅarÄ±sÄ±z oldu. (YanlÄ±ÅlÄ±k %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: GeÃ§iÅ baÅarÄ±sÄ±z oldu. (YanlÄ±ÅlÄ±k %u)\n" IDS_STATISTICS "\n\ -%1!s! iÃ§in ping sayÄ±mlamalarÄ±:\n\ - Paketler: GÃ¶nderilen = %2!d!, AlÄ±nan = %3!d!, Yitirilen %4!d! (%%%5!u! yitik),\n" +%s iÃ§in ping sayÄ±mlamalarÄ±:\n\ + Paketler: GÃ¶nderilen = %d, AlÄ±nan = %d, Yitirilen %d (%%%d yitik),\n" IDS_APPROXIMATE_RTT "Mili sÃ¢niye olarak yaklaÅÄ±k gidiÅ geliÅ sÃ¼releri:\n\ - En Az = %1!u!ms, En Ãok = %2!u!ms, Ortalama = %3!u!ms\n" + En Az = %lums, En Ãok = %lums, Ortalama = %lums\n" - IDS_WINSOCK_FAIL "WinSock'u baÅlatma baÅarÄ±sÄ±z oldu: %1!d!\n" + IDS_WINSOCK_FAIL "WinSock'u baÅlatma baÅarÄ±sÄ±z oldu: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/uk-UA.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -33,34 +33,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "Not enough resources available.\n" IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %1.\n" - IDS_BAD_OPTION "Bad option %1.\n" - IDS_BAD_PARAMETER "Bad parameter %1.\n" - IDS_BAD_VALUE "Bad value for option %1, valid range is from %2!d! to %3!u!.\n" - IDS_WRONG_FAMILY "The option %1 is only supported for %2.\n" - IDS_UNKNOWN_HOST "Ping could not find host %1. Please check the name and try again.\n" - IDS_PINGING_ADDRESS "\nPinging %1 %0" - IDS_PINGING_HOSTNAME "\nPinging %1 [%2] %0" - IDS_SOURCE_ADDRESS "from %1!s! %0" - IDS_PING_SIZE "with %1!d! bytes of data:\n\n" - IDS_REPLY_FROM "Reply from %1: %0" - IDS_REPLY_BYTES "bytes=%1!d! %0" - IDS_REPLY_TIME_MS "time=%1!d!ms %0" - IDS_REPLY_TIME_0MS "time<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo reply returned %1.\n" + IDS_MISSING_VALUE "Value must be supplied for option %s.\n" + IDS_BAD_OPTION "Bad option %s.\n" + IDS_BAD_PARAMETER "Bad parameter %s.\n" + IDS_BAD_VALUE "Bad value for option %s, valid range is from %u to %u.\n" + IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" + IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_PINGING_ADDRESS "\nPinging %s " + IDS_PINGING_HOSTNAME "\nPinging %s [%s] " + IDS_SOURCE_ADDRESS "from %s %s" + IDS_PING_SIZE "with %lu bytes of data:\n\n" + IDS_REPLY_FROM "Reply from %s: " + IDS_REPLY_BYTES "bytes=%d " + IDS_REPLY_TIME_MS "time=%lums " + IDS_REPLY_TIME_0MS "time<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" IDS_REQUEST_TIMED_OUT "Request timed out.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" IDS_STATISTICS "\n\ -Ping statistics for %1!s!:\n\ - Packets: Sent = %2!d!, Received = %3!d!, Lost %4!d! (%5!u!%% loss),\n" +Ping statistics for %s:\n\ + Packets: Sent = %d, Received = %d, Lost %d (%d%% loss),\n" IDS_APPROXIMATE_RTT "Approximate round-trip time in milliseconds:\n\ - Minimum = %1!u!ms, Maximum = %2!u!ms, Average = %3!u!ms\n" + Minimum = %lums, Maximum = %lums, Average = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/zh-CN.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -33,34 +33,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "Not enough resources available.\n" IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %1.\n" - IDS_BAD_OPTION "Bad option %1.\n" - IDS_BAD_PARAMETER "Bad parameter %1.\n" - IDS_BAD_VALUE "Bad value for option %1, valid range is from %2!d! to %3!u!.\n" - IDS_WRONG_FAMILY "The option %1 is only supported for %2.\n" - IDS_UNKNOWN_HOST "Ping could not find host %1. Please check the name and try again.\n" - IDS_PINGING_ADDRESS "\nPinging %1 %0" - IDS_PINGING_HOSTNAME "\nPinging %1 [%2] %0" - IDS_SOURCE_ADDRESS "from %1!s! %0" - IDS_PING_SIZE "with %1!d! bytes of data:\n\n" - IDS_REPLY_FROM "Reply from %1: %0" - IDS_REPLY_BYTES "bytes=%1!d! %0" - IDS_REPLY_TIME_MS "time=%1!d!ms %0" - IDS_REPLY_TIME_0MS "time<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo reply returned %1.\n" + IDS_MISSING_VALUE "Value must be supplied for option %s.\n" + IDS_BAD_OPTION "Bad option %s.\n" + IDS_BAD_PARAMETER "Bad parameter %s.\n" + IDS_BAD_VALUE "Bad value for option %s, valid range is from %u to %u.\n" + IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" + IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_PINGING_ADDRESS "\nPinging %s " + IDS_PINGING_HOSTNAME "\nPinging %s [%s] " + IDS_SOURCE_ADDRESS "from %s %s" + IDS_PING_SIZE "with %lu bytes of data:\n\n" + IDS_REPLY_FROM "Reply from %s: " + IDS_REPLY_BYTES "bytes=%d " + IDS_REPLY_TIME_MS "time=%lums " + IDS_REPLY_TIME_0MS "time<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" IDS_REQUEST_TIMED_OUT "Request timed out.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" IDS_STATISTICS "\n\ -Ping statistics for %1!s!:\n\ - Packets: Sent = %2!d!, Received = %3!d!, Lost %4!d! (%5!u!%% loss),\n" +Ping statistics for %s:\n\ + Packets: Sent = %d, Received = %d, Lost %d (%d%% loss),\n" IDS_APPROXIMATE_RTT "Approximate round-trip time in milliseconds:\n\ - Minimum = %1!u!ms, Maximum = %2!u!ms, Average = %3!u!ms\n" + Minimum = %lums, Maximum = %lums, Average = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" END Modified: trunk/reactos/base/applications/network/ping/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/zh-TW.rc [iso-8859-1] Fri Feb 17 12:30:14 2017 @@ -33,34 +33,34 @@ IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "Not enough resources available.\n" IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %1.\n" - IDS_BAD_OPTION "Bad option %1.\n" - IDS_BAD_PARAMETER "Bad parameter %1.\n" - IDS_BAD_VALUE "Bad value for option %1, valid range is from %2!d! to %3!u!.\n" - IDS_WRONG_FAMILY "The option %1 is only supported for %2.\n" - IDS_UNKNOWN_HOST "Ping could not find host %1. Please check the name and try again.\n" - IDS_PINGING_ADDRESS "\nPinging %1 %0" - IDS_PINGING_HOSTNAME "\nPinging %1 [%2] %0" - IDS_SOURCE_ADDRESS "from %1!s! %0" - IDS_PING_SIZE "with %1!d! bytes of data:\n\n" - IDS_REPLY_FROM "Reply from %1: %0" - IDS_REPLY_BYTES "bytes=%1!d! %0" - IDS_REPLY_TIME_MS "time=%1!d!ms %0" - IDS_REPLY_TIME_0MS "time<1ms %0" - IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo reply returned %1.\n" + IDS_MISSING_VALUE "Value must be supplied for option %s.\n" + IDS_BAD_OPTION "Bad option %s.\n" + IDS_BAD_PARAMETER "Bad parameter %s.\n" + IDS_BAD_VALUE "Bad value for option %s, valid range is from %u to %u.\n" + IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" + IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_PINGING_ADDRESS "\nPinging %s " + IDS_PINGING_HOSTNAME "\nPinging %s [%s] " + IDS_SOURCE_ADDRESS "from %s %s" + IDS_PING_SIZE "with %lu bytes of data:\n\n" + IDS_REPLY_FROM "Reply from %s: " + IDS_REPLY_BYTES "bytes=%d " + IDS_REPLY_TIME_MS "time=%lums " + IDS_REPLY_TIME_0MS "time<1ms " + IDS_REPLY_TTL "TTL=%d\n" + IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" IDS_REQUEST_TIMED_OUT "Request timed out.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %1!u!)\n" + IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" IDS_STATISTICS "\n\ -Ping statistics for %1!s!:\n\ - Packets: Sent = %2!d!, Received = %3!d!, Lost %4!d! (%5!u!%% loss),\n" +Ping statistics for %s:\n\ + Packets: Sent = %d, Received = %d, Lost %d (%d%% loss),\n" IDS_APPROXIMATE_RTT "Approximate round-trip time in milliseconds:\n\ - Minimum = %1!u!ms, Maximum = %2!u!ms, Average = %3!u!ms\n" + Minimum = %lums, Maximum = %lums, Average = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" END

7 years, 7 months

[tfaber] 73809: [WINDOWSCODECS] - Fix some MSVC-specific definitions

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Feb 17 12:17:20 2017 New Revision: 73809 URL: http://svn.reactos.org/svn/reactos?rev=73809&view=rev Log: [WINDOWSCODECS] - Fix some MSVC-specific definitions Modified: trunk/reactos/dll/win32/windowscodecs/msvc-thiscall.c trunk/reactos/dll/win32/windowscodecs/typeof.h Modified: trunk/reactos/dll/win32/windowscodecs/msvc-thiscall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ms… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/msvc-thiscall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/msvc-thiscall.c [iso-8859-1] Fri Feb 17 12:17:20 2017 @@ -1,5 +1,6 @@ #include "wincodecs_private.h" +#undef DEFINE_THISCALL_WRAPPER #define DEFINE_THISCALL_WRAPPER(func,args) \ typedef struct {int x[args/4];} _tag_##func; \ void __stdcall func(_tag_##func p1); \ Modified: trunk/reactos/dll/win32/windowscodecs/typeof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ty… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/typeof.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/typeof.h [iso-8859-1] Fri Feb 17 12:17:20 2017 @@ -24,17 +24,17 @@ typedef struct jpeg_error_mgr * (__cdecl typeof(jpeg_std_error))(struct jpeg_error_mgr *); typedef void (__cdecl typeof(jpeg_CreateDecompress))(struct jpeg_decompress_struct *, int, __typeof_size); -typedef int (__cdecl typeof(jpeg_read_header))(struct jpeg_decompress_struct *, int); -typedef int (__cdecl typeof(jpeg_start_decompress))(struct jpeg_decompress_struct *); +typedef int (__cdecl typeof(jpeg_read_header))(struct jpeg_decompress_struct *, unsigned char); +typedef unsigned char (__cdecl typeof(jpeg_start_decompress))(struct jpeg_decompress_struct *); typedef unsigned int (__cdecl typeof(jpeg_read_scanlines))(struct jpeg_decompress_struct *, unsigned char **, unsigned int); -typedef int (__cdecl typeof(jpeg_finish_decompress))(struct jpeg_decompress_struct *); +typedef unsigned char (__cdecl typeof(jpeg_finish_decompress))(struct jpeg_decompress_struct *); typedef void (__cdecl typeof(jpeg_destroy_decompress))(struct jpeg_decompress_struct *); typedef unsigned char (__cdecl typeof(jpeg_resync_to_restart))(struct jpeg_decompress_struct *, int); typedef void (__cdecl typeof(jpeg_CreateCompress))(struct jpeg_compress_struct *, int, __typeof_size); typedef void (__cdecl typeof(jpeg_start_compress))(struct jpeg_compress_struct *, unsigned char); typedef void (__cdecl typeof(jpeg_destroy_compress))(struct jpeg_compress_struct *); -typedef void (__cdecl typeof(jpeg_finish_compress))(struct jpeg_decompress_struct *); -typedef void (__cdecl typeof(jpeg_set_defaults))(struct jpeg_decompress_struct *); +typedef void (__cdecl typeof(jpeg_finish_compress))(struct jpeg_compress_struct *); +typedef void (__cdecl typeof(jpeg_set_defaults))(struct jpeg_compress_struct *); typedef unsigned int (__cdecl typeof(jpeg_write_scanlines))(struct jpeg_compress_struct *, char **, unsigned int); typedef void (*png_error_ptr_1)(struct png_struct_def *, const char *); @@ -79,7 +79,7 @@ typedef void (__stdcall typeof(png_set_PLTE))(struct png_struct_def *, struct png_info_def *, const struct png_color_struct *, int); typedef void (__stdcall typeof(png_set_tRNS))(struct png_struct_def *, struct png_info_def *, const unsigned char *, int, const struct png_color_16_struct *); typedef void *thandle_t_1; -typedef int (*TIFFReadWriteProc_1)(thandle_t_1, void *, long); +typedef int (*TIFFReadWriteProc_1)(thandle_t_1, void *, __typeof_intptr); typedef unsigned int (*TIFFSeekProc_1)(void *, unsigned int, int); typedef int (*TIFFCloseProc_1)(thandle_t_1); typedef unsigned int (*TIFFSizeProc_1)(thandle_t_1);

7 years, 7 months

[pschweitzer] 73808: [FASTFAT] Thomas->happiness++;

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Feb 17 11:38:05 2017 New Revision: 73808 URL: http://svn.reactos.org/svn/reactos?rev=73808&view=rev Log: [FASTFAT] Thomas->happiness++; Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Fri Feb 17 11:38:05 2017 @@ -97,7 +97,7 @@ StandardInfo->Directory = FALSE; } StandardInfo->NumberOfLinks = 1; - StandardInfo->DeletePending = BooleanFlagOn(FCB->Flags, FCB_DELETE_PENDING) ? TRUE : FALSE; + StandardInfo->DeletePending = BooleanFlagOn(FCB->Flags, FCB_DELETE_PENDING); *BufferLength -= sizeof(FILE_STANDARD_INFORMATION); return STATUS_SUCCESS; @@ -165,7 +165,7 @@ /* Check volume label bit */ ASSERT(0 == (*FCB->Attributes & _A_VOLID)); - if (FCB->Flags & FCB_IS_FATX_ENTRY) + if (BooleanFlagOn(FCB->Flags, FCB_IS_FATX_ENTRY)) { if (BasicInfo->CreationTime.QuadPart != 0 && BasicInfo->CreationTime.QuadPart != -1) { @@ -254,7 +254,7 @@ if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) return STATUS_BUFFER_OVERFLOW; - if (FCB->Flags & FCB_IS_FATX_ENTRY) + if (BooleanFlagOn(FCB->Flags, FCB_IS_FATX_ENTRY)) { FsdDosDateTimeToSystemTime(DeviceExt, FCB->entry.FatX.CreationDate, @@ -331,7 +331,7 @@ return STATUS_SUCCESS; } - if (FCB->Flags & FCB_DELETE_PENDING) + if (BooleanFlagOn(FCB->Flags, FCB_DELETE_PENDING)) { /* stream already marked for deletion. just update the file object */ FileObject->DeletePending = TRUE; @@ -1043,7 +1043,7 @@ if (*BufferLength < sizeof(FILE_NETWORK_OPEN_INFORMATION)) return(STATUS_BUFFER_OVERFLOW); - if (Fcb->Flags & FCB_IS_FATX_ENTRY) + if (BooleanFlagOn(Fcb->Flags, FCB_IS_FATX_ENTRY)) { FsdDosDateTimeToSystemTime(DeviceExt, Fcb->entry.FatX.CreationDate, @@ -1196,7 +1196,7 @@ } if (!vfatFCBIsDirectory(Fcb)) { - if (Fcb->Flags & FCB_IS_FATX_ENTRY) + if (BooleanFlagOn(Fcb->Flags, FCB_IS_FATX_ENTRY)) Fcb->entry.FatX.FileSize = Size; else Fcb->entry.Fat.FileSize = Size; @@ -1221,12 +1221,12 @@ ULONG ClusterSize = DeviceExt->FatInfo.BytesPerCluster; ULONG NewSize = AllocationSize->u.LowPart; ULONG NCluster; - BOOLEAN AllocSizeChanged = FALSE; + BOOLEAN AllocSizeChanged = FALSE, IsFatX = BooleanFlagOn(Fcb->Flags, FCB_IS_FATX_ENTRY); DPRINT("VfatSetAllocationSizeInformation(File <%wZ>, AllocationSize %d %u)\n", &Fcb->PathNameU, AllocationSize->HighPart, AllocationSize->LowPart); - if (Fcb->Flags & FCB_IS_FATX_ENTRY) + if (IsFatX) OldSize = Fcb->entry.FatX.FileSize; else OldSize = Fcb->entry.Fat.FileSize; @@ -1278,7 +1278,7 @@ return STATUS_DISK_FULL; } - if (Fcb->Flags & FCB_IS_FATX_ENTRY) + if (IsFatX) { Fcb->entry.FatX.FirstCluster = FirstCluster; } @@ -1378,7 +1378,7 @@ } else { - if (Fcb->Flags & FCB_IS_FATX_ENTRY) + if (IsFatX) { Fcb->entry.FatX.FirstCluster = 0; } @@ -1454,7 +1454,7 @@ SystemBuffer = IrpContext->Irp->AssociatedIrp.SystemBuffer; BufferLength = IrpContext->Stack->Parameters.QueryFile.Length; - if (!(FCB->Flags & FCB_IS_PAGE_FILE)) + if (!BooleanFlagOn(FCB->Flags, FCB_IS_PAGE_FILE)) { if (!ExAcquireResourceSharedLite(&FCB->MainResource, BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) @@ -1532,7 +1532,7 @@ Status = STATUS_INVALID_PARAMETER; } - if (!(FCB->Flags & FCB_IS_PAGE_FILE)) + if (!BooleanFlagOn(FCB->Flags, FCB_IS_PAGE_FILE)) { ExReleaseResourceLite(&FCB->MainResource); } @@ -1607,7 +1607,7 @@ } } - if (!(FCB->Flags & FCB_IS_PAGE_FILE)) + if (!BooleanFlagOn(FCB->Flags, FCB_IS_PAGE_FILE)) { if (!ExAcquireResourceExclusiveLite(&FCB->MainResource, BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) @@ -1662,7 +1662,7 @@ Status = STATUS_NOT_SUPPORTED; } - if (!(FCB->Flags & FCB_IS_PAGE_FILE)) + if (!BooleanFlagOn(FCB->Flags, FCB_IS_PAGE_FILE)) { ExReleaseResourceLite(&FCB->MainResource); } Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Fri Feb 17 11:38:05 2017 @@ -547,7 +547,7 @@ LARGE_INTEGER ByteOffset; PVOID Buffer; ULONG BytesPerSector; - BOOLEAN PagingIo, CanWait; + BOOLEAN PagingIo, CanWait, IsVolume; ASSERT(IrpContext); @@ -586,6 +586,7 @@ BytesPerSector = IrpContext->DeviceExt->FatInfo.BytesPerSector; PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO); CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); + IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME); /* fail if file is a directory and no paged read */ if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !PagingIo) @@ -596,7 +597,7 @@ DPRINT("'%wZ', Offset: %u, Length %u\n", &Fcb->PathNameU, ByteOffset.u.LowPart, Length); - if (ByteOffset.u.HighPart && !(Fcb->Flags & FCB_IS_VOLUME)) + if (ByteOffset.u.HighPart && !IsVolume) { Status = STATUS_INVALID_PARAMETER; goto ByeBye; @@ -616,7 +617,7 @@ goto ByeBye; } - if (IrpContext->Irp->Flags & (IRP_PAGING_IO | IRP_NOCACHE) || (Fcb->Flags & FCB_IS_VOLUME)) + if (IrpContext->Irp->Flags & (IRP_PAGING_IO | IRP_NOCACHE) || IsVolume) { if (ByteOffset.u.LowPart % BytesPerSector != 0 || Length % BytesPerSector != 0) { @@ -627,7 +628,7 @@ } } - if (Fcb->Flags & FCB_IS_VOLUME) + if (IsVolume) { Resource = &IrpContext->DeviceExt->DirResource; } @@ -770,7 +771,7 @@ ULONG Length = 0; PVOID Buffer; ULONG BytesPerSector; - BOOLEAN PagingIo, CanWait; + BOOLEAN PagingIo, CanWait, IsVolume; ASSERT(IrpContext); @@ -806,6 +807,7 @@ PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO); CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); + IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME); /* fail if file is a directory and no paged read */ if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !PagingIo) @@ -823,7 +825,7 @@ Length = IrpContext->Stack->Parameters.Write.Length; BytesPerSector = IrpContext->DeviceExt->FatInfo.BytesPerSector; - if (ByteOffset.u.HighPart && !(Fcb->Flags & FCB_IS_VOLUME)) + if (ByteOffset.u.HighPart && !IsVolume) { Status = STATUS_INVALID_PARAMETER; goto ByeBye; @@ -840,7 +842,7 @@ } } - if (IrpContext->Irp->Flags & (IRP_PAGING_IO|IRP_NOCACHE) || (Fcb->Flags & FCB_IS_VOLUME)) + if (IrpContext->Irp->Flags & (IRP_PAGING_IO|IRP_NOCACHE) || IsVolume) { if (ByteOffset.u.LowPart % BytesPerSector != 0 || Length % BytesPerSector != 0) { @@ -874,7 +876,7 @@ } } - if (Fcb->Flags & FCB_IS_VOLUME) + if (IsVolume) { Resource = &IrpContext->DeviceExt->DirResource; } @@ -916,7 +918,7 @@ } } - if (!CanWait && !(Fcb->Flags & FCB_IS_VOLUME)) + if (!CanWait && !IsVolume) { if (ByteOffset.u.LowPart + Length > Fcb->RFCB.AllocationSize.u.LowPart) {

7 years, 7 months

[pschweitzer] 73807: [FASTFAT] Fix a few ugly things. Both Thomas & cppcheck should be happier now!

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Feb 17 11:08:38 2017 New Revision: 73807 URL: http://svn.reactos.org/svn/reactos?rev=73807&view=rev Log: [FASTFAT] Fix a few ugly things. Both Thomas & cppcheck should be happier now! Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/fastfat/rw.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Fri Feb 17 11:08:38 2017 @@ -97,7 +97,7 @@ StandardInfo->Directory = FALSE; } StandardInfo->NumberOfLinks = 1; - StandardInfo->DeletePending = FCB->Flags & FCB_DELETE_PENDING ? TRUE : FALSE; + StandardInfo->DeletePending = BooleanFlagOn(FCB->Flags, FCB_DELETE_PENDING) ? TRUE : FALSE; *BufferLength -= sizeof(FILE_STANDARD_INFORMATION); return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Fri Feb 17 11:08:38 2017 @@ -547,6 +547,7 @@ LARGE_INTEGER ByteOffset; PVOID Buffer; ULONG BytesPerSector; + BOOLEAN PagingIo, CanWait; ASSERT(IrpContext); @@ -583,9 +584,11 @@ ByteOffset = IrpContext->Stack->Parameters.Read.ByteOffset; Length = IrpContext->Stack->Parameters.Read.Length; BytesPerSector = IrpContext->DeviceExt->FatInfo.BytesPerSector; + PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO); + CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); /* fail if file is a directory and no paged read */ - if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !(IrpContext->Irp->Flags & IRP_PAGING_IO)) + if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !PagingIo) { Status = STATUS_INVALID_PARAMETER; goto ByeBye; @@ -628,7 +631,7 @@ { Resource = &IrpContext->DeviceExt->DirResource; } - else if (IrpContext->Irp->Flags & IRP_PAGING_IO) + else if (PagingIo) { Resource = &Fcb->PagingIoResource; } @@ -637,15 +640,14 @@ Resource = &Fcb->MainResource; } - if (!ExAcquireResourceSharedLite(Resource, - IrpContext->Flags & IRPCONTEXT_CANWAIT ? TRUE : FALSE)) + if (!ExAcquireResourceSharedLite(Resource, CanWait)) { Resource = NULL; Status = STATUS_PENDING; goto ByeBye; } - if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) && + if (!PagingIo && FsRtlAreThereCurrentFileLocks(&Fcb->FileLock)) { if (!FsRtlCheckLockForReadAccess(&Fcb->FileLock, IrpContext->Irp)) @@ -655,7 +657,7 @@ } } - Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO)); + Buffer = VfatGetUserBuffer(IrpContext->Irp, PagingIo); if (!(IrpContext->Irp->Flags & (IRP_NOCACHE|IRP_PAGING_IO)) && !(Fcb->Flags & (FCB_IS_PAGE_FILE|FCB_IS_VOLUME))) @@ -682,11 +684,11 @@ if (!CcCopyRead(IrpContext->FileObject, &ByteOffset, Length, - (IrpContext->Flags & IRPCONTEXT_CANWAIT) != 0, + CanWait, Buffer, &IrpContext->Irp->IoStatus)) { - ASSERT((IrpContext->Flags & IRPCONTEXT_CANWAIT) == 0); + ASSERT(!CanWait); Status = STATUS_PENDING; goto ByeBye; } @@ -742,7 +744,7 @@ { IrpContext->Irp->IoStatus.Status = Status; if (IrpContext->FileObject->Flags & FO_SYNCHRONOUS_IO && - !(IrpContext->Irp->Flags & IRP_PAGING_IO) && + !PagingIo && (NT_SUCCESS(Status) || Status == STATUS_END_OF_FILE)) { IrpContext->FileObject->CurrentByteOffset.QuadPart = @@ -768,6 +770,7 @@ ULONG Length = 0; PVOID Buffer; ULONG BytesPerSector; + BOOLEAN PagingIo, CanWait; ASSERT(IrpContext); @@ -801,8 +804,11 @@ DPRINT("<%wZ>\n", &Fcb->PathNameU); + PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO); + CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); + /* fail if file is a directory and no paged read */ - if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !(IrpContext->Irp->Flags & IRP_PAGING_IO)) + if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !PagingIo) { Status = STATUS_INVALID_PARAMETER; goto ByeBye; @@ -854,7 +860,7 @@ goto Metadata; } - if (IrpContext->Irp->Flags & IRP_PAGING_IO) + if (PagingIo) { if (ByteOffset.u.LowPart + Length > Fcb->RFCB.AllocationSize.u.LowPart) { @@ -872,7 +878,7 @@ { Resource = &IrpContext->DeviceExt->DirResource; } - else if (IrpContext->Irp->Flags & IRP_PAGING_IO) + else if (PagingIo) { Resource = &Fcb->PagingIoResource; } @@ -881,10 +887,9 @@ Resource = &Fcb->MainResource; } - if ((Fcb->Flags & FCB_IS_PAGE_FILE) || (IrpContext->Irp->Flags & IRP_PAGING_IO)) - { - if (!ExAcquireResourceSharedLite(Resource, - BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) + if ((Fcb->Flags & FCB_IS_PAGE_FILE) || PagingIo) + { + if (!ExAcquireResourceSharedLite(Resource, CanWait)) { Resource = NULL; Status = STATUS_PENDING; @@ -893,8 +898,7 @@ } else { - if (!ExAcquireResourceExclusiveLite(Resource, - BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) + if (!ExAcquireResourceExclusiveLite(Resource, CanWait)) { Resource = NULL; Status = STATUS_PENDING; @@ -902,7 +906,7 @@ } } - if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) && + if (!PagingIo && FsRtlAreThereCurrentFileLocks(&Fcb->FileLock)) { if (!FsRtlCheckLockForWriteAccess(&Fcb->FileLock, IrpContext->Irp)) @@ -912,7 +916,7 @@ } } - if (!(IrpContext->Flags & IRPCONTEXT_CANWAIT) && !(Fcb->Flags & FCB_IS_VOLUME)) + if (!CanWait && !(Fcb->Flags & FCB_IS_VOLUME)) { if (ByteOffset.u.LowPart + Length > Fcb->RFCB.AllocationSize.u.LowPart) { @@ -921,10 +925,10 @@ } } - Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO)); + Buffer = VfatGetUserBuffer(IrpContext->Irp, PagingIo); if (!(Fcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME)) && - !(IrpContext->Irp->Flags & IRP_PAGING_IO) && + !PagingIo && ByteOffset.u.LowPart + Length > Fcb->RFCB.FileSize.u.LowPart) { LARGE_INTEGER AllocationSize; @@ -961,7 +965,7 @@ if (CcCopyWrite(IrpContext->FileObject, &ByteOffset, Length, - TRUE /*(IrpContext->Flags & IRPCONTEXT_CANWAIT) != 0*/, + TRUE /*CanWait*/, Buffer)) { IrpContext->Irp->IoStatus.Information = Length; @@ -969,7 +973,7 @@ } else { - ASSERT(FALSE /*(IrpContext->Flags & IRPCONTEXT_CANWAIT) == 0*/); + ASSERT(FALSE /*!CanWait*/); Status = STATUS_UNSUCCESSFUL; } } @@ -1002,7 +1006,7 @@ } Metadata: - if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) && + if (!PagingIo && !(Fcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME))) { if(!(*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) @@ -1064,7 +1068,7 @@ { IrpContext->Irp->IoStatus.Status = Status; if (IrpContext->FileObject->Flags & FO_SYNCHRONOUS_IO && - !(IrpContext->Irp->Flags & IRP_PAGING_IO) && NT_SUCCESS(Status)) + !PagingIo && NT_SUCCESS(Status)) { IrpContext->FileObject->CurrentByteOffset.QuadPart = ByteOffset.QuadPart + IrpContext->Irp->IoStatus.Information; Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Fri Feb 17 11:08:38 2017 @@ -197,9 +197,9 @@ #define LONGNAME_MAX_LENGTH 256 // max length for a long filename -#define ENTRY_DELETED(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat))) -#define ENTRY_VOLUME(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat))) -#define ENTRY_END(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat))) +#define ENTRY_DELETED(DeviceExt, DirEntry) (BooleanFlagOn(DeviceExt->Flags, VCB_IS_FATX) ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat))) +#define ENTRY_VOLUME(DeviceExt, DirEntry) (BooleanFlagOn(DeviceExt->Flags, VCB_IS_FATX) ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat))) +#define ENTRY_END(DeviceExt, DirEntry) (BooleanFlagOn(DeviceExt->Flags, VCB_IS_FATX) ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat))) #define FAT_ENTRY_DELETED(DirEntry) ((DirEntry)->Filename[0] == 0xe5) #define FAT_ENTRY_END(DirEntry) ((DirEntry)->Filename[0] == 0)

7 years, 7 months

← Newer
1
...
17
18
19
20
21
22
23
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2017