December 2015 - Wine-Devel - list.winehq.org

Re: [2/2] oleaut32: Align terminating null character in SysAllocStringByteLen.

by Dmitry Timoshkov

Qian Hong <fracting(a)gmail.com> wrote: > On Fri, Dec 25, 2015 at 1:43 PM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > > Does this work with disabled cache? > > I compiled Wine the patch [2/2] and tested on my Windows XP 32bit box: > > vartype.c:6559: LCIDs: System=0x00000804, User=0x00000804 > vartype.c:6352: Tests skipped: BSTR cache is disabled, some tests will > be skipped. > vartype: 2517493 tests executed (0 marked as todo, 0 failures), 1 skipped. > > I think it works with cache disabled. Same here, works in both 32 and 64-bit builds with and without OANOCACHE=1. -- Dmitry.

Dec. 25, 2015

Re: [2/2] oleaut32: Align terminating null character in SysAllocStringByteLen.

by Qian Hong

Hi, On Fri, Dec 25, 2015 at 1:43 PM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > Does this work with disabled cache? I compiled Wine the patch [2/2] and tested on my Windows XP 32bit box: vartype.c:6559: LCIDs: System=0x00000804, User=0x00000804 vartype.c:6352: Tests skipped: BSTR cache is disabled, some tests will be skipped. vartype: 2517493 tests executed (0 marked as todo, 0 failures), 1 skipped. I think it works with cache disabled. -- Regards, Qian Hong - http://www.winehq.org

Dec. 25, 2015

Re: [2/2] oleaut32: Align terminating null character in SysAllocStringByteLen.

by Nikolay Sivov

On 25.12.2015 8:38, Sebastian Lackner wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > If SysAllocStringByteLen() is used with an odd length, the two terminating > null bytes are not aligned properly, which means that strlenW() would not > find them. Tests show that Windows appends three terminating null bytes in > this case. > > There is no need to change the memory allocation part because we already > round up to the next bucket size. > > dlls/oleaut32/oleaut.c | 14 ++++++-------- > dlls/oleaut32/tests/vartype.c | 29 +++++++++++++++++++++++++++++ > 2 files changed, 35 insertions(+), 8 deletions(-) > > diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c > index 75f9cb4..78cb083 100644 > --- a/dlls/oleaut32/oleaut.c > +++ b/dlls/oleaut32/oleaut.c > @@ -149,12 +149,9 @@ static bstr_t *alloc_bstr(size_t size) > > if(cache_entry) { > if(WARN_ON(heap)) { > - size_t tail; > - > - memset(ret, ARENA_INUSE_FILLER, FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)])); > - tail = bstr_alloc_size(size) - FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)]); > - if(tail) > - memset(ret->u.ptr+size+sizeof(WCHAR), ARENA_TAIL_FILLER, tail); > + size_t fill_size = (FIELD_OFFSET(bstr_t, u.ptr[size])+2*sizeof(WCHAR)-1) & ~(sizeof(WCHAR)-1); > + memset(ret, ARENA_INUSE_FILLER, fill_size); > + memset((char *)ret+fill_size, ARENA_TAIL_FILLER, bstr_alloc_size(size)-fill_size); > } > ret->size = size; > return ret; > @@ -418,10 +415,11 @@ BSTR WINAPI SysAllocStringByteLen(LPCSTR str, UINT len) > > if(str) { > memcpy(bstr->u.ptr, str, len); > - bstr->u.ptr[len] = bstr->u.ptr[len+1] = 0; > + bstr->u.ptr[len] = 0; > }else { > - memset(bstr->u.ptr, 0, len+sizeof(WCHAR)); > + memset(bstr->u.ptr, 0, len+1); > } > + bstr->u.str[(len+sizeof(WCHAR)-1)/sizeof(WCHAR)] = 0; > > return bstr->u.str; > } > diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c > index 7cbb059..d905d37 100644 > --- a/dlls/oleaut32/tests/vartype.c > +++ b/dlls/oleaut32/tests/vartype.c > @@ -5444,7 +5444,9 @@ static void test_SysAllocStringByteLen(void) > { > const OLECHAR szTest[10] = { 'T','e','s','t','\0' }; > const CHAR szTestA[6] = { 'T','e','s','t','\0','?' }; > + char *buf; > BSTR str; > + int i; > > if (sizeof(void *) == 4) /* not limited to 0x80000000 on Win64 */ > { > @@ -5487,6 +5489,7 @@ static void test_SysAllocStringByteLen(void) > > ok (bstr->dwLen == 3, "Expected 3, got %d\n", bstr->dwLen); > ok (!lstrcmpA((LPCSTR)bstr->szString, szTestTruncA), "String different\n"); > + ok (!bstr->szString[2], "String not terminated\n"); > SysFreeString(str); > } > > @@ -5500,6 +5503,32 @@ static void test_SysAllocStringByteLen(void) > ok (!lstrcmpW(bstr->szString, szTest), "String different\n"); > SysFreeString(str); > } > + > + /* Make sure terminating null is aligned properly */ > + buf = HeapAlloc(GetProcessHeap(), 0, 1025); > + ok (buf != NULL, "Expected non-NULL\n"); > + for (i = 0; i < 1024; i++) > + { > + LPINTERNAL_BSTR bstr; > + > + str = SysAllocStringByteLen(NULL, i); > + ok (str != NULL, "Expected non-NULL\n"); > + bstr = Get(str); > + ok (bstr->dwLen == i, "Expected %d, got %d\n", i, bstr->dwLen); > + ok (!bstr->szString[(i+sizeof(WCHAR)-1)/sizeof(WCHAR)], "String not terminated\n"); > + SysFreeString(str); > + > + memset(buf, 0xaa, 1025); > + str = SysAllocStringByteLen(buf, i); > + ok (str != NULL, "Expected non-NULL\n"); > + bstr = Get(str); > + ok (bstr->dwLen == i, "Expected %d, got %d\n", i, bstr->dwLen); > + buf[i] = 0; > + ok (!lstrcmpA((LPCSTR)bstr->szString, buf), "String different\n"); > + ok (!bstr->szString[(i+sizeof(WCHAR)-1)/sizeof(WCHAR)], "String not terminated\n"); > + SysFreeString(str); > + } > + HeapFree(GetProcessHeap(), 0, buf); > } Does this work with disabled cache? > > static void test_SysReAllocString(void) >

Dec. 25, 2015

Re: winedump: Add initial version of old (SLTG) typelib dumper.

by Dmitry Timoshkov

Alexandre Julliard <julliard(a)winehq.org> wrote: > > +static int _isprint(unsigned char c) > > { > > - int i; > > + return c >= 32 ? 1 : 0; > > Please don't do that. Could you please be more specific? > > + > > + assert(print_hex("magic") == 0x47544c53); > > Please don't do that. Once again please be more verbose, I can't read your mind. But as a guess you didn't like the assert()? What's wrong with this one in comparison to many others in this file? > > +#if 0 > > + 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"); > > +#else > > + printf("skipping 12 bytes\n"); > > + dump_binary(12); > > + printf("\n"); > > +#endif > > Same here. Since this is a work in progress the intent was to show that the format of this block is unknown and there is at least another source of information that treats it differently. I'd prefer to leave this as a self documenting explanation. -- Dmitry.

Dec. 24, 2015

Re: winedump: Add initial version of old (SLTG) typelib dumper.

by Alexandre Julliard

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > +static int _isprint(unsigned char c) > { > - int i; > + return c >= 32 ? 1 : 0; Please don't do that. > + > + assert(print_hex("magic") == 0x47544c53); Please don't do that. > + while (offset < name_table_start + name_table_size) > + { > +/*printf("current offset: %08x (relative to name table start: %08x (%u))\n", > + offset, offset - name_table_start, offset - name_table_start);*/ > + dump_binary(8); > + print_string0(); > + printf("\n"); > +/*printf("current offset: %08x (relative to name table start: %08x (%u))\n", > + offset, offset - name_table_start, offset - name_table_start);*/ Please clean these up. > +#if 0 > + 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"); > +#else > + printf("skipping 12 bytes\n"); > + dump_binary(12); > + printf("\n"); > +#endif Same here. -- Alexandre Julliard julliard(a)winehq.org

Dec. 24, 2015

Re: user32: Set correct caret state in the server in SetCaretPos (try 2)

by Alexandre Julliard

Anton Baskanov <baskanov(a)gmail.com> writes: > @@ -2977,7 +2977,8 @@ enum coords_relative > int x; /* caret x position */ > int y; /* caret y position */ > int hide; /* increment for hide count (can be negative to show it) */ > - int state; /* caret state (1=on, 0=off, -1=toggle current state) */ > + int state; /* caret state (1=on, 0=off, -1=toggle current state, > + * -2=on if the position differs, unchanged otherwise) */ Please define constants instead. -- Alexandre Julliard julliard(a)winehq.org

Dec. 24, 2015

Re: server: Implement wineserver call for SystemHandleInformation. (v2)

by Sebastian Lackner

On 24.12.2015 13:10, Marvin wrote: > Hi, > > While running your changed tests on Windows, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > Full results can be found at > https://testbot.winehq.org/JobDetails.pl?Key=19147 > > Your paranoid android. > > > === build (build) === > Patch failed to apply > This is expected because of the partial resend. The patch only removes todo_wines.

Dec. 24, 2015

Re: server: Implement wineserver call for SystemHandleInformation. (v2)

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19147 Your paranoid android. === build (build) === Patch failed to apply

Dec. 24, 2015

Re: [2/2] server: Implement wineserver call for SystemHandleInformation.

by Alexandre Julliard

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -3265,6 +3265,22 @@ enum coords_relative > VARARG(sd,security_descriptor); /* retrieved security descriptor */ > @END > > + > +struct handle_info > +{ > + process_id_t owner; > + obj_handle_t handle; > + unsigned int access; > +}; > + > +/* Return a list of all opened handles */ > +(a)REQ(get_system_handles) > +(a)REPLY > + unsigned int count; /* number of handles */ > + VARARG(data,bytes); /* array of handle_infos */ This is not a bytes array, please write a proper dumping function. -- Alexandre Julliard julliard(a)winehq.org

Dec. 24, 2015

Re: [PATCH 1/5] ole32/tests: Some tests for OleRegGetUserType()

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19139 Your paranoid android. === wxppro (32 bit compobj) === compobj.c:2250: Test failed: form 0, got L"CLSID_StdFont" compobj.c:2250: Test failed: form 1, got L"CLSID_StdFont" compobj.c:2250: Test failed: form 2, got L"CLSID_StdFont" compobj.c:2250: Test failed: form 3, got L"CLSID_StdFont" compobj.c:2250: Test failed: form 4, got L"CLSID_StdFont" compobj.c:2266: Test failed: form 0, got L"CLSID_StdFont" compobj.c:2266: Test failed: form 1, got L"CLSID_StdFont" compobj.c:2266: Test failed: form 2, got L"CLSID_StdFont" compobj.c:2266: Test failed: form 3, got L"CLSID_StdFont" compobj.c:2266: Test failed: form 4, got L"CLSID_StdFont" === w2003std (32 bit compobj) === compobj.c:2250: Test failed: form 0, got L"CLSID_StdFont" compobj.c:2250: Test failed: form 1, got L"CLSID_StdFont" compobj.c:2250: Test failed: form 2, got L"CLSID_StdFont" compobj.c:2250: Test failed: form 3, got L"CLSID_StdFont" compobj.c:2250: Test failed: form 4, got L"CLSID_StdFont" compobj.c:2266: Test failed: form 0, got L"CLSID_StdFont" compobj.c:2266: Test failed: form 1, got L"CLSID_StdFont" compobj.c:2266: Test failed: form 2, got L"CLSID_StdFont" compobj.c:2266: Test failed: form 3, got L"CLSID_StdFont" compobj.c:2266: Test failed: form 4, got L"CLSID_StdFont"

Dec. 24, 2015