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