Ros-diffs April 2018

ros-diffs@reactos.org

26 participants
247 discussions

01/01: [KERNEL32/WINE] Sync res.c with Wine Staging 3.3. CORE-14434
by Amine Khaldi 11 Apr '18

11 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d262f1ee4dfa76641d62… commit 6d262f1ee4dfa76641d625dcab47724ee7de06f7 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Apr 11 12:36:44 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Apr 11 12:36:44 2018 +0100 [KERNEL32/WINE] Sync res.c with Wine Staging 3.3. CORE-14434 --- dll/win32/kernel32/wine/res.c | 10 +++++++++- media/doc/README.WINE | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dll/win32/kernel32/wine/res.c b/dll/win32/kernel32/wine/res.c index d6b0e5ea54..971d27a192 100644 --- a/dll/win32/kernel32/wine/res.c +++ b/dll/win32/kernel32/wine/res.c @@ -1383,7 +1383,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) { static const WCHAR prefix[] = { 'r','e','s','u',0 }; WCHAR tempdir[MAX_PATH], tempfile[MAX_PATH]; - DWORD section_size; + DWORD i, section_size; BOOL ret = FALSE; IMAGE_SECTION_HEADER *sec; IMAGE_NT_HEADERS32 *nt; @@ -1567,11 +1567,19 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; nt64->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + + for (i=0; i<nt64->OptionalHeader.NumberOfRvaAndSizes; i++) + if (nt64->OptionalHeader.DataDirectory[i].VirtualAddress > sec->VirtualAddress) + nt64->OptionalHeader.DataDirectory[i].VirtualAddress += rva_delta; } else { nt->OptionalHeader.SizeOfImage += rva_delta; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + + for (i=0; i<nt->OptionalHeader.NumberOfRvaAndSizes; i++) + if (nt->OptionalHeader.DataDirectory[i].VirtualAddress > sec->VirtualAddress) + nt->OptionalHeader.DataDirectory[i].VirtualAddress += rva_delta; } } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 7580f000a6..8cf47655b2 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -274,7 +274,7 @@ kernel32 - reactos/dll/win32/kernel32/wine/comm.c # Synced in r52754 reactos/dll/win32/kernel32/wine/lzexpand.c # Synced to WineStaging-3.3 reactos/dll/win32/kernel32/wine/profile.c # Synced to WineStaging-3.3 - reactos/dll/win32/kernel32/wine/res.c # Partially synced to WineStaging-1.7.55 + reactos/dll/win32/kernel32/wine/res.c # Partially synced to WineStaging-3.3 reactos/dll/win32/kernel32/winnls/string/casemap.c # Synced to WineStaging-1.7.55 reactos/dll/win32/kernel32/winnls/string/chartype.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/collation.c # Synced to WineStaging-1.7.55

1 0

01/01: [KERNEL32/WINE] Sync profile.c with Wine Staging 3.3. CORE-14434
by Amine Khaldi 11 Apr '18

11 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d2519218f27f3acd99f6… commit 8d2519218f27f3acd99f6c094235ea1d07658a09 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Apr 11 12:32:54 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Apr 11 12:32:54 2018 +0100 [KERNEL32/WINE] Sync profile.c with Wine Staging 3.3. CORE-14434 --- dll/win32/kernel32/wine/profile.c | 111 +++++++++++++++++++++++++++++++++++--- media/doc/README.WINE | 2 +- 2 files changed, 105 insertions(+), 8 deletions(-) diff --git a/dll/win32/kernel32/wine/profile.c b/dll/win32/kernel32/wine/profile.c index 49383c376d..0cd9970a13 100644 --- a/dll/win32/kernel32/wine/profile.c +++ b/dll/win32/kernel32/wine/profile.c @@ -19,12 +19,35 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef __REACTOS__ + #include <k32.h> #define NDEBUG #include <debug.h> DEBUG_CHANNEL(profile); +#else /* __REACTOS__ */ + +#include "config.h" +#include "wine/port.h" + +#include <string.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winerror.h" +#include "winternl.h" +#include "wine/unicode.h" +#include "wine/library.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(profile); + +#endif /* __REACTOS__ */ + static const char bom_utf8[] = {0xEF,0xBB,0xBF}; typedef enum @@ -73,6 +96,8 @@ static PROFILE *MRUProfile[N_CACHED_PROFILES]={NULL}; static const WCHAR emptystringW[] = {0}; static const WCHAR wininiW[] = { 'w','i','n','.','i','n','i',0 }; +#ifdef __REACTOS__ + static RTL_CRITICAL_SECTION PROFILE_CritSect; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = { @@ -82,6 +107,19 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = }; static RTL_CRITICAL_SECTION PROFILE_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; +#else /* __REACTOS__ */ + +static CRITICAL_SECTION PROFILE_CritSect; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &PROFILE_CritSect, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": PROFILE_CritSect") } +}; +static CRITICAL_SECTION PROFILE_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; + +#endif /* __REACTOS__ */ + static const char hex[16] = "0123456789ABCDEF"; /*********************************************************************** @@ -263,7 +301,7 @@ static inline BOOL PROFILE_isspaceW(WCHAR c) return isspaceW(c) || c == 0x1a; } -static inline ENCODING PROFILE_DetectTextEncoding(void * buffer, int * len) +static inline ENCODING PROFILE_DetectTextEncoding(const void * buffer, int * len) { int flags = IS_TEXT_UNICODE_SIGNATURE | IS_TEXT_UNICODE_REVERSE_SIGNATURE | @@ -469,8 +507,14 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) next_key = &key->next; prev_key = key; +#ifdef __REACTOS__ + TRACE("New key: name=%s, value=%s\n", + debugstr_w(key->name), + key->value ? debugstr_w(key->value) : L"(none)"); +#else TRACE("New key: name=%s, value=%s\n", - debugstr_w(key->name), key->value ? debugstr_w(key->value) : L"(none)"); + debugstr_w(key->name), key->value ? debugstr_w(key->value) : "(none)"); +#endif } } if (szFile != pBuffer) @@ -745,7 +789,11 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) if (!filename) filename = wininiW; +#ifdef __REACTOS__ if ((RtlDetermineDosPathNameType_U(filename) == RtlPathTypeRelative) && +#else + if ((RtlDetermineDosPathNameType_U(filename) == RELATIVE_PATH) && +#endif !strchrW(filename, '\\') && !strchrW(filename, '/')) { static const WCHAR wszSeparator[] = {'\\', 0}; @@ -849,7 +897,11 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) * If return_values is TRUE, also include the corresponding values. */ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, +#ifdef __REACTOS__ LPWSTR buffer, DWORD len, BOOL return_values ) +#else + LPWSTR buffer, UINT len, BOOL return_values ) +#endif { PROFILEKEY *key; @@ -900,7 +952,11 @@ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, } /* See GetPrivateProfileSectionNamesA for documentation */ +#ifdef __REACTOS__ static INT PROFILE_GetSectionNames( LPWSTR buffer, DWORD len ) +#else +static INT PROFILE_GetSectionNames( LPWSTR buffer, UINT len ) +#endif { LPWSTR buf; UINT buflen,tmplen; @@ -964,7 +1020,11 @@ static INT PROFILE_GetSectionNames( LPWSTR buffer, DWORD len ) * */ static INT PROFILE_GetString( LPCWSTR section, LPCWSTR key_name, +#ifdef __REACTOS__ LPCWSTR def_val, LPWSTR buffer, DWORD len ) +#else + LPCWSTR def_val, LPWSTR buffer, UINT len ) +#endif { PROFILEKEY *key = NULL; static const WCHAR empty_strW[] = { 0 }; @@ -1074,9 +1134,15 @@ UINT WINAPI GetProfileIntW( LPCWSTR section, LPCWSTR entry, INT def_val ) /*********************************************************************** * GetPrivateProfileStringW (KERNEL32.@) */ +#ifdef __REACTOS__ DWORD WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, LPWSTR buffer, DWORD len, LPCWSTR filename ) +#else +INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, + LPCWSTR def_val, LPWSTR buffer, + UINT len, LPCWSTR filename ) +#endif { int ret; LPWSTR defval_tmp = NULL; @@ -1130,9 +1196,15 @@ DWORD WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, /*********************************************************************** * GetPrivateProfileStringA (KERNEL32.@) */ +#ifdef __REACTOS__ DWORD WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR def_val, LPSTR buffer, DWORD len, LPCSTR filename ) +#else +INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, + LPCSTR def_val, LPSTR buffer, + UINT len, LPCSTR filename ) +#endif { UNICODE_STRING sectionW, entryW, def_valW, filenameW; LPWSTR bufferW; @@ -1173,8 +1245,13 @@ DWORD WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, /*********************************************************************** * GetProfileStringA (KERNEL32.@) */ +#ifdef __REACTOS__ DWORD WINAPI GetProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR def_val, LPSTR buffer, DWORD len ) +#else +INT WINAPI GetProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR def_val, + LPSTR buffer, UINT len ) +#endif { return GetPrivateProfileStringA( section, entry, def_val, buffer, len, "win.ini" ); @@ -1183,8 +1260,13 @@ DWORD WINAPI GetProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR def_val, /*********************************************************************** * GetProfileStringW (KERNEL32.@) */ +#ifdef __REACTOS__ DWORD WINAPI GetProfileStringW( LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, LPWSTR buffer, DWORD len ) +#else +INT WINAPI GetProfileStringW( LPCWSTR section, LPCWSTR entry, + LPCWSTR def_val, LPWSTR buffer, UINT len ) +#endif { return GetPrivateProfileStringW( section, entry, def_val, buffer, len, wininiW ); @@ -1263,7 +1345,11 @@ UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry, /*********************************************************************** * GetPrivateProfileSectionW (KERNEL32.@) */ +#ifdef __REACTOS__ DWORD WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, +#else +INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, +#endif DWORD len, LPCWSTR filename ) { int ret = 0; @@ -1289,7 +1375,11 @@ DWORD WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, /*********************************************************************** * GetPrivateProfileSectionA (KERNEL32.@) */ +#ifdef __REACTOS__ DWORD WINAPI GetPrivateProfileSectionA( LPCSTR section, LPSTR buffer, +#else +INT WINAPI GetPrivateProfileSectionA( LPCSTR section, LPSTR buffer, +#endif DWORD len, LPCSTR filename ) { UNICODE_STRING sectionW, filenameW; @@ -1335,7 +1425,11 @@ DWORD WINAPI GetPrivateProfileSectionA( LPCSTR section, LPSTR buffer, /*********************************************************************** * GetProfileSectionA (KERNEL32.@) */ +#ifdef __REACTOS__ DWORD WINAPI GetProfileSectionA( LPCSTR section, LPSTR buffer, DWORD len ) +#else +INT WINAPI GetProfileSectionA( LPCSTR section, LPSTR buffer, DWORD len ) +#endif { return GetPrivateProfileSectionA( section, buffer, len, "win.ini" ); } @@ -1343,7 +1437,11 @@ DWORD WINAPI GetProfileSectionA( LPCSTR section, LPSTR buffer, DWORD len ) /*********************************************************************** * GetProfileSectionW (KERNEL32.@) */ +#ifdef __REACTOS__ DWORD WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len ) +#else +INT WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len ) +#endif { return GetPrivateProfileSectionW( section, buffer, len, wininiW ); } @@ -1372,7 +1470,7 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, SetLastError(ERROR_FILE_NOT_FOUND); } else { ret = PROFILE_SetString( section, entry, string, FALSE); - PROFILE_FlushFile(); + if (ret) ret = PROFILE_FlushFile(); } } @@ -1428,11 +1526,10 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, else if (PROFILE_Open( filename, TRUE )) { if (!string) {/* delete the named section*/ ret = PROFILE_SetString(section,NULL,NULL, FALSE); - PROFILE_FlushFile(); } else { PROFILE_DeleteAllKeys(section); ret = TRUE; - while(*string) { + while(*string && ret) { LPWSTR buf = HeapAlloc( GetProcessHeap(), 0, (strlenW(string)+1) * sizeof(WCHAR) ); strcpyW( buf, string ); if((p = strchrW( buf, '='))) { @@ -1442,8 +1539,8 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, HeapFree( GetProcessHeap(), 0, buf ); string += strlenW(string)+1; } - PROFILE_FlushFile(); } + if (ret) ret = PROFILE_FlushFile(); } RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1725,7 +1822,7 @@ BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key, if (PROFILE_Open( filename, TRUE )) { ret = PROFILE_SetString( section, key, outstring, FALSE); - PROFILE_FlushFile(); + if (ret) ret = PROFILE_FlushFile(); } RtlLeaveCriticalSection( &PROFILE_CritSect ); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 08a4312dd1..7580f000a6 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -273,7 +273,7 @@ kernel32 - reactos/dll/win32/kernel32/wine/actctx.c # Partly synced with Wine 1.7.55 reactos/dll/win32/kernel32/wine/comm.c # Synced in r52754 reactos/dll/win32/kernel32/wine/lzexpand.c # Synced to WineStaging-3.3 - reactos/dll/win32/kernel32/wine/profile.c # Partially synced to WineStaging-1.7.55 + reactos/dll/win32/kernel32/wine/profile.c # Synced to WineStaging-3.3 reactos/dll/win32/kernel32/wine/res.c # Partially synced to WineStaging-1.7.55 reactos/dll/win32/kernel32/winnls/string/casemap.c # Synced to WineStaging-1.7.55 reactos/dll/win32/kernel32/winnls/string/chartype.c # Synced in r52754

1 0

01/01: [KERNEL32/WINE] Sync lzexpand.c with Wine Staging 3.3. CORE-14434
by Amine Khaldi 11 Apr '18

11 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f1d080ce53b395cc3bf3… commit 2f1d080ce53b395cc3bf31185eb4981d6f1f050e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Apr 11 12:30:53 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Apr 11 12:30:53 2018 +0100 [KERNEL32/WINE] Sync lzexpand.c with Wine Staging 3.3. CORE-14434 --- dll/win32/kernel32/wine/lzexpand.c | 40 ++++++++++++++++++++++++++++++++++++-- media/doc/README.WINE | 2 +- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dll/win32/kernel32/wine/lzexpand.c b/dll/win32/kernel32/wine/lzexpand.c index 94ac68b7c7..eea124efa0 100644 --- a/dll/win32/kernel32/wine/lzexpand.c +++ b/dll/win32/kernel32/wine/lzexpand.c @@ -1,4 +1,4 @@ -/* +/* * LZ Decompression functions * * Copyright 1996 Marcus Meissner @@ -33,6 +33,8 @@ * */ +#ifdef __REACTOS__ + #include <k32.h> #define NDEBUG @@ -45,6 +47,30 @@ DEBUG_CHANNEL(kernel32file); #define _lwrite(a, b, c) (long)(_hwrite(a, b, (long)c)) +#else /* __REACTOS__ */ + +#include "config.h" + +#include <string.h> +#include <ctype.h> +#include <sys/types.h> +#include <stdarg.h> +#include <stdio.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + +#include "windef.h" +#include "winbase.h" +#include "lzexpand.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(file); + +#endif /* __REACTOS__ */ + /* The readahead length of the decompressor. Reading single bytes * using _lread() would be SLOW. */ @@ -136,7 +162,7 @@ static INT read_header(HFILE fd,struct lzfileheader *head) memcpy(&(head->compressiontype),buf+LZ_MAGIC_LEN,1); memcpy(&(head->lastchar),buf+LZ_MAGIC_LEN+1,1); - /* FIXME: consider endianess on non-intel architectures */ + /* FIXME: consider endianness on non-intel architectures */ memcpy(&(head->reallength),buf+LZ_MAGIC_LEN+2,4); if (memcmp(head->magic,LZMagic,LZ_MAGIC_LEN)) @@ -468,7 +494,11 @@ LONG WINAPI LZCopy( HFILE src, HFILE dest ) /* not compressed? just copy */ if (!IS_LZ_HANDLE(src)) +#ifdef __REACTOS__ xread=(_readfun)_hread; // ROSHACK +#else + xread=_lread; +#endif else xread=(_readfun)LZRead; len=0; @@ -526,6 +556,7 @@ static LPSTR LZEXPAND_MangleName( LPCSTR fn ) HFILE WINAPI LZOpenFileA( LPSTR fn, LPOFSTRUCT ofs, WORD mode ) { HFILE fd,cfd; + BYTE ofs_cBytes = ofs->cBytes; TRACE("(%s,%p,%d)\n",fn,ofs,mode); /* 0x70 represents all OF_SHARE_* flags, ignore them for the check */ @@ -536,6 +567,8 @@ HFILE WINAPI LZOpenFileA( LPSTR fn, LPOFSTRUCT ofs, WORD mode ) fd = OpenFile(mfn,ofs,mode); HeapFree( GetProcessHeap(), 0, mfn ); } + if (fd==HFILE_ERROR) + ofs->cBytes = ofs_cBytes; if ((mode&~0x70)!=OF_READ) return fd; if (fd==HFILE_ERROR) @@ -579,6 +612,8 @@ void WINAPI LZClose( HFILE fd ) } } +#ifdef __REACTOS__ + /* * @implemented */ @@ -606,3 +641,4 @@ LZCreateFileW(IN LPCWSTR FileName, return ERROR_CALL_NOT_IMPLEMENTED; } +#endif /* __REACTOS__ */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d65efe21ad..08a4312dd1 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -272,7 +272,7 @@ iphlpapi - kernel32 - reactos/dll/win32/kernel32/wine/actctx.c # Partly synced with Wine 1.7.55 reactos/dll/win32/kernel32/wine/comm.c # Synced in r52754 - reactos/dll/win32/kernel32/wine/lzexpand.c # Synced in r52754 + reactos/dll/win32/kernel32/wine/lzexpand.c # Synced to WineStaging-3.3 reactos/dll/win32/kernel32/wine/profile.c # Partially synced to WineStaging-1.7.55 reactos/dll/win32/kernel32/wine/res.c # Partially synced to WineStaging-1.7.55 reactos/dll/win32/kernel32/winnls/string/casemap.c # Synced to WineStaging-1.7.55

1 0

01/01: [WIDL] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 11 Apr '18

11 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8296d6c1ef7d34ee4d47b… commit 8296d6c1ef7d34ee4d47b9c00ec1412534c0ee45 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Apr 11 12:29:04 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Apr 11 12:29:04 2018 +0100 [WIDL] Sync with Wine Staging 3.3. CORE-14434 --- media/doc/README.WINE | 2 +- sdk/tools/widl/hash.c | 6 + sdk/tools/widl/header.c | 14 +- sdk/tools/widl/parser.l | 105 +++++++------- sdk/tools/widl/parser.tab.c | 8 +- sdk/tools/widl/parser.tab.h | 6 +- sdk/tools/widl/parser.y | 2 +- sdk/tools/widl/parser.yy.c | 105 +++++++------- sdk/tools/widl/parser.yy.h | 325 ++++++++++++++++++++++++++++++++++++++++++++ sdk/tools/widl/proxy.c | 14 ++ sdk/tools/widl/typegen.c | 4 + sdk/tools/widl/typelib.c | 6 + sdk/tools/widl/write_msft.c | 7 + sdk/tools/widl/write_sltg.c | 5 + 14 files changed, 497 insertions(+), 112 deletions(-) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 0667b21ba9..d65efe21ad 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -16,7 +16,7 @@ wine-patches(a)winehq.com and ros-dev(a)reactos.org The following build tools are shared with Wine. reactos/sdk/tools/unicode # Synced to WineStaging-3.3 -reactos/sdk/tools/widl # Synced to WineStaging-2.16 +reactos/sdk/tools/widl # Synced to WineStaging-3.3 reactos/sdk/tools/wpp # Synced to WineStaging-2.9 The following libraries are shared with Wine. diff --git a/sdk/tools/widl/hash.c b/sdk/tools/widl/hash.c index a084a7c885..673625ed1e 100644 --- a/sdk/tools/widl/hash.c +++ b/sdk/tools/widl/hash.c @@ -21,7 +21,13 @@ #include <stdio.h> #include <stdarg.h> +#ifdef __REACTOS__ #include <nls.h> +#else +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#endif #include "widltypes.h" #include "hash.h" diff --git a/sdk/tools/widl/header.c b/sdk/tools/widl/header.c index 27bca0ed0d..6493253aee 100644 --- a/sdk/tools/widl/header.c +++ b/sdk/tools/widl/header.c @@ -960,7 +960,7 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * if (is_override_method(iface, child, func)) continue; - if (!is_callas(func->attrs) && !is_aggregate_return(func)) { + if (!is_callas(func->attrs)) { const var_t *arg; fprintf(header, "#define %s_%s(This", name, get_name(func)); @@ -969,6 +969,12 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * fprintf(header, ",%s", arg->name); fprintf(header, ") "); + if (is_aggregate_return(func)) + { + fprintf(header, "%s_%s_define_WIDL_C_INLINE_WRAPPERS_for_aggregate_return_support\n", name, get_name(func)); + continue; + } + fprintf(header, "(This)->lpVtbl->%s(This", get_vtbl_entry_name(iface, func)); if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) @@ -1128,7 +1134,11 @@ static void write_inline_wrappers(FILE *header, const type_t *iface, const type_ if (!is_callas(func->attrs)) { const var_t *arg; +#ifdef __REACTOS__ fprintf(header, "FORCEINLINE "); +#else + fprintf(header, "static FORCEINLINE "); +#endif write_type_decl_left(header, type_function_get_rettype(func->type)); fprintf(header, " %s_%s(", name, get_name(func)); write_args(header, type_get_function_args(func->type), name, 1, FALSE); @@ -1163,6 +1173,7 @@ static void do_write_c_method_def(FILE *header, const type_t *iface, const char if (type_iface_get_inherit(iface)) do_write_c_method_def(header, type_iface_get_inherit(iface), name); +#ifdef __REACTOS__ /* r59312 / 3ab1571 */ else if (type_iface_get_stmts(iface) == NULL) { fprintf(header, "#ifndef __cplusplus\n"); @@ -1172,6 +1183,7 @@ static void do_write_c_method_def(FILE *header, const type_t *iface, const char fprintf(header, "\n"); return; } +#endif STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { diff --git a/sdk/tools/widl/parser.l b/sdk/tools/widl/parser.l index 6520ce72e6..a57ac648b8 100644 --- a/sdk/tools/widl/parser.l +++ b/sdk/tools/widl/parser.l @@ -78,7 +78,7 @@ static int attr_token(const char *kw); static warning_list_t *disabled_warnings = NULL; -#define MAX_IMPORT_DEPTH 10 +#define MAX_IMPORT_DEPTH 20 struct { YY_BUFFER_STATE state; char *input_name; @@ -495,60 +495,63 @@ void pop_import(void) } struct imports { - char *name; - struct imports *next; + char *name; + struct imports *next; } *first_import; int do_import(char *fname) { - FILE *f; - char *path, *name; - struct imports *import; - int ptr = import_stack_ptr; - int ret, fd; - - import = first_import; - while (import && strcmp(import->name, fname)) - import = import->next; - if (import) return 0; /* already imported */ - - import = xmalloc(sizeof(struct imports)); - import->name = xstrdup(fname); - import->next = first_import; - first_import = import; - - /* don't search for a file name with a path in the include directories, - * for compatibility with MIDL */ - if (strchr( fname, '/' ) || strchr( fname, '\\' )) - path = xstrdup( fname ); - else if (!(path = wpp_find_include( fname, input_name ))) - error_loc("Unable to open include file %s\n", fname); - - import_stack[ptr].temp_name = temp_name; - import_stack[ptr].input_name = input_name; - import_stack[ptr].line_number = line_number; - import_stack_ptr++; - input_name = path; - line_number = 1; - - name = xstrdup( "widl.XXXXXX" ); - if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); - - temp_name = name; - if (!(f = fdopen(fd, "wt"))) - error("Could not open fd %s for writing\n", name); - - ret = wpp_parse( path, f ); - fclose( f ); - if (ret) exit(1); - - if((f = fopen(temp_name, "r")) == NULL) - error_loc("Unable to open %s\n", temp_name); - - import_stack[ptr].state = YY_CURRENT_BUFFER; - yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); - return 1; + FILE *f; + char *path, *name; + struct imports *import; + int ptr = import_stack_ptr; + int ret, fd; + + import = first_import; + while (import && strcmp(import->name, fname)) + import = import->next; + if (import) return 0; /* already imported */ + + import = xmalloc(sizeof(struct imports)); + import->name = xstrdup(fname); + import->next = first_import; + first_import = import; + + /* don't search for a file name with a path in the include directories, + * for compatibility with MIDL */ + if (strchr( fname, '/' ) || strchr( fname, '\\' )) + path = xstrdup( fname ); + else if (!(path = wpp_find_include( fname, input_name ))) + error_loc("Unable to open include file %s\n", fname); + + if (import_stack_ptr == MAX_IMPORT_DEPTH) + error_loc("Exceeded max import depth\n"); + + import_stack[ptr].temp_name = temp_name; + import_stack[ptr].input_name = input_name; + import_stack[ptr].line_number = line_number; + import_stack_ptr++; + input_name = path; + line_number = 1; + + name = xstrdup( "widl.XXXXXX" ); + if((fd = mkstemps( name, 0 )) == -1) + error("Could not generate a temp name from %s\n", name); + + temp_name = name; + if (!(f = fdopen(fd, "wt"))) + error("Could not open fd %s for writing\n", name); + + ret = wpp_parse( path, f ); + fclose( f ); + if (ret) exit(1); + + if((f = fopen(temp_name, "r")) == NULL) + error_loc("Unable to open %s\n", temp_name); + + import_stack[ptr].state = YY_CURRENT_BUFFER; + yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); + return 1; } void abort_import(void) diff --git a/sdk/tools/widl/parser.tab.c b/sdk/tools/widl/parser.tab.c index 016c4ef0ea..3d52c09450 100644 --- a/sdk/tools/widl/parser.tab.c +++ b/sdk/tools/widl/parser.tab.c @@ -228,8 +228,8 @@ static struct namespace *current_namespace = &global_namespace; /* In a future release of Bison, this section will be replaced by #include "parser.tab.h". */ -#ifndef YY_PARSER_E_REACTOS_SYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED -# define YY_PARSER_E_REACTOS_SYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED +#ifndef YY_PARSER_E_REACTOSSYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED +# define YY_PARSER_E_REACTOSSYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED /* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -475,7 +475,7 @@ extern YYSTYPE parser_lval; int parser_parse (void); -#endif /* !YY_PARSER_E_REACTOS_SYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED */ +#endif /* !YY_PARSER_E_REACTOSSYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED */ /* Copy the second part of user declarations. */ @@ -5975,7 +5975,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at type->attrs = attrs; } -#ifdef __REACTOS__ +#ifdef __REACTOS__ /* r53187 / 5bf224e */ /* Append the SWITCHTYPE attribute to a non-encapsulated union if it does not already have it. */ if (type_get_type_detect_alias(type) == TYPE_UNION && is_attr(attrs, ATTR_SWITCHTYPE) && diff --git a/sdk/tools/widl/parser.tab.h b/sdk/tools/widl/parser.tab.h index fc50cfad9d..86600640f7 100644 --- a/sdk/tools/widl/parser.tab.h +++ b/sdk/tools/widl/parser.tab.h @@ -30,8 +30,8 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -#ifndef YY_PARSER_E_REACTOS_SYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED -# define YY_PARSER_E_REACTOS_SYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED +#ifndef YY_PARSER_E_REACTOSSYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED +# define YY_PARSER_E_REACTOSSYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED /* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -277,4 +277,4 @@ extern YYSTYPE parser_lval; int parser_parse (void); -#endif /* !YY_PARSER_E_REACTOS_SYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED */ +#endif /* !YY_PARSER_E_REACTOSSYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED */ diff --git a/sdk/tools/widl/parser.y b/sdk/tools/widl/parser.y index 1e23046f04..c895a876fc 100644 --- a/sdk/tools/widl/parser.y +++ b/sdk/tools/widl/parser.y @@ -1936,7 +1936,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at type->attrs = attrs; } -#ifdef __REACTOS__ +#ifdef __REACTOS__ /* r53187 / 5bf224e */ /* Append the SWITCHTYPE attribute to a non-encapsulated union if it does not already have it. */ if (type_get_type_detect_alias(type) == TYPE_UNION && is_attr(attrs, ATTR_SWITCHTYPE) && diff --git a/sdk/tools/widl/parser.yy.c b/sdk/tools/widl/parser.yy.c index 5e7cb85ccc..1502508b87 100644 --- a/sdk/tools/widl/parser.yy.c +++ b/sdk/tools/widl/parser.yy.c @@ -766,7 +766,7 @@ static int attr_token(const char *kw); static warning_list_t *disabled_warnings = NULL; -#define MAX_IMPORT_DEPTH 10 +#define MAX_IMPORT_DEPTH 20 struct { YY_BUFFER_STATE state; char *input_name; @@ -2635,60 +2635,63 @@ void pop_import(void) } struct imports { - char *name; - struct imports *next; + char *name; + struct imports *next; } *first_import; int do_import(char *fname) { - FILE *f; - char *path, *name; - struct imports *import; - int ptr = import_stack_ptr; - int ret, fd; - - import = first_import; - while (import && strcmp(import->name, fname)) - import = import->next; - if (import) return 0; /* already imported */ - - import = xmalloc(sizeof(struct imports)); - import->name = xstrdup(fname); - import->next = first_import; - first_import = import; - - /* don't search for a file name with a path in the include directories, - * for compatibility with MIDL */ - if (strchr( fname, '/' ) || strchr( fname, '\\' )) - path = xstrdup( fname ); - else if (!(path = wpp_find_include( fname, input_name ))) - error_loc("Unable to open include file %s\n", fname); - - import_stack[ptr].temp_name = temp_name; - import_stack[ptr].input_name = input_name; - import_stack[ptr].line_number = line_number; - import_stack_ptr++; - input_name = path; - line_number = 1; - - name = xstrdup( "widl.XXXXXX" ); - if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); - - temp_name = name; - if (!(f = fdopen(fd, "wt"))) - error("Could not open fd %s for writing\n", name); - - ret = wpp_parse( path, f ); - fclose( f ); - if (ret) exit(1); - - if((f = fopen(temp_name, "r")) == NULL) - error_loc("Unable to open %s\n", temp_name); - - import_stack[ptr].state = YY_CURRENT_BUFFER; - parser__switch_to_buffer(parser__create_buffer(f,YY_BUF_SIZE)); - return 1; + FILE *f; + char *path, *name; + struct imports *import; + int ptr = import_stack_ptr; + int ret, fd; + + import = first_import; + while (import && strcmp(import->name, fname)) + import = import->next; + if (import) return 0; /* already imported */ + + import = xmalloc(sizeof(struct imports)); + import->name = xstrdup(fname); + import->next = first_import; + first_import = import; + + /* don't search for a file name with a path in the include directories, + * for compatibility with MIDL */ + if (strchr( fname, '/' ) || strchr( fname, '\\' )) + path = xstrdup( fname ); + else if (!(path = wpp_find_include( fname, input_name ))) + error_loc("Unable to open include file %s\n", fname); + + if (import_stack_ptr == MAX_IMPORT_DEPTH) + error_loc("Exceeded max import depth\n"); + + import_stack[ptr].temp_name = temp_name; + import_stack[ptr].input_name = input_name; + import_stack[ptr].line_number = line_number; + import_stack_ptr++; + input_name = path; + line_number = 1; + + name = xstrdup( "widl.XXXXXX" ); + if((fd = mkstemps( name, 0 )) == -1) + error("Could not generate a temp name from %s\n", name); + + temp_name = name; + if (!(f = fdopen(fd, "wt"))) + error("Could not open fd %s for writing\n", name); + + ret = wpp_parse( path, f ); + fclose( f ); + if (ret) exit(1); + + if((f = fopen(temp_name, "r")) == NULL) + error_loc("Unable to open %s\n", temp_name); + + import_stack[ptr].state = YY_CURRENT_BUFFER; + parser__switch_to_buffer(parser__create_buffer(f,YY_BUF_SIZE)); + return 1; } void abort_import(void) diff --git a/sdk/tools/widl/parser.yy.h b/sdk/tools/widl/parser.yy.h new file mode 100644 index 0000000000..bddc1efd7b --- /dev/null +++ b/sdk/tools/widl/parser.yy.h @@ -0,0 +1,325 @@ +#ifndef parser_HEADER_H +#define parser_HEADER_H 1 +#define parser_IN_HEADER 1 + +#line 6 "parser.yy.h" + +#line 8 "parser.yy.h" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 37 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <stdlib.h> + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include <inttypes.h> +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! C99 */ + +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST + +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#define YY_BUF_SIZE 16384 +#endif + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +extern yy_size_t parser_leng; + +extern FILE *parser_in, *parser_out; + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + yy_size_t yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +void parser_restart (FILE *input_file ); +void parser__switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE parser__create_buffer (FILE *file,int size ); +void parser__delete_buffer (YY_BUFFER_STATE b ); +void parser__flush_buffer (YY_BUFFER_STATE b ); +void parser_push_buffer_state (YY_BUFFER_STATE new_buffer ); +void parser_pop_buffer_state (void ); + +YY_BUFFER_STATE parser__scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE parser__scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE parser__scan_bytes (yyconst char *bytes,yy_size_t len ); + +void *parser_alloc (yy_size_t ); +void *parser_realloc (void *,yy_size_t ); +void parser_free (void * ); + +/* Begin user sect3 */ + +extern int parser_lineno; + +extern char *parser_text; +#define yytext_ptr parser_text + +#ifdef YY_HEADER_EXPORT_START_CONDITIONS +#define INITIAL 0 +#define QUOTE 1 +#define WSTRQUOTE 2 +#define ATTR 3 +#define PP_LINE 4 +#define PP_PRAGMA 5 +#define SQUOTE 6 + +#endif + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include <unistd.h> +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int parser_lex_destroy (void ); + +int parser_get_debug (void ); + +void parser_set_debug (int debug_flag ); + +YY_EXTRA_TYPE parser_get_extra (void ); + +void parser_set_extra (YY_EXTRA_TYPE user_defined ); + +FILE *parser_get_in (void ); + +void parser_set_in (FILE * in_str ); + +FILE *parser_get_out (void ); + +void parser_set_out (FILE * out_str ); + +yy_size_t parser_get_leng (void ); + +char *parser_get_text (void ); + +int parser_get_lineno (void ); + +void parser_set_lineno (int line_number ); + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int parser_wrap (void ); +#else +extern int parser_wrap (void ); +#endif +#endif + +#ifndef yytext_ptr +static void yy_flex_strncpy (char *,yyconst char *,int ); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * ); +#endif + +#ifndef YY_NO_INPUT + +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#define YY_READ_BUF_SIZE 8192 +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL_IS_OURS 1 + +extern int parser_lex (void); + +#define YY_DECL int parser_lex (void) +#endif /* !YY_DECL */ + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + +#undef YY_NEW_FILE +#undef YY_FLUSH_BUFFER +#undef yy_set_bol +#undef yy_new_buffer +#undef yy_set_interactive +#undef YY_DO_BEFORE_ACTION + +#ifdef YY_DECL_IS_OURS +#undef YY_DECL_IS_OURS +#undef YY_DECL +#endif + +#line 231 "parser.l" + + +#line 324 "parser.yy.h" +#undef parser_IN_HEADER +#endif /* parser_HEADER_H */ diff --git a/sdk/tools/widl/proxy.c b/sdk/tools/widl/proxy.c index 794fc5dc3a..376326333e 100644 --- a/sdk/tools/widl/proxy.c +++ b/sdk/tools/widl/proxy.c @@ -482,7 +482,11 @@ static const statement_t * get_callas_source(const type_t * iface, const var_t * return NULL; } +#ifdef __REACTOS__ /* r57019 / c3be8a3 */ static int write_proxy_procformatstring_offsets( const type_t *iface, int skip ) +#else +static void write_proxy_procformatstring_offsets( const type_t *iface, int skip ) +#endif { const statement_t *stmt; int i = 0; @@ -512,7 +516,9 @@ static int write_proxy_procformatstring_offsets( const type_t *iface, int skip ) print_proxy( "%u, /* %s::%s */\n", func->procstring_offset, iface->name, get_name(func)); i++; } +#ifdef __REACTOS__ /* r57019 / c3be8a3 */ return i; +#endif } static int write_proxy_methods(type_t *iface, int skip) @@ -645,10 +651,14 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "static const unsigned short %s_FormatStringOffsetTable[] =\n", iface->name ); print_proxy( "{\n" ); indent++; +#ifdef __REACTOS__ /* r57019 / c3be8a3 */ if (write_proxy_procformatstring_offsets( iface, 0 ) == 0) { print_proxy( "0\n" ); } +#else + write_proxy_procformatstring_offsets( iface, 0 ); +#endif indent--; print_proxy( "};\n\n" ); @@ -722,10 +732,14 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "static const PRPC_STUB_FUNCTION %s_table[] =\n", iface->name); print_proxy( "{\n"); indent++; +#ifdef __REACTOS__ /* r57019 / c3be8a3 */ if (write_stub_methods(iface, FALSE) == 0) { fprintf(proxy, "0"); } +#else + write_stub_methods(iface, FALSE); +#endif fprintf(proxy, "\n"); indent--; fprintf(proxy, "};\n\n"); diff --git a/sdk/tools/widl/typegen.c b/sdk/tools/widl/typegen.c index ca3f82f955..c2e3fd6f50 100644 --- a/sdk/tools/widl/typegen.c +++ b/sdk/tools/widl/typegen.c @@ -4747,7 +4747,11 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun if (align >= pointer_size) fprintf( file, "%s;\n", arg->name ); else +#ifdef __REACTOS__ fprintf( file, "DECLSPEC_ALIGN(%u) %s;\n", pointer_size, arg->name ); +#else + fprintf( file, "%s DECLSPEC_ALIGN(%u);\n", arg->name, pointer_size ); +#endif } if (add_retval && !is_void( retval->type )) { diff --git a/sdk/tools/widl/typelib.c b/sdk/tools/widl/typelib.c index ba71de71ab..7c590bca49 100644 --- a/sdk/tools/widl/typelib.c +++ b/sdk/tools/widl/typelib.c @@ -32,7 +32,13 @@ #include <string.h> #include <ctype.h> +#ifdef __REACTOS__ #include <typedefs.h> +#else +#include "windef.h" +#include "winbase.h" +#endif + #include "widl.h" #include "utils.h" #include "parser.h" diff --git a/sdk/tools/widl/write_msft.c b/sdk/tools/widl/write_msft.c index 4ed09ee4b0..efaa633f2f 100644 --- a/sdk/tools/widl/write_msft.c +++ b/sdk/tools/widl/write_msft.c @@ -39,8 +39,15 @@ #define NONAMELESSUNION +#ifdef __REACTOS__ #include <typedefs.h> #include <nls.h> +#else +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#endif #include "widl.h" #include "typelib.h" diff --git a/sdk/tools/widl/write_sltg.c b/sdk/tools/widl/write_sltg.c index 4efc7f00de..8f7b27afb4 100644 --- a/sdk/tools/widl/write_sltg.c +++ b/sdk/tools/widl/write_sltg.c @@ -30,8 +30,13 @@ #define NONAMELESSUNION +#ifdef __REACTOS__ #include <typedefs.h> #include <nls.h> +#else +#include "windef.h" +#include "winbase.h" +#endif #include "widl.h" #include "typelib.h"

1 0

01/01: [UNICODE] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 11 Apr '18

11 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cbd6bd3ce7c8c873ef71… commit 6cbd6bd3ce7c8c873ef71a3238889291f668aed5 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Apr 11 12:25:43 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Apr 11 12:25:43 2018 +0100 [UNICODE] Sync with Wine Staging 3.3. CORE-14434 --- media/doc/README.WINE | 2 +- sdk/tools/unicode/CMakeLists.txt | 3 +++ sdk/tools/unicode/c_037.c | 2 +- sdk/tools/unicode/c_10000.c | 2 +- sdk/tools/unicode/c_10001.c | 2 +- sdk/tools/unicode/c_10002.c | 2 +- sdk/tools/unicode/c_10003.c | 2 +- sdk/tools/unicode/c_10004.c | 2 +- sdk/tools/unicode/c_10005.c | 2 +- sdk/tools/unicode/c_10006.c | 2 +- sdk/tools/unicode/c_10007.c | 2 +- sdk/tools/unicode/c_10008.c | 2 +- sdk/tools/unicode/c_10010.c | 2 +- sdk/tools/unicode/c_10017.c | 2 +- sdk/tools/unicode/c_10021.c | 2 +- sdk/tools/unicode/c_10029.c | 2 +- sdk/tools/unicode/c_1006.c | 2 +- sdk/tools/unicode/c_10079.c | 2 +- sdk/tools/unicode/c_10081.c | 2 +- sdk/tools/unicode/c_10082.c | 2 +- sdk/tools/unicode/c_1026.c | 2 +- sdk/tools/unicode/c_1250.c | 2 +- sdk/tools/unicode/c_1251.c | 2 +- sdk/tools/unicode/c_1252.c | 2 +- sdk/tools/unicode/c_1253.c | 2 +- sdk/tools/unicode/c_1254.c | 2 +- sdk/tools/unicode/c_1255.c | 2 +- sdk/tools/unicode/c_1256.c | 2 +- sdk/tools/unicode/c_1257.c | 2 +- sdk/tools/unicode/c_1258.c | 2 +- sdk/tools/unicode/c_1361.c | 2 +- sdk/tools/unicode/c_20127.c | 2 +- sdk/tools/unicode/c_20866.c | 2 +- sdk/tools/unicode/c_20932.c | 2 +- sdk/tools/unicode/c_21866.c | 2 +- sdk/tools/unicode/c_28591.c | 2 +- sdk/tools/unicode/c_28592.c | 2 +- sdk/tools/unicode/c_28593.c | 2 +- sdk/tools/unicode/c_28594.c | 2 +- sdk/tools/unicode/c_28595.c | 2 +- sdk/tools/unicode/c_28596.c | 2 +- sdk/tools/unicode/c_28597.c | 2 +- sdk/tools/unicode/c_28598.c | 2 +- sdk/tools/unicode/c_28599.c | 2 +- sdk/tools/unicode/c_28600.c | 2 +- sdk/tools/unicode/c_28603.c | 2 +- sdk/tools/unicode/c_28604.c | 2 +- sdk/tools/unicode/c_28605.c | 2 +- sdk/tools/unicode/c_28606.c | 2 +- sdk/tools/unicode/c_424.c | 2 +- sdk/tools/unicode/c_437.c | 2 +- sdk/tools/unicode/c_500.c | 2 +- sdk/tools/unicode/c_737.c | 2 +- sdk/tools/unicode/c_775.c | 2 +- sdk/tools/unicode/c_850.c | 2 +- sdk/tools/unicode/c_852.c | 2 +- sdk/tools/unicode/c_855.c | 2 +- sdk/tools/unicode/c_856.c | 2 +- sdk/tools/unicode/c_857.c | 2 +- sdk/tools/unicode/c_860.c | 2 +- sdk/tools/unicode/c_861.c | 2 +- sdk/tools/unicode/c_862.c | 2 +- sdk/tools/unicode/c_863.c | 2 +- sdk/tools/unicode/c_864.c | 2 +- sdk/tools/unicode/c_865.c | 2 +- sdk/tools/unicode/c_866.c | 2 +- sdk/tools/unicode/c_869.c | 2 +- sdk/tools/unicode/c_874.c | 2 +- sdk/tools/unicode/c_875.c | 2 +- sdk/tools/unicode/c_878.c | 2 +- sdk/tools/unicode/c_932.c | 2 +- sdk/tools/unicode/c_936.c | 2 +- sdk/tools/unicode/c_949.c | 2 +- sdk/tools/unicode/c_950.c | 2 +- sdk/tools/unicode/casemap.c | 2 +- sdk/tools/unicode/compose.c | 4 ++-- sdk/tools/unicode/mbtowc.c | 2 +- sdk/tools/unicode/string.c | 2 ++ sdk/tools/unicode/utf8.c | 2 +- sdk/tools/unicode/wctomb.c | 2 +- sdk/tools/unicode/wctype.c | 38 +++++++++++++++++++------------------- 81 files changed, 103 insertions(+), 98 deletions(-) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 6a8ed462f1..0667b21ba9 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -15,7 +15,7 @@ wine-patches(a)winehq.com and ros-dev(a)reactos.org The following build tools are shared with Wine. -reactos/sdk/tools/unicode # Synced to WineStaging-2.9 +reactos/sdk/tools/unicode # Synced to WineStaging-3.3 reactos/sdk/tools/widl # Synced to WineStaging-2.16 reactos/sdk/tools/wpp # Synced to WineStaging-2.9 diff --git a/sdk/tools/unicode/CMakeLists.txt b/sdk/tools/unicode/CMakeLists.txt index 94777f187b..a715719c8b 100644 --- a/sdk/tools/unicode/CMakeLists.txt +++ b/sdk/tools/unicode/CMakeLists.txt @@ -1,3 +1,6 @@ + +add_definitions(-DDECLSPEC_HIDDEN=) + list(APPEND SOURCE c_037.c c_10000.c diff --git a/sdk/tools/unicode/c_037.c b/sdk/tools/unicode/c_037.c index 164a91a157..18e25f3cfb 100644 --- a/sdk/tools/unicode/c_037.c +++ b/sdk/tools/unicode/c_037.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_037 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_037 = { { 37, 1, 0x006f, 0x003f, "IBM EBCDIC US Canada" }, cp2uni, diff --git a/sdk/tools/unicode/c_10000.c b/sdk/tools/unicode/c_10000.c index 9f0b51658a..bae5e52b51 100644 --- a/sdk/tools/unicode/c_10000.c +++ b/sdk/tools/unicode/c_10000.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x111e, 0x111e, 0x111e, 0x0e79, 0x111e, 0x111e, 0x0f30, 0x102f }; -const struct sbcs_table cptable_10000 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_10000 = { { 10000, 1, 0x003f, 0x003f, "Mac Roman" }, cp2uni, diff --git a/sdk/tools/unicode/c_10001.c b/sdk/tools/unicode/c_10001.c index 3285980b20..5bee88e42b 100644 --- a/sdk/tools/unicode/c_10001.c +++ b/sdk/tools/unicode/c_10001.c @@ -7128,7 +7128,7 @@ static const unsigned short uni2cp_high[256] = 0x6554, 0x6648, 0x673a, 0x69ef, 0x69ef, 0x69ef, 0x680a, 0x6909 }; -const struct dbcs_table cptable_10001 = +const struct dbcs_table DECLSPEC_HIDDEN cptable_10001 = { { 10001, 2, 0x003f, 0x30fb, "Mac Japanese" }, cp2uni, diff --git a/sdk/tools/unicode/c_10002.c b/sdk/tools/unicode/c_10002.c index 5acd415f9b..dad3648633 100644 --- a/sdk/tools/unicode/c_10002.c +++ b/sdk/tools/unicode/c_10002.c @@ -6538,7 +6538,7 @@ static const unsigned short uni2cp_high[256] = 0x6482, 0x6582, 0x6682, 0x675b, 0x6a19, 0x6a19, 0x682b, 0x692a }; -const struct dbcs_table cptable_10002 = +const struct dbcs_table DECLSPEC_HIDDEN cptable_10002 = { { 10002, 2, 0x003f, 0x003f, "Mac Traditional Chinese" }, cp2uni, diff --git a/sdk/tools/unicode/c_10003.c b/sdk/tools/unicode/c_10003.c index dd17fbd377..32ac146c39 100644 --- a/sdk/tools/unicode/c_10003.c +++ b/sdk/tools/unicode/c_10003.c @@ -8243,7 +8243,7 @@ static const unsigned short uni2cp_high[256] = 0x94b4, 0x95b4, 0x96b4, 0x978b, 0x9a30, 0x9a30, 0x9842, 0x9941 }; -const struct dbcs_table cptable_10003 = +const struct dbcs_table DECLSPEC_HIDDEN cptable_10003 = { { 10003, 2, 0x003f, 0x003f, "Mac Korean" }, cp2uni, diff --git a/sdk/tools/unicode/c_10004.c b/sdk/tools/unicode/c_10004.c index d8c20ce3cc..c80fcc2ab6 100644 --- a/sdk/tools/unicode/c_10004.c +++ b/sdk/tools/unicode/c_10004.c @@ -760,7 +760,7 @@ static const unsigned short uni2cp_high[256] = 0x0fe8, 0x1364, 0x1364, 0x10bf, 0x1364, 0x1364, 0x1176, 0x1275 }; -const struct sbcs_table cptable_10004 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_10004 = { { 10004, 1, 0x003f, 0x003f, "Mac Arabic" }, cp2uni, diff --git a/sdk/tools/unicode/c_10005.c b/sdk/tools/unicode/c_10005.c index 9e21c2d9b8..137de05b3a 100644 --- a/sdk/tools/unicode/c_10005.c +++ b/sdk/tools/unicode/c_10005.c @@ -777,7 +777,7 @@ static const unsigned short uni2cp_high[256] = 0x1062, 0x13ea, 0x13ea, 0x1145, 0x13ea, 0x13ea, 0x11fc, 0x12fb }; -const struct sbcs_table cptable_10005 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_10005 = { { 10005, 1, 0x003f, 0x003f, "Mac Hebrew" }, cp2uni, diff --git a/sdk/tools/unicode/c_10006.c b/sdk/tools/unicode/c_10006.c index ba0ce21b0f..1ccdffa980 100644 --- a/sdk/tools/unicode/c_10006.c +++ b/sdk/tools/unicode/c_10006.c @@ -687,7 +687,7 @@ static const unsigned short uni2cp_high[256] = 0x113f, 0x113f, 0x113f, 0x0e9a, 0x113f, 0x113f, 0x0f51, 0x1050 }; -const struct sbcs_table cptable_10006 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_10006 = { { 10006, 1, 0x003f, 0x003f, "Mac Greek" }, cp2uni, diff --git a/sdk/tools/unicode/c_10007.c b/sdk/tools/unicode/c_10007.c index aa8822e8bd..0934fc5e2b 100644 --- a/sdk/tools/unicode/c_10007.c +++ b/sdk/tools/unicode/c_10007.c @@ -750,7 +750,7 @@ static const unsigned short uni2cp_high[256] = 0x131e, 0x131e, 0x131e, 0x1079, 0x131e, 0x131e, 0x1130, 0x122f }; -const struct sbcs_table cptable_10007 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_10007 = { { 10007, 1, 0x003f, 0x003f, "Mac Cyrillic" }, cp2uni, diff --git a/sdk/tools/unicode/c_10008.c b/sdk/tools/unicode/c_10008.c index dff7a4ec93..48699a99ec 100644 --- a/sdk/tools/unicode/c_10008.c +++ b/sdk/tools/unicode/c_10008.c @@ -6301,7 +6301,7 @@ static const unsigned short uni2cp_high[256] = 0x631b, 0x641a, 0x651a, 0x65f1, 0x68ae, 0x68ae, 0x66c0, 0x67bf }; -const struct dbcs_table cptable_10008 = +const struct dbcs_table DECLSPEC_HIDDEN cptable_10008 = { { 10008, 2, 0x003f, 0x003f, "Mac Simplified Chinese" }, cp2uni, diff --git a/sdk/tools/unicode/c_10010.c b/sdk/tools/unicode/c_10010.c index 140d7521aa..90b83269b6 100644 --- a/sdk/tools/unicode/c_10010.c +++ b/sdk/tools/unicode/c_10010.c @@ -715,7 +715,7 @@ static const unsigned short uni2cp_high[256] = 0x0e74, 0x1219, 0x1219, 0x0f74, 0x1219, 0x1219, 0x102b, 0x112a }; -const struct sbcs_table cptable_10010 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_10010 = { { 10010, 1, 0x003f, 0x003f, "Mac Romanian" }, cp2uni, diff --git a/sdk/tools/unicode/c_10017.c b/sdk/tools/unicode/c_10017.c index 1246c86068..165fc52e13 100644 --- a/sdk/tools/unicode/c_10017.c +++ b/sdk/tools/unicode/c_10017.c @@ -750,7 +750,7 @@ static const unsigned short uni2cp_high[256] = 0x131b, 0x131b, 0x131b, 0x1076, 0x131b, 0x131b, 0x112d, 0x122c }; -const struct sbcs_table cptable_10017 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_10017 = { { 10017, 1, 0x003f, 0x003f, "Mac Ukrainian" }, cp2uni, diff --git a/sdk/tools/unicode/c_10021.c b/sdk/tools/unicode/c_10021.c index 6294970941..1665fa175f 100644 --- a/sdk/tools/unicode/c_10021.c +++ b/sdk/tools/unicode/c_10021.c @@ -715,7 +715,7 @@ static const unsigned short uni2cp_high[256] = 0x1212, 0x1212, 0x1212, 0x0f6d, 0x1212, 0x1212, 0x1024, 0x1123 }; -const struct sbcs_table cptable_10021 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_10021 = { { 10021, 1, 0x003f, 0x003f, "Mac Thai" }, cp2uni, diff --git a/sdk/tools/unicode/c_10029.c b/sdk/tools/unicode/c_10029.c index 9829f41058..af4f00623a 100644 --- a/sdk/tools/unicode/c_10029.c +++ b/sdk/tools/unicode/c_10029.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1117, 0x1117, 0x1117, 0x0e72, 0x1117, 0x1117, 0x0f29, 0x1028 }; -const struct sbcs_table cptable_10029 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_10029 = { { 10029, 1, 0x003f, 0x003f, "Mac Latin 2" }, cp2uni, diff --git a/sdk/tools/unicode/c_1006.c b/sdk/tools/unicode/c_1006.c index b11669e6b4..da6575eb0a 100644 --- a/sdk/tools/unicode/c_1006.c +++ b/sdk/tools/unicode/c_1006.c @@ -719,7 +719,7 @@ static const unsigned short uni2cp_high[256] = 0x122d, 0x122d, 0x122d, 0x0f88, 0x122d, 0x122d, 0x103f, 0x113e }; -const struct sbcs_table cptable_1006 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_1006 = { { 1006, 1, 0x003f, 0x003f, "IBM Arabic" }, cp2uni, diff --git a/sdk/tools/unicode/c_10079.c b/sdk/tools/unicode/c_10079.c index 885984c019..31533fc9eb 100644 --- a/sdk/tools/unicode/c_10079.c +++ b/sdk/tools/unicode/c_10079.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1119, 0x1119, 0x1119, 0x0e74, 0x1119, 0x1119, 0x0f2b, 0x102a }; -const struct sbcs_table cptable_10079 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_10079 = { { 10079, 1, 0x003f, 0x003f, "Mac Icelandic" }, cp2uni, diff --git a/sdk/tools/unicode/c_10081.c b/sdk/tools/unicode/c_10081.c index 5aea465627..6d4733eee9 100644 --- a/sdk/tools/unicode/c_10081.c +++ b/sdk/tools/unicode/c_10081.c @@ -710,7 +710,7 @@ static const unsigned short uni2cp_high[256] = 0x0e74, 0x11f0, 0x11f0, 0x0f4b, 0x11f0, 0x11f0, 0x1002, 0x1101 }; -const struct sbcs_table cptable_10081 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_10081 = { { 10081, 1, 0x003f, 0x003f, "Mac Turkish" }, cp2uni, diff --git a/sdk/tools/unicode/c_10082.c b/sdk/tools/unicode/c_10082.c index c42b427b4c..b2a4ce7074 100644 --- a/sdk/tools/unicode/c_10082.c +++ b/sdk/tools/unicode/c_10082.c @@ -715,7 +715,7 @@ static const unsigned short uni2cp_high[256] = 0x0e74, 0x1219, 0x1219, 0x0f74, 0x1219, 0x1219, 0x102b, 0x112a }; -const struct sbcs_table cptable_10082 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_10082 = { { 10082, 1, 0x003f, 0x003f, "Mac Croatian" }, cp2uni, diff --git a/sdk/tools/unicode/c_1026.c b/sdk/tools/unicode/c_1026.c index 4975390f42..4887024ab2 100644 --- a/sdk/tools/unicode/c_1026.c +++ b/sdk/tools/unicode/c_1026.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_1026 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_1026 = { { 1026, 1, 0x006f, 0x003f, "IBM EBCDIC Latin 5 Turkish" }, cp2uni, diff --git a/sdk/tools/unicode/c_1250.c b/sdk/tools/unicode/c_1250.c index 6279a4a013..81ef082ce8 100644 --- a/sdk/tools/unicode/c_1250.c +++ b/sdk/tools/unicode/c_1250.c @@ -576,7 +576,7 @@ static const unsigned short uni2cp_high[256] = 0x0dd7, 0x0dd7, 0x0dd7, 0x0dd7, 0x0dd7, 0x0dd7, 0x0dd7, 0x0d78 }; -const struct sbcs_table cptable_1250 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_1250 = { { 1250, 1, 0x003f, 0x003f, "ANSI Eastern Europe" }, cp2uni, diff --git a/sdk/tools/unicode/c_1251.c b/sdk/tools/unicode/c_1251.c index 5103c2bdc4..51e929aff7 100644 --- a/sdk/tools/unicode/c_1251.c +++ b/sdk/tools/unicode/c_1251.c @@ -412,7 +412,7 @@ static const unsigned short uni2cp_high[256] = 0x08f3, 0x08f3, 0x08f3, 0x08f3, 0x08f3, 0x08f3, 0x08f3, 0x0894 }; -const struct sbcs_table cptable_1251 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_1251 = { { 1251, 1, 0x003f, 0x003f, "ANSI Cyrillic" }, cp2uni, diff --git a/sdk/tools/unicode/c_1252.c b/sdk/tools/unicode/c_1252.c index 0fc4f44b1e..5a0d23ab21 100644 --- a/sdk/tools/unicode/c_1252.c +++ b/sdk/tools/unicode/c_1252.c @@ -574,7 +574,7 @@ static const unsigned short uni2cp_high[256] = 0x0dcb, 0x0dcb, 0x0dcb, 0x0dcb, 0x0dcb, 0x0dcb, 0x0dcb, 0x0d6c }; -const struct sbcs_table cptable_1252 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_1252 = { { 1252, 1, 0x003f, 0x003f, "ANSI Latin 1" }, cp2uni, diff --git a/sdk/tools/unicode/c_1253.c b/sdk/tools/unicode/c_1253.c index 9b8c58da65..79675f0c2a 100644 --- a/sdk/tools/unicode/c_1253.c +++ b/sdk/tools/unicode/c_1253.c @@ -424,7 +424,7 @@ static const unsigned short uni2cp_high[256] = 0x07e3, 0x0941, 0x0941, 0x0941, 0x0941, 0x0941, 0x0941, 0x08e2 }; -const struct sbcs_table cptable_1253 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_1253 = { { 1253, 1, 0x003f, 0x003f, "ANSI Greek" }, cp2uni, diff --git a/sdk/tools/unicode/c_1254.c b/sdk/tools/unicode/c_1254.c index b5fd3ad666..4cf3e26121 100644 --- a/sdk/tools/unicode/c_1254.c +++ b/sdk/tools/unicode/c_1254.c @@ -576,7 +576,7 @@ static const unsigned short uni2cp_high[256] = 0x0dd7, 0x0dd7, 0x0dd7, 0x0dd7, 0x0dd7, 0x0dd7, 0x0dd7, 0x0d78 }; -const struct sbcs_table cptable_1254 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_1254 = { { 1254, 1, 0x003f, 0x003f, "ANSI Turkish" }, cp2uni, diff --git a/sdk/tools/unicode/c_1255.c b/sdk/tools/unicode/c_1255.c index 6256cedc3e..521da855aa 100644 --- a/sdk/tools/unicode/c_1255.c +++ b/sdk/tools/unicode/c_1255.c @@ -317,7 +317,7 @@ static const unsigned short uni2cp_high[256] = 0x04ae, 0x060c, 0x060c, 0x060c, 0x060c, 0x060c, 0x060c, 0x05ad }; -const struct sbcs_table cptable_1255 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_1255 = { { 1255, 1, 0x003f, 0x003f, "ANSI Hebrew" }, cp2uni, diff --git a/sdk/tools/unicode/c_1256.c b/sdk/tools/unicode/c_1256.c index 5e722b278f..a7b1e16fe0 100644 --- a/sdk/tools/unicode/c_1256.c +++ b/sdk/tools/unicode/c_1256.c @@ -351,7 +351,7 @@ static const unsigned short uni2cp_high[256] = 0x070e, 0x070e, 0x070e, 0x0500, 0x070e, 0x070e, 0x05b0, 0x06af }; -const struct sbcs_table cptable_1256 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_1256 = { { 1256, 1, 0x003f, 0x003f, "ANSI Arabic" }, cp2uni, diff --git a/sdk/tools/unicode/c_1257.c b/sdk/tools/unicode/c_1257.c index 89f9d9a1a5..f8acd5b822 100644 --- a/sdk/tools/unicode/c_1257.c +++ b/sdk/tools/unicode/c_1257.c @@ -275,7 +275,7 @@ static const unsigned short uni2cp_high[256] = 0x036d, 0x04cb, 0x04cb, 0x04cb, 0x04cb, 0x04cb, 0x04cb, 0x046c }; -const struct sbcs_table cptable_1257 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_1257 = { { 1257, 1, 0x003f, 0x003f, "ANSI Baltic" }, cp2uni, diff --git a/sdk/tools/unicode/c_1258.c b/sdk/tools/unicode/c_1258.c index 09b9ad6cc6..ef6c76e4e6 100644 --- a/sdk/tools/unicode/c_1258.c +++ b/sdk/tools/unicode/c_1258.c @@ -309,7 +309,7 @@ static const unsigned short uni2cp_high[256] = 0x05da, 0x05da, 0x05da, 0x05da, 0x05da, 0x05da, 0x05da, 0x057b }; -const struct sbcs_table cptable_1258 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_1258 = { { 1258, 1, 0x003f, 0x003f, "ANSI/OEM Viet Nam" }, cp2uni, diff --git a/sdk/tools/unicode/c_1361.c b/sdk/tools/unicode/c_1361.c index ab167d8353..f9b83df71f 100644 --- a/sdk/tools/unicode/c_1361.c +++ b/sdk/tools/unicode/c_1361.c @@ -8657,7 +8657,7 @@ static const unsigned short uni2cp_high[256] = 0x8c33, 0x8d33, 0x8e33, 0x9019, 0x9019, 0x9019, 0x9019, 0x8f32 }; -const struct dbcs_table cptable_1361 = +const struct dbcs_table DECLSPEC_HIDDEN cptable_1361 = { { 1361, 2, 0x003f, 0x003f, "Korean Johab" }, cp2uni, diff --git a/sdk/tools/unicode/c_20127.c b/sdk/tools/unicode/c_20127.c index a54a19e053..76583aa142 100644 --- a/sdk/tools/unicode/c_20127.c +++ b/sdk/tools/unicode/c_20127.c @@ -681,7 +681,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_20127 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_20127 = { { 20127, 1, 0x003f, 0x003f, "US-ASCII (7bit)" }, cp2uni, diff --git a/sdk/tools/unicode/c_20866.c b/sdk/tools/unicode/c_20866.c index 0ad56a24bb..2831375e31 100644 --- a/sdk/tools/unicode/c_20866.c +++ b/sdk/tools/unicode/c_20866.c @@ -750,7 +750,7 @@ static const unsigned short uni2cp_high[256] = 0x131b, 0x131b, 0x131b, 0x1076, 0x131b, 0x131b, 0x112d, 0x122c }; -const struct sbcs_table cptable_20866 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_20866 = { { 20866, 1, 0x003f, 0x003f, "Russian KOI8" }, cp2uni, diff --git a/sdk/tools/unicode/c_20932.c b/sdk/tools/unicode/c_20932.c index 32f6bb1516..5c8664cfc8 100644 --- a/sdk/tools/unicode/c_20932.c +++ b/sdk/tools/unicode/c_20932.c @@ -6265,7 +6265,7 @@ static const unsigned short uni2cp_high[256] = 0x69a6, 0x652a, 0x662a, 0x6701, 0x69a6, 0x69a6, 0x67b8, 0x68b7 }; -const struct dbcs_table cptable_20932 = +const struct dbcs_table DECLSPEC_HIDDEN cptable_20932 = { { 20932, 2, 0x003f, 0x30fb, "EUC-JP" }, cp2uni, diff --git a/sdk/tools/unicode/c_21866.c b/sdk/tools/unicode/c_21866.c index 6445a5fb05..c7103bb280 100644 --- a/sdk/tools/unicode/c_21866.c +++ b/sdk/tools/unicode/c_21866.c @@ -750,7 +750,7 @@ static const unsigned short uni2cp_high[256] = 0x131b, 0x131b, 0x131b, 0x1076, 0x131b, 0x131b, 0x112d, 0x122c }; -const struct sbcs_table cptable_21866 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_21866 = { { 21866, 1, 0x003f, 0x003f, "Ukrainian KOI8" }, cp2uni, diff --git a/sdk/tools/unicode/c_28591.c b/sdk/tools/unicode/c_28591.c index 71b7309501..2cdd870b9f 100644 --- a/sdk/tools/unicode/c_28591.c +++ b/sdk/tools/unicode/c_28591.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_28591 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28591 = { { 28591, 1, 0x003f, 0x003f, "ISO 8859-1 Latin 1" }, cp2uni, diff --git a/sdk/tools/unicode/c_28592.c b/sdk/tools/unicode/c_28592.c index f9ae26186d..ed765441ea 100644 --- a/sdk/tools/unicode/c_28592.c +++ b/sdk/tools/unicode/c_28592.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_28592 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28592 = { { 28592, 1, 0x003f, 0x003f, "ISO 8859-2 Latin 2 (East European)" }, cp2uni, diff --git a/sdk/tools/unicode/c_28593.c b/sdk/tools/unicode/c_28593.c index f0dbc6b0f7..df25061675 100644 --- a/sdk/tools/unicode/c_28593.c +++ b/sdk/tools/unicode/c_28593.c @@ -715,7 +715,7 @@ static const unsigned short uni2cp_high[256] = 0x1210, 0x1210, 0x1210, 0x0f6b, 0x1210, 0x1210, 0x1022, 0x1121 }; -const struct sbcs_table cptable_28593 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28593 = { { 28593, 1, 0x003f, 0x003f, "ISO 8859-3 Latin 3 (South European)" }, cp2uni, diff --git a/sdk/tools/unicode/c_28594.c b/sdk/tools/unicode/c_28594.c index 325adfc806..f50d96531b 100644 --- a/sdk/tools/unicode/c_28594.c +++ b/sdk/tools/unicode/c_28594.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_28594 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28594 = { { 28594, 1, 0x003f, 0x003f, "ISO 8859-4 Latin 4 (Baltic old)" }, cp2uni, diff --git a/sdk/tools/unicode/c_28595.c b/sdk/tools/unicode/c_28595.c index b2a671ca97..0c06b70b4b 100644 --- a/sdk/tools/unicode/c_28595.c +++ b/sdk/tools/unicode/c_28595.c @@ -750,7 +750,7 @@ static const unsigned short uni2cp_high[256] = 0x131b, 0x131b, 0x131b, 0x1076, 0x131b, 0x131b, 0x112d, 0x122c }; -const struct sbcs_table cptable_28595 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28595 = { { 28595, 1, 0x003f, 0x003f, "ISO 8859-5 Cyrillic" }, cp2uni, diff --git a/sdk/tools/unicode/c_28596.c b/sdk/tools/unicode/c_28596.c index c1586f6009..39a6b6af45 100644 --- a/sdk/tools/unicode/c_28596.c +++ b/sdk/tools/unicode/c_28596.c @@ -746,7 +746,7 @@ static const unsigned short uni2cp_high[256] = 0x12fc, 0x12fc, 0x12fc, 0x1057, 0x12fc, 0x12fc, 0x110e, 0x120d }; -const struct sbcs_table cptable_28596 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28596 = { { 28596, 1, 0x003f, 0x003f, "ISO 8859-6 Arabic" }, cp2uni, diff --git a/sdk/tools/unicode/c_28597.c b/sdk/tools/unicode/c_28597.c index 45376563e3..4464adf5a0 100644 --- a/sdk/tools/unicode/c_28597.c +++ b/sdk/tools/unicode/c_28597.c @@ -715,7 +715,7 @@ static const unsigned short uni2cp_high[256] = 0x1216, 0x1216, 0x1216, 0x0f71, 0x1216, 0x1216, 0x1028, 0x1127 }; -const struct sbcs_table cptable_28597 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28597 = { { 28597, 1, 0x003f, 0x003f, "ISO 8859-7 Greek" }, cp2uni, diff --git a/sdk/tools/unicode/c_28598.c b/sdk/tools/unicode/c_28598.c index a3dc40d682..0546a3e9a4 100644 --- a/sdk/tools/unicode/c_28598.c +++ b/sdk/tools/unicode/c_28598.c @@ -743,7 +743,7 @@ static const unsigned short uni2cp_high[256] = 0x12e2, 0x12e2, 0x12e2, 0x103d, 0x12e2, 0x12e2, 0x10f4, 0x11f3 }; -const struct sbcs_table cptable_28598 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28598 = { { 28598, 1, 0x003f, 0x003f, "ISO 8859-8 Hebrew" }, cp2uni, diff --git a/sdk/tools/unicode/c_28599.c b/sdk/tools/unicode/c_28599.c index be4bad410c..385047eb85 100644 --- a/sdk/tools/unicode/c_28599.c +++ b/sdk/tools/unicode/c_28599.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_28599 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28599 = { { 28599, 1, 0x003f, 0x003f, "ISO 8859-9 Latin 5 (Turkish)" }, cp2uni, diff --git a/sdk/tools/unicode/c_28600.c b/sdk/tools/unicode/c_28600.c index 36c29b9105..bbc21a6b0c 100644 --- a/sdk/tools/unicode/c_28600.c +++ b/sdk/tools/unicode/c_28600.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_28600 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28600 = { { 28600, 1, 0x003f, 0x003f, "ISO 8859-10 Latin 6 (Nordic)" }, cp2uni, diff --git a/sdk/tools/unicode/c_28603.c b/sdk/tools/unicode/c_28603.c index f059da381e..c1e49fd4fe 100644 --- a/sdk/tools/unicode/c_28603.c +++ b/sdk/tools/unicode/c_28603.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_28603 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28603 = { { 28603, 1, 0x003f, 0x003f, "ISO 8859-13 Latin 7 (Baltic)" }, cp2uni, diff --git a/sdk/tools/unicode/c_28604.c b/sdk/tools/unicode/c_28604.c index 1b68789e4b..ab2e160126 100644 --- a/sdk/tools/unicode/c_28604.c +++ b/sdk/tools/unicode/c_28604.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_28604 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28604 = { { 28604, 1, 0x003f, 0x003f, "ISO 8859-14 Latin 8 (Celtic)" }, cp2uni, diff --git a/sdk/tools/unicode/c_28605.c b/sdk/tools/unicode/c_28605.c index fecb8ca067..2848eded75 100644 --- a/sdk/tools/unicode/c_28605.c +++ b/sdk/tools/unicode/c_28605.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_28605 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28605 = { { 28605, 1, 0x003f, 0x003f, "ISO 8859-15 Latin 9 (Euro)" }, cp2uni, diff --git a/sdk/tools/unicode/c_28606.c b/sdk/tools/unicode/c_28606.c index 9dee969ae3..cab3ee1c0a 100644 --- a/sdk/tools/unicode/c_28606.c +++ b/sdk/tools/unicode/c_28606.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_28606 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_28606 = { { 28606, 1, 0x003f, 0x003f, "ISO 8859-16 Latin 10 (Balkan)" }, cp2uni, diff --git a/sdk/tools/unicode/c_424.c b/sdk/tools/unicode/c_424.c index 0ae1fe24be..8b7da59074 100644 --- a/sdk/tools/unicode/c_424.c +++ b/sdk/tools/unicode/c_424.c @@ -713,7 +713,7 @@ static const unsigned short uni2cp_high[256] = 0x11ff, 0x11ff, 0x11ff, 0x0f5a, 0x11ff, 0x11ff, 0x1011, 0x1110 }; -const struct sbcs_table cptable_424 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_424 = { { 424, 1, 0x003f, 0x003f, "IBM EBCDIC Hebrew" }, cp2uni, diff --git a/sdk/tools/unicode/c_437.c b/sdk/tools/unicode/c_437.c index af234de97c..9df7a7f709 100644 --- a/sdk/tools/unicode/c_437.c +++ b/sdk/tools/unicode/c_437.c @@ -720,7 +720,7 @@ static const unsigned short uni2cp_high[256] = 0x113f, 0x113f, 0x113f, 0x0e9a, 0x113f, 0x113f, 0x0f51, 0x1050 }; -const struct sbcs_table cptable_437 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_437 = { { 437, 1, 0x003f, 0x003f, "OEM United States" }, cp2uni, diff --git a/sdk/tools/unicode/c_500.c b/sdk/tools/unicode/c_500.c index 69bb4e6a12..42e8107654 100644 --- a/sdk/tools/unicode/c_500.c +++ b/sdk/tools/unicode/c_500.c @@ -682,7 +682,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_500 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_500 = { { 500, 1, 0x006f, 0x003f, "IBM EBCDIC International" }, cp2uni, diff --git a/sdk/tools/unicode/c_737.c b/sdk/tools/unicode/c_737.c index 57a6f1ef48..0399c4bfd7 100644 --- a/sdk/tools/unicode/c_737.c +++ b/sdk/tools/unicode/c_737.c @@ -720,7 +720,7 @@ static const unsigned short uni2cp_high[256] = 0x113f, 0x113f, 0x113f, 0x0e9a, 0x113f, 0x113f, 0x0f51, 0x1050 }; -const struct sbcs_table cptable_737 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_737 = { { 737, 1, 0x003f, 0x003f, "OEM Greek 437G" }, cp2uni, diff --git a/sdk/tools/unicode/c_775.c b/sdk/tools/unicode/c_775.c index 54d2abeb12..1b3594c8df 100644 --- a/sdk/tools/unicode/c_775.c +++ b/sdk/tools/unicode/c_775.c @@ -715,7 +715,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_775 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_775 = { { 775, 1, 0x003f, 0x003f, "OEM Baltic" }, cp2uni, diff --git a/sdk/tools/unicode/c_850.c b/sdk/tools/unicode/c_850.c index adedcf8c5d..674651f0c3 100644 --- a/sdk/tools/unicode/c_850.c +++ b/sdk/tools/unicode/c_850.c @@ -715,7 +715,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_850 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_850 = { { 850, 1, 0x003f, 0x003f, "OEM Multilingual Latin 1" }, cp2uni, diff --git a/sdk/tools/unicode/c_852.c b/sdk/tools/unicode/c_852.c index 977b1d9b77..d614e8ab13 100644 --- a/sdk/tools/unicode/c_852.c +++ b/sdk/tools/unicode/c_852.c @@ -715,7 +715,7 @@ static const unsigned short uni2cp_high[256] = 0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025 }; -const struct sbcs_table cptable_852 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_852 = { { 852, 1, 0x003f, 0x003f, "OEM Slovak Latin 2" }, cp2uni, diff --git a/sdk/tools/unicode/c_855.c b/sdk/tools/unicode/c_855.c index c449f491ea..807c6790ee 100644 --- a/sdk/tools/unicode/c_855.c +++ b/sdk/tools/unicode/c_855.c @@ -783,7 +783,7 @@ static const unsigned short uni2cp_high[256] = 0x131b, 0x131b, 0x131b, 0x1076, 0x131b, 0x131b, 0x112d, 0x122c }; -const struct sbcs_table cptable_855 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_855 = { { 855, 1, 0x003f, 0x003f, "OEM Cyrillic" }, cp2uni, diff --git a/sdk/tools/unicode/c_856.c b/sdk/tools/unicode/c_856.c index d10d0c86e5..0b152b6096 100644 --- a/sdk/tools/unicode/c_856.c +++ b/sdk/tools/unicode/c_856.c @@ -713,7 +713,7 @@ static const unsigned short uni2cp_high[256] = 0x11ff, 0x11ff, 0x11ff, 0x0f5a, 0x11ff, 0x11ff, 0x1011, 0x1110 }; -const struct sbcs_table cptable_856 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_856 = { { 856, 1, 0x003f, 0x003f, "Hebrew PC" }, cp2uni, diff --git a/sdk/tools/unicode/c_857.c b/sdk/tools/unicode/c_857.c index 21cc4b4023..9bd36c1c5b 100644 --- a/sdk/tools/unicode/c_857.c +++ b/sdk/tools/unicode/c_857.c @@ -743,7 +743,7 @@ static const unsigned short uni2cp_high[256] = 0x0e6f, 0x11eb, 0x11eb, 0x0f46, 0x11eb, 0x11eb, 0x0ffd, 0x10fc }; -const struct sbcs_table cptable_857 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_857 = { { 857, 1, 0x003f, 0x003f, "OEM Turkish" }, cp2uni, diff --git a/sdk/tools/unicode/c_860.c b/sdk/tools/unicode/c_860.c index 620a3f5da7..d6d147c111 100644 --- a/sdk/tools/unicode/c_860.c +++ b/sdk/tools/unicode/c_860.c @@ -720,7 +720,7 @@ static const unsigned short uni2cp_high[256] = 0x113f, 0x113f, 0x113f, 0x0e9a, 0x113f, 0x113f, 0x0f51, 0x1050 }; -const struct sbcs_table cptable_860 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_860 = { { 860, 1, 0x003f, 0x003f, "OEM Portuguese" }, cp2uni, diff --git a/sdk/tools/unicode/c_861.c b/sdk/tools/unicode/c_861.c index d869db65ad..67cd1438a1 100644 --- a/sdk/tools/unicode/c_861.c +++ b/sdk/tools/unicode/c_861.c @@ -720,7 +720,7 @@ static const unsigned short uni2cp_high[256] = 0x113f, 0x113f, 0x113f, 0x0e9a, 0x113f, 0x113f, 0x0f51, 0x1050 }; -const struct sbcs_table cptable_861 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_861 = { { 861, 1, 0x003f, 0x003f, "OEM Icelandic" }, cp2uni, diff --git a/sdk/tools/unicode/c_862.c b/sdk/tools/unicode/c_862.c index aa9fa2d9ff..18a8a997b7 100644 --- a/sdk/tools/unicode/c_862.c +++ b/sdk/tools/unicode/c_862.c @@ -751,7 +751,7 @@ static const unsigned short uni2cp_high[256] = 0x122a, 0x122a, 0x122a, 0x0f85, 0x122a, 0x122a, 0x103c, 0x113b }; -const struct sbcs_table cptable_862 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_862 = { { 862, 1, 0x003f, 0x003f, "OEM Hebrew" }, cp2uni, diff --git a/sdk/tools/unicode/c_863.c b/sdk/tools/unicode/c_863.c index d7a6f964b4..3bea216b63 100644 --- a/sdk/tools/unicode/c_863.c +++ b/sdk/tools/unicode/c_863.c @@ -720,7 +720,7 @@ static const unsigned short uni2cp_high[256] = 0x113f, 0x113f, 0x113f, 0x0e9a, 0x113f, 0x113f, 0x0f51, 0x1050 }; -const struct sbcs_table cptable_863 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_863 = { { 863, 1, 0x003f, 0x003f, "OEM Canadian French" }, cp2uni, diff --git a/sdk/tools/unicode/c_864.c b/sdk/tools/unicode/c_864.c index e65fa3850f..e3088b6be9 100644 --- a/sdk/tools/unicode/c_864.c +++ b/sdk/tools/unicode/c_864.c @@ -742,7 +742,7 @@ static const unsigned short uni2cp_high[256] = 0x0f62, 0x12de, 0x12de, 0x1039, 0x12de, 0x12de, 0x10f0, 0x11ef }; -const struct sbcs_table cptable_864 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_864 = { { 864, 1, 0x003f, 0x003f, "OEM Arabic" }, cp2uni, diff --git a/sdk/tools/unicode/c_865.c b/sdk/tools/unicode/c_865.c index ef5e75d6a3..5b5f1ce1bb 100644 --- a/sdk/tools/unicode/c_865.c +++ b/sdk/tools/unicode/c_865.c @@ -720,7 +720,7 @@ static const unsigned short uni2cp_high[256] = 0x113f, 0x113f, 0x113f, 0x0e9a, 0x113f, 0x113f, 0x0f51, 0x1050 }; -const struct sbcs_table cptable_865 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_865 = { { 865, 1, 0x003f, 0x003f, "OEM Nordic" }, cp2uni, diff --git a/sdk/tools/unicode/c_866.c b/sdk/tools/unicode/c_866.c index abcc8b65fc..37fb6b0f37 100644 --- a/sdk/tools/unicode/c_866.c +++ b/sdk/tools/unicode/c_866.c @@ -783,7 +783,7 @@ static const unsigned short uni2cp_high[256] = 0x131b, 0x131b, 0x131b, 0x1076, 0x131b, 0x131b, 0x112d, 0x122c }; -const struct sbcs_table cptable_866 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_866 = { { 866, 1, 0x003f, 0x003f, "OEM Russian" }, cp2uni, diff --git a/sdk/tools/unicode/c_869.c b/sdk/tools/unicode/c_869.c index 76ecb5994f..70cff9a5fc 100644 --- a/sdk/tools/unicode/c_869.c +++ b/sdk/tools/unicode/c_869.c @@ -720,7 +720,7 @@ static const unsigned short uni2cp_high[256] = 0x113f, 0x113f, 0x113f, 0x0e9a, 0x113f, 0x113f, 0x0f51, 0x1050 }; -const struct sbcs_table cptable_869 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_869 = { { 869, 1, 0x003f, 0x003f, "OEM Greek" }, cp2uni, diff --git a/sdk/tools/unicode/c_874.c b/sdk/tools/unicode/c_874.c index c7ff356511..e5a83388a6 100644 --- a/sdk/tools/unicode/c_874.c +++ b/sdk/tools/unicode/c_874.c @@ -419,7 +419,7 @@ static const unsigned short uni2cp_high[256] = 0x06be, 0x081c, 0x081c, 0x081c, 0x081c, 0x081c, 0x081c, 0x07bd }; -const struct sbcs_table cptable_874 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_874 = { { 874, 1, 0x003f, 0x003f, "ANSI/OEM Thai" }, cp2uni, diff --git a/sdk/tools/unicode/c_875.c b/sdk/tools/unicode/c_875.c index 59eafafb41..ba6f2e6491 100644 --- a/sdk/tools/unicode/c_875.c +++ b/sdk/tools/unicode/c_875.c @@ -687,7 +687,7 @@ static const unsigned short uni2cp_high[256] = 0x113f, 0x113f, 0x113f, 0x0e9a, 0x113f, 0x113f, 0x0f51, 0x1050 }; -const struct sbcs_table cptable_875 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_875 = { { 875, 1, 0x006f, 0x003f, "IBM EBCDIC Greek" }, cp2uni, diff --git a/sdk/tools/unicode/c_878.c b/sdk/tools/unicode/c_878.c index 3afe491b85..16f0e257e3 100644 --- a/sdk/tools/unicode/c_878.c +++ b/sdk/tools/unicode/c_878.c @@ -750,7 +750,7 @@ static const unsigned short uni2cp_high[256] = 0x131b, 0x131b, 0x131b, 0x1076, 0x131b, 0x131b, 0x112d, 0x122c }; -const struct sbcs_table cptable_878 = +const struct sbcs_table DECLSPEC_HIDDEN cptable_878 = { { 878, 1, 0x003f, 0x003f, "Russian KOI8" }, cp2uni, diff --git a/sdk/tools/unicode/c_932.c b/sdk/tools/unicode/c_932.c index b98522e753..5129380054 100644 --- a/sdk/tools/unicode/c_932.c +++ b/sdk/tools/unicode/c_932.c @@ -5588,7 +5588,7 @@ static const unsigned short uni2cp_high[256] = 0x647f, 0x6573, 0x6665, 0x684a, 0x684a, 0x684a, 0x684a, 0x6764 }; -const struct dbcs_table cptable_932 = +const struct dbcs_table DECLSPEC_HIDDEN cptable_932 = { { 932, 2, 0x003f, 0x30fb, "ANSI/OEM Japanese Shift-JIS" }, cp2uni, diff --git a/sdk/tools/unicode/c_936.c b/sdk/tools/unicode/c_936.c index 3754f2d68c..09786ebbac 100644 --- a/sdk/tools/unicode/c_936.c +++ b/sdk/tools/unicode/c_936.c @@ -7937,7 +7937,7 @@ static const unsigned short uni2cp_high[256] = 0x6919, 0x6a19, 0x6b19, 0x6dce, 0x6dce, 0x6dce, 0x6be9, 0x6ce8 }; -const struct dbcs_table cptable_936 = +const struct dbcs_table DECLSPEC_HIDDEN cptable_936 = { { 936, 2, 0x003f, 0x003f, "ANSI/OEM Simplified Chinese GBK" }, cp2uni, diff --git a/sdk/tools/unicode/c_949.c b/sdk/tools/unicode/c_949.c index 4dbb845bc2..da1f1c9f5d 100644 --- a/sdk/tools/unicode/c_949.c +++ b/sdk/tools/unicode/c_949.c @@ -9095,7 +9095,7 @@ static const unsigned short uni2cp_high[256] = 0x8c74, 0x8d74, 0x8e74, 0x905a, 0x905a, 0x905a, 0x905a, 0x8f73 }; -const struct dbcs_table cptable_949 = +const struct dbcs_table DECLSPEC_HIDDEN cptable_949 = { { 949, 2, 0x003f, 0x003f, "ANSI/OEM Korean Unified Hangul" }, cp2uni, diff --git a/sdk/tools/unicode/c_950.c b/sdk/tools/unicode/c_950.c index 4430d0a118..74eddfc175 100644 --- a/sdk/tools/unicode/c_950.c +++ b/sdk/tools/unicode/c_950.c @@ -8344,7 +8344,7 @@ static const unsigned short uni2cp_high[256] = 0x753e, 0x763e, 0x773e, 0x79f3, 0x79f3, 0x79f3, 0x780e, 0x790d }; -const struct dbcs_table cptable_950 = +const struct dbcs_table DECLSPEC_HIDDEN cptable_950 = { { 950, 2, 0x003f, 0x003f, "ANSI/OEM Traditional Chinese Big5" }, cp2uni, diff --git a/sdk/tools/unicode/casemap.c b/sdk/tools/unicode/casemap.c index 923989147e..bfab3233ee 100644 --- a/sdk/tools/unicode/casemap.c +++ b/sdk/tools/unicode/casemap.c @@ -1,5 +1,5 @@ /* Unicode case mappings */ -/* generated from http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" diff --git a/sdk/tools/unicode/compose.c b/sdk/tools/unicode/compose.c index 1f2b7df34b..71589f47c1 100644 --- a/sdk/tools/unicode/compose.c +++ b/sdk/tools/unicode/compose.c @@ -1,5 +1,5 @@ /* Unicode char composition */ -/* generated from http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" @@ -392,7 +392,7 @@ static inline int binary_search( WCHAR ch, int low, int high ) return -1; } -WCHAR wine_compose( const WCHAR *str ) +WCHAR DECLSPEC_HIDDEN wine_compose( const WCHAR *str ) { int pos, idx = 1, start = 0, count = 70; for (;;) diff --git a/sdk/tools/unicode/mbtowc.c b/sdk/tools/unicode/mbtowc.c index 5e32367099..4977c82d8b 100644 --- a/sdk/tools/unicode/mbtowc.c +++ b/sdk/tools/unicode/mbtowc.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ); +extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; /* check the code whether it is in Unicode Private Use Area (PUA). */ /* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */ diff --git a/sdk/tools/unicode/string.c b/sdk/tools/unicode/string.c index 6b1e145336..09499ea988 100644 --- a/sdk/tools/unicode/string.c +++ b/sdk/tools/unicode/string.c @@ -26,7 +26,9 @@ #define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" +#ifdef __REACTOS__ #define min(a,b) (((a) < (b)) ? (a) : (b)) +#endif int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) { diff --git a/sdk/tools/unicode/utf8.c b/sdk/tools/unicode/utf8.c index 5943ddadd7..f47561e4bf 100644 --- a/sdk/tools/unicode/utf8.c +++ b/sdk/tools/unicode/utf8.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern WCHAR wine_compose( const WCHAR *str ); +extern WCHAR wine_compose( const WCHAR *str ) DECLSPEC_HIDDEN; /* number of following bytes in sequence based on first byte value (for bytes above 0x7f) */ static const char utf8_length[128] = diff --git a/sdk/tools/unicode/wctomb.c b/sdk/tools/unicode/wctomb.c index e7f35e5980..65e4aa04f7 100644 --- a/sdk/tools/unicode/wctomb.c +++ b/sdk/tools/unicode/wctomb.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern WCHAR wine_compose( const WCHAR *str ); +extern WCHAR wine_compose( const WCHAR *str ) DECLSPEC_HIDDEN; /****************************************************************/ /* sbcs support */ diff --git a/sdk/tools/unicode/wctype.c b/sdk/tools/unicode/wctype.c index 5a79353985..8d0a3ed94d 100644 --- a/sdk/tools/unicode/wctype.c +++ b/sdk/tools/unicode/wctype.c @@ -307,8 +307,8 @@ const unsigned short wine_wctype_table[17152] = 0x2300, 0x2300, 0x2300, 0x2300, 0x2300, 0x2300, 0x2300, 0x2300, 0x2300, 0x2300, 0x2300, 0x2300, 0x2300, 0x2300, 0x2300, 0x2300, 0x2300, 0xd200, 0xd200, 0xd200, 0x0000, 0x0000, 0x2210, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, + 0xc300, 0xc300, 0xc300, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -358,7 +358,7 @@ const unsigned short wine_wctype_table[17152] = 0x1300, 0x1300, 0xd200, 0xd200, 0x0000, 0x0000, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1300, 0x1300, 0x5200, 0x5200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x5200, 0x0000, 0x0000, 0x0000, 0x0000, + 0x1200, 0x1200, 0x1200, 0x5200, 0x1300, 0x1210, 0x0000, 0x0000, 0x0000, 0xd200, 0xd200, 0x1200, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x0000, 0x0000, 0x0000, 0x1300, 0x1300, 0x0000, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, @@ -390,7 +390,7 @@ const unsigned short wine_wctype_table[17152] = 0x1300, 0x1300, 0xd200, 0xd200, 0x0000, 0x0000, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1210, 0x5200, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x1300, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x1300, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0x0000, 0xd200, 0x1200, 0x1200, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x0000, 0x1300, 0x1300, 0x0000, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, @@ -455,14 +455,14 @@ const unsigned short wine_wctype_table[17152] = 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x0000, 0x1300, 0x1300, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0xd200, 0x1200, 0x1200, 0x0000, 0x1300, 0x1300, 0x1300, + 0xd200, 0xd200, 0x1200, 0x1200, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x1300, 0x1300, 0x1300, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, - 0x1300, 0x1300, 0x1300, 0x0000, 0x0000, 0x1300, 0x1200, 0x1200, + 0x1300, 0x1300, 0x1300, 0xd200, 0xd200, 0x1300, 0x1200, 0x1200, 0x1200, 0xd200, 0xd200, 0xd200, 0xd200, 0x0000, 0x1200, 0x1200, 0x1200, 0x0000, 0x1200, 0x1200, 0x1200, 0xd200, 0x1300, 0x1200, 0x0000, 0x0000, 0x0000, 0x0000, 0x1300, 0x1300, 0x1300, 0x1200, @@ -933,7 +933,7 @@ const unsigned short wine_wctype_table[17152] = 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0x1200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0x1300, 0x1300, 0x1300, 0x1300, 0xd200, 0x1300, 0x1300, - 0x1300, 0x1300, 0x1200, 0x1200, 0xd200, 0x1300, 0x1300, 0x0000, + 0x1300, 0x1300, 0x1200, 0x1200, 0xd200, 0x1300, 0x1300, 0x1200, 0xd200, 0xd200, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, @@ -965,8 +965,8 @@ const unsigned short wine_wctype_table[17152] = 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, - 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, + 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, + 0xd200, 0xd200, 0x0000, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, @@ -1054,7 +1054,7 @@ const unsigned short wine_wctype_table[17152] = 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, - 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x0000, + 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, @@ -1158,7 +1158,7 @@ const unsigned short wine_wctype_table[17152] = 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, - 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0x0000, + 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, @@ -1377,7 +1377,7 @@ const unsigned short wine_wctype_table[17152] = 0xb200, 0xb200, 0x0000, 0x0000, 0x0000, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0x0000, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, - 0xb200, 0xb200, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xb200, 0xb200, 0xb200, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb200, 0xb200, 0xb200, 0xb200, @@ -1455,8 +1455,8 @@ const unsigned short wine_wctype_table[17152] = 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb300, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, - 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, + 0xb210, 0xb210, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1548,7 +1548,7 @@ const unsigned short wine_wctype_table[17152] = 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, - 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x0000, + 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, @@ -1697,10 +1697,10 @@ const unsigned short wine_wctype_table[17152] = 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, - 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, + 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, + 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, + 0x1300, 0x1300, 0x1300, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300,

1 0

01/01: [TRANSLATION] Polish translation update for drwtsn32, winlogon and usersrv. (#475)
by Adam Słaboń 10 Apr '18

10 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abe6bbabfb91021bacfa4… commit abe6bbabfb91021bacfa4f5ea377da46220248f8 Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Tue Apr 10 22:54:34 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Apr 10 22:54:34 2018 +0200 [TRANSLATION] Polish translation update for drwtsn32, winlogon and usersrv. (#475) --- base/applications/drwtsn32/drwtsn32.rc | 8 +++++++- base/applications/drwtsn32/lang/en-US.rc | 2 ++ base/applications/drwtsn32/lang/pl-PL.rc | 13 +++++++++++++ base/system/winlogon/lang/pl-PL.rc | 8 ++++---- win32ss/user/winsrv/usersrv/lang/pl-PL.rc | 16 ++++++++-------- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/base/applications/drwtsn32/drwtsn32.rc b/base/applications/drwtsn32/drwtsn32.rc index 0f3e2108af..f39332b8a4 100644 --- a/base/applications/drwtsn32/drwtsn32.rc +++ b/base/applications/drwtsn32/drwtsn32.rc @@ -16,6 +16,12 @@ #include <reactos/manifest_exe.rc> +/* UTF-8 */ +#pragma code_page(65001) + #ifdef LANGUAGE_EN_US - #include "lang/en-US.rc" + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" #endif diff --git a/base/applications/drwtsn32/lang/en-US.rc b/base/applications/drwtsn32/lang/en-US.rc index d681297c2a..a8590ff0c1 100644 --- a/base/applications/drwtsn32/lang/en-US.rc +++ b/base/applications/drwtsn32/lang/en-US.rc @@ -5,6 +5,8 @@ * COPYRIGHT: Copyright 2018 William Kent (wjk011 [at] gmail [dot] com) */ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + STRINGTABLE BEGIN IDS_APP_TITLE "ReactOS Crash Reporter" diff --git a/base/applications/drwtsn32/lang/pl-PL.rc b/base/applications/drwtsn32/lang/pl-PL.rc new file mode 100644 index 0000000000..a5385421e1 --- /dev/null +++ b/base/applications/drwtsn32/lang/pl-PL.rc @@ -0,0 +1,13 @@ +/* + * PROJECT: Dr. Watson crash reporter + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: pl-PL resource file + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Raportowanie błędu ReactOS" + IDS_USER_ALERT_MESSAGE "Aplikacja %ls została zamknięta z powodu błędu. Informacje o tym błędzie zostały zapisne w:\r\n\r\n%ls" +END diff --git a/base/system/winlogon/lang/pl-PL.rc b/base/system/winlogon/lang/pl-PL.rc index ae112f0944..71e8e7828c 100644 --- a/base/system/winlogon/lang/pl-PL.rc +++ b/base/system/winlogon/lang/pl-PL.rc @@ -29,14 +29,14 @@ END IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP -CAPTION "System Shutdown" +CAPTION "Zamykanie systemu" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 - LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "Trwa zamykanie systemu. Zapisz wszystkie rozpoczęte prace i wyloguj się. Wszystkie niezapisane zmiany zostaną utracone po zamknięciu systemu.", -1, 38, 7, 135, 40 + LTEXT "Czas do zamknięcia:", -1, 38, 50, 90, 8 LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 - LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "Wiadomość:", -1, 38, 65, 135, 8 LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END diff --git a/win32ss/user/winsrv/usersrv/lang/pl-PL.rc b/win32ss/user/winsrv/usersrv/lang/pl-PL.rc index 5f9dd73401..3839de66c5 100644 --- a/win32ss/user/winsrv/usersrv/lang/pl-PL.rc +++ b/win32ss/user/winsrv/usersrv/lang/pl-PL.rc @@ -34,16 +34,16 @@ END STRINGTABLE BEGIN - IDS_SEVERITY_SUCCESS "Success" - IDS_SEVERITY_INFORMATIONAL "System Information" - IDS_SEVERITY_WARNING "System Warning" - IDS_SEVERITY_ERROR "System Error" + IDS_SEVERITY_SUCCESS "Sukces" + IDS_SEVERITY_INFORMATIONAL "Informacja" + IDS_SEVERITY_WARNING "Uwaga" + IDS_SEVERITY_ERROR "Błąd" END STRINGTABLE BEGIN - IDS_SYSTEM_PROCESS "System Process" - IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" - IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." - IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." + IDS_SYSTEM_PROCESS "Proces systemowy" + IDS_UNKNOWN_SOFTWARE_EXCEPT "nieznany wyjątek programowy" + IDS_OK_TERMINATE_PROGRAM "Kliknij OK aby zakończyć pracę programu." + IDS_CANCEL_DEBUG_PROGRAM "Kliknij Anuluj aby uzyskać więcej informacji o błędzie." END

1 0

01/01: [TRANSLATION][SHELL32] Corrected mistakes
by Joann Mõndresku 10 Apr '18

10 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6522bb42dff8169fc46e1… commit 6522bb42dff8169fc46e1d11a523a40d4d4a9f70 Author: Joann Mõndresku <joann.mondresku(a)gmail.com> AuthorDate: Tue Apr 10 18:25:48 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Apr 10 22:49:16 2018 +0200 [TRANSLATION][SHELL32] Corrected mistakes --- dll/win32/shell32/lang/et-EE.rc | 88 ++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 4acbe06a3b..3bc7300cf4 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -44,7 +44,7 @@ BEGIN MENUITEM "Värskenda", FCIDM_SHVIEW_REFRESH MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Kleebi", FCIDM_SHVIEW_INSERT - MENUITEM "Kleebi otsetee", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Kleebi otseteena", FCIDM_SHVIEW_INSERTLINK END END @@ -87,17 +87,17 @@ IDM_DRAGFILE MENU BEGIN POPUP "" BEGIN - MENUITEM "&Copy here", IDM_COPYHERE - MENUITEM "&Move here", IDM_MOVEHERE - MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM "&Kopeeri siia", IDM_COPYHERE + MENUITEM "&Liiguta siia", IDM_MOVEHERE + MENUITEM "Loo &otsetee siia", IDM_LINKHERE MENUITEM SEPARATOR - MENUITEM "Cancel", 0 + MENUITEM "Loobu", 0 END END IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Browse for Folder" +CAPTION "Vali kaust" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP @@ -109,7 +109,7 @@ END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Browse for Folder" +CAPTION "Vali kaust" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 @@ -165,7 +165,7 @@ IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS'i on teile toonud:", IDC_STATIC, 0, 0, 180, 10 + LTEXT "ReactOSi on teile toonud:", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END @@ -175,7 +175,7 @@ CAPTION "Käivitus" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Tippige programmi, kausta, dokumendi või Interneti-ressursi nimi ja ReactOS avab selle.", 12289, 36, 11, 182, 18 + LTEXT "Kirjuta programmi, kausta, dokumendi või Interneti-ressursi nimi ja ReactOS avab selle.", 12289, 36, 11, 182, 18 LTEXT "&Ava:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP @@ -217,9 +217,9 @@ CAPTION "Laiendatud atribuudid" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON - LTEXT "Valige selle otsetee jaoks soovitud täpsemad atribuudid.", -1, 5, 30, 210, 10 + LTEXT "Vali selle otsetee jaoks soovitud täpsemad atribuudid.", -1, 5, 30, 210, 10 CHECKBOX "Käivita teistsuguse mandaadiga", 14000, 25, 50, 150, 10 - LTEXT "Sellse suvandi abil saate käivitada otsetee teise kasutajana või jätkata oma kasutajanime all, kaitstes samal ajal oma arvutit ja andmeid volitamata programmitegevuse eest.", -1, 50, 60, 175, 40 + LTEXT "Selle suvandi abil saad käivitada otsetee teise või enda kasutajanime all, kaitstes samal ajal oma arvutit ja andmeid volitamata programmitegevuse eest.", -1, 50, 60, 175, 40 CHECKBOX "Käivita eraldi mäluruumis", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Loobu", 2, 120, 124, 50, 15, WS_VISIBLE @@ -264,7 +264,7 @@ BEGIN LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Faili tüüp:", 14004, 8, 35, 50, 10 CONTROL "Fail", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10 - LTEXT "Avab programmiga:", 14006, 8, 53, 50, 10 + LTEXT "Ava programmiga:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Muuda...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP @@ -375,7 +375,7 @@ BEGIN LTEXT "Millise kasutajakonto abil soovite selle programmi käivitada?", -1, 10, 20, 220, 20 CHECKBOX "Praegune kasutaja %s", 14000, 10, 45, 150, 10 LTEXT "Kaitse minu arvutit ja andmeid volitamata programmitegevuse eest", -1, 25, 57, 200, 10, WS_DISABLED - CHECKBOX "See suvand võib takistada arvutiviirusi teie arvutit või andmeid kahjustamast, kuid selle valimine võib põhjustada programmi valesti töötamist.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "See suvand võib takistada arvutiviirusi Sinu arvutit või andmeid kahjustamast, kuid selle valimine võib põhjustada programmi valesti töötamist.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE CHECKBOX "Järgmine kasutaja:", 14002, 10, 100, 90, 10 LTEXT "Kasutajanimi:", -1, 20, 118, 54, 10 COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -407,7 +407,7 @@ CAPTION "Programmiga avamine" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 - LTEXT "Vali programm, mille abil soovite selle faili avada:", -1, 44, 12, 211, 10 + LTEXT "Vali programm, mille abil soovid selle faili avada:", -1, 44, 12, 211, 10 LTEXT "Fail: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programmid", -1, 7, 42, 249, 187 CONTROL "Programmid", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 @@ -425,7 +425,7 @@ BEGIN GROUPBOX "Toimingud", -1, 7, 10, 249, 45 CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20 AUTORADIOBUTTON "Näita kaustades tavalisi &toiminguid", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Kasuta Windowsi klassikalisi &kaustu", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10 + AUTORADIOBUTTON "Kasuta ReactOSi klassikalisi &kaustu", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10 GROUPBOX "Kaustade sirvimine", -1, 7, 60, 249, 45, WS_TABSTOP CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20 AUTORADIOBUTTON "Ava iga kaust &samas aknas", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP @@ -446,7 +446,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Kaustavaated", -1, 7, 10, 249, 60 ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20 - LTEXT "Selle kausta puhul kasutatud vaadet (nt Üksikasjad\nvõi Paanid) võite rakendada kõigile kaustadele.", -1, 60, 20, 180, 20 + LTEXT "Selle kausta puhul kasutatud vaadet (nt Üksikasjad\nvõi Paanid) võid rakendada kõigile kaustadele.", -1, 60, 20, 180, 20 PUSHBUTTON "&Rakenda kõigile kaustadele", 14001, 60, 50, 90, 14, WS_TABSTOP PUSHBUTTON "&Lähtesta kõik kaustad", 14002, 160, 50, 80, 14, WS_TABSTOP LTEXT "Täpsemad sätted:", -1, 7, 80, 100, 10 @@ -485,7 +485,7 @@ BEGIN LTEXT "See kaust sisaldab juba faili nimega '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX LTEXT "See kaust sisaldab juba kirjutuskaitstud faili nimega '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX LTEXT "See kaust sisaldab juba süsteemi faili nimega '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX - LTEXT "Kas soovite asendada olemasoleva faili", -1, 44, 35, 228, 10, SS_NOPREFIX + LTEXT "Kas soovid asendada olemasoleva faili", -1, 44, 35, 228, 10, SS_NOPREFIX LTEXT "(tundmatu kuupäev ja maht)", 12302, 79, 51, 198, 20, SS_NOPREFIX ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL LTEXT "sellega?", -1, 44, 75, 228, 10, SS_NOPREFIX @@ -499,7 +499,7 @@ CAPTION "Logi ReactOS'ist välja" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Kas soovite kindlasti välja logida?", -1, 49, 15, 131, 8 + LTEXT "Kas soovid kindlasti välja logida?", -1, 49, 15, 131, 8 DEFPUSHBUTTON "&Logi välja", IDOK, 49, 38, 43, 14 PUSHBUTTON "Loobu", IDCANCEL, 99, 38, 43, 14 END @@ -510,7 +510,7 @@ CAPTION "Ühenda ReactOS lahti" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_DISCONN, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Kas soovite kindlasti lahti ühendada?", -1, 49, 15, 131, 8 + LTEXT "Kas soovid kindlasti lahti ühendada?", -1, 49, 15, 131, 8 DEFPUSHBUTTON "&Ühenda lahti", IDOK, 47, 38, 47, 14 PUSHBUTTON "Loobu", IDCANCEL, 99, 38, 47, 14 END @@ -567,7 +567,7 @@ BEGIN LTEXT "ReactOS saab automaatselt sooritada sama toimingut iga kord kui ühendate seda seadet.", 1001, 32, 7, 190, 22 LTEXT "&Mida soovite ReactOSil teha lasta?", 1002, 32, 31, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96 - AUTOCHECKBOX "&Valige sooritav toiming", 1004, 32, 143, 190, 8 + AUTOCHECKBOX "&Valige toiming", 1004, 32, 143, 190, 8 DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14 PUSHBUTTON "Loobu", IDCANCEL, 159, 160, 60, 14 END @@ -578,9 +578,9 @@ CAPTION "Sulge ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP - LTEXT "Mida tahate arvutil teha lasta?", -1, 39, 7, 167, 10 + LTEXT "Mida tahad arvutil teha lasta?", -1, 39, 7, 167, 10 COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL - LTEXT "Säilitab teie sessiooni hoides arvuti vähese mäluga koos andmetega üleval. Arvuti ärkab klahvivajutusele või hiire liigutusele üles.", 8225, 39, 40, 167, 37 + LTEXT "Säilitab Sinu sessiooni hoides arvuti vähese mäluga koos andmetega üleval. Arvuti ärkab klahvivajutusele või hiire liigutusele üles.", 8225, 39, 40, 167, 37 DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP PUSHBUTTON "Loobu", IDCANCEL, 75, 82, 60, 14 PUSHBUTTON "&Abi", IDHELP, 144, 82, 60, 14 @@ -642,9 +642,9 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20 LTEXT "Seda faili kasutavad operatsioonisüsteem ja paljud\n\ -programmid. Selle redigeerimine või muutmine võib teie\n\ +programmid. Selle redigeerimine või muutmine võib Sinu\n\ süsteemi kahjustada..\n\n\ -Kas olete kindel et soovite seda faili avada?", IDC_STATIC, 35, 5, 230, 60 +Kas oled kindel et soovid seda faili avada?", IDC_STATIC, 35, 5, 230, 60 DEFPUSHBUTTON "Jah", IDYES, 125, 55, 50, 14 PUSHBUTTON "Ei", IDNO, 180, 55, 50, 14 END @@ -682,9 +682,9 @@ BEGIN IDS_ADMINISTRATIVETOOLS "Haldusriistad" /* special folders descriptions */ - IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Saate konfigureerida oma arvuti haldussätted." - IDS_FOLDER_OPTIONS_DESCRIPTION "Saate kohandada failide ja kaustada kuvamisviisi, muuta failiseoseid." - IDS_FONTS_DESCRIPTION "Saate lisada, muuta ja hallata oma arvutis fonte." + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Saad konfigureerida oma arvuti haldussätted." + IDS_FOLDER_OPTIONS_DESCRIPTION "Saad kohandada failide ja kaustada kuvamisviisi, muuta failiseoseid." + IDS_FONTS_DESCRIPTION "Saad lisada, muuta ja hallata oma arvutis fonte." IDS_PRINTERS_DESCRIPTION "Kuvab installitud printerid ja faksprinterid ja aitab teil uusi lisada." /* context menus */ @@ -710,16 +710,16 @@ BEGIN IDS_CREATEFOLDER_CAPTION "Ei saa kausta luua" IDS_DELETEITEM_CAPTION "Kinnita faili kustutamine" IDS_DELETEFOLDER_CAPTION "Kinnita kausta kustutamine" - IDS_DELETEITEM_TEXT "Kas soovite kindlasti kustutada üksust '%1'?" - IDS_DELETEMULTIPLE_TEXT "Kas soovite kindlasti kustutada need %1 üksust?" - IDS_DELETESELECTED_TEXT "Kas soovite kindlasti kustutada need valitud üksused?" - IDS_TRASHITEM_TEXT "Kas soovite kindlasti saata üksuse '%1' prügikasti?" - IDS_TRASHFOLDER_TEXT "Kas soovite kindlasti eemaldada kausta '%1' ja teiseldada kogu selle sisu prügikasti?" - IDS_TRASHMULTIPLE_TEXT "Kas soovite kindlasti saata need %1 üksust prügikasti?" - IDS_CANTTRASH_TEXT "Üksust '%1' ei saa teiseldada prügikasti. Kas soovite seda kustutada?" - IDS_OVERWRITEFILE_TEXT "See kaust sisaldab juba faili nimega '%1'.\n\nKas soovite asendada olemasoleva faili?" + IDS_DELETEITEM_TEXT "Kas kindlasti soovid kustutada üksust '%1'?" + IDS_DELETEMULTIPLE_TEXT "Kas kindlasti soovid kustutada need %1 üksust?" + IDS_DELETESELECTED_TEXT "Kas kindlasti soovid kustutada need valitud üksused?" + IDS_TRASHITEM_TEXT "Kas kindlasti soovid saata üksuse '%1' prügikasti?" + IDS_TRASHFOLDER_TEXT "Kas kindlasti soovid eemaldada kausta '%1' ja teiseldada kogu selle sisu prügikasti?" + IDS_TRASHMULTIPLE_TEXT "Kas kindlasti soovid saata need %1 üksust prügikasti?" + IDS_CANTTRASH_TEXT "Üksust '%1' ei saa teiseldada prügikasti. Kas soovid need kustutada?" + IDS_OVERWRITEFILE_TEXT "See kaust sisaldab juba faili nimega '%1'.\n\nKas soovid asendada olemasoleva faili?" IDS_OVERWRITEFILE_CAPTION "Kinnita faili ülekirjutamine" - IDS_OVERWRITEFOLDER_TEXT "See kaust sisaldab juba kausta nimega '%1'.\n\nKui olemasoleva kausta failidel on sama nimi nagu teiseldatava või kopeeritava kausta failidel, siis need asendatakse. Kas soovite kausta ikkagi teiseldada või kopeerida?" + IDS_OVERWRITEFOLDER_TEXT "See kaust sisaldab juba kausta nimega '%1'.\n\nKui olemasoleva kausta failidel on sama nimi nagu teiseldatava või kopeeritava kausta failidel, siis need asendatakse. Kas soovid kausta ikkagi teiseldada või kopeerida?" IDS_FILEOOP_COPYING "Kopeerimine..." IDS_FILEOOP_MOVING "Liigutamine..." @@ -730,9 +730,9 @@ BEGIN /* message box strings */ IDS_RESTART_TITLE "Taaskäivita" - IDS_RESTART_PROMPT "Kas soovite taaskäivitada süsteemi?" + IDS_RESTART_PROMPT "Kas soovid taaskäivitada süsteemi?" IDS_SHUTDOWN_TITLE "Lülita välja" - IDS_SHUTDOWN_PROMPT "Kas soovite arvuti välja lülitada?" + IDS_SHUTDOWN_PROMPT "Kas soovid arvuti välja lülitada?" /* Run File dialog */ IDS_RUNDLG_ERROR "Ei saanud kuvada Run faili dialoogiboksi (sisemine viga)" @@ -747,13 +747,13 @@ BEGIN IDS_STARTUP "Start Menu\\Programs\\StartUp" IDS_RECENT "Hiljutised" IDS_SENDTO "SendTo" - IDS_STARTMENU "Start Menu" + IDS_STARTMENU "Start Menüü" IDS_MYMUSIC "Minu muusika" IDS_MYVIDEO "Minu videod" IDS_DESKTOPDIRECTORY "Töölaud" IDS_NETHOOD "NetHood" IDS_TEMPLATES "Mallid" - IDS_APPDATA "Rakendusted Andmed" + IDS_APPDATA "Rakenduste Andmed" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Local Settings\\Application Data" IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" @@ -775,7 +775,7 @@ BEGIN IDS_DRIVE_FIXED "Kohalik ketas" IDS_DRIVE_CDROM "CD-draiv" IDS_DRIVE_NETWORK "Võrgudraiv" - IDS_DRIVE_FLOPPY "3.5 Floppy" + IDS_DRIVE_FLOPPY "3.5 Floppi" IDS_DRIVE_REMOVABLE "Irdmäluga seade" IDS_FS_UNKNOWN "Tundmatu" @@ -824,7 +824,7 @@ BEGIN IDS_SCR_FILE "Ekraanisäästja" IDS_SYS_FILE "Süsteemi fail" IDS_VXD_FILE "Virtuaalseadme draiver" - IDS_ANY_FILE "%s-file" + IDS_ANY_FILE "%s-fail" IDS_OPEN_VERB "Ava" IDS_EXPLORE_VERB "Uuri" @@ -841,10 +841,10 @@ BEGIN IDS_DEFAULT_CLUSTER_SIZE "Vaikimisi jaotusühik" IDS_COPY_OF "Koopia üksusest" - IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "Ühtegi ReactOSi programmi ei ole seadistatud seda tüüpi failide avamiseks." IDS_FILE_DETAILS "Üksikasjad '%s' laienduse kohta" - IDS_FILE_DETAILSADV "Faili, mille laiend on '%s', on tüübiga '%s'. Kõiki '%s'-tüüpi faile mõjutavate sätete muutmiseks klõpsake nuppu Täpsemalt." + IDS_FILE_DETAILSADV "Faili, mille laiend on '%s', on tüübiga '%s'. Kõiki '%s'-tüüpi faile mõjutavate sätete muutmiseks klõpsa nuppu Täpsemalt." IDS_FILE_TYPES "Failitüübid" IDS_COLUMN_EXTENSION "Laiendused"

1 0

01/01: [NET] Improve the NET STATISTICS command
by Eric Kohl 10 Apr '18

10 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e60a17e8b05657d7ee61… commit 2e60a17e8b05657d7ee6127ba8caa0757c41134a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Apr 10 21:32:30 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Apr 10 21:34:00 2018 +0200 [NET] Improve the NET STATISTICS command - Add resource strings for the NET STATISTICS SERVER command. - Convert and display the 'statistics since' time. --- base/applications/network/net/cmdStatistics.c | 109 +++++++++++++++++++++----- base/applications/network/net/lang/en-US.rc | 20 ++++- base/applications/network/net/lang/es-ES.rc | 20 ++++- base/applications/network/net/lang/ro-RO.rc | 20 ++++- base/applications/network/net/lang/ru-RU.rc | 20 ++++- base/applications/network/net/lang/tr-TR.rc | 20 ++++- base/applications/network/net/lang/zh-CN.rc | 20 ++++- base/applications/network/net/lang/zh-TW.rc | 20 ++++- base/applications/network/net/resource.h | 21 ++++- 9 files changed, 235 insertions(+), 35 deletions(-) diff --git a/base/applications/network/net/cmdStatistics.c b/base/applications/network/net/cmdStatistics.c index 7a048c06da..23a6e5f0df 100644 --- a/base/applications/network/net/cmdStatistics.c +++ b/base/applications/network/net/cmdStatistics.c @@ -6,6 +6,8 @@ */ #include "net.h" +#include <rtltypes.h> +#include <rtlfuncs.h> static INT @@ -14,6 +16,10 @@ DisplayServerStatistics(VOID) PSERVER_INFO_100 ServerInfo = NULL; PSTAT_SERVER_0 StatisticsInfo = NULL; LARGE_INTEGER LargeValue; + FILETIME FileTime, LocalFileTime; + SYSTEMTIME SystemTime; + WORD wHour; + INT nPaddedLength = 33; NET_API_STATUS Status; Status = NetServerGetInfo(NULL, 100, (PBYTE*)&ServerInfo); @@ -28,35 +34,77 @@ DisplayServerStatistics(VOID) if (Status != NERR_Success) goto done; - ConResPrintf(StdOut, IDS_STATISTICS_SERVER_NAME, ServerInfo->sv100_name); + ConResPrintf(StdOut, IDS_STATISTICS_SRV_NAME, ServerInfo->sv100_name); - printf("Statistik since %lu\n\n\n", StatisticsInfo->sts0_start); + RtlSecondsSince1970ToTime(StatisticsInfo->sts0_start, + &LargeValue); + FileTime.dwLowDateTime = LargeValue.u.LowPart; + FileTime.dwHighDateTime = LargeValue.u.HighPart; + FileTimeToLocalFileTime(&FileTime, &LocalFileTime); + FileTimeToSystemTime(&LocalFileTime, &SystemTime); - printf("Sessions accepted %lu\n", StatisticsInfo->sts0_sopens); - printf("Sessions timed-out %lu\n", StatisticsInfo->sts0_stimedout); - printf("Sessions errored-out %lu\n\n", StatisticsInfo->sts0_serrorout); + wHour = SystemTime.wHour; + if (wHour == 0) + { + wHour = 12; + } + else if (wHour > 12) + { + wHour = wHour - 12; + } + + ConResPrintf(StdOut, IDS_STATISTICS_SINCE, + SystemTime.wMonth, SystemTime.wDay, SystemTime.wYear, + wHour, SystemTime.wMinute, + (SystemTime.wHour >= 1 && SystemTime.wHour < 13) ? L"AM" : L"PM"); + + PrintPaddedResourceString(IDS_STATISTICS_SRV_SESACCEPT, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_sopens); + + PrintPaddedResourceString(IDS_STATISTICS_SRV_SESSTIME, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_stimedout); + + PrintPaddedResourceString(IDS_STATISTICS_SRV_SESSERROR, nPaddedLength); + ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->sts0_serrorout); LargeValue.u.LowPart = StatisticsInfo->sts0_bytessent_low; LargeValue.u.HighPart = StatisticsInfo->sts0_bytessent_high; - printf("Kilobytes sent %I64u\n", LargeValue.QuadPart / 1024); + PrintPaddedResourceString(IDS_STATISTICS_SRV_KBSENT, nPaddedLength); + ConPrintf(StdOut, L"%I64u\n", LargeValue.QuadPart / 1024); LargeValue.u.LowPart = StatisticsInfo->sts0_bytesrcvd_low; LargeValue.u.HighPart = StatisticsInfo->sts0_bytesrcvd_high; - printf("Kilobytes received %I64u\n\n", LargeValue.QuadPart / 1024); + PrintPaddedResourceString(IDS_STATISTICS_SRV_KBRCVD, nPaddedLength); + ConPrintf(StdOut, L"%I64u\n", LargeValue.QuadPart / 1024); + + PrintPaddedResourceString(IDS_STATISTICS_SRV_MRESPTIME, nPaddedLength); + ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->sts0_avresponse); + + PrintPaddedResourceString(IDS_STATISTICS_SRV_SYSERRORS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_syserrors); + + PrintPaddedResourceString(IDS_STATISTICS_SRV_PMERRORS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_permerrors); - printf("Mean response time (msec) %lu\n\n", StatisticsInfo->sts0_avresponse); + PrintPaddedResourceString(IDS_STATISTICS_SRV_PWERRORS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->sts0_pwerrors); - printf("System errors %lu\n", StatisticsInfo->sts0_syserrors); - printf("Permission violations %lu\n", StatisticsInfo->sts0_permerrors); - printf("Password violations %lu\n\n", StatisticsInfo->sts0_pwerrors); + PrintPaddedResourceString(IDS_STATISTICS_SRV_FILES, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_fopens); - printf("Files accessed %lu\n", StatisticsInfo->sts0_fopens); - printf("Communication devices accessed %lu\n", StatisticsInfo->sts0_devopens); - printf("Print jobs spooled %lu\n\n", StatisticsInfo->sts0_jobsqueued); + PrintPaddedResourceString(IDS_STATISTICS_SRV_DEVICES, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_devopens); - printf("Times buffers exhausted\n\n"); - printf(" Big buffers %lu\n", StatisticsInfo->sts0_bigbufneed); - printf(" Request buffers %lu\n\n", StatisticsInfo->sts0_reqbufneed); + PrintPaddedResourceString(IDS_STATISTICS_SRV_JOBS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->sts0_jobsqueued); + + ConResPuts(StdOut, IDS_STATISTICS_SRV_BUFFERS); + + PrintPaddedResourceString(IDS_STATISTICS_SRV_BIGBUFFERS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_bigbufneed); + + PrintPaddedResourceString(IDS_STATISTICS_SRV_REQBUFFERS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->sts0_reqbufneed); done: if (StatisticsInfo != NULL) @@ -75,6 +123,10 @@ DisplayWorkstationStatistics(VOID) { PWKSTA_INFO_100 WorkstationInfo = NULL; PSTAT_WORKSTATION_0 StatisticsInfo = NULL; + LARGE_INTEGER LargeValue; + FILETIME FileTime, LocalFileTime; + SYSTEMTIME SystemTime; + WORD wHour; NET_API_STATUS Status; Status = NetWkstaGetInfo(NULL, @@ -91,9 +143,28 @@ DisplayWorkstationStatistics(VOID) if (Status != NERR_Success) goto done; - ConResPrintf(StdOut, IDS_STATISTICS_WORKSTATION_NAME, WorkstationInfo->wki100_computername); + ConResPrintf(StdOut, IDS_STATISTICS_WKS_NAME, WorkstationInfo->wki100_computername); + + RtlSecondsSince1970ToTime(StatisticsInfo->StatisticsStartTime.u.LowPart, + &LargeValue); + FileTime.dwLowDateTime = LargeValue.u.LowPart; + FileTime.dwHighDateTime = LargeValue.u.HighPart; + FileTimeToLocalFileTime(&FileTime, &LocalFileTime); + FileTimeToSystemTime(&LocalFileTime, &SystemTime); + + wHour = SystemTime.wHour; + if (wHour == 0) + { + wHour = 12; + } + else if (wHour > 12) + { + wHour = wHour - 12; + } - printf("Statistik since %I64u\n\n\n", StatisticsInfo->StatisticsStartTime.QuadPart); + ConResPrintf(StdOut, IDS_STATISTICS_SINCE, + SystemTime.wMonth, SystemTime.wDay, SystemTime.wYear, + wHour, SystemTime.wMinute, (SystemTime.wHour >= 1 && SystemTime.wHour < 13) ? L"AM" : L"PM"); printf("Bytes received %I64u\n", StatisticsInfo->BytesReceived.QuadPart); printf("Server Message Blocks (SMBs) received %I64u\n", StatisticsInfo->SmbsReceived.QuadPart); diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index f778c5a668..5d7f207b12 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -193,8 +193,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" - IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" + IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" + IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" + IDS_STATISTICS_SRV_SESSERROR "Sessions errored-out" + IDS_STATISTICS_SRV_KBSENT "Kilobytes sent" + IDS_STATISTICS_SRV_KBRCVD "Kilobytes received" + IDS_STATISTICS_SRV_MRESPTIME "Mean response time (msec)" + IDS_STATISTICS_SRV_SYSERRORS "System errors" + IDS_STATISTICS_SRV_PMERRORS "Permission violations" + IDS_STATISTICS_SRV_PWERRORS "Password violations" + IDS_STATISTICS_SRV_FILES "Files accessed" + IDS_STATISTICS_SRV_DEVICES "Communication devices accessed" + IDS_STATISTICS_SRV_JOBS "Print jobs spooled" + IDS_STATISTICS_SRV_BUFFERS "Times buffers exhausted\n\n" + IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" + IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" + IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" IDS_USER_ACCOUNTS "User accounts for \\\\%s" IDS_USER_NAME "User name" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 54dbacf2c6..bb2a33ec6b 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -194,8 +194,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" - IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" + IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" + IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" + IDS_STATISTICS_SRV_SESSERROR "Sessions errored-out" + IDS_STATISTICS_SRV_KBSENT "Kilobytes sent" + IDS_STATISTICS_SRV_KBRCVD "Kilobytes received" + IDS_STATISTICS_SRV_MRESPTIME "Mean response time (msec)" + IDS_STATISTICS_SRV_SYSERRORS "System errors" + IDS_STATISTICS_SRV_PMERRORS "Permission violations" + IDS_STATISTICS_SRV_PWERRORS "Password violations" + IDS_STATISTICS_SRV_FILES "Files accessed" + IDS_STATISTICS_SRV_DEVICES "Communication devices accessed" + IDS_STATISTICS_SRV_JOBS "Print jobs spooled" + IDS_STATISTICS_SRV_BUFFERS "Times buffers exhausted\n\n" + IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" + IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" + IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" IDS_USER_ACCOUNTS "Cuentas de usuario en \\\\%s" IDS_USER_NAME "Nombre de usuario" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index a97a9b9dc8..6fc84bb0a9 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -197,8 +197,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" - IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" + IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" + IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" + IDS_STATISTICS_SRV_SESSERROR "Sessions errored-out" + IDS_STATISTICS_SRV_KBSENT "Kilobytes sent" + IDS_STATISTICS_SRV_KBRCVD "Kilobytes received" + IDS_STATISTICS_SRV_MRESPTIME "Mean response time (msec)" + IDS_STATISTICS_SRV_SYSERRORS "System errors" + IDS_STATISTICS_SRV_PMERRORS "Permission violations" + IDS_STATISTICS_SRV_PWERRORS "Password violations" + IDS_STATISTICS_SRV_FILES "Files accessed" + IDS_STATISTICS_SRV_DEVICES "Communication devices accessed" + IDS_STATISTICS_SRV_JOBS "Print jobs spooled" + IDS_STATISTICS_SRV_BUFFERS "Times buffers exhausted\n\n" + IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" + IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" + IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" IDS_USER_ACCOUNTS "Conturi de utilizator pentru \\\\%s" IDS_USER_NAME "Nume utilizator" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 87bb958e99..2c1df320eb 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -193,8 +193,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" - IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" + IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" + IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" + IDS_STATISTICS_SRV_SESSERROR "Sessions errored-out" + IDS_STATISTICS_SRV_KBSENT "Kilobytes sent" + IDS_STATISTICS_SRV_KBRCVD "Kilobytes received" + IDS_STATISTICS_SRV_MRESPTIME "Mean response time (msec)" + IDS_STATISTICS_SRV_SYSERRORS "System errors" + IDS_STATISTICS_SRV_PMERRORS "Permission violations" + IDS_STATISTICS_SRV_PWERRORS "Password violations" + IDS_STATISTICS_SRV_FILES "Files accessed" + IDS_STATISTICS_SRV_DEVICES "Communication devices accessed" + IDS_STATISTICS_SRV_JOBS "Print jobs spooled" + IDS_STATISTICS_SRV_BUFFERS "Times buffers exhausted\n\n" + IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" + IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" + IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" IDS_USER_ACCOUNTS "Учетные записи пользователей для \\\\%s" IDS_USER_NAME "Имя пользователя" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 3930ce709d..a27cf19e7d 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -193,8 +193,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" - IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" + IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" + IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" + IDS_STATISTICS_SRV_SESSERROR "Sessions errored-out" + IDS_STATISTICS_SRV_KBSENT "Kilobytes sent" + IDS_STATISTICS_SRV_KBRCVD "Kilobytes received" + IDS_STATISTICS_SRV_MRESPTIME "Mean response time (msec)" + IDS_STATISTICS_SRV_SYSERRORS "System errors" + IDS_STATISTICS_SRV_PMERRORS "Permission violations" + IDS_STATISTICS_SRV_PWERRORS "Password violations" + IDS_STATISTICS_SRV_FILES "Files accessed" + IDS_STATISTICS_SRV_DEVICES "Communication devices accessed" + IDS_STATISTICS_SRV_JOBS "Print jobs spooled" + IDS_STATISTICS_SRV_BUFFERS "Times buffers exhausted\n\n" + IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" + IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" + IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" IDS_USER_ACCOUNTS "\\\\%s için kullanıcı hesapları" IDS_USER_NAME "Kullanıcı adı" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 6c6a4693a6..f1650effab 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -193,8 +193,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" - IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" + IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" + IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" + IDS_STATISTICS_SRV_SESSERROR "Sessions errored-out" + IDS_STATISTICS_SRV_KBSENT "Kilobytes sent" + IDS_STATISTICS_SRV_KBRCVD "Kilobytes received" + IDS_STATISTICS_SRV_MRESPTIME "Mean response time (msec)" + IDS_STATISTICS_SRV_SYSERRORS "System errors" + IDS_STATISTICS_SRV_PMERRORS "Permission violations" + IDS_STATISTICS_SRV_PWERRORS "Password violations" + IDS_STATISTICS_SRV_FILES "Files accessed" + IDS_STATISTICS_SRV_DEVICES "Communication devices accessed" + IDS_STATISTICS_SRV_JOBS "Print jobs spooled" + IDS_STATISTICS_SRV_BUFFERS "Times buffers exhausted\n\n" + IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" + IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" + IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" IDS_USER_ACCOUNTS "\\\\%s 的用户帐户" IDS_USER_NAME "用户名" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index ff2c74c39e..89c63d0752 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -193,8 +193,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" - IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" + IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" + IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" + IDS_STATISTICS_SRV_SESSERROR "Sessions errored-out" + IDS_STATISTICS_SRV_KBSENT "Kilobytes sent" + IDS_STATISTICS_SRV_KBRCVD "Kilobytes received" + IDS_STATISTICS_SRV_MRESPTIME "Mean response time (msec)" + IDS_STATISTICS_SRV_SYSERRORS "System errors" + IDS_STATISTICS_SRV_PMERRORS "Permission violations" + IDS_STATISTICS_SRV_PWERRORS "Password violations" + IDS_STATISTICS_SRV_FILES "Files accessed" + IDS_STATISTICS_SRV_DEVICES "Communication devices accessed" + IDS_STATISTICS_SRV_JOBS "Print jobs spooled" + IDS_STATISTICS_SRV_BUFFERS "Times buffers exhausted\n\n" + IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" + IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" + IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" IDS_USER_ACCOUNTS "使用者帳戶 \\\\%s" IDS_USER_NAME "使用者名稱" diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 0c53afc07a..441b00a2a4 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -111,8 +111,25 @@ #define IDS_LOCALGROUP_MEMBERS 303 #define IDS_STATISTICS_TEXT 320 -#define IDS_STATISTICS_SERVER_NAME 321 -#define IDS_STATISTICS_WORKSTATION_NAME 322 +#define IDS_STATISTICS_SINCE 321 +#define IDS_STATISTICS_SRV_NAME 322 +#define IDS_STATISTICS_SRV_SESACCEPT 323 +#define IDS_STATISTICS_SRV_SESSTIME 324 +#define IDS_STATISTICS_SRV_SESSERROR 325 +#define IDS_STATISTICS_SRV_KBSENT 326 +#define IDS_STATISTICS_SRV_KBRCVD 327 +#define IDS_STATISTICS_SRV_MRESPTIME 328 +#define IDS_STATISTICS_SRV_SYSERRORS 329 +#define IDS_STATISTICS_SRV_PMERRORS 330 +#define IDS_STATISTICS_SRV_PWERRORS 331 +#define IDS_STATISTICS_SRV_FILES 332 +#define IDS_STATISTICS_SRV_DEVICES 333 +#define IDS_STATISTICS_SRV_JOBS 334 +#define IDS_STATISTICS_SRV_BUFFERS 335 +#define IDS_STATISTICS_SRV_BIGBUFFERS 336 +#define IDS_STATISTICS_SRV_REQBUFFERS 337 + +#define IDS_STATISTICS_WKS_NAME 342 #define IDS_USER_ACCOUNTS 449 #define IDS_USER_NAME 450

1 0

01/01: [TRANSLATION][MEDIA] Polish translation update (#479)
by Paweł Cholewa 10 Apr '18

10 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30eb3859f45f363f091c8… commit 30eb3859f45f363f091c84f0c5b3deda9859a65b Author: Paweł Cholewa <MCPlayG(a)wp.pl> AuthorDate: Tue Apr 10 15:50:03 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Apr 10 15:50:03 2018 +0200 [TRANSLATION][MEDIA] Polish translation update (#479) --- media/inf/shortcuts.inf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index c9d4c181a3..69fd403a29 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -1014,13 +1014,16 @@ ENTERTAINMENT=Rozrywka COMMUNICATIONS=Komunikacja GAMES=Gry +README_TITLE=Przeczytaj Mnie +README_DESC=Plik Przeczytaj Mnie ReactOS + CMD_TITLE=Wiersz polecenia CMD_DESC=Uruchom konsolę EXPLORER_TITLE=Eksplorator ReactOS EXPLORER_DESC=Uruchom Eksplorator RAPPS_TITLE=Menedżer aplikacji ReactOS RAPPS_TITLE_SHORT=Menedżer aplikacji -RAPPS_DESC=Ściągnij i zainstaluj inne aplikacje +RAPPS_DESC=Pobierz i zainstaluj inne aplikacje SERVMAN_TITLE=Menedżer usług SERVMAN_DESC=Uruchom Menedżer usług DEVMGMT_TITLE=Menedżer urządzeń

1 0

02/02: [RTL] actctx: Use the new RosGetProcessCompatVersion.
by Mark Jansen 09 Apr '18

09 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9aa26b9c232f9e8c500f0… commit 9aa26b9c232f9e8c500f021904eb49c54cd744e2 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Apr 9 18:55:59 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Apr 9 19:36:09 2018 +0200 [RTL] actctx: Use the new RosGetProcessCompatVersion. --- sdk/lib/rtl/actctx.c | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index f4a5f26124..2f82808dd5 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -16,6 +16,7 @@ #include <rtl.h> #include <ntstrsafe.h> +#include <compat_undoc.h> #define NDEBUG #include <debug.h> @@ -4935,9 +4936,6 @@ void actctx_init(void) HANDLE handle; WCHAR buffer[1024]; NTSTATUS Status; - BOOLEAN bForwardCompatible = FALSE; - ULONG Buffer[(sizeof(COMPATIBILITY_CONTEXT_ELEMENT) * 10 + sizeof(ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION)) / sizeof(ULONG)]; - SIZE_T SizeRequired; ctx.cbSize = sizeof(ctx); ctx.lpSource = NULL; @@ -4950,36 +4948,21 @@ void actctx_init(void) process_actctx = check_actctx(handle); } - /* FIXME: use RosGetProcessCompatVersion when PR419 gets merged */ - Status = RtlQueryInformationActivationContext(RTL_QUERY_ACTIVATION_CONTEXT_FLAG_NO_ADDREF, - NULL, - NULL, - CompatibilityInformationInActivationContext, - Buffer, - sizeof(Buffer), - &SizeRequired); - if (NT_SUCCESS(Status)) - { - ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION* ContextCompatInfo; - ContextCompatInfo = (ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION*)Buffer; - DPRINT("RtlQueryInformationActivationContext for CompatibilityInformationInActivationContext suceeded\n"); - /* No Compatibility elements present, bail out */ - if (ContextCompatInfo->ElementCount != 0) - { - DPRINT1("Found compatibility information in exe manifest (%d). Attempting to activate forward compatibility!\n", ContextCompatInfo->ElementCount); - bForwardCompatible = TRUE; - } - } - ctx.dwFlags = 0; ctx.hModule = NULL; ctx.lpResourceName = NULL; ctx.lpSource = buffer; - RtlStringCchCopyW(buffer, 1024, SharedUserData->NtSystemRoot); - if (!bForwardCompatible) - RtlStringCchCatW(buffer, 1024, L"\\winsxs\\manifests\\systemcompatible.manifest"); + RtlStringCchCopyW(buffer, RTL_NUMBER_OF(buffer), SharedUserData->NtSystemRoot); + + if (RosGetProcessCompatVersion()) + { + RtlStringCchCatW(buffer, RTL_NUMBER_OF(buffer), L"\\winsxs\\manifests\\forwardcompatible.manifest"); + } else - RtlStringCchCatW(buffer, 1024, L"\\winsxs\\manifests\\forwardcompatible.manifest"); + { + RtlStringCchCatW(buffer, RTL_NUMBER_OF(buffer), L"\\winsxs\\manifests\\systemcompatible.manifest"); + } + Status = RtlCreateActivationContext(0, (PVOID)&ctx, 0, NULL, NULL, &handle); if (NT_SUCCESS(Status)) {

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2018