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

Re: shell32: Implement Set/GetCurrentViewMode in the default shellview. (try 2)
by Alexandre Julliard 22 Jul '10

22 Jul '10

David Hedberg <david.hedberg(a)gmail.com> writes: > + > + /* Check that all the messages received can be found in vista_plus_msgs. */ > +#define verify_vista_plus_msgs() \ > + do { \ > + UINT i,j, failcount = 0; \ > + for(i = 0; i < sequences[LISTVIEW_SEQ_INDEX]->count; i++) { \ > + BOOL found = FALSE; \ > + UINT msg = sequences[LISTVIEW_SEQ_INDEX]->sequence[i].message; \ > + for(j = 0; vista_plus_msgs[j] != 0; j++) \ > + if(vista_plus_msgs[j] == msg) found = TRUE; \ > + if(!found) { \ > + failcount++; \ > + trace("Unexpected messaged %d\n", msg); \ > + } \ > + } \ > + ok(!failcount,"Failed (%d).\n", failcount); \ > + flush_sequences(sequences, NUM_MSG_SEQUENCES); \ > + } while(0) > + Please avoid that sort of thing, make it a separate function instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [5/7] msi/tests: Skip tests when the current user has insufficient rights.
by testbot＠testbot.winehq.org 22 Jul '10

22 Jul '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=3720 Your paranoid android. === W7PROX64 (32 bit package) === package.c:7703: Test failed: Expected "C:\winetest\FileName1", got "" package.c:7709: Test failed: Expected "C:\winetest\FileName2", got "" package.c:7715: Test failed: Expected "C:\winetest\FileName3", got "" package.c:7727: Test failed: Expected "C:\winetest\FileName5", got "" package.c:7733: Test failed: Expected "C:\winetest\", got "" package.c:7739: Test failed: Expected "C:\winetest\", got "" package.c:7755: Test failed: Expected "C:\winetest\FileName8.dll", got "" package.c:7766: Test failed: Expected "C:\winetest\FileName10.dll", got "" === W7PROX64 (64 bit package) === package.c:8319: Test failed: Expected "C:\winetest\FileName1", got "" package.c:8330: Test failed: Expected "C:\winetest\", got "" package.c:8341: Test failed: Expected "C:\winetest\", got "" package.c:8391: Test failed: Expected "C:\winetest\FileName3.dll", got "" package.c:8402: Test failed: Expected "C:\winetest\FileName5.dll", got "" package.c:8411: Test failed: Expected "C:\", got "" package.c:8417: Test failed: Expected "C:\winetest\", got "" package.c:8438: Test failed: Expected "C:\winetest\FileName1", got "" package.c:8447: Test failed: Expected "C:\winetest\FileName1", got "" === W98SE (32 bit install) === install.c:9098: Test failed: Expected ERROR_SUCCESS, got 1605 === WNT4WSSP6 (32 bit install) === install.c:9098: Test failed: Expected ERROR_SUCCESS, got 1605 === W2KPROSP4 (32 bit install) === install.c:9098: Test failed: Expected ERROR_SUCCESS, got 1605 === WXPPROSP3 (32 bit install) === install.c:9098: Test failed: Expected ERROR_SUCCESS, got 1605 === W2K3R2SESP2 (32 bit install) === install.c:9098: Test failed: Expected ERROR_SUCCESS, got 1605 === WVISTAADM (32 bit install) === install.c:9098: Test failed: Expected ERROR_SUCCESS, got 1605 === W2K8SE (32 bit install) === install.c:9098: Test failed: Expected ERROR_SUCCESS, got 1605 === W7PRO (32 bit install) === install.c:9098: Test failed: Expected ERROR_SUCCESS, got 1605 === W7PROX64 (32 bit install) === install.c:5512: 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:5531: Test failed: Expected "01\msitest\augustus", got "Software\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\84A88FD7F6998CE40A22FB59F6B9C2BB\InstallProperties" install.c:5556: 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:5575: Test failed: Expected "01\msitest\augustus", got "Software\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\84A88FD7F6998CE40A22FB59F6B9C2BB\InstallProperties" install.c:9098: Test failed: Expected ERROR_SUCCESS, got 1605 === W7PROX64 (64 bit install) === install.c:7073: Test failed: Expected ERROR_SUCCESS, got 2 install.c:7079: Test failed: Expected ERROR_SUCCESS, got 6 install.c:7080: Test failed: Wrong multi-sz data install.c:7081: Test failed: Expected 15, got 260 install.c:9098: Test failed: Expected ERROR_SUCCESS, got 1605 install.c:9491: Test failed: key not removed install.c:9501: Test failed: key not removed install.c:9512: Test failed: key not removed install.c:9780: Test failed: key not created

1 0

Re: [6/6] shlwapi/tests: Correct the prototype of the StrRetToBSTR function pointer.
by Paul Vriens 22 Jul '10

22 Jul '10

On 07/20/2010 06:14 AM, Andrew Nguyen wrote: > --- > dlls/shlwapi/tests/string.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) This patchset introduces crashes in these tests on W2K, XP and W2K3: http://test.winehq.org/data/tests/shlwapi:string.html Further than that it seems that none of the test are run on several platforms now. If I look at my Win98 box I get "The xx.exe file is linked to missing export SHELL32.DLL:StrChrA" and on some Vista+ boxes (not on my Vista for example): http://testbot.winehq.org/JobDetails.pl?Key=3663&scrshot_106=1#k106 Could you have a look? Notice the mentioning of SHELL32 in those errors. -- Cheers, Paul.

3 9

[1\4]wined3d: Extend IWineD3D_GetAdapterDisplayMode with an extra paramater to pass back some extra adapter info.
by Louis Lenders 22 Jul '10

22 Jul '10

Hi Henri >I mean that I don't think the "rotation" argument to > GetAdapterDisplayMode() should be allowed to be NULL. I tested IDirect3D9Ex::GetAdapterDisplayModeEx and that allows pRotation to be NULL, and still happily retrieves all other (D3DDISPLAYMODEEX) info. So it's seems logical IWineD3DGetAdapterDisplayMode is allowed to have it's rotation parameter NULL as well. I attached a new series of patches to the bug http://bugs.winehq.org/show_bug.cgi?id=18640 >It probably also makes sense to properly start adding the required > support from the bottom. XRandR should be able to retrieve the display > rotation, but if that's not available you can just let winex11.drv > return an identity rotation. I fear i'm completely unfamiliar with XRandr; i think right now it's beyond the scope of this patch series, the patch series is really meant to (partly) tackle bug 18640

2 1

Re: [6/6] shlwapi/tests: Correct the prototype of the StrRetToBSTR function pointer.
by Greg Geldorp 22 Jul '10

22 Jul '10

> From: Paul Vriens <paul.vriens.wine(a)gmail.com> > > The first thing winetest does is run a "<dll>_test.exe --list" for each > dll. If there is a missing export (or import library) it will not > include this dll in the tests (so none of the subtests will run). Just ran shlwapi_test.exe --list manually on WVISTAADM, "The procedure entry point StrCpyNW could not be located in the dynamic link library shell32.dll." Ge.

1 0

Re: [PATCH 1/1] d3dx9: Complete test for D3DXCreateSphere.
by Henri Verbeet 22 Jul '10

22 Jul '10

On 21 July 2010 21:56, Misha Koshelev <misha680(a)gmail.com> wrote: > + /* first vertex and normal */ > + vertex = 0; > + test_vertex_data[vertex].position.x = 0.0f; > + test_vertex_data[vertex].position.y = 0.0f; > + test_vertex_data[vertex].position.z = radius; > + test_vertex_data[vertex].normal.x = 0.0f; > + test_vertex_data[vertex].normal.y = 0.0f; > + test_vertex_data[vertex].normal.z = 1.0f; > + vertex++; > + assert(vertex < MAX_VERTICES); An assert probably isn't very useful after the fact, but it seems to me that dynamically allocating an array of the appropriate size is nicer anyway. > +static DWORD compute_sphere_test_index_data(FLOAT radius, UINT slices, UINT stacks) I haven't really thought this through yet, but would it perhaps be simpler to calculate the faces a vertex is part of, instead of the other way around?

1 0

Re: [4/5] d3dx9: Implement D3DXCreateTexture plus tests
by Henri Verbeet 22 Jul '10

22 Jul '10

On 21 July 2010 16:06, Owen Rudge <owen(a)owenrudge.net> wrote: > + hr = D3DXCreateTexture(device, D3DX_DEFAULT, 63, 0, 0, 0, D3DPOOL_DEFAULT, &texture); > + ok(hr == D3D_OK, "D3DXCreateTexture returned %#x, expected %#x\n", hr, D3D_OK); > + > + if (texture) > + { > + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); > + > + ok(desc.Width == 63, "Returned width %d, expected %d\n", desc.Width, 63); > + ok(desc.Height == 63, "Returned height %d, expected %d\n", desc.Height, 63); > + > + IDirect3DTexture9_Release(texture); > + } I (still) think that depends on NPOT texture support in the device. I.e., if the device doesn't support NPOT textures, I suppose the call can either fail, or create a texture with different dimension like 64x64, but it can't create 63x63 textures. Note that D3DPTEXTURECAPS_NONPOW2CONDITIONAL also affects NPOT capabilities.

1 0

Re: [2/5] d3dx9: Implement D3DXCheckTextureRequirements
by Henri Verbeet 22 Jul '10

22 Jul '10

On 21 July 2010 16:06, Owen Rudge <owen(a)owenrudge.net> wrote: > +/* Returns TRUE if num is a power of 2, FALSE otherwise */ > +BOOL is_pow2(UINT num) > +{ > + return !(num & (num - 1)); > +} Minor, but this returns TRUE if num is power of two, *or zero*. That's fine for how it's used, but please mention it. > +/* Returns the smallest power of 2 which is greater than or equal to num */ > +UINT make_pow2(UINT num) > +{ > + UINT result = 1; > + > + while (result < num) > + result <<= 1; > + > + return result; > +} There's a danger of this looping forever if you pass it something > 0x80000000. I'm not sure if we care though, maybe that simply falls under the heading of "so don't do that". > + if (!width && !height) > + max_mipmaps = 9; This looks like the number of mipmaps in a 256x256 texture, i.e. log2i(256) + 1. That doesn't match the values of w and h in that case though, so I think a comment for clarification wouldn't hurt there. > + while (mip_width > 1 || mip_height > 1) > + { > + mip_width >>= 1; > + mip_height >>= 1; > + max_mipmaps++; > + } This one is also minor, but if you don't need mip_width / mip_height for anything else, you can just take max(w, h) before the loop. It's probably not worth the trouble for a single instance of this calculation, but note that wined3d has a wined3d_log2i() function in dlls/wined3d/utils.c.

1 0

Re: [4/7] msi/tests: Return an error code from helper_createpackage and package_from_db.
by testbot＠testbot.winehq.org 22 Jul '10

22 Jul '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=3719 Your paranoid android. === W7PROX64 (32 bit package) === package.c:7618: Test failed: Expected "C:\winetest\FileName1", got "" package.c:7624: Test failed: Expected "C:\winetest\FileName2", got "" package.c:7630: Test failed: Expected "C:\winetest\FileName3", got "" package.c:7642: Test failed: Expected "C:\winetest\FileName5", got "" package.c:7648: Test failed: Expected "C:\winetest\", got "" package.c:7654: Test failed: Expected "C:\winetest\", got "" package.c:7670: Test failed: Expected "C:\winetest\FileName8.dll", got "" package.c:7681: Test failed: Expected "C:\winetest\FileName10.dll", got "" === W7PROX64 (64 bit package) === package.c:8227: Test failed: Expected "C:\winetest\FileName1", got "" package.c:8238: Test failed: Expected "C:\winetest\", got "" package.c:8249: Test failed: Expected "C:\winetest\", got "" package.c:8299: Test failed: Expected "C:\winetest\FileName3.dll", got "" package.c:8310: Test failed: Expected "C:\winetest\FileName5.dll", got "" package.c:8319: Test failed: Expected "C:\", got "" package.c:8325: Test failed: Expected "C:\winetest\", got "" package.c:8346: Test failed: Expected "C:\winetest\FileName1", got "" package.c:8355: Test failed: Expected "C:\winetest\FileName1", got ""

1 0

Re: [3/7] msi/tests: Fix test failures on wow64.
by testbot＠testbot.winehq.org 22 Jul '10

22 Jul '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=3718 Your paranoid android. === W7PROX64 (32 bit package) === package.c:7614: Test failed: Expected "C:\winetest\FileName1", got "" package.c:7620: Test failed: Expected "C:\winetest\FileName2", got "" package.c:7626: Test failed: Expected "C:\winetest\FileName3", got "" package.c:7638: Test failed: Expected "C:\winetest\FileName5", got "" package.c:7644: Test failed: Expected "C:\winetest\", got "" package.c:7650: Test failed: Expected "C:\winetest\", got "" package.c:7666: Test failed: Expected "C:\winetest\FileName8.dll", got "" package.c:7677: Test failed: Expected "C:\winetest\FileName10.dll", got "" === W7PROX64 (64 bit package) === package.c:8223: Test failed: Expected "C:\winetest\FileName1", got "" package.c:8234: Test failed: Expected "C:\winetest\", got "" package.c:8245: Test failed: Expected "C:\winetest\", got "" package.c:8295: Test failed: Expected "C:\winetest\FileName3.dll", got "" package.c:8306: Test failed: Expected "C:\winetest\FileName5.dll", got "" package.c:8315: Test failed: Expected "C:\", got "" package.c:8321: Test failed: Expected "C:\winetest\", got "" package.c:8342: Test failed: Expected "C:\winetest\FileName1", got "" package.c:8351: Test failed: Expected "C:\winetest\FileName1", got ""

1 0