September 2020 - Ros-diffs

[reactos] 24/179: [WINESYNC] dbghelp: Map SIMD dwarf registers on ARM64.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1191416699f8e50cda8f… commit d1191416699f8e50cda8f37acc1394899e953234 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:14:08 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:33 2020 +0200 [WINESYNC] dbghelp: Map SIMD dwarf registers on ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 86864486be64a277f6edf8e66709cd0f17a4eed9 by André Hentschel <nerv(a)dawncrow.de> --- dll/win32/dbghelp/cpu_arm64.c | 1 + sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/dbghelp/cpu_arm64.c b/dll/win32/dbghelp/cpu_arm64.c index dea19f83bac..f50b3255bd0 100644 --- a/dll/win32/dbghelp/cpu_arm64.c +++ b/dll/win32/dbghelp/cpu_arm64.c @@ -158,6 +158,7 @@ static unsigned arm64_map_dwarf_register(unsigned regno, BOOL eh_frame) if (regno == 29) return CV_ARM64_FP; if (regno == 30) return CV_ARM64_LR; if (regno == 31) return CV_ARM64_SP; + if (regno >= 64 && regno <= 95) return CV_ARM64_Q0 + regno - 64; FIXME("Don't know how to map register %d\n", regno); return CV_ARM64_NOREG; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index d497e3133cc..15ff3dbd075 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: 7d441808ac3b1d8bcef7795b636bda14c31c927b + wine: 86864486be64a277f6edf8e66709cd0f17a4eed9

4 years, 8 months

1
0
0 0

[reactos] 23/179: [WINESYNC] dbghelp: Read the stabs nlist entry corresponding to the target's architecture.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eaf6edad46672a486303b… commit eaf6edad46672a486303bd783026f90e3a66a1a8 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:14:05 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:33 2020 +0200 [WINESYNC] dbghelp: Read the stabs nlist entry corresponding to the target's architecture. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 7d441808ac3b1d8bcef7795b636bda14c31c927b by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/dbghelp_private.h | 2 +- dll/win32/dbghelp/macho_module.c | 16 +++----- dll/win32/dbghelp/stabs.c | 73 +++++++++++++++++++++---------------- sdk/tools/winesync/dbghelp.cfg | 2 +- 4 files changed, 48 insertions(+), 45 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index 537b9bc087b..21198f400ab 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -708,7 +708,7 @@ typedef void (*stabs_def_cb)(struct module* module, unsigned long load_offset, BOOL is_public, BOOL is_global, unsigned char other, struct symt_compiland* compiland, void* user); extern BOOL stabs_parse(struct module* module, unsigned long load_offset, - const void* stabs, int stablen, + const char* stabs, int stablen, const char* strs, int strtablen, stabs_def_cb callback, void* user) DECLSPEC_HIDDEN; diff --git a/dll/win32/dbghelp/macho_module.c b/dll/win32/dbghelp/macho_module.c index b8f5967137d..52c8e69108c 100644 --- a/dll/win32/dbghelp/macho_module.c +++ b/dll/win32/dbghelp/macho_module.c @@ -88,13 +88,6 @@ struct dyld_all_image_infos { WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_macho); -#ifdef _WIN64 -typedef struct nlist_64 macho_nlist; -#else -typedef struct nlist macho_nlist; -#endif - - /* Bitmask for Mach-O image header flags indicating that the image is in dyld's shared cached. That implies that its segments are mapped non-contiguously. This value isn't defined anywhere in headers. It's used in dyld and in @@ -913,24 +906,25 @@ static int macho_parse_symtab(struct image_file_map* ifm, struct macho_file_map* fmap = &ifm->u.macho; const struct symtab_command* sc = (const struct symtab_command*)lc; struct macho_debug_info* mdi = user; - const macho_nlist* stab; const char* stabstr; int ret = 0; + size_t stabsize = (ifm->addr_size == 32) ? sizeof(struct nlist) : sizeof(struct nlist_64); + const char *stab; TRACE("(%p/%d, %p, %p) %u syms at 0x%08x, strings 0x%08x - 0x%08x\n", fmap, fmap->fd, lc, user, sc->nsyms, sc->symoff, sc->stroff, sc->stroff + sc->strsize); - if (!macho_map_ranges(fmap, sc->symoff, sc->nsyms * sizeof(macho_nlist), + if (!macho_map_ranges(fmap, sc->symoff, sc->nsyms * stabsize, sc->stroff, sc->strsize, (const void**)&stab, (const void**)&stabstr)) return 0; if (!stabs_parse(mdi->module, mdi->module->format_info[DFI_MACHO]->u.macho_info->load_addr - fmap->segs_start, - stab, sc->nsyms * sizeof(macho_nlist), + stab, sc->nsyms * stabsize, stabstr, sc->strsize, macho_stabs_def_cb, mdi)) ret = -1; - macho_unmap_ranges(fmap, sc->symoff, sc->nsyms * sizeof(macho_nlist), + macho_unmap_ranges(fmap, sc->symoff, sc->nsyms * stabsize, sc->stroff, sc->strsize, (const void**)&stab, (const void**)&stabstr); return ret; diff --git a/dll/win32/dbghelp/stabs.c b/dll/win32/dbghelp/stabs.c index 1ec0065bb71..9caf6f9d427 100644 --- a/dll/win32/dbghelp/stabs.c +++ b/dll/win32/dbghelp/stabs.c @@ -41,6 +41,7 @@ #include <sys/mman.h> #endif #include <limits.h> +#include <stdint.h> #include <stdlib.h> #include <string.h> #ifdef HAVE_UNISTD_H @@ -119,11 +120,7 @@ struct stab_nlist unsigned char n_type; char n_other; short n_desc; -#if defined(__APPLE__) && defined(_WIN64) - unsigned long n_value; -#else unsigned n_value; -#endif }; static void stab_strcpy(char* dest, int sz, const char* source) @@ -1273,7 +1270,7 @@ static inline void stabbuf_append(char **buf, unsigned *buf_size, const char *st } BOOL stabs_parse(struct module* module, unsigned long load_offset, - const void* pv_stab_ptr, int stablen, + const char* pv_stab_ptr, int stablen, const char* strs, int strtablen, stabs_def_cb callback, void* user) { @@ -1286,7 +1283,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, const char* ptr; char* stabbuff; unsigned int stabbufflen; - const struct stab_nlist* stab_ptr = pv_stab_ptr; + const struct stab_nlist* stab_ptr; const char* strs_end; int strtabinc; char symname[4096]; @@ -1298,8 +1295,14 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, BOOL ret = TRUE; struct location loc; unsigned char type; + size_t stabsize = sizeof(struct stab_nlist); + uint64_t n_value; - nstab = stablen / sizeof(struct stab_nlist); +#ifdef __APPLE__ + if (module->process->is_64bit) + stabsize = sizeof(struct nlist_64); +#endif + nstab = stablen / stabsize; strs_end = strs + strtablen; memset(stabs_basic, 0, sizeof(stabs_basic)); @@ -1315,8 +1318,14 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, strtabinc = 0; stabbuff[0] = '\0'; - for (i = 0; i < nstab; i++, stab_ptr++) + for (i = 0; i < nstab; i++) { + stab_ptr = (struct stab_nlist *)(pv_stab_ptr + i * stabsize); + n_value = stab_ptr->n_value; +#ifdef __APPLE__ + if (module->process->is_64bit) + n_value = ((struct nlist_64 *)stab_ptr)->n_value; +#endif ptr = strs + stab_ptr->n_strx; if ((ptr > strs_end) || (ptr + strlen(ptr) > strs_end)) { @@ -1390,7 +1399,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, stab_strcpy(symname, sizeof(symname), ptr); loc.kind = loc_absolute; loc.reg = 0; - loc.offset = load_offset + stab_ptr->n_value; + loc.offset = load_offset + n_value; symt_new_global_variable(module, compiland, symname, TRUE /* FIXME */, loc, 0, stabs_parse_type(ptr)); break; @@ -1400,7 +1409,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, stab_strcpy(symname, sizeof(symname), ptr); loc.kind = loc_absolute; loc.reg = 0; - loc.offset = load_offset + stab_ptr->n_value; + loc.offset = load_offset + n_value; symt_new_global_variable(module, compiland, symname, TRUE /* FIXME */, loc, 0, stabs_parse_type(ptr)); break; @@ -1408,14 +1417,14 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, if (curr_func) { block = symt_open_func_block(module, curr_func, block, - stab_ptr->n_value, 0); + n_value, 0); pending_flush(&pending_block, module, curr_func, block); } break; case N_RBRAC: if (curr_func) block = symt_close_func_block(module, curr_func, block, - stab_ptr->n_value); + n_value); break; case N_PSYM: /* These are function parameters. */ @@ -1425,9 +1434,9 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, stab_strcpy(symname, sizeof(symname), ptr); loc.kind = loc_regrel; loc.reg = dbghelp_current_cpu->frame_regno; - loc.offset = stab_ptr->n_value; + loc.offset = n_value; symt_add_func_local(module, curr_func, - (int)stab_ptr->n_value >= 0 ? DataIsParam : DataIsLocal, + (int)n_value >= 0 ? DataIsParam : DataIsLocal, &loc, NULL, param_type, symname); symt_add_function_signature_parameter(module, (struct symt_function_signature*)curr_func->type, @@ -1441,7 +1450,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, loc.kind = loc_register; loc.offset = 0; - switch (stab_ptr->n_value) + switch (n_value) { case 0: loc.reg = CV_REG_EAX; break; case 1: loc.reg = CV_REG_ECX; break; @@ -1459,7 +1468,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case 16: case 17: case 18: - case 19: loc.reg = CV_REG_ST0 + stab_ptr->n_value - 12; break; + case 19: loc.reg = CV_REG_ST0 + n_value - 12; break; case 21: case 22: case 23: @@ -1467,7 +1476,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case 25: case 26: case 27: - case 28: loc.reg = CV_REG_XMM0 + stab_ptr->n_value - 21; break; + case 28: loc.reg = CV_REG_XMM0 + n_value - 21; break; case 29: case 30: case 31: @@ -1475,9 +1484,9 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case 33: case 34: case 35: - case 36: loc.reg = CV_REG_MM0 + stab_ptr->n_value - 29; break; + case 36: loc.reg = CV_REG_MM0 + n_value - 29; break; default: - FIXME("Unknown register value (%lu)\n", (unsigned long)stab_ptr->n_value); + FIXME("Unknown register value (%lu)\n", (unsigned long)n_value); loc.reg = CV_REG_NONE; break; } @@ -1500,7 +1509,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, /* These are local variables */ loc.kind = loc_regrel; loc.reg = dbghelp_current_cpu->frame_regno; - loc.offset = stab_ptr->n_value; + loc.offset = n_value; if (curr_func != NULL) pending_add_var(&pending_block, ptr, DataIsLocal, &loc); break; case N_SLINE: @@ -1511,14 +1520,14 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, assert(source_idx >= 0); if (curr_func != NULL) { - unsigned long offset = stab_ptr->n_value; + unsigned long offset = n_value; if (module->type == DMT_MACHO) offset -= curr_func->address - load_offset; symt_add_func_line(module, curr_func, source_idx, stab_ptr->n_desc, offset); } else pending_add_line(&pending_func, source_idx, stab_ptr->n_desc, - stab_ptr->n_value, load_offset); + n_value, load_offset); break; case N_FUN: /* @@ -1545,13 +1554,13 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, * and offset of last function */ stabs_finalize_function(module, curr_func, - stab_ptr->n_value ? - (load_offset + stab_ptr->n_value - curr_func->address) : 0); + n_value ? + (load_offset + n_value - curr_func->address) : 0); } func_type = symt_new_function_signature(module, stabs_parse_type(ptr), -1); curr_func = symt_new_function(module, compiland, symname, - load_offset + stab_ptr->n_value, 0, + load_offset + n_value, 0, &func_type->symt); pending_flush(&pending_func, module, curr_func, NULL); } @@ -1560,7 +1569,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, /* some versions of GCC to use a N_FUN "" to mark the end of a function * and n_value contains the size of the func */ - stabs_finalize_function(module, curr_func, stab_ptr->n_value); + stabs_finalize_function(module, curr_func, n_value); curr_func = NULL; } break; @@ -1602,7 +1611,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, break; case N_UNDF: strs += strtabinc; - strtabinc = stab_ptr->n_value; + strtabinc = n_value; /* I'm not sure this is needed, so trace it before we obsolete it */ if (curr_func) { @@ -1615,7 +1624,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, /* Ignore this. We don't care what it points to. */ break; case N_BINCL: - stabs_add_include(stabs_new_include(ptr, stab_ptr->n_value)); + stabs_add_include(stabs_new_include(ptr, n_value)); assert(incl_stk < (int)(sizeof(incl) / sizeof(incl[0])) - 1); incl[++incl_stk] = source_idx; source_idx = source_new(module, NULL, ptr); @@ -1625,9 +1634,9 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, source_idx = incl[incl_stk--]; break; case N_EXCL: - if (stabs_add_include(stabs_find_include(ptr, stab_ptr->n_value)) < 0) + if (stabs_add_include(stabs_find_include(ptr, n_value)) < 0) { - ERR("Excluded header not found (%s,%ld)\n", ptr, (unsigned long)stab_ptr->n_value); + ERR("Excluded header not found (%s,%ld)\n", ptr, (unsigned long)n_value); module_reset_debug_info(module); ret = FALSE; goto done; @@ -1664,7 +1673,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, if (*ptr == '_') ptr++; stab_strcpy(symname, sizeof(symname), ptr); - callback(module, load_offset, symname, stab_ptr->n_value, + callback(module, load_offset, symname, n_value, is_public, is_global, stab_ptr->n_other, compiland, user); } break; @@ -1674,7 +1683,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, } stabbuff[0] = '\0'; TRACE("0x%02x %lx %s\n", - stab_ptr->n_type, (unsigned long)stab_ptr->n_value, debugstr_a(strs + stab_ptr->n_strx)); + stab_ptr->n_type, (unsigned long)n_value, debugstr_a(strs + stab_ptr->n_strx)); } module->module.SymType = SymDia; module->module.CVSig = 'S' | ('T' << 8) | ('A' << 16) | ('B' << 24); diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index e4f1f15e1b4..d497e3133cc 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: 1dc9bb70cd16fa7b37e8fd6e82ed18311ddfbe38 + wine: 7d441808ac3b1d8bcef7795b636bda14c31c927b

4 years, 8 months

1
0
0 0

[reactos] 22/179: [WINESYNC] dbghelp: Translate the 32-bit Mach-O section header to the 64-bit one.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f631b4d12035fcb25616d… commit f631b4d12035fcb25616dcfb51b1f52c0ff60043 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:14:05 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:33 2020 +0200 [WINESYNC] dbghelp: Translate the 32-bit Mach-O section header to the 64-bit one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 1dc9bb70cd16fa7b37e8fd6e82ed18311ddfbe38 by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/image_private.h | 8 +------- dll/win32/dbghelp/macho_module.c | 43 ++++++++++++++++++++++++++------------- sdk/tools/winesync/dbghelp.cfg | 2 +- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dll/win32/dbghelp/image_private.h b/dll/win32/dbghelp/image_private.h index 329236c9bf5..6b435559d72 100644 --- a/dll/win32/dbghelp/image_private.h +++ b/dll/win32/dbghelp/image_private.h @@ -46,12 +46,6 @@ #endif #ifdef HAVE_MACH_O_LOADER_H #include <mach-o/loader.h> - -#ifdef _WIN64 -typedef struct section_64 macho_section; -#else -typedef struct section macho_section; -#endif #endif #define IMAGE_NO_MAP ((void*)-1) @@ -107,7 +101,7 @@ struct image_file_map int num_sections; struct { - const macho_section* section; + struct section_64 section; const char* mapped; unsigned int ignored : 1; }* sect; diff --git a/dll/win32/dbghelp/macho_module.c b/dll/win32/dbghelp/macho_module.c index 52ea739b13a..b8f5967137d 100644 --- a/dll/win32/dbghelp/macho_module.c +++ b/dll/win32/dbghelp/macho_module.c @@ -328,7 +328,7 @@ BOOL macho_find_section(struct image_file_map* ifm, const char* segname, const c { struct macho_file_map* fmap; unsigned i; - char tmp[sizeof(fmap->sect[0].section->sectname)]; + char tmp[sizeof(fmap->sect[0].section.sectname)]; /* Other parts of dbghelp use section names like ".eh_frame". Mach-O uses names like "__eh_frame". Convert those. */ @@ -345,8 +345,8 @@ BOOL macho_find_section(struct image_file_map* ifm, const char* segname, const c for (i = 0; i < fmap->num_sections; i++) { if (!fmap->sect[i].ignored && - strcmp(fmap->sect[i].section->sectname, sectname) == 0 && - (!segname || strcmp(fmap->sect[i].section->segname, segname) == 0)) + strcmp(fmap->sect[i].section.sectname, sectname) == 0 && + (!segname || strcmp(fmap->sect[i].section.segname, segname) == 0)) { ism->fmap = ifm; ism->sidx = i; @@ -372,7 +372,7 @@ const char* macho_map_section(struct image_section_map* ism) if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.macho.num_sections || fmap->sect[ism->sidx].ignored) return IMAGE_NO_MAP; - return macho_map_range(fmap, fmap->sect[ism->sidx].section->offset, fmap->sect[ism->sidx].section->size, + return macho_map_range(fmap, fmap->sect[ism->sidx].section.offset, fmap->sect[ism->sidx].section.size, &fmap->sect[ism->sidx].mapped); } @@ -385,8 +385,8 @@ void macho_unmap_section(struct image_section_map* ism) if (ism->sidx >= 0 && ism->sidx < fmap->num_sections && fmap->sect[ism->sidx].mapped != IMAGE_NO_MAP) { - macho_unmap_range(&fmap->sect[ism->sidx].mapped, NULL, fmap, fmap->sect[ism->sidx].section->offset, - fmap->sect[ism->sidx].section->size); + macho_unmap_range(&fmap->sect[ism->sidx].mapped, NULL, fmap, fmap->sect[ism->sidx].section.offset, + fmap->sect[ism->sidx].section.size); } } @@ -398,7 +398,7 @@ DWORD_PTR macho_get_map_rva(const struct image_section_map* ism) if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.macho.num_sections || ism->fmap->u.macho.sect[ism->sidx].ignored) return 0; - return ism->fmap->u.macho.sect[ism->sidx].section->addr - ism->fmap->u.macho.segs_start; + return ism->fmap->u.macho.sect[ism->sidx].section.addr - ism->fmap->u.macho.segs_start; } /****************************************************************** @@ -409,7 +409,7 @@ unsigned macho_get_map_size(const struct image_section_map* ism) if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.macho.num_sections || ism->fmap->u.macho.sect[ism->sidx].ignored) return 0; - return ism->fmap->u.macho.sect[ism->sidx].section->size; + return ism->fmap->u.macho.sect[ism->sidx].section.size; } /****************************************************************** @@ -539,12 +539,12 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct load struct macho_file_map* fmap = &ifm->u.macho; struct section_info* info = user; BOOL ignore; - const macho_section* section; int i; unsigned long tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; uint64_t vmaddr, vmsize; char segname[16]; uint32_t nsects; + const void *sections; if (ifm->addr_size == 32) { @@ -553,7 +553,7 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct load vmsize = sc->vmsize; memcpy(segname, sc->segname, sizeof(segname)); nsects = sc->nsects; - section = (const macho_section*)(sc + 1); + sections = (const void *)(sc + 1); } else { @@ -562,7 +562,7 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct load vmsize = sc->vmsize; memcpy(segname, sc->segname, sizeof(segname)); nsects = sc->nsects; - section = (const macho_section*)(sc + 1); + sections = (const void *)(sc + 1); } TRACE("(%p/%d, %p, %p) before: 0x%08lx - 0x%08lx\n", fmap, fmap->fd, lc, user, @@ -596,7 +596,22 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct load for (i = 0; i < nsects; i++) { - fmap->sect[info->section_index].section = &section[i]; + if (ifm->addr_size == 32) + { + const struct section *section = &((const struct section *)sections)[i]; + memcpy(fmap->sect[info->section_index].section.sectname, section->sectname, sizeof(section->sectname)); + memcpy(fmap->sect[info->section_index].section.segname, section->segname, sizeof(section->segname)); + fmap->sect[info->section_index].section.addr = section->addr; + fmap->sect[info->section_index].section.size = section->size; + fmap->sect[info->section_index].section.offset = section->offset; + fmap->sect[info->section_index].section.align = section->align; + fmap->sect[info->section_index].section.reloff = section->reloff; + fmap->sect[info->section_index].section.nreloc = section->nreloc; + fmap->sect[info->section_index].section.flags = section->flags; + } + else + fmap->sect[info->section_index].section = ((const struct section_64 *)sections)[i]; + fmap->sect[info->section_index].mapped = IMAGE_NO_MAP; fmap->sect[info->section_index].ignored = ignore; info->section_index++; @@ -831,8 +846,8 @@ static BOOL macho_sect_is_code(struct macho_file_map* fmap, unsigned char sectid sectidx--; /* convert from 1-based to 0-based */ if (sectidx >= fmap->num_sections || fmap->sect[sectidx].ignored) return FALSE; - ret = (!(fmap->sect[sectidx].section->flags & SECTION_TYPE) && - (fmap->sect[sectidx].section->flags & (S_ATTR_PURE_INSTRUCTIONS|S_ATTR_SOME_INSTRUCTIONS))); + ret = (!(fmap->sect[sectidx].section.flags & SECTION_TYPE) && + (fmap->sect[sectidx].section.flags & (S_ATTR_PURE_INSTRUCTIONS|S_ATTR_SOME_INSTRUCTIONS))); TRACE("-> %d\n", ret); return ret; } diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 7b8de6b1dbd..e4f1f15e1b4 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: 0fc3c33637d4c8eff3f4373d374b3feb402bce4a + wine: 1dc9bb70cd16fa7b37e8fd6e82ed18311ddfbe38

4 years, 8 months

1
0
0 0

[reactos] 21/179: [WINESYNC] dbghelp: Read the Mach-O segment command corresponding to the target's architecture.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75e77444c6be66dacd390… commit 75e77444c6be66dacd390e163e6cf274c3edd5f0 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:14:05 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:33 2020 +0200 [WINESYNC] dbghelp: Read the Mach-O segment command corresponding to the target's architecture. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 0fc3c33637d4c8eff3f4373d374b3feb402bce4a by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/macho_module.c | 68 +++++++++++++++++++++++++++++----------- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 51 insertions(+), 19 deletions(-) diff --git a/dll/win32/dbghelp/macho_module.c b/dll/win32/dbghelp/macho_module.c index 50fcca4d41f..52ea739b13a 100644 --- a/dll/win32/dbghelp/macho_module.c +++ b/dll/win32/dbghelp/macho_module.c @@ -89,10 +89,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_macho); #ifdef _WIN64 -typedef struct segment_command_64 macho_segment_command; typedef struct nlist_64 macho_nlist; #else -typedef struct segment_command macho_segment_command; typedef struct nlist macho_nlist; #endif @@ -506,12 +504,26 @@ static int macho_enum_load_commands(struct image_file_map *ifm, unsigned cmd, */ static int macho_count_sections(struct image_file_map* ifm, const struct load_command* lc, void* user) { - const macho_segment_command* sc = (const macho_segment_command*)lc; + char segname[16]; + uint32_t nsects; + + if (ifm->addr_size == 32) + { + const struct segment_command *sc = (const struct segment_command *)lc; + memcpy(segname, sc->segname, sizeof(segname)); + nsects = sc->nsects; + } + else + { + const struct segment_command_64 *sc = (const struct segment_command_64 *)lc; + memcpy(segname, sc->segname, sizeof(segname)); + nsects = sc->nsects; + } TRACE("(%p/%d, %p, %p) segment %s\n", ifm, ifm->u.macho.fd, lc, user, - debugstr_an(sc->segname, sizeof(sc->segname))); + debugstr_an(segname, sizeof(segname))); - ifm->u.macho.num_sections += sc->nsects; + ifm->u.macho.num_sections += nsects; return 0; } @@ -525,44 +537,64 @@ static int macho_count_sections(struct image_file_map* ifm, const struct load_co static int macho_load_section_info(struct image_file_map* ifm, const struct load_command* lc, void* user) { struct macho_file_map* fmap = &ifm->u.macho; - const macho_segment_command* sc = (const macho_segment_command*)lc; struct section_info* info = user; BOOL ignore; const macho_section* section; int i; unsigned long tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; + uint64_t vmaddr, vmsize; + char segname[16]; + uint32_t nsects; + + if (ifm->addr_size == 32) + { + const struct segment_command *sc = (const struct segment_command *)lc; + vmaddr = sc->vmaddr; + vmsize = sc->vmsize; + memcpy(segname, sc->segname, sizeof(segname)); + nsects = sc->nsects; + section = (const macho_section*)(sc + 1); + } + else + { + const struct segment_command_64 *sc = (const struct segment_command_64 *)lc; + vmaddr = sc->vmaddr; + vmsize = sc->vmsize; + memcpy(segname, sc->segname, sizeof(segname)); + nsects = sc->nsects; + section = (const macho_section*)(sc + 1); + } TRACE("(%p/%d, %p, %p) before: 0x%08lx - 0x%08lx\n", fmap, fmap->fd, lc, user, (unsigned long)fmap->segs_start, (unsigned long)fmap->segs_size); - TRACE("Segment command vm: 0x%08lx - 0x%08lx\n", (unsigned long)sc->vmaddr, - (unsigned long)(sc->vmaddr + sc->vmsize)); + TRACE("Segment command vm: 0x%08lx - 0x%08lx\n", (unsigned long)vmaddr, + (unsigned long)(vmaddr + vmsize)); /* Images in the dyld shared cache have their segments mapped non-contiguously. We don't know how to properly locate any of the segments other than __TEXT, so ignore them. */ - ignore = (info->split_segs && strcmp(sc->segname, SEG_TEXT)); + ignore = (info->split_segs && strcmp(segname, SEG_TEXT)); - if (!strncmp(sc->segname, "WINE_", 5)) - TRACE("Ignoring special Wine segment %s\n", debugstr_an(sc->segname, sizeof(sc->segname))); - else if (!strncmp(sc->segname, "__PAGEZERO", 10)) + if (!strncmp(segname, "WINE_", 5)) + TRACE("Ignoring special Wine segment %s\n", debugstr_an(segname, sizeof(segname))); + else if (!strncmp(segname, "__PAGEZERO", 10)) TRACE("Ignoring __PAGEZERO segment\n"); else if (ignore) - TRACE("Ignoring %s segment because image has split segments\n", sc->segname); + TRACE("Ignoring %s segment because image has split segments\n", segname); else { /* If this segment starts before previously-known earliest, record new earliest. */ - if (sc->vmaddr < fmap->segs_start) - fmap->segs_start = sc->vmaddr; + if (vmaddr < fmap->segs_start) + fmap->segs_start = vmaddr; /* If this segment extends beyond previously-known furthest, record new furthest. */ - tmp = (sc->vmaddr + sc->vmsize + page_mask) & ~page_mask; + tmp = (vmaddr + vmsize + page_mask) & ~page_mask; if (fmap->segs_size < tmp) fmap->segs_size = tmp; TRACE("after: 0x%08lx - 0x%08lx\n", (unsigned long)fmap->segs_start, (unsigned long)fmap->segs_size); } - section = (const macho_section*)(sc + 1); - for (i = 0; i < sc->nsects; i++) + for (i = 0; i < nsects; i++) { fmap->sect[info->section_index].section = &section[i]; fmap->sect[info->section_index].mapped = IMAGE_NO_MAP; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 47ba99d45ee..7b8de6b1dbd 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: bf7681cb2f3a73239170b4f0ebc8f6b38bc027ec + wine: 0fc3c33637d4c8eff3f4373d374b3feb402bce4a

4 years, 8 months

1
0
0 0

[reactos] 20/179: [WINESYNC] dbghelp: Pass an image_file_map to macho_enum_load_commands().

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d3ccc92fb935fb335a5d… commit 0d3ccc92fb935fb335a5d2fde4d454eb3105e1ca Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:14:05 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:33 2020 +0200 [WINESYNC] dbghelp: Pass an image_file_map to macho_enum_load_commands(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id bf7681cb2f3a73239170b4f0ebc8f6b38bc027ec by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/macho_module.c | 38 ++++++++++++++++++++++---------------- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dll/win32/dbghelp/macho_module.c b/dll/win32/dbghelp/macho_module.c index 679c2030b6a..50fcca4d41f 100644 --- a/dll/win32/dbghelp/macho_module.c +++ b/dll/win32/dbghelp/macho_module.c @@ -467,10 +467,11 @@ static const struct load_command* macho_next_load_command(const struct load_comm * callback. If >=0, that's the count of load commands successfully * processed. */ -static int macho_enum_load_commands(struct macho_file_map* fmap, unsigned cmd, - int (*cb)(struct macho_file_map*, const struct load_command*, void*), +static int macho_enum_load_commands(struct image_file_map *ifm, unsigned cmd, + int (*cb)(struct image_file_map*, const struct load_command*, void*), void* user) { + struct macho_file_map* fmap = &ifm->u.macho; const struct load_command* lc; int i; int count = 0; @@ -488,7 +489,7 @@ static int macho_enum_load_commands(struct macho_file_map* fmap, unsigned cmd, if (cmd && cmd != lc->cmd) continue; count++; - result = cb(fmap, lc, user); + result = cb(ifm, lc, user); TRACE("load_command[%d] (%p), cmd %u; callback => %d\n", i, lc, lc->cmd, result); if (result) return (result < 0) ? result : count; } @@ -503,13 +504,14 @@ static int macho_enum_load_commands(struct macho_file_map* fmap, unsigned cmd, * significant sections in a Mach-O file. All commands are * expected to be of LC_SEGMENT[_64] type. */ -static int macho_count_sections(struct macho_file_map* fmap, const struct load_command* lc, void* user) +static int macho_count_sections(struct image_file_map* ifm, const struct load_command* lc, void* user) { const macho_segment_command* sc = (const macho_segment_command*)lc; - TRACE("(%p/%d, %p, %p) segment %s\n", fmap, fmap->fd, lc, user, debugstr_an(sc->segname, sizeof(sc->segname))); + TRACE("(%p/%d, %p, %p) segment %s\n", ifm, ifm->u.macho.fd, lc, user, + debugstr_an(sc->segname, sizeof(sc->segname))); - fmap->num_sections += sc->nsects; + ifm->u.macho.num_sections += sc->nsects; return 0; } @@ -520,8 +522,9 @@ static int macho_count_sections(struct macho_file_map* fmap, const struct load_c * range covered by the segments of a Mach-O file and builds the * section map. All commands are expected to be of LC_SEGMENT[_64] type. */ -static int macho_load_section_info(struct macho_file_map* fmap, const struct load_command* lc, void* user) +static int macho_load_section_info(struct image_file_map* ifm, const struct load_command* lc, void* user) { + struct macho_file_map* fmap = &ifm->u.macho; const macho_segment_command* sc = (const macho_segment_command*)lc; struct section_info* info = user; BOOL ignore; @@ -576,9 +579,9 @@ static int macho_load_section_info(struct macho_file_map* fmap, const struct loa * Callback for macho_enum_load_commands. Records the UUID load * command of a Mach-O file. */ -static int find_uuid(struct macho_file_map* fmap, const struct load_command* lc, void* user) +static int find_uuid(struct image_file_map* ifm, const struct load_command* lc, void* user) { - fmap->uuid = (const struct uuid_command*)lc; + ifm->u.macho.uuid = (const struct uuid_command*)lc; return 1; } @@ -700,7 +703,7 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, TRACE("... verified Mach header\n"); fmap->num_sections = 0; - if (macho_enum_load_commands(fmap, target_cmd, macho_count_sections, NULL) < 0) + if (macho_enum_load_commands(ifm, target_cmd, macho_count_sections, NULL) < 0) goto done; TRACE("%d sections\n", fmap->num_sections); @@ -713,7 +716,7 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, info.split_segs = split_segs; info.section_index = 0; - if (macho_enum_load_commands(fmap, target_cmd, macho_load_section_info, &info) < 0) + if (macho_enum_load_commands(ifm, target_cmd, macho_load_section_info, &info) < 0) { fmap->num_sections = 0; goto done; @@ -723,7 +726,7 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, TRACE("segs_start: 0x%08lx, segs_size: 0x%08lx\n", (unsigned long)fmap->segs_start, (unsigned long)fmap->segs_size); - if (macho_enum_load_commands(fmap, LC_UUID, find_uuid, NULL) < 0) + if (macho_enum_load_commands(ifm, LC_UUID, find_uuid, NULL) < 0) goto done; if (fmap->uuid) { @@ -857,9 +860,10 @@ static void macho_stabs_def_cb(struct module* module, unsigned long load_offset, * Callback for macho_enum_load_commands. Processes the LC_SYMTAB * load commands from the Mach-O file. */ -static int macho_parse_symtab(struct macho_file_map* fmap, +static int macho_parse_symtab(struct image_file_map* ifm, const struct load_command* lc, void* user) { + struct macho_file_map* fmap = &ifm->u.macho; const struct symtab_command* sc = (const struct symtab_command*)lc; struct macho_debug_info* mdi = user; const macho_nlist* stab; @@ -1219,6 +1223,7 @@ BOOL macho_load_debug_info(struct process *pcs, struct module* module) BOOL ret = FALSE; struct macho_debug_info mdi; int result; + struct image_file_map *ifm; struct macho_file_map *fmap; if (module->type != DMT_MACHO || !module->format_info[DFI_MACHO]->u.macho_info) @@ -1227,7 +1232,8 @@ BOOL macho_load_debug_info(struct process *pcs, struct module* module) return FALSE; } - fmap = &module->format_info[DFI_MACHO]->u.macho_info->file_map.u.macho; + ifm = &module->format_info[DFI_MACHO]->u.macho_info->file_map; + fmap = &ifm->u.macho; TRACE("(%p, %p/%d)\n", module, fmap, fmap->fd); @@ -1246,7 +1252,7 @@ BOOL macho_load_debug_info(struct process *pcs, struct module* module) mdi.module = module; pool_init(&mdi.pool, 65536); hash_table_init(&mdi.pool, &mdi.ht_symtab, 256); - result = macho_enum_load_commands(fmap, LC_SYMTAB, macho_parse_symtab, &mdi); + result = macho_enum_load_commands(ifm, LC_SYMTAB, macho_parse_symtab, &mdi); if (result > 0) ret = TRUE; else if (result < 0) @@ -1255,7 +1261,7 @@ BOOL macho_load_debug_info(struct process *pcs, struct module* module) if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY) && fmap->dsym) { mdi.fmap = &fmap->dsym->u.macho; - result = macho_enum_load_commands(mdi.fmap, LC_SYMTAB, macho_parse_symtab, &mdi); + result = macho_enum_load_commands(fmap->dsym, LC_SYMTAB, macho_parse_symtab, &mdi); if (result > 0) ret = TRUE; else if (result < 0) diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index bb75907c7a0..47ba99d45ee 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: f2e38e17956197180ad730fd00a267fc25d4f238 + wine: bf7681cb2f3a73239170b4f0ebc8f6b38bc027ec

4 years, 8 months

1
0
0 0

[reactos] 19/179: [WINESYNC] dbghelp: Read the 32-bit Mach-O header.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9985483679bdc61852251… commit 9985483679bdc618522519b2d1092f72e0dba3b2 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:14:04 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:33 2020 +0200 [WINESYNC] dbghelp: Read the 32-bit Mach-O header. It is identical to the 64-bit header, except for the "reserved" field. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id f2e38e17956197180ad730fd00a267fc25d4f238 by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/image_private.h | 4 +--- dll/win32/dbghelp/macho_module.c | 2 +- sdk/tools/winesync/dbghelp.cfg | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dll/win32/dbghelp/image_private.h b/dll/win32/dbghelp/image_private.h index 060e0272f1a..329236c9bf5 100644 --- a/dll/win32/dbghelp/image_private.h +++ b/dll/win32/dbghelp/image_private.h @@ -48,10 +48,8 @@ #include <mach-o/loader.h> #ifdef _WIN64 -typedef struct mach_header_64 macho_mach_header; typedef struct section_64 macho_section; #else -typedef struct mach_header macho_mach_header; typedef struct section macho_section; #endif #endif @@ -98,7 +96,7 @@ struct image_file_map struct image_file_map* dsym; /* the debug symbols file associated with this one */ #ifdef HAVE_MACH_O_LOADER_H - macho_mach_header mach_header; + struct mach_header mach_header; const struct load_command* load_commands; const struct uuid_command* uuid; diff --git a/dll/win32/dbghelp/macho_module.c b/dll/win32/dbghelp/macho_module.c index ee35af53b17..679c2030b6a 100644 --- a/dll/win32/dbghelp/macho_module.c +++ b/dll/win32/dbghelp/macho_module.c @@ -1196,7 +1196,7 @@ static BOOL image_uses_split_segs(HANDLE process, unsigned long load_addr) struct process *pcs = process_find_by_handle(process); cpu_type_t target_cpu = (pcs->is_64bit) ? CPU_TYPE_X86_64 : CPU_TYPE_X86; uint32_t target_magic = (pcs->is_64bit) ? MH_MAGIC_64 : MH_MAGIC; - macho_mach_header header; + struct mach_header header; if (ReadProcessMemory(process, (void*)load_addr, &header, sizeof(header), NULL) && header.magic == target_magic && header.cputype == target_cpu && diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index c5c81db8387..bb75907c7a0 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: f0ee3471f369bc3d3911647c7efa63fc503e6ce2 + wine: f2e38e17956197180ad730fd00a267fc25d4f238

4 years, 8 months

1
0
0 0

[reactos] 18/179: [WINESYNC] dbghelp: Determine the target Mach-O architecture from the process's architecture.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=887025f3a05241da3ba19… commit 887025f3a05241da3ba19dd57e694da9cead3cbb Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:06:46 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:33 2020 +0200 [WINESYNC] dbghelp: Determine the target Mach-O architecture from the process's architecture. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id f0ee3471f369bc3d3911647c7efa63fc503e6ce2 by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/dbghelp_private.h | 2 +- dll/win32/dbghelp/macho_module.c | 66 ++++++++++++++++++------------------- dll/win32/dbghelp/module.c | 2 +- sdk/tools/winesync/dbghelp.cfg | 2 +- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index 24db267a6b6..537b9bc087b 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -621,7 +621,7 @@ extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_th /* macho_module.c */ extern BOOL macho_enum_modules(HANDLE hProc, enum_modules_cb, void*) DECLSPEC_HIDDEN; extern BOOL macho_fetch_file_info(HANDLE process, const WCHAR* name, unsigned long load_addr, DWORD_PTR* base, DWORD* size, DWORD* checksum) DECLSPEC_HIDDEN; -extern BOOL macho_load_debug_info(struct module* module) DECLSPEC_HIDDEN; +extern BOOL macho_load_debug_info(struct process *pcs, struct module* module) DECLSPEC_HIDDEN; extern struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsigned long) DECLSPEC_HIDDEN; extern BOOL macho_read_wine_loader_dbg_info(struct process* pcs) DECLSPEC_HIDDEN; diff --git a/dll/win32/dbghelp/macho_module.c b/dll/win32/dbghelp/macho_module.c index 7c40801d89c..ee35af53b17 100644 --- a/dll/win32/dbghelp/macho_module.c +++ b/dll/win32/dbghelp/macho_module.c @@ -91,17 +91,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_macho); #ifdef _WIN64 typedef struct segment_command_64 macho_segment_command; typedef struct nlist_64 macho_nlist; - -#define TARGET_CPU_TYPE CPU_TYPE_X86_64 -#define TARGET_MH_MAGIC MH_MAGIC_64 -#define TARGET_SEGMENT_COMMAND LC_SEGMENT_64 #else typedef struct segment_command macho_segment_command; typedef struct nlist macho_nlist; - -#define TARGET_CPU_TYPE CPU_TYPE_X86 -#define TARGET_MH_MAGIC MH_MAGIC -#define TARGET_SEGMENT_COMMAND LC_SEGMENT #endif @@ -610,7 +602,8 @@ static inline void reset_file_map(struct image_file_map* ifm) * * Maps a Mach-O file into memory (and checks it's a real Mach-O file) */ -static BOOL macho_map_file(const WCHAR* filenameW, BOOL split_segs, struct image_file_map* ifm) +static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, + BOOL split_segs, struct image_file_map* ifm) { struct macho_file_map* fmap = &ifm->u.macho; struct fat_header fat_header; @@ -620,17 +613,16 @@ static BOOL macho_map_file(const WCHAR* filenameW, BOOL split_segs, struct image unsigned len; struct section_info info; BOOL ret = FALSE; + cpu_type_t target_cpu = (pcs->is_64bit) ? CPU_TYPE_X86_64 : CPU_TYPE_X86; + uint32_t target_magic = (pcs->is_64bit) ? MH_MAGIC_64 : MH_MAGIC; + uint32_t target_cmd = (pcs->is_64bit) ? LC_SEGMENT_64 : LC_SEGMENT; TRACE("(%s, %p)\n", debugstr_w(filenameW), fmap); reset_file_map(ifm); ifm->modtype = DMT_MACHO; -#ifdef _WIN64 - ifm->addr_size = 64; -#else - ifm->addr_size = 32; -#endif + ifm->addr_size = (pcs->is_64bit) ? 64 : 32; len = WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, NULL, 0, NULL, NULL); if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) @@ -670,14 +662,14 @@ static BOOL macho_map_file(const WCHAR* filenameW, BOOL split_segs, struct image struct fat_arch fat_arch; if (read(fmap->fd, &fat_arch, sizeof(fat_arch)) != sizeof(fat_arch)) goto done; - if (swap_ulong_be_to_host(fat_arch.cputype) == TARGET_CPU_TYPE) + if (swap_ulong_be_to_host(fat_arch.cputype) == target_cpu) { fmap->arch_offset = swap_ulong_be_to_host(fat_arch.offset); break; } } if (i >= narch) goto done; - TRACE("... found target arch (%d)\n", TARGET_CPU_TYPE); + TRACE("... found target arch (%d)\n", target_cpu); } else { @@ -691,8 +683,8 @@ static BOOL macho_map_file(const WCHAR* filenameW, BOOL split_segs, struct image goto done; TRACE("... got possible Mach header\n"); /* and check for a Mach-O header */ - if (fmap->mach_header.magic != TARGET_MH_MAGIC || - fmap->mach_header.cputype != TARGET_CPU_TYPE) goto done; + if (fmap->mach_header.magic != target_magic || + fmap->mach_header.cputype != target_cpu) goto done; /* Make sure the file type is one of the ones we expect. */ switch (fmap->mach_header.filetype) { @@ -708,7 +700,7 @@ static BOOL macho_map_file(const WCHAR* filenameW, BOOL split_segs, struct image TRACE("... verified Mach header\n"); fmap->num_sections = 0; - if (macho_enum_load_commands(fmap, TARGET_SEGMENT_COMMAND, macho_count_sections, NULL) < 0) + if (macho_enum_load_commands(fmap, target_cmd, macho_count_sections, NULL) < 0) goto done; TRACE("%d sections\n", fmap->num_sections); @@ -721,7 +713,7 @@ static BOOL macho_map_file(const WCHAR* filenameW, BOOL split_segs, struct image info.split_segs = split_segs; info.section_index = 0; - if (macho_enum_load_commands(fmap, TARGET_SEGMENT_COMMAND, macho_load_section_info, &info) < 0) + if (macho_enum_load_commands(fmap, target_cmd, macho_load_section_info, &info) < 0) { fmap->num_sections = 0; goto done; @@ -1072,11 +1064,11 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt * TRUE. If it can't be mapped or its UUID doesn't match, return * FALSE. */ -static BOOL try_dsym(const WCHAR* path, struct macho_file_map* fmap) +static BOOL try_dsym(struct process *pcs, const WCHAR* path, struct macho_file_map* fmap) { struct image_file_map dsym_ifm; - if (macho_map_file(path, FALSE, &dsym_ifm)) + if (macho_map_file(pcs, path, FALSE, &dsym_ifm)) { char uuid_string[UUID_STRING_LEN]; @@ -1110,7 +1102,7 @@ static BOOL try_dsym(const WCHAR* path, struct macho_file_map* fmap) * "dsymutil --flat". Finally, use Spotlight to search for a * .dSYM bundle with the same UUID as the module file. */ -static void find_and_map_dsym(struct module* module) +static void find_and_map_dsym(struct process *pcs, struct module* module) { static const WCHAR dot_dsym[] = {'.','d','S','Y','M',0}; static const WCHAR dsym_subpath[] = {'/','C','o','n','t','e','n','t','s','/','R','e','s','o','u','r','c','e','s','/','D','W','A','R','F','/',0}; @@ -1142,12 +1134,12 @@ static void find_and_map_dsym(struct module* module) strcatW(path, dsym_subpath); strcatW(path, p); - if (try_dsym(path, fmap)) + if (try_dsym(pcs, path, fmap)) goto found; strcpyW(path + strlenW(module->module.LoadedImageName), dot_dwarf); - if (try_dsym(path, fmap)) + if (try_dsym(pcs, path, fmap)) goto found; format_uuid(fmap->uuid->uuid, uuid_string); @@ -1175,7 +1167,7 @@ static void find_and_map_dsym(struct module* module) strcatW(path, p); CFRelease(item_path); - if (try_dsym(path, fmap)) + if (try_dsym(pcs, path, fmap)) goto found; } } @@ -1201,9 +1193,13 @@ static BOOL image_uses_split_segs(HANDLE process, unsigned long load_addr) if (process && load_addr) { + struct process *pcs = process_find_by_handle(process); + cpu_type_t target_cpu = (pcs->is_64bit) ? CPU_TYPE_X86_64 : CPU_TYPE_X86; + uint32_t target_magic = (pcs->is_64bit) ? MH_MAGIC_64 : MH_MAGIC; macho_mach_header header; + if (ReadProcessMemory(process, (void*)load_addr, &header, sizeof(header), NULL) && - header.magic == TARGET_MH_MAGIC && header.cputype == TARGET_CPU_TYPE && + header.magic == target_magic && header.cputype == target_cpu && header.flags & MACHO_DYLD_IN_SHARED_CACHE) { split_segs = TRUE; @@ -1218,7 +1214,7 @@ static BOOL image_uses_split_segs(HANDLE process, unsigned long load_addr) * * Loads Mach-O debugging information from the module image file. */ -BOOL macho_load_debug_info(struct module* module) +BOOL macho_load_debug_info(struct process *pcs, struct module* module) { BOOL ret = FALSE; struct macho_debug_info mdi; @@ -1239,7 +1235,7 @@ BOOL macho_load_debug_info(struct module* module) if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) { - find_and_map_dsym(module); + find_and_map_dsym(pcs, module); if (dwarf2_parse(module, module->reloc_delta, NULL /* FIXME: some thunks to deal with ? */, &module->format_info[DFI_MACHO]->u.macho_info->file_map)) @@ -1281,12 +1277,16 @@ BOOL macho_fetch_file_info(HANDLE process, const WCHAR* name, unsigned long load DWORD* size, DWORD* checksum) { struct image_file_map fmap; + struct process *pcs; BOOL split_segs; TRACE("(%s, %p, %p, %p)\n", debugstr_w(name), base, size, checksum); + pcs = process_find_by_handle(process); + if (!pcs) return FALSE; + split_segs = image_uses_split_segs(process, load_addr); - if (!macho_map_file(name, split_segs, &fmap)) return FALSE; + if (!macho_map_file(pcs, name, split_segs, &fmap)) return FALSE; if (base) *base = fmap.u.macho.segs_start; *size = fmap.u.macho.segs_size; *checksum = calc_crc32(fmap.u.macho.fd); @@ -1375,7 +1375,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, load_addr, macho_info, macho_info->flags); split_segs = image_uses_split_segs(pcs->handle, load_addr); - if (!macho_map_file(filename, split_segs, &fmap)) return FALSE; + if (!macho_map_file(pcs, filename, split_segs, &fmap)) return FALSE; /* Find the dynamic loader's table of images loaded into the process. */ @@ -1415,7 +1415,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, reset_file_map(&fmap); if (dbghelp_options & SYMOPT_DEFERRED_LOADS) macho_info->module->module.SymType = SymDeferred; - else if (!macho_load_debug_info(macho_info->module)) + else if (!macho_load_debug_info(pcs, macho_info->module)) ret = FALSE; macho_info->module->format_info[DFI_MACHO]->u.macho_info->in_use = 1; @@ -1930,7 +1930,7 @@ struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsign return NULL; } -BOOL macho_load_debug_info(struct module* module) +BOOL macho_load_debug_info(struct process *pcs, struct module* module) { return FALSE; } diff --git a/dll/win32/dbghelp/module.c b/dll/win32/dbghelp/module.c index 8f7150460be..b47fbb2af66 100644 --- a/dll/win32/dbghelp/module.c +++ b/dll/win32/dbghelp/module.c @@ -415,7 +415,7 @@ BOOL module_get_debug(struct module_pair* pair) break; #ifndef DBGHELP_STATIC_LIB case DMT_MACHO: - ret = macho_load_debug_info(pair->effective); + ret = macho_load_debug_info(pair->pcs, pair->effective); break; #endif default: diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 0014cc129c2..c5c81db8387 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: 99e818154a803c8cfd2478b9db3b455fc9adef30 + wine: f0ee3471f369bc3d3911647c7efa63fc503e6ce2

4 years, 8 months

1
0
0 0

[reactos] 17/179: [WINESYNC] dbghelp: Read the r_debug and link_map structs corresponding to the target's architecture.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c719e68907cdea1b1dadb… commit c719e68907cdea1b1dadb4e99d135474ee7b9c04 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:06:43 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:32 2020 +0200 [WINESYNC] dbghelp: Read the r_debug and link_map structs corresponding to the target's architecture. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 99e818154a803c8cfd2478b9db3b455fc9adef30 by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/elf_module.c | 110 +++++++++++++++++++++++++++++++---------- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 85 insertions(+), 27 deletions(-) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index c43d10812c3..32ce3455db0 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -78,6 +78,15 @@ struct r_debug }; #endif /* HAVE_STRUCT_R_DEBUG */ +struct r_debug32 +{ + int r_version; + DWORD r_map; + Elf32_Addr r_brk; + int r_state; + Elf32_Addr r_ldbase; +}; + #ifndef HAVE_STRUCT_LINK_MAP struct link_map { @@ -88,6 +97,14 @@ struct link_map }; #endif /* HAVE_STRUCT_LINK_MAP */ +struct link_map32 +{ + Elf32_Addr l_addr; + DWORD l_name; + DWORD l_ld; + DWORD l_next, l_prev; +}; + WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); struct elf_info @@ -1648,36 +1665,77 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, const WCHAR* main_name, enum_elf_modules_cb cb, void* user) { - struct r_debug dbg_hdr; - void* lm_addr; - struct link_map lm; - char bufstr[256]; - WCHAR bufstrW[MAX_PATH]; - - if (!pcs->dbg_hdr_addr || - !ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, - &dbg_hdr, sizeof(dbg_hdr), NULL)) - return FALSE; + WCHAR bufstrW[MAX_PATH]; + char bufstr[256]; + void *lm_addr; - /* Now walk the linked list. In all known ELF implementations, - * the dynamic loader maintains this linked list for us. In some - * cases the first entry doesn't appear with a name, in other cases it - * does. - */ - for (lm_addr = (void*)dbg_hdr.r_map; lm_addr; lm_addr = (void*)lm.l_next) + if (pcs->is_64bit) { - if (!ReadProcessMemory(pcs->handle, lm_addr, &lm, sizeof(lm), NULL)) - return FALSE; + struct r_debug dbg_hdr; + struct link_map lm; + + if (!pcs->dbg_hdr_addr || + !ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, + &dbg_hdr, sizeof(dbg_hdr), NULL)) + return FALSE; - if (lm.l_prev != NULL && /* skip first entry, normally debuggee itself */ - lm.l_name != NULL && - ReadProcessMemory(pcs->handle, lm.l_name, bufstr, sizeof(bufstr), NULL)) + /* Now walk the linked list. In all known ELF implementations, + * the dynamic loader maintains this linked list for us. In some + * cases the first entry doesn't appear with a name, in other cases it + * does. + */ + for (lm_addr = (void*)dbg_hdr.r_map; lm_addr; lm_addr = (void*)lm.l_next) { - bufstr[sizeof(bufstr) - 1] = '\0'; - MultiByteToWideChar(CP_UNIXCP, 0, bufstr, -1, bufstrW, sizeof(bufstrW) / sizeof(WCHAR)); - if (main_name && !bufstrW[0]) strcpyW(bufstrW, main_name); - if (!cb(bufstrW, (unsigned long)lm.l_addr, (unsigned long)lm.l_ld, FALSE, user)) break; - } + if (!ReadProcessMemory(pcs->handle, lm_addr, &lm, sizeof(lm), NULL)) + return FALSE; + + if (lm.l_prev != NULL && /* skip first entry, normally debuggee itself */ + lm.l_name != NULL && + ReadProcessMemory(pcs->handle, lm.l_name, bufstr, sizeof(bufstr), NULL)) + { + bufstr[sizeof(bufstr) - 1] = '\0'; + MultiByteToWideChar(CP_UNIXCP, 0, bufstr, -1, bufstrW, + sizeof(bufstrW) / sizeof(WCHAR)); + if (main_name && !bufstrW[0]) strcpyW(bufstrW, main_name); + if (!cb(bufstrW, (unsigned long)lm.l_addr, (unsigned long)lm.l_ld, FALSE, user)) + break; + } + } + } + else + { + struct r_debug32 dbg_hdr; + struct link_map32 lm; + + if (!pcs->dbg_hdr_addr || + !ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, + &dbg_hdr, sizeof(dbg_hdr), NULL)) + return FALSE; + + /* Now walk the linked list. In all known ELF implementations, + * the dynamic loader maintains this linked list for us. In some + * cases the first entry doesn't appear with a name, in other cases it + * does. + */ + for (lm_addr = (void *)(DWORD_PTR)dbg_hdr.r_map; lm_addr; + lm_addr = (void *)(DWORD_PTR)lm.l_next) + { + if (!ReadProcessMemory(pcs->handle, lm_addr, &lm, sizeof(lm), NULL)) + return FALSE; + + if (lm.l_prev && /* skip first entry, normally debuggee itself */ + lm.l_name && + ReadProcessMemory(pcs->handle, (void *)(DWORD_PTR)lm.l_name, + bufstr, sizeof(bufstr), NULL)) + { + bufstr[sizeof(bufstr) - 1] = '\0'; + MultiByteToWideChar(CP_UNIXCP, 0, bufstr, -1, bufstrW, + sizeof(bufstrW) / sizeof(WCHAR)); + if (main_name && !bufstrW[0]) strcpyW(bufstrW, main_name); + if (!cb(bufstrW, (unsigned long)lm.l_addr, (unsigned long)lm.l_ld, FALSE, user)) + break; + } + } } #ifdef AT_SYSINFO_EHDR diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 7069689f26f..0014cc129c2 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: 7e4fd17d5b62e888fd6a3a452dc3ee22dfb74ccd + wine: 99e818154a803c8cfd2478b9db3b455fc9adef30

4 years, 8 months

1
0
0 0

[reactos] 16/179: [WINESYNC] dbghelp: Translate the 32-bit ELF symbol struct to the 64-bit one.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76ad5c4b684579b8d73bd… commit 76ad5c4b684579b8d73bd0b35ec91fe2ed773982 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:05:44 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:32 2020 +0200 [WINESYNC] dbghelp: Translate the 32-bit ELF symbol struct to the 64-bit one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 7e4fd17d5b62e888fd6a3a452dc3ee22dfb74ccd by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/elf_module.c | 87 ++++++++++++++++++++++++--------------- dll/win32/dbghelp/image_private.h | 9 +--- sdk/tools/winesync/dbghelp.cfg | 2 +- 3 files changed, 55 insertions(+), 43 deletions(-) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index 0cbeb98c407..c43d10812c3 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -101,7 +101,7 @@ struct elf_info struct symtab_elt { struct hash_table_elt ht_elt; - const Elf_Sym* symp; + Elf64_Sym sym; struct symt_compiland* compiland; unsigned used; }; @@ -548,13 +548,13 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, const char* symname; struct symt_compiland* compiland = NULL; const char* ptr; - const Elf_Sym* symp; struct symtab_elt* ste; struct image_section_map ism, ism_str; + const char *symtab; if (!elf_find_section(fmap, ".symtab", SHT_SYMTAB, &ism) && !elf_find_section(fmap, ".dynsym", SHT_DYNSYM, &ism)) return; - if ((symp = (const Elf_Sym*)image_map_section(&ism)) == IMAGE_NO_MAP) return; + if ((symtab = image_map_section(&ism)) == IMAGE_NO_MAP) return; ism_str.fmap = ism.fmap; ism_str.sidx = fmap->u.elf.sect[ism.sidx].shdr.sh_link; if ((strp = image_map_section(&ism_str)) == IMAGE_NO_MAP) @@ -563,33 +563,50 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, return; } - nsym = image_get_map_size(&ism) / sizeof(*symp); + nsym = image_get_map_size(&ism) / + (fmap->addr_size == 32 ? sizeof(Elf32_Sym) : sizeof(Elf64_Sym)); for (j = 0; thunks[j].symname; j++) thunks[j].rva_start = thunks[j].rva_end = 0; - for (i = 0; i < nsym; i++, symp++) + for (i = 0; i < nsym; i++) { + Elf64_Sym sym; + + if (fmap->addr_size == 32) + { + Elf32_Sym *sym32 = &((Elf32_Sym *)symtab)[i]; + + sym.st_name = sym32->st_name; + sym.st_value = sym32->st_value; + sym.st_size = sym32->st_size; + sym.st_info = sym32->st_info; + sym.st_other = sym32->st_other; + sym.st_shndx = sym32->st_shndx; + } + else + sym = ((Elf64_Sym *)symtab)[i]; + /* Ignore certain types of entries which really aren't of that much * interest. */ - if ((ELF32_ST_TYPE(symp->st_info) != STT_NOTYPE && - ELF32_ST_TYPE(symp->st_info) != STT_FILE && - ELF32_ST_TYPE(symp->st_info) != STT_OBJECT && - ELF32_ST_TYPE(symp->st_info) != STT_FUNC) || - symp->st_shndx == SHN_UNDEF) + if ((ELF32_ST_TYPE(sym.st_info) != STT_NOTYPE && + ELF32_ST_TYPE(sym.st_info) != STT_FILE && + ELF32_ST_TYPE(sym.st_info) != STT_OBJECT && + ELF32_ST_TYPE(sym.st_info) != STT_FUNC) || + sym.st_shndx == SHN_UNDEF) { continue; } - symname = strp + symp->st_name; + symname = strp + sym.st_name; /* handle some specific symtab (that we'll throw away when done) */ - switch (ELF32_ST_TYPE(symp->st_info)) + switch (ELF32_ST_TYPE(sym.st_info)) { case STT_FILE: if (symname) - compiland = symt_new_compiland(module, symp->st_value, + compiland = symt_new_compiland(module, sym.st_value, source_new(module, NULL, symname)); else compiland = NULL; @@ -600,8 +617,8 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, { if (!strcmp(symname, thunks[j].symname)) { - thunks[j].rva_start = symp->st_value; - thunks[j].rva_end = symp->st_value + symp->st_size; + thunks[j].rva_start = sym.st_value; + thunks[j].rva_end = sym.st_value + sym.st_size; break; } } @@ -635,7 +652,7 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, ste->ht_elt.name = n; } } - ste->symp = symp; + ste->sym = sym; ste->compiland = compiland; ste->used = 0; hash_table_add(ht_symtab, &ste->ht_elt); @@ -651,7 +668,7 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, * * lookup a symbol by name in our internal hash table for the symtab */ -static const Elf_Sym* elf_lookup_symtab(const struct module* module, +static const Elf64_Sym *elf_lookup_symtab(const struct module* module, const struct hash_table* ht_symtab, const char* name, const struct symt* compiland) { @@ -698,8 +715,8 @@ static const Elf_Sym* elf_lookup_symtab(const struct module* module, { FIXME("Already found symbol %s (%s) in symtab %s @%08x and %s @%08x\n", name, compiland_name, - source_get(module, result->compiland->source), (unsigned int)result->symp->st_value, - source_get(module, ste->compiland->source), (unsigned int)ste->symp->st_value); + source_get(module, result->compiland->source), (unsigned int)result->sym.st_value, + source_get(module, ste->compiland->source), (unsigned int)ste->sym.st_value); } else { @@ -713,7 +730,7 @@ static const Elf_Sym* elf_lookup_symtab(const struct module* module, debugstr_w(module->module.ModuleName), name); return NULL; } - return result->symp; + return &result->sym; } /****************************************************************** @@ -727,7 +744,7 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table struct hash_table_iter hti; void* ptr; struct symt_ht* sym; - const Elf_Sym* symp; + const Elf64_Sym* symp; struct elf_module_info* elf_info = module->format_info[DFI_ELF]->u.elf_info; hash_table_iter_init(&module->ht_symbols, &hti, NULL); @@ -748,9 +765,10 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table { if (((struct symt_function*)sym)->address != elf_info->elf_addr && ((struct symt_function*)sym)->address != elf_info->elf_addr + symp->st_value) - FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n", + FIXME("Changing address for %p/%s!%s from %08lx to %s\n", sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name, - ((struct symt_function*)sym)->address, elf_info->elf_addr + symp->st_value); + ((struct symt_function*)sym)->address, + wine_dbgstr_longlong(elf_info->elf_addr + symp->st_value)); if (((struct symt_function*)sym)->size && ((struct symt_function*)sym)->size != symp->st_size) FIXME("Changing size for %p/%s!%s from %08lx to %08x\n", sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name, @@ -776,9 +794,10 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table { if (((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr && ((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr + symp->st_value) - FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n", + FIXME("Changing address for %p/%s!%s from %08lx to %s\n", sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name, - ((struct symt_function*)sym)->address, elf_info->elf_addr + symp->st_value); + ((struct symt_function*)sym)->address, + wine_dbgstr_longlong(elf_info->elf_addr + symp->st_value)); ((struct symt_data*)sym)->u.var.offset = elf_info->elf_addr + symp->st_value; ((struct symt_data*)sym)->kind = (ELF32_ST_BIND(symp->st_info) == STB_LOCAL) ? DataIsFileStatic : DataIsGlobal; @@ -817,13 +836,13 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h { if (ste->used) continue; - addr = module->reloc_delta + ste->symp->st_value; + addr = module->reloc_delta + ste->sym.st_value; - j = elf_is_in_thunk_area(ste->symp->st_value, thunks); + j = elf_is_in_thunk_area(ste->sym.st_value, thunks); if (j >= 0) /* thunk found */ { symt_new_thunk(module, ste->compiland, ste->ht_elt.name, thunks[j].ordinal, - addr, ste->symp->st_size); + addr, ste->sym.st_size); } else { @@ -839,19 +858,19 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h * used yet (ie we have no debug information on them) * That's the case, for example, of the .spec.c files */ - switch (ELF32_ST_TYPE(ste->symp->st_info)) + switch (ELF32_ST_TYPE(ste->sym.st_info)) { case STT_FUNC: symt_new_function(module, ste->compiland, ste->ht_elt.name, - addr, ste->symp->st_size, NULL); + addr, ste->sym.st_size, NULL); break; case STT_OBJECT: loc.kind = loc_absolute; loc.reg = 0; loc.offset = addr; symt_new_global_variable(module, ste->compiland, ste->ht_elt.name, - ELF32_ST_BIND(ste->symp->st_info) == STB_LOCAL, - loc, ste->symp->st_size, NULL); + ELF32_ST_BIND(ste->sym.st_info) == STB_LOCAL, + loc, ste->sym.st_size, NULL); break; default: FIXME("Shouldn't happen\n"); @@ -891,8 +910,8 @@ static int elf_new_public_symbols(struct module* module, const struct hash_table while ((ste = hash_table_iter_up(&hti))) { symt_new_public(module, ste->compiland, ste->ht_elt.name, - module->reloc_delta + ste->symp->st_value, - ste->symp->st_size); + module->reloc_delta + ste->sym.st_value, + ste->sym.st_size); } return TRUE; } diff --git a/dll/win32/dbghelp/image_private.h b/dll/win32/dbghelp/image_private.h index ecd15a27c29..060e0272f1a 100644 --- a/dll/win32/dbghelp/image_private.h +++ b/dll/win32/dbghelp/image_private.h @@ -58,14 +58,7 @@ typedef struct section macho_section; #define IMAGE_NO_MAP ((void*)-1) -#if defined(__ELF__) && !defined(DBGHELP_STATIC_LIB) - -#ifdef _WIN64 -#define Elf_Sym Elf64_Sym -#else -#define Elf_Sym Elf32_Sym -#endif -#else +#ifndef __ELF__ #ifndef SHT_NULL #define SHT_NULL 0 #endif diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index eb2b78f98ff..7069689f26f 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: 51ada19ac235df104e95476e9b3fa8204357bb9a + wine: 7e4fd17d5b62e888fd6a3a452dc3ee22dfb74ccd

4 years, 8 months

1
0
0 0

[reactos] 15/179: [WINESYNC] dbghelp: Read the Elf_auxv_t struct corresponding to the target's architecture.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a24f9acfc8d442f889e8… commit 4a24f9acfc8d442f889e858bd03905b852439e49 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:05:43 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:32 2020 +0200 [WINESYNC] dbghelp: Read the Elf_auxv_t struct corresponding to the target's architecture. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 51ada19ac235df104e95476e9b3fa8204357bb9a by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/elf_module.c | 30 ++++++++++++++++++++++++------ dll/win32/dbghelp/image_private.h | 2 -- sdk/tools/winesync/dbghelp.cfg | 2 +- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index 2b444f8b015..0cbeb98c407 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -1522,7 +1522,6 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, unsigned l void* addr; void* str; void* str_max; - Elf_auxv_t auxv; si->SizeOfStruct = sizeof(*si); si->MaxNameLen = MAX_SYM_NAME; @@ -1548,14 +1547,33 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, unsigned l while (addr < str_max && ReadProcessMemory(pcs->handle, addr, &str, sizeof(str), NULL) && str == NULL) addr = (void*)((DWORD_PTR)addr + sizeof(str)); - while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type != AT_NULL) + if (pcs->is_64bit) { - if (auxv.a_type == type) + Elf64_auxv_t auxv; + + while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type != AT_NULL) { - *val = auxv.a_un.a_val; - return TRUE; + if (auxv.a_type == type) + { + *val = auxv.a_un.a_val; + return TRUE; + } + addr = (void*)((DWORD_PTR)addr + sizeof(auxv)); + } + } + else + { + Elf32_auxv_t auxv; + + while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type != AT_NULL) + { + if (auxv.a_type == type) + { + *val = auxv.a_un.a_val; + return TRUE; + } + addr = (void*)((DWORD_PTR)addr + sizeof(auxv)); } - addr = (void*)((DWORD_PTR)addr + sizeof(auxv)); } return FALSE; diff --git a/dll/win32/dbghelp/image_private.h b/dll/win32/dbghelp/image_private.h index 22e81ae3e01..ecd15a27c29 100644 --- a/dll/win32/dbghelp/image_private.h +++ b/dll/win32/dbghelp/image_private.h @@ -62,10 +62,8 @@ typedef struct section macho_section; #ifdef _WIN64 #define Elf_Sym Elf64_Sym -#define Elf_auxv_t Elf64_auxv_t #else #define Elf_Sym Elf32_Sym -#define Elf_auxv_t Elf32_auxv_t #endif #else #ifndef SHT_NULL diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 15733bdd51b..eb2b78f98ff 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: bb53152faab705d972de3763ddd9bb3351e92460 + wine: 51ada19ac235df104e95476e9b3fa8204357bb9a

4 years, 8 months

1
0
0 0

[reactos] 14/179: [WINESYNC] dbghelp: Read the Elf_Dyn struct corresponding to the target's architecture.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd5baf8750f27108496ec… commit dd5baf8750f27108496ec0dd4c765cc6118a7bec Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:04:53 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:32 2020 +0200 [WINESYNC] dbghelp: Read the Elf_Dyn struct corresponding to the target's architecture. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id bb53152faab705d972de3763ddd9bb3351e92460 by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/elf_module.c | 59 ++++++++++++++++++++++++++++----------- dll/win32/dbghelp/image_private.h | 2 -- sdk/tools/winesync/dbghelp.cfg | 2 +- 3 files changed, 44 insertions(+), 19 deletions(-) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index f84df836da6..2b444f8b015 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -1270,29 +1270,56 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, if (elf_find_section(fmap, ".dynamic", SHT_DYNAMIC, &ism)) { - Elf_Dyn dyn; char* ptr = (char*)(ULONG_PTR)fmap->u.elf.sect[ism.sidx].shdr.sh_addr; unsigned long len; if (load_offset) ptr += load_offset - fmap->u.elf.elf_start; - do + if (fmap->addr_size == 32) { - if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || - len != sizeof(dyn)) - return ret; - if (dyn.d_tag == DT_DEBUG) + Elf32_Dyn dyn; + + do { - elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; - if (load_offset == 0 && dyn_addr == 0) /* likely the case */ - /* Assume this module (the Wine loader) has been loaded at its preferred address */ - dyn_addr = ism.fmap->u.elf.sect[ism.sidx].shdr.sh_addr; - break; - } - ptr += sizeof(dyn); - } while (dyn.d_tag != DT_NULL); - if (dyn.d_tag == DT_NULL) return ret; - } + if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || + len != sizeof(dyn)) + return ret; + if (dyn.d_tag == DT_DEBUG) + { + elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; + if (load_offset == 0 && dyn_addr == 0) /* likely the case */ + /* Assume this module (the Wine loader) has been + * loaded at its preferred address */ + dyn_addr = ism.fmap->u.elf.sect[ism.sidx].shdr.sh_addr; + break; + } + ptr += sizeof(dyn); + } while (dyn.d_tag != DT_NULL); + if (dyn.d_tag == DT_NULL) return ret; + } + else + { + Elf64_Dyn dyn; + + do + { + if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || + len != sizeof(dyn)) + return ret; + if (dyn.d_tag == DT_DEBUG) + { + elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; + if (load_offset == 0 && dyn_addr == 0) /* likely the case */ + /* Assume this module (the Wine loader) has been + * loaded at its preferred address */ + dyn_addr = ism.fmap->u.elf.sect[ism.sidx].shdr.sh_addr; + break; + } + ptr += sizeof(dyn); + } while (dyn.d_tag != DT_NULL); + if (dyn.d_tag == DT_NULL) return ret; + } + } elf_end_find(fmap); } diff --git a/dll/win32/dbghelp/image_private.h b/dll/win32/dbghelp/image_private.h index 868d346abdb..22e81ae3e01 100644 --- a/dll/win32/dbghelp/image_private.h +++ b/dll/win32/dbghelp/image_private.h @@ -61,11 +61,9 @@ typedef struct section macho_section; #if defined(__ELF__) && !defined(DBGHELP_STATIC_LIB) #ifdef _WIN64 -#define Elf_Dyn Elf64_Dyn #define Elf_Sym Elf64_Sym #define Elf_auxv_t Elf64_auxv_t #else -#define Elf_Dyn Elf32_Dyn #define Elf_Sym Elf32_Sym #define Elf_auxv_t Elf32_auxv_t #endif diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index ed6da1caf6a..15733bdd51b 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: bd620ffb443eaa2dba997dc5597cb37c44d757b7 + wine: bb53152faab705d972de3763ddd9bb3351e92460

4 years, 8 months

1
0
0 0

[reactos] 13/179: [WINESYNC] dbghelp: Read the ELF program header corresponding to the target's architecture.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48c551a237ded45fdca72… commit 48c551a237ded45fdca722d2e3849d5427aa16e8 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:04:09 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:32 2020 +0200 [WINESYNC] dbghelp: Read the ELF program header corresponding to the target's architecture. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id bd620ffb443eaa2dba997dc5597cb37c44d757b7 by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/elf_module.c | 31 ++++++++++++++++++++++++------- dll/win32/dbghelp/image_private.h | 2 -- sdk/tools/winesync/dbghelp.cfg | 2 +- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index 8049210c550..f84df836da6 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -332,7 +332,6 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; struct stat statbuf; unsigned int i; - Elf_Phdr phdr; size_t tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; char* filename; unsigned len; @@ -429,13 +428,31 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* fmap->u.elf.elf_start = ~0L; for (i = 0; i < fmap->u.elf.elfhdr.e_phnum; i++) { - if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), - fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && - phdr.p_type == PT_LOAD) + if (fmap->addr_size == 32) { - tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; - if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; - if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + Elf32_Phdr phdr; + + if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), + fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && + phdr.p_type == PT_LOAD) + { + tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; + if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; + if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + } + } + else + { + Elf64_Phdr phdr; + + if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), + fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && + phdr.p_type == PT_LOAD) + { + tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; + if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; + if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + } } } /* if non relocatable ELF, then remove fixed address from computation diff --git a/dll/win32/dbghelp/image_private.h b/dll/win32/dbghelp/image_private.h index 47fd7eed91e..868d346abdb 100644 --- a/dll/win32/dbghelp/image_private.h +++ b/dll/win32/dbghelp/image_private.h @@ -61,12 +61,10 @@ typedef struct section macho_section; #if defined(__ELF__) && !defined(DBGHELP_STATIC_LIB) #ifdef _WIN64 -#define Elf_Phdr Elf64_Phdr #define Elf_Dyn Elf64_Dyn #define Elf_Sym Elf64_Sym #define Elf_auxv_t Elf64_auxv_t #else -#define Elf_Phdr Elf32_Phdr #define Elf_Dyn Elf32_Dyn #define Elf_Sym Elf32_Sym #define Elf_auxv_t Elf32_auxv_t diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 7376e9c5177..ed6da1caf6a 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: cf78601b3781e64ea2745cf8084848acb69300a8 + wine: bd620ffb443eaa2dba997dc5597cb37c44d757b7

4 years, 8 months

1
0
0 0

[reactos] 12/179: [WINESYNC] dbghelp: Add a missing include to fix the build.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8428b1f8c3ec1d5aa8b44… commit 8428b1f8c3ec1d5aa8b44d380b373bbb3c7a5db1 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:04:09 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:32 2020 +0200 [WINESYNC] dbghelp: Add a missing include to fix the build. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id cf78601b3781e64ea2745cf8084848acb69300a8 by Huw Davies <huw(a)codeweavers.com> --- dll/win32/dbghelp/macho_module.c | 1 + sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/dbghelp/macho_module.c b/dll/win32/dbghelp/macho_module.c index 4018c9dbf2d..7c40801d89c 100644 --- a/dll/win32/dbghelp/macho_module.c +++ b/dll/win32/dbghelp/macho_module.c @@ -51,6 +51,7 @@ #include "winternl.h" #include "wine/library.h" #include "wine/debug.h" +#include "wine/heap.h" #include "image_private.h" #ifdef HAVE_MACH_O_LOADER_H diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index bb7500be148..7376e9c5177 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: 4005901773bf1842804c40d928a944623e11d238 + wine: cf78601b3781e64ea2745cf8084848acb69300a8

4 years, 8 months

1
0
0 0

[reactos] 11/179: [WINESYNC] dbghelp: Translate the 32-bit ELF section header to the 64-bit one.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23a2d2713d732b1e1a63d… commit 23a2d2713d732b1e1a63db0824536a576981bf2a Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:03:11 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:32 2020 +0200 [WINESYNC] dbghelp: Translate the 32-bit ELF section header to the 64-bit one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 4005901773bf1842804c40d928a944623e11d238 by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/elf_module.c | 35 ++++++++++++++++++++++++++++++++--- dll/win32/dbghelp/image_private.h | 4 +--- sdk/tools/winesync/dbghelp.cfg | 2 +- 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index edf32b59f11..8049210c550 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -292,6 +292,36 @@ static BOOL elf_map_file_read(struct image_file_map* fmap, struct elf_map_file_d } } +static BOOL elf_map_shdr(struct elf_map_file_data* emfd, struct image_file_map* fmap, unsigned int i) +{ + if (fmap->addr_size == 32) + { + Elf32_Shdr shdr32; + + if (!elf_map_file_read(fmap, emfd, &shdr32, sizeof(shdr32), + fmap->u.elf.elfhdr.e_shoff + i * sizeof(Elf32_Shdr))) + return FALSE; + + fmap->u.elf.sect[i].shdr.sh_name = shdr32.sh_name; + fmap->u.elf.sect[i].shdr.sh_type = shdr32.sh_type; + fmap->u.elf.sect[i].shdr.sh_flags = shdr32.sh_flags; + fmap->u.elf.sect[i].shdr.sh_addr = shdr32.sh_addr; + fmap->u.elf.sect[i].shdr.sh_offset = shdr32.sh_offset; + fmap->u.elf.sect[i].shdr.sh_size = shdr32.sh_size; + fmap->u.elf.sect[i].shdr.sh_link = shdr32.sh_link; + fmap->u.elf.sect[i].shdr.sh_info = shdr32.sh_info; + fmap->u.elf.sect[i].shdr.sh_addralign = shdr32.sh_addralign; + fmap->u.elf.sect[i].shdr.sh_entsize = shdr32.sh_entsize; + } + else + { + if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr), + fmap->u.elf.elfhdr.e_shoff + i * sizeof(Elf64_Shdr))) + return FALSE; + } + return TRUE; +} + /****************************************************************** * elf_map_file * @@ -385,8 +415,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* for (i = 0; i < fmap->u.elf.elfhdr.e_shnum; i++) { - if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr), - fmap->u.elf.elfhdr.e_shoff + i * sizeof(fmap->u.elf.sect[i].shdr))) + if (!elf_map_shdr(emfd, fmap, i)) { HeapFree(GetProcessHeap(), 0, fmap->u.elf.sect); fmap->u.elf.sect = NULL; @@ -1225,7 +1254,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, if (elf_find_section(fmap, ".dynamic", SHT_DYNAMIC, &ism)) { Elf_Dyn dyn; - char* ptr = (char*)fmap->u.elf.sect[ism.sidx].shdr.sh_addr; + char* ptr = (char*)(ULONG_PTR)fmap->u.elf.sect[ism.sidx].shdr.sh_addr; unsigned long len; if (load_offset) ptr += load_offset - fmap->u.elf.elf_start; diff --git a/dll/win32/dbghelp/image_private.h b/dll/win32/dbghelp/image_private.h index 6c6da64f247..47fd7eed91e 100644 --- a/dll/win32/dbghelp/image_private.h +++ b/dll/win32/dbghelp/image_private.h @@ -61,13 +61,11 @@ typedef struct section macho_section; #if defined(__ELF__) && !defined(DBGHELP_STATIC_LIB) #ifdef _WIN64 -#define Elf_Shdr Elf64_Shdr #define Elf_Phdr Elf64_Phdr #define Elf_Dyn Elf64_Dyn #define Elf_Sym Elf64_Sym #define Elf_auxv_t Elf64_auxv_t #else -#define Elf_Shdr Elf32_Shdr #define Elf_Phdr Elf32_Phdr #define Elf_Dyn Elf32_Dyn #define Elf_Sym Elf32_Sym @@ -100,7 +98,7 @@ struct image_file_map Elf64_Ehdr elfhdr; struct { - Elf_Shdr shdr; + Elf64_Shdr shdr; const char* mapped; }* sect; #endif diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 69e8113da58..bb7500be148 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: 799e0bfa57c4c2a7922c43031bd0d95c6add6a1a + wine: 4005901773bf1842804c40d928a944623e11d238

4 years, 8 months

1
0
0 0

[reactos] 10/179: [WINESYNC] dbghelp: Translate the 32-bit ELF header to the 64-bit one.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1983f47206975383907d2… commit 1983f47206975383907d2c9d17360e2d3cfa98e5 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:00:07 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:31 2020 +0200 [WINESYNC] dbghelp: Translate the 32-bit ELF header to the 64-bit one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 799e0bfa57c4c2a7922c43031bd0d95c6add6a1a by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/elf_module.c | 29 +++++++++++++++++++++++++++-- dll/win32/dbghelp/image_private.h | 4 +--- sdk/tools/winesync/dbghelp.cfg | 2 +- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index d0b483abbcf..edf32b59f11 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -351,8 +351,33 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* fmap->addr_size = e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32; - if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr), 0)) - goto done; + if (fmap->addr_size == 32) + { + Elf32_Ehdr elfhdr32; + + if (!elf_map_file_read(fmap, emfd, &elfhdr32, sizeof(elfhdr32), 0)) + goto done; + + memcpy(fmap->u.elf.elfhdr.e_ident, elfhdr32.e_ident, EI_NIDENT); + fmap->u.elf.elfhdr.e_type = elfhdr32.e_type; + fmap->u.elf.elfhdr.e_machine = elfhdr32.e_machine; + fmap->u.elf.elfhdr.e_version = elfhdr32.e_version; + fmap->u.elf.elfhdr.e_entry = elfhdr32.e_entry; + fmap->u.elf.elfhdr.e_phoff = elfhdr32.e_phoff; + fmap->u.elf.elfhdr.e_shoff = elfhdr32.e_shoff; + fmap->u.elf.elfhdr.e_flags = elfhdr32.e_flags; + fmap->u.elf.elfhdr.e_ehsize = elfhdr32.e_ehsize; + fmap->u.elf.elfhdr.e_phentsize = elfhdr32.e_phentsize; + fmap->u.elf.elfhdr.e_phnum = elfhdr32.e_phnum; + fmap->u.elf.elfhdr.e_shentsize = elfhdr32.e_shentsize; + fmap->u.elf.elfhdr.e_shnum = elfhdr32.e_shnum; + fmap->u.elf.elfhdr.e_shstrndx = elfhdr32.e_shstrndx; + } + else + { + if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr), 0)) + goto done; + } fmap->u.elf.sect = HeapAlloc(GetProcessHeap(), 0, fmap->u.elf.elfhdr.e_shnum * sizeof(fmap->u.elf.sect[0])); diff --git a/dll/win32/dbghelp/image_private.h b/dll/win32/dbghelp/image_private.h index 96861040412..6c6da64f247 100644 --- a/dll/win32/dbghelp/image_private.h +++ b/dll/win32/dbghelp/image_private.h @@ -61,14 +61,12 @@ typedef struct section macho_section; #if defined(__ELF__) && !defined(DBGHELP_STATIC_LIB) #ifdef _WIN64 -#define Elf_Ehdr Elf64_Ehdr #define Elf_Shdr Elf64_Shdr #define Elf_Phdr Elf64_Phdr #define Elf_Dyn Elf64_Dyn #define Elf_Sym Elf64_Sym #define Elf_auxv_t Elf64_auxv_t #else -#define Elf_Ehdr Elf32_Ehdr #define Elf_Shdr Elf32_Shdr #define Elf_Phdr Elf32_Phdr #define Elf_Dyn Elf32_Dyn @@ -99,7 +97,7 @@ struct image_file_map struct image_file_map* alternate; /* another ELF file (linked to this one) */ char* target_copy; #if defined(__ELF__) && !defined(DBGHELP_STATIC_LIB) - Elf_Ehdr elfhdr; + Elf64_Ehdr elfhdr; struct { Elf_Shdr shdr; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 95dc6bc4fb4..69e8113da58 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: a612f1f56fefd00ebe6d8f7bcf7c826f5aa85eab + wine: 799e0bfa57c4c2a7922c43031bd0d95c6add6a1a

4 years, 8 months

1
0
0 0

[reactos] 09/179: [WINESYNC] dbghelp: Detect ELF architecture before reading the whole header.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7adbd03d5fcd936e93a93… commit 7adbd03d5fcd936e93a939240b131ba487605b4b Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:00:07 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:31 2020 +0200 [WINESYNC] dbghelp: Detect ELF architecture before reading the whole header. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id a612f1f56fefd00ebe6d8f7bcf7c826f5aa85eab by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/elf_module.c | 14 ++++++++++---- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index e4689a71b1e..d0b483abbcf 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -307,6 +307,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* char* filename; unsigned len; BOOL ret = FALSE; + unsigned char e_ident[EI_NIDENT]; switch (emfd->kind) { @@ -340,14 +341,19 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* case from_process: break; } - if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr), 0)) + + if (!elf_map_file_read(fmap, emfd, e_ident, sizeof(e_ident), 0)) goto done; /* and check for an ELF header */ - if (memcmp(fmap->u.elf.elfhdr.e_ident, - elf_signature, sizeof(elf_signature))) goto done; + if (memcmp(e_ident, elf_signature, sizeof(elf_signature))) + goto done; + + fmap->addr_size = e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32; + + if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr), 0)) + goto done; - fmap->addr_size = fmap->u.elf.elfhdr.e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32; fmap->u.elf.sect = HeapAlloc(GetProcessHeap(), 0, fmap->u.elf.elfhdr.e_shnum * sizeof(fmap->u.elf.sect[0])); if (!fmap->u.elf.sect) goto done; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index e58d3a96f88..95dc6bc4fb4 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: c2c0e4fe510f75c757e5dbdc1b727a7c9f3d6f33 + wine: a612f1f56fefd00ebe6d8f7bcf7c826f5aa85eab

4 years, 8 months

1
0
0 0

[reactos] 08/179: [WINESYNC] dbghelp: Don't enforce child architecture in elf_map_file().

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de68f04b7cf0275cead0b… commit de68f04b7cf0275cead0b10a1d7c516edd29ad43 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:00:07 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:31 2020 +0200 [WINESYNC] dbghelp: Don't enforce child architecture in elf_map_file(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id c2c0e4fe510f75c757e5dbdc1b727a7c9f3d6f33 by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/elf_module.c | 7 +------ sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index e047a7f1ecf..e4689a71b1e 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -346,12 +346,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* /* and check for an ELF header */ if (memcmp(fmap->u.elf.elfhdr.e_ident, elf_signature, sizeof(elf_signature))) goto done; - /* and check 32 vs 64 size according to current machine */ -#ifdef _WIN64 - if (fmap->u.elf.elfhdr.e_ident[EI_CLASS] != ELFCLASS64) goto done; -#else - if (fmap->u.elf.elfhdr.e_ident[EI_CLASS] != ELFCLASS32) goto done; -#endif + fmap->addr_size = fmap->u.elf.elfhdr.e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32; fmap->u.elf.sect = HeapAlloc(GetProcessHeap(), 0, fmap->u.elf.elfhdr.e_shnum * sizeof(fmap->u.elf.sect[0])); diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 32f984f570e..e58d3a96f88 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: 185d9ee7ebf56e0663f715e532f2ee2c27289f12 + wine: c2c0e4fe510f75c757e5dbdc1b727a7c9f3d6f33

4 years, 8 months

1
0
0 0

[reactos] 07/179: [WINESYNC] dbghelp: Correctly determine the wine loader base address.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee8dbf8e10c923575a695… commit ee8dbf8e10c923575a69597f581fd2293da54180 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:00:06 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:31 2020 +0200 [WINESYNC] dbghelp: Correctly determine the wine loader base address. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 185d9ee7ebf56e0663f715e532f2ee2c27289f12 by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/dbghelp_private.h | 21 +++++++++++++++++++++ dll/win32/dbghelp/elf_module.c | 23 +++++++++++++++++++++-- sdk/tools/winesync/dbghelp.cfg | 2 +- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index a78bd156673..24db267a6b6 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -572,6 +572,27 @@ struct cpu extern struct cpu* dbghelp_current_cpu DECLSPEC_HIDDEN; +/* Abbreviated 32-bit PEB */ +typedef struct _PEB32 +{ + BOOLEAN InheritedAddressSpace; + BOOLEAN ReadImageFileExecOptions; + BOOLEAN BeingDebugged; + BOOLEAN SpareBool; + DWORD Mutant; + DWORD ImageBaseAddress; + DWORD LdrData; + DWORD ProcessParameters; + DWORD SubSystemData; + DWORD ProcessHeap; + DWORD FastPebLock; + DWORD FastPebLockRoutine; + DWORD FastPebUnlockRoutine; + ULONG EnvironmentUpdateCount; + DWORD KernelCallbackTable; + ULONG Reserved[2]; +} PEB32; + /* dbghelp.c */ extern struct process* process_find_by_handle(HANDLE hProcess) DECLSPEC_HIDDEN; extern BOOL validate_addr64(DWORD64 addr) DECLSPEC_HIDDEN; diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index 4d877b44214..e047a7f1ecf 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -1574,8 +1574,27 @@ static BOOL elf_search_loader(struct process* pcs, struct elf_info* elf_info) ULONG_PTR base = 0; BOOL ret; - if (!NtQueryInformationProcess( pcs->handle, ProcessBasicInformation, &pbi, sizeof(pbi), NULL )) - ReadProcessMemory( pcs->handle, &pbi.PebBaseAddress->Reserved[0], &base, sizeof(base), NULL ); + if (NtQueryInformationProcess( pcs->handle, ProcessBasicInformation, + &pbi, sizeof(pbi), NULL )) + return FALSE; + + if (!pcs->is_64bit) + { + PEB32 *peb32 = (PEB32 *)pbi.PebBaseAddress; + DWORD base32; + + if (!ReadProcessMemory( pcs->handle, &peb32->Reserved[0], &base32, + sizeof(base32), NULL )) + return FALSE; + + base = base32; + } + else + { + if (!ReadProcessMemory( pcs->handle, &pbi.PebBaseAddress->Reserved[0], + &base, sizeof(base), NULL )) + return FALSE; + } ret = elf_search_and_load_file(pcs, loader, base, 0, elf_info); heap_free(loader); diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index db9fd318575..32f984f570e 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: a981edf0bc7c828e6b55fdc73b51a2f457043c4a + wine: 185d9ee7ebf56e0663f715e532f2ee2c27289f12

4 years, 8 months

1
0
0 0

[reactos] 06/179: [WINESYNC] dbghelp: Determine the wine loader name from the target process's architecture.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f69be6c561fcf5e151e96… commit f69be6c561fcf5e151e96ad9729f3ec501b8393a Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 13:00:06 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:31 2020 +0200 [WINESYNC] dbghelp: Determine the wine loader name from the target process's architecture. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id a981edf0bc7c828e6b55fdc73b51a2f457043c4a by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/compat.c | 22 +++++++++----- dll/win32/dbghelp/compat.h | 39 +++++++++++++----------- dll/win32/dbghelp/dbghelp.c | 7 +++++ dll/win32/dbghelp/dbghelp_private.h | 60 ++++++++++++++++++++----------------- dll/win32/dbghelp/elf_module.c | 7 ++++- dll/win32/dbghelp/macho_module.c | 4 ++- dll/win32/dbghelp/module.c | 57 +++++++++++++++++------------------ sdk/tools/winesync/dbghelp.cfg | 2 +- 8 files changed, 111 insertions(+), 87 deletions(-) diff --git a/dll/win32/dbghelp/compat.c b/dll/win32/dbghelp/compat.c index 51a43453fa8..dfd9ec13d29 100644 --- a/dll/win32/dbghelp/compat.c +++ b/dll/win32/dbghelp/compat.c @@ -71,8 +71,8 @@ __RtlImageRvaToSection( PVOID __RtlImageRvaToVa -(const IMAGE_NT_HEADERS* NtHeader, - PVOID BaseAddress, +(const IMAGE_NT_HEADERS* NtHeader, + PVOID BaseAddress, ULONG Rva, PIMAGE_SECTION_HEADER *SectionHeader) { @@ -160,7 +160,7 @@ HANDLE __CreateFileW( { char buf[MAX_PATH]; HANDLE res; - + WideCharToMultiByte(CP_ACP, 0, lpFileName, -1, buf, MAX_PATH, NULL, NULL); res = CreateFileA(buf, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile); return res; @@ -187,7 +187,7 @@ void* __MapViewOfFile(HANDLE file,DWORD d1,DWORD d2,DWORD d3,SIZE_T s) free(result); return NULL; } - + return result; } @@ -222,15 +222,15 @@ __WideCharToMultiByte(UINT page, DWORD flags, LPCWSTR src, INT srclen, } if (srclen < 0) srclen = strlenW(src) + 1; - + if(!dstlen) return srclen; - + for(i=0; i<srclen && i<dstlen; i++) dst[i] = src[i] & 0xFF; if (used) *used = FALSE; - + return i; } @@ -247,7 +247,7 @@ __MultiByteToWideChar(UINT page, DWORD flags, LPCSTR src, INT srclen, } if (srclen < 0) srclen = strlen(src) + 1; - + if(!dstlen) return srclen; @@ -394,3 +394,9 @@ const char *wine_dbgstr_wn( const WCHAR *str, int n ) *dst++ = 0; return res; } + +BOOL __IsWow64Process(HANDLE Process, BOOL* is_wow64) +{ + *is_wow64 = FALSE; + return TRUE; +} diff --git a/dll/win32/dbghelp/compat.h b/dll/win32/dbghelp/compat.h index f6061c773c7..cbd90edbe81 100644 --- a/dll/win32/dbghelp/compat.h +++ b/dll/win32/dbghelp/compat.h @@ -400,7 +400,7 @@ typedef struct _EXCEPTION_REGISTRATION_RECORD #define INVALID_HANDLE_VALUE (HANDLE)(-1) #define HeapAlloc __HeapAlloc #define HeapReAlloc __HeapReAlloc -#define HeapFree(x,y,z) free(z) +#define HeapFree(x,y,z) free(z) #define GetProcessHeap() 1 #define GetProcessId(x) 8 #define lstrcpynW __lstrcpynW @@ -422,6 +422,8 @@ typedef struct _EXCEPTION_REGISTRATION_RECORD #define GetCurrentDirectoryW(x, y) 0 #define GetFileSizeEx __GetFileSizeEx #define ReadProcessMemory(a,b,c,d,e) 0 +#define GetCurrentProcess() (HANDLE)1 +#define IsWow64Process __IsWow64Process void* __HeapAlloc(int heap, int flags, size_t size); void* __HeapReAlloc(int heap, DWORD d2, void *slab, SIZE_T newsize); @@ -432,6 +434,7 @@ void* __MapViewOfFile(HANDLE file,DWORD d1,DWORD d2,DWORD d3,SIZE_T s); BOOL __UnmapViewOfFile(const void*); LPSTR __lstrcpynA(LPSTR,LPCSTR,int); BOOL __GetFileSizeEx(HANDLE,PLARGE_INTEGER); +BOOL WINAPI __IsWow64Process(HANDLE,BOOL*); #define OPEN_EXISTING 3 #define FILE_MAP_READ SECTION_MAP_READ typedef struct _LDT_ENTRY { @@ -673,7 +676,7 @@ typedef VOID IMAGEHLP_CONTEXT, *PIMAGEHLP_CONTEXT; #define SYMFLAG_PUBLIC_CODE 0x00400000 #define UNDNAME_COMPLETE (0x0000) #define UNDNAME_NAME_ONLY (0x1000) -typedef struct _TI_FINDCHILDREN_PARAMS +typedef struct _TI_FINDCHILDREN_PARAMS { ULONG Count; ULONG Start; @@ -709,7 +712,7 @@ typedef struct _SYMBOL_INFO ULONG MaxNameLen; CHAR Name[1]; } SYMBOL_INFO, *PSYMBOL_INFO; -typedef enum +typedef enum { SymNone = 0, SymCoff, @@ -791,7 +794,7 @@ typedef BOOL (CALLBACK *PFIND_EXE_FILE_CALLBACKW)(HANDLE, PCWSTR, PVOID); #define FindExecutableImageExW __FindExecutableImageExW HANDLE __FindExecutableImageExW(PCWSTR, PCWSTR, PWSTR, PFIND_EXE_FILE_CALLBACKW, PVOID); DWORD WINAPI UnDecorateSymbolName(PCSTR, PSTR, DWORD, DWORD); -typedef enum _THREAD_WRITE_FLAGS +typedef enum _THREAD_WRITE_FLAGS { ThreadWriteThread = 0x0001, ThreadWriteStack = 0x0002, @@ -911,7 +914,7 @@ typedef struct _IMAGEHLP_MODULE64 } IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64; typedef DWORD RVA; typedef ULONG64 RVA64; -typedef enum _MINIDUMP_TYPE +typedef enum _MINIDUMP_TYPE { MiniDumpNormal = 0x0000, MiniDumpWithDataSegs = 0x0001, @@ -938,7 +941,7 @@ typedef struct _MINIDUMP_THREAD_CALLBACK ULONG64 StackBase; ULONG64 StackEnd; } MINIDUMP_THREAD_CALLBACK, *PMINIDUMP_THREAD_CALLBACK; -typedef struct _MINIDUMP_THREAD_EX_CALLBACK +typedef struct _MINIDUMP_THREAD_EX_CALLBACK { ULONG ThreadId; HANDLE ThreadHandle; @@ -949,7 +952,7 @@ typedef struct _MINIDUMP_THREAD_EX_CALLBACK ULONG64 BackingStoreBase; ULONG64 BackingStoreEnd; } MINIDUMP_THREAD_EX_CALLBACK, *PMINIDUMP_THREAD_EX_CALLBACK; -typedef struct _MINIDUMP_MODULE_CALLBACK +typedef struct _MINIDUMP_MODULE_CALLBACK { PWCHAR FullPath; ULONG64 BaseOfImage; @@ -966,16 +969,16 @@ typedef struct _MINIDUMP_INCLUDE_THREAD_CALLBACK { ULONG ThreadId; } MINIDUMP_INCLUDE_THREAD_CALLBACK, *PMINIDUMP_INCLUDE_THREAD_CALLBACK; -typedef struct _MINIDUMP_INCLUDE_MODULE_CALLBACK +typedef struct _MINIDUMP_INCLUDE_MODULE_CALLBACK { ULONG64 BaseOfImage; } MINIDUMP_INCLUDE_MODULE_CALLBACK, *PMINIDUMP_INCLUDE_MODULE_CALLBACK; -typedef struct _MINIDUMP_CALLBACK_INPUT +typedef struct _MINIDUMP_CALLBACK_INPUT { ULONG ProcessId; HANDLE ProcessHandle; ULONG CallbackType; - union + union { MINIDUMP_THREAD_CALLBACK Thread; MINIDUMP_THREAD_EX_CALLBACK ThreadEx; @@ -986,7 +989,7 @@ typedef struct _MINIDUMP_CALLBACK_INPUT } MINIDUMP_CALLBACK_INPUT, *PMINIDUMP_CALLBACK_INPUT; typedef struct _MINIDUMP_CALLBACK_OUTPUT { - union + union { ULONG ModuleWriteFlags; ULONG ThreadWriteFlags; @@ -998,7 +1001,7 @@ typedef struct _MINIDUMP_CALLBACK_OUTPUT } DUMMYUNIONNAME; } MINIDUMP_CALLBACK_OUTPUT, *PMINIDUMP_CALLBACK_OUTPUT; typedef BOOL (WINAPI* MINIDUMP_CALLBACK_ROUTINE)(PVOID, const PMINIDUMP_CALLBACK_INPUT, PMINIDUMP_CALLBACK_OUTPUT); -typedef struct _MINIDUMP_CALLBACK_INFORMATION +typedef struct _MINIDUMP_CALLBACK_INFORMATION { MINIDUMP_CALLBACK_ROUTINE CallbackRoutine; void* CallbackParam; @@ -1060,7 +1063,7 @@ typedef struct _STACKFRAME64 DWORD64 Reserved[3]; KDHELP64 KdHelp; } STACKFRAME64, *LPSTACKFRAME64; -typedef enum _IMAGEHLP_SYMBOL_TYPE_INFO +typedef enum _IMAGEHLP_SYMBOL_TYPE_INFO { TI_GET_SYMTAG, TI_GET_SYMNAME, @@ -1245,13 +1248,13 @@ enum SymTagEnum SymTagPointerType, SymTagArrayType, SymTagBaseType, - SymTagTypedef, + SymTagTypedef, SymTagBaseClass, SymTagFriend, - SymTagFunctionArgType, - SymTagFuncDebugStart, + SymTagFunctionArgType, + SymTagFuncDebugStart, SymTagFuncDebugEnd, - SymTagUsingNamespace, + SymTagUsingNamespace, SymTagVTableShape, SymTagVTable, SymTagCustom, @@ -1867,7 +1870,7 @@ typedef enum THUNK_ORDINAL_ADJUSTOR, THUNK_ORDINAL_VCALL, THUNK_ORDINAL_PCODE, - THUNK_ORDINAL_LOAD + THUNK_ORDINAL_LOAD } THUNK_ORDINAL; typedef enum CV_call_e diff --git a/dll/win32/dbghelp/dbghelp.c b/dll/win32/dbghelp/dbghelp.c index 6779e9ae98e..14eeb781637 100644 --- a/dll/win32/dbghelp/dbghelp.c +++ b/dll/win32/dbghelp/dbghelp.c @@ -309,6 +309,7 @@ static BOOL check_live_target(struct process* pcs) BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeProcess) { struct process* pcs; + BOOL wow64, child_wow64; TRACE("(%p %s %u)\n", hProcess, debugstr_w(UserSearchPath), fInvadeProcess); @@ -326,6 +327,12 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP pcs->handle = hProcess; + IsWow64Process(GetCurrentProcess(), &wow64); + + if (!IsWow64Process(hProcess, &child_wow64)) + return FALSE; + pcs->is_64bit = (sizeof(void *) == 8 || wow64) && !child_wow64; + if (UserSearchPath) { pcs->search_path = lstrcpyW(HeapAlloc(GetProcessHeap(), 0, diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index 0d1e8e4274d..a78bd156673 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -415,7 +415,7 @@ struct module struct wine_rb_tree sources_offsets_tree; }; -struct process +struct process { struct process* next; HANDLE handle; @@ -433,6 +433,8 @@ struct process unsigned buffer_size; void* buffer; + + BOOL is_64bit; }; struct line_info @@ -639,11 +641,13 @@ extern void module_reset_debug_info(struct module* module) DECLSPEC_HIDD extern BOOL module_remove(struct process* pcs, struct module* module) DECLSPEC_HIDDEN; extern void module_set_module(struct module* module, const WCHAR* name) DECLSPEC_HIDDEN; -extern const WCHAR *get_wine_loader_name(void) DECLSPEC_HIDDEN; +#ifndef __REACTOS__ +extern WCHAR * get_wine_loader_name(struct process *pcs) DECLSPEC_HIDDEN; +#endif /* msc.c */ extern BOOL pe_load_debug_directory(const struct process* pcs, - struct module* module, + struct module* module, const BYTE* mapping, const IMAGE_SECTION_HEADER* sectp, DWORD nsect, const IMAGE_DEBUG_DIRECTORY* dbg, int nDbg) DECLSPEC_HIDDEN; @@ -657,7 +661,7 @@ extern BOOL pdb_virtual_unwind(struct cpu_stack_walk* csw, DWORD_PTR ip, /* path.c */ extern BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, - PCSTR full_path, const GUID* guid, DWORD dw1, DWORD dw2, + PCSTR full_path, const GUID* guid, DWORD dw1, DWORD dw2, PSTR buffer, BOOL* is_unmatched) DECLSPEC_HIDDEN; /* pe_module.c */ @@ -720,14 +724,14 @@ extern struct symt_compiland* symt_new_compiland(struct module* module, unsigned long address, unsigned src_idx) DECLSPEC_HIDDEN; extern struct symt_public* - symt_new_public(struct module* module, - struct symt_compiland* parent, + symt_new_public(struct module* module, + struct symt_compiland* parent, const char* typename, BOOL is_function, unsigned long address, unsigned size) DECLSPEC_HIDDEN; extern struct symt_data* - symt_new_global_variable(struct module* module, + symt_new_global_variable(struct module* module, struct symt_compiland* parent, const char* name, unsigned is_static, struct location loc, unsigned long size, @@ -738,31 +742,31 @@ extern struct symt_function* const char* name, unsigned long addr, unsigned long size, struct symt* type) DECLSPEC_HIDDEN; -extern BOOL symt_normalize_function(struct module* module, +extern BOOL symt_normalize_function(struct module* module, const struct symt_function* func) DECLSPEC_HIDDEN; extern void symt_add_func_line(struct module* module, - struct symt_function* func, - unsigned source_idx, int line_num, + struct symt_function* func, + unsigned source_idx, int line_num, unsigned long offset) DECLSPEC_HIDDEN; extern struct symt_data* - symt_add_func_local(struct module* module, - struct symt_function* func, + symt_add_func_local(struct module* module, + struct symt_function* func, enum DataKind dt, const struct location* loc, struct symt_block* block, struct symt* type, const char* name) DECLSPEC_HIDDEN; extern struct symt_block* - symt_open_func_block(struct module* module, + symt_open_func_block(struct module* module, struct symt_function* func, - struct symt_block* block, + struct symt_block* block, unsigned pc, unsigned len) DECLSPEC_HIDDEN; extern struct symt_block* - symt_close_func_block(struct module* module, + symt_close_func_block(struct module* module, const struct symt_function* func, struct symt_block* block, unsigned pc) DECLSPEC_HIDDEN; extern struct symt_hierarchy_point* - symt_add_function_point(struct module* module, + symt_add_function_point(struct module* module, struct symt_function* func, - enum SymTagEnum point, + enum SymTagEnum point, const struct location* loc, const char* name) DECLSPEC_HIDDEN; extern BOOL symt_fill_func_line_info(const struct module* module, @@ -770,7 +774,7 @@ extern BOOL symt_fill_func_line_info(const struct module* module, DWORD64 addr, IMAGEHLP_LINE64* line) DECLSPEC_HIDDEN; extern BOOL symt_get_func_line_next(const struct module* module, PIMAGEHLP_LINE64 line) DECLSPEC_HIDDEN; extern struct symt_thunk* - symt_new_thunk(struct module* module, + symt_new_thunk(struct module* module, struct symt_compiland* parent, const char* name, THUNK_ORDINAL ord, unsigned long addr, unsigned long size) DECLSPEC_HIDDEN; @@ -791,38 +795,38 @@ extern void symt_init_basic(struct module* module) DECLSPEC_HIDDEN; extern BOOL symt_get_info(struct module* module, const struct symt* type, IMAGEHLP_SYMBOL_TYPE_INFO req, void* pInfo) DECLSPEC_HIDDEN; extern struct symt_basic* - symt_new_basic(struct module* module, enum BasicType, + symt_new_basic(struct module* module, enum BasicType, const char* typename, unsigned size) DECLSPEC_HIDDEN; extern struct symt_udt* symt_new_udt(struct module* module, const char* typename, unsigned size, enum UdtKind kind) DECLSPEC_HIDDEN; extern BOOL symt_set_udt_size(struct module* module, struct symt_udt* type, unsigned size) DECLSPEC_HIDDEN; -extern BOOL symt_add_udt_element(struct module* module, - struct symt_udt* udt_type, +extern BOOL symt_add_udt_element(struct module* module, + struct symt_udt* udt_type, const char* name, - struct symt* elt_type, unsigned offset, + struct symt* elt_type, unsigned offset, unsigned size) DECLSPEC_HIDDEN; extern struct symt_enum* symt_new_enum(struct module* module, const char* typename, struct symt* basetype) DECLSPEC_HIDDEN; -extern BOOL symt_add_enum_element(struct module* module, - struct symt_enum* enum_type, +extern BOOL symt_add_enum_element(struct module* module, + struct symt_enum* enum_type, const char* name, int value) DECLSPEC_HIDDEN; extern struct symt_array* - symt_new_array(struct module* module, int min, int max, + symt_new_array(struct module* module, int min, int max, struct symt* base, struct symt* index) DECLSPEC_HIDDEN; extern struct symt_function_signature* - symt_new_function_signature(struct module* module, + symt_new_function_signature(struct module* module, struct symt* ret_type, enum CV_call_e call_conv) DECLSPEC_HIDDEN; extern BOOL symt_add_function_signature_parameter(struct module* module, struct symt_function_signature* sig, struct symt* param) DECLSPEC_HIDDEN; extern struct symt_pointer* - symt_new_pointer(struct module* module, + symt_new_pointer(struct module* module, struct symt* ref_type, unsigned long size) DECLSPEC_HIDDEN; extern struct symt_typedef* - symt_new_typedef(struct module* module, struct symt* ref, + symt_new_typedef(struct module* module, struct symt* ref, const char* name) DECLSPEC_HIDDEN; diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index e841b1b707a..4d877b44214 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -50,6 +50,7 @@ #include "wine/library.h" #include "wine/debug.h" +#include "wine/heap.h" #ifdef __ELF__ @@ -1568,13 +1569,17 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, */ static BOOL elf_search_loader(struct process* pcs, struct elf_info* elf_info) { + WCHAR *loader = get_wine_loader_name(pcs); PROCESS_BASIC_INFORMATION pbi; ULONG_PTR base = 0; + BOOL ret; if (!NtQueryInformationProcess( pcs->handle, ProcessBasicInformation, &pbi, sizeof(pbi), NULL )) ReadProcessMemory( pcs->handle, &pbi.PebBaseAddress->Reserved[0], &base, sizeof(base), NULL ); - return elf_search_and_load_file(pcs, get_wine_loader_name(), base, 0, elf_info); + ret = elf_search_and_load_file(pcs, loader, base, 0, elf_info); + heap_free(loader); + return ret; } /****************************************************************** diff --git a/dll/win32/dbghelp/macho_module.c b/dll/win32/dbghelp/macho_module.c index 01fa300eff7..4018c9dbf2d 100644 --- a/dll/win32/dbghelp/macho_module.c +++ b/dll/win32/dbghelp/macho_module.c @@ -1703,6 +1703,7 @@ BOOL macho_synchronize_module_list(struct process* pcs) */ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_info) { + WCHAR *loader = get_wine_loader_name(pcs); BOOL ret = FALSE; ULONG_PTR dyld_image_info_address; struct dyld_all_image_infos image_infos; @@ -1757,7 +1758,8 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in } if (!ret) - ret = macho_search_and_load_file(pcs, get_wine_loader_name(), 0, macho_info); + ret = macho_search_and_load_file(pcs, loader, 0, macho_info); + heap_free(loader); return ret; } diff --git a/dll/win32/dbghelp/module.c b/dll/win32/dbghelp/module.c index 2ddf3f50644..8f7150460be 100644 --- a/dll/win32/dbghelp/module.c +++ b/dll/win32/dbghelp/module.c @@ -149,44 +149,41 @@ void module_set_module(struct module* module, const WCHAR* name) module_fill_module(name, module->modulename, sizeof(module->modulename) / sizeof(module->modulename[0])); } -const WCHAR *get_wine_loader_name(void) +#ifndef __REACTOS__ +/* Returned string must be freed by caller */ +WCHAR *get_wine_loader_name(struct process *pcs) { - static const BOOL is_win64 = sizeof(void *) > sizeof(int); /* FIXME: should depend on target process */ static const WCHAR wineW[] = {'w','i','n','e',0}; static const WCHAR suffixW[] = {'6','4',0}; - static const WCHAR *loader; + WCHAR *buffer, *p; + const char *env; - if (!loader) + /* All binaries are loaded with WINELOADER (if run from tree) or by the + * main executable + */ + if ((env = getenv("WINELOADER"))) + { + DWORD len = 2 + MultiByteToWideChar( CP_UNIXCP, 0, env, -1, NULL, 0 ); + buffer = heap_alloc( len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_UNIXCP, 0, env, -1, buffer, len ); + } + else { - WCHAR *p, *buffer; - const char *ptr; + buffer = heap_alloc( sizeof(wineW) + 2 * sizeof(WCHAR) ); + strcpyW( buffer, wineW ); + } - /* All binaries are loaded with WINELOADER (if run from tree) or by the - * main executable - */ - if ((ptr = getenv("WINELOADER"))) - { - DWORD len = 2 + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, buffer, len ); - } - else - { - buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(wineW) + 2 * sizeof(WCHAR) ); - strcpyW( buffer, wineW ); - } - p = buffer + strlenW( buffer ) - strlenW( suffixW ); - if (p > buffer && !strcmpW( p, suffixW )) - { - if (!is_win64) *p = 0; - } - else if (is_win64) strcatW( buffer, suffixW ); + p = buffer + strlenW( buffer ) - strlenW( suffixW ); + if (p > buffer && !strcmpW( p, suffixW )) + *p = 0; - TRACE( "returning %s\n", debugstr_w(buffer) ); - loader = buffer; - } - return loader; + if (pcs->is_64bit) + strcatW(buffer, suffixW); + + TRACE( "returning %s\n", debugstr_w(buffer) ); + return buffer; } +#endif static const char* get_module_type(enum module_type type, BOOL virtual) { diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 55c41591d34..db9fd318575 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: 9b973eee9e06a3dca7a6c5739741446bf46e27f5 + wine: a981edf0bc7c828e6b55fdc73b51a2f457043c4a

4 years, 8 months

1
0
0 0

[reactos] 05/179: [WINESYNC] dbghelp: Add a helper to check if a given module is the Wine loader.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=334654480249d92cb2572… commit 334654480249d92cb25728c2f6231b82e8236a46 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 12:56:05 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:31 2020 +0200 [WINESYNC] dbghelp: Add a helper to check if a given module is the Wine loader. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 9b973eee9e06a3dca7a6c5739741446bf46e27f5 by Zebediah Figura <zfigura(a)codeweavers.com> --- dll/win32/dbghelp/module.c | 76 ++++++++++++++++++++++++++++++++---------- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 59 insertions(+), 19 deletions(-) diff --git a/dll/win32/dbghelp/module.c b/dll/win32/dbghelp/module.c index aaa0ff6f987..2ddf3f50644 100644 --- a/dll/win32/dbghelp/module.c +++ b/dll/win32/dbghelp/module.c @@ -30,12 +30,17 @@ #include "psapi.h" #include "winternl.h" #include "wine/debug.h" +#ifndef __REACTOS__ +#include "wine/heap.h" +#endif #endif WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); const WCHAR S_ElfW[] = {'<','e','l','f','>','\0'}; +#ifndef __REACTOS__ const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'}; +#endif static const WCHAR S_DotSoW[] = {'.','s','o','\0'}; static const WCHAR S_DotDylibW[] = {'.','d','y','l','i','b','\0'}; static const WCHAR S_DotPdbW[] = {'.','p','d','b','\0'}; @@ -77,9 +82,44 @@ static const WCHAR* get_filename(const WCHAR* name, const WCHAR* endptr) return ++ptr; } +#ifndef __REACTOS__ +static BOOL is_wine_loader(const WCHAR *module) +{ + static const WCHAR wineW[] = {'w','i','n','e',0}; + static const WCHAR suffixW[] = {'6','4',0}; + const WCHAR *filename = get_filename(module, NULL); + const char *ptr, *p; + BOOL ret = FALSE; + WCHAR *buffer; + DWORD len; + + if ((ptr = getenv("WINELOADER"))) + { + if ((p = strrchr(ptr, '/'))) ptr = p + 1; + len = 2 + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); + buffer = heap_alloc( len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, buffer, len ); + } + else + { + buffer = heap_alloc( sizeof(wineW) + 2 * sizeof(WCHAR) ); + strcpyW( buffer, wineW ); + } + + if (!strcmpW( filename, buffer )) + ret = TRUE; + + strcatW( buffer, suffixW ); + if (!strcmpW( filename, buffer )) + ret = TRUE; + + heap_free( buffer ); + return ret; +} +#endif + static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) { - const WCHAR *loader = get_wine_loader_name(); const WCHAR *ptr, *endptr; size_t len, l; @@ -89,8 +129,10 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) out[len] = '\0'; if (len > 4 && (l = match_ext(out, len))) out[len - l] = '\0'; - else if (len > strlenW(loader) && !strcmpiW(out + len - strlenW(loader), loader)) +#ifndef __REACTOS__ + else if (is_wine_loader(out)) lstrcpynW(out, S_WineLoaderW, size); +#endif else { if (len > 3 && !strcmpiW(&out[len - 3], S_DotSoW) && @@ -295,7 +337,7 @@ static struct module* module_get_container(const struct process* pcs, const struct module* inner) { struct module* module; - + for (module = pcs->lmodules; module; module = module->next) { if (module != inner && @@ -311,11 +353,11 @@ static struct module* module_get_container(const struct process* pcs, * module_get_containee * */ -struct module* module_get_containee(const struct process* pcs, +struct module* module_get_containee(const struct process* pcs, const struct module* outter) { struct module* module; - + for (module = pcs->lmodules; module; module = module->next) { if (module != outter && @@ -349,7 +391,7 @@ BOOL module_get_debug(struct module_pair* pair) if (pair->effective->module.SymType == SymDeferred) { BOOL ret; - + if (pair->effective->is_virtual) ret = FALSE; else switch (pair->effective->type) { @@ -393,14 +435,14 @@ BOOL module_get_debug(struct module_pair* pair) /*********************************************************************** * module_find_by_addr * - * either the addr where module is loaded, or any address inside the + * either the addr where module is loaded, or any address inside the * module */ struct module* module_find_by_addr(const struct process* pcs, DWORD64 addr, enum module_type type) { struct module* module; - + if (type == DMT_UNKNOWN) { if ((module = module_find_by_addr(pcs, addr, DMT_PE)) || @@ -413,7 +455,7 @@ struct module* module_find_by_addr(const struct process* pcs, DWORD64 addr, for (module = pcs->lmodules; module; module = module->next) { if (type == module->type && addr >= module->module.BaseOfImage && - addr < module->module.BaseOfImage + module->module.ImageSize) + addr < module->module.BaseOfImage + module->module.ImageSize) return module; } } @@ -464,8 +506,7 @@ static BOOL module_is_container_loaded(const struct process* pcs, */ enum module_type module_get_type_by_name(const WCHAR* name) { - int loader_len, len = strlenW(name); - const WCHAR *loader; + int len = strlenW(name); /* Skip all version extensions (.[digits]) regex: "(\.\d+)*$" */ do @@ -500,10 +541,8 @@ enum module_type module_get_type_by_name(const WCHAR* name) return DMT_DBG; /* wine is also a native module (Mach-O on Mac OS X, ELF elsewhere) */ - loader = get_wine_loader_name(); - loader_len = strlenW( loader ); - if ((len == loader_len || (len > loader_len && name[len - loader_len - 1] == '/')) && - !strcmpiW(name + len - loader_len, loader)) +#ifndef __REACTOS__ + if (is_wine_loader(name)) { #ifdef __APPLE__ return DMT_MACHO; @@ -511,6 +550,7 @@ enum module_type module_get_type_by_name(const WCHAR* name) return DMT_ELF; #endif } +#endif return DMT_PE; } @@ -768,7 +808,7 @@ static BOOL CALLBACK enum_modW64_32(PCWSTR name, DWORD64 base, PVOID user) } BOOL WINAPI SymEnumerateModules(HANDLE hProcess, - PSYM_ENUMMODULES_CALLBACK EnumModulesCallback, + PSYM_ENUMMODULES_CALLBACK EnumModulesCallback, PVOID UserContext) { struct enum_modW64_32 x; @@ -799,7 +839,7 @@ static BOOL CALLBACK enum_modW64_64(PCWSTR name, DWORD64 base, PVOID user) } BOOL WINAPI SymEnumerateModules64(HANDLE hProcess, - PSYM_ENUMMODULES_CALLBACK64 EnumModulesCallback, + PSYM_ENUMMODULES_CALLBACK64 EnumModulesCallback, PVOID UserContext) { struct enum_modW64_64 x; @@ -822,7 +862,7 @@ BOOL WINAPI SymEnumerateModulesW64(HANDLE hProcess, struct module* module; if (!pcs) return FALSE; - + for (module = pcs->lmodules; module; module = module->next) { if (!(dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) && diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index c06d6c5981e..55c41591d34 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: wine-3.9 + wine: 9b973eee9e06a3dca7a6c5739741446bf46e27f5

4 years, 8 months

1
0
0 0

[reactos] 04/179: [WINESYNC]: revert wine-staging patchset for dbghelp

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7431b80ae6bde63f2120d… commit 7431b80ae6bde63f2120db5bcb91b97c6b3c4b13 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 11 12:54:01 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:30 2020 +0200 [WINESYNC]: revert wine-staging patchset for dbghelp --- dll/win32/dbghelp/elf_module.c | 8 +++--- ...-Always-check-for-debug-symbols-in-BINDIR.patch | 31 ---------------------- 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index 066c2f5166d..e841b1b707a 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -1489,11 +1489,9 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, if (!ret && !strchrW(filename, '/')) { ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, - getenv("PATH"), elf_info); - if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, - getenv("LD_LIBRARY_PATH"), elf_info); - if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, - BINDIR, elf_info); + getenv("PATH"), elf_info) || + elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, + getenv("LD_LIBRARY_PATH"), elf_info); if (!ret) ret = elf_load_file_from_dll_path(pcs, filename, load_offset, dyn_addr, elf_info); } diff --git a/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch b/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch deleted file mode 100644 index b16a465972a..00000000000 --- a/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f466d59e3eca3c1fd120203d01a746761f301207 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner <sebastian(a)fds-team.de> -Date: Mon, 6 Oct 2014 05:06:06 +0200 -Subject: dbghelp: Always check for debug symbols in BINDIR. - ---- - dll/win32/dbghelp/elf_module.c | 8 +++++--- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c -index 6428955941c..75c0a4c2453 100644 ---- a/dll/win32/dbghelp/elf_module.c -+++ b/dll/win32/dbghelp/elf_module.c -@@ -1486,9 +1486,11 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, - if (!ret && !strchrW(filename, '/')) - { - ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, -- getenv("PATH"), elf_info) || -- elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, -- getenv("LD_LIBRARY_PATH"), elf_info); -+ getenv("PATH"), elf_info); -+ if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, -+ getenv("LD_LIBRARY_PATH"), elf_info); -+ if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, -+ BINDIR, elf_info); - if (!ret) ret = elf_load_file_from_dll_path(pcs, filename, - load_offset, dyn_addr, elf_info); - } --- -2.11.0 -

4 years, 8 months

1
0
0 0

[reactos] 03/179: [WINESYNC] Add dbghelp entry

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cce4bdebafbd04509f24… commit 6cce4bdebafbd04509f24b36cfd3c78bf7832525 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 11 12:45:58 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:30 2020 +0200 [WINESYNC] Add dbghelp entry --- sdk/tools/winesync/dbghelp.cfg | 6 +++++ ...-Always-check-for-debug-symbols-in-BINDIR.patch | 31 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg new file mode 100644 index 00000000000..c06d6c5981e --- /dev/null +++ b/sdk/tools/winesync/dbghelp.cfg @@ -0,0 +1,6 @@ +directories: + dlls/dbghelp: dll/win32/dbghelp +files: + include/dbghelp.h: sdk/include/psdk/dbghelp.h +tags: + wine: wine-3.9 diff --git a/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch b/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch new file mode 100644 index 00000000000..b16a465972a --- /dev/null +++ b/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch @@ -0,0 +1,31 @@ +From f466d59e3eca3c1fd120203d01a746761f301207 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner <sebastian(a)fds-team.de> +Date: Mon, 6 Oct 2014 05:06:06 +0200 +Subject: dbghelp: Always check for debug symbols in BINDIR. + +--- + dll/win32/dbghelp/elf_module.c | 8 +++++--- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c +index 6428955941c..75c0a4c2453 100644 +--- a/dll/win32/dbghelp/elf_module.c ++++ b/dll/win32/dbghelp/elf_module.c +@@ -1486,9 +1486,11 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, + if (!ret && !strchrW(filename, '/')) + { + ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, +- getenv("PATH"), elf_info) || +- elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, +- getenv("LD_LIBRARY_PATH"), elf_info); ++ getenv("PATH"), elf_info); ++ if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, ++ getenv("LD_LIBRARY_PATH"), elf_info); ++ if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, ++ BINDIR, elf_info); + if (!ret) ret = elf_load_file_from_dll_path(pcs, filename, + load_offset, dyn_addr, elf_info); + } +-- +2.11.0 +

4 years, 8 months

1
0
0 0

[reactos] 02/179: [LIBWINE] make wine_get_dos_file_name available

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a84b0dbe6b8a4f78f271e… commit a84b0dbe6b8a4f78f271ef0cd8331d9b5252134d Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Sep 14 10:01:15 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:30 2020 +0200 [LIBWINE] make wine_get_dos_file_name available And complain loudly when we get a *real* unix file name --- sdk/include/psdk/winbase.h | 5 ++ sdk/lib/3rdparty/libwine/CMakeLists.txt | 4 +- sdk/lib/3rdparty/libwine/path.c | 82 +++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 1 deletion(-) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index f803ff178de..0f653ea835f 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -3945,6 +3945,11 @@ QueryDepthSList( #endif /* _SLIST_HEADER_ */ +#ifdef __WINESRC__ +/* Wine specific. Basically MultiByteToWideChar for us. */ +WCHAR * CDECL wine_get_dos_file_name(LPCSTR str); +#endif + #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/sdk/lib/3rdparty/libwine/CMakeLists.txt b/sdk/lib/3rdparty/libwine/CMakeLists.txt index 809893c3bd9..bed7ca764eb 100644 --- a/sdk/lib/3rdparty/libwine/CMakeLists.txt +++ b/sdk/lib/3rdparty/libwine/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -add_definitions(-D__WINESRC__) list(APPEND SOURCE config.c @@ -10,12 +9,15 @@ list(APPEND SOURCE isnan.c loader.c ${REACTOS_SOURCE_DIR}/sdk/lib/crt/string/wctype.c + path.c register.c # string.c implements _stricmp, already shipped with crt ) add_library(wine ${SOURCE}) add_dependencies(wine psdk) +target_compile_definitions(wine PRIVATE __WINESRC__ _WINE) add_library(wineldr loader.c) add_dependencies(wineldr xdk) +target_compile_definitions(wineldr PRIVATE __WINESRC__) diff --git a/sdk/lib/3rdparty/libwine/path.c b/sdk/lib/3rdparty/libwine/path.c new file mode 100644 index 00000000000..d8f11bdafc5 --- /dev/null +++ b/sdk/lib/3rdparty/libwine/path.c @@ -0,0 +1,82 @@ +/* Copyright 1993 Erik Bos + * Copyright 1996, 2004 Alexandre Julliard + * Copyright 2003 Eric Pouech + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <windef.h> +#include <winbase.h> +#include <winnls.h> + +#include <wine/winternl.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(path); + +static inline BOOL set_ntstatus( NTSTATUS status ) +{ + if (status) SetLastError( RtlNtStatusToDosError( status )); + return !status; +} + +/*********************************************************************** + * wine_get_dos_file_name (KERNEL32.@) Not a Windows API + * + * Return the full DOS file name for a given Unix path. + * Returned buffer must be freed by caller. + */ +WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) +{ + UNICODE_STRING nt_name; + NTSTATUS status; + WCHAR *buffer; + SIZE_T len = strlen(str) + 1; + + if (str[0] != '/') /* relative path name */ + { + if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; + MultiByteToWideChar( CP_UNIXCP, 0, str, len, buffer, len ); + status = RtlDosPathNameToNtPathName_U_WithStatus( buffer, &nt_name, NULL, NULL ); + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + if (!set_ntstatus( status )) return NULL; + buffer = nt_name.Buffer; + len = nt_name.Length / sizeof(WCHAR) + 1; + } + else + { +#ifdef __REACTOS__ + ERR("Got absolute UNIX path name in function wine_get_dos_file_name. This is not UNIX. Please fix the caller!\n"); + ERR("File name: %s\n", str); +#else + len += 8; /* \??\unix prefix */ + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; + if (!set_ntstatus( wine_unix_to_nt_file_name( str, buffer, &len ))) + { + HeapFree( GetProcessHeap(), 0, buffer ); + return NULL; + } +#endif + } + if (buffer[5] == ':') + { + /* get rid of the \??\ prefix */ + /* FIXME: should implement RtlNtPathNameToDosPathName and use that instead */ + memmove( buffer, buffer + 4, (len - 4) * sizeof(WCHAR) ); + } + else buffer[1] = '\\'; + return buffer; +}

4 years, 8 months

1
0
0 0

[reactos] 01/179: [CRT] Let's have llabs for every compiler out there

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9fc0c7a372a6b448efa73… commit 9fc0c7a372a6b448efa735e023e74a4895f6e9a9 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Sep 14 09:23:50 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:29 2020 +0200 [CRT] Let's have llabs for every compiler out there --- sdk/include/crt/stdlib.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdk/include/crt/stdlib.h b/sdk/include/crt/stdlib.h index 2ad4300c95c..a9fdbf604e7 100644 --- a/sdk/include/crt/stdlib.h +++ b/sdk/include/crt/stdlib.h @@ -1440,9 +1440,7 @@ extern "C" { _Check_return_ __MINGW_EXTENSION lldiv_t __cdecl lldiv(_In_ long long, _In_ long long); -#ifndef _MSC_VER __MINGW_EXTENSION __CRT_INLINE long long __cdecl llabs(_In_ long long _j) { return (_j >= 0 ? _j : -_j); } -#endif __MINGW_EXTENSION long long __cdecl strtoll(const char* __restrict__, char** __restrict, int); __MINGW_EXTENSION unsigned long long __cdecl strtoull(const char* __restrict__, char** __restrict__, int);

4 years, 8 months

1
0
0 0

[reactos] 01/01: [RAPPS] Fix of unhandled exception when trying to modify/uninstall without selection (#3185)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=579f5012156b23510b15c… commit 579f5012156b23510b15cd0633c9c84381414f9e Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Tue Sep 15 22:50:12 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 15 22:50:12 2020 +0200 [RAPPS] Fix of unhandled exception when trying to modify/uninstall without selection (#3185) CORE-17279 --- base/applications/rapps/gui.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index fb414504fc7..ed0689aac2a 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -278,6 +278,9 @@ BOOL CMainWindow::RemoveSelectedAppFromRegistry() if (MessageBoxW(szMsgText, szMsgTitle, MB_YESNO | MB_ICONQUESTION) == IDYES) { CInstalledApplicationInfo *InstalledApp = (CInstalledApplicationInfo *)m_ApplicationView->GetFocusedItemData(); + if (!InstalledApp) + return FALSE; + LSTATUS Result = InstalledApp->RemoveFromRegistry(); if (Result != ERROR_SUCCESS) { @@ -299,6 +302,8 @@ BOOL CMainWindow::UninstallSelectedApp(BOOL bModify) return FALSE; CInstalledApplicationInfo *InstalledApp = (CInstalledApplicationInfo *)m_ApplicationView->GetFocusedItemData(); + if (!InstalledApp) + return FALSE; return InstalledApp->UninstallApplication(bModify); }

4 years, 8 months

1
0
0 0

[reactos] 01/01: [MMIXER] Fix NULL dereference CORE-17276

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a27f0debca4c0fe8cd916… commit a27f0debca4c0fe8cd916d2406124f9d30ae5dbe Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Sep 15 20:54:50 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Sep 15 20:54:50 2020 +0200 [MMIXER] Fix NULL dereference CORE-17276 This lead to a crash of winmm:mixer during "GCCLin_x86 on Test VBox". The crash was exposed when new code paths were activated by 0.4.15-dev-791-g 6d7ebc20481a587bd19e8a8049317113071b0817 I do intend to port this commit back into 0.4.14RC. --- sdk/lib/drivers/sound/mmixer/sup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/lib/drivers/sound/mmixer/sup.c b/sdk/lib/drivers/sound/mmixer/sup.c index 06f342b12e8..4fa8c080309 100644 --- a/sdk/lib/drivers/sound/mmixer/sup.c +++ b/sdk/lib/drivers/sound/mmixer/sup.c @@ -690,6 +690,8 @@ MMixerSetGetVolumeControlDetails( /* get input */ Input = (LPMIXERCONTROLDETAILS_UNSIGNED)MixerControlDetails->paDetails; + if (!Input) + return MM_STATUS_UNSUCCESSFUL; /* to prevent dereferencing NULL */ if (bSet) {

4 years, 8 months

1
0
0 0

[reactos] 01/01: [VIDEOPRT] Add global variable for debugging video drivers (#3080)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0dfc7f06b7119a3713352… commit 0dfc7f06b7119a3713352efc8d1b2b6d122c0d12 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Sep 15 18:24:42 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 15 15:24:42 2020 +0300 [VIDEOPRT] Add global variable for debugging video drivers (#3080) Reference: https://docs.microsoft.com/en-us/previous-versions/ff570170(v=vs.85) --- win32ss/drivers/videoprt/videoprt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index a59d0442017..edce0febccd 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -31,6 +31,8 @@ /* GLOBAL VARIABLES ***********************************************************/ +ULONG VideoDebugLevel = 0; + BOOLEAN VpBaseVideo = FALSE; BOOLEAN VpNoVesa = FALSE; @@ -294,6 +296,8 @@ IntVideoPortFindAdapter( SystemBasicInfo.PageSize; } + // FIXME: Check the adapter key and update VideoDebugLevel variable. + /* * Call miniport HwVidFindAdapter entry point to detect if * particular device is present. There are two possible code @@ -794,6 +798,9 @@ VideoPortDebugPrint( { va_list ap; + if (VideoDebugLevel >= DebugPrintLevel) + DebugPrintLevel = Error; + va_start(ap, DebugMessage); vDbgPrintEx(DPFLTR_IHVVIDEO_ID, DebugPrintLevel, DebugMessage, ap); va_end(ap);

4 years, 8 months

1
0
0 0

[reactos] 01/01: [PCIIDEX] Implement missing PciIdeXDebugPrint function (#3146)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f8de896aaabd54f8fae5… commit 0f8de896aaabd54f8fae579b98525d7c648dddfa Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Sep 15 18:10:52 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 15 15:10:52 2020 +0300 [PCIIDEX] Implement missing PciIdeXDebugPrint function (#3146) It's useful for debugging IDE controller minidrivers, and it makes pciidex.sys work on Windows XP/2003. - https://user-images.githubusercontent.com/37072976/92856412-39d56b80-f415-1… CORE-17256 --- drivers/storage/ide/pciidex/miniport.c | 29 +++++++++++++++++++++++++++++ drivers/storage/ide/pciidex/pciidex.spec | 1 + drivers/storage/inc/ide.h | 4 ++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/drivers/storage/ide/pciidex/miniport.c b/drivers/storage/ide/pciidex/miniport.c index bb0ea2afbf7..c58f3d1397b 100644 --- a/drivers/storage/ide/pciidex/miniport.c +++ b/drivers/storage/ide/pciidex/miniport.c @@ -11,6 +11,9 @@ #define NDEBUG #include <debug.h> +/** @brief Global debugging level. Valid values are between 0 (Error) and 3 (Trace). */ +ULONG PciIdeDebug = 0; + static DRIVER_DISPATCH PciIdeXForwardOrIgnore; static NTSTATUS NTAPI PciIdeXForwardOrIgnore( @@ -90,6 +93,32 @@ PciIdeXPnpDispatch( return PciIdeXPdoPnpDispatch(DeviceObject, Irp); } +/** + * @brief Prints the given string with printf-like formatting to the kernel debugger. + * @param[in] DebugPrintLevel Level of the debug message. + * Valid values are between 0 (Error) and 3 (Trace). + * @param[in] DebugMessage Format of the string/arguments. + * @param[in] ... Variable number of arguments matching the format + * specified in \a DebugMessage. + * @sa PciIdeDebug + */ +VOID +PciIdeXDebugPrint( + _In_ ULONG DebugPrintLevel, + _In_z_ _Printf_format_string_ PCCHAR DebugMessage, + ...) +{ + va_list ap; + + /* Check if we can print anything */ + if (DebugPrintLevel <= PciIdeDebug) + DebugPrintLevel = 0; + + va_start(ap, DebugMessage); + vDbgPrintEx(DPFLTR_PCIIDE_ID, DebugPrintLevel, DebugMessage, ap); + va_end(ap); +} + NTSTATUS NTAPI PciIdeXInitialize( IN PDRIVER_OBJECT DriverObject, diff --git a/drivers/storage/ide/pciidex/pciidex.spec b/drivers/storage/ide/pciidex/pciidex.spec index b31793550f3..a5dd343ba7a 100644 --- a/drivers/storage/ide/pciidex/pciidex.spec +++ b/drivers/storage/ide/pciidex/pciidex.spec @@ -1,3 +1,4 @@ +@ varargs PciIdeXDebugPrint(long str) @ stdcall PciIdeXGetBusData(ptr ptr long long) @ stdcall PciIdeXInitialize(ptr ptr ptr long) @ stdcall PciIdeXSetBusData(ptr ptr ptr long long) diff --git a/drivers/storage/inc/ide.h b/drivers/storage/inc/ide.h index b4912499fe7..53f40d0447c 100644 --- a/drivers/storage/inc/ide.h +++ b/drivers/storage/inc/ide.h @@ -478,8 +478,8 @@ typedef struct _PCIIDE_CONFIG_HEADER { VOID PciIdeXDebugPrint( - ULONG DebugPrintLevel, - PCCHAR DebugMessage, + _In_ ULONG DebugPrintLevel, + _In_z_ _Printf_format_string_ PCCHAR DebugMessage, ... );

4 years, 8 months

1
0
0 0

[reactos] 01/01: [BROWSEUI][USER32] Explicitly use MAKEINTRESOURCEW() for consistency (#3192)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=345ad55319f410b509429… commit 345ad55319f410b50942994a0ccef6174d61f351 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Sep 15 13:56:51 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 15 14:56:51 2020 +0300 [BROWSEUI][USER32] Explicitly use MAKEINTRESOURCEW() for consistency (#3192) --- dll/win32/browseui/addressband.cpp | 6 +++--- dll/win32/browseui/toolsband.cpp | 4 ++-- win32ss/user/user32/windows/cursoricon.c | 2 +- win32ss/user/user32/windows/menu.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/browseui/addressband.cpp b/dll/win32/browseui/addressband.cpp index 820773495fe..2f0dfe36619 100644 --- a/dll/win32/browseui/addressband.cpp +++ b/dll/win32/browseui/addressband.cpp @@ -548,10 +548,10 @@ void CAddressBand::CreateGoButton() HINSTANCE shellInstance; shellInstance = _AtlBaseModule.GetResourceInstance(); - m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), - 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), + m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCEW(IDB_GOBUTTON_NORMAL), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCEW(IDB_GOBUTTON_HOT), + 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | diff --git a/dll/win32/browseui/toolsband.cpp b/dll/win32/browseui/toolsband.cpp index 5e98f7b2f1a..d0eb76a0dc7 100644 --- a/dll/win32/browseui/toolsband.cpp +++ b/dll/win32/browseui/toolsband.cpp @@ -290,11 +290,11 @@ HRESULT STDMETHODCALLTYPE CToolsBand::SetSite(IUnknown* pUnkSite){ SendMessage(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS); m_himlNormal = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), - MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG), + MAKEINTRESOURCEW(IDB_SHELL_EXPLORER_LG), 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); m_himlHot = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), - MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG_HOT), + MAKEINTRESOURCEW(IDB_SHELL_EXPLORER_LG_HOT), 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); SendMessage(TB_SETIMAGELIST, 0, (LPARAM) m_himlNormal); diff --git a/win32ss/user/user32/windows/cursoricon.c b/win32ss/user/user32/windows/cursoricon.c index e64e0374a17..6299c839006 100644 --- a/win32ss/user/user32/windows/cursoricon.c +++ b/win32ss/user/user32/windows/cursoricon.c @@ -2615,7 +2615,7 @@ BOOL WINAPI SetSystemCursor( { if (hcur == NULL) { - hcur = LoadImageW( 0, MAKEINTRESOURCE(id), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ); + hcur = LoadImageW(NULL, MAKEINTRESOURCEW(id), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE); if (hcur == NULL) { return FALSE; diff --git a/win32ss/user/user32/windows/menu.c b/win32ss/user/user32/windows/menu.c index 231c2f78ae7..59c687f4c3a 100644 --- a/win32ss/user/user32/windows/menu.c +++ b/win32ss/user/user32/windows/menu.c @@ -669,7 +669,7 @@ User32CallLoadMenuFromKernel(PVOID Arguments, ULONG ArgumentLength) Common = (PLOADMENU_CALLBACK_ARGUMENTS) Arguments; - Result = (LRESULT)LoadMenuW( Common->hModule, Common->InterSource ? MAKEINTRESOURCE(Common->InterSource) : (LPCWSTR)&Common->MenuName); + Result = (LRESULT)LoadMenuW(Common->hModule, Common->InterSource ? MAKEINTRESOURCEW(Common->InterSource) : (LPCWSTR)&Common->MenuName); return ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS); }

4 years, 8 months

1
0
0 0

[reactos] 01/01: [KDBG] Fixed handle leak in KdbpSymLoadModuleSymbols() when RosSymCreateFromFile() fails (#3184)

by Michael Stamper

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b43e4c981e41f26726fe2… commit b43e4c981e41f26726fe214cacde7d7ec5738907 Author: Michael Stamper <michaelstamper1(a)gmail.com> AuthorDate: Mon Sep 14 20:48:06 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 14 21:48:06 2020 +0200 [KDBG] Fixed handle leak in KdbpSymLoadModuleSymbols() when RosSymCreateFromFile() fails (#3184) --- ntoskrnl/kdbg/kdb_symbols.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 1b2d8f695c8..3baafaf7b78 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -363,6 +363,7 @@ KdbpSymLoadModuleSymbols( HANDLE FileHandle; NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; + BOOLEAN Result; /* Allow KDB to break on module load */ KdbModuleLoaded(FileName); @@ -404,14 +405,15 @@ KdbpSymLoadModuleSymbols( DPRINT("Loading symbols from %wZ...\n", FileName); - if (!RosSymCreateFromFile(&FileHandle, RosSymInfo)) + Result = RosSymCreateFromFile(&FileHandle, RosSymInfo); + ZwClose(FileHandle); + + if (!Result) { DPRINT("Failed to load symbols from %wZ\n", FileName); return; } - ZwClose(FileHandle); - DPRINT("Symbols loaded.\n"); /* add file to cache */

4 years, 8 months

1
0
0 0

[reactos] 01/01: [WDMAUD.DRV] Workaround multiple issues with AC97 driver from rapps

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d7ebc20481a587bd19e8… commit 6d7ebc20481a587bd19e8a8049317113071b0817 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Sep 14 17:12:16 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Sep 14 17:12:16 2020 +0200 [WDMAUD.DRV] Workaround multiple issues with AC97 driver from rapps By taking alternative code-paths in WdmAud and bypassing Sysaudio. This relies on the patch 0.4.15-dev-765-g b8e936a57b4770e133772cf2dd66f30671a1524b It fixes the following bugs/regressions: -CORE-13202 Unhandled exception from wdmaud.drv when recording sound in Scratch 1.4 leads to app-crash -CORE-13488 A deadlock in "DiabloII" character selection screen and "The Lion King II" -CORE-8726/CORE-9986/CORE-16564 AC97 driver is now working in the same session where driver was installed, no reboot-orgies needed anymore -CORE-9981 almost 100% fixed, DosBox + Commander Keen6 properly plays music instead of garbled output, same improvement for ScummVM 2.0 with Monkey Island 2 The playback is not yet *entirely* perfect, still a few hiccups now and then, but by orders of magnitude better than before. --- dll/win32/wdmaud.drv/wdmaud.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/wdmaud.drv/wdmaud.c b/dll/win32/wdmaud.drv/wdmaud.c index dfd8ea0361e..45308b3aff2 100644 --- a/dll/win32/wdmaud.drv/wdmaud.c +++ b/dll/win32/wdmaud.drv/wdmaud.c @@ -18,6 +18,7 @@ #include <debug.h> #include <mmebuddy_debug.h> +#define USE_MMIXER_LIB #ifndef USE_MMIXER_LIB #define FUNC_NAME(x) x##ByLegacy #else

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SHELL32_APITEST] Strengthen ShellExecCmdLine testcase (#3164)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78edea816477ac7d088a8… commit 78edea816477ac7d088a86ec1743d7a649c0c025 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 14 13:25:45 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 14 13:25:45 2020 +0900 [SHELL32_APITEST] Strengthen ShellExecCmdLine testcase (#3164) - Add tests for "My Documents" and "Control Panel". - Add some comments for usability. CORE-16939 --- .../rostests/apitests/shell32/ShellExecCmdLine.cpp | 63 ++++++++++++---------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp index 770c71c365f..1ec15fa02c2 100644 --- a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp +++ b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp @@ -13,8 +13,6 @@ #include <debug.h> #include <stdio.h> -//#define ShellExecCmdLine ShellExecCmdLine - #ifndef SECL_NO_UI #define SECL_NO_UI 0x2 #define SECL_LOG_USAGE 0x8 @@ -23,7 +21,7 @@ #define SECL_RUNAS 0x40 #endif -#ifdef ShellExecCmdLine +#define ShellExecCmdLine proxy_ShellExecCmdLine #define shell32_hInstance GetModuleHandle(NULL) #define IDS_FILE_NOT_FOUND (-1) @@ -38,6 +36,7 @@ static __inline void __SHCloneStrW(WCHAR **target, const WCHAR *source) lstrcpyW(*target, source); } +// NOTE: You have to sync the following code to dll/win32/shell32/shlexec.cpp. static LPCWSTR SplitParams(LPCWSTR psz, LPWSTR pszArg0, size_t cchArg0) { @@ -236,10 +235,11 @@ HRESULT WINAPI ShellExecCmdLine( return HRESULT_FROM_WIN32(dwError); } -#else - typedef HRESULT (WINAPI *SHELLEXECCMDLINE)(HWND, LPCWSTR, LPCWSTR, INT, LPVOID, DWORD); - SHELLEXECCMDLINE g_pShellExecCmdLine = NULL; -#endif + +#undef ShellExecCmdLine + +typedef HRESULT (WINAPI *SHELLEXECCMDLINE)(HWND, LPCWSTR, LPCWSTR, INT, LPVOID, DWORD); +SHELLEXECCMDLINE g_pShellExecCmdLine = NULL; typedef struct TEST_ENTRY { @@ -396,6 +396,12 @@ static const TEST_ENTRY s_entries[] = { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\"", L"C:\\Program Files" }, { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\" \"Test File.txt\"", NULL }, { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\" \"Test File.txt\"", L"." }, + // My Documents + { __LINE__, S_OK, TRUE, NULL, L"::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL }, + { __LINE__, S_OK, TRUE, NULL, L"shell:::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL }, + // Control Panel + { __LINE__, S_OK, TRUE, NULL, L"::{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", NULL }, + { __LINE__, S_OK, TRUE, NULL, L"shell:::{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", NULL }, }; static void DoEntry(const TEST_ENTRY *pEntry) @@ -410,13 +416,16 @@ static void DoEntry(const TEST_ENTRY *pEntry) _SEH2_TRY { -#ifdef ShellExecCmdLine - hr = ShellExecCmdLine(NULL, pEntry->pwszCommand, pEntry->pwszStartDir, - SW_SHOWNORMAL, NULL, dwSeclFlags); -#else - hr = (*g_pShellExecCmdLine)(NULL, pEntry->pwszCommand, pEntry->pwszStartDir, - SW_SHOWNORMAL, NULL, dwSeclFlags); -#endif + if (IsReactOS()) + { + hr = proxy_ShellExecCmdLine(NULL, pEntry->pwszCommand, pEntry->pwszStartDir, + SW_SHOWNORMAL, NULL, dwSeclFlags); + } + else + { + hr = (*g_pShellExecCmdLine)(NULL, pEntry->pwszCommand, pEntry->pwszStartDir, + SW_SHOWNORMAL, NULL, dwSeclFlags); + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -454,22 +463,22 @@ START_TEST(ShellExecCmdLine) { using namespace std; -#ifndef ShellExecCmdLine - // CHECKME - if (!IsWindowsVistaOrGreater()) + if (!IsReactOS()) { - skip("ShellExecCmdLine is not available on this platform\n"); - return; - } + if (!IsWindowsVistaOrGreater()) + { + skip("ShellExecCmdLine is not available on this platform\n"); + return; + } - HMODULE hShell32 = GetModuleHandleA("shell32"); - g_pShellExecCmdLine = (SHELLEXECCMDLINE)GetProcAddress(hShell32, (LPCSTR)(INT_PTR)265); - if (!g_pShellExecCmdLine) - { - skip("ShellExecCmdLine is not found\n"); - return; + HMODULE hShell32 = GetModuleHandleA("shell32"); + g_pShellExecCmdLine = (SHELLEXECCMDLINE)GetProcAddress(hShell32, (LPCSTR)(INT_PTR)265); + if (!g_pShellExecCmdLine) + { + skip("ShellExecCmdLine is not found\n"); + return; + } } -#endif // s_testfile1 FILE *fp = fopen(s_testfile1, "wb");

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SHELL32] Fix boot to shell, addendum to commit 14599b0a.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3731984199872416fa2a… commit a3731984199872416fa2a53fd7b3867fede3135d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Sep 14 05:39:48 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 14 05:54:13 2020 +0200 [SHELL32] Fix boot to shell, addendum to commit 14599b0a. shell32.ShellMessageBoxW redirects to shlwapi.ShellMessageBoxWrapW. However the latter one (shlwapi) is exported by ordinal only. Trying to use in shell32.spec file the following syntax: 182 varargs ShellMessageBoxW() shlwapi.ShellMessageBoxWrapW will therefore fail at runtime, because Windows/ReactOS will fail to snap shlwapi.ShellMessageBoxWrapW. Using instead an export by orginal: 182 varargs ShellMessageBoxW() shlwapi.#388 actually fails as well, but at link time, by both MSVC' LINK and GNU's dlltool. This generates a .def file containing the line: ShellMessageBoxW=shlwapi.#388 @182 It is not clear why it fails, because according to: https://docs.microsoft.com/en-us/cpp/build/reference/exports?view=vs-2019 and https://devblogs.microsoft.com/oldnewthing/20121116-00/?p=6073 this should be possible. However one encounters the same errors as those described at: https://groups.google.com/forum/#!topic/microsoft.public.vc.language/AVnx-E… and https://www.xspdf.com/questions/22333.shtml ... So instead we use another trick, that appears to be already in use in the shell32.spec. Since the shlwapi functions are imported because we link to it, this means that ShellMessageBoxWrapW() is already available through this import. So we can specify it in the .spec file as is, without a full name prefixed with "shlwapi." . Therefore the associated shell32.ShellMessageBoxW function will instead link to the small ShellMessageBoxWrapW() import stub that is generated automatically. --- dll/win32/shell32/shell32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index 110ac17c69c..f5270cc103f 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -178,7 +178,7 @@ 179 stdcall SHGetNewLinkInfoA(str str ptr long long) 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) 181 stdcall -noname RegisterShellHook(long long) -182 varargs ShellMessageBoxW(long long wstr wstr long) shlwapi.ShellMessageBoxWrapW +182 varargs ShellMessageBoxW(long long wstr wstr long) ShellMessageBoxWrapW ## This is the no-named 'shlwapi.ShellMessageBoxWrapW' (i.e. 'shlwapi.#388') 183 varargs ShellMessageBoxA(long long str str long) 184 stdcall -noname ArrangeWindows(long long long long long) 185 stdcall -noname SHHandleDiskFull(ptr long)

4 years, 8 months

1
0
0 0

[reactos] 01/01: [PROGMAN][CRT][USER32] Do not use LoadLibraryEx() NT6+ flags (#3152)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a04831677eaaf62a7d7a9… commit a04831677eaaf62a7d7a99583f6f5e788687d9d2 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Sep 13 23:42:09 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:42:09 2020 +0200 [PROGMAN][CRT][USER32] Do not use LoadLibraryEx() NT6+ flags (#3152) CORE-12004 --- base/shell/progman/dialog.c | 4 ++-- sdk/lib/crt/misc/dbgrpt.cpp | 2 +- win32ss/user/user32/windows/cursoricon.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/shell/progman/dialog.c b/base/shell/progman/dialog.c index 3aebd71356f..452b1bc4c7b 100644 --- a/base/shell/progman/dialog.c +++ b/base/shell/progman/dialog.c @@ -586,7 +586,7 @@ DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SetDlgItemTextW(hDlg, PM_ICON_FILE, pIconContext->szName); SendMessageA(pIconContext->hDlgCtrl, LB_SETITEMHEIGHT, 0, 32); - pIconContext->hLibrary = LoadLibraryExW(pIconContext->szName, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); + pIconContext->hLibrary = LoadLibraryExW(pIconContext->szName, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE); if (pIconContext->hLibrary) { EnumResourceNamesW(pIconContext->hLibrary, @@ -635,7 +635,7 @@ DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SetDlgItemTextW(hDlg, PM_ICON_FILE, filename); DestroyIconList(pIconContext->hDlgCtrl); - pIconContext->hLibrary = LoadLibraryExW(filename, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); + pIconContext->hLibrary = LoadLibraryExW(filename, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE); if (pIconContext->hLibrary) { EnumResourceNamesW(pIconContext->hLibrary, diff --git a/sdk/lib/crt/misc/dbgrpt.cpp b/sdk/lib/crt/misc/dbgrpt.cpp index 9259ff8edab..a349687d475 100644 --- a/sdk/lib/crt/misc/dbgrpt.cpp +++ b/sdk/lib/crt/misc/dbgrpt.cpp @@ -113,7 +113,7 @@ HMODULE _CrtGetUser32() { if (_CrtUser32Handle == NULL) { - HMODULE mod = LoadLibraryExW(L"user32.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); + HMODULE mod = LoadLibraryExW(L"user32.dll", NULL, 0 /* NT6+: LOAD_LIBRARY_SEARCH_SYSTEM32 */); if (mod == NULL) mod = (HMODULE)INVALID_HANDLE_VALUE; diff --git a/win32ss/user/user32/windows/cursoricon.c b/win32ss/user/user32/windows/cursoricon.c index ad0ac4d6d05..e64e0374a17 100644 --- a/win32ss/user/user32/windows/cursoricon.c +++ b/win32ss/user/user32/windows/cursoricon.c @@ -1866,7 +1866,7 @@ CURSORICON_CopyImage( ustrRsrc.Buffer, IS_INTRESOURCE(ustrRsrc.Buffer) ? L"" : ustrRsrc.Buffer); /* Get the module handle or load the module */ - hModule = LoadLibraryExW(ustrModule.Buffer, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); + hModule = LoadLibraryExW(ustrModule.Buffer, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE); if (!hModule) { DWORD err = GetLastError();

4 years, 8 months

1
0
0 0

[reactos] 01/01: [TRANSLATION][SHELL32] Localization of "System Folder" in My Computer types (#3168)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aad9bb8e8addfa3d0fdc5… commit aad9bb8e8addfa3d0fdc5a85606172690b58c425 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Sep 13 23:16:19 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:16:19 2020 +0200 [TRANSLATION][SHELL32] Localization of "System Folder" in My Computer types (#3168) Co-authored-by: Adam Stachowicz <saibamenppl(a)gmail.com> Co-authored-by: JoseSanchezz <67137372+JoseSanchezz(a)users.noreply.github.com> --- dll/win32/shell32/folders/CRegFolder.cpp | 3 +-- dll/win32/shell32/lang/bg-BG.rc | 2 ++ dll/win32/shell32/lang/ca-ES.rc | 2 ++ dll/win32/shell32/lang/cs-CZ.rc | 2 ++ dll/win32/shell32/lang/da-DK.rc | 2 ++ dll/win32/shell32/lang/de-DE.rc | 2 ++ dll/win32/shell32/lang/el-GR.rc | 2 ++ dll/win32/shell32/lang/en-GB.rc | 2 ++ dll/win32/shell32/lang/en-US.rc | 2 ++ dll/win32/shell32/lang/es-ES.rc | 2 ++ dll/win32/shell32/lang/et-EE.rc | 2 ++ dll/win32/shell32/lang/fi-FI.rc | 2 ++ dll/win32/shell32/lang/fr-FR.rc | 2 ++ dll/win32/shell32/lang/he-IL.rc | 2 ++ dll/win32/shell32/lang/hi-IN.rc | 2 ++ dll/win32/shell32/lang/hu-HU.rc | 2 ++ dll/win32/shell32/lang/id-ID.rc | 2 ++ dll/win32/shell32/lang/it-IT.rc | 2 ++ dll/win32/shell32/lang/ja-JP.rc | 2 ++ dll/win32/shell32/lang/ko-KR.rc | 2 ++ dll/win32/shell32/lang/nl-NL.rc | 2 ++ dll/win32/shell32/lang/no-NO.rc | 2 ++ dll/win32/shell32/lang/pl-PL.rc | 2 ++ dll/win32/shell32/lang/pt-BR.rc | 2 ++ dll/win32/shell32/lang/pt-PT.rc | 2 ++ dll/win32/shell32/lang/ro-RO.rc | 2 ++ dll/win32/shell32/lang/ru-RU.rc | 2 ++ dll/win32/shell32/lang/sk-SK.rc | 2 ++ dll/win32/shell32/lang/sl-SI.rc | 2 ++ dll/win32/shell32/lang/sq-AL.rc | 2 ++ dll/win32/shell32/lang/sv-SE.rc | 2 ++ dll/win32/shell32/lang/tr-TR.rc | 2 ++ dll/win32/shell32/lang/uk-UA.rc | 2 ++ dll/win32/shell32/lang/zh-CN.rc | 2 ++ dll/win32/shell32/lang/zh-TW.rc | 2 ++ dll/win32/shell32/shresdef.h | 2 ++ 36 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index 6dc12770212..ce7292f3964 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -771,8 +771,7 @@ HRESULT WINAPI CRegFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHEL RegCloseKey(hKey); return S_OK; case 2: /* type */ - //return SHSetStrRet(&psd->str, resource_id); /* FIXME: translate */ - return SHSetStrRet(&psd->str, "System Folder"); + return SHSetStrRet(&psd->str, IDS_SYSTEMFOLDER); } return E_FAIL; } diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index c8cf53f7ab8..f256ece6cae 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -1007,4 +1007,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index d7b4f1d9108..ff4656cd30c 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index fdb3815d20f..490b68aa090 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -1012,4 +1012,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index cd8482376fd..0f86d9a3c26 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -1012,4 +1012,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index d0a9621f396..6e94e825518 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -1007,4 +1007,6 @@ BEGIN IDS_MOVETOTITLE "Wählen Sie den Ort, in den '%s' verschoben werden soll. Klicken Sie anschließend auf Verschieben." IDS_MOVEITEMS "Elemente verschieben" IDS_MOVEBUTTON "Verschieben" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 608a39b4e47..ba7f4182855 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 105de0326dc..63424343e74 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index a363b8007ba..ef2dcf0590e 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index d7587de7a88..41adf26c018 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -1015,4 +1015,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 9533ddd67a0..4b308e77c23 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -1013,4 +1013,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 714c08ac926..30071a27944 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 2cad6e6b751..acf02ca4a6b 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Sélectionnez l'emplacement où vous souhaitez déplacer '%s', puis appuyez sur le bouton Déplacer." IDS_MOVEITEMS "Déplacer les éléments" IDS_MOVEBUTTON "Déplacer" + + IDS_SYSTEMFOLDER "Dossier système" END diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index a04365c04f7..b27f62e4bdc 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -1008,4 +1008,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 54b4dfc3dfb..d3cac589e6e 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -1001,4 +1001,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 8f887b03807..7c47db6fe45 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -1005,4 +1005,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 5dc7a1d0370..d48846edb55 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -1002,4 +1002,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 6bf694cb9cb..8572685eda1 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index c72797b6285..d1c420ecf1a 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -1003,4 +1003,6 @@ BEGIN IDS_MOVETOTITLE "'%s' の移動先を選択して「移動」ボタンをクリックして下さい。" IDS_MOVEITEMS "項目の移動先" IDS_MOVEBUTTON "移動" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 407d8675d61..0c0fd22d783 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index b4c70b2ba0a..0871a744914 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index d19c455cfa8..1b159361977 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 1d44e866ae8..2d6e65dce66 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -1012,4 +1012,6 @@ BEGIN IDS_MOVETOTITLE "Zaznacz miejsce, w które chcesz przenieść '%s', a następnie kliknij przycisk Przenieś." IDS_MOVEITEMS "Przenoszenie elementów" IDS_MOVEBUTTON "Przenieś" + + IDS_SYSTEMFOLDER "Folder systemowy" END diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 4a8e3831407..f9d40a365da 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 779b5d22d43..82ca880f830 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 86e775f7670..bad12b2d015 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -1008,4 +1008,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index e9da9dcfc0e..0b73dc46b94 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -1013,4 +1013,6 @@ BEGIN IDS_MOVETOTITLE "Выберите расположение, куда вы хотите переместить '%s', затем нажмите кнопку 'Переместить'." IDS_MOVEITEMS "Перемещение элементов" IDS_MOVEBUTTON "Переместить" + + IDS_SYSTEMFOLDER "Системная папка" END diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 4b2263553ff..b7c2c68873e 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index f25073b1adf..25bb2407df3 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index dc503934a27..f555196609d 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -1010,4 +1010,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index e7a4927acc8..89ece721224 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 01a9d772838..8ba5645ac0f 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -1008,4 +1008,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 60e1d6c06df..b8c7c952a33 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 7fce0c7b035..b93b3a389ab 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -1016,4 +1016,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index a39f2ccc4ce..dbe437c0ea9 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -1016,4 +1016,6 @@ BEGIN IDS_MOVETOTITLE "選取想要移動 '%s' 的位置，然後按一下 [移動] 按鈕。" IDS_MOVEITEMS "移動項目" IDS_MOVEBUTTON "移動" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 391b8330b2b..821d4d05a85 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -306,6 +306,8 @@ #define IDS_MOVEITEMS 30538 #define IDS_MOVEBUTTON 30539 +#define IDS_SYSTEMFOLDER 30540 + /* Dialogs */ /* Run dialog */

4 years, 8 months

1
0
0 0

[reactos] 01/01: [TRANSLATION][SCREENSAVERS][SYSSETUP] Add Portuguese (PT) translation (#3156)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b52189873db71e4fb784f… commit b52189873db71e4fb784fbb75349fe1c86922853 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sun Sep 13 22:14:05 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:14:05 2020 +0200 [TRANSLATION][SCREENSAVERS][SYSSETUP] Add Portuguese (PT) translation (#3156) --- .../applications/screensavers/3dtext/lang/pt-BR.rc | 2 +- .../3dtext/lang/{pt-BR.rc => pt-PT.rc} | 6 ++--- base/applications/screensavers/3dtext/rsrc.rc | 3 +++ base/applications/screensavers/logon/lang/pt-BR.rc | 2 +- base/applications/screensavers/logon/lang/pt-PT.rc | 9 +++++++ base/applications/screensavers/logon/logon.rc | 3 +++ dll/win32/syssetup/lang/pt-PT.rc | 30 +++++++++++----------- 7 files changed, 35 insertions(+), 20 deletions(-) diff --git a/base/applications/screensavers/3dtext/lang/pt-BR.rc b/base/applications/screensavers/3dtext/lang/pt-BR.rc index 521dbcb94f5..e83ccd9294a 100644 --- a/base/applications/screensavers/3dtext/lang/pt-BR.rc +++ b/base/applications/screensavers/3dtext/lang/pt-BR.rc @@ -1,5 +1,5 @@ /* Portuguese translation of 3D Text ScreenSaver by Lucas Raziel (Oldcpv3) (raziellucas(a)hotmail.com) */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU diff --git a/base/applications/screensavers/3dtext/lang/pt-BR.rc b/base/applications/screensavers/3dtext/lang/pt-PT.rc similarity index 68% copy from base/applications/screensavers/3dtext/lang/pt-BR.rc copy to base/applications/screensavers/3dtext/lang/pt-PT.rc index 521dbcb94f5..c1e71287703 100644 --- a/base/applications/screensavers/3dtext/lang/pt-BR.rc +++ b/base/applications/screensavers/3dtext/lang/pt-PT.rc @@ -1,15 +1,15 @@ -/* Portuguese translation of 3D Text ScreenSaver by Lucas Raziel (Oldcpv3) (raziellucas(a)hotmail.com) */ +/* Translation to Portuguese (PT) by zecarlos1957(a)hotmail.com 10-09-2020 */ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Opções do Protetor de Tela" +CAPTION "Opções de Protecção de Ecrã" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 216, 24, 50, 14 EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Personalizar Text", IDC_STATIC, 18, 17, 65, 8 + LTEXT "Personalizar Texto", IDC_STATIC, 18, 17, 65, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/rsrc.rc b/base/applications/screensavers/3dtext/rsrc.rc index 4e0f6c9a179..16d6659518b 100644 --- a/base/applications/screensavers/3dtext/rsrc.rc +++ b/base/applications/screensavers/3dtext/rsrc.rc @@ -70,6 +70,9 @@ IDI_ICON ICON DISCARDABLE "res/icon_3dtext.ico" #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/screensavers/logon/lang/pt-BR.rc b/base/applications/screensavers/logon/lang/pt-BR.rc index cac144837be..eca2f843ffd 100644 --- a/base/applications/screensavers/logon/lang/pt-BR.rc +++ b/base/applications/screensavers/logon/lang/pt-BR.rc @@ -1,6 +1,6 @@ /* Translation and UTF-8 Conversion by mkbu95 <mkbu95(a)gmail.com> (May, 2012) */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE BEGIN diff --git a/base/applications/screensavers/logon/lang/pt-PT.rc b/base/applications/screensavers/logon/lang/pt-PT.rc new file mode 100644 index 00000000000..1520b91659f --- /dev/null +++ b/base/applications/screensavers/logon/lang/pt-PT.rc @@ -0,0 +1,9 @@ +/* Translation to Portuguese (PT) by zecarlos1957(a)hotmail.com 10-09-2020*/ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_DESCRIPTION "Protecção de ecrã Início" + IDS_TEXT "Esta protecção de ecrã não é configuravel." +END diff --git a/base/applications/screensavers/logon/logon.rc b/base/applications/screensavers/logon/logon.rc index 5881fd93698..cf7cc24e57e 100644 --- a/base/applications/screensavers/logon/logon.rc +++ b/base/applications/screensavers/logon/logon.rc @@ -77,6 +77,9 @@ IDB_SERVER BITMAP "res/1.bmp" #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index de3be1e4467..cd9a7862216 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -6,7 +6,7 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bem-vindo ao assistente de instalação do ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Este assistente ajuda-o a instalar o ReactOS no seu computador. Precisamos reunir algumas informações para instalar o ReactOS devidamente.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Este assistente ajuda-o a instalar o ReactOS no seu computador. Precisamos reunir algumas informações para instalar o ReactOS correctamente.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Clique Avançar para continuar a instalação.", IDC_STATIC, 115, 169, 195, 17 END @@ -23,16 +23,16 @@ BEGIN END IDD_PRODUCT DIALOGEX 0, 0, 317, 143 -CAPTION "ReactOS Setup" +CAPTION "Instalação do ReactOS" STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 - LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 - LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + LTEXT "Por favor escolha uma opção de produto:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "&Opções de produto:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + GROUPBOX "Informação de produto", IDC_STATIC, 5, 50, 305, 85 + LTEXT "Descrição:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END @@ -99,7 +99,7 @@ END IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 @@ -228,8 +228,8 @@ END STRINGTABLE BEGIN IDS_DETECTIONDISABLED "Detecção desabilitada" - IDS_LOOKFORWHEEL "A detectar o volante do rato" - IDS_ASSUMEPRESENT "Assume volante está presente" + IDS_LOOKFORWHEEL "A detectar o roda do rato" + IDS_ASSUMEPRESENT "Assume roda está presente" END STRINGTABLE @@ -242,11 +242,11 @@ END STRINGTABLE BEGIN - IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" - IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." - IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_PRODUCTTITLE "Opções de produto" + IDS_PRODUCTSUBTITLE "Pode escolher uma opção de produto que afecta o comportamento do sistema." + IDS_PRODUCTSERVERNAME "Servidor ReactOS" + IDS_PRODUCTWORKSTATIONNAME "Estação de trabalho ReactOS" + IDS_PRODUCTSERVERINFO "O sistema será reconhecido como um servidor. As pastas privadas ""Minhas imagens"", ""Meus vídeos"" e ""Minhas músicas"" são independentes de ""Meus documentos""." + IDS_PRODUCTWORKSTATIONINFO "O sistema será reconhecido como uma estação de trabalho. As pastas privadas ""Minhas imagens"", ""Meus vídeos"" e ""Minhas músicas"" estão em ""Meus documentos""." IDS_DEFAULT "(Default)" END

4 years, 8 months

1
0
0 0

[reactos] 01/01: [RAPPS][CONSRV] French translation update (#3160)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f07ace6aa245c10df7ba4… commit f07ace6aa245c10df7ba47cba01c3055f5e9d3a6 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Sep 13 23:12:52 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:12:52 2020 +0200 [RAPPS][CONSRV] French translation update (#3160) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/applications/rapps/lang/fr-FR.rc | 30 +++++++++++----------- .../user/winsrv/consrv/frontends/gui/lang/fr-FR.rc | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 996ffa5c212..e1f13a39b90 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -141,7 +141,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nCommande de désinstallation : " IDS_INFO_MODIFYPATH "\nModifier le chemin d'accès : " IDS_INFO_INSTALLDATE "\nDate d'installation : " - IDS_AINFO_PACKAGE_NAME "\nPackage Name: " + IDS_AINFO_PACKAGE_NAME "\nNom du paquet : " END STRINGTABLE @@ -178,7 +178,7 @@ END STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS Applications Manager" + IDS_APPTITLE "Gestionnaire d'applications ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Chercher…" IDS_INSTALL "Installer" @@ -211,9 +211,9 @@ BEGIN IDS_SELECTEDFORINST "Sélectionnées pour installation" IDS_MISMATCH_CERT_INFO "Certificat inconnu:\nSujet: %s\nEmetteur: %s\nVoulez-vous continuer ?" IDS_UNABLE_PATH "Format de chemin invalide." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "détails" + IDS_APP_DISPLAY_LIST "liste" + IDS_APP_DISPLAY_TILE "tuile" END STRINGTABLE @@ -230,8 +230,8 @@ END STRINGTABLE BEGIN - IDS_LICENSE_OPENSOURCE "Open Source" - IDS_LICENSE_FREEWARE "Freeware" + IDS_LICENSE_OPENSOURCE "Libre" + IDS_LICENSE_FREEWARE "Gratuit" IDS_LICENSE_TRIAL "Version d'essai / Démo" END @@ -254,12 +254,12 @@ END STRINGTABLE BEGIN - IDS_CMD_USAGE "Usage: " - IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" - IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" - IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" - IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" - IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" - IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" - IDS_CMD_PACKAGE_INFO "Information about package %1:\n" + IDS_CMD_USAGE "Usage : " + IDS_CMD_NEED_PACKAGE_NAME "Erreur : L'option %1 nécessite un ou plusieurs noms de paquets.\n" + IDS_CMD_NEED_FILE_NAME "Erreur : L'option %1 nécessite un nom de fichier.\n" + IDS_CMD_NEED_PARAMS "Erreur : L'option %1 nécessite un ou plusieurs paramètres.\n" + IDS_CMD_INVALID_OPTION "Erreur : L'option de ligne de commande spécifiée est inconnue ou invalide.\n" + IDS_CMD_FIND_RESULT_FOR "Résultats pour %1 :\n" + IDS_CMD_PACKAGE_NOT_FOUND "Impossible de trouver le paquet %1.\n" + IDS_CMD_PACKAGE_INFO "Information sur le paquet %1 :\n" END diff --git a/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc b/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc index 2c8955fc4ea..23ab69ecc9e 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc +++ b/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc @@ -20,7 +20,7 @@ BEGIN IDS_SCROLLUP "Défiler en haut" IDS_SCROLLDOWN "Défiler en bas" */ - IDS_TERMINAL_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "Console ReactOS" END STRINGTABLE

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SHELL32] Improve Format dialog debug log (trivial) (#3176)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d4b853b8a0df3401da87… commit 6d4b853b8a0df3401da871ee2618f39e356328da Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Sep 13 23:05:04 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:05:04 2020 +0200 [SHELL32] Improve Format dialog debug log (trivial) (#3176) - Logging of name for unknown filesystem. - Fix some trace content as not only HDD could be affected. --- dll/win32/shell32/dialogs/drive.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/shell32/dialogs/drive.cpp b/dll/win32/shell32/dialogs/drive.cpp index 60243d44a02..126dc0da211 100644 --- a/dll/win32/shell32/dialogs/drive.cpp +++ b/dll/win32/shell32/dialogs/drive.cpp @@ -212,7 +212,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) { if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes)) { - TRACE("FAT16 is not supported on hdd larger than 4G current %lu\n", TotalNumberOfBytes.QuadPart); + TRACE("FAT16 is not supported on drive larger than 4G current %lu\n", TotalNumberOfBytes.QuadPart); SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0); return; } @@ -234,7 +234,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) { if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes)) { - TRACE("FAT32 is not supported on hdd larger than 32G current %lu\n", TotalNumberOfBytes.QuadPart); + TRACE("FAT32 is not supported on drive larger than 32G current %lu\n", TotalNumberOfBytes.QuadPart); SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0); return; } @@ -256,7 +256,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) { if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes)) { - TRACE("NTFS is not supported on hdd larger than 2TB current %lu\n", TotalNumberOfBytes.QuadPart); + TRACE("NTFS is not supported on drive larger than 2TB current %lu\n", TotalNumberOfBytes.QuadPart); SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0); return; } @@ -289,7 +289,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) { if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes)) { - TRACE("EXT2 is not supported on hdd larger than 32T current %lu\n", TotalNumberOfBytes.QuadPart); + TRACE("EXT2 is not supported on drive larger than 32T current %lu\n", TotalNumberOfBytes.QuadPart); SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0); return; } @@ -310,7 +310,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) { if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes)) { - TRACE("BtrFS is not supported on hdd larger than 16E current %lu\n", TotalNumberOfBytes.QuadPart); + TRACE("BtrFS is not supported on drive larger than 16E current %lu\n", TotalNumberOfBytes.QuadPart); SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0); return; } @@ -329,7 +329,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) } else { - FIXME("unknown fs\n"); + FIXME("Unknown filesystem: %ls\n", wszBuf); SendDlgItemMessageW(hwndDlg, 28680, CB_RESETCONTENT, iSelIndex, 0); return; } @@ -444,7 +444,7 @@ FormatExCB( case FSNOTSUPPORTED: case CLUSTERSIZETOOSMALL: bSuccess = FALSE; - FIXME("\n"); + FIXME("Unsupported command in FormatExCB\n"); break; default: @@ -476,13 +476,13 @@ FormatDrive(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) iSelIndex = SendMessageW(hDlgCtrl, CB_GETCURSEL, 0, 0); if (iSelIndex == CB_ERR) { - FIXME("\n"); + ERR("Unable to get file system selection\n"); return; } Length = SendMessageW(hDlgCtrl, CB_GETLBTEXTLEN, iSelIndex, 0); if ((int)Length == CB_ERR || Length + 1 > _countof(szFileSys)) { - FIXME("\n"); + ERR("Unable to get file system selection\n"); return; } @@ -495,7 +495,7 @@ FormatDrive(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) Length = SendMessageW(hDlgCtrl, WM_GETTEXTLENGTH, 0, 0); if (Length + 1 > _countof(szLabel)) { - FIXME("\n"); + ERR("Unable to get volume label\n"); return; } SendMessageW(hDlgCtrl, WM_GETTEXT, _countof(szLabel), (LPARAM)szLabel);

4 years, 8 months

1
0
0 0

[reactos] 01/01: [FORMAT] Fix of output text overlap in console when finished (#3177)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=860a985f26a41140ca063… commit 860a985f26a41140ca063e9493dbd953ede06ec9 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Sep 13 23:02:09 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:02:09 2020 +0200 [FORMAT] Fix of output text overlap in console when finished (#3177) At the end of the format operation, text in console got overwritten and leftovers from previous line remained displayed. --- base/system/format/format.c | 1 + 1 file changed, 1 insertion(+) diff --git a/base/system/format/format.c b/base/system/format/format.c index 6685200e479..0d7e642c598 100644 --- a/base/system/format/format.c +++ b/base/system/format/format.c @@ -562,6 +562,7 @@ int wmain(int argc, WCHAR *argv[]) FormatEx(RootDirectory, media, FileSystem, Label, QuickFormat, ClusterSize, FormatExCallback); if (Error) return -1; + ConPuts(StdOut, L"\n"); ConResPuts(StdOut, STRING_FMT_COMPLETE); //

4 years, 8 months

1
0
0 0

[reactos] 01/01: [FORMAT] French translation fix (#3178)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51023e3a2e5b15d0b76e1… commit 51023e3a2e5b15d0b76e1a39169f38ea65831783 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Sep 13 23:01:07 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:01:07 2020 +0200 [FORMAT] French translation fix (#3178) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/system/format/lang/fr-FR.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/system/format/lang/fr-FR.rc b/base/system/format/lang/fr-FR.rc index a077d4d346d..74447b46072 100644 --- a/base/system/format/lang/fr-FR.rc +++ b/base/system/format/lang/fr-FR.rc @@ -13,11 +13,11 @@ BEGIN sont fortement recommandées pour une utilisation courante\n\ NTFS peut utiliser 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ FAT peut utiliser 8192, 16K, 32K, 64K, 128K, 256K.\n\ - La compression NTFS n'est pas possible au de là de 4096.\n\ + La compression NTFS n'est pas possible au delà de 4096.\n\ -C Les fichiers sur le nouveau disque seront compressés automatiquement.\n\n" STRING_COMPLETE "%lu pourcent effectués.\r" - STRING_FORMAT_FAIL "FormatEx ne peut se finir avec succés.\n\n" - STRING_NO_SUPPORT "Fontion Non Supportée" + STRING_FORMAT_FAIL "FormatEx ne peut se finir avec succès.\n\n" + STRING_NO_SUPPORT "Opération non supportée" STRING_FMIFS_FAIL "Impossible de trouver les points d'entrée FMIFS.\n\n" STRING_UNKNOW_ARG "Argument inconnu : %s\n" STRING_DRIVE_PARM "Le disque à formater n'est pas indiqué.\n\n" @@ -38,6 +38,6 @@ PERDUES !\nContinuer avec le formatage (O/N) ? " STRING_VOL_COMPRESS "Le disque ne supporte pas la compression.\n" STRING_ENTER_LABEL "Nom du disque (11 caractères, Entrée si aucun) ? " STRING_NO_LABEL "Impossible de donner un nom au disque" - STRING_FREE_SPACE "\nEspace disque total : %I64d octet.\n Espace disque disponible : %I64d octet.\n" + STRING_FREE_SPACE "\nEspace disque total : %I64d octet(s).\nEspace disque disponible : %I64d octet(s).\n" STRING_SERIAL_NUMBER "\nNuméro de série du disque: %04X-%04X\n" END

4 years, 8 months

1
0
0 0

[reactos] 04/04: [CMD] Document the two extra file attributes the enhanced batch/FOR variables %~aX could handle on Windows >= 8.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c58a601602095f5a388d9… commit c58a601602095f5a388d9a4c7d8b681a2b5e0181 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 4 22:19:45 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 13 22:50:11 2020 +0200 [CMD] Document the two extra file attributes the enhanced batch/FOR variables %~aX could handle on Windows >= 8. They are currently specified for documentation purposes (i.e. what Windows 8+ CMD.EXE can report) but not used yet, since ReactOS does not support them. --- base/shell/cmd/cmd.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index f760bf7745c..caa60a466fe 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1143,6 +1143,10 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) { _T('o'), FILE_ATTRIBUTE_OFFLINE }, { _T('t'), FILE_ATTRIBUTE_TEMPORARY }, { _T('l'), FILE_ATTRIBUTE_REPARSE_POINT }, +#if (NTDDI_VERSION >= NTDDI_WIN8) + { _T('v'), FILE_ATTRIBUTE_INTEGRITY_STREAM }, + { _T('x'), FILE_ATTRIBUTE_NO_SCRUB_DATA /* 0x20000 */ }, +#endif }; for (Attrib = Table; Attrib != &Table[ARRAYSIZE(Table)]; Attrib++) {

4 years, 8 months

1
0
0 0

[reactos] 03/04: [CMD] SHIFT: Use _istdigit().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95466904db08f0174164b… commit 95466904db08f0174164bf20844343982d796d3e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 12 17:00:42 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 13 22:50:10 2020 +0200 [CMD] SHIFT: Use _istdigit(). --- base/shell/cmd/shift.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/shift.c b/base/shell/cmd/shift.c index e3ce5b106d9..fd2873d2541 100644 --- a/base/shell/cmd/shift.c +++ b/base/shell/cmd/shift.c @@ -65,7 +65,7 @@ INT cmd_shift (LPTSTR param) { if (*param == _T('/')) { - if (param[1] < '0' || param[1] > '9') + if (!_istdigit(param[1])) { error_invalid_switch(param[1]); return 1;

4 years, 8 months

1
0
0 0

[reactos] 02/04: [CMD] Use pointers to const strings in error functions, where applicable.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00ce3c48fe99cdc475166… commit 00ce3c48fe99cdc475166e3078b9166a8b9fcf48 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 12 20:29:54 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 13 22:50:09 2020 +0200 [CMD] Use pointers to const strings in error functions, where applicable. --- base/shell/cmd/cmd.h | 18 +++++++++--------- base/shell/cmd/error.c | 18 +++++++++--------- base/shell/cmd/parser.c | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index 2d285c10790..b3c1c0f1d9d 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -179,22 +179,22 @@ INT CommandEchoserr (LPTSTR); VOID ErrorMessage( IN DWORD dwErrorCode, - IN LPTSTR szFormat OPTIONAL, + IN PCTSTR szFormat OPTIONAL, ...); VOID error_no_pipe(VOID); -VOID error_bad_command(LPTSTR); +VOID error_bad_command(PCTSTR s); VOID error_invalid_drive(VOID); VOID error_req_param_missing(VOID); -VOID error_sfile_not_found(LPTSTR); +VOID error_sfile_not_found(PCTSTR s); VOID error_file_not_found(VOID); VOID error_path_not_found(VOID); -VOID error_too_many_parameters(LPTSTR); -VOID error_parameter_format(TCHAR); -VOID error_invalid_switch(TCHAR); -VOID error_invalid_parameter_format(LPTSTR); +VOID error_too_many_parameters(PCTSTR s); +VOID error_parameter_format(TCHAR ch); +VOID error_invalid_switch(TCHAR ch); +VOID error_invalid_parameter_format(PCTSTR s); VOID error_out_of_memory(VOID); -VOID error_syntax(LPTSTR); +VOID error_syntax(PCTSTR s); VOID msg_pause(VOID); @@ -360,7 +360,7 @@ VOID EchoCommand(PARSED_COMMAND *Cmd); TCHAR *Unparse(PARSED_COMMAND *Cmd, TCHAR *Out, TCHAR *OutEnd); VOID FreeCommand(PARSED_COMMAND *Cmd); -void ParseErrorEx(LPTSTR s); +VOID ParseErrorEx(IN PCTSTR s); extern BOOL bParseError; extern TCHAR ParseLine[CMDLINE_LENGTH]; diff --git a/base/shell/cmd/error.c b/base/shell/cmd/error.c index dd2ec7a6c3f..147b0f7acf9 100644 --- a/base/shell/cmd/error.c +++ b/base/shell/cmd/error.c @@ -25,11 +25,11 @@ VOID ErrorMessage( IN DWORD dwErrorCode, - IN LPTSTR szFormat OPTIONAL, + IN PCTSTR szFormat OPTIONAL, ...) { va_list arg_ptr; - LPTSTR szError; + PTSTR szError; TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMessage[1024]; @@ -46,7 +46,7 @@ ErrorMessage( if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&szError, 0, NULL)) + (PTSTR)&szError, 0, NULL)) { ConErrPrintf(_T("%s%s%s"), szError, szMessage, (*szMessage ? _T("\n") : _T(""))); if (szError) @@ -76,7 +76,7 @@ VOID error_invalid_switch(TCHAR ch) } -VOID error_too_many_parameters(LPTSTR s) +VOID error_too_many_parameters(PCTSTR s) { ConErrResPrintf(STRING_ERROR_TOO_MANY_PARAMETERS, s); nErrorLevel = 1; @@ -97,12 +97,12 @@ VOID error_file_not_found(VOID) } -VOID error_sfile_not_found(LPTSTR f) +VOID error_sfile_not_found(PCTSTR s) { TCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, ARRAYSIZE(szMsg)); - ConErrPrintf(_T("%s - %s\n"), szMsg, f); + ConErrPrintf(_T("%s - %s\n"), szMsg, s); nErrorLevel = 1; } @@ -121,7 +121,7 @@ VOID error_invalid_drive(VOID) } -VOID error_bad_command(LPTSTR s) +VOID error_bad_command(PCTSTR s) { ConErrResPrintf(STRING_ERROR_BADCOMMAND, s); nErrorLevel = 9009; @@ -142,14 +142,14 @@ VOID error_out_of_memory(VOID) } -VOID error_invalid_parameter_format(LPTSTR s) +VOID error_invalid_parameter_format(PCTSTR s) { ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, s); nErrorLevel = 1; } -VOID error_syntax(LPTSTR s) +VOID error_syntax(PCTSTR s) { TCHAR szMsg[RC_STRING_MAX_SIZE]; diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c index 048c83e3f96..37bc548f2a1 100644 --- a/base/shell/cmd/parser.c +++ b/base/shell/cmd/parser.c @@ -112,7 +112,7 @@ restart: return (CurChar = Char); } -void ParseErrorEx(LPTSTR s) +VOID ParseErrorEx(IN PCTSTR s) { /* Only display the first error we encounter */ if (!bParseError) @@ -120,7 +120,7 @@ void ParseErrorEx(LPTSTR s) bParseError = TRUE; } -static void ParseError(void) +static __inline VOID ParseError(VOID) { ParseErrorEx(CurrentTokenType != TOK_END ? CurrentToken : NULL); }

4 years, 8 months

1
0
0 0

[reactos] 01/04: [CMD] Minor formatting only.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f8f3a2bba25ec463e34d… commit 3f8f3a2bba25ec463e34df88f36c1c6802057202 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 12 20:01:27 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 13 22:50:09 2020 +0200 [CMD] Minor formatting only. --- base/shell/cmd/cmd.h | 26 +++++++++++++------------- base/shell/cmd/error.c | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index 205ff8ef7fe..2d285c10790 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -182,21 +182,21 @@ ErrorMessage( IN LPTSTR szFormat OPTIONAL, ...); -VOID error_no_pipe (VOID); -VOID error_bad_command (LPTSTR); -VOID error_invalid_drive (VOID); -VOID error_req_param_missing (VOID); -VOID error_sfile_not_found (LPTSTR); -VOID error_file_not_found (VOID); -VOID error_path_not_found (VOID); -VOID error_too_many_parameters (LPTSTR); +VOID error_no_pipe(VOID); +VOID error_bad_command(LPTSTR); +VOID error_invalid_drive(VOID); +VOID error_req_param_missing(VOID); +VOID error_sfile_not_found(LPTSTR); +VOID error_file_not_found(VOID); +VOID error_path_not_found(VOID); +VOID error_too_many_parameters(LPTSTR); VOID error_parameter_format(TCHAR); -VOID error_invalid_switch (TCHAR); -VOID error_invalid_parameter_format (LPTSTR); -VOID error_out_of_memory (VOID); -VOID error_syntax (LPTSTR); +VOID error_invalid_switch(TCHAR); +VOID error_invalid_parameter_format(LPTSTR); +VOID error_out_of_memory(VOID); +VOID error_syntax(LPTSTR); -VOID msg_pause (VOID); +VOID msg_pause(VOID); /* Prototypes for FILECOMP.C */ #ifdef FEATURE_UNIX_FILENAME_COMPLETION diff --git a/base/shell/cmd/error.c b/base/shell/cmd/error.c index 6995f188d89..dd2ec7a6c3f 100644 --- a/base/shell/cmd/error.c +++ b/base/shell/cmd/error.c @@ -69,35 +69,35 @@ VOID error_parameter_format(TCHAR ch) } -VOID error_invalid_switch (TCHAR ch) +VOID error_invalid_switch(TCHAR ch) { ConErrResPrintf(STRING_ERROR_INVALID_SWITCH, ch); nErrorLevel = 1; } -VOID error_too_many_parameters (LPTSTR s) +VOID error_too_many_parameters(LPTSTR s) { ConErrResPrintf(STRING_ERROR_TOO_MANY_PARAMETERS, s); nErrorLevel = 1; } -VOID error_path_not_found (VOID) +VOID error_path_not_found(VOID) { ConErrResPuts(STRING_ERROR_PATH_NOT_FOUND); nErrorLevel = 1; } -VOID error_file_not_found (VOID) +VOID error_file_not_found(VOID) { ConErrResPuts(STRING_ERROR_FILE_NOT_FOUND); nErrorLevel = 1; } -VOID error_sfile_not_found (LPTSTR f) +VOID error_sfile_not_found(LPTSTR f) { TCHAR szMsg[RC_STRING_MAX_SIZE]; @@ -107,49 +107,49 @@ VOID error_sfile_not_found (LPTSTR f) } -VOID error_req_param_missing (VOID) +VOID error_req_param_missing(VOID) { ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING); nErrorLevel = 1; } -VOID error_invalid_drive (VOID) +VOID error_invalid_drive(VOID) { ConErrResPuts(STRING_ERROR_INVALID_DRIVE); nErrorLevel = 1; } -VOID error_bad_command (LPTSTR s) +VOID error_bad_command(LPTSTR s) { ConErrResPrintf(STRING_ERROR_BADCOMMAND, s); nErrorLevel = 9009; } -VOID error_no_pipe (VOID) +VOID error_no_pipe(VOID) { ConErrResPuts(STRING_ERROR_CANNOTPIPE); nErrorLevel = 1; } -VOID error_out_of_memory (VOID) +VOID error_out_of_memory(VOID) { ConErrResPuts(STRING_ERROR_OUT_OF_MEMORY); nErrorLevel = 1; } -VOID error_invalid_parameter_format (LPTSTR s) +VOID error_invalid_parameter_format(LPTSTR s) { ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, s); nErrorLevel = 1; } -VOID error_syntax (LPTSTR s) +VOID error_syntax(LPTSTR s) { TCHAR szMsg[RC_STRING_MAX_SIZE]; @@ -164,7 +164,7 @@ VOID error_syntax (LPTSTR s) } -VOID msg_pause (VOID) +VOID msg_pause(VOID) { ConOutResPuts(STRING_ERROR_D_PAUSEMSG); }

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SHELL32][SHLWAPI] Forward shell32.ShellMessageBoxW directly to shlwapi.ShellMessageBoxWrapW. (#3179)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14599b0a37927355eefd4… commit 14599b0a37927355eefd411b444d61bde11b75b2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 13 18:21:29 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 13 22:44:58 2020 +0200 [SHELL32][SHLWAPI] Forward shell32.ShellMessageBoxW directly to shlwapi.ShellMessageBoxWrapW. (#3179) This makes ShellMessageBoxW use the correct implementation where the text buffer size is dynamic, instead of having a too small hardcoded size. Fixes CORE-17271. See also PR #3172 by Kyle Katarn, supplemented with some ideas from Mark Jansen. However we cannot straightforwardly implement ShellMessageBoxA around ShellMessageBoxW, by converting some parameters from ANSI to UNICODE, because there may be some variadic ANSI strings, associated with '%s' printf-like formatters inside the format string, that would also need to be converted; however there is no way for us to find these and perform the conversion ourselves. Therefore, we re-implement ShellMessageBoxA by doing a copy-paste ANSI adaptation of the shlwapi.ShellMessageBoxWrapW function. Note that, on Vista+ onwards, shlwapi implements both ShellMessageBoxA/W, and shell32 directly forwards these exports to shlwapi, thus avoiding these workarounds. [PSDK] Explicily use WINAPIV for the variadic ShellMessageBoxA/W functions. [INCLUDE/REACTOS] Add ShellMessageBoxWrapW in shlwapi_undoc.h . --- dll/win32/shell32/precomp.h | 13 ++++++ dll/win32/shell32/shell32.spec | 2 +- dll/win32/shell32/wine/shellord.c | 90 ++++++++++++++++++++++++++++++++++++- dll/win32/shlwapi/ordinal.c | 19 +++++++- sdk/include/psdk/shellapi.h | 2 + sdk/include/reactos/shlwapi_undoc.h | 10 +++++ 6 files changed, 132 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index 84bb7e49dc5..9ae77f4b794 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -45,6 +45,19 @@ #undef ShellExecute #include <undocshell.h> +/* + * For versions < Vista+, redefine ShellMessageBoxW to ShellMessageBoxWrapW + * (this is needed to avoid a linker error). On Vista+ onwards, shell32.ShellMessageBoxW + * redirects to shlwapi.ShellMessageBoxW so the #define should not be needed. + * + * However our shell32 is built with _WIN32_WINNT set to 0x600 (Vista+), + * yet its exports (especially regarding ShellMessageBoxA/W) are Win2003 + * compatible. So the #define is still needed, and the check be disabled. + */ +// #if (_WIN32_WINNT < 0x0600) +#define ShellMessageBoxW ShellMessageBoxWrapW +// #endif + #include <browseui_undoc.h> #include <shellutils.h> diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index f24256761af..110ac17c69c 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -178,7 +178,7 @@ 179 stdcall SHGetNewLinkInfoA(str str ptr long long) 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) 181 stdcall -noname RegisterShellHook(long long) -182 varargs ShellMessageBoxW(long long wstr wstr long) +182 varargs ShellMessageBoxW(long long wstr wstr long) shlwapi.ShellMessageBoxWrapW 183 varargs ShellMessageBoxA(long long str str long) 184 stdcall -noname ArrangeWindows(long long long long long) 185 stdcall -noname SHHandleDiskFull(ptr long) diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index 8cbdb2a4da4..ab0969a157b 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -331,12 +331,28 @@ BOOL WINAPI RegisterShellHook( * * See ShellMessageBoxA. * + */ +#ifdef __REACTOS__ +/* + * shell32.ShellMessageBoxW directly redirects to shlwapi.ShellMessageBoxWrapW, + * while shell32.ShellMessageBoxA is a copy-paste ANSI adaptation of the + * shlwapi.ShellMessageBoxWrapW function. + * + * From Vista+ onwards, all the implementation of ShellMessageBoxA/W that + * were existing in shell32 has been completely moved to shlwapi, so that + * shell32.ShellMessageBoxA and shell32.ShellMessageBoxW are redirections + * to the corresponding shlwapi functions. + * + */ +#else // !__REACTOS__ +/* * NOTE: * shlwapi.ShellMessageBoxWrapW is a duplicate of shell32.ShellMessageBoxW * because we can't forward to it in the .spec file since it's exported by * ordinal. If you change the implementation here please update the code in * shlwapi as well. */ +// Wine version, broken. int ShellMessageBoxW( HINSTANCE hInstance, HWND hWnd, @@ -358,12 +374,12 @@ int ShellMessageBoxW( hInstance,hWnd,lpText,lpCaption,uType); if (IS_INTRESOURCE(lpCaption)) - LoadStringW(hInstance, LOWORD(lpCaption), szTitle, sizeof(szTitle)/sizeof(szTitle[0])); + LoadStringW(hInstance, LOWORD(lpCaption), szTitle, ARRAY_SIZE(szTitle)); else pszTitle = lpCaption; if (IS_INTRESOURCE(lpText)) - LoadStringW(hInstance, LOWORD(lpText), szText, sizeof(szText)/sizeof(szText[0])); + LoadStringW(hInstance, LOWORD(lpText), szText, ARRAY_SIZE(szText)); else pszText = lpText; @@ -376,6 +392,7 @@ int ShellMessageBoxW( LocalFree(pszTemp); return ret; } +#endif /************************************************************************* * ShellMessageBoxA [SHELL32.183] @@ -395,6 +412,18 @@ int ShellMessageBoxW( * NOTES * Exported by ordinal */ +#ifdef __REACTOS__ +/* + * Note that we cannot straightforwardly implement ShellMessageBoxA around + * ShellMessageBoxW, by converting some parameters from ANSI to UNICODE, + * because there may be some variadic ANSI strings, associated with '%s' + * printf-like formatters inside the format string, that would also need + * to be converted; however there is no way for us to find these and perform + * the conversion ourselves. + * Therefore, we re-implement ShellMessageBoxA by doing a copy-paste ANSI + * adaptation of the shlwapi.ShellMessageBoxWrapW function. + */ +#endif int ShellMessageBoxA( HINSTANCE hInstance, HWND hWnd, @@ -403,6 +432,62 @@ int ShellMessageBoxA( UINT uType, ...) { +#ifdef __REACTOS__ + CHAR *szText = NULL, szTitle[100]; + LPCSTR pszText, pszTitle = szTitle; + LPSTR pszTemp; + __ms_va_list args; + int ret; + + __ms_va_start(args, uType); + + TRACE("(%p,%p,%p,%p,%08x)\n", hInstance, hWnd, lpText, lpCaption, uType); + + if (IS_INTRESOURCE(lpCaption)) + LoadStringA(hInstance, LOWORD(lpCaption), szTitle, ARRAY_SIZE(szTitle)); + else + pszTitle = lpCaption; + + if (IS_INTRESOURCE(lpText)) + { + /* Retrieve the length of the Unicode string and obtain the maximum + * possible length for the corresponding ANSI string (not counting + * any possible NULL-terminator). */ + const WCHAR *ptr; + UINT len = LoadStringW(hInstance, LOWORD(lpText), (LPWSTR)&ptr, 0); + + len = WideCharToMultiByte(CP_ACP, 0, ptr, len, + NULL, 0, NULL, NULL); + + if (len) + { + szText = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(CHAR)); + if (szText) LoadStringA(hInstance, LOWORD(lpText), szText, len + 1); + } + pszText = szText; + if (!pszText) { + WARN("Failed to load id %d\n", LOWORD(lpText)); + __ms_va_end(args); + return 0; + } + } + else + pszText = lpText; + + FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + pszText, 0, 0, (LPSTR)&pszTemp, 0, &args); + + __ms_va_end(args); + + ret = MessageBoxA(hWnd, pszTemp, pszTitle, uType | MB_SETFOREGROUND); + + HeapFree(GetProcessHeap(), 0, szText); + LocalFree(pszTemp); + return ret; + +#else // __REACTOS__ + +// Wine version, broken. char szText[100],szTitle[100]; LPCSTR pszText = szText, pszTitle = szTitle; LPSTR pszTemp; @@ -433,6 +518,7 @@ int ShellMessageBoxA( ret = MessageBoxA(hWnd,pszTemp,pszTitle,uType); LocalFree(pszTemp); return ret; +#endif } /************************************************************************* diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index 431ec51d2e1..b8b93a60372 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -4803,11 +4803,25 @@ DWORD WINAPI GetUIVersion(void) * * See shell32.ShellMessageBoxW * +#ifndef __REACTOS__ + * * NOTE: * shlwapi.ShellMessageBoxWrapW is a duplicate of shell32.ShellMessageBoxW * because we can't forward to it in the .spec file since it's exported by * ordinal. If you change the implementation here please update the code in * shell32 as well. + * +#else // __REACTOS__ + * + * From Vista+ onwards, all the implementation of ShellMessageBoxA/W that + * were existing in shell32 has been completely moved to shlwapi, so that + * shell32.ShellMessageBoxA and shell32.ShellMessageBoxW are redirections + * to the corresponding shlwapi functions. + * + * For Win2003 compatibility, if you change the implementation here please + * update the code of ShellMessageBoxA in shell32 as well. + * +#endif */ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType, ...) @@ -4823,7 +4837,7 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, TRACE("(%p,%p,%p,%p,%08x)\n", hInstance, hWnd, lpText, lpCaption, uType); if (IS_INTRESOURCE(lpCaption)) - LoadStringW(hInstance, LOWORD(lpCaption), szTitle, sizeof(szTitle)/sizeof(szTitle[0])); + LoadStringW(hInstance, LOWORD(lpCaption), szTitle, ARRAY_SIZE(szTitle)); else pszTitle = lpCaption; @@ -4852,6 +4866,9 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, __ms_va_end(args); +#ifdef __REACTOS__ + uType |= MB_SETFOREGROUND; +#endif ret = MessageBoxW(hWnd, pszTemp, pszTitle, uType); HeapFree(GetProcessHeap(), 0, szText); diff --git a/sdk/include/psdk/shellapi.h b/sdk/include/psdk/shellapi.h index b4a5ecb4f78..77e3fc5b62c 100644 --- a/sdk/include/psdk/shellapi.h +++ b/sdk/include/psdk/shellapi.h @@ -511,6 +511,7 @@ ShellAboutW( _In_opt_ HICON hIcon); int +WINAPIV ShellMessageBoxA( _In_opt_ HINSTANCE hAppInst, _In_opt_ HWND hWnd, @@ -520,6 +521,7 @@ ShellMessageBoxA( ...); int +WINAPIV ShellMessageBoxW( _In_opt_ HINSTANCE hAppInst, _In_opt_ HWND hWnd, diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 08af85972d7..a56ed24ed9d 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -120,6 +120,16 @@ INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen); PVOID WINAPI SHLockSharedEx(HANDLE hData, DWORD dwProcessId, BOOL bWriteAccess); +int +WINAPIV +ShellMessageBoxWrapW( + _In_opt_ HINSTANCE hAppInst, + _In_opt_ HWND hWnd, + _In_ LPCWSTR lpcText, + _In_opt_ LPCWSTR lpcTitle, + _In_ UINT fuStyle, + ...); + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

4 years, 8 months

1
0
0 0

[reactos] 01/01: [RAPPS] Update Chinese Simplified (zh-CN) translation (#3155)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5077e400d5a92d15516c0… commit 5077e400d5a92d15516c0dd1c7fa4cdb9399dd12 Author: He Yang <1160386205(a)qq.com> AuthorDate: Mon Sep 14 03:00:08 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 22:00:08 2020 +0300 [RAPPS] Update Chinese Simplified (zh-CN) translation (#3155) Addendum to 7a11c65. --- base/applications/rapps/lang/zh-CN.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index a0e025ab3c9..f82334fa9d0 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -257,12 +257,12 @@ END STRINGTABLE BEGIN - IDS_CMD_USAGE "Usage: " - IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" - IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" - IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" - IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" - IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" - IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" - IDS_CMD_PACKAGE_INFO "Information about package %1:\n" + IDS_CMD_USAGE "用法：" + IDS_CMD_NEED_PACKAGE_NAME "错误：选项 %1 需要一个或多个软件包名。\n" + IDS_CMD_NEED_FILE_NAME "错误：选项 %1 需要一个文件名。\n" + IDS_CMD_NEED_PARAMS "错误：选项 %1 需要一个或多个参数。\n" + IDS_CMD_INVALID_OPTION "错误：指定了未知或错误的命令行参数。\n" + IDS_CMD_FIND_RESULT_FOR "%1 的搜索结果：\n" + IDS_CMD_PACKAGE_NOT_FOUND "未能找到软件包 %1。\n" + IDS_CMD_PACKAGE_INFO "有关软件包 %1 的信息：\n" END

4 years, 8 months

1
0
0 0

[reactos] 01/01: [NTOBJSHEX] Update Polish (pl-PL) translation (#3175)

by Adam Stachowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3bc1b396aa5471cc4eb8… commit f3bc1b396aa5471cc4eb820ce4586c0ca5b6d1a8 Author: Adam Stachowicz <saibamenppl(a)gmail.com> AuthorDate: Sun Sep 13 15:22:11 2020 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 18:22:11 2020 +0300 [NTOBJSHEX] Update Polish (pl-PL) translation (#3175) Addendum to e358d1d. CORE-17268 --- dll/shellext/ntobjshex/lang/pl-PL.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/shellext/ntobjshex/lang/pl-PL.rc b/dll/shellext/ntobjshex/lang/pl-PL.rc index 828b21d4fa5..e202527993a 100644 --- a/dll/shellext/ntobjshex/lang/pl-PL.rc +++ b/dll/shellext/ntobjshex/lang/pl-PL.rc @@ -2,8 +2,8 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_NTOBJFLD_NAME "Przestrzeń nazw NT Object" + IDS_NTOBJFLD_NAME "Przestrzeń nazw obiektów NT" IDS_REGISTRY_NAME "Rejestr systemu" - IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" - IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" + IDS_NTOBJFLD_COMMENT "Umożliwia przeglądanie przestrzeni nazw obiektów NT" + IDS_REGISTRY_COMMENT "Umożliwia przeglądanie rejestru systemu" END

4 years, 8 months

1
0
0 0

[reactos] 03/03: [MSVCRT] Add vista exports

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c1f6631e62150c41d18e… commit 3c1f6631e62150c41d18e255079189b0313bff18 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Sep 9 19:18:27 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 13 15:37:29 2020 +0200 [MSVCRT] Add vista exports --- dll/win32/msvcrt/msvcrt.spec | 551 ++++++++++++++++++++++++++++ dll/win32/msvcrt/stubs.c | 831 +++++++++++++++++++++++++++++++++++++++++++ sdk/lib/crt/crt.cmake | 2 +- 3 files changed, 1383 insertions(+), 1 deletion(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index cf07e0b8b77..00bf4e65f3d 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -197,6 +197,31 @@ @ cdecl -arch=i386 _CIsqrt() @ cdecl -arch=i386 _CItan() @ cdecl -arch=i386 _CItanh() +@ stub -version=0x600+ _CrtCheckMemory +@ stub -version=0x600+ _CrtDbgBreak +@ stub -version=0x600+ _CrtDbgReport +@ stub -version=0x600+ _CrtDbgReportV +@ stub -version=0x600+ _CrtDbgReportW +@ stub -version=0x600+ _CrtDbgReportWV +@ stub -version=0x600+ _CrtDoForAllClientObjects +@ stub -version=0x600+ _CrtDumpMemoryLeaks +@ stub -version=0x600+ _CrtIsMemoryBlock +@ stub -version=0x600+ _CrtIsValidHeapPointer +@ stub -version=0x600+ _CrtIsValidPointer +@ stub -version=0x600+ _CrtMemCheckpoint +@ stub -version=0x600+ _CrtMemDifference +@ stub -version=0x600+ _CrtMemDumpAllObjectsSince +@ stub -version=0x600+ _CrtMemDumpStatistics +@ stub -version=0x600+ _CrtReportBlockType +@ stub -version=0x600+ _CrtSetAllocHook +@ stub -version=0x600+ _CrtSetBreakAlloc +@ stub -version=0x600+ _CrtSetDbgBlockType +@ stub -version=0x600+ _CrtSetDbgFlag +@ stub -version=0x600+ _CrtSetDumpClient +@ stub -version=0x600+ _CrtSetReportFile +@ stub -version=0x600+ _CrtSetReportHook +@ stub -version=0x600+ _CrtSetReportHook2 +@ stub -version=0x600+ _CrtSetReportMode @ stdcall _CxxThrowException(long long) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Getdays() @@ -207,13 +232,16 @@ @ cdecl _XcptFilter(long ptr) @ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) @ cdecl __CppXcptFilter(long ptr) +@ stub -version=0x600+ -arch=i386 __CxxCallUnwindDelDtor @ stub -arch=i386 __CxxCallUnwindDtor @ stub -arch=i386 __CxxCallUnwindVecDtor @ cdecl -arch=i386 __CxxDetectRethrow(ptr) @ cdecl -arch=i386 __CxxExceptionFilter() @ cdecl -arch=i386,x86_64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ cdecl -arch=i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler +@ cdecl -version=0x600+ -arch=x86_64 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -arch=arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) +@ cdecl -version=0x600+ -arch=i386,x86_64 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386 __CxxQueryExceptionSize() @ cdecl -arch=i386 __CxxRegisterExceptionObject() @@ -238,8 +266,10 @@ @ cdecl __crtGetStringTypeW(long long wstr long ptr) @ cdecl __crtLCMapStringA(long long str long str long long long) @ cdecl __crtLCMapStringW(long long wstr long wstr long long long) +@ stub -version=0x600+ __daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() +@ stub -version=0x600+ __dstbias @ cdecl __fpecode() @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv @@ -251,6 +281,27 @@ @ extern __lc_collate_cp MSVCRT___lc_collate_cp @ extern __lc_handle MSVCRT___lc_handle @ cdecl __lconv_init() +@ stub -version=0x600+ -arch=i386 __libm_sse2_acos +@ stub -version=0x600+ -arch=i386 __libm_sse2_acosf +@ stub -version=0x600+ -arch=i386 __libm_sse2_asin +@ stub -version=0x600+ -arch=i386 __libm_sse2_asinf +@ stub -version=0x600+ -arch=i386 __libm_sse2_atan +@ stub -version=0x600+ -arch=i386 __libm_sse2_atan2 +@ stub -version=0x600+ -arch=i386 __libm_sse2_atanf +@ stub -version=0x600+ -arch=i386 __libm_sse2_cos +@ stub -version=0x600+ -arch=i386 __libm_sse2_cosf +@ stub -version=0x600+ -arch=i386 __libm_sse2_exp +@ stub -version=0x600+ -arch=i386 __libm_sse2_expf +@ stub -version=0x600+ -arch=i386 __libm_sse2_log +@ stub -version=0x600+ -arch=i386 __libm_sse2_log10 +@ stub -version=0x600+ -arch=i386 __libm_sse2_log10f +@ stub -version=0x600+ -arch=i386 __libm_sse2_logf +@ stub -version=0x600+ -arch=i386 __libm_sse2_pow +@ stub -version=0x600+ -arch=i386 __libm_sse2_powf +@ stub -version=0x600+ -arch=i386 __libm_sse2_sin +@ stub -version=0x600+ -arch=i386 __libm_sse2_sinf +@ stub -version=0x600+ -arch=i386 __libm_sse2_tan +@ stub -version=0x600+ -arch=i386 __libm_sse2_tanf @ extern __mb_cur_max @ cdecl -arch=i386 __p___argc() @ cdecl -arch=i386 __p___argv() @@ -288,6 +339,7 @@ @ cdecl __set_app_type(long) @ extern __setlc_active @ cdecl __setusermatherr(ptr) +@ stub -version=0x600+ __strncnt @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) @@ -296,11 +348,14 @@ @ extern __unguarded_readlc_active @ extern __wargv __wargv @ cdecl __wcserror(wstr) +@ cdecl -version=0x600+ __wcserror_s(ptr long wstr) +@ stub -version=0x600+ __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv @ cdecl -arch=i386 _abnormal_termination() # stub _abs64 @ cdecl _access(str long) +@ cdecl -version=0x600+ _access_s(str long) @ extern _acmdln @ stdcall -arch=i386 _adj_fdiv_m16i(long) @ stdcall -arch=i386 _adj_fdiv_m32(long) @@ -318,24 +373,39 @@ @ extern -arch=i386 _adjust_fdiv @ extern _aexit_rtn @ cdecl _aligned_free(ptr) +@ stub -version=0x600+ _aligned_free_dbg @ cdecl _aligned_malloc(long long) +@ stub -version=0x600+ _aligned_malloc_dbg @ cdecl _aligned_offset_malloc(long long long) +@ stub -version=0x600+ _aligned_offset_malloc_dbg @ cdecl _aligned_offset_realloc(ptr long long long) +@ stub -version=0x600+ _aligned_offset_realloc_dbg @ cdecl _aligned_realloc(ptr long long) +@ stub -version=0x600+ _aligned_realloc_dbg @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) @ cdecl _atodbl(ptr str) +@ stub -version=0x600+ _atodbl_l +@ stub -version=0x600+ _atof_l +@ stub -version=0x600+ _atoflt_l @ cdecl -ret64 _atoi64(str) +@ stub -version=0x600+ _atoi64_l +@ stub -version=0x600+ _atoi_l +@ stub -version=0x600+ _atol_l @ cdecl _atoldbl(ptr str) +@ stub -version=0x600+ _atoldbl_l @ cdecl _beep(long long) @ cdecl _beginthread(ptr long ptr) @ cdecl _beginthreadex(ptr long ptr ptr long ptr) @ cdecl _c_exit() @ cdecl _cabs(long) @ cdecl _callnewh(long) +@ stub -version=0x600+ _calloc_dbg @ cdecl _cexit() @ cdecl _cgets(str) +@ stub -version=0x600+ _cgets_s @ cdecl -stub _cgetws(wstr) +@ stub -version=0x600+ _cgetws_s @ cdecl _chdir(str) @ cdecl _chdrive(long) @ cdecl _chgsign(double) @@ -343,29 +413,58 @@ @ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) @ cdecl _chsize(long long) +@ cdecl -version=0x600+ _chsize_s(long int64) +@ stub -version=0x600+ _chvalidator +@ stub -version=0x600+ _chvalidator_l @ cdecl -arch=i386,x86_64 _clearfp() @ cdecl _close(long) @ cdecl _commit(long) @ extern _commode @ cdecl -arch=i386,x86_64 _control87(long long) @ cdecl _controlfp(long long) +@ cdecl -version=0x600+ _controlfp_s(ptr long long) @ cdecl _copysign( double double ) @ cdecl -arch=x86_64,arm _copysignf(long long) @ varargs _cprintf(str) +@ stub -version=0x600+ _cprintf_l +@ stub -version=0x600+ _cprintf_p +@ stub -version=0x600+ _cprintf_p_l +@ stub -version=0x600+ _cprintf_s +@ stub -version=0x600+ _cprintf_s_l @ cdecl _cputs(str) @ cdecl -stub _cputws(wstr) @ cdecl _creat(str long) +@ stub -version=0x600+ _crtAssertBusy +@ stub -version=0x600+ _crtBreakAlloc +@ stub -version=0x600+ _crtDbgFlag @ varargs _cscanf(str) +@ stub -version=0x600+ _cscanf_l +@ stub -version=0x600+ _cscanf_s +@ stub -version=0x600+ _cscanf_s_l +@ stub -version=0x600+ _ctime32 +@ stub -version=0x600+ _ctime32_s @ cdecl _ctime64(ptr) +@ cdecl -version=0x600+ _ctime64_s(ptr long ptr) @ extern _ctype @ cdecl _cwait(ptr long long) @ varargs _cwprintf(wstr) +@ stub -version=0x600+ _cwprintf_l +@ stub -version=0x600+ _cwprintf_p +@ stub -version=0x600+ _cwprintf_p_l +@ stub -version=0x600+ _cwprintf_s +@ stub -version=0x600+ _cwprintf_s_l @ varargs -stub _cwscanf(wstr) +@ stub -version=0x600+ _cwscanf_l +@ stub -version=0x600+ _cwscanf_s +@ stub -version=0x600+ _cwscanf_s_l @ extern _daylight +@ stub -version=0x600+ _difftime32 +@ stub -version=0x600+ _difftime64 @ extern _dstbias @ cdecl _dup(long) @ cdecl _dup2(long long) @ cdecl _ecvt(double long ptr ptr) +@ stub -version=0x600+ _ecvt_s @ cdecl _endthread() @ cdecl _endthreadex(long) @ extern _environ @@ -384,8 +483,10 @@ @ cdecl _execvpe(str ptr ptr) @ cdecl _exit(long) @ cdecl _expand(ptr long) +@ stub -version=0x600+ _expand_dbg @ cdecl _fcloseall() @ cdecl _fcvt(double long ptr ptr) +@ stub -version=0x600+ _fcvt_s @ cdecl _fdopen(long str) @ cdecl _fgetchar() @ cdecl _fgetwchar() @@ -410,22 +511,61 @@ @ cdecl -stub -arch=x86_64 _fpclassf(long) @ cdecl -arch=i386 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() +@ stub -version=0x600+ _fprintf_l +@ stub -version=0x600+ _fprintf_p +@ stub -version=0x600+ _fprintf_p_l +@ stub -version=0x600+ _fprintf_s_l @ cdecl _fputchar(long) @ cdecl _fputwchar(long) +@ stub -version=0x600+ _free_dbg +@ stub -version=0x600+ _freea +@ stub -version=0x600+ _freea_s +@ stub -version=0x600+ _fscanf_l +@ stub -version=0x600+ _fscanf_s_l +@ cdecl -version=0x600+ _fseeki64(ptr int64 long) @ cdecl _fsopen(str str long) @ cdecl _fstat(long ptr) @ cdecl _fstat64(long ptr) @ cdecl _fstati64(long ptr) @ cdecl _ftime(ptr) +@ stub -version=0x600+ _ftime32 +@ stub -version=0x600+ _ftime32_s @ cdecl _ftime64(ptr) +@ cdecl -version=0x600+ _ftime64_s(ptr) @ cdecl -arch=i386 -ret64 _ftol() +@ cdecl -version=0x600+ -arch=i386 _ftol2(long) +@ cdecl -version=0x600+ -arch=i386 _ftol2_sse(long) +@ stub -version=0x600+ -arch=i386 _ftol2_sse_excpt @ cdecl _fullpath(ptr str long) +@ stub -version=0x600+ _fullpath_dbg @ cdecl _futime(long ptr) +@ stub -version=0x600+ _futime32 @ cdecl _futime64(long ptr) +@ stub -version=0x600+ _fwprintf_l +@ stub -version=0x600+ _fwprintf_p +@ stub -version=0x600+ _fwprintf_p_l +@ stub -version=0x600+ _fwprintf_s_l +@ stub -version=0x600+ _fwscanf_l +@ stub -version=0x600+ _fwscanf_s_l @ cdecl _gcvt(double long str) +@ stub -version=0x600+ _gcvt_s +@ cdecl -version=0x600+ _get_doserrno(ptr) +@ stub -version=0x600+ _get_environ +@ cdecl -version=0x600+ _get_errno(ptr) +@ stub -version=0x600+ _get_fileinfo +@ stub -version=0x600+ _get_fmode # @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) +@ cdecl -version=0x600+ _get_osplatform(ptr) +@ stub -version=0x600+ _get_osver +@ cdecl -version=0x600+ _get_output_format() +@ cdecl -version=0x600+ _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() +@ stub -version=0x600+ _get_wenviron +@ stub -version=0x600+ _get_winmajor +@ stub -version=0x600+ _get_winminor +@ stub -version=0x600+ _get_winver +@ cdecl -version=0x600+ _get_wpgmptr(ptr) @ cdecl _getch() @ cdecl _getche() @ cdecl _getcwd(str long) @@ -444,7 +584,10 @@ @ cdecl -stub _getwche() @ cdecl _getws(ptr) @ cdecl -arch=i386 _global_unwind2(ptr) +@ cdecl -version=0x600+ _gmtime32(ptr) +@ cdecl -version=0x600+ _gmtime32_s(ptr ptr) @ cdecl _gmtime64(ptr) +@ cdecl -version=0x600+ _gmtime64_s(ptr ptr) @ cdecl _heapadd(ptr long) @ cdecl _heapchk() @ cdecl _heapmin() @@ -455,58 +598,121 @@ @ cdecl _hypot(double double) @ cdecl -arch=x86_64,arm _hypotf(long long) @ cdecl _i64toa(long long ptr long) +@ cdecl -version=0x600+ _i64toa_s(int64 ptr long long) @ cdecl _i64tow(long long ptr long) +@ cdecl -version=0x600+ _i64tow_s(int64 ptr long long) @ cdecl _initterm(ptr ptr) +@ cdecl -version=0x600+ _initterm_e(ptr ptr) @ cdecl -arch=i386 _inp(long) MSVCRT__inp @ cdecl -arch=i386 _inpd(long) MSVCRT__inpd @ cdecl -arch=i386 _inpw(long) MSVCRT__inpw +@ cdecl -version=0x600+ _invalid_parameter(wstr wstr wstr long long) @ extern _iob +@ cdecl -version=0x600+ _isalnum_l(long ptr) +@ cdecl -version=0x600+ _isalpha_l(long ptr) @ cdecl _isatty(long) +@ cdecl -version=0x600+ _iscntrl_l(long ptr) @ cdecl _isctype(long long) +@ cdecl -version=0x600+ _isctype_l(long long ptr) +@ cdecl -version=0x600+ _isdigit_l(long ptr) +@ cdecl -version=0x600+ _isgraph_l(long ptr) +@ cdecl -version=0x600+ _isleadbyte_l(long ptr) +@ cdecl -version=0x600+ _islower_l(long ptr) @ cdecl _ismbbalnum(long) +@ stub -version=0x600+ _ismbbalnum_l @ cdecl _ismbbalpha(long) +@ stub -version=0x600+ _ismbbalpha_l @ cdecl _ismbbgraph(long) +@ stub -version=0x600+ _ismbbgraph_l @ cdecl _ismbbkalnum(long) +@ stub -version=0x600+ _ismbbkalnum_l @ cdecl _ismbbkana(long) +@ stub -version=0x600+ _ismbbkana_l @ cdecl _ismbbkprint(long) +@ stub -version=0x600+ _ismbbkprint_l @ cdecl _ismbbkpunct(long) +@ stub -version=0x600+ _ismbbkpunct_l @ cdecl _ismbblead(long) +@ stub -version=0x600+ _ismbblead_l @ cdecl _ismbbprint(long) +@ stub -version=0x600+ _ismbbprint_l @ cdecl _ismbbpunct(long) +@ stub -version=0x600+ _ismbbpunct_l @ cdecl _ismbbtrail(long) +@ stub -version=0x600+ _ismbbtrail_l @ cdecl _ismbcalnum(long) +@ stub -version=0x600+ _ismbcalnum_l @ cdecl _ismbcalpha(long) +@ stub -version=0x600+ _ismbcalpha_l @ cdecl _ismbcdigit(long) +@ stub -version=0x600+ _ismbcdigit_l @ cdecl _ismbcgraph(long) +@ stub -version=0x600+ _ismbcgraph_l @ cdecl _ismbchira(long) +@ stub -version=0x600+ _ismbchira_l @ cdecl _ismbckata(long) +@ stub -version=0x600+ _ismbckata_l @ cdecl _ismbcl0(long) +@ stub -version=0x600+ _ismbcl0_l @ cdecl _ismbcl1(long) +@ stub -version=0x600+ _ismbcl1_l @ cdecl _ismbcl2(long) +@ stub -version=0x600+ _ismbcl2_l @ cdecl _ismbclegal(long) +@ stub -version=0x600+ _ismbclegal_l @ cdecl _ismbclower(long) +@ stub -version=0x600+ _ismbclower_l @ cdecl _ismbcprint(long) +@ stub -version=0x600+ _ismbcprint_l @ cdecl _ismbcpunct(long) +@ stub -version=0x600+ _ismbcpunct_l @ cdecl _ismbcspace(long) +@ stub -version=0x600+ _ismbcspace_l @ cdecl _ismbcsymbol(long) +@ stub -version=0x600+ _ismbcsymbol_l @ cdecl _ismbcupper(long) +@ stub -version=0x600+ _ismbcupper_l @ cdecl _ismbslead(ptr ptr) +@ stub -version=0x600+ _ismbslead_l @ cdecl _ismbstrail(ptr ptr) +@ stub -version=0x600+ _ismbstrail_l @ cdecl _isnan(double) @ stub -arch=x86_64 _isnanf +@ cdecl -version=0x600+ _isprint_l(long ptr) +@ cdecl -version=0x600+ _isspace_l(long ptr) +@ cdecl -version=0x600+ _isupper_l(long ptr) +@ cdecl -version=0x600+ _iswalnum_l(long ptr) +@ cdecl -version=0x600+ _iswalpha_l(long ptr) +@ cdecl -version=0x600+ _iswcntrl_l(long ptr) +@ cdecl -version=0x600+ _iswctype_l(long ptr) +@ cdecl -version=0x600+ _iswdigit_l(long ptr) +@ cdecl -version=0x600+ _iswgraph_l(long ptr) +@ cdecl -version=0x600+ _iswlower_l(long ptr) +@ cdecl -version=0x600+ _iswprint_l(long ptr) +@ cdecl -version=0x600+ _iswpunct_l(long ptr) +@ cdecl -version=0x600+ _iswspace_l(long ptr) +@ cdecl -version=0x600+ _iswupper_l(long ptr) +@ cdecl -version=0x600+ _iswxdigit_l(long ptr) +@ cdecl -version=0x600+ _isxdigit_l(long ptr) @ cdecl _itoa(long ptr long) +@ cdecl -version=0x600+ _itoa_s(long str long long) @ cdecl _itow(long ptr long) +@ cdecl -version=0x600+ _itow_s() # FIXME @ cdecl _j0(double) @ cdecl _j1(double) @ cdecl _jn(long double) @ cdecl _kbhit() @ cdecl _lfind(ptr ptr ptr long ptr) +@ stub -version=0x600+ _lfind_s @ cdecl -arch=i386 _loaddll(str) @ cdecl -arch=x86_64 -version=0x502 _loaddll(str) @ cdecl -arch=x86_64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 -version=0x600+ _local_unwind4(ptr ptr long) +@ stub -version=0x600+ _localtime32 +@ stub -version=0x600+ _localtime32_s @ cdecl _localtime64(ptr) +@ cdecl -version=0x600+ _localtime64_s(ptr ptr) @ cdecl _lock(long) @ cdecl _locking(long long long) @ cdecl _logb(double) @@ -514,74 +720,167 @@ @ cdecl _lrotl(long long) @ cdecl _lrotr(long long) @ cdecl _lsearch(ptr ptr long long ptr) +@ stub -version=0x600+ _lsearch_s @ cdecl _lseek(long long long) @ cdecl -ret64 _lseeki64(long double long) @ cdecl _ltoa(long ptr long) +@ cdecl -version=0x600+ _ltoa_s(long str long long) @ cdecl _ltow(long ptr long) +@ cdecl -version=0x600+ _ltow_s(long ptr long long) @ cdecl _makepath(ptr str str str str) +@ stub -version=0x600+ _makepath_s +@ stub -version=0x600+ _malloc_dbg @ cdecl _mbbtombc(long) +@ stub -version=0x600+ _mbbtombc_l @ cdecl _mbbtype(long long) @ extern _mbcasemap @ cdecl _mbccpy (str str) +@ stub -version=0x600+ _mbccpy_l +@ stub -version=0x600+ _mbccpy_s +@ stub -version=0x600+ _mbccpy_s_l @ cdecl _mbcjistojms(long) +@ stub -version=0x600+ _mbcjistojms_l @ cdecl _mbcjmstojis(long) +@ stub -version=0x600+ _mbcjmstojis_l @ cdecl _mbclen(ptr) +@ stub -version=0x600+ _mbclen_l @ cdecl _mbctohira(long) +@ stub -version=0x600+ _mbctohira_l @ cdecl _mbctokata(long) +@ stub -version=0x600+ _mbctokata_l @ cdecl _mbctolower(long) +@ stub -version=0x600+ _mbctolower_l @ cdecl _mbctombb(long) +@ stub -version=0x600+ _mbctombb_l @ cdecl _mbctoupper(long) +@ stub -version=0x600+ _mbctoupper_l @ extern _mbctype +@ stub -version=0x600+ _mblen_l @ cdecl _mbsbtype(str long) +@ stub -version=0x600+ _mbsbtype_l @ cdecl _mbscat(str str) +@ stub -version=0x600+ _mbscat_s +@ stub -version=0x600+ _mbscat_s_l @ cdecl _mbschr(str long) +@ stub -version=0x600+ _mbschr_l @ cdecl _mbscmp(str str) +@ stub -version=0x600+ _mbscmp_l @ cdecl _mbscoll(str str) +@ stub -version=0x600+ _mbscoll_l @ cdecl _mbscpy(ptr str) +@ stub -version=0x600+ _mbscpy_s +@ stub -version=0x600+ _mbscpy_s_l @ cdecl _mbscspn(str str) +@ stub -version=0x600+ _mbscspn_l @ cdecl _mbsdec(ptr ptr) +@ stub -version=0x600+ _mbsdec_l @ cdecl _mbsdup(str) @ cdecl _mbsicmp(str str) +@ stub -version=0x600+ _mbsicmp_l @ cdecl _mbsicoll(str str) +@ stub -version=0x600+ _mbsicoll_l @ cdecl _mbsinc(str) +@ stub -version=0x600+ _mbsinc_l @ cdecl _mbslen(str) +@ stub -version=0x600+ _mbslen_l @ cdecl _mbslwr(str) +@ stub -version=0x600+ _mbslwr_l +@ stub -version=0x600+ _mbslwr_s +@ stub -version=0x600+ _mbslwr_s_l @ cdecl _mbsnbcat(str str long) +@ stub -version=0x600+ _mbsnbcat_l +@ stub -version=0x600+ _mbsnbcat_s +@ stub -version=0x600+ _mbsnbcat_s_l @ cdecl _mbsnbcmp(str str long) +@ stub -version=0x600+ _mbsnbcmp_l @ cdecl _mbsnbcnt(ptr long) +@ stub -version=0x600+ _mbsnbcnt_l @ cdecl _mbsnbcoll(str str long) +@ stub -version=0x600+ _mbsnbcoll_l @ cdecl _mbsnbcpy(ptr str long) +@ stub -version=0x600+ _mbsnbcpy_l +@ cdecl -version=0x600+ _mbsnbcpy_s(ptr long str long) +@ stub -version=0x600+ _mbsnbcpy_s_l @ cdecl _mbsnbicmp(str str long) +@ stub -version=0x600+ _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) +@ stub -version=0x600+ _mbsnbicoll_l @ cdecl _mbsnbset(str long long) +@ stub -version=0x600+ _mbsnbset_l +@ stub -version=0x600+ _mbsnbset_s +@ stub -version=0x600+ _mbsnbset_s_l @ cdecl _mbsncat(str str long) +@ stub -version=0x600+ _mbsncat_l +@ stub -version=0x600+ _mbsncat_s +@ stub -version=0x600+ _mbsncat_s_l @ cdecl _mbsnccnt(str long) +@ stub -version=0x600+ _mbsnccnt_l @ cdecl _mbsncmp(str str long) +@ stub -version=0x600+ _mbsncmp_l @ cdecl _mbsncoll(str str long) +@ stub -version=0x600+ _mbsncoll_l @ cdecl _mbsncpy(str str long) +@ stub -version=0x600+ _mbsncpy_l +@ stub -version=0x600+ _mbsncpy_s +@ stub -version=0x600+ _mbsncpy_s_l @ cdecl _mbsnextc(str) +@ stub -version=0x600+ _mbsnextc_l @ cdecl _mbsnicmp(str str long) +@ stub -version=0x600+ _mbsnicmp_l @ cdecl _mbsnicoll(str str long) +@ stub -version=0x600+ _mbsnicoll_l @ cdecl _mbsninc(str long) +@ stub -version=0x600+ _mbsninc_l +@ stub -version=0x600+ _mbsnlen +@ stub -version=0x600+ _mbsnlen_l @ cdecl _mbsnset(str long long) +@ stub -version=0x600+ _mbsnset_l +@ stub -version=0x600+ _mbsnset_s +@ stub -version=0x600+ _mbsnset_s_l @ cdecl _mbspbrk(str str) +@ stub -version=0x600+ _mbspbrk_l @ cdecl _mbsrchr(str long) +@ stub -version=0x600+ _mbsrchr_l @ cdecl _mbsrev(str) +@ stub -version=0x600+ _mbsrev_l @ cdecl _mbsset(str long) +@ stub -version=0x600+ _mbsset_l +@ stub -version=0x600+ _mbsset_s +@ stub -version=0x600+ _mbsset_s_l @ cdecl _mbsspn(str str) +@ stub -version=0x600+ _mbsspn_l @ cdecl _mbsspnp(str str) +@ stub -version=0x600+ _mbsspnp_l @ cdecl _mbsstr(str str) +@ stub -version=0x600+ _mbsstr_l @ cdecl _mbstok(str str) +@ stub -version=0x600+ _mbstok_l +@ stub -version=0x600+ _mbstok_s +@ stub -version=0x600+ _mbstok_s_l +@ cdecl -version=0x600+ _mbstowcs_l(ptr str long ptr) +@ stub -version=0x600+ _mbstowcs_s_l @ cdecl _mbstrlen(str) +@ stub -version=0x600+ _mbstrlen_l +@ stub -version=0x600+ _mbstrnlen +@ stub -version=0x600+ _mbstrnlen_l @ cdecl _mbsupr(str) +@ stub -version=0x600+ _mbsupr_l +@ stub -version=0x600+ _mbsupr_s +@ stub -version=0x600+ _mbsupr_s_l +@ cdecl -version=0x600+ _mbtowc_l(ptr wstr long long) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) +@ cdecl -version=0x600+ _memicmp_l(ptr ptr long ptr) @ cdecl _mkdir(str) @ cdecl _mkgmtime(ptr) +@ cdecl -version=0x600+ _mkgmtime32(ptr) @ cdecl _mkgmtime64(ptr) @ cdecl _mktemp(str) +@ stub -version=0x600+ _mktemp_s +@ cdecl -version=0x600+ _mktime32(ptr) @ cdecl _mktime64(ptr) @ cdecl _msize(ptr) +@ stub -version=0x600+ -arch=i386 _msize_debug @ cdecl _nextafter(double double) @ stub -arch=x86_64 _nextafterf @ cdecl _onexit(ptr) @@ -597,14 +896,20 @@ @ extern _pgmptr @ cdecl _pipe(ptr long long) @ cdecl _popen(str str) +@ stub -version=0x600+ _printf_l +@ stub -version=0x600+ _printf_p +@ stub -version=0x600+ _printf_p_l +@ stub -version=0x600+ _printf_s_l @ cdecl _purecall() @ cdecl _putch(long) @ cdecl _putenv(str) +@ stub -version=0x600+ _putenv_s @ cdecl _putw(long ptr) @ cdecl _putwch(long) @ cdecl _putws(wstr) @ extern _pwctype @ cdecl _read(long ptr long) +@ stub -version=0x600+ _realloc_dbg @ cdecl _resetstkoflw() @ cdecl _rmdir(str) @ cdecl _rmtmp() @@ -618,12 +923,26 @@ @ cdecl -arch=i386 _safe_fprem1() @ cdecl _scalb(double long) @ stub -arch=x86_64 _scalbf +@ stub -version=0x600+ _scanf_l +@ stub -version=0x600+ _scanf_s_l @ varargs _scprintf(str) +@ stub -version=0x600+ _scprintf_l +@ stub -version=0x600+ _scprintf_p_l @ varargs _scwprintf(wstr) +@ stub -version=0x600+ _scwprintf_l +@ stub -version=0x600+ _scwprintf_p_l @ cdecl _searchenv(str str ptr) +@ cdecl -version=0x600+ _searchenv_s(str str ptr long) +@ stub -version=0x600+ -arch=i386 _seh_longjmp_unwind4 @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ stub -arch=i386 _set_SSE2_enable +@ stub -version=0x600+ _set_controlfp +@ cdecl -version=0x600+ _set_doserrno(long) +@ cdecl -version=0x600+ _set_errno(long) @ cdecl _set_error_mode(long) +@ stub -version=0x600+ _set_fileinfo +@ stub -version=0x600+ _set_fmode +@ stub -version=0x600+ _set_output_format @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) @ cdecl -norelay _setjmp(ptr) @@ -635,10 +954,25 @@ @ cdecl _setsystime(ptr long) @ cdecl _sleep(long) @ varargs _snprintf(ptr long str) +@ stub -version=0x600+ _snprintf_c +@ stub -version=0x600+ _snprintf_c_l +@ stub -version=0x600+ _snprintf_l +@ stub -version=0x600+ _snprintf_s +@ stub -version=0x600+ _snprintf_s_l @ varargs _snscanf(str long str) +@ stub -version=0x600+ _snscanf_l +@ stub -version=0x600+ _snscanf_s +@ stub -version=0x600+ _snscanf_s_l @ varargs _snwprintf(ptr long wstr) +@ stub -version=0x600+ _snwprintf_l +@ stub -version=0x600+ _snwprintf_s +@ stub -version=0x600+ _snwprintf_s_l @ varargs _snwscanf(wstr long wstr) +@ stub -version=0x600+ _snwscanf_l +@ stub -version=0x600+ _snwscanf_s +@ stub -version=0x600+ _snwscanf_s_l @ varargs _sopen(str long long) +@ cdecl -version=0x600+ _sopen_s(ptr str long long long) @ varargs _spawnl(long str str) @ varargs _spawnle(long str str) @ varargs _spawnlp(long str str) @@ -648,44 +982,92 @@ @ cdecl _spawnvp(long str ptr) @ cdecl _spawnvpe(long str ptr ptr) @ cdecl _splitpath(str ptr ptr ptr ptr) +@ stub -version=0x600+ _splitpath_s +@ stub -version=0x600+ _sprintf_l +@ stub -version=0x600+ _sprintf_p_l +@ stub -version=0x600+ _sprintf_s_l +@ stub -version=0x600+ _sscanf_l +@ stub -version=0x600+ _sscanf_s_l @ cdecl _stat(str ptr) @ cdecl _stat64(str ptr) @ cdecl _stati64(str ptr) @ cdecl _statusfp() @ cdecl _strcmpi(str str) +@ cdecl -version=0x600+ _strcoll_l(str str ptr) @ cdecl _strdate(ptr) +@ cdecl -version=0x600+ _strdate_s(ptr long) @ cdecl _strdup(str) +@ stub -version=0x600+ _strdup_dbg @ cdecl _strerror(long) +@ cdecl -version=0x600+ _strerror_s(ptr long str) @ cdecl _stricmp(str str) +@ cdecl -version=0x600+ _stricmp_l(str str ptr) @ cdecl _stricoll(str str) +@ cdecl -version=0x600+ _stricoll_l(str str ptr) @ cdecl _strlwr(str) +@ stub -version=0x600+ _strlwr_l +@ cdecl -version=0x600+ _strlwr_s(str long) +@ cdecl -version=0x600+ _strlwr_s_l(str long ptr) @ cdecl _strncoll(str str long) +@ cdecl -version=0x600+ _strncoll_l(str str long ptr) @ cdecl _strnicmp(str str long) +@ cdecl -version=0x600+ _strnicmp_l(str str long ptr) @ cdecl _strnicoll(str str long) +@ cdecl -version=0x600+ _strnicoll_l(str str long ptr) @ cdecl _strnset(str long long) +@ cdecl -version=0x600+ _strnset_s(str long long long) @ cdecl _strrev(str) @ cdecl _strset(str long) +@ cdecl -version=0x600+ _strset_s(str long long) @ cdecl _strtime(ptr) +@ cdecl -version=0x600+ _strtime_s(ptr long) +@ stub -version=0x600+ _strtod_l @ cdecl _strtoi64(str ptr long) +@ cdecl -version=0x600+ _strtoi64_l(str ptr long ptr) +@ stub -version=0x600+ _strtol_l @ cdecl _strtoui64(str ptr long) strtoull +@ stub -version=0x600+ _strtoui64_l +@ cdecl -version=0x600+ _strtoul_l(str ptr long ptr) @ cdecl _strupr(str) +@ cdecl -version=0x600+ _strupr_l(str ptr) +@ cdecl -version=0x600+ _strupr_s(str long) +@ cdecl -version=0x600+ _strupr_s_l(str long ptr) +@ cdecl -version=0x600+ _strxfrm_l(ptr str long ptr) @ cdecl _swab(str str long) +@ stub -version=0x600+ _swprintf +@ stub -version=0x600+ _swprintf_c +@ stub -version=0x600+ _swprintf_c_l +@ stub -version=0x600+ _swprintf_p_l +@ stub -version=0x600+ _swprintf_s_l +@ stub -version=0x600+ _swscanf_l +@ stub -version=0x600+ _swscanf_s_l @ extern _sys_errlist @ extern _sys_nerr @ cdecl _tell(long) @ cdecl -ret64 _telli64(long) @ cdecl _tempnam(str str) +@ stub -version=0x600+ _tempnam_dbg +@ stub -version=0x600+ _time32 @ cdecl _time64(ptr) @ extern _timezone @ cdecl _tolower(long) +@ cdecl -version=0x600+ _tolower_l(long ptr) @ cdecl _toupper(long) +@ cdecl -version=0x600+ _toupper_l(long ptr) +@ cdecl -version=0x600+ _towlower_l(long ptr) +@ cdecl -version=0x600+ _towupper_l(long ptr) @ extern _tzname @ cdecl _tzset() @ cdecl _ui64toa(long long ptr long) +@ cdecl -version=0x600+ _ui64toa_s(int64 ptr long long) @ cdecl _ui64tow(long long ptr long) +@ cdecl -version=0x600+ _ui64tow_s(int64 ptr long long) @ cdecl _ultoa(long ptr long) +@ stub -version=0x600+ _ultoa_s @ cdecl _ultow(long ptr long) +@ stub -version=0x600+ _ultow_s @ cdecl _umask(long) +@ stub -version=0x600+ _umask_s @ cdecl _ungetch(long) # stub _ungetwch @ cdecl _unlink(str) @@ -693,33 +1075,116 @@ @ cdecl -arch=x86_64 -version=0x502 _unloaddll(ptr) @ cdecl _unlock(long) @ cdecl _utime(str ptr) +@ stub -version=0x600+ _utime32 @ cdecl _utime64(str ptr) +@ stub -version=0x600+ _vcprintf +@ stub -version=0x600+ _vcprintf_l +@ stub -version=0x600+ _vcprintf_p +@ stub -version=0x600+ _vcprintf_p_l +@ stub -version=0x600+ _vcprintf_s +@ stub -version=0x600+ _vcprintf_s_l +@ stub -version=0x600+ _vcwprintf +@ stub -version=0x600+ _vcwprintf_l +@ stub -version=0x600+ _vcwprintf_p +@ stub -version=0x600+ _vcwprintf_p_l +@ stub -version=0x600+ _vcwprintf_s +@ stub -version=0x600+ _vcwprintf_s_l +@ stub -version=0x600+ _vfprintf_l +@ stub -version=0x600+ _vfprintf_p +@ stub -version=0x600+ _vfprintf_p_l +@ stub -version=0x600+ _vfprintf_s_l +@ stub -version=0x600+ _vfwprintf_l +@ stub -version=0x600+ _vfwprintf_p +@ stub -version=0x600+ _vfwprintf_p_l +@ stub -version=0x600+ _vfwprintf_s_l +@ stub -version=0x600+ _vprintf_l +@ stub -version=0x600+ _vprintf_p +@ stub -version=0x600+ _vprintf_p_l +@ stub -version=0x600+ _vprintf_s_l @ cdecl _vscprintf(str ptr) +@ stub -version=0x600+ _vscprintf_l +@ stub -version=0x600+ _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) +@ stub -version=0x600+ _vscwprintf_l +@ stub -version=0x600+ _vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) +@ stub -version=0x600+ _vsnprintf_c +@ stub -version=0x600+ _vsnprintf_c_l +@ stub -version=0x600+ _vsnprintf_l +@ stub -version=0x600+ _vsnprintf_s +@ stub -version=0x600+ _vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) +@ stub -version=0x600+ _vsnwprintf_l +@ stub -version=0x600+ _vsnwprintf_s +@ stub -version=0x600+ _vsnwprintf_s_l +@ stub -version=0x600+ _vsprintf_l +@ stub -version=0x600+ _vsprintf_p +@ stub -version=0x600+ _vsprintf_p_l +@ stub -version=0x600+ _vsprintf_s_l +@ stub -version=0x600+ _vswprintf +@ stub -version=0x600+ _vswprintf_c +@ stub -version=0x600+ _vswprintf_c_l +@ stub -version=0x600+ _vswprintf_l +@ stub -version=0x600+ _vswprintf_p_l +@ stub -version=0x600+ _vswprintf_s_l +@ stub -version=0x600+ _vwprintf_l +@ stub -version=0x600+ _vwprintf_p +@ stub -version=0x600+ _vwprintf_p_l +@ stub -version=0x600+ _vwprintf_s_l @ cdecl _waccess(wstr long) +@ cdecl -version=0x600+ _waccess_s(wstr long) @ cdecl _wasctime(ptr) +@ cdecl -version=0x600+ _wasctime_s(ptr long ptr) +@ stub -version=0x600+ _wassert @ cdecl _wchdir(wstr) @ cdecl _wchmod(wstr long) @ extern _wcmdln @ cdecl _wcreat(wstr long) +@ cdecl -version=0x600+ _wcscoll_l(str str ptr) @ cdecl _wcsdup(wstr) +@ stub -version=0x600+ _wcsdup_dbg @ cdecl _wcserror(long) +@ cdecl -version=0x600+ _wcserror_s(ptr long long) +@ stub -version=0x600+ _wcsftime_l @ cdecl _wcsicmp(wstr wstr) +@ cdecl -version=0x600+ _wcsicmp_l(wstr wstr ptr) @ cdecl _wcsicoll(wstr wstr) +@ cdecl -version=0x600+ _wcsicoll_l(wstr wstr ptr) @ cdecl _wcslwr(wstr) +@ cdecl -version=0x600+ _wcslwr_l(wstr ptr) +@ cdecl -version=0x600+ _wcslwr_s(wstr long) +@ cdecl -version=0x600+ _wcslwr_s_l(wstr long ptr) @ cdecl _wcsncoll(wstr wstr long) +@ cdecl -version=0x600+ _wcsncoll_l(wstr wstr long ptr) @ cdecl _wcsnicmp(wstr wstr long) +@ cdecl -version=0x600+ _wcsnicmp_l(wstr wstr long ptr) @ cdecl _wcsnicoll(wstr wstr long) +@ cdecl -version=0x600+ _wcsnicoll_l(wstr str long ptr) @ cdecl _wcsnset(wstr long long) +@ cdecl -version=0x600+ _wcsnset_s(wstr long long long) @ cdecl _wcsrev(wstr) @ cdecl _wcsset(wstr long) +@ cdecl -version=0x600+ _wcsset_s(ptr long long) @ cdecl _wcstoi64(wstr ptr long) +@ cdecl -version=0x600+ _wcstoi64_l(wstr ptr long ptr) +@ stub -version=0x600+ _wcstol_l +@ cdecl -version=0x600+ _wcstombs_l(ptr wstr long ptr) +@ stub -version=0x600+ _wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) +@ cdecl -version=0x600+ _wcstoui64_l(wstr ptr long ptr) +@ stub -version=0x600+ _wcstoul_l @ cdecl _wcsupr(wstr) +@ cdecl -version=0x600+ _wcsupr_l(wstr ptr) +@ cdecl -version=0x600+ _wcsupr_s(wstr long) +@ cdecl -version=0x600+ _wcsupr_s_l(ptr long ptr) +@ cdecl -version=0x600+ _wcsxfrm_l(ptr wstr long ptr) @ cdecl _wctime(ptr) +@ stub -version=0x600+ _wctime32 +@ stub -version=0x600+ _wctime32_s @ cdecl _wctime64(ptr) +@ cdecl -version=0x600+ _wctime64_s(ptr long ptr) +@ stub -version=0x600+ _wctomb_l +@ stub -version=0x600+ _wctomb_s_l # stub _wctype @ extern _wenviron @ varargs _wexecl(wstr wstr) @@ -738,30 +1203,47 @@ # stub _wfindnext64 @ cdecl _wfindnexti64(long ptr) @ cdecl _wfopen(wstr wstr) +@ cdecl -version=0x600+ _wfopen_s(ptr wstr wstr) @ cdecl _wfreopen(wstr wstr ptr) +@ stub -version=0x600+ _wfreopen_s @ cdecl _wfsopen(wstr wstr long) @ cdecl _wfullpath(ptr wstr long) +@ stub -version=0x600+ _wfullpath_dbg @ cdecl _wgetcwd(wstr long) @ cdecl _wgetdcwd(long wstr long) @ cdecl _wgetenv(wstr) +@ stub -version=0x600+ _wgetenv_s @ extern _winmajor @ extern _winminor +@ stub -version=0x600+ _winput_s @ extern _winver @ cdecl _wmakepath(ptr wstr wstr wstr wstr) +@ stub -version=0x600+ _wmakepath_s @ cdecl _wmkdir(wstr) @ cdecl _wmktemp(wstr) +@ stub -version=0x600+ _wmktemp_s @ varargs _wopen(wstr long) +@ stub -version=0x600+ _woutput_s @ cdecl _wperror(wstr) @ extern _wpgmptr @ cdecl _wpopen(wstr wstr) +@ stub -version=0x600+ _wprintf_l +@ stub -version=0x600+ _wprintf_p +@ stub -version=0x600+ _wprintf_p_l +@ stub -version=0x600+ _wprintf_s_l @ cdecl _wputenv(wstr) +@ stub -version=0x600+ _wputenv_s @ cdecl _wremove(wstr) @ cdecl _wrename(wstr wstr) @ cdecl _write(long ptr long) @ cdecl _wrmdir(wstr) +@ stub -version=0x600+ _wscanf_l +@ stub -version=0x600+ _wscanf_s_l @ cdecl _wsearchenv(wstr wstr ptr) +@ cdecl -version=0x600+ _wsearchenv_s(wstr wstr ptr long) @ cdecl _wsetlocale(long wstr) @ varargs _wsopen(wstr long long) +@ cdecl -version=0x600+ _wsopen_s(ptr wstr long long long) @ varargs _wspawnl(long wstr wstr) @ varargs _wspawnle(long wstr wstr) @ varargs _wspawnlp(long wstr wstr) @@ -771,20 +1253,30 @@ @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) +@ stub -version=0x600+ _wsplitpath_s @ cdecl _wstat(wstr ptr) @ cdecl _wstat64(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstrdate(ptr) +@ cdecl -version=0x600+ _wstrdate_s(ptr long) @ cdecl _wstrtime(ptr) +@ stub -version=0x600+ _wstrtime_s @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) +@ stub -version=0x600+ _wtempnam_dbg @ cdecl _wtmpnam(ptr) +@ stub -version=0x600+ _wtmpnam_s @ cdecl _wtof(wstr) +@ stub -version=0x600+ _wtof_l @ cdecl _wtoi(wstr) @ cdecl _wtoi64(wstr) +@ cdecl -version=0x600+ _wtoi64_l(wstr ptr) +@ stub -version=0x600+ _wtoi_l @ cdecl _wtol(wstr) +@ stub -version=0x600+ _wtol_l @ cdecl _wunlink(wstr) @ cdecl _wutime(wstr ptr) +@ stub -version=0x600+ _wutime32 @ cdecl _wutime64(wstr ptr) @ cdecl _y0(double) @ cdecl _y1(double) @@ -794,6 +1286,7 @@ @ cdecl acos(double) @ cdecl -arch=x86_64,arm acosf(long) @ cdecl asctime(ptr) +@ cdecl -version=0x600+ asctime_s(ptr long ptr) @ cdecl asin(double) @ cdecl -arch=x86_64,arm asinf(long) @ cdecl atan(double) @@ -805,10 +1298,13 @@ @ cdecl atoi(str) @ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) +@ stub -version=0x600+ bsearch_s +@ stub -version=0x600+ btowc @ cdecl calloc(long long) @ cdecl ceil(double) @ cdecl -arch=x86_64,arm ceilf(long) @ cdecl clearerr(ptr) +@ stub -version=0x600+ clearerr_s @ cdecl clock() @ cdecl cos(double) @ cdecl -arch=x86_64,arm cosf(long) @@ -836,7 +1332,9 @@ @ cdecl fmod(double double) @ cdecl -arch=x86_64,arm fmodf(long) @ cdecl fopen(str str) +@ cdecl -version=0x600+ fopen_s(ptr str str) @ varargs fprintf(ptr str) +@ stub -version=0x600+ fprintf_s @ cdecl fputc(long ptr) @ cdecl fputs(str ptr) @ cdecl fputwc(long ptr) @@ -844,17 +1342,22 @@ @ cdecl fread(ptr long long ptr) @ cdecl free(ptr) @ cdecl freopen(str str ptr) +@ stub -version=0x600+ freopen_s @ cdecl frexp(double ptr) @ varargs fscanf(ptr str) +@ stub -version=0x600+ fscanf_s @ cdecl fseek(ptr long long) @ cdecl fsetpos(ptr ptr) @ cdecl ftell(ptr) @ varargs fwprintf(ptr wstr) +@ stub -version=0x600+ fwprintf_s @ cdecl fwrite(ptr long long ptr) @ varargs fwscanf(ptr wstr) +@ stub -version=0x600+ fwscanf_s @ cdecl getc(ptr) @ cdecl getchar() @ cdecl getenv(str) +@ stub -version=0x600+ getenv_s @ cdecl gets(str) @ cdecl getwc(ptr) @ cdecl getwchar() @@ -897,12 +1400,20 @@ @ cdecl longjmp(ptr long) @ cdecl malloc(long) @ cdecl mblen(ptr long) +@ cdecl -version=0x600+ mbrlen(str long ptr) +@ stub -version=0x600+ mbrtowc +@ stub -version=0x600+ mbsdup_dbg +@ stub -version=0x600+ mbsrtowcs +@ stub -version=0x600+ mbsrtowcs_s @ cdecl mbstowcs(ptr str long) +@ stub -version=0x600+ mbstowcs_s @ cdecl mbtowc(wstr str long) @ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) +@ stub -version=0x600+ memcpy_s @ cdecl memmove(ptr ptr long) +@ cdecl -version=0x600+ memmove_s(ptr long ptr long) @ cdecl memset(ptr long long) @ cdecl mktime(ptr) @ cdecl modf(double ptr) @@ -911,19 +1422,23 @@ @ cdecl pow(double double) @ cdecl -arch=x86_64,arm powf(long) @ varargs printf(str) +@ stub -version=0x600+ printf_s @ cdecl putc(long ptr) @ cdecl putchar(long) @ cdecl puts(str) @ cdecl putwc(long ptr) fputwc @ cdecl putwchar(long) _fputwchar @ cdecl qsort(ptr long long ptr) +@ stub -version=0x600+ qsort_s @ cdecl raise(long) @ cdecl rand() +@ cdecl -version=0x600+ rand_s(ptr) @ cdecl realloc(ptr long) @ cdecl remove(str) @ cdecl rename(str str) @ cdecl rewind(ptr) @ varargs scanf(str) +@ stub -version=0x600+ scanf_s @ cdecl setbuf(ptr ptr) @ cdecl -arch=x86_64,arm -norelay setjmp(ptr ptr) _setjmp @ cdecl setlocale(long str) @@ -934,33 +1449,44 @@ @ cdecl sinh(double) @ cdecl -arch=x86_64,arm sinhf(long) @ varargs sprintf(ptr str) +@ stub -version=0x600+ sprintf_s @ cdecl sqrt(double) @ cdecl -arch=x86_64,arm sqrtf(long) @ cdecl srand(long) @ varargs sscanf(str str) +@ stub -version=0x600+ sscanf_s @ cdecl strcat(str str) +@ cdecl -version=0x600+ strcat_s(ptr long str) @ cdecl strchr(str long) @ cdecl strcmp(str str) @ cdecl strcoll(str str) @ cdecl strcpy(ptr str) +@ cdecl -version=0x600+ strcpy_s(ptr long str) @ cdecl strcspn(str str) @ cdecl strerror(long) +@ cdecl -version=0x600+ strerror_s(ptr long long) @ cdecl strftime(str long str ptr) @ cdecl strlen(str) @ cdecl strncat(str str long) +@ cdecl -version=0x600+ strncat_s(str long str long) @ cdecl strncmp(str str long) @ cdecl strncpy(ptr str long) +@ cdecl -version=0x600+ strncpy_s(ptr long str long) +@ cdecl -version=0x600+ strnlen(str long) @ cdecl strpbrk(str str) @ cdecl strrchr(str long) @ cdecl strspn(str str) @ cdecl strstr(str str) @ cdecl strtod(str ptr) @ cdecl strtok(str str) +@ cdecl -version=0x600+ strtok_s(str str ptr) @ cdecl strtol(str ptr long) @ cdecl strtoul(str ptr long) @ cdecl strxfrm(ptr str long) @ varargs swprintf(ptr wstr) +@ stub -version=0x600+ swprintf_s @ varargs swscanf(wstr wstr) +@ stub -version=0x600+ swscanf_s @ cdecl system(str) @ cdecl tan(double) @ cdecl -arch=x86_64,arm tanf(long) @@ -968,40 +1494,65 @@ @ cdecl -arch=x86_64,arm tanhf(long) @ cdecl time(ptr) @ cdecl tmpfile() +@ stub -version=0x600+ tmpfile_s @ cdecl tmpnam(ptr) +@ stub -version=0x600+ tmpnam_s @ cdecl tolower(long) @ cdecl toupper(long) @ cdecl towlower(long) @ cdecl towupper(long) @ cdecl ungetc(long ptr) @ cdecl ungetwc(long ptr) +@ stub -version=0x600+ utime @ cdecl vfprintf(ptr str ptr) +@ stub -version=0x600+ vfprintf_s @ cdecl vfwprintf(ptr wstr ptr) +@ stub -version=0x600+ vfwprintf_s @ cdecl vprintf(str ptr) +@ stub -version=0x600+ vprintf_s +@ cdecl -version=0x600+ vsnprintf(ptr long str ptr) @ cdecl vsprintf(ptr str ptr) +@ stub -version=0x600+ vsprintf_s @ cdecl vswprintf(ptr wstr ptr) +@ stub -version=0x600+ vswprintf_s @ cdecl vwprintf(wstr ptr) +@ stub -version=0x600+ vwprintf_s +@ stub -version=0x600+ wcrtomb +@ stub -version=0x600+ wcrtomb_s @ cdecl wcscat(wstr wstr) +@ cdecl -version=0x600+ wcscat_s(wstr long wstr) @ cdecl wcschr(wstr long) @ cdecl wcscmp(wstr wstr) @ cdecl wcscoll(wstr wstr) @ cdecl wcscpy(ptr wstr) +@ cdecl -version=0x600+ wcscpy_s(wstr long wstr) @ cdecl wcscspn(wstr wstr) @ cdecl wcsftime(ptr long wstr ptr) @ cdecl wcslen(wstr) @ cdecl wcsncat(wstr wstr long) +@ cdecl -version=0x600+ wcsncat_s(wstr long wstr long) @ cdecl wcsncmp(wstr wstr long) @ cdecl wcsncpy(ptr wstr long) +@ cdecl -version=0x600+ wcsncpy_s(ptr long wstr long) +@ cdecl -version=0x600+ wcsnlen(wstr long) @ cdecl wcspbrk(wstr wstr) @ cdecl wcsrchr(wstr long) +@ stub -version=0x600+ wcsrtombs +@ stub -version=0x600+ wcsrtombs_s @ cdecl wcsspn(wstr wstr) @ cdecl wcsstr(wstr wstr) @ cdecl wcstod(wstr ptr) @ cdecl wcstok(wstr wstr) +@ cdecl -version=0x600+ wcstok_s(wstr wstr ptr) @ cdecl wcstol(wstr ptr long) @ cdecl wcstombs(ptr ptr long) +@ stub -version=0x600+ wcstombs_s @ cdecl wcstoul(wstr ptr long) @ cdecl wcsxfrm(ptr wstr long) +@ stub -version=0x600+ wctob @ cdecl wctomb(ptr long) +@ stub -version=0x600+ wctomb_s @ varargs wprintf(wstr) +@ stub -version=0x600+ wprintf_s @ varargs wscanf(wstr) +@ stub -version=0x600+ wscanf_s diff --git a/dll/win32/msvcrt/stubs.c b/dll/win32/msvcrt/stubs.c index 82e7e41b165..e120a130cc8 100644 --- a/dll/win32/msvcrt/stubs.c +++ b/dll/win32/msvcrt/stubs.c @@ -88,3 +88,834 @@ unsigned long MSVCRT__outpd( return _outpd(port, dataword); } #endif + +typedef struct __crt_locale_data_public +{ + unsigned short const* _locale_pctype; + _Field_range_(1, 2) int _locale_mb_cur_max; + unsigned int _locale_lc_codepage; +} __crt_locale_data_public; + +__inline +__crt_locale_data_public* +__CRTDECL +__acrt_get_locale_data_prefix( + void const volatile* const _LocalePointers) +{ + _locale_t const _TypedLocalePointers = (_locale_t)_LocalePointers; + return (__crt_locale_data_public*)_TypedLocalePointers->locinfo; +} + +__inline +int +__CRTDECL +__acrt_locale_get_ctype_array_value( + _In_reads_(_Char_value + 1) unsigned short const * const locale_pctype_array, + _In_range_(-1, 255) int const c, + _In_ int const mask + ) +{ + if (c >= -1 && c <= 255) + { + return locale_pctype_array[c] & mask; + } + return 0; +} + +const unsigned short* __cdecl __pctype_func(void); + +#if defined _CRT_DISABLE_PERFCRIT_LOCKS && !defined _DLL + #define __PCTYPE_FUNC _pctype +#else + #define __PCTYPE_FUNC __pctype_func() +#endif + +#ifdef _DEBUG + _ACRTIMP int __cdecl _chvalidator(_In_ int c, _In_ int mask); + #define __chvalidchk(a, b) _chvalidator(a, b) +#else + #define __chvalidchk(a, b) (__acrt_locale_get_ctype_array_value(__PCTYPE_FUNC, (a), (b))) +#endif + +__inline +int +__CRTDECL +_chvalidchk_l( + _In_ int const c, + _In_ int const mask, + _In_opt_ _locale_t const locale + ) +{ +#ifdef _DEBUG + return _chvalidator_l(locale, c, mask); +#else + if (locale) + { + return __acrt_locale_get_ctype_array_value(__acrt_get_locale_data_prefix(locale)->_locale_pctype, c, mask); + } + + return __chvalidchk(c, mask); +#endif +} + +__inline +int +__CRTDECL +_ischartype_l( + _In_ int const c, + _In_ int const mask, + _In_opt_ _locale_t const locale) +{ + if (locale) + { + if (c >= -1 && c <= 255) + { + return __acrt_get_locale_data_prefix(locale)->_locale_pctype[c] & mask; + } + + if (__acrt_get_locale_data_prefix(locale)->_locale_mb_cur_max > 1) + { + return _isctype_l(c, mask, locale); + } + + return 0; // >0xFF and SBCS locale + } + + return _chvalidchk_l(c, mask, 0); +} + +//#undef _isalnum_l +_Check_return_ +_CRTIMP +int +__cdecl +_isalnum_l( + _In_ int c, + _In_opt_ _locale_t locale) +{ + return _ischartype_l(c, _ALPHA | _DIGIT, locale); +} + +#undef _isalpha_l +_Check_return_ +_CRTIMP +int +__cdecl +_isalpha_l( + _In_ int c, + _In_opt_ _locale_t locale) +{ + return _ischartype_l(c, _ALPHA, locale); +} + +#undef _iscntrl_l +_Check_return_ +_CRTIMP +int +__cdecl +_iscntrl_l( + _In_ int c, + _In_opt_ _locale_t locale) +{ + return _ischartype_l(c, _CONTROL, locale); +} + +#undef _isdigit_l +_Check_return_ +_CRTIMP +int +__cdecl +_isdigit_l( + _In_ int c, + _In_opt_ _locale_t locale) +{ + return _ischartype_l(c, _DIGIT, locale); +} + +#undef _isgraph_l +_Check_return_ +_CRTIMP +int +__cdecl +_isgraph_l( + _In_ int c, + _In_opt_ _locale_t locale) +{ + return _ischartype_l(c, _PUNCT | _ALPHA | _DIGIT, locale); +} + +#undef _islower_l +_Check_return_ +_CRTIMP +int +__cdecl +_islower_l( + _In_ int c, + _In_opt_ _locale_t locale) +{ + return _ischartype_l(c, _LOWER, locale); +} + +#undef _isprint_l +_Check_return_ +_CRTIMP +int +__cdecl +_isprint_l( + _In_ int c, + _In_opt_ _locale_t locale) +{ + return _ischartype_l(c, _BLANK | _PUNCT | _ALPHA | _DIGIT, locale); +} + +#undef _isspace_l +_Check_return_ +_CRTIMP +int +__cdecl +_isspace_l( + _In_ int c, + _In_opt_ _locale_t locale) +{ + return _ischartype_l(c, _SPACE, locale); +} + +#undef _isupper_l +_Check_return_ +_CRTIMP +int +__cdecl +_isupper_l( + _In_ int c, + _In_opt_ _locale_t locale) +{ + return _ischartype_l(c, _UPPER, locale); +} + +#undef _iswalnum_l +_Check_return_ +_CRTIMP +int +__cdecl +_iswalnum_l( + _In_ wint_t c, + _In_opt_ _locale_t locale) +{ + return _iswctype_l(c, _ALPHA|_DIGIT, locale); +} + +#undef _iswalpha_l +_Check_return_ +_CRTIMP +int +__cdecl +_iswalpha_l( + _In_ wint_t c, + _In_opt_ _locale_t locale) +{ + return _iswctype_l(c, _ALPHA, locale); +} + +#undef _iswcntrl_l +_Check_return_ +_CRTIMP +int +__cdecl +_iswcntrl_l( + _In_ wint_t c, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return _iswctype_l(c, _CONTROL, locale); +} + +_Check_return_ +_CRTIMP +int +__cdecl +_iswctype_l( + _In_ wint_t c, + _In_ wctype_t type, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +#undef _iswdigit_l +_Check_return_ +_CRTIMP +int +__cdecl +_iswdigit_l( + _In_ wint_t c, + _In_opt_ _locale_t locale) +{ + return _iswctype_l(c, _DIGIT, locale); +} + +#undef _iswgraph_l +_Check_return_ +_CRTIMP +int +__cdecl +_iswgraph_l( + _In_ wint_t c, + _In_opt_ _locale_t locale) +{ + return _iswctype_l(c, _PUNCT | _ALPHA | _DIGIT, locale); +} + +#undef _iswlower_l +_Check_return_ +_CRTIMP +int +__cdecl +_iswlower_l( + _In_ wint_t c, + _In_opt_ _locale_t locale) +{ + return _iswctype_l(c , _LOWER, locale); +} + +#undef _iswprint_l +_Check_return_ +_CRTIMP +int +__cdecl +_iswprint_l( + _In_ wint_t c, + _In_opt_ _locale_t locale) +{ + return _iswctype_l(c, _BLANK | _PUNCT | _ALPHA | _DIGIT, locale); +} + +#undef _iswpunct_l +_Check_return_ +_CRTIMP +int +__cdecl +_iswpunct_l( + _In_ wint_t c, + _In_opt_ _locale_t locale) +{ + return _iswctype_l(c, _PUNCT, locale); +} + +#undef _iswspace_l +_Check_return_ +_CRTIMP +int +__cdecl +_iswspace_l( + _In_ wint_t c, + _In_opt_ _locale_t locale) +{ + return _iswctype_l(c, _SPACE, locale); +} + +#undef _iswupper_l +_Check_return_ +_CRTIMP +int +__cdecl +_iswupper_l( + _In_ wint_t c, + _In_opt_ _locale_t locale) +{ + return _iswctype_l(c, _UPPER, locale); +} + +#undef _iswxdigit_l +_Check_return_ +_CRTIMP +int +__cdecl +_iswxdigit_l( + _In_ wint_t c, + _In_opt_ _locale_t locale) +{ + return _iswctype_l(c, _HEX, locale); +} + +#undef _isxdigit_l +_Check_return_ +_CRTIMP +int +__cdecl +_isxdigit_l( + _In_ int c, + _In_opt_ _locale_t locale) +{ + return _ischartype_l(c, _HEX, locale); +} + +_Must_inspect_result_ +_CRTIMP +int +__cdecl +_memicmp_l( + _In_reads_bytes_opt_(size) const void *buf1, + _In_reads_bytes_opt_(size) const void *buf2, + _In_ size_t size, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_strcoll_l( + _In_z_ const char *str1, + _In_z_ const char *str2, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_stricmp_l( + _In_z_ const char *str1, + _In_z_ const char *str2, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_stricoll_l( + _In_z_ const char *str1, + _In_z_ const char *str2, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +_strlwr_s( + _Inout_updates_z_(size) char *str, + _In_ size_t size) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +_strlwr_s_l( + _Inout_updates_z_(size) char *str, + _In_ size_t size, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_strncoll_l( + _In_z_ const char *str1, + _In_z_ const char *str2, + _In_ size_t maxcount, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_strnicmp_l( + _In_reads_or_z_(maxcount) const char *str1, + _In_reads_or_z_(maxcount) const char *str2, + _In_ size_t maxcount, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_strnicoll_l( + _In_z_ const char *str1, + _In_z_ const char *str2, + _In_ size_t maxcount, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +_strnset_s( + _Inout_updates_z_(size) char *str, + _In_ size_t size, + _In_ int val, + _In_ size_t _MaxCount) +{ + UNIMPLEMENTED; + return 0; +} + +_CRTIMP +char* +_strupr_l( + char *str, + _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +wint_t +__cdecl +_towlower_l( + _In_ wint_t c, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +wint_t +__cdecl +_towupper_l( + _In_ wint_t c, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_CRTIMP +wchar_t* +_wcslwr_l( + wchar_t *str, + _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_CRTIMP +wchar_t* +_wcsupr_l( + wchar_t *str, + _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_opt_ +_CRTIMP +size_t +__cdecl +_wcsxfrm_l( + _Out_writes_opt_(maxcount) _Post_maybez_ wchar_t *dst, + _In_z_ const wchar_t *src, + _In_ size_t maxcount, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +_strset_s( + _Inout_updates_z_(size) char *dst, + _In_ size_t size, + _In_ int val) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +_strupr_s( + _Inout_updates_z_(size) char *str, + _In_ size_t size) +{ + return _strupr_s_l(str, size, 0); +} + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +_strupr_s_l( + _Inout_updates_z_(_Size) char *str, + _In_ size_t size, + _locale_t locale) +{ + UNIMPLEMENTED; + return ENOTSUP; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_tolower_l( + _In_ int c, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_toupper_l( + _In_ int c, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_wcscoll_l( + _In_z_ const wchar_t *str1, + _In_z_ const wchar_t *str2, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_wcsicmp_l( + _In_z_ const wchar_t *str1, + _In_z_ const wchar_t *str2, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_wcsicoll_l( + _In_z_ const wchar_t *str1, + _In_z_ const wchar_t *str2, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +_wcslwr_s( + _Inout_updates_z_(sizeInWords) wchar_t *str, + _In_ size_t sizeInWords) +{ + return _wcslwr_s_l(str, sizeInWords, NULL); +} + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +_wcslwr_s_l( + _Inout_updates_z_(sizeInWords) wchar_t *str, + _In_ size_t sizeInWords, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return ENOTSUP; +} + +typedef size_t rsize_t; + +_Check_return_wat_ +_CRTIMP // _ACRTIMP +errno_t +__cdecl +strncat_s( + _Inout_updates_z_(size) char* dest, + _In_ rsize_t size, + _In_reads_or_z_(maxCount) char const* src, + _In_ rsize_t maxCount) +{ + UNIMPLEMENTED; + return ENOTSUP; +} + +_Check_return_opt_ +_CRTIMP +_CRT_INSECURE_DEPRECATE(vsnprintf_s) +int +__cdecl +vsnprintf_( + _Out_writes_(maxCount) char *dst, + _In_ size_t maxCount, + _In_z_ _Printf_format_string_ const char *format, + va_list argptr) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_wcsnicoll_l( + _In_z_ const wchar_t *str1, + _In_z_ const wchar_t *str2, + _In_ size_t maxCount, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_wcsnicmp_l( + _In_reads_or_z_(_MaxCount) const wchar_t *str1, + _In_reads_or_z_(_MaxCount) const wchar_t *str2, + _In_ size_t maxCount, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_ +_CRTIMP +int +__cdecl +_wcsncoll_l( + _In_z_ const wchar_t *str1, + _In_z_ const wchar_t *str2, + _In_ size_t maxCount, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +_strerror_s( + _Out_writes_z_(_SizeInBytes) char *buf, + _In_ size_t sizeInBytes, + _In_opt_z_ const char *errMsg) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +_wcsnset_s( + _Inout_updates_z_(_DstSizeInWords) wchar_t *dst, + _In_ size_t sizeInWords, + _In_ wchar_t val, + _In_ size_t maxCount) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +_wcsset_s( + _Inout_updates_z_(_SizeInWords) wchar_t *str, + _In_ size_t sizeInWords, + _In_ wchar_t val) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +_wcsupr_s_l( + _Inout_updates_z_(_Size) wchar_t *str, + _In_ size_t size, + _In_opt_ _locale_t locale) +{ + UNIMPLEMENTED; + return 0; +} + +_Check_return_opt_ +_CRTIMP +_CRT_INSECURE_DEPRECATE(vsnprintf_s) +int +__cdecl +vsnprintf( + _Out_writes_(_MaxCount) char *dest, + _In_ size_t maxCount, + _In_z_ _Printf_format_string_ const char *format, + va_list argptr) +{ + UNIMPLEMENTED; + return 0; +} + + + diff --git a/sdk/lib/crt/crt.cmake b/sdk/lib/crt/crt.cmake index b200145c0d6..1148d12d289 100644 --- a/sdk/lib/crt/crt.cmake +++ b/sdk/lib/crt/crt.cmake @@ -292,7 +292,7 @@ list(APPEND CRT_SOURCE string/strtod.c string/strtoi64.c string/strtok.c - #string/strtok_s.c + string/strtok_s.c string/strtol.c string/strtoul.c string/strtoull.c

4 years, 8 months

1
0
0 0

[reactos] 02/03: [MSVCRT] -i386 -> -arch=i386 for consistency

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=767a975cf64351e3dedde… commit 767a975cf64351e3dedde39ee188c1bde226d802 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Mar 3 19:36:49 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 13 15:37:29 2020 +0200 [MSVCRT] -i386 -> -arch=i386 for consistency --- dll/win32/msvcrt/msvcrt.spec | 144 +++++++++++++++++++++---------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 9923d3ff9d4..cf07e0b8b77 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -3,64 +3,64 @@ @ cdecl -arch=x86_64 -version=0x502 $I10_OUTPUT() MSVCRT_I10_OUTPUT # **************** x86 C++ functions **************** -@ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@ABV0@@Z(ptr) MSVCRT___non_rtti_object_copy_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) -@ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@PBD@Z(ptr) MSVCRT___non_rtti_object_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(char const *) -@ cdecl -i386 -norelay ??0bad_cast@@AAE@PBQBD@Z(ptr) MSVCRT_bad_cast_ctor # private: __thiscall bad_cast::bad_cast(char const * const *) -@ cdecl -i386 -norelay ??0bad_cast@@QAE@ABQBD@Z(ptr) MSVCRT_bad_cast_ctor # public: __thiscall bad_cast::bad_cast(char const * const &) -@ cdecl -i386 -norelay ??0bad_cast@@QAE@ABV0@@Z(ptr) MSVCRT_bad_cast_copy_ctor # public: __thiscall bad_cast::bad_cast(class bad_cast const &) -@ cdecl -i386 -norelay ??0bad_cast@@QAE@PBD@Z(ptr) MSVCRT_bad_cast_ctor_charptr # public: __thiscall bad_cast::bad_cast(char const *) -@ cdecl -i386 -norelay ??0bad_typeid@@QAE@ABV0@@Z(ptr) MSVCRT_bad_typeid_copy_ctor # public: __thiscall bad_typeid::bad_typeid(class bad_typeid const &) -@ cdecl -i386 -norelay ??0bad_typeid@@QAE@PBD@Z(ptr) MSVCRT_bad_typeid_ctor # public: __thiscall bad_typeid::bad_typeid(char const *) -@ cdecl -i386 -norelay ??0exception@@QAE@ABQBD@Z(ptr) MSVCRT_exception_ctor # public: __thiscall exception::exception(char const * const &) -@ cdecl -i386 -norelay ??0exception@@QAE@ABQBDH@Z(ptr long) MSVCRT_exception_ctor_noalloc # public: __thiscall exception::exception(char const * const &,int) -@ cdecl -i386 -norelay ??0exception@@QAE@ABV0@@Z(ptr) MSVCRT_exception_copy_ctor # public: __thiscall exception::exception(class exception const &) -@ cdecl -i386 -norelay ??0exception@@QAE@XZ() MSVCRT_exception_default_ctor # public: __thiscall exception::exception(void) -@ cdecl -i386 -norelay ??1__non_rtti_object@@UAE@XZ() MSVCRT___non_rtti_object_dtor # public: virtual __thiscall __non_rtti_object::~__non_rtti_object(void) -@ cdecl -i386 -norelay ??1bad_cast@@UAE@XZ() MSVCRT_bad_cast_dtor # public: virtual __thiscall bad_cast::~bad_cast(void) -@ cdecl -i386 -norelay ??1bad_typeid@@UAE@XZ() MSVCRT_bad_typeid_dtor # public: virtual __thiscall bad_typeid::~bad_typeid(void) -@ cdecl -i386 -norelay ??1exception@@UAE@XZ() MSVCRT_exception_dtor # public: virtual __thiscall exception::~exception(void) -@ cdecl -i386 -norelay ??1type_info@@UAE@XZ() MSVCRT_type_info_dtor # public: virtual __thiscall type_info::~type_info(void) -@ cdecl -i386 ??2@YAPAXI@Z(long) MSVCRT_operator_new # void * __cdecl operator new(unsigned int) -;@ cdecl -i386 ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg # void * __cdecl operator new(unsigned int,int,char const *,int) -@ cdecl -i386 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete(void *) -@ cdecl -i386 -norelay ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr) MSVCRT___non_rtti_object_opequals # public: class __non_rtti_object & __thiscall __non_rtti_object::operator=(class __non_rtti_object const &) -@ cdecl -i386 -norelay ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr) MSVCRT_bad_cast_opequals # public: class bad_cast & __thiscall bad_cast::operator=(class bad_cast const &) -@ cdecl -i386 -norelay ??4bad_typeid@@QAEAAV0@ABV0@@Z(ptr) MSVCRT_bad_typeid_opequals # public: class bad_typeid & __thiscall bad_typeid::operator=(class bad_typeid const &) -@ cdecl -i386 -norelay ??4exception@@QAEAAV0@ABV0@@Z(ptr) MSVCRT_exception_opequals # public: class exception & __thiscall exception::operator=(class exception const &) -@ cdecl -i386 -norelay ??8type_info@@QBEHABV0@@Z(ptr) MSVCRT_type_info_opequals_equals # public: int __thiscall type_info::operator==(class type_info const &)const -@ cdecl -i386 -norelay ??9type_info@@QBEHABV0@@Z(ptr) MSVCRT_type_info_opnot_equals # public: int __thiscall type_info::operator!=(class type_info const &)const -@ extern -i386 ??_7__non_rtti_object@@6B@ MSVCRT___non_rtti_object_vtable # const __non_rtti_object::`vftable' -@ extern -i386 ??_7bad_cast@@6B@ MSVCRT_bad_cast_vtable # const bad_cast::`vftable' -@ extern -i386 ??_7bad_typeid@@6B@ MSVCRT_bad_typeid_vtable # const bad_typeid::`vftable' -@ extern -i386 ??_7exception@@6B@ MSVCRT_exception_vtable # const exception::`vftable' -@ cdecl -i386 -norelay ??_E__non_rtti_object@@UAEPAXI@Z(long) MSVCRT___non_rtti_object_vector_dtor # public: virtual void * __thiscall __non_rtti_object::`vector deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Ebad_cast@@UAEPAXI@Z(long) MSVCRT_bad_cast_vector_dtor # public: virtual void * __thiscall bad_cast::`vector deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Ebad_typeid@@UAEPAXI@Z(long) MSVCRT_bad_typeid_vector_dtor # public: virtual void * __thiscall bad_typeid::`vector deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Eexception@@UAEPAXI@Z(long) MSVCRT_exception_vector_dtor # public: virtual void * __thiscall exception::`vector deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Fbad_cast@@QAEXXZ() MSVCRT_bad_cast_default_ctor # public: void __thiscall bad_cast::`default constructor closure'(void) -@ cdecl -i386 -norelay ??_Fbad_typeid@@QAEXXZ() MSVCRT_bad_typeid_default_ctor # public: void __thiscall bad_typeid::`default constructor closure'(void) -@ cdecl -i386 -norelay ??_G__non_rtti_object@@UAEPAXI@Z(long) MSVCRT___non_rtti_object_scalar_dtor # public: virtual void * __thiscall __non_rtti_object::`scalar deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Gbad_cast@@UAEPAXI@Z(long) MSVCRT_bad_cast_scalar_dtor # public: virtual void * __thiscall bad_cast::`scalar deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Gbad_typeid@@UAEPAXI@Z(long) MSVCRT_bad_typeid_scalar_dtor # public: virtual void * __thiscall bad_typeid::`scalar deleting destructor'(unsigned int) -@ cdecl -i386 -norelay ??_Gexception@@UAEPAXI@Z(long) MSVCRT_exception_scalar_dtor # public: virtual void * __thiscall exception::`scalar deleting destructor'(unsigned int) -@ cdecl -i386 ??_U@YAPAXI@Z(long) MSVCRT_operator_new # void * __cdecl operator new[](unsigned int) -;@ cdecl -i386 ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg # void * __cdecl operator new[](unsigned int,int,char const *,int) -@ cdecl -i386 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete[](void *) -@ cdecl -i386 -norelay __uncaught_exception(ptr) MSVCRT___uncaught_exception -@ cdecl -i386 -norelay ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned int) -@ cdecl -i386 ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode # int __cdecl _query_new_mode(void) -@ cdecl -i386 -norelay ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int) -@ cdecl -i386 ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode # int __cdecl _set_new_mode(int) -@ cdecl -i386 -norelay ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator # void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS *)))(unsigned int,struct _EXCEPTION_POINTERS *) -@ cdecl -i386 -norelay ?before@type_info@@QBEHABV1@@Z(ptr) MSVCRT_type_info_before # public: int __thiscall type_info::before(class type_info const &)const -@ cdecl -i386 -norelay ?name@type_info@@QBEPBDXZ() MSVCRT_type_info_name # public: char const * __thiscall type_info::name(void)const -@ cdecl -i386 -norelay ?raw_name@type_info@@QBEPBDXZ() MSVCRT_type_info_raw_name # public: char const * __thiscall type_info::raw_name(void)const -@ cdecl -i386 ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler # void (__cdecl*__cdecl set_new_handler(void (__cdecl*)(void)))(void) -@ cdecl -i386 ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_terminate # void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void) -@ cdecl -i386 ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_unexpected # void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void) -@ cdecl -i386 ?terminate@@YAXXZ() MSVCRT_terminate # void __cdecl terminate(void) -@ cdecl -i386 ?unexpected@@YAXXZ() MSVCRT_unexpected # void __cdecl unexpected(void) -@ cdecl -i386 -norelay ?what@exception@@UBEPBDXZ() MSVCRT_what_exception # public: virtual char const * __thiscall exception::what(void)const +@ cdecl -arch=i386 -norelay ??0__non_rtti_object@@QAE@ABV0@@Z(ptr) MSVCRT___non_rtti_object_copy_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) +@ cdecl -arch=i386 -norelay ??0__non_rtti_object@@QAE@PBD@Z(ptr) MSVCRT___non_rtti_object_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(char const *) +@ cdecl -arch=i386 -norelay ??0bad_cast@@AAE@PBQBD@Z(ptr) MSVCRT_bad_cast_ctor # private: __thiscall bad_cast::bad_cast(char const * const *) +@ cdecl -arch=i386 -norelay ??0bad_cast@@QAE@ABQBD@Z(ptr) MSVCRT_bad_cast_ctor # public: __thiscall bad_cast::bad_cast(char const * const &) +@ cdecl -arch=i386 -norelay ??0bad_cast@@QAE@ABV0@@Z(ptr) MSVCRT_bad_cast_copy_ctor # public: __thiscall bad_cast::bad_cast(class bad_cast const &) +@ cdecl -arch=i386 -norelay ??0bad_cast@@QAE@PBD@Z(ptr) MSVCRT_bad_cast_ctor_charptr # public: __thiscall bad_cast::bad_cast(char const *) +@ cdecl -arch=i386 -norelay ??0bad_typeid@@QAE@ABV0@@Z(ptr) MSVCRT_bad_typeid_copy_ctor # public: __thiscall bad_typeid::bad_typeid(class bad_typeid const &) +@ cdecl -arch=i386 -norelay ??0bad_typeid@@QAE@PBD@Z(ptr) MSVCRT_bad_typeid_ctor # public: __thiscall bad_typeid::bad_typeid(char const *) +@ cdecl -arch=i386 -norelay ??0exception@@QAE@ABQBD@Z(ptr) MSVCRT_exception_ctor # public: __thiscall exception::exception(char const * const &) +@ cdecl -arch=i386 -norelay ??0exception@@QAE@ABQBDH@Z(ptr long) MSVCRT_exception_ctor_noalloc # public: __thiscall exception::exception(char const * const &,int) +@ cdecl -arch=i386 -norelay ??0exception@@QAE@ABV0@@Z(ptr) MSVCRT_exception_copy_ctor # public: __thiscall exception::exception(class exception const &) +@ cdecl -arch=i386 -norelay ??0exception@@QAE@XZ() MSVCRT_exception_default_ctor # public: __thiscall exception::exception(void) +@ cdecl -arch=i386 -norelay ??1__non_rtti_object@@UAE@XZ() MSVCRT___non_rtti_object_dtor # public: virtual __thiscall __non_rtti_object::~__non_rtti_object(void) +@ cdecl -arch=i386 -norelay ??1bad_cast@@UAE@XZ() MSVCRT_bad_cast_dtor # public: virtual __thiscall bad_cast::~bad_cast(void) +@ cdecl -arch=i386 -norelay ??1bad_typeid@@UAE@XZ() MSVCRT_bad_typeid_dtor # public: virtual __thiscall bad_typeid::~bad_typeid(void) +@ cdecl -arch=i386 -norelay ??1exception@@UAE@XZ() MSVCRT_exception_dtor # public: virtual __thiscall exception::~exception(void) +@ cdecl -arch=i386 -norelay ??1type_info@@UAE@XZ() MSVCRT_type_info_dtor # public: virtual __thiscall type_info::~type_info(void) +@ cdecl -arch=i386 ??2@YAPAXI@Z(long) MSVCRT_operator_new # void * __cdecl operator new(unsigned int) +;@ cdecl -arch=i386 ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg # void * __cdecl operator new(unsigned int,int,char const *,int) +@ cdecl -arch=i386 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete(void *) +@ cdecl -arch=i386 -norelay ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr) MSVCRT___non_rtti_object_opequals # public: class __non_rtti_object & __thiscall __non_rtti_object::operator=(class __non_rtti_object const &) +@ cdecl -arch=i386 -norelay ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr) MSVCRT_bad_cast_opequals # public: class bad_cast & __thiscall bad_cast::operator=(class bad_cast const &) +@ cdecl -arch=i386 -norelay ??4bad_typeid@@QAEAAV0@ABV0@@Z(ptr) MSVCRT_bad_typeid_opequals # public: class bad_typeid & __thiscall bad_typeid::operator=(class bad_typeid const &) +@ cdecl -arch=i386 -norelay ??4exception@@QAEAAV0@ABV0@@Z(ptr) MSVCRT_exception_opequals # public: class exception & __thiscall exception::operator=(class exception const &) +@ cdecl -arch=i386 -norelay ??8type_info@@QBEHABV0@@Z(ptr) MSVCRT_type_info_opequals_equals # public: int __thiscall type_info::operator==(class type_info const &)const +@ cdecl -arch=i386 -norelay ??9type_info@@QBEHABV0@@Z(ptr) MSVCRT_type_info_opnot_equals # public: int __thiscall type_info::operator!=(class type_info const &)const +@ extern -arch=i386 ??_7__non_rtti_object@@6B@ MSVCRT___non_rtti_object_vtable # const __non_rtti_object::`vftable' +@ extern -arch=i386 ??_7bad_cast@@6B@ MSVCRT_bad_cast_vtable # const bad_cast::`vftable' +@ extern -arch=i386 ??_7bad_typeid@@6B@ MSVCRT_bad_typeid_vtable # const bad_typeid::`vftable' +@ extern -arch=i386 ??_7exception@@6B@ MSVCRT_exception_vtable # const exception::`vftable' +@ cdecl -arch=i386 -norelay ??_E__non_rtti_object@@UAEPAXI@Z(long) MSVCRT___non_rtti_object_vector_dtor # public: virtual void * __thiscall __non_rtti_object::`vector deleting destructor'(unsigned int) +@ cdecl -arch=i386 -norelay ??_Ebad_cast@@UAEPAXI@Z(long) MSVCRT_bad_cast_vector_dtor # public: virtual void * __thiscall bad_cast::`vector deleting destructor'(unsigned int) +@ cdecl -arch=i386 -norelay ??_Ebad_typeid@@UAEPAXI@Z(long) MSVCRT_bad_typeid_vector_dtor # public: virtual void * __thiscall bad_typeid::`vector deleting destructor'(unsigned int) +@ cdecl -arch=i386 -norelay ??_Eexception@@UAEPAXI@Z(long) MSVCRT_exception_vector_dtor # public: virtual void * __thiscall exception::`vector deleting destructor'(unsigned int) +@ cdecl -arch=i386 -norelay ??_Fbad_cast@@QAEXXZ() MSVCRT_bad_cast_default_ctor # public: void __thiscall bad_cast::`default constructor closure'(void) +@ cdecl -arch=i386 -norelay ??_Fbad_typeid@@QAEXXZ() MSVCRT_bad_typeid_default_ctor # public: void __thiscall bad_typeid::`default constructor closure'(void) +@ cdecl -arch=i386 -norelay ??_G__non_rtti_object@@UAEPAXI@Z(long) MSVCRT___non_rtti_object_scalar_dtor # public: virtual void * __thiscall __non_rtti_object::`scalar deleting destructor'(unsigned int) +@ cdecl -arch=i386 -norelay ??_Gbad_cast@@UAEPAXI@Z(long) MSVCRT_bad_cast_scalar_dtor # public: virtual void * __thiscall bad_cast::`scalar deleting destructor'(unsigned int) +@ cdecl -arch=i386 -norelay ??_Gbad_typeid@@UAEPAXI@Z(long) MSVCRT_bad_typeid_scalar_dtor # public: virtual void * __thiscall bad_typeid::`scalar deleting destructor'(unsigned int) +@ cdecl -arch=i386 -norelay ??_Gexception@@UAEPAXI@Z(long) MSVCRT_exception_scalar_dtor # public: virtual void * __thiscall exception::`scalar deleting destructor'(unsigned int) +@ cdecl -arch=i386 ??_U@YAPAXI@Z(long) MSVCRT_operator_new # void * __cdecl operator new[](unsigned int) +;@ cdecl -arch=i386 ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg # void * __cdecl operator new[](unsigned int,int,char const *,int) +@ cdecl -arch=i386 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete[](void *) +@ cdecl -arch=i386 -norelay __uncaught_exception(ptr) MSVCRT___uncaught_exception +@ cdecl -arch=i386 -norelay ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned int) +@ cdecl -arch=i386 ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode # int __cdecl _query_new_mode(void) +@ cdecl -arch=i386 -norelay ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int) +@ cdecl -arch=i386 ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode # int __cdecl _set_new_mode(int) +@ cdecl -arch=i386 -norelay ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator # void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS *)))(unsigned int,struct _EXCEPTION_POINTERS *) +@ cdecl -arch=i386 -norelay ?before@type_info@@QBEHABV1@@Z(ptr) MSVCRT_type_info_before # public: int __thiscall type_info::before(class type_info const &)const +@ cdecl -arch=i386 -norelay ?name@type_info@@QBEPBDXZ() MSVCRT_type_info_name # public: char const * __thiscall type_info::name(void)const +@ cdecl -arch=i386 -norelay ?raw_name@type_info@@QBEPBDXZ() MSVCRT_type_info_raw_name # public: char const * __thiscall type_info::raw_name(void)const +@ cdecl -arch=i386 ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler # void (__cdecl*__cdecl set_new_handler(void (__cdecl*)(void)))(void) +@ cdecl -arch=i386 ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_terminate # void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void) +@ cdecl -arch=i386 ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_unexpected # void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void) +@ cdecl -arch=i386 ?terminate@@YAXXZ() MSVCRT_terminate # void __cdecl terminate(void) +@ cdecl -arch=i386 ?unexpected@@YAXXZ() MSVCRT_unexpected # void __cdecl unexpected(void) +@ cdecl -arch=i386 -norelay ?what@exception@@UBEPBDXZ() MSVCRT_what_exception # public: virtual char const * __thiscall exception::what(void)const # **************** win64 C++ functions **************** @ cdecl -arch=win64 ??0__non_rtti_object@@QEAA@AEBV0@@Z(ptr) MSVCRT___non_rtti_object_copy_ctor # public: __cdecl __non_rtti_object::__non_rtti_object(class __non_rtti_object const & __ptr64) __ptr64 @@ -198,7 +198,7 @@ @ cdecl -arch=i386 _CItan() @ cdecl -arch=i386 _CItanh() @ stdcall _CxxThrowException(long long) -@ cdecl -i386 -norelay _EH_prolog() +@ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() @ cdecl _Gettnames() @@ -214,10 +214,10 @@ @ cdecl -arch=i386,x86_64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ cdecl -arch=i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -arch=arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) -@ stdcall -i386 __CxxLongjmpUnwind(ptr) -@ cdecl -i386 __CxxQueryExceptionSize() -@ cdecl -i386 __CxxRegisterExceptionObject() -@ cdecl -i386 __CxxUnregisterExceptionObject() +@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) +@ cdecl -arch=i386 __CxxQueryExceptionSize() +@ cdecl -arch=i386 __CxxRegisterExceptionObject() +@ cdecl -arch=i386 __CxxUnregisterExceptionObject() @ cdecl __DestructExceptionObject(ptr) @ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid @ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast @@ -340,7 +340,7 @@ @ cdecl _chdrive(long) @ cdecl _chgsign(double) @ cdecl -arch=x86_64,arm _chgsignf(long) -@ cdecl -i386 -norelay _chkesp() +@ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) @ cdecl _chsize(long long) @ cdecl -arch=i386,x86_64 _clearfp() @@ -371,9 +371,9 @@ @ extern _environ @ cdecl _eof(long) @ cdecl _errno() -@ cdecl -i386 _except_handler2(ptr ptr ptr ptr) -@ cdecl -i386 _except_handler3(ptr ptr ptr ptr) -@ cdecl -i386 -version=0x600+ _except_handler4_common(ptr ptr ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) +@ cdecl -arch=i386 -version=0x600+ _except_handler4_common(ptr ptr ptr ptr ptr ptr) @ varargs _execl(str str) @ varargs _execle(str str) @ varargs _execlp(str str) @@ -443,7 +443,7 @@ @ cdecl -stub _getwch() @ cdecl -stub _getwche() @ cdecl _getws(ptr) -@ cdecl -i386 _global_unwind2(ptr) +@ cdecl -arch=i386 _global_unwind2(ptr) @ cdecl _gmtime64(ptr) @ cdecl _heapadd(ptr long) @ cdecl _heapchk() @@ -504,13 +504,13 @@ @ cdecl -arch=i386 _loaddll(str) @ cdecl -arch=x86_64 -version=0x502 _loaddll(str) @ cdecl -arch=x86_64 _local_unwind(ptr ptr) -@ cdecl -i386 _local_unwind2(ptr long) -@ cdecl -i386 -version=0x600+ _local_unwind4(ptr ptr long) +@ cdecl -arch=i386 _local_unwind2(ptr long) +@ cdecl -arch=i386 -version=0x600+ _local_unwind4(ptr ptr long) @ cdecl _localtime64(ptr) @ cdecl _lock(long) @ cdecl _locking(long long long) @ cdecl _logb(double) -@ cdecl -i386 _longjmpex(ptr long) longjmp +@ cdecl -arch=i386 _longjmpex(ptr long) longjmp @ cdecl _lrotl(long long) @ cdecl _lrotr(long long) @ cdecl _lsearch(ptr ptr long long ptr) @@ -621,7 +621,7 @@ @ varargs _scprintf(str) @ varargs _scwprintf(wstr) @ cdecl _searchenv(str str ptr) -@ stdcall -i386 _seh_longjmp_unwind(ptr) +@ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ stub -arch=i386 _set_SSE2_enable @ cdecl _set_error_mode(long) @ cdecl _set_sbh_threshold(long)

4 years, 8 months

1
0
0 0

[reactos] 01/03: [MSVCRT] Fix some architecture specific exports

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfaba507dc4d12c1bb0fd… commit dfaba507dc4d12c1bb0fd005514f13b90a82585d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Mar 3 19:34:23 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 13 15:37:29 2020 +0200 [MSVCRT] Fix some architecture specific exports --- dll/apisets/api-ms-win-crt-private-l1-1-0.spec | 2 +- dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec | 3 +- dll/win32/msvcrt/msvcrt.spec | 40 ++++++++++++++++++-------- sdk/lib/crt/except/amd64/cpp.s | 4 +++ 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec index a0e1b339a8f..3c9758e58fd 100644 --- a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec @@ -18,7 +18,7 @@ @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64,arm __C_specific_handler() msvcrt.__C_specific_handler -@ stdcall __CxxDetectRethrow() msvcrt.__CxxDetectRethrow +@ stdcall -arch=i386 __CxxDetectRethrow() msvcrt.__CxxDetectRethrow @ stub __CxxExceptionFilter @ stdcall -arch=i386,x86_64 __CxxFrameHandler() msvcrt.__CxxFrameHandler @ stdcall -arch=i386 __CxxFrameHandler2() msvcrt.__CxxFrameHandler2 diff --git a/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec b/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec index 35bdbf3ace5..4f65bb65fd4 100644 --- a/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec @@ -39,7 +39,8 @@ @ stdcall _errno() msvcrt._errno @ stub -version=0xA00+ _execute_onexit_table @ stdcall _exit() msvcrt._exit -@ stdcall _fpieee_flt() msvcrt._fpieee_flt +@ stdcall -arch=i386 _fpieee_flt() msvcrt._fpieee_flt +@ stdcall -stub -arch=x86_64 _fpieee_flt() # ucrtbase._fpieee_flt (msvcrt x64 doesn't have this!) @ stdcall _fpreset() msvcrt._fpreset @ stub _get_doserrno @ stub _get_errno diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 8d3c2d473c4..9923d3ff9d4 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -1,5 +1,7 @@ # msvcrt.dll - MS VC++ Run Time Library +@ cdecl -arch=x86_64 -version=0x502 $I10_OUTPUT() MSVCRT_I10_OUTPUT + # **************** x86 C++ functions **************** @ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@ABV0@@Z(ptr) MSVCRT___non_rtti_object_copy_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) @ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@PBD@Z(ptr) MSVCRT___non_rtti_object_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(char const *) @@ -63,7 +65,9 @@ # **************** win64 C++ functions **************** @ cdecl -arch=win64 ??0__non_rtti_object@@QEAA@AEBV0@@Z(ptr) MSVCRT___non_rtti_object_copy_ctor # public: __cdecl __non_rtti_object::__non_rtti_object(class __non_rtti_object const & __ptr64) __ptr64 @ cdecl -arch=win64 ??0__non_rtti_object@@QEAA@PEBD@Z(ptr) MSVCRT___non_rtti_object_ctor # public: __cdecl __non_rtti_object::__non_rtti_object(char const * __ptr64) __ptr64 +@ cdecl -arch=win64 ??0bad_cast@@AAE@PBQBD@Z(ptr) MSVCRT_bad_cast_ctor # private: __thiscall bad_cast::bad_cast(char const near * const near *) @ cdecl -arch=win64 ??0bad_cast@@AEAA@PEBQEBD@Z(ptr) MSVCRT_bad_cast_ctor # private: __cdecl bad_cast::bad_cast(char const * __ptr64 const * __ptr64) __ptr64 +@ cdecl -arch=win64 ??0bad_cast@@QAE@ABQBD@Z(ptr) MSVCRT_bad_cast_ctor # public: __thiscall bad_cast::bad_cast(char const near * const near &) @ cdecl -arch=win64 ??0bad_cast@@QEAA@AEBQEBD@Z(ptr) MSVCRT_bad_cast_ctor # public: __cdecl bad_cast::bad_cast(char const * __ptr64 const & __ptr64) __ptr64 @ cdecl -arch=win64 ??0bad_cast@@QEAA@AEBV0@@Z(ptr) MSVCRT_bad_cast_copy_ctor # public: __cdecl bad_cast::bad_cast(class bad_cast const & __ptr64) __ptr64 @ cdecl -arch=win64 ??0bad_cast@@QEAA@PEBD@Z(ptr) MSVCRT_bad_cast_ctor_charptr # public: __cdecl bad_cast::bad_cast(char const * __ptr64) __ptr64 @@ -79,6 +83,7 @@ @ cdecl -arch=win64 ??1exception@@UEAA@XZ() MSVCRT_exception_dtor # public: virtual __cdecl exception::~exception(void) __ptr64 @ cdecl -arch=win64 ??1type_info@@UEAA@XZ() MSVCRT_type_info_dtor # public: virtual __cdecl type_info::~type_info(void) __ptr64 @ cdecl -arch=win64 ??2@YAPEAX_K@Z(double) MSVCRT_operator_new # void * __ptr64 __cdecl operator new(unsigned __int64) +@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(int64 long str long) MSVCRT_operator_new_dbg # void * __ptr64 __cdecl operator new(unsigned __int64,int,char const * __ptr64,int) @ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete(void * __ptr64) @ cdecl -arch=win64 ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT___non_rtti_object_opequals # public: class __non_rtti_object & __ptr64 __cdecl __non_rtti_object::operator=(class __non_rtti_object const & __ptr64) __ptr64 @ cdecl -arch=win64 ??4bad_cast@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT_bad_cast_opequals # public: class bad_cast & __ptr64 __cdecl bad_cast::operator=(class bad_cast const & __ptr64) __ptr64 @@ -93,6 +98,7 @@ @ cdecl -arch=win64 ??_Fbad_cast@@QEAAXXZ() MSVCRT_bad_cast_default_ctor # public: void __cdecl bad_cast::`default constructor closure'(void) __ptr64 @ cdecl -arch=win64 ??_Fbad_typeid@@QEAAXXZ() MSVCRT_bad_typeid_default_ctor # public: void __cdecl bad_typeid::`default constructor closure'(void) __ptr64 @ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) MSVCRT_operator_new # void * __ptr64 __cdecl operator new[](unsigned __int64) +@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(int64 long str long) MSVCRT_operator_new_dbg # void * __ptr64 __cdecl operator new[](unsigned __int64,int,char const * __ptr64,int) @ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete[](void * __ptr64) @ cdecl -arch=win64 __uncaught_exception(ptr) MSVCRT___uncaught_exception @ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned __int64) @@ -174,7 +180,7 @@ # **************** Common functions **************** -@ cdecl $I10_OUTPUT() MSVCRT_I10_OUTPUT +@ cdecl -arch=i386 $I10_OUTPUT() MSVCRT_I10_OUTPUT @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() @@ -201,10 +207,10 @@ @ cdecl _XcptFilter(long ptr) @ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) @ cdecl __CppXcptFilter(long ptr) -# stub __CxxCallUnwindDtor -# stub __CxxCallUnwindVecDtor -@ cdecl __CxxDetectRethrow(ptr) -@ cdecl __CxxExceptionFilter() +@ stub -arch=i386 __CxxCallUnwindDtor +@ stub -arch=i386 __CxxCallUnwindVecDtor +@ cdecl -arch=i386 __CxxDetectRethrow(ptr) +@ cdecl -arch=i386 __CxxExceptionFilter() @ cdecl -arch=i386,x86_64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ cdecl -arch=i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -arch=arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) @@ -292,7 +298,7 @@ @ cdecl __wcserror(wstr) @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv -@ cdecl _abnormal_termination() +@ cdecl -arch=i386 _abnormal_termination() # stub _abs64 @ cdecl _access(str long) @ extern _acmdln @@ -396,11 +402,13 @@ @ cdecl _findnext64(long ptr) @ cdecl _findnexti64(long ptr) @ cdecl _finite(double) +@ stub -arch=x86_64 _finitef @ cdecl _flsbuf(long ptr) @ cdecl _flushall() @ extern _fmode @ cdecl _fpclass(double) -@ cdecl _fpieee_flt(long ptr ptr) +@ cdecl -stub -arch=x86_64 _fpclassf(long) +@ cdecl -arch=i386 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() @ cdecl _fputchar(long) @ cdecl _fputwchar(long) @@ -423,7 +431,8 @@ @ cdecl _getcwd(str long) @ cdecl _getdcwd(long str long) @ cdecl _getdiskfree(long ptr) -@ cdecl _getdllprocaddr(long str long) +@ cdecl -arch=i386 _getdllprocaddr(long str long) +@ cdecl -arch=x86_64 -version=0x502 _getdllprocaddr(long str long) @ cdecl _getdrive() @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @@ -440,7 +449,8 @@ @ cdecl _heapchk() @ cdecl _heapmin() @ cdecl _heapset(long) -@ cdecl _heapused(ptr ptr) +@ cdecl -arch=i386 _heapused(ptr ptr) +@ cdecl -arch=x86_64 -version=0x502 _heapused(ptr ptr) @ cdecl _heapwalk(ptr) @ cdecl _hypot(double double) @ cdecl -arch=x86_64,arm _hypotf(long long) @@ -483,6 +493,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbstrail(ptr ptr) @ cdecl _isnan(double) +@ stub -arch=x86_64 _isnanf @ cdecl _itoa(long ptr long) @ cdecl _itow(long ptr long) @ cdecl _j0(double) @@ -490,7 +501,9 @@ @ cdecl _jn(long double) @ cdecl _kbhit() @ cdecl _lfind(ptr ptr ptr long ptr) -@ cdecl _loaddll(str) +@ cdecl -arch=i386 _loaddll(str) +@ cdecl -arch=x86_64 -version=0x502 _loaddll(str) +@ cdecl -arch=x86_64 _local_unwind(ptr ptr) @ cdecl -i386 _local_unwind2(ptr long) @ cdecl -i386 -version=0x600+ _local_unwind4(ptr ptr long) @ cdecl _localtime64(ptr) @@ -570,6 +583,7 @@ @ cdecl _mktime64(ptr) @ cdecl _msize(ptr) @ cdecl _nextafter(double double) +@ stub -arch=x86_64 _nextafterf @ cdecl _onexit(ptr) @ varargs _open(str long) @ cdecl _open_osfhandle(long long) @@ -603,11 +617,12 @@ @ cdecl -arch=i386 _safe_fprem() @ cdecl -arch=i386 _safe_fprem1() @ cdecl _scalb(double long) +@ stub -arch=x86_64 _scalbf @ varargs _scprintf(str) @ varargs _scwprintf(wstr) @ cdecl _searchenv(str str ptr) @ stdcall -i386 _seh_longjmp_unwind(ptr) -# stub _set_SSE2_enable +@ stub -arch=i386 _set_SSE2_enable @ cdecl _set_error_mode(long) @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) @@ -674,7 +689,8 @@ @ cdecl _ungetch(long) # stub _ungetwch @ cdecl _unlink(str) -@ cdecl _unloaddll(long) +@ cdecl -arch=i386 _unloaddll(ptr) +@ cdecl -arch=x86_64 -version=0x502 _unloaddll(ptr) @ cdecl _unlock(long) @ cdecl _utime(str ptr) @ cdecl _utime64(str ptr) diff --git a/sdk/lib/crt/except/amd64/cpp.s b/sdk/lib/crt/except/amd64/cpp.s index 3be32c9648c..03b6d3dff9d 100644 --- a/sdk/lib/crt/except/amd64/cpp.s +++ b/sdk/lib/crt/except/amd64/cpp.s @@ -36,8 +36,10 @@ ENDM DEFINE_ALIAS ??3@YAXPEAX@Z, MSVCRT_operator_delete DEFINE_ALIAS ??_U@YAPEAX_K@Z, MSVCRT_operator_new +DEFINE_ALIAS ??_U@YAPEAX_KHPEBDH@Z, MSVCRT_operator_new_dbg DEFINE_ALIAS ??_V@YAXPEAX@Z, MSVCRT_operator_delete DEFINE_ALIAS ??2@YAPEAX_K@Z, MSVCRT_operator_new +DEFINE_ALIAS ??2@YAPEAX_KHPEBDH@Z, MSVCRT_operator_new_dbg DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, MSVCRT__query_new_handler DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, MSVCRT__set_new_handler DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_new_handler @@ -57,7 +59,9 @@ DEFINE_ALIAS ??4exception@@QEAAAEAV0@AEBV0@@Z, MSVCRT_exception_opequals DEFINE_ALIAS ??1type_info@@UEAA@XZ, MSVCRT_type_info_dtor DEFINE_ALIAS ??0__non_rtti_object@@QEAA@AEBV0@@Z, MSVCRT___non_rtti_object_copy_ctor DEFINE_ALIAS ??0__non_rtti_object@@QEAA@PEBD@Z, MSVCRT___non_rtti_object_ctor +DEFINE_ALIAS ??0bad_cast@@AAE@PBQBD@Z, MSVCRT_bad_cast_ctor DEFINE_ALIAS ??0bad_cast@@AEAA@PEBQEBD@Z, MSVCRT_bad_cast_ctor +DEFINE_ALIAS ??0bad_cast@@QAE@ABQBD@Z, MSVCRT_bad_cast_ctor DEFINE_ALIAS ??0bad_cast@@QEAA@AEBQEBD@Z, MSVCRT_bad_cast_ctor DEFINE_ALIAS ??0bad_cast@@QEAA@AEBV0@@Z, MSVCRT_bad_cast_copy_ctor DEFINE_ALIAS ??0bad_cast@@QEAA@PEBD@Z, MSVCRT_bad_cast_ctor_charptr

4 years, 8 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2020