November 2014 - Wine-devel - list.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