- wine-devel - winehq.org

Re: secur32/test: Switch requested protocol from SSL3 to TLS1.
by Marvin 20 Oct '14

20 Oct '14

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

1 0

Re: [PATCH] vbscript: Implemented String
by Piotr Caban 20 Oct '14

20 Oct '14

On 10/19/14 17:44, Shuai Meng wrote: > + newstr = SysAllocStringLen(NULL, 1023); You need to allocate correct length string. First argument should be used here. You're also leaking the string in error-handling paths. > + > + switch(V_VT(arg + 1)) { > + case VT_NULL: > + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); > + case VT_BSTR: > + str = V_BSTR(arg + 1); > + break; > + case VT_ARRAY|VT_BYREF|VT_VARIANT: > + return DISP_E_TYPEMISMATCH; > + default: > + hres = to_short(arg + 1, &tmp); > + if(FAILED(hres)) > + return hres; > + str[0] = (char)tmp; Please add a test with second argument larger then 256. It would be also interesting to see a test with second argument being BSTR with first character out of ASCII range. Please also check what happens if V_BSTR(arg+1)==NULL. > + hres = to_short(arg, &len); > + if(FAILED(hres)) > + return hres; > + if(len < 0) > + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); > + else if(len == 0) > + newstr = '\0'; > + else if(len > 1023) > + len = 1023; I guess that first argument is probably an integer. The length of produced string is probably also not limited to 1023 characters. Thanks, Piotr

2 1

Re: [v5 03/12] reg.exe: Add REG_MULTI_SZ tests for reg add
by Stefan Dösinger 20 Oct '14

20 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-17 20:38, schrieb Jonathan Vollebregt: > + /* REG_MULTI_SZ */ > + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + memcpy(buffer, "three", 6); > + memcpy(buffer+6, "little", 7); > + memcpy(buffer+6+7, "strings", 8); > + buffer[21] = 0; > + verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); I think this shoudl work as well: const char buffer[] = "three\0little\0strings\0"; verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, sizeof(buffer), TODO_REG_SIZE); Notice the [] to declare an array so sizeof returns the proper value. strlen will not work. > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#randomgibberish\" /d \"three#little#strings\" /f", &r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"\" /d \"three#little#strings\" /f", &r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"##\" /f", &r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"two##strings\" /f", &r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"#a\" /f", &r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); What about the following cases? /s ABC /d threeABClittleABCstrings /s \\0 /d three\\0little\\0strings -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJURR9NAAoJEN0/YqbEcdMw/6UP/Rs7diy+TUkZDbJq2x3JyZYZ c+YK2Z9PoWNs3oTvwvVtaxrVqSX1y0fVnGEpNixGEMbo5fae7/rm9fN5WqvI+1FW RWG0ViCpJ4EduNVhORtHmMGzhqQAAGlfuEF0fthSshynaD8MirwPMW5LzBVTK/A8 zhI0wvveQElhscEoYtaZOkuI5WZzzKnjGpuGtserx31B41ClASEpR/MiU4XJD78p OvqaPotzlbQermrte9B+ZWcxjjVyrsM2fToVbXMNhtBDyDy17uG1Lpr8lQrXL85J uFYpVFiYoRf7CCHrhY2Gx8H7AsHwc8W0LDlnvlIKk6yRWnzyQuSzQJVbFNzBAy9u wBlQ6kZjMJzvaGCk9el5MXiwgN6Vs2bHa3j/8qvrzQyaGNebiZA7QLaXUXOqXpb6 De6/ev8iyTD1cyFwVootQBAsb40HKBk24ZwmP0sp+j3seJUlzR37ve/R71avexWL uheZ9Xj5xeBm0G3JJQ3C0cxUYo+f22t9gDLbKtOa+5BcRskjtmgHjEHEzZs33T8F BcXhGtAyL99XwXh73ILHg321pjkTu1sWzd9ILigVz6mYmOJzZp/L4Azy6E3W/U7j GHkT46Ag7/aUN4BTR5MieySdFtAQ9pbdYI1FRMBINie2Ny9AC71UrDYtFpNQuzaN C4BbMES4ZXNJQuGSHs33 =iJxu -----END PGP SIGNATURE-----

2 2

Re: [v5 01/12] reg.exe: Fix wrong error message in reg add DWORD test
by Stefan Dösinger 20 Oct '14

20 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-17 20:38, schrieb Jonathan Vollebregt: > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD /f", &r); > todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), > - "got exit code %d, expected 0\n", r); > + "got exit code %d, expected 1\n", r); r is a DWORD, which is an unsigned value, so %u is the correct format to print it. There's not much point in printing the expected value. One can look it up by looking at the source file. Having the expected value twice only asks for inconsistencies like the one you're fixing here. If you want to print the expected value I'd prefer something like this: todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); or maybe todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected REG_EXIT_SUCCESS(%d)\n", r, REG_EXIT_SUCCESS); That way you don't hardcode the numerical value of REG_EXIT_SUCCESS. I recommend sending smaller patchsets, e.g. in your case send the tests, and once they are in, send the implementation changes. The tests make sense on their own, and that way you don't flood wine-patches too much. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJURSKoAAoJEN0/YqbEcdMwgVsP/0rEoBVYlB3zoP979b5q4Wbw U0Y+ilARyJ4vAoeVKlJtQ8xLxg2Mej6vYvCx5fve6cq6pokUbfrHBpEgBNsjx7gq AI88t8CSDYnpFBGpDYRVDdwq5enLP0cJKOZHb7pVIR5+1JIbDW/RxA3eLGmbvLsE EU8nGiSEzYuRwKMy4XfuMFCG1oPRIzg2WO+8ckneJ+P2ZYDmNVWv1sxcuitAm7Lr g6pq5CwN1Y1agzPHd45W10/hPTnD9ViqaSQgHIpXs47urElL6z1nRb3bgwKAVeBf 9KA9qm12F+zqNoEc9cTHPdnjjOHM7LgQFTmWJDNdZSiXDKMvqZAldRkuI2cAp4jX tRFYSeUlNk3KDLnJ5msINwRklatovSBbUizHY/D+YhCJVU1aRIKsebJ0zOFrVoUp 2UBbtfBembEOr917aXngNlpZzKPbwPGpm+wyBum7q8OU19CN5X8/WqXZVhms3QAU bchyP9EnX6SjnHiZn4XE0gC8ABj5LeS24/Zgtfm/T19FT7NL00U49pis+F8RMim8 kthoNp2YO+rpzcvQjaWvBMQlCtecpZx2f9b9x/lfAxd+fMVDGjsVxFcp5V7OipJG 1pdISvYtwOqrlgqiy1Bm4q9vX47y+qDmM1NnAvfBcDkkE/hk+QaCQo+MjAW1W/Bm 7DS30tdCw2E6+XWdk/Du =Xz8b -----END PGP SIGNATURE-----

1 0

Re: [v5 02/12] reg.exe: Add REG_EXPAND_SZ tests for reg add
by Stefan Dösinger 20 Oct '14

20 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-17 20:38, schrieb Jonathan Vollebregt: > + /* REG_EXPAND_SZ */ > + run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15, TODO_REG_SIZE); Is there really no observable difference between REG_SZ and REG_EXPAND_SZ? The MSDN description suggests that the behavior you observe here is correct, but I wonder what REG_EXPAND_SZ is good for in this case, other than just an elaborate way to set a flag that says "please call ExpandEnvironmentStrings". -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJURRrSAAoJEN0/YqbEcdMwsFMP/0KQ0ZQxOe5pwDcAX2h2B1tI peMiCJsmb8AwNru1qNjfwEZ/cU5Y7JvDmue3AQqkHKenkyyu5dYw1ItWmsTYW1z/ mRqK7R7/v6frRzPr1iMT4+8MKYVuiPxkgCPHQsMWQGfYBhLk3xVLq/ev64+paLw3 09GjgVWY5JS+vChI+4WX8T0+WS0mmmnbp/+QZb/z3jfNZvYEDXaNFmkITwROfaif ftuYS5VJL70UUxHvHcx6ctcexwnga0ka+voCVFRK/yALLesTB01+eYkn9bgVYVPl O4UC3INvMJsfdDd3KhFJSh/RZBHKn/4TyKQDu0DZDeMJMx/l8Q22TxsutsR5de+L BLQhrxzHVirrBkBrOwc5GCrpdBU0NpQX8mBW/E9kISzFlCHbtWa97F2gqCw6rnaA BU3430R+6aolQ3E47y4CdMZA5I7sIbTa5EdXJdkshExuMDS1V8xph2N/JCttzNPh QczIL7NAHekm+5W/DvuC4wx9jajmiQ/ol4Jr140h48SaEKL97/tWkoXTF/UmtqPi k7kaY3zqTNUyrLAQxarERVy3tZkicRMimvTCLbAFTZ4g86JgU9vjNYRbdbGS/fwr e0bsk8k3C1vtARYi+pYIbHQaQrzAE+/dR3caMVsXf08PTfituRQjlCqgb637Uf43 5iX8bhy6U/mdi9xIUn5W =7z6c -----END PGP SIGNATURE-----

1 0

Re: [PATCH 6/6] d3d8/tests: Use create_device in test_swvp_buffer.
by Marvin 20 Oct '14

20 Oct '14

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=9637 Your paranoid android. === w8 (32 bit device) === device.c:2438: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3142: Test failed: Expected wndproc 0x412ae0, got 0x412ae0.

1 0

Re: [PATCH 5/6] d3d8/tests: Use create_device for test_fpu_setup.
by Marvin 20 Oct '14

20 Oct '14

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=9636 Your paranoid android. === w8 (32 bit device) === device.c:2435: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3139: Test failed: Expected wndproc 0x412b30, got 0x412b30.

1 0

Re: [PATCH 4/6] d3d8/tests: Update create_device to match d3d9.
by Marvin 20 Oct '14

20 Oct '14

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=9635 Your paranoid android. === w8 (32 bit device) === device.c:2423: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3130: Test failed: Expected wndproc 0x412e30, got 0x412e30.

1 0

Re: comctl32: Use strcmpW instead of pointer comparison to ensure treeview updates correctly
by Nikolay Sivov 19 Oct '14

19 Oct '14

On 10/19/2014 20:01, Dan Bassi wrote: > Hi Nikolay. In uTorrent, the Treeview box on the left doesn't update > under Wine unless the box is clicked (whereas under Windows, it > updates automatically without clicking). > > I later traced the error to the "item_changed()" function in > comctl32/treeview.c, which was (incorrectly) detecting the text as > never having changed. This patch seems to fix that behaviour. > > Please let me know your thoughts. Many thanks. What I mean is that we need more tests in comctl32/tests/treeview.c to prove that patch is correct. The fact that it fixes some case with some application is not enough. > > On Sun, Oct 19, 2014 at 4:49 PM, Nikolay Sivov <bunglehead(a)gmail.com > <mailto:bunglehead@gmail.com>> wrote: > > On 10/19/2014 18:44, Dan Bassi wrote: > > + /* Old text is a null pointer due to HeapAlloc() failing, > therefore unable to perform strcmpW so assume text has changed */ > + if (!tiOld->pszText) > + return TRUE; > + > > I don't think you should necessary assume it's changed. > > /* Text has changed and it's not a callback */ > - if ((tvChange->mask & TVIF_TEXT) && (tiOld->pszText != > tiNew->pszText) && > + if ((tvChange->mask & TVIF_TEXT) && > (strcmpW(tiOld->pszText, tiNew->pszText) != 0) && > tiNew->pszText != LPSTR_TEXTCALLBACKW) > return TRUE; > > This is wrong, you can't compare if it's a special callback value. > > + originalItem.pszText = HeapAlloc(GetProcessHeap(), 0, > originalItem.cchTextMax * sizeof(WCHAR)); > > Normally comctl32 code uses Alloc()/Free() functions. > > This patch needs tests first, those tests should cover all > possible combinations regarding callback cases, different pointers > but same data, > same data but different pointers, maybe something else. > > >

1 0

Re: [PATCH] vbscript: Implemented String
by Marvin 19 Oct '14

19 Oct '14

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

1 0

Re: comctl32: Use strcmpW instead of pointer comparison to ensure treeview updates correctly
by Nikolay Sivov 19 Oct '14

19 Oct '14

On 10/19/2014 18:44, Dan Bassi wrote: > + /* Old text is a null pointer due to HeapAlloc() failing, therefore unable to perform strcmpW so assume text has changed */ > + if (!tiOld->pszText) > + return TRUE; > + I don't think you should necessary assume it's changed. > /* Text has changed and it's not a callback */ > - if ((tvChange->mask & TVIF_TEXT) && (tiOld->pszText != tiNew->pszText) && > + if ((tvChange->mask & TVIF_TEXT) && (strcmpW(tiOld->pszText, tiNew->pszText) != 0) && > tiNew->pszText != LPSTR_TEXTCALLBACKW) > return TRUE; This is wrong, you can't compare if it's a special callback value. > + originalItem.pszText = HeapAlloc(GetProcessHeap(), 0, originalItem.cchTextMax * sizeof(WCHAR)); Normally comctl32 code uses Alloc()/Free() functions. This patch needs tests first, those tests should cover all possible combinations regarding callback cases, different pointers but same data, same data but different pointers, maybe something else.

1 0

Re: wined3d: Correctly display fog for right-handed projection matrix (try 7)
by Stefan Dösinger 18 Oct '14

18 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, This one looks good to me. Am 2014-10-12 17:08, schrieb Joachim Priesner: > + enum > + { > + COLOR_ALPHA_0x00 = 0x00000000, > + COLOR_CLEAR = 0xffff00ff, > + COLOR_FOGGED = 0x0000ff00, > + COLOR_UNFOGGED = 0x00ff0000 > + }; > + > + /* Fill the null-shader entry with the FVF (SetVertexShader is "overloaded" on d3d8). */ > + DWORD vertex_shader[3] = {D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, 0, 0}; Do you need the specular color on Windows as well, or to make this work right on Wine? I suspect that the NONE/NONE test doesn't work right on Wine because we do not set a controlled fog coordinate in wined3d/state.c, load_vertex_data(), in the case where WINED3D_FFP_SPECULAR is absent and similarly in drawprim.c, drawStridedSlow(). In either case that's no reason to hold up this patch any longer IMHO. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOp0lAAoJEN0/YqbEcdMwgD4P/iLeSfFbE/jEsJ+Yux1lR9PC FDoJ50dxiedieOJWl4TbvIgr5uNyXnBm9YtPiiLgZJNfwoJ2znYjYDsA4h2yZ8FU lrgHwWcAo1ZvlPS0QolSYfx7QH4TpGIKklfEr7Qe4LQgftJjHNGioDuK1zpT+E3e JjcZOXDKjOP4ACNu5awEBq9v427TxOT9E+GJQWrq/cxbCYRbDurFwuFS2Jb1o/j+ 9zEoy8qiaQ+6v0j8+RcAkBTMdg6DBwSOYsH7P/KjrnzUkj+yH1w+R9dcnHMdaeMP RRoJSLsGzfANXF05vn7vE5Q5QzOjhXtIWWL/yun/IAL/EofZrXyVikoGP28wxUV1 QBICfDUvel4dhnYxNzNGUMQXC7gaXmJI3q12gemhkX4vj2W/FxVIaSN7vr5j+5rp 2ijdi9rexyBopbDM/9ay599GSNjXrTljkv8sEH23JMIpKR2BP7afyih6Hta9e/zf Ao9LtFwyBye2F9HTyM9G10MBrnVdNIKhJ9ZY30bRhomtXrfP1HuRvvpfRPja9gjZ M/aiwqPM6a3vfdJ/kIOra72vNZAoE9ccEOuDPQqMhg2ccoYvLUg6+LGvKRLanmOO lCsKiFYUChwJlebbo98+bfhMiR7TBI5fkwXOxR4coDu9jIl1oP2GblaL5Sul+zg1 rXbnkL2Pltlb/ZaW33l0 =Ozzv -----END PGP SIGNATURE-----

3 6

Re: [PATCH 1/3] kernel32: Support UTF-7 in MultiByteToWideChar. (try 3)
by Michael Stefaniuc 17 Oct '14

17 Oct '14

Hello Alex, I'll have a go at reviewing your patches as Alexandre didn't take them as is. On 10/13/2014 05:54 AM, Alex Henrie wrote: > --- a/dlls/kernel32/locale.c > +++ b/dlls/kernel32/locale.c I'm pulling this diff chunk to the front as it is wrong and some of your code is over-complicated based on that assumption. > @@ -1963,7 +2119,7 @@ BOOL WINAPI EnumSystemCodePagesW( CODEPAGE_ENUMPROCW lpfnCodePageEnum, DWORD fla > * flags [I] Character mapping flags > * src [I] Source string buffer > * srclen [I] Length of src (in bytes), or -1 if src is NUL terminated > - * dst [O] Destination buffer > + * dst [O] Destination buffer, or NULL to compute the required length > * dstlen [I] Length of dst (in WCHARs), or 0 to compute the required length The only case where dst == NULL is when dstlen == 0 but that already implies computing the required length. dst == NULL and dstlen != 0 is an error and MultiByteToWideChar() bails out. > @@ -1954,6 +1954,162 @@ BOOL WINAPI EnumSystemCodePagesW( CODEPAGE_ENUMPROCW lpfnCodePageEnum, DWORD fla > > > /*********************************************************************** > + * write_to_w_string > + * > + * Helper for utf7_mbstowcs > + * > + * RETURNS > + * TRUE on success, FALSE on error > + */ > +static inline BOOL write_to_w_string(WCHAR *dst, int dstlen, int *index, WCHAR character) This isn't a good name for the helper as that's not what it does. It is more a "count and optionally write". Also prefixing it utf7 would make it clear that is just a helper for utf7_mbstowcs and not a generic function and thus would remove the need for the comment that it is just a helper for utf7_mbstowcs. I know you're using this helper to avoid code duplication between the length calculation and the conversion unlike wine_utf8_mbstowcs(). But it complicates the handling of available space in dst. Without seeing the code for both approaches I'm not sure what is best so I'll review it as is. > +{ > + if (dst) You have to force dst = NULL in utf7_mbstowcs() for this to work. Just checking for dstlen > 0 should avoid that. > + { > + if (*index >= dstlen) > + return FALSE; > + > + dst[*index] = character; > + } > + > + (*index)++; > + > + return TRUE; > +} > + > +/*********************************************************************** > + * utf7_mbstowcs > + * > + * UTF-7 to UTF-16 string conversion, helper for MultiByteToWideChar > + * > + * RETURNS > + * On success, the number of characters written > + * On dst buffer overflow, -1 What about the case where it fails to decode a character? E.g. wine_utf8_mbstowcs() has -2 for that case which then translates to SetLastError(ERROR_NO_UNICODE_TRANSLATION). I looked at the tests but you didn't seem to test the GetLastError in the cases with the invalid input characters. > + */ > +static int utf7_mbstowcs(const char *src, int srclen, WCHAR *dst, int dstlen) > +{ > + static const WCHAR base64_decoding_table[] = { Why is this table an array of WCHAR? The entries aren't WCHARs. > + /* \0 */ -1, /* \x01 */ -1, /* \x02 */ -1, /* \x03 */ -1, This table is really hard to read even in a editor that does syntax highlighting. As you just need 4 characters per column you could have sixteen columns and merge the comments to one comment at the end of the line. Something like this would be more readable as well as being more compact: -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00 - 0x15 */ .... /* '0' - '?' */ > + /* \x04 */ -1, /* \x05 */ -1, /* \x06 */ -1, /* \a */ -1, > + /* \b */ -1, /* \t */ -1, /* \n */ -1, /* \v */ -1, > + /* \f */ -1, /* \r */ -1, /* \x0E */ -1, /* \x0F */ -1, > + /* \x10 */ -1, /* \x11 */ -1, /* \x12 */ -1, /* \x13 */ -1, > + /* \x14 */ -1, /* \x15 */ -1, /* \x16 */ -1, /* \x17 */ -1, > + /* \x18 */ -1, /* \x19 */ -1, /* \x1A */ -1, /* \e */ -1, > + /* \x1C */ -1, /* \x1D */ -1, /* \x1E */ -1, /* \x1F */ -1, > + /* */ -1, /* ! */ -1, /* " */ -1, /* # */ -1, > + /* $ */ -1, /* % */ -1, /* & */ -1, /* ' */ -1, > + /* ( */ -1, /* ) */ -1, /* * */ -1, /* + */ 62, > + /* , */ -1, /* - */ -1, /* . */ -1, /* / */ 63, > + /* 0 */ 52, /* 1 */ 53, /* 2 */ 54, /* 3 */ 55, > + /* 4 */ 56, /* 5 */ 57, /* 6 */ 58, /* 7 */ 59, > + /* 8 */ 60, /* 9 */ 61, /* : */ -1, /* ; */ -1, > + /* < */ -1, /* = */ -1, /* > */ -1, /* ? */ -1, > + /* @ */ -1, /* A */ 0, /* B */ 1, /* C */ 2, > + /* D */ 3, /* E */ 4, /* F */ 5, /* G */ 6, > + /* H */ 7, /* I */ 8, /* J */ 9, /* K */ 10, > + /* L */ 11, /* M */ 12, /* N */ 13, /* O */ 14, > + /* P */ 15, /* Q */ 16, /* R */ 17, /* S */ 18, > + /* T */ 19, /* U */ 20, /* V */ 21, /* W */ 22, > + /* X */ 23, /* Y */ 24, /* Z */ 25, /* [ */ -1, > + /* \ */ -1, /* ] */ -1, /* ^ */ -1, /* _ */ -1, > + /* ` */ -1, /* a */ 26, /* b */ 27, /* c */ 28, > + /* d */ 29, /* e */ 30, /* f */ 31, /* g */ 32, > + /* h */ 33, /* i */ 34, /* j */ 35, /* k */ 36, > + /* l */ 37, /* m */ 38, /* n */ 39, /* o */ 40, > + /* p */ 41, /* q */ 42, /* r */ 43, /* s */ 44, > + /* t */ 45, /* u */ 46, /* v */ 47, /* w */ 48, > + /* x */ 49, /* y */ 50, /* z */ 51, /* { */ -1, > + /* | */ -1, /* } */ -1, /* ~ */ -1, /* \x7F */ -1 > + }; > + > + const char *source_end = src + srclen; > + int dest_index = 0; > + > + DWORD byte_pair = 0; > + short offset = 0; > + > + /* MultiByteToWideChar guarantees that srclen > 0 */ > + assert(srclen > 0); This assert isn't needed. Just rewriting the first do..while loop to a while loop avoids it. That eliminates 3 lines of code of which one is a comment pointing to an unneeded assert. > + > + if (!dstlen) > + dst = NULL; Unneeded if the helper just checks for dstlen > 0. > + > + do Should be just "while (src < source_end)" to avoid the assert from above. > + { > + if (*src == '+') > + { > + src++; /* skip the + sign */ > + if (src >= source_end) > + break; > + > + if (*src == '-') > + { > + /* just a plus sign escaped as +- */ > + if (!write_to_w_string(dst, dstlen, &dest_index, '+')) > + return -1; > + src++; > + continue; > + } > + > + do > + { > + WCHAR sextet = *src; Same as for base64_decoding_table, sextet is not a WCHAR. > + if (sextet == '-') > + { > + /* skip over the dash and end base64 decoding */ > + /* the current, unfinished byte pair is discarded */ > + src++; > + offset = 0; > + break; > + } > + else if (sextet <= 127) > + { > + sextet = base64_decoding_table[sextet]; > + if (sextet == (WCHAR)-1) Unneeded cast. Using a signed type for sextet also avoids the -Wsign-compare compiler warning. Alternatively use ~0 instead of -1 if you want to keep an unsigned type. > + { > + /* -1 means that the next character of src is not part of a base64 sequence */ This upper part of the comment is better placed in the declaration of base64_decoding_table. > + /* in other words, all sextets in this base64 sequence have been processed */ > + /* the current, unfinished byte pair is discarded */ > + offset = 0; > + break; > + } > + } > + else > + { > + /* the next character of src is > 127 and therefore not part of a base64 sequence */ > + /* the current, unfinished byte pair is NOT discarded in this case */ > + /* this is probably a bug in Windows */ > + break; > + } > + > + byte_pair = (byte_pair << 6) | sextet; > + offset += 6; > + > + if (offset >= 16) > + { > + /* this byte pair is done */ > + if (!write_to_w_string(dst, dstlen, &dest_index, (byte_pair >> (offset - 16)) & 0xFFFF)) > + return -1; > + offset -= 16; > + } > + > + /* this sextet is done */ > + src++; > + } while (src < source_end); > + } > + else > + { > + /* we have to convert to unsigned char in case *src > 127 */ > + if (!write_to_w_string(dst, dstlen, &dest_index, (unsigned char)*src)) > + return -1; > + src++; > + } > + } while (src < source_end); > + > + return dest_index; > +} > + > +/*********************************************************************** > * MultiByteToWideChar (KERNEL32.@) > * > * Convert a multibyte character string into a Unicode string. bye michael

3 7

reg.exe platform specific test?
by Jonathan Vollebregt 17 Oct '14

17 Oct '14

In the reg.exe tests around line 181: > verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), > (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); What's the reason for this? Is there some platform specific quirk I should be aware of?

4 4

Re: Italian translation of Wine
by Matteo Bruni 17 Oct '14

17 Oct '14

2014-10-16 11:19 GMT+02:00 Davide Pizzetti <erpizzo(a)alice.it>: > This is an updated patch for the Italian translation of Wine. > Hi Davide, Please bear with me, but: @@ -30,7 +34,6 @@ msgid "&Install..." msgstr "&Installa..." #: appwiz.rc:65 -#, fuzzy #| msgid "" #| "The following software can be automatically removed. To remove a program " #| "or to modify its installed components, select it from the list and click " I still think you should remove those "#| msgid" lines when removing the fuzzy tags. If the program you're using to update the .po file doesn't help you with that, you might have to do it by hand by opening the .po file in a plain text editor. @@ -1682,11 +1682,11 @@ msgstr "Autenticazione del client" #: crypt32.rc:140 msgid "Code Signing" -msgstr "Firma codice" +msgstr "Firma del codice" #: crypt32.rc:141 msgid "Secure Email" -msgstr "Email sicura" +msgstr "E-mail sicura" #: crypt32.rc:142 msgid "Time Stamping" I don't like those changes, they seem mostly gratuitous to me (there are others similar instances below). If you're changing the "email" translation, make sure to be consistent. In general I'd avoid adding more stuff to this patch on each iteration, first get this patch in and then you can work on another one with more string translations. @@ -1834,7 +1834,7 @@ msgstr "Altro nome=" #: crypt32.rc:186 msgid "Email Address=" -msgstr "Indirizzo Email=" +msgstr "Indirizzo mail=" This looks wrong. @@ -2861,7 +2855,7 @@ msgstr "" #: cryptui.rc:127 msgid "Protects e-mail messages" -msgstr "Protegge messaggi e-mail" +msgstr "Protegge i messaggi mail" Same. @@ -4800,7 +4785,7 @@ msgstr "Nessuno spegnimento in corso.\n" #: winerror.mc:1381 msgid "I/O device error.\n" -msgstr "Errore I/O dell'unità.\n" +msgstr "Errore I/O del dispositiov.\n" #: winerror.mc:1386 This is still wrong. #: netstat.rc:48 msgid "Reset Connections" -msgstr "Connessione LAN" +msgstr "Resetta le connessioni" This means "Connessioni resettate". You can use "chiuse" instead, or probably even "annullate" as you wrote in another message translation. @@ -13103,7 +13080,7 @@ msgstr "Wine" #: wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." msgstr "" -"La configurazione di Wine in %s è in aggiornamento, aspetta un momento..." +"La configurazione di Wine in %s sta venendo aggiornata, aspetta un momento..." I prefer the previous translation.

3 4

Re: server: Fix invalid memory access when copying KeyNameInformation data.
by Austin English 17 Oct '14

17 Oct '14

On Thu, Oct 16, 2014 at 11:13 PM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=37411 for me. > > --- > server/registry.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Works here as well, thanks for the fix. -- -Austin

2 1

todo_wine under the hood
by Jonathan Vollebregt 17 Oct '14

17 Oct '14

I was looking at verify_reg_() in programs/reg/tests/reg.c:61 and noticed some simple if statements: > if (todo & TODO_REG_TYPE) > todo_wine lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); > else > lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); > if (todo & TODO_REG_SIZE) > todo_wine lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); > else > lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); > if (todo & TODO_REG_DATA) > todo_wine lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); > else > lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); Simple enough, except if I pass TODO_REG_TYPE to this function it never even tries the size or data blocks. While this makes sense to implement (You can't test the data if you don't know it's size) I have no idea *how* it does it. I've tried the obvious - the mask values don't overlap in a way that would cause it to fallthrough. The lok and todo_wine macros don't have anything in them that returns. In fact the todo_wine macro appears to start a loop for some reason and all in all I'm very confused as to how exactly it's doing this. I'm curious as to how this works under the hood. I also need to stick a broken() in there somewhere but every time I do it falls through, and I don't want to rewrite the entire verify_reg_() function for a single exception. (If you're interested, reg add a REG_BINARY with an odd number of characters prefixes a 0 nibble, but suffixes it in XP)

2 4

Re: [PATCH 3/5] d3d9/tests: Add style and size tests for D3DCREATE_NOWINDOWCHANGES.
by Henri Verbeet 17 Oct '14

17 Oct '14

On 16 October 2014 17:07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c > index 11fe091..34b967a 100644 > --- a/dlls/d3d9/tests/d3d9ex.c > +++ b/dlls/d3d9/tests/d3d9ex.c > @@ -37,6 +37,7 @@ struct device_desc > unsigned int width; > unsigned int height; > BOOL windowed; > + DWORD behavior_flags; > }; > I don't like this much, I'd probably prefer "windowed" and "behavior_flags" to be merged into a single flags field and then have flags along the lines of e.g. CREATE_DEVICE_FULLSCREEN, CREATE_DEVICE_NOWINDOWCHANGES, CREATE_DEVICE_SWVP_ONLY, etc.

2 1

Re: server: KeyNameInformation returns the full name of the key. (try 3)
by Austin English 16 Oct '14

16 Oct '14

On Mon, Oct 13, 2014 at 10:25 AM, Akihiro Sagawa <sagawa.aki(a)gmail.com> wrote: > Try 3: > - Avoid allocating memory. (Based on Alexandre's comment, thanks.) > - Use k != root_key instead of k->namelen != 0. > - Add insufficient buffer test. > > --- > dlls/ntdll/tests/reg.c | 19 ++++++++++++++----- > server/registry.c | 25 ++++++++++++++++++++++++- > 2 files changed, 38 insertions(+), 6 deletions(-) > Hi Akihiro, This change breaks the tests on my machine (causing wineserver to crash and the ntdll/reg test to fail), see https://bugs.winehq.org/show_bug.cgi?id=37411 Could you please take a look? Thanks, -Austin

1 1

Wine Gecko 2.34-beta2
by Jacek Caban 16 Oct '14

16 Oct '14

Hi all, I uploaded new beta2 Wine Gecko builds. I believe that it makes sense to have another beta this time, because beta1 was off the tip. This week Firefox 34 entered beta stage and I merged its changes made upstream meantime. To test it, use the attached patch or my Wine fork [1]. It should work out of box as soon as [2] is committed. Until then, you may download the package manually [3]. I will be mostly away next week. If all goes well, I will merge Mozilla beta and release new Wine Gecko in about two weeks. All testing is appreciated. If you find any regression, please let me know. Thanks, Jacek [1] http://repo.or.cz/w/wine/wine-gecko.git [2] http://source.winehq.org/patches/data/107093 [3] https://sourceforge.net/projects/wine/files/Wine%20Gecko/2.34-beta2/

1 0

d3d focus patches
by Stefan Dösinger 16 Oct '14

16 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi Matteo, I have attached the current state of my focus handling patches. They are more readable than the last ones and contain additional tests, but they're not finished yet. I hope they help with the gamma restore handling. I'd be interested to know if they pass for you on Windows. Especially d3d9ex has unreliable / buggy behavior on my Windows boxes. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUPtvBAAoJEN0/YqbEcdMw6JoP/jIUtgxta1SubRejbBz6lVS3 +CXS5WFNV8Kpc1fKpK6VRqs+HHNy7fH55zXAuw3KCzIarh7JPPjrgP2U4pSzuaHa fH2cWhysMbxK2tKRD0VHiZY696H/rpGgqFVwxusQuB/+Pzeqe7wpSOFOJ2QGUWqb GuAm4YFRfNdXaSQ94c4NBMU+a4N+TcXuI7YDus3WDcDIASAUnMs3i3NCmh/0IxI0 wrIfuY1szbVqI+qs6eGeN0TzTcRgEC9QHrevwdOyE7OsiN7z850wKX0k/zHxuHCl BazHk6JS0i0r3r9V+6NmUVCAqmplY93Kr04hHWxJDMWIilIxvVHs62m+wEBg+pDC LBTVlJhh28fPNAM6pPqrTUeAKnNGXwd+bevGrjl1035+qokKsj2VbIL6TnP2vDKo APORCXZ7INPp8c4EVIKHex60N2+Ec+Y8CWruUtn/UIJeMue2dgKxEq/FY5c4otWn Xu2OIUe/76cWG1tNxsTp6QhauYCW/JlteBKkyNnt/Wj/1I2LkQ8PxKEwNNCF9sbq +0oQIbLH0TRO5qU4uNAiKzPhFY4Sgy6RfMZpNpyQLSm0rT7bXeIb/EnF0Isklkaz t++UztQ/1A5ZjfeH235sPuyJ61YUTFgLfFG5swZcyZTdtTa0gymG4Ku9G1P018TU gwUbjaw/QqYKJsmEcjFK =Y/QI -----END PGP SIGNATURE-----

3 4

Re: [PATCH 2/5] d3d8/tests: Port the applicable parts of the new unsupported shaders tests to d3d8.
by Marvin 16 Oct '14

16 Oct '14

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=9559 Your paranoid android. === w8 (32 bit device) === device.c:2421: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3128: Test failed: Expected wndproc 0x412e30, got 0x412e30.

1 0

Re: [PATCH 1/5] d3d9/tests: Port the unsupported shaders test to D3D9Ex.
by Marvin 16 Oct '14

16 Oct '14

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=9558 Your paranoid android. === w8 (32 bit device) === device.c:2421: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3078: Test failed: Expected wndproc 0x412c60, got 0x412c60.

1 0

Re: Italian translation of Wine
by Matteo Bruni 15 Oct '14

15 Oct '14

2014-10-15 15:55 GMT+02:00 Davide Pizzetti <erpizzo(a)alice.it>: > This is the patch that improves the Italian translation of Wine. > Davide > Thank you for the translation! I do have some comments though. @@ -187,8 +188,8 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine non ha trovato un pacchetto Gecko, necessario ad applicazioni che " -"incorporano HTML per funzionare correttamente. Wine lo può scaricare e " +"Wine non è riuscito a trovare un pacchetto Mono, che è necessario ad " +"applicazioni .NET per funzionare correttamente. Wine lo può scaricare e " "ad" doesn't sound right. Maybe "per"? Or something like "per far sì che applicazioni .NET funzionino correttamente". @@ -868,7 +869,7 @@ msgstr "Il file non esiste" #: comdlg32.rc:40 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "La selezione contiene un oggetto non in una cartella" That's not what the original message means. I don't have a nice translation for it though... @@ -3579,33 +3570,30 @@ msgstr "Errore di sintassi" #: jscript.rc:37 msgid "Expected ';'" -msgstr "Richiesto ';'" +msgstr "Previsto ';'" I'd probably prefer "Atteso", here and in the other similar messages. @@ -3613,7 +3601,7 @@ msgstr "Costante stringa non terminata" #: jscript.rc:44 msgid "'return' statement outside of function" -msgstr "" +msgstr "dichiarazione 'return' al di fuori della funzione" A nitpick, but 'return' is not a declaration. I would simply go for "Istruzione". @@ -4785,10 +4769,9 @@ msgid "No Unicode translation.\n" msgstr "Nessuna traduzione Unicode.\n" #: winerror.mc:1366 -#, fuzzy #| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" -msgstr "Inizializzazione DLL fallita.\n" +msgstr "Inizializzazione del DLL fallita.\n" Another one that's probably arguable, but I prefer the previous translation here. If you really want to add the preposition, that clearly wants the feminine form - yeah I know foreign words don't have a gender in Italian :P FWIW you use the feminine form with "DLL" later on in the patch. A general comment, I think it's best if you also remove the old, commented out, msgid when you fix those fuzzy translations. @@ -4800,7 +4783,7 @@ msgstr "Nessuno spegnimento in corso.\n" #: winerror.mc:1381 msgid "I/O device error.\n" -msgstr "Errore I/O dell'unità.\n" +msgstr "Errore I/O del dispositiov.\n" Typo. #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "ondeggiante" "ondeggiante" sounds quite bad. Not sure what would be the right translation here though... "galleggiante" would be the most direct translation but it doesn't seem right either. Maybe "mobile" or something? #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "attraversabile" "attraversato" #: oleacc.rc:127 -#, fuzzy #| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Protetto da scrittura.\n" +msgstr "protetto\n" You should drop the \n here. #: urlmon.rc:43 msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" +"Quando installato, un componente ActiveX ha un accesso completo al tuo " +"computer. Non installarlo finché non ne hai una fiducia assoluta." "finché" doesn't seem appropriate. I'd go with "a meno che". @@ -9737,14 +9690,13 @@ msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <dir> è la versione ridotta di CHDIR. Cambia la cartella\n" +"CD <director> è la versione ridotta di CHDIR. Cambia la cartella\n" "predefinita attuale.\n" Typo. @@ -9810,7 +9761,9 @@ msgstr "" "Il comando FOR è usato per eseguire un comando per ciascuno di un set di " "files.\n" "\n" -"Sintassi: FOR %variabile IN (set) DO comando\n" +"Sintassi: FOR %variable IN (set) DO comando\n" +"\n" +"Il segno % dev'essere ripetuto quando si utilizza FOR in un file batch.\n" "%variabile" was probably on purpose. #: netstat.rc:56 -#, fuzzy #| msgid "Decoding Error" msgid "Receive Errors" -msgstr "Errore di decodifica" +msgstr "Ricevi gli errori" That message means "Errori di ricezione". @@ -11095,7 +11026,7 @@ msgid "" msgstr "" "Il file '%s' non esiste.\n" "\n" -"Creare un nuovo file?" +"Vuoi creare un nuovo file?" Arguable, but I preferred the impersonal form of the previous translation. #: winecfg.rc:226 -#, fuzzy #| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Configurazione di Wine" +msgstr "Configurazione dell'unità di memorizzazione di massa" Maybe simply "Configurazione dischi"? I do like the general tone of your translations. Thank you again!

1 0

Re: [PATCH 4/4] dwrite: Implement HasCharacter()
by Marvin 15 Oct '14

15 Oct '14

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=9549 Your paranoid android. === wvistau64 (32 bit font) === font.c:676: Test failed: got 0x80004002 === w2008s64 (32 bit font) === font.c:676: Test failed: got 0x80004002 === wvistau64 (64 bit font) === font.c:676: Test failed: got 0x80004002 === w2008s64 (64 bit font) === font.c:676: Test failed: got 0x80004002

1 0

Re: [PATCH 3/4] dwrite: Added one more test for system font collection
by Marvin 15 Oct '14

15 Oct '14

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=9548 Your paranoid android. === wvistau64 (32 bit font) === font.c:665: Test failed: got 0x80004002 === w2008s64 (32 bit font) === font.c:665: Test failed: got 0x80004002 === wvistau64 (64 bit font) === font.c:665: Test failed: got 0x80004002 === w2008s64 (64 bit font) === font.c:665: Test failed: got 0x80004002

2 1

Re: [3/3] msvcrt: Added _fflush_nolock() implementation
by Piotr Caban 15 Oct '14

15 Oct '14

Hi, On 10/09/14 19:52, Iván Matellanes wrote: > +/********************************************************************* > + * _fflush_nolock (MSVCRT.@) > + */ > +int CDECL MSVCRT__fflush_nolock(MSVCRT_FILE* file) > +{ > + if(!file) { > + msvcrt_flush_all_buffers(MSVCRT__IOWRT); There's one more thing that looks strange here. msvcrt_flush_all_buffers calls MSVCRT_fflush internally. That causes some streams to get locked and unlocked. Could you please add a test that checks how native behaves here? I'm not sure if we should lock any FILE's in a _nolock function variant. Thanks, Piotr

2 2

Re: Updated the Italian .po file of Wine
by Nikolay Sivov 15 Oct '14

15 Oct '14

On 10/14/2014 04:48 PM, Davide Pizzetti wrote: > I just updated the Italian translation of Wine. > Davide > > > Hi, Davide. Thank you for your contribution, but you need to do one more step to these changes accepted into Wine - changes should be sent in a diff format. That means you need to fetch Wine git repo, update translations and generate a patch that will contain your changes only, not the whole po-file. Whole process is described here http://wiki.winehq.org/SubmittingPatches, if you have any question after reading this wiki article feel free to ask them on wine-devel mailing list.

1 0

Re: [PATCH 2/4] d3d9/tests: Avoid mode changes in d3d9ex' test_lost_device.
by Marvin 15 Oct '14

15 Oct '14

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=9532 Your paranoid android. === w8 (32 bit d3d9ex) === d3d9ex.c:1276: Test failed: Got unexpected hr 0. d3d9ex.c:1278: Test failed: Got unexpected hr 0. d3d9ex.c:1280: Test failed: Got unexpected hr 0. d3d9ex.c:1282: Test failed: Got unexpected hr 0.

3 3

Re: [PATCH 4/4] d3d9/tests: Port test_window_style to d3d9ex.
by Marvin 14 Oct '14

14 Oct '14

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=9534 Your paranoid android. === w8 (32 bit d3d9ex) === d3d9ex.c:1294: Test failed: Got unexpected hr 0. d3d9ex.c:1296: Test failed: Got unexpected hr 0. d3d9ex.c:1298: Test failed: Got unexpected hr 0. d3d9ex.c:1300: Test failed: Got unexpected hr 0.

1 0

Re: [PATCH 3/3] kernel32/tests: Add tests for UTF-7 conversion. (try 3.1)
by Michael Stefaniuc 14 Oct '14

14 Oct '14

Hello Alex, On 10/13/2014 08:19 AM, Alex Henrie wrote: > The only difference from the previous version of this patch is the > correction of a typo in one of the comments. > > --- > dlls/kernel32/tests/codepage.c | 751 ++++++++++++++++++++++++++++++++++ > +++++++ 1 file changed, 751 insertions(+) while more tests are good that's a lot of lines to have for just one function. So splitting the WCHAR => UTF-7 from the UTF-7 => WCHAR tests should help make it more manageable. Also some of the strings are huge. Most of those seem to be for the WCHAR => UTF-7 and could be probably generated by just using the directly_encodable_table[] from patch 2. If the tests cannot be generated from the table then please split the strings into more manageable chunks, as is they are unreadable / unmaintainable. Also the due to the size of the patch it is hard to discern what the difference between the different test structs are. Especially as the names are basically equivalent in this context: - utf16_to_utf7_tests and wcstombs_tests - utf7_to_utf16_tests and mbstowcs_tests bye michael

1 0

Re: [PATCH 3/4] d3d9/tests: Port wndproc tests to d3d9ex.
by Marvin 14 Oct '14

14 Oct '14

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=9533 Your paranoid android. === w8 (32 bit d3d9ex) === d3d9ex.c:1294: Test failed: Got unexpected hr 0. d3d9ex.c:1296: Test failed: Got unexpected hr 0. d3d9ex.c:1298: Test failed: Got unexpected hr 0. d3d9ex.c:1300: Test failed: Got unexpected hr 0.

1 0

Re: [PATCH 1/1] ddraw: Return the primary legacy ddraw device last.
by Stefan Dösinger 14 Oct '14

14 Oct '14

There are a few things I am wondering about and where the test can be extended: The existing test > /* Test with valid callback parameter and count the number of primary devices */ > callbackCount = 0; > ret = pDirectDrawEnumerateExA(test_count_callbackExA, &callbackCount, 0); > ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); > ok(callbackCount == 1, "Expected 1 primary device, got %d\n", callbackCount); Combined with your change that suggests that without any flag only the NULL guid is enumerated. If so I think that's worth an explicit check. Is the NULL guid enumerated when DDENUM_DETACHEDSECONDARYDEVICES and/or DDENUM_NONDISPLAYDEVICES are set? Regarding the specific changes you make: > dlls/ddraw/tests/ddrawmodes.c | 35 +++++++++++++++++++++++++++++++++++ I'd prefer that this test be moved to ddraw1.c > + static char DriverDescription[] = "DirectDraw HAL"; > + static char DriverName[] = "display"; Please do not use CamelCase or lpFoo in d3d-related code. Somewhat related, but that can be a separate patch: d3d3_EnumDevices() mentions that some games modify the strings. In your code (and the current code), such modifications would persist for the runtime of the application. It would be interesting to add a test for this. > +static BOOL WINAPI test_last_callbackExA(GUID *lpGUID, char *lpDriverDescription, > + char *lpDriverName, void *lpContext, HMONITOR hm) You should be able to combine the callbacks. Just declare a structure and put a counter in it. > +{ > + GUID **context_guid = (GUID **)lpContext; > + static GUID last_guid; I guess this works, but it is somewhat ugly. If you use a struct you can put a GUID and a BOOL guid_was_null in it. Or a GUID and a GUID *. Please extend the test to DirectDrawEnumerateA. MSDN suggests it is equivalent to DirectDrawEnumerateExA(DDENUM_NONDISPLAYDEVICES), but I have my doubts here. Comparing the strings of the non-NULL device against "DirectDraw HAL" and "display" (in the Ex and non-Ex case) would also be a good idea. Am 13.10.2014 um 21:16 schrieb Erich E. Hoover <erich.e.hoover(a)gmail.com>: > Fixes bug #37307. There are a couple of other bugs that are > preventing Urban Assault from working, but this fixes the problem with > returning the interfaces in the wrong order. > <0001-ddraw-Return-the-primary-legacy-ddraw-device-last.patch>

2 2

Re: [PATCH 1/1] d3d8/tests: Allow a width and height to be passed to create_device().
by Marvin 14 Oct '14

14 Oct '14

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=9522 Your paranoid android. === w8 (32 bit device) === device.c:2421: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3078: Test failed: Expected wndproc 0x412c60, got 0x412c60.

1 0

Re: [PATCH] vbscript: Implemented Timer
by Marvin 14 Oct '14

14 Oct '14

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

3 2

Re: advapi32/tests: Don't crash on Wine in WoW setups
by Marvin 13 Oct '14

13 Oct '14

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

1 0

Re: [PATCH 5/5] ntdll: Implement storing DOS attributes in NtCreateFile.
by Marvin 13 Oct '14

13 Oct '14

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=9506 Your paranoid android. === build (build) === Make in include dir failed

1 0

Re: [PATCH 4/5] ntdll: Implement storing DOS attributes in NtSetInformationFile.
by Marvin 13 Oct '14

13 Oct '14

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=9505 Your paranoid android. === build (build) === Make in include dir failed

1 0

RFC: Adding distribution field to Bugzilla
by Austin English 13 Oct '14

13 Oct '14

Howdy everyone, I'd like to add a distribution field to Bugzilla, to make it easier to identify when users may have additional patches installed by their distribution and/or other distribution specific issues (e.g., https://bugs.winehq.org/show_bug.cgi?id=35413). It would be a drop down selection, with the major distributions listed (i.e., ArchLinux, Debian, Fedora, Gentoo, Mint, RedHat, Slackware, Suse, Ubuntu, other). Comments/feedback welcome. -- -Austin

6 9

Re: Add WWN 377
by Stefan Dösinger 13 Oct '14

13 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-10 21:48, schrieb André Hentschel: > +<stats posts="131" size="310" contrib="23" multiples="14" lastweek="11"> > + > +<person posts="9" size="21" who="stefandoesinger at gmail.com (Stefan Dösinger)" /> > +<person posts="6" size="8" who="hverbeet at gmail.com (Henri Verbeet)" /> > +<person posts="6" size="6" who="julliard at winehq.org (Alexandre Julliard)" /> > +<person posts="4" size="8" who="mstefani at redhat.com (Michael Stefaniuc)" /> > +<person posts="3" size="4" who="austinenglish at gmail.com (Austin English)" /> > +<person posts="3" size="3" who="alexhenrie24 at gmail.com (Alex Henrie)" /> > +<person posts="3" size="2" who="nsivov at codeweavers.com (Nikolay Sivov)" /> > +<person posts="2" size="5" who="scottritchie at ubuntu.com (Scott Ritchie)" /> > +<person posts="2" size="2" who="dimesio at earthlink.net (Rosanne DiMesio)" /> > +<person posts="2" size="1" who="piotr.caban at gmail.com (Piotr Caban)" /> You may want to check the stat generation. Those are 38 posts. Plus 8 for the other 4 multiple posters + 9 for the single posters != 131. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOFxQAAoJEN0/YqbEcdMwMEgP/AycUgCYLAtZ0O8BLi1YCMP2 1asxLYGu0ERqqI+ga/cB83bOSYwDqHMfM4EvxwmEkv+1OunHYObEaTFmGeo/ylee T/GrRg6boHBsgaLyNYsn7xKltBxxY8mZTy8kYEnHi95Hz1r8FBTTjYH93sgUEtRd qmKyL7IJjAAgQzsZe4HBcKUzdGUCRVI0IrFRBc/48SDdVZs47UuTMg2NpLjxF2Db ebgt+YtJQhjnikqMkA541JkxDKd6EIqOIg38dOY1easnqV9WAURdvESY5zrtWmnF ZCPJvmS8PxGylBiI2b/AgrjmoU/cxpjoe1n3Uza8pvdxrCZSVNjDK0ceteIex57g SlqHkplYrrZHaeYsVgdoq+z9+S+4fdgm0pMUUV9W4QBXZdIsoRPFEMbplX7B30Uo /01hVceSzEoM+DeNV4G55KCJnBrPhQ7vOT1rfbdGgcVqX3OEdpv9FaKY0VLmuwNq QBRghN9TY7sX12Q3VPmTkVHkudTCz9gQAScDJpIh60XHj2ZkS8bmQHwhrPDERkoe YvtyR9OROcqrpzCeBW4AnbMuJHeYrGJC7H2OYFbt+N0VAFkV2Zh5Z3+LAkrER5DY 0HIqADQy0c73l7FPT172j3zvC9t4boDelR8Wx5jHsSmUdzboiFQZodLaw2o6b3Mt 2a6cjWARAZNetTBaAPwq =/Lzl -----END PGP SIGNATURE-----

2 1

Re: ieframe: Send command state change notifications from history navigation handlers.
by Marvin 13 Oct '14

13 Oct '14

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=9497 Your paranoid android. === wvistau64 (32 bit webbrowser) === webbrowser.c:976: Test failed: unexpected dispIdMember 271 webbrowser.c:1602: Test failed: unexpected call TranslateUrl webbrowser.c:445: Test failed: unexpected nCmdID 14

1 0

Re: cmd/tests: Spelling and grammar fixes
by Marvin 13 Oct '14

13 Oct '14

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=9495 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 1364 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1365 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1366 (got 'C:\Documents and Settings\winetest\My Documents\foobar\foodir2', wanted '@drive@@path@foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1367 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1368 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1369 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1370 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1371 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1373 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1376 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1377 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1378 (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 1379 (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 1380 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1381 (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 1382 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@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'')

1 0

Re: [PATCH] widl: Generate method macros/wrappers for overridden methods.
by Marvin 13 Oct '14

13 Oct '14

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

2 1

Re: wininet: Remove the content length header after the request is sent.
by Jacek Caban 13 Oct '14

13 Oct '14

On 10/13/14 13:57, Hans Leidekker wrote: > This ensures that a new content length header is inserted when the request is reused. Could you please add a test? Jacek

1 0

Re: ieframe: Send command state change notifications from history navigation handlers.
by Jacek Caban 13 Oct '14

13 Oct '14

Hi Hans, On 10/13/14 13:56, Hans Leidekker wrote: > HRESULT go_back(DocHost *This) > { > + HRESULT hres; > + > if(!This->travellog.position) { > WARN("No history available\n"); > return E_FAIL; > } > > - return navigate_history(This, This->travellog.position-1); > + hres = navigate_history(This, This->travellog.position-1); > + if(SUCCEEDED(hres)) > + on_commandstate_change(This, CSC_NAVIGATEFORWARD, VARIANT_TRUE); We probably shouldn't call this notification if forward navigation was already possible before the call. Also, if we reach the bottom of history stack, we should also probably notify that back navigation is no longer possible. It would be more generic and easier to get right if you did that in navigate_history, based on previous and current history position. > HRESULT get_location_url(DocHost *This, BSTR *ret) > diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c > index fa37169..238b6de 100644 > --- a/dlls/ieframe/tests/webbrowser.c > +++ b/dlls/ieframe/tests/webbrowser.c > @@ -3022,7 +3022,7 @@ static void test_go_back(IWebBrowser2 *wb, const char *back_url) > hres = IWebBrowser2_GoBack(wb); > ok(hres == S_OK, "GoBack failed: %08x\n", hres); > CHECK_CALLED(Invoke_BEFORENAVIGATE2); > - todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); > + CHECK_CALLED(Invoke_COMMANDSTATECHANGE); > CLEAR_CALLED(Invoke_PROPERTYCHANGE); /* called by IE11 */ > } > > @@ -3038,7 +3038,7 @@ static void test_go_forward(IWebBrowser2 *wb, const char *forward_url) > hres = IWebBrowser2_GoForward(wb); > ok(hres == S_OK, "GoForward failed: %08x\n", hres); > CHECK_CALLED(Invoke_BEFORENAVIGATE2); > - todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); > + CHECK_CALLED(Invoke_COMMANDSTATECHANGE); > I would be nice to have those tests stricter. For example, by checking command in COMMANDSTATECHANGE notification and have separated Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD and Invoke_COMMANDSTATECHANGE_NAVIGATEBACK. Thanks, Jacek

1 0

Re: jscript: Don't use builtin property for exposing ActiveXObject constructor.
by Marvin 13 Oct '14

13 Oct '14

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

1 0

Re: [PATCH v4 5/8] reg.exe: Add wchar/raw data conversion functions
by Stefan Dösinger 12 Oct '14

12 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This code could use more tests, especially for REG_SZ_MULTI and REG_BINARY. Am 2014-10-09 10:55, schrieb Jonathan Vollebregt: > +static WCHAR *data_get_wchar(const BYTE *data, const DWORD size, const DWORD type) This function is not used until the next patch. From a design point of view it unfortunate that you allocate a new string for the REG_SZ and REG_SZ_MULTI case and essentially just do a memcpy and free the old string. As long as you just need this function to print the values it would be better to add a function that prints directly. Keep reg export in mind though. It may need the function like this, or maybe a printing function that is passed a file descriptor. > + do > + { > + lstrcpyW(output+i, &input[i]); > + > + i += strlenW(&input[i]) + 1; > + > + if (input[i] != 0) > + output[i - 1] = ','; > + } while (input[i]); If I understand this correctly this replaces 0 WCHARs with ',' . There should be nicer ways to do this. > +static BYTE *wchar_get_data(const WCHAR *input, const DWORD type, > + const WCHAR seperator, DWORD *size_out) > ... > + case REG_SZ: > + case REG_EXPAND_SZ: > + { > + i = (strlenW(input) + 1) * sizeof(WCHAR); > + output = HeapAlloc(GetProcessHeap(), 0, i); > + lstrcpyW((WCHAR *) output, input); > + *size_out = i; > + return output; > + } This also has unfortunate copying behavior. Maybe there is a nicer way to solve this. > + for (i = 0, p = 0; i <= strlenW(input); i++, p++) > + { > + if (input[i] == seperator) Please watch the spelling of separator. This confused me a bit in my code search :-) . > + temp[p] = 0; > + else if (seperator == 0 && input[i] == '\\' && input[i + 1] == '0') How does a 0 separator work? The command line interpreter would fail to parse such a string. msdn claims that the default separator is '\0', but maybe they mean a backslash ('\\') like your code uses. If the default separator is a backslash it would be nicer to handle this default in the code that parses the command line. > + { > + temp[p] = 0; > + i++; > + } I don't understand what's special about a 0 or \ separator as far as this loop is concerned. > + if (p % 2) if (p & 1) is nicer to check for odd / even (i.e., the lowest bit). The compiler should be able to to this optimization as well. > + p /= 2; p >>= 1 . Or you could consider incrementing i by 2 in the for loop below. > + for (i = 0; i < p; i++) > + temp[i] = (temp[i * 2] << 4) | temp[i * 2 + 1]; -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOpgoAAoJEN0/YqbEcdMwyLYP+QFSbpZLsy/Au6uKLQNfcRqS MnHxgrB1wq+RxfDbQ6UdzT6gIVKhEII0c//gZ32H5Fr/+zIofaa38XmtH6Fp8MMg p1s+ubFeZ29vMaNER28zwK/QM6Allwo+JLjqLSM6W2cgrfe1kU/iPWGC97nJktEj cG4wsAdcgYCHvkOH/06ZIC/zSbWyG0yZJSgKfLqfgEbuD/TAmmkXh0TVMm9Znp88 J6mLhcYSbfTK2oHzU9nXETTa5oFR/VfHQHZ7asa+q14kftl24Y5JCs1VD6BK/G4p TjD5jQhIN9L5FHKj79n+9y5eeYjrIiMhdi81ey3Bm8it03ZPUN3aAjXf6CD6UmBu wxHZwB8L1PALJsDBK+E7a8QgeteWxMjX07m2FdfFNewj4IFq4eoASdeINd8Zd1rt TpWl2/jpKz4PecRvGeNKOEgqx+mFcSRWiXErytWtEmJzz+aPEjdjFXesf6aWFB/l +ZZxc202He9JXacPFvmCuL0ltWStJqdSZRZg/FkIgqXZkWfj1bwxDYpu+7Jv6243 KrQrMUGna1VXGM6tAfYph0BLtZnksTwFS6MEoPzirf2Yqe3uuQzecQqhyaStaESJ 5HS+6NTEZT2LhvKy3mui970k2THpmQFb7j4f+xdmKHEj6qdsoH+SHouJgkig/KLk x28pWN1J80RCE92BQdYV =tqtd -----END PGP SIGNATURE-----

2 2

Re: [PATCH v4 3/8] reg.exe: Add wchar/type conversion functions
by Stefan Dösinger 12 Oct '14

12 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-09 10:55, schrieb Jonathan Vollebregt: > +static const WCHAR *type_get_wchar(const DWORD type) This function is not used. You can add it in patch 5, where you actually use it. > +static DWORD wchar_get_type(const WCHAR *type) > +{ > + static const WCHAR type_dword_le[] = {'R','E','G','_','D','W','O','R','D','_','L','I','T','T','L','E','_','E','N','D','I','A','N',0}; > + DWORD i; > + > + if (lstrcmpiW(type, type_dword_le) == 0) > + return REG_DWORD_LITTLE_ENDIAN; I think a table where you can map two different strings to index 4 is nicer than the special case, unless having the cheap reverse lookup is important for performance. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOotdAAoJEN0/YqbEcdMwpsAQAJIoOZIzwfKU+EWf6lTO1L6u zhHECP7G8GnlxDI9XGVkg0xvj0v+mxBXUXHdWkCczKyuWJFmUB4adULqpXDloyRa 0aMKSnziixXadiQMY5p36KmTSVLg+rCq3ol/dCjR1E/kCktkwbH0mcx0w4YMf9wZ /gtTRFY7F4OVLFQdhZV4lI2stcJpP057Tx+MivzfpVgw+HXfo3IUZlDtAVY0LNXV DfjX9terIhqE6kqkyalsa6sYczNRgrGF2D+jU+MADJSnQ7bHk15foayV4nzkcqk9 wabU65qY4HEWTo54m4u/W0yVyEb3j3JWN1XQAm/a+ae1iFnE86XHf5eq7s4ze81a Wu5dYdBanrH/qMkzGdG15+3h2u33PxHOL0R/25KrwvZDV61GGJ8r1gJEsPvNWqh3 QomLLMPCSArNLBUQSUrfk84GyeOg0TBfSXTR/JLOxG8GtQ/slAWwa/F310tBxSTa 6Csx6aeazHDMrZhgT2W75hMy1eA8GVGCH5ovBl3ThdJB9kkJM6zIQh7UB940TnVA orZcSXxxKVENO2FTWbeSrsQhjqwwvTL8reRS2T7wZZAQ3J10OI0HXOAIE4hr54wE j7FA5whN86sLXg4stjLW0ExpzlTHvTKYxQJl7CPILaYMQXwVIIdrgeaV8bi9ko5c vlir4SrW/E5rfUfxflAx =eD+7 -----END PGP SIGNATURE-----

1 0

Re: [PATCH v4 1/8] reg.exe: Perform checks in wmain
by Stefan Dösinger 12 Oct '14

12 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-09 10:55, schrieb Jonathan Vollebregt: > Move as much error-checking to main as possible so sub functions > don't have to repeat basic checks > > IE: Is the key on a remote system, or are we missing arguments? I don't think this is really an improvement. The old code first looked at argvW[1], then argvW[2], ..., with clear checks that the argument count is big enough. The new code jumps around between the arguments without any clear order. As a result it still isn't clear if argv[2] is supposed to be a registry key at all when you check it for remoting. While it may be true in the current form of reg.exe, it won't work if support for e.g. reg import is added. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOoBfAAoJEN0/YqbEcdMw+ogP/AnFEAMDQrGtrjtau/EL0Yuu vkmUcgAcSG71I//iFchLvpSzzrVlgmrX2t8eatFHyClBh0jhGwtFOvdXHiilsOEV yRcJBlkr5wa+hD+SvpBX4VGTBFJEhbJ9uhzzeFv0teh6AhxVpkjFGM6yR373xmkz Pk9F7sT30YxOqF5RftPwWylihpWNOgMwk2rHJkanImI+Fle0EMQOIaI+ASDsc5i0 DhAl8Xs867wUkiFfBzU5l5p+nARGr971PDj3nUOubDeJEUNBaO7d+Uh4AAa9a+h3 evDd1e+kdW8kjStnFXQZfkFYw+8gK9lxB05NrX1EeIkGoxpKaOXMW+5gEV76eb8z yqfe3vdzijHptKGxAml5Y6A7N3HPuZyi+dwDW41Dmgsz3cY+WmZ6X3CGXB3wBcew SVSoZjfcdE4mq6BDFPRC7A1+Rt6aYUAvxQDQT+jhRtlMBRQrAtML3o9n08JEbqkD T6twKYBniWHBlGgb8rD9yA1snUYlOO2a4zhGzZ2Z/L9WHMzxOXLApa2x6Tcew9Jz V1gqDQPpgwhy4a/8oeukwj9VH2uva12Q72f7RQMKc1Q7CGXskso4RlZpJpHi2eNi 1oHDQzTYX0nLOSeU8C4336zq+ljh2Csme8CtLFw9a44mbzhSzzdtWJBcS3M8pQ8C Txkl4Xka006+rZQHjzQO =inoY -----END PGP SIGNATURE-----

1 0

Re: [PATCH 3/5] wined3d: Track texture allocation per-texture.
by Farmboy0 12 Oct '14

12 Oct '14

On 08.10.2014 08:47, Henri Verbeet wrote: > --- > dlls/wined3d/surface.c | 13 +++-------- > dlls/wined3d/texture.c | 47 ++++++++++++++++++++++++++++++---------- > dlls/wined3d/volume.c | 8 +++---- > dlls/wined3d/wined3d_private.h | 14 ++++++------ > 4 files changed, 49 insertions(+), 33 deletions(-) > > diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c > index d02d5f2..0967220 100644 > --- a/dlls/wined3d/surface.c > +++ b/dlls/wined3d/surface.c > @@ -599,11 +599,6 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) > surface_invalidate_location(surface, WINED3D_LOCATION_SYSMEM); > } > > -static void surface_force_reload(struct wined3d_surface *surface) > -{ > - surface->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); > -} > - > static void surface_release_client_storage(struct wined3d_surface *surface) > { > struct wined3d_context *context = context_acquire(surface->resource.device, NULL); > @@ -621,11 +616,9 @@ static void surface_release_client_storage(struct wined3d_surface *surface) > gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, > GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); > } > + wined3d_texture_force_reload(surface->container); > > context_release(context); > - > - surface_invalidate_location(surface, WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); > - surface_force_reload(surface); > } > > static BOOL surface_use_pbo(const struct wined3d_surface *surface) > @@ -1211,7 +1204,7 @@ static void surface_unload(struct wined3d_resource *resource) > surface_load_location(surface, surface->resource.map_binding); > surface_invalidate_location(surface, ~surface->resource.map_binding); > } > - surface->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); > + wined3d_texture_force_reload(surface->container); > > context = context_acquire(device, NULL); > gl_info = context->gl_info; > @@ -1845,7 +1838,7 @@ void surface_load(struct wined3d_surface *surface, BOOL srgb) > surface_invalidate_location(surface, ~surface->resource.map_binding); > /* Switching color keying on / off may change the internal format. */ > if (ck_changed) > - surface_force_reload(surface); > + wined3d_texture_force_reload(surface->container); > } > else if (!(surface->locations & location)) > { > diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c > index 27a10c6..bc75305 100644 > --- a/dlls/wined3d/texture.c > +++ b/dlls/wined3d/texture.c > @@ -751,7 +751,26 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT > > void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) > { > + DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; > + > + if (texture->flags & alloc_flag) > + return; > + > texture->texture_ops->texture_prepare_texture(texture, context, srgb); > + texture->flags |= alloc_flag; > +} > + > +void wined3d_texture_force_reload(struct wined3d_texture *texture) > +{ > + unsigned int sub_count = texture->level_count * texture->layer_count; > + unsigned int i; > + > + texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED); > + for (i = 0; i < sub_count; ++i) > + { > + texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i], > + WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); > + } > } > > void CDECL wined3d_texture_generate_mipmaps(struct wined3d_texture *texture) > @@ -817,11 +836,17 @@ static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource > wined3d_surface_destroy(surface); > } > > +static void texture2d_sub_resource_invalidate_location(struct wined3d_resource *sub_resource, DWORD location) > +{ > + struct wined3d_surface *surface = surface_from_resource(sub_resource); > + > + surface_invalidate_location(surface, location); > +} > + > /* Context activation is done by the caller. */ > static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) > { > UINT sub_count = texture->level_count * texture->layer_count; > - DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; > const struct wined3d_format *format = texture->resource.format; > const struct wined3d_gl_info *gl_info = context->gl_info; > const struct wined3d_color_key_conversion *conversion; > @@ -864,9 +889,6 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi > GLsizei width = surface->pow2Width; > const BYTE *mem = NULL; > > - if (surface->flags & alloc_flag) > - continue; > - > if (converted) > surface->flags |= SFLAG_CONVERTED; > else > @@ -922,8 +944,6 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi > gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); > checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); > } > - > - surface->flags |= alloc_flag; > } > } > > @@ -932,6 +952,7 @@ static const struct wined3d_texture_ops texture2d_ops = > texture2d_sub_resource_load, > texture2d_sub_resource_add_dirty_region, > texture2d_sub_resource_cleanup, > + texture2d_sub_resource_invalidate_location, > texture2d_prepare_texture, > }; > > @@ -1261,9 +1282,15 @@ static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource > wined3d_volume_destroy(volume); > } > > +static void texture3d_sub_resource_invalidate_location(struct wined3d_resource *sub_resource, DWORD location) > +{ > + struct wined3d_volume *volume = volume_from_resource(sub_resource); > + > + wined3d_volume_invalidate_location(volume, location); > +} > + > static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) > { > - DWORD alloc_flag = srgb ? WINED3D_VFLAG_SRGB_ALLOCATED : WINED3D_VFLAG_ALLOCATED; > unsigned int sub_count = texture->level_count * texture->layer_count; > const struct wined3d_format *format = texture->resource.format; > const struct wined3d_gl_info *gl_info = context->gl_info; > @@ -1276,9 +1303,6 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi > struct wined3d_volume *volume = volume_from_resource(texture->sub_resources[i]); > void *mem = NULL; > > - if (volume->flags & alloc_flag) > - continue; > - > if (gl_info->supported[APPLE_CLIENT_STORAGE] && !format->convert > && volume_prepare_system_memory(volume)) > { > @@ -1300,8 +1324,6 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi > gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); > checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); > } > - > - volume->flags |= alloc_flag; > } > } > > @@ -1310,6 +1332,7 @@ static const struct wined3d_texture_ops texture3d_ops = > texture3d_sub_resource_load, > texture3d_sub_resource_add_dirty_region, > texture3d_sub_resource_cleanup, > + texture3d_sub_resource_invalidate_location, > texture3d_prepare_texture, > }; > > diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c > index 92bc1e1..0cbc7d4 100644 > --- a/dlls/wined3d/volume.c > +++ b/dlls/wined3d/volume.c > @@ -262,9 +262,9 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, > case WINED3D_LOCATION_TEXTURE_RGB: > case WINED3D_LOCATION_TEXTURE_SRGB: > if ((location == WINED3D_LOCATION_TEXTURE_RGB > - && !(volume->flags & WINED3D_VFLAG_ALLOCATED)) > + && !(volume->container->flags & WINED3D_TEXTURE_RGB_ALLOCATED)) > || (location == WINED3D_LOCATION_TEXTURE_SRGB > - && !(volume->flags & WINED3D_VFLAG_SRGB_ALLOCATED))) > + && !(volume->container->flags & WINED3D_TEXTURE_SRGB_ALLOCATED))) > ERR("Trying to load (s)RGB texture without prior allocation.\n"); > > if (volume->locations & WINED3D_LOCATION_DISCARDED) > @@ -451,8 +451,8 @@ static void volume_unload(struct wined3d_resource *resource) > } > > /* The texture name is managed by the container. */ > - volume->flags &= ~(WINED3D_VFLAG_ALLOCATED | WINED3D_VFLAG_SRGB_ALLOCATED > - | WINED3D_VFLAG_CLIENT_STORAGE); > + wined3d_texture_force_reload(volume->container); > + volume->flags &= ~WINED3D_VFLAG_CLIENT_STORAGE; > > resource_unload(resource); > } > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 17a68dc..5ec5088 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -2116,6 +2116,7 @@ struct wined3d_texture_ops > void (*texture_sub_resource_add_dirty_region)(struct wined3d_resource *sub_resource, > const struct wined3d_box *dirty_region); > void (*texture_sub_resource_cleanup)(struct wined3d_resource *sub_resource); > + void (*texture_sub_resource_invalidate_location)(struct wined3d_resource *sub_resource, DWORD location); > void (*texture_prepare_texture)(struct wined3d_texture *texture, > struct wined3d_context *context, BOOL srgb); > }; > @@ -2123,8 +2124,10 @@ struct wined3d_texture_ops > #define WINED3D_TEXTURE_COND_NP2 0x00000001 > #define WINED3D_TEXTURE_POW2_MAT_IDENT 0x00000002 > #define WINED3D_TEXTURE_IS_SRGB 0x00000004 > -#define WINED3D_TEXTURE_RGB_VALID 0x00000008 > -#define WINED3D_TEXTURE_SRGB_VALID 0x00000010 > +#define WINED3D_TEXTURE_RGB_ALLOCATED 0x00000008 > +#define WINED3D_TEXTURE_RGB_VALID 0x00000010 > +#define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000020 > +#define WINED3D_TEXTURE_SRGB_VALID 0x00000040 > > struct wined3d_texture > { > @@ -2170,6 +2173,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, > struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; > void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, > struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; > +void wined3d_texture_force_reload(struct wined3d_texture *texture) DECLSPEC_HIDDEN; > void wined3d_texture_load(struct wined3d_texture *texture, > struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; > void wined3d_texture_prepare_texture(struct wined3d_texture *texture, > @@ -2191,9 +2195,7 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, > > const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; > > -#define WINED3D_VFLAG_ALLOCATED 0x00000001 > -#define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000002 > -#define WINED3D_VFLAG_CLIENT_STORAGE 0x00000004 > +#define WINED3D_VFLAG_CLIENT_STORAGE 0x00000001 > > struct wined3d_volume > { > @@ -2354,8 +2356,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D > #define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ > #define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ > #define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ > -#define SFLAG_ALLOCATED 0x00000800 /* A GL texture is allocated for this surface. */ > -#define SFLAG_SRGBALLOCATED 0x00001000 /* A sRGB GL texture is allocated for this surface. */ > > struct wined3d_sampler > { Hi, This commit causes problems with Eve Online. When switching from Fullscreen to Windowed I get the following errors and the 3d objects look like a mess of colors. err:d3d_surface:surface_load_location Surface 0x1f834240 does not have any up to date location. err:d3d_surface:surface_invalidate_location Surface 0x1f834240 does not have any up to date location. I have bisected the following commit to be the offender: commit ee8a5b7dd1e554ef32229c766715f23ba17c9f6c Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:20 2014 +0200 wined3d: Track texture allocation per-texture.

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel