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

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

Nov. 7, 2014

-----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 yesterday this doesn't need a return value. > + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, > + error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (WCHAR *)&message, 0, NULL); > + > + reg_message(STRING_ERROR); > + reg_printfW(error_string, error_code, message); > + HeapFree(GetProcessHeap(), 0, message); http://msdn.microsoft.com/en-us/library/windows/desktop/ms679351(v=vs.85).a… says FormatMessage uses LocalAlloc to allocate the buffer. You need to free it with LocalFree. I don't know if we have any rule for checking the return value for FormatMessage here. You are already in an error printing codepath, and if you print an error every time printing an error fails you'll never stop. Otoh it seems questionable not to check the return value. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUXK8aAAoJEN0/YqbEcdMwxuoP/RGyxXJoVN5h8Quj3L5HFGb+ Fg3xah51LzRJzQFirZ7yF13OVoZiGg7om4eAlo/eSAy1Ae/jzGxodg7PKEU7DXX/ 3s2TYE9TrkPJClt2hFq1asGoAI1uezNDJybwSXBxEgRAkUzBBhBh+9XEKffZz3iE OWpyHyCOQBwHPBq3krLP+joADngT13UfEvvrccNobvYb47WMBddJ70UdD+sYeF/i fbbYMdnhIKowbe26xCVwSDN5huXMq1f9zYuqkJwL6BRmkgD5FiwYdo8zXu2BvpEq ZkFwxUjCXFRJ7nwLAly5lNSCA1MMFD/Whwd5PxbMmVCwWK3nhqknxQdJJJIy95vd e2JeSwk/4ELavjXubMGAH5D7QfTnveO/ji/kZCWB2buN30ht5ORRH6bjupL/zIr4 hhh4HJ/6EdHhWJfffenmM9uGxN8zNO6HmVSHVnXn90QnSousjuNkFymfr9RkWycr kmjPJQw8inoEl0zmeMiDdu+Kxo9MHX7SAwAHi9OzYeU2aka8LTOASn0mmKM+GBeO 9uaJbQAa/ILzWkFaYY/C+lgnyJgjgY6+fFj1O+DFlXh4DnaZ1DXMrn4+3WrUDWQk 3cFD0/6ehVBuUouEY8dF0yDiWPO9cwTEe7S5G9u03rS72H6mRfRP8mJVI6ZVPwbU 7wj5TGWDXCcDiRHd46UI =abxe -----END PGP SIGNATURE-----

1 0

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

Nov. 7, 2014

On 11/07/14 04:36, Shuai Meng wrote: > used mod other than division when the second argument(length of > string) is grater than 256; Your test was already showing that it doesn't work this way. You will probably need to use MultiByteToWideChar function here. + case VT_ARRAY|VT_BYREF|VT_VARIANT: + return DISP_E_TYPEMISMATCH; + default: + hres = to_short(arg + 1, &tmp); There's no need to handle VT_ARRAY|VT_BYREF|VT_VARIANT case separately. It will be done by to_short function. Thanks, Piotr

1 0

Re: shell32: Simplify check for empty string (PVS-Studio)
by Alistair Leslie-Hughes Nov. 7, 2014

Nov. 7, 2014

On 07/11/14 20:22, Michael Stefaniuc wrote: > --- > dlls/shell32/shellord.c | 2 +- > dlls/shell32/tests/ebrowser.c | 2 +- > dlls/shell32/tests/shlfolder.c | 14 +++++++------- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c > index 56c9fe9..914dc5a 100644 > --- a/dlls/shell32/shellord.c > +++ b/dlls/shell32/shellord.c > @@ -947,7 +947,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) > /* buffer size looks good */ > ptr += 12; /* get to string */ > len = bufused - (ptr-buffer); /* get length of buf remaining */ > - if ((lstrlenA(ptr) > 0) && (lstrlenA(ptr) <= len-1)) { > + if (ptr[0] && (lstrlenA(ptr) <= len-1)) { You are changing tabs to spaces here. Best Regards Alistair Leslie-Hughes

2 1

Re: [PATCH] vbscript: Implemented String(try 3)
by Marvin Nov. 7, 2014

Nov. 7, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=10094 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 2/4] d3d8/tests: The device restores the mode settings from the registry (v5).
by Marvin Nov. 7, 2014

Nov. 7, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=10090 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 000B00F8, 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:3215: Test failed: Failed to reset device. device.c:3222: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3230: Test failed: Expected wndproc 0x412ed0, got 0x412ed0.

1 0

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

Nov. 6, 2014

-----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 Nov. 6, 2014

Nov. 6, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 Nov. 6, 2014

Nov. 6, 2014

-----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 Nov. 6, 2014

Nov. 6, 2014

-----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 Nov. 6, 2014

Nov. 6, 2014

-----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 Nov. 6, 2014

Nov. 6, 2014

-----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 Nov. 6, 2014

Nov. 6, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 Nov. 6, 2014

Nov. 6, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 Nov. 6, 2014

Nov. 6, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 Nov. 6, 2014

Nov. 6, 2014

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 Nov. 6, 2014

Nov. 6, 2014

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 Nov. 5, 2014

Nov. 5, 2014

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 Nov. 5, 2014

Nov. 5, 2014

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 Nov. 5, 2014

Nov. 5, 2014

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 Nov. 5, 2014

Nov. 5, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 Nov. 5, 2014

Nov. 5, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 Nov. 5, 2014

Nov. 5, 2014

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 Nov. 4, 2014

Nov. 4, 2014

-----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 Nov. 4, 2014

Nov. 4, 2014

-----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 Nov. 4, 2014

Nov. 4, 2014

-----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