April 2022 - Wine-Commits - list.winehq.org

Eric Pouech : winedbg: Trace 64-bit integers with I64 width modifier.
by Alexandre Julliard April 8, 2022

April 8, 2022

Module: wine Branch: master Commit: 27c6ac568991fddb554487ddbe42b84930e785ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=27c6ac568991fddb554487dd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Apr 8 09:12:30 2022 +0200 winedbg: Trace 64-bit integers with I64 width modifier. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 208526739e2..3118637cb5e 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

Jinoh Kang : riched20: Implement callback to IRichEditOleCallback_QueryInsertObject.
by Alexandre Julliard April 8, 2022

April 8, 2022

Module: wine Branch: master Commit: 10667b39aad6710668f60c1ba8f10e50aeb87242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10667b39aad6710668f60c1b… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Apr 8 01:09:07 2022 +0900 riched20: Implement callback to IRichEditOleCallback_QueryInsertObject. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 11 ++++++++++- dlls/riched20/editor.c | 3 +-- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 6 +++++- dlls/riched20/tests/richole.c | 6 ++---- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index c8658098e18..09ec0ffc735 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -456,13 +456,21 @@ static struct re_object* create_re_object(const REOBJECT *reo, ME_Run *run) return reobj; } -void editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo) +HRESULT editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo) { ME_Run *run, *prev; const WCHAR space = ' '; struct re_object *reobj_prev = NULL; ME_Cursor *cursor, cursor_from_ofs; ME_Style *style; + HRESULT hr; + + if (editor->lpOleCallback) + { + hr = IRichEditOleCallback_QueryInsertObject(editor->lpOleCallback, (LPCLSID)&reo->clsid, reo->pstg, REO_CP_SELECTION); + if (hr != S_OK) + return hr; + } if (reo->cp == REO_CP_SELECTION) cursor = editor->pCursors; @@ -495,6 +503,7 @@ void editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo) list_add_head(&editor->reobj_list, &run->reobj->entry); ME_ReleaseStyle( style ); + return S_OK; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..3628e51ac9b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1171,8 +1171,7 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB reobject.dwFlags = 0; /* FIXME */ reobject.dwUser = 0; - editor_insert_oleobj(editor, &reobject); - hr = S_OK; + hr = editor_insert_oleobj(editor, &reobject); } if (lpObject) IOleObject_Release(lpObject); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e0df63ae92d..3028d9bdbd5 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -187,7 +187,7 @@ int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) DEC BOOL ME_IsSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DeleteSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SendSelChange(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void editor_insert_oleobj( ME_TextEditor *editor, const REOBJECT *reo ) DECLSPEC_HIDDEN; +HRESULT editor_insert_oleobj( ME_TextEditor *editor, const REOBJECT *reo ) DECLSPEC_HIDDEN; BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, BOOL bForce) DECLSPEC_HIDDEN; int ME_GetTextLength(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index a23f4c82730..936f1c928b3 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1361,6 +1361,7 @@ static HRESULT WINAPI IRichEditOle_fnInsertObject(IRichEditOle *iface, REOBJECT *reo) { struct text_services *services = impl_from_IRichEditOle( iface ); + HRESULT hr; TRACE("(%p,%p)\n", services, reo); @@ -1369,7 +1370,10 @@ IRichEditOle_fnInsertObject(IRichEditOle *iface, REOBJECT *reo) if (reo->cbStruct < sizeof(*reo)) return STG_E_INVALIDPARAMETER; - editor_insert_oleobj(services->editor, reo); + hr = editor_insert_oleobj(services->editor, reo); + if (hr != S_OK) + return hr; + ME_CommitUndo(services->editor); ME_UpdateRepaint(services->editor, FALSE); return S_OK; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 65c07162421..c85a621b80b 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3420,7 +3420,7 @@ static void _insert_reobject(struct reolecb_obj *callback, IRichEditOle *reole, IOleClientSite *clientsite; HRESULT hr; - olecb_expect_QueryInsertObject(callback, line, EXPECT_TODO_WINE | 1, + olecb_expect_QueryInsertObject(callback, line, 1, &CLSID_NULL, NULL, REO_CP_SELECTION /* cp overriden */, S_OK); hr = IRichEditOle_GetClientSite(reole, &clientsite); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); @@ -3495,18 +3495,16 @@ static void subtest_InsertObject(struct reolecb_obj *callback) hr = IRichEditOle_GetClientSite(reole, &clientsite); ok(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); - olecb_expect_QueryInsertObject(callback, __LINE__, EXPECT_TODO_WINE | 1, + olecb_expect_QueryInsertObject(callback, __LINE__, 1, &CLSID_NULL, NULL, REO_CP_SELECTION, S_FALSE); fill_reobject_struct(&reobj, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 0); hr = IRichEditOle_InsertObject(reole, &reobj); - todo_wine ok(hr == S_FALSE, "IRichEditOle_InsertObject got hr %#lx.\n", hr); olecb_check_QueryInsertObject(callback, __LINE__); IOleClientSite_Release(clientsite); count = IRichEditOle_GetObjectCount(reole); - todo_wine ok(count == 3, "got wrong object count: %ld\n", count); }

1 0

Zebediah Figura : qcap/filewriter: Avoid casting to DWORD in an ERR message.
by Alexandre Julliard April 8, 2022

April 8, 2022

Module: wine Branch: master Commit: 50a06d0dc48c2e16b48a11e75a450f2892d40876 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50a06d0dc48c2e16b48a11e7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 8 12:23:18 2022 -0500 qcap/filewriter: Avoid casting to DWORD in an ERR message. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 43f6274ea8d..bc63abcb8cb 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -68,26 +68,27 @@ static HRESULT WINAPI file_writer_sink_receive(struct strmbase_sink *iface, IMed struct file_writer *filter = impl_from_strmbase_pin(&iface->pin); REFERENCE_TIME start, stop; LARGE_INTEGER offset; + DWORD size, ret_size; HRESULT hr; - DWORD size; BYTE *data; if ((hr = IMediaSample_GetTime(sample, &start, &stop)) != S_OK) ERR("Failed to get sample time, hr %#lx.\n", hr); + size = stop - start; if ((hr = IMediaSample_GetPointer(sample, &data)) != S_OK) ERR("Failed to get sample pointer, hr %#lx.\n", hr); offset.QuadPart = start; if (!SetFilePointerEx(filter->file, offset, NULL, FILE_BEGIN) - || !WriteFile(filter->file, data, stop - start, &size, NULL)) + || !WriteFile(filter->file, data, size, &ret_size, NULL)) { ERR("Failed to write file, error %lu.\n", GetLastError()); return HRESULT_FROM_WIN32(hr); } - if (size != stop - start) - ERR("Short write, %lu/%lu.\n", size, (DWORD)(stop - start)); + if (ret_size != size) + ERR("Short write, %lu/%lu.\n", ret_size, size); return S_OK; }

1 0

Eric Pouech : dxdiagn: Use I64 width modifier for 64-bit integers in printf.
by Alexandre Julliard April 8, 2022

April 8, 2022

Module: wine Branch: master Commit: 059ba68ee6515432ff761e8ea8f1f677621f95c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=059ba68ee6515432ff761e8e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Apr 8 09:12:13 2022 +0200 dxdiagn: Use I64 width modifier for 64-bit integers in printf. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 8479d59fefe..ed59f84bef2 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

Nikolay Sivov : evr: Cleanup class factory methods.
by Alexandre Julliard April 8, 2022

April 8, 2022

Module: wine Branch: master Commit: 7c908eb9a41d46ba9412838bacf8eda31cc51ca2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c908eb9a41d46ba9412838b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 8 09:50:39 2022 +0300 evr: Cleanup class factory methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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; }

1 0

Nikolay Sivov : dispex/tests: Use CRT allocation functions.
by Alexandre Julliard April 8, 2022

April 8, 2022

Module: wine Branch: master Commit: e68833a8455c2cc47c2688300c95fdf5f387ec35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e68833a8455c2cc47c268830… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 8 09:37:27 2022 +0300 dispex/tests: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dispex/tests/marshal.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index 137d81b9d8d..4a5f33a3c9c 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -86,7 +86,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) DispatchMessageA(&msg); } - HeapFree(GetProcessHeap(), 0, data); + free(data); CoUninitialize(); @@ -97,7 +97,7 @@ static DWORD start_host_object2(IStream *stream, REFIID riid, IUnknown *object, { DWORD tid = 0, ret; HANDLE events[2]; - struct host_object_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); + struct host_object_data *data = malloc(sizeof(*data)); data->stream = stream; data->iid = *riid; @@ -179,9 +179,8 @@ static ULONG WINAPI dispex_Release(IDispatchEx* iface) ULONG refs = InterlockedDecrement(&This->refs); trace("Release\n"); if(!refs) - { - HeapFree(GetProcessHeap(), 0, This); - } + free(This); + return refs; } @@ -350,7 +349,7 @@ static IDispatchEx *dispex_create(void) { dispex *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = malloc(sizeof(*This)); if (!This) return NULL; This->IDispatchEx_iface.lpVtbl = &dispex_vtable; This->refs = 1;

1 0

Nikolay Sivov : dispex: Use CRT memory allocation functions.
by Alexandre Julliard April 8, 2022

April 8, 2022

Module: wine Branch: master Commit: a6e2902d1f8fbdb812521670d4e4e51e2bc85fd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e2902d1f8fbdb812521670… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 8 09:37:26 2022 +0300 dispex: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dispex/usrmarshal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dispex/usrmarshal.c b/dlls/dispex/usrmarshal.c index 4c837b53397..16e0b684028 100644 --- a/dlls/dispex/usrmarshal.c +++ b/dlls/dispex/usrmarshal.c @@ -134,7 +134,7 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID any on return. */ if(byref_args) { - vt_list = HeapAlloc(GetProcessHeap(), 0, pdp->cArgs * sizeof(vt_list[0])); + vt_list = malloc(pdp->cArgs * sizeof(vt_list[0])); if(!vt_list) return E_OUTOFMEMORY; for(arg = 0; arg < pdp->cArgs; arg++) vt_list[arg] = V_VT(pdp->rgvarg + arg); @@ -166,6 +166,6 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID for(arg = 0; arg < byref_args; arg++) VariantInit(pdp->rgvarg + ref_idx[arg]); - HeapFree(GetProcessHeap(), 0, vt_list); + free(vt_list); return hr; }

1 0

Eric Pouech : dbghelp: Trace 64-bit integers with I64 width modifier.
by Alexandre Julliard April 8, 2022

April 8, 2022

Module: wine Branch: master Commit: 4d7eccd616dcb3983b642a5e5d8e64391d1c0819 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d7eccd616dcb3983b642a5e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Apr 8 09:12:06 2022 +0200 dbghelp: Trace 64-bit integers with I64 width modifier. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 079e3a2ee4a..906b60e64e1 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

Eric Pouech : snmpapi: Trace 64-bit integers with I64 width modifier.
by Alexandre Julliard April 8, 2022

April 8, 2022

Module: wine Branch: master Commit: 088c510ef1e1ee531e4a5a0fd27c8714b80d1cdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=088c510ef1e1ee531e4a5a0f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Apr 8 09:12:26 2022 +0200 snmpapi: Trace 64-bit integers with I64 width modifier. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 7020c606228..4c647b6d2be 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

Zebediah Figura : tests: Try to avoid using SV_Position from shaders which can be tested with SM1.
by Alexandre Julliard April 8, 2022

April 8, 2022

Module: vkd3d Branch: master Commit: 90b4cbc1f2ab2f39b85861b298f8cbd53d957249 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=90b4cbc1f2ab2f39b85861b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 7 18:58:16 2022 -0500 tests: Try to avoid using SV_Position from shaders which can be tested with SM1. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/conditional.shader_test | 14 +++++++++---- tests/hlsl-for.shader_test | 18 +++++++++++------ tests/hlsl-struct-semantics.shader_test | 35 +++++++++++++++++++++++++++------ tests/trigonometry.shader_test | 13 +++++++++--- 4 files changed, 61 insertions(+), 19 deletions(-) diff --git a/tests/conditional.shader_test b/tests/conditional.shader_test index 1a1b8fee..e665ac1d 100644 --- a/tests/conditional.shader_test +++ b/tests/conditional.shader_test @@ -1,7 +1,13 @@ +[vertex shader] +void main(out float tex : texcoord, inout float4 pos : sv_position) +{ + tex = pos.x; +} + [pixel shader] -float4 main(float4 pos : SV_POSITION) : SV_TARGET +float4 main(float tex : texcoord) : SV_TARGET { - if(pos.x > 200.0) + if (tex > 0.0) return float4(0.1, 0.2, 0.3, 0.4); else return float4(0.9, 0.8, 0.7, 0.6); @@ -9,5 +15,5 @@ float4 main(float4 pos : SV_POSITION) : SV_TARGET [test] draw quad -probe rect rgba (0, 0, 200, 480) (0.9, 0.8, 0.7, 0.6) -probe rect rgba (200, 0, 640, 480) (0.1, 0.2, 0.3, 0.4) +probe rect rgba ( 0, 0, 319, 480) (0.9, 0.8, 0.7, 0.6) +probe rect rgba (321, 0, 640, 480) (0.1, 0.2, 0.3, 0.4) diff --git a/tests/hlsl-for.shader_test b/tests/hlsl-for.shader_test index b133ce99..4e91ce41 100644 --- a/tests/hlsl-for.shader_test +++ b/tests/hlsl-for.shader_test @@ -1,14 +1,20 @@ +[vertex shader] +void main(out float tex : texcoord, inout float4 pos : sv_position) +{ + tex = pos.x; +} + [pixel shader] -float4 main(float4 pos : SV_POSITION) : SV_TARGET +float4 main(float tex : texcoord) : sv_target { int i; float x = 0.0; for (i = 0; i < 10; i++) { x += i; - if (pos.x == 1.5 && i == 5) + if (tex > 0.5 && i == 5) break; - if (pos.x == 2.5 && i >= 7) + if (tex > -0.5 && i >= 7) continue; x -= 1; } @@ -17,6 +23,6 @@ float4 main(float4 pos : SV_POSITION) : SV_TARGET [test] draw quad -probe rgba (0, 0) (10.0, 35.0, 0.0, 0.0) -probe rgba (1, 0) (5.0, 10.0, 0.0, 0.0) -probe rgba (2, 0) (10.0, 38.0, 0.0, 0.0) +probe rect rgba ( 0, 0, 159, 480) (10.0, 35.0, 0.0, 0.0) +probe rect rgba (161, 0, 479, 480) (10.0, 38.0, 0.0, 0.0) +probe rect rgba (481, 0, 640, 480) ( 5.0, 10.0, 0.0, 0.0) diff --git a/tests/hlsl-struct-semantics.shader_test b/tests/hlsl-struct-semantics.shader_test index b623a998..43b07bb8 100644 --- a/tests/hlsl-struct-semantics.shader_test +++ b/tests/hlsl-struct-semantics.shader_test @@ -1,9 +1,34 @@ +[input layout] +0 r32g32b32a32 float texcoord +0 r32g32 float sv_position + +[vertex buffer 0] +0.0 1.0 0.0 1.0 -2.0 -2.0 +0.0 1.0 0.0 1.0 -2.0 2.0 +0.0 1.0 0.0 1.0 2.0 -2.0 +0.0 1.0 0.0 1.0 2.0 2.0 + +[vertex shader] + +struct vertex +{ + struct + { + float4 texcoord : texcoord; + float4 pos : sv_position; + } m; +}; + +void main(inout struct vertex v) +{ +} + [pixel shader] struct input { struct { - float4 pos : sv_position; + float4 texcoord : texcoord; } m; }; @@ -18,12 +43,10 @@ struct output struct output main(struct input i) { struct output o; - o.m.color = i.m.pos; + o.m.color = i.m.texcoord; return o; } [test] -draw quad -probe rgba (0, 1) (0.5, 1.5, 0.0, 1.0) -probe rgba (1, 0) (1.5, 0.5, 0.0, 1.0) -probe rgba (3, 5) (3.5, 5.5, 0.0, 1.0) +draw triangle strip 4 +probe all rgba (0.0, 1.0, 0.0, 1.0) diff --git a/tests/trigonometry.shader_test b/tests/trigonometry.shader_test index 07a280a0..cf53d7a1 100644 --- a/tests/trigonometry.shader_test +++ b/tests/trigonometry.shader_test @@ -1,7 +1,14 @@ +[vertex shader] +void main(out float tex : texcoord, inout float4 pos : sv_position) +{ + tex = (pos.x + 1) * 320; +} + [pixel shader] -float4 main(float4 pos : SV_POSITION) : SV_TARGET +float4 main(float tex : texcoord) : sv_target { - return float4(sin(pos.x - 0.5), cos(pos.x - 0.5), 0, 0); + tex = floor(tex + 0.25); + return float4(sin(tex), cos(tex), 0, 0); } [test] @@ -17,7 +24,7 @@ probe rgba ( 7, 0) ( 0.65698660, 0.75390225, 0.0, 0.0) 1024 probe rgba ( 8, 0) ( 0.98935825, -0.14550003, 0.0, 0.0) 1024 probe rgba ( 9, 0) ( 0.41211849, -0.91113026, 0.0, 0.0) 1024 probe rgba (10, 0) (-0.54402111, -0.83907153, 0.0, 0.0) 1024 -probe rgba (11, 0) (-0.99999021, 0.00442570, 0.0, 0.0) 1024 +probe rgba (11, 0) (-0.99999021, 0.00442570, 0.0, 0.0) 2048 probe rgba (12, 0) (-0.53657292, 0.84385396, 0.0, 0.0) 1024 probe rgba (13, 0) ( 0.42016704, 0.90744678, 0.0, 0.0) 1024 probe rgba (14, 0) ( 0.99060736, 0.13673722, 0.0, 0.0) 1024

1 0