March 2019 - Wine-devel - list.winehq.org

Retrieving LOCALE_FONTSIGNATURE value
by Isira Seneviratne 01 Mar '19

01 Mar '19

I used the following code to retrieve the LOCALE_FONTSIGNATURE value for Sinhala and print it to a text file (I used GetLocaleInfoA because MinGW was returning an error saying that GetLocaleInfoEx could not be found). I was able to retrieve the LOCALE_SSCRIPTS value on Windows using this method as well by replacing LOCALE_FONTSIGNATURE with LOCALE_SSCRIPTS in GetLocaleInfoA: #include <windows.h> #include <winnls.h> #include <fstream> using namespace std; int main() { ofstream ofs ("locale.txt", std::ofstream::out); char s[100]; GetLocaleInfoA(MAKELCID(MAKELANGID(LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA), SORT_DEFAULT), LOCALE_FONTSIGNATURE, s, 100); ofs << s << endl; ofs.close(); } I then used hexdump to get the following from the output file: 0000000 0a0d 0000002 How should this be converted to the format used in the NLS files?

1 0

[PATCH 1/2] ntdll/tests: Add test for preserving x87 fpu state when capturing context.
by Paul Gofman 01 Mar '19

01 Mar '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ntdll/tests/exception.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b8bd186632..5d108bade1 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1509,7 +1509,8 @@ static void test_thread_context(void) struct expected { DWORD Eax, Ebx, Ecx, Edx, Esi, Edi, Ebp, Esp, Eip, - SegCs, SegDs, SegEs, SegFs, SegGs, SegSs, EFlags, prev_frame; + SegCs, SegDs, SegEs, SegFs, SegGs, SegSs, EFlags, prev_frame, + x87_control, save_x87_control, new_x87_control; } expect; NTSTATUS (*func_ptr)( struct expected *res, void *func, void *arg1, void *arg2 ) = (void *)code_mem; @@ -1542,10 +1543,23 @@ static void test_thread_context(void) 0x8f, 0x40, 0x3c, /* popl 0x3c(%eax) */ 0xff, 0x75, 0x00, /* pushl 0x0(%ebp) ; previous stack frame */ 0x8f, 0x40, 0x40, /* popl 0x40(%eax) */ + + 0x9b, 0xd9, 0x78, 0x48, /* fstcw 0x48(%eax) */ + 0x68, 0x7f, 0x04, 0x00, 0x00, /* pushl $0x47f */ + 0x8f, 0x40, 0x44, /* popl 0x44(%eax) */ + 0xd9, 0x68, 0x44, /* fldcw 0x44(%eax); */ + 0x8b, 0x00, /* mov (%eax),%eax */ 0xff, 0x75, 0x14, /* pushl 0x14(%ebp) */ 0xff, 0x75, 0x10, /* pushl 0x10(%ebp) */ 0xff, 0x55, 0x0c, /* call *0xc(%ebp) */ + + 0x50, /* pushl %eax */ + 0x8b, 0x45, 0x08, /* mov 0x8(%ebp),%eax */ + 0x9b, 0xd9, 0x78, 0x4c, /* fstcw 0x4c(%eax) */ + 0xd9, 0x68, 0x48, /* fldcw 0x48(%eax); */ + 0x58, /* popl %eax */ + 0xc9, /* leave */ 0xc3, /* ret */ }; @@ -1593,7 +1607,8 @@ static void test_thread_context(void) memset( &context, 0xcc, sizeof(context) ); memset( &expect, 0xcc, sizeof(expect) ); - context.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS; + context.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT; + status = func_ptr( &expect, pNtGetContextThread, (void *)GetCurrentThread(), &context ); ok( status == STATUS_SUCCESS, "NtGetContextThread failed %08x\n", status ); trace( "expect: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x ebp=%08x esp=%08x " @@ -1625,6 +1640,13 @@ static void test_thread_context(void) ok( context.SegFs == LOWORD(expect.SegFs), "wrong SegFs %08x/%08x\n", context.SegFs, expect.SegFs ); ok( context.SegGs == LOWORD(expect.SegGs), "wrong SegGs %08x/%08x\n", context.SegGs, expect.SegGs ); ok( context.SegSs == LOWORD(expect.SegSs), "wrong SegSs %08x/%08x\n", context.SegSs, expect.SegGs ); + + ok( LOWORD(context.FloatSave.ControlWord) == LOWORD(expect.x87_control), + "wrong x87 control word %#x/%#x.\n", context.FloatSave.ControlWord, expect.x87_control ); + todo_wine ok( LOWORD(expect.x87_control) == LOWORD(expect.new_x87_control), + "x87 control word changed in NtGetContextThread() %#x/%#x.\n", + LOWORD(expect.x87_control), LOWORD(expect.new_x87_control) ); + #undef COMPARE } -- 2.20.1

1 1

[PATCH] user32/tests: Remove useless casts to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/dde.c | 10 +++++----- dlls/user32/tests/msg.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index eed2ac437e..934252008c 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2123,7 +2123,7 @@ static void test_PackDDElParam(void) lparam = PackDDElParam(WM_DDE_INITIATE, 0xcafe, 0xbeef); /* value gets sign-extended despite being an LPARAM */ - ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); + ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_INITIATE, lparam, &lo, &hi); @@ -2135,7 +2135,7 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); lparam = PackDDElParam(WM_DDE_TERMINATE, 0xcafe, 0xbeef); - ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); + ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_TERMINATE, lparam, &lo, &hi); @@ -2170,7 +2170,7 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); lparam = PackDDElParam(WM_DDE_UNADVISE, 0xcafe, 0xbeef); - ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); + ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_UNADVISE, lparam, &lo, &hi); @@ -2183,7 +2183,7 @@ static void test_PackDDElParam(void) lparam = PackDDElParam(WM_DDE_ACK, 0xcafe, 0xbeef); /* win9x returns the input (0xbeef<<16 | 0xcafe) here */ - if (lparam != (int)0xbeefcafe) { + if (lparam != 0xbeefcafe) { ptr = GlobalLock((HGLOBAL)lparam); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(ptr[0] == 0xcafe, "Expected 0xcafe, got %08lx\n", ptr[0]); @@ -2228,7 +2228,7 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); lparam = PackDDElParam(WM_DDE_REQUEST, 0xcafe, 0xbeef); - ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); + ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_REQUEST, lparam, &lo, &hi); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d0f0637ee..acf131f2d9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17552,7 +17552,7 @@ START_TEST(msg) { unsigned int arg; /* Child process. */ - sscanf (test_argv[2], "%d", (unsigned int *) &arg); + sscanf (test_argv[2], "%d", &arg); do_wait_idle_child( arg ); return; } -- 2.20.1

2 1

[PATCH 1/6] d3d9: Release system memory wined3d buffer only after the draw buffer is destroyed.
by Matteo Bruni 01 Mar '19

01 Mar '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d9/buffer.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index dcd7e287264..43321b3202b 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -59,9 +59,10 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -81,9 +82,10 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -270,6 +272,9 @@ static const IDirect3DVertexBuffer9Vtbl d3d9_vertexbuffer_vtbl = static void STDMETHODCALLTYPE d3d9_vertexbuffer_wined3d_object_destroyed(void *parent) { struct d3d9_vertexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d9_resource_cleanup(&buffer->resource); heap_free(buffer); } @@ -387,9 +392,10 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -409,9 +415,10 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface) IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -596,6 +603,9 @@ static const IDirect3DIndexBuffer9Vtbl d3d9_indexbuffer_vtbl = static void STDMETHODCALLTYPE d3d9_indexbuffer_wined3d_object_destroyed(void *parent) { struct d3d9_indexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d9_resource_cleanup(&buffer->resource); heap_free(buffer); } -- 2.19.2

5 17

[PATCH] ieframe/tests: Remove useless cast to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 706d5071a9..0e7311796f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -4069,7 +4069,7 @@ static void test_SetAdvise(void) ok(!flags, "got %08x\n", aspects); ok(sink == NULL, "got %p\n", sink); - hr = IViewObject2_SetAdvise(view, DVASPECT_CONTENT, 0, (IAdviseSink *)&test_sink); + hr = IViewObject2_SetAdvise(view, DVASPECT_CONTENT, 0, &test_sink); ok(hr == S_OK, "got %08x\n", hr); aspects = flags = 0xdeadbeef; -- 2.20.1

2 1

[PATCH] winebus.sys: Remove useless casts to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- dlls/winebus.sys/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 64b245e630..1f671cf568 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1086,7 +1086,7 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, /* The caller has to free the serial number */ if (*value) { - *serial_number = (WCHAR*)strdupAtoW(value); + *serial_number = strdupAtoW(value); found_serial = 1; } } diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 299cec5034..fd68833ac3 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -380,7 +380,7 @@ static NTSTATUS build_device_relations(DEVICE_RELATIONS **devices) i = 0; LIST_FOR_EACH_ENTRY(ptr, &pnp_devset, struct pnp_device, entry) { - (*devices)->Objects[i] = (DEVICE_OBJECT*)ptr->device; + (*devices)->Objects[i] = ptr->device; i++; } LeaveCriticalSection(&device_list_cs); -- 2.20.1

1 0

[PATCH] comctl32/tests: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 86d0fabf9e..0e62ab9e0c 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1559,8 +1559,7 @@ cleanup: if(hbmDst) DeleteObject(hbmDst); - if(hdcDst) - DeleteDC(hdcDst); + DeleteDC(hdcDst); if(hbmMask) DeleteObject(hbmMask); -- 2.20.1

1 0

[PATCH] progman: Avoid using the comma operator
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/progman/grpfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index 4a71ce51d3..f3a084d290 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -667,8 +667,8 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) PUT_SHORT(buffer, 0, 0x8000); PUT_SHORT(buffer, 2, 0xffff); PUT_SHORT(buffer, 4, 0x000a); - buffer[6] = 'P', buffer[7] = 'M'; - buffer[8] = 'C', buffer[9] = 'C'; + buffer[6] = 'P'; buffer[7] = 'M'; + buffer[8] = 'C'; buffer[9] = 'C'; if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 10)) return FALSE; -- 2.20.1

1 0

[PATCH] winedump: Remove useless casts to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winedump/debug.c | 4 ++-- tools/winedump/msc.c | 4 ++-- tools/winedump/msmangle.c | 10 +++++----- tools/winedump/pdb.c | 4 ++-- tools/winedump/search.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 221c079851..7fa5f4ecee 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -413,7 +413,7 @@ static void dump_codeview_headers(unsigned long base, unsigned long len) if (memcmp(signature, "NB10", 4) == 0) { const CODEVIEW_PDB_DATA* pdb_data; - pdb_data = (const void *)cv_base; + pdb_data = cv_base; printf(" Filepos: 0x%08lX\n", pdb_data->filepos); printf(" TimeStamp: %08X (%s)\n", @@ -426,7 +426,7 @@ static void dump_codeview_headers(unsigned long base, unsigned long len) { const OMFSignatureRSDS* rsds_data; - rsds_data = (const void *)cv_base; + rsds_data = cv_base; printf(" Guid: %s\n", get_guid_str(&rsds_data->guid)); printf(" Age: %08X\n", rsds_data->age); printf(" Filename: %s\n", rsds_data->name); diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 5890b2926b..5f7765f4d3 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -91,7 +91,7 @@ static int full_numeric_leaf(struct full_value* fv, const unsigned short int* le case LF_USHORT: length += 2; - fv->v.i = *(const unsigned short*)leaf; + fv->v.i = *leaf; break; case LF_LONG: @@ -1490,7 +1490,7 @@ void codeview_dump_linetab2(const char* linetab, DWORD size, const char* strimag break; default: printf("%sblock end %x\n", pfx, lt2->header); - lt2 = (const struct codeview_linetab2*)((const char*)linetab + size); + lt2 = (const struct codeview_linetab2*)(linetab + size); continue; } lt2 = codeview_linetab2_next_block(lt2); diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index 39e4f3a173..f9fe75b7d5 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -590,7 +590,7 @@ static char *demangle_datatype (char **str, compound_type *ct, if (!ct->expression) return NULL; - return (char *)(*str = iter); + return *str = iter; } @@ -629,7 +629,7 @@ static char *get_constraints_convention_1 (char **str, compound_type *ct) char *iter = *str, **retval = str; if (ct->have_qualifiers) - return (char *)*str; /* Previously got constraints for this type */ + return *str; /* Previously got constraints for this type */ if (*iter == '?' || *iter == 'A') { @@ -651,7 +651,7 @@ static char *get_constraints_convention_1 (char **str, compound_type *ct) } } - return (char *)(*retval = iter); + return *retval = iter; } @@ -666,7 +666,7 @@ static char *get_constraints_convention_2 (char **str, compound_type *ct) /* FIXME: Why do arrays have both convention 1 & 2 constraints? */ if (ct->have_qualifiers && ct->dest_type != 'Q') - return (char *)*str; /* Previously got constraints for this type */ + return *str; /* Previously got constraints for this type */ ct->have_qualifiers = TRUE; /* Even if none, we've got all we're getting */ @@ -687,7 +687,7 @@ static char *get_constraints_convention_2 (char **str, compound_type *ct) break; } - return (char *)(*retval = iter); + return *retval = iter; } diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 6fd70ce9e5..dcfbea85b4 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -336,7 +336,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx for (j = cfile; j < src->nSrcFiles && j < cfile + indx[i]; j++) { /* FIXME: in some cases, it's a p_string but WHEN ? */ - if (cstr + offset[j] >= (const char*)start_cstr /* wrap around */ && + if (cstr + offset[j] >= start_cstr /* wrap around */ && cstr + offset[j] < (const char*)src + symbols->srcmodule_size) printf("\t\t\tSource file: %s\n", cstr + offset[j]); else @@ -367,7 +367,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t\tAge: %08u\n" "\t\tfile1: %s\n" "\t\tfile2: %s\n", - (ULONG_PTR)((const char*)imp - (const char*)first), + (ULONG_PTR)((const char*)imp - first), imp->unknown1, imp->unknown2, imp->TimeDateStamp, diff --git a/tools/winedump/search.c b/tools/winedump/search.c index 08aa8e125d..49f83ca70f 100644 --- a/tools/winedump/search.c +++ b/tools/winedump/search.c @@ -311,7 +311,7 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) if (arg < 0) { - sym->return_text = (char*)type_str; + sym->return_text = type_str; sym->return_type = dest_type; } else @@ -332,7 +332,7 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) sym->arg_name [arg] = str_substring (proto_str, iter); proto_str = iter; } - sym->arg_text [arg] = (char*)type_str; + sym->arg_text [arg] = type_str; } return proto_str; -- 2.20.1

1 0

[PATCH] ntdll/tests: Avoid using the comma operator
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/directory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index a69b31b6df..1109f7f3a4 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -619,7 +619,7 @@ static void test_NtQueryDirectoryFile(void) ok( filename[0] == '.' && filename[1] == '.', "incorrect long file name: %s\n", wine_dbgstr_wn(next->FileName, next->FileNameLength/sizeof(WCHAR))); - data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ), + data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ); memset( data, 0x55, data_size ); U(io).Status = 0xdeadbeef; U(io).Information = 0xdeadbeef; @@ -636,7 +636,7 @@ static void test_NtQueryDirectoryFile(void) next = (FILE_BOTH_DIRECTORY_INFORMATION *)&fbdi->FileName[1]; ok( next->NextEntryOffset == 0x55555555, "wrong offset %x\n", next->NextEntryOffset ); - data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] ), + data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] ); memset( data, 0x55, data_size ); U(io).Status = 0xdeadbeef; U(io).Information = 0xdeadbeef; -- 2.20.1

1 0