wine-devel October 2014

wine-devel@winehq.org

52 participants
183 discussions

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

← Newer
1
...
4
5
6
7
8
9
10
...
19
Older →

Jump to page:

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