June 2017 - Wine-Devel - list.winehq.org

Re: [PATCH v3] configure: Avoid clobbering x18 on arm64 within wine
by André Hentschel June 26, 2017

June 26, 2017

1 0

Re: [v2 PATCH 1/2] d3drm: Added IDirect3DRMWrap stub
by Henri Verbeet June 26, 2017

June 26, 2017

On 26 June 2017 at 01:16, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +static HRESULT WINAPI d3drm_wrap_QueryInterface(IDirect3DRMWrap *iface, REFIID riid, void **out) > +{ > + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); > + > + if (IsEqualGUID(riid, &IID_IDirect3DRMWrap) > + || IsEqualGUID(riid, &IID_IDirect3DRMObject) > + || IsEqualGUID(riid, &IID_IUnknown)) > + { > + IDirect3DRMWrap_AddRef(iface); > + *out = iface; > + return S_OK; > + } > + > + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); That's a little misleading. > + > + *out = NULL; > + return CLASS_E_CLASSNOTAVAILABLE; > +}

1 0

Re: [PATCH 5/5] msi: Implement UI messages in MsiOpenPackage().
by Hans Leidekker June 26, 2017

June 26, 2017

> @@ -1610,6 +1617,35 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) > if (gszLogFile) > package->log_file = CreateFileW( gszLogFile, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, > OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); > + > + /* FIXME: when should these messages be sent? */ > + data_row = MSI_CreateRecord(3); > + /* FIXME: field 0 should be NULL */ > + MSI_RecordSetInteger(data_row, 1, 0); > + MSI_RecordSetInteger(data_row, 2, package->num_langids ? package->langids[0] : 0); > + MSI_RecordSetInteger(data_row, 3, msi_get_string_table_codepage(package->db->strings)); > + MSI_ProcessMessage(package, INSTALLMESSAGE_COMMONDATA, data_row); > + > + info_row = MSI_CreateRecord(0); > + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, time_format, timet, 100); > + GetDateFormatW(LOCALE_USER_DEFAULT, 0, NULL, date_format, datet, 100); > + LoadStringW(msi_hInstance, IDS_INFO_LOGGINGSTART, info_template, 1024); > + sprintfW(info_message, info_template, datet, timet); > + MSI_RecordSetStringW(info_row, 0, info_message); > + MSI_ProcessMessage(package, INSTALLMESSAGE_INFO|MB_ICONHAND, info_row); > + > + MSI_ProcessMessage(package, INSTALLMESSAGE_COMMONDATA, data_row); > + > + productname = msi_dup_property(package->db, INSTALLPROPERTY_PRODUCTNAMEW); > + MSI_RecordSetInteger(data_row, 1, 1); > + MSI_RecordSetStringW(data_row, 2, productname); > + MSI_RecordSetStringW(data_row, 3, NULL); > + MSI_ProcessMessage(package, INSTALLMESSAGE_COMMONDATA, data_row); Error handling.

1 0

Re: [PATCH 3/5] msi: Send the correct UI messages upon calling MsiDoAction().
by Hans Leidekker June 26, 2017

June 26, 2017

On Sun, 2017-06-25 at 21:13 -0500, Zebediah Figura wrote: > @@ -156,18 +158,12 @@ static const WCHAR szValidateProductID[] = > static const WCHAR szWriteEnvironmentStrings[] = > {'W','r','i','t','e','E','n','v','i','r','o','n','m','e','n','t','S','t','r','i','n','g','s',0}; > > -static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action) > +static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template) > { > - static const WCHAR Query_t[] = > - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', > - '`','A','c','t','i','o', 'n','T','e','x','t','`',' ', > - 'W','H','E','R','E', ' ','`','A','c','t','i','o','n','`',' ','=', > - ' ','\'','%','s','\'',0}; > - MSIRECORD * row; > - > - row = MSI_QueryGetRecord( package->db, Query_t, action ); > - if (!row) > - return; > + MSIRECORD *row = MSI_CreateRecord(3); > + MSI_RecordSetStringW(row, 1, action); > + MSI_RecordSetStringW(row, 2, description); > + MSI_RecordSetStringW(row, 3, template); Please check the result of the MSI_CreateRecord call. > @@ -175,28 +171,21 @@ static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action) > static void ui_actioninfo(MSIPACKAGE *package, LPCWSTR action, BOOL start, > UINT rc) > { > - MSIRECORD * row; > - static const WCHAR template_s[]= > - {'A','c','t','i','o','n',' ','s','t','a','r','t',' ','%','s',':',' ', > - '%','s', '.',0}; > - static const WCHAR template_e[]= > - {'A','c','t','i','o','n',' ','e','n','d','e','d',' ','%','s',':',' ', > - '%','s', '.',' ','R','e','t','u','r','n',' ','v','a','l','u','e',' ', > - '%','i','.',0}; > + MSIRECORD *row; > + WCHAR template[1024]; > static const WCHAR format[] = > {'H','H','\'',':','\'','m','m','\'',':','\'','s','s',0}; > WCHAR message[1024]; > WCHAR timet[0x100]; > > GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, format, timet, 0x100); > - if (start) > - sprintfW(message,template_s,timet,action); > - else > - sprintfW(message,template_e,timet,action,rc); > - > - row = MSI_CreateRecord(1); > - MSI_RecordSetStringW(row,1,message); > - > + LoadStringW(msi_hInstance, start ? IDS_INFO_ACTIONSTART : IDS_INFO_ACTIONENDED, template, 1024); > + sprintfW(message, template, timet); > + > + row = MSI_CreateRecord(2); > + MSI_RecordSetStringW(row, 0, message); > + MSI_RecordSetStringW(row, 1, action); > + MSI_RecordSetInteger(row, 2, !rc); Same here.

1 0

Re: [PATCH 1/2] tools/winedbg: Add support for printing floating point registers.
by Alexandre Julliard June 26, 2017

June 26, 2017

Zebediah Figura <z.figura12(a)gmail.com> writes: > @@ -237,6 +237,14 @@ static struct dbg_internal_var be_x86_64_ctx[] = > {CV_AMD64_R13, "R13", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R13), dbg_itype_unsigned_long_int}, > {CV_AMD64_R14, "R14", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R14), dbg_itype_unsigned_long_int}, > {CV_AMD64_R15, "R15", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R15), dbg_itype_unsigned_long_int}, > + {CV_AMD64_ST0, "ST0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[ 0]), dbg_itype_long_real}, > + {CV_AMD64_ST0+1, "ST1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[10]), dbg_itype_long_real}, > + {CV_AMD64_ST0+2, "ST2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[20]), dbg_itype_long_real}, > + {CV_AMD64_ST0+3, "ST3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[30]), dbg_itype_long_real}, > + {CV_AMD64_ST0+4, "ST4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[40]), dbg_itype_long_real}, > + {CV_AMD64_ST0+5, "ST5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[50]), dbg_itype_long_real}, > + {CV_AMD64_ST0+6, "ST6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[60]), dbg_itype_long_real}, > + {CV_AMD64_ST0+7, "ST7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[70]), dbg_itype_long_real}, This doesn't build: ../../../wine/include/winnt.h:757:42: error: ‘CONTEXT {aka struct _CONTEXT}’ has no member named ‘FloatSave’ ../../../wine/programs/winedbg/be_x86_64.c:240:53: note: in expansion of macro ‘FIELD_OFFSET’ -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2] tools/winedbg: Add support for printing SSE (XMM) registers.
by Alexandre Julliard June 26, 2017

June 26, 2017

Zebediah Figura <z.figura12(a)gmail.com> writes: > + for (cnt = 0; cnt < 8; cnt++) > + { > + dbg_printf( " xmm%u: uint=%016llx%016llx", cnt, > + xmm_area->XmmRegisters[cnt].High, xmm_area->XmmRegisters[cnt].Low ); Please avoid %ll formats. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: advpack: Improve DelNode and tests
by Alexandre Julliard June 26, 2017

June 26, 2017

"katahiromz ." <katayama.hirofumi.mz(a)gmail.com> writes: > @@ -327,6 +328,149 @@ done: > return HRESULT_FROM_WIN32(dwLastError); > } > > +static HRESULT DELNODE_delete_file(LPWSTR fname) > +{ > + if (GetFileAttributesW(fname) != INVALID_FILE_ATTRIBUTES) > + { > + SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL); > + if (DeleteFileW(fname)) > + { > + return S_OK; > + } > + } There shouldn't be any reason to retrieve attributes first. > + /* generate a path with wildcard suitable for iterating */ > + fname_len = lstrlenW(fname); > + if (fname_len && fname[fname_len - 1] != L'\\') > + { > + fname[fname_len++] = L'\\'; Please don't use wide character constants. > C_SRCS = \ > advpack.c \ > + delnode.c \ > files.c \ > install.c Please don't create a new file, the tests should go into files.c. > +static const NODEW s_nodesW[] = > +{ > + { L"dir1", TRUE }, /* 0 */ > + { L"dir1\\dir2", TRUE }, /* 1 */ > + { L"dir1\\dir2\\file1", FALSE }, /* 2 */ You can't use wide character strings in Wine. > +START_TEST(delnode) > +{ > + s_hAdvPack = LoadLibraryA("advpack.dll"); > + if (s_hAdvPack == NULL) > + { > + skip("unable to load advpack.dll\n"); > + return; > + } This shouldn't be necessary. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH v2] configure: Avoid clobbering x18 on arm64 when building with clang
by Martin Storsjö June 26, 2017

June 26, 2017

On Sat, 24 Jun 2017, André Hentschel wrote: > Am 21.06.2017 um 12:39 schrieb Martin Storsjo: >> On aarch64/arm64, clang/LLVM feels free to use x18 for normal code >> generation on linux (while the register is reserved on iOS/darwin). >> For windows/arm64, this register must not be clobbered. >> >> If targeting arm64, check for the clang cflags that allows this >> register to be left untouched. >> >> This makes sure that wine for aarch64 built with clang doesn't >> crash immediately on startup. >> >> Signed-off-by: Martin Storsjo <martin(a)martin.st> >> --- >> Now with the sign-off included, which was forgotten in v1. >> --- >> configure.ac | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> diff --git a/configure.ac b/configure.ac >> index 7ae29f7..5b5a1d8 100644 >> --- a/configure.ac >> +++ b/configure.ac >> @@ -179,6 +179,11 @@ case $host in >> CFLAGS="$CFLAGS -marm" >> AC_SUBST(TARGETFLAGS,"-marm") >> ;; >> + aarch64*) >> + # Clang needs these flags in order not to clobber the x18 register >> + WINE_TRY_CFLAGS([-Xclang -target-feature -Xclang +reserve-x18], >> + [CFLAGS="$CFLAGS -Xclang -target-feature -Xclang +reserve-x18"]) >> + ;; >> i[[3456789]]86*) >> enable_win16=${enable_win16:-yes} >> ;; >> > > I think it's worthwhile adding it > > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> FWIW, in case Alexandre also reconsiders merging it since you think it's worthwhile adding it - I reposted a v3, using the gcc compatible flag syntax and with an improved commit message. // Martin

1 0

Re: [4/6] windowscodecs: Add initial implementation of IWICMetadataQueryReader::GetMetadataByName. (v2)
by Dmitry Timoshkov June 25, 2017

June 25, 2017

Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > +static const WCHAR *map_shortname_to_schema(const GUID *format, const WCHAR *name) > +{ > + UINT i; > + > + /* It appears that the only metadata formats > + * that support schemas are xmp and xmpstruct. > ++ */ Oops. I hope that a typo in the comment won't require another resend. Alexandre, could you please remove extra '+' in the comment above if the patch gets accepted? Thanks. -- Dmitry.

1 0

Re: [6/7] windowscodecs: Add some tests for IWICMetadataQueryReader.
by Vincent Povirk June 25, 2017

June 25, 2017

> + if (CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, queryW, len-1, name, len-1) == CSTR_EQUAL && decoder_data[j].query[len - 1] != 0) > + { > + if (winetest_debug > 1) > + trace("query: %s\n", wine_dbgstr_w(queryW + len - 1)); > + PropVariantInit(&value); Shouldn't this be PropVariantClear?

2 1

Re: [5/7] windowscodecs: Add initial implementation of IWICMetadataQueryReader::GetMetadataByName.
by Vincent Povirk June 25, 2017

June 25, 2017

> + if (vt == VT_CLSID) > + { > + id->u.puuid = CoTaskMemAlloc(sizeof(GUID)); > + if (!id->u.puuid) return E_OUTOFMEMORY; > + > + hr = UuidFromStringW(next_token.u.bstrVal, id->u.puuid); > + } > + else > + hr = PropVariantChangeType(id, &next_token, 0, vt); > + PropVariantClear(&next_token); > + if (hr != S_OK) > + { > + PropVariantClear(id); > + PropVariantClear(schema); > + return hr; > + } > + > + id->vt = vt; Assigning the vt at the end of this is a bit strange. I don't know any situation here where PropVariantChangeType will succeed without giving you the requested vt, and if it did, changing it would be unsafe. I can see you need it in the VT_CLSID case, but then it would make more sense to set it there. In fact, this version will leak memory if UuidFromStringW fails. + if (!elem.len) break; When can this happen? + new_value.vt = VT_UNKNOWN; + hr = MetadataQueryReader_CreateInstance(This->block, root, (IWICMetadataQueryReader **)&new_value.u.punkVal); I think you need to clear new_value first here?

2 1

Re: [PATCH v2] configure: Avoid clobbering x18 on arm64 when building with clang
by Alexandre Julliard June 24, 2017

June 24, 2017

Martin Storsjo <martin(a)martin.st> writes: > On aarch64/arm64, clang/LLVM feels free to use x18 for normal code > generation on linux (while the register is reserved on iOS/darwin). > For windows/arm64, this register must not be clobbered. This would have to be made the default system-wide, fixing it on the Wine side isn't good enough since we call system libraries. -- Alexandre Julliard julliard(a)winehq.org

3 7

Re: [PATCH] gdiplus: Write API doc for GdipAddPathEllipse and GdipAddPathEllipseI
by Vincent Povirk June 24, 2017

June 24, 2017

+ * GenericError If conversion from arc to bezier curve fails When would this happen? Best I can tell, it isn't supposed to be possible, and the check is just coding defensively. + * Ok If ecerything works out as expected Typo.

2 1

Re: [3/3] user32/tests: Add test for GetWindowDisplayAffinity.
by Marvin June 23, 2017

June 23, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=31812 Your paranoid android. === w7u (32 bit win) === win.c:9858: Test failed: SetWindowDisplayAffinity returned with 8 win.c:9862: Test failed: GetWindowDisplayAffinity returned unexpected affinity 0 win.c:9865: Test failed: SetWindowDisplayAffinity returned with 8 === w7pro64 (32 bit win) === win.c:9858: Test failed: SetWindowDisplayAffinity returned with 8 win.c:9862: Test failed: GetWindowDisplayAffinity returned unexpected affinity 0 win.c:9865: Test failed: SetWindowDisplayAffinity returned with 8 === w7pro64 (64 bit win) === win.c:9858: Test failed: SetWindowDisplayAffinity returned with 8 win.c:9862: Test failed: GetWindowDisplayAffinity returned unexpected affinity 0 win.c:9865: Test failed: SetWindowDisplayAffinity returned with 8

2 1

Re: [PATCH 2/2] d3drm: Added IDirect3DRMWrap stub
by Henri Verbeet June 23, 2017

June 23, 2017

On 23 June 2017 at 15:15, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +static HRESULT WINAPI d3drm_wrap_QueryInterface(IDirect3DRMWrap *iface, REFIID riid, void **out) > +{ > + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); > + > + if (IsEqualGUID(riid, &IID_IDirect3DRMWrap) > + || IsEqualGUID(riid, &IID_IDirect3DRMObject) > + || IsEqualGUID(riid, &IID_IUnknown)) > + { > + IDirect3DRMWrap_AddRef(iface); > + *out = iface; > + return S_OK; > + } > + > + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); > + > + *out = NULL; > + return E_NOINTERFACE; > +} Likewise, while E_NOINTERFACE would normally be the expected value, that's not a given with d3drm. > +static ULONG WINAPI d3drm_wrap_Release(IDirect3DRMWrap *iface) > +{ > + struct d3drm_wrap *wrap = impl_from_IDirect3DRMWrap(iface); > + ULONG refcount = InterlockedDecrement(&wrap->ref); > + > + TRACE("%p decreasing refcount to %u.\n", iface, refcount); > + > + if (!refcount) > + { > + d3drm_object_cleanup((IDirect3DRMObject *)iface, &wrap->obj); > + //IDirect3DRM_Release(mesh->d3drm); C99 comment. > @@ -109,10 +109,10 @@ static void test_class_name_(unsigned int line, IDirect3DRMObject *object, const > ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname size, hr %#x.\n", hr); > ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size); > > - size = 1; > + size = size2 = *name ? 1 : 0; I think "!!*name" would be more obvious, but don't care strongly.

1 0

Re: [PATCH 1/2] d3drm: Added IDirect3DRMAnimation stub
by Henri Verbeet June 23, 2017

June 23, 2017

On 23 June 2017 at 15:15, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +static HRESULT WINAPI d3drm_animation2_QueryInterface(IDirect3DRMAnimation2 *iface, REFIID riid, void **out) > +{ > + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); > + > + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); > + > + if (IsEqualGUID(riid, &IID_IDirect3DRMAnimation) > + || IsEqualGUID(riid, &IID_IDirect3DRMObject) > + || IsEqualGUID(riid, &IID_IUnknown)) > + { > + *out = &animation->IDirect3DRMAnimation_iface; > + } > + else if (IsEqualGUID(riid, &IID_IDirect3DRMAnimation2)) > + { > + *out = &animation->IDirect3DRMAnimation2_iface; > + } > + else > + { > + *out = NULL; > + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); > + return CLASS_E_CLASSNOTAVAILABLE; I suspect CLASS_E_CLASSNOTAVAILABLE is correct, since other d3drm interfaces are unusual like that as well, but it would be good to have that backed up by the tests.

1 0

Re: [PATCH 1/4] d3drm: Make it possible to create material objects with CreateObject().
by Henri Verbeet June 22, 2017

June 22, 2017

On 21 June 2017 at 14:39, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index fc19b97b8b..6c2903226a 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1404,6 +1404,8 @@ static void test_object(void) > { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame2 }, > { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame3 }, > { &CLSID_CDirect3DRMLight, &IID_IDirect3DRMLight }, > + { &CLSID_CDirect3DRMMaterial, &IID_IDirect3DRMMaterial }, > + { &CLSID_CDirect3DRMMaterial, &IID_IDirect3DRMMaterial2 }, > }; > IDirect3DRM *d3drm1; > IDirect3DRM2 *d3drm2; > @@ -1429,7 +1431,8 @@ static void test_object(void) > { > BOOL takes_ref = IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMeshBuilder) || > IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMFrame) || > - IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMLight); > + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMLight) || > + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMaterial); If there are going to be more of these, it probably makes sense to just include the information as a field in tests[].

2 1

Re: winhttp: Reset content length when a redirect creates a new connection.
by Alistair Leslie-Hughes June 22, 2017

June 22, 2017

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

1 0

Re: [PATCH 4/4] d3drm: Make it possible to create meshes with CreateObject().
by Henri Verbeet June 22, 2017

June 22, 2017

On 21 June 2017 at 14:39, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h > index 1b00e1a36d..af79b43292 100644 > --- a/dlls/d3drm/d3drm_private.h > +++ b/dlls/d3drm/d3drm_private.h > @@ -147,6 +147,30 @@ struct d3drm_mesh_builder > DWORD *material_indices; > }; > > +struct mesh_group > +{ > + unsigned nb_vertices; > + D3DRMVERTEX* vertices; > + unsigned nb_faces; > + unsigned vertex_per_face; > + DWORD face_data_size; > + unsigned* face_data; > + D3DCOLOR color; > + IDirect3DRMMaterial2* material; > + IDirect3DRMTexture3* texture; > +}; Not new, but misleading "*" placement.

1 0

Re: [PATCH 1/2] Update make_specfiles to handle ucrtbase's _o_* functions
by Alexandre Julliard June 22, 2017

June 22, 2017

Max Qian <public(a)maxqia.com> writes: > Helps fix https://bugs.winehq.org/show_bug.cgi?id=38960 > I'm 99% sure that all of them redirect to the non _o_ functions, > and this is required to get Steam working with Windows <=7 mode. I expect that there's a reason behind the _o_ functions, and it's probably worth figuring out. In any case, you don't want to have a dll forward to itself, you should link to the same target function instead (assuming that's really what the _o_ functions are supposed to do). -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH v2] api-ms-win-core-crt-l1-1-0: Add dll.
by Alexandre Julliard June 22, 2017

June 22, 2017

Andrey Gusev <andrey.goosev(a)gmail.com> writes: > +@ cdecl -arch=i386 -ret64 _ftol2() MSVCRT__ftol > +@ cdecl -arch=i386 -ret64 _ftol2_sse() MSVCRT__ftol This can't work, the function isn't in this dll. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] oleaut32: check return code of Currency2Integer (Coverity)
by Dmitry Timoshkov June 22, 2017

June 22, 2017

Marcus Meissner <marcus(a)jet.franken.de> wrote: > HRESULT WINAPI VarI1FromCy(CY cyIn, signed char* pcOut) > { > LONG i = I1_MAX + 1; > + HRESUTL hr; > > - VarI4FromCy(cyIn, &i); > - return _VarI1FromI4(i, pcOut); > + hr = VarI4FromCy(cyIn, &i); > + > + if (SUCCEEDED(hr)) > + hr = _VarI1FromI4(i, pcOut); > + return hr; > } I guess that this change makes initialization of 'i' redundant. Here and in remaining cases. Probably needs a test case though to make sure which behaviour is more correct. -- Dmitry.

1 0

Re: rsaenh: Avoid double 'va_end(args)' in case of a premature loop termination.
by Sebastian Lackner June 22, 2017

June 22, 2017

On 21.06.2017 10:24, Dmitry Timoshkov wrote: > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > --- > dlls/rsaenh/mpi.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c > index 03e31023e6..dcf6ddf112 100644 > --- a/dlls/rsaenh/mpi.c > +++ b/dlls/rsaenh/mpi.c > @@ -2365,10 +2365,7 @@ int mp_init_multi(mp_int *mp, ...) > succeeded in init-ing, then return error. > */ > va_list clean_args; > - > - /* end the current list */ > - va_end(args); > - > + > /* now start cleaning up */ > cur_arg = mp; > va_start(clean_args, mp); > @@ -2381,6 +2378,7 @@ int mp_init_multi(mp_int *mp, ...) > break; > } > n++; > + va_end(args); Doesn't this change make it even worse? Whats the purpose of calling va_end() when the enumeration isn't finished yet? > cur_arg = va_arg(args, mp_int*); > } > va_end(args); >

2 3

Re: [11/17] windowscodecs: Simplify a bit comparison of two PROPVARIANTs.
by Vincent Povirk June 22, 2017

June 22, 2017

I'm not sure the point of changing this when we're just going to replace it with PropVariantCompareEx.

2 1

Re: [13/17] windowscodecs: Use PropVariantCompareEx to compare metadata items.
by Vincent Povirk June 22, 2017

June 22, 2017

This breaks the windowscodecs/metadata test here. fixme:propsys:PropVariantCompareEx vartype 30 not handled metadata.c:382: Test failed: GetValue failed, hr=88982f40 fixme:propsys:PropVariantCompareEx vartype 30 not handled metadata.c:388: Test failed: GetValue failed, hr=88982f40 metadata.c:389: Test failed: unexpected vt: 30 wine: Unhandled page fault on read access to 0x00000000 at address 0x7ed13c05 (thread 0009), starting debugger...

2 1

Re: [v4 1/4] d3dx9: Remove redundant parameter size check in set_constants().
by Matteo Bruni June 21, 2017

June 21, 2017

2017-06-19 11:24 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > v4: > - added assert() for parameter size. > --- > dlls/d3dx9_36/preshader.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > index 2785ca3..76d6de9 100644 > --- a/dlls/d3dx9_36/preshader.c > +++ b/dlls/d3dx9_36/preshader.c > @@ -1178,11 +1178,6 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const > param_offset = i + j * info.major; > else > param_offset = i * info.minor + j; > - if (param_offset * sizeof(unsigned int) >= param->bytes) > - { > - WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i); > - break; > - } > out[offset] = data[param_offset]; > } > } > @@ -1303,6 +1298,11 @@ static HRESULT merge_const_set_entries(struct d3dx_const_tab *const_tab, > memmove(&const_tab->const_set[index + 1], &const_tab->const_set[i], > sizeof(*const_tab->const_set) * (const_tab->const_set_count - i)); > const_tab->const_set_count -= i - index - 1; > + assert(param->bytes >= table_info[first_const->table].component_size > + * first_const->element_count > + * (first_const->direct_copy ? get_reg_components(first_const->table) > + * first_const->register_count > + : first_const->param->rows * first_const->param->columns)); I don't think an assert() is correct here. You are comparing parameter size, which eventually depends on the effect data, with the constant size, which comes from the constant table and thus again the effect data. In general we shouldn't assert on invalid input data. Also by putting the assert() in merge_const_set_entries() you're not checking the non-array, non-struct constants. Am I missing something? Is there something else that would trigger if e.g. a 4x4 matrix constants gets matched with a 3x4 parameter?

2 4

Re: [PATCH 1/2] quartz: Restore a comment explaining mediatime.
by Matteo Bruni June 21, 2017

June 21, 2017

2017-06-19 21:15 GMT+02:00 Zebediah Figura <z.figura12(a)gmail.com>: > This comment was removed by 0a6f11c8, possibly by accident. > The usage of the term "media time" here is confusing, both > because it does not describe time (or any meaningful unit) > and also because it conflicts with the normal definition of > "media time", viz. length in number of samples. > > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/quartz/quartz_private.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h > index 7cad3a75640..a9855e95acd 100644 > --- a/dlls/quartz/quartz_private.h > +++ b/dlls/quartz/quartz_private.h > @@ -33,6 +33,7 @@ > #include "wine/strmbase.h" > #include "wine/list.h" > > +/* see IAsyncReader::Request on MSDN for the explanation of this */ > #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) > #define SEC_FROM_MEDIATIME(time) ((time) / 10000000) > #define BYTES_FROM_MEDIATIME(time) SEC_FROM_MEDIATIME(time) Is it reasonable to put some short explanation right here (i.e. removing the middle man) instead?

2 1

Re: [v4 4/4] d3dx9: Move transpose 'if' outside of the inner loop in set_constants().
by Matteo Bruni June 21, 2017

June 21, 2017

2017-06-19 11:24 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > v4: > - updated to handle incomplete row of transposed matrix accordingly. > --- > dlls/d3dx9_36/preshader.c | 26 ++++++++++---------------- > 1 file changed, 10 insertions(+), 16 deletions(-) > > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > index 9a2ecfa..39bd483 100644 > --- a/dlls/d3dx9_36/preshader.c > +++ b/dlls/d3dx9_36/preshader.c > @@ -1138,7 +1138,6 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const > unsigned int table = const_set->table; > struct d3dx_parameter *param = const_set->param; > unsigned int element, i, j, start_offset; > - unsigned int param_offset; > struct const_upload_info info; > unsigned int *data = param->data; > enum pres_value_type param_type; > @@ -1178,24 +1177,19 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const > > /* Store reshaped but (possibly) not converted yet data temporarily in the same constants buffer. > * All the supported types of parameters and table values have the same size. */ > - for (i = 0; i < info.major_count; ++i) > - { > - for (j = 0; j < info.minor; ++j) > - { > - if (info.transpose) > - param_offset = i + j * info.major; > - else > - param_offset = i * info.minor + j; > - out[i * info.major_stride + j] = data[param_offset]; > - } > - } > if (info.transpose) > { > + for (i = 0; i < info.major_count; ++i) > + for (j = 0; j < info.minor; ++j) > + out[i * info.major_stride + j] = data[i + j * info.major]; > + > for (j = 0; j < info.minor_remainder; ++j) > - { > - param_offset = i + j * info.major; > - out[i * info.major_stride + j] = data[param_offset]; > - } > + out[i * info.major_stride + j] = data[i + j * info.major]; } Accidental backspace? ;)

1 0

Re: [PATCH v2 2/4] winemp3.acm: Disallow operations encoding to MPEG.
by Andrew Eikum June 21, 2017

June 21, 2017

I'd like this more with tests, showing what the application was doing and how Wine failed its expectations but now meets them. Andrew On Fri, Jun 09, 2017 at 06:08:28PM -0500, Zebediah Figura wrote: > Since the winemp3 driver is currently decode-only, and most Windows > versions do not ship by default with a driver capable of encoding > to mpeg3, we should report the driver's capabilities accordingly. > > v2: remove failing tests > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/winemp3.acm/mpegl3.c | 80 ++++++++++------------------------------------- > 1 file changed, 17 insertions(+), 63 deletions(-) > > diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c > index cc6008da59e..c5d71bba524 100644 > --- a/dlls/winemp3.acm/mpegl3.c > +++ b/dlls/winemp3.acm/mpegl3.c > @@ -258,10 +258,13 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) > mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); > #endif > } > - /* no encoding yet > else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && > - adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3) > - */ > + (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || > + adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) > + { > + WARN("Encoding to MPEG is not supported\n"); > + goto theEnd; > + } > else goto theEnd; > MPEG3_Reset(adsi, aad); > > @@ -736,54 +739,19 @@ static LRESULT MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) > case 1: > aftd->dwFormatTag = WAVE_FORMAT_MPEGLAYER3; > aftd->cbFormatSize = sizeof(MPEGLAYER3WAVEFORMAT); > - aftd->cStandardFormats = NUM_MPEG3_FORMATS; > + aftd->cStandardFormats = 0; > lstrcpyW(aftd->szFormatTag, szMpeg3); > break; > case 2: > aftd->dwFormatTag = WAVE_FORMAT_MPEG; > aftd->cbFormatSize = sizeof(MPEG1WAVEFORMAT); > - aftd->cStandardFormats = NUM_MPEG3_FORMATS; > + aftd->cStandardFormats = 0; > lstrcpyW(aftd->szFormatTag, szMpeg); > break; > } > return MMSYSERR_NOERROR; > } > > -static void fill_in_mp3(unsigned cbwfx, WAVEFORMATEX* wfx, unsigned bit_rate) > -{ > - MPEGLAYER3WAVEFORMAT* mp3wfx = (MPEGLAYER3WAVEFORMAT*)wfx; > - > - wfx->nAvgBytesPerSec = bit_rate / 8; > - if (cbwfx >= sizeof(WAVEFORMATEX)) > - wfx->cbSize = sizeof(MPEGLAYER3WAVEFORMAT) - sizeof(WAVEFORMATEX); > - if (cbwfx >= sizeof(MPEGLAYER3WAVEFORMAT)) > - { > - mp3wfx->wID = MPEGLAYER3_ID_MPEG; > - mp3wfx->fdwFlags = MPEGLAYER3_FLAG_PADDING_OFF; > - mp3wfx->nBlockSize = (bit_rate * 144) / wfx->nSamplesPerSec; > - mp3wfx->nFramesPerBlock = 1; > - mp3wfx->nCodecDelay = 0x0571; > - } > -} > - > -static void fill_in_mpeg(unsigned cbwfx, WAVEFORMATEX* wfx, unsigned bit_rate) > -{ > - MPEG1WAVEFORMAT* mp3wfx = (MPEG1WAVEFORMAT*)wfx; > - > - wfx->nAvgBytesPerSec = bit_rate / 8; > - if (cbwfx >= sizeof(WAVEFORMATEX)) > - wfx->cbSize = sizeof(MPEG1WAVEFORMAT) - sizeof(WAVEFORMATEX); > - if (cbwfx >= sizeof(MPEG1WAVEFORMAT)) > - { > - mp3wfx->fwHeadLayer = ACM_MPEG_LAYER3; > - mp3wfx->dwHeadBitrate = wfx->nAvgBytesPerSec * 8; > - mp3wfx->fwHeadMode = ACM_MPEG_JOINTSTEREO; > - mp3wfx->fwHeadModeExt = 0xf; > - mp3wfx->wHeadEmphasis = 1; > - mp3wfx->fwHeadFlags = ACM_MPEG_ID_MPEG1; > - } > -} > - > /*********************************************************************** > * MPEG3_FormatDetails > * > @@ -814,16 +782,8 @@ static LRESULT MPEG3_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) > break; > case WAVE_FORMAT_MPEGLAYER3: > case WAVE_FORMAT_MPEG: > - if (afd->dwFormatIndex >= NUM_MPEG3_FORMATS) return ACMERR_NOTPOSSIBLE; > - afd->pwfx->nChannels = MPEG3_Formats[afd->dwFormatIndex].nChannels; > - afd->pwfx->nSamplesPerSec = MPEG3_Formats[afd->dwFormatIndex].rate; > - afd->pwfx->wBitsPerSample = MPEG3_Formats[afd->dwFormatIndex].nBits; > - afd->pwfx->nBlockAlign = 1; > - if (afd->dwFormatTag == WAVE_FORMAT_MPEGLAYER3) > - fill_in_mp3(afd->cbwfx, afd->pwfx, 192000); > - else > - fill_in_mpeg(afd->cbwfx, afd->pwfx, 192000); > - break; > + WARN("Encoding to MPEG is not supported\n"); > + return ACMERR_NOTPOSSIBLE; > default: > WARN("Unsupported tag %08x\n", afd->dwFormatTag); > return MMSYSERR_INVALPARAM; > @@ -856,18 +816,15 @@ static LRESULT MPEG3_FormatSuggest(PACMDRVFORMATSUGGEST adfs) > adfs->pwfxDst->nChannels = adfs->pwfxSrc->nChannels; > if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_NSAMPLESPERSEC)) > adfs->pwfxDst->nSamplesPerSec = adfs->pwfxSrc->nSamplesPerSec; > - > if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_WBITSPERSAMPLE)) > - { > - if (adfs->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM) > - adfs->pwfxDst->wBitsPerSample = 4; > - else > - adfs->pwfxDst->wBitsPerSample = 16; > - } > + adfs->pwfxDst->wBitsPerSample = 16; > if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG)) > { > if (adfs->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM) > - adfs->pwfxDst->wFormatTag = WAVE_FORMAT_MPEGLAYER3; > + { > + WARN("Encoding to MPEG is not supported\n"); > + return ACMERR_NOTPOSSIBLE; > + } > else > adfs->pwfxDst->wFormatTag = WAVE_FORMAT_PCM; > } > @@ -883,12 +840,9 @@ static LRESULT MPEG3_FormatSuggest(PACMDRVFORMATSUGGEST adfs) > adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxDst->nBlockAlign; > break; > case WAVE_FORMAT_MPEG: > - adfs->pwfxDst->nBlockAlign = 1; > - fill_in_mpeg(adfs->cbwfxDst, adfs->pwfxDst, 192000); > - break; > case WAVE_FORMAT_MPEGLAYER3: > - adfs->pwfxDst->nBlockAlign = 1; > - fill_in_mp3(adfs->cbwfxDst, adfs->pwfxDst, 192000); > + WARN("Encoding to MPEG is not supported\n"); > + return ACMERR_NOTPOSSIBLE; > break; > default: > FIXME("\n"); > -- > 2.13.0 > > >

2 4

Re: user.exe16: Fix memory leaks in cases when HeapReAlloc fails.
by Alexandre Julliard June 21, 2017

June 21, 2017

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > @@ -3286,7 +3289,8 @@ DWORD WINAPI FormatMessage16( > } > talloced = strlen(target)+1; > if (nSize && talloced<nSize) { > - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize); > + LPSTR new_target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize); > + if (new_target) target = new_target; You could probably remove it entirely. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] gdi32: Don't write EMR_EXTSELECTCLIPRGN to emf file on SelectClipPath call
by Dmitry Timoshkov June 21, 2017

June 21, 2017

Piotr Caban <piotr(a)codeweavers.com> wrote: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/gdi32/enhmfdrv/dc.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) It shouldn't be too hard to add an appropriate test case. -- Dmitry.

1 0

Re: [PATCH 1/5] cryptnet: label ordinals
by Alexandre Julliard June 21, 2017

June 21, 2017

Austin English <austinenglish(a)gmail.com> writes: > @@ -1,7 +1,7 @@ > -@ stub CertDllVerifyCTLUsage > -@ stdcall CertDllVerifyRevocation(long long long ptr long ptr ptr) > -@ stub CryptnetWlxLogoffEvent > -@ stub LdapProvOpenStore > +1 stub CertDllVerifyCTLUsage > +2 stdcall CertDllVerifyRevocation(long long long ptr long ptr ptr) > +3 stub CryptnetWlxLogoffEvent > +4 stub LdapProvOpenStore I see no evidence that these should have ordinals, they differ across versions. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] api-ms-win-core-crt-l1-1-0: Add dll.
by Alexandre Julliard June 21, 2017

June 21, 2017

Andrey Gusev <andrey.goosev(a)gmail.com> writes: > @@ -53,6 +53,13 @@ my @dll_groups = > ], > [ > "ucrtbase", > + "msvcr120", > + "msvcrt", > + "ntdll", > + "api-ms-win-core-crt-l1-1-0", You can't have all these dlls forward to ucrtbase. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] ole32: Add stub for OleGetIconOfFile.
by Dmitry Timoshkov June 21, 2017

June 21, 2017

Alex Henrie <alexhenrie24(a)gmail.com> wrote: > +HGLOBAL WINAPI OleGetIconOfFile(LPOLESTR path, BOOL use_file_as_label) > +{ > + FIXME("(%p, %d), stub!\n", path, use_file_as_label); > + return NULL; > +} Probably 'path' should be printed with debugstr_w(), > +@ stdcall OleGetIconOfFile(ptr long) ... and argument type should be 'wstr' instead of 'ptr'. -- Dmitry.

2 1

Re: [06/17] propsys: Add support for VT_LPSTR and VT_LPWSTR to PropVariantCompareEx. (v2)
by Alexandre Julliard June 20, 2017

June 20, 2017

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > @@ -112,6 +116,15 @@ static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, > src_signed = FALSE; > *res = 0; > break; > + case VT_LPSTR: > + *res = strtoll(pv->u.pszVal, NULL, 0); > + src_signed = *res < 0; > + break; > + case VT_LPWSTR: > + case VT_BSTR: > + *res = strtolW(pv->u.pwszVal, NULL, 0); > + src_signed = *res < 0; > + break; This could probably use a little error checking. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 07/12] server: Introduce default async queue that's used if async is not explicitly queued in fd op.
by Alexandre Julliard June 20, 2017

June 20, 2017

Jacek Caban <jacek(a)codeweavers.com> writes: > Although (at least now) all read and write implementations always queue > async on success, it's not the case for ioctl. I think we should allow > simple ioctls without pending results to not care about explicitly > handling async objects, but those still need a queued async for proper > result reporting. We currently don't set events, queue APCs nor send > completion for them. > > My initial thought was to make async object work better without > associated queue, but that leads to problems with references from an > async to fd. I think that would be better than creating a dummy queue. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [17/17] windowscodecs: Add some tests for IWICMetadataQueryReader.
by Marvin June 20, 2017

June 20, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=31731 Your paranoid android. === w8 (32 bit metadata) === metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} === w864 (32 bit metadata) === metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} === w1064 (32 bit metadata) === metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} === w864 (64 bit metadata) === metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} === w1064 (64 bit metadata) === metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36} metadata.c:2531: Test failed: unknown iid {00240e6f-3f23-4432-b0cc-48d5bbff6c36}

2 1

Re: [PATCH] gdiplus: Implement triangular line caps in widened paths.
by Clemens Tamme June 19, 2017

June 19, 2017

Great, thanks for letting me know! Am 19.06.2017 22:20 schrieb "Marvin" <testbot(a)winehq.org>: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Committed". > > This means that your patch has been approved, and committed to the > main git tree. Congratulations! >

1 0

Re: [PATCH] shell32: Initialize members in SHGetFileInfo.
by Alexandre Julliard June 19, 2017

June 19, 2017

"katahiromz ." <katayama.hirofumi.mz(a)gmail.com> writes: > From ca0631aa8766b91cc0183adc9f9f1fe99e058af0 Mon Sep 17 00:00:00 2001 > From: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> > Date: Mon, 19 Jun 2017 13:02:33 +0900 > Subject: [PATCH] shell32: Initialize members in SHGetFileInfo. > > This patch kills some failures in shell32_winetest:shlfileop by > initializing some members of SHFILEINFO in SHGetFileInfoA/W. > > Tested on ReactOS r75083. > > before: shlfileop: 790 tests executed (0 marked as todo, 31 failures), 0 > skipped. > after: shlfileop: 790 tests executed (0 marked as todo, 22 failures), 0 > skipped. > > Signed-off-by: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> > --- > dlls/shell32/shell32_main.c | 5 +++++ > 1 file changed, 5 insertions(+) You'd need to update the corresponding todos, but the patch is also causing failures: ../../../tools/runtest -q -P wine -T ../../.. -M shell32.dll -p shell32_test.exe.so shlfileop && touch shlfileop.ok shlfileop.c:200: Test succeeded inside todo block: SHGetFileInfoA('' | 0) did not clear hIcon shlfileop.c:201: Test succeeded inside todo block: SHGetFileInfoA('' | 0) did not clear szDisplayName[0] shlfileop.c:202: Test succeeded inside todo block: SHGetFileInfoA('' | 0) did not clear szTypeName[0] shlfileop.c:203: Test failed: SHGetFileInfoA('' | 0) should not clear iIcon shlfileop.c:238: Test succeeded inside todo block: SHGetFileInfoA(c:\nonexistent | SHGFI_ATTRIBUTES) did not clear hIcon shlfileop.c:239: Test succeeded inside todo block: SHGetFileInfoA(c:\nonexistent | SHGFI_ATTRIBUTES) did not clear szDisplayName[0] shlfileop.c:240: Test succeeded inside todo block: SHGetFileInfoA(c:\nonexistent | SHGFI_ATTRIBUTES) did not clear szTypeName[0] shlfileop.c:241: Test failed: SHGetFileInfoA(c:\nonexistent | SHGFI_ATTRIBUTES) should not clear iIcon shlfileop.c:386: Test succeeded inside todo block: SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon shlfileop.c:387: Test succeeded inside todo block: SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear szTypeName[0] shlfileop.c:412: Test succeeded inside todo block: SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon shlfileop.c:713: Tests skipped: Test would show a dialog box Makefile:739: recipe for target 'shlfileop.ok' failed make: *** [shlfileop.ok] Error 11 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH v2 4/5] msi: Don't reimplement record formatting.
by Hans Leidekker June 19, 2017

June 19, 2017

On Sun, 2017-06-18 at 21:53 -0500, Zebediah Figura wrote: > diff --git a/dlls/msi/package.c b/dlls/msi/package.c > index eae01e0..f16b1dc 100644 > --- a/dlls/msi/package.c > +++ b/dlls/msi/package.c > @@ -1709,8 +1709,8 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC > static const WCHAR szSetProgress[] = {'S','e','t','P','r','o','g','r','e','s','s',0}; > static const WCHAR szActionText[] = {'A','c','t','i','o','n','T','e','x','t',0}; > MSIRECORD *uirow; > - LPWSTR deformated, message; > - DWORD i, len, total_len, log_type = 0; > + LPWSTR deformated, message = {0}; > + DWORD len, log_type = 0; > INT rc = 0; > char *msg; > > @@ -1776,39 +1776,10 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC > } > else > { > - static const WCHAR format[] = {'%','u',':',' ',0}; > - UINT count = MSI_RecordGetFieldCount( record ); > - WCHAR *p; > - > - total_len = 1; > - for (i = 1; i <= count; i++) > - { > - len = 0; > - MSI_RecordGetStringW( record, i, NULL, &len ); > - total_len += len + 13; > - } > - p = message = msi_alloc( total_len * sizeof(WCHAR) ); > - if (!p) return ERROR_OUTOFMEMORY; > - > - for (i = 1; i <= count; i++) > - { > - if (count > 1) > - { > - len = sprintfW( p, format, i ); > - total_len -= len; > - p += len; > - } > - len = total_len; > - MSI_RecordGetStringW( record, i, p, &len ); > - total_len -= len; > - p += len; > - if (count > 1 && total_len) > - { > - *p++ = ' '; > - total_len--; > - } > - } > - p[0] = 0; > + MSI_FormatRecordW(package, record, message, &len); > + len++; > + message = msi_alloc(len * sizeof(WCHAR)); > + MSI_FormatRecordW(package, record, message, &len); You can pass a NULL buffer in the size query. Please keep the check for allocation failure. I would check the first call to MSI_FormatRecordW too since the record is passed by the caller.

2 1

Re: [v3 3/3] d3dx9: Remove redundant parameter size check in set_constants().
by Matteo Bruni June 19, 2017

June 19, 2017

2017-06-15 0:00 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > v3: > no changes. > --- > dlls/d3dx9_36/preshader.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > index 2785ca3..0bc31cb 100644 > --- a/dlls/d3dx9_36/preshader.c > +++ b/dlls/d3dx9_36/preshader.c > @@ -1178,11 +1178,6 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const > param_offset = i + j * info.major; > else > param_offset = i * info.minor + j; > - if (param_offset * sizeof(unsigned int) >= param->bytes) > - { > - WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i); > - break; > - } > out[offset] = data[param_offset]; Is there anything else covering this case though? If I'm not mistaken such a parameter / constant would be accepted currently so just dropping the check would potentially allow broken preshaders to read outside of the parameter data. Now I certainly agree that the check shouldn't be there, it should probably be in init_set_constants_param() instead. If this is already checked somewhere in the code then I'm okay with the patch as is.

2 1

Re: [PATCH 2/5] msi: Use an external UI record handler before a string handler.
by Marvin June 18, 2017

June 18, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=31710 Your paranoid android. === wvistau64 (32 bit package) === package.c:9086: Test failed: message didn't match package.c:9105: Test failed: expected 16, got 20 package.c:9107: Test failed: message didn't match package.c:9105: Test failed: expected 16, got 22 package.c:9107: Test failed: message didn't match package.c:9086: Test failed: message didn't match package.c:9105: Test failed: expected 16, got 24 package.c:9107: Test failed: message didn't match === wvistau64 (64 bit package) === package.c:9086: Test failed: message didn't match package.c:9105: Test failed: expected 16, got 20 package.c:9107: Test failed: message didn't match package.c:9105: Test failed: expected 16, got 22 package.c:9107: Test failed: message didn't match package.c:9086: Test failed: message didn't match package.c:9105: Test failed: expected 16, got 24 package.c:9107: Test failed: message didn't match

1 0

Re: [4/4] wined3d: Trigger frontbuffer update in surface_cpu_blt.
by Henri Verbeet June 18, 2017

June 18, 2017

On 16 June 2017 at 16:03, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > In this case I'm not sure about the best way to fix it. Feel free to use > a different approach if preferred (for example calling > swapchain_frontbuffer_updated from context_unmap_bo_address). > Explicitly calling from surface_cpu_blt() is probably the right way to go. > @@ -3343,6 +3343,9 @@ release: > context_unmap_bo_address(context, &dst_data, GL_PIXEL_UNPACK_BUFFER); > if (!same_sub_resource) > context_unmap_bo_address(context, &src_data, GL_PIXEL_UNPACK_BUFFER); > + > + swapchain_frontbuffer_updated(dst_texture, dst_sub_resource_idx, dst_box); Strictly speaking this is only necessary on success, but doing it unconditionally shouldn't hurt. > @@ -1979,6 +1979,22 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour > return WINED3D_OK; > } > > +void swapchain_frontbuffer_updated(struct wined3d_texture *texture, unsigned int sub_resource_idx, > + const struct wined3d_box *box) > +{ > + struct wined3d_texture_sub_resource *sub_resource; > + > + if (!texture->swapchain || texture->swapchain->front_buffer != texture) > + return; > + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) > + return; The sub-resource index should always be valid here. We validate it on entry into wined3d, and internally we should always pass valid indices. > + if (sub_resource->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_TEXTURE_RGB)) > + return; Perhaps more importantly, this check should be unnecessary for surface_cpu_blt(), since we always invalidate ~map_binding. > + if (box) SetRect(&texture->swapchain->front_buffer_update, box->left, box->top, box->right, box->bottom); And with this line effectively being only used for surface_cpu_blt(), I'm not sure the swapchain_frontbuffer_updated() helper is really worth it.

1 0

Detect whether wineserver is fully started? Signal? File?
by Sebastian M. Ernst June 18, 2017

June 18, 2017

Dear Wine developers, I am working on a little Python module which is supposed to make use of Wine. The module has a dedicated class for managing its own wineserver-session with its own prefix. It allows me to control wineserver independently of the lifetime of any Windows executable I run on top of it and to quit it when my work is done. Starting and stopping wineserver is no problem. However, what I can not figure out is how to determine when my wineserver is actually completely loaded, up and running. After all, the loading process requires quite a bit of time. Mainly due to my intention of preventing any (hard to debug) crashes and delays when running Windows executables, I want wineserver to be fully up & loaded before I run anything on top of it. The following code snipped illustrates the problem: os.environ['WINEPREFIX'] = '/some/path' proc_wineserver = subprocess.Popen( ['wineserver', '-f', '-p'], # run persistent in foreground stdin = subprocess.PIPE, stdout = subprocess.PIPE, stderr = subprocess.PIPE, shell = False ) time.sleep(1) # Placeholder *HACK*. BETTER SOLUTION? proc_somewinexe = subprocess.Popen(['wine some.exe'], shell = False) As a temporary hack, for which I am seeking a replacement, I simply sleep for one second. This is odd on faster PCs and really not enough on somewhat older hardware (or with slow harddrives instead of SSDs) ... Is there a signal I can catch or a file I can check (and wait for in a loop to appear) or anything else which would allow me a clean(er) solution? Or, alternatively, where in the Wine source code do I have to look for how the "wine" command does it (?) - looking for wineserver and firing one up if there is not one before any exe file is executed? I recently posted a question in the Wine forum with similar content: https://forum.winehq.org/viewtopic.php?f=2&t=28967 Thanks for any advise, Sebastian

3 6

[PATCH] gdiplus: Implement triangular line caps in widened paths.
by Clemens Tamme June 17, 2017

June 17, 2017

Pens in GDI+ have a startcap an an endcap property. Previously, values LineCapFlat, LineCapSquare and LineCapRound were supported, now LineCapTriangle is added. This solves two FIXMEs in GdipWidenPath: unimplemented end cap 3 and unimplemented start cap 3 (3 being the value of LineCapTriangle). Test dlls/gdiplus/test/graphicspath.c runs on Ubuntu 16.04. Signed-off-by: Clemens Tamme <clemens.tamme(a)gmail.com> --- dlls/gdiplus/graphicspath.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 3d33c29..e34f4ed 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1883,6 +1883,27 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, } break; } + case LineCapTriangle: + { + REAL segment_dy = nextpoint->Y-endpoint->Y; + REAL segment_dx = nextpoint->X-endpoint->X; + REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL distance = pen->width/2.0; + REAL dx, dy; + + dx = distance * segment_dx / segment_length; + dy = distance * segment_dy / segment_length; + + if (add_first_points) { + add_bevel_point(endpoint, nextpoint, pen, 1, last_point); + + *last_point = add_path_list_node(*last_point, endpoint->X - dx, + endpoint->Y - dy, PathPointTypeLine); + } + if (add_last_point) + add_bevel_point(endpoint, nextpoint, pen, 0, last_point); + break; + } } } @@ -2118,10 +2139,10 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, { last_point = points; - if (pen->endcap > LineCapRound) + if (pen->endcap > LineCapTriangle) FIXME("unimplemented end cap %x\n", pen->endcap); - if (pen->startcap > LineCapRound) + if (pen->startcap > LineCapTriangle) FIXME("unimplemented start cap %x\n", pen->startcap); if (pen->dashcap != DashCapFlat) -- 2.7.4

1 0

Installation of up-to-date wine-staging
by Alan W. Irwin June 17, 2017

June 17, 2017

I followed the directions at <https://wine-staging.com/installation.html> to install wine-staging on my Debian Jessie platform. However, the result is considerably out of date (version 2.4 rather than 2.9 (or 2.10)), and there appears to be no method of determining what version of wine-staging is available for each of the other Linux platforms mentioned on that web page such as Debian testing = stretch. Is this lack of an up-to-date version some idiosyncrasy for the Debian Jessie platform or is this a problem for all the Linux distributions covered in the above web page? Are there plans to start keeping wine-staging installs more up to date for Debian Jessie or is there some other set of directions I should be following to gain access to the latest version of wine-staging? It's been a number of years since I have built wine, and in that era I only bothered with the 32-bit version. So if it turns out the answer is there are no plans to keep the various distro versions of wine-staging up to date so the only way to get an up-to-date version is to build a WoW64 version of the latest wine that has been patched with the wine-staging patches, it would be good to state that in the above page. Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net) the Time Ephemerides project (timeephem.sf.net) PLplot scientific plotting software package (plplot.sf.net) the libLASi project (unifont.org/lasi) the Loads of Linux Links project (loll.sf.net) and the Linux Brochure Project (lbproject.sf.net) __________________________ Linux-powered Science __________________________

2 3

Approach to debugging wine issues
by Fabian Maurer June 16, 2017

June 16, 2017

Hello Wine Devs, I'm currently trying to investigate an crash with an old game called KnightOfKnights (See Bug 43180). I already know which dll is responsible for the crash, and the native dll fixes it. The crash appears in native code of the game though. Now my approach would be to open the program with a debugger (x64dbg works nice under wine) and then step through the program, finding where the null- pointer comes from until I reach the wine function that returned something wrong. After all, I can compare the control flow using the native d3dxof dll and the builtin d3dxof dll to see where the game gets the value(s) that lead to crash, the goal here would be to find one or more functions from d3dxof that return a different value, like a nullpointer. Then I could begin hacking wine code to find out why it returns something wrong and try to fix that, without looking at the native code of course. Now my question, is this an accepted solution to fixing bugs? I read in the wiki that disassembling a program to diagnose bugs is discouraged due to legal issues and difficulty, though I don't really see another way to track it down. Any insights from you guys and girls who are used to fixing bugs? Just figured I should ask, before I try to create a solution by ways you won't accept. Regards, Fabian Maurer

3 3

Re: widl: Try to append .tlb extension to importib file name if it can't be found without it.
by Alexandre Julliard June 16, 2017

June 16, 2017

Jacek Caban <jacek(a)codeweavers.com> writes: > That's for cases like importlib("oleacc.dll"). MIDL can import them from > system DLLs, but for widl, we currently need oleacc.dll file in include > directory. Since it is at least confusing to have a file named > oleacc.dll between includes, this patch allows providing oleacc.dll.tlb > file instead. I'm not sure what you want to do here. Do you want to put a plain typelib file in includes, but name it .dll.tlb? Or do you need an actual dll? -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [v2 PATCH] include/wincodec.idl: Stop redefinition of ID2D1Image
by Vincent Povirk June 16, 2017

June 16, 2017

Why can't we handle this the way that d2d1.idl does? It doesn't include wincodec.idl, but it declares the interfaces it uses from there. I know the Windows SDK doesn't do that, but that's probably because the SDK headers are weird and don't declare the d2d1 interfaces in an idl.

3 2

Re: [PATCH] oledb32: Support DBTYPE_I4->DBTYPE_WSTR in GetConversionSize
by Huw Davies June 16, 2017

June 16, 2017

On Tue, Jun 13, 2017 at 04:09:54AM +0000, Alistair Leslie-Hughes wrote: > dst_len cannot be set to 110 beacuse we don't have any idea of how this > value is set. In this case we really do want to set something, and if it's 110 on Windows then we may as well use that. The previous case was to do with a NULL-variant, where DataConvert() didn't actually return any data. This time it will, so we should give the app a chance to allocate a big enough buffer. It would also be worth handling and testing more cases than the conversion to DBTYPE_I4. Perhaps we should set *dst_len to 110 if get_length() returns 0 and then let the special cases overrride it. Huw. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/oledb32/convert.c | 5 +++++ > dlls/oledb32/tests/convert.c | 12 ++++++++++++ > 2 files changed, 17 insertions(+) > > diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c > index 0d45ef0..bf01101 100644 > --- a/dlls/oledb32/convert.c > +++ b/dlls/oledb32/convert.c > @@ -1401,6 +1401,11 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, > case DBTYPE_WSTR: > switch (src_type) > { > + case DBTYPE_I4: > + { > + /* Return S_OK to signal we can convert from this type. On windows, dst_len is set to 110. */ > + break; > + } > case DBTYPE_VARIANT: > { > VARIANT v; > diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c > index 116ca16..d07ebf1 100644 > --- a/dlls/oledb32/tests/convert.c > +++ b/dlls/oledb32/tests/convert.c > @@ -2715,6 +2715,7 @@ static void test_getconversionsize(void) > VARIANT var; > SAFEARRAY *psa = NULL; > SAFEARRAYBOUND rgsabound[1]; > + int i4; > > /* same way as CanConvert fails here */ > dst_len = 0; > @@ -2834,6 +2835,17 @@ static void test_getconversionsize(void) > ok(dst_len == 1802, "%ld\n", dst_len); > VariantClear(&var); > > + /* A value of 110 is returned in dst_len */ > + dst_len = 0; > + src_len = sizeof(i4); > + i4 = 200; > + hr = IDataConvert_GetConversionSize(convert, DBTYPE_I4, DBTYPE_WSTR, &src_len, &dst_len, &i4); > + ok(hr == S_OK, "got 0x%08x\n", hr); > + > + dst_len = 0; > + hr = IDataConvert_GetConversionSize(convert, DBTYPE_I4, DBTYPE_WSTR, NULL, &dst_len, NULL); > + ok(hr == S_OK, "got 0x%08x\n", hr); > + > /* On Windows, NULL variants being convert to a non-fixed sized type will return a dst_len of > * 110 but we aren't testing for this value. > */ > -- > 1.9.1 > > >

1 0