wine-devel June 2017

wine-devel@winehq.org

45 participants
173 discussions

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

21 Jun '17

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 21 Jun '17

21 Jun '17

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 21 Jun '17

21 Jun '17

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 21 Jun '17

21 Jun '17

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 20 Jun '17

20 Jun '17

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 20 Jun '17

20 Jun '17

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 20 Jun '17

20 Jun '17

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 19 Jun '17

19 Jun '17

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 19 Jun '17

19 Jun '17

"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 19 Jun '17

19 Jun '17

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

← Newer
1
...
6
7
8
9
10
11
12
...
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel June 2017