- wine-devel - winehq.org

Re: [v2] shell32: fix two bugs in IQueryAssocations
by Nikolay Sivov 08 Feb '16

08 Feb '16

On 08.02.2016 3:07, Theodore Dubois wrote: > >> On Feb 7, 2016, at 4:25 AM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: >> >> Why do you need this? > > So I can assert in Init. That's not necessary. > >> >>> This->hkeyProgID = This->hkeySource; >> >> I know it's not something you introduced, but it's dirty and should be >> fixed, because it leads to double free on a same handle. > > I’ll fix that in the next version. > >> Basically you remove everything, and tests don't show that you should do >> that. For example looking at Win7 registry I see HKCR\.exe with default >> value of "exefile", then default value for HKCR\exefile is Application >> (and also there is a FriendlyTypeName key that's most likely localized). >> Current code will return "Application" and that seems like a better >> candidate for a friendly name. > > In that case, hkeyProgID would refer to HKCR\exefile, and then I return the > default value from that key which is “Application”. It used to start with hkeySource > (would point to HKCR\.exe) and do some digging, but my code does that work in Init. > + if (*pszAssoc == '.') > + { > + /* for a file extension, the progid is the default value */ > + hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&progId, NULL); > + if (FAILED(hr)) > + return hr; > + } What happens if default value is not set? > + else /* if (*pszAssoc == '{') */ > + { > + assert(*pszAssoc == '{'); > + > + HKEY progIdKey; > + /* for a clsid, the progid is the default value of the ProgID subkey */ > + ret = RegOpenKeyExW(This->hkeySource, > + szProgID, > + 0, > + KEY_READ, > + &progIdKey); > + if (ret != ERROR_SUCCESS) > + return HRESULT_FROM_WIN32(ret); > + hr = ASSOC_GetValue(progIdKey, NULL, (void**)&progId, NULL); > + if (FAILED(hr)) > + return hr; > + RegCloseKey(progIdKey); > + } Now Init() will fail on missing progid subkey, and it didn't before. Also this introduces leaks. > >> A convincing test should create a custom extension key, and test all >> possible combinations of empty default values, missing keys with default >> value name etc. > > Yes, more tests is always good. I’ll try and figure out how to test things on Windows and add some more tests in the next version. > > ~Theodore >

2 1

Re: [v2] shell32: fix two bugs in IQueryAssocations
by Theodore Dubois 08 Feb '16

08 Feb '16

> On Feb 7, 2016, at 4:25 AM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > > Why do you need this? So I can assert in Init. > >> This->hkeyProgID = This->hkeySource; > > I know it's not something you introduced, but it's dirty and should be > fixed, because it leads to double free on a same handle. I’ll fix that in the next version. > Basically you remove everything, and tests don't show that you should do > that. For example looking at Win7 registry I see HKCR\.exe with default > value of "exefile", then default value for HKCR\exefile is Application > (and also there is a FriendlyTypeName key that's most likely localized). > Current code will return "Application" and that seems like a better > candidate for a friendly name. In that case, hkeyProgID would refer to HKCR\exefile, and then I return the default value from that key which is “Application”. It used to start with hkeySource (would point to HKCR\.exe) and do some digging, but my code does that work in Init. > A convincing test should create a custom extension key, and test all > possible combinations of empty default values, missing keys with default > value name etc. Yes, more tests is always good. I’ll try and figure out how to test things on Windows and add some more tests in the next version. ~Theodore

1 0

Re: [PATCH 4/5] wined3d: Introduce wined3d_texture_get_overlay_position().
by Stefan Dösinger 07 Feb '16

07 Feb '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-02-05 um 20:31 schrieb Henri Verbeet: > dlls/wined3d/texture.c | 32 ++++++++++++++++++++++++++++++++ I think the overlay API would be much nicer in swapchains, either textures overlaying swapchains or swapchains overlaying swapchains. Unfortunately the fact that you can assign an overlay to an offscreenplain surface makes that very difficult. A solution similar to palettes where we do most tracking in ddraw and only forward "useful" setups to wined3d might be feasible. Fwiw, the only non video player app that uses overlays that I know is settlers 3, which uses them to draw the mouse pointer if certain options are set. (Feel free to completely ignore this concern, I don't think overlays should be a side quest for CSMT...) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWt33BAAoJEN0/YqbEcdMwiAoP/2uQ2ieAcs6PnFDTpwFhXMxf nYthS9pQfhmLSKPfyp69sj1QJvGLkfwtRJD4xqdu0TkJp3YMYsHIzFktT6wODcOd hqnMcN+8S0EYLFg7CYWgbwN+b+stUUzyFxML5DkLglnU6zC2nfid5Vv0h8o27o/D ySUKnSMqyhIzU5N1KL1qTaucnLYG9zW9Sgtw05zCpBZ86wy2X12ylyhRvofslqPj Cm6TPT5RPcgDw7TGSDfF1nFIp4c3nO6DIl4mWMBP6VCl+Z69Q2CqvSGBqW4ZWd3U Zs1Kae+6iF8FghwNtXx68o/gi/hcab648mA6Jc1ybnwGupv3i27/7ayQPB4Wb4R3 rx/37cJNz4FS9X5/reQJEOhoJR9wDzbBqmyctMOoMp8lOJCcpUaACdFDYvxVhvcv C4T0nMA8nmJ+uW5fgscsduEUFqPAN9QHwHDpn9AzzGVnjrpCEvFwXYFfuLZdhU9r NqMaxpyllA7S8GGuF4gmPPKopKl5C9+ZlNyTEadzhtksgZ9vqtXYbrxYaJryIMwG CPakKX5VHVP48IFxbFgzi7/0iq51njkS0BmTKc65+ZCa6bO3sVAcbu29N1UOFOYU T0XfO6PDUgljCCDLm/9+wrbpGd23yu9HQnUHcwyh41H06L1rBcun52P7PSdoC8Jh vGSx0aSmRCCBYTM9RpWi =XqoV -----END PGP SIGNATURE-----

2 1

Re: [v2] shell32: fix two bugs in IQueryAssocations
by Nikolay Sivov 07 Feb '16

07 Feb '16

On 07.02.2016 1:09, Theodore Dubois wrote: > Basically, returns the correct value for > ASSOCSTR_FRIENDLYDOCNAME and ASSOCSTR_DEFAULTICON > when passed a ProgID instead of a file extension. > > Also adds some tests to make sure it works. > > Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> > --- > dlls/shell32/assoc.c | 115 +++++++++++++++++++++++---------------------- > dlls/shell32/tests/assoc.c | 12 ++++- > 2 files changed, 70 insertions(+), 57 deletions(-) > > diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c > index 90d00a8..49af3c3 100644 > --- a/dlls/shell32/assoc.c > +++ b/dlls/shell32/assoc.c > @@ -18,6 +18,7 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > #include <stdarg.h> > +#include <assert.h> Why do you need this? > This->hkeyProgID = This->hkeySource; I know it's not something you introduced, but it's dirty and should be fixed, because it leads to double free on a same handle. > + return S_OK; > + } > + > + /* if it's not a progid, it's a file extension or clsid */ > + if (*pszAssoc == '.') > + { > + /* for a file extension, the progid is the default value */ > + hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&progId, NULL); > + if (FAILED(hr)) > + return hr; > + } > + else /* if (*pszAssoc == '{') */ > + { > + assert(*pszAssoc == '{'); > + > + HKEY progIdKey; > + /* for a clsid, the progid is the default value of the ProgID subkey */ > + ret = RegOpenKeyExW(This->hkeySource, > + szProgID, > + 0, > + KEY_READ, > + &progIdKey); > + if (ret != ERROR_SUCCESS) > + return HRESULT_FROM_WIN32(ret); > + hr = ASSOC_GetValue(progIdKey, NULL, (void**)&progId, NULL); > + if (FAILED(hr)) > + return hr; > + RegCloseKey(progIdKey); > + } > + > + /* open the actual progid key, the one with the shell subkey */ > + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, > + progId, > + 0, > + KEY_READ, > + &This->hkeyProgID); > + if (ret != ERROR_SUCCESS) > + return HRESULT_FROM_WIN32(ret); > return S_OK; > } > else if (hkeyProgid != NULL) > @@ -507,33 +544,12 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( > > case ASSOCSTR_FRIENDLYDOCNAME: > { > - WCHAR *pszFileType; > - DWORD ret; > - DWORD size; > + WCHAR *docName; > > - hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); > + hr = ASSOC_GetValue(This->hkeyProgID, NULL, (void**)&docName, NULL); > if (FAILED(hr)) > return hr; > - size = 0; > - ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); > - if (ret == ERROR_SUCCESS) > - { > - WCHAR *docName = HeapAlloc(GetProcessHeap(), 0, size); > - if (docName) > - { > - ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, docName, &size); > - if (ret == ERROR_SUCCESS) > - hr = ASSOC_ReturnString(flags, pszOut, pcchOut, docName, strlenW(docName) + 1); > - else > - hr = HRESULT_FROM_WIN32(ret); > - HeapFree(GetProcessHeap(), 0, docName); > - } > - else > - hr = E_OUTOFMEMORY; > - } > - else > - hr = HRESULT_FROM_WIN32(ret); > - HeapFree(GetProcessHeap(), 0, pszFileType); > + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, docName, strlenW(docName) + 1); > return hr; > } Basically you remove everything, and tests don't show that you should do that. For example looking at Win7 registry I see HKCR\.exe with default value of "exefile", then default value for HKCR\exefile is Application (and also there is a FriendlyTypeName key that's most likely localized). Current code will return "Application" and that seems like a better candidate for a friendly name. A convincing test should create a custom extension key, and test all possible combinations of empty default values, missing keys with default value name etc. > > @@ -623,41 +639,28 @@ get_friendly_name_fail: > case ASSOCSTR_DEFAULTICON: > { > static const WCHAR DefaultIconW[] = {'D','e','f','a','u','l','t','I','c','o','n',0}; > - WCHAR *pszFileType; > DWORD ret; > DWORD size; > - HKEY hkeyFile; > > - hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); > - if (FAILED(hr)) > - return hr; > - ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); > + size = 0; > + ret = RegGetValueW(This->hkeyProgID, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); > if (ret == ERROR_SUCCESS) > { > - size = 0; > - ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); > - if (ret == ERROR_SUCCESS) > + WCHAR *icon = HeapAlloc(GetProcessHeap(), 0, size); > + if (icon) > { > - WCHAR *icon = HeapAlloc(GetProcessHeap(), 0, size); > - if (icon) > - { > - ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); > - if (ret == ERROR_SUCCESS) > - hr = ASSOC_ReturnString(flags, pszOut, pcchOut, icon, strlenW(icon) + 1); > - else > - hr = HRESULT_FROM_WIN32(ret); > - HeapFree(GetProcessHeap(), 0, icon); > - } > + ret = RegGetValueW(This->hkeyProgID, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); > + if (ret == ERROR_SUCCESS) > + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, icon, strlenW(icon) + 1); > else > - hr = E_OUTOFMEMORY; > + hr = HRESULT_FROM_WIN32(ret); > + HeapFree(GetProcessHeap(), 0, icon); > } > else > - hr = HRESULT_FROM_WIN32(ret); > - RegCloseKey(hkeyFile); > + hr = E_OUTOFMEMORY; > } > else > hr = HRESULT_FROM_WIN32(ret); > - HeapFree(GetProcessHeap(), 0, pszFileType); > return hr; > } Same.

1 0

Re: shell32/tests: Fix okShell()'s tracing so it takes todo and other flags into account.
by Marvin 06 Feb '16

06 Feb '16

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=20233 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=29 err=2 shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=29 err=2 shlexec.c:2422: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" failed: rc=29 err=32 shlexec.c:2436: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde")]' shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" failed: rc=29 err=2 shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtEC4F.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=29 err=2 shlexec.c:2422: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtEC4F.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtEC4F.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=29 err=32 shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtEC4F.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" failed: rc=29 err=2 shlexec.c:2422: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtEC4F.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtEC4F.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" failed: rc=29 err=32

1 0

Re: [1/2] tests: Add winetest_status() which indicates what to do with a test result.
by Alexandre Julliard 06 Feb '16

06 Feb '16

Francois Gouget <fgouget(a)codeweavers.com> writes: > winetest_status() takes into account not just the condition but also > the todo level, debug level, whether to report successful tests; and > returns the test status and whether to trace its result. > This allows individual tests to do their own logging taking into account all these flags. > > Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Honestly, this thing is getting out of hand. Not only is this adding a lot of complexity for a trivial difference in output, but it has actually made the traces less readable IMO. Can we please get rid of the fancy macros and go back to printing the relevant information in the ok() calls, like all other tests do? Pretty please? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH] shell32: fix two bugs in IQueryAssocations
by Marvin 06 Feb '16

06 Feb '16

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=20228 Your paranoid android. === wxppro (32 bit assoc) === assoc.c:144: Test failed: 3: got needed length 18 assoc.c:144: Test failed: 5: got needed length 18 === w2003std (32 bit assoc) === assoc.c:144: Test failed: 3: got needed length 18 assoc.c:144: Test failed: 5: got needed length 18 === wvistau64 (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 19 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 19 === w2008s64 (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w7u (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 16 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 16 === w7pro64 (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w8 (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w864 (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w1064 (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === wvistau64 (64 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 19 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 19 === w2008s64 (64 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w7pro64 (64 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w864 (64 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w1064 (64 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18

1 0

Re: [PATCH] shell32: fix two bugs in IQueryAssocations
by Marvin 06 Feb '16

06 Feb '16

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=20227 Your paranoid android. === wvistau64 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w2008s64 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w7u (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w7pro64 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w8 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w864 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w1064 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === wvistau64 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w2008s64 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w7pro64 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w864 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w1064 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a

1 0

Re: [PATCH] shell32: fix two bugs in IQueryAssocations
by Marvin 06 Feb '16

06 Feb '16

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=20226 Your paranoid android. === wvistau64 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w2008s64 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w7u (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w7pro64 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w8 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w864 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w1064 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === wvistau64 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w2008s64 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w7pro64 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w864 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w1064 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a

1 0

Re: [PATCH 3/5] ddraw/tests: Rewrite rectangle_settings().
by Marvin 06 Feb '16

06 Feb '16

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=20225 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 2/5] ddraw/tests: Rewrite offscreen_test().
by Marvin 05 Feb '16

05 Feb '16

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=20224 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 1/5] ddraw/tests: Rewrite yv12_test().
by Marvin 05 Feb '16

05 Feb '16

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=20223 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 1/7] wined3d: Move internal format queries to separate function.
by Henri Verbeet 05 Feb '16

05 Feb '16

On 5 February 2016 at 15:08, Józef Kucia <jkucia(a)codeweavers.com> wrote: > adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); > adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); > srgb_write = (fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_SRGB_WRITE) > && (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE); > It seems wasteful to do this for each format.

1 0

Re: [PATCH] usp10: Implement fOverrideDirection
by Marvin 05 Feb '16

05 Feb '16

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=20222 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1437: Test failed: 0: uJustification incorrect (0) usp10.c:1437: Test failed: 1: uJustification incorrect (0) usp10.c:1437: Test failed: 2: uJustification incorrect (0) usp10.c:1437: Test failed: 3: uJustification incorrect (0) usp10.c:1437: Test failed: 4: uJustification incorrect (0) usp10.c:1437: Test failed: 5: uJustification incorrect (0) usp10.c:1437: Test failed: 6: uJustification incorrect (0) usp10.c:1437: Test failed: 7: uJustification incorrect (0) usp10.c:1437: Test failed: 8: uJustification incorrect (0) usp10.c:1437: Test failed: 9: uJustification incorrect (0) usp10.c:1453: Test failed: 3: uJustification incorrect (0) usp10.c:1453: Test failed: 5: fDiacritic incorrect (1) usp10.c:1453: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1453: Test failed: 15: fDiacritic incorrect (1) usp10.c:1453: Test failed: 15: fZeroWidth incorrect (1)

1 0

Re: [2/2] shell32/tests: Fix okShell() so it takes all logging options into account.
by Marvin 05 Feb '16

05 Feb '16

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=20213 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2443: Test failed: failed: rc=29 err=2 shlexec.c:2441: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2443: Test failed: failed: rc=29 err=32 shlexec.c:2443: Test failed: failed: rc=29 err=2 shlexec.c:2441: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2443: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2443: Test failed: failed: rc=29 err=2 shlexec.c:2441: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2443: Test failed: failed: rc=29 err=32 shlexec.c:2443: Test failed: failed: rc=29 err=2 shlexec.c:2441: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2443: Test failed: failed: rc=29 err=32

1 0

Re: uxtheme: test and fix CloseThemeData with invalid handle value
by Alexandre Julliard 05 Feb '16

05 Feb '16

Piet Jankbal <xerox.xerox2000x(a)gmail.com> writes: > Hi, this fixes https://bugs.winehq.org/show_bug.cgi?id=29862 > > signed off: Louis Lenders Please add a Signed-off-by header in the correct format. Also why are you sending this under a different name? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32: Add test MultiByteToWideChar for code page is 936. (try 2)
by Alexandre Julliard 05 Feb '16

05 Feb '16

Changhui LIU <chliu027028(a)gmail.com> writes: > + BOOL vistaOrLater = FALSE; > + OSVERSIONINFOA osvi; > + > + memset(&osvi, 0, sizeof(osvi)); > + osvi.dwOSVersionInfoSize = sizeof(osvi); > + GetVersionExA(&osvi); > + vistaOrLater = (osvi.dwMajorVersion > 5); Please don't do version checks in tests. You can mark the old behavior as broken if necessary. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v5 PATCH 1/2] gdiplus: Implement GdipSetPenTransform
by Marvin 05 Feb '16

05 Feb '16

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=20197 Your paranoid android. === build (build) === Patch failed to apply

2 1

Re: [v5 PATCH 2/2] gdiplus: Implement GdipResetPenTransform
by Marvin 05 Feb '16

05 Feb '16

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=20198 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [v5 PATCH 2/2] gdiplus: Implement GdipResetPenTransform
by Marvin 05 Feb '16

05 Feb '16

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=20195 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [v5 PATCH 1/2] gdiplus: Implement GdipSetPenTransform
by Marvin 05 Feb '16

05 Feb '16

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=20194 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH] dwrite/tests: Remove failing test line, we have skips for this now
by Marvin 05 Feb '16

05 Feb '16

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=20191 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [v4 PATCH 2/3] gdiplus: Implement GdipSetPenTransform
by Vincent Povirk 04 Feb '16

04 Feb '16

Why did you remove the TRACE from this function?

1 0

Re: [PATCH 3/6] wined3d: Add support for separate sRGB formats.
by Henri Verbeet 04 Feb '16

04 Feb '16

On 4 February 2016 at 01:17, Józef Kucia <jkucia(a)codeweavers.com> wrote: > - factory->wined3d = wined3d_create(0); > + factory->wined3d = wined3d_create(WINED3D_SEPARATE_SRGB_FORMATS); In some ways I like this, although I wonder if it wouldn't make more sense to handle this in terms of a flag to enable support for SRGB_READ/SRGB_WRITE. I.e., when WINED3D_SAMP_SRGB_TEXTURE and WINED3D_RS_SRGBWRITEENABLE are supported, WINED3DFMT_R8G8B8A8_UNORM and WINED3DFMT_R8G8B8A8_UNORM_SRGB would effectively be the same, while when they aren't you'd get the d3d10+ behaviour. > @@ -5993,7 +5994,7 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) > return WINED3D_OK; > } > > - if (!wined3d_adapter_init(&wined3d->adapters[0], 0)) > + if (!wined3d_adapter_init(&wined3d->adapters[0], wined3d, 0)) I'm not a huge fan of this, although I could probably live with it. I guess it's mostly to get at wined3d->flags during format initialization, in which case it may be sufficient to just pass the flags to wined3d_adapter_init(). > diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c > index 1904dd1..718aa18 100644 > --- a/dlls/wined3d/utils.c > +++ b/dlls/wined3d/utils.c > @@ -58,8 +58,11 @@ static const struct wined3d_format_channels formats[] = > {WINED3DFMT_DXT4, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_DXT5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_BC1_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > + {WINED3DFMT_BC1_UNORM_SRGB, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_BC2_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > + {WINED3DFMT_BC2_UNORM_SRGB, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_BC3_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > + {WINED3DFMT_BC3_UNORM_SRGB, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_MULTI2_ARGB8, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_G8R8_G8B8, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_R8G8_B8G8, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, One thought I have about this is that we could just store the channel sizes and shifts for the typeless formats, and then have the typed formats copy the information from there, perhaps instead of the format_base_flags[] table we have now. So you'd have something like this: {WINED3DFMT_R8G8B8A8_UNORM, WINED3DFMT_R8G8B8A8_TYPELESS, UNORM, UNORM, UNORM, UNORM} {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_TYPELESS, UNORM, UNORM, UNORM, UNORM} {WINED3DFMT_R8G8B8A8_SNORM, WINED3DFMT_R8G8B8A8_TYPELESS, SNORM, SNORM, SNORM, SNORM} {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_R8G8B8A8_TYPELESS, UINT, UINT, UINT, UINT} {WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_R8G8B8A8_TYPELESS, SINT, SINT, SINT, SINT} > @@ -2237,7 +2255,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, > format_clear_flag(format, WINED3DFMT_FLAG_SRGB_WRITE); > > if (!gl_info->supported[ARB_DEPTH_TEXTURE] > - && texture_info->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) > + && !!texture_info && texture_info->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) The "!!" before texture_info seems unnecessary. > +static inline BOOL should_use_separate_srgb_gl_texture(const struct wined3d_context *context) That's a fairly long function name. Not that I have a better suggestion though. > +{ > + return !context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] > + && !(context->swapchain->device->wined3d->flags & WINED3D_SEPARATE_SRGB_FORMATS); > +} The number of pointer dereferences in here is scary. :) (Yeah, I know, there are other places that are just as bad.) Maybe it makes sense to store a copy of the flags in struct d3d_info?

2 1

Re: kernel32: Add test MultiByteToWideChar for code page is 936.
by Alexandre Julliard 04 Feb '16

04 Feb '16

Changhui LIU <chliu027028(a)gmail.com> writes: > +static void test_cp936_to_widechar(void) > +{ > + int count = 0; > + int count2 = 0; > + WCHAR wide_buf[4]; > + unsigned char buf[] = {0xbf, 0xb4, 0xc7}; > + > + count = MultiByteToWideChar(936, 0, (char*)&buf[0], sizeof(buf), NULL, 0); > + ok(count > 0, "returned %d (expected > '0')\n", count); > + > + count2 = MultiByteToWideChar(936, 0, (char*)&buf[0], sizeof(buf), wide_buf, count); > + todo_wine ok(count2 > 0, "returned %d (expected > '0')\n", count2); > + > + todo_wine ok(count == count2, "expected twice call result is same\n"); That test could be more strict, I expect that there's a defined behavior, not just > 0. Comparing with the results from MB_ERR_INVALID_CHARS would also be interesting. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: hhctrl.ocx: Store window position in registry so that it's persistent between runs.
by Jacek Caban 04 Feb '16

04 Feb '16

On 02/04/16 13:05, Jacek Caban wrote: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/hhctrl.ocx/help.c | 71 > +++++++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 68 insertions(+), 3 deletions(-) Please ignore this patch. It's not the right fix. Jacek

1 0

Re: [PATCH] include: Add IColumnsInfo interface (resend)
by Nikolay Sivov 04 Feb '16

04 Feb '16

On 04.02.2016 12:31, Alistair Leslie-Hughes wrote: > +[ > + object, > + uuid(0c733a11-2a1c-11ce-ade5-00aa0044773d), > + pointer_default(unique) > +] > +interface IColumnsInfo : IUnknown > +{ > + [local] > + HRESULT GetColumnInfo([in, out] DBORDINAL *columns,[out, size_is(*columns)] DBCOLUMNINFO **colinfo, > + [out] OLECHAR *stringsbuffer); > + > + [call_as(GetColumnInfo)] > + HRESULT RemoteGetColumnInfo([in, out] DBORDINAL *columns, [out, size_is((ULONG)*columns)] DBCOLUMNINFO **col_info, > + [out, size_is((ULONG)*columns)] DBBYTEOFFSET **name_offsets, > + [out, size_is((ULONG)*columns)] DBBYTEOFFSET **columnid_offsets, > + [in, out] DBLENGTH *string_len, [in, out, unique, size_is((ULONG)*string_len)] OLECHAR **stringsbuffer, > + [out] IErrorInfo **error); > + ULONG in SDK comes from DBORDINAL being ULONGLONG vs ULONG depending on bitness, I agree we probably don't have to duplicate that, and can always use cast. In any case size_is attribute is used in a wrong way, and at least one method prototype does not match SDK.

1 0

Re: [PATCH] usp10: Correct math punctuation handling in itemization
by Marvin 03 Feb '16

03 Feb '16

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=20174 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1284: Test failed: 0: uJustification incorrect (0) usp10.c:1284: Test failed: 1: uJustification incorrect (0) usp10.c:1284: Test failed: 2: uJustification incorrect (0) usp10.c:1284: Test failed: 3: uJustification incorrect (0) usp10.c:1284: Test failed: 4: uJustification incorrect (0) usp10.c:1284: Test failed: 5: uJustification incorrect (0) usp10.c:1284: Test failed: 6: uJustification incorrect (0) usp10.c:1284: Test failed: 7: uJustification incorrect (0) usp10.c:1284: Test failed: 8: uJustification incorrect (0) usp10.c:1284: Test failed: 9: uJustification incorrect (0) usp10.c:1300: Test failed: 3: uJustification incorrect (0) usp10.c:1300: Test failed: 5: fDiacritic incorrect (1) usp10.c:1300: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1300: Test failed: 15: fDiacritic incorrect (1) usp10.c:1300: Test failed: 15: fZeroWidth incorrect (1)

2 1

Re: [v3 PATCH 2/3] gdiplus: Implement GdipSetPenTransform
by Vincent Povirk 03 Feb '16

03 Feb '16

I think we should keep the FIXME on this one until we use the transform in rendering, maybe change it to semi-stub.

1 0

Re: [PATCH 1/6] d3d11: Implement d3d11_device_CheckMultisampleQualityLevels().
by Henri Verbeet 03 Feb '16

03 Feb '16

On 29 January 2016 at 00:51, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + if (sample_count > 32) > + return E_FAIL; I think that's D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT. > + if (sample_count > 16) > + { > + FIXME("sample_count %u not handled yet.\n", sample_count); > + return S_OK; > + } I think that belongs in wined3d_check_device_multisample_type(). > + hr = wined3d_device_check_multisample_quality_levels(device->wined3d_device, > + wined3dformat_from_dxgi_format(format), sample_count, quality_level_count); > + if (hr == WINED3DERR_INVALIDCALL) > + return E_INVALIDARG; > + if (hr == WINED3DERR_NOTAVAILABLE) > + return S_OK; This is fine, but the d3d10+ API probably makes more sense in the long run. I.e., eventually we'd want to handle the difference in d3d8/9 instead. > +HRESULT CDECL wined3d_device_check_multisample_quality_levels(const struct wined3d_device *device, > + enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, > + DWORD *quality_level_count) I don't think we really want to introduce a new entry point for this. I guess the issue is that we can't get at the wined3d object that created the device from inside d3d11, but I think it would be preferable to do something about that instead. It seems likely that CheckFeatureSupport() and CheckFormatSupport() would run into this as well.

2 1

Re: [5/5] webservices: Implement WsWriteStartCData and WsWriteEndCData.
by Marvin 03 Feb '16

03 Feb '16

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=20164 Your paranoid android. === build (build) === Make failed

1 0

Re: [PATCH v5] user32: Add MOUSEHOOKSTRUCTEX to improve mouse wheel support
by Alex Henrie 03 Feb '16

03 Feb '16

+typedef struct +{ + struct { /* MOUSEHOOKSTRUCT */ + POINT pt; + HWND hwnd; + UINT wHitTestCode; + ULONG_PTR dwExtraInfo; + } DUMMYSTRUCTNAME; + DWORD mouseData; +} MOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX; Other than the excessive indentation in "DWORD mouseData", this patch looks good, and the user32 tests still pass on my machine. -Alex

1 0

Re: [PATCH 6/6] ddraw: Replace wined3d_surface_preload() with wined3d_texture_preload().
by Henri Verbeet 01 Feb '16

01 Feb '16

On 31 January 2016 at 11:22, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > Also removed wined3d_surface_preload as it's now unused > > Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> > --- > dlls/ddraw/device.c | 2 +- > dlls/wined3d/surface.c | 13 ------------- > dlls/wined3d/wined3d.spec | 1 - > include/wine/wined3d.h | 1 - > 4 files changed, 1 insertion(+), 16 deletions(-) > You may have noticed that I started working on this myself instead, and this patch is practically a duplicate of 118671.

2 3

Re: [PATCH 5/5] dwrite: Remove some redundant includes
by Marvin 01 Feb '16

01 Feb '16

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=20128 Your paranoid android. === wvistau64 (32 bit layout) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [v3] msvcrt: handle of thread created by _beginthread should not be closed on thread detach.
by Piotr Caban 01 Feb '16

01 Feb '16

Hi, On 02/01/16 12:00, Paul Gofman wrote: > + /* _beginthreadex: handle is not closed on _endthread */ > + hThread = (HANDLE)_beginthreadex(NULL,0, test_thread_func_ex, NULL, 0, NULL); > + ok(hThread != INVALID_HANDLE_VALUE, "_beginthreadex failed (%d)\n", errno); _beginthreadex returns 0 in case of error (not INVALID_HANDLE_VALUE). Except of it the patch looks good for me. Thanks, Piotr

1 0

Re: [v2] msvcrt: handle of thread created by _beginthread should not be closed on thread detach.
by Piotr Caban 01 Feb '16

01 Feb '16

Hi Paul, On 01/31/16 22:58, Paul Gofman wrote: > + /* _beginthread: handle is not closed on ExitProcess and _endthreadex */ > + hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)0); > + Sleep(150); > + ret = WaitForSingleObject(hThread, INFINITE); > + ok(ret == WAIT_FAILED, "ret = %d\n", ret); This test may fail if for some reason thread has not finished during 150ms sleep. You can workaround this issue following way: hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)0); ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); WaitForSingleObject(hThread, INFINITE); ret = CloseHandle(hThread); ok(!ret, "ret = %d\n", ret); > @@ -69,6 +69,9 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) > MSVCRT_free(arg); > > local_trampoline.start_address(local_trampoline.arglist); > + > + CloseHandle(data->handle); > + data->handle = NULL; According to MSDN _endthread should be called here. Because it's documented I think we should implement it in similar way. > @@ -136,8 +139,18 @@ MSVCRT_uintptr_t CDECL _beginthreadex( > */ > void CDECL _endthread(void) > { > + thread_data_t *tls; > + > TRACE("(void)\n"); > > + tls = TlsGetValue(msvcrt_tls_index); > + if (tls && tls->handle) You should check for INVALID_HANDLE_VALUE instead of NULL here. It's doesn't really matter but for sake of consistency tls->handle should be set to INVALID_HANDLE_VALUE after close. Thanks, Piotr

2 1

Re: [PATCH] server: Implement serial port read interval timeouts.
by Alexandre Julliard 01 Feb '16

01 Feb '16

Alex Henrie <alexhenrie24(a)gmail.com> writes: > Fixes https://bugs.winehq.org/show_bug.cgi?id=39875 > > There is a test program attached to the bug report. > > Version 3 has all the logic in serial.c, even though this required > adding a getter in async.c and another getter in fd.c. The first > interval timeout no longer trashes subsequent interval timeouts or > the total timeout, and absolute timeouts are used exclusively. You should be able to do this without adding all the extra getter functions. I'd suggest something along these lines (completely untested): diff --git a/server/serial.c b/server/serial.c index 164a4b1fe717..04b517dd347e 100644 --- a/server/serial.c +++ b/server/serial.c @@ -62,12 +62,15 @@ static void serial_destroy(struct object *obj); static enum server_fd_type serial_get_fd_type( struct fd *fd ); static void serial_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +static void serial_reselect_async( struct fd *fd, struct async_queue *queue ); struct serial { struct object obj; struct fd *fd; + struct timeout_user *read_timer; + /* timeout values */ unsigned int readinterval; unsigned int readconst; @@ -115,7 +118,7 @@ static const struct fd_ops serial_fd_ops = no_fd_flush, /* flush */ default_fd_ioctl, /* ioctl */ serial_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ + serial_reselect_async, /* reselect_async */ default_fd_cancel_async /* cancel_async */ }; @@ -134,6 +137,7 @@ struct object *create_serial( struct fd *fd ) if (!(serial = alloc_object( &serial_ops ))) return NULL; + serial->read_timer = NULL; serial->readinterval = 0; serial->readmult = 0; serial->readconst = 0; @@ -157,6 +161,7 @@ static struct fd *serial_get_fd( struct object *obj ) static void serial_destroy( struct object *obj) { struct serial *serial = (struct serial *)obj; + if (serial->read_timer) remove_timeout_user( serial->read_timer ); release_object( serial->fd ); } @@ -203,6 +208,34 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ } } +static void serial_read_timeout( void *arg ) +{ + struct serial *serial = arg; + + serial->read_timer = NULL; + fd_async_wake_up( serial->fd, ASYNC_TYPE_READ, STATUS_TIMEOUT ); +} + +static void serial_reselect_async( struct fd *fd, struct async_queue *queue ) +{ + struct serial *serial = get_fd_user( fd ); + + if (serial->read_timer) + { + if (!(default_fd_get_poll_events( fd ) & POLLIN)) + { + remove_timeout_user( serial->read_timer ); + serial->read_timer = NULL; + } + } + else if (!serial->read_timer && serial->readinterval && (default_fd_get_poll_events( fd ) & POLLIN)) + { + serial->read_timer = add_timeout_user( (timeout_t)serial->readinterval * -10000, + serial_read_timeout, serial ); + } + default_fd_reselect_async( fd, queue ); +} + DECL_HANDLER(get_serial_info) { struct serial *serial; -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/3] user32: A window may be notified with WM_CAPTURECHANGED about itself gaining mouse capture if SetCapture() i
by Marvin 01 Feb '16

01 Feb '16

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=20123 Your paranoid android. === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:7246: Test failed: destroy child on thread exit: 3: the msg sequence is not complete: expected 0000 - actual 001a

1 0

Re: [PATCH] user32: Allow WM_CAPTURECHANGED indicating SetCapture() parameter
by Ken Thomases 01 Feb '16

01 Feb '16

On Jan 31, 2016, at 7:18 PM, Christopher Thielen <cthielen(a)gmail.com> wrote: > > A window may be notified with WM_CAPTURECHANGED about itself > gaining mouse capture if it calls SetCapture() twice. > > Tested on Windows XP and Fedora Workstation 22. > > Revised to simplify based on wine-devel feedback. > Revised to address any side-effects of new WM_CAPTURECHANGED > messages. The changes to comctl32 should be in a separate patch. In general, changes to different DLLs should be in separate patches unless it can't be avoided. The comctl32 patch should come before the change to when WM_CAPTURECHANGED is sent so that things aren't broken part-way through the patch series. You might also put the button.c changes in a separate patch, too. > case WM_CAPTURECHANGED: > - return TOOLBAR_CaptureChanged(infoPtr); > + if(hwnd != lParam) > + { > + return TOOLBAR_CaptureChanged(infoPtr); > + } > + else > + { > + return 0; > + } The second return can be hoisted out of the else since the true branch can't fall through. Also, you can reverse the logic, so the code can look like: case WM_CAPTURECHANGED: if(hwnd == lParam) return 0; return TOOLBAR_CaptureChanged(infoPtr); I think that's clearer and also a smaller diff. Same for the other files. Cheers, Ken

2 1

Re: [PATCH] user32: Allow WM_CAPTURECHANGED indicating SetCapture() parameter
by Marvin 01 Feb '16

01 Feb '16

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=20122 Your paranoid android. === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different

1 0

Re: comctl32: treeview: Fix crash when deleting the first visible item while bRedraw == false
by Nikolay Sivov 31 Jan '16

31 Jan '16

On 01/30/2016 12:11 AM, Joachim Priesner wrote: > When bRedraw == false, TREEVIEW_DeleteItem returned early, leaving > firstVisible == NULL. This led to a crash when bRedraw was set to true > again. > > Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> > --- > dlls/comctl32/tests/treeview.c | 38 ++++++++++++++++++++++++++++++++++++++ > dlls/comctl32/treeview.c | 4 +++- > 2 files changed, 41 insertions(+), 1 deletion(-) > > diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c > index 92504c1..34d0674 100644 > --- a/dlls/comctl32/tests/treeview.c > +++ b/dlls/comctl32/tests/treeview.c > @@ -1903,6 +1903,43 @@ static void test_delete_items(void) > DestroyWindow(hTree); > } > > +static void test_delete_first_visible_setredraw_false(void) Please append new tests to test_delete_items(), after a comment line describing what's being tested. > +{ > + HWND hTree; > + INT ret; > + TVINSERTSTRUCTA ins; > + HTREEITEM hItem1; > + > + static CHAR item1[] = "Item 1"; > + static CHAR item2[] = "Item 2"; > + > + hTree = create_treeview_control(0); > + > + ins.hParent = TVI_ROOT; > + ins.hInsertAfter = TVI_ROOT; > + U(ins).item.mask = TVIF_TEXT; > + U(ins).item.pszText = item1; > + hItem1 = TreeView_InsertItemA(hTree, &ins); Just to make sure add a test for hItem != NULL. > + > + ins.hParent = TVI_ROOT; > + ins.hInsertAfter = hItem1; > + U(ins).item.mask = TVIF_TEXT; > + U(ins).item.pszText = item2; > + (void*) TreeView_InsertItemA(hTree, &ins); /* return value unused */ > + Same here, it'll also make a value used. > + ret = SendMessageA(hTree, WM_SETREDRAW, 0, 0); > + ok(ret == 0, "got %d\n", ret); > + > + ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hItem1); > + ok(ret == TRUE, "got %d\n", ret); > + > + /* this used to crash, test that it does not any more */ > + ret = SendMessageA(hTree, WM_SETREDRAW, 1, 0); > + ok(ret == 0, "got %d\n", ret); > + For WM_SETREDRAW wParam please use TRUE/FALSE instead. Otherwise looks good, thanks for fixing this.

1 0

Re: [v2 PATCH 1/3] gdiplus: Implement GdipGetPenTransform
by Nikolay Sivov 31 Jan '16

31 Jan '16

On Sunday, 31 January 2016, Alistair Leslie-Hughes < leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com > <javascript:;>> > --- > dlls/gdiplus/gdiplus_private.h | 1 + > dlls/gdiplus/pen.c | 9 ++++----- > dlls/gdiplus/tests/pen.c | 6 +++--- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/dlls/gdiplus/gdiplus_private.h > b/dlls/gdiplus/gdiplus_private.h > index 1af0bd0..fd45a49 100644 > --- a/dlls/gdiplus/gdiplus_private.h > +++ b/dlls/gdiplus/gdiplus_private.h > @@ -197,6 +197,7 @@ struct GpPen{ > REAL offset; /* dash offset */ > GpBrush *brush; > GpPenAlignment align; > + GpMatrix *transform; > }; Why does it have to be a separate allocation? It looks like GpMatrix field will work fine.

1 0

Re: [PATCH 2/2] mscoree: call native DllEntryPoint when it is defined in COR header.
by Vincent Povirk 29 Jan '16

29 Jan '16

You seem to have some weird indentation? We should probably still call DisableThreadLibraryCalls on process attach if there's no native entry point.

1 0

Re: jscript: Fixed tests on some old jscript versions.
by Marvin 29 Jan '16

29 Jan '16

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=20096 Your paranoid android. === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w7pro64 (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === w864 (32 bit) === No test summary line found === w1064 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found === w7pro64 (64 bit) === No test summary line found === w864 (64 bit) === No test summary line found === w1064 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/6] d3d11/tests: Add a test for CheckMultisampleQualityLevels.
by Henri Verbeet 29 Jan '16

29 Jan '16

On 29 January 2016 at 00:51, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +static void test_checkmultisamplequalitylevels(void) The naming here is a bit different from the other tests. :) I guess it was inspired by the equivalent d3d9 test?

1 0

Re: [PATCH 6/6] d3d10core/tests: Test the creation of textures with invalid multisample settings.
by Józef Kucia 29 Jan '16

29 Jan '16

On Fri, Jan 29, 2016 at 12:51 AM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > dlls/d3d10core/tests/device.c | 48 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) > > diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c > index ae755d3..de3b551 100644 > --- a/dlls/d3d10core/tests/device.c > +++ b/dlls/d3d10core/tests/device.c > @@ -5138,6 +5138,53 @@ done: > ok(!refcount, "Device has %u references left.\n", refcount); > } > > +static void test_invalid_multisample(void) > +{ > + D3D10_TEXTURE2D_DESC desc; > + ID3D10Texture2D *texture; > + UINT quality_level_count; > + ID3D10Device *device; > + ULONG refcount; > + HRESULT hr; > + > + if (!(device = create_device())) > + { > + skip("Failed to create device.\n"); > + return; > + } > + > + ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_level_count); > + desc.Width = 128; > + desc.Height = 128; > + desc.MipLevels = 1; > + desc.ArraySize = 1; > + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; > + desc.SampleDesc.Count = 2; > + desc.SampleDesc.Quality = 0; > + desc.Usage = D3D10_USAGE_DEFAULT; > + desc.BindFlags = D3D10_BIND_RENDER_TARGET; > + desc.CPUAccessFlags = 0; > + desc.MiscFlags = 0; > + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); > + if (quality_level_count) > + { > + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); > + ID3D10Texture2D_Release(texture); > + desc.SampleDesc.Quality = quality_level_count; > + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); > + } > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + > + /* We assume 15 samples multisampling is never supported in practice. */ > + desc.SampleDesc.Count = 15; > + desc.SampleDesc.Quality = 0; > + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + > + refcount = ID3D10Device_Release(device); > + ok(!refcount, "Device has %u references left.\n", refcount); > +} > + > START_TEST(device) > { > test_feature_level(); > @@ -5168,4 +5215,5 @@ START_TEST(device) > test_copy_subresource_region(); > test_multisample_init(); > test_checkmultisamplequalitylevels(); > + test_invalid_multisample(); > } > -- > 2.4.10 > > > This is fine by me but it could be considered to be merged into test_create_texture2d().

2 1

Re: [PATCH 3/5] wined3d: Recognize SM4 dcl_immediateConstantBuffer.
by Henri Verbeet 29 Jan '16

29 Jan '16

On 29 January 2016 at 09:44, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + else if (ins.handler_idx == WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER) > + { > + struct wined3d_shader_immediate_constant_buffer *icb = ins.declaration.icb; > + if (reg_maps->icb) > + { > + ERR("Multiple immediate constant buffers.\n"); This would need to be a WARN or a FIXME, unless you ensure that it can never happen in the front-end. > + HeapFree(GetProcessHeap(), 0, reg_maps->icb); > + } > + if (!(reg_maps->icb = HeapAlloc(GetProcessHeap(), 0, icb->element_count * sizeof(*icb->data)))) > + { > + ERR("Failed to allocate immediate constant buffer.\n"); > + return E_OUTOFMEMORY; > + } > + memcpy(reg_maps->icb, icb->data, icb->element_count * sizeof(*icb->data)); > + reg_maps->icb_size = icb->element_count / 4; I think it shouldn't be necessary to copy the data, shader->frontend_data should stay alive until the shader is destroyed. > + FIXME("Unexpected size of immediate constant buffer %u.\n", len); "Unexpected immediate constant buffer size %u.\n" sounds more natural to me, but it's not a big deal.

1 0

Re: [PATCH v3] ntoskrnl.exe: Implement IoGetDeviceProperty for DevicePropertyPhysicalDeviceObjectName
by Alexandre Julliard 29 Jan '16

29 Jan '16

Aric Stewart <aric(a)codeweavers.com> writes: > + case DevicePropertyPhysicalDeviceObjectName: > + { > + ULONG used_len; > + OBJECT_NAME_INFORMATION *name = HeapAlloc(GetProcessHeap(), 0, buffer_length + (sizeof(OBJECT_NAME_INFORMATION))); > + > + status = NtQueryObject(device->Reserved, ObjectNameInformation, name, buffer_length + sizeof(OBJECT_NAME_INFORMATION), &used_len); > + if (status == STATUS_SUCCESS) > + { > + memcpy(property_buffer, name->Name.Buffer, name->Name.Length); > + *result_length = name->Name.Length; > + } > + else > + *result_length = 0; Length is still not correct if the buffer is too small, and the string needs to be null-terminated. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: shell32/tests: Add traces to the WaitForInputIdle() hooking process.
by Marvin 29 Jan '16

29 Jan '16

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=20058 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2391: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt4CE4.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt4CE4.tmp\test file.sde")]' shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2379: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2379: Test failed: failed: rc=29 err=2

3 3

Re: [PATCH 1/3] gdiplus: Implement GdipGetPenTransform
by Nikolay Sivov 29 Jan '16

29 Jan '16

On Friday, 29 January 2016, Alistair Leslie-Hughes < leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com > <javascript:;>> > --- > dlls/gdiplus/gdiplus_private.h | 6 ++++++ > dlls/gdiplus/pen.c | 9 ++++----- > dlls/gdiplus/tests/pen.c | 6 +++--- > 3 files changed, 13 insertions(+), 8 deletions(-) > > diff --git a/dlls/gdiplus/gdiplus_private.h > b/dlls/gdiplus/gdiplus_private.h > index 1af0bd0..1ed1e5e 100644 > --- a/dlls/gdiplus/gdiplus_private.h > +++ b/dlls/gdiplus/gdiplus_private.h > @@ -71,6 +71,11 @@ static inline BOOL heap_free(void *mem) > return HeapFree(GetProcessHeap(), 0, mem); > } > > +static inline void copy_matrix(GpMatrix *in, GpMatrix *out) > +{ > + memcpy(out, in, 6 * sizeof(REAL)); > +} > + Simple assignment could be used instead of this helper.

1 0

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