April 2010 - Wine-devel - list.winehq.org

Re: [PATCH 3/4] wined3d: fix texm3x3spec coordinate mask bug
by Henri Verbeet 28 Apr '10

28 Apr '10

On 28 April 2010 14:29, Roderick Colenbrander <thunderbird2k(a)gmail.com> wrote: > This patch fixes an issue in "King's Bounty: The Legend" for which a shader of the form: > 'texture2D(sampler2D, tmp0.xyz)' was generated. The nvidia GLSL compiler wants to have tmp0.xyz. We talked about this on IRC yesterday, the reason this happens is that the sampler type is wrong.

2 2

Re: kernel32: Add tests for lstrcmpW (try 3)
by Dmitry Timoshkov 28 Apr '10

28 Apr '10

André Hentschel <nerv(a)dawncrow.de> wrote: > + for (r = 0; r < 0xFFFF; r++) > + { > + if (ignorewchar(r)) > + { > + markerW[2] = r; > + todo_wine > + { > + ok(!lstrcmpW(markerW, nomarkerW), "expected the character 0x%x to be ignored within the string\n", r); > + ok(CompareStringW(LOCALE_SYSTEM_DEFAULT, 0, markerW, -1, nomarkerW, -1) == 2, > + "expected the character 0x%x to be ignored within the string\n", r); > + ok(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS| > + SORT_STRINGSORT|NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP, > + markerW, -1, nomarkerW, -1) == 2, > + "expected the character 0x%x to be ignored within the string\n", r); > + } > + } > + } This is not better, my comments for your previous attempts still apply. In addition to those: 1. if you decided to use some specific flags in the CompareString call, you may want to test other variants of them. Using LOCALE_USE_CP_ACP in a W version of the API doesn't look useful. 2. return value of CompareString has symblic names. -- Dmitry.

1 0

Re: [PATCH 1/4] wined3d: fix flip_surface flag copying bug
by Roderick Colenbrander 28 Apr '10

28 Apr '10

Ignore patch 1/4 and 2/4 for now. I missed a reply from Henri to the bug report. Roderick On Wed, Apr 28, 2010 at 2:29 PM, Roderick Colenbrander <thunderbird2k(a)gmail.com> wrote: > This patch fixes a part of bug 22356. The issue is that Jedi Knight performs a full surface copy > from the back to the front buffer which in the end uses flip_surface. flip_surface swaps > the surface flags which causes an issue in this case because only one of the buffers > ever had SFLAG_CONVERTED set. This means that SFLAG_CONVERTED is set for the odd frame > and unset for the even frame. > --- > dlls/wined3d/surface.c | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c > index fcdfec8..d14dbd0 100644 > --- a/dlls/wined3d/surface.c > +++ b/dlls/wined3d/surface.c > @@ -2917,10 +2917,13 @@ void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back) { > front->texture_name_srgb = tmp; > } > > + /* Copy location flags */ > { > DWORD tmp_flags = back->Flags; > - back->Flags = front->Flags; > - front->Flags = tmp_flags; > + back->Flags &= ~SFLAG_LOCATIONS; > + back->Flags |= front->Flags & SFLAG_LOCATIONS; > + front->Flags &= ~SFLAG_LOCATIONS; > + front->Flags |= tmp_flags & SFLAG_LOCATIONS; > } > } > > -- > 1.6.3.3 > >

1 0

Re: Minor dlls/mshtml/htmlbody.c simplification (RESEND)
by Nikolay Sivov 28 Apr '10

28 Apr '10

On 4/28/2010 14:02, Gerald Pfeifer wrote: > ChangeLog: > Remove variable hres which is not really used from HTMLBodyElement_get_text. > > diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c > index 5c66e65..c6b202b 100644 > --- a/dlls/mshtml/htmlbody.c > +++ b/dlls/mshtml/htmlbody.c > @@ -443,7 +443,6 @@ static HRESULT WINAPI HTMLBodyElement_get_text(IHTMLBodyElement *iface, VARIANT > HTMLBodyElement *This = HTMLBODY_THIS(iface); > nsAString text; > nsresult nsres; > - HRESULT hres; > > TRACE("(%p)->(%p)\n", This, p); > > @@ -454,10 +453,8 @@ static HRESULT WINAPI HTMLBodyElement_get_text(IHTMLBodyElement *iface, VARIANT > > nsAString_GetData(&text,&color); > V_VT(p) = VT_BSTR; > - hres = nscolor_to_str(color,&V_BSTR(p)); > }else { > ERR("GetText failed: %08x\n", nsres); > - hres = E_FAIL; > } > > nsAString_Finish(&text); > Please follow wine-devel comments: http://www.winehq.org/pipermail/wine-devel/2010-April/083175.html

1 0

bt all broken?
by Dan Kegel 28 Apr '10

28 Apr '10

winedbg's bt all seems broken since sometime between 1.1.40 and now. Has anybody else seen this?

3 4

RE: user32: Fix some tests on 2K8R2 and win7
by Greg Geldorp 27 Apr '10

27 Apr '10

> From: André Hentschel > > Yepp, the bot doesnt compare results with an unpatched state... Actually, it does. It compares the results of patch jobs against the most recent winetest.exe job for the same VM, which in this case would be https://testbot.winehq.org/JobDetails.pl?Key=1749. That job didn't list any failures for the user32:win.c test, which is why the failures produced by the patch are listed as new failures. Of course, it is still possible that this is a false positive, we've seen more differences between individual test runs and winetest.exe runs. BTW, the bot now reports test results back to Alexandre's patch tracker at http://source.winehq.org/patches Ge.

1 0

Re: user32: Fix some tests on 2K8R2 and win7
by testbot＠testbot.winehq.org 27 Apr '10

27 Apr '10

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 http://testbot.winehq.org/JobDetails.pl?Key=1768 Your paranoid android. === W98SE (32 bit win) === win.c:2929: Test failed: hwnd 000004C4 message 0112 win.c:2931: Test failed: message 0112 available win.c:2938: Test failed: hwnd 000004C4 message 0100 win.c:2940: Test failed: message 0100 available win.c:2952: Test failed: message 000f available win.c:2964: Test failed: message 000f available win.c:2973: Test failed: message 000f available win.c:2982: Test failed: message 000f available

2 1

Re: Slackware download description line updated to latest package binary format
by Jeremy Newman 27 Apr '10

27 Apr '10

This patch does not apply against the current git tree. Please always submit patches using "git format-patch". Also, it helps if you prefix the subject with [website] so I can tell which patches are meant for the website without scanning the body. -Newman Ing. Simone. Giustetti wrote: > Hi all, > > The download page description for Slackware was updated because someone pointed > to me it was not clear if the new txz package format was supported or not. > The attached patch contains the updated line for the template in 3 languages. > > Bye > Simone > > > > ------------------------------------------------------------------------ > >

1 0

Re: [3/5] msi/tests: Use a unique product code when testing MsiConfigureFeature parameter validation.
by testbot＠testbot.winehq.org 27 Apr '10

27 Apr '10

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 http://testbot.winehq.org/JobDetails.pl?Key=1761 Your paranoid android. === W7PROX64 (32 bit msi) === msi.c:1596: Test failed: Expected C:\imapath, got <à( msi.c:1615: Test failed: Expected C:\imapath, got <à( msi.c:1624: Test failed: Expected C:\imapath, got <à( msi.c:1657: Test failed: Expected C:\imapath, got <à( msi.c:1676: Test failed: Expected C:\imapath, got <à( msi.c:1685: Test failed: Expected C:\imapath, got <à( msi.c:1733: Test failed: Expected C:\imapath, got <à( msi.c:1752: Test failed: Expected C:\imapath, got <à( msi.c:1761: Test failed: Expected C:\imapath, got <à( msi.c:1808: Test failed: Expected C:\imapath, got <à( msi.c:1817: Test failed: Expected C:\imapath, got <à( msi.c:1859: Test failed: Expected C:\imapath, got <à( msi.c:1868: Test failed: Expected C:\imapath, got <à( msi.c:1965: Test failed: Expected {8BA3F294-2904-42D3-B780-7C569244693E}, got prod msi.c:1983: Test failed: Expected {8BA3F294-2904-42D3-B780-7C569244693E}, got prod msi.c:1998: Test failed: Expected {8BA3F294-2904-42D3-B780-7C569244693E}, got prod msi.c:2013: Test failed: Expected {8BA3F294-2904-42D3-B780-7C569244693E}, got prod msi.c:2031: Test failed: Expected {62D87153-CBAE-4699-86D4-C37EEE2A9901}, got prod msi.c:2060: Test failed: Expected {8BA3F294-2904-42D3-B780-7C569244693E}, got prod msi.c:2078: Test failed: Expected {8BA3F294-2904-42D3-B780-7C569244693E}, got prod msi.c:2093: Test failed: Expected {8BA3F294-2904-42D3-B780-7C569244693E}, got prod msi.c:2108: Test failed: Expected {8BA3F294-2904-42D3-B780-7C569244693E}, got prod msi.c:2126: Test failed: Expected {62D87153-CBAE-4699-86D4-C37EEE2A9901}, got prod msi.c:2207: Test failed: Expected {B8311ECD-C0EF-4937-81A1-73E7A63065CD}, got msi.c:2213: Test failed: Expected {B8311ECD-C0EF-4937-81A1-73E7A63065CD}, got msi.c:2237: Test failed: Expected {B8311ECD-C0EF-4937-81A1-73E7A63065CD} or {4DF189B9-4720-46F4-B870-D7B6B32A204E}, got msi.c:2244: Test failed: Expected {B8311ECD-C0EF-4937-81A1-73E7A63065CD} or {4DF189B9-4720-46F4-B870-D7B6B32A204E}, got msi.c:2278: Test failed: Expected {B8311ECD-C0EF-4937-81A1-73E7A63065CD}, got msi.c:2307: Test failed: Expected {B8311ECD-C0EF-4937-81A1-73E7A63065CD} or {4DF189B9-4720-46F4-B870-D7B6B32A204E}, got msi.c:2314: Test failed: Expected {B8311ECD-C0EF-4937-81A1-73E7A63065CD} or {4DF189B9-4720-46F4-B870-D7B6B32A204E}, got msi.c:7303: Test failed: Expected "{805BDA38-C6AE-424D-8178-45836DB8D4D3}", got "C:\winetest\\winetest.msi" msi.c:7372: Test failed: Expected "{805BDA38-C6AE-424D-8178-45836DB8D4D3}", got "C:\winetest\\winetest.msi" msi.c:7439: Test failed: Expected "{805BDA38-C6AE-424D-8178-45836DB8D4D3}", got "C:\winetest\\winetest.msi" msi.c:7663: Test failed: Expected "{74818EE1-8A72-4B5E-BD11-2628E1090FDC}", got "apple" msi.c:7665: Test failed: Expected "{7ED2C8EE-9E50-42A4-BEDF-E42E1AA119E2}", got "banana" msi.c:7724: Test failed: Expected "{7ED2C8EE-9E50-42A4-BEDF-E42E1AA119E2}", got "banana" msi.c:7742: Test failed: Expected "{74818EE1-8A72-4B5E-BD11-2628E1090FDC}", got "apple" msi.c:7760: Test failed: Expected "{74818EE1-8A72-4B5E-BD11-2628E1090FDC}", got "apple" msi.c:7762: Test failed: Expected "{7ED2C8EE-9E50-42A4-BEDF-E42E1AA119E2}", got "banana" msi.c:7778: Test failed: Expected "{74818EE1-8A72-4B5E-BD11-2628E1090FDC}", got "apple" msi.c:7780: Test failed: Expected "{7ED2C8EE-9E50-42A4-BEDF-E42E1AA119E2}", got "banana" msi.c:7797: Test failed: Expected "{74818EE1-8A72-4B5E-BD11-2628E1090FDC}", got "apple" msi.c:7799: Test failed: Expected "{7ED2C8EE-9E50-42A4-BEDF-E42E1AA119E2}", got "banana" msi.c:7818: Test failed: Expected "{74818EE1-8A72-4B5E-BD11-2628E1090FDC}", got "apple" msi.c:7820: Test failed: Expected "{7ED2C8EE-9E50-42A4-BEDF-E42E1AA119E2}", got "banana" msi.c:7837: Test failed: Expected "{74818EE1-8A72-4B5E-BD11-2628E1090FDC}", got "apple" msi.c:7839: Test failed: Expected "{7ED2C8EE-9E50-42A4-BEDF-E42E1AA119E2}", got "banana" msi.c:7955: Test failed: Expected "{74818EE1-8A72-4B5E-BD11-2628E1090FDC}", got "apple" msi.c:7957: Test failed: Expected "{7ED2C8EE-9E50-42A4-BEDF-E42E1AA119E2}", got "banana" msi.c:8002: Test failed: Expected "{74818EE1-8A72-4B5E-BD11-2628E1090FDC}", got "apple" msi.c:8004: Test failed: Expected "{7ED2C8EE-9E50-42A4-BEDF-E42E1AA119E2}", got "banana" msi.c:8028: Test failed: Expected "{74818EE1-8A72-4B5E-BD11-2628E1090FDC}", got "apple" msi.c:8030: Test failed: Expected "{7ED2C8EE-9E50-42A4-BEDF-E42E1AA119E2}", got "banana" msi.c:7663: Test failed: Expected "{44750609-7030-4563-A080-485647446DEE}", got "apple" msi.c:7665: Test failed: Expected "{BAC6C3BA-B9D7-4696-BDDE-9A4176BC56A2}", got "banana" msi.c:7724: Test failed: Expected "{BAC6C3BA-B9D7-4696-BDDE-9A4176BC56A2}", got "banana" msi.c:7742: Test failed: Expected "{44750609-7030-4563-A080-485647446DEE}", got "apple" msi.c:7760: Test failed: Expected "{44750609-7030-4563-A080-485647446DEE}", got "apple" msi.c:7762: Test failed: Expected "{BAC6C3BA-B9D7-4696-BDDE-9A4176BC56A2}", got "banana" msi.c:7778: Test failed: Expected "{44750609-7030-4563-A080-485647446DEE}", got "apple" msi.c:7780: Test failed: Expected "{BAC6C3BA-B9D7-4696-BDDE-9A4176BC56A2}", got "banana" msi.c:7797: Test failed: Expected "{44750609-7030-4563-A080-485647446DEE}", got "apple" msi.c:7799: Test failed: Expected "{BAC6C3BA-B9D7-4696-BDDE-9A4176BC56A2}", got "banana" msi.c:7818: Test failed: Expected "{44750609-7030-4563-A080-485647446DEE}", got "apple" msi.c:7820: Test failed: Expected "{BAC6C3BA-B9D7-4696-BDDE-9A4176BC56A2}", got "banana" msi.c:7837: Test failed: Expected "{44750609-7030-4563-A080-485647446DEE}", got "apple" msi.c:7839: Test failed: Expected "{BAC6C3BA-B9D7-4696-BDDE-9A4176BC56A2}", got "banana" msi.c:7955: Test failed: Expected "{44750609-7030-4563-A080-485647446DEE}", got "apple" msi.c:7957: Test failed: Expected "{BAC6C3BA-B9D7-4696-BDDE-9A4176BC56A2}", got "banana" msi.c:8002: Test failed: Expected "{44750609-7030-4563-A080-485647446DEE}", got "apple" msi.c:8004: Test failed: Expected "{BAC6C3BA-B9D7-4696-BDDE-9A4176BC56A2}", got "banana" msi.c:8028: Test failed: Expected "{44750609-7030-4563-A080-485647446DEE}", got "apple" msi.c:8030: Test failed: Expected "{BAC6C3BA-B9D7-4696-BDDE-9A4176BC56A2}", got "banana" msi.c:7663: Test failed: Expected "{CCF1B2FF-D172-488B-8D4B-E39DF415EC05}", got "apple" msi.c:7665: Test failed: Expected "{D10217FC-E007-454E-A664-ABB810B6A9D4}", got "banana" msi.c:7724: Test failed: Expected "{D10217FC-E007-454E-A664-ABB810B6A9D4}", got "banana" msi.c:7742: Test failed: Expected "{CCF1B2FF-D172-488B-8D4B-E39DF415EC05}", got "apple" msi.c:7760: Test failed: Expected "{CCF1B2FF-D172-488B-8D4B-E39DF415EC05}", got "apple" msi.c:7762: Test failed: Expected "{D10217FC-E007-454E-A664-ABB810B6A9D4}", got "banana" msi.c:7778: Test failed: Expected "{CCF1B2FF-D172-488B-8D4B-E39DF415EC05}", got "apple" msi.c:7780: Test failed: Expected "{D10217FC-E007-454E-A664-ABB810B6A9D4}", got "banana" msi.c:7797: Test failed: Expected "{CCF1B2FF-D172-488B-8D4B-E39DF415EC05}", got "apple" msi.c:7799: Test failed: Expected "{D10217FC-E007-454E-A664-ABB810B6A9D4}", got "banana" msi.c:7818: Test failed: Expected "{CCF1B2FF-D172-488B-8D4B-E39DF415EC05}", got "apple" msi.c:7820: Test failed: Expected "{D10217FC-E007-454E-A664-ABB810B6A9D4}", got "banana" msi.c:7837: Test failed: Expected "{CCF1B2FF-D172-488B-8D4B-E39DF415EC05}", got "apple" msi.c:7839: Test failed: Expected "{D10217FC-E007-454E-A664-ABB810B6A9D4}", got "banana" msi.c:7955: Test failed: Expected "{CCF1B2FF-D172-488B-8D4B-E39DF415EC05}", got "apple" msi.c:7957: Test failed: Expected "{D10217FC-E007-454E-A664-ABB810B6A9D4}", got "banana" msi.c:8002: Test failed: Expected "{CCF1B2FF-D172-488B-8D4B-E39DF415EC05}", got "apple" msi.c:8004: Test failed: Expected "{D10217FC-E007-454E-A664-ABB810B6A9D4}", got "banana" msi.c:8028: Test failed: Expected "{CCF1B2FF-D172-488B-8D4B-E39DF415EC05}", got "apple" msi.c:8030: Test failed: Expected "{D10217FC-E007-454E-A664-ABB810B6A9D4}", got "banana" msi.c:8281: Test failed: Expected "{372082F7-058A-409C-905E-2169F35495CA}", got "apple" msi.c:8283: Test failed: Expected "{7AC4AF3E-8A34-43A2-943A-3C047E041E35}", got "banana" msi.c:8403: Test failed: Expected "{372082F7-058A-409C-905E-2169F35495CA}", got "apple" msi.c:8405: Test failed: Expected "{7AC4AF3E-8A34-43A2-943A-3C047E041E35}", got "banana" msi.c:8450: Test failed: Expected "{372082F7-058A-409C-905E-2169F35495CA}", got "apple" msi.c:8452: Test failed: Expected "{7AC4AF3E-8A34-43A2-943A-3C047E041E35}", got "banana" msi.c:8476: Test failed: Expected "{372082F7-058A-409C-905E-2169F35495CA}", got "apple" msi.c:8478: Test failed: Expected "{7AC4AF3E-8A34-43A2-943A-3C047E041E35}", got "banana" msi.c:8281: Test failed: Expected "{1269E876-F059-41C5-8D5D-B9E636E6833E}", got "apple" msi.c:8283: Test failed: Expected "{965A5D65-6BC6-4AC6-B106-342368801CD1}", got "banana" msi.c:8403: Test failed: Expected "{1269E876-F059-41C5-8D5D-B9E636E6833E}", got "apple" msi.c:8405: Test failed: Expected "{965A5D65-6BC6-4AC6-B106-342368801CD1}", got "banana" msi.c:8450: Test failed: Expected "{1269E876-F059-41C5-8D5D-B9E636E6833E}", got "apple" msi.c:8452: Test failed: Expected "{965A5D65-6BC6-4AC6-B106-342368801CD1}", got "banana" msi.c:8476: Test failed: Expected "{1269E876-F059-41C5-8D5D-B9E636E6833E}", got "apple" msi.c:8478: Test failed: Expected "{965A5D65-6BC6-4AC6-B106-342368801CD1}", got "banana" msi.c:8773: Test failed: Expected patchcode to be unchanged, got {8B602740-836D-4D2F-9A48-0A77827D8057} msi.c:8775: Test failed: Expected targetprod to be unchanged, got {676CA140-B885-480C-89F7-254D1A7BDED6} msi.c:8844: Test failed: Expected "{8B602740-836D-4D2F-9A48-0A77827D8057}", got "apple" msi.c:8846: Test failed: Expected "{676CA140-B885-480C-89F7-254D1A7BDED6}", got "banana" msi.c:8889: Test failed: Expected "{8B602740-836D-4D2F-9A48-0A77827D8057}", got "apple" msi.c:8891: Test failed: Expected "{676CA140-B885-480C-89F7-254D1A7BDED6}", got "banana" msi.c:9435: Test failed: Expected "{C450F244-0D1A-4A58-840B-E3612F065798}", got "apple" msi.c:9478: Test failed: Expected "{C450F244-0D1A-4A58-840B-E3612F065798}", got "apple" msi.c:9655: Test failed: Expected "{C450F244-0D1A-4A58-840B-E3612F065798}", got "apple"

1 0

Re: [1/5] msi/tests: Return INVALID_FILE_SIZE from get_pf_file_size if the file can't be opened.
by testbot＠testbot.winehq.org 27 Apr '10

27 Apr '10

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 http://testbot.winehq.org/JobDetails.pl?Key=1760 Your paranoid android. === W7PROX64 (32 bit install) === install.c:5279: Test failed: Expected "C:\Program Files (x86)\msitest\maximus", got "Software\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\84A88FD7F6998CE40A22FB59F6B9C2BB\InstallProperties" install.c:5298: Test failed: Expected "01\msitest\augustus", got "Software\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\84A88FD7F6998CE40A22FB59F6B9C2BB\InstallProperties" install.c:5323: Test failed: Expected "C:\Program Files (x86)\msitest\maximus", got "Software\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\84A88FD7F6998CE40A22FB59F6B9C2BB\InstallProperties" install.c:5342: Test failed: Expected "01\msitest\augustus", got "Software\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\84A88FD7F6998CE40A22FB59F6B9C2BB\InstallProperties" === W7PROX64 (64 bit install) === install.c:8132: Test failed: RegQueryValueExA failed 2 (0) install.c:8855: Test failed: file not created install.c:8856: Test failed: file not created install.c:8858: Test failed: file not created install.c:8864: Test failed: file removed install.c:8869: Test failed: directory removed install.c:8916: Test failed: key not removed install.c:8926: Test failed: key not removed install.c:8937: Test failed: key not removed install.c:9011: Test failed: got 6 expected 0 install.c:9017: Test failed: got 6 expected 0 install.c:9020: Test failed: got 6 expected 0 install.c:9022: Test failed: file removed install.c:9167: Test failed: key not created === W7PROX64 (64 bit patch) === patch.c:698: Test failed: expected 1000, got 4294967295 patch.c:711: Test failed: expected 1002, got 4294967295

1 0