- wine-devel - winehq.org

Re: [PATCH 1/8] reg: Add system error printing function
by Stefan Dösinger 06 Nov '14

06 Nov '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-06 22:17, schrieb Jonathan Vollebregt: > +static int reg_print_error(LSTATUS error_code) +{ As mentioned on IRC, this can "return" void. I'll look at this more closely tomorrow. Wait with the resend a bit until I've checked all the patches, so far I've only spotted small issues, nothing that will turn everything upside down. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUW+eWAAoJEN0/YqbEcdMwaJcP+wZqn1PerYCBMWcv9JEvllGk WPaSG5ETP0cVEFq2D0Y07e/eOrbfRHvg20/BLp/KxszHQjOMGNK7r2EyPlERIF4Q EqIfgR9Yirf25fP2fC9a99UOkg6H0PTWZbHjVDhWZjeUNrHW6jJgKry1IjmvOm9h wkHFXR/IKQFcgTJVEB2wIi2vfdMqDjWRb9zK4Ft+FyLmzlmi144aErd5QD6iidim urbDbHeIbPA8uvndEVpTXoL7DeE0gJldf861UKWh4WBMboPzoZ9v4Ws4BvPQFSlV ufMzLFJIXHb7VGn2aj04FPkEicJ481KvjllcVHnnFaLWqSb76QLRqsEG6Y3ION9r Zh60OYs9gq3VN5YTAIuN0W7vRMrVXNTIHgsL1MD71vzMz655kTQeeaCBACZoSMXS thzAOuhWrtzAzUxzaw9VwIuYIwTtw557M5OGGruNCeYe+I/+L7gsr0OEQLcUovTW bX0enl+65tjGBMFttFxjdmCa4Mlsh7jpU/Md+71D5yo77nrqGAZWANYkipJczxaU KCpDz0wccR3T1S4VW6p9r1HuhuUOrhSG9XR4DT3dqaO8gl2c8rnPRtlMVpTMiL51 1AhbviV6tiHQR/M0ksu0bDtexHHmXmBdMDK7qfP4mIAtTJ6MVPNBrWwSwMXnPmNG d1o2xWea1bfFPTj9hMNm =dhm6 -----END PGP SIGNATURE-----

1 0

Re: [2/2] wined3d: Take abs() of vertex z coordinate as FFP fog coordinate (try 4)
by Marvin 06 Nov '14

06 Nov '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=10078 Your paranoid android. === w8 (32 bit visual) === visual.c:880: Test failed: CreateVertexShader failed (0x8876086c) visual.c:882: Test failed: CreateVertexShader failed (0x8876086c)

1 0

Re: [PATCH] advapi32/tests: Test RegDeleteKey with empty string parameter
by Stefan Dösinger 06 Nov '14

06 Nov '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Content-wise this looks ok to me. But please mark a resubmission of a patch in the subject line and preferably say something like "This supersedes patch XXXXXX" in the patch desciption and add a small explanation what changed. (No need to resend this one. Just keep it in mind for the future.) Stefan Am 2014-11-06 19:18, schrieb Jonathan Vollebregt: > --- > dlls/advapi32/tests/registry.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c > index 23eafab..55a74f6 100644 > --- a/dlls/advapi32/tests/registry.c > +++ b/dlls/advapi32/tests/registry.c > @@ -1372,6 +1372,7 @@ static void test_reg_close_key(void) > static void test_reg_delete_key(void) > { > DWORD ret; > + HKEY key; > > ret = RegDeleteKeyA(hkey_main, NULL); > > @@ -1390,6 +1391,15 @@ static void test_reg_delete_key(void) > ret == ERROR_ACCESS_DENIED || > ret == ERROR_BADKEY, /* Win95 */ > "ret=%d\n", ret); > + > + ret = RegCreateKeyA(hkey_main, "deleteme", &key); > + ok(ret == ERROR_SUCCESS, "Could not create key, got %d\n", ret); > + ret = RegDeleteKeyA(key, ""); > + ok(ret == ERROR_SUCCESS, "RegDeleteKeyA failed, got %d\n", ret); > + RegCloseKey(key); > + ret = RegOpenKeyA(hkey_main, "deleteme", &key); > + ok(ret == ERROR_FILE_NOT_FOUND, "Key was not deleted, got %d\n", ret); > + RegCloseKey(key); > } > > static void test_reg_save_key(void) > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUW8qZAAoJEN0/YqbEcdMwE+AP/3ZkydOTA8XW2U0Dx5NlNTeZ d6tNj1fcVyY7XZs/+/LSBUjUsS1STy+UN6PInVp2rvYVJ057PP28768pghzzDRiP ZC98QHls3nx8qXtIhjUTUDWDZFFFJlScf81qkm1QKhc/zQ4+KWX1ndUOgNJsc6F5 T7x7OaQP5uniOodw1D0OZmqpbAFMxa9jMX3M4StNzGvrO+WPj7anriuA56Fb/tWW oQxItSe0r7uSX6+1Xj0nWYK+Wv1q73GicVP98t85IOA2FgyBWEyTlaw3A/LeyENh LxW/b5qN2VfTMfs5I5kBKbC7QhOzNHZo0cjKBgkN2xKi2K6+1v+F0UI3+Dajvjg6 Sez4NphgMMMRSaZlqo8G9SX8gjgIVhyfo0RyqU85YoFvHXL97nw3C0Xhz5Iqbf7Y TZcpGxLVOYcl/jqITPVQYrwpyds5eT/vxvBfE32/eMwEi8lH5qGTYQkykditOX+a 5/nVXUAasyRmBq/nb4oDFdTXFX2saxcM9QpeptIc5sKwWYHe9bQ+w44fIAC9hCSP nZyDCUTymjuofS1EqD8ZzOebUf+0/Dfujm6odn7pUHg6ZdKqS9aX4BXfSJfJTg6M Quh3F+bX8lTe60wXyQQ9UbVpYEIOkCBJMQoPlM+qHLVRgR1oJK6fpXLvFYp8o2sV b68XSbGXriHFUMhKcPkz =tXkF -----END PGP SIGNATURE-----

1 0

Re: [2/2] wined3d: Take abs() of vertex z coordinate as FFP fog coordinate (try 3)
by Stefan Dösinger 06 Nov '14

06 Nov '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-03 19:55, schrieb Joachim Priesner: > + static const DWORD vertex_shader_code1[] = > + { > + 0xfffe0100, /* vs_1_0 */ > + /* output.Pos = mul(Projection, input.Pos) */ > + 0x00000005, 0x800f0000, 0x90000000, 0xa0e40000, /* mul r0, v0.x, c0 */ > + 0x00000005, 0x800f0001, 0x90550000, 0xa0e40001, /* mul r1, v0.y, c1 */ > + 0x00000002, 0x800f0000, 0x80e40000, 0x80e40001, /* add r0, r0, r1 */ > + 0x00000005, 0x800f0001, 0x90aa0000, 0xa0e40002, /* mul r1, v0.z, c2 */ > + 0x00000002, 0x800f0000, 0x80e40000, 0x80e40001, /* add r0, r0, r1 */ > + 0x00000005, 0x800f0001, 0x90ff0000, 0xa0e40003, /* mul r1, v0.w, c3 */ > + 0x00000002, 0xc00f0000, 0x80e40000, 0x80e40001, /* add oPos, r0, r1 */ > + /* output.Color = input.Color */ > + 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ > + 0x0000ffff, /* END */ > + }; I asked Henri about the status of this patch on IRC today, and he reiterated that he wants the matrix multiplication removed from the shader and replaced with z = z * 0.5 + 0.5. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUW7xNAAoJEN0/YqbEcdMwtjoP/2Jfv+6KmJ23vWa7v3NvSYv0 KFx2z6d+omGCjhGjbjRNfv/l2YmbPGtDJW2lVMA6FPU+Nguz6GjNFGAuDjzvUYlH RyxpJi4tUOM0HM7dMqAZSIgSc1hr/kXYTowbm4gxwt8LfrvgPBfaB120RRQ9n4Q0 EF8LOxUYFErPQ96Xum0E2mIgVm0Cehax7gPJXrszYwCOK8ApIlvc3zRGantrG85g WtgjTwe9/uVe2xIrWl6dyDtC+CZSeFnROhPdEP9vr5im/5uJJTH1YOkeZv6lwieV Z6W2v730OsDqcBIj2+Dx6Ytb6Mr+Q0b/UFae09/23wOSuxW7yMYU12FwvfWUoRiI T5BvvShShQRIvsvojdUnJOzL3MBTvXzqu98vIrrrJ47sjawt0ovmD3Ofz02+BBuU sZh9HgsTiAu1e5fVau7GxhqOMzd1ou6jer+YgGriJ8kwkUIkFXdaQDuY7gx+xICu i70H25mSprHPccRAPe8TcoJC1ClUjAF8UoKk9uham0uOTM9TsbQyYUzS+3gqhuv5 ZIQtk/YfPtWeXl/W/qPczo0/oAcJE9Al5831vA/6kZ8Z2xrzKW6uBOa0mGPqyUyr pZOkyYiWPwPbA6jo7y9oNpY/XbuB4Xjis7lm49fWJr6TiEnRRyvzju3U5Ea8qvBo +qUVGAE5iofmM94IONgi =iwvO -----END PGP SIGNATURE-----

1 0

Re: [PATCH 1/3] advapi32/tests: Add trailing slashes tests for RegOpen/CreateKey
by Stefan Dösinger 06 Nov '14

06 Nov '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fyi, I asked for these tests to be added to demonstrate that rejecting trailing backslashes is the behavior of reg.exe and not the advapi32 functions. Patch 1 and 2 look good to me, and I made Jonathan aware of the unchecked ret assign in patch 3 on IRC. Am 2014-11-06 19:03, schrieb Jonathan Vollebregt: > --- > dlls/advapi32/tests/registry.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c > index 382d8cc..3aff541 100644 > --- a/dlls/advapi32/tests/registry.c > +++ b/dlls/advapi32/tests/registry.c > @@ -953,6 +953,11 @@ static void test_reg_open_key(void) > ok(hkResult != NULL, "hkResult != NULL\n"); > RegCloseKey(hkResult); > > + /* trailing slashes */ > + ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test\\\\", &hkResult); > + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); > + RegCloseKey(hkResult); > + > /* open nonexistent key > * check that hkResult is set to NULL > */ > @@ -1218,6 +1223,12 @@ static void test_reg_create_key(void) > RegCloseKey(hkey1); > } > > + /* trailing backslash characters */ > + ret = RegCreateKeyExA(hkey_main, "Subkey4\\\\", 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL); > + ok(ret == ERROR_SUCCESS, "RegCreateKeyExA failed with error %d\n", ret); > + RegDeleteKeyA(hkey1, ""); > + RegCloseKey(hkey1); > + > /* WOW64 flags - open an existing key */ > hkey1 = NULL; > ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL); > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUW7s2AAoJEN0/YqbEcdMw3coP/1o0qah4t2dTpAHVXUB08UIZ IzII9m1g8uGrqffTJWFJqzDR3jDZjanxxCxvsEYO493WX57YZebsTk1jLbL/BYHi yzuGaukeDhOf0dtPD4xbjjnkg0JMJ5L+8T7SSTVeEj8TEFLwCOABZfAEiwo4O0PP ISvNF2BQFBULuq2kWVZ4K8piw/LFD+y3Mcodw3uCydsBS0bQ2Xp5YiLOImAqITmi YxxR+VOQWZ2SFLUUE79Ct7mmWTUkufCaAcj/6HPpgcfsgqUt/VqwEG0oAPrTwnKc EfmtRrkgLgSQadzKjSbjAnFQghGAUVcAWCXZ09UMCzLiNKf+UvDh/298XYlRvf5Z Tey30k4Jj6/K+RZfJNQTUIQNImbOvUWWHQFbJ4pIfOGRJi5dH+vig20lHDUB+lE5 cLmEpVhMc3bjb0yyeDeqL1j5p/isedeJCFcj9R2giNQRGRswduiTH5xtV4xUk+oB Cu716ppFZyUXVMIhL73+P6PiHM/GyDlKAvkTQVN0FMW8v9vtoVmElIIrkmqmnLLz OcyGRIhd+0YMnZTyvio2nPI23yu+IroKTDiVXjTJEZl0dVPBD4jK6t8RPpfQfY54 USzUa5k2wUKNIWejbK6GkIIA/+TF+UvcRumqo1NTtZ3ZHn7ds4soxhlwdKhOUkLy 0mgdtIWV6Aa2mQoTcNLT =76OW -----END PGP SIGNATURE-----

1 0

Re: [PATCH 3/7] reg: Add path/key conversion functions
by Stefan Dösinger 06 Nov '14

06 Nov '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +typedef struct > +{ > + HKEY key; > + const WCHAR *short_name; > + const WCHAR *long_name; > +} hkey_rel; Style suggestion: you can make this an anonymous structure: struct { HKEY key; const WCHAR *short_name; const WCHAR *long_name; } root_rels[] = { {HKEY_LOCAL_MACHINE, short_hklm, long_hklm}, {HKEY_CURRENT_USER, short_hkcu, long_hkcu}, {HKEY_CLASSES_ROOT, short_hkcr, long_hkcr}, {HKEY_USERS, short_hku, long_hku}, {HKEY_CURRENT_CONFIG, short_hkcc, long_hkcc}, }; Unless of course you need the structure definition elsewhere. > +static LSTATUS path_get_rootkey(const WCHAR *path, HKEY *out) Since you're only returning two possible values (ERROR_SUCCESS or ERROR_BADKEY) you can make this return a HKEY *. > +static LSTATUS path_get_key(const WCHAR *path, HKEY *out) > +{ > + HKEY k; > + LONG err = path_get_rootkey(path, &k); > + if (err != ERROR_SUCCESS) > + return err; > + > + path = strchrW(path, '\\'); > + if (path) > + path++; > + > + err = RegOpenKeyW(k, path, &k); > + if (err != ERROR_SUCCESS) > + return err; > + > + *out = k; > + return ERROR_SUCCESS; > } What do you think about this: static LSTATUS path_get_key(const WCHAR *path, HKEY *out) { *out = path_get_rootkey(path); path = strchrW(path, '\\'); if (path) path++; return RegOpenKeyW(*out, path, out); } If my understanding of RegOpenKeyW is right this will give you ERROR_INVALID_HANDLE (winnt+) or ERROR_BADKEY (win9x) if the root key is invalid, ERROR_PATH_NOT_FOUND if the path is invalid, and ERROR_SUCCESS otherwise. So pretty much the behavior of your code in 1/3rd of the lines of code. I think path_open would be a better name for this function. You could also consider an additional BOOL create parameter to call RegCreateKeyW instead of RegOpenKeyW so you can reuse this code in reg_add. > + err = path_get_key(key_name, &subkey); > + if (err != ERROR_SUCCESS) > { > - reg_message(STRING_INVALID_KEY); > - return 1; > - } > - p++; > - > - root = get_rootkey(key_name); > - if (!root) > - { > - reg_message(STRING_INVALID_KEY); > + reg_print_error(err); > return 1; > } > > @@ -306,21 +341,19 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, > /* Delete subtree only if no /v* option is given */ > if (!value_name && !value_empty && !value_all) > { > - if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) > + HKEY root; > + err = path_get_rootkey(key_name, &root); > + err = RegDeleteTreeW(root, strchrW(key_name, '\\') + 1); My reading comprehension may be lacking again, but can't you just call RegDeleteTree(subkey, NULL)? You're also assuming the caller isn't trying to nuke HKEY_LOCAL_MACHINE :-) . -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUWUmSAAoJEN0/YqbEcdMwjmQP/iuYzlfloARtQOxq6zCyHAsT bBFIHVwZoiB3/e4UvDcnRvcdJGvTM/LNu2LBczsFhOEfidSGsMYbbPAm2bEP5cJE FAcy2bMTpiaPJx957dbimhEQuSreRx1OOdzH6jK74g+d/WJ3fHy0RHh9QXY0Rpe+ JLsPDOpau2gDs6HoKNvF9yVPM32sa/BWJGtLqGFhQngmzIye9WmBEVMX+c6w9q9N gxc7uiDBYXMSi4D2rGE5HwQJq3AM6InTOKkyAkDZv6EObvUeZ0JQKtFlC6tW3z0x aXTzs9RjvzS2er5ULPyxYV3QxBynRzI80VoWq5p3Z4M34dIaSsJeuWlhTWiIktzl U+M7G1Ukk3owmmXtYC0nBOIBq2IEzRzL28nXwbz3h8EUp1kYzwsZ9VpP6NitOP+6 E2yywBEDIrJL22RNSt79GLKlnLKpBNitWq5xCoWdXE625pBDSEH4cKlE5Afwi7j7 /jNGjxRv4Rre6+PcgrPLq3JSaEDHAs+tKuBvkJWgCKCc45KkaGiiwS5Tp32odqdA Q75F+8Epolx00aA948PwJ827VMtMT6U6z79ypluI5tgHuldhS73pmg9PvLtVfYG6 TlexSFUC1eq0FJWwS8yxY2HO20ZbQpOjpmrxR0mu2ACcFfdH8Ut6dspB5g2ttrGU XgXrPCumoV8HxXzwDcMu =B2eH -----END PGP SIGNATURE-----

2 4

Re: user32/tests: Add tests for MsgWaitForMultipleObjectsEx.
by Marvin 06 Nov '14

06 Nov '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=10062 Your paranoid android. === w7u (32 bit msg) === msg.c:12147: Test failed: unexpected hwnd 0014013C msg.c:12169: Test failed: bad time 308c6/308d6

1 0

Re: [PATCH 1/5] d3d10core/tests: Port alpha_test() to d3d10core.
by Marvin 06 Nov '14

06 Nov '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=10061 Your paranoid android. === wvistau64 (32 bit device) === device.c:2175: Test failed: Failed to create input layout, hr 0x80070057. device.c:2210: Test failed: Failed to create texture, hr 0x80070057. device.c:2212: Test failed: Failed to create rendertarget view, hr 0x80070057. device.c:2260: Test failed: Got unexpected color 0x800000ff. device.c:2262: Test failed: Got unexpected color 0x800000ff. device: unhandled exception c0000005 at 7306CBBD === w2008s64 (32 bit device) === device.c:2175: Test failed: Failed to create input layout, hr 0x80070057. device.c:2210: Test failed: Failed to create texture, hr 0x80070057. device.c:2212: Test failed: Failed to create rendertarget view, hr 0x80070057. device.c:2260: Test failed: Got unexpected color 0x800000ff. device.c:2262: Test failed: Got unexpected color 0x800000ff. device: unhandled exception c0000005 at 744ACBBD === w8 (32 bit device) === device.c:2175: Test failed: Failed to create input layout, hr 0x80070057. device.c:2210: Test failed: Failed to create texture, hr 0x80070057. device.c:2212: Test failed: Failed to create rendertarget view, hr 0x80070057. device.c:2260: Test failed: Got unexpected color 0x800000ff. device.c:2262: Test failed: Got unexpected color 0x800000ff. device: unhandled exception c0000005 at 0040155D === wvistau64 (64 bit device) === device.c:2175: Test failed: Failed to create input layout, hr 0x80070057. device.c:2210: Test failed: Failed to create texture, hr 0x80070057. device.c:2212: Test failed: Failed to create rendertarget view, hr 0x80070057. device.c:2260: Test failed: Got unexpected color 0x800000ff. device.c:2262: Test failed: Got unexpected color 0x800000ff. device: unhandled exception c0000005 at 00000000745122BF === w2008s64 (64 bit device) === device.c:2175: Test failed: Failed to create input layout, hr 0x80070057. device.c:2210: Test failed: Failed to create texture, hr 0x80070057. device.c:2212: Test failed: Failed to create rendertarget view, hr 0x80070057. device.c:2260: Test failed: Got unexpected color 0x800000ff. device.c:2262: Test failed: Got unexpected color 0x800000ff. device: unhandled exception c0000005 at 00000000746C22BF

1 0

Re: [PATCH 1/5] d3d10core/tests: Port alpha_test() to d3d10core.
by Marvin 06 Nov '14

06 Nov '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=10060 Your paranoid android. === w8 (32 bit visual) === visual.c:2635: Test failed: unexpected colortable on offscreen surface

1 0

Re: [PATCH 1/2] kernel32/tests: Add UTF-7 non-encoded surrounding characters tests.
by Alexandre Julliard 06 Nov '14

06 Nov '14

Alex Henrie <alexhenrie24(a)gmail.com> writes: > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, input, 4, output, sizeof(output) - 1, NULL, NULL); > + ok(GetLastError() == 0xdeadbeef, > + "i=0x%04x: expected error=0xdeadbeef, got error=0x%x\n", i, GetLastError()); Testing last error on success is not useful and should be avoided. -- Alexandre Julliard julliard(a)winehq.org

2 3

WineHQ Downloads page needs a disclaimer
by Rosanne DiMesio 06 Nov '14

06 Nov '14

A good example of why: https://bugs.winehq.org/show_bug.cgi?id=36964#c15 Our Downloads page doesn't directly say that the binary packages listed are officially endorsed, but it does give that impression: only a few distros are listed, the very top of the page says "Supported Wine" in big letters, and while the 3rd Party Tools section explicitly says those aren't supported, the Binary Downloads section gives no such warning. Users who assume that the packages listed on that page have the "WineHQ seal of approval" aren't being unreasonable. This isn't just an issue with the Fedora packges. The Ubuntu packages with winepulse and changes to dsound have long been a problem (plus https://bugs.winehq.org/show_bug.cgi?id=34299), and the CentOS/RHEL 7 packages are 64 bit only. I have stickies on the forum about all these things, but not everyone comes through the forum. The Downloads page needs to make it much clearer to users that the distro packages listed are not "official" WineHQ packages. The wording could be something like "Binary packages are built and maintained by the distros, and may contain patches that are not supported here. The links below are provided solely as a convenience to users and do not represent an endorsement." (Posting here because that's what I've been told to do for such issues.) -- Rosanne DiMesio <dimesio(a)earthlink.net>

3 2

Re: [1/2] d3dx9_36: Implement D3DXCreatePolygon. (try 5)
by Matteo Bruni 05 Nov '14

05 Nov '14

2014-11-05 18:47 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Argh, head->wall - accidentially made the changes to v2 instead of v3. ;) > Again replace ~0 -> ~0U. Yeah, I noticed that but it wasn't a showstopper of course, no need to bang your head to the wall :D I confirm my approval (as much as it might matter), including patch 107477. > > Based on a patch by David Adam. > --- > dlls/d3dx9_36/d3dx9_36.spec | 2 +- > dlls/d3dx9_36/mesh.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ > include/d3dx9shape.h | 2 ++ > 3 files changed, 91 insertions(+), 1 deletion(-) > > >

1 0

Re: [2/2] d3dx9_36/tests: Add tests for D3DXCreatePolygon. (try 4)
by Matteo Bruni 05 Nov '14

05 Nov '14

2014-11-05 18:25 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Changes in try 4: > * Use smaller buffer > * Fix typo > * Remove error checking & goto > > Changes in try 3: > * Replace ~0 -> ~0U. > > Changes in try 2: > * Lot of style cleanups - hopefully I didn't miss anything. > * Fix condition for 'sides' argument (should be >= 3, not just != 0) > * Added test to check if *mesh is cleared on error - tests show that this is not the case. > I only kept a single test for that to avoid making the test code too ugly. > > Based on a patch by David Adam. > --- > dlls/d3dx9_36/tests/mesh.c | 155 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 155 insertions(+) FWIW, series looks good to me.

1 0

Re: [2/2] d3dx9_36/tests: Add tests for D3DXCreatePolygon. (try 3)
by Matteo Bruni 05 Nov '14

05 Nov '14

2014-11-04 19:57 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Based on a patch by David Adam. > --- > dlls/d3dx9_36/tests/mesh.c | 163 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 163 insertions(+) Hi Sebastian, first of all, let me say I'm okay with these patches going in as they are. IMHO there is still room for improvement though: +static void test_polygon(IDirect3DDevice9 *device, float length, unsigned int sides) +{ + HRESULT hr; + ID3DXMesh *polygon; + struct mesh mesh; + char name[256]; No need to use such a big array there. + hr = D3DXCreatePolygon(device, length, sides, &polygon, NULL); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + if (hr != D3D_OK) + { + skip("Couldn't create box\n"); Copy-paste typo. FWIW, we usually prefer a '.' at the end of trace messages. + adjacency = NULL; + hr = D3DXCreatePolygon(device, 3.0f, 11, &polygon, &adjacency); + ok(hr == D3D_OK, "Expected D3D_OK, received %#x\n", hr); + + if (FAILED(hr)) + { + skip("D3DXCreatePolygon failed\n"); + goto end; + } That D3DXCreatePolygon() call is not expected to ever fail, so no need for the "if". + if (adjacency) + ID3DXBuffer_Release(adjacency); If you remove the previous "if" you won't need the "end" label and this one becomes always true. Then I'd put this Release() right after the loop checking the adjacency. Again, I don't care about those details, this is still good enough for me. It's mostly about any future patch you'd want to send in.

2 2

Re: advapi32/tests: Avoid a crash on some linux hosts.
by Marvin 05 Nov '14

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

1 0

Re: msi: Simplify check for an empty string (PVS-Studio)
by Marvin 05 Nov '14

05 Nov '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=10031 Your paranoid android. === w2000pro (32 bit action) === The test timed out === wxppro (32 bit action) === The test timed out === wvistau64 (32 bit action) === The test timed out === w7u (32 bit action) === The test timed out === w8 (32 bit action) === The test timed out === wvistau64 (64 bit action) === Failure running script in VM: timed out waiting for the child process

2 1

Re: imm: Fix switching to Chinese IEM after typing some English will fail
by Aric Stewart 05 Nov '14

05 Nov '14

On 11/3/14, 8:52 PM, 黄巍 wrote: > Bug 35896 - Switching to Chinese input method after typing some English will fail. > https://bugs.winehq.org/show_bug.cgi?id=35896 > > --- > dlls/imm32/imm.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c > index 7ed1fe6..47c7ea8 100644 > --- a/dlls/imm32/imm.c > +++ b/dlls/imm32/imm.c > @@ -2901,6 +2901,8 @@ BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD > else > return FALSE; > > + data->immKbd = IMM_GetImmHkl(hKL); > + > if (!data->immKbd->hIME || !data->immKbd->pImeProcessKey) > return FALSE; > > I recently made a fix to this area of a bug very similar to the one your reported. Have you tested with the most recent development build without your patch to see if it was already fixed? I feel like your change should be unnecessary after my modification. -aric

2 1

Re: [PATCH 7/7] reg: Clean up reg_delete
by Stefan Dösinger 04 Nov '14

04 Nov '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +#define MAX_VALUE_NAME 16384 This is ugly. Why not use lpcMaxValueNameLen from RegQueryInfoKey like the old code does? > +#define ERROR_NO_DELETE_ROOTKEY 20003 Ah, here we have the case I raised in patch 3 :-) . This seems like another error case that advapi32 should be able to handle for you. It needs tests in reg.exe and advapi32.dll. That's assuming the call is really supposed to fail - if it succeeds we obviously don't want to test it and destroy the Windows installation in the process. Before you test this on the testbot ask fgouget if it is safe to test. I believe it is since the VMs are restored from read-only snapshots after every test run. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIbBAEBAgAGBQJUWVxsAAoJEN0/YqbEcdMwQhQP92zeYVEhBb4RXRMhtNsrtU6R jHPf1hGDtMM484wNhpHv97C/2sQ5RUq4bEAanyNNxdLZEFUJ7vT3LVNcEOmPqVI+ jKR5G9h0tXtqaGlee6fHiMPN6ZfRZjxqCNrNICXcCO13f/eErT+uCRPqLAh5b8YY Tpo5CsOJgS9tGh2UHBFbRt+ZAa/M0Mu4N/6253140HxQfVVgJ2Q3j3fERJ5TacJI o26uQpWD0Olu+pv64Ej3eehnGJ5cmHld9wBdbIJjRwvQ8knukzPC6tdhAlZrVoTN KI3F8r+LIlNQm/VF/E3cQWo/vTXDJsQ5tArOMyQfWvLBzpHOZ3Lye4fF2wwvgVFG VOfcui1eFmGYR/4f+r/mxbespuyYYBBD+rR2kDnhXgrxqegDIpyfPFN3cQQDSHJD FVoEb8mb4nxkqckywWw4tDBp7TM0dOJsUKeLIyjmT4sl+LH8YWCuINL0eN7i9AlV XhK7wjF02vVmXrRiJDycJkAAoS4yxY5tyEPM0Ua/M68cLQ5SJNx1oOXWTJSu5W+b XNAgc4MCGhtNOsaNE7SQdyETYfoqeStv1BxEb0eTFb+z+uia0lDpxFuytbSkTqWH xEJJe+bmNnhDqkmOUOz8ShfWoGVmvwGg99t+2XBWmRaveFBHXvJkb2D4XXjfCK7D CxvCYItQ7xN6Ub9vKMc= =deiq -----END PGP SIGNATURE-----

1 0

Re: [PATCH 5/7] reg: Add wchar/raw data conversion functions
by Stefan Dösinger 04 Nov '14

04 Nov '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +static LSTATUS wchar_get_data( const WCHAR *input, const DWORD type, > + const WCHAR separator, DWORD *size_out, BYTE **out) > +{ > + DWORD i; > > - switch (reg_type) > + if (!input) > + return data_default(type, size_out, out); > + > + switch (type) > { > case REG_SZ: > + case REG_EXPAND_SZ: Another option to consider instead of the switch construct: Add conversion function pointers to struct type_rel. In this case you cannot use an anonymous structure. wchar_get_type would return a const struct type_rel *, and you can get the REG_* DWORD from it and call the data conversion function. The same can be done in the opposite direction. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUWVgQAAoJEN0/YqbEcdMwfBUP/1IEsXZU+GuDO/fyjUGeRcke TBPRvRdgWpDtGc9Bm35dimRPXX8nw/Sk/2KLRRpqnWKQp76LuwYCkB7exWaJLWDP jxb/MP3QdWKkxxmkJDwerviB2ouoW6TWgatksCO+MOmxzQcwrJj2l88LefgQeD0Y w3T/kv5oWsKpIuZVJjtg4Jw8FNo1Q7PQI1bJaoa16t+Hb1KPUwn0U5/bVqD30B8H OqCEdv1jlqSYEMXP4yD3QXpapyDu8R//gCqcIdFml1MO9XdOR5sSnkdUqQipSNjZ 0UyBDtUVp/3KsI+cz4Uk3HqgaHnXFhESyG0CBMySM/we3ofWGvya5lOmPBP4+Tzo pI0xlzI2eapf9Pr9ROrz5qELdUTFc2ahF1EqVOvltLJxpVgBgNhMe7PaG11gJTsE FvK0BgAbvUOfRyiWI6MiyQcU6cwznXM19i0rGHj3hO1IgwcMZazn5weus3qrm+jM /vS2Ul6eUoB7kdWZgrKG2ehBLMLrQZRe0G4ra3B3AcCl7Ol05Sxm0F6Wntm0sZZg 2CTbyX3SwXeGSax4DH+MzFG3u31h6dNArtKLlKU0NzW9t7pGxW8L8QIFxQaMAvBS pzNwB1icU0Vc49ETx1fK6SmMZTuDU6mPRrEqxpdBfn+YGW6acnZMFq4qKe1rxgyy aXvXsCnlBCn90b0wefPI =S2A4 -----END PGP SIGNATURE-----

1 0

Re: [PATCH 5/7] reg: Add wchar/raw data conversion functions
by Stefan Dösinger 04 Nov '14

04 Nov '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +#define ERROR_NAN 20002 ERROR_NEGATIVE_VALUE would be a better name since NAN is a floating point thing. > +static LSTATUS data_default(const DWORD type, DWORD *size_out, BYTE **out) I think the old behavior of passing NULL to RegSetValueExW if no data is specified with /d was nicer. That's assuming it does the right thing for all data types. This may need tests in advapi32/tests/registry.c The bottom line of this suggestion and things like passing a NULL HKEY to RegOpenKey in patch 3, or trailing backslashes in patch 2 is to leave as much error handling to the advapi32 functions as possible. I think reg.exe should be a fairly minimal string parsing program that blindly forwards everything to advapi32 and doesn't do much checking on its own. The exception are kinda of errors that are not possible in advapi32 by design, like a negative REG_DWORD. You're welcome to prove me wrong with tests that show advapi32 and reg.exe error handling differ :-) Another possibility is that native assumes a default value string of "" if /d is not specified, which then produces behavior like an empty REG_SZ and fails to convert into a DWORD. > { > - LPBYTE out_data = NULL; > - *reg_count = 0; > + switch (type) > + { > ... > + case REG_DWORD: > + case REG_DWORD_BIG_ENDIAN: > + { > + return ERROR_NAN; > + } It's odd that there isn't a default value for REG_DWORD, 0 would be a logical choice. But the tests confirm this... But I don't see why you haven't removed the todo_wine from the according test. > + default: > + return ERROR_UNSUPPORTED_TYPE; I think this is a bad place to catch unsupported data types. "type" comes from one of your own functions, namely wchar_get_type(). If reg.exe shouldn't support any of the data types not explicitly handled here then wchar_get_type should already return an error in this case. Otherwise you can make this a FIXME("Add support for type %u\n" type); -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUWVSuAAoJEN0/YqbEcdMwd9IP/A2J8L9/QJxCHc+g+rOFI/GB y+NA9dQJ2MXnCC7DeGU0myblOeRlTkFRqA3R/isM21IBSmOPLseLqSexzuvf8fwf y1cSEZ49z3yLI7rrVt0VEhX8p9dqkczU+W3GWE2M9jOkP88pxNSPsm5vIO+VtJRi 1GqGp3Snz4NQ6jCQGHn30M4vwgxRXS0gxkmGj1iEcA772vEWpNuAOptDQ9j0fGan aXzdmQMF8VDJMeGR6uI+8JuM2ERAjt9EE/2PGLjH0b9zpPR8V7Z+ECqPJh9kTJv6 wxM1wCHzsGXDQYlqQzQjaoWNIchrEybqgnaar0KS4H0+Hz8DKOz1StDB5bfQ2bHi lBiQ5a4T6AXOlNOH49RiLcPLrHUoUcmvFd+Cr4HngySeu0WkFvtsfdFjppJW+nrw aXMuKoZpje0+5EjTgI255Oi6vZnx+piy1hRn1zSTE5xq9lnyEPVaemtus77x4rOL 82/TChrSaeYg/uXrFNWFZG9fb38L2EIyeIQSLZwTYIHrE6p2IGp1AnMPkDcM4TcC rMQXEW3IPdmR2EXf2gZ0PuU3Sab4M9dWuMsJ/E4H6vOu/d9/BfnGle1TR6hP6Pqu XlZrjrm0Ifh/fnWec75Yc6rpj1Ueen4C1/dAxjDe3sn509qAvfREUtUH3psBLGXQ uCkQoWInlbV4UmVjl1Gg =hZLk -----END PGP SIGNATURE-----

1 0

Re: [PATCH 4/7] reg: Add wchar/type conversion functions
by Stefan Dösinger 04 Nov '14

04 Nov '14

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

1 0

Re: [PATCH 2/7] reg: Check key paths in main
by Stefan Dösinger 04 Nov '14

04 Nov '14

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

1 0

Re: [PATCH 1/7] reg: Add system error printing function
by Stefan Dösinger 04 Nov '14

04 Nov '14

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

1 0

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

04 Nov '14

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

2 1

Re: [1/2] d3dx9_36: Implement D3DXCreatePolygon.
by Matteo Bruni 04 Nov '14

04 Nov '14

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

3 2

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

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

2 1

Re: advapi32/tests: Simplify empty string check (PVS-Studio).
by Marvin 04 Nov '14

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

2 1

Re: [2/2] kernel32/tests: Add tests for FindFirstFileExW level FindExInfoBasic.
by Marvin 04 Nov '14

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

1 0

[PATCH] iphlpapi: call SetLastError in NotifyAddrChange/NotifyRouteChange(try 2)
by Hao Peng 04 Nov '14

04 Nov '14

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

1 0

Re: [PATCH 6/6] d3d8/tests: Add an ATI1N entry to the test_volume_blocks test.
by Marvin 04 Nov '14

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

1 0

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

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

1 0

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

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

1 0

Re: ws2_32: Add tests and implement inet_pton
by Marvin 03 Nov '14

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

1 0

Re: [2/2] d3dx9_36/tests: Add tests for D3DXCreatePolygon.
by Matteo Bruni 03 Nov '14

03 Nov '14

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

2 2

Wine Gecko 2.34 released
by Jacek Caban 03 Nov '14

03 Nov '14

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

1 0

Re: [2/2] wined3d: wined3d: Take abs() of vertex z coordinate as FFP fog coordinate (try 2)
by Henri Verbeet 03 Nov '14

03 Nov '14

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

1 0

Re: [PATCH 2/2] user32/tests: Test exception handling for timer callbacks.
by Alexandre Julliard 03 Nov '14

03 Nov '14

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

2 1

[PATCH] iphlpapi: call WSASetLastError in NotifyAddrChange/NotifyRouteChange
by Hao Peng 03 Nov '14

03 Nov '14

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

2 1

Re: [4/6] msvcrt: Added _fread_nolock_s implementation
by Alexandre Julliard 03 Nov '14

03 Nov '14

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

2 2

[PATCH] Mystery hang reduction -- clear new allocations
by mtewoodbury＠gmail.com 02 Nov '14

02 Nov '14

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

2 1

Re: [PATCH] vbscript: Implemented String(try 2)
by Piotr Caban 02 Nov '14

02 Nov '14

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

3 3

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

02 Nov '14

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

1 0

Re: [PATCH] cmd/tests: Add tests for 'del' (Fixes bug 35970)
by Marvin 02 Nov '14

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

2 1

Re: [2/2] oleaut32: Implement TLB dependencies lookup in resources (resend 3 - last submit before abandon)
by Sebastian Lackner 01 Nov '14

01 Nov '14

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

1 0

Re: [2/2] oleaut32: Implement TLB dependencies lookup in resources (resend 3 - last submit before abandon)
by Guillaume Charifi 01 Nov '14

01 Nov '14

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

1 0

Re: comctl32: Avoid magic numbers
by Nikolay Sivov 31 Oct '14

31 Oct '14

> /* FIXME: This flag is undocumented and unknown by our CompareString. > - * We need a define for it. > */ > - dwFlags = 0x10000000; > + dwFlags = LOCALE_RETURN_GENITIVE_NAMES; > if (!bCase) dwFlags |= NORM_IGNORECASE; It makes no sense to use this flag from CompareString(). I think it's better to remove it along with this comment.

3 2

Re: [PATCH 2/2] user32/tests: Test exception handling for timer callbacks.
by Marvin 31 Oct '14

31 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=9924 Your paranoid android. === w7u (32 bit msg) === msg.c:12154: Test failed: unexpected hwnd 0014013C msg.c:12176: Test failed: bad time 325e7/325f6

1 0

Re: [2/2] oleaut32: Implement TLB dependencies lookup in resources (resend 3 - last submit before abandon)
by Alexandre Julliard 31 Oct '14

31 Oct '14

Guillaume Charifi <guillaume.charifi(a)sfr.fr> writes: > + strcpyW(szTLBPath, szPath); > + snprintfW(szStringName, sizeof(szStringName)/sizeof(WCHAR), resFormatStrW, PtrToInt(lpszIntName)); > + strcatW(szTLBPath, szStringName); > + > + ret = TLB_PEFile_Open(szPath, PtrToInt(lpszIntName), &pBase, &dwTLBLength, &pFile); > + if (ret == TYPE_E_CANTLOADLIBRARY) > + ret = TLB_NEFile_Open(szPath, PtrToInt(lpszIntName), &pBase, &dwTLBLength, &pFile); > + if (ret == TYPE_E_CANTLOADLIBRARY) > + ret = TLB_Mapping_Open(szPath, &pBase, &dwTLBLength, &pFile); > + if (SUCCEEDED(ret)) > + { > + if (dwTLBLength >= 4) > + { > + DWORD dwSignature = FromLEDWord(*((DWORD*) pBase)); > + if (dwSignature == MSFT_SIGNATURE) > + pTLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength); > + else if (dwSignature == SLTG_SIGNATURE) > + pTLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); > + else > + { > + FIXME("Header type magic 0x%08x not supported.\n", dwSignature); > + ret = E_FAIL; > + } > + } > + else > + ret = E_FAIL; > + IUnknown_Release(pFile); > + } You should avoid duplicating all that code. > + if(pTLib) { > + ITypeLibImpl *impl = impl_from_ITypeLib2(pTLib); > + ret = UuidEqual((UUID *)This->guid, (UUID *)TLB_get_guid_null(impl->guid), &rpc_stat); > + ITypeLib_Release((ITypeLib *)pTLib); > + > + ret = (ret == TRUE) ? LoadTypeLibEx(szTLBPath, REGKIND_NONE, (ITypeLib **)&pTLib) : E_FAIL; > + } That's pretty ugly. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/5] d3d9/tests: Add a test for ATI1N and ATI2N texture formats.
by Henri Verbeet 30 Oct '14

30 Oct '14

On 29 October 2014 18:01, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -6145,6 +6145,7 @@ static void test_lockrect_offset(void) > {D3DFMT_DXT3, "D3DFMT_DXT3", 4, 4, 16}, > {D3DFMT_DXT4, "D3DFMT_DXT4", 4, 4, 16}, > {D3DFMT_DXT5, "D3DFMT_DXT5", 4, 4, 16}, > + {MAKEFOURCC('A','T','I','1'), "ATI1N", 1, 1, 1}, > {MAKEFOURCC('A','T','I','2'), "ATI2N", 1, 1, 1}, Mostly just curiosity, but there are other tests in device.c for ATI2N, any reason for not adding ATI1N coverage to those as well? > + static const DWORD expected_colors_ati[] = {0x003f3f3f, 0x003f3f3f, 0x00007fff, 0x007f00ff}; > + static const DWORD expected_colors_nvidia[] = {0x007f0000, 0x007f0000, 0x00007fff, 0x007f00ff}; Conceptually I might have preferred this as static const struct { struct vec2 position; D3DCOLOR amd; D3DCOLOR nvidia; } expected_colors[] { ... } but it's not a big deal. > + for (i = 0; i < 4; ++i) > + { > + color = getPixelColor(device, 80 + 160 * i, 240); > + trace("Got 0x%08x.\n", color); Is this leftover debug code?

2 2

Need feedback on first four UTF-7 patches
by Alex Henrie 30 Oct '14

30 Oct '14

Alexandre, I submitted four UTF-7 patches on October 19 and am still waiting for feedback. I was hoping that these patches would not be controversial because they only add encoding tests. I have six additional patches waiting in https://github.com/alexhenrie/wine/commits/master - four patches for adding decoding tests and two patches to make all the tests pass - but I will not submit them until I get feedback about the first four that I have already submitted. -Alex

8 13

Re: msi: Format registry values before interpreting value type.
by Marvin 30 Oct '14

30 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=9898 Your paranoid android. === wxppro (32 bit action) === The test timed out === w7u (32 bit action) === The test timed out

1 0

Re: [PATCH 3/5] wined3d: Dirtify pixel shader on texture format change.
by Henri Verbeet 30 Oct '14

30 Oct '14

On 29 October 2014 18:01, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + if (!prev || op->texture->target != prev->target > + || op->texture->resource.format != prev->resource.format) Shouldn't this just check the color_fixup? And in principle I think this would apply to vertex shaders as well, except that we don't track color fixups in struct vs_compile_args at all. The real pain will come with d3d10 of course, since you can access a much larger amount of resources there.

2 1

Re: dplayx: Fix some crashes and wine_todo's ( try 3)
by Marvin 30 Oct '14

30 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=9894 Your paranoid android. === w8 (32 bit dplayx) === Failure running script in VM: timed out waiting for the child process

1 0

Re: [PATCH 1/4] kernel32/tests: Add simple UTF-7 encoding tests.
by Sebastian Lackner 29 Oct '14

29 Oct '14

On 20.10.2014 06:41, Alex Henrie wrote: > --- > dlls/kernel32/tests/codepage.c | 134 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 134 insertions(+) > > diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c > index 8423c75..684ede1 100644 > --- a/dlls/kernel32/tests/codepage.c > +++ b/dlls/kernel32/tests/codepage.c > @@ -412,6 +412,138 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) > ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); > } > > +static void test_utf7_encoding(void) > +{ > + struct simple_test > + { > + WCHAR utf16[1024]; > + int utf16_len; > + char utf7[1024]; > + int utf7_len; 1024 is unnecessary big. A couple of bytes would be sufficient for all these tests. > + }; > + > + static const struct simple_test simple_tests[] = { No need to give that struct a name. You can simply do: static const struct { ... } simple_tests[] = { ... } > + /* tests some valid UTF-16 */ > + { > + {0x4F60,0x597D,0x5417,0}, > + 4, > + "+T2BZfVQX-", > + 11 > + }, > + /* tests some invalid UTF-16 */ > + /* (stray lead surrogate) */ That looks ugly, either put it in a single line or use: /* line1 * line2 */ > + { > + {0xD801,0}, > + 2, > + "+2AE-", > + 6 > + }, > + /* tests some more invalid UTF-16 */ > + /* (codepoint does not exist) */ > + { > + {0xFF00,0}, > + 2, > + "+/wA-", > + 6 > + } > + }; > + > + int i; > + > + for (i = 0; i < sizeof(simple_tests) / sizeof(simple_tests[0]); i++) > + { > + char c_buffer[1024]; > + WCHAR w_buffer[1024]; Same as above, way too big. > + int len; > + > + c_buffer[sizeof(c_buffer) - 1] = 0; > + w_buffer[sizeof(w_buffer) / sizeof(WCHAR) - 1] = 0; It probably makes more sense to initialize the buffers before each test, instead of one time at the beginning. > + > + /* test string conversion with srclen=-1 */ > + memset(c_buffer, '#', sizeof(c_buffer) - 1); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -1, c_buffer, sizeof(c_buffer), NULL, NULL); > + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) > + { > + skip("UTF-7 encoding not implemented\n"); > + return; > + } At my opinion it would be better to do one basic test at the beginning, and then abort immediately, instead of doing that inside of the for loop, if its not too complicated. > + ok(len == simple_tests[i].utf7_len && > + strcmp(c_buffer, simple_tests[i].utf7) == 0 && > + c_buffer[len] == '#', > + "simple_test failure i=%i dst=\"%s\" len=%i\n", i, c_buffer, len); > + ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); > + > + /* test string conversion with srclen=-2 */ > + memset(c_buffer, '#', sizeof(c_buffer) - 1); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -2, c_buffer, sizeof(c_buffer), NULL, NULL); > + ok(len == simple_tests[i].utf7_len && > + strcmp(c_buffer, simple_tests[i].utf7) == 0 && > + c_buffer[len] == '#', > + "simple_test failure i=%i dst=\"%s\" len=%i\n", i, c_buffer, len); > + ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); You are testing a lot of things in a single ok(...) block. It will be very difficult to find out whats wrong if we get test failures in the future. I think it would be better to split that into multiple checks, probably with some more meaningful message about what is wrong (wrong len, wrong content, ...) > + > + /* test string conversion with dstlen=len-1 */ > + memset(c_buffer, '#', sizeof(c_buffer) - 1); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -1, c_buffer, simple_tests[i].utf7_len - 1, NULL, NULL); > + ok(len == 0 && > + memcmp(c_buffer, simple_tests[i].utf7, simple_tests[i].utf7_len - 1) == 0 && > + c_buffer[simple_tests[i].utf7_len - 1] == '#', > + "simple_test failure i=%i dst=\"%s\" len=%i\n", i, c_buffer, len); > + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "error=%x\n", GetLastError()); > + > + /* test string conversion with dstlen=len */ > + memset(c_buffer, '#', sizeof(c_buffer) - 1); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -1, c_buffer, simple_tests[i].utf7_len, NULL, NULL); > + ok(len == simple_tests[i].utf7_len && > + strcmp(c_buffer, simple_tests[i].utf7) == 0 && > + c_buffer[len] == '#', > + "simple_test failure i=%i dst=\"%s\" len=%i\n", i, c_buffer, len); > + ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); > + > + /* test string conversion with dstlen=len+1 */ > + memset(c_buffer, '#', sizeof(c_buffer) - 1); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -1, c_buffer, simple_tests[i].utf7_len + 1, NULL, NULL); > + ok(len == simple_tests[i].utf7_len && > + strcmp(c_buffer, simple_tests[i].utf7) == 0 && > + c_buffer[len] == '#', > + "simple_test failure i=%i dst=\"%s\" len=%i\n", i, c_buffer, len); > + ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); > + > + /* test dry run with dst=NULL and dstlen=0 */ > + memset(c_buffer, '#', sizeof(c_buffer)); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -1, NULL, 0, NULL, NULL); > + ok(len == simple_tests[i].utf7_len && > + c_buffer[0] == '#', > + "simple_test failure i=%i len=%i\n", i, len); > + ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); > + > + /* test dry run with dst!=NULL and dstlen=0 */ > + memset(c_buffer, '#', sizeof(c_buffer) - 1); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -1, c_buffer, 0, NULL, NULL); > + ok(len == simple_tests[i].utf7_len && > + c_buffer[0] == '#', > + "simple_test failure i=%i len=%i\n", i, len); > + ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); > + > + /* all simple utf16-to-utf7 tests can be reversed to make utf7-to-utf16 tests */ > + memset(w_buffer, '#', sizeof(w_buffer) - sizeof(WCHAR)); > + SetLastError(0xdeadbeef); > + len = MultiByteToWideChar(CP_UTF7, 0, simple_tests[i].utf7, -1, w_buffer, sizeof(w_buffer) / sizeof(WCHAR)); > + todo_wine ok(len == simple_tests[i].utf16_len && > + memcmp(w_buffer, simple_tests[i].utf16, len * sizeof(WCHAR)) == 0 && > + w_buffer[len] == 0x2323, > + "simple_test failure i=%i dst=%s len=%i\n", i, wine_dbgstr_w(w_buffer), len); > + todo_wine ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); Why do you use todo_wine when the whole test block is skipped? Moreover, it should probably go into the later patches which add the MultibyteToWideChar tests. > + } > +} > + > static void test_undefined_byte_char(void) > { > static const struct tag_testset { > @@ -618,6 +750,8 @@ START_TEST(codepage) > test_string_conversion(NULL); > test_string_conversion(&bUsedDefaultChar); > > + test_utf7_encoding(); > + > test_undefined_byte_char(); > test_threadcp(); > } >

1 0

Re: [2/2] oleaut32: Implement TLB dependencies lookup in resources (resend 3 - last submit before abandon)
by Andrew Eikum 29 Oct '14

29 Oct '14

On Sat, Sep 27, 2014 at 08:10:28PM +0200, Guillaume Charifi wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=34184 > > This is the last time without a review before I give up. > I'm not sure why this is hung up, but to reiterate, it seems acceptable to me. Andrew

1 0

Re: [PATCH 1/6] reg: Sanitize key paths in main
by Stefan Dösinger 29 Oct '14

29 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, This patch is a lot more readable than the past version IMO. I'll look at the other patches tomorrow. Am 2014-10-27 13:10, schrieb Jonathan Vollebregt: > +static WCHAR *sanitize_path(WCHAR *key){ Inconsistent curly bracket placement. The other patches have more cases of that. > + else > + reg_message(STRING_INVALID_KEY); Doesn't get_rootkey() implicitly take care of this? I don't see why you need an extra check for a single leading backslash. There's one (intended?) side effect of this check though: It ensures that the code below doesn't crash on the input string "\\". > + i = strlenW(key); > + if (key[i - 1] == '\\') > + key[i - 1] = 0; Why do you need this? The existing code and the todo_wine test suggests that RegCreateKey accepts any number of trailing slashes. Adding a test for this in dlls/advapi32/tests/registry.c would be a good idea. This is the only case where you modify the input string. If it indeed is not necessary you can change the parameter to a const WCHAR * and return a BOOL. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUTs1oAAoJEN0/YqbEcdMw0rsP/3XocRwBZ2zPgs/0ERHMOL0q 84+09LlpOMMBzEQDue4WnxLgNwT6EUdP1W+CpMLtjdh6r35qePWRuHwrieuRoKsF 7SoZhAqB1XGfSTfHC5yaSlC3a3didsGn8wCvb9R66wFcBstWY+wW9cdnyUzRhXeK oowmLBioiKlWGHBX84k7pvxLEzokeW+yEj0D/NXaVeFJ5ATfsqRynIiMJOeMJzJj XcnrH9YBDzvOy36zSREclwEtwt73dZ9dRYiLO4fHaaqsBMM0xiuZYl5CkfUxGjtm /c33mOOUl4l9EEpQLdu6kMtrT6kF13XbT2ume0AcqTbL4KrJVl7j173wck0vt1e7 kaLS1ViU4TGxHHo7mkqfMUjDpJM1tR5etV9DqQGQYui+BQ1ZOTpISrmuFxbXPAOd ecwvZGXEePGWrZlsV4lECc25/1BJQfEpxKK/5pc6fTv0TYd+JGOOnOSlTR9xlOSW rs/mjTuedQDNIFr+RvfMK+OpJIXXA9ve0jkpDX0XLnl3lZWG0p+rGholQXwHC5VS 1YUucH8moIW/8kN1s39/RSzcBgkxvAEDgiFsIigYqyEnPpafTbSQn3rNIVD5DQ0X +Fy7gBffr+uaOSKAh8ShdMGvRFGipd4WNQTelemCVcD1Pku2X01ImBImyHeMxBzW 2JdXxGTtZT8PribxigHn =eTay -----END PGP SIGNATURE-----

2 6

Re: [1/2] ndis.sys: add a stub dll
by Alistair Leslie-Hughes 29 Oct '14

29 Oct '14

Hi Austin, On 29/10/14 06:10, Austin English wrote: > > -- > -Austin This file should be installed into the system32\drivers directory by default. Modify wine.in.inf, look for mountmgr.sys as an example. Best Regards Alistair Leslie-Hughes

2 1

Re: [PATCH] mshtml: check null before release the elem object
by Jacek Caban 29 Oct '14

29 Oct '14

Hi Hao, On 10/24/14 11:37, Hao Peng wrote: > Check null pointer before release the script elem object, prevent to > release them twice. The real problem is that stop_binding is called twice. I sent a patch fixing that. Jacek

1 0

Re: dpnet: Implement IDirectPlay8Address GetComponentByName (try 2 - resend)
by Stefan Dösinger 29 Oct '14

29 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-29 05:26, schrieb Alistair Leslie-Hughes: > + switch (entry->type) + { + > case DPNA_DATATYPE_DWORD: + memcpy(pvBuffer, > &entry->data.value, sizeof(DWORD)); + break; + > case DPNA_DATATYPE_GUID: + memcpy(pvBuffer, > &entry->data.guid, sizeof(GUID)); + break; + > case DPNA_DATATYPE_STRING: + memcpy(pvBuffer, > &entry->data.string, entry->size); + break; + > case DPNA_DATATYPE_STRING_ANSI: + > memcpy(pvBuffer, &entry->data.ansi, entry->size); + > break; + case DPNA_DATATYPE_BINARY: + > memcpy(pvBuffer, &entry->data.binary, entry->size); + > break; + } Using assignments like in AddComponent would be nicer. Since you're replacing everything but the function declaration you can rename the parameter names to get rid of the lpFoo names. The string types need some tests for the terminating 0 character. AddComponent currently does not check if the string length matches the input size. (It doesn't overflow though since it allocates according to the string length.) > + size = sizeof(GUID)-1; + hr = > IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, > &compguid, &size, &type); + ok(hr == DPNERR_BUFFERTOOSMALL, > "got 0x%08x\n", hr); + ok(size == sizeof(GUID), "got %d > expected %d\n", size, sizeof(GUID)); Does it return DPNERR_BUFFERTOSMALL if pvBuffer is NULL? The d3d private data API returns D3D_OK in this case. This is worth a check. Does GetComponentByName correct the size downward when *pdwBufferSize > size? Also test this with pvBuffer != NULL Your implementation suggests pdwDataType is only set if the buffer has an appropriate size. Is this the case? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUUPfSAAoJEN0/YqbEcdMwlBoP/jL3jPsPavfF4iQEr/fKe5y3 HLT67L/yqgriTCo4soOECoa+9fh9+8YFvBKrDvN7ISpZyni+paK38kxifAtwR0Xl QB7yrk3x+TVvIy8f3+QxwbqI7b/CX6AxEYcXG7Y30QNZchw+qN396HOs8XPU+HCG umYrNcnknizbASMQwkl0vaoZgun0JJP3L1jSEFnuLSZkl3f9CTIq5exS3q+ndqn7 0P0iqvo1CI1Pry/5qQGCYYxKqoFRfrqKbF0q1kGcImnwjpz211iuEQyVo23UICVI 0iMX1X2KueFQ4r9QrzRJmo+/8H5PpKsEQrWlhdBZyhhOX6m3BMxOrQK9/7OIzpua l8cYkrKpLCgMsvhF5hZchX1CY5ZomFdhOjFAQldYCpSVHuupnFqOPXx2qqmjGzU3 38h/liv4VgHLvpckLgvjsD8SGqtkBH/nk4WTk50fzWupegtLqnQ1gxILTNuh+e9Y kX4PWcMbbMQ6t1rjrdjBz4hDX/wAF44vx4NDLnht59aV3of9xtKfVWW8SFV9il40 2WDPhHESojF8BU/Nt/qx70YokSPIqpmwXdg1RQPXi5FNj2W5uqZoGCxCTeFfnY60 a68+EOaZaQhdSW5VSjGGWprs9jfBN4wB5SPoUU24adu5ygjcUsGj3IHj9H6ssBPN vwscAjUYyZDTzkgRQYAE =OHT3 -----END PGP SIGNATURE-----

1 1

Re: dplayx: Fix some crashes and wine_todo's ( try 2)
by Stefan Dösinger 29 Oct '14

29 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-29 06:13, schrieb Alistair Leslie-Hughes: > hr = IDirectPlayX_InitializeConnection( pDP, pAddress, 0 ); > - todo_wine checkHR( DP_OK, hr ); > + checkHR( DP_OK, hr ); Apparently running those tests only in interactive mode caused quite a bit of bitrot :-\ . According to ab448df3 the tests were too slow. Is this still the case? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUUPlaAAoJEN0/YqbEcdMwYHsP/jwHawWB1Y+iGVlg+fT56yaI kYJ5knxAn2JaLwPB9DVyt2JRMG2SqvWmS0glqKfOVvWR8RFOGzUL/S1nS0H1VpgD drKtxFJFq1KOYFsgsBxHZdvsPnlayB/GXwAmIRXn6rI4rvkvuWDM2q7ovM9ZNsW+ 0zgiV5z9JMMiC/UOVedS4WF5ScoHjJfwW6S9bk4KAWltaybDFQA1Txo4OT+wpW0t 34p+GOB8uAoqqpyzONA5O2MpOdtodhFT03++6FLU3Y26+pyeKDqMP+TpX3MTRB70 JwIk09OBxSlqHjKUiU/4shd4bFSY0Pf/yzGpvFEsXTDHlcodvpBEHMKQj+8RXqqL PglmiK/Xy1J4OmrDmrTRMuGn/FmD1Mkj4WfQTsZ17ODHcubRlVhdNxsHqgDZDEVB krHYGcAJ5t6ZjVnM8m7uGLyvyJbsMeefHiR1+SFHi1VyBJnlD6Iu+osDQPKRSDK7 vcMciPMuXI0e3UUIzf5Kuz0gXDHdWuNerMI8j+6s3hyjc4zQnSd4GRL3fKV0GQOv lMEYS9DiF9ESUhjqC/9NFb233sbPmxabkVaoA+9C6vXgDdDhbE2rAQ75HFDoXh52 856Mq5tMuQQVFaZxHVd0A8bArNlb1ZLksuN02b5bo/q4Q0mN7oJEjxybgSxuHKAd yODcTxiiPmIVo1IWzKYJ =wqXw -----END PGP SIGNATURE-----

1 0

Re: [1/2] wined3d: Set D3DPMISCCAPS_FOGVERTEXCLAMPED flag in get_device_caps
by Henri Verbeet 29 Oct '14

29 Oct '14

On 28 October 2014 00:43, Joachim Priesner <joachim.priesner(a)web.de> wrote: > Wine clamps the oFog output of vertex shaders. Tests for the flag follow > in the second part of this patch. Why is it better to add the flag instead of just removing the clamping?

2 5

Re: [PATCH 7/8] dwrite: Implement system font collection as any other font collection
by Alexandre Julliard 29 Oct '14

29 Oct '14

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > Subject: [PATCH 7/8] dwrite: Implement system font collection as any other > font collection It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M dwrite.dll -p dwrite_test.exe.so analyzer && touch analyzer.ok wine: Unhandled page fault on read access to 0x001a0000 at address 0x68665c0b (thread 007f), starting debugger... Unhandled exception: page fault on read access to 0x001a0000 in 32-bit code (0x68665c0b). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:68665c0b ESP:0032f6c0 EBP:0032f6e8 EFLAGS:00010216( R- -- I -A-P- ) EAX:001a0000 EBX:6867e828 ECX:006e0065 EDX:0018d418 ESI:0018c798 EDI:0018c7b8 Stack dump: 0x0032f6c0: 00000013 7b84aa26 0018c7d0 0018c7b8 0x0032f6d0: 0032f736 0018c928 68665b5b 6867e828 0x0032f6e0: 0032f736 0018c928 0032f7f8 6866720b 0x0032f6f0: 0018c798 0032f736 0018d418 00000000 0x0032f700: 00000040 00000001 6867298d 00002710 0x0032f710: 00000001 00000518 0018cb32 00000000 Backtrace: =>0 0x68665c0b add_localizedstring+0xbb(iface=0x18c798, locale="en-US", string="WenQuanYi Micro Hei?? ???I??????8bg --auto %ld %ld") [/home/julliard/wine/wine/dlls/dwrite/../../include/wine/unicode.h:200] in dwrite (0x0032f6e8) 1 0x6866720b opentype_get_font_strings_from_id+0x2fa(table_data=0x18c910, id=DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, strings=0x32f854) [/home/julliard/wine/wine/dlls/dwrite/opentype.c:815] in dwrite (0x0032f7f8) 2 0x6865cab2 create_font_collection+0x1b1(factory=0x12af18, enumerator=0x12b830, ret=0x12af20) [/home/julliard/wine/wine/dlls/dwrite/font.c:1486] in dwrite (0x0032fa88) 3 0x6865d048 get_system_fontcollection+0x97(factory=0x12af18, collection=0x12af20) [/home/julliard/wine/wine/dlls/dwrite/font.c:1676] in dwrite (0x0032fab8) 4 0x68664bbd dwritefactory_GetSystemFontCollection+0xdc(iface=<couldn't compute location>, collection=<couldn't compute location>, check_for_updates=<couldn't compute location>) [/home/julliard/wine/wine/dlls/dwrite/main.c:566] in dwrite (0x0032faf8) 5 0x6865d59b gdiinterop_CreateFontFromLOGFONT+0x5a(iface=<couldn't compute location>, logfont=<couldn't compute location>, font=<couldn't compute location>) [/home/julliard/wine/wine/dlls/dwrite/../../include/dwrite.h:6896] in dwrite (0x0032fb58) 6 0x6862a87d create_fontface+0xac() [/home/julliard/wine/wine/dlls/dwrite/tests/../../../include/dwrite.h:4396] in dwrite_test (0x0032fc18) 7 0x6862b700 func_analyzer+0xb1f() [/home/julliard/wine/wine/dlls/dwrite/tests/analyzer.c:1044] in dwrite_test (0x0032fd58) 8 0x6862a083 main+0x332(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/dwrite/tests/../../../include/wine/test.h:584] in dwrite_test (0x0032fe08) 9 0x6863571f __wine_spec_exe_entry+0x6e(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in dwrite_test (0x0032fe58) 10 0x7b85992c call_process_entry+0xb() in kernel32 (0x0032fe78) 11 0x7b85a8aa start_process+0x59(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1104] in kernel32 (0x0032fea8) 12 0x7bc7a5a0 call_thread_func_wrapper+0xb() in ntdll (0x0032fec8) 13 0x7bc7d361 call_thread_func+0xb0(entry=0x7b85a850, arg=0x7ffdf000, frame=0x32ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2724] in ntdll (0x0032ffa8) 14 0x7bc7a57e call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 15 0x7bc50f57 start_process+0x16(kernel_start=0x7b85a850) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2870] in ntdll (0x0032ffe8) 16 0x6803121d wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 17 0x68031380 wine_switch_to_stack+0x1f(func=0x7bc50f40, arg=0x7b85a850, stack=0x330000) [/home/julliard/wine/wine/libs/wine/port.c:59] in libwine.so.1 (0xffdc1c18) 18 0x7bc56365 LdrInitializeThunk+0x1f4(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2924] in ntdll (0xffdc1c58) 19 0x7b860613 __wine_kernel_init+0x9b2() [/home/julliard/wine/wine/dlls/kernel32/process.c:1276] in kernel32 (0xffdc2b48) 20 0x7bc57123 __wine_process_init+0x152() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3133] in ntdll (0xffdc2bb8) 21 0x6802ee83 wine_init+0x2c2(argc=0x3, argv=0xffdc30f4, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:958] in libwine.so.1 (0xffdc2c08) 22 0x7bf00d6a main+0x79(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:237] in <wine-loader> (0xffdc3048) 23 0x68251a63 __libc_start_main+0xf2() in libc.so.6 (0x00000000) 0x68665c0b add_localizedstring+0xbb [/home/julliard/wine/wine/dlls/dwrite/../../include/wine/unicode.h:200] in dwrite: cmpw $0,0x0(%eax) 200 while (*s) s++; -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/3] ddraw/tests: Port test_mode_change to ddraw (v2)
by Henri Verbeet 29 Oct '14

29 Oct '14

For whatever it's worth, the ddraw test test_mode_change() was originally related to is test_coop_level_mode_set(). (I.e., see also commits 43aac32f, 1ac6f487, f41ea4fe.)

1 0

Re: [PATCH 1/3] d3d9/tests: The device restores the mode settings from the registry (v2).
by Henri Verbeet 29 Oct '14

29 Oct '14

On 27 October 2014 23:28, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + IDirect3D9_GetAdapterDisplayMode(d3d9, D3DADAPTER_DEFAULT, &d3ddm); > + adapter_mode_count = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, d3ddm.Format); Shouldn't "d3ddm.Format" just be "D3DFMT_A8R8G8B8" here, since the test is using create_device()? > + modes = HeapAlloc(GetProcessHeap(), 0, sizeof(*modes) * adapter_mode_count); > + for (i = 0; i < adapter_mode_count; ++i) > + { > + UINT j; > + > + hr = IDirect3D9_EnumAdapterModes(d3d9, D3DADAPTER_DEFAULT, d3ddm.Format, i, &d3ddm2); > + ok(SUCCEEDED(hr), "Failed to enumerate display mode, hr %#x.\n", hr); > + > + if (d3ddm2.Width == screen_width && d3ddm2.Height == screen_height) > + continue; Given the nature of this test, we'd probably want to retrieve "screen_width" and "screen_height" with EnumDisplaySettingsW() and ENUM_REGISTRY_SETTINGS, and perhaps also make sure they match the current settings before running any tests. > + /* The r200 driver on Windows XP enumerates modes like 320x200 and 320x240 but > + * refuses to create a device at these sizes. */ > + if (d3ddm2.Width < 640 || d3ddm2.Height < 480) > + continue; > + > + for (j = 0; j < mode_count; ++j) > + { > + if (modes[j].w == d3ddm2.Width && modes[j].h == d3ddm2.Height) > + break; > + } > + if (j == mode_count) > + { > + modes[j].w = d3ddm2.Width; > + modes[j].h = d3ddm2.Height; > + ++mode_count; > + } > + } > + > + /* Make sure the d3d mode is smaller or equal in both width and height > + * than the mode passed to ChangeDisplaySettings. Otherwise Windows > + * shrinks the window to the ChangeDisplaySettings parameters + 12. */ > + d3ddm.Width = d3ddm.Height = d3ddm2.Width = d3ddm2.Height = ~0U; > + for (i = 0; i < mode_count; i++) > + { > + if (modes[i].w < d3ddm.Width && modes[i].h < d3ddm.Height) > + { > + d3ddm.Width = modes[i].w; > + d3ddm.Height = modes[i].h; > + } > + } > + for (i = 0; i < mode_count; i++) > + { > + if (modes[i].w < d3ddm.Width || modes[i].h < d3ddm.Height) > + continue; > + if (modes[i].w == d3ddm.Width && modes[i].h == d3ddm.Height) > + continue; > + d3ddm2.Width = modes[i].w; > + d3ddm2.Height = modes[i].h; > + break; > + } > + > + HeapFree(GetProcessHeap(), 0, modes); > + if (d3ddm2.Width == ~0U) > + { > + skip("Could not find adequate modes, skipping mode tests.\n"); > + IDirect3D9_Release(d3d9); > + return; > + } This looks fairly complicated, but in the end you just need two display modes that satisfy a couple of conditions. I suspect this code could be simplified a fair bit. Of course that probably also applies to test_reset() where this looks borrowed from.

1 0

Re: dplayx: Fix some crashes and wine_todo's
by Marvin 29 Oct '14

29 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=9845 Your paranoid android. === w8 (32 bit dplayx) === The test timed out

3 3

Re: dplayx: Fix some crashes and wine_todo's ( try 2)
by Nikolay Sivov 29 Oct '14

29 Oct '14

On 10/29/2014 08:13 AM, Alistair Leslie-Hughes wrote: > +#if 0 > + /* Crashes under Win7 */ > hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); > checkHR( DPERR_INVALIDPARAM, hr ); > dwDataSize=-1; > hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], &dwDataSize ); > checkHR( DPERR_INVALIDPARAMS, hr ); > check( -1, dwDataSize ); > +#endif That's the same. Wine test use if (0) {} block to disable code. Also you don't need checkHR() at all in such cases.

2 1

Re: dplayx: Fix some crashes and wine_todo's ( try 2)
by Sebastian Lackner 29 Oct '14

29 Oct '14

On 29.10.2014 06:13, Alistair Leslie-Hughes wrote: > Hi, > use #if 0 > Using "#if"s is no good idea, since this doesn't ensure that the code still compiles in the future. Better use "if (0)" instead.

1 0

Re: dplayx: Fix some crashes and wine_todo's
by Nikolay Sivov 29 Oct '14

29 Oct '14

> - hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); > +/* hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); > checkHR( DPERR_INVALIDPARAM, hr ); > dwDataSize=-1; > hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], &dwDataSize ); > checkHR( DPERR_INVALIDPARAMS, hr ); > - check( -1, dwDataSize ); > + check( -1, dwDataSize );*/ You can't just comment out parts, if those crash on Windows put them in compilable block inside if (0) and add appropriate comment.

1 0

Re: gdiplus: Fix error when drawing from a rectangle outside bitmap bounds.
by Vincent Povirk 28 Oct '14

28 Oct '14

Don't commit this. Right and bottom are included and I incorrectly treated them as excluded. I will send a fixed version.

1 0

Re: [2/2] wined3d: wined3d: Take abs() of vertex z coordinate as FFP fog coordinate
by Stefan Dösinger 28 Oct '14

28 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-28 00:44, schrieb Joachim Priesner: > + {0, D3DFOG_NONE, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, > + {0, D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, > ... > + /* We are using an affine projection matrix, so pixel fog assumes fog start and end > + * to be in device space coordinates. Pixel fog will therefore be calculated from > + * z=-1 to z=1, whereas vertex fog will be calculated from z=0 to z=1. */ > + start.f = 0.0f; > + end.f = 1.0f; I think this comment is wrong. In d3d normalized Z coordiantes go from 0.0 to 1.0. In GL (sans GL_ARB_clip_control) they go from -1.0 to 1.0. The fog results above agree with this - otherwise you'd get C_UNFOGGED for table fog in the middle of the quad with the given projection matrix and fogstart and end. Strictly speaking you don't have to set start = 0, end = 1, those are the default values. A comment stating that is enough. > + {0, D3DFOG_NONE, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, > + {0, D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, > + {0, D3DFOG_LINEAR, D3DFOG_NONE, C_FOGGED, C_UNFOGGED, C_FOGGED, C_FOGGED}, > + {0, D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, C_FOGGED}, There's a space missing in line 3. Otherwise this patch looks good to me. It also passes on my Radeon X1600 GPU. I didn't retest the HD 5770, I assume it passes there as well. I also tested it on Vista with my GeForce 7400, it works as expected. The Radeon 9000 GPU crashes on the vs1 ("non-foggy") + table fog tests. The other non-foggy shader tests run, but don't pass. I have attached the output in case you're interested, but otherwise don't bother about this. If I have time some day I'll try to find out where the driver's limitations are. I guess it's generally broken when fog is on and the shader does not write a fog coordinate. This is not the only fog-related problem on this card on Windows. Thanks again for your hard work. I hope I didn't miss anything this time :-) Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUT4SlAAoJEN0/YqbEcdMwYKoP/0UgSvtbxdM2sTto3Fmtl5dB fHvudTRqxQJs/7ymaxcoknGOwgY8iyu4UB0lQ1vWgIG0kJAI3QK351AujXTEG2bm Rbke87C//kTyb8DRMRYvpA05BnF1eMMtzZXD/+d1CDp8xqnUEwpdsCUz+5ZMymrk z07+zmGyq6t7XKVT4yvVA58dkIB5FuJQ/XS7mkiJ+267A+ZN+odnFGrMP/rT/jnE x/ySDcOatBsZ94LpsYqSLQH33COki+ngD2H0qAQG33Y1UAQnRb7l5g/fFwrs8vqS o5P8Hq5zEKjyjfP9Gr/BdVUjLgNurTLrpgs7T06XwMGeVJvQV2HyEIffXjrKUsqg T2H4fJaa9DHyehm+zB7YRdk+QKr0ibODA8/AG+m85nmcUFK7TZY0n+OMEHdwR8xk g6pr01zw4mJg7bJZE+uVdLwNuWA/BhTsxCrjphI9GAUf7VVr/VdaZC30m2p7lTsn rtH7vjh/UEBZg8vGwVgkpHNwaop8Cr1sfXH+uy4K6F1O/j+oLH0qpP15PCRkPqq4 HF39Lnj0/JYuI6Ak7M70K8Qw6ExP6KDs9KL9rn2znsomtPYRfkRyLe2uUCjeBHNz OfCWB8zQUrYfV9VCmK77rNgqui7+/Nyb7+MODwbnkkgBIOF/dao7WNYz501Cubee Ab85oRdj1ReT91QW2Awt =k/GT -----END PGP SIGNATURE-----

2 2

Re: [PATCH] d3d8/tests: The device restores the mode settings from the registry (v3).
by Marvin 28 Oct '14

28 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=9818 Your paranoid android. === w8 (32 bit device) === device.c:2437: Test failed: Expected foreground window 000701B2, got 0002004C. device.c:3219: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: gdiplus: Blend in the background colour.
by Vincent Povirk 28 Oct '14

28 Oct '14

> + return ((b + ((BYTE)bkgnd * (255 - alpha) + 127) / 255) | What's the purpose of adding 127 here? > stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead|ImageLockModeUserInputBuf, > PixelFormat32bppPARGB, &lockeddata); > > + if (background & 0xffffff) > + { > + DWORD *ptr; > + UINT i; > + for (ptr = (DWORD*)bits, i = 0; i < width * height; ptr++, i++) > + { > + if ((*ptr & 0xff000000) == 0xff000000) continue; > + *ptr = blend_argb_no_bkgnd_alpha(*ptr, background); > + } > + } I guess it wouldn't hurt anything, but it doesn't make much sense to do this if LockBits fails.

2 1

Re: comctl32: Enable the appropriate wizard buttons before sending DM_SETDEFID.
by Marvin 28 Oct '14

28 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=9817 Your paranoid android. === w2000pro (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! propsheet.c:785: Test failed: property sheet with custom window proc: the msg 0x001c was expected, but got msg 0x0047 instead === wxppro (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === wvistau64 (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === w2008s64 (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === w7u (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! propsheet.c:785: Test failed: property sheet with custom window proc: the msg 0x001c was expected, but got msg 0x0047 instead === w8 (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === wvistau64 (64 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === w2008s64 (64 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed!

1 0

Re: ws2_32: WS_get_local_ips: Fix sorting IP addresses by metric if two addresses have the same metric
by Ken Thomases 28 Oct '14

28 Oct '14

Hi, On Oct 24, 2014, at 3:27 PM, Joachim Priesner <joachim.priesner(a)web.de> wrote: > The previous implementation required the metrics to be mutually inequal > (because of the "this_metric > last_metric" check). If the metrics were > not mutually inequal, it would write only one address per metric value to the list > and fill up the rest of the list with the magic loopback IP address 127.12.34.56. > > I take it that this is not the expected behavior, please correct me if I'm wrong! I was recently looking at this code and noticed the same problem. Thanks for working on this. I don't understand why the original code ever would have wanted to return the magic loopback address, other than to cover up the brokenness of the sort. So, why do you still have that logic in there? Each pass of the outer (i) loop can "consume" at most one entry in the list. So, the inner (j) loop should always find a remaining lowest-metric entry. lowest_metric_idx should never be -1 at the end of that loop and the magic address should never be used. More simply, this is just an attempt to sort the routes. None should be added and none should be removed (i.e. replaced with magic). Since it's a sort, I recommend that this loop simply be replaced with an invocation of qsort() with an appropriate comparison function. That's what's done in iphlpapi for similar situations. (This can be conditioned on numroutes >= 2 to avoid the overhead when it's not necessary.) After the routes are sorted, the addresses can be copied over to the h_addr_list with a much simpler loop. -Ken

1 0

Re: [PATCH 2/6] reg: Add path/key conversion functions
by Stefan Dösinger 27 Oct '14

27 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-27 13:10, schrieb Jonathan Vollebregt: > +#define ARRAY_COUNT(A) (sizeof(A)/sizeof(*A)) Other places that use a macro like this call it ARRAY_SIZE. > +typedef struct { > + HKEY key; > + const WCHAR *short_name; > + const WCHAR *long_name; > +} hkey_rel; Style :-) > +static inline int path_rootname_cmp(const WCHAR *path, const WCHAR *name) > +{ > + DWORD length = strlenW(name); > + > + return (strncmpiW(path, name, length) == 0 && (path[length] == 0 || path[length] == '\\')); > +} I don't like the names "path" and "name". I wondered why you're relying on the length of name. A better name for "path" could be "input", but I can't think of anything for "name". > +static HKEY path_get_rootkey(const WCHAR *path) > +{ > + DWORD i; > + for (i = 0; i < ARRAY_COUNT(root_rels); i++) > + { > + if (path_rootname_cmp(path, root_rels[i].short_name) || > + path_rootname_cmp(path, root_rels[i].long_name)) > + return root_rels[i].key; > + } > + > + reg_message(STRING_INVALID_KEY); > + return NULL; > +} Is it a good idea to write an error message from deep inside a helper function? What happens when you just pass the NULL root to RegOpenKey? Can you tell the cases for STRING_INVALID_KEY and STRING_CANNOT_FIND apart base on the return value? You could also consider a function that returns an error string ID for each advapi32 Reg* error result. Then you can propagate the advapi32 return codes to main() and write the error string there. Depending on the possible failure modes this may or may not be possible. > + path = strchrW(path, '\\'); > + if (!path) > + return k; I see that this is why you need the trailing backslash elimination in the previous patch. But still, do you need this? What happens when you call e.g. RegOpenKey(HKEY_CURRENT_USER, "\\", &k)? If it returns HKEY_CURRENT_USER or a handle that points to HKEY_CURRENT_USER you're fine. Similarly for RegOpenKey(HKEY_CURRENT_USER, "", &k). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUTtS5AAoJEN0/YqbEcdMw+kEP/0DwI2fMgk2o6bKh1mCVwzeg AFH+EKh1pAwpHBmIRHX7XzyDBAusd0GVH0+B5WQFnl+Fr49ybYqp8CGfytqm0H/e lgqS0SCDZjaDTI5WO5zT/L5/VGhQ5tQHSQJiHS3UhXX3IBDXd7aYcbreSMHNcyJ8 ZPaFmVVCH8iRiR4qqMS8cJKXPxzx5tg5Ec9TpXfyYraI8YDPTNPOGlUipl9m5kwa lrqjD+TbGbCOczq1mx6WSJnVxKWboWhz3FnzYDM0C8PzpJlRyzODWlfUHVMSLSmQ xu9K/lXl2XJpmXbjFsCPZ5C4K3pRVH3poAtPNs+yOEeHkWTE2Pf3uyKNBwpW4ONU 3PFhn0beJM1scJY/LRjpCWLi74xA+FdBq6WDuxx2BpMoDvKCe/zV+LEY6zbymtxY OsXQXXQwpcVBAC3mWQK0EWce8g2/he4PoPi8/l4ZakkCEAF4dqtdfSEQAccf9KfV EeI8PJOAZRLoKAUQgKse2mYHG8V4EJEp8IQA0HcuWgR9zEMTpIUt08xdmU5cIWfu Ena2T9phlAWmDIjcgr9haIHEreZkMI8DZI07XOmVAlZL44rSdkVop816I/ItTE98 CTwU6N0pD/V4htZcwWN7ZVojPK4AA7UD9NW7sg326drl2KIpk5j0ZmYq0/WwSL2o uS2pHS9eKgBarX7GCXyd =k2ys -----END PGP SIGNATURE-----

1 0

Re: [PATCH 2/3] d3d8/tests: The device restores the mode settings from the registry (v2).
by Marvin 27 Oct '14

27 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=9791 Your paranoid android. === w8 (32 bit device) === device.c:2437: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3129: Test failed: Got unexpect width 800, expected 1024. device.c:3131: Test failed: Got unexpect height 600, expected 768. device.c:3217: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: wined3d: Take abs() of vertex z coordinate as FFP fog coordinate and remove oFog clamp for vertex shaders
by Stefan Dösinger 27 Oct '14

27 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I have tested your patches on my various systems. I have replaced C_IGNORE in the d3d8 test with C_FOGGED. The test passes on Nvidia cards, but fails (also in d3d9) on my AMD cards. As far as I can see AMD cards clamp the fog coord. I have attached results from a Radeon 9000 (WinXP), Radeon X1600 (Win7) and Radeon HD 5770 (Win7). The Radeon 9000 driver crashes in the tests. Windows somehow restores it, but the screen resolution is broken until the next reboot (Can't set back the native resolution of 1400x1050.) I haven't quite understood yet what you're doing with quad2/quad3, so I can't comment on the code yet. Cheers, Stefan Am 2014-10-22 09:43, schrieb Joachim Priesner: > Supersedes 107021. (The title of that patch really was not fitting > any more.) > > The FFP fog coordinate is not vertex.z, but the absolute value of > it. The patch fixes that and adds a test. > > The tests also suggest that the vertex shader side clamp of oFog > is incorrect. The test results are clear on that for d3d9, but vary > across different Windows machines for d3d8. Therefore, the d3d8 > oFog clamp tests are disabled for now. > > Tested on openSuse 13.1 and Windows 8.1 (VMware, Wine test bot, > real machine with nVidia graphics card). --- > dlls/d3d8/tests/visual.c | 335 > +++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | > 399 +++++++++++++++++++++++++++++++++++++++++++++ > dlls/ddraw/tests/ddraw7.c | 186 +++++++++++++++++++++ > dlls/wined3d/glsl_shader.c | 4 +- 4 files changed, 922 > insertions(+), 2 deletions(-) > > diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c > index ba73bb6..42d3e97 100644 --- a/dlls/d3d8/tests/visual.c +++ > b/dlls/d3d8/tests/visual.c @@ -696,6 +696,340 @@ done: > DestroyWindow(window); } > > +/* This test tests fog in combination with negative vertex z > coordinates. */ +static void fog_negative_z_test(void) +{ + > enum + { + C_ALPHA_0x00 = 0x00000000, + C_CLEAR > = 0xffff00ff, + C_FOGGED = 0x0000ff00, + > C_HALF_FOGGED = 0x00808000, + C_UNFOGGED = 0x00ff0000, + > C_IGNORE = 0xdeadbeef + }; + + /* 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}; + DWORD pixel_shader[2] = {0, 0}; + > IDirect3D8 *d3d; + IDirect3DDevice8 *device; + BOOL > has_vs_support, has_ps_support, has_table_fog_support; + > unsigned int i, ps, y; + D3DCOLOR color, expected_middle_color; > + ULONG refcount; + D3DCAPS8 caps; + HWND window; + > HRESULT hr; + union + { + float f; + DWORD i; + > } start, end; + + /* For all vertex shaders the view matrix goes > in registers c0...c3, + * the projection matrix goes in > registers c4...c7. */ + + /* Basic vertex shader without fog > computation ("non foggy") */ + static const DWORD > vertex_shader_code1[] = + { + 0xfffe0100, > /* vs_1_0 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x00000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x00000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x00000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x00000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x00000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x00000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x00000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x00000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x00000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + 0x0000ffff, > /* END */ + }; + + /* Basic vertex shader with > fog computation ("foggy"). + * Using the vertex' x coordinate > as fog coordinate so that all test cases that use vertex fog + > * will have a gradient from fully fogged (green, left) to unfogged > (red, right). */ + static const DWORD vertex_shader_code2[] = + > { + 0xfffe0100, > /* vs_1_0 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x00000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x00000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x00000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x00000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x00000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x00000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x00000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x00000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x00000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + /* output.Fog = input.Pos.x */ + > 0x00000001, 0xc00f0001, 0x90000000, > /* mov oFog, v0.x */ + 0x0000ffff, > /* END */ + }; + + /* Basic pixel shader */ + > static const DWORD pixel_shader_code[] = + { + > 0xffff0101, > /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, > /* mov r0, v0 */ + 0x0000ffff + }; + + static const > struct + { + struct vec3 position; + DWORD > diffuse; + DWORD specular; + } + quad1[] = + { + > {{-1.0f, -1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, -1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, > 0.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }, + quad2[] = + > { + {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{-1.0f, 1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 0.0f, 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, > 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }, + quad3[] = + > { + {{ 0.0f, 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{ 0.0f, 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, 0.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, > 1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }; + static const > DWORD vertex_decl[] = + { + D3DVSD_STREAM(0), + > D3DVSD_REG(0, D3DVSDT_FLOAT3), /* position, v0 */ + > D3DVSD_REG(1, D3DVSDT_D3DCOLOR), /* diffuse color, v1 */ + > D3DVSD_REG(2, D3DVSDT_D3DCOLOR), /* specular color, v2 */ + > D3DVSD_END() + }; + static const struct test_data_t + { + > int vshader; + D3DFOGMODE vfog; + D3DFOGMODE tfog; + > DWORD color_left; + DWORD color_middle_top; + DWORD > color_middle_bottom; + DWORD color_right; + } + > test_data[] = + { + /* Using z-based fog, the bottom quad > should have a gradient UNFOGGED->FOGGED + * for table fog, > and be completely fogged for vertex fog. + * When the fog > coordinate returned by the vertex shader is used instead, + > * the result is a gradient FOGGED->UNFOGGED. */ + + /* No > vertex shader */ + {0, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {0, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {0, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_UNFOGGED, C_FOGGED, C_FOGGED}, + {0, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_FOGGED}, + + /* Vertex shader without vertex fog > computation */ + {1, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {1, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {1, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_FOGGED, C_FOGGED, C_FOGGED}, + {1, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_FOGGED}, + + /* Vertex shader with vertex fog > computation. + * Ignore the bottom middle color as test > results vary on different Windows machines. */ + {2, > D3DFOG_NONE, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {2, D3DFOG_LINEAR, > D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, > C_FOGGED}, + {2, D3DFOG_LINEAR, D3DFOG_NONE, C_FOGGED, > C_FOGGED, C_IGNORE, C_UNFOGGED}, + {2, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_IGNORE, > C_UNFOGGED}, + }; + /* Affine projection matrix for z-near = > -1, z-far = 1. */ + static const D3DMATRIX proj_mat = + {{{ + > 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + > 0.0f, 0.0f, 0.5f, 0.0f, + 0.0f, 0.0f, 0.5f, 1.0f + }}}; + > /* Transposed version of proj_mat to pass to the vertex shaders. > */ + static const D3DMATRIX proj_mat_transposed = + {{{ + > 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + > 0.0f, 0.0f, 0.5f, 0.5f, + 0.0f, 0.0f, 0.0f, 1.0f + }}}; + > static const D3DMATRIX view_mat = + {{{ + 1.0f, 0.0f, > 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, > 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }}}; + + window > = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | > WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + > d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to > create a D3D object\n"); + if (!(device = create_device(d3d, > window, window, TRUE))) + { + skip("Failed to create a > D3D device, skipping tests\n"); + goto done; + } + + > hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + > ok(SUCCEEDED(hr), "Failed to get device caps (%#x)\n", hr); + + > has_table_fog_support = caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE; > + if (!has_table_fog_support) + skip("No table fog > support, skipping some fog tests\n"); + + has_ps_support = > caps.PixelShaderVersion >= D3DPS_VERSION(1, 1); + if > (has_ps_support) + { + hr = > IDirect3DDevice8_CreatePixelShader(device, pixel_shader_code, > &pixel_shader[1]); + ok(SUCCEEDED(hr), "CreatePixelShader > failed (%#x)\n", hr); + } + else + { + skip("No > ps_1_1 support, skipping some fog tests\n"); + } + + > has_vs_support = caps.VertexShaderVersion >= D3DVS_VERSION(1, 0); + > if (has_vs_support) + { + hr = > IDirect3DDevice8_CreateVertexShader(device, vertex_decl, > vertex_shader_code1, &vertex_shader[1], 0); + > ok(SUCCEEDED(hr), "CreateVertexShader failed (%#x)\n", hr); + > hr = IDirect3DDevice8_CreateVertexShader(device, vertex_decl, > vertex_shader_code2, &vertex_shader[2], 0); + > ok(SUCCEEDED(hr), "CreateVertexShader failed (%#x)\n", hr); + + > /* Note: Shaders expect matrices in column-major form, so they > have + * to be transposed if they are not symmetrical. */ + > hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &view_mat, > 4); + ok(SUCCEEDED(hr), "SetVertexShaderConstant (view > matrix) failed (%#x)\n", hr); + hr = > IDirect3DDevice8_SetVertexShaderConstant(device, 4, > &proj_mat_transposed, 4); + ok(SUCCEEDED(hr), > "SetVertexShaderConstant (projection matrix) failed (%#x)\n", hr); > + } + else + { + skip("No vs_1_0 support, skipping > some fog tests\n"); + } + + /* Setup initial states: No depth > test, no lighting, fog on, fog color */ + hr = > IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, > D3DZB_FALSE); + ok(SUCCEEDED(hr), "Turning off depth test failed > (%#x)\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, > D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Turning off > lighting failed (%#x)\n", hr); + hr = > IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + > ok(SUCCEEDED(hr), "Turning on fog calculations failed (%#x)\n", > hr); + hr = IDirect3DDevice8_SetRenderState(device, > D3DRS_FOGCOLOR, C_FOGGED); + ok(SUCCEEDED(hr), "Setting fog > color failed (%#x)\n", hr); + + /* We are using an affine > projection matrix, so fog start and end are in device space > coords. + * This corresponds to a fog from z=-1 to z=1. */ + > start.f = 0.0f; + end.f = 1.0f; + + hr = > IDirect3DDevice8_SetRenderState(device, D3DRS_FOGSTART, start.i); + > ok(SUCCEEDED(hr), "Setting fog start failed (%#x)\n", hr); + hr > = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, end.i); + > ok(SUCCEEDED(hr), "Setting fog end failed (%#x)\n", hr); + + hr > = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, > &proj_mat); + ok(SUCCEEDED(hr), "Failed to set projection > transform (%#x)\n", hr); + hr = > IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, &view_mat); + > ok(SUCCEEDED(hr), "Failed to set view transform (%#x)\n", hr); + + > for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) + > { + if (test_data[i].vshader != 0 && > !vertex_shader[test_data[i].vshader]) + continue; + > if (test_data[i].tfog != D3DFOG_NONE && !has_table_fog_support) + > continue; + + hr = IDirect3DDevice8_SetVertexShader(device, > vertex_shader[test_data[i].vshader]); + ok(SUCCEEDED(hr), > "SetVertexShader failed (%#x)\n", hr); + + for (ps = 0; ps < > sizeof(pixel_shader)/sizeof(pixel_shader[0]); ps++) + { + > if (ps != 0 && !pixel_shader[ps]) + continue; + + > if (has_ps_support) + { + hr = > IDirect3DDevice8_SetPixelShader(device, pixel_shader[ps]); + > ok(SUCCEEDED(hr), "SetPixelShader failed (%#x)\n", hr); + > } + + hr = IDirect3DDevice8_SetRenderState(device, > D3DRS_FOGVERTEXMODE, test_data[i].vfog); + > ok(SUCCEEDED(hr), "Setting fog vertex mode to %d failed (%#x)\n", > test_data[i].vfog, hr); + hr = > IDirect3DDevice8_SetRenderState(device, D3DRS_FOGTABLEMODE, > test_data[i].tfog); + ok(SUCCEEDED(hr), "Setting fog > table mode to %d failed (%#x)\n", test_data[i].tfog, hr); + + > hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, > C_CLEAR, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed > (%#x)\n", hr); + hr = > IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), > "BeginScene failed (%#x)\n", hr); + hr = > IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad1[0], sizeof(quad1[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad2[0], sizeof(quad2[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad3[0], sizeof(quad3[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), > "EndScene failed (%#x)\n", hr); + + /* Use 5% tolerance > on the colors since there may be a gradient + * between > left and right vertices. */ + for (y = 120; y <= 360; y > += 240) + { + color = > getPixelColor(device, 2, y); + ok(color_match(color, > test_data[i].color_left, 13), + "fog vs%i > ps%i fvm%i ftm%i, y=%i: got left color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, ps, > test_data[i].vfog, test_data[i].tfog, y, + > color, test_data[i].color_left); + > expected_middle_color = + (y == 120 ? > test_data[i].color_middle_top : test_data[i].color_middle_bottom); > + if (expected_middle_color != C_IGNORE) + > { + color = getPixelColor(device, 320, y); + > ok(color_match(color, expected_middle_color, 13), + > "fog vs%i ps%i fvm%i ftm%i, y=%i: got middle color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, > ps, test_data[i].vfog, test_data[i].tfog, y, + > color, expected_middle_color); + } + > color = getPixelColor(device, 638, y); + > ok(color_match(color, test_data[i].color_right, 13), + > "fog vs%i ps%i fvm%i ftm%i, y=%i: got right color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, ps, > test_data[i].vfog, test_data[i].tfog, y, + > color, test_data[i].color_right); + } + + hr > = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + > ok(SUCCEEDED(hr), "Present failed (%#x)\n", hr); + } + } > + for (i = 0; i < > sizeof(vertex_shader)/sizeof(vertex_shader[0]); i++) + if > (vertex_shader[i]) + > IDirect3DDevice8_DeleteVertexShader(device, vertex_shader[i]); + > for (i = 0; i < sizeof(pixel_shader)/sizeof(pixel_shader[0]); i++) > + if (pixel_shader[i]) + > IDirect3DDevice8_DeletePixelShader(device, pixel_shader[i]); + > refcount = IDirect3DDevice8_Release(device); + ok(!refcount, > "Device has %u references left\n", refcount); +done: + > IDirect3D8_Release(d3d); + DestroyWindow(window); +} + /* This > tests fog in combination with shaders. * What's tested: linear fog > (vertex and table) with pixel shader * linear table > fog with non foggy vertex shader @@ -5092,6 +5426,7 @@ > START_TEST(visual) offscreen_test(); alpha_test(); > test_scalar_instructions(); + fog_negative_z_test(); > fog_with_shader_test(); cnd_test(); p8_texture_test(); diff --git > a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index > 117c8eb..421cae0 100644 --- a/dlls/d3d9/tests/visual.c +++ > b/dlls/d3d9/tests/visual.c @@ -1825,6 +1825,404 @@ done: > DestroyWindow(window); } > > +/* This test tests fog in combination with negative vertex z > coordinates. */ +static void fog_negative_z_test(void) +{ + > enum + { + C_ALPHA_0x00 = 0x00000000, + C_CLEAR > = 0xffff00ff, + C_FOGGED = 0x0000ff00, + > C_HALF_FOGGED = 0x00808000, + C_UNFOGGED = 0x00ff0000 + > }; + + IDirect3DVertexShader9 *vertex_shader[4] = {NULL, NULL, > NULL, NULL}; + IDirect3DPixelShader9 *pixel_shader[3] = {NULL, > NULL, NULL}; + IDirect3DVertexDeclaration9 *vertex_declaration = > NULL; + IDirect3DDevice9 *device; + BOOL has_vs_support, > has_ps_support, has_table_fog_support; + unsigned int i, ps, y; > + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + > DWORD color, expected_middle_color; + HWND window; + HRESULT > hr; + union + { + float f; + DWORD i; + } > start, end; + + /* For all vertex shaders the view matrix goes > in registers c0...c3, + * the projection matrix goes in > registers c4...c7. */ + + /* Basic vertex shader without fog > computation ("non foggy") */ + static const DWORD > vertex_shader_code1[] = + { + 0xfffe0101, > /* vs_1_1 */ + 0x0000001f, 0x80000000, > 0x900f0000, /* dcl_position0 v0 > */ + 0x0000001f, 0x8000000a, 0x900f0001, > /* dcl_color0 v1 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x00000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x00000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x00000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x00000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x00000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x00000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x00000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x00000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x00000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + 0x0000ffff, > /* END */ + }; + + /* Basic vertex shader with > fog computation ("foggy"). + * Using the vertex' x coordinate > as fog coordinate so that all test cases that use vertex fog + > * will have a gradient from fully fogged (green, left) to unfogged > (red, right). */ + static const DWORD vertex_shader_code2[] = + > { + 0xfffe0101, > /* vs_1_1 */ + 0x0000001f, 0x80000000, > 0x900f0000, /* dcl_position0 v0 > */ + 0x0000001f, 0x8000000a, 0x900f0001, > /* dcl_color0 v1 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x00000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x00000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x00000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x00000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x00000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x00000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x00000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x00000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x00000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + /* output.Fog = input.Pos.x */ + > 0x00000001, 0xc00f0001, 0x90000000, > /* mov oFog, v0.x */ + 0x0000ffff, > /* END */ + }; + + /* Basic vertex shader with > fog computation ("foggy"), vs_2_0 */ + static const DWORD > vertex_shader_code3[] = + { + 0xfffe0200, > /* vs_2_0 */ + 0x0200001f, 0x80000000, > 0x900f0000, /* dcl_position0 v0 > */ + 0x0200001f, 0x8000000a, 0x900f0001, > /* dcl_color0 v1 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x03000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x03000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x03000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x03000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x03000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x03000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x03000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x03000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x02000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + /* output.Fog = input.Pos.x */ + > 0x02000001, 0xc00f0001, 0x90000000, > /* mov oFog, v0.x */ + 0x0000ffff, > /* END */ + }; + + /* Basic pixel shader */ + > static const DWORD pixel_shader_code[] = + { + > 0xffff0101, > /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, > /* mov r0, v0 */ + 0x0000ffff + }; + static const > DWORD pixel_shader_code2[] = + { + 0xffff0200, > /* ps_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, > /* dcl v0 */ + 0x02000001, 0x800f0800, 0x90e40000, > /* mov oC0, v0 */ + 0x0000ffff + }; + static const > struct + { + struct vec3 position; + D3DCOLOR > diffuse; + D3DCOLOR specular; + } + quad1[] = + { + > {{-1.0f, -1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, -1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, > 0.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }, + quad2[] = + > { + {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{-1.0f, 1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 0.0f, 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, > 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }, + quad3[] = + > { + {{ 0.0f, 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{ 0.0f, 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, 0.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, > 1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }; + + static > const D3DVERTEXELEMENT9 decl_elements[] = + { + {0, 0, > D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, > 0}, + {0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, > D3DDECLUSAGE_COLOR, 0}, /* diffuse */ + {0, 16, > D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, > 1}, /* specular */ + D3DDECL_END() + }; + static const > struct test_data_t + { + int vshader; + D3DFOGMODE > vfog; + D3DFOGMODE tfog; + DWORD color_left; + > DWORD color_middle_top; + DWORD color_middle_bottom; + > DWORD color_right; + } + test_data[] = + { + /* > Using z-based fog, the bottom quad should have a gradient > UNFOGGED->FOGGED + * for table fog, and be completely > fogged for vertex fog. + * When the fog coordinate returned > by the vertex shader is used instead, + * the result is a > gradient FOGGED->UNFOGGED in the right half of the screen. */ + + > /* No vertex shader */ + {0, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {0, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {0, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_UNFOGGED, C_FOGGED, C_FOGGED}, + {0, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_FOGGED}, + + /* Vertex shader without vertex fog > computation */ + {1, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {1, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {1, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_FOGGED, C_FOGGED, C_FOGGED}, + {1, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_FOGGED}, + + /* Vertex shader vs_1_1 with vertex fog > computation */ + {2, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {2, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {2, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_FOGGED, C_FOGGED, C_UNFOGGED}, + {2, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_UNFOGGED}, + + /* Vertex shader vs_2_0 with vertex fog > computation */ + {3, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {3, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {3, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_FOGGED, C_FOGGED, C_UNFOGGED}, + {3, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_UNFOGGED}, + }; + /* Affine projection matrix for z-near = > -1, z-far = 1. */ + static const D3DMATRIX proj_mat = + {{{ + > 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + > 0.0f, 0.0f, 0.5f, 0.0f, + 0.0f, 0.0f, 0.5f, 1.0f, + }}}; > + /* Transposed version of proj_mat to pass to the vertex > shaders. */ + static const D3DMATRIX proj_mat_transposed = + > {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, > 0.0f, + 0.0f, 0.0f, 0.5f, 0.5f, + 0.0f, 0.0f, 0.0f, > 1.0f, + }}}; + static const D3DMATRIX view_mat = + {{{ + > 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + > 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; > + + window = CreateWindowA("static", "d3d9_test", > WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, > NULL, NULL, NULL, NULL); + d3d = > Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create > a D3D object\n"); + if (!(device = create_device(d3d, window, > window, TRUE))) + { + skip("Failed to create a D3D > device, skipping tests\n"); + goto done; + } + + hr = > IDirect3DDevice9_GetDeviceCaps(device, &caps); + > ok(SUCCEEDED(hr), "Failed to get device caps (%#x)\n", hr); + + > has_table_fog_support = caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE; > + if (!has_table_fog_support) + skip("No table fog > support, skipping some fog tests\n"); + + has_vs_support = > caps.VertexShaderVersion >= D3DVS_VERSION(1, 1); + if > (has_vs_support) + { + hr = > IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code1, > &vertex_shader[1]); + ok(SUCCEEDED(hr), "CreateVertexShader > failed (%#x)\n", hr); + hr = > IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code2, > &vertex_shader[2]); + ok(SUCCEEDED(hr), "CreateVertexShader > failed (%#x)\n", hr); + + if (caps.VertexShaderVersion >= > D3DVS_VERSION(2, 0)) + { + hr = > IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code3, > &vertex_shader[3]); + ok(SUCCEEDED(hr), > "CreateVertexShader failed (%#x)\n", hr); + } + else > + { + skip("No vs_2_0 support, skipping some fog > tests\n"); + } + + /* Note: Shaders expect matrices > in column-major form, so they have + * to be transposed if > they are not symmetrical. */ + hr = > IDirect3DDevice9_SetVertexShaderConstantF(device, 0, (const > float*)&view_mat, 4); + ok(SUCCEEDED(hr), > "SetVertexShaderConstantF (view matrix) failed (%#x)\n", hr); + > hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 4, (const > float*)&proj_mat_transposed, 4); + ok(SUCCEEDED(hr), > "SetVertexShaderConstantF (projection matrix) failed (%#x)\n", > hr); + } + else + { + skip("No vs_1_1 support, > skipping some fog tests\n"); + } + + has_ps_support = > caps.PixelShaderVersion >= D3DPS_VERSION(1, 1); + if > (has_ps_support) + { + hr = > IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code, > &pixel_shader[1]); + ok(SUCCEEDED(hr), "CreatePixelShader > failed (%#x)\n", hr); + + if (caps.PixelShaderVersion >= > D3DPS_VERSION(2, 0)) + { + hr = > IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code2, > &pixel_shader[2]); + ok(SUCCEEDED(hr), > "CreatePixelShader failed (%#x)\n", hr); + } + else + > { + skip("No ps_2_0 support, skipping some fog > tests\n"); + } + } + else + { + skip("No > ps_1_1 support, skipping some fog tests\n"); + } + + hr = > IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, > &vertex_declaration); + ok(SUCCEEDED(hr), > "CreateVertexDeclaration failed (%#x)\n", hr); + + /* Setup > initial states: No depth test, no lighting, fog on, fog color */ + > hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, > D3DZB_FALSE); + ok(SUCCEEDED(hr), "Turning off depth test failed > (%#x)\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, > D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Turning off > lighting failed (%#x)\n", hr); + hr = > IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + > ok(SUCCEEDED(hr), "Turning on fog calculations failed (%#x)\n", > hr); + hr = IDirect3DDevice9_SetRenderState(device, > D3DRS_FOGCOLOR, C_FOGGED); + ok(SUCCEEDED(hr), "Setting fog > color failed (%#x)\n", hr); + hr = > IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); > + ok(SUCCEEDED(hr), "SetVertexDeclaration failed (%#x)\n", hr); > + + /* We are using an affine projection matrix, so fog start > and end are in device space coords. + * This corresponds to a > fog from z=-1 to z=1. */ + start.f = 0.0f; + end.f = 1.0f; + > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, > start.i); + ok(SUCCEEDED(hr), "Setting fog start failed > (%#x)\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, > D3DRS_FOGEND, end.i); + ok(SUCCEEDED(hr), "Setting fog end > failed (%#x)\n", hr); + + hr = > IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, > &proj_mat); + ok(SUCCEEDED(hr), "Failed to set projection > transform (%#x)\n", hr); + hr = > IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &view_mat); + > ok(SUCCEEDED(hr), "Failed to set view transform (%#x)\n", hr); + + > for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) + > { + if (test_data[i].vshader != 0 && > !vertex_shader[test_data[i].vshader]) + continue; + > if (test_data[i].tfog != D3DFOG_NONE && !has_table_fog_support) + > continue; + + if (has_vs_support) + { + hr > = IDirect3DDevice9_SetVertexShader(device, > vertex_shader[test_data[i].vshader]); + > ok(SUCCEEDED(hr), "SetVertexShader failed (%#x)\n", hr); + > } + + for (ps = 0; ps < > sizeof(pixel_shader)/sizeof(pixel_shader[0]); ps++) + { + > if (ps != 0 && !pixel_shader[ps]) + continue; + + > if (has_ps_support) + { + hr = > IDirect3DDevice9_SetPixelShader(device, pixel_shader[ps]); + > ok(SUCCEEDED(hr), "SetPixelShader failed (%#x)\n", hr); + > } + + hr = IDirect3DDevice9_SetRenderState(device, > D3DRS_FOGVERTEXMODE, test_data[i].vfog); + > ok(SUCCEEDED(hr), "Setting fog vertex mode to %d failed (%#x)\n", > test_data[i].vfog, hr); + hr = > IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, > test_data[i].tfog); + ok(SUCCEEDED(hr), "Setting fog > table mode to %d failed (%#x)\n", test_data[i].tfog, hr); + + > hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, > C_CLEAR, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed > (%#x)\n", hr); + hr = > IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), > "BeginScene failed (%#x)\n", hr); + hr = > IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad1[0], sizeof(quad1[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad2[0], sizeof(quad2[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad3[0], sizeof(quad3[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), > "EndScene failed (%#x)\n", hr); + + /* Use 5% tolerance > on the colors since there may be a gradient + * between > left and right vertices. */ + for (y = 120; y <= 360; y > += 240) + { + color = > getPixelColor(device, 2, y); + ok(color_match(color, > test_data[i].color_left, 13), + "fog vs%i > ps%i fvm%i ftm%i, y=%i: got left color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, ps, > test_data[i].vfog, test_data[i].tfog, y, + > color, test_data[i].color_left); + color = > getPixelColor(device, 320, y); + > expected_middle_color = + (y == 120 ? > test_data[i].color_middle_top : test_data[i].color_middle_bottom); > + ok(color_match(color, expected_middle_color, 13), > + "fog vs%i ps%i fvm%i ftm%i, y=%i: got > middle color %08x, expected %08x+-5%%\n", + > test_data[i].vshader, ps, test_data[i].vfog, test_data[i].tfog, y, > + color, expected_middle_color); + > color = getPixelColor(device, 638, y); + > ok(color_match(color, test_data[i].color_right, 13), + > "fog vs%i ps%i fvm%i ftm%i, y=%i: got right color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, ps, > test_data[i].vfog, test_data[i].tfog, y, + > color, test_data[i].color_right); + } + + hr > = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + > ok(SUCCEEDED(hr), "Present failed (%#x)\n", hr); + } + } > + + for (i = 0; i < > sizeof(vertex_shader)/sizeof(vertex_shader[0]); i++) + if > (vertex_shader[i]) + > IDirect3DVertexShader9_Release(vertex_shader[i]); + for (i = 0; > i < sizeof(pixel_shader)/sizeof(pixel_shader[0]); i++) + if > (pixel_shader[i]) + > IDirect3DPixelShader9_Release(pixel_shader[i]); + > IDirect3DVertexDeclaration9_Release(vertex_declaration); + > refcount = IDirect3DDevice9_Release(device); + ok(!refcount, > "Device has %u references left\n", refcount); +done: + > IDirect3D9_Release(d3d); + DestroyWindow(window); +} + /* This > test tests fog in combination with shaders. * What's tested: linear > fog (vertex and table) with pixel shader * linear > table fog with non foggy vertex shader @@ -16729,6 +17127,7 @@ > START_TEST(visual) test_vshader_input(); test_vshader_float16(); > stream_test(); + fog_negative_z_test(); fog_with_shader_test(); > texbem_test(); texdepth_test(); diff --git > a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index > ec50fb8..286b828 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ > b/dlls/ddraw/tests/ddraw7.c @@ -3384,6 +3384,191 @@ static void > test_fog_special(void) DestroyWindow(window); } > > +/* This test tests fog in combination with negative vertex z > coordinates. */ +static void test_fog_negative_z(void) +{ + > enum + { + C_ALPHA_0x00 = 0x00000000, + C_CLEAR > = 0xffff00ff, + C_FOGGED = 0x0000ff00, + > C_HALF_FOGGED = 0x00808000, + C_UNFOGGED = 0x00ff0000 + > }; + + D3DCOLOR color, expected_middle_color; + HRESULT hr; + > ULONG refcount; + BOOL has_table_fog_support; + unsigned int > i, y; + HWND window; + IDirect3DDevice7 *device; + > IDirectDrawSurface7 *rt; + D3DDEVICEDESC7 caps; + + union + > { + float f; + DWORD d; + } start, end; + + > static struct + { + struct vec3 position; + > D3DCOLOR diffuse; + D3DCOLOR specular; + } + quad1[] > = + { + {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, > C_ALPHA_0x00}, + {{ 1.0f, 0.0f, 1.0f}, C_UNFOGGED, > C_ALPHA_0x00}, + {{-1.0f, -1.0f, -1.0f}, C_UNFOGGED, > C_ALPHA_0x00}, + {{ 1.0f, -1.0f, 1.0f}, C_UNFOGGED, > C_ALPHA_0x00}, + }, + quad2[] = + { + {{-1.0f, > 1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, 1.0f, > 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{-1.0f, 0.0f, -1.0f}, > C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, 0.0f, 0.0f}, > C_UNFOGGED, C_ALPHA_0x00}, + }, + quad3[] = + { + > {{ 0.0f, 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, 1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, > 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, 0.0f, > 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }; + static const struct > test_data_t + { + DWORD vertexmode, tablemode; + > D3DCOLOR color_left, color_middle_top, color_middle_bottom, > color_right; + } + test_data[] = + { + > {D3DFOG_NONE, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {D3DFOG_LINEAR, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + > {D3DFOG_LINEAR, D3DFOG_NONE, C_FOGGED, C_UNFOGGED, C_FOGGED, > C_FOGGED}, + {D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, > C_FOGGED, C_FOGGED, C_FOGGED}, + }; + /* Affine > projection matrix for z-near = -1, z-far = 1. */ + static > D3DMATRIX proj_mat = + { + 1.0f, 0.0f, 0.0f, 0.0f, + > 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.5f, 0.0f, + > 0.0f, 0.0f, 0.5f, 1.0f + }; + static D3DMATRIX view_mat = + > { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, > 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, > 1.0f + }; + + window = CreateWindowA("static", "ddraw_test", > WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + > if (!(device = create_device(window, DDSCL_NORMAL))) + { + > skip("Failed to create a 3D device, skipping test.\n"); + > DestroyWindow(window); + return; + } + + memset(&caps, > 0, sizeof(caps)); + hr = IDirect3DDevice7_GetCaps(device, > &caps); + ok(SUCCEEDED(hr), "IDirect3DDevice7_GetCaps failed, hr > %#x.\n", hr); + + has_table_fog_support = > caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE; + if > (!has_table_fog_support) + skip("No table fog support, > skipping some fog tests.\n"); + + hr = > IDirect3DDevice7_GetRenderTarget(device, &rt); + > ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + > + hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to > enable fog, hr %#x.\n", hr); + hr = > IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGCOLOR, > C_FOGGED); + ok(SUCCEEDED(hr), "Failed to set fog color, hr > %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to > disable lighting, hr %#x.\n", hr); + hr = > IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, > D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable depth test, > hr %#x.\n", hr); + + /* We are using an affine projection > matrix, so fog start and end are in device space coords. + * > This corresponds to a fog from z=-1 to z=1. */ + start.f = > 0.0f; + end.f = 1.0f; + + hr = > IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGSTART, > start.d); + ok(SUCCEEDED(hr), "Failed to set fog start, hr > %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_FOGEND, end.d); + ok(SUCCEEDED(hr), "Failed to > set fog end, hr %#x.\n", hr); + + hr = > IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, > &proj_mat); + ok(SUCCEEDED(hr), "Failed to set projection > transform, hr %#x.\n", hr); + hr = > IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, > &view_mat); + ok(SUCCEEDED(hr), "Failed to set view transform, > hr %#x.\n", hr); + + for (i = 0; i < > sizeof(test_data)/sizeof(test_data[0]); i++) + { + if > (test_data[i].tablemode != D3DFOG_NONE && !has_table_fog_support) + > continue; + + hr = IDirect3DDevice7_Clear(device, 0, NULL, > D3DCLEAR_TARGET, C_CLEAR, 1.0f, 0); + ok(SUCCEEDED(hr), > "Failed to clear render target, i=%d, hr %#x.\n", i, hr); + + > hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_FOGVERTEXMODE, test_data[i].vertexmode); + > ok(SUCCEEDED(hr), "Failed to set fog vertex mode, i=%d, hr %#x.\n", > i, hr); + hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_FOGTABLEMODE, test_data[i].tablemode); + > ok(SUCCEEDED(hr), "Failed to set fog table mode, i=%d, hr %#x.\n", > i, hr); + + hr = IDirect3DDevice7_BeginScene(device); + > ok(SUCCEEDED(hr), "Failed to begin scene, i=%d, hr %#x.\n", i, > hr); + hr = IDirect3DDevice7_DrawPrimitive(device, > D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_DIFFUSE | > D3DFVF_SPECULAR, quad1, 4, 0); + ok(SUCCEEDED(hr), "Failed > to draw, i=%d, hr %#x.\n", i, hr); + hr = > IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + > D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, quad2, 4, 0); + > ok(SUCCEEDED(hr), "Failed to draw, i=%d, hr %#x.\n", i, hr); + > hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + > D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, quad3, 4, 0); + > ok(SUCCEEDED(hr), "Failed to draw, i=%d, hr %#x.\n", i, hr); + > hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), > "Failed to end scene, i=%d, hr %#x.\n", i, hr); + + /* Use > 5% tolerance on the colors since there may be a gradient + > * between left and right vertices. */ + for (y = 120; y <= > 360; y += 240) + { + color = > get_surface_color(rt, 2, y); + ok(compare_color(color, > test_data[i].color_left, 13), + "fog fvm%i ftm%i > y=%i: got left color %08x, expected %08x+-5%%.\n", + > test_data[i].vertexmode, test_data[i].tablemode, color, y, + > test_data[i].color_left); + color = > get_surface_color(rt, 320, y); + expected_middle_color > = + (y == 120 ? test_data[i].color_middle_top : > test_data[i].color_middle_bottom); + > ok(compare_color(color, expected_middle_color, 13), + > "fog fvm%i ftm%i y=%i: got middle color %08x, expected > %08x+-5%%.\n", + test_data[i].vertexmode, > test_data[i].tablemode, y, + color, > expected_middle_color); + color = get_surface_color(rt, > 638, y); + ok(compare_color(color, > test_data[i].color_right, 13), + "fog fvm%i > ftm%i y=%i: got right color %08x, expected %08x+-5%%.\n", + > test_data[i].vertexmode, test_data[i].tablemode, y, + > color, test_data[i].color_right); + } + } + + > IDirectDrawSurface7_Release(rt); + refcount = > IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u > references left.\n", refcount); + DestroyWindow(window); +} + > static void test_lighting_interface_versions(void) { > IDirect3DDevice7 *device; @@ -7671,6 +7856,7 @@ START_TEST(ddraw7) > test_clear_rect_count(); test_coop_level_versions(); > test_fog_special(); + test_fog_negative_z(); > test_lighting_interface_versions(); test_coop_level_activateapp(); > test_texturemanage(); diff --git a/dlls/wined3d/glsl_shader.c > b/dlls/wined3d/glsl_shader.c index 7379ba2..b78e59e 100644 --- > a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ > -4352,7 +4352,7 @@ static GLhandleARB > generate_param_reorder_function(struct wined3d_shader_buffer } else > if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_FOG)) > { - shader_addline(buffer, "gl_FogFragCoord = > clamp(vs_out[%u].%c, 0.0, 1.0);\n", i, reg_mask[1]); + > shader_addline(buffer, "gl_FogFragCoord = vs_out[%u].%c;\n", i, > reg_mask[1]); } } shader_addline(buffer, "}\n"); @@ -5005,7 +5005,7 > @@ static GLhandleARB shader_glsl_generate_ffp_vertex_shader(struct > wined3d_shader_ /* Need to undo the [0.0 - 1.0] -> [-1.0 - 1.0] > transformation from D3D to GL coordinates. */ > shader_addline(buffer, "gl_FogFragCoord = gl_Position.z * 0.5 + > 0.5;\n"); else - shader_addline(buffer, > "gl_FogFragCoord = ec_pos.z;\n"); + > shader_addline(buffer, "gl_FogFragCoord = abs(ec_pos.z);\n"); > break; > > default: > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUR5+HAAoJEN0/YqbEcdMwkzAP/Rr0nW6/UhcjbrhTWFapJgu1 yofwZuo6jh6hWeqYJQKmI+ltYY+D6zX8yjaAZv8b+JbW5QbNAAUkH8UR1DakrvuY ZxBKxOURffVifx3cC1K6c8Joy2j/0TLKMGBtB5MMNZKpRaROPa+jGo6Yp7B3lyqr V3V0OfOSyduQTSpFdXLTkQzXK0qu4Knk1tGqg3IuuLERMZC8ClYnrTMnwO1nU93J PLXT+AVF0/h6/pHOyyXJm63w5+j8ZQGScqEVaqaT+Js3Yl2KKc+IgiOCo81VdCF+ AcTh2ReRSxQLIp+5qcGw36/dw/+RSq+Hld54OsnDZlgpLd1nYs3Bs6DBae7aaQZ8 QUEzc74DThOssKcOmObfuplzAEcg1VP7Asb7aHxWAzRUrnpLJS5L+NAJYtzzOld3 1dLTjXoQO+B+RCwh5Ea5gbSLbhX8h5U2amA6IEract8rKU5EMWlGmJ7l2TX+3HY9 5hiBMXSEeARTfkwXTqhf+NTpL4A0kXudd25/9RgubfOJusZT5vWKMJryMbW/H5Ah TKpYDiFYC7bBGaTlsxHb1CWoOweFIRm1ord4vob7IB3KBE9VCvm2j+3ZxHmm2dld J4WyhbrErJq86Qxa6tToh9ELZlg4UkJxvUOxjdD7ra4qo2isd9ABkbxhxoHgcvY2 PqVs5A384cEgYrNgBe55 =hu36 -----END PGP SIGNATURE-----

2 5

Re: [PATCH 2/5] dwrite: Block attempts of registering local file loader
by Marvin 27 Oct '14

27 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=9762 Your paranoid android. === wvistau64 (32 bit font) === font.c:949: Test failed: got 0x88985006 font.c:953: Test failed: got 0x80070057 === w2008s64 (32 bit font) === font.c:949: Test failed: got 0x88985006 font.c:953: Test failed: got 0x80070057 === wvistau64 (64 bit font) === font.c:949: Test failed: got 0x88985006 font.c:953: Test failed: got 0x80070057 === w2008s64 (64 bit font) === font.c:949: Test failed: got 0x88985006 font.c:953: Test failed: got 0x80070057

1 0

Re: comctl32: Use strcmpW instead of pointer comparison to ensure treeview updates correctly (try 2)
by Nikolay Sivov 26 Oct '14

26 Oct '14

On 10/26/2014 21:02, Dan Bassi wrote: This should be a normal message sequence test, we have everything in place for that. And you're not testing text callback case.

1 0

Re: [1/2] server: Store the time of the socket connection (resend)
by Alexandre Julliard 26 Oct '14

26 Oct '14

Bruno Jesus <00cpxxx(a)gmail.com> writes: > diff --git a/server/protocol.def b/server/protocol.def > index fec5e75..1e83862 100644 > --- a/server/protocol.def > +++ b/server/protocol.def > @@ -1250,6 +1250,7 @@ enum server_fd_type > int family; /* family, see socket manpage */ > int type; /* type, see socket manpage */ > int protocol; /* protocol, see socket manpage */ > + unsigned int connect_time; /* time the socket was connected (tick count) */ There doesn't seem to be any reason to return a tick count (as opposed to a normal server timestamp). -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: urlmon/tests: Clarify ok() condition
by Marvin 25 Oct '14

25 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=9754 Your paranoid android. === w2008s64 (64 bit url) === url.c:1681: Test failed: unexpected call OnProgress_CONNECTING

1 0

Re: [PATCH] vbscript: Implemented String(try 2)
by Marvin 25 Oct '14

25 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=9751 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 2/8] reg.exe: Add path_get_key() to remove boilerplate
by Stefan Dösinger 24 Oct '14

24 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I think this patch has the potential to improve code readability if improved a bit. Am 2014-10-09 10:55, schrieb Jonathan Vollebregt: > +#define MAX_ROOT_KEY_NAME_LENGTH 20 > +#define NUM_ROOT_KEYS 5 > + > +static const WCHAR short_HKEY_name[NUM_ROOT_KEYS][5] = { > ... > +}; > + > +static const WCHAR long_HKEY_name[NUM_ROOT_KEYS][MAX_ROOT_KEY_NAME_LENGTH] = { > ... > +}; > + > +static const HKEY HKEYs[NUM_ROOT_KEYS] = { > ... > +}; Why not use one table instead of 3 separate arrays with magically matching indices? Something like static const struct { HKEY key; const WCHAR *long_name; const WCHAR *short_name; } keys[] = { {HKEY_LOCAL_MACHINE, {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}, {'H','K','L','M',0}}, ... }; static HKEY path_get_rootkey(const WCHAR *path) { unsigned int i; for (i = 0; i < sizeof(keys) / sizeof(*keys); i++) { if (!strcmpi(keys[i].short_name, name) || !strcmpi(keys[i].long_name, name)) return keys[i].key; } return NULL; } > + if (strncmpiW(path, short_HKEY_name[i], strlenW(short_HKEY_name[i])) == 0 || > + strncmpiW(path, long_HKEY_name[i], strlenW(long_HKEY_name[i])) == 0) I don't think strncmpi(x, y, strlen(y)) has any advantage over strcmpi(x, y). strlen just counts the number of characters to the first 0 byte, where strcmpi would stop anyway. Are you sure there is not some other behavior of CompareStringW that str(n)cmpi does not have? I have not found any, but I am not sure about the CP_ACP part. The original code probably has a bug if the user passes a string like HKEY_LOCAL_MACHINE_GARBAGE. It's worth writing a test for this. > +static HKEY path_get_rootkey(const WCHAR *path) > +{ > + if (path_get_rootkey_name(path)) > + return HKEYs[(path_get_rootkey_name(path) - long_HKEY_name[0]) / MAX_ROOT_KEY_NAME_LENGTH]; This searches the array twice. > + path = strchrW(path, '\\'); > + if (!path) > + return k; I expect that this causes trouble with RegCloseKey. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOoj8AAoJEN0/YqbEcdMwBI8P/1CgdHX0yt2Z6iZqn61fA1wt M89EKguHgXoQmorrtpMYtZJNoMd6f0kIv4yH+corcZwz01iGAuu4Zq7v3grD3SIz uv6S+QNiysw8wT5tTSFVu+DiGuxQXreb1BryjMXgmoOLbmPLPbcYX+yEj1DaiRqg gh1hXYpVoqCjKGed8Wukk+Cq481azQz41e2vUqd2pP8mux0BToWaBU8H9HufTxYg RyHYaKksstGhQLINm2FOAtq2S8eZN5TRdELcTEuQoDiE6c6YNIepLLJ5f6MiH4lt 6Biq2CUeIOhkqEWjWGzGmfom2rBq1lcSWuLnV9N7coRKdCOC+wWpeEvUBjvFTqMW JcbdZxusE3Rp80scp7YFnUBVXfOlQr4IofKkNeJkVUjoAIGOuSAcr6pHnO8KTpMI K/9nkFb/cOF8IQi6Gc3PxJxXYBBQFw578aeNpUk6QEmimXcyBvmCe/K2Oki1Qa7x CoU7MIMvtE1oSL2kN5o4yzJ+YrIZ4CGfg8yhvl9M54tWHvLMLe+Bw+5pMefwgDXP QIYCdKKIWf+hsTOJCYHLgD5wU8euvTvcgmBklI5cGivwLQqrLfZMucmnsG4jmXH4 pLdZwJsC1XXRRej13YofPzfRSZbK3pcjGwpiq7sxJTrWH05pTm+kBOGId1ChelcS jW7y6q/ecery5/13atxt =PXew -----END PGP SIGNATURE-----

4 9

Re: [PATCH 3/5] ddraw/tests: RestoreDisplayMode uses the registry mode.
by Marvin 24 Oct '14

24 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=9733 Your paranoid android. === w8 (32 bit ddraw1) === ddraw1.c:1318: Test failed: Expected color 0x00ff0000 for test 0, got 0x0000ff00. ddraw1.c:1340: Test failed: Expected color 0x000000ff for test 0, got 0x0000ff00.

1 0

Re: [PATCH 2/5] d3d8/tests: The device restores the mode settings from the registry.
by Marvin 24 Oct '14

24 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=9732 Your paranoid android. === w8 (32 bit device) === device.c:2437: Test failed: Expected foreground window 000301BA, got 0002004C. device.c:3098: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 800, 600}. device.c:3121: Test failed: Got unexpect width 640, expected 1024. device.c:3123: Test failed: Got unexpect height 480, expected 768. device.c:3209: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: [PATCH 1/5] d3d9/tests: The device restores the mode settings from the registry.
by Marvin 24 Oct '14

24 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=9731 Your paranoid android. === w8 (32 bit device) === device.c:4008: Test failed: Expected {0, 0, 800, 600}, got {0, 0, 652, 492}.

1 0

Re: [PATCH 4/5] dwrite: Pass raw NAME table pointer to table reading code
by Marvin 24 Oct '14

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

1 0

Re: [PATCH 2/5] dwrite: Cache fontface instances at factory level
by Marvin 24 Oct '14

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

1 0

Re: [2/2] ws2_32: Properly implement SO_CONNECT_TIME (try 3)
by Marvin 24 Oct '14

24 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=9727 Your paranoid android. === wvistau64 (32 bit sock) === sock: unhandled exception c0000005 at 00000000 === w2008s64 (32 bit sock) === sock: unhandled exception c0000005 at 00000000 === w2008s64 (64 bit sock) === sock.c:6676: Test failed: failed to create socket 10022 sock.c:6679: Test failed: failed to create completion port 87 sock.c:6684: Test failed: WSAIoctl failed 10038 sock.c:6687: Test failed: failed to get completion status 6

1 0

Re: [PATCH] wininet: remove custom port handling in HTTP_HandleRedirect (try 2)
by Alexandre Julliard 24 Oct '14

24 Oct '14

Daniel Lehman <dlehman(a)esri.com> writes: > HTTP_HandleRedirect updates both: > - the Host: field > - and session->hostname > > If there is a custom port, it is appended to session->hostName. This causes problems for later HttpOpenRequest/process_host_port calls that append the port to the host name (resulting in "foobar:1234:1234") > > There is already logic in HTTP_HandleRequest that will update the > request->server if the new host or port don't match. in that case, > get_server/process_host_port use the updated host and port and store > them appended in server->host_port. If they already match, > server->host_port is left untouched > > The attached change removes the current custom port logic to instead > use server->host_port to update the Host: field It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M wininet.dll -p wininet_test.exe.so http && touch http.ok http.c:693: Test failed: Wrong URL http://test.winehq.org:80/tests/hello.html http.c:693: Test failed: Wrong URL http://test.winehq.org:80/tests/hello.html make[1]: *** [http.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: d3dx10_43: Add stub for D3DXCpuOptimizations
by Henri Verbeet 24 Oct '14

24 Oct '14

On 24 October 2014 00:28, André Hentschel <nerv(a)dawncrow.de> wrote: > +typedef enum _D3DX_CPU_OPTIMIZATION > +{ > + D3DX_NOT_OPTIMIZED = 0, > + D3DX_3DNOW_OPTIMIZED = 1, > + D3DX_SSE2_OPTIMIZED = 2, > + D3DX_SSE_OPTIMIZED = 3 > +} D3DX_CPU_OPTIMIZATION; I think this should be in d3dx10math.h. > + FIXME("%i - stub\n", enable); I'd like to see that as "FIXME("enable %#x stub!\n", enable);" for consistency with other D3D code, but I don't think it's a big deal.

1 0

[PATCH] mshtml: check null before release the elem object
by Hao Peng 24 Oct '14

24 Oct '14

Check null pointer before release the script elem object, prevent to release them twice. --- dlls/mshtml/script.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

Fw:[PATCH] mlang: add gbk to Chinese Simplified codepage
by Hao Peng 24 Oct '14

24 Oct '14

Add gbk to Chinese Simplified codepage data array in mlang, to make sure GBK encoded strings were decoded in codepage 936. --- dlls/mlang/mlang.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)

1 0

Re: [PATCH] vbscript: Implemented String
by Nikolay Sivov 23 Oct '14

23 Oct '14

> + str = SysAllocStringLen(NULL, 1023); > + newstr = SysAllocStringLen(NULL, 1023); Where this length comes from? > + 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; > + break; > + } You only need first character, right? Then why do you need a full BSTR pointer in VT_BSTR case? And assigning it to 'str' you leak a previously allocated buffer. Why cast to (char)tmp? > + else if(len == 0) > + newstr = '\0'; Same way you're losing pointer to allocated buffer.

2 4

Re: [PATCH 2/2] dwrite/tests: Some tests for local font file loader
by Marvin 23 Oct '14

23 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=9714 Your paranoid android. === wvistau64 (32 bit font) === font.c:943: Test failed: got 0x88985006 font.c:945: Test failed: got 0x80070057 === w2008s64 (32 bit font) === font.c:943: Test failed: got 0x88985006 font.c:945: Test failed: got 0x80070057 === wvistau64 (64 bit font) === font.c:943: Test failed: got 0x88985006 font.c:945: Test failed: got 0x80070057 === w2008s64 (64 bit font) === font.c:943: Test failed: got 0x88985006 font.c:945: Test failed: got 0x80070057

1 0

Re: [PATCH v3 1/6] reg.exe/tests: Parameterise error messages
by Alexandre Julliard 23 Oct '14

23 Oct '14

Jonathan Vollebregt <jnvsor(a)gmail.com> writes: > Also use %u for DWORD instead of %d It's not worth changing that sort of thing, the expected value is in general not useful. In the tests that you are modifying you can get rid of it, otherwise leave them alone. -- Alexandre Julliard julliard(a)winehq.org

3 2

Re: [PATCH 1/3] d3d8/tests: Skip unsupported resources in test_resource_type.
by Marvin 22 Oct '14

22 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=9711 Your paranoid android. === w8 (32 bit device) === device.c:2437: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3141: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: dpnet: Check if DirectDplay is installed (try 4 - resend)
by Stefan Dösinger 22 Oct '14

22 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I don't remember and cannot find out from the archives what happened to try 1-3. > +#include "dpnet_private.h" I think we want our test files to be stand-alone if possible. Having a copy of the code in each file or merging the test files are alternatives to giving up this independence. Though at least dlls/ntdll/tests/ntdll_test.h is an example of an existing test header. Another option is to generalize this function beyond dpnet.dll and put it in include/wine/test.h or make programs/winetest responsible for checking for stubs. I think programs/winetest is the best place, as it also handles missing DLLs. If you keep the header please rename it, along with the protection define. > +extern BOOL IsStubDLL(const char *filename) DECLSPEC_HIDDEN; You have CamelCase in there. You could also consider making this a static inline function in the header, that way you avoid dependencies between the .c files. > +/* + * Windows 8 has a concept of stub DLL's. When DLLMain is > called the user is prompted I think DLLs is the correct plural, DLL's would be the possessive. > + LPSTR data = HeapAlloc(GetProcessHeap(), 0, size); LPFOO. There are other cases on this code. > + if (VerQueryValueA(data, > "\\StringFileInfo\\040904b0\\OriginalFilename", (LPVOID*)&p, > &size)) What's 040904b0? I could not find an explanation on google, so maybe there's no way to avoid it. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUSAkhAAoJEN0/YqbEcdMw3y8QAJMwgh4rHP2iHgQV1mPkjSFR bHMv/CZynb/cd6e8of2oQybSC+iAt4e6MUPqMQCkg0CcsqcDTHf27Ci6r5q+P7Lg fTxAp2U/Vz5r77cKRejarjNueN62SBet7wDR9Bx8pIZ7+yAQDQ6H2qf5iqHOr5KU 0kjftpeKA9YUy1nuQJEf3wUUqnXEy8tZBL9UqryV6ya+HLzYdwq1SNJunH/rOaFh QQBM9CQ4HPMvj7BnGmKdQhFdssptaNYLPrK0QUCb/EyroqB0YGQ2QZsINQREKGYl y8iwjFaMkpIALtXX88UapHfPBn6jc4Y7abaEWm0ReRly1FCkMOgoPIqwLyWIunga sJalQeULE8ztPh/dseofH7mtOJyWY82JCs2l8F3iTRANwjbJCiZVE/dFJHurs8EZ 0wQ4zNH3wp1HwjYXDxOuVS2phJ9Y1SC30Cjb2jDLotg1NX/5QWLbQvn6R+S1+YV/ AkFbizAFUf6GNhnLTKMB+WC+lChc2ZF57P+H0iFixbpnW8OTNYDKiefKKQuScicE i6TgiKBTw7pWrn6h+s1GV+nILBsqzO8HqGaTLvvQUGkPKdaxjN/5HJLYQ60Xhg7P RvLSiYm0xOQNgZyoVCrGlLyiKZg7r192q+Yv9OG4AQ/GQkdeP9PahKmhu9a0WhDt xD1zmLqLy45erH4m4oa4 =Wf/H -----END PGP SIGNATURE-----

1 0

Re: [PATCH v3 1/6] reg.exe/tests: Parameterise error messages
by Stefan Dösinger 22 Oct '14

22 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 These patches look reasonable to me. There are some things that are matters of opinion as far as I can see, like printing static expected values in this patch, or reusing the same buffer in patch 4-6. I left those up to Jonathan to decide. If we have written rules about those please point them out. Am 2014-10-22 18:13, schrieb Jonathan Vollebregt: > Also use %u for DWORD instead of %d > --- > programs/reg/tests/reg.c | 60 ++++++++++++++++++++++++------------------------ > 1 file changed, 30 insertions(+), 30 deletions(-) > > diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c > index 5b79aed..772d81d 100644 > --- a/programs/reg/tests/reg.c > +++ b/programs/reg/tests/reg.c > @@ -73,13 +73,13 @@ static void verify_reg_(unsigned line, HKEY hkey, const char* value, > return; > > if (todo & TODO_REG_TYPE) > - todo_wine lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); > + todo_wine lok(type == exp_type, "got wrong type %u, expected %u\n", type, exp_type); > else > - lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); > + lok(type == exp_type, "got wrong type %u, expected %u\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); > + todo_wine lok(size == exp_size, "got wrong size %u, expected %u\n", size, exp_size); > else > - lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); > + lok(size == exp_size, "got wrong size %u, expected %u\n", size, exp_size); > if (todo & TODO_REG_DATA) > todo_wine lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); > else > @@ -93,7 +93,7 @@ static void test_add(void) > DWORD r, dword, type, size; > > run_reg_exe("reg add", &r); > - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected %u\n", r, REG_EXIT_FAILURE); > > err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); > ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); > @@ -102,7 +102,7 @@ static void test_add(void) > ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > > err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); > ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); > @@ -110,36 +110,36 @@ static void test_add(void) > /* REG_SZ */ > run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); > ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), > - "got exit code %d, expected 0\n", r); > + "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > if (r == REG_EXIT_SUCCESS) > verify_reg(hkey, "", REG_SZ, "WineTest", 9, 0); > else > win_skip("broken reg.exe detected\n"); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /d deadbeef /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > verify_reg(hkey, "test", REG_SZ, "deadbeef", 9, 0); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > verify_reg(hkey, "test", REG_SZ, "", 1, TODO_REG_SIZE); > > run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > verify_reg(hkey, "", REG_SZ, "WineTEST", 9, 0); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test2 /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > verify_reg(hkey, "test2", REG_SZ, "", 1, TODO_REG_SIZE); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test3 /f /d \"\"", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > verify_reg(hkey, "test3", REG_SZ, "", 1, 0); > > /* REG_DWORD */ > run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /f /d 12345678", &r); > ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), > - "got exit code %d, expected 0\n", r); > + "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > dword = 12345678; > if (r == REG_EXIT_SUCCESS) > verify_reg(hkey, "", REG_DWORD, &dword, sizeof(dword), 0); > @@ -148,41 +148,41 @@ static void test_add(void) > > 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 %u, expected %u\n", r, REG_EXIT_FAILURE); > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword2 /t REG_DWORD /d zzz /f", &r); > - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected %u\n", r, REG_EXIT_FAILURE); > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword3 /t REG_DWORD /d deadbeef /f", &r); > - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected %u\n", r, REG_EXIT_FAILURE); > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword4 /t REG_DWORD /d 123xyz /f", &r); > - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected %u\n", r, REG_EXIT_FAILURE); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword5 /t reg_dword /d 12345678 /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > dword = 12345678; > verify_reg(hkey, "dword5", REG_DWORD, &dword, sizeof(dword), 0); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword6 /t REG_DWORD /D 0123 /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > size = sizeof(dword); > err = RegQueryValueExA(hkey, "dword6", NULL, &type, (LPBYTE)&dword, &size); > ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); > - ok(type == REG_DWORD, "got wrong type %d, expected %d\n", type, REG_DWORD); > - ok(size == sizeof(DWORD), "got wrong size %d, expected %d\n", size, (int)sizeof(DWORD)); > + ok(type == REG_DWORD, "got wrong type %u, expected %u\n", type, REG_DWORD); > + ok(size == sizeof(DWORD), "got wrong size %u, expected %u\n", size, (unsigned int) sizeof(DWORD)); > todo_wine ok(dword == 123 || broken(dword == 0123 /* WinXP */), > - "got wrong data %d, expected %d\n", dword, 123); > + "got wrong data %u, expected %u\n", dword, 123); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword7 /t reg_dword /d 0xabcdefg /f", &r); > - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected %u\n", r, REG_EXIT_FAILURE); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0xdeadbeef /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > dword = 0xdeadbeef; > verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), > (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); > > /* REG_DWORD_LITTLE_ENDIAN */ > run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > dword = 456; > verify_reg(hkey, "DWORD_LE", REG_DWORD_LITTLE_ENDIAN, &dword, sizeof(dword), 0); > > @@ -200,7 +200,7 @@ static void test_delete(void) > const DWORD deadbeef = 0xdeadbeef; > > run_reg_exe("reg delete", &r); > - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected %u\n", r, REG_EXIT_FAILURE); > > err = RegCreateKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); > ok(err == ERROR_SUCCESS, "got %d\n", err); > @@ -219,17 +219,17 @@ static void test_delete(void) > RegCloseKey(hsubkey); > > run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > err = RegQueryValueExA(hkey, "bar", NULL, NULL, NULL, NULL); > ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); > > run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > err = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); > todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); > > run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > err = RegQueryValueExA(hkey, "foo", NULL, NULL, NULL, NULL); > ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); > err = RegOpenKeyExA(hkey, "subkey", 0, KEY_READ, &hsubkey); > @@ -238,7 +238,7 @@ static void test_delete(void) > RegCloseKey(hkey); > > run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); > ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); > } > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUSAPxAAoJEN0/YqbEcdMw46UP/2gJ9G9eYnhotsSlgl5S+fKw +BheiroQvKsqoCVHxw4LdunAtJDYA7i9lohaXrl+3EmMlgA/YMzwhRiZawC2Nukh 6OkZrjCYNx9V5PWNPrzAmj6wWE0UJ9QJDlm6krN9sI8KtFRG3Xaeo6qcWF/Hb3Rj S9htN0+hi5mex8v0mAEICkoISDgmfUVvHc1CF/W9wx1aNYMN1vmgdRNd4R6HrnTg rOH4AFugV5rdHHvZxfcnHg1S7k0T+uiXp7qN5o3rch2zE5yM/YXGzapMRT9OijpC rm+AntnROz4NgW3lZdR4rCOGm1dFmaP87NAAnm3o+LWioWzgV4YsalfowDxSi7L5 TTwE/+NfYhrkgFfTRywFeAdO3Yj6hQ1gLe8rwUrA2fprNxRbloLXRfsBuuzi2HHR DAndXbzLvLydu87I5DvmZKWcwvch68RqsBLDUMcyApquXNULINOLi3Wdrn7Ce4vq CLQEyUFS9Yl+IyoSOC0Xh1VXZ6tmRsJQAsOsm2DGLZpwRCSNjgmR1SBb4mM4TH0m n6010JV5apbQX0csTF3xQX7OXzYR6DT4IfkI4CndtMkUOSJfGigE6OydtaeH/+mF MGTWvJlmbG98U59fZYoCR/FmxsHHrc4clpZNkaNFH0RK/bbcUrzHRdV0A/IKAOWM MFGf31X9gvGNdeuBjqNP =vmiv -----END PGP SIGNATURE-----

1 0

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

22 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=9690 Your paranoid android. === w8 (32 bit device) === device.c:2437: Test failed: Expected foreground window 000301B8, got 0002004C. device.c:3141: Test failed: Expected wndproc 0x412ae0, got 0x412ae0.

1 0

Re: [PATCH 3/4] d3d8/tests: Use create_device for test_fpu_setup.
by Marvin 21 Oct '14

21 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=9689 Your paranoid android. === w8 (32 bit device) === device.c:2432: Test failed: Expected foreground window 00080166, got 0002004C. device.c:3136: Test failed: Expected wndproc 0x412b10, got 0x412b10.

1 0

Re: [PATCH 1/6] reg.exe/tests: Parameterise error messages
by Stefan Dösinger 21 Oct '14

21 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-20 22:24, schrieb Jonathan Vollebregt: > - ok(type == REG_DWORD, "got wrong type %d, expected %d\n", type, REG_DWORD); > - ok(size == sizeof(DWORD), "got wrong size %d, expected %d\n", size, (int)sizeof(DWORD)); > + ok(type == REG_DWORD, "got wrong type %u, expected %u\n", type, REG_DWORD); > + ok(size == sizeof(DWORD), "got wrong size %u, expected %u\n", size, (DWORD)sizeof(DWORD)); I don't know if this is the canonical way to handle this. My gut feeling is that a cast to unsigned int would be nicer than a cast of DWORD, but I hope others can give a better answer. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJURiJmAAoJEN0/YqbEcdMw3HEP/1MBp8qA+CyiaauJYQiiQ7+s Ixo1oO/cBewMzYwbqf+4luIxtWPl2v3ocRecHVrns7SRoOrLnsdfp/Tjf5pzx3GL 0mjDrXjKJCPEsY6tTTx3uHKnGhMt7coYymef4LPpZHVwYdy8DuwhCaCiZWwxY54M /apfZ3sFieiMqO4aXPAMR02mKcyPDIarLn0t2A1pJWV10iSJ1BunyM+tBNV0523B V98UknVYqlBUoqwqywbMKMCCnCCvN/Z7gtUiydodQdHlkPTgWFSwNvLTrEgSclXo 1L04NH9JzvTYlIN2oHSELNpdiZycEaBS7xTaYk0DjdnvXYG3jS/zsgYBURjnuWJr oFz86pFOnEeirvkixEfAtPy5RwKfJKvgXVKH3eP75g9pLpGJ7L5+2hS/VMYbV40O ENK4D/U41L4ldJVDo/3GQUyiU8Me0OukgIFbHS+axygKgp5YWcH7HDhAgwG3xTu9 LLeAgLnWxeQ0RHVSohPLrVVNSOlwFyLQQsc6Jh+ZbcnxetF0mFJtvVPfRfkWjzkV nC6AamdvpnZlxfrqP66VB3ZKaSScMiqvlUvP/JRRd9bto6Hp5wbnD/1g9sAV8Iyl 6cSOH44kDB5qdFg8IWr+Dsh8PpQVUai1HzBioKrDA3av6XVgV/rwCSaoRhwkdjTS MmjNbHDCXnNMlx7S7dQe =3Os0 -----END PGP SIGNATURE-----

2 1

Re: [PATCH 2/6] d3d9/tests: Use create_device in test_fpu_setup.
by Henri Verbeet 21 Oct '14

21 Oct '14

On 20 October 2014 13:08, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -3598,20 +3604,18 @@ static void test_fpu_setup(void) > d3d9 = Direct3DCreate9(D3D_SDK_VERSION); > ok(!!d3d9, "Failed to create a D3D object.\n"); > > - memset(&present_parameters, 0, sizeof(present_parameters)); > - present_parameters.Windowed = TRUE; > - present_parameters.hDeviceWindow = window; > - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; > + device_desc.device_window = window; > + device_desc.width = 640; > + device_desc.height = 480; > + device_desc.flags = CREATE_DEVICE_HWVP_ONLY; > This essentially matches the existing code, but does the test really not work with software vertexprocessing? It seems to work for me.

2 2

Re: [PATCH 5/6] reg.exe/tests: Add REG_BINARY tests for reg add
by Stefan Dösinger 21 Oct '14

21 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-20 22:24, schrieb Jonathan Vollebregt: > + // Remaining nibble prefixed C++ comments are not allowed in Wine. Otherwise this series looks good to me. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJURiGjAAoJEN0/YqbEcdMwoCAP/RZB/7kV5iPt9E2yQ9f5Dr0G wlo+XleoqM8oQ87lPKT7RturEb0LAhZRWFp9IAh32CoxKyTqoMSlvCMJ1I266dXz 7CDxe7+HW8HvDziUBAM5FMKno/PXQoBoLCjx0EUXAmbTCQP9hIxWwr6knPgXsJo4 OF1PIUH3xJQ+O4/hea4EGNl2zmglkBQhYpq6Ab+jSNEd42MYHTq0x+W987ltW9eA KnrTZbXg+wAW0GIxJaZkeiwV6fKDNxbb4DbRnti1O31C7k+kzQ8nUciDVo/BpaXd FBa89MBWvuMLva7W3OcncOmTR6thOQiutS3363dNfsOrTvL1EwU9FBSNui1yl18Q y0WPmpoH4IDEhcfdcQ8gbCENQrM9ybltpRFTonSom0L0PYff1Irc2mvw7O0SGzxj a6V4oipqTkdHCwiMGEW5h05K2KMAuwq8dYTXoGgtODjLO1bm79SHKSHS7jQ6Vldd WR6rhkJKStOc/EpuPF9ls6gLcDZJsHxqoz66Qj77XQnwPrmduWtMMhty9Eg/eMMH WHZr8PrgS77nFdA4xmBqYpk8opOfTTNfBO0vjBG+l2ymBdTSYoCvzPmMtCMlcC55 aePuvqflwuvqZ7RogSa9GMkVJEEP1xHOJUWPWos95YsslCQyQox7qvOQcccPx+Nz xUeuNIXIay7SBn9EINVC =8eal -----END PGP SIGNATURE-----

1 0

Re: [PATCH 2/2] kernel32: Handle win32 hresult in FormatMessage.
by Sebastian Lackner 20 Oct '14

20 Oct '14

On 20.10.2014 19:05, Catalin Patulea wrote: > +static LPWSTR search_message( DWORD flags, HMODULE module, UINT id, WORD lang ) > +{ > + LPWSTR from = NULL; > + if (flags & FORMAT_MESSAGE_FROM_HMODULE) > + from = load_message( module, id, lang ); > + if (!from && (flags & FORMAT_MESSAGE_FROM_SYSTEM)) { <---- [1] > + // Fold win32 hresult to its embedded error code. <---- [2] > + if (HRESULT_SEVERITY(id) == SEVERITY_ERROR && > + HRESULT_FACILITY(id) == FACILITY_WIN32) { <---- [1] > + id = HRESULT_CODE(id); > + } > + from = load_message( kernel32_handle, id, lang ); > + } > + return from; > +} > + Some small style improvement suggestions: 1) better use this style for if conditions: --- snip --- if (...) { } --- snip --- 2) Wine prefers comments using the following style --- snip --- /* ... */ --- snip --- Regards, Sebastian

1 0

Re: [PATCH 1/2] kernel32/tests: Add test for FormatMessage with HRESULT
by Sebastian Lackner 20 Oct '14

20 Oct '14

On 20.10.2014 19:05, Catalin Patulea wrote: > > + /* Test HRESULT. It's not documented but in practice _com_error::ErrorMessage relies on this. */ > + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 0x80070005 /* E_ACCESSDENIED */, > + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); > + ok(ret != 0, "FormatMessageA returned 0\n"); > + As this test is failing on Wine you should mark it with "todo_wine", to avoid introducing test failures. Patch 2 which fixes the issue should remove the "todo_wine" again.

1 0

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

Re: Add WWN 377
by Rico Schüller 11 Oct '14

11 Oct '14

On 10.10.2014 21:48, André Hentschel wrote: > diff --git a/news/de/2014101001.xml b/news/de/2014101001.xml > new file mode 100644 > index 0000000..8ad495c > --- /dev/null > +++ b/news/de/2014101001.xml > @@ -0,0 +1,11 @@ > +<news> > + <date>10. Oktober 2014</date> > + <title>World Wine News Ausgabe 377</title> > + <body> > +<a href="{$root}/wwn/377">WWN Ausgabe 377 (en)</a> wurde heute verÃ¶ffentlicht. > +<ul> > +<li><a href="{$root}/wwn/377#Idea for a Wine staging tree">Idea fÃ¼r einen Wine Staging Tree</a></li> <li><a href="{$root}/wwn/377#Idea for a Wine staging tree">Idee ... Cheers Rico

1 0

Re: [PATCH] mshtml/tests: Fix typo.
by Marvin 11 Oct '14

11 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=9465 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

2 1

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

10 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I missed a few things the last time. This list is exhaustive now, at least as far as I'm concerned. I have listed most things for d3d8, but they apply to the d3d9 test as well. Am 2014-10-10 15:21, schrieb Joachim Priesner: > + static const D3DMATRIX proj_mat = > + {{{ > + 1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 1.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, -1.0f, 0.0f, > + 0.0f, 0.0f, -0.0f, 1.0f > + }}}; Minor detail: you left a redundant - in here. (4th row, third column, -0.0f) > + /* Basic vertex shader with fog computation ("foggy"). > + * Using the vertex' x coordinate as fog coordinate so that all test cases that use vertex fog > + * will have a gradient from fully fogged (green, left) to unfogged (red, right). */ This is a bit off-topic, but I'm still noting it here: We don't have any tests for the clamp(0.0, 1.0) we do on the oFog output. Hence it may be interesting to check the middle of the screen in case of the foggy shader. If it is half fogged, the clamp is correct. If it is fully fogged the clamp is wrong (keep in mind that "foggy shaders" have reverse fog with start = 1, end = 0). This shouldn't be part of this patch, but it is an idea for a follow-up test if you or anyone else is interested. > + {0, 0, D3DFOG_NONE, D3DFOG_LINEAR, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 1, D3DFOG_NONE, D3DFOG_LINEAR, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 0, D3DFOG_LINEAR, D3DFOG_LINEAR, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 0, D3DFOG_LINEAR, D3DFOG_NONE, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 1, D3DFOG_LINEAR, D3DFOG_NONE, COLOR_UNFOGGED, COLOR_FOGGED}, Please add a D3DFOG_NONE, D3DFOG_NONE case for completeness. In case of the shaders I expect the same result as with table fog = NONE, vertex fog = LINEAR. In case of fixed function fragment processing I expect fully fogged because it uses the alpha component of the specular color, which defaults to 0. Fogstart = 255 and fogend = 0 in that case, similar to the vertex shader oFog case. > + /* Note: Shaders expect matrices in column-major form, so they have > + * to be transposed if they are not symmetrical (which is the case at the moment). */ > + hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &view_mat, 4); > + ok(SUCCEEDED(hr), "SetVertexShaderConstant (view matrix) failed (%08x)\n", hr); > + hr = IDirect3DDevice8_SetVertexShaderConstant(device, 4, &proj_mat, 4); > + ok(SUCCEEDED(hr), "SetVertexShaderConstant (projection matrix) failed (%08x)\n", hr); I'd expect these calls to fail on hardware that does not support shaders. Same for the Set*Shader(NULL) calls later on. Technically you do not need the matrix multiply inside the shader with the new matrices, but if you want to keep them in to make the fixed function and shader codepaths more similar that's OK with me. The D3DPRASTERCAPS_FOGTABLE capability applies to d3d8/9 as well. I don't know if there's any GPU out there that doesn't support table fog other than my ancient ATI 3D Rage. > + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); You are not checking the return value here. > + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) > + { > + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code1, &vertex_shader[1]); > + ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); > + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code2, &vertex_shader[2]); > + ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); > ... > + } Please check the vertex shader version separately from the pixel shader one. > diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c > index 0385044..23542ff 100644 > --- a/dlls/ddraw/tests/visual.c > +++ b/dlls/ddraw/tests/visual.c New ddraw tests should go to dlls/ddraw/tests/ddraw*.c. I'm fine with just a ddraw7 test for this. The older ddraw interfaces have a different fog interface (D3DLIGHTSTATE_FOG*, and somehow there's a separate D3DRENDERSTATE_FOGTABLE*). While we could certainly use more tests for this interface it shouldn't be the concern of this patch. > + if (IDirect3DDevice7_BeginScene(device) == D3D_OK) This is not a big issue, but there's no need to have a code branch for BeginScene / EndScene, just let the draws in between fail like you do in d3d8/9. I have never seen a case where BeginScene fails unexpectedly. (Yeah, the existing code isn't consistent on this point.) > + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, end.i); > + ok(SUCCEEDED(hr), "Setting fog end failed (%08x)\n", hr); > ... > + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &proj_mat); > + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); Another minor style issue: You're mixing %08x and %#x. The preferred one is %#x, but what mostly matters is consistency. Similar for punctuation at the end of the traces. SUCCEEDED(hr) is preferred over hr == D3D_OK. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOFewAAoJEN0/YqbEcdMwxSYP/jFB5IT9a+7w8JQ7vlziVdGz KZccLwVFSyJqLhEiTIs7B0yz5rWhkjI6HPxzWRPRMVbNTjlUvsiZRLl8FU6hR86A 1G6azwEnMs0/u9LUOfdphBLdj454+E/NJMr1EzkRjL+PMt49RZwSxdCmxPXK/unx yrxLSPuxCjHGhN6K95/xV8fVkbJoa7va8IeKDHhfoFpdpaUqUqyGaSbNCfiyYj6l cyA8ZBlQEEEYBDg8HopQgw99MmfU3BIL4rY984YnsscYMckI5qjOs+joMcUwHscU Vaflkmh5udcj74sdgPguOwigJeLuLzY6zbWzhUGDFzdkXuwfuF0oe+ws/QcNOYX6 r2d/CGa7nYXfTFewR4SODJT+950P8CwuskLsslBAiPpy4uzVcbhKT2oNh7L7vhU1 +o6gYk98ceCaRdZxajf+j2hElg7N9AkWAK/RfLY25d3ALnKKVDbaidWKot3dVcHN nicK89v6jKSmD/FdbVM9/YUi4QzOZM5IJAItG0OuhS0oU/Bfkpr0e7NXvORxdGPC BpRvQrwIJXWiT43aqK8E1w67mE47PMmqoKjO3qVfWLojC0L7KPybDjGtUKj652Qr ixqPlaERPLeRVyAGtpxHlIE2opyx3fOSy/ZSTq6/PzK4GNZ/hgfTLbUff2ixxa+M cL3+mTtlQSBx9yt9BmUG =ZDPP -----END PGP SIGNATURE-----

1 0

Re: kernel32: fix incorrect lastpart in GetFullPathNameA with DBCS
by Akihiro Sagawa 10 Oct '14

10 Oct '14

On Thu, 09 Oct 2014 12:03:15 -0500, Aric Stewart wrote: > --- > dlls/kernel32/path.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Hi Aric, Thank you for pointing this out, but unfortunately this seems not to be perfect. Because certain DBCS trail byte range is overlapped its lead byte range [1]. To demonstrate this issue, I attached additional test. The first case (0x955c,0x97a0=表裏) is now pass by your patch, but the second one (0x838f,0x8343,0x8393=ワイン) is failure. In my opinion, the solution is looking up the path separator from the beginning of the string like _mbsrchr() in msvcrt. If you have a further question about this, please contact me. [1] For CP 932 (Japanese Shift JIS), Double byte character: Lead byte (first byte): 0x81-0x9f or 0xe0-0xfc, and Trail byte (second byte): 0x40-0x7e or 0x80-0xfc. Single byte character: 0x00-0x7f, 0xa1-0xdf. Regards, Akihiro Sagawa

2 1

Re: wined3d: Correctly display fog for right-handed projection matrix (try 6)
by Marvin 10 Oct '14

10 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=9439 Your paranoid android. === w8 (32 bit visual) === visual.c:2716: Test failed: unexpected colortable on offscreen surface

1 0

Re: [PATCH 6/6] wined3d: Don't replicate shader limits values for each shader.
by Henri Verbeet 10 Oct '14

10 Oct '14

On 9 October 2014 18:01, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +static const struct wined3d_shader_limits vs_limits[] = This doesn't really need to be global. It's not even that I mind that much for this kind of static const array, but it actually makes things easier to keep it local to shader_set_limits(). > struct wined3d_shader_limits > { > + unsigned int min_version; > + unsigned int max_version; > unsigned int sampler; > unsigned int constant_int; > unsigned int constant_float; You don't need that to be part of wined3d_shader_limits.

1 0

Re: [PATCH 5/6] d3d9/tests: Port the unsupported shaders test to D3D9Ex.
by Henri Verbeet 10 Oct '14

10 Oct '14

On 9 October 2014 18:00, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +static void test_unsupported_shaders(void) In principle I like this better than "test_wrong_shader()", but could you then please update the d3d8 and d3d9 tests as well? It's a lot easier to find equivalent tests between D3D versions if they at least have the same name.

1 0

Re: [PATCH 1/2] d3d8/tests: Don't check the foreground window if we're not in foreground.
by Francois Gouget 10 Oct '14

10 Oct '14

On Wed, 8 Oct 2014, Stefan Dösinger wrote: [...] > There are many more failures in d3d8:device when the test is not in > foreground. Those failures write static lines and I'd prefer the testbot > to be changed to run them in foreground instead. What do you mean by that? The TestBot runs a command line tool in an iconized console. In turn that tool runs the test binary. However I'm not aware of it preventing test windows from being in the foreground. Maybe the console windows being iconized somehow gets inherited by the windows created by the test binary, but shouldn't the test just request to bring its windows to the foreground? -- Francois Gouget <fgouget(a)codeweavers.com>

3 2

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

10 Oct '14

On 10/09/14 19:52, Iván Matellanes wrote: > @@ -921,22 +921,36 @@ int CDECL MSVCRT_fflush(MSVCRT_FILE* file) > { > if(!file) { > msvcrt_flush_all_buffers(MSVCRT__IOWRT); > + } else if(file->_flag & MSVCRT__IOWRT || file->_flag & MSVCRT__IOREAD) { > + int ret; > + > + MSVCRT__lock_file(file); > + ret = MSVCRT__fflush_nolock(file); > + MSVCRT__unlock_file(file); > + > + return ret; > + } > + return 0; > +} file->_flag should be checked inside the lock (it's already done inside fflush_nolock). Could you please change the code to something like this: if(!file) msvcrt_flush_all_buffers(MSVCRT__IOWRT); MSVCRT__lock_file(file); ret = MSVCRT__fflush_nolock(file); MSVCRT__unlock_file(file); Thanks, Piotr

1 0

Re: kernel32: fix incorrect lastpart in GetFullPathNameA with DBCS
by Dmitry Timoshkov 10 Oct '14

10 Oct '14

Aric Stewart <aric(a)codeweavers.com> wrote: > --- a/dlls/kernel32/path.c > +++ b/dlls/kernel32/path.c > @@ -271,7 +271,8 @@ DWORD WINAPI GetFullPathNameA( LPCSTR name, DWORD len, LPSTR buffer, > > if (*p != '\\') > { > - while ((p > buffer + 2) && (*p != '\\')) p--; > + while ((p > buffer + 2) && > + ((*p != '\\') || IsDBCSLeadByte(*(p-1)))) p--; This probably should depend on whether ansi or oem code page is active. -- Dmitry.

1 0

Re: [PATCH 1/2] d3d8/tests: Don't check the foreground window if we're not in foreground.
by Henri Verbeet 09 Oct '14

09 Oct '14

On 8 October 2014 14:37, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > These two patches fix test failures when the process is not in > foreground that print changing error lines. This avoids generating > warnings from the testbot whenever d3d8/tests/device.c is touched. > > There are many more failures in d3d8:device when the test is not in > foreground. Those failures write static lines and I'd prefer the testbot > to be changed to run them in foreground instead. Why does this affect d3d8, but not d3d9?

2 1

Re: [PATCH 7/7] mshtml: Added script element readyState and onreadystatechange tests.
by Marvin 09 Oct '14

09 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=9400 Your paranoid android. === w7u (32 bit script) === script.c:632: Test failed: L"elem.readyState = loading" === w8 (32 bit script) === script.c:632: Test failed: L"elem.readyState = loading" script.c:632: Test failed: L"extern_res_script_rs = loaded0,eval,complete1, expected eval,complete1,"

1 0

Re: [PATCH 1/3] kernel32: Support UTF-7 in MultiByteToWideChar. (try 2)
by Alexandre Julliard 09 Oct '14

09 Oct '14

Alex Henrie <alexhenrie24(a)gmail.com> writes: > Sorry, I noticed a couple of errors in the utf7_mbstowcs and > utf7_wcstombs documentation. They are now corrected. You still haven't addressed the issues I mentioned last time around. -- Alexandre Julliard julliard(a)winehq.org

3 5

Re: msvcr90: Prefer native dll if manifest is not present
by Nikolay Sivov 08 Oct '14

08 Oct '14

> +#if _MSVCR_VER == 90 > + static const WCHAR msvcr90W[] = {'m','s','v','c','r','9','0','.','d','l','l',0}; > + ACTCTX_SECTION_KEYED_DATA askd = { sizeof(askd) }; > + > + if(FindActCtxSectionStringW(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, > + ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, msvcr90W, &askd)) { > + ReleaseActCtx(askd.hActCtx); > + return TRUE; > + } > + > + return FALSE; > +#endif It looks like you won't be using context handle anyway, so you can just set flags to zero, and return FindActCtxSectionStringW() value immediately.

2 1

Re: [PATCH 1/2] d3d8/tests: Don't check the foreground window if we're not in foreground.
by Marvin 08 Oct '14

08 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=9361 Your paranoid android. === w8 (32 bit device) === device.c:3043: Test failed: Expected wndproc 0x412d00, got 0x412d00.

1 0

Re: msvcr90: Prefer native dll if manifest is not present
by Stefan Dösinger 08 Oct '14

08 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-08 16:35, schrieb Piotr Caban: > DVDFab 9.x is distributed with custom version of msvcr90.dll that > is not compatible with normal dll. I think this comment should go into the code because Alexandre removes it from the commit log. It will be hard to find out the reason for this code without it. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUNU0oAAoJEN0/YqbEcdMwalAP/2PgH8yjUYkTImTuMCeFj0+z ZBNVOkDz6+1/qeWZvA7YdnkZ8GqBaAZ48KBTgMMFyjUjiot2Ee2SbfyEJfHGBNE3 PBBaLzWIoxxkSDzkVK4A5XTDqx3gAueiTX79dS3cYd1R2Zb+rnFSkDkxSv0S03Q0 xY/ig2KDcYnm5BXfPcrV9PKTsBzLrJ+73t+4uBh3cKY623V8umZObyjq9yYNdwFn lSH3fIhUM60U6r4xMOw4YkiI7GJ5otlf7ORAA6zh+4N0oKwkcPiC6NJ3a/HLW6xG dyw9fQ3183puDWE+3Fi0ufHSTcbp6evMqY4WhOWwNYRNTjQdMcIY23S6rATGfqS9 TieSwABJ4L3quQ0zjmw920x4rTh7/XAMC3gEpXjlFF23LniHDnQtKjwckHk5a2vh qqDQ7+y7bywb6CDGUJCo/Mp6mT5Mt4qcL3/CZtuCsLM5FLYgvAXaGw3IYTCCxAnF F198/g1En1zjdbJmvDWAda4YAD9ffdmkWrppW0Oq7p8klyd35OktJ4LS6ULqb2jo K90+Ss+5N55rmhfGqPRgWifu+gRK3bdO08YpKkhhGyv6J+5DFyyB7uBqbSnjMNbR 25M2aPGvH4jB9vDD9DVSkt4q35FDmHVRYThW+3L3W92q0WatHhyWwoMTY6f+rvGj ftkB6MWECB/XTl1QxMQW =qeov -----END PGP SIGNATURE-----

1 0

Wine 1.7.28 source code
by Игорь Чебаненко 08 Oct '14

08 Oct '14

Hello,I scanned Wine 1.7.28 source code with cppcheck 1.63. I hope my scanning will get attention. Threre's lots of false-positives,but,I think,in my file you will see interesting things. P.S Thank you for Wine. It is very interesting,and important open source project.

3 2

Re: kernel32: add a stub for GetSystemFileCacheSize (2/2)
by Alistair Leslie-Hughes 08 Oct '14

08 Oct '14

On 08/10/14 06:37, Austin English wrote: > > @·stub·SetSystemFileCacheSize > +@·stdcall·SetSystemFileCacheSize(long·long·long)·kernel32.SetSystemFileCacheSize > This patch doesn't match the subject. Best Regards Alistair Leslie-Hughes

2 1

Re: [PATCH] mscoree: Use E_NOT_SUFFICIENT_BUFFER definition
by Marvin 08 Oct '14

08 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=9344 Your paranoid android. === wxppro (32 bit mscoree) === mscoree.c:343: Test failed: CreateConfigStream returned 8007007f === wvistau64 (32 bit mscoree) === mscoree.c:343: Test failed: CreateConfigStream returned 8007007f === w2008s64 (32 bit mscoree) === mscoree.c:343: Test failed: CreateConfigStream returned 8007007f === w7u (32 bit mscoree) === mscoree.c:343: Test failed: CreateConfigStream returned 8007007f === w8 (32 bit mscoree) === mscoree.c:343: Test failed: CreateConfigStream returned 8007007f === wvistau64 (64 bit mscoree) === mscoree.c:343: Test failed: CreateConfigStream returned 8007007f === w2008s64 (64 bit mscoree) === mscoree.c:343: Test failed: CreateConfigStream returned 8007007f

2 1

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

07 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Am 2014-10-04 00:24, schrieb Joachim Priesner: > + static const D3DMATRIX proj_mat_rh = > + {{{ > + 0.828732f, 0.0f, 0.0f, 0.0f, > + 0.0f, 1.104976f, 0.0f, 0.0f, > + 0.0f, 0.0f, -1.0001f, -1.0f, > + 0.0f, 0.0f, -0.010001f, 0.0f > + }}}; > ... > + static const D3DMATRIX view_mat_rh = > + {{{ > + 1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 1.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, -0.1f, 0.0f, > + 0.0f, 0.0f, 0.0f, 1.0f > + }}}; I'm sorry that this reply is a bit late, but I've been wondering if you need the complicated projection matrix to show the abs() in the vertex pipeline. If I understand it correctly, a view and projection matrix like this should do the job as well with the same input coordinates: static const D3DMATRIX proj_mat = {{{ 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f }}}; static const D3DMATRIX view_mat = {{{ 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f }}}; The test results with these matrices are identical, and the test correctly detects the defect in Wine. The test is much easier to follow. Am I missing something? As an added bonus you could replace the 10.0f in the input vertices with 1.0 and the -0.1f in the view matrix with -1.0f. Some other suggestions: > +/* Some color constants to make tests easier to read. */ > +#define COLOR_FOG 0xff00ff00 > +#define COLOR_FOGGED 0x0000ff00 > +#define COLOR_UNFOGGED 0x00ff0000 > +#define COLOR_CLEAR 0xffff00ff IMHO it would be nicer to either use an enum in the scope of fog_righthanded_test (preferred) or #undef them after the function. > + static struct > + { > + struct vec3 position; > + DWORD diffuse; > + } > + quad[] = > + { > + {{-1.0f, -1.0f, 10.0f}, COLOR_UNFOGGED}, > + {{-1.0f, 1.0f, 10.0f}, COLOR_UNFOGGED}, > + {{ 1.0f, -1.0f, 10.0f}, COLOR_UNFOGGED}, > + {{ 1.0f, 1.0f, 10.0f}, COLOR_UNFOGGED}, > + }; Always drawing a gradient would be better. That avoids other fog setup problems that lead to either always fogged or never fogged quads. Also, this can be static const in d3d8 and d3d9. > + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, COLOR_CLEAR, 1.0f, 0); > + ok(SUCCEEDED(hr), "IDirect3DDevice9_Clear failed (%08x)\n", hr); Do you need the Z buffer? Just disable the depth test, no need to clear it. > + /* Basic vertex shader with fog computation ("foggy"). > + * Using the vertex' x coordinate as fog coordinate so that all test cases that use vertex fog > + * will have a gradient from fully fogged (green, left) to unfogged (red, right). */ > + static const DWORD vertex_shader_code2[] = > + { > + 0xfffe0100, /* vs_1_0 */ > ... > + 0x0000ffff, /* END */ > + }; > + > + /* Basic pixel shader */ Two indentation issues here. The comment needs one extra space, the closing bracket has one too many. I suspect your editor screwed this up when you copied the code from d3d9 to d3d8. > + if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) > + { > + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code3, &vertex_shader[3]); > + ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); > + hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code2, &pixel_shader[2]); > + ok(SUCCEEDED(hr), "CreatePixelShader failed (%08x)\n", hr); > + } else { > + skip("No shader model 2 support, skipping some fog tests.\n"); > + } Curly bracket placement. This applies to a few other places. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUNGWtAAoJEN0/YqbEcdMw/+YQAIQxmRjeNMne0+f9AuCwtNVJ /MrhsXPnCFDWbYE6BTXM8/2CvlM5DzhCya2AQg8UFW4qMXQJmijTorCjDF0e7Vc7 RvuP4xJXsqhKDhyoYfSzcX8WYkJZcVow0tQIz++qKfjMbgqnGwoWocYdNgyymy9v pU6Q/shM1qv2PUkDNuMAJI7Tv09R5muYEyi9sfRa+grFGQwDJGQpgOXwP5oR2DWM wjlTIO7wMkXY0XGE5DInxE+slaF2gECrKrHRM+1HNicNq5hGOwYwdm/JcBA9qxGQ uv+w0WMKR0n4FPtJBHXcm3/qshUyBvzSsMSEilfBwOzrrclOx9ctNEuogqufEpF9 6yGuX0PEp+W9g9rN6rCMMBjYmGJdal2bY2F1KQ+iLAYHhMsahy+fibIGEwE7Yugg +ffx3RONm335mpZqQh5NrtHAwf3iLEEA7PQQawW5UKCoKANpV03KyZBFJLZ1lOC4 cEQLQQNo7p/M0211bm4dTN8SSYvucloDSuzwe+PqCNvyL8xJyJCiHMHuVX2cFdgt 7qPA13LdKze/7S4Jk1JjL31tTEdMCGZJSekkTEAJ7C/c01L3DiDVywn9VNVXdPsR 8oW8pfZI0t1g2/Miq08mP1T+IWTftYOQaHyiYrQ73hu8PtDgY3C92JHwV4SmvPUI UxItWlY/H/8FLJG5v5dt =dUDt -----END PGP SIGNATURE-----

1 0

Re: server: KeyNameInformation returns the full name of the key. (try 2)
by Alexandre Julliard 07 Oct '14

07 Oct '14

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > Try 2: > - Use `for' loops instead of `while' loops in get_key_full_name function. > - Introduce full_name variable to avoid tricky free() condition check at > end of enum_key function. You should be able to do this without allocating memory. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/3] d3d8/tests: Introduce a create_device_pp function for custom present parameters.
by Marvin 07 Oct '14

07 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=9329 Your paranoid android. === w8 (32 bit device) === device.c:2401: Test failed: Expected foreground window 000B00F8, got 0002004C. device.c:3043: Test failed: Expected wndproc 0x412bd0, got 0x412bd0.

1 0

Re: ntdll: Introduce new function wine_server_set_reply_user for user provided pointers.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Sebastian Lackner <sebastian(a)fds-team.de> writes: > This patch is an alternative strategy for fixing the issue described > in http://source.winehq.org/patches/data/106864. Please note that the > patches 2-4 from the previous series are still valid, and can be > applied independently. > > Although Andre_H and ehoover told me that this solution will not be > accepted, I'll give it a try, because its the cleanest approach I can > think of. > > There is a huge amount of wineserver calls that use > wine_server_set_reply incorrectly, and manually adding code to all > these functions seems very complicated. In ntdll we have to use > virtual_check_buffer_for_write, everywhere else we have to use > IsBadWritePtr. And even if we have added that, it could still break > things: When we add the check at the top of each affected function, > and return some general error codes, it could break apps which expect > a page fault exception in some other code branch. There are few places that need this, and even fewer where it's an actual problem in practice. In fact it wouldn't be a problem at all except for your writecopy hack, which is in itself a questionable change. You'll need more convincing arguments for this series. -- Alexandre Julliard julliard(a)winehq.org

1 0

wine crashed on exiting inside gdiplus.
by Hin-Tak Leung 06 Oct '14

06 Oct '14

It is probably not important, just in case it is something easily fixable, I just got a crash on exit inside gdiplus. $ git describe wine-1.7.28 the backtrace is: Backtrace: =>0 0x7dcfed37 ipicture_pixel_width+0x7(pic=0xfeeefeee) [/home/Nobak-Hin-Tak/tmp-git/wine/dlls/gdiplus/../../include/ocidl.h:1221] in gdiplus (0x00e7e428) 1 0x7dd0b61b GdipGetImageBounds+0x15a(image=0x4eb5d40, srcRect=0xe7e548, srcUnit=0xe7e4c4) [/home/Nobak-Hin-Tak/tmp-git/wine/dlls/gdiplus/image.c:2182] in gdiplus (0x00e7e488) 2 0x7dce6f9e get_graphics_bounds+0x17d(graphics=<is not available>, rect=<is not available>) [/home/Nobak-Hin-Tak/tmp-git/wine/dlls/gdiplus/graphics.c:1999] in gdiplus (0x00e7e508) 3 0x7dcf2065 GdipGetDC+0xe4(graphics=<is not available>, hdc=<is not available>) [/home/Nobak-Hin-Tak/tmp-git/wine/dlls/gdiplus/graphics.c:5719] in gdiplus (0x00e7e598) 4 0x00bad6c0 (0x00e7e5e8) 5 0x00bad65c (0x00e7e608) ... ... 0x7dcfed37 ipicture_pixel_width+0x7 [/home/Nobak-Hin-Tak/tmp-git/wine/dlls/gdiplus/../../include/ocidl.h:1221] in gdiplus: movl 0x0(%eax),%edx 1221 return This->lpVtbl->get_Width(This,pWidth);

1 0

Re: po: Update German translation.
by Joachim Priesner 06 Oct '14

06 Oct '14

> #: jscript.rc:40 > > -#, fuzzy > -#| msgid "Subject Key Identifier" > > msgid "Expected identifier" > > -msgstr "SchlÃ¼sselkennung des Antragstellers" > +msgstr "Erwarteter Bezeichner" This should probably read "Bezeichner erwartet". Best Joachim

1 0

Re: [PATCH 7/7] user32/tests: Test WM_SYSCOMMAND(SC_MINIMIZE) on an unminimizable window.
by Marvin 06 Oct '14

06 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=9283 Your paranoid android. === wvistau64 (32 bit msg) === msg.c:4466: Test failed: SendMessage( WM_SYSCOMMAND, SC_MINIMIZE ):popup, unminimizable: 6: the msg 0x0046 was expected, but got msg 0x0088 instead msg.c:4466: Test failed: SendMessage( WM_SYSCOMMAND, SC_MINIMIZE ):popup, unminimizable: 7: the msg 0x0083 was expected, but got msg 0x0046 instead msg.c:4466: Test failed: SendMessage( WM_SYSCOMMAND, SC_MINIMIZE ):popup, unminimizable: 10: the msg 0x0047 was expected, but got msg 0x0083 instead msg.c:4466: Test failed: SendMessage( WM_SYSCOMMAND, SC_MINIMIZE ):popup, unminimizable: 11: the msg 0x0003 was expected, but got msg 0x0085 instead msg.c:4466: Test failed: SendMessage( WM_SYSCOMMAND, SC_MINIMIZE ):popup, unminimizable: 12: the msg 0x0005 was expected, but got msg 0x000d instead msg.c:4466: Test failed: SendMessage( WM_SYSCOMMAND, SC_MINIMIZE ):popup, unminimizable: 14: the msg sequence is not complete: expected 0000 - actual 0047 === w7u (32 bit msg) === msg.c:12187: Test failed: unexpected hwnd 00080150 msg.c:12209: Test failed: bad time 30ba3/30bb3

2 1

Re: [1/4] ntdll: Trigger write watches before passing userdata pointer to wait_reply.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Sebastian Lackner <sebastian(a)fds-team.de> writes: > The reply_data field sometimes points directly to user-provided > memory. That's not supposed to happen. Callers that do that should be fixed. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/7] wined3d: Restore the display mode on focus loss (v2).
by Henri Verbeet 06 Oct '14

06 Oct '14

On 6 October 2014 13:42, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > +static BOOL wined3d_swapchain_mode_changed(const struct wined3d_swapchain *swapchain) > +{ > + return swapchain->desc.backbuffer_width != swapchain->original_mode.width > + || swapchain->desc.backbuffer_height != swapchain->original_mode.height > + || swapchain->desc.backbuffer_format != swapchain->original_mode.format_id > + || swapchain->desc.refresh_rate != swapchain->original_mode.refresh_rate; > +} > + > void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) > { > if (!activate) > + { > + if (wined3d_swapchain_mode_changed(swapchain)) > + { > + if (FAILED(wined3d_set_adapter_display_mode(swapchain->device->wined3d, > + swapchain->device->adapter->ordinal, &swapchain->original_mode))) > + ERR("Failed to set display mode.\n"); > + > + swapchain->reapply_mode = TRUE; This seems to imply that if an application created a fullscreen swapchain at the current display resolution, but then some external mode change happened, we should keep the mode from the external mode change on focus loss, but then change it on reset. That may be correct, but it's certainly more complicated than just resetting the original mode on focus loss, and I don't see tests. As a follow up, it would perhaps also be interesting to verify that in some of the places where we're currently using "original_mode", we really shouldn't be using EnumDisplaySettings() with ENUM_REGISTRY_SETTINGS instead.

2 2

Re: [PATCH 6/7] user32/tests: Test minimizing an unminimizable window. (v2)
by Marvin 06 Oct '14

06 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=9282 Your paranoid android. === w7u (32 bit msg) === msg.c:12150: Test failed: unexpected hwnd 0011013C msg.c:12172: Test failed: bad time 31592/315a2

1 0

Re: [PATCH 3/7] d3d9/tests: Test messages on focus loss (v3).
by Henri Verbeet 06 Oct '14

06 Oct '14

On 6 October 2014 13:42, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > - device = create_device(d3d9, device_window, focus_window, FALSE); > - if (!device) > + present_parameters.Windowed = FALSE; > + present_parameters.hDeviceWindow = device_window; > + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; > + present_parameters.BackBufferWidth = 640; > + present_parameters.BackBufferHeight = 480; > + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; > + if (FAILED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, > + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) We're just hoping the display resolution isn't already 640x480 here, right? I'd also rather see this using create_device(). Or perhaps some variant like create_device_pp() taking a D3DPRESENT_PARAMETERS structure, although it seems to me that the issue you're running into is just that screen_width and screen_height aren't very good choices for the backbuffer dimensions in the general case.

2 1

Re: [PATCH 5/7] d3d8/tests: Test messages on focus loss (v3).
by Marvin 06 Oct '14

06 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=9281 Your paranoid android. === w8 (32 bit device) === device.c:2489: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3131: Test failed: Expected wndproc 0x413080, got 0x413080.

1 0

Re: [PATCH 4/7] d3d9/tests: Port test_wndproc to d3d9ex (v2).
by Henri Verbeet 06 Oct '14

06 Oct '14

On 6 October 2014 13:42, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + ret = pEnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &orig_mode, 0); Why the Ex versions here? > + user32_handle = GetModuleHandleA("user32.dll"); > + pEnumDisplaySettingsExA = (void*)GetProcAddress(user32_handle, "EnumDisplaySettingsExA"); > + pChangeDisplaySettingsExA = (void*)GetProcAddress(user32_handle, "ChangeDisplaySettingsExA"); I also suspect we don't need to get these through GetProcAddress() on any setup where we still run the tests.

1 0

Wine staging tree
by Michael Müller 06 Oct '14

06 Oct '14

Hi, since I already revealed our staging tree idea in a mail which I accidentally send to wine-devel, I think it is time to explain the whole idea. Before you start complaining, please carefully read the whole mail, and especially note that we're in no way trying to compete with vanilla Wine (which seems to be the main counter-argument I've heard so far). Wine is a huge project and it is easy to introduce new regressions or to have mistakes in your patches. For this reason all patches need to be accepted by AJ to keep a good code quality. Nevertheless it is not unusual that patches drop out of the list because they don't get any attention or contributors get frustrated because sending try XX is a slow process of gaining feedback. Just to be clear: I think its absolutely essential that Wine has a stable and very well tested code base, so I'm _not_ suggesting to change the submission rules. Nevertheless its sometimes impossible to test a patch, without having some user feedback. Besides that, there is a huge gap between Wine user perspective and Wine developer perspective: Users sometimes would prefer to use an early beta version of a patch (which might not be the perfect solution, but the application at least works), whereas developers prefer a well-tested and 100% correct solution. For this reason we converted wine-compholio (which was previously used to provide patches for Silverlight / Pipelight) to some kind of staging tree. We add patches there which may not be yet be completely ready for wine-patches, for example some features are not fully implemented yet or need additional testing. This makes it possible for other developers to take a look at them before they reach wine-patches and they can give you feedback and point out possible mistakes. This is especially suited for new contributors. Just think about all the GSoC students, which spend months to implement new features, and at the end the code is lost and not really maintained anymore, because it wasn't in a perfect shape yet to go upstream. That shouldn't happen at my opinion. Besides the possibility of getting feedback, your patches will also be tested by regular users to reveal regressions. We follow the same release cycle as Wine (with usually 1 days offset) and provide prebuilt packages for: Ubuntu, Arch Linux, Debian, OpenSUSE, Fedora, Mageia 4 and there are also 3rd party builds for other distributions like Slackware. Fedora directly integrates our patches into their wine package. Some users also prefer wine-compholio since they get patches for their software earlier, and developers have the advantage to know about regressions faster. Although being a staging tree, we don't want to break too much stuff for our users and therefore do not accept any hacks like PlayOnLinux. If there is a highly demanded application with a known workaround, we may consider making an exception - but we _definitely_ don't want to end up like PlayOnLinux ;-). We always try to find a compromise between the user and the developers perspective. However, If you introduce regressions and don't fix them till the next release we may consider dropping the patches again. Since our aim is to get patches upstream, our repo does not contain the whole wine source code but only patches to make this task easy. We also use a sophisticated patch system which creates a Makefile that automatically figures out dependencies between patchsets and prevents adding patches that do not apply, but explaining all that would be too much for this mail ;-). If you think this might be a great idea and/or you want to make use of it, you can find all required information at: https://github.com/compholio/wine-compholio https://github.com/compholio/wine-compholio/blob/master/DEVELOPER.md We also try to improve existing patches from bugs or patches which did not get upstream, so don't be surprised if you find one your patches in our repo. ;-) There is currently no mailing list for suggesting patches (as mentioned at the beginning our original plan was to wait a bit more, before officially announcing this idea), but you can either talk to us in #wine-compholio on FreeNode or open a bug report on github to propose patches. We neither want to prevent anybody from sending their patches upstream, nor to be a competitor to Wine, we just want to give some optional extra help for both developers and users. Instead of having lots of private developer work-in-progress branches, this makes it possible to create a combined version, and users get an easy way to test fixes without compiling wine on their own (for example if you have a fix for a bug and want other people to verify whether it solves the problem for them). Regards, Michael

9 13

Re: msvcrt: Added _fclose_nolock() implementation.
by Piotr Caban 06 Oct '14

06 Oct '14

On 10/04/14 18:53, Iván Matellanes wrote: > Added _fclose_nolock() implementation. Could you please also change _fclose implementation so it calls _fclose_nolock internally? This will avoid some code duplication. Thanks, Piotr

1 0

Re: [PATCH 2/2] gameux: Use CLSIDFromString() instead of shell32 equivalent
by Marvin 06 Oct '14

06 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=9268 Your paranoid android. === w8 (32 bit gameexplorer) === No test summary line found

1 0

[PATCH] dbghelp: implement DW_TAG_const_type in dwarf2_parse_udt_type
by David Heidelberger 05 Oct '14

05 Oct '14

Also solve spamming debug output with these messages: fixme:dbghelp_dwarf:dwarf2_parse_udt_type Unhandled Tag type 0x26 at ctx(0x33c42c,L"ourlib.so.0"), for debug_info(abbrev:0x1360224,symt:0x159ed70) Signed-off-by: David Heidelberger <david.heidelberger(a)ixit.cz> --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e7c36b0..1f85f6b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1453,6 +1453,9 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, case DW_TAG_subprogram: dwarf2_parse_subprogram(ctx, child); break; + case DW_TAG_const_type: + dwarf2_parse_const_type(ctx, child); + break; case DW_TAG_structure_type: case DW_TAG_class_type: case DW_TAG_union_type: -- 2.1.1

1 0

Re: [PATCH] kernel32/nls: Added support for LOCALE_SOPENTYPELANGUAGETAG
by Alistair Leslie-Hughes 05 Oct '14

05 Oct '14

On 05/10/14 07:14, Nikolay Sivov wrote: > --- > > +WINBASEAPI·INT·········WINAPI·GetLocaleInfoEx(LPCWSTR,LCTYPE,LPWSTR,INT); > This looks like it doesn't belong to this patch. Best Regards Alistair Leslie-Hughes

2 1

Win10 winetest results
by André Hentschel 04 Oct '14

04 Oct '14

Hi, i tried winetest on a fresh win10 (technical preview) install... because of the error number i can't upload it to test.winehq.org for easier review... But here they are: http://wine.dawncrow.de/win10/res164F.tmp http://wine.dawncrow.de/win10/resB470.tmp

1 0

Re: [PATCH] ntdll: test also FullDirectoryInformation
by Marvin 04 Oct '14

04 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=9261 Your paranoid android. === w2000pro (32 bit directory) === directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 1, single_entry 1 directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 0, single_entry 1 === wxppro (32 bit directory) === directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 1, single_entry 1 directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 0, single_entry 1 === wvistau64 (32 bit directory) === directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 1, single_entry 1 directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 0, single_entry 1 === w2008s64 (32 bit directory) === directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 1, single_entry 1 directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 0, single_entry 1 === w7u (32 bit directory) === directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 1, single_entry 1 directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 0, single_entry 1 === w8 (32 bit directory) === directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 1, single_entry 1 directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 0, single_entry 1 === wvistau64 (64 bit directory) === directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 1, single_entry 1 directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 0, single_entry 1 === w2008s64 (64 bit directory) === directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 1, single_entry 1 directory.c:251: Test failed: not enough data in directory (72 expected, 70 got, fnamelen 2), restart 0, single_entry 1

1 0

Re: wined3d: Correctly display fog for right-handed projection matrix (try 5)
by Marvin 04 Oct '14

04 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=9259 Your paranoid android. === w8 (32 bit visual) === visual.c:2717: Test failed: unexpected colortable on offscreen surface

2 1

Re: [PATCH 5/5] ws2_32: Return WSAEINVAL if "out_size" is smaller than the minimum size for SIO_ADDRESS_LIST_QUERY.
by Marvin 03 Oct '14

03 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=9245 Your paranoid android. === wvistau64 (32 bit sock) === sock: unhandled exception c0000005 at 00000000

2 1

Re: [PATCH] jscript: Ignore BOM mark in next_token. (try 5)
by Nikolay Sivov 03 Oct '14

03 Oct '14

> static BOOL skip_spaces(parser_ctx_t *ctx) > { > - while(ctx->ptr < ctx->end && isspaceW(*ctx->ptr)) { > + while(ctx->ptr < ctx->end && (isspaceW(*ctx->ptr) || *ctx->ptr == 0xFEFF /* UTF16 BOM */)) { > if(is_endline(*ctx->ptr++)) > ctx->nl = TRUE; > } This looks correct according to ECMA-252 section 7.2 - all of the following is a whitespace: - tab and vertical tab, 0x9 and 0xb; - form feed 0xc - space 0x20 - NBSP 0xa0 - UTF-16 BOM 0xfeff - any other Unicode "space separator" Hopefully isspaceW() covers everything but the BOM. What worries me is that isspaceW() itself is used in numerous places in code on its own. So probably we need more tests to cover more cases where space separators could be used, and later have our own is_space() call that will conform to the standard.

3 5

Re: [PATCH] user32/tests: Test minimizing an unminimizable window. (v2)
by Marvin 02 Oct '14

02 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=9217 Your paranoid android. === w7u (32 bit msg) === msg.c:11961: Test failed: got message 102 msg.c:11966: Test failed: bad wparam 201a/2260 msg.c:11978: Test failed: bad wparam 201a/2260 msg.c:11985: Test failed: no messages: 0: the msg sequence is not complete: expected 0000 - actual 0102 msg.c:11987: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:11994: Test failed: no messages: 0: the msg sequence is not complete: expected 0000 - actual 0102 msg.c:11996: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:12003: Test failed: no messages: 0: the msg sequence is not complete: expected 0000 - actual 0102 msg.c:12005: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:12012: Test failed: no messages: 0: the msg sequence is not complete: expected 0000 - actual 0102 msg.c:12014: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:12021: Test failed: no messages: 0: the msg sequence is not complete: expected 0000 - actual 0102 msg.c:12023: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:12031: Test failed: no messages: 0: the msg sequence is not complete: expected 0000 - actual 0102 msg.c:12034: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:12039: Test failed: no messages: 0: the msg sequence is not complete: expected 0000 - actual 0102 msg.c:12041: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:12049: Test failed: no messages: 0: the msg sequence is not complete: expected 0000 - actual 0102 msg.c:12057: Test failed: bad wparam 201a/2260 msg.c:12061: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:12069: Test failed: no messages: 0: the msg sequence is not complete: expected 0000 - actual 0102 msg.c:12071: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:12073: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:12082: Test failed: no messages: 0: the msg sequence is not complete: expected 0000 - actual 0102 msg.c:12085: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:12087: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:12093: Test failed: no messages: 0: the msg sequence is not complete: expected 0000 - actual 0102 msg.c:12095: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:12097: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a msg.c:12102: Test failed: Unicode WM_CHAR: 0: in msg 0x0102 expecting wParam 0x2260 got 0x201a0081 msg.c:12111: Test failed: bad wparam 81/30fb msg.c:12118: Test failed: bad wparam 81/30fb msg.c:12129: Test failed: bad wparam 3f/81 msg.c:12131: Test failed: no message msg.c:12134: Test failed: bad wparam 3f/81 msg.c:12144: Test failed: bad wparam 3f/81 msg.c:12150: Test failed: unexpected hwnd 00060150 msg.c:12152: Test failed: bad wparam 81/81 msg.c:12161: Test failed: bad wparam 3f/81 msg.c:12168: Test failed: unexpected hwnd 00000000 msg.c:12170: Test failed: bad wparam 81/81 msg.c:12171: Test failed: bad lparam 0 msg.c:12183: Test failed: bad wparam 3f/81 msg.c:12188: Test failed: bad wparam 3f/81 msg.c:12190: Test failed: no message msg.c:12193: Test failed: bad wparam 3f/81 msg.c:12195: Test failed: no message msg.c:12198: Test failed: bad wparam 3f/81

1 0

Re: [2/3] shlwapi: Fix swapped argument order in SHMapHandle.
by Marvin 02 Oct '14

02 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=9214 Your paranoid android. === wvistau64 (32 bit ordinal) === ordinal.c:548: Test failed: SHMapHandle failed: 6 ordinal.c:551: Test failed: SHLockShared failed: 87 ordinal.c:557: Test failed: SHUnlockShared failed: 487 === w2008s64 (32 bit ordinal) === ordinal.c:548: Test failed: SHMapHandle failed: 6 ordinal.c:551: Test failed: SHLockShared failed: 87 ordinal.c:557: Test failed: SHUnlockShared failed: 487 === wvistau64 (64 bit ordinal) === ordinal.c:548: Test failed: SHMapHandle failed: 6 ordinal.c:551: Test failed: SHLockShared failed: 87 ordinal.c:557: Test failed: SHUnlockShared failed: 487 === w2008s64 (64 bit ordinal) === ordinal.c:548: Test failed: SHMapHandle failed: 6 ordinal.c:551: Test failed: SHLockShared failed: 87 ordinal.c:557: Test failed: SHUnlockShared failed: 487

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel