- wine-devel - winehq.org

[PATCH] po: Update French translation.
by Isira Seneviratne 02 Mar '19

02 Mar '19

1 0

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

[PATCH 1/2] user32/combo: Add more tests for listbox_size
by Fabian Maurer 01 Mar '19

01 Mar '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/combo.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 0d3b1b170f..12e4ed5862 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -692,18 +692,21 @@ static void test_listbox_size(DWORD style) {2, 41, TRUE}, {2, 42, FALSE}, {2, 50, FALSE}, - {2, 60}, - {2, 80}, - {2, 89}, - {2, 90}, - {2, 100}, + {2, 60, FALSE}, + {2, 80, FALSE}, + {2, 89, FALSE}, + {2, 90, FALSE}, + {2, 100, FALSE}, + {3, 73, TRUE}, {10, 24, FALSE}, + {10, 40, TRUE}, {10, 41, TRUE}, {10, 42, FALSE}, {10, 50, FALSE}, {10, 60, FALSE}, {10, 80, FALSE}, + {10, 88, FALSE}, {10, 89, TRUE}, {10, 90, FALSE}, {10, 100, FALSE}, -- 2.20.1

3 7

[PATCH 8/8] d3d12/tests: Use multiple command lists in test_swapchain_size_mismatch().
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 5cb9a2991639..16e5c4ba5374 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -954,6 +954,7 @@ static void test_swapchain_draw(void) static void test_swapchain_size_mismatch(void) { static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + UINT64 frame_fence_value[MAX_FRAME_COUNT] = {0}; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE rtv; struct test_context_desc desc; @@ -963,6 +964,8 @@ static void test_swapchain_size_mismatch(void) ID3D12CommandQueue *queue; unsigned int index, i; ID3D12Device *device; + ID3D12Fence *fence; + UINT64 fence_value; ULONG refcount; HWND window; HRESULT hr; @@ -1010,12 +1013,28 @@ static void test_swapchain_size_mismatch(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(&context, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + swapchain = create_swapchain(&context, window, 4, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(context.list); ++i) + { + hr = ID3D12GraphicsCommandList_Close(context.list[i]); + ok(hr == S_OK, "Failed to close command list %u, hr %#x.\n", i, hr); + } + fence_value = 1; for (i = 0; i < 20; ++i) { index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + + hr = wait_for_fence(fence, frame_fence_value[index]); + ok(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + + reset_command_list(&context, index); backbuffer = context.render_target[index]; + command_list = context.list[index]; rtv = context.rtv[index]; transition_sub_resource_state(command_list, backbuffer, 0, @@ -1030,13 +1049,21 @@ static void test_swapchain_size_mismatch(void) hr = IDXGISwapChain3_Present(swapchain, 1, 0); ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); - wait_queue_idle(device, queue); - reset_command_list(&context, 0); - if (i == 6) + { + wait_queue_idle(device, queue); MoveWindow(window, 0, 0, 100, 100, TRUE); + } + + frame_fence_value[index] = fence_value; + hr = ID3D12CommandQueue_Signal(queue, fence, fence_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + ++fence_value; } + wait_queue_idle(device, queue); + + ID3D12Fence_Release(fence); destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); -- 2.19.2

3 2

[PATCH 7/8] d3d12/tests: Use multiple command lists in test_swapchain_backbuffer_index().
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 271 +++++++++++++++++++++++---------------- 1 file changed, 161 insertions(+), 110 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index dec7cf855839..5cb9a2991639 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdlib.h> #define COBJMACROS #include "initguid.h" @@ -274,37 +275,25 @@ static ID3D12PipelineState *create_pipeline_state_(unsigned int line, ID3D12Devi return pipeline_state; } -#define reset_command_list(a, b) reset_command_list_(__LINE__, a, b) -static void reset_command_list_(unsigned int line, - ID3D12GraphicsCommandList *list, ID3D12CommandAllocator *allocator) -{ - HRESULT hr; - - hr = ID3D12CommandAllocator_Reset(allocator); - ok_(__FILE__, line)(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); - hr = ID3D12GraphicsCommandList_Reset(list, allocator, NULL); - ok_(__FILE__, line)(hr == S_OK, "Failed to reset command list, hr %#x.\n", hr); -} - struct test_context_desc { BOOL no_pipeline; const D3D12_SHADER_BYTECODE *ps; }; +#define MAX_FRAME_COUNT 4 + struct test_context { ID3D12Device *device; ID3D12CommandQueue *queue; - ID3D12CommandAllocator *allocator; - ID3D12GraphicsCommandList *list; - - D3D12_RESOURCE_DESC render_target_desc; - ID3D12Resource *render_target; + ID3D12CommandAllocator *allocator[MAX_FRAME_COUNT]; + ID3D12GraphicsCommandList *list[MAX_FRAME_COUNT]; ID3D12DescriptorHeap *rtv_heap; - D3D12_CPU_DESCRIPTOR_HANDLE rtv; + D3D12_CPU_DESCRIPTOR_HANDLE rtv[MAX_FRAME_COUNT]; + ID3D12Resource *render_target[MAX_FRAME_COUNT]; ID3D12RootSignature *root_signature; ID3D12PipelineState *pipeline_state; @@ -313,15 +302,43 @@ struct test_context RECT scissor_rect; }; -#define create_render_target(context, a, b) create_render_target_(__LINE__, context, a, b) -static void create_render_target_(unsigned int line, struct test_context *context, - ID3D12Resource **render_target, const D3D12_CPU_DESCRIPTOR_HANDLE *rtv) +#define reset_command_list(a, b) reset_command_list_(__LINE__, a, b) +static void reset_command_list_(unsigned int line, struct test_context *context, unsigned int index) +{ + HRESULT hr; + + assert(index < MAX_FRAME_COUNT); + + hr = ID3D12CommandAllocator_Reset(context->allocator[index]); + ok_(__FILE__, line)(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); + hr = ID3D12GraphicsCommandList_Reset(context->list[index], context->allocator[index], NULL); + ok_(__FILE__, line)(hr == S_OK, "Failed to reset command list, hr %#x.\n", hr); +} + +static void destroy_render_targets(struct test_context *context) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(context->render_target); ++i) + { + if (context->render_target[i]) + { + ID3D12Resource_Release(context->render_target[i]); + context->render_target[i] = NULL; + } + } +} + +#define create_render_target(context) create_render_target_(__LINE__, context) +static void create_render_target_(unsigned int line, struct test_context *context) { D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; D3D12_CLEAR_VALUE clear_value; HRESULT hr; + destroy_render_targets(context); + memset(&heap_properties, 0, sizeof(heap_properties)); heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; @@ -344,13 +361,13 @@ static void create_render_target_(unsigned int line, struct test_context *contex hr = ID3D12Device_CreateCommittedResource(context->device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, - &IID_ID3D12Resource, (void **)render_target); + &IID_ID3D12Resource, (void **)&context->render_target[0]); ok_(__FILE__, line)(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); - context->render_target_desc = resource_desc; + set_viewport(&context->viewport, 0.0f, 0.0f, resource_desc.Width, resource_desc.Height, 0.0f, 1.0f); + SetRect(&context->scissor_rect, 0, 0, resource_desc.Width, resource_desc.Height); - if (rtv) - ID3D12Device_CreateRenderTargetView(context->device, *render_target, NULL, *rtv); + ID3D12Device_CreateRenderTargetView(context->device, context->render_target[0], NULL, context->rtv[0]); } #define init_test_context(a, b) init_test_context_(__LINE__, a, b) @@ -359,7 +376,9 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, { D3D12_COMMAND_QUEUE_DESC command_queue_desc; D3D12_DESCRIPTOR_HEAP_DESC rtv_heap_desc; + unsigned int rtv_size; ID3D12Device *device; + unsigned int i; HRESULT hr; memset(context, 0, sizeof(*context)); @@ -379,15 +398,21 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, &IID_ID3D12CommandQueue, (void **)&context->queue); ok_(__FILE__, line)(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); - hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, - &IID_ID3D12CommandAllocator, (void **)&context->allocator); - ok_(__FILE__, line)(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(context->allocator); ++i) + { + hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, + &IID_ID3D12CommandAllocator, (void **)&context->allocator[i]); + ok_(__FILE__, line)(hr == S_OK, "Failed to create command allocator %u, hr %#x.\n", i, hr); + } - hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, - context->allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&context->list); - ok_(__FILE__, line)(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(context->list); ++i) + { + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + context->allocator[i], NULL, &IID_ID3D12GraphicsCommandList, (void **)&context->list[i]); + ok_(__FILE__, line)(hr == S_OK, "Failed to create command list %u, hr %#x.\n", i, hr); + } - rtv_heap_desc.NumDescriptors = 16; + rtv_heap_desc.NumDescriptors = MAX_FRAME_COUNT; rtv_heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV; rtv_heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; rtv_heap_desc.NodeMask = 0; @@ -395,14 +420,12 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, &IID_ID3D12DescriptorHeap, (void **)&context->rtv_heap); ok_(__FILE__, line)(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); - context->rtv = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(context->rtv_heap); - - create_render_target_(line, context, &context->render_target, &context->rtv); - - set_viewport(&context->viewport, 0.0f, 0.0f, - context->render_target_desc.Width, context->render_target_desc.Height, 0.0f, 1.0f); - SetRect(&context->scissor_rect, 0, 0, - context->render_target_desc.Width, context->render_target_desc.Height); + rtv_size = ID3D12Device_GetDescriptorHandleIncrementSize(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV); + for (i = 0; i < ARRAY_SIZE(context->rtv); ++i) + { + context->rtv[i] = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(context->rtv_heap); + context->rtv[i].ptr += i * rtv_size; + } context->root_signature = create_default_root_signature(device); @@ -410,8 +433,7 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, return TRUE; context->pipeline_state = create_pipeline_state_(line, device, - context->root_signature, context->render_target_desc.Format, - desc ? desc->ps : NULL); + context->root_signature, DXGI_FORMAT_B8G8R8A8_UNORM, desc ? desc->ps : NULL); return TRUE; } @@ -419,6 +441,7 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, #define destroy_test_context(context) destroy_test_context_(__LINE__, context) static void destroy_test_context_(unsigned int line, struct test_context *context) { + unsigned int i; ULONG refcount; if (context->pipeline_state) @@ -428,12 +451,13 @@ static void destroy_test_context_(unsigned int line, struct test_context *contex if (context->rtv_heap) ID3D12DescriptorHeap_Release(context->rtv_heap); - if (context->render_target) - ID3D12Resource_Release(context->render_target); + destroy_render_targets(context); - ID3D12CommandAllocator_Release(context->allocator); + for (i = 0; i < ARRAY_SIZE(context->allocator); ++i) + ID3D12CommandAllocator_Release(context->allocator[i]); ID3D12CommandQueue_Release(context->queue); - ID3D12GraphicsCommandList_Release(context->list); + for (i = 0; i < ARRAY_SIZE(context->list); ++i) + ID3D12GraphicsCommandList_Release(context->list[i]); refcount = ID3D12Device_Release(context->device); ok_(__FILE__, line)(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); @@ -546,15 +570,22 @@ static HWND create_window(DWORD style) return CreateWindowA("static", "d3d12_test", style, 0, 0, 256, 256, NULL, NULL, NULL, NULL); } -static IDXGISwapChain3 *create_swapchain(ID3D12CommandQueue *queue, HWND window, - DXGI_FORMAT format, unsigned int width, unsigned int height) +static IDXGISwapChain3 *create_swapchain(struct test_context *context, HWND window, + unsigned int buffer_count, DXGI_FORMAT format, unsigned int width, unsigned int height) { + ID3D12CommandQueue *queue = context->queue; + ID3D12Device *device = context->device; IDXGISwapChain1 *swapchain1; DXGI_SWAP_CHAIN_DESC1 desc; IDXGISwapChain3 *swapchain; IDXGIFactory4 *factory; + unsigned int i; HRESULT hr; + assert(buffer_count <= MAX_FRAME_COUNT); + + destroy_render_targets(context); + hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); @@ -565,7 +596,7 @@ static IDXGISwapChain3 *create_swapchain(ID3D12CommandQueue *queue, HWND window, desc.SampleDesc.Count = 1; desc.SampleDesc.Quality = 0; desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - desc.BufferCount = 2; + desc.BufferCount = buffer_count; desc.Scaling = DXGI_SCALING_STRETCH; desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; @@ -578,6 +609,17 @@ static IDXGISwapChain3 *create_swapchain(ID3D12CommandQueue *queue, HWND window, hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain3, (void **)&swapchain); ok(hr == S_OK, "Failed to query IDXGISwapChain3, hr %#x.\n", hr); IDXGISwapChain1_Release(swapchain1); + + for (i = 0; i < buffer_count; ++i) + { + hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&context->render_target[i]); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); + ID3D12Device_CreateRenderTargetView(device, context->render_target[i], NULL, context->rtv[i]); + } + + set_viewport(&context->viewport, 0.0f, 0.0f, width, height, 0.0f, 1.0f); + SetRect(&context->scissor_rect, 0, 0, width, height); + return swapchain; } @@ -768,12 +810,14 @@ static void test_draw(void) if (!init_test_context(&context, NULL)) return; - command_list = context.list; + command_list = context.list[0]; queue = context.queue; - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + create_render_target(&context); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv[0], white, 0, NULL); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv[0], FALSE, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); @@ -781,10 +825,10 @@ static void test_draw(void) ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); - transition_sub_resource_state(command_list, context.render_target, 0, + transition_sub_resource_state(command_list, context.render_target[0], 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + check_sub_resource_uint(context.render_target[0], 0, queue, command_list, 0xff00ff00, 0); destroy_test_context(&context); } @@ -793,6 +837,7 @@ static void test_swapchain_draw(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE rtv; struct test_context_desc desc; struct test_context context; ID3D12Resource *backbuffer; @@ -845,7 +890,7 @@ static void test_swapchain_draw(void) if (!init_test_context(&context, &desc)) return; device = context.device; - command_list = context.list; + command_list = context.list[0]; queue = context.queue; window = create_window(WS_VISIBLE); @@ -858,18 +903,17 @@ static void test_swapchain_draw(void) context.pipeline_state = create_pipeline_state(device, context.root_signature, tests[i].format, &ps); - swapchain = create_swapchain(queue, window, tests[i].format, rect.right, rect.bottom); + swapchain = create_swapchain(&context, window, 2, tests[i].format, rect.right, rect.bottom); index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); - hr = IDXGISwapChain3_GetBuffer(swapchain, index, &IID_ID3D12Resource, (void **)&backbuffer); - ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", index, hr); - ID3D12Device_CreateRenderTargetView(device, backbuffer, NULL, context.rtv); + backbuffer = context.render_target[index]; + rtv = context.rtv[index]; transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv, white, 0, NULL); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, FALSE, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); @@ -882,7 +926,7 @@ static void test_swapchain_draw(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(backbuffer, 0, queue, command_list, tests[i].color, 0); - reset_command_list(command_list, context.allocator); + reset_command_list(&context, 0); transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PRESENT); hr = ID3D12GraphicsCommandList_Close(command_list); @@ -894,14 +938,13 @@ static void test_swapchain_draw(void) wait_queue_idle(device, queue); - refcount = ID3D12Resource_Release(backbuffer); - ok(!refcount, "Backbuffer has %u references left.\n", refcount); + destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); ID3D12PipelineState_Release(context.pipeline_state); context.pipeline_state = NULL; - reset_command_list(command_list, context.allocator); + reset_command_list(&context, 0); } DestroyWindow(window); @@ -912,7 +955,7 @@ static void test_swapchain_size_mismatch(void) { static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; ID3D12GraphicsCommandList *command_list; - ID3D12Resource *backbuffers[2]; + D3D12_CPU_DESCRIPTOR_HANDLE rtv; struct test_context_desc desc; struct test_context context; ID3D12Resource *backbuffer; @@ -930,24 +973,23 @@ static void test_swapchain_size_mismatch(void) if (!init_test_context(&context, &desc)) return; device = context.device; - command_list = context.list; + command_list = context.list[0]; queue = context.queue; window = CreateWindowA("static", "d3d12_test", WS_VISIBLE, 0, 0, 200, 200, NULL, NULL, NULL, NULL); - swapchain = create_swapchain(queue, window, DXGI_FORMAT_B8G8R8A8_UNORM, 400, 400); + swapchain = create_swapchain(&context, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, 400, 400); index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); - hr = IDXGISwapChain3_GetBuffer(swapchain, index, &IID_ID3D12Resource, (void **)&backbuffer); - ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", index, hr); - ID3D12Device_CreateRenderTargetView(device, backbuffer, NULL, context.rtv); + backbuffer = context.render_target[index]; + rtv = context.rtv[index]; transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv, green, 0, NULL); transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(backbuffer, 0, queue, command_list, 0xff00ff00, 0); - reset_command_list(command_list, context.allocator); + reset_command_list(&context, 0); transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PRESENT); hr = ID3D12GraphicsCommandList_Close(command_list); @@ -958,10 +1000,9 @@ static void test_swapchain_size_mismatch(void) ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); wait_queue_idle(device, queue); - reset_command_list(command_list, context.allocator); + reset_command_list(&context, 0); - refcount = ID3D12Resource_Release(backbuffer); - ok(!refcount, "Backbuffer has %u references left.\n", refcount); + destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); DestroyWindow(window); @@ -969,23 +1010,18 @@ static void test_swapchain_size_mismatch(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(queue, window, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); - - for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) - { - hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&backbuffers[i]); - ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); - } + swapchain = create_swapchain(&context, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); for (i = 0; i < 20; ++i) { index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); - ID3D12Device_CreateRenderTargetView(device, backbuffers[index], NULL, context.rtv); + backbuffer = context.render_target[index]; + rtv = context.rtv[index]; - transition_sub_resource_state(command_list, backbuffers[index], 0, + transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); - transition_sub_resource_state(command_list, backbuffers[index], 0, + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv, green, 0, NULL); + transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT); hr = ID3D12GraphicsCommandList_Close(command_list); ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); @@ -995,14 +1031,13 @@ static void test_swapchain_size_mismatch(void) ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); wait_queue_idle(device, queue); - reset_command_list(command_list, context.allocator); + reset_command_list(&context, 0); if (i == 6) MoveWindow(window, 0, 0, 100, 100, TRUE); } - for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) - ID3D12Resource_Release(backbuffers[i]); + destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); DestroyWindow(window); @@ -1012,15 +1047,20 @@ static void test_swapchain_size_mismatch(void) static void test_swapchain_backbuffer_index(void) { static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; - unsigned int previous_index, expected_index, index, i; + UINT64 frame_fence_value[MAX_FRAME_COUNT] = {0}; ID3D12GraphicsCommandList *command_list; - ID3D12Resource *backbuffers[2]; + unsigned int expected_index, index, i; + const unsigned int buffer_count = 2; + D3D12_CPU_DESCRIPTOR_HANDLE rtv; struct test_context_desc desc; struct test_context context; + ID3D12Resource *backbuffer; unsigned int sync_interval; IDXGISwapChain3 *swapchain; ID3D12CommandQueue *queue; ID3D12Device *device; + ID3D12Fence *fence; + UINT64 fence_value; ULONG refcount; HWND window; HRESULT hr; @@ -1031,33 +1071,42 @@ static void test_swapchain_backbuffer_index(void) if (!init_test_context(&context, &desc)) return; device = context.device; - command_list = context.list; queue = context.queue; window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(queue, window, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + swapchain = create_swapchain(&context, window, buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); - for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(context.list); ++i) { - hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&backbuffers[i]); - ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); + hr = ID3D12GraphicsCommandList_Close(context.list[i]); + ok(hr == S_OK, "Failed to close command list %u, hr %#x.\n", i, hr); } - previous_index = 1; + index = 1; + fence_value = 1; for (i = 0; i < 20; ++i) { + expected_index = (index + 1) % buffer_count; index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); - ID3D12Device_CreateRenderTargetView(device, backbuffers[index], NULL, context.rtv); - - expected_index = (previous_index + 1) % 2; ok(index == expected_index, "Test %u: Got index %u, expected %u.\n", i, index, expected_index); - transition_sub_resource_state(command_list, backbuffers[index], 0, + hr = wait_for_fence(fence, frame_fence_value[index]); + ok(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + + reset_command_list(&context, index); + backbuffer = context.render_target[index]; + command_list = context.list[index]; + rtv = context.rtv[index]; + + transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); - transition_sub_resource_state(command_list, backbuffers[index], 0, + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv, green, 0, NULL); + transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT); hr = ID3D12GraphicsCommandList_Close(command_list); ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); @@ -1071,14 +1120,16 @@ static void test_swapchain_backbuffer_index(void) hr = IDXGISwapChain3_Present(swapchain, sync_interval, 0); ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); - wait_queue_idle(device, queue); - reset_command_list(command_list, context.allocator); - - previous_index = index; + frame_fence_value[index] = fence_value; + hr = ID3D12CommandQueue_Signal(queue, fence, fence_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + ++fence_value; } - for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) - ID3D12Resource_Release(backbuffers[i]); + wait_queue_idle(device, queue); + + ID3D12Fence_Release(fence); + destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); DestroyWindow(window); -- 2.19.2

3 2

[PATCH 6/8] dxgi: Handle VK_ERROR_OUT_OF_DATE_KHR returned from vkAcquireNextImageKHR().
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 22feeaeb825f..991a505ef6fa 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1421,7 +1421,7 @@ static VkResult d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapc if ((vr = vk_funcs->p_vkAcquireNextImageKHR(vk_device, swapchain->vk_swapchain, UINT64_MAX, VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) { - ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); + WARN("Failed to acquire next Vulkan image, vr %d.\n", vr); return vr; } @@ -2136,6 +2136,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface } vr = d3d12_swapchain_acquire_next_image(swapchain); + if (vr == VK_ERROR_OUT_OF_DATE_KHR) + { + TRACE("Recreating Vulkan swapchain.\n"); + d3d12_swapchain_destroy_buffers(swapchain, FALSE); + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); + } + if (vr < 0) + ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); return hresult_from_vk_result(vr); } @@ -2570,6 +2578,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) { + ERR("Failed to acquire Vulkan image, vr %d.\n", vr); d3d12_swapchain_destroy(swapchain); return hresult_from_vk_result(vr); } -- 2.19.2

3 2

[PATCH 5/8] dxgi: Factor out d3d12_swapchain_recreate_vulkan_swapchain().
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 64 +++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f2f89b9f7a84..22feeaeb825f 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1411,7 +1411,7 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return S_OK; } -static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) +static VkResult d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkDevice vk_device = swapchain->vk_device; @@ -1422,21 +1422,18 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) { ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return vr; } if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) { ERR("Failed to wait for fence, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return vr; } if ((vr = vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence)) < 0) - { ERR("Failed to reset fence, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - return S_OK; + return vr; } static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, BOOL destroy_user_buffers) @@ -1594,6 +1591,23 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s return d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format); } +static HRESULT d3d12_swapchain_recreate_vulkan_swapchain(struct d3d12_swapchain *swapchain) +{ + VkResult vr; + HRESULT hr; + + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + { + ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); + return hr; + } + + if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) + ERR("Failed to acquire Vulkan image after recreating swapchain, vr %d.\n", vr); + + return hresult_from_vk_result(vr); +} + static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) { return CONTAINING_RECORD(iface, struct d3d12_swapchain, IDXGISwapChain3_iface); @@ -1811,7 +1825,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * DXGI_SWAP_CHAIN_DESC1 *desc, new_desc; unsigned int i; ULONG refcount; - HRESULT hr; TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x.\n", iface, buffer_count, width, height, debug_dxgi_format(format), flags); @@ -1864,13 +1877,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * d3d12_swapchain_destroy_buffers(swapchain, TRUE); swapchain->desc = new_desc; - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) - { - ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); - return hr; - } - - return d3d12_swapchain_acquire_next_image(swapchain); + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *iface, @@ -1971,7 +1978,6 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha unsigned int sync_interval) { VkPresentModeKHR present_mode; - HRESULT hr; switch (sync_interval) { @@ -2011,16 +2017,8 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha } d3d12_swapchain_destroy_buffers(swapchain, FALSE); - swapchain->present_mode = present_mode; - - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) - { - ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); - return hr; - } - - return d3d12_swapchain_acquire_next_image(swapchain); + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); } static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) @@ -2116,13 +2114,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface TRACE("Recreating Vulkan swapchain.\n"); d3d12_swapchain_destroy_buffers(swapchain, FALSE); - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) - { - ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); - return hr; - } - - if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) + if (FAILED(hr = d3d12_swapchain_recreate_vulkan_swapchain(swapchain))) return hr; if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) @@ -2143,7 +2135,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface return hresult_from_vk_result(vr); } - return d3d12_swapchain_acquire_next_image(swapchain); + vr = d3d12_swapchain_acquire_next_image(swapchain); + return hresult_from_vk_result(vr); } static BOOL STDMETHODCALLTYPE d3d12_swapchain_IsTemporaryMonoSupported(IDXGISwapChain3 *iface) @@ -2575,11 +2568,10 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI } swapchain->vk_fence = vk_fence; - if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) + if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) { - WARN("Failed to acquire Vulkan image, hr %#x.\n", hr); d3d12_swapchain_destroy(swapchain); - return hr; + return hresult_from_vk_result(vr); } IWineDXGIFactory_AddRef(swapchain->factory = factory); -- 2.19.2

3 2

[PATCH 4/8] dxgi: Introduce d3d12_swapchain_have_user_images().
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 68 ++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 3c0951635f69..f2f89b9f7a84 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1067,6 +1067,11 @@ static BOOL d3d12_swapchain_is_present_mode_supported(struct d3d12_swapchain *sw return supported; } +static BOOL d3d12_swapchain_have_user_images(struct d3d12_swapchain *swapchain) +{ + return !!swapchain->vk_images[0]; +} + static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain, VkFormat vk_format) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1081,7 +1086,7 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc VkResult vr; HRESULT hr; - if (swapchain->vk_images[0]) + if (d3d12_swapchain_have_user_images(swapchain)) return S_OK; memset(&image_info, 0, sizeof(image_info)); @@ -1437,7 +1442,6 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, BOOL destroy_user_buffers) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - BOOL have_user_images; VkQueue vk_queue; unsigned int i; @@ -1455,11 +1459,9 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, B } } - have_user_images = swapchain->vk_images[0]; - for (i = 0; i < swapchain->buffer_count; ++i) { - if (swapchain->buffers[i] && (destroy_user_buffers || !have_user_images)) + if (swapchain->buffers[i] && (destroy_user_buffers || !d3d12_swapchain_have_user_images(swapchain))) { vkd3d_resource_decref(swapchain->buffers[i]); swapchain->buffers[i] = NULL; @@ -1589,10 +1591,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s swapchain->vk_swapchain_width = width; swapchain->vk_swapchain_height = height; - if (FAILED(hr = d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format))) - return hr; - - return S_OK; + return d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format); } static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) @@ -1999,7 +1998,7 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return S_OK; } - if (!swapchain->vk_images[swapchain->current_buffer_index]) + if (!d3d12_swapchain_have_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return S_OK; @@ -2024,39 +2023,13 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return d3d12_swapchain_acquire_next_image(swapchain); } -static VkResult d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) -{ - const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkSubmitInfo submit_info; - VkResult vr; - - submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; - submit_info.pNext = NULL; - submit_info.waitSemaphoreCount = 0; - submit_info.pWaitSemaphores = NULL; - submit_info.pWaitDstStageMask = NULL; - submit_info.commandBufferCount = 1; - submit_info.pCommandBuffers = &swapchain->vk_cmd_buffers[swapchain->current_buffer_index]; - submit_info.signalSemaphoreCount = 1; - submit_info.pSignalSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; - - if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0) - ERR("Failed to blit swapchain buffer, vr %d.\n", vr); - return vr; -} - static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkPresentInfoKHR present_info; + VkSubmitInfo submit_info; VkResult vr; - if (swapchain->vk_images[swapchain->current_buffer_index]) - { - if ((vr = d3d12_swapchain_blit_buffer(swapchain, vk_queue)) < 0) - return vr; - } - present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; present_info.pNext = NULL; present_info.waitSemaphoreCount = 0; @@ -2066,8 +2039,25 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, present_info.pImageIndices = &swapchain->current_buffer_index; present_info.pResults = NULL; - if (swapchain->vk_semaphores[swapchain->current_buffer_index]) + if (d3d12_swapchain_have_user_images(swapchain)) { + /* blit */ + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submit_info.pNext = NULL; + submit_info.waitSemaphoreCount = 0; + submit_info.pWaitSemaphores = NULL; + submit_info.pWaitDstStageMask = NULL; + submit_info.commandBufferCount = 1; + submit_info.pCommandBuffers = &swapchain->vk_cmd_buffers[swapchain->current_buffer_index]; + submit_info.signalSemaphoreCount = 1; + submit_info.pSignalSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; + + if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0) + { + ERR("Failed to blit swapchain buffer, vr %d.\n", vr); + return vr; + } + present_info.waitSemaphoreCount = 1; present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; } @@ -2117,7 +2107,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface { vkd3d_release_vk_queue(swapchain->command_queue); - if (!swapchain->vk_images[swapchain->current_buffer_index]) + if (!d3d12_swapchain_have_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return DXGI_STATUS_MODE_CHANGED; -- 2.19.2

3 2

[PATCH 3/8] maintainers: Add d3d12 to Direct3D section.
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index e72a9e835556..344282727fc5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -68,6 +68,7 @@ P: Józef Kucia <jkucia(a)codeweavers.com> P: Matteo Bruni <mbruni(a)codeweavers.com> F: dlls/d3d10*/ F: dlls/d3d11/ +F: dlls/d3d12/ F: dlls/d3d8/ F: dlls/d3d9/ F: dlls/d3drm/ -- 2.19.2

2 1

[PATCH 1/8] d3d11: Add D3D11_FORMAT_SUPPORT_TEXTURE1D to d3d11_device_CheckFormatSupport().
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7ad3d9b5e9b6..877775fdd3ac 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3302,6 +3302,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * } flag_mapping[] = { + {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE3D}, {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, -- 2.19.2

3 2

[PATCH 2/8] wined3d: Add R8G8_UNORM vertex format.
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 3 ++- dlls/wined3d/utils.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 90488edef6f3..4a02b3f51f69 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16341,6 +16341,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R32_SINT, DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_SINT, + DXGI_FORMAT_R8G8_UNORM, DXGI_FORMAT_R8_UINT, DXGI_FORMAT_R8_SINT, }; @@ -16357,7 +16358,7 @@ static void test_create_input_layout(void) layout_desc->Format = vertex_formats[i]; hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), vs_code, sizeof(vs_code), &input_layout); - ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", + ok(hr == S_OK, "Failed to create input layout for format %#x, hr %#x.\n", vertex_formats[i], hr); refcount = get_refcount(device); ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 062f8662aa72..469ce1bdacfd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -633,6 +633,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, + {WINED3DFMT_R8G8_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, -- 2.19.2

3 2

[PATCH] vbscript: Move variable declaration outside of for.
by Alistair Leslie-Hughes 01 Mar '19

01 Mar '19

This stops a compile error under gcc 4.8.4. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/vbscript/tests/run.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 49066ce..6be6c7f 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -828,8 +828,9 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { "resume", DISPID_TESTOBJ_KEYWORD, NULL }, { "goto", DISPID_TESTOBJ_KEYWORD, NULL }, }; + int i; - for (int i = 0; i < ARRAY_SIZE(dispids); i++) { + for (i = 0; i < ARRAY_SIZE(dispids); i++) { if(!stricmp_wa(bstrName, dispids[i].name)) { dispid_t *d = &dispids[i]; if(d->expect) { -- 1.9.1

3 2

[PATCH 5/6] jscript: Pass string as jsstr_t to push_instr_str.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)

1 0

[PATCH 4/6] jscript: Return regexp string as jsstr_t from lexer.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 24 +++++------------------- dlls/jscript/lex.c | 3 +-- dlls/jscript/parser.h | 8 +++++--- dlls/jscript/parser.y | 5 ++++- 4 files changed, 15 insertions(+), 25 deletions(-)

1 0

[PATCH 6/6] jscript: Add support for string literals with embedded null bytes.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 4 ++-- dlls/jscript/lex.c | 34 +++++++++++++++++++++------------- dlls/jscript/parser.h | 2 +- dlls/jscript/parser.y | 12 ++++++------ dlls/jscript/tests/lang.js | 3 +++ 5 files changed, 33 insertions(+), 22 deletions(-)

1 0

[PATCH 3/6] jscript: Support embedded null bytes in unescape.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/json.c | 4 ++-- dlls/jscript/lex.c | 25 +++++++++++++++---------- dlls/jscript/parser.h | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-)

1 0

[PATCH 2/6] jscript: Use jsstr_t as string argument type in OP_obj_prop.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 39 ++++++++++++++++++++------------------- dlls/jscript/engine.c | 8 ++++++-- dlls/jscript/engine.h | 2 +- 3 files changed, 27 insertions(+), 22 deletions(-)

1 0

[PATCH 1/6] jscript/tests: Allow GetTypeInfo calls.
by Jacek Caban 01 Mar '19

01 Mar '19

Those are called by some versions of jscript.dll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/run.c | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH v2 3/3] dnsapi: No longer prefer native.
by Hans Leidekker 01 Mar '19

01 Mar '19

v2: Get rid of DllMain. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/main.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 93528a2302..6cb3b493b7 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -30,21 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE( "(%p, %d, %p)\n", hinst, reason, reserved ); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - /****************************************************************************** * DnsAcquireContextHandle_A [DNSAPI.@] * -- 2.11.0

1 0

[PATCH v2 2/3] dnsapi: Fix data length returned for records that contain Unicode strings.
by Hans Leidekker 01 Mar '19

01 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/record.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 8d7b17af64..dc6a1137d9 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -21,6 +21,7 @@ #include "config.h" #include "wine/port.h" #include "wine/debug.h" +#include "wine/unicode.h" #include <stdarg.h> #include <stdio.h> @@ -480,6 +481,11 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET heap_free( dst->Data.MINFO.pNameMailbox ); goto error; } + + dst->wDataLength = sizeof(dst->Data.MINFO); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.MINFO.pNameMailbox ) + 1) * sizeof(WCHAR) + + (strlenW( dst->Data.MINFO.pNameErrorsMailbox ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_AFSDB: @@ -489,6 +495,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.MX.pNameExchange = dns_strcpyX( src->Data.MX.pNameExchange, in, out ); if (!dst->Data.MX.pNameExchange) goto error; + + dst->wDataLength = sizeof(dst->Data.MX); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.MX.pNameExchange ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_NXT: @@ -496,6 +506,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.NXT.pNameNext = dns_strcpyX( src->Data.NXT.pNameNext, in, out ); if (!dst->Data.NXT.pNameNext) goto error; + + dst->wDataLength = sizeof(dst->Data.NXT); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.NXT.pNameNext ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_CNAME: @@ -510,6 +524,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.PTR.pNameHost = dns_strcpyX( src->Data.PTR.pNameHost, in, out ); if (!dst->Data.PTR.pNameHost) goto error; + + dst->wDataLength = sizeof(dst->Data.PTR); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.PTR.pNameHost ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SIG: @@ -517,6 +535,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.SIG.pNameSigner = dns_strcpyX( src->Data.SIG.pNameSigner, in, out ); if (!dst->Data.SIG.pNameSigner) goto error; + + dst->wDataLength = sizeof(dst->Data.SIG); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SIG.pNameSigner ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SOA: @@ -532,6 +554,11 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET heap_free( dst->Data.SOA.pNamePrimaryServer ); goto error; } + + dst->wDataLength = sizeof(dst->Data.SOA); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SOA.pNamePrimaryServer ) + 1) * sizeof(WCHAR) + + (strlenW( dst->Data.SOA.pNameAdministrator ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SRV: @@ -539,6 +566,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.SRV.pNameTarget = dns_strcpyX( src->Data.SRV.pNameTarget, in, out ); if (!dst->Data.SRV.pNameTarget) goto error; + + dst->wDataLength = sizeof(dst->Data.SRV); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR); break; } default: -- 2.11.0

1 0

[PATCH v2 1/3] dnsapi: Add support for DNS_TYPE_OPT records.
by Hans Leidekker 01 Mar '19

01 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46704 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/query.c | 10 ++++++++++ dlls/dnsapi/record.c | 10 ++++++++++ include/windns.h | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 19eecfded1..e601191c5d 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -218,6 +218,7 @@ static unsigned int dns_get_record_size( const ns_rr *rr ) break; } case ns_t_null: + case ns_t_opt: { size += rr->rdlength - 1; break; @@ -313,6 +314,15 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W *dlen = sizeof(DNS_NULL_DATA) + rr->rdlength - 1; break; } + case ns_t_opt: + { + r->Data.OPT.wDataLength = rr->rdlength; + r->Data.OPT.wPad = 0; + memcpy( r->Data.OPT.Data, rr->rdata, rr->rdlength ); + + *dlen = sizeof(DNS_OPT_DATA) + rr->rdlength - 1; + break; + } case ns_t_cname: case ns_t_ns: case ns_t_mb: diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 7882b2290f..8d7b17af64 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -222,6 +222,16 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) return FALSE; break; } + case DNS_TYPE_OPT: + { + if (r1->Data.Opt.wDataLength != r2->Data.Opt.wDataLength) + return FALSE; + /* ignore wPad */ + if (memcmp( r1->Data.Opt.Data, + r2->Data.Opt.Data, r1->Data.Opt.wDataLength )) + return FALSE; + break; + } case DNS_TYPE_AAAA: { for (i = 0; i < sizeof(IP6_ADDRESS)/sizeof(DWORD); i++) diff --git a/include/windns.h b/include/windns.h index f150919b42..d9a4b9adb0 100644 --- a/include/windns.h +++ b/include/windns.h @@ -519,6 +519,14 @@ typedef struct DECL_WINELIB_TYPE_AW(DNS_WINSR_DATA) DECL_WINELIB_TYPE_AW(PDNS_WINSR_DATA) +typedef struct +{ + WORD wDataLength; + WORD wPad; + BYTE Data[1]; +} +DNS_OPT_DATA, *PDNS_OPT_DATA; + typedef struct _DnsRecordA { struct _DnsRecordA *pNext; @@ -552,6 +560,7 @@ typedef struct _DnsRecordA DNS_TSIG_DATAA TSIG, Tsig; DNS_WINS_DATA WINS, Wins; DNS_WINSR_DATAA WINSR, WinsR, NBSTAT, Nbstat; + DNS_OPT_DATA OPT, Opt; } Data; } DNS_RECORDA, *PDNS_RECORDA; @@ -588,6 +597,7 @@ typedef struct _DnsRecordW DNS_TSIG_DATAW TSIG, Tsig; DNS_WINS_DATA WINS, Wins; DNS_WINSR_DATAW WINSR, WinsR, NBSTAT, Nbstat; + DNS_OPT_DATA OPT, Opt; } Data; } DNS_RECORDW, *PDNS_RECORDW; -- 2.11.0

1 0

[PATCH] wpcap: Fix compilation with recent pcap/pcap.h versions.
by Dmitry Timoshkov 01 Mar '19

01 Mar '19

Recent libpcap versions have added inclusion of pcap/socket.h to pcap.h that includes sys/socket.h and other system .h files that lead to conflicts with winsock2.h. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wpcap/wpcap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index e7908cd038..f163235138 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -24,6 +24,7 @@ #undef SOCKET #undef INVALID_SOCKET +#define USE_WS_PREFIX #include "winsock2.h" #include "windef.h" #include "winbase.h" -- 2.20.1

2 1

[PATCH 3/3] dnsapi: No longer prefer native.
by Hans Leidekker 01 Mar '19

01 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 93528a2302..3272470209 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -36,8 +36,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); break; -- 2.11.0

2 1

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

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return MMSYSERR_NOMEM if pad is NULL. dlls/msacm32/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index e0c5fdd90e..2d7862cb73 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -600,7 +600,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe return MMSYSERR_NOERROR; gotError: WARN("failed: ret = %08x\n", ret); - if (pad && !pad->hDrvr) + if (!pad->hDrvr) HeapFree(MSACM_hHeap, 0, pad); return ret; } -- 2.20.1

2 1

[PATCH] mshtml: Open pages in the native browser in HlinkTarget_Navigate().
by Zebediah Figura 01 Mar '19

01 Mar '19

This matches native Windows behaviour as well, as demonstrated by running the interactive hlink:hlink tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44423 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mshtml/persist.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index b82750a85e..0607306586 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -30,6 +30,7 @@ #include "shlguid.h" #include "idispids.h" #include "mimeole.h" +#include "shellapi.h" #define NO_SHLWAPI_REG #include "shlwapi.h" @@ -1187,8 +1188,19 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L if(pwzJumpLocation) FIXME("JumpLocation not supported\n"); - if(!This->doc_obj->client) - return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL); + if(!This->doc_obj->client) { + static const WCHAR szOpen[] = {'o','p','e','n',0}; + HRESULT hres; + BSTR uri; + + hres = IUri_GetAbsoluteUri(This->window->uri, &uri); + if (FAILED(hres)) + return hres; + + ShellExecuteW(NULL, szOpen, uri, NULL, NULL, SW_SHOW); + SysFreeString(uri); + return S_OK; + } return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); } -- 2.20.1

2 1

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

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/bindctx.c | 2 +- dlls/urlmon/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 2759f3d226..61917518c0 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -45,7 +45,7 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid) void *ret; HRESULT hres; - hres = IBindStatusCallback_QueryInterface(This->callback, riid, (void**)&ret); + hres = IBindStatusCallback_QueryInterface(This->callback, riid, &ret); if(FAILED(hres) && This->serv_prov) hres = IServiceProvider_QueryService(This->serv_prov, riid, riid, &ret); diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 11e6ecee90..cc1ba81606 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -434,7 +434,7 @@ HRESULT FileProtocol_Construct(IUnknown *outer, LPVOID *ppobj) ret->file = INVALID_HANDLE_VALUE; ret->priority = 0; ret->ref = 1; - ret->outer = outer ? outer : (IUnknown*)&ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_outer; *ppobj = &ret->IUnknown_outer; return S_OK; -- 2.20.1

2 1

[PATCH v3] po: Update German translation.
by Isira Seneviratne 01 Mar '19

01 Mar '19

1 0

[PATCH v2] po: Update German translation.
by Isira Seneviratne 01 Mar '19

01 Mar '19

2 1

[PATCH] riched20/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/riched20/tests/editor.c | 2 +- dlls/riched20/tests/richole.c | 62 +++++++++++++++++------------------ dlls/riched32/tests/editor.c | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ddb101810e..f6158d9a3d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4970,7 +4970,7 @@ static void test_EM_EXSETSEL(void) /* Test with multibyte character */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); /* 012345 6 78901 */ - cr.cpMin = 4, cr.cpMax = 8; + cr.cpMin = 4; cr.cpMax = 8; result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); ok(result == 8, "EM_EXSETSEL return %ld expected 8\n", result); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d3ffdce4a7..52399047ad 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -531,21 +531,21 @@ static void test_GetText(void) SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); /* ITextSelection */ - first = 0, lim = 4; + first = 0; lim = 4; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW1), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 4, lim = 0; + first = 4; lim = 0; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW1), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 1, lim = 1; + first = 1; lim = 1; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); @@ -557,35 +557,35 @@ static void test_GetText(void) ok(hres == E_INVALIDARG, "ITextSelection_GetText\n"); } - first = 8, lim = 12; + first = 8; lim = 12; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW3), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 8, lim = 13; + first = 8; lim = 13; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW2), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 12, lim = 13; + first = 12; lim = 13; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW5), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 0, lim = -1; + first = 0; lim = -1; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW4), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = -1, lim = 9; + first = -1; lim = 9; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); @@ -757,7 +757,7 @@ static void test_ITextRange_GetChar(void) ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL); - first = 0, lim = 0; + first = 0; lim = 0; create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); @@ -769,7 +769,7 @@ static void test_ITextRange_GetChar(void) ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL); - first = 12, lim = 12; + first = 12; lim = 12; create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); @@ -781,7 +781,7 @@ static void test_ITextRange_GetChar(void) ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL); - first = 13, lim = 13; + first = 13; lim = 13; create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); @@ -795,7 +795,7 @@ static void test_ITextRange_GetChar(void) create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 12, lim = 12; + first = 12; lim = 12; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetChar(txtRge, NULL); @@ -885,28 +885,28 @@ static void test_ITextSelection_GetChar(void) create_interfaces(&w, &reOle, &txtDoc, &txtSel); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 0, lim = 4; + first = 0; lim = 4; SendMessageA(w, EM_SETSEL, first, lim); pch = 0xdeadbeef; hres = ITextSelection_GetChar(txtSel, &pch); ok(hres == S_OK, "ITextSelection_GetChar\n"); ok(pch == 'T', "got wrong char: %c\n", pch); - first = 0, lim = 0; + first = 0; lim = 0; SendMessageA(w, EM_SETSEL, first, lim); pch = 0xdeadbeef; hres = ITextSelection_GetChar(txtSel, &pch); ok(hres == S_OK, "ITextSelection_GetChar\n"); ok(pch == 'T', "got wrong char: %c\n", pch); - first = 12, lim = 12; + first = 12; lim = 12; SendMessageA(w, EM_SETSEL, first, lim); pch = 0xdeadbeef; hres = ITextSelection_GetChar(txtSel, &pch); ok(hres == S_OK, "ITextSelection_GetChar\n"); ok(pch == '\r', "got wrong char: %c\n", pch); - first = 13, lim = 13; + first = 13; lim = 13; SendMessageA(w, EM_SETSEL, first, lim); pch = 0xdeadbeef; hres = ITextSelection_GetChar(txtSel, &pch); @@ -940,7 +940,7 @@ static void test_ITextRange_GetStart_GetEnd(void) create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 1, lim = 6; + first = 1; lim = 6; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); start = 0xdeadbeef; @@ -953,7 +953,7 @@ static void test_ITextRange_GetStart_GetEnd(void) ok(end == 6, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = 6, lim = 1; + first = 6; lim = 1; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); start = 0xdeadbeef; @@ -966,7 +966,7 @@ static void test_ITextRange_GetStart_GetEnd(void) ok(end == 6, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = -1, lim = 13; + first = -1; lim = 13; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); start = 0xdeadbeef; @@ -979,7 +979,7 @@ static void test_ITextRange_GetStart_GetEnd(void) ok(end == 13, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = 13, lim = 13; + first = 13; lim = 13; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); start = 0xdeadbeef; @@ -1159,7 +1159,7 @@ static void test_ITextSelection_GetStart_GetEnd(void) create_interfaces(&w, &reOle, &txtDoc, &txtSel); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 2, lim = 5; + first = 2; lim = 5; SendMessageA(w, EM_SETSEL, first, lim); start = 0xdeadbeef; hres = ITextSelection_GetStart(txtSel, &start); @@ -1170,7 +1170,7 @@ static void test_ITextSelection_GetStart_GetEnd(void) ok(hres == S_OK, "ITextSelection_GetEnd\n"); ok(end == 5, "got wrong end value: %d\n", end); - first = 5, lim = 2; + first = 5; lim = 2; SendMessageA(w, EM_SETSEL, first, lim); start = 0xdeadbeef; hres = ITextSelection_GetStart(txtSel, &start); @@ -1181,7 +1181,7 @@ static void test_ITextSelection_GetStart_GetEnd(void) ok(hres == S_OK, "ITextSelection_GetEnd\n"); ok(end == 5, "got wrong end value: %d\n", end); - first = 0, lim = -1; + first = 0; lim = -1; SendMessageA(w, EM_SETSEL, first, lim); start = 0xdeadbeef; hres = ITextSelection_GetStart(txtSel, &start); @@ -1192,7 +1192,7 @@ static void test_ITextSelection_GetStart_GetEnd(void) ok(hres == S_OK, "ITextSelection_GetEnd\n"); ok(end == 13, "got wrong end value: %d\n", end); - first = 13, lim = 13; + first = 13; lim = 13; SendMessageA(w, EM_SETSEL, first, lim); start = 0xdeadbeef; hres = ITextSelection_GetStart(txtSel, &start); @@ -1365,7 +1365,7 @@ static void test_ITextRange_GetDuplicate(void) create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 0, lim = 4; + first = 0; lim = 4; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "ITextDocument_Range fails 0x%x.\n", hres); @@ -1408,7 +1408,7 @@ static void test_ITextRange_Collapse(void) create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 4, lim = 8; + first = 4; lim = 8; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_Collapse(txtRge, tomTrue); @@ -1470,7 +1470,7 @@ static void test_ITextRange_Collapse(void) ok(end == 4, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = 6, lim = 6; + first = 6; lim = 6; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_Collapse(txtRge, tomEnd); @@ -1483,7 +1483,7 @@ static void test_ITextRange_Collapse(void) ok(end == 6, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = 8, lim = 8; + first = 8; lim = 8; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_Collapse(txtRge, tomStart); @@ -1519,7 +1519,7 @@ static void test_ITextSelection_Collapse(void) create_interfaces(&w, &reOle, &txtDoc, &txtSel); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 4, lim = 8; + first = 4; lim = 8; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_Collapse(txtSel, tomTrue); ok(hres == S_OK, "ITextSelection_Collapse\n"); @@ -1556,7 +1556,7 @@ static void test_ITextSelection_Collapse(void) ok(start == 4, "got wrong start value: %d\n", start); ok(end == 4, "got wrong end value: %d\n", end); - first = 6, lim = 6; + first = 6; lim = 6; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_Collapse(txtSel, tomEnd); ok(hres == S_FALSE, "ITextSelection_Collapse\n"); @@ -1564,7 +1564,7 @@ static void test_ITextSelection_Collapse(void) ok(start == 6, "got wrong start value: %d\n", start); ok(end == 6, "got wrong end value: %d\n", end); - first = 8, lim = 8; + first = 8; lim = 8; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_Collapse(txtSel, tomStart); ok(hres == S_FALSE, "ITextSelection_Collapse\n"); diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index dd9773c3f6..7394203cb7 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1358,7 +1358,7 @@ static void test_EM_EXSETSEL(void) /* Test with multibyte character */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); /* 012345 6 7 8901 */ - cr.cpMin = 4, cr.cpMax = 8; + cr.cpMin = 4; cr.cpMax = 8; result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); todo_wine ok(result == 7, "EM_EXSETSEL return %ld expected 7\n", result); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); -- 2.20.1

2 1

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

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- dlls/ole32/tests/compobj.c | 6 +++--- dlls/ole32/tests/marshal.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 3eff56908d..6d4bcca96a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1003,7 +1003,7 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; GlobalUnlock(entry->stgmedium.u.hMetaFilePict); - for (check = (WORD *)&meta_place_rec; check != (WORD *)&meta_place_rec.checksum; check++) + for (check = (WORD *)&meta_place_rec; check != &meta_place_rec.checksum; check++) meta_place_rec.checksum ^= *check; hr = IStream_Write(stream, &meta_place_rec, sizeof(struct meta_placeable), NULL); if (hr == S_OK && data_size) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b4dd83e63d..aebe9674a1 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1031,7 +1031,7 @@ static HRESULT WINAPI PSFactoryBuffer_CreateStub( { CHECK_EXPECT(CreateStub); - ok(pUnkServer == (IUnknown*)&Test_Unknown, "unexpected pUnkServer %p\n", pUnkServer); + ok(pUnkServer == &Test_Unknown, "unexpected pUnkServer %p\n", pUnkServer); if(!ps_factory_buffer) return E_NOTIMPL; @@ -3753,10 +3753,10 @@ static DWORD CALLBACK implicit_mta_proc(void *param) hr = CoRegisterMessageFilter(NULL, NULL); ok(hr == CO_E_NOT_SUPPORTED, "got %#x\n", hr); - hr = CoLockObjectExternal((IUnknown *)&Test_Unknown, TRUE, TRUE); + hr = CoLockObjectExternal(&Test_Unknown, TRUE, TRUE); ok_ole_success(hr, "CoLockObjectExternal"); - hr = CoDisconnectObject((IUnknown *)&Test_Unknown, 0); + hr = CoDisconnectObject(&Test_Unknown, 0); ok_ole_success(hr, "CoDisconnectObject"); return 0; diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index c53acf236c..33b155d474 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -329,7 +329,7 @@ static HRESULT WINAPI Test_IClassFactory_CreateInstance( LPVOID *ppvObj) { if (pUnkOuter) return CLASS_E_NOAGGREGATION; - return IUnknown_QueryInterface((IUnknown*)&Test_Unknown, riid, ppvObj); + return IUnknown_QueryInterface(&Test_Unknown, riid, ppvObj); } static HRESULT WINAPI Test_IClassFactory_LockServer( -- 2.20.1

3 2

[PATCH 1/5] user32/listbox: Use a helper to set item data by index
by Gabriel Ivăncescu 01 Mar '19

01 Mar '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 826ce01..9bf9f90 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -156,6 +156,11 @@ static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; } +static void set_item_data( LB_DESCR *descr, UINT index, ULONG_PTR data ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].data = data; +} + static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) { return HAS_STRINGS(descr) ? descr->items[index].str : NULL; @@ -2743,7 +2748,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam; + set_item_data(descr, wParam, lParam); /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE; -- 2.20.1

3 13

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

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/font.c | 2 +- dlls/dwrite/layout.c | 4 ++-- dlls/dwrite/opentype.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 948c1dfa05..374236657b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2420,7 +2420,7 @@ static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT3 BOOL is_system_collection(IDWriteFontCollection *collection) { void *obj; - return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, (void**)&obj) == S_OK; + return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, &obj) == S_OK; } static HRESULT WINAPI dwritesystemfontcollection_QueryInterface(IDWriteFontCollection1 *iface, REFIID riid, void **obj) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index de79fd4c7f..4cd5ce445f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2520,7 +2520,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ changed = set_layout_range_iface_attr((IUnknown**)&dest->object, (IUnknown*)value->u.object); break; case LAYOUT_RANGE_ATTR_EFFECT: - changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.effect); + changed = set_layout_range_iface_attr(&dest_iface->iface, value->u.effect); break; case LAYOUT_RANGE_ATTR_UNDERLINE: changed = dest_bool->value != value->u.underline; @@ -2560,7 +2560,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ dest_spacing->min_advance = value->u.spacing.min_advance; break; case LAYOUT_RANGE_ATTR_TYPOGRAPHY: - changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.typography); + changed = set_layout_range_iface_attr(&dest_iface->iface, (IUnknown*)value->u.typography); break; default: ; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b13f424019..4772236770 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -538,7 +538,7 @@ struct ot_lookup_table WORD subtable[1]; }; -#define GLYPH_NOT_COVERED ((unsigned int)~0u) +#define GLYPH_NOT_COVERED (~0u) struct ot_coverage_format1 { -- 2.20.1

2 1

[v2 PATCH 01/10] mfplat/tests: Add a test for deferred item posting.
by Nikolay Sivov 01 Mar '19

01 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixes test failures on Windows. dlls/mfplat/mfplat.spec | 6 ++-- dlls/mfplat/queue.c | 47 +++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 62 ++++++++++++++++++++++++++++++++++++-- include/mfapi.h | 2 ++ 4 files changed, 112 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c4e0b2abfa..39fd7a9d44 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -28,7 +28,7 @@ @ stub MFCalculateBitmapImageSize @ stub MFCalculateImageSize @ stub MFCancelCreateFile -@ stub MFCancelWorkItem +@ stdcall MFCancelWorkItem(int64) @ stub MFCompareFullToPartialMediaType @ stub MFCompareSockaddrAddresses @ stub MFConvertColorInfoFromDXVA @@ -124,8 +124,8 @@ @ stdcall MFPutWorkItemEx(long ptr) @ stub MFRecordError @ stub MFRemovePeriodicCallback -@ stub MFScheduleWorkItem -@ stub MFScheduleWorkItemEx +@ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) +@ stdcall MFScheduleWorkItemEx(ptr int64 ptr) @ stub MFSerializeAttributesToStream @ stub MFSerializeEvent @ stub MFSerializeMediaTypeToStream diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index ebc2ad487b..7c8790b52c 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -385,3 +385,50 @@ HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result) return hr; } + +static HRESULT schedule_work_item(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) +{ + FIXME("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); + + return E_NOTIMPL; +} + +/*********************************************************************** + * MFScheduleWorkItemEx (mfplat.@) + */ +HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) +{ + TRACE("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); + + return schedule_work_item(result, timeout, key); +} + +/*********************************************************************** + * MFScheduleWorkItemEx (mfplat.@) + */ +HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key) +{ + IMFAsyncResult *result; + HRESULT hr; + + TRACE("%p, %p, %s, %p.\n", callback, state, wine_dbgstr_longlong(timeout), key); + + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + return hr; + + hr = schedule_work_item(result, timeout, key); + + IMFAsyncResult_Release(result); + + return hr; +} + +/*********************************************************************** + * MFCancelWorkItem (mfplat.@) + */ +HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key) +{ + FIXME("%s.\n", wine_dbgstr_longlong(key)); + + return E_NOTIMPL; +} diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 609faa5d00..cc8a0f47b8 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -43,6 +43,7 @@ static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteS static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer **buffer); static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); static void (WINAPI *pMFHeapFree)(void *p); +static HRESULT (WINAPI *pMFPutWaitingWorkItem)(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -318,6 +319,7 @@ static void init_functions(void) X(MFCreateMemoryBuffer); X(MFHeapAlloc); X(MFHeapFree); + X(MFPutWaitingWorkItem); #undef X } @@ -718,13 +720,13 @@ static ULONG WINAPI testcallback_Release(IMFAsyncCallback *iface) static HRESULT WINAPI testcallback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) { - ok(0, "Unexpected call.\n"); + ok(flags != NULL && queue != NULL, "Unexpected arguments.\n"); return E_NOTIMPL; } static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { - ok(0, "Unexpected call.\n"); + ok(result != NULL, "Unexpected result object.\n"); return E_NOTIMPL; } @@ -1035,6 +1037,61 @@ static void test_MFHeapAlloc(void) pMFHeapFree(res); } +static void test_scheduled_items(void) +{ + IMFAsyncCallback callback = { &testcallbackvtbl }; + IMFAsyncResult *result; + MFWORKITEM_KEY key, key2; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFScheduleWorkItem(&callback, NULL, -5000, &key); +todo_wine + ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); +todo_wine + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); +todo_wine + ok(hr == MF_E_NOT_FOUND || broken(hr == S_OK) /* < win10 */, "Unexpected hr %#x.\n", hr); + + if (!pMFPutWaitingWorkItem) + { + skip("Waiting items are not supported.\n"); + return; + } + + hr = MFCreateAsyncResult(NULL, &callback, NULL, &result); + ok(hr == S_OK, "Failed to create result, hr %#x.\n", hr); + + hr = pMFPutWaitingWorkItem(NULL, 0, result, &key); + ok(hr == S_OK, "Failed to add waiting item, hr %#x.\n", hr); + + hr = pMFPutWaitingWorkItem(NULL, 0, result, &key2); + ok(hr == S_OK, "Failed to add waiting item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key2); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + IMFAsyncResult_Release(result); + + hr = MFScheduleWorkItem(&callback, NULL, -5000, &key); + ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -1056,6 +1113,7 @@ START_TEST(mfplat) test_MFCopyImage(); test_MFCreateCollection(); test_MFHeapAlloc(); + test_scheduled_items(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 7c47213d85..4b7d758488 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -115,6 +115,8 @@ HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result); +HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key); +HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes); -- 2.20.1

1 9

[PATCH] winevulkan: Use VkBase{In, Out}Structure instead of custom structure.
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 1c721039f2f3..3893f1c85e4d 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -34,17 +34,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); */ #define WINE_VULKAN_ICD_VERSION 4 -/* All Vulkan structures use this structure for the first elements. */ -struct wine_vk_structure_header -{ - VkStructureType sType; - void *pNext; -}; - #define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t) static void *wine_vk_find_struct_(void *s, VkStructureType t) { - struct wine_vk_structure_header *header; + VkBaseOutStructure *header; for (header = s; header; header = header->pNext) { @@ -250,7 +243,7 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src */ if (src->pNext) { - const struct wine_vk_structure_header *header; + const VkBaseInStructure *header; dst->pNext = NULL; for (header = src->pNext; header; header = header->pNext) @@ -369,7 +362,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo */ if (src->pNext) { - const struct wine_vk_structure_header *header; + const VkBaseInStructure *header; for (header = src->pNext; header; header = header->pNext) { @@ -997,8 +990,8 @@ void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t family_index, void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *info, VkQueue *queue) { - const struct wine_vk_structure_header *chain; struct VkQueue_T *matching_queue; + const VkBaseInStructure *chain; TRACE("%p, %p, %p\n", device, info, queue); @@ -1111,7 +1104,7 @@ VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, { ERR("Unable to allocate memory for comman buffers!\n"); res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err; + goto done; } for (j = 0; j < num_command_buffers; j++) @@ -1123,7 +1116,7 @@ VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, res = queue->device->funcs.p_vkQueueSubmit(queue->queue, count, submits_host, fence); -err: +done: for (i = 0; i < count; i++) { heap_free((void *)submits_host[i].pCommandBuffers); -- 2.19.2

1 0

[PATCH 2/3] dnsapi: Fix data length returned for records that contain Unicode strings.
by Hans Leidekker 01 Mar '19

01 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/record.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 8d7b17af64..dc6a1137d9 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -21,6 +21,7 @@ #include "config.h" #include "wine/port.h" #include "wine/debug.h" +#include "wine/unicode.h" #include <stdarg.h> #include <stdio.h> @@ -480,6 +481,11 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET heap_free( dst->Data.MINFO.pNameMailbox ); goto error; } + + dst->wDataLength = sizeof(dst->Data.MINFO); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.MINFO.pNameMailbox ) + 1) * sizeof(WCHAR) + + (strlenW( dst->Data.MINFO.pNameErrorsMailbox ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_AFSDB: @@ -489,6 +495,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.MX.pNameExchange = dns_strcpyX( src->Data.MX.pNameExchange, in, out ); if (!dst->Data.MX.pNameExchange) goto error; + + dst->wDataLength = sizeof(dst->Data.MX); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.MX.pNameExchange ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_NXT: @@ -496,6 +506,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.NXT.pNameNext = dns_strcpyX( src->Data.NXT.pNameNext, in, out ); if (!dst->Data.NXT.pNameNext) goto error; + + dst->wDataLength = sizeof(dst->Data.NXT); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.NXT.pNameNext ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_CNAME: @@ -510,6 +524,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.PTR.pNameHost = dns_strcpyX( src->Data.PTR.pNameHost, in, out ); if (!dst->Data.PTR.pNameHost) goto error; + + dst->wDataLength = sizeof(dst->Data.PTR); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.PTR.pNameHost ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SIG: @@ -517,6 +535,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.SIG.pNameSigner = dns_strcpyX( src->Data.SIG.pNameSigner, in, out ); if (!dst->Data.SIG.pNameSigner) goto error; + + dst->wDataLength = sizeof(dst->Data.SIG); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SIG.pNameSigner ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SOA: @@ -532,6 +554,11 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET heap_free( dst->Data.SOA.pNamePrimaryServer ); goto error; } + + dst->wDataLength = sizeof(dst->Data.SOA); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SOA.pNamePrimaryServer ) + 1) * sizeof(WCHAR) + + (strlenW( dst->Data.SOA.pNameAdministrator ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SRV: @@ -539,6 +566,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.SRV.pNameTarget = dns_strcpyX( src->Data.SRV.pNameTarget, in, out ); if (!dst->Data.SRV.pNameTarget) goto error; + + dst->wDataLength = sizeof(dst->Data.SRV); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR); break; } default: -- 2.11.0

1 0

[PATCH 1/3] dnsapi: Add support for DNS_TYPE_OPT records.
by Hans Leidekker 01 Mar '19

01 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46704 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/query.c | 10 ++++++++++ dlls/dnsapi/record.c | 10 ++++++++++ include/windns.h | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 19eecfded1..e601191c5d 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -218,6 +218,7 @@ static unsigned int dns_get_record_size( const ns_rr *rr ) break; } case ns_t_null: + case ns_t_opt: { size += rr->rdlength - 1; break; @@ -313,6 +314,15 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W *dlen = sizeof(DNS_NULL_DATA) + rr->rdlength - 1; break; } + case ns_t_opt: + { + r->Data.OPT.wDataLength = rr->rdlength; + r->Data.OPT.wPad = 0; + memcpy( r->Data.OPT.Data, rr->rdata, rr->rdlength ); + + *dlen = sizeof(DNS_OPT_DATA) + rr->rdlength - 1; + break; + } case ns_t_cname: case ns_t_ns: case ns_t_mb: diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 7882b2290f..8d7b17af64 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -222,6 +222,16 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) return FALSE; break; } + case DNS_TYPE_OPT: + { + if (r1->Data.Opt.wDataLength != r2->Data.Opt.wDataLength) + return FALSE; + /* ignore wPad */ + if (memcmp( r1->Data.Opt.Data, + r2->Data.Opt.Data, r1->Data.Opt.wDataLength )) + return FALSE; + break; + } case DNS_TYPE_AAAA: { for (i = 0; i < sizeof(IP6_ADDRESS)/sizeof(DWORD); i++) diff --git a/include/windns.h b/include/windns.h index f150919b42..d9a4b9adb0 100644 --- a/include/windns.h +++ b/include/windns.h @@ -519,6 +519,14 @@ typedef struct DECL_WINELIB_TYPE_AW(DNS_WINSR_DATA) DECL_WINELIB_TYPE_AW(PDNS_WINSR_DATA) +typedef struct +{ + WORD wDataLength; + WORD wPad; + BYTE Data[1]; +} +DNS_OPT_DATA, *PDNS_OPT_DATA; + typedef struct _DnsRecordA { struct _DnsRecordA *pNext; @@ -552,6 +560,7 @@ typedef struct _DnsRecordA DNS_TSIG_DATAA TSIG, Tsig; DNS_WINS_DATA WINS, Wins; DNS_WINSR_DATAA WINSR, WinsR, NBSTAT, Nbstat; + DNS_OPT_DATA OPT, Opt; } Data; } DNS_RECORDA, *PDNS_RECORDA; @@ -588,6 +597,7 @@ typedef struct _DnsRecordW DNS_TSIG_DATAW TSIG, Tsig; DNS_WINS_DATA WINS, Wins; DNS_WINSR_DATAW WINSR, WinsR, NBSTAT, Nbstat; + DNS_OPT_DATA OPT, Opt; } Data; } DNS_RECORDW, *PDNS_RECORDW; -- 2.11.0

1 0

[PATCH 01/10] mfplat/tests: Add a test for deferred item posting.
by Nikolay Sivov 01 Mar '19

01 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mfplat.spec | 6 ++-- dlls/mfplat/queue.c | 47 +++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 62 ++++++++++++++++++++++++++++++++++++-- include/mfapi.h | 2 ++ 4 files changed, 112 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c4e0b2abfa..39fd7a9d44 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -28,7 +28,7 @@ @ stub MFCalculateBitmapImageSize @ stub MFCalculateImageSize @ stub MFCancelCreateFile -@ stub MFCancelWorkItem +@ stdcall MFCancelWorkItem(int64) @ stub MFCompareFullToPartialMediaType @ stub MFCompareSockaddrAddresses @ stub MFConvertColorInfoFromDXVA @@ -124,8 +124,8 @@ @ stdcall MFPutWorkItemEx(long ptr) @ stub MFRecordError @ stub MFRemovePeriodicCallback -@ stub MFScheduleWorkItem -@ stub MFScheduleWorkItemEx +@ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) +@ stdcall MFScheduleWorkItemEx(ptr int64 ptr) @ stub MFSerializeAttributesToStream @ stub MFSerializeEvent @ stub MFSerializeMediaTypeToStream diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index ebc2ad487b..7c8790b52c 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -385,3 +385,50 @@ HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result) return hr; } + +static HRESULT schedule_work_item(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) +{ + FIXME("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); + + return E_NOTIMPL; +} + +/*********************************************************************** + * MFScheduleWorkItemEx (mfplat.@) + */ +HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) +{ + TRACE("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); + + return schedule_work_item(result, timeout, key); +} + +/*********************************************************************** + * MFScheduleWorkItemEx (mfplat.@) + */ +HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key) +{ + IMFAsyncResult *result; + HRESULT hr; + + TRACE("%p, %p, %s, %p.\n", callback, state, wine_dbgstr_longlong(timeout), key); + + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + return hr; + + hr = schedule_work_item(result, timeout, key); + + IMFAsyncResult_Release(result); + + return hr; +} + +/*********************************************************************** + * MFCancelWorkItem (mfplat.@) + */ +HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key) +{ + FIXME("%s.\n", wine_dbgstr_longlong(key)); + + return E_NOTIMPL; +} diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 609faa5d00..cc8a0f47b8 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -43,6 +43,7 @@ static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteS static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer **buffer); static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); static void (WINAPI *pMFHeapFree)(void *p); +static HRESULT (WINAPI *pMFPutWaitingWorkItem)(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -318,6 +319,7 @@ static void init_functions(void) X(MFCreateMemoryBuffer); X(MFHeapAlloc); X(MFHeapFree); + X(MFPutWaitingWorkItem); #undef X } @@ -718,13 +720,13 @@ static ULONG WINAPI testcallback_Release(IMFAsyncCallback *iface) static HRESULT WINAPI testcallback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) { - ok(0, "Unexpected call.\n"); + ok(flags != NULL && queue != NULL, "Unexpected arguments.\n"); return E_NOTIMPL; } static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { - ok(0, "Unexpected call.\n"); + ok(result != NULL, "Unexpected result object.\n"); return E_NOTIMPL; } @@ -1035,6 +1037,61 @@ static void test_MFHeapAlloc(void) pMFHeapFree(res); } +static void test_scheduled_items(void) +{ + IMFAsyncCallback callback = { &testcallbackvtbl }; + IMFAsyncResult *result; + MFWORKITEM_KEY key, key2; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFScheduleWorkItem(&callback, NULL, -5000, &key); +todo_wine + ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); +todo_wine + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); +todo_wine + ok(hr == MF_E_NOT_FOUND || broken(hr == S_OK) /* < win10 */, "Unexpected hr %#x.\n", hr); + + if (!pMFPutWaitingWorkItem) + { + skip("Waiting items are not supported.\n"); + return; + } + + hr = MFCreateAsyncResult(NULL, &callback, NULL, &result); + ok(hr == S_OK, "Failed to create result, hr %#x.\n", hr); + + hr = pMFPutWaitingWorkItem(NULL, 0, result, &key); + ok(hr == S_OK, "Failed to add waiting item, hr %#x.\n", hr); + + hr = pMFPutWaitingWorkItem(NULL, 0, result, &key2); + ok(hr == S_OK, "Failed to add waiting item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key2); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + IMFAsyncResult_Release(result); + + hr = MFScheduleWorkItem(&callback, NULL, -5000, &key); + ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -1056,6 +1113,7 @@ START_TEST(mfplat) test_MFCopyImage(); test_MFCreateCollection(); test_MFHeapAlloc(); + test_scheduled_items(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 7c47213d85..4b7d758488 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -115,6 +115,8 @@ HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result); +HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key); +HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes); -- 2.20.1

2 10

[PATCH v2] po: Update Sinhala translation.
by Isira Seneviratne 01 Mar '19

01 Mar '19

2 1

[PATCH] po: Update Sinhala translation.
by Isira Seneviratne 01 Mar '19

01 Mar '19

2 1

Creating the Sinhala NLS file
by Isira Seneviratne 01 Mar '19

01 Mar '19

Hi, I've created a NLS file for the Sinhala language, which is available through the attached patch. I created it by using the Tamil NLS file as a base and altered as many strings as I could by referring to Microsoft's Style Guide for Sinhala. I would like to know if the following statements to obtain the value of LOCALE_FONTSIGNATURE for Sinhala are correct, or if any corrections should be made: WCHAR s[100]; GetLocaleInfoEx(L"si", LOCALE_FONTSIGNATURE, s, 100); Isira

3 6

[PATCH] kernel32: Add LOCALE_SSCRIPTS value to Sinhala NLS file.
by Isira Seneviratne 01 Mar '19

01 Mar '19

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