- Wine-Devel - list.winehq.org

[PATCH vkd3d v2 1/5] tests: Use a vertex buffer to draw quads for shader tests.
by Zebediah Figura April 8, 2022

April 8, 2022

For compatibility with shader models before 4.0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Draw a large triangle anyway. Also, make it large enough to avoid depending on pixel-exact rendering near the viewport edges. tests/shader_runner.c | 69 ++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 21 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index d3d131164..ffa4cf61b 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -314,6 +314,24 @@ static void parse_input_layout_directive(struct shader_runner *runner, const cha element->index = 0; } +static void set_resource(struct shader_runner *runner, struct resource *resource) +{ + size_t i; + + for (i = 0; i < runner->resource_count; ++i) + { + if (runner->resources[i]->slot == resource->slot && runner->resources[i]->type == resource->type) + { + runner->ops->destroy_resource(runner, runner->resources[i]); + runner->resources[i] = resource; + return; + } + } + + runner->resources = realloc(runner->resources, (runner->resource_count + 1) * sizeof(*runner->resources)); + runner->resources[runner->resource_count++] = resource; +} + static void set_uniforms(struct shader_runner *runner, size_t offset, size_t count, const void *uniforms) { runner->uniform_count = align(max(runner->uniform_count, offset + count), 4); @@ -326,13 +344,40 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) { if (match_string(line, "draw quad", &line)) { + struct resource_params params; + struct input_element *element; + + /* For simplicity, draw a large triangle instead. */ + static const struct vec2 quad[] = + { + {-2.0f, -2.0f}, + {-2.0f, 4.0f}, + { 4.0f, -2.0f}, + }; + static const char vs_source[] = - "void main(uint id : SV_VertexID, out float4 position : SV_Position)\n" + "void main(inout float4 position : sv_position)\n" "{\n" - " float2 coords = float2((id << 1) & 2, id & 2);\n" - " position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);\n" "}"; + vkd3d_array_reserve((void **)&runner->input_elements, &runner->input_element_capacity, + 1, sizeof(*runner->input_elements)); + element = &runner->input_elements[0]; + element->name = strdup("sv_position"); + element->slot = 0; + element->format = DXGI_FORMAT_R32G32_FLOAT; + element->texel_size = sizeof(*quad); + element->index = 0; + runner->input_element_count = 1; + + memset(&params, 0, sizeof(params)); + params.slot = 0; + params.type = RESOURCE_TYPE_VERTEX_BUFFER; + params.data = malloc(sizeof(quad)); + memcpy(params.data, quad, sizeof(quad)); + params.data_size = sizeof(quad); + set_resource(runner, runner->ops->create_resource(runner, &params)); + if (!runner->vs_source) runner->vs_source = strdup(vs_source); @@ -482,24 +527,6 @@ static struct sampler *get_sampler(struct shader_runner *runner, unsigned int sl return NULL; } -static void set_resource(struct shader_runner *runner, struct resource *resource) -{ - size_t i; - - for (i = 0; i < runner->resource_count; ++i) - { - if (runner->resources[i]->slot == resource->slot && runner->resources[i]->type == resource->type) - { - runner->ops->destroy_resource(runner, runner->resources[i]); - runner->resources[i] = resource; - return; - } - } - - runner->resources = realloc(runner->resources, (runner->resource_count + 1) * sizeof(*runner->resources)); - runner->resources[runner->resource_count++] = resource; -} - unsigned int get_vb_stride(const struct shader_runner *runner, unsigned int slot) { unsigned int stride = 0; -- 2.35.1

2 9

[PATCH] ncrypt: Map STATUS_NO_MEMORY to NTE_NO_MEMORY.
by Mohamad Al-Jaf April 8, 2022

April 8, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- BCryptEnumAlgorithms can return this as an NTSTATUS. --- dlls/ncrypt/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 10cec633269..58503338d6e 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -40,6 +40,7 @@ static SECURITY_STATUS map_ntstatus(NTSTATUS status) case STATUS_INVALID_SIGNATURE: return NTE_BAD_SIGNATURE; case STATUS_SUCCESS: return ERROR_SUCCESS; case STATUS_INVALID_PARAMETER: return NTE_INVALID_PARAMETER; + case STATUS_NO_MEMORY: return NTE_NO_MEMORY; case STATUS_NOT_SUPPORTED: return NTE_NOT_SUPPORTED; case NTE_BAD_DATA: return NTE_BAD_DATA; default: -- 2.35.1

2 1

[PATCH] msado15: _Recordset Clone return valid object.
by Alistair Leslie-Hughes April 8, 2022

April 8, 2022

This is just to stop a crash when Clone is called. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 3bbb4bd3300..766c17598ce 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1794,8 +1794,12 @@ static HRESULT WINAPI recordset_CompareBookmarks( _Recordset *iface, VARIANT boo static HRESULT WINAPI recordset_Clone( _Recordset *iface, LockTypeEnum lock_type, _Recordset **obj ) { - FIXME( "%p, %d, %p\n", iface, lock_type, obj ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + FIXME( "%p, %d, %p\n", recordset, lock_type, obj ); + + *obj = iface; + recordset_AddRef( iface ); + return S_OK; } static HRESULT WINAPI recordset_Resync( _Recordset *iface, AffectEnum affect_records, ResyncEnum resync_values ) -- 2.35.1

1 0

[PATCH v3 1/2] winex11: Prevent the call sequence change between xim preedit callback and key event handlers.
by Byeongsik Jeon April 8, 2022

April 8, 2022

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v2: rework. update merge_events(). v3: remove the wrong explanatory paragraph. "xim preedit callback" is called from within the XFilterEvent(). ### xim server sended event sequence ### preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string 'ㄱ' preedit draw:: caret 1 chg_first 0 chg_length 1 string '가' preedit draw:: caret 1 chg_first 0 chg_length 1 string '간' preedit draw:: caret 0 chg_first 0 chg_length 1 NULL preedit done:: lookup chars:: keycode 0 string 3 '가' <== HERE preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string '나' <== HERE ### Wine process_events() simulated event sequence ### preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string 'ㄱ' preedit draw:: caret 1 chg_first 0 chg_length 1 string '가' preedit draw:: caret 1 chg_first 0 chg_length 1 string '간' preedit draw:: caret 0 chg_first 0 chg_length 1 NULL preedit done:: preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string '나' <== HERE lookup chars:: keycode 0 string 3 '가' <== HERE dlls/winex11.drv/event.c | 60 ++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index c20ceeacca1..581e28787a0 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -261,10 +261,11 @@ static Bool filter_event( Display *display, XEvent *event, char *arg ) enum event_merge_action { - MERGE_DISCARD, /* discard the old event */ - MERGE_HANDLE, /* handle the old event */ + MERGE_FLUSH, /* handle all the events */ MERGE_KEEP, /* keep the old event for future merging */ - MERGE_IGNORE /* ignore the new event, keep the old one */ + MERGE_IGNORE, /* ignore the new event, keep the old one */ + MERGE_DISCARD, /* discard the old event */ + MERGE_HANDLE /* handle the old event */ }; /*********************************************************************** @@ -316,6 +317,19 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) { switch (prev->type) { + case 0: + switch (next->type) + { + case ConfigureNotify: + case MotionNotify: +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + case GenericEvent: +#endif + return MERGE_DISCARD; + default: + return MERGE_KEEP; + } + break; case ConfigureNotify: switch (next->type) { @@ -325,7 +339,7 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate ConfigureNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; case Expose: case PropertyNotify: return MERGE_KEEP; @@ -340,30 +354,30 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H case GenericEvent: - if (next->xcookie.extension != xinput2_opcode) break; - if (next->xcookie.evtype != XI_RawMotion) break; - if (x11drv_thread_data()->warp_serial) break; + if (next->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (next->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; + if (x11drv_thread_data()->warp_serial) return MERGE_HANDLE; return MERGE_KEEP; } break; case GenericEvent: - if (prev->xcookie.extension != xinput2_opcode) break; - if (prev->xcookie.evtype != XI_RawMotion) break; + if (prev->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (prev->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; switch (next->type) { case GenericEvent: - if (next->xcookie.extension != xinput2_opcode) break; - if (next->xcookie.evtype != XI_RawMotion) break; - if (x11drv_thread_data()->warp_serial) break; + if (next->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (next->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; + if (x11drv_thread_data()->warp_serial) return MERGE_HANDLE; return merge_raw_motion_events( prev->xcookie.data, next->xcookie.data ); #endif } break; } - return MERGE_HANDLE; + return MERGE_FLUSH; } @@ -445,23 +459,29 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X else continue; /* filtered, ignore it */ } + get_event_data( &event ); - if (prev_event.type) action = merge_events( &prev_event, &event ); + action = merge_events( &prev_event, &event ); switch( action ) { - case MERGE_HANDLE: /* handle prev, keep new */ + case MERGE_FLUSH: /* handle all the events */ queued |= call_event_handler( display, &prev_event ); - /* fall through */ - case MERGE_DISCARD: /* discard prev, keep new */ free_event_data( &prev_event ); - prev_event = event; - break; + prev_event.type = 0; + /* fall through */ case MERGE_KEEP: /* handle new, keep prev for future merging */ queued |= call_event_handler( display, &event ); /* fall through */ case MERGE_IGNORE: /* ignore new, keep prev for future merging */ free_event_data( &event ); break; + case MERGE_HANDLE: /* handle prev, keep new */ + queued |= call_event_handler( display, &prev_event ); + /* fall through */ + case MERGE_DISCARD: /* discard prev, keep new */ + free_event_data( &prev_event ); + prev_event = event; + break; } } if (prev_event.type) queued |= call_event_handler( display, &prev_event ); -- 2.35.1

1 1

[PATCH] programs/winedbg: trace 64-bit integers with I64 width modifier
by Eric Pouech April 8, 2022

April 8, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 208526739e2e..3118637cb5ef 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -114,8 +114,8 @@ BOOL memory_write_value(const struct dbg_lvalue* lvalue, DWORD size, void* value if (!types_get_info(&lvalue->type, TI_GET_LENGTH, &os)) return FALSE; if (size != os) { - dbg_printf("Size mismatch in memory_write_value, got %lu from type while expecting %lu\n", - (DWORD)os, size); + dbg_printf("Size mismatch in memory_write_value, got %I64u from type while expecting %lu\n", + os, size); return FALSE; }

1 0

[PATCH] dlls/snmpapi: trace 64-bit integers with I64 width modifier
by Eric Pouech April 8, 2022

April 8, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/snmpapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 7020c6062283..4c647b6d2bee 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -579,7 +579,7 @@ VOID WINAPI SnmpUtilPrintAsnAny(AsnAny *any) case ASN_TIMETICKS: TRACE("Timeticks %lu\n", any->asnValue.ticks); return; case ASN_COUNTER64: { - TRACE("Counter64 %lx%08lx\n", (DWORD)(any->asnValue.counter64.QuadPart>>32),(DWORD)any->asnValue.counter64.QuadPart); + TRACE("Counter64 %I64x\n", any->asnValue.counter64.QuadPart); return; } case ASN_OCTETSTRING:

1 0

[PATCH] dlls/qcap: trace 64-bit integers with I64 width modifier
by Eric Pouech April 8, 2022

April 8, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/qcap/filewriter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 43f6274ea8d0..efe9b10277b5 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -87,7 +87,7 @@ static HRESULT WINAPI file_writer_sink_receive(struct strmbase_sink *iface, IMed } if (size != stop - start) - ERR("Short write, %lu/%lu.\n", size, (DWORD)(stop - start)); + ERR("Short write, %lu/%I64u.\n", size, stop - start); return S_OK; }

1 0

[PATCH] dlls/dxdiagn: use I64 width modifier for 64-bit integers in printf
by Eric Pouech April 8, 2022

April 8, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dxdiagn/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 8479d59fefe6..ed59f84bef2f 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -685,7 +685,7 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) return hr; /* FIXME: Roundoff should not be done with truncated division. */ - swprintf(print_buf, ARRAY_SIZE(print_buf), L"%uMB RAM", (DWORD)(msex.ullTotalPhys / (1024 * 1024))); + swprintf(print_buf, ARRAY_SIZE(print_buf), L"%I64uMB RAM", msex.ullTotalPhys / (1024 * 1024)); hr = add_bstr_property(node, L"szPhysicalMemoryEnglish", print_buf); if (FAILED(hr)) return hr;

1 0

[PATCH] dlls/dbghelp: trace 64-bit integers with I64 width modifier
by Eric Pouech April 8, 2022

April 8, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 079e3a2ee4aa..906b60e64e1b 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -693,7 +693,7 @@ static struct symt* codeview_add_type_array(struct codeview_type_parse* ctp, if (symt_get_info(ctp->module, elem, TI_GET_LENGTH, &elem_size) && elem_size) { if (arr_len % (DWORD)elem_size) - FIXME("array size should be a multiple of element size %u %lu\n", arr_len, (DWORD)elem_size); + FIXME("array size should be a multiple of element size %u %I64u\n", arr_len, elem_size); count = arr_len / (unsigned)elem_size; } return &symt_new_array(ctp->module, 0, count, elem, index)->symt;

1 0

[PATCH] evr: Cleanup class factory methods.
by Nikolay Sivov April 8, 2022

April 8, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/main.c | 66 ++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/evr/main.c b/dlls/evr/main.c index b5bab74c4f6..702e4640831 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -48,16 +48,16 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } -typedef struct { +struct class_factory +{ IClassFactory IClassFactory_iface; - - LONG ref; + LONG refcount; HRESULT (*pfnCreateInstance)(IUnknown *unk_outer, void **ppobj); -} IClassFactoryImpl; +}; -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +static inline struct class_factory *impl_from_IClassFactory(IClassFactory *iface) { - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); + return CONTAINING_RECORD(iface, struct class_factory, IClassFactory_iface); } struct object_creation_info @@ -73,65 +73,65 @@ static const struct object_creation_info object_creation[] = { &CLSID_MFVideoPresenter9, evr_presenter_create }, }; -static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) +static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **out) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); + struct class_factory *factory = impl_from_IClassFactory(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = &This->IClassFactory_iface; + *out = &factory->IClassFactory_iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); return E_NOINTERFACE; } static ULONG WINAPI classfactory_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - return InterlockedIncrement(&This->ref); + struct class_factory *factory = impl_from_IClassFactory(iface); + return InterlockedIncrement(&factory->refcount); } static ULONG WINAPI classfactory_Release(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct class_factory *factory = impl_from_IClassFactory(iface); + ULONG refcount = InterlockedDecrement(&factory->refcount); - if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + if (!refcount) + free(factory); - return ref; + return refcount; } static HRESULT WINAPI classfactory_CreateInstance(IClassFactory *iface, IUnknown *outer_unk, REFIID riid, void **ppobj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - HRESULT hres; + struct class_factory *factory = impl_from_IClassFactory(iface); IUnknown *unk; + HRESULT hr; - TRACE("(%p)->(%p,%s,%p)\n", This, outer_unk, debugstr_guid(riid), ppobj); + TRACE("%p, %p, %s, %p.\n", iface, outer_unk, debugstr_guid(riid), ppobj); *ppobj = NULL; if (outer_unk && !IsEqualGUID(riid, &IID_IUnknown)) return E_NOINTERFACE; - hres = This->pfnCreateInstance(outer_unk, (void **) &unk); - if (SUCCEEDED(hres)) + hr = factory->pfnCreateInstance(outer_unk, (void **) &unk); + if (SUCCEEDED(hr)) { - hres = IUnknown_QueryInterface(unk, riid, ppobj); + hr = IUnknown_QueryInterface(unk, riid, ppobj); IUnknown_Release(unk); } - return hres; + return hr; } static HRESULT WINAPI classfactory_LockServer(IClassFactory *iface, BOOL dolock) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("(%p)->(%d), stub!\n", This, dolock); + FIXME("%p, %d stub!\n", iface, dolock); + return S_OK; } @@ -144,12 +144,12 @@ static const IClassFactoryVtbl classfactory_Vtbl = classfactory_LockServer }; -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) { + struct class_factory *factory; unsigned int i; - IClassFactoryImpl *factory; - TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + TRACE("%s, %s, %p.\n", debugstr_guid(rclsid), debugstr_guid(riid), out); if (!IsEqualGUID(&IID_IClassFactory, riid) && !IsEqualGUID( &IID_IUnknown, riid)) @@ -167,16 +167,16 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return CLASS_E_CLASSNOTAVAILABLE; } - factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); - if (factory == NULL) + if (!(factory = malloc(sizeof(*factory)))) return E_OUTOFMEMORY; factory->IClassFactory_iface.lpVtbl = &classfactory_Vtbl; - factory->ref = 1; + factory->refcount = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = &(factory->IClassFactory_iface); + *out = &factory->IClassFactory_iface; + return S_OK; } -- 2.35.1

1 0