- wine-devel - winehq.org

[PATCH 1/5] winmm: Don't allow to set time division property while playing.
by Akihiro Sagawa 09 Jul '18

09 Jul '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 6 ++++++ dlls/winmm/winmm.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)

2 1

[PATCH] winedump: Add support for SLTG typelibs.
by Dmitry Timoshkov 09 Jul '18

09 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/dump.c | 2 +- tools/winedump/tlb.c | 1222 +++++++++++++++++++++++++++++++++++-- tools/winedump/winedump.h | 6 +- 3 files changed, 1187 insertions(+), 43 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index e84e473ea7..f608075d7b 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -241,7 +241,7 @@ dumpers[] = {SIG_LNK, get_kind_lnk, lnk_dump}, {SIG_EMF, get_kind_emf, emf_dump}, {SIG_FNT, get_kind_fnt, fnt_dump}, - {SIG_MSFT, get_kind_msft, msft_dump}, + {SIG_TLB, get_kind_tlb, tlb_dump}, {SIG_UNKNOWN, NULL, NULL} /* sentinel */ }; diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index df1ea4b576..e7301688df 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -2,6 +2,7 @@ * Dump a typelib (tlb) file * * Copyright 2006 Jacek Caban + * Copyright 2015 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +31,7 @@ #include "winedump.h" #define MSFT_MAGIC 0x5446534d +#define SLTG_MAGIC 0x47544c53 #define HELPDLLFLAG 0x0100 enum TYPEKIND { @@ -109,7 +111,7 @@ typedef struct seg_t { int offset; int length; } seg_t; -static seg_t segdir[]; +static seg_t segdir[15]; enum SEGDIRTYPE { SEGDIR_TYPEINFO, @@ -141,6 +143,12 @@ static int msft_typeinfo_impltypes[1000]; static int msft_typeinfo_elemcnt[1000]; static int msft_typeinfo_cnt = 0; +static const char * const tkind[TKIND_MAX] = { + "TKIND_ENUM", "TKIND_RECORD", "TKIND_MODULE", + "TKIND_INTERFACE", "TKIND_DISPATCH", "TKIND_COCLASS", + "TKIND_ALIAS", "TKIND_UNION" +}; + static const void *tlb_read(int size) { const void *ret = PRD(offset, size); @@ -160,7 +168,7 @@ static int tlb_read_int(void) static int tlb_read_short(void) { - const short *ret = tlb_read(sizeof(short)); + const unsigned short *ret = tlb_read(sizeof(short)); return ret ? *ret : -1; } @@ -173,9 +181,6 @@ static int tlb_read_byte(void) static void print_offset(void) { int i; - - printf("%04x: ", offset); - for(i=0; i<indent; i++) printf(" "); } @@ -199,15 +204,21 @@ static void print_end_block(void) indent--; print_offset(); printf("}\n"); +} + +static int print_byte(const char *name) +{ + unsigned char ret; print_offset(); - printf("\n"); + printf("%s = %02xh\n", name, ret=tlb_read_byte()); + return ret; } static int print_hex(const char *name) { int ret; print_offset(); - printf("%s = %08x\n", name, ret=tlb_read_int()); + printf("%s = %08xh\n", name, ret=tlb_read_int()); return ret; } @@ -222,7 +233,15 @@ static int print_short_hex(const char *name) { int ret; print_offset(); - printf("%s = %xh\n", name, ret=tlb_read_short()); + printf("%s = %04xh\n", name, ret=tlb_read_short()); + return ret; +} + +static int print_short_dec(const char *name) +{ + int ret; + print_offset(); + printf("%s = %d\n", name, ret=tlb_read_short()); return ret; } @@ -286,25 +305,47 @@ static void print_ctl2(const char *name) printf("\n"); } -static void dump_binary(int n) +static int tlb_isprint(unsigned char c) { - int i; + return c >= 32; +} - for(i = 1; i <= n; i++) { - switch(i & 0x0f) { - case 0: - printf("%02x\n", tlb_read_byte()); - break; - case 1: - print_offset(); - /* fall through */ - default: - printf("%02x ", tlb_read_byte()); +static void dump_binary(int size) +{ + const unsigned char *ptr; + int i, j; + + if (!size) return; + + ptr = tlb_read(size); + if (!ptr) return; + + print_offset(); + printf("%08x: ", offset - size); + + for (i = 0; i < size; i++) + { + printf("%02x%c", ptr[i], (i % 16 == 7) ? '-' : ' '); + if ((i % 16) == 15) + { + printf( " " ); + for (j = 0; j < 16; j++) + printf("%c", tlb_isprint(ptr[i-15+j]) ? ptr[i-15+j] : '.'); + if (i < size-1) + { + printf("\n"); + print_offset(); + printf("%08x: ", offset - size + i + 1); + } } } - - if(n&0x0f) - printf("\n"); + if (i % 16) + { + printf("%*s ", 3 * (16-(i%16)), ""); + for (j = 0; j < i % 16; j++) + printf("%c", tlb_isprint(ptr[i-(i%16)+j]) ? ptr[i-(i%16)+j] : '.'); + } + printf("\n"); } static int dump_msft_varflags(void) @@ -324,10 +365,10 @@ static int dump_msft_varflags(void) static void dump_msft_version(void) { - int version; + unsigned version; print_offset(); version = tlb_read_int(); - printf("version = %d.%d\n", version & 0xff, version >> 16); + printf("version = %u.%u\n", version & 0xffff, version >> 16); } static void dump_msft_header(void) @@ -361,11 +402,6 @@ static void dump_msft_header(void) static int dump_msft_typekind(void) { - static const char *tkind[TKIND_MAX] = { - "TKIND_ENUM", "TKIND_RECORD", "TKIND_MODULE", - "TKIND_INTERFACE", "TKIND_DISPATCH", "TKIND_COCLASS", - "TKIND_ALIAS", "TKIND_UNION" - }; int ret, typekind; print_offset(); @@ -520,11 +556,36 @@ static BOOL dump_msft_namehashtab(seg_t *seg) return TRUE; } -static void dump_string(int len, int align_off) +static void print_string0(void) +{ + unsigned char c; + + printf("\""); + while ((c = tlb_read_byte()) != 0) + { + if (isprint(c)) + fwrite(&c, 1, 1, stdout); + else + { + char buf[16]; + sprintf(buf, "\\%u", c); + fwrite(buf, 1, strlen(buf), stdout); + } + } + printf("\""); +} + +static void print_string(int len) { printf("\""); fwrite(tlb_read(len), len, 1, stdout); - printf("\" "); + printf("\""); +} + +static void dump_string(int len, int align_off) +{ + print_string(len); + printf(" "); while((len++ + align_off) & 3) printf("\\%2.2x", tlb_read_byte()); } @@ -960,13 +1021,7 @@ static BOOL dump_offset(void) return FALSE; } -enum FileSig get_kind_msft(void) -{ - const DWORD *sig = PRD(0, sizeof(DWORD)); - return sig && *sig == MSFT_MAGIC ? SIG_MSFT : SIG_UNKNOWN; -} - -void msft_dump(void) +static void msft_dump(void) { int i; @@ -987,3 +1042,1092 @@ void msft_dump(void) print_hex("unknown"); } } + +/****************************** SLTG Typelibs ******************************/ + +struct block_entry +{ + DWORD len; + WORD index_string; + WORD next; +}; + +struct bitstream +{ + const BYTE *buffer; + DWORD length; + WORD current; +}; + +#include "pshpack1.h" +struct sltg_typeinfo_header +{ + short magic; + int href_table; + int res06; + int elem_table; + int res0e; + int version; + int res16; + struct + { + unsigned unknown1 : 3; + unsigned flags : 16; + unsigned unknown2 : 5; + unsigned typekind : 8; + } misc; + int res1e; +}; + +struct sltg_member_header +{ + short res00; + short res02; + char res04; + int extra; +}; + +struct sltg_tail +{ + unsigned short cFuncs; + unsigned short cVars; + unsigned short cImplTypes; + unsigned short res06; /* always 0000 */ + unsigned short funcs_off; /* offset to functions (starting from the member header) */ + unsigned short vars_off; /* offset to vars (starting from the member header) */ + unsigned short impls_off; /* offset to implemented types (starting from the member header) */ + unsigned short funcs_bytes; /* bytes used by function data */ + unsigned short vars_bytes; /* bytes used by var data */ + unsigned short impls_bytes; /* bytes used by implemented type data */ + unsigned short tdescalias_vt; /* for TKIND_ALIAS */ + unsigned short res16; /* always ffff */ + unsigned short res18; /* always 0000 */ + unsigned short res1a; /* always 0000 */ + unsigned short simple_alias; /* tdescalias_vt is a vt rather than an offset? */ + unsigned short res1e; /* always 0000 */ + unsigned short cbSizeInstance; + unsigned short cbAlignment; + unsigned short res24; + unsigned short res26; + unsigned short cbSizeVft; + unsigned short res2a; /* always ffff */ + unsigned short res2c; /* always ffff */ + unsigned short res2e; /* always ffff */ + unsigned short res30; /* always ffff */ + unsigned short res32; + unsigned short res34; +}; + +struct sltg_variable +{ + char magic; /* 0x0a */ + char flags; + short next; + short name; + short byte_offs; /* pos in struct, or offset to const type or const data (if flags & 0x08) */ + short type; /* if flags & 0x02 this is the type, else offset to type */ + int memid; + short helpcontext; /* ?? */ + short helpstring; /* ?? */ +#if 0 + short varflags; /* only present if magic & 0x20 */ +#endif +}; +#include "poppack.h" + +static const char *lookup_code(const BYTE *table, DWORD table_size, struct bitstream *bits) +{ + const BYTE *p = table; + + while (p < table + table_size && *p == 0x80) + { + if (p + 2 >= table + table_size) return NULL; + + if (!(bits->current & 0xff)) + { + if (!bits->length) return NULL; + bits->current = (*bits->buffer << 8) | 1; + bits->buffer++; + bits->length--; + } + + if (bits->current & 0x8000) + { + p += 3; + } + else + { + p = table + (*(p + 2) | (*(p + 1) << 8)); + } + + bits->current <<= 1; + } + + if (p + 1 < table + table_size && *(p + 1)) + { + /* FIXME: Whats the meaning of *p? */ + const BYTE *q = p + 1; + while (q < table + table_size && *q) q++; + return (q < table + table_size) ? (const char *)(p + 1) : NULL; + } + + return NULL; +} + +static const char *decode_string(const BYTE *table, const char *stream, DWORD stream_length, DWORD *read_bytes) +{ + char *buf; + DWORD buf_size, table_size; + const char *p; + struct bitstream bits; + + bits.buffer = (const BYTE *)stream; + bits.length = stream_length; + bits.current = 0; + + buf_size = *(const WORD *)table; + table += sizeof(WORD); + table_size = *(const DWORD *)table; + table += sizeof(DWORD); + + buf = malloc(buf_size); + buf[0] = 0; + + while ((p = lookup_code(table, table_size, &bits))) + { + if (buf[0]) strcat(buf, " "); + assert(strlen(buf) + strlen(p) + 1 <= buf_size); + strcat(buf, p); + } + + if (read_bytes) *read_bytes = stream_length - bits.length; + + return buf; +} + +static void print_sltg_name(const char *name) +{ + unsigned short len = tlb_read_short(); + print_offset(); + printf("%s = %#x (", name, len); + if (len != 0xffff) print_string(len); + printf(")\n"); +} + +static int dump_sltg_header(int *sltg_first_blk, int *size_of_index) +{ + int n_file_blocks; + + print_begin_block("Header"); + + print_hex("magic"); + n_file_blocks = print_short_dec("# file blocks"); + print_short_hex("res06"); + *size_of_index = print_short_hex("size of index"); + *sltg_first_blk = print_short_dec("first block"); + print_guid("guid"); + print_hex("res1c"); + print_hex("res20"); + + print_end_block(); + + return n_file_blocks; +} + +static void dump_sltg_index(int count) +{ + int i; + + printf("index:\n"); + + print_string0(); + printf("\n"); + print_string0(); + printf("\n"); + + for (i = 0; i < count - 2; i++) + { + print_string0(); + printf("\n"); + } + + printf("\n"); +} + +static void dump_sltg_pad9(void) +{ + printf("pad9:\n"); + dump_binary(9); + printf("\n"); +} + +static void dump_sltg_block_entry(int idx, const char *index) +{ + char name[32]; + short index_offset; + + sprintf(name, "Block entry %d", idx); + print_begin_block(name); + + print_hex("len"); + index_offset = tlb_read_short(); + print_offset(); + printf("index string = %xh \"%s\"\n", index_offset, index + index_offset); + print_short_hex("next"); + + print_end_block(); +} + +static void dump_sltg_library_block(void) +{ + print_begin_block("Library block entry"); + + print_short_hex("magic"); + print_short_hex("res02"); + print_sltg_name("name"); + print_short_hex("res06"); + print_sltg_name("helpstring"); + print_sltg_name("helpfile"); + print_hex("helpcontext"); + print_short_hex("syskind"); + print_short_hex("lcid"); + print_hex("res12"); + print_short_hex("libflags"); + dump_msft_version(); + print_guid("uuid"); + + print_end_block(); +} + +static void skip_sltg_library_block(void) +{ + unsigned short skip; + + tlb_read_short(); + tlb_read_short(); + skip = tlb_read_short(); + if (skip != 0xffff) tlb_read(skip); + tlb_read_short(); + skip = tlb_read_short(); + if (skip != 0xffff) tlb_read(skip); + skip = tlb_read_short(); + if (skip != 0xffff) tlb_read(skip); + tlb_read_int(); + tlb_read_short(); + tlb_read_short(); + tlb_read_int(); + tlb_read_short(); + tlb_read_int(); + tlb_read(sizeof(GUID)); +} + +static void dump_sltg_other_typeinfo(int idx, const char *hlp_strings) +{ + int hlpstr_len, saved_offset; + char name[32]; + + sprintf(name, "Other typeinfo %d", idx); + print_begin_block(name); + + print_sltg_name("index name"); + print_sltg_name("other name"); + print_short_hex("res1a"); + print_short_hex("name offset"); + + print_offset(); + hlpstr_len = tlb_read_short(); + if (hlpstr_len) + { + const char *str; + + saved_offset = offset; + str = tlb_read(hlpstr_len); + str = decode_string((const BYTE *)hlp_strings, str, hlpstr_len, NULL); + printf("helpstring: \"%s\"\n", str); + + offset = saved_offset; + print_offset(); + printf("helpstring encoded bits: %d bytes\n", hlpstr_len); + dump_binary(hlpstr_len); + } + else + printf("helpstring: \"\"\n"); + + print_short_hex("res20"); + print_hex("helpcontext"); + print_short_hex("res26"); + print_guid("uuid"); + print_short_dec("typekind"); + + print_end_block(); +} + +static void skip_sltg_other_typeinfo(void) +{ + unsigned short skip; + + skip = tlb_read_short(); + if (skip != 0xffff) tlb_read(skip); + skip = tlb_read_short(); + if (skip != 0xffff) tlb_read(skip); + tlb_read_short(); + tlb_read_short(); + skip = tlb_read_short(); + if (skip) tlb_read(skip); + tlb_read_short(); + tlb_read_int(); + tlb_read_short(); + tlb_read(sizeof(GUID)); + tlb_read_short(); +} + +static void sltg_print_simple_type(short type) +{ + print_offset(); + if ((type & 0x0f00) == 0x0e00) + printf("*"); + printf("%04x | (%d)\n", type & 0xff80, type & 0x7f); +} + +static void dump_safe_array(int array_offset) +{ + int i, cDims, saved_offset = offset; + + offset = array_offset; + + print_offset(); + printf("safe array starts at %#x\n", offset); + + cDims = print_short_dec("cDims"); + print_short_hex("fFeatures"); + print_dec("cbElements"); + print_dec("cLocks"); + print_hex("pvData"); + + for (i = 0; i < cDims; i++) + dump_binary(8); /* sizeof(SAFEARRAYBOUND) */ + + print_offset(); + printf("safe array ends at %#x\n", offset); + offset = saved_offset; +} + +static int sltg_print_compound_type(int vars_start_offset, int type_offset) +{ + short type, vt; + int type_bytes, saved_offset = offset; + + offset = vars_start_offset + type_offset; + print_offset(); + printf("type description starts at %#x\n", offset); + + for (;;) + { + do + { + type = tlb_read_short(); + vt = type & 0x7f; + + if (vt == VT_PTR) + { + print_offset(); + printf("%04x | VT_PTR\n", type & 0xff80); + } + } while (vt == VT_PTR); + + if (vt == VT_USERDEFINED) + { + short href = tlb_read_short(); + print_offset(); + if ((type & 0x0f00) == 0x0e00) + printf("*"); + printf("%04x | VT_USERDEFINED (href %d)\n", type & 0xff80, href); + break; + } + else if (vt == VT_CARRAY) + { + short off; + + off = tlb_read_short(); + print_offset(); + printf("VT_CARRAY: offset %#x (+%#x=%#x)\n", + off, vars_start_offset, off + vars_start_offset); + dump_safe_array(vars_start_offset + off); + + /* type description follows */ + print_offset(); + printf("array element type:\n"); + continue; + } + else if (vt == VT_SAFEARRAY) + { + short off; + + off = tlb_read_short(); + print_offset(); + printf("VT_SAFEARRAY: offset %#x (+%#x=%#x)\n", + off, vars_start_offset, off + vars_start_offset); + dump_safe_array(vars_start_offset + off); + break; + } + else + { + sltg_print_simple_type(type); + break; + } + } + + print_offset(); + printf("type description ends at %#x\n", offset); + type_bytes = offset - saved_offset; + offset = saved_offset; + + return type_bytes; +} + +static void dump_type(int len, const char *hlp_strings) +{ + union + { + struct + { + unsigned unknown1 : 3; + unsigned flags : 13; + unsigned unknown2 : 8; + unsigned typekind : 8; + } s; + unsigned flags; + } misc; + int typeinfo_start_offset, extra, member_offset, href_offset, i; + int vars_header_bytes = 0, vars_bytes = 0, saved_offset; + const void *block; + const struct sltg_typeinfo_header *ti; + const struct sltg_member_header *mem; + const struct sltg_tail *tail; + + typeinfo_start_offset = offset; + block = tlb_read(len); + offset = typeinfo_start_offset; + + ti = block; + mem = (const struct sltg_member_header *)((char *)block + ti->elem_table); + tail = (const struct sltg_tail *)((char *)(mem + 1) + mem->extra); + + typeinfo_start_offset = offset; + + print_short_hex("magic"); + href_offset = tlb_read_int(); + print_offset(); + if (href_offset != -1) + printf("href offset = %#x (+%#x=%#x)\n", + href_offset, typeinfo_start_offset, href_offset + typeinfo_start_offset); + else + printf("href offset = ffffffffh\n"); + print_hex("res06"); + member_offset = tlb_read_int(); + print_offset(); + printf("member offset = %#x (+%#x=%#x)\n", + member_offset, typeinfo_start_offset, member_offset + typeinfo_start_offset); + print_hex("res0e"); + print_hex("version"); + print_hex("res16"); + misc.flags = print_hex("misc"); + print_offset(); + printf("misc: unknown1 %02x, flags %04x, unknown2 %02x, typekind %u (%s)\n", + misc.s.unknown1, misc.s.flags, misc.s.unknown2, misc.s.typekind, + misc.s.typekind < TKIND_MAX ? tkind[misc.s.typekind] : "unknown"); + print_hex("res1e"); + + if (href_offset != -1) + { + int i, number; + + print_begin_block("href_table"); + + print_short_hex("magic"); + print_hex("res02"); + print_hex("res06"); + print_hex("res0a"); + print_hex("res0e"); + print_hex("res12"); + print_hex("res16"); + print_hex("res1a"); + print_hex("res1e"); + print_hex("res22"); + print_hex("res26"); + print_hex("res2a"); + print_hex("res2e"); + print_hex("res32"); + print_hex("res36"); + print_hex("res3a"); + print_hex("res3e"); + print_short_hex("res42"); + number = print_hex("number"); + + for (i = 0; i < number; i += 8) + dump_binary(8); + + print_short_hex("res50"); + print_byte("res52"); + print_hex("res53"); + + for (i = 0; i < number/8; i++) + print_sltg_name("name"); + + print_byte("resxx"); + + print_end_block(); + } + + print_offset(); + printf("member_header starts at %#x, current offset = %#x\n", typeinfo_start_offset + member_offset, offset); + member_offset = offset; + print_short_hex("res00"); + print_short_hex("res02"); + print_byte("res04"); + extra = print_hex("extra"); + + if (misc.s.typekind == TKIND_RECORD || misc.s.typekind == TKIND_ENUM) + { + int vars_start_offset = offset; + + for (i = 0; i < tail->cVars; i++) + { + char name[32]; + int saved_off; + char magic, flags; + short next, value; + + sprintf(name, "variable %d", i); + print_begin_block(name); + + saved_off = offset; + dump_binary(sizeof(struct sltg_variable)); + offset = saved_off; + + magic = print_byte("magic"); + flags = print_byte("flags"); + next = tlb_read_short(); + print_offset(); + if (next != -1) + printf("next offset = %#x (+%#x=%#x)\n", + next, vars_start_offset, next + vars_start_offset); + else + printf("next offset = ffffh\n"); + print_short_hex("name"); + + if (flags & 0x40) + print_short_hex("dispatch"); + else if (flags & 0x10) + { + if (flags & 0x08) + print_short_hex("const value"); + else + { + value = tlb_read_short(); + print_offset(); + printf("byte offset = %#x (+%#x=%#x)\n", + value, vars_start_offset, value + vars_start_offset); + } + } + else + print_short_hex("oInst"); + + value = tlb_read_short(); + if (!(flags & 0x02)) + { + print_offset(); + printf("type offset = %#x (+%#x=%#x)\n", + value, vars_start_offset, value + vars_start_offset); + print_offset(); + printf("type:\n"); + vars_bytes += sltg_print_compound_type(vars_start_offset, value); + } + else + { + print_offset(); + printf("type:\n"); + sltg_print_simple_type(value); + } + + print_hex("memid"); + print_short_hex("helpcontext"); + + value = tlb_read_short(); + print_offset(); + if (value != -1) + { + const char *str; + DWORD hlpstr_maxlen; + + printf("helpstring offset = %#x (+%#x=%#x)\n", + value, vars_start_offset, value + vars_start_offset); + + saved_offset = offset; + + offset = value + vars_start_offset; + + hlpstr_maxlen = member_offset + sizeof(struct sltg_member_header) + mem->extra - offset; + + str = tlb_read(hlpstr_maxlen); + str = decode_string((const BYTE *)hlp_strings, str, hlpstr_maxlen, &hlpstr_maxlen); + print_offset(); + printf("helpstring: \"%s\"\n", str); + + offset = value + vars_start_offset; + print_offset(); + printf("helpstring encoded bits: %d bytes\n", hlpstr_maxlen); + dump_binary(hlpstr_maxlen); + + offset = saved_offset; + } + else + printf("helpstring offset = ffffh\n"); + + if (magic & 0x20) + { + print_short_hex("varflags"); + vars_header_bytes += 2; + } + + vars_header_bytes += sizeof(struct sltg_variable); + + if (next != -1) + { + if (offset != vars_start_offset + next) + dump_binary(vars_start_offset + next - offset); + } + + print_end_block(); + } + } + else if (misc.s.typekind == TKIND_INTERFACE || misc.s.typekind == TKIND_COCLASS) + { + short next, i; + int funcs_start_offset = offset; + + for (i = 0; i < tail->cImplTypes; i++) + { + char name[32]; + + sprintf(name, "impl.type %d (current offset %#x)", i, offset); + print_begin_block(name); + + print_short_hex("res00"); + next = tlb_read_short(); + print_offset(); + if (next != -1) + printf("next offset = %#x (+%#x=%#x)\n", + next, funcs_start_offset, next + funcs_start_offset); + else + printf("next offset = ffffh\n"); + print_short_hex("res04"); + print_byte("impltypeflags"); + print_byte("res07"); + print_short_hex("res08"); + print_short_hex("ref"); + print_short_hex("res0c"); + print_short_hex("res0e"); + print_short_hex("res10"); + print_short_hex("res12"); + print_short_hex("pos in table"); + + print_end_block(); + } + + for (i = 0; i < tail->cFuncs; i++) + { + char name[32]; + BYTE magic, flags; + short args_off, value, n_params, j; + + sprintf(name, "function %d (current offset %#x)", i, offset); + print_begin_block(name); + + magic = print_byte("magic"); + flags = tlb_read_byte(); + print_offset(); + printf("invoke_kind = %u\n", flags >> 4); + next = tlb_read_short(); + print_offset(); + if (next != -1) + printf("next offset = %#x (+%#x=%#x)\n", + next, funcs_start_offset, next + funcs_start_offset); + else + printf("next offset = ffffh\n"); + print_short_hex("name"); + print_hex("dispid"); + print_short_hex("helpcontext"); + + value = tlb_read_short(); + print_offset(); + if (value != -1) + { + const char *str; + DWORD hlpstr_maxlen; + + printf("helpstring offset = %#x (+%#x=%#x)\n", + value, funcs_start_offset, value + funcs_start_offset); + + saved_offset = offset; + + offset = value + funcs_start_offset; + + hlpstr_maxlen = member_offset + sizeof(struct sltg_member_header) + mem->extra - offset; + + str = tlb_read(hlpstr_maxlen); + str = decode_string((const BYTE *)hlp_strings, str, hlpstr_maxlen, &hlpstr_maxlen); + print_offset(); + printf("helpstring: \"%s\"\n", str); + + offset = value + funcs_start_offset; + print_offset(); + printf("helpstring encoded bits: %d bytes\n", hlpstr_maxlen); + dump_binary(hlpstr_maxlen); + + offset = saved_offset; + } + else + printf("helpstring offset = ffffh\n"); + + args_off = tlb_read_short(); + print_offset(); + if (args_off != -1) + printf("args off = %#x (+%#x=%#x)\n", + args_off, funcs_start_offset, args_off + funcs_start_offset); + else + printf("args off = ffffh\n"); + flags = tlb_read_byte(); + n_params = flags >> 3; + print_offset(); + printf("callconv %u, cParams %u\n", flags & 0x7, n_params); + + flags = tlb_read_byte(); + print_offset(); + printf("retnextop %02x, cParamsOpt %u\n", flags, (flags & 0x7e) >> 1); + + value = print_short_hex("rettype"); + if (!(flags & 0x80)) + { + print_offset(); + printf("rettype offset = %#x (+%#x=%#x)\n", + value, funcs_start_offset, value + funcs_start_offset); + print_offset(); + printf("rettype:\n"); + sltg_print_compound_type(funcs_start_offset, value); + } + else + { + print_offset(); + printf("rettype:\n"); + sltg_print_simple_type(value); + } + + print_short_hex("vtblpos"); + if (magic & 0x20) + print_short_hex("funcflags"); + + if (n_params) + { + offset = args_off + funcs_start_offset; + print_offset(); + printf("arguments start at %#x\n", offset); + } + + for (j = 0; j < n_params; j++) + { + char name[32]; + unsigned short name_offset; + + sprintf(name, "arg %d", j); + print_begin_block(name); + + name_offset = tlb_read_short(); + print_offset(); + printf("name: %04xh\n", name_offset); + + value = tlb_read_short(); + print_offset(); + printf("type/offset %04xh\n", value); + if (name_offset & 1) /* type follows */ + { + print_offset(); + printf("type follows, using current offset for type\n"); + offset -= 2; + value = offset - funcs_start_offset; + } + + print_offset(); + printf("arg[%d] off = %#x (+%#x=%#x)\n", + j, value, funcs_start_offset, value + funcs_start_offset); + print_offset(); + printf("type:\n"); + value = sltg_print_compound_type(funcs_start_offset, value); + if (name_offset & 1) + offset += value; + + print_end_block(); + } + + if (n_params) + { + print_offset(); + printf("arguments end at %#x\n", offset); + } + + if (next != -1) + { + if (offset != funcs_start_offset + next) + dump_binary(funcs_start_offset + next - offset); + } + + print_end_block(); + } + } + else + { + printf("skipping %#x bytes\n", extra); + dump_binary(extra); + } + + if (offset < member_offset + sizeof(struct sltg_member_header) + mem->extra) + { + print_offset(); + printf("skipping %d bytes\n", member_offset + (int)sizeof(struct sltg_member_header) + mem->extra - offset); + dump_binary(member_offset + sizeof(struct sltg_member_header) + mem->extra - offset); + } + + print_offset(); + printf("dumped %d (%#x) bytes\n", offset - typeinfo_start_offset, offset - typeinfo_start_offset); + len -= offset - typeinfo_start_offset; + print_offset(); + printf("sltg_tail %d (%#x) bytes:\n", len, len); + saved_offset = offset; + dump_binary(len); + offset = saved_offset; + print_short_hex("cFuncs"); + print_short_hex("cVars"); + print_short_hex("cImplTypes"); + print_short_hex("res06"); + print_short_hex("funcs_off"); + print_short_hex("vars_off"); + print_short_hex("impls_off"); + print_short_hex("funcs_bytes"); + print_short_hex("vars_bytes"); + print_short_hex("impls_bytes"); + print_short_hex("tdescalias_vt"); + print_short_hex("res16"); + print_short_hex("res18"); + print_short_hex("res1a"); + print_short_hex("simple_alias"); + print_short_hex("res1e"); + print_short_hex("cbSizeInstance"); + print_short_hex("cbAlignment"); + print_short_hex("res24"); + print_short_hex("res26"); + print_short_hex("cbSizeVft"); + print_short_hex("res2a"); + print_short_hex("res2c"); + print_short_hex("res2e"); + print_short_hex("res30"); + print_short_hex("res32"); + print_short_hex("res34"); + offset = saved_offset + len; +} + +static void sltg_dump(void) +{ + int i, n_file_blocks, n_first_blk, size_of_index; + int name_table_start, name_table_size, saved_offset; + int libblk_start, libblk_len, hlpstr_len, len; + const char *index, *hlp_strings; + const struct block_entry *entry; + + n_file_blocks = dump_sltg_header(&n_first_blk, &size_of_index); + + saved_offset = offset; + entry = tlb_read((n_file_blocks - 1) * sizeof(*entry)); + if (!entry) return; + index = tlb_read(size_of_index); + if (!index) return; + offset = saved_offset; + + for (i = 0; i < n_file_blocks - 1; i++) + dump_sltg_block_entry(i, index); + + saved_offset = offset; + dump_sltg_index(n_file_blocks); + assert(offset - saved_offset == size_of_index); + + dump_sltg_pad9(); + + /* read the helpstrings for later decoding */ + saved_offset = offset; + + for (i = n_first_blk - 1; entry[i].next != 0; i = entry[i].next - 1) + tlb_read(entry[i].len); + + libblk_start = offset; + skip_sltg_library_block(); + tlb_read(0x40); + typeinfo_cnt = tlb_read_short(); + + for (i = 0; i < typeinfo_cnt; i++) + skip_sltg_other_typeinfo(); + + len = tlb_read_int(); + hlpstr_len = (libblk_start + len) - offset; + hlp_strings = tlb_read(hlpstr_len); + assert(hlp_strings != NULL); + /* check the helpstrings header values */ + len = *(int *)(hlp_strings + 2); + assert(hlpstr_len == len + 6); + + offset = saved_offset; + + for (i = n_first_blk - 1; entry[i].next != 0; i = entry[i].next - 1) + { + short magic; + char name[32]; + + saved_offset = offset; + + sprintf(name, "Block %d", i); + print_begin_block(name); + magic = tlb_read_short(); + assert(magic == 0x0501); + offset -= 2; + dump_binary(entry[i].len); + print_end_block(); + + offset = saved_offset; + + print_begin_block(name); + dump_type(entry[i].len, hlp_strings); + print_end_block(); + + offset = saved_offset + entry[i].len; + } + + libblk_len = entry[i].len; + + libblk_start = offset; + dump_sltg_library_block(); + + printf("skipping 0x40 bytes\n"); + dump_binary(0x40); + printf("\n"); + typeinfo_cnt = print_short_dec("typeinfo count"); + printf("\n"); + + for (i = 0; i < typeinfo_cnt; i++) + dump_sltg_other_typeinfo(i, hlp_strings); + + len = print_hex("offset from start of library block to name table"); + printf("%#x + %#x = %#x\n", libblk_start, len, libblk_start + len); + len = (libblk_start + len) - offset; + printf("skipping %#x bytes (encoded/compressed helpstrings)\n", len); + printf("max string length: %#x, strings length %#x\n", *(short *)hlp_strings, *(int *)(hlp_strings + 2)); + dump_binary(len); + printf("\n"); + + len = print_short_hex("name table jump"); + if (len == 0xffff) + { + printf("skipping 0x000a bytes\n"); + dump_binary(0x000a); + printf("\n"); + } + else if (len == 0x0200) + { + printf("skipping 0x002a bytes\n"); + dump_binary(0x002a); + printf("\n"); + } + else + { + printf("FIXME: please report! (%#x)\n", len); + assert(0); + } + + printf("skipping 0x200 bytes\n"); + dump_binary(0x200); + printf("\n"); + + name_table_size = print_hex("name table size"); + + name_table_start = offset; + printf("name table offset = %#x\n\n", offset); + + while (offset < name_table_start + name_table_size) + { + int aligned_len; + + dump_binary(8); + print_string0(); + printf("\n"); + + len = offset - name_table_start; + aligned_len = (len + 0x1f) & ~0x1f; + if (aligned_len - len < 4) + dump_binary(aligned_len - len); + else + dump_binary(len & 1); + printf("\n"); + } + + print_hex("01ffff01"); + len = print_hex("length"); + printf("skipping %#x bytes\n", len); + dump_binary(len); + printf("\n"); + + len = (libblk_start + libblk_len) - offset; + printf("skipping libblk remainder %#x bytes\n", len); + dump_binary(len); + printf("\n"); + + /* FIXME: msodumper/olestream.py parses this block differently + print_short_hex("unknown"); + print_short_hex("byte order mark"); + i = tlb_read_short(); + printf("version = %u.%u\n", i & 0xff, i >> 8); + print_short_hex("system identifier"); + print_hex("unknown"); + printf("\n"); + */ + printf("skipping 12 bytes\n"); + dump_binary(12); + printf("\n"); + + print_guid("uuid"); + printf("\n"); + + /* 0x0008,"TYPELIB",0 */ + dump_binary(12); + printf("\n"); + + printf("skipping 12 bytes\n"); + dump_binary(12); + printf("\n"); + + printf("skipping remainder 0x10 bytes\n"); + dump_binary(0x10); + printf("\n"); +} + +void tlb_dump(void) +{ + const DWORD *sig = PRD(0, sizeof(DWORD)); + if (*sig == MSFT_MAGIC) + msft_dump(); + else + sltg_dump(); +} + +enum FileSig get_kind_tlb(void) +{ + const DWORD *sig = PRD(0, sizeof(DWORD)); + if (sig && (*sig == MSFT_MAGIC || *sig == SLTG_MAGIC)) return SIG_TLB; + return SIG_UNKNOWN; +} diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 339cee32f0..ea95b27b09 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -214,7 +214,7 @@ const char *get_machine_str(int mach); /* file dumping functions */ enum FileSig {SIG_UNKNOWN, SIG_DOS, SIG_PE, SIG_DBG, SIG_PDB, SIG_NE, SIG_LE, SIG_MDMP, SIG_COFFLIB, SIG_LNK, - SIG_EMF, SIG_FNT, SIG_MSFT}; + SIG_EMF, SIG_FNT, SIG_TLB}; const void* PRD(unsigned long prd, unsigned long len); unsigned long Offset(const void* ptr); @@ -251,8 +251,8 @@ enum FileSig get_kind_pdb(void); void pdb_dump(void); enum FileSig get_kind_fnt(void); void fnt_dump( void ); -enum FileSig get_kind_msft(void); -void msft_dump(void); +enum FileSig get_kind_tlb(void); +void tlb_dump(void); BOOL codeview_dump_symbols(const void* root, unsigned long size); BOOL codeview_dump_types_from_offsets(const void* table, const DWORD* offsets, unsigned num_types); -- 2.17.1

2 4

[website] German translation for vkd3d release 1.0
by Julian Rüger 09 Jul '18

09 Jul '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

2 7

[PATCH v3] msvcrt: Update size checks for secure scanf versions
by Piotr Caban 09 Jul '18

09 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v3: - resend the patch so it's run on testbot dlls/msvcrt/scanf.h | 4 ++-- dlls/msvcrt/tests/scanf.c | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-)

1 0

[PATCH] msvcr100/test: Replace a macro with ARRAY_SIZE
by Michael Stefaniuc 09 Jul '18

09 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index bd959912cb..db5a4cbf19 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -363,8 +363,6 @@ static BOOL init(void) return TRUE; } -#define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) - #define okwchars(dst, b0, b1, b2, b3, b4, b5, b6, b7) \ ok(dst[0] == b0 && dst[1] == b1 && dst[2] == b2 && dst[3] == b3 && \ dst[4] == b4 && dst[5] == b5 && dst[6] == b6 && dst[7] == b7, \ @@ -384,7 +382,7 @@ static void test_wmemcpy_s(void) /* Normal */ memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_wmemcpy_s(dest, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == 0, "Copying a buffer into a big enough destination returned %d, expected 0\n", ret); okwchars(dest, tiny[0], tiny[1], tiny[2], tiny[3], tiny[4], tiny[5], XX, XX); @@ -392,7 +390,7 @@ static void test_wmemcpy_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, NUMELMS(dest), big, NUMELMS(big)); + ret = p_wmemcpy_s(dest, ARRAY_SIZE(dest), big, ARRAY_SIZE(big)); ok(errno == ERANGE, "Copying a big buffer to a small destination errno %d, expected ERANGE\n", errno); ok(ret == ERANGE, "Copying a big buffer to a small destination returned %d, expected ERANGE\n", ret); okwchars(dest, 0, 0, 0, 0, 0, 0, 0, 0); @@ -402,7 +400,7 @@ static void test_wmemcpy_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, NUMELMS(dest), NULL, NUMELMS(tiny)); + ret = p_wmemcpy_s(dest, ARRAY_SIZE(dest), NULL, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Copying a NULL source buffer errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Copying a NULL source buffer returned %d, expected EINVAL\n", ret); okwchars(dest, 0, 0, 0, 0, 0, 0, 0, 0); @@ -412,7 +410,7 @@ static void test_wmemcpy_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, 0, tiny, NUMELMS(tiny)); + ret = p_wmemcpy_s(dest, 0, tiny, ARRAY_SIZE(tiny)); ok(errno == ERANGE, "Copying into a destination of size 0 errno %d, expected ERANGE\n", errno); ok(ret == ERANGE, "Copying into a destination of size 0 returned %d, expected ERANGE\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -421,7 +419,7 @@ static void test_wmemcpy_s(void) /* Replace dest with NULL */ errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); - ret = p_wmemcpy_s(NULL, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_wmemcpy_s(NULL, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Copying a tiny buffer to a big NULL destination errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Copying a tiny buffer to a big NULL destination returned %d, expected EINVAL\n", ret); CHECK_CALLED(invalid_parameter_handler); @@ -430,7 +428,7 @@ static void test_wmemcpy_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, 0, NULL, NUMELMS(tiny)); + ret = p_wmemcpy_s(dest, 0, NULL, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Copying a NULL buffer into a destination of size 0 errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Copying a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -453,13 +451,13 @@ static void test_wmemmove_s(void) /* Normal */ memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_wmemmove_s(dest, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == 0, "Moving a buffer into a big enough destination returned %d, expected 0\n", ret); okwchars(dest, tiny[0], tiny[1], tiny[2], tiny[3], tiny[4], tiny[5], XX, XX); /* Overlapping */ memcpy(dest, big, sizeof(dest)); - ret = p_wmemmove_s(dest+1, NUMELMS(dest)-1, dest, NUMELMS(dest)-1); + ret = p_wmemmove_s(dest+1, ARRAY_SIZE(dest)-1, dest, ARRAY_SIZE(dest)-1); ok(ret == 0, "Moving a buffer up one char returned %d, expected 0\n", ret); okwchars(dest, big[0], big[0], big[1], big[2], big[3], big[4], big[5], big[6]); @@ -467,7 +465,7 @@ static void test_wmemmove_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, NUMELMS(dest), big, NUMELMS(big)); + ret = p_wmemmove_s(dest, ARRAY_SIZE(dest), big, ARRAY_SIZE(big)); ok(errno == ERANGE, "Moving a big buffer to a small destination errno %d, expected ERANGE\n", errno); ok(ret == ERANGE, "Moving a big buffer to a small destination returned %d, expected ERANGE\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -477,7 +475,7 @@ static void test_wmemmove_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, NUMELMS(dest), NULL, NUMELMS(tiny)); + ret = p_wmemmove_s(dest, ARRAY_SIZE(dest), NULL, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Moving a NULL source buffer errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Moving a NULL source buffer returned %d, expected EINVAL\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -487,7 +485,7 @@ static void test_wmemmove_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, 0, tiny, NUMELMS(tiny)); + ret = p_wmemmove_s(dest, 0, tiny, ARRAY_SIZE(tiny)); ok(errno == ERANGE, "Moving into a destination of size 0 errno %d, expected ERANGE\n", errno); ok(ret == ERANGE, "Moving into a destination of size 0 returned %d, expected ERANGE\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -496,7 +494,7 @@ static void test_wmemmove_s(void) /* Replace dest with NULL */ errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); - ret = p_wmemmove_s(NULL, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_wmemmove_s(NULL, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Moving a tiny buffer to a big NULL destination errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Moving a tiny buffer to a big NULL destination returned %d, expected EINVAL\n", ret); CHECK_CALLED(invalid_parameter_handler); @@ -505,7 +503,7 @@ static void test_wmemmove_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, 0, NULL, NUMELMS(tiny)); + ret = p_wmemmove_s(dest, 0, NULL, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Moving a NULL buffer into a destination of size 0 errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Moving a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -824,7 +822,7 @@ static void test_event(void) event evt; event *evts[70]; HANDLE thread; - HANDLE threads[NUMELMS(evts)]; + HANDLE threads[ARRAY_SIZE(evts)]; call_func1(p_event_ctor, &evt); @@ -851,7 +849,7 @@ static void test_event(void) if (0) /* crashes on Windows */ p_event_wait_for_multiple(NULL, 10, TRUE, 0); - for (i = 0; i < NUMELMS(evts); i++) { + for (i = 0; i < ARRAY_SIZE(evts); i++) { evts[i] = malloc(sizeof(evt)); call_func1(p_event_ctor, evts[i]); } @@ -859,17 +857,17 @@ static void test_event(void) ret = p_event_wait_for_multiple(evts, 0, TRUE, 100); ok(!ret, "expected 0, got %d\n", ret); - ret = p_event_wait_for_multiple(evts, NUMELMS(evts), TRUE, 100); + ret = p_event_wait_for_multiple(evts, ARRAY_SIZE(evts), TRUE, 100); ok(ret == -1, "expected -1, got %d\n", ret); /* reset and test wait for multiple with all */ - for (i = 0; i < NUMELMS(evts); i++) + for (i = 0; i < ARRAY_SIZE(evts); i++) threads[i] = CreateThread(NULL, 0, test_event_thread, (void*)evts[i], 0, NULL); - ret = p_event_wait_for_multiple(evts, NUMELMS(evts), TRUE, 5000); + ret = p_event_wait_for_multiple(evts, ARRAY_SIZE(evts), TRUE, 5000); ok(ret != -1, "didn't expect -1\n"); - for (i = 0; i < NUMELMS(evts); i++) { + for (i = 0; i < ARRAY_SIZE(evts); i++) { WaitForSingleObject(threads[i], INFINITE); CloseHandle(threads[i]); } @@ -896,7 +894,7 @@ static void test_event(void) ret = p_event_wait_for_multiple(evts, 2, FALSE, 0); ok(ret == 1, "expected 1, got %d\n", ret); - for (i = 0; i < NUMELMS(evts); i++) { + for (i = 0; i < ARRAY_SIZE(evts); i++) { call_func1(p_event_dtor, evts[i]); free(evts[i]); } -- 2.14.4

2 1

[PATCH 2/2 v2] msvcrt: Update size checks for secure scanf versions
by Piotr Caban 09 Jul '18

09 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - add more tests - write to the buffer after doing size check dlls/msvcrt/scanf.h | 4 ++-- dlls/msvcrt/tests/scanf.c | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-)

1 0

[PATCH] urlmon: Use ARRAY_SIZE() macro.
by Nikolay Sivov 09 Jul '18

09 Jul '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/urlmon/axinstall.c | 24 ++++++++++++------------ dlls/urlmon/binding.c | 2 +- dlls/urlmon/file.c | 2 +- dlls/urlmon/http.c | 4 ++-- dlls/urlmon/internet.c | 2 +- dlls/urlmon/mimefilter.c | 14 +++++++------- dlls/urlmon/sec_mgr.c | 8 ++++---- dlls/urlmon/session.c | 10 ++++------ dlls/urlmon/umon.c | 4 ++-- dlls/urlmon/uri.c | 18 +++++++++--------- 10 files changed, 43 insertions(+), 45 deletions(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index d2cf7e6d85..5eac00d46c 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -154,12 +154,12 @@ static void expand_command(install_ctx_t *ctx, const WCHAR *cmd, WCHAR *buf, siz memcpy(buf+len, prev_ptr, ptr-prev_ptr); len += ptr-prev_ptr; - if(!strncmpiW(ptr, expand_dirW, sizeof(expand_dirW)/sizeof(WCHAR))) { + if(!strncmpiW(ptr, expand_dirW, ARRAY_SIZE(expand_dirW))) { len2 = strlenW(ctx->tmp_dir); if(buf) memcpy(buf+len, ctx->tmp_dir, len2*sizeof(WCHAR)); len += len2; - ptr += sizeof(expand_dirW)/sizeof(WCHAR); + ptr += ARRAY_SIZE(expand_dirW); }else { FIXME("Can't expand %s\n", debugstr_w(ptr)); if(buf) @@ -185,7 +185,7 @@ static HRESULT process_hook_section(install_ctx_t *ctx, const WCHAR *sect_name) static const WCHAR runW[] = {'r','u','n',0}; - len = GetPrivateProfileStringW(sect_name, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + len = GetPrivateProfileStringW(sect_name, NULL, NULL, buf, ARRAY_SIZE(buf), ctx->install_file); if(!len) return S_OK; @@ -194,7 +194,7 @@ static HRESULT process_hook_section(install_ctx_t *ctx, const WCHAR *sect_name) WCHAR *cmd; size_t size; - len = GetPrivateProfileStringW(sect_name, runW, NULL, val, sizeof(val)/sizeof(*val), ctx->install_file); + len = GetPrivateProfileStringW(sect_name, runW, NULL, val, ARRAY_SIZE(val), ctx->install_file); TRACE("Run %s\n", debugstr_w(val)); @@ -229,14 +229,14 @@ static HRESULT install_inf_file(install_ctx_t *ctx) static const WCHAR setup_hooksW[] = {'S','e','t','u','p',' ','H','o','o','k','s',0}; static const WCHAR add_codeW[] = {'A','d','d','.','C','o','d','e',0}; - len = GetPrivateProfileStringW(setup_hooksW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + len = GetPrivateProfileStringW(setup_hooksW, NULL, NULL, buf, ARRAY_SIZE(buf), ctx->install_file); if(len) { default_install = FALSE; for(key = buf; *key; key += strlenW(key)+1) { TRACE("[Setup Hooks] key: %s\n", debugstr_w(key)); - len = GetPrivateProfileStringW(setup_hooksW, key, NULL, sect_name, sizeof(sect_name)/sizeof(*sect_name), + len = GetPrivateProfileStringW(setup_hooksW, key, NULL, sect_name, ARRAY_SIZE(sect_name), ctx->install_file); if(!len) { WARN("Could not get key value\n"); @@ -249,14 +249,14 @@ static HRESULT install_inf_file(install_ctx_t *ctx) } } - len = GetPrivateProfileStringW(add_codeW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + len = GetPrivateProfileStringW(add_codeW, NULL, NULL, buf, ARRAY_SIZE(buf), ctx->install_file); if(len) { default_install = FALSE; for(key = buf; *key; key += strlenW(key)+1) { TRACE("[Add.Code] key: %s\n", debugstr_w(key)); - len = GetPrivateProfileStringW(add_codeW, key, NULL, sect_name, sizeof(sect_name)/sizeof(*sect_name), + len = GetPrivateProfileStringW(add_codeW, key, NULL, sect_name, ARRAY_SIZE(sect_name), ctx->install_file); if(!len) { WARN("Could not get key value\n"); @@ -290,7 +290,7 @@ static HRESULT install_cab_file(install_ctx_t *ctx) DWORD i; HRESULT hres; - GetTempPathW(sizeof(tmp_path)/sizeof(WCHAR), tmp_path); + GetTempPathW(ARRAY_SIZE(tmp_path), tmp_path); for(i=0; !res && i < 100; i++) { GetTempFileNameW(tmp_path, NULL, GetTickCount() + i*17037, tmp_dir); @@ -336,13 +336,13 @@ static void update_counter(install_ctx_t *ctx, HWND hwnd) HWND button_hwnd; KillTimer(hwnd, ctx->timer); - LoadStringW(urlmon_instance, IDS_AXINSTALL_INSTALL, text, sizeof(text)/sizeof(WCHAR)); + LoadStringW(urlmon_instance, IDS_AXINSTALL_INSTALL, text, ARRAY_SIZE(text)); button_hwnd = GetDlgItem(hwnd, ID_AXINSTALL_INSTALL_BTN); EnableWindow(button_hwnd, TRUE); }else { WCHAR buf[100]; - LoadStringW(urlmon_instance, IDS_AXINSTALL_INSTALLN, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(urlmon_instance, IDS_AXINSTALL_INSTALLN, buf, ARRAY_SIZE(buf)); sprintfW(text, buf, ctx->counter); } @@ -476,7 +476,7 @@ static void failure_msgbox(install_ctx_t *ctx, HRESULT hres) { WCHAR buf[1024], fmt[1024]; - LoadStringW(urlmon_instance, IDS_AXINSTALL_FAILURE, fmt, sizeof(fmt)/sizeof(WCHAR)); + LoadStringW(urlmon_instance, IDS_AXINSTALL_FAILURE, fmt, ARRAY_SIZE(fmt)); sprintfW(buf, fmt, hres); MessageBoxW(ctx->hwnd, buf, NULL, MB_OK); } diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index c2879b21c5..fdabdfcc81 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -202,7 +202,7 @@ static LPWSTR get_mime_clsid(LPCWSTR mime, CLSID *clsid) len = strlenW(mime)+1; key_name = heap_alloc(sizeof(mime_keyW) + len*sizeof(WCHAR)); memcpy(key_name, mime_keyW, sizeof(mime_keyW)); - strcpyW(key_name + sizeof(mime_keyW)/sizeof(WCHAR), mime); + strcpyW(key_name + ARRAY_SIZE(mime_keyW), mime); res = RegOpenKeyW(HKEY_CLASSES_ROOT, key_name, &hkey); heap_free(key_name); diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 9e7f3cf184..11e6ecee90 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -304,7 +304,7 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); size = 0; - hres = CoInternetParseIUri(pUri, PARSE_PATH_FROM_URL, 0, path, sizeof(path)/sizeof(WCHAR), &size, 0); + hres = CoInternetParseIUri(pUri, PARSE_PATH_FROM_URL, 0, path, ARRAY_SIZE(path), &size, 0); if(FAILED(hres)) { WARN("CoInternetParseIUri failed: %08x\n", hres); return report_result(pOIProtSink, hres, 0); diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 5fcbd54174..1762787d09 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -342,7 +342,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques CoTaskMemFree(rootdoc_url); } - num = sizeof(accept_mimes)/sizeof(accept_mimes[0])-1; + num = ARRAY_SIZE(accept_mimes) - 1; hres = IInternetBindInfo_GetBindString(bind_info, BINDSTRING_ACCEPT_MIMES, accept_mimes, num, &num); if(hres == INET_E_USE_DEFAULT_SETTING) { static const WCHAR default_accept_mimeW[] = {'*','/','*',0}; @@ -428,7 +428,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques WARN("IServiceProvider_QueryService IID_IHttpNegotiate2 failed: %08x\n", hres); /* No goto done as per native */ }else { - len = sizeof(security_id)/sizeof(security_id[0]); + len = ARRAY_SIZE(security_id); hres = IHttpNegotiate2_GetRootSecurityId(http_negotiate2, security_id, &len, 0); IHttpNegotiate2_Release(http_negotiate2); if (hres != S_OK) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 28aaa0b43c..7c997a03b0 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -588,7 +588,7 @@ static HRESULT load_process_feature(INTERNETFEATURELIST feature) BOOL check_hklm = FALSE; BOOL enabled; - if (!GetModuleFileNameW(NULL, module_name, sizeof(module_name)/sizeof(WCHAR))) { + if (!GetModuleFileNameW(NULL, module_name, ARRAY_SIZE(module_name))) { ERR("Failed to get module file name: %u\n", GetLastError()); return E_UNEXPECTED; } diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c index e12c2b7196..7904bf90f4 100644 --- a/dlls/urlmon/mimefilter.c +++ b/dlls/urlmon/mimefilter.c @@ -547,12 +547,12 @@ static BOOL is_known_mime_type(const WCHAR *mime) { unsigned i; - for(i=0; i < sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + for(i=0; i < ARRAY_SIZE(mime_filters_any_pos); i++) { if(!strcmpW(mime, mime_filters_any_pos[i].mime)) return TRUE; } - for(i=0; i < sizeof(mime_filters)/sizeof(*mime_filters); i++) { + for(i=0; i < ARRAY_SIZE(mime_filters); i++) { if(!strcmpW(mime, mime_filters[i].mime)) return TRUE; } @@ -585,7 +585,7 @@ static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *p if(proposed_mime) { ret = proposed_mime; - for(i=0; i < sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + for(i=0; i < ARRAY_SIZE(mime_filters_any_pos); i++) { if(!strcmpW(proposed_mime, mime_filters_any_pos[i].mime)) { any_pos_mime = i; for(len=size; len>0; len--) { @@ -598,8 +598,8 @@ static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *p } } - if(i == sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos)) { - for(i=0; i < sizeof(mime_filters)/sizeof(*mime_filters); i++) { + if(i == ARRAY_SIZE(mime_filters_any_pos)) { + for(i=0; i < ARRAY_SIZE(mime_filters); i++) { if(!strcmpW(proposed_mime, mime_filters[i].mime)) { if(!mime_filters[i].filter(buf, size)) ret = NULL; @@ -613,7 +613,7 @@ static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *p * are not looked for if none of them was proposed */ if(!proposed_mime || any_pos_mime!=-1) { for(len=size; !ret && len>0; len--) { - for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + for(i=0; i<ARRAY_SIZE(mime_filters_any_pos); i++) { if(mime_filters_any_pos[i].filter(buf+size-len, len)) { ret = mime_filters_any_pos[i].mime; break; @@ -635,7 +635,7 @@ static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *p for(len=size; ret==app_octetstreamW && len>0; len--) { if(!is_text_plain_char(buf[size-len])) break; - for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + for(i=0; i<ARRAY_SIZE(mime_filters_any_pos); i++) { if(mime_filters_any_pos[i].filter(buf+size-len, len)) { ret = text_plainW; break; diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index eab155d54b..5f62068127 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -547,7 +547,7 @@ static HRESULT map_security_uri_to_zone(IUri *uri, DWORD *zone) else path_start = path; - if((ptr = strchrW(path_start, ':')) && ptr-path_start+1 < sizeof(root)/sizeof(WCHAR)) { + if((ptr = strchrW(path_start, ':')) && ptr-path_start+1 < ARRAY_SIZE(root)) { UINT type; memcpy(root, path_start, (ptr-path_start+1)*sizeof(WCHAR)); @@ -645,7 +645,7 @@ static HRESULT open_zone_key(HKEY parent_key, DWORD zone, HKEY *hkey) { static const WCHAR wszFormat[] = {'%','s','%','u',0}; - WCHAR key_name[sizeof(wszZonesKey)/sizeof(WCHAR)+12]; + WCHAR key_name[ARRAY_SIZE(wszZonesKey) + 12]; DWORD res; wsprintfW(key_name, wszFormat, wszZonesKey, zone); @@ -1307,7 +1307,7 @@ static LPDWORD build_zonemap_from_reg(void) while (!res) { name[0] = '\0'; - len = sizeof(name) / sizeof(name[0]); + len = ARRAY_SIZE(name); res = RegEnumKeyExW(hkey, used, name, &len, NULL, NULL, NULL, NULL); if (!res) { @@ -2052,7 +2052,7 @@ HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION const WCHAR *tmp = ret_url; /* Check and see if a "//" is after the scheme name. */ - tmp += sizeof(fileW)/sizeof(WCHAR); + tmp += ARRAY_SIZE(fileW); if(*tmp != '/' || *(tmp+1) != '/') hres = E_INVALIDARG; } diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index dea1c9f121..34ff5448fb 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -86,7 +86,7 @@ static HRESULT get_protocol_cf(LPCWSTR schema, DWORD schema_len, CLSID *pclsid, wszKey = heap_alloc(sizeof(wszProtocolsKey)+(schema_len+1)*sizeof(WCHAR)); memcpy(wszKey, wszProtocolsKey, sizeof(wszProtocolsKey)); - memcpy(wszKey + sizeof(wszProtocolsKey)/sizeof(WCHAR), schema, (schema_len+1)*sizeof(WCHAR)); + memcpy(wszKey + ARRAY_SIZE(wszProtocolsKey), schema, (schema_len+1)*sizeof(WCHAR)); res = RegOpenKeyW(HKEY_CLASSES_ROOT, wszKey, &hkey); heap_free(wszKey); @@ -171,8 +171,7 @@ BOOL is_registered_protocol(LPCWSTR url) WCHAR schema[64]; HRESULT hres; - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), - &schema_len, 0); + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, ARRAY_SIZE(schema), &schema_len, 0); if(FAILED(hres)) return FALSE; @@ -188,8 +187,7 @@ IInternetProtocolInfo *get_protocol_info(LPCWSTR url) DWORD schema_len; HRESULT hres; - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), - &schema_len, 0); + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, ARRAY_SIZE(schema), &schema_len, 0); if(FAILED(hres) || !schema_len) return NULL; @@ -578,7 +576,7 @@ static void ensure_useragent(void) DWORD value_len; while(1) { - value_len = sizeof(buf)/sizeof(WCHAR); + value_len = ARRAY_SIZE(buf); res = RegEnumValueW(key, idx, buf, &value_len, NULL, NULL, NULL, NULL); if(res != ERROR_SUCCESS) break; diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 9e46319358..116f593348 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -627,7 +627,7 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker if (!szURL || !ppmk) return E_INVALIDARG; - if(dwFlags >= sizeof(create_flags_map)/sizeof(*create_flags_map)) { + if(dwFlags >= ARRAY_SIZE(create_flags_map)) { FIXME("Unsupported flags %x\n", dwFlags); return E_INVALIDARG; } @@ -680,7 +680,7 @@ HRESULT WINAPI CreateURLMonikerEx2(IMoniker *pmkContext, IUri *pUri, IMoniker ** if (!pUri || !ppmk) return E_INVALIDARG; - if(dwFlags >= sizeof(create_flags_map)/sizeof(*create_flags_map)) { + if(dwFlags >= ARRAY_SIZE(create_flags_map)) { FIXME("Unsupported flags %x\n", dwFlags); return E_INVALIDARG; } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 8de3161a7b..92978dc53f 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -365,7 +365,7 @@ static inline BOOL is_ascii(WCHAR c) static BOOL is_default_port(URL_SCHEME scheme, DWORD port) { DWORD i; - for(i = 0; i < sizeof(default_ports)/sizeof(default_ports[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(default_ports); ++i) { if(default_ports[i].scheme == scheme && default_ports[i].port) return TRUE; } @@ -556,7 +556,7 @@ void find_domain_name(const WCHAR *host, DWORD host_len, * Ex: edu.uk -> has no domain name. * foo.uk -> foo.uk as the domain name. */ - for(i = 0; i < sizeof(recognized_tlds)/sizeof(recognized_tlds[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(recognized_tlds); ++i) { if(!StrCmpNIW(host, recognized_tlds[i].tld_name, 3)) return; } @@ -584,7 +584,7 @@ void find_domain_name(const WCHAR *host, DWORD host_len, * www.google.foo.uk -> foo.uk as the domain name. */ if(last_tld - (sec_last_tld+1) == 3) { - for(i = 0; i < sizeof(recognized_tlds)/sizeof(recognized_tlds[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(recognized_tlds); ++i) { if(!StrCmpNIW(sec_last_tld+1, recognized_tlds[i].tld_name, 3)) { const WCHAR *domain = memrchrW(host, '.', sec_last_tld-host); @@ -1134,7 +1134,7 @@ static BOOL parse_scheme_type(parse_data *data) { if(data->scheme && data->scheme_len) { DWORD i; - for(i = 0; i < sizeof(recognized_schemes)/sizeof(recognized_schemes[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(recognized_schemes); ++i) { if(lstrlenW(recognized_schemes[i].scheme_name) == data->scheme_len) { /* Has to be a case insensitive compare. */ if(!StrCmpNIW(recognized_schemes[i].scheme_name, data->scheme, data->scheme_len)) { @@ -2728,7 +2728,7 @@ static BOOL canonicalize_port(const parse_data *data, Uri *uri, DWORD flags, BOO uri->port_offset = -1; /* Check if the scheme has a default port. */ - for(i = 0; i < sizeof(default_ports)/sizeof(default_ports[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(default_ports); ++i) { if(default_ports[i].scheme == data->scheme_type) { has_default_port = TRUE; default_port = default_ports[i].port; @@ -3154,7 +3154,7 @@ static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags, uri->display_modifiers |= URI_DISPLAY_NO_ABSOLUTE_URI; /* Windows also sets the port for these (if they have one). */ - for(i = 0; i < sizeof(default_ports)/sizeof(default_ports[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(default_ports); ++i) { if(data->scheme_type == default_ports[i].scheme) { uri->has_port = TRUE; uri->port = default_ports[i].port; @@ -4121,7 +4121,7 @@ static DWORD generate_raw_uri(const parse_data *data, BSTR uri, DWORD flags) { DWORD i; BOOL is_default = FALSE; - for(i = 0; i < sizeof(default_ports)/sizeof(default_ports[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(default_ports); ++i) { if(data->scheme_type == default_ports[i].scheme && data->port_value == default_ports[i].port) is_default = TRUE; @@ -7002,7 +7002,7 @@ static HRESULT parse_rootdocument(const Uri *uri, LPWSTR output, DWORD output_le memcpy(ptr, colon_slashesW, sizeof(colon_slashesW)); /* Add the authority. */ - ptr += sizeof(colon_slashesW)/sizeof(WCHAR); + ptr += ARRAY_SIZE(colon_slashesW); memcpy(ptr, uri->canon_uri+uri->authority_start, uri->authority_len*sizeof(WCHAR)); /* Add the '/' after the authority. */ @@ -7066,7 +7066,7 @@ static HRESULT parse_path_from_url(const Uri *uri, LPWSTR output, DWORD output_l static const WCHAR slash_slashW[] = {'\\','\\'}; memcpy(ptr, slash_slashW, sizeof(slash_slashW)); - ptr += sizeof(slash_slashW)/sizeof(WCHAR); + ptr += ARRAY_SIZE(slash_slashW); memcpy(ptr, uri->canon_uri+uri->host_start, uri->host_len*sizeof(WCHAR)); ptr += uri->host_len; } -- 2.18.0

2 1

[PATCH 1/3] ntdll: Only set owned bits in RTL_BITMAP
by janisozaur＠gmail.com 09 Jul '18

09 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> --- dlls/ntdll/rtlbitmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 318f6fcbd4..c3e9385ec0 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -157,7 +157,8 @@ VOID WINAPI RtlSetBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) USHORT initialWord = NTDLL_maskBits[ulCount] << (ulStart & 7); *lpOut++ |= (initialWord & 0xff); - *lpOut |= (initialWord >> 8); + if (lpOut < ((BYTE *)lpBits->Buffer) + (lpBits->SizeOfBitMap / 8)) + *lpOut |= (initialWord >> 8); return; } } @@ -218,7 +219,8 @@ VOID WINAPI RtlClearBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) USHORT initialWord = ~(NTDLL_maskBits[ulCount] << (ulStart & 7)); *lpOut++ &= (initialWord & 0xff); - *lpOut &= (initialWord >> 8); + if (lpOut < ((BYTE *)lpBits->Buffer) + (lpBits->SizeOfBitMap / 8)) + *lpOut &= (initialWord >> 8); return; } } -- 2.17.1

2 3

[PATCH v2] msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback.
by Piotr Caban 09 Jul '18

09 Jul '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - update all specfiles .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/misc.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-)

1 0

[website] German translation for vkd3d release 1.0 (try 2)
by Julian Rüger 09 Jul '18

09 Jul '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net> --- v2: Fixed a typo spotted by Florian Pelz.

1 0

[PATCH] ntdll/tests: Skip the map protect tests if we can't disable no-exec.
by Huw Davies 09 Jul '18

09 Jul '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- When run as a stand-alone test most of the testbot VMs have the process execute flags bits MAP_EXECUTE_OPTION_DISBABLE and MAP_EXECUTE_OPTION_PERMANENT set. With the permanent bit set, it's not possible to turn off no-exec. It's unclear why, when run as part of winetest, this is not the case. Also note that this test doesn't run on 64-bit, as apparently the process execute flags are not supported on that platform. dlls/ntdll/tests/info.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4a2d9e6933..7d60b94f15 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1776,20 +1776,30 @@ static void test_mapprotection(void) NTSTATUS status; SIZE_T retlen, count; void (*f)(void); + BOOL reset_flags = FALSE; - if (!pNtClose) { - skip("No NtClose ... Win98\n"); - return; - } /* Switch to being a noexec unaware process */ status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof (oldflags), &flagsize); - if (status == STATUS_INVALID_PARAMETER) { - skip("Invalid Parameter on ProcessExecuteFlags query?\n"); + if (status == STATUS_INVALID_PARAMETER) + { + skip("Unable to query process execute flags on this platform\n"); return; } - ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); - status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); - ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + trace("Process execute flags %08x\n", oldflags); + + if (oldflags & MEM_EXECUTE_OPTION_DISABLE) + { + if (oldflags & MEM_EXECUTE_OPTION_PERMANENT) + { + skip("Unable to turn off noexec\n"); + return; + } + + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + reset_flags = TRUE; + } size.u.LowPart = 0x2000; size.u.HighPart = 0; @@ -1832,8 +1842,8 @@ static void test_mapprotection(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); pNtClose (h); - /* Switch back */ - pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof(oldflags) ); + if (reset_flags) + pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof(oldflags) ); } static void test_queryvirtualmemory(void) -- 2.16.2

1 0

[PATCH v2] browseui: Implement IProgressDialog::SetAnimation.
by Alistair Leslie-Hughes 09 Jul '18

09 Jul '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/browseui/browseui.rc | 2 +- dlls/browseui/progressdlg.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc index 833b139413..4c612e93e3 100644 --- a/dlls/browseui/browseui.rc +++ b/dlls/browseui/browseui.rc @@ -32,7 +32,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_C CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, ACS_TRANSPARENT | ACS_AUTOPLAY, 12, 10, 236, 25 LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 09c1996a59..2de60e434e 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -403,7 +403,16 @@ static HRESULT WINAPI ProgressDialog_SetTitle(IProgressDialog *iface, LPCWSTR pw static HRESULT WINAPI ProgressDialog_SetAnimation(IProgressDialog *iface, HINSTANCE hInstance, UINT uiResourceId) { - FIXME("(%p, %p, %d) - stub\n", iface, hInstance, uiResourceId); + ProgressDialog *This = impl_from_IProgressDialog(iface); + + TRACE("(%p, %p, #%x)\n", iface, hInstance, uiResourceId); + + if (IS_INTRESOURCE(uiResourceId)) + { + if (!SendDlgItemMessageW(This->hwnd, IDC_ANIMATION, ACM_OPENW, (WPARAM)hInstance, uiResourceId)) + WARN("Failed to load animation\n"); + } + return S_OK; } -- 2.18.0

2 1

[PATCH] ole32: Use the more common ARRAY_SIZE spelling
by Michael Stefaniuc 09 Jul '18

09 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/compobj.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index fb69a66746..3487cca572 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -70,8 +70,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) - /**************************************************************************** * This section defines variables internal to the COM module. */ @@ -1477,7 +1475,7 @@ static HRESULT apartment_hostobject(struct apartment *apt, TRACE("clsid %s, iid %s\n", debugstr_guid(&params->clsid), debugstr_guid(&params->iid)); - if (COM_RegReadPath(&params->regdata, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(&params->regdata, dllpath, ARRAY_SIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(&params->clsid)); @@ -2356,7 +2354,7 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax) HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *subkey) { static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; - WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) - 1]; + WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(wszCLSIDSlash) - 1]; LONG res; HKEY key; @@ -2391,7 +2389,7 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey static const WCHAR szAppIdKey[] = { 'A','p','p','I','d','\\',0 }; DWORD res; WCHAR buf[CHARS_IN_GUID]; - WCHAR keyname[ARRAYSIZE(szAppIdKey) + CHARS_IN_GUID]; + WCHAR keyname[ARRAY_SIZE(szAppIdKey) + CHARS_IN_GUID]; DWORD size; HKEY hkey; DWORD type; @@ -2599,7 +2597,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) { static const WCHAR wszInterface[] = {'I','n','t','e','r','f','a','c','e','\\',0}; static const WCHAR wszPSC[] = {'\\','P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; - WCHAR path[ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAYSIZE(wszPSC)]; + WCHAR path[ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAY_SIZE(wszPSC)]; APARTMENT *apt; struct registered_psclsid *registered_psclsid; ACTCTX_SECTION_KEYED_DATA data; @@ -2642,8 +2640,8 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) /* Interface\\{string form of riid}\\ProxyStubClsid32 */ strcpyW(path, wszInterface); - StringFromGUID2(riid, path + ARRAYSIZE(wszInterface) - 1, CHARS_IN_GUID); - strcpyW(path + ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); + StringFromGUID2(riid, path + ARRAY_SIZE(wszInterface) - 1, CHARS_IN_GUID); + strcpyW(path + ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); hr = get_ps_clsid_from_registry(path, 0, pclsid); if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || @@ -2971,7 +2969,7 @@ static HRESULT get_inproc_class_object(APARTMENT *apt, const struct class_reg_da else apartment_threaded = !apt->multi_threaded; - if (COM_RegReadPath(regdata, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(regdata, dllpath, ARRAY_SIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(rclsid)); @@ -3829,7 +3827,7 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew) if(IsEqualGUID(clsidNew, &CLSID_NULL)){ RegDeleteKeyW(hkey, wszTreatAs); }else{ - if(!StringFromGUID2(clsidNew, szClsidNew, ARRAYSIZE(szClsidNew))){ + if(!StringFromGUID2(clsidNew, szClsidNew, ARRAY_SIZE(szClsidNew))){ WARN("StringFromGUID2 failed\n"); res = E_FAIL; goto done; @@ -5087,7 +5085,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) regdata.u.hkey = hkey; regdata.hkey = TRUE; - if (COM_RegReadPath(&regdata, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS) + if (COM_RegReadPath(&regdata, dllpath, ARRAY_SIZE(dllpath)) == ERROR_SUCCESS) { static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0}; if (!strcmpiW(dllpath, wszOle32)) -- 2.14.4

2 1

[PATCH] browseui: Implement IProgressDialog::SetAnimation.
by Alistair Leslie-Hughes 09 Jul '18

09 Jul '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/browseui/browseui.rc | 2 +- dlls/browseui/progressdlg.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc index 833b139..4c612e9 100644 --- a/dlls/browseui/browseui.rc +++ b/dlls/browseui/browseui.rc @@ -32,7 +32,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_C CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, ACS_TRANSPARENT | ACS_AUTOPLAY, 12, 10, 236, 25 LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 09c1996..ed306de 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -403,7 +403,16 @@ static HRESULT WINAPI ProgressDialog_SetTitle(IProgressDialog *iface, LPCWSTR pw static HRESULT WINAPI ProgressDialog_SetAnimation(IProgressDialog *iface, HINSTANCE hInstance, UINT uiResourceId) { - FIXME("(%p, %p, %d) - stub\n", iface, hInstance, uiResourceId); + ProgressDialog *This = impl_from_IProgressDialog(iface); + + TRACE("(%p, %p, %d)\n", iface, hInstance, uiResourceId); + + if (uiResourceId & ~0xFFFF) + return S_OK; + + if (!SendDlgItemMessageW(This->hwnd, IDC_ANIMATION, ACM_OPENW, (WPARAM)hInstance, uiResourceId)) + WARN("Failed to load animation\n"); + return S_OK; } -- 1.9.1

2 1

[PATCH 2/3] wsdapi: Implement generation of ProbeMatches message.
by Owen Rudge 09 Jul '18

09 Jul '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 169 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 169 insertions(+), 2 deletions(-)

2 1

[PATCH 1/2] kernel32/tests: resource: Replicate muirct.exe behavior
by Jon Doron 09 Jul '18

09 Jul '18

For some reason muirct.exe is aware of the opaque structure used by BeginUpdateResource, it access the filename field of the opaque structure during it's processing. MS documentation for the muirct utility: https://docs.microsoft.com/en-us/windows/desktop/intl/resource-utilities Sample execution: MUIRCT.EXE -c "ui.exe" -e "de-DE\ui.exe.mui" --- dlls/kernel32/tests/resource.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 74066cfba3..6db9655833 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -24,6 +24,7 @@ #include "wine/test.h" static const char filename[] = "test_.exe"; +static const wchar_t filenameW[] = L"test_.exe"; static DWORD GLE; enum constants { @@ -463,6 +464,28 @@ static void test_find_resource(void) ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %u\n", GetLastError() ); } +static void test_muirct_compatiblity(void) +{ + HANDLE res = NULL; + PVOID res_data; + PWCHAR res_filename; + + res = BeginUpdateResourceW( (PWCHAR)filenameW, FALSE ); + ok( res != NULL, "BeginUpdateResourceW failed\n" ); + res_data = GlobalLock(res); + ok( res_data != NULL, "GlobalLock failed\n" ); +#ifdef _WIN64 + res_filename = (PWCHAR)GlobalLock( *(HGLOBAL*)((ULONG_PTR)res_data + 0x30) ); +#else + res_filename = (PWCHAR)GlobalLock( *(HGLOBAL*)((ULONG_PTR)res_data + 0x18) ); +#endif + ok( res_filename != NULL, "GlobalLock for res_filename failed\n" ); + ok( !lstrcmpW(res_filename, (PWCHAR)filenameW), "Filename fields do not match\n" ); + ok( GlobalUnlock( res_filename ), "GlobalUnlock res_filenamed failed\n" ); + ok( GlobalUnlock( res_data ), "GlobalUnlock res_data failed\n" ); + ok( EndUpdateResourceW( res, TRUE ), "EndUpdateResourceW failed\n"); +} + START_TEST(resource) { DWORD i; @@ -482,6 +505,7 @@ START_TEST(resource) { const struct _sec_variants *sec = &sec_variants[i]; build_exe( &sec->build ); + test_muirct_compatiblity(); update_resources_none(); check_exe( &sec->chk_none ); update_resources_delete(); -- 2.17.1

2 3

[PATCH] ntdll/tests: Tests for RtlIpv6StringToAddress
by Alistair Leslie-Hughes 09 Jul '18

09 Jul '18

From: Mark Jansen <learn0more+wine(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/tests/rtl.c | 430 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 430 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 881bc1a..ec12ea2 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -24,6 +24,7 @@ #include <stdlib.h> #include "ntdll_test.h" +#include "in6addr.h" #include "inaddr.h" #ifndef __WINE_WINTERNL_H @@ -88,9 +89,12 @@ static IMAGE_BASE_RELOCATION *(WINAPI *pLdrProcessRelocationBlock)(void*,UINT,US static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); +static NTSTATUS (WINAPI *pRtlIpv6StringToAddressA)(PCSTR, PCSTR *, struct in6_addr *); +static NTSTATUS (WINAPI *pRtlIpv6StringToAddressW)(PCWSTR, PCWSTR *, struct in6_addr *); static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG_PTR*); static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); +static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)(LPWSTR, DWORD, LPDWORD, LPCSTR, DWORD); static NTSTATUS (WINAPI *pRtlGetCompressionWorkSpaceSize)(USHORT, PULONG, PULONG); static NTSTATUS (WINAPI *pRtlDecompressBuffer)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, PULONG); static NTSTATUS (WINAPI *pRtlDecompressFragment)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, ULONG, PULONG, PVOID); @@ -151,9 +155,12 @@ static void InitFunctionPtrs(void) pRtlIpv4AddressToStringA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringA"); pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); + pRtlIpv6StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressA"); + pRtlIpv6StringToAddressW = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressW"); pLdrAddRefDll = (void *)GetProcAddress(hntdll, "LdrAddRefDll"); pLdrLockLoaderLock = (void *)GetProcAddress(hntdll, "LdrLockLoaderLock"); pLdrUnlockLoaderLock = (void *)GetProcAddress(hntdll, "LdrUnlockLoaderLock"); + pRtlMultiByteToUnicodeN = (void *)GetProcAddress(hntdll, "RtlMultiByteToUnicodeN"); pRtlGetCompressionWorkSpaceSize = (void *)GetProcAddress(hntdll, "RtlGetCompressionWorkSpaceSize"); pRtlDecompressBuffer = (void *)GetProcAddress(hntdll, "RtlDecompressBuffer"); pRtlDecompressFragment = (void *)GetProcAddress(hntdll, "RtlDecompressFragment"); @@ -1315,6 +1322,428 @@ static void test_RtlIpv4StringToAddress(void) } } + +/* ipv6 addresses based on the set from https://github.com/beaugunderson/javascript-ipv6/tree/master/test/data */ +static const struct +{ + PCSTR address; + NTSTATUS res; + int terminator_offset; + int ip[8]; + /* win_broken: older versions of windows do not handle this correct + ex_fail: Ex function does need the string to be terminated, non-Ex does not. + ex_skip: test doesnt make sense for Ex (f.e. it's invalid for non-Ex but valid for Ex) */ + enum { normal_6, win_broken_6 = 1, ex_fail_6 = 2, ex_skip_6 = 4 } flags; +} ipv6_tests[] = +{ + { "0000:0000:0000:0000:0000:0000:0000:0000", STATUS_SUCCESS, 39, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "0000:0000:0000:0000:0000:0000:0000:0001", STATUS_SUCCESS, 39, + { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "0:0:0:0:0:0:0:0", STATUS_SUCCESS, 15, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "0:0:0:0:0:0:0:1", STATUS_SUCCESS, 15, + { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "0:0:0:0:0:0:0::", STATUS_SUCCESS, 13, + { 0, 0, 0, 0, 0, 0, 0, 0 }, win_broken_6 }, + { "0:0:0:0:0:0:13.1.68.3", STATUS_SUCCESS, 21, + { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, + { "0:0:0:0:0:0::", STATUS_SUCCESS, 13, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "0:0:0:0:0::", STATUS_SUCCESS, 11, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "0:0:0:0:0:FFFF:129.144.52.38", STATUS_SUCCESS, 28, + { 0, 0, 0, 0, 0, 0xffff, 0x9081, 0x2634 } }, + { "0::", STATUS_SUCCESS, 3, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "0:1:2:3:4:5:6:7", STATUS_SUCCESS, 15, + { 0, 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700 } }, + { "1080:0:0:0:8:800:200c:417a", STATUS_SUCCESS, 26, + { 0x8010, 0, 0, 0, 0x800, 0x8, 0x0c20, 0x7a41 } }, + { "0:a:b:c:d:e:f::", STATUS_SUCCESS, 13, + { 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00, 0xf00, 0 }, win_broken_6 }, + { "1111:2222:3333:4444:5555:6666:123.123.123.123", STATUS_SUCCESS, 45, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + { "1111:2222:3333:4444:5555:6666:7777:8888", STATUS_SUCCESS, 39, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 } }, + { "1111:2222:3333:4444:0x5555:6666:7777:8888", STATUS_INVALID_PARAMETER, 21, + { 0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444:x555:6666:7777:8888", STATUS_INVALID_PARAMETER, 20, + { 0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444:0r5555:6666:7777:8888", STATUS_INVALID_PARAMETER, 21, + { 0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444:r5555:6666:7777:8888", STATUS_INVALID_PARAMETER, 20, + { 0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444:5555:6666:7777::", STATUS_SUCCESS, 34, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0 }, win_broken_6 }, + { "1111:2222:3333:4444:5555:6666::", STATUS_SUCCESS, 31, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0 } }, + { "1111:2222:3333:4444:5555:6666::8888", STATUS_SUCCESS, 35, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x8888 } }, + { "1111:2222:3333:4444:5555::", STATUS_SUCCESS, 26, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0 } }, + { "1111:2222:3333:4444:5555::123.123.123.123", STATUS_SUCCESS, 41, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0x7b7b, 0x7b7b } }, + { "1111:2222:3333:4444:5555::0x1.123.123.123", STATUS_SUCCESS, 27, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x100 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555::0x88", STATUS_SUCCESS, 27, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8800 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555::0X88", STATUS_SUCCESS, 27, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8800 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555::0X", STATUS_SUCCESS, 27, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555::0X88:7777", STATUS_SUCCESS, 27, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8800 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555::0x8888", STATUS_SUCCESS, 27, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8888 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555::08888", STATUS_INVALID_PARAMETER, 31, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444:5555::fffff", STATUS_INVALID_PARAMETER, 31, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444::fffff", STATUS_INVALID_PARAMETER, 26, + { 0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333::fffff", STATUS_INVALID_PARAMETER, 21, + { 0x1111, 0x2222, 0x3333, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444:5555::7777:8888", STATUS_SUCCESS, 35, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0x7777, 0x8888 } }, + { "1111:2222:3333:4444:5555::8888", STATUS_SUCCESS, 30, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8888 } }, + { "1111::", STATUS_SUCCESS, 6, + { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, + { "1111::123.123.123.123", STATUS_SUCCESS, 21, + { 0x1111, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b } }, + { "1111::3333:4444:5555:6666:123.123.123.123", STATUS_SUCCESS, 41, + { 0x1111, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + { "1111::3333:4444:5555:6666:7777:8888", STATUS_SUCCESS, 35, + { 0x1111, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 } }, + { "1111::4444:5555:6666:123.123.123.123", STATUS_SUCCESS, 36, + { 0x1111, 0, 0, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + { "1111::4444:5555:6666:7777:8888", STATUS_SUCCESS, 30, + { 0x1111, 0, 0, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 } }, + { "1111::5555:6666:123.123.123.123", STATUS_SUCCESS, 31, + { 0x1111, 0, 0, 0, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + { "1111::5555:6666:7777:8888", STATUS_SUCCESS, 25, + { 0x1111, 0, 0, 0, 0x5555, 0x6666, 0x7777, 0x8888 } }, + { "1111::6666:123.123.123.123", STATUS_SUCCESS, 26, + { 0x1111, 0, 0, 0, 0, 0x6666, 0x7b7b, 0x7b7b } }, + { "1111::6666:7777:8888", STATUS_SUCCESS, 20, + { 0x1111, 0, 0, 0, 0, 0x6666, 0x7777, 0x8888 } }, + { "1111::7777:8888", STATUS_SUCCESS, 15, + { 0x1111, 0, 0, 0, 0, 0, 0x7777, 0x8888 } }, + { "1111::8888", STATUS_SUCCESS, 10, + { 0x1111, 0, 0, 0, 0, 0, 0, 0x8888 } }, + { "1:2:3:4:5:6:1.2.3.4", STATUS_SUCCESS, 19, + { 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x201, 0x403 } }, + { "1:2:3:4:5:6:7:8", STATUS_SUCCESS, 15, + { 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700, 0x800 } }, + { "1:2:3:4:5:6::", STATUS_SUCCESS, 13, + { 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0, 0 } }, + { "1:2:3:4:5:6::8", STATUS_SUCCESS, 14, + { 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0, 0x800 } }, + { "2001:0000:1234:0000:0000:C1C0:ABCD:0876", STATUS_SUCCESS, 39, + { 0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608 } }, + { "2001:0000:4136:e378:8000:63bf:3fff:fdd2", STATUS_SUCCESS, 39, + { 0x120, 0, 0x3641, 0x78e3, 0x80, 0xbf63, 0xff3f, 0xd2fd } }, + { "2001:0db8:0:0:0:0:1428:57ab", STATUS_SUCCESS, 27, + { 0x120, 0xb80d, 0, 0, 0, 0, 0x2814, 0xab57 } }, + { "2001:0db8:1234:ffff:ffff:ffff:ffff:ffff", STATUS_SUCCESS, 39, + { 0x120, 0xb80d, 0x3412, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } }, + { "2001::CE49:7601:2CAD:DFFF:7C94:FFFE", STATUS_SUCCESS, 35, + { 0x120, 0, 0x49ce, 0x176, 0xad2c, 0xffdf, 0x947c, 0xfeff } }, + { "2001:db8:85a3::8a2e:370:7334", STATUS_SUCCESS, 28, + { 0x120, 0xb80d, 0xa385, 0, 0, 0x2e8a, 0x7003, 0x3473 } }, + { "3ffe:0b00:0000:0000:0001:0000:0000:000a", STATUS_SUCCESS, 39, + { 0xfe3f, 0xb, 0, 0, 0x100, 0, 0, 0xa00 } }, + { "::", STATUS_SUCCESS, 2, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "::%16", STATUS_SUCCESS, 2, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "::/16", STATUS_SUCCESS, 2, + { 0, 0, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, + { "::0", STATUS_SUCCESS, 3, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "::0:0", STATUS_SUCCESS, 5, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "::0:0:0", STATUS_SUCCESS, 7, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "::0:0:0:0", STATUS_SUCCESS, 9, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "::0:0:0:0:0", STATUS_SUCCESS, 11, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "::0:0:0:0:0:0", STATUS_SUCCESS, 13, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + /* this one and the next one are incorrectly parsed by windows, + it adds one zero too many in front, cutting off the last digit. */ + { "::0:0:0:0:0:0:0", STATUS_SUCCESS, 13, + { 0, 0, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, + { "::0:a:b:c:d:e:f", STATUS_SUCCESS, 13, + { 0, 0, 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00 }, ex_fail_6 }, + { "::123.123.123.123", STATUS_SUCCESS, 17, + { 0, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b } }, + { "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", STATUS_SUCCESS, 39, + { 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } }, + + { "':10.0.0.1", STATUS_INVALID_PARAMETER, 0, + { -1 } }, + { "-1", STATUS_INVALID_PARAMETER, 0, + { -1 } }, + { "02001:0000:1234:0000:0000:C1C0:ABCD:0876", STATUS_INVALID_PARAMETER, -1, + { -1 } }, + { "2001:00000:1234:0000:0000:C1C0:ABCD:0876", STATUS_INVALID_PARAMETER, -1, + { 0x120, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "2001:0000:01234:0000:0000:C1C0:ABCD:0876", STATUS_INVALID_PARAMETER, -1, + { 0x120, 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1.2.3.4", STATUS_INVALID_PARAMETER, 7, + { 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1.2.3.4:1111::5555", STATUS_INVALID_PARAMETER, 7, + { 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1.2.3.4::5555", STATUS_INVALID_PARAMETER, 7, + { 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "11112222:3333:4444:5555:6666:1.2.3.4", STATUS_INVALID_PARAMETER, -1, + { -1 } }, + { "11112222:3333:4444:5555:6666:7777:8888", STATUS_INVALID_PARAMETER, -1, + { -1 } }, + { "1111", STATUS_INVALID_PARAMETER, 4, + { -1 } }, + { "1111:22223333:4444:5555:6666:1.2.3.4", STATUS_INVALID_PARAMETER, -1, + { 0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:22223333:4444:5555:6666:7777:8888", STATUS_INVALID_PARAMETER, -1, + { 0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:", STATUS_INVALID_PARAMETER, 10, + { 0x1111, 0x2222, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:1.2.3.4", STATUS_INVALID_PARAMETER, 17, + { 0x1111, 0x2222, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333", STATUS_INVALID_PARAMETER, 14, + { 0x1111, 0x2222, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444:5555:6666:7777:1.2.3.4", STATUS_SUCCESS, 36, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x100 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555:6666:7777:8888:", STATUS_SUCCESS, 39, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555:6666:7777:8888:1.2.3.4",STATUS_SUCCESS, 39, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555:6666:7777:8888:9999", STATUS_SUCCESS, 39, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 }, ex_fail_6 }, + { "1111:2222:::", STATUS_SUCCESS, 11, + { 0x1111, 0x2222, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, + { "1111::5555:", STATUS_INVALID_PARAMETER, 11, + { 0x1111, 0x5555, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111::3333:4444:5555:6666:7777::", STATUS_SUCCESS, 30, + { 0x1111, 0, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777 }, ex_fail_6 }, + { "1111:2222:::4444:5555:6666:1.2.3.4", STATUS_SUCCESS, 11, + { 0x1111, 0x2222, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, + { "1111::3333::5555:6666:1.2.3.4", STATUS_SUCCESS, 10, + { 0x1111, 0, 0, 0, 0, 0, 0, 0x3333 }, ex_fail_6 }, + { "12345::6:7:8", STATUS_INVALID_PARAMETER, -1, + { -1 } }, + { "1::1.2.256.4", STATUS_INVALID_PARAMETER, -1, + { 0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.3.256", STATUS_INVALID_PARAMETER, 12, + { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.3.300", STATUS_INVALID_PARAMETER, 12, + { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2::1", STATUS_INVALID_PARAMETER, 6, + { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.3.4::1", STATUS_SUCCESS, 10, + { 0x100, 0, 0, 0, 0, 0, 0x201, 0x403 }, ex_fail_6 }, + { "1::1.", STATUS_INVALID_PARAMETER, 5, + { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2", STATUS_INVALID_PARAMETER, 6, + { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.", STATUS_INVALID_PARAMETER, 7, + { 0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.3", STATUS_INVALID_PARAMETER, 8, + { 0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.3.", STATUS_INVALID_PARAMETER, 9, + { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.3.4", STATUS_SUCCESS, 10, + { 0x100, 0, 0, 0, 0, 0, 0x201, 0x403 } }, + { "1::1.2.3.900", STATUS_INVALID_PARAMETER, 12, + { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.300.4", STATUS_INVALID_PARAMETER, -1, + { 0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.256.3.4", STATUS_INVALID_PARAMETER, -1, + { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::256.2.3.4", STATUS_INVALID_PARAMETER, -1, + { 0x100, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::2::3", STATUS_SUCCESS, 4, + { 0x100, 0, 0, 0, 0, 0, 0, 0x200 }, ex_fail_6 }, + { "2001:0000:1234: 0000:0000:C1C0:ABCD:0876", STATUS_INVALID_PARAMETER, 15, + { 0x120, 0, 0x3412, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "2001:0000:1234:0000:0000:C1C0:ABCD:0876 0", STATUS_SUCCESS, 39, + { 0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608 }, ex_fail_6 }, + { "2001:1:1:1:1:1:255Z255X255Y255", STATUS_INVALID_PARAMETER, 18, + { 0x120, 0x100, 0x100, 0x100, 0x100, 0x100, 0xabab, 0xabab } }, + { "2001::FFD3::57ab", STATUS_SUCCESS, 10, + { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff }, ex_fail_6 }, + { ":", STATUS_INVALID_PARAMETER, 0, + { -1 } }, + { ":1111:2222:3333:4444:5555:6666:1.2.3.4", STATUS_INVALID_PARAMETER, 0, + { -1 } }, + { ":1111:2222:3333:4444:5555:6666:7777:8888", STATUS_INVALID_PARAMETER, 0, + { -1 } }, + { ":1111::", STATUS_INVALID_PARAMETER, 0, + { -1 } }, + { "::-1", STATUS_SUCCESS, 2, + { 0, 0, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, + { "::.", STATUS_SUCCESS, 2, + { 0, 0, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, + { "::..", STATUS_SUCCESS, 2, + { 0, 0, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, + { "::...", STATUS_SUCCESS, 2, + { 0, 0, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, + { "XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:1.2.3.4", STATUS_INVALID_PARAMETER, 0, + { -1 } }, + { "[::]", STATUS_INVALID_PARAMETER, 0, + { -1 }, ex_skip_6 }, +}; +const unsigned int ipv6_testcount = sizeof(ipv6_tests) / sizeof(ipv6_tests[0]); + + +static void init_ip6(IN6_ADDR* addr, const int src[8]) +{ + unsigned int j; + if (!src || src[0] == -1) + { + for (j = 0; j < 8; ++j) + addr->s6_words[j] = 0xabab; + } + else + { + for (j = 0; j < 8; ++j) + addr->s6_words[j] = src[j]; + } +} + +static void compare_RtlIpv6StringToAddressW(PCSTR name_a, int terminator_offset_a, + const struct in6_addr *addr_a, NTSTATUS res_a) +{ + WCHAR name[512]; + NTSTATUS res; + IN6_ADDR ip; + PCWSTR terminator; + + if (!pRtlIpv6StringToAddressW) + return; + + pRtlMultiByteToUnicodeN(name, sizeof(name), NULL, name_a, strlen(name_a) + 1); + + init_ip6(&ip, NULL); + terminator = (void *)0xdeadbeef; + res = pRtlIpv6StringToAddressW(name, &terminator, &ip); + ok(res == res_a, "[W:%s] res = 0x%08x, expected 0x%08x\n", name_a, res, res_a); + + if (terminator_offset_a < 0) + { + ok(terminator == (void *)0xdeadbeef, + "[W:%s] terminator = %p, expected it not to change\n", + name_a, terminator); + } + else + { + ok(terminator == name + terminator_offset_a, + "[W:%s] terminator = %p, expected %p\n", + name_a, terminator, name + terminator_offset_a); + } + + ok(!memcmp(&ip, addr_a, sizeof(ip)), + "[W:%s] ip = %x:%x:%x:%x:%x:%x:%x:%x, expected %x:%x:%x:%x:%x:%x:%x:%x\n", + name_a, + ip.s6_words[0], ip.s6_words[1], ip.s6_words[2], ip.s6_words[3], + ip.s6_words[4], ip.s6_words[5], ip.s6_words[6], ip.s6_words[7], + addr_a->s6_words[0], addr_a->s6_words[1], addr_a->s6_words[2], addr_a->s6_words[3], + addr_a->s6_words[4], addr_a->s6_words[5], addr_a->s6_words[6], addr_a->s6_words[7]); +} + +static void test_RtlIpv6StringToAddress(void) +{ + NTSTATUS res; + IN6_ADDR ip, expected_ip; + PCSTR terminator; + unsigned int i; + + if (!pRtlIpv6StringToAddressW) + { + skip("RtlIpv6StringToAddressW not available\n"); + /* we can continue, just not test W */ + } + + if (!pRtlIpv6StringToAddressA) + { + skip("RtlIpv6StringToAddressA not available\n"); + return; /* all tests are centered around A, we cannot continue */ + } + + res = pRtlIpv6StringToAddressA("::", &terminator, &ip); + ok(res == STATUS_SUCCESS, "[validate] res = 0x%08x, expected STATUS_SUCCESS\n", res); + if (0) + { + /* any of these crash */ + res = pRtlIpv6StringToAddressA(NULL, &terminator, &ip); + ok(res == STATUS_INVALID_PARAMETER, "[null string] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + res = pRtlIpv6StringToAddressA("::", NULL, &ip); + ok(res == STATUS_INVALID_PARAMETER, "[null terminator] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + res = pRtlIpv6StringToAddressA("::", &terminator, NULL); + ok(res == STATUS_INVALID_PARAMETER, "[null result] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + } + + /* sanity check */ + ok(sizeof(ip) == sizeof(USHORT)* 8, "sizeof(ip)\n"); + + for (i = 0; i < ipv6_testcount; i++) + { + init_ip6(&ip, NULL); + terminator = (void *)0xdeadbeef; + res = pRtlIpv6StringToAddressA(ipv6_tests[i].address, &terminator, &ip); + compare_RtlIpv6StringToAddressW(ipv6_tests[i].address, (terminator != (void *)0xdeadbeef) ? + (terminator - ipv6_tests[i].address) : -1, &ip, res); + + if (ipv6_tests[i].flags & win_broken_6) + { + ok(res == ipv6_tests[i].res || broken(res == STATUS_INVALID_PARAMETER), + "[%s] res = 0x%08x, expected 0x%08x\n", + ipv6_tests[i].address, res, ipv6_tests[i].res); + + if (res == STATUS_INVALID_PARAMETER) + continue; + } + else + { + ok(res == ipv6_tests[i].res, + "[%s] res = 0x%08x, expected 0x%08x\n", + ipv6_tests[i].address, res, ipv6_tests[i].res); + } + + if (ipv6_tests[i].terminator_offset < 0) + { + ok(terminator == (void *)0xdeadbeef, + "[%s] terminator = %p, expected it not to change\n", + ipv6_tests[i].address, terminator); + } + else if (ipv6_tests[i].flags & win_broken_6) + { + PCSTR expected = ipv6_tests[i].address + ipv6_tests[i].terminator_offset; + ok(terminator == expected || broken(terminator == expected + 2), + "[%s] terminator = %p, expected %p\n", + ipv6_tests[i].address, terminator, expected); + } + else + { + ok(terminator == ipv6_tests[i].address + ipv6_tests[i].terminator_offset, + "[%s] terminator = %p, expected %p\n", + ipv6_tests[i].address, terminator, ipv6_tests[i].address + ipv6_tests[i].terminator_offset); + } + + init_ip6(&expected_ip, ipv6_tests[i].ip); + ok(!memcmp(&ip, &expected_ip, sizeof(ip)), + "[%s] ip = %x:%x:%x:%x:%x:%x:%x:%x, expected %x:%x:%x:%x:%x:%x:%x:%x\n", + ipv6_tests[i].address, + ip.s6_words[0], ip.s6_words[1], ip.s6_words[2], ip.s6_words[3], + ip.s6_words[4], ip.s6_words[5], ip.s6_words[6], ip.s6_words[7], + expected_ip.s6_words[0], expected_ip.s6_words[1], expected_ip.s6_words[2], expected_ip.s6_words[3], + expected_ip.s6_words[4], expected_ip.s6_words[5], expected_ip.s6_words[6], expected_ip.s6_words[7]); + } +} + static void test_LdrAddRefDll(void) { HMODULE mod, mod2; @@ -2541,6 +2970,7 @@ START_TEST(rtl) test_RtlIpv4AddressToString(); test_RtlIpv4AddressToStringEx(); test_RtlIpv4StringToAddress(); + test_RtlIpv6StringToAddress(); test_LdrAddRefDll(); test_LdrLockLoaderLock(); test_RtlCompressBuffer(); -- 1.9.1

1 0

[PATCH v2 2/2] ntoskrnl.exe/tests: Add KeInitializeTimerEx tests
by Alistair Leslie-Hughes 09 Jul '18

09 Jul '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- v2: Corrected failed tests dlls/ntoskrnl.exe/tests/driver.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 06b365f..cde78e5 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -172,6 +172,21 @@ todo_wine IoFreeMdl(mdl); } +static void test_init_funcs(void) +{ + KTIMER timer, timer2; + + KeInitializeTimerEx(&timer, NotificationTimer); + ok(timer.Header.Type == 8, "got: %u\n", timer.Header.Type); + ok(timer.Header.Size == 0 || timer.Header.Size == 10, "got: %u\n", timer.Header.Size); + ok(timer.Header.SignalState == 0, "got: %u\n", timer.Header.SignalState); + + KeInitializeTimerEx(&timer2, SynchronizationTimer); + ok(timer2.Header.Type == 9, "got: %u\n", timer2.Header.Type); + ok(timer2.Header.Size == 0 || timer2.Header.Size == 10, "got: %u\n", timer2.Header.Size); + ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); +} + static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -197,6 +212,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) test_currentprocess(); test_mdl_map(); + test_init_funcs(); /* print process report */ if (test_input->winetest_debug) -- 1.9.1

1 0

[PATCH v2 1/2] ntoskrnl.exe: Improve KeInitializeTimerEx stub.
by Alistair Leslie-Hughes 09 Jul '18

09 Jul '18

From: Alexander Morozov <amorozov(a)etersoft.ru> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c8f9173..41f3862 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1923,6 +1923,9 @@ void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock ) void WINAPI KeInitializeTimerEx( PKTIMER Timer, TIMER_TYPE Type ) { FIXME( "stub: %p %d\n", Timer, Type ); + + RtlZeroMemory(Timer, sizeof(KTIMER)); + Timer->Header.Type = Type ? 9 : 8; } -- 1.9.1

1 0

[PATCH 2/2] ntoskrnl.exe/tests: Add KeInitializeTimerEx tests
by Alistair Leslie-Hughes 09 Jul '18

09 Jul '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/tests/driver.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 06b365f..eb378ce 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -172,6 +172,21 @@ todo_wine IoFreeMdl(mdl); } +static void test_init_funcs(void) +{ + KTIMER timer, timer2; + + KeInitializeTimerEx(&timer, NotificationTimer); + ok(timer.Header.Type == 8, "got: %u\n", timer.Header.Type); + ok(timer.Header.Size == 0, "got: %u\n", timer.Header.Size); + ok(timer.Header.SignalState == 0, "got: %u\n", timer.Header.SignalState); + + KeInitializeTimerEx(&timer2, SynchronizationTimer); + ok(timer2.Header.Type == 9, "got: %u\n", timer2.Header.Type); + ok(timer2.Header.Size == 0, "got: %u\n", timer2.Header.Size); + ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); +} + static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -197,6 +212,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) test_currentprocess(); test_mdl_map(); + test_init_funcs(); /* print process report */ if (test_input->winetest_debug) -- 1.9.1

2 1

[PATCH 1/2] ntoskrnl.exe: Improve KeInitializeTimerEx stub.
by Alistair Leslie-Hughes 09 Jul '18

09 Jul '18

From: Alexander Morozov <amorozov(a)etersoft.ru> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c8f9173..41f3862 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1923,6 +1923,9 @@ void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock ) void WINAPI KeInitializeTimerEx( PKTIMER Timer, TIMER_TYPE Type ) { FIXME( "stub: %p %d\n", Timer, Type ); + + RtlZeroMemory(Timer, sizeof(KTIMER)); + Timer->Header.Type = Type ? 9 : 8; } -- 1.9.1

1 0

[PATCH 1/2] ntdll/tests: Add RtlFindNextForwardRun{Set,Clear} tests
by janisozaur＠gmail.com 08 Jul '18

08 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> The tests in particular should trigger an edge case in implementation Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> --- dlls/ntdll/tests/rtlbitmap.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/ntdll/tests/rtlbitmap.c b/dlls/ntdll/tests/rtlbitmap.c index 9552318e7f..3c3992e8fc 100644 --- a/dlls/ntdll/tests/rtlbitmap.c +++ b/dlls/ntdll/tests/rtlbitmap.c @@ -40,6 +40,8 @@ static CCHAR (WINAPI *pRtlFindMostSignificantBit)(ULONGLONG); static CCHAR (WINAPI *pRtlFindLeastSignificantBit)(ULONGLONG); static ULONG (WINAPI *pRtlFindSetRuns)(PRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); static ULONG (WINAPI *pRtlFindClearRuns)(PRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); +static ULONG (WINAPI *pRtlFindNextForwardRunSet)(PRTL_BITMAP,ULONG,PULONG); +static ULONG (WINAPI *pRtlFindNextForwardRunClear)(PRTL_BITMAP,ULONG,PULONG); static ULONG (WINAPI *pRtlNumberOfSetBits)(PRTL_BITMAP); static ULONG (WINAPI *pRtlNumberOfClearBits)(PRTL_BITMAP); static ULONG (WINAPI *pRtlFindLongestRunSet)(PRTL_BITMAP,PULONG); @@ -69,6 +71,8 @@ static void InitFunctionPtrs(void) pRtlFindLeastSignificantBit = (void *)GetProcAddress(hntdll, "RtlFindLeastSignificantBit"); pRtlFindSetRuns = (void *)GetProcAddress(hntdll, "RtlFindSetRuns"); pRtlFindClearRuns = (void *)GetProcAddress(hntdll, "RtlFindClearRuns"); + pRtlFindNextForwardRunSet = (void *)GetProcAddress(hntdll, "RtlFindNextForwardRunSet"); + pRtlFindNextForwardRunClear = (void *)GetProcAddress(hntdll, "RtlFindNextForwardRunClear"); pRtlFindLongestRunSet = (void *)GetProcAddress(hntdll, "RtlFindLongestRunSet"); pRtlFindLongestRunClear = (void *)GetProcAddress(hntdll, "RtlFindLongestRunClear"); } @@ -620,6 +624,35 @@ static void test_RtlFindClearRuns(void) } } + +static void test_RtlFindNextForwardRunSet(void) +{ + BYTE mask[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff }; + ULONG ulStart = 0; + ULONG ulCount, lpPos; + if (!pRtlFindNextForwardRunSet) + return; + + pRtlInitializeBitMap(&bm, mask, 62); + ulCount = pRtlFindNextForwardRunSet(&bm, ulStart, &lpPos); + ok(ulCount == 6, "Invalid length of found set run: %d, expected 6\n", ulCount); + ok(lpPos == 56, "Invalid position of found set run: %d, expected 56\n", lpPos); +} + +static void test_RtlFindNextForwardRunClear(void) +{ + BYTE mask[8] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 }; + ULONG ulStart = 0; + ULONG ulCount, lpPos; + if (!pRtlFindNextForwardRunClear) + return; + + pRtlInitializeBitMap(&bm, mask, 62); + ulCount = pRtlFindNextForwardRunClear(&bm, ulStart, &lpPos); + ok(ulCount == 6, "Invalid length of found clear run: %d, expected 6\n", ulCount); + ok(lpPos == 56, "Invalid position of found clear run: %d, expected 56\n", lpPos); +} + #endif START_TEST(rtlbitmap) @@ -645,6 +678,8 @@ START_TEST(rtlbitmap) test_RtlFindLeastSignificantBit(); test_RtlFindSetRuns(); test_RtlFindClearRuns(); + test_RtlFindNextForwardRunSet(); + test_RtlFindNextForwardRunClear(); } #endif } -- 2.18.0

3 3

[PATCH v2 1/2] ntdll/tests: Add RtlFindNextForwardRun{Set, Clear} tests
by janisozaur＠gmail.com 08 Jul '18

08 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> The tests in particular should trigger an edge case in implementation v2: add `todo_wine` for new failing tests Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> --- dlls/ntdll/tests/rtlbitmap.c | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/ntdll/tests/rtlbitmap.c b/dlls/ntdll/tests/rtlbitmap.c index 9552318e7f..10ee5f64fd 100644 --- a/dlls/ntdll/tests/rtlbitmap.c +++ b/dlls/ntdll/tests/rtlbitmap.c @@ -40,6 +40,8 @@ static CCHAR (WINAPI *pRtlFindMostSignificantBit)(ULONGLONG); static CCHAR (WINAPI *pRtlFindLeastSignificantBit)(ULONGLONG); static ULONG (WINAPI *pRtlFindSetRuns)(PRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); static ULONG (WINAPI *pRtlFindClearRuns)(PRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); +static ULONG (WINAPI *pRtlFindNextForwardRunSet)(PRTL_BITMAP,ULONG,PULONG); +static ULONG (WINAPI *pRtlFindNextForwardRunClear)(PRTL_BITMAP,ULONG,PULONG); static ULONG (WINAPI *pRtlNumberOfSetBits)(PRTL_BITMAP); static ULONG (WINAPI *pRtlNumberOfClearBits)(PRTL_BITMAP); static ULONG (WINAPI *pRtlFindLongestRunSet)(PRTL_BITMAP,PULONG); @@ -69,6 +71,8 @@ static void InitFunctionPtrs(void) pRtlFindLeastSignificantBit = (void *)GetProcAddress(hntdll, "RtlFindLeastSignificantBit"); pRtlFindSetRuns = (void *)GetProcAddress(hntdll, "RtlFindSetRuns"); pRtlFindClearRuns = (void *)GetProcAddress(hntdll, "RtlFindClearRuns"); + pRtlFindNextForwardRunSet = (void *)GetProcAddress(hntdll, "RtlFindNextForwardRunSet"); + pRtlFindNextForwardRunClear = (void *)GetProcAddress(hntdll, "RtlFindNextForwardRunClear"); pRtlFindLongestRunSet = (void *)GetProcAddress(hntdll, "RtlFindLongestRunSet"); pRtlFindLongestRunClear = (void *)GetProcAddress(hntdll, "RtlFindLongestRunClear"); } @@ -620,6 +624,37 @@ static void test_RtlFindClearRuns(void) } } + +static void test_RtlFindNextForwardRunSet(void) +{ + BYTE mask[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff }; + ULONG ulStart = 0; + ULONG ulCount, lpPos; + if (!pRtlFindNextForwardRunSet) + return; + + pRtlInitializeBitMap(&bm, mask, 62); + ulCount = pRtlFindNextForwardRunSet(&bm, ulStart, &lpPos); + todo_wine + ok(ulCount == 6, "Invalid length of found set run: %d, expected 6\n", ulCount); + ok(lpPos == 56, "Invalid position of found set run: %d, expected 56\n", lpPos); +} + +static void test_RtlFindNextForwardRunClear(void) +{ + BYTE mask[8] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 }; + ULONG ulStart = 0; + ULONG ulCount, lpPos; + if (!pRtlFindNextForwardRunClear) + return; + + pRtlInitializeBitMap(&bm, mask, 62); + ulCount = pRtlFindNextForwardRunClear(&bm, ulStart, &lpPos); + todo_wine + ok(ulCount == 6, "Invalid length of found clear run: %d, expected 6\n", ulCount); + ok(lpPos == 56, "Invalid position of found clear run: %d, expected 56\n", lpPos); +} + #endif START_TEST(rtlbitmap) @@ -645,6 +680,8 @@ START_TEST(rtlbitmap) test_RtlFindLeastSignificantBit(); test_RtlFindSetRuns(); test_RtlFindClearRuns(); + test_RtlFindNextForwardRunSet(); + test_RtlFindNextForwardRunClear(); } #endif } -- 2.18.0

1 1

[PATCH] kernel32: Fill stack with meaningful values in call_process_entry mis-align workaround.
by André Hentschel 08 Jul '18

08 Jul '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/process.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ff56e9a..7787a32 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1042,7 +1042,9 @@ __ASM_GLOBAL_FUNC( call_process_entry, __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "subl $12,%esp\n\t" /* deliberately mis-align the stack by 8, Doom 3 needs this */ + "pushl 4(%ebp)\n\t" /* deliberately mis-align the stack by 8, Doom 3 needs this */ + "pushl 4(%ebp)\n\t" /* Driller expects readable address at this offset */ + "pushl 4(%ebp)\n\t" "pushl 8(%ebp)\n\t" "call *12(%ebp)\n\t" "leave\n\t" -- 2.7.4

1 0

[PATCH 1/2] kernel32/tests: resource: Replicate muirct.exe behavior
by Jon Doron 08 Jul '18

08 Jul '18

For some reason muirct.exe is aware of the opaque structure used by BeginUpdateResource, it access the filename field of the opaque structure during it's processing. MS documentation for the muirct utility: https://docs.microsoft.com/en-us/windows/desktop/intl/resource-utilities Sample execution: MUIRCT.EXE -c "ui.exe" -e "de-DE\ui.exe.mui" --- dlls/kernel32/tests/resource.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 74066cfba3..6db9655833 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -24,6 +24,7 @@ #include "wine/test.h" static const char filename[] = "test_.exe"; +static const wchar_t filenameW[] = L"test_.exe"; static DWORD GLE; enum constants { @@ -463,6 +464,28 @@ static void test_find_resource(void) ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %u\n", GetLastError() ); } +static void test_muirct_compatiblity(void) +{ + HANDLE res = NULL; + PVOID res_data; + PWCHAR res_filename; + + res = BeginUpdateResourceW( (PWCHAR)filenameW, FALSE ); + ok( res != NULL, "BeginUpdateResourceW failed\n" ); + res_data = GlobalLock(res); + ok( res_data != NULL, "GlobalLock failed\n" ); +#ifdef _WIN64 + res_filename = (PWCHAR)GlobalLock( *(HGLOBAL*)((ULONG_PTR)res_data + 0x30) ); +#else + res_filename = (PWCHAR)GlobalLock( *(HGLOBAL*)((ULONG_PTR)res_data + 0x18) ); +#endif + ok( res_filename != NULL, "GlobalLock for res_filename failed\n" ); + ok( !lstrcmpW(res_filename, (PWCHAR)filenameW), "Filename fields do not match\n" ); + ok( GlobalUnlock( res_filename ), "GlobalUnlock res_filenamed failed\n" ); + ok( GlobalUnlock( res_data ), "GlobalUnlock res_data failed\n" ); + ok( EndUpdateResourceW( res, TRUE ), "EndUpdateResourceW failed\n"); +} + START_TEST(resource) { DWORD i; @@ -482,6 +505,7 @@ START_TEST(resource) { const struct _sec_variants *sec = &sec_variants[i]; build_exe( &sec->build ); + test_muirct_compatiblity(); update_resources_none(); check_exe( &sec->chk_none ); update_resources_delete(); -- 2.17.1

1 1

Ansible: Compiling Wine 32 and 64 bit on Debian made easy
by Francois Gouget 08 Jul '18

08 Jul '18

Debian's multi-arch support is great... in theory. In practice a lot of packages don't support multi-arch or have broken multi-arch support which makes it hard to compile the 32 and 64 bit versions of Wine. Since this is something the TestBot needs to do and it would be nice if anyone could replicate the TestBot infrastructure I wrote Ansible playbooks. One of those configures a Debian 9 system so it has all the 32 and 64 bit dependencies needed to compile Wine (except for GStreamer due to extensive breakage, and vkd3d which is too new). I don't know if that would help people using Ubuntu or other versions of Debian but here are the playbooks in case anyone wants to try them. Here's how one would use the attached tar file to configure their own system: * Unpack the tar file. * Install ansible on your machine. * Tell ansible to set up you machine. cd ansible mkdir inventories/devel vi inventories/devel/inventory Write the following [unix-winebuild] localhost [my_ansible] localhost [my_ansible:vars] ansible_become=yes * Then either (if I remember correctly) run the following command line as root: ./playbooks/unix-winebuild.yml Or if you can sudo root you could also run it as follows: ./playbooks/unix-winebuild.yml --ask-become-pass And of course, since this is ansible, if you have your credentials set correctly you can apply this to any number of remote host with just that same command. Also note that you only need to install ansible on the machine you will use to set up your remote hosts or virtual machines. Here's some more details about what you'll find in the tar file: Playbooks: * unix-winebuild: To set up the system to compile the 32 and 64 bit versions of Wine. This installs all the reauired development packages, works around the development packages that cannot be installed because of multi-arch issues, etc. So this is the playbook you want! * unix-winepe: Configures a host to build Wine PE binaries. Roles: * setup_multiarch: To enable the amd64 and i386 architectures. * fix_pymultiarch: To fix Debian packages that have broken prerm or postinst scripts that totally break the packaging system once they are installed for more than one architecture. winebuild needs it for gir1.2-ibus-1.0. * apt_multiarch: A multiarch aware role for installing packages. * solink: To create missing .so symbolic links for development packages. * apt_bad_dev: To install development packages and workaround issues for those that are not multiarch-compatible. * winebuild: To set up the system to compile the 32 and 64 bit versions of Wine. * winebuildtools: Configures a host to be able to build Wine's native tools. * winepe: Configures a host to build Wine PE binaries. -- Francois Gouget <fgouget(a)codeweavers.com>

4 4

[PATCH] msacm32: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc 07 Jul '18

07 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msacm32/pcmconverter.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index d52662ac76..a2dd9da278 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -71,7 +71,6 @@ static DWORD PCM_drvClose(DWORD dwDevID) return 1; } -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) #define NUM_OF(a,b) ((a)/(b)) /* flags for fdwDriver */ @@ -114,7 +113,7 @@ static DWORD PCM_GetFormatIndex(LPWAVEFORMATEX wfx) unsigned int i; TRACE("(%p)\n", wfx); - for (i = 0; i < NUM_PCM_FORMATS; i++) { + for (i = 0; i < ARRAY_SIZE(PCM_Formats); i++) { if (wfx->nChannels == PCM_Formats[i].nChannels && wfx->nSamplesPerSec == PCM_Formats[i].rate && wfx->wBitsPerSample == PCM_Formats[i].nBits) @@ -1035,7 +1034,7 @@ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); aftd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CONVERTER; - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); aftd->szFormatTag[0] = 0; return MMSYSERR_NOERROR; @@ -1057,7 +1056,7 @@ static LRESULT PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) } break; case ACM_FORMATDETAILSF_INDEX: - assert(afd->dwFormatIndex < NUM_PCM_FORMATS); + assert(afd->dwFormatIndex < ARRAY_SIZE(PCM_Formats)); afd->pwfx->wFormatTag = WAVE_FORMAT_PCM; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; -- 2.14.4

1 0

[PATCH] l3codeca.acm: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc 07 Jul '18

07 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/l3codeca.acm/mpegl3.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index 0e419bd66d..c8929651b6 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -89,9 +89,6 @@ static const Format MPEG3_Formats[] = {1, 0, 48000}, {2, 0, 48000} }; -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) -#define NUM_MPEG3_FORMATS (sizeof(MPEG3_Formats) / sizeof(MPEG3_Formats[0])) - /*********************************************************************** * MPEG3_GetFormatIndex */ @@ -103,12 +100,12 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx) switch (wfx->wFormatTag) { case WAVE_FORMAT_PCM: - hi = NUM_PCM_FORMATS; + hi = ARRAY_SIZE(PCM_Formats); fmts = PCM_Formats; break; case WAVE_FORMAT_MPEG: case WAVE_FORMAT_MPEGLAYER3: - hi = NUM_MPEG3_FORMATS; + hi = ARRAY_SIZE(MPEG3_Formats); fmts = MPEG3_Formats; break; default: @@ -733,7 +730,7 @@ static LRESULT MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) case 0: aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); lstrcpyW(aftd->szFormatTag, szPcm); break; case 1: @@ -768,7 +765,7 @@ static LRESULT MPEG3_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) switch (afd->dwFormatTag) { case WAVE_FORMAT_PCM: - if (afd->dwFormatIndex >= NUM_PCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(PCM_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits; -- 2.14.4

1 0

[PATCH] winex11.drv: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc 07 Jul '18

07 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 10 +++++----- dlls/winex11.drv/desktop.c | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index c55a2661fb..296c00c3a5 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -187,7 +187,6 @@ static const struct static struct list format_list = LIST_INIT( format_list ); -#define NB_BUILTIN_FORMATS (sizeof(builtin_formats) / sizeof(builtin_formats[0])) #define GET_ATOM(prop) (((prop) < FIRST_XATOM) ? (Atom)(prop) : X11DRV_Atoms[(prop) - FIRST_XATOM]) static DWORD clipboard_thread_id; @@ -295,9 +294,9 @@ static void register_builtin_formats(void) struct clipboard_format *formats; unsigned int i; - if (!(formats = HeapAlloc( GetProcessHeap(), 0, NB_BUILTIN_FORMATS * sizeof(*formats)))) return; + if (!(formats = HeapAlloc( GetProcessHeap(), 0, ARRAY_SIZE(builtin_formats) * sizeof(*formats)))) return; - for (i = 0; i < NB_BUILTIN_FORMATS; i++) + for (i = 0; i < ARRAY_SIZE(builtin_formats); i++) { if (builtin_formats[i].name) formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); @@ -983,7 +982,7 @@ static HANDLE import_targets( Atom type, const void *data, size_t size ) register_x11_formats( properties, count ); /* the builtin formats contain duplicates, so allocate some extra space */ - if (!(formats = HeapAlloc( GetProcessHeap(), 0, (count + NB_BUILTIN_FORMATS) * sizeof(*formats )))) + if (!(formats = HeapAlloc( GetProcessHeap(), 0, (count + ARRAY_SIZE(builtin_formats)) * sizeof(*formats )))) return 0; pos = 0; @@ -1454,7 +1453,8 @@ static BOOL export_targets( Display *display, Window win, Atom prop, Atom target if (!(formats = get_clipboard_formats( &count ))) return FALSE; /* the builtin formats contain duplicates, so allocate some extra space */ - if (!(targets = HeapAlloc( GetProcessHeap(), 0, (count + NB_BUILTIN_FORMATS) * sizeof(*targets) ))) + if (!(targets = HeapAlloc( GetProcessHeap(), 0, + (count + ARRAY_SIZE(builtin_formats)) * sizeof(*targets) ))) { HeapFree( GetProcessHeap(), 0, formats ); return FALSE; diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 4df8784a97..559efe2beb 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -73,7 +73,6 @@ static struct screen_size { {1920, 1200}, {2560, 1600} }; -#define NUM_DESKTOP_MODES (sizeof(screen_sizes) / sizeof(struct screen_size)) #define _NET_WM_STATE_REMOVE 0 #define _NET_WM_STATE_ADD 1 @@ -88,7 +87,7 @@ static void make_modes(void) /* original specified desktop size */ X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 60); - for (i=0; i<NUM_DESKTOP_MODES; i++) + for (i=0; i<ARRAY_SIZE(screen_sizes); i++) { if ( (screen_sizes[i].width <= max_width) && (screen_sizes[i].height <= max_height) ) { @@ -160,7 +159,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) dd_modes = X11DRV_Settings_SetHandlers("desktop", X11DRV_desktop_GetCurrentMode, X11DRV_desktop_SetCurrentMode, - NUM_DESKTOP_MODES+2, 1); + ARRAY_SIZE(screen_sizes)+2, 1); make_modes(); X11DRV_Settings_AddDepthModes(); dd_mode_count = X11DRV_Settings_GetModeCount(); -- 2.14.4

1 0

[PATCH] shell32: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc 07 Jul '18

07 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shfldr_mycomp.c | 8 +++----- dlls/shell32/shfldr_printers.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index b5b9ff22ae..60f32f1f23 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -87,8 +87,6 @@ static const shvheader mycomputer_header[] = { NULL, 0, IDS_SHV_COLUMN7, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10 }, }; -#define MYCOMPUTERSHELLVIEWCOLUMNS sizeof(mycomputer_header)/sizeof(shvheader) - /************************************************************************** * ISF_MyComputer_Constructor */ @@ -799,7 +797,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumnState ( TRACE ("(%p)->(%d %p)\n", This, iColumn, pcsFlags); - if (!pcsFlags || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (!pcsFlags || iColumn >= ARRAY_SIZE(mycomputer_header)) return E_INVALIDARG; *pcsFlags = mycomputer_header[iColumn].pcsFlags; @@ -826,7 +824,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDetailsOf (IShellFolder2 *iface, TRACE ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); - if (!psd || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (!psd || iColumn >= ARRAY_SIZE(mycomputer_header)) return E_INVALIDARG; if (!pidl) @@ -871,7 +869,7 @@ static HRESULT WINAPI ISF_MyComputer_fnMapColumnToSCID (IShellFolder2 *iface, UI TRACE("(%p)->(%u %p)\n", This, column, scid); - if (column >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (column >= ARRAY_SIZE(mycomputer_header)) return E_INVALIDARG; return shellfolder_map_column_to_scid(mycomputer_header, column, scid); diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 66260ac816..8e25e58857 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -63,8 +63,6 @@ static const shvheader printers_header[] = { { NULL, 0, IDS_SHV_COL_MODEL, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20 } }; -#define PRINTERS_FOLDER_COL_NUM sizeof(printers_header)/sizeof(shvheader) - static HRESULT WINAPI IShellFolder_Printers_fnQueryInterface(IShellFolder2 *iface, REFIID riid, LPVOID *ppvObj) { @@ -283,7 +281,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDefaultColumnState ( TRACE("(%p)->(%d %p)\n", This, iColumn, pcsFlags); - if (iColumn >= PRINTERS_FOLDER_COL_NUM) + if (iColumn >= ARRAY_SIZE(printers_header)) return E_INVALIDARG; *pcsFlags = printers_header[iColumn].pcsFlags; @@ -306,7 +304,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDetailsOf (IShellFolder2 *iface TRACE("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); - if (iColumn >= PRINTERS_FOLDER_COL_NUM) + if (iColumn >= ARRAY_SIZE(printers_header)) return E_NOTIMPL; if (!pidl) @@ -323,7 +321,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnMapColumnToSCID (IShellFolder2 *if TRACE("(%p)->(%u %p)\n", This, column, scid); - if (column >= PRINTERS_FOLDER_COL_NUM) + if (column >= ARRAY_SIZE(printers_header)) return E_INVALIDARG; return shellfolder_map_column_to_scid(printers_header, column, scid); -- 2.14.4

1 0

[PATCH] msvcrt: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc
by Alex Henrie 07 Jul '18

07 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/heap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 7ea80a3a50..b4f11d8ef4 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -21,6 +21,7 @@ * handler and non atomic heap operations */ +#include "config.h" #include "msvcrt.h" #include "mtdll.h" #include "wine/debug.h" @@ -127,7 +128,7 @@ static MSVCRT_size_t msvcrt_heap_size(void *ptr) /********************************************************************* * ??2@YAPAXI@Z (MSVCRT.@) */ -void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_operator_new(MSVCRT_size_t size) { void *retval; int freed; @@ -169,7 +170,7 @@ void* CDECL MSVCRT_operator_new_dbg(MSVCRT_size_t size, int type, const char *fi /********************************************************************* * ??3@YAXPAX@Z (MSVCRT.@) */ -void CDECL MSVCRT_operator_delete(void *mem) +void CDECL DECLSPEC_HOTPATCH MSVCRT_operator_delete(void *mem) { TRACE("(%p)\n", mem); msvcrt_heap_free(mem); @@ -394,7 +395,7 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs /********************************************************************* * calloc (MSVCRT.@) */ -void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) { MSVCRT_size_t bytes = count*size; @@ -420,7 +421,7 @@ void* CDECL _calloc_base(MSVCRT_size_t count, MSVCRT_size_t size) /********************************************************************* * free (MSVCRT.@) */ -void CDECL MSVCRT_free(void* ptr) +void CDECL DECLSPEC_HOTPATCH MSVCRT_free(void* ptr) { msvcrt_heap_free(ptr); } @@ -459,7 +460,7 @@ void* CDECL _malloc_base(MSVCRT_size_t size) /********************************************************************* * realloc (MSVCRT.@) */ -void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_realloc(void* ptr, MSVCRT_size_t size) { if (!ptr) return MSVCRT_malloc(size); if (size) return msvcrt_heap_realloc(0, ptr, size); -- 2.18.0

2 3

[PATCH] ole32: Return IUnknown interface from GITCF_CreateInstance if requested
by Alex Henrie 06 Jul '18

06 Jul '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Without this patch, ArcMap.exe (part of ArcGIS Desktop 10.6) crashes shortly after starting. --- dlls/ole32/git.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index f7a0460154..10a15e43d5 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -314,7 +314,8 @@ static HRESULT WINAPI GITCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { - if (IsEqualIID(riid,&IID_IGlobalInterfaceTable)) { + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IGlobalInterfaceTable)) { IGlobalInterfaceTable *git = get_std_git(); return IGlobalInterfaceTable_QueryInterface(git, riid, ppv); } -- 2.18.0

2 1

[PATCH] oleaut32: Add DECLSPEC_HOTPATCH to functions patched by MS Word 2010
by Alex Henrie 06 Jul '18

06 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/variant.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index d03893a938..608446d737 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -272,7 +272,7 @@ static inline IMalloc *get_malloc(void) * See BSTR. * str may be NULL, in which case this function does nothing. */ -void WINAPI SysFreeString(BSTR str) +void WINAPI DECLSPEC_HOTPATCH SysFreeString(BSTR str) { bstr_cache_entry_t *cache_entry; bstr_t *bstr; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b9cf4b0a00..9c97ab3ce6 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -648,7 +648,7 @@ HRESULT VARIANT_ClearInd(VARIANTARG *pVarg) * Success: S_OK. Any previous value in pVarg is freed and its type is set to VT_EMPTY. * Failure: DISP_E_BADVARTYPE, if the variant is not a valid variant type. */ -HRESULT WINAPI VariantClear(VARIANTARG* pVarg) +HRESULT WINAPI DECLSPEC_HOTPATCH VariantClear(VARIANTARG* pVarg) { HRESULT hres; @@ -962,8 +962,8 @@ VariantCopyInd_Return: * The LCID used for the conversion is LOCALE_USER_DEFAULT. * See VariantChangeTypeEx. */ -HRESULT WINAPI VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, - USHORT wFlags, VARTYPE vt) +HRESULT WINAPI DECLSPEC_HOTPATCH VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, + USHORT wFlags, VARTYPE vt) { return VariantChangeTypeEx( pvargDest, pvargSrc, LOCALE_USER_DEFAULT, wFlags, vt ); } -- 2.18.0

1 0

[PATCH] kernel32: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc
by Alex Henrie 06 Jul '18

06 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index c7a15cdcbb..3362868ba0 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -314,7 +314,7 @@ SIZE_T WINAPI VirtualQueryEx( HANDLE process, LPCVOID addr, * Success: Starting address of mapped view. * Failure: NULL. */ -LPVOID WINAPI DECLSPEC_HOTPATCH MapViewOfFile( HANDLE mapping, DWORD access, +void * WINAPI DECLSPEC_HOTPATCH MapViewOfFile( HANDLE mapping, DWORD access, DWORD offset_high, DWORD offset_low, SIZE_T count ) { return MapViewOfFileEx( mapping, access, offset_high, @@ -384,7 +384,7 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE handle, DWORD access, * Failure: FALSE. * */ -BOOL WINAPI UnmapViewOfFile( LPCVOID addr ) +BOOL WINAPI DECLSPEC_HOTPATCH UnmapViewOfFile( const void *addr ) { NTSTATUS status; -- 2.18.0

1 0

[PATCH] ntdll: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc
by Alex Henrie 06 Jul '18

06 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ca08f9d854..4494b92414 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1662,7 +1662,7 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) * NOTES * This call does not SetLastError(). */ -PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) +void * WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) { ARENA_FREE *pArena; ARENA_INUSE *pInUse; @@ -1747,7 +1747,7 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) * Success: TRUE, if ptr is NULL or was freed successfully. * Failure: FALSE. */ -BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, ULONG flags, PVOID ptr ) +BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE heap, ULONG flags, void *ptr ) { ARENA_INUSE *pInUse; SUBHEAP *subheap; -- 2.18.0

1 0

[PATCH] po: Update Norwegian translation.
by Kim Malmo 06 Jul '18

06 Jul '18

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 74 ++++++++++++----------------------------------------- 1 file changed, 17 insertions(+), 57 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b5d496d896..40775b064e 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-06-09 23:18+0200\n" +"PO-Revision-Date: 2018-07-06 19:05+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -3436,32 +3436,24 @@ msgid "Publishers..." msgstr "Utgivere..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Lokal nettverksforbindelse" +msgstr "Nettverksforbindelser" #: inetcpl.rc:125 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Lokal tjener" +msgstr "Mellomtjener" #: inetcpl.rc:126 msgid "Use a proxy server" -msgstr "" +msgstr "Bruk en mellomtjener" #: inetcpl.rc:127 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Adresse" +msgstr "Adresse:" #: inetcpl.rc:129 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Ingen porter" +msgstr "Port:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -4451,7 +4443,7 @@ msgstr "Katalognavnet er ugyldig.\n" #: winerror.mc:918 msgid "Extended attributes didn't fit.\n" -msgstr "De utvidede atributtene fikk ikke plass.\n" +msgstr "De utvidede egenskapene fikk ikke plass.\n" #: winerror.mc:923 msgid "Extended attribute file corrupt.\n" @@ -4467,7 +4459,7 @@ msgstr "Ugyldig referanse for utvidet atributt.\n" #: winerror.mc:938 msgid "Extended attributes not supported.\n" -msgstr "Utvidede atributter støttes ikke.\n" +msgstr "Utvidede egenskaper støttes ikke.\n" #: winerror.mc:943 msgid "Mutex not owned by caller.\n" @@ -6799,7 +6791,7 @@ msgstr "&Format:" #: msacm32.rc:47 msgid "&Attributes:" -msgstr "&Attributter:" +msgstr "&Egenskaper:" #: mshtml.rc:39 msgid "Hyperlink" @@ -8559,7 +8551,7 @@ msgstr "Dato opprettet:" #: shell32.rc:369 shell32.rc:406 msgid "Attributes:" -msgstr "Attributter:" +msgstr "Egenskaper:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8599,7 +8591,7 @@ msgstr "Endret" #: shell32.rc:141 winefile.rc:172 winefile.rc:114 msgid "Attributes" -msgstr "Attributter" +msgstr "Egenskaper" #: shell32.rc:143 msgid "Size available" @@ -9241,10 +9233,12 @@ msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"SSL-sertifikatdato som ble mottatt fra tjeneren er feil. Sertifikatet er " +"utgått.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL-sertifikatets vertsnavn-felt er feil.\n" #: winmm.rc:32 msgid "The specified command was carried out." @@ -12020,7 +12014,7 @@ msgstr "Kopier program:" #: progman.rc:152 msgid "Program Group Attributes" -msgstr "Programgruppeattributter" +msgstr "Programgruppe-egenskaper" #: progman.rc:156 msgid "&Group file:" @@ -12028,7 +12022,7 @@ msgstr "&Gruppefil:" #: progman.rc:168 msgid "Program Attributes" -msgstr "Programattributter" +msgstr "Programegenskaper" #: progman.rc:172 progman.rc:212 msgid "&Command line:" @@ -15664,41 +15658,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15762,6 +15721,7 @@ msgstr "" "[/A] Bare kopier filer som er markert som arkiv.\n" "[/M] Bare kopier filer som er markert som arkiv; fjern denne\n" "\tmerkingen etterpå.\n" +"[/K] Kopier filegenskaper, uten denne blir ikke egenskapene preservert.\n" "[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n" "\t\tden oppgitte datoen. Hvis ingen dato oppgis kopieres det bare hvis\n" "\t\tmålet er eldre enn kilden.\n" -- 2.17.1

1 0

[PATCH] mscoree: Use the more common ARRAY_SIZE spelling
by Michael Stefaniuc 06 Jul '18

06 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 64f345d850..0c933cac29 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1607,7 +1607,6 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, } #define CHARS_IN_GUID 39 -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) { @@ -1618,7 +1617,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; static const WCHAR wszInprocServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; static const WCHAR wszDLL[] = {'.','d','l','l',0}; - WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) + ARRAYSIZE(wszInprocServer32) - 1]; + WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(wszCLSIDSlash) + ARRAY_SIZE(wszInprocServer32) - 1]; MonoDomain *domain; MonoAssembly *assembly; ICLRRuntimeInfo *info = NULL; -- 2.14.4

2 1

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 06 Jul '18

06 Jul '18

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/po/fi.po b/po/fi.po index d2d9a47314..c563ff6043 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15627,41 +15627,6 @@ msgid "D" msgstr "H" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15724,6 +15689,7 @@ msgstr "" "[/A] Kopioi vain tiedostot, joilla on arkistointiattribuutti.\n" "[/M] Kopioi vain tiedostot, joilla on arkistointiattribuutti, ja\n" "\tpoista arkistointiattribuutti.\n" +"[/K] Kopioi myös attribuutit. Muuten attribuutit eivät säily.\n" "[/D | /D:k-p-v] Kopioi uudet tiedostot tai ne, joita on muokattu annetun\n" "\t\tpäivän jälkeen. Jos päivää ei anneta, kopioi vain, jos\n" "\t\tkohde on vanhempi kuin lähde.\n" -- 2.18.0

1 0

Re: Dmitry Timoshkov : user32: For an owner-drawn listbox without strings WM_MEASUREITEM still needs correct itemData.
by Nikolay Sivov 06 Jul '18

06 Jul '18

On 6/28/2018 11:55 PM, Alexandre Julliard wrote: > Module: wine > Branch: master > Commit: 8b864ae9aa6284206dcef57ed716227cb41ca6c9 > URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b864ae9aa6284206dcef57e… > > Author: Dmitry Timoshkov <dmitry(a)baikal.ru> > Date: Thu Jun 28 18:48:50 2018 +0800 > > user32: For an owner-drawn listbox without strings WM_MEASUREITEM still needs correct itemData. > > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > > --- > > dlls/user32/listbox.c | 2 +- > dlls/user32/tests/msg.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c > index 9caccf6..af8ee40 100644 > --- a/dlls/user32/listbox.c > +++ b/dlls/user32/listbox.c > @@ -1554,7 +1554,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, > mis.CtlType = ODT_LISTBOX; > mis.CtlID = id; > mis.itemID = index; > - mis.itemData = data; > + mis.itemData = str ? (ULONG_PTR)str : data; > mis.itemHeight = descr->item_height; > SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); > item->height = mis.itemHeight ? mis.itemHeight : 1; > diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c > index da01766..052b9b9 100644 > --- a/dlls/user32/tests/msg.c > +++ b/dlls/user32/tests/msg.c > @@ -14387,7 +14387,7 @@ static void test_listbox_messages(void) > ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); > ok(ret == 2, "expected 2, got %ld\n", ret); > > - ok_sequence(wm_lb_addstring_sort_ownerdraw, "LB_ADDSTRING", TRUE); > + ok_sequence(wm_lb_addstring_sort_ownerdraw, "LB_ADDSTRING", FALSE); > check_lb_state(listbox, 3, LB_ERR, 0, 0); > > log_all_parent_messages--; > I wonder how was this tested. Included test diff does not seem to be relevant, i.e. I don't get any new failures with functional part reverted.

1 0

[PATCH 3/4] oleaut32: IPicture::set_hPal() supports only bitmaps.
by Dmitry Timoshkov 06 Jul '18

06 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 401d940262..b58fa9f1a4 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -742,10 +742,18 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, static HRESULT WINAPI OLEPictureImpl_set_hPal(IPicture *iface, OLE_HANDLE hpal) { - OLEPictureImpl *This = impl_from_IPicture(iface); - FIXME("(%p)->(%08x): stub\n", This, hpal); - OLEPicture_SendNotify(This,DISPID_PICT_HPAL); - return E_NOTIMPL; + OLEPictureImpl *This = impl_from_IPicture(iface); + + TRACE("(%p)->(%08x)\n", This, hpal); + + if (This->desc.picType == PICTYPE_BITMAP) + { + This->desc.u.bmp.hpal = (HPALETTE)hpal; + OLEPicture_SendNotify(This,DISPID_PICT_HPAL); + return S_OK; + } + + return E_FAIL; } /************************************************************************ -- 2.17.1

1 0

[PATCH 2/4] oleaut32: IPicture::get_hPal() supports only bitmaps.
by Dmitry Timoshkov 06 Jul '18

06 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 41 ++++++++++++-------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index da71946a40..401d940262 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -555,37 +555,22 @@ static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface, static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface, OLE_HANDLE *phandle) { - OLEPictureImpl *This = impl_from_IPicture(iface); - HRESULT hres; - TRACE("(%p)->(%p)\n", This, phandle); + OLEPictureImpl *This = impl_from_IPicture(iface); - if (!phandle) - return E_POINTER; + TRACE("(%p)->(%p)\n", This, phandle); - switch (This->desc.picType) { - case (UINT)PICTYPE_UNINITIALIZED: - case PICTYPE_NONE: - *phandle = 0; - hres = S_FALSE; - break; - case PICTYPE_BITMAP: - *phandle = HandleToUlong(This->desc.u.bmp.hpal); - hres = S_OK; - break; - case PICTYPE_METAFILE: - hres = E_FAIL; - break; - case PICTYPE_ICON: - case PICTYPE_ENHMETAFILE: - default: - FIXME("unimplemented for type %d. Returning 0 palette.\n", - This->desc.picType); - *phandle = 0; - hres = S_OK; - } + if (!phandle) return E_POINTER; - TRACE("returning 0x%08x, palette handle %08x\n", hres, *phandle); - return hres; + if (This->desc.picType == PICTYPE_BITMAP) + { + *phandle = HandleToUlong(This->desc.u.bmp.hpal); + return S_OK; + } + +#ifdef _WIN64 + *phandle = 0; +#endif + return E_FAIL; } /************************************************************************ -- 2.17.1

1 0

[PATCH 1/4] oleaut32: Don't accept unsupported picture types in OleCreatePictureIndirect.
by Dmitry Timoshkov 06 Jul '18

06 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index ac8b207207..da71946a40 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -275,9 +275,10 @@ static void OLEPictureImpl_SetIcon(OLEPictureImpl * This) * The caller of this method must release the object when it's * done with it. */ -static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) +static HRESULT OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn, OLEPictureImpl **pict) { - OLEPictureImpl* newObject = 0; + OLEPictureImpl *newObject; + HRESULT hr; if (pictDesc) TRACE("(%p) type = %d\n", pictDesc, pictDesc->picType); @@ -286,9 +287,8 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) * Allocate space for the object. */ newObject = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(OLEPictureImpl)); - - if (newObject==0) - return newObject; + if (!newObject) + return E_OUTOFMEMORY; /* * Initialize the virtual function table. @@ -299,12 +299,12 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) newObject->IConnectionPointContainer_iface.lpVtbl = &OLEPictureImpl_IConnectionPointContainer_VTable; newObject->pCP = NULL; - CreateConnectionPoint((IUnknown*)&newObject->IPicture_iface, &IID_IPropertyNotifySink, + hr = CreateConnectionPoint((IUnknown*)&newObject->IPicture_iface, &IID_IPropertyNotifySink, &newObject->pCP); - if (!newObject->pCP) + if (hr != S_OK) { HeapFree(GetProcessHeap(), 0, newObject); - return NULL; + return hr; } /* @@ -347,18 +347,24 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) case PICTYPE_ICON: OLEPictureImpl_SetIcon(newObject); break; + case PICTYPE_ENHMETAFILE: + FIXME("EMF is not supported\n"); + newObject->himetricWidth = newObject->himetricHeight = 0; + break; + default: - FIXME("Unsupported type %d\n", pictDesc->picType); - newObject->himetricWidth = newObject->himetricHeight = 0; - break; + WARN("Unsupported type %d\n", pictDesc->picType); + IPicture_Release(&newObject->IPicture_iface); + return E_UNEXPECTED; } } else { newObject->desc.picType = PICTYPE_UNINITIALIZED; } TRACE("returning %p\n", newObject); - return newObject; + *pict = newObject; + return S_OK; } /************************************************************************ @@ -2217,10 +2223,8 @@ HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, *ppvObj = NULL; - newPict = OLEPictureImpl_Construct(lpPictDesc, Own); - - if (newPict == NULL) - return E_OUTOFMEMORY; + hr = OLEPictureImpl_Construct(lpPictDesc, Own, &newPict); + if (hr != S_OK) return hr; /* * Make sure it supports the interface required by the caller. -- 2.17.1

1 0

[PATCH] winhttp: Use the more common ARRAY_SIZE spelling
by Michael Stefaniuc 06 Jul '18

06 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/request.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 56ec910294..5e5b229a1f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -851,8 +851,6 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, } -#define ARRAYSIZE(array) (sizeof(array) / sizeof((array)[0])) - static const WCHAR basicW[] = {'B','a','s','i','c',0}; static const WCHAR ntlmW[] = {'N','T','L','M',0}; static const WCHAR passportW[] = {'P','a','s','s','p','o','r','t',0}; @@ -867,11 +865,11 @@ static const struct } auth_schemes[] = { - { basicW, ARRAYSIZE(basicW) - 1, WINHTTP_AUTH_SCHEME_BASIC }, - { ntlmW, ARRAYSIZE(ntlmW) - 1, WINHTTP_AUTH_SCHEME_NTLM }, - { passportW, ARRAYSIZE(passportW) - 1, WINHTTP_AUTH_SCHEME_PASSPORT }, - { digestW, ARRAYSIZE(digestW) - 1, WINHTTP_AUTH_SCHEME_DIGEST }, - { negotiateW, ARRAYSIZE(negotiateW) - 1, WINHTTP_AUTH_SCHEME_NEGOTIATE } + { basicW, ARRAY_SIZE(basicW) - 1, WINHTTP_AUTH_SCHEME_BASIC }, + { ntlmW, ARRAY_SIZE(ntlmW) - 1, WINHTTP_AUTH_SCHEME_NTLM }, + { passportW, ARRAY_SIZE(passportW) - 1, WINHTTP_AUTH_SCHEME_PASSPORT }, + { digestW, ARRAY_SIZE(digestW) - 1, WINHTTP_AUTH_SCHEME_DIGEST }, + { negotiateW, ARRAY_SIZE(negotiateW) - 1, WINHTTP_AUTH_SCHEME_NEGOTIATE } }; static const unsigned int num_auth_schemes = sizeof(auth_schemes)/sizeof(auth_schemes[0]); -- 2.14.4

2 1

[PATCH] po: Update Russian translation.
by Nikolay Sivov 06 Jul '18

06 Jul '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/po/ru.po b/po/ru.po index 45dd3a1b28..9caec7dc40 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-04 13:51+0300\n" +"PO-Revision-Date: 2018-07-06 09:17+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -15658,41 +15658,6 @@ msgid "D" msgstr "D" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15756,6 +15721,7 @@ msgstr "" "[/A] Копирует только файлы с атрибутом «архивный».\n" "[/M] Копирует только файлы с атрибутом «архивный»,\n" "при этом очищает атрибут.\n" +"[/K] Копирует атрибуты, без этого ключа атрибуты не копируются.\n" "[/D | /D:m-d-y] Копирует только новые файлы или файлы, изменённые\n" "\t\tпосле указанной даты. Если дата не указана, заменяет все старые файлы\n" "\t\tсуществующими новыми.\n" -- 2.18.0

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 06 Jul '18

06 Jul '18

1 0

[PATCH] user32: Support SPI_S/GETAUDIODESCRIPTION in SystemParametersInfo
by Alistair Leslie-Hughes 06 Jul '18

06 Jul '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/sysparams.c | 32 +++++++++++++++++++++++++++++++- include/winuser.h | 9 +++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index fc55b06..7f4fb66 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -70,6 +70,7 @@ enum parameter_key SHOWSOUNDS_KEY, KEYBOARDPREF_KEY, SCREENREADER_KEY, + AUDIODESC_KEY, NB_PARAM_KEYS }; @@ -94,6 +95,9 @@ static const WCHAR KEYBOARDPREF_REGKEY[] = {'C','o','n','t','r','o','l',' ','P', static const WCHAR SCREENREADER_REGKEY[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', 'A','c','c','e','s','s','i','b','i','l','i','t','y','\\', 'B','l','i','n','d',' ','A','c','c','e','s','s',0}; +static const WCHAR AUDIODESC_REGKEY[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'A','c','c','e','s','s','i','b','i','l','i','t','y','\\', + 'A','u','d','i','o','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR *parameter_key_names[NB_PARAM_KEYS] = { @@ -107,6 +111,7 @@ static const WCHAR *parameter_key_names[NB_PARAM_KEYS] = SHOWSOUNDS_REGKEY, KEYBOARDPREF_REGKEY, SCREENREADER_REGKEY, + AUDIODESC_REGKEY, }; /* parameter key values; the first char is actually an enum parameter_key to specify the key */ @@ -217,6 +222,8 @@ static const WCHAR COLOR_GRADIENTACTIVECAPTION_VALNAME[] = {COLORS_KEY,'G','r',' static const WCHAR COLOR_GRADIENTINACTIVECAPTION_VALNAME[] = {COLORS_KEY,'G','r','a','d','i','e','n','t','I','n','a','c','t','i','v','e','T','i','t','l','e',0}; static const WCHAR COLOR_MENUHILIGHT_VALNAME[] = {COLORS_KEY,'M','e','n','u','H','i','l','i','g','h','t',0}; static const WCHAR COLOR_MENUBAR_VALNAME[] = {COLORS_KEY,'M','e','n','u','B','a','r',0}; +static const WCHAR AUDIODESC_LOCALE_VALNAME[] = {AUDIODESC_KEY,'L','o','c','a','l','e',0}; +static const WCHAR AUDIODESC_ON_VALNAME[] = {AUDIODESC_KEY,'O','n',0}; /* FIXME - real value */ static const WCHAR SCREENSAVERRUNNING_VALNAME[]= {DESKTOP_KEY,'W','I','N','E','_','S','c','r','e','e','n','S','a','v','e','r','R','u','n','n','i','n','g',0}; @@ -1240,6 +1247,7 @@ static BOOL_ENTRY( SCREENSAVERRUNNING, FALSE ); static BOOL_ENTRY( SHOWSOUNDS, FALSE ); static BOOL_ENTRY( SNAPTODEFBUTTON, FALSE ); static BOOL_ENTRY_MIRROR( ICONTITLEWRAP, TRUE ); +static BOOL_ENTRY( AUDIODESC_ON, FALSE); static YESNO_ENTRY( BEEP, TRUE ); @@ -1269,6 +1277,7 @@ static DWORD_ENTRY( FOREGROUNDFLASHCOUNT, 3 ); static DWORD_ENTRY( FOREGROUNDLOCKTIMEOUT, 0 ); static DWORD_ENTRY( LOGPIXELS, 0 ); static DWORD_ENTRY( MOUSECLICKLOCKTIME, 1200 ); +static DWORD_ENTRY( AUDIODESC_LOCALE, 0 ); static PATH_ENTRY( DESKPATTERN ); static PATH_ENTRY( DESKWALLPAPER ); @@ -1399,6 +1408,8 @@ static union sysparam_all_entry * const default_entries[] = (union sysparam_all_entry *)&entry_USERPREFERENCESMASK, (union sysparam_all_entry *)&entry_WHEELSCROLLCHARS, (union sysparam_all_entry *)&entry_WHEELSCROLLLINES, + (union sysparam_all_entry *)&entry_AUDIODESC_LOCALE, + (union sysparam_all_entry *)&entry_AUDIODESC_ON, }; /*********************************************************************** @@ -2334,7 +2345,26 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_SETFONTSMOOTHINGORIENTATION: ret = set_entry( &entry_FONTSMOOTHINGORIENTATION, uiParam, pvParam, fWinIni ); break; - + case SPI_GETAUDIODESCRIPTION: + { + AUDIODESCRIPTION *audio = pvParam; + if (audio && audio->cbSize == sizeof(AUDIODESCRIPTION) && uiParam == sizeof(AUDIODESCRIPTION) ) + { + ret = get_entry( &entry_AUDIODESC_ON, 0, &audio->Enabled ) && + get_entry( &entry_AUDIODESC_LOCALE, 0, &audio->Locale ); + } + break; + } + case SPI_SETAUDIODESCRIPTION: + { + AUDIODESCRIPTION *audio = pvParam; + if (audio && audio->cbSize == sizeof(AUDIODESCRIPTION) && uiParam == sizeof(AUDIODESCRIPTION) ) + { + ret = set_entry( &entry_AUDIODESC_ON, 0, &audio->Enabled, fWinIni) && + set_entry( &entry_AUDIODESC_LOCALE, 0, &audio->Locale, fWinIni ); + } + break; + } default: FIXME( "Unknown action: %u\n", uiAction ); SetLastError( ERROR_INVALID_SPI_VALUE ); diff --git a/include/winuser.h b/include/winuser.h index 24ca055..a653ef4 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2362,6 +2362,8 @@ typedef struct tagDROPSTRUCT #define SPI_SETMOUSESPEED 113 #define SPI_GETSCREENSAVERRUNNING 114 #define SPI_GETDESKWALLPAPER 115 +#define SPI_GETAUDIODESCRIPTION 116 +#define SPI_SETAUDIODESCRIPTION 117 #define SPI_GETACTIVEWINDOWTRACKING 0x1000 #define SPI_SETACTIVEWINDOWTRACKING 0x1001 @@ -3387,6 +3389,13 @@ enum tagPOINTER_INPUT_TYPE }; typedef DWORD POINTER_INPUT_TYPE; +typedef struct tagAUDIODESCRIPTION +{ + UINT cbSize; + BOOL Enabled; + LCID Locale; +} AUDIODESCRIPTION, *LPAUDIODESCRIPTION; + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); -- 1.9.1

1 0

[PATCH 1/4] psapi/tests: Link statically to psapi.
by Zebediah Figura 05 Jul '18

05 Jul '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/psapi/tests/Makefile.in | 2 +- dlls/psapi/tests/psapi_main.c | 220 ++++++++++++++++-------------------------- 2 files changed, 83 insertions(+), 139 deletions(-) diff --git a/dlls/psapi/tests/Makefile.in b/dlls/psapi/tests/Makefile.in index 980ed0a..d085953 100644 --- a/dlls/psapi/tests/Makefile.in +++ b/dlls/psapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = psapi.dll -IMPORTS = user32 +IMPORTS = psapi user32 C_SRCS = \ psapi_main.c diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 0c25668..aba05274 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -34,33 +34,10 @@ #include "winternl.h" #include "winnls.h" #include "winuser.h" +#define PSAPI_VERSION 1 #include "psapi.h" #include "wine/test.h" -#define PSAPI_GET_PROC(func) \ - p ## func = (void*)GetProcAddress(hpsapi, #func); \ - if(!p ## func) { \ - ok(0, "GetProcAddress(%s) failed\n", #func); \ - FreeLibrary(hpsapi); \ - return FALSE; \ - } - -static BOOL (WINAPI *pEmptyWorkingSet)(HANDLE); -static BOOL (WINAPI *pEnumProcesses)(DWORD*, DWORD, DWORD*); -static BOOL (WINAPI *pEnumProcessModules)(HANDLE, HMODULE*, DWORD, LPDWORD); -static DWORD (WINAPI *pGetModuleBaseNameA)(HANDLE, HMODULE, LPSTR, DWORD); -static DWORD (WINAPI *pGetModuleFileNameExA)(HANDLE, HMODULE, LPSTR, DWORD); -static DWORD (WINAPI *pGetModuleFileNameExW)(HANDLE, HMODULE, LPWSTR, DWORD); -static BOOL (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD); -static DWORD (WINAPI *pGetMappedFileNameA)(HANDLE, LPVOID, LPSTR, DWORD); -static DWORD (WINAPI *pGetMappedFileNameW)(HANDLE, LPVOID, LPWSTR, DWORD); -static BOOL (WINAPI *pGetPerformanceInfo)(PPERFORMANCE_INFORMATION, DWORD); -static DWORD (WINAPI *pGetProcessImageFileNameA)(HANDLE, LPSTR, DWORD); -static DWORD (WINAPI *pGetProcessImageFileNameW)(HANDLE, LPWSTR, DWORD); -static BOOL (WINAPI *pGetProcessMemoryInfo)(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD); -static BOOL (WINAPI *pGetWsChanges)(HANDLE, PPSAPI_WS_WATCH_INFORMATION, DWORD); -static BOOL (WINAPI *pInitializeProcessForWsWatch)(HANDLE); -static BOOL (WINAPI *pQueryWorkingSet)(HANDLE, PVOID, DWORD); static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, SIZE_T, SIZE_T *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); @@ -69,28 +46,8 @@ static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); static BOOL wow64; -static BOOL InitFunctionPtrs(HMODULE hpsapi) +static BOOL init_func_ptrs(void) { - PSAPI_GET_PROC(EmptyWorkingSet); - PSAPI_GET_PROC(EnumProcessModules); - PSAPI_GET_PROC(EnumProcesses); - PSAPI_GET_PROC(GetModuleBaseNameA); - PSAPI_GET_PROC(GetModuleFileNameExA); - PSAPI_GET_PROC(GetModuleFileNameExW); - PSAPI_GET_PROC(GetModuleInformation); - PSAPI_GET_PROC(GetMappedFileNameA); - PSAPI_GET_PROC(GetMappedFileNameW); - PSAPI_GET_PROC(GetProcessMemoryInfo); - PSAPI_GET_PROC(GetWsChanges); - PSAPI_GET_PROC(InitializeProcessForWsWatch); - PSAPI_GET_PROC(QueryWorkingSet); - /* GetProcessImageFileName is not exported on NT4 */ - pGetPerformanceInfo = - (void *)GetProcAddress(hpsapi, "GetPerformanceInfo"); - pGetProcessImageFileNameA = - (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA"); - pGetProcessImageFileNameW = - (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW"); pNtQuerySystemInformation = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQuerySystemInformation"); pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryVirtualMemory"); pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); @@ -107,12 +64,12 @@ static void test_EnumProcesses(void) DWORD pid, ret, cbUsed = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = pEnumProcesses(NULL, 0, &cbUsed); + ret = EnumProcesses(NULL, 0, &cbUsed); ok(ret == 1, "failed with %d\n", GetLastError()); ok(cbUsed == 0, "cbUsed=%d\n", cbUsed); SetLastError(0xdeadbeef); - ret = pEnumProcesses(&pid, 4, &cbUsed); + ret = EnumProcesses(&pid, 4, &cbUsed); ok(ret == 1, "failed with %d\n", GetLastError()); ok(cbUsed == 4, "cbUsed=%d\n", cbUsed); } @@ -127,39 +84,39 @@ static void test_EnumProcessModules(void) DWORD ret, cbNeeded = 0xdeadbeef; SetLastError(0xdeadbeef); - pEnumProcessModules(NULL, NULL, 0, &cbNeeded); + EnumProcessModules(NULL, NULL, 0, &cbNeeded); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pEnumProcessModules(hpQI, NULL, 0, &cbNeeded); + EnumProcessModules(hpQI, NULL, 0, &cbNeeded); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); hMod = (void *)0xdeadbeef; - ret = pEnumProcessModules(hpQI, &hMod, sizeof(HMODULE), NULL); + ret = EnumProcessModules(hpQI, &hMod, sizeof(HMODULE), NULL); ok(!ret, "succeeded\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); hMod = (void *)0xdeadbeef; - ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), NULL); + ret = EnumProcessModules(hpQV, &hMod, sizeof(HMODULE), NULL); ok(!ret, "succeeded\n"); ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got %d\n", GetLastError()); ok(hMod == GetModuleHandleA(NULL), "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); SetLastError(0xdeadbeef); - ret = pEnumProcessModules(hpQV, NULL, 0, &cbNeeded); + ret = EnumProcessModules(hpQV, NULL, 0, &cbNeeded); ok(ret == 1, "failed with %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pEnumProcessModules(hpQV, NULL, sizeof(HMODULE), &cbNeeded); + ret = EnumProcessModules(hpQV, NULL, sizeof(HMODULE), &cbNeeded); ok(!ret, "succeeded\n"); ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got %d\n", GetLastError()); SetLastError(0xdeadbeef); hMod = (void *)0xdeadbeef; - ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); + ret = EnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); ok(ret == 1, "got %d, failed with %d\n", ret, GetLastError()); ok(hMod == GetModuleHandleA(NULL), "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); @@ -173,7 +130,7 @@ static void test_EnumProcessModules(void) SetLastError(0xdeadbeef); hMod = NULL; - ret = pEnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + ret = EnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); ok(ret == 1, "got %d, error %u\n", ret, GetLastError()); ok(!!hMod, "expected non-NULL module\n"); ok(cbNeeded % sizeof(hMod) == 0, "got %u\n", cbNeeded); @@ -194,21 +151,21 @@ static void test_EnumProcessModules(void) SetLastError(0xdeadbeef); hMod = NULL; - ret = pEnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + ret = EnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); ok(ret == 1, "got %d, error %u\n", ret, GetLastError()); ok(!!hMod, "expected non-NULL module\n"); ok(cbNeeded % sizeof(hMod) == 0, "got %u\n", cbNeeded); - ret = pGetModuleBaseNameA(pi.hProcess, hMod, name, sizeof(name)); + ret = GetModuleBaseNameA(pi.hProcess, hMod, name, sizeof(name)); ok(ret, "got error %u\n", GetLastError()); ok(!strcmp(name, "notepad.exe"), "got %s\n", name); - ret = pGetModuleFileNameExA(pi.hProcess, hMod, name, sizeof(name)); + ret = GetModuleFileNameExA(pi.hProcess, hMod, name, sizeof(name)); ok(ret, "got error %u\n", GetLastError()); todo_wine ok(!strcmp(name, buffer), "got %s\n", name); - ret = pGetModuleInformation(pi.hProcess, hMod, &info, sizeof(info)); + ret = GetModuleInformation(pi.hProcess, hMod, &info, sizeof(info)); ok(ret, "got error %u\n", GetLastError()); ok(info.lpBaseOfDll == hMod, "expected %p, got %p\n", hMod, info.lpBaseOfDll); ok(info.SizeOfImage, "image size was 0\n"); @@ -227,7 +184,7 @@ todo_wine ok(!ret, "wait timed out\n"); SetLastError(0xdeadbeef); - ret = pEnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + ret = EnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); ok(!ret, "got %d\n", ret); todo_wine ok(GetLastError() == ERROR_PARTIAL_COPY, "got error %u\n", GetLastError()); @@ -243,23 +200,23 @@ static void test_GetModuleInformation(void) DWORD ret; SetLastError(0xdeadbeef); - pGetModuleInformation(NULL, hMod, &info, sizeof(info)); + GetModuleInformation(NULL, hMod, &info, sizeof(info)); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleInformation(hpQI, hMod, &info, sizeof(info)); + GetModuleInformation(hpQI, hMod, &info, sizeof(info)); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleInformation(hpQV, hBad, &info, sizeof(info)); + GetModuleInformation(hpQV, hBad, &info, sizeof(info)); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleInformation(hpQV, hMod, &info, sizeof(info)-1); + GetModuleInformation(hpQV, hMod, &info, sizeof(info)-1); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetModuleInformation(hpQV, hMod, &info, sizeof(info)); + ret = GetModuleInformation(hpQV, hMod, &info, sizeof(info)); ok(ret == 1, "failed with %d\n", GetLastError()); ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n", info.lpBaseOfDll, hMod); } @@ -277,12 +234,12 @@ static void test_GetPerformanceInfo(void) BOOL ret; SetLastError(0xdeadbeef); - ret = pGetPerformanceInfo(&info, sizeof(info)-1); + ret = GetPerformanceInfo(&info, sizeof(info)-1); ok(!ret, "GetPerformanceInfo unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BAD_LENGTH, "expected error=ERROR_BAD_LENGTH but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetPerformanceInfo(&info, sizeof(info)); + ret = GetPerformanceInfo(&info, sizeof(info)); ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); @@ -384,22 +341,22 @@ static void test_GetProcessMemoryInfo(void) DWORD ret; SetLastError(0xdeadbeef); - ret = pGetProcessMemoryInfo(NULL, &pmc, sizeof(pmc)); + ret = GetProcessMemoryInfo(NULL, &pmc, sizeof(pmc)); ok(!ret, "GetProcessMemoryInfo should fail\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetProcessMemoryInfo(hpSR, &pmc, sizeof(pmc)); + ret = GetProcessMemoryInfo(hpSR, &pmc, sizeof(pmc)); ok(!ret, "GetProcessMemoryInfo should fail\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)-1); + ret = GetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)-1); ok(!ret, "GetProcessMemoryInfo should fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)); + ret = GetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)); ok(ret == 1, "failed with %d\n", GetLastError()); } @@ -452,19 +409,19 @@ static void test_GetMappedFileName(void) HANDLE hfile, hmap; SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)); + ret = GetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)); + ret = GetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError( 0xdeadbeef ); - ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath)); + ret = GetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath)); todo_wine ok( ret || broken(GetLastError() == ERROR_UNEXP_NET_ERR), /* win2k */ "GetMappedFileNameA failed with error %u\n", GetLastError() ); @@ -510,26 +467,26 @@ todo_wine ok(base != NULL, "MapViewOfFile error %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, 0); + ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, 0); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base, 0, sizeof(map_name)); + ret = GetMappedFileNameA(GetCurrentProcess(), base, 0, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, 1); + ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, 1); todo_wine ok(ret == 1, "GetMappedFileName error %d\n", GetLastError()); ok(!map_name[0] || broken(map_name[0] == device_name[0]) /* before win2k */, "expected 0, got %c\n", map_name[0]); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); + ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); todo_wine { ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); @@ -537,7 +494,7 @@ todo_wine { } SetLastError(0xdeadbeef); - ret = pGetMappedFileNameW(GetCurrentProcess(), base, map_nameW, ARRAY_SIZE(map_nameW)); + ret = GetMappedFileNameW(GetCurrentProcess(), base, map_nameW, ARRAY_SIZE(map_nameW)); todo_wine { ok(ret, "GetMappedFileNameW error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); @@ -550,7 +507,7 @@ todo_wine { } SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); + ret = GetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); todo_wine { ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); @@ -558,19 +515,19 @@ todo_wine { } SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base + 0x4000, map_name, sizeof(map_name)); + ret = GetMappedFileNameA(GetCurrentProcess(), base + 0x4000, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_UNEXP_NET_ERR, "expected ERROR_UNEXP_NET_ERR, got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), NULL, map_name, sizeof(map_name)); + ret = GetMappedFileNameA(GetCurrentProcess(), NULL, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_UNEXP_NET_ERR, "expected ERROR_UNEXP_NET_ERR, got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(0, base, map_name, sizeof(map_name)); + ret = GetMappedFileNameA(0, base, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); @@ -589,7 +546,7 @@ todo_wine ok(base != NULL, "MapViewOfFile error %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); + ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_FILE_INVALID, "expected ERROR_FILE_INVALID, got %d\n", GetLastError()); @@ -605,12 +562,9 @@ static void test_GetProcessImageFileName(void) WCHAR szImgPathW[MAX_PATH]; DWORD ret, ret1; - if(pGetProcessImageFileNameA == NULL) - return; - /* This function is available on WinXP+ only */ SetLastError(0xdeadbeef); - if(!pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath))) + if(!GetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath))) { if(GetLastError() == ERROR_INVALID_FUNCTION) { win_skip("GetProcessImageFileName not implemented\n"); @@ -624,19 +578,19 @@ static void test_GetProcessImageFileName(void) } SetLastError(0xdeadbeef); - pGetProcessImageFileNameA(NULL, szImgPath, sizeof(szImgPath)); + GetProcessImageFileNameA(NULL, szImgPath, sizeof(szImgPath)); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetProcessImageFileNameA(hpSR, szImgPath, sizeof(szImgPath)); + GetProcessImageFileNameA(hpSR, szImgPath, sizeof(szImgPath)); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetProcessImageFileNameA(hpQI, szImgPath, 0); + GetProcessImageFileNameA(hpQI, szImgPath, 0); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); - ret = pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath)); - ret1 = pGetMappedFileNameA(hpQV, hMod, szMapPath, sizeof(szMapPath)); + ret = GetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath)); + ret1 = GetMappedFileNameA(hpQV, hMod, szMapPath, sizeof(szMapPath)); if(ret && ret1) { /* Windows returns 2*strlen-1 */ @@ -645,32 +599,32 @@ static void test_GetProcessImageFileName(void) } SetLastError(0xdeadbeef); - pGetProcessImageFileNameW(NULL, szImgPathW, ARRAY_SIZE(szImgPathW)); + GetProcessImageFileNameW(NULL, szImgPathW, ARRAY_SIZE(szImgPathW)); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); /* no information about correct buffer size returned: */ SetLastError(0xdeadbeef); - pGetProcessImageFileNameW(hpQI, szImgPathW, 0); + GetProcessImageFileNameW(hpQI, szImgPathW, 0); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetProcessImageFileNameW(hpQI, NULL, 0); + GetProcessImageFileNameW(hpQI, NULL, 0); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); /* correct call */ memset(szImgPathW, 0xff, sizeof(szImgPathW)); - ret = pGetProcessImageFileNameW(hpQI, szImgPathW, ARRAY_SIZE(szImgPathW)); + ret = GetProcessImageFileNameW(hpQI, szImgPathW, ARRAY_SIZE(szImgPathW)); ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n"); ok(szImgPathW[0] == '\\', "GetProcessImageFileNameW should have returned an NT path.\n"); ok(lstrlenW(szImgPathW) == ret, "Expected length to be %d, got %d\n", ret, lstrlenW(szImgPathW)); /* boundary values of 'size' */ SetLastError(0xdeadbeef); - pGetProcessImageFileNameW(hpQI, szImgPathW, ret); + GetProcessImageFileNameW(hpQI, szImgPathW, ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); memset(szImgPathW, 0xff, sizeof(szImgPathW)); - ret = pGetProcessImageFileNameW(hpQI, szImgPathW, ret + 1); + ret = GetProcessImageFileNameW(hpQI, szImgPathW, ret + 1); ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n"); ok(szImgPathW[0] == '\\', "GetProcessImageFileNameW should have returned an NT path.\n"); ok(lstrlenW(szImgPathW) == ret, "Expected length to be %d, got %d\n", ret, lstrlenW(szImgPathW)); @@ -684,21 +638,21 @@ static void test_GetModuleFileNameEx(void) DWORD ret; SetLastError(0xdeadbeef); - ret = pGetModuleFileNameExA(NULL, hMod, szModExPath, sizeof(szModExPath)); + ret = GetModuleFileNameExA(NULL, hMod, szModExPath, sizeof(szModExPath)); ok( !ret, "GetModuleFileNameExA succeeded\n" ); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetModuleFileNameExA(hpQI, hMod, szModExPath, sizeof(szModExPath)); + ret = GetModuleFileNameExA(hpQI, hMod, szModExPath, sizeof(szModExPath)); ok( !ret, "GetModuleFileNameExA succeeded\n" ); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetModuleFileNameExA(hpQV, hBad, szModExPath, sizeof(szModExPath)); + ret = GetModuleFileNameExA(hpQV, hBad, szModExPath, sizeof(szModExPath)); ok( !ret, "GetModuleFileNameExA succeeded\n" ); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); - ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, sizeof(szModExPath)); + ret = GetModuleFileNameExA(hpQV, NULL, szModExPath, sizeof(szModExPath)); if(!ret) return; ok(ret == strlen(szModExPath), "szModExPath=\"%s\" ret=%d\n", szModExPath, ret); @@ -708,7 +662,7 @@ static void test_GetModuleFileNameEx(void) SetLastError(0xdeadbeef); memset( szModExPath, 0xcc, sizeof(szModExPath) ); - ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 4 ); + ret = GetModuleFileNameExA(hpQV, NULL, szModExPath, 4 ); ok( ret == 4 || ret == strlen(szModExPath), "wrong length %u\n", ret ); ok( broken(szModExPath[3]) /*w2kpro*/ || strlen(szModExPath) == 3, "szModExPath=\"%s\" ret=%d\n", szModExPath, ret ); @@ -717,14 +671,14 @@ static void test_GetModuleFileNameEx(void) if (0) /* crashes on Windows 10 */ { SetLastError(0xdeadbeef); - ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 0 ); + ret = GetModuleFileNameExA(hpQV, NULL, szModExPath, 0 ); ok( ret == 0, "wrong length %u\n", ret ); ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); } SetLastError(0xdeadbeef); memset( buffer, 0xcc, sizeof(buffer) ); - ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 4 ); + ret = GetModuleFileNameExW(hpQV, NULL, buffer, 4 ); ok( ret == 4 || ret == lstrlenW(buffer), "wrong length %u\n", ret ); ok( broken(buffer[3]) /*w2kpro*/ || lstrlenW(buffer) == 3, "buffer=%s ret=%d\n", wine_dbgstr_w(buffer), ret ); @@ -734,7 +688,7 @@ static void test_GetModuleFileNameEx(void) { SetLastError(0xdeadbeef); buffer[0] = 0xcc; - ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 0 ); + ret = GetModuleFileNameExW(hpQV, NULL, buffer, 0 ); ok( ret == 0, "wrong length %u\n", ret ); ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); ok( buffer[0] == 0xcc, "buffer modified %s\n", wine_dbgstr_w(buffer) ); @@ -748,18 +702,18 @@ static void test_GetModuleBaseName(void) DWORD ret; SetLastError(0xdeadbeef); - pGetModuleBaseNameA(NULL, hMod, szModBaseName, sizeof(szModBaseName)); + GetModuleBaseNameA(NULL, hMod, szModBaseName, sizeof(szModBaseName)); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleBaseNameA(hpQI, hMod, szModBaseName, sizeof(szModBaseName)); + GetModuleBaseNameA(hpQI, hMod, szModBaseName, sizeof(szModBaseName)); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleBaseNameA(hpQV, hBad, szModBaseName, sizeof(szModBaseName)); + GetModuleBaseNameA(hpQV, hBad, szModBaseName, sizeof(szModBaseName)); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); - ret = pGetModuleBaseNameA(hpQV, NULL, szModBaseName, sizeof(szModBaseName)); + ret = GetModuleBaseNameA(hpQV, NULL, szModBaseName, sizeof(szModBaseName)); if(!ret) return; ok(ret == strlen(szModBaseName), "szModBaseName=\"%s\" ret=%d\n", szModBaseName, ret); @@ -777,19 +731,19 @@ static void test_ws_functions(void) BOOL ret; SetLastError(0xdeadbeef); - pEmptyWorkingSet(NULL); + EmptyWorkingSet(NULL); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pEmptyWorkingSet(hpSR); + EmptyWorkingSet(hpSR); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pEmptyWorkingSet(hpAA); + ret = EmptyWorkingSet(hpAA); ok(ret == 1, "failed with %d\n", GetLastError()); SetLastError( 0xdeadbeef ); - ret = pInitializeProcessForWsWatch( NULL ); + ret = InitializeProcessForWsWatch( NULL ); todo_wine ok( !ret, "InitializeProcessForWsWatch succeeded\n" ); if (!ret) { @@ -801,7 +755,7 @@ static void test_ws_functions(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); } SetLastError(0xdeadbeef); - ret = pInitializeProcessForWsWatch(hpAA); + ret = InitializeProcessForWsWatch(hpAA); ok(ret == 1, "failed with %d\n", GetLastError()); addr = VirtualAlloc(NULL, 1, MEM_COMMIT, PAGE_READWRITE); @@ -816,7 +770,7 @@ static void test_ws_functions(void) } SetLastError(0xdeadbeef); - ret = pQueryWorkingSet(hpQI, pages, 4096 * sizeof(ULONG_PTR)); + ret = QueryWorkingSet(hpQI, pages, 4096 * sizeof(ULONG_PTR)); todo_wine ok(ret == 1, "failed with %d\n", GetLastError()); if(ret == 1) { @@ -832,7 +786,7 @@ static void test_ws_functions(void) test_gwsc: SetLastError(0xdeadbeef); - ret = pGetWsChanges(hpQI, wswi, sizeof(wswi)); + ret = GetWsChanges(hpQI, wswi, sizeof(wswi)); todo_wine ok(ret == 1, "failed with %d\n", GetLastError()); if(ret == 1) { @@ -852,20 +806,12 @@ free_page: START_TEST(psapi_main) { - HMODULE hpsapi = LoadLibraryA("psapi.dll"); + DWORD pid = GetCurrentProcessId(); - if(!hpsapi) - { - win_skip("Could not load psapi.dll\n"); - return; - } + init_func_ptrs(); - if(InitFunctionPtrs(hpsapi)) - { - DWORD pid = GetCurrentProcessId(); - - if (pIsWow64Process) - IsWow64Process(GetCurrentProcess(), &wow64); + if (pIsWow64Process) + IsWow64Process(GetCurrentProcess(), &wow64); hpSR = OpenProcess(STANDARD_RIGHTS_REQUIRED, FALSE, pid); hpQI = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); @@ -886,12 +832,10 @@ START_TEST(psapi_main) test_GetModuleBaseName(); test_ws_functions(); } - CloseHandle(hpSR); - CloseHandle(hpQI); - CloseHandle(hpVR); - CloseHandle(hpQV); - CloseHandle(hpAA); - } - - FreeLibrary(hpsapi); + + CloseHandle(hpSR); + CloseHandle(hpQI); + CloseHandle(hpVR); + CloseHandle(hpQV); + CloseHandle(hpAA); } -- 2.7.4

2 6

Re: Alexandre Julliard : server: Don' t clip update regions to the desktop window.
by Ken Thomases 05 Jul '18

05 Jul '18

On Jul 5, 2018, at 3:25 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > Module: wine > Branch: master > Commit: 8cfac3b218669edcef8b92ea8370b0579eb23ea9 > URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cfac3b218669edcef8b92ea… > > Author: Alexandre Julliard <julliard(a)winehq.org> > Date: Thu Jul 5 12:48:13 2018 +0200 > > server: Don't clip update regions to the desktop window. > > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > > --- > > dlls/user32/tests/msg.c | 4 ++-- > server/window.c | 23 ++++++++--------------- > 2 files changed, 10 insertions(+), 17 deletions(-) > > diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c > index 0cfafe4..cb918fa 100644 > --- a/dlls/user32/tests/msg.c > +++ b/dlls/user32/tests/msg.c > @@ -4760,7 +4760,7 @@ static void test_showwindow(void) > flush_sequence(); > ShowWindow(hwnd, SW_SHOWMAXIMIZED); > ok_sequence(WmShowMaxPopupResizedSeq_todo, > - "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", TRUE); > + "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", FALSE); Should the name of the test sequence and the context string both have "_todo"/" TODO" removed? (Although "WmShowMaxPopupResizedSeq" is already used for a difference sequence.) -Ken

2 1

[PATCH v5] winemac.drv: Wake up the display on user input.
by Ken Thomases 05 Jul '18

05 Jul '18

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- v5: include IOPMLib.h to fix build, call UpdateSystemActivity() to also reset screen saver --- dlls/winemac.drv/window.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e49a445..6558824 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -23,6 +23,13 @@ #include "config.h" +#include <IOKit/pwr_mgt/IOPMLib.h> +#define GetCurrentThread Mac_GetCurrentThread +#define LoadResource Mac_LoadResource +#include <CoreServices/CoreServices.h> +#undef GetCurrentThread +#undef LoadResource + #include "macdrv.h" #include "winuser.h" #include "wine/unicode.h" @@ -1551,13 +1558,44 @@ BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd) } +static WNDPROC desktop_orig_wndproc; + +#define WM_WINE_NOTIFY_ACTIVITY WM_USER + +static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case WM_WINE_NOTIFY_ACTIVITY: + { + /* This wakes from display sleep, but doesn't affect the screen saver. */ + static IOPMAssertionID assertion; + IOPMAssertionDeclareUserActivity(CFSTR("Wine user input"), kIOPMUserActiveLocal, &assertion); + + /* This prevents the screen saver, but doesn't wake from display sleep. */ + /* It's deprecated, but there's no better alternative. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + UpdateSystemActivity(UsrActivity); +#pragma clang diagnostic pop + break; + } + } + return desktop_orig_wndproc( hwnd, msg, wp, lp ); +} + /********************************************************************** * CreateWindow (MACDRV.@) */ BOOL CDECL macdrv_CreateWindow(HWND hwnd) { if (hwnd == GetDesktopWindow()) + { + desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( GetDesktopWindow(), + GWLP_WNDPROC, (LONG_PTR)desktop_wndproc_wrapper ); + macdrv_init_clipboard(); + } return TRUE; } -- 2.10.2

1 0

[PATCH] krnl386.exe16: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc 05 Jul '18

05 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/krnl386.exe16/error.c | 6 ++---- dlls/krnl386.exe16/int21.c | 8 +++----- dlls/krnl386.exe16/vxd.c | 4 +--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/krnl386.exe16/error.c b/dlls/krnl386.exe16/error.c index dc02d2132e..5508d7c0e8 100644 --- a/dlls/krnl386.exe16/error.c +++ b/dlls/krnl386.exe16/error.c @@ -193,8 +193,6 @@ static const struct { }; #undef ErrorString -#define ErrorStringCount (sizeof(ErrorStrings) / sizeof(ErrorStrings[0])) -#define ParamErrorStringCount (sizeof(ParamErrorStrings) / sizeof(ParamErrorStrings[0])) /*********************************************************************** * GetErrorString (internal) @@ -204,7 +202,7 @@ static const char *GetErrorString(UINT16 uErr) static char buffer[80]; unsigned int n; - for (n = 0; n < ErrorStringCount; n++) { + for (n = 0; n < ARRAY_SIZE(ErrorStrings); n++) { if (uErr == ErrorStrings[n].constant) return ErrorStrings[n].name; } @@ -229,7 +227,7 @@ static const char *GetParamErrorString(UINT16 uErr) { { unsigned int n; - for (n = 0; n < ParamErrorStringCount; n++) { + for (n = 0; n < ARRAY_SIZE(ParamErrorStrings); n++) { if (uErr == ParamErrorStrings[n].constant) { strcat(buffer, ParamErrorStrings[n].name); return buffer; diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 3a08749d41..f32b1a767c 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -282,8 +282,6 @@ static struct magic_device magic_devices[] = { {'h','p','s','c','a','n',0}, NULL, { { 0, 0 } }, INT21_IoctlHPScanHandler }, }; -#define NB_MAGIC_DEVICES (sizeof(magic_devices)/sizeof(magic_devices[0])) - /* Many calls translate a drive argument like this: drive number (00h = default, 01h = A:, etc) @@ -856,13 +854,13 @@ static HANDLE INT21_OpenMagicDevice( LPCWSTR name, DWORD access ) if ((p = strrchrW( name, '/' ))) name = p + 1; if ((p = strrchrW( name, '\\' ))) name = p + 1; - for (i = 0; i < NB_MAGIC_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(magic_devices); i++) { int len = strlenW( magic_devices[i].name ); if (!strncmpiW( magic_devices[i].name, name, len ) && (!name[len] || name[len] == '.' || name[len] == ':')) break; } - if (i == NB_MAGIC_DEVICES) return 0; + if (i == ARRAY_SIZE(magic_devices)) return 0; if (!magic_devices[i].handle) /* need to open it */ { @@ -2639,7 +2637,7 @@ static void INT21_Ioctl_Char( CONTEXT *context ) } } else { UINT i; - for (i = 0; i < NB_MAGIC_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(magic_devices); i++) { if (!magic_devices[i].handle) continue; if (magic_devices[i].index.QuadPart == info.IndexNumber.QuadPart) diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index 7be5f63b5e..dc14600f5d 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -80,8 +80,6 @@ static struct vxdcall_service vxd_services[] = { {'v','w','i','n','3','2','.','v','x','d',0}, 0x002a, NULL, NULL } }; -#define NB_VXD_SERVICES (sizeof(vxd_services)/sizeof(vxd_services[0])) - #define W32S_APP2WINE(addr) ((addr)? (DWORD)(addr) + W32S_offset : 0) #define W32S_WINE2APP(addr) ((addr)? (DWORD)(addr) - W32S_offset : 0) @@ -293,7 +291,7 @@ void WINAPI DECLSPEC_HIDDEN __regs_VxDCall( CONTEXT *context ) DWORD service = stack32_pop( context ); RtlEnterCriticalSection( &vxd_section ); - for (i = 0; i < NB_VXD_SERVICES; i++) + for (i = 0; i < ARRAY_SIZE(vxd_services); i++) { if (HIWORD(service) != vxd_services[i].service) continue; if (!vxd_services[i].module) /* need to load it */ -- 2.14.4

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel