November 2014 - Wine-Devel - list.winehq.org

Re: [PATCH 4/7] reg: Add wchar/type conversion functions
by Stefan Dösinger Nov. 4, 2014

Nov. 4, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +#define ERROR_INVALID_TYPE 20001 What does RegSetValueEx return if you pass an invalid type? The API makes this error condition possible, so there's likely a return value for it. (Yeah, I know, it's not your fault advapi32/tests has no test for this. If I understand server/registry.c correctly such a call succeeds and creates a blob with an undefined type. Still needs tests) ERROR_INVALID_DATATYPE may be a candidate. > +typedef struct > +{ > + DWORD type; > + const WCHAR *name; > +} type_rel; You can make this anonymous too. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUWU1cAAoJEN0/YqbEcdMwBWcQAID2xh321Jci/xtp6ZJMY7cV 6bzXGGBfyBiDaCzyWiUdcZrLaGmPm6ehuV655FylMEAQvY8XGOoifdF1F6rdlqok fwGLfdwWns6EUpdINipGbBrPFn2bKdJyP3ZECY0owEYM8H76CoJDwcgCiIrIM1T1 0uejd152KmVs/4p4kg/XYvWbJqSQc4VceHs2HPW2QG+LZ7prLEK/Cwj7PVu/sIq7 KZKrDEx6UGEkvYCr24ldWcd4qTzicnzipjnbqR8rH0F3Y0ZAL2EaQqrCfSdxj14O Yy8YIn+QQTBa732yahs9hJrVeFYhgLboVrLavTb+AtoLeq5/TnBLwB5Gl1+EqIah HRVK9VBNE1hlIjj84+GdUx4hicNwBwUe0a/cODC6b0LwsBh9aalawWuhOAs8R38/ xt4RNHc/1VUxC3XWNz8s0NuPjIooPLu5z4rnbyl2LM99w5mteac9wqH8mhmJE1qa INB1yBbCGv9dccSZwzRtkyw1Lpj4762uKM6Vxk01ii2lN2uP/mWN91M9o7blga3h +6QTL+TiiUzwVMirkjX2TxLSTDZxHXkYRadKMgerN9V//ztGmie2cIara4J4kLzm PWDpXNguQC4WrcLzAbi7zDY3UOcxvXY4XQSCOBcIAQj254ZfTH+oBgtosWt5x9km dsLZ0QNRy5GmHGm52ine =10ha -----END PGP SIGNATURE-----

1 0

Re: [PATCH 2/7] reg: Check key paths in main
by Stefan Dösinger Nov. 4, 2014

Nov. 4, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +static BOOL sane_path(const WCHAR *key) > +{ > + int i = strlenW(key); > + > + if (i < 3 || (key[i - 1] == '\\' && key[i - 2] == '\\')) > + { > + reg_print_error(ERROR_BADKEY); > + return FALSE; > + } I think I have asked this a few times, please forgive me if I forgot the answer: Did you test if RegAddKey and friends handle this for you? dlls/advapi32/tests/registry.c would profit from some tests for the error cases you have in programs/reg/tests/reg.c . > + if (!sane_path(key_name)) > + return 1; > + > for (i = 1; i < argc; i++) > { > if (!lstrcmpiW(argvW[i], slashVW)) > @@ -471,6 +485,9 @@ int wmain(int argc, WCHAR *argvW[]) > } > > key_name = argvW[2]; > + if (!sane_path(key_name)) > + return 1; > + > for (i = 1; i < argc; i++) > { > if (!lstrcmpiW(argvW[i], slashVW)) > @@ -502,6 +519,9 @@ int wmain(int argc, WCHAR *argvW[]) > } > > key_name = argvW[2]; > + if (!sane_path(key_name)) > + return 1; > + The helper function is a good idea if the answer to the above question is "no", but what's the advantage of calling it from main 3 times instead of reg_add, reg_delete and reg_query? All the other validation is done in reg_* . For consistency with the other functions it would be a good idea to return ERROR_BADKEY / ERROR_NO_REMOTE here and call reg_print_error in the caller. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUWUE0AAoJEN0/YqbEcdMwNIUP/0bcqgtH0ZPZ3DXmSVYRGq2I mUZmHxZHuGYdfWuiFKt6TjbcVUw/WNNuWn/1hTiSQC4A1wZvnvvT5w6dpKpyd1mP x48OXBPWg1hBALFvqxpK+x9CLUB745ms62wblfsltmJDei/EBnWTXy0jZn4rEshc jqTWesiieev/iaet+QbChMd+28RJmr3MoOaJkYOihi4SnLo6nXD0pcPL+tc3vtpW R0JA0GxmWNUVlqKuvqYvSIEMHoI6XwqL/Zlbr5PP11NtAmEzIEFfMUZ4uXQVY3vy C4qWcQctvQ8Akg+chmpoyZMYJ6+s3udpedzA2RhcKSymFgDRTXwdYnVFTK6BA1Pt jODRZ1RAOG9ShZMzIRNaIK7sBxYbK+wYxQpUvw5Xd5AuDnd2PUNJXnnvNMqW0c3x ZP5NxOpHucmgUgdSxPc0kwTLyC3Dg7KU1npUsxDnpZqgS9nSWZo/ZRp3kuNac6Z3 MSb3gLpvKDK/0mK09dGwJwCNHsIFfg67hjRVcswM4h/9O4gxWQ9tUzW/dwgT343+ iLaso6+Icvq4OFtXnZbZX8yPpK7j7oJgC/YFn94ib1Wz8PwMGb97OEPYF2IEsKWi xBLLDA976QeNKhb7Uxyg3Mr1ER3K4gaCHe0DCG5p4gfdGv5XhlaSOCGAdw/1UFFE IbSp8XZrbY+ZX0Psx/QW =FiSK -----END PGP SIGNATURE-----

1 0

Re: [PATCH 1/7] reg: Add system error printing function
by Stefan Dösinger Nov. 4, 2014

Nov. 4, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I conceptually like this function. Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +static int reg_print_error(LONG error_code) You are mixing LSTATUS and LONG in your code. It seems like this is ultimately Microsoft's fault since it defines LSTATUS in reg.h but puts error values from winerror.h into it. Since LSTATUS is defined as LONG it is not a big deal, but please pick one and try to be consistent. My choice would be LSTATUS since it is returned from the registry functions, but if you have a reason to choose LONG that's OK with me. > + case ERROR_FILE_NOT_FOUND: > + return reg_message(STRING_CANNOT_FIND); > + case ERROR_BADKEY: > + return reg_message(STRING_INVALID_KEY); These are dead code, please add them in the patches that call them. > + STRING_ERROR, "Error: " Wouldn't "Unexpected error" be a better fit? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUWT4tAAoJEN0/YqbEcdMw3bwP/1//Ah6I2lrHnd0SnJ8m83IM yyrD6D1hL3njOFPCLFykdEbrjf+yDkz1Qi596L/qUbvkK9rbVEo4EtUgtHeJ/D+/ UF7Jr0oB8RWDQZh5ePt+Ns0x9BYUwqbi/fyOda+Xtz0P+Vl3FUH5K3U3OO5cYtlB S52bruK/Bv69FsRQwFwN9vYRX+JnJJq3NJ9Q2xoywBN26iypgTa+SDdKxA9gcDK1 xIfvSDqYsqR5Rq6UnRzroknG0j0aeuDWgHwY5pF1/DxGTbir5wCs6UOVPstIQeqk VxjrInXjGXo4LmJHz+6KPVc3+WuKr5QsmQr9Z/NgZBLN7xJXJ4DY19keFhUQfsLB AjAvf+mJy8GRwoaCihboze9ltQywoM0jZe2zLRxYiiXmD79EDN2huKi9D8g+ur58 0OE37veRYh6IUhjzQvfTxdNZvkNnPxvvP+S51qVEQu6GWPjITe375mQf8HIV3AZO z+NV3TWgsiz/tMqQK5YCPq9oR8vuXzu7H4RBjdUUpKy5yTzEcXSw6ehqj2Qehz5I MTC7QBQVNxHD3MFHGCoPA7Oeb8J2IEDGgZlj9cq9TSLTfy9XOlPQ8Abth29I/fjl GW/9Z10VGQ9F+KQ7E5E0V+Sci93l486Dv2gf579ZYmCa8sfPI7BVj1SQmkOY3bQP i3Ekbq0hR2Yk1FQcciYG =iN7/ -----END PGP SIGNATURE-----

1 0

Re: [PATCH 2/4] d3d9/tests: The device restores the mode settings from the registry (v3).
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Stefan Dösinger <stefan(a)codeweavers.com> writes: > Version 3: Simplify the mode selection code and hardcode > D3DFMT_X8R8G8B8. Retain the test for mode reset when the device was > originally created with the registry size. > > Version 2: Make sure the mode set with ChangeDisplaySettings is bigger > than the device's mode. Otherwise Windows shrinks the window to the new > mode + 12 pixels. Testing this behavior is not the purpose of this test. > > Implementing this behavior is complicated because ddraw destroys and > recreates swapchains in SetCooperativeLevel. > --- > dlls/d3d9/tests/device.c | 153 ++++++++++++++++++++++++++++++++++++----------- > 1 file changed, 117 insertions(+), 36 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M d3d9.dll -p d3d9_test.exe.so device && touch device.ok device.c:4034: Test succeeded inside todo block: Got unexpect width 1920, expected 1920. device.c:5516: Tests skipped: This GPU supports SM3, skipping unsupported shader test. device.c:5928: Tests skipped: D3DFMT_A32B32G32R32F supports filtering, skipping tests. device.c:7229: Tests skipped: Dynamic D3DFMT_YUY2 textures not supported, skipping mipmap test. device.c:7229: Tests skipped: Dynamic D3DFMT_UYVY textures not supported, skipping mipmap test. make: *** [device.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [1/2] d3dx9_36: Implement D3DXCreatePolygon.
by Matteo Bruni Nov. 4, 2014

Nov. 4, 2014

2014-11-03 6:35 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Based on a patch by David Adam. > > For bug 13632. > > --- > dlls/d3dx9_36/d3dx9_36.spec | 2 +- > dlls/d3dx9_36/mesh.c | 89 +++++++++++++++++++++++++++++++++++++++++++++ > include/d3dx9shape.h | 2 + > 3 files changed, 92 insertions(+), 1 deletion(-) > Hi Sebastian, I have a few nitpicks: + TRACE("(%p, %f, %u, %p, %p)\n", device, length, sides, mesh, adjacency); Generally you want that to be something like: TRACE("device %p, length %f, sides %u, mesh %p, adjacency %p.\n", device, length, sides, mesh, adjacency); + if (!device || length < 0.0f || sides == 0 || !mesh) Probably "!sides" is more in the usual Wine d3d* style. Also, no need to use brackets for single-line branches. + if (FAILED(hr = D3DXCreateMeshFVF(sides, sides + 1, D3DXMESH_MANAGED, + D3DFVF_XYZ | D3DFVF_NORMAL,device, &polygon))) Line continuation should be indented by 8 blanks. Also, missing whitespace after a comma. + scale = 0.5f * length / sin(D3DX_PI / sides); You probably want to use sinf() here. Same below. + for (i = 0; i < sides; i++) Not important, but the current wined3d style wants "++i" here. + for (i = 0; i < sides; i++) + { + adjacency_buf[i][0] = i - 1; + adjacency_buf[i][1] = -1; + adjacency_buf[i][2] = i + 1; + } Really a detail, but adjacency_buf and i are both defined as unsigned int, so either defining them as plain, signed int or using ~0 instead of -1 would be nicer. I haven't seen the test yet but in some other D3DX9 functions the "out" pointers are set to NULL on error. If this function has the same behavior you should probably add a "*mesh = NULL;" in the first few lines of the function.

3 2

Re: [PATCH 3/4] d3d8/tests: Check if the current display settings match the registry settings.
by Marvin Nov. 4, 2014

Nov. 4, 2014

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=9978 Your paranoid android. === w8 (32 bit device) === device.c:1173: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1218: Test failed: Reset failed, hr 0x88760868. device.c:1220: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1224: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1231: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1232: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1234: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1235: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1236: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1241: Test failed: Screen width is 640, expected 800. device.c:1242: Test failed: Screen height is 480, expected 600. device.c:1248: Test failed: Back buffer width is 640, expected 800. device.c:1250: Test failed: Back buffer height is 480, expected 600. device.c:1280: Test failed: Screen width is 640, expected 1024. device.c:1281: Test failed: Screen height is 480, expected 768. device.c:2441: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:2813: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2817: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2839: Test failed: Failed to reset device, hr 0x88760868. device.c:2843: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2847: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3056: Test failed: Got unexpect width 640. device.c:3057: Test failed: Got unexpect height 480. device.c:3068: Test failed: Got unexpect width 640. device.c:3069: Test failed: Got unexpect height 480. device.c:3131: Test failed: Failed to reset device. device.c:3138: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3146: Test failed: Expected wndproc 0x412ed0, got 0x412ed0.

2 1

Re: advapi32/tests: Simplify empty string check (PVS-Studio).
by Marvin Nov. 4, 2014

Nov. 4, 2014

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=9984 Your paranoid android. === w7u (32 bit service) === The test timed out

2 1

Re: [2/2] kernel32/tests: Add tests for FindFirstFileExW level FindExInfoBasic.
by Marvin Nov. 4, 2014

Nov. 4, 2014

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=9994 Your paranoid android. === wvistau64 (32 bit file) === file.c:367: Test failed: attributes of file "testfile.xxx" are 0x0820 === wvistau64 (64 bit file) === file.c:367: Test failed: attributes of file "testfile.xxx" are 0x0820

1 0

[PATCH] iphlpapi: call SetLastError in NotifyAddrChange/NotifyRouteChange(try 2)
by Hao Peng Nov. 4, 2014

Nov. 4, 2014

call SetLastError in NotifyAddrChange/NotifyRouteChange, to make apps can get WSA_IO_PENDING error code after async operation through GetLastError. Thanks to Sebastian Lackner for comments. superseded patch 107390. --- dlls/iphlpapi/iphlpapi_main.c | 18 ++++++++++++++++-- dlls/iphlpapi/tests/iphlpapi.c | 39 +++++++++++++++++++++++---------------- 2 files changed, 39 insertions(+), 18 deletions(-)

1 0

Re: [PATCH 6/6] d3d8/tests: Add an ATI1N entry to the test_volume_blocks test.
by Marvin Nov. 4, 2014

Nov. 4, 2014

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=9983 Your paranoid android. === w8 (32 bit device) === device.c:1174: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1219: Test failed: Reset failed, hr 0x88760868. device.c:1221: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1225: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1232: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1234: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1235: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1236: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1237: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1242: Test failed: Screen width is 640, expected 800. device.c:1243: Test failed: Screen height is 480, expected 600. device.c:1249: Test failed: Back buffer width is 640, expected 800. device.c:1251: Test failed: Back buffer height is 480, expected 600. device.c:1281: Test failed: Screen width is 640, expected 1024. device.c:1282: Test failed: Screen height is 480, expected 768. device.c:2437: Test failed: Expected foreground window 000500F6, got 0002004C. device.c:2808: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2812: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2834: Test failed: Failed to reset device, hr 0x88760868. device.c:2838: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2842: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3051: Test failed: Got unexpect width 640. device.c:3052: Test failed: Got unexpect height 480. device.c:3063: Test failed: Got unexpect width 640. device.c:3064: Test failed: Got unexpect height 480. device.c:3126: Test failed: Failed to reset device. device.c:3133: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3141: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: [PATCH 4/6] d3d8/tests: Add a test for ATI1N and ATI2N texture formats.
by Marvin Nov. 4, 2014

Nov. 4, 2014

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=9981 Your paranoid android. === w8 (32 bit device) === device.c:1174: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1219: Test failed: Reset failed, hr 0x88760868. device.c:1221: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1225: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1232: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1234: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1235: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1236: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1237: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1242: Test failed: Screen width is 640, expected 800. device.c:1243: Test failed: Screen height is 480, expected 600. device.c:1249: Test failed: Back buffer width is 640, expected 800. device.c:1251: Test failed: Back buffer height is 480, expected 600. device.c:1281: Test failed: Screen width is 640, expected 1024. device.c:1282: Test failed: Screen height is 480, expected 768. device.c:2437: Test failed: Expected foreground window 000301E2, got 0002004C. device.c:2808: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2812: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2834: Test failed: Failed to reset device, hr 0x88760868. device.c:2838: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2842: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3051: Test failed: Got unexpect width 640. device.c:3052: Test failed: Got unexpect height 480. device.c:3063: Test failed: Got unexpect width 640. device.c:3064: Test failed: Got unexpect height 480. device.c:3126: Test failed: Failed to reset device. device.c:3133: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3141: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: [PATCH 4/4] d3d8/tests: The device restores the mode settings from the registry (v4).
by Marvin Nov. 4, 2014

Nov. 4, 2014

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=9979 Your paranoid android. === w8 (32 bit device) === device.c:1173: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1218: Test failed: Reset failed, hr 0x88760868. device.c:1220: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1224: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1231: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1232: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1234: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1235: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1236: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1241: Test failed: Screen width is 640, expected 800. device.c:1242: Test failed: Screen height is 480, expected 600. device.c:1248: Test failed: Back buffer width is 640, expected 800. device.c:1250: Test failed: Back buffer height is 480, expected 600. device.c:1280: Test failed: Screen width is 640, expected 1024. device.c:1281: Test failed: Screen height is 480, expected 768. device.c:2441: Test failed: Expected foreground window 000701E6, got 0002004C. device.c:2813: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2817: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2839: Test failed: Failed to reset device, hr 0x88760868. device.c:2843: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2847: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3216: Test failed: Failed to reset device. device.c:3223: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3231: Test failed: Expected wndproc 0x412ed0, got 0x412ed0.

1 0

Re: ws2_32: Add tests and implement inet_pton
by Marvin Nov. 3, 2014

Nov. 3, 2014

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=9974 Your paranoid android. === wxppro (32 bit sock) === sock.c:610: Test failed: oob_server (184): unexpectedly at the OOB mark: 0

1 0

Re: [2/2] d3dx9_36/tests: Add tests for D3DXCreatePolygon.
by Matteo Bruni Nov. 3, 2014

Nov. 3, 2014

2014-11-03 6:35 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Based on a patch by David Adam. > > --- > dlls/d3dx9_36/tests/mesh.c | 154 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 154 insertions(+) More nitpicks... +static BOOL compute_polygon(struct mesh *mesh, float length, UINT sides) I'd prefer a plain unsigned int there. The various comments I made for the implementation patch obviously apply to the body of compute_polygon() too. + IDirect3D9* d3d; + IDirect3DDevice9* device; + D3DPRESENT_PARAMETERS d3dpp; + ID3DXMesh* polygon; + ID3DXBuffer* ppBuffer; Watch out for the '*' placement. Also, no hungarian notation please. + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); Not sure we care but the other tests in mesh.c use D3DCREATE_SOFTWARE_VERTEXPROCESSING. + ok(buffer_size == 33 * sizeof(DWORD), "expected size %d, received %d\n", + 33 * sizeof(DWORD), buffer_size); I think it's usually better not to print sizeof() results. + ok(buffer[i][1] == -1, "wrong adjacency[%d][1] = %d\n", i, buffer[i][1]); I'd prefer ~0 here. Also, unsigned int should be printed with "%u". + if (ppBuffer) ID3DXBuffer_Release(ppBuffer); Please put the "if" body on a separate line. I'd like to see an additional test to check whether the ID3DXMesh pointer is set to NULL on D3DXCreatePolygon() failure. Probably you could simply modify (at least) one of the failure tests at the beginning for that.

2 2

Wine Gecko 2.34 released
by Jacek Caban Nov. 3, 2014

Nov. 3, 2014

Hi all, Wine Gecko 2.34 is finally released and relevant commit is in Wine. There is one important note to distro packages and everyone willing to build it himself: it's important to use very recent mingw-w64 version. See [1] for details. Cheers, Jacek https://bugzilla.mozilla.org/show_bug.cgi?id=1088848

1 0

Re: [2/2] wined3d: wined3d: Take abs() of vertex z coordinate as FFP fog coordinate (try 2)
by Henri Verbeet Nov. 3, 2014

Nov. 3, 2014

On 29 October 2014 23:35, Joachim Priesner <joachim.priesner(a)web.de> wrote: > + /* Basic vertex shader without fog computation ("non foggy") */ > + static const DWORD vertex_shader_code1[] = > + { > + 0xfffe0100, /* vs_1_0 */ > + /* output.Pos = mul(input.Pos, Projection) */ > + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ > + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ > + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ > + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ > + /* output.Color = input.Color */ > + 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ > + 0x0000ffff, /* END */ > + }; ... > + static const D3DMATRIX proj_mat = > + {{{ > + 1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 1.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.5f, 0.0f, > + 0.0f, 0.0f, 0.5f, 1.0f > + }}}; > + /* Transposed version of proj_mat to pass to the vertex shaders. */ > + static const D3DMATRIX proj_mat_transposed = > + {{{ > + 1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 1.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.5f, 0.5f, > + 0.0f, 0.0f, 0.0f, 1.0f > + }}}; Instead of transposing the matrix, you can just change the multiplication in the shader. I.e., using "mul(Projection, input.Pos)" instead of "mul(input.Pos, Projection)". That would then give you a mul/mad/mad/mad sequence instead of 4 dp4's. But of course that's all just a complicated way to do "output.Pos = input.Pos * 0.5 + 0.5;". > + /* start=0.0f, end=1.0f should be the default values, set them anyway to be sure. > + * These values do not affect the tests with foggy vertex shader, as the fog > + * intensity is computed directly by the shader. */ > + start.f = 0.0f; > + end.f = 1.0f; > + > + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGSTART, start.i); > + ok(SUCCEEDED(hr), "Setting fog start failed (%#x)\n", hr); > + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, end.i); > + ok(SUCCEEDED(hr), "Setting fog end failed (%#x)\n", hr); > + You don't need this. > + static const struct test_data_t > + { > + int vshader; > + D3DFOGMODE vfog; > + D3DFOGMODE tfog; > + DWORD color_left; > + DWORD color_middle_top; > + DWORD color_middle_bottom; > + DWORD color_right; > + } The _t suffix is reserved by POSIX, so you shouldn't use it for your own type names. In this specific case, you don't need the structure to be named at all, and you can just use an anonymous structure instead.

1 0

Re: [PATCH 2/2] user32/tests: Test exception handling for timer callbacks.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Qian Hong <qhong(a)codeweavers.com> writes: > +static void test_timers_exception(DWORD code) > +{ > + UINT_PTR id; > + MSG msg; > + > + exception = code; > + count = 0; > + id = SetTimer(NULL, 0, 300, callback_exception); > + ok(id != 0, "did not get id from SetTimer.\n"); > + > + Sleep(150); > + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); > + ok(count == 0, "did not get zero count as expected (%i).\n", count); > + Sleep(200); > + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); > + ok(count == 1, "did not get one count as expected (%i).\n", count); > + KillTimer(NULL, id); > + Sleep(350); > + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); > + ok(count == 1, "killing timer did not work (%i).\n", count); > +} You should find a way to test this without all these sleeps, the user32 tests already take a long time as it is. -- Alexandre Julliard julliard(a)winehq.org

2 1

[PATCH] iphlpapi: call WSASetLastError in NotifyAddrChange/NotifyRouteChange
by Hao Peng Nov. 3, 2014

Nov. 3, 2014

call WSASetLastError in NotifyAddrChange/NotifyRouteChange to make following DEMO code working. void main() { OVERLAPPED overlap; DWORD ret; HANDLE hand = NULL; overlap.hEvent = WSACreateEvent(); ret = NotifyAddrChange(&hand, &overlap); if (ret != NO_ERROR) { if (WSAGetLastError() != WSA_IO_PENDING) { printf("NotifyAddrChange error...%d\n", WSAGetLastError()); return; } } if ( WaitForSingleObject(overlap.hEvent, INFINITE) == WAIT_OBJECT_0 ) printf("IP Address table changed..\n"); } --- dlls/iphlpapi/iphlpapi_main.c | 57 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 12 deletions(-)

2 1

Re: [4/6] msvcrt: Added _fread_nolock_s implementation
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

"Iván Matellanes" <matellanesivan(a)gmail.com> writes: > { > + MSVCRT_size_t ret; > + > + MSVCRT__lock_file(stream); > + ret = MSVCRT__fread_nolock_s(buf, buf_size, elem_size, count, stream); > + MSVCRT__unlock_file(stream); The parameter validation has to be done before locking the file. -- Alexandre Julliard julliard(a)winehq.org

2 2

[PATCH] Mystery hang reduction -- clear new allocations
by mtewoodbury＠gmail.com Nov. 2, 2014

Nov. 2, 2014

From: Max TenEyck Woodbury <max+git(a)mtew.isa-geek.net> I was getting mystery frozen processes that cleared when a total screen redraw was forced. This has been reported numerous times over several years. It came and went with various releases. I have been getting it consistantly recently. I had an idea that it might have something to do with partially uninitialized drawing data structures, so I started adding HEAP_ZERO_MEMORY flags in various places. This particular set cleared the problem, at least for now... diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index cf5378c..cf1c814 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -178,7 +178,8 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara declaration->parent = parent; declaration->parent_ops = parent_ops; declaration->device = device; - declaration->elements = HeapAlloc(GetProcessHeap(), 0, sizeof(*declaration->elements) * element_count); + declaration->elements = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*declaration->elements) * element_count); if (!declaration->elements) { ERR("Failed to allocate elements memory.\n"); @@ -316,7 +317,7 @@ static unsigned int convert_fvf_to_declaration(const struct wined3d_gl_info *gl_ has_psize + has_diffuse + has_specular + num_textures; state.gl_info = gl_info; - state.elements = HeapAlloc(GetProcessHeap(), 0, size * sizeof(*state.elements)); + state.elements = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size * sizeof(*state.elements)); if (!state.elements) return ~0U; state.offset = 0; state.idx = 0; -- 1.8.0.rc0.18.gf84667d

2 1

Re: [PATCH] vbscript: Implemented String(try 2)
by Piotr Caban Nov. 2, 2014

Nov. 2, 2014

Hi, Some of the tests are not working on windows: E:\>vbscript_crosstest.exe run run.c:1043: Test failed: api.vbs: L"String(1, 564) = 4" run.c:1043: Test failed: api.vbs: L"String(1, 16895.49) = \00ff" run.c:1043: Test failed: api.vbs: L"String(1, CSng(16895.5)) = " run.c:1043: Test failed: api.vbs: L"755826670, w: Err.number = 0" run: 26885 tests executed (0 marked as todo, 4 failures), 0 skipped. On 10/25/14 10:10, Shuai Meng wrote: > +Call ok(String(1, 65.5) = "B", "String(1, 65.5) = " & String(1, 65.5)) > +Call ok(getVT(String(1, 65.5)) = "VT_BSTR", "getVT(String(1, 65.5)) = " & getVT(String(1, 65.5))) > +Call ok(String(1, 66.5) = "B", "String(1, 66.5) = " & String(1, 66.5)) > +Call ok(getVT(String(1, 66.5)) = "VT_BSTR", "getVT(String(1, 66.5)) = " & getVT(String(1, 66.5))) You have added exactly the same test twice. > +Call testStringError(2147483648, "w", 6) > +Call testStringError(2147483647, "w", 5) > +Call testStringError(1073741824, "w", 5) > +Call testStringError(1073741823, "w", 14) > +Call testStringError(755826670, "w", 14) > +Call testStringError(755826669, "w", 0) You can't assume it's possible to allocate ~700mb of memory in tests. The function never returns E_OUTOFMEMORY. You can't test it in wine tests suite but you can see it by calling the function in loop until system runs out of memory and then checking the error. You should simply try to allocate the string and if it fails return VBSE_OUT_OF_STRING_SPACE. Cheers, Piotr

3 3

Re: [1/2] ddraw: add dsurface dimension tests, try 12
by Stefan Dösinger Nov. 2, 2014

Nov. 2, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, First of all, thanks for your endurance with this. I know our pickiness can be exhausting. Am 2014-10-30 19:39, schrieb Patrick Rudolph: > + ddcaps.dwSize = sizeof(DDCAPS); > + hr = IDirectDraw_GetCaps(ddraw, &ddcaps, NULL); > + ok(SUCCEEDED(hr), "IDirectDraw_GetCaps failed, hr %#x.\n", hr); You are never reading ddcaps. I suspect it is a leftover from the now-removed out of (video)memory tests. > + surfacedesc.dwFlags = tests[i].flags | DDSD_PIXELFORMAT; You are already setting DDSD_PIXELFORMAT in all of tests[i].flags, there's no need to set it twice. Remove one of them, preferably the one in tests[].flags. You can move DDSD_CAPS as well. Henri mentioned the same issue in his feedback. The rest are some minor style issues, but please fix them as well: > + DWORD i,j; I'd prefer unsigned int i, j, but that's not a strong opinion. > + todo_wine ok(hr == tests[i].hr || broken(hr == DDERR_INVALIDPARAMS), "Pixelformat %s, test %d returned %08x\n", formats[j].name, i, hr); i is unsigned, print it with %u. > + hr = IDirectDraw_CreateSurface(ddraw, &surfacedesc, &surface, NULL); > + ok(SUCCEEDED(hr), "CreateSurface returned %08x\n", hr); > + > + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surfacedesc); > + ok(SUCCEEDED(hr), "GetSurfaceDesc returned %x\n", hr); Please be consistent with the format you use. Tests added in recent years use %#x, I recommend to use this. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUVkaEAAoJEN0/YqbEcdMwPVoQAJTppEl15dBZ6uVCBmOYEzbg W5GYcDfdjv9/j4S6cVyHh0wKQF7eoHBdVelF8IvE47rBGBoe63YZnOuozEN1JPNL 7buCVNBof+1WytRAZacIyu9O4Vbs2bLXgGlGqo4T0baQbQMKoH/gQnyEXcxmJR6s egElATCH1RvInllwuIPbtSr+RcmH+m8Tk9LRzHNU6gKcXNwdNv1iicQaD+wF3S2F +iG7va1Sy6ubeDHEX8CE3EMhHyFmcZZlsqk2G6AVJcj914+I8VNua69XVCujkdaH atkZQ1bS8HQ9nzfrc+X7G5CI6ZsGfO2UA8mtjl1rf8OzoCgCZ8lZmjdhgD40iQVX boFXmsFGMZAYDVxu/aUX2qD4NtBkE4TlF9JVy8UA0QMWd1DN1SyjO77lp6197VGV bAaDhjID8bUyaTc6m314eOiKMuM+2Nyt6aGwT87uyTffKCM2Eyt692tB3xWH6IqT nJpctMa724qOoAmRL5jca99uDTrn6iKkUa7m8hMXgRQEjyQvd9fm+wbNmRrxGfmA 59IwxFHF5IKTsQVbkDaLvXfU2n9ubvA0cyXRFAP1YLI9pDKq1/I3ORmToYIJ0D6O k7AqX0/7nrnu0uJEDhP3/AsTMs2Ldvh1MavNxUIWOcDK4PCc/Ga9PBc6ubX4FQGI i3iQC8eR0aQrlYAr5lvj =6YE6 -----END PGP SIGNATURE-----

1 0

Re: [PATCH] cmd/tests: Add tests for 'del' (Fixes bug 35970)
by Marvin Nov. 2, 2014

Nov. 2, 2014

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=9945 Your paranoid android. === wxppro (32 bit) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 689 (got 'Got unexpected result: "C:\Documents"', wanted 'Plain directory enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 690 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 691 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 692 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 693 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted 'Mixed enumeration from provided root') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 694 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted 'With duplicates enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 695 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted 'Strip missing wildcards, keep unwildcarded names') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 696 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted 'for /R passed') batch.c:312: Test failed: unexpected char 0x50 position 0 in line 697 (got 'Plain directory enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 698 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 699 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 700 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 701 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 702 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 703 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 704 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 705 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 706 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 707 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 708 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 709 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 710 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 711 (got 'File enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 712 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 713 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 714 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 715 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 716 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 717 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 718 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 719 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 720 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 721 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 722 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 723 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 724 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 725 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 726 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 727 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 728 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 729 (got 'Mixed enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 730 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 731 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 732 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 733 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 734 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 735 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 736 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 737 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 738 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 739 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 740 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 741 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 742 (got 'With duplicates enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 743 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 744 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 745 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 746 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 747 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 748 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 749 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 750 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 751 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 752 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 753 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 754 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 755 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 756 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 757 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 758 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 759 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 760 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 761 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 762 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 763 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 764 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 765 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 766 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 767 (got 'Strip missing wildcards, keep unwildcarded names', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 768 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 769 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 770 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 771 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 772 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 773 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 774 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 775 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 776 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 777 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 778 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 779 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x66 position 0 in line 780 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1368 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1369 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1370 (got 'C:\Documents and Settings\winetest\My Documents\foobar\foodir2', wanted '@drive@@path(a)foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1371 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1372 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1373 (got '--- Extra endlocal in called batch', wanted '@drive@@path(a)foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1374 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1375 (got '--- Extra endlocal in called batch', wanted '@drive@@path(a)foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1377 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1380 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1381 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted '@drive@@path(a)foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1382 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1383 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1384 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path(a)foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1385 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1386 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path(a)foobar') === wvistau64 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'') === w8 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--------'', wanted ''--a------'@or_broken@'%~ai'') === wvistau64 (64 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'')

2 1

Re: [2/2] oleaut32: Implement TLB dependencies lookup in resources (resend 3 - last submit before abandon)
by Guillaume Charifi Nov. 1, 2014

Nov. 1, 2014

Thanks a lot for your reply, I have nothing to add, so I'm about to submit just your fixed version.Thanks to Alexander and Andrew too.

1 0

Re: [2/2] oleaut32: Implement TLB dependencies lookup in resources (resend 3 - last submit before abandon)
by Sebastian Lackner Nov. 1, 2014

Nov. 1, 2014

I had this patch on my list for a couple of weeks, and finally had time to take a closer look. There were still a lot of issues. I've listed them below, and have also added a fixed version to our staging tree: https://github.com/wine-compholio/wine-staging/blob/master/patches/oleaut32… Feel free to integrate my changes and resubmit if you like. On 27.09.2014 20:10, Guillaume Charifi wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=34184 > > This is the last time without a review before I give up. > > --- dlls/oleaut32/tests/typelib.c | 2 +- > dlls/oleaut32/typelib.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- > 2 files changed, 103 insertions(+), 10 deletions(-) > > >diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c >index cb5bc23..99e2aedd 100644 >--- a/dlls/oleaut32/tests/typelib.c >+++ b/dlls/oleaut32/tests/typelib.c >@@ -5595,7 +5595,7 @@ static void test_dep(void) { > ok(hr == S_OK, "got: %x\n", hr); > > hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); >- todo_wine ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); >+ ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); > > ITypeInfo_Release(ptInfo); > if(ptInfoExt) >diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c >index 48b171b..d895696 100644 >--- a/dlls/oleaut32/typelib.c >+++ b/dlls/oleaut32/typelib.c >@@ -7572,6 +7572,84 @@ static HRESULT ITypeInfoImpl_GetDispatchRefTypeInfo( ITypeInfo *iface, > return E_FAIL; > } > >+struct search_res_tlb_param { >+ GUID *guid; GUID should be const. >+ ITypeLib *pTLib; >+ HRESULT result; >+}; There is no need to store 'result' here. If the lookup fails the result is not used anyway. Comparing pTlib != NULL should be sufficient. >+ >+static BOOL CALLBACK search_res_tlb(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszIntName, LONG_PTR lParam) >+{ >+ struct search_res_tlb_param *This = (LPVOID)lParam; >+ >+ HRESULT ret; >+ >+ static WCHAR resFormatStrW[] = {'\\','%','d',0}; Should be const. >+ WCHAR szPath[MAX_PATH]; >+ WCHAR szTLBPath[MAX_PATH]; >+ WCHAR szStringName[12]; >+ LPVOID pBase = NULL; >+ DWORD dwTLBLength = 0; >+ IUnknown *pFile = NULL; >+ ITypeLib2 *pTLib = NULL; >+ RPC_STATUS rpc_stat; >+ >+ This->pTLib = NULL; >+ This->result = E_FAIL; >+ >+ if(IS_INTRESOURCE(lpszIntName) == FALSE) >+ return TRUE; >+ >+ GetModuleFileNameW(hModule, szPath, MAX_PATH); Missing error checks. >+ >+ strcpyW(szTLBPath, szPath); >+ snprintfW(szStringName, sizeof(szStringName)/sizeof(WCHAR), resFormatStrW, PtrToInt(lpszIntName)); >+ strcatW(szTLBPath, szStringName); Here also missing error checks. Moreover copying the data all the time is a bit ugly. >+ >+ ret = TLB_PEFile_Open(szPath, PtrToInt(lpszIntName), &pBase, &dwTLBLength, &pFile); >+ if (ret == TYPE_E_CANTLOADLIBRARY) >+ ret = TLB_NEFile_Open(szPath, PtrToInt(lpszIntName), &pBase, &dwTLBLength, &pFile); >+ if (ret == TYPE_E_CANTLOADLIBRARY) >+ ret = TLB_Mapping_Open(szPath, &pBase, &dwTLBLength, &pFile); >+ if (SUCCEEDED(ret)) >+ { >+ if (dwTLBLength >= 4) >+ { >+ DWORD dwSignature = FromLEDWord(*((DWORD*) pBase)); >+ if (dwSignature == MSFT_SIGNATURE) >+ pTLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength); >+ else if (dwSignature == SLTG_SIGNATURE) >+ pTLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); >+ else >+ { >+ FIXME("Header type magic 0x%08x not supported.\n", dwSignature); >+ ret = E_FAIL; >+ } >+ } >+ else >+ ret = E_FAIL; >+ IUnknown_Release(pFile); >+ } As already pointed out by Alexandre, this whole block is duplicated, although that is not really necessary. You can just call existing functions to load the typelib, SearchPathW will have no influence when its an absolute path. >+ >+ if(pTLib) { >+ ITypeLibImpl *impl = impl_from_ITypeLib2(pTLib); >+ ret = UuidEqual((UUID *)This->guid, (UUID *)TLB_get_guid_null(impl->guid), &rpc_stat); Why casting and using this API? The rest of the file uses IsEqualGUID. This also allows to get rid of the dummy rpc_stat variable. Moreover you are storing a BOOL value in a HRESULT variable. >+ ITypeLib_Release((ITypeLib *)pTLib); >+ >+ ret = (ret == TRUE) ? LoadTypeLibEx(szTLBPath, REGKIND_NONE, (ITypeLib **)&pTLib) : E_FAIL; That is especially ugly, because you free the library, just to load it again immediately afterwards. I don't think there is any good reason to do that, correct me if I'm wrong. >+ } >+ >+ This->result = ret; >+ >+ if(SUCCEEDED(ret)) { >+ /* If found, stop to enumerate */ >+ This->pTLib = (ITypeLib *)pTLib; >+ return FALSE; >+ } >+ >+ return TRUE; >+} >+ > /* ITypeInfo::GetRefTypeInfo > * > * If a type description references other type descriptions, it retrieves >@@ -7665,20 +7743,35 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( > ITypeLib_AddRef(pTLib); > result = S_OK; > } else { >+ static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; >+ struct search_res_tlb_param param; > BSTR libnam; > > TRACE("typeinfo in imported typelib that isn't already loaded\n"); > >- result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), >- ref_type->pImpTLInfo->wVersionMajor, >- ref_type->pImpTLInfo->wVersionMinor, >- This->pTypeLib->syskind, >- ref_type->pImpTLInfo->lcid, &libnam, TRUE); >- if(FAILED(result)) >- libnam = SysAllocString(ref_type->pImpTLInfo->name); >+ /* Search in resource table */ >+ param.guid = (GUID *)TLB_get_guid_null(ref_type->pImpTLInfo->guid); You are casting away the const here. Normally there is no cast required at all. >+ param.pTLib = NULL; >+ param.result = E_FAIL; >+ >+ EnumResourceNamesW(NULL, TYPELIBW, search_res_tlb, (LONG_PTR)&param); >+ >+ pTLib = param.pTLib; >+ result = param.result; > >- result = LoadTypeLib(libnam, &pTLib); >- SysFreeString(libnam); >+ /* Search on disk */ >+ if(FAILED(result)) { >+ result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), >+ ref_type->pImpTLInfo->wVersionMajor, >+ ref_type->pImpTLInfo->wVersionMinor, >+ This->pTypeLib->syskind, >+ ref_type->pImpTLInfo->lcid, &libnam, TRUE); >+ if(FAILED(result)) >+ libnam = SysAllocString(ref_type->pImpTLInfo->name); >+ >+ result = LoadTypeLib(libnam, &pTLib); >+ SysFreeString(libnam); >+ } > > if(SUCCEEDED(result)) { > ref_type->pImpTLInfo->pImpTypeLib = impl_from_ITypeLib(pTLib);

1 0