May 2013 - Wine-Devel - list.winehq.org

RE:
by xerox_xerox2000＠yahoo.co.uk May 26, 2013

May 26, 2013

Moussoiddik%20Aboudou588 http://fonio-bio.org/w/87Elsie%20Mills045 Mon, 27 May 2013 5:04:06

1 0

Re: [PATCH] kernel32: Don't move fixed memory area in GlobalReAlloc().
by Marvin May 25, 2013

May 25, 2013

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 http://testbot.winehq.org/JobDetails.pl?Key=25705 Your paranoid android. === W7PROX64 (32 bit heap) === heap.c:234: Test failed: got 00000000 heap.c:400: Test failed: got 00000000 === TEST64_W7SP1 (32 bit heap) === heap.c:234: Test failed: got 00000000 heap.c:400: Test failed: got 00000000

1 0

Re: [2/2] server: A being destroyed object may need to access other objects using a handle.
by Alexandre Julliard May 24, 2013

May 24, 2013

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > --- a/server/handle.c > +++ b/server/handle.c > @@ -165,7 +165,6 @@ static void handle_table_destroy( struct object *obj ) > for (i = 0, entry = table->entries; i <= table->last; i++, entry++) > { > struct object *obj = entry->ptr; > - entry->ptr = NULL; > if (obj) release_object( obj ); You can't do that, the object can't be accessed after being released. -- Alexandre Julliard julliard(a)winehq.org

2 5

Adding names to the authors file.
by Tae Wong May 24, 2013

May 24, 2013

The only Croatian person is Marko Nikolić, but with no accented letter. Could you also add Joško Nikolić (the Croatian translator) and Volkan Gezer (the Turkish translator) to the authors file as well? The file name (in all capitals) is AUTHORS. It is very great so that you have to accentuate Marko's name at the message. But you use "straight quotes" or “smart quotes”. And Van Schaik's name is credited under the surname (and not on the particle). Here is the sort that you want for the section: va. South African and Namibian names in Dutch should have been sorted on the prefix (particle), but not in the surname. Vainer, Moshe Valoska, Hleb Valtonen, Hannu Vance, Carroll Vanek, Tomas van Schaik, Carl (Note that this is on a letter by letter sort.) Vaughn, Charles

1 0

Re: po: Added Croatian translation.
by Frédéric Delanoy May 24, 2013

May 24, 2013

On Thu, May 23, 2013 at 3:45 PM, Joško Nikolić <josko.nikolic1(a)gmail.com> wrote: > > --- > configure | 1 + > po/LINGUAS | 1 + > po/hr.po | 13923 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 13925 insertions(+) > create mode 100644 po/hr.po As mentioned on IRC, you should remove the #| msgid "foo" lines, and modify 'configure.ac' instead of 'configure', which is autogenerated. Frédéric

1 0

Re: [5/5] oledb32: GetConversionSize only returns a valid size of BSTR
by Marvin May 24, 2013

May 24, 2013

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 http://testbot.winehq.org/JobDetails.pl?Key=25680 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [4/5] oledb32: DataConvert only variant length types can have a null dst
by Marvin May 24, 2013

May 24, 2013

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 http://testbot.winehq.org/JobDetails.pl?Key=25679 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [2/5] oledb32: DataConvert Support NULL variant
by Marvin May 24, 2013

May 24, 2013

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 http://testbot.winehq.org/JobDetails.pl?Key=25677 Your paranoid android. === WVISTAX64 (64 bit convert) === No test summary line found === W7PROX64 (64 bit convert) === No test summary line found === TEST64_W7SP1 (64 bit convert) === No test summary line found

1 0

Re: [5/5] oledb32: GetConversionSize only returns a valid size of BSTR
by Nikolay Sivov May 23, 2013

May 23, 2013

On Thu, May 23, 2013 at 11:48 AM, Alistair Leslie-Hughes < leslie_alistair(a)hotmail.com> wrote: > Hi, > > > Changelog: > oledb32: GetConversionSize only returns a valid size of BSTR > + if(V_VT((VARIANT*)src) != VT_BSTR) + *dst_len = 110; else - return hr; + *dst_len = (SysStringLen(V_BSTR((VARIANT*)src)) + 1) * sizeof(WCHAR); + + return S_OK; So it returns previous result if type is invalid, meaning it's not VT_BSTR? You can't just return a random constant that appears in tests just because of previously made call (which is my guess). If you really want to implement this broken behaviour it will need more tests, at least one more that shows it returns a result from last successful call. > > Best Regards > Alistair Leslie-Hughes > > > >

1 0

Re: advapi32/tests: Fix copy&paste typo
by Guo Jian May 23, 2013

May 23, 2013

Hi Andre, According to my test plan of the registry merging project, I will add new tests for HKCR. At first I tried to add them to the old code but I find it become too long and hard-reading. I had to rewrite them to a series of strict and neat tests, classified as read/write operations, including keys & values enumerating and deleting. I used many pre-definitions which make the test look fluent, but I'm not sure if the code is acceptable. http://newtestbot.winehq.org/JobDetails.pl?Key=942 static void test_classesroot(void) { DWORD res, len, i; HKEY hkey; char name[32]; #define CREATE_KEY(key, path) \ { \ HKEY tmp; \ if ((res = RegCreateKeyExA( key, path, 0, NULL, 0, \ KEY_ENUMERATE_SUB_KEYS|KEY_SET_VALUE|KEY_QUERY_VALUE|KEY_CREATE_SUB_KEY, \ NULL, &tmp, NULL )) != ERROR_SUCCESS) \ { \ ok(FALSE, "RegCreateKeyExA %p\\%s failed with %08X\n", key, path, res); \ return; \ } \ else \ { \ RegCloseKey(tmp); \ } \ } #define DELETE_KEY(key, path) \ { \ DWORD res; \ if ((res = RegDeleteKey(key, path)) != ERROR_SUCCESS) \ { \ ok(FALSE, "RegDeleteKey %p\\%s failed with %08X\n", key, path, res); \ return; \ } \ } #define SET_VALUE(key, path, name, value) \ { \ HKEY tmp; \ if ((res = RegOpenKeyExA( key, path, 0, \ KEY_SET_VALUE, &tmp )) != ERROR_SUCCESS) \ { \ ok(FALSE, "RegOpenKeyExA %p\\%s failed with %08X\n", key, path, res); \ return; \ } \ else \ { \ if ((res = RegSetValueEx( tmp, name, 0, REG_SZ, \ (CONST BYTE*)value, strlen(value) )) != ERROR_SUCCESS) \ { \ ok(FALSE, "RegSetValueEx %p\\%s failed with %08X\n", tmp, name, res); \ return; \ } \ RegCloseKey(tmp); \ } \ } #define CHECK_EXIST_KEY(key, path) \ ok(exist_key(key, path), "key %p\\%s should exist\n", key, path); #define CHECK_NOT_EXIST_KEY(key, path) \ ok(!exist_key(key, path), "key %p\\%s should exist\n", key, path); #define CHECK_VALUE(key, path, name, value) \ { \ HKEY tmp; \ if ((res = RegOpenKeyExA( key, path, 0, \ KEY_QUERY_VALUE, &tmp )) != ERROR_SUCCESS) \ { \ ok(FALSE, "RegOpenKeyExA %p\\%s failed with %08X\n", key, path, res); \ return; \ } \ else \ { \ char buf[32]; \ DWORD type = REG_SZ, size = sizeof(buf); \ if ((res = RegQueryValueEx( tmp, name, 0, &type, \ (BYTE*)buf, &size )) != ERROR_SUCCESS) \ { \ ok(FALSE, "RegQueryValueEx %p\\%s failed with %08X\n", tmp, name, res); \ return; \ } \ ok(!strcmp(value, buf), "%s expected '%s' but got '%s' in %p\\%s\n", name, value, buf, key, path); \ RegCloseKey(tmp); \ } \ } #define CHECK_NON_VALUE(key, path, name) \ { \ HKEY tmp; \ if ((res = RegOpenKeyExA( key, path, 0, \ KEY_QUERY_VALUE, &tmp )) != ERROR_SUCCESS) \ { \ ok(FALSE, "RegOpenKeyExA %p\\%s failed with %08X\n", key, path, res); \ return; \ } \ else \ { \ char buf[32]; \ DWORD type = REG_SZ, size = sizeof(buf); \ if ((res = RegQueryValueEx( tmp, name, 0, &type, \ (BYTE*)buf, &size )) == ERROR_SUCCESS) \ { \ ok(FALSE, "%s should not exist in %p\\%s\n", name, key, path); \ } \ else if (res != ERROR_FILE_NOT_FOUND) \ { \ ok(FALSE, "RegQueryValueEx %p\\%s failed with %08X\n", tmp, name, res); \ return; \ } \ RegCloseKey(tmp); \ } \ } #define DELETE_VALUE(key, path, name) \ { \ HKEY tmp; \ if ((res = RegOpenKeyExA( key, path, 0, \ KEY_SET_VALUE, &tmp )) != ERROR_SUCCESS) \ { \ ok(FALSE, "RegOpenKeyExA %p\\%s failed with %08X\n", key, path, res); \ return; \ } \ else \ { \ if ((res = RegDeleteValueA(tmp, name)) != ERROR_SUCCESS) \ { \ ok(FALSE, "RegDeleteValue %s in %p\\%s failed with %08X\n", name, key, path, res); \ return; \ } \ RegCloseKey(tmp); \ } \ } #define CHECK_KEY_INFO(key, path, c1, c2) \ { \ HKEY tmp; \ if ((res = RegOpenKeyExA( key, path, 0, \ KEY_QUERY_VALUE, &tmp )) != ERROR_SUCCESS) \ { \ ok(FALSE, "RegOpenKeyExA %p\\%s failed with %08X\n", key, path, res); \ return; \ } \ else \ { \ DWORD n1, n2; \ if (ERROR_SUCCESS != (res = RegQueryInfoKeyA( tmp, NULL, NULL, NULL, \ &n1, NULL, NULL, &n2, NULL, NULL, NULL, NULL ))) \ { \ ok(FALSE, "RegQueryInfoKeyA failed with %08X\n\n", res); \ return; \ } \ ok(n1 == c1, "subkey count expected %d but got %d in %p\\%s\n", c1, n1, key, path); \ ok(n2 == c2, "value count expected %d but got %d in %p\\%s\n", c2, n2, key, path); \ RegCloseKey(tmp); \ } \ } /* test create_key priority */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); if ((res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, STANDARD_RIGHTS_READ, &hkey )) != ERROR_SUCCESS) { skip("classes merging not supported\n"); cleanup_classes(); return; } /* test create_key priority */ /* create from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CLASSES_ROOT, "WineTestCls"); CHECK_EXIST_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); CHECK_NOT_EXIST_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); /* create from hklm then hkcr */ cleanup_classes(); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_CLASSES_ROOT, "WineTestCls"); CHECK_NOT_EXIST_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); /* create from hkcu then hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_CLASSES_ROOT, "WineTestCls"); CHECK_NOT_EXIST_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); /* further test based on the below */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); if ((res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, KEY_CREATE_SUB_KEY, &hkey )) != ERROR_SUCCESS) { ok(FALSE, "RegOpenKeyExA %p\\%s failed with %08X\n", hkey, "WineTestCls", res); return; } /* create subkey under the handle opened from the key that exists only in hkcu but not hklm */ CREATE_KEY(hkey, "subkey1"); RegCloseKey(hkey); /* check that subkey is created in hklm, proving that the handle from hkcr is not same as opened in hkcu, even when it does not conflict with hklm */ CHECK_EXIST_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls\\subkey1"); CHECK_NOT_EXIST_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls\\subkey1"); /* test delete_key priority */ /* create from hkcu and delete from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); DELETE_KEY(HKEY_CLASSES_ROOT, "WineTestCls"); CHECK_NOT_EXIST_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); CHECK_NOT_EXIST_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); /* create from hklm and delete from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); DELETE_KEY(HKEY_CLASSES_ROOT, "WineTestCls"); CHECK_NOT_EXIST_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); CHECK_NOT_EXIST_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); /* create from hkcu and hklm and delete twice from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); DELETE_KEY(HKEY_CLASSES_ROOT, "WineTestCls"); CHECK_EXIST_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); CHECK_NOT_EXIST_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); /* delete again */ DELETE_KEY(HKEY_CLASSES_ROOT, "WineTestCls"); CHECK_NOT_EXIST_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); CHECK_NOT_EXIST_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); /* test set_value priority */ /* set new value from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); SET_VALUE(HKEY_CLASSES_ROOT, "WineTestCls", "val1", "hkcr"); CHECK_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1", "hkcr"); CHECK_NON_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1"); /* set value from hkcu and reset value from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); SET_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1", "hkcu"); SET_VALUE(HKEY_CLASSES_ROOT, "WineTestCls", "val1", "hkcr"); CHECK_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1", "hkcr"); CHECK_NON_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1"); /* set value from hklm and reset value from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); SET_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1", "hklm"); SET_VALUE(HKEY_CLASSES_ROOT, "WineTestCls", "val1", "hkcr"); CHECK_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1", "hkcr"); CHECK_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1", "hklm"); /* set value from hkcu and hklm and reset value from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); SET_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1", "hkcu"); SET_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1", "hklm"); SET_VALUE(HKEY_CLASSES_ROOT, "WineTestCls", "val1", "hkcr"); CHECK_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1", "hkcr"); CHECK_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1", "hklm"); /* set value from hklm in a key not conflict with hkcu and reset value from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); SET_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1", "hklm"); SET_VALUE(HKEY_CLASSES_ROOT, "WineTestCls", "val1", "hkcr"); CHECK_NOT_EXIST_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); CHECK_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1", "hkcr"); /* test delete_value priority, no need to test when not conflict */ /* set value from hkcu and hklm then delete twice from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); SET_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1", "hkcu"); SET_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1", "hklm"); DELETE_VALUE(HKEY_CLASSES_ROOT, "WineTestCls", "val1"); CHECK_NON_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1"); CHECK_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1", "hklm"); /* delete again */ DELETE_VALUE(HKEY_CLASSES_ROOT, "WineTestCls", "val1"); CHECK_NON_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1"); /* test query_value priority, noneed to test when not conflict */ /* set value to hkcu and create the key in hklm then query from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); SET_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1", "hkcu"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); CHECK_VALUE(HKEY_CLASSES_ROOT, "WineTestCls", "val1", "hkcu"); /* set value to hklm and create the key in hkcu then query from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); SET_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1", "hklm"); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); CHECK_VALUE(HKEY_CLASSES_ROOT, "WineTestCls", "val1", "hklm"); /* set conflict value both to hkcu and hklm then query from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); SET_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1", "hkcu"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); SET_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1", "hklm"); CHECK_VALUE(HKEY_CLASSES_ROOT, "WineTestCls", "val1", "hkcu"); /* set non conflict value both to hkcu and hklm then query from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); SET_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1", "hkcu"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); SET_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val2", "hklm"); CHECK_VALUE(HKEY_CLASSES_ROOT, "WineTestCls", "val1", "hkcu"); CHECK_VALUE(HKEY_CLASSES_ROOT, "WineTestCls", "val2", "hklm"); /* test query_info_key priority, no need to test when queried key does not conflict */ /* check subkey and value count for conflict subkeys from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls\\subkey1"); SET_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1", "hkcu"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls\\subkey1"); SET_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val1", "hkcu"); CHECK_KEY_INFO(HKEY_CLASSES_ROOT, "WineTestCls", 1, 1); /* check subkey and value count for non conflict subkeys from hkcr */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls\\subkey1"); SET_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1", "hkcu"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls\\subkey2"); SET_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val2", "hkcu"); CHECK_KEY_INFO(HKEY_CLASSES_ROOT, "WineTestCls", 2, 2); /* test enum_key priority, no need to test when enumerated key does not conflict */ /* create subkeys and values in hkcu and hklm */ cleanup_classes(); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls\\subkey1"); CREATE_KEY(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls\\subkey3"); SET_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val1", "hkcu"); SET_VALUE(HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", "val3", "hkcu"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls\\subkey3"); CREATE_KEY(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls\\subkey2"); SET_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val3", "hkcu"); SET_VALUE(HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", "val2", "hkcu"); /* check the count */ CHECK_KEY_INFO(HKEY_CLASSES_ROOT, "WineTestCls", 3, 3); if ((res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, KEY_ENUMERATE_SUB_KEYS|KEY_QUERY_VALUE, &hkey )) != ERROR_SUCCESS) { ok(FALSE, "RegOpenKeyExA %p\\%s failed with %08X\n", hkey, "WineTestCls", res); return; } /* check the names and order of subkeys when enumerating */ i = 0; len = sizeof(name); while (ERROR_SUCCESS == (res = RegEnumKeyExA(hkey, i, name, &len, NULL, NULL, NULL, NULL))) { ++ i; if (i > 3) { ok(FALSE, "got extra subkey name %s\n", name); } else if (strncmp(name, "subkey", 6) || name[6] != (i + '0') || name[7]) { ok(FALSE, "got unexpected subkey name or order %s at index %d\n", name, i); } len = sizeof(name); } if (res != ERROR_NO_MORE_ITEMS) { ok(FALSE, "RegEnumKeyExA failed with %08X\n", res); return; } if (i < 3) { ok(FALSE, "expected 3 subkeys but got only %d\n", i); } /* check the names and order of values when enumerating */ i = 0; len = sizeof(name); while (ERROR_SUCCESS == (res = RegEnumValueA(hkey, i, name, &len, NULL, NULL, NULL, NULL))) { ++ i; if (i > 3) { ok(FALSE, "got extra value name %s\n", name); } else if (strncmp(name, "val", 3) || name[3] != (i + '0') || name[4]) { ok(FALSE, "got unexpected value name or order %s at index %d\n", name, i); } len = sizeof(name); } if (res != ERROR_NO_MORE_ITEMS) { ok(FALSE, "RegEnumValueA failed with %08X\n", res); return; } if (i < 3) { ok(FALSE, "expected 3 value but got only %d\n", i); } RegCloseKey(hkey); cleanup_classes(); } -- Regards, Guo Jian

1 0

Regression for bash.exe redirection of ctest.exe for wine-1.5.30 compared to wine-1.5.19
by Alan W. Irwin May 22, 2013

May 22, 2013

Generally I have found in still fairly limited testing that MSYS bash.exe redirection is fine on wine-1.5.30 (which I have now been able to build in 32-bit mode on Debian wheezy x86_64 thanks to the 32-bit library symlink trick discussed in my previous recent thread). However, I have just discovered a puzzling case where MSYS bash.exe redirection now fails for ctest.exe compared to wine-1.5.19. To reproduce this regression download the Windows binary version of cmake-1.8.10.2 (which includes cmake.exe and ctest.exe) and install it. Also download and install MinGW/MSYS. In the past, I have found results depend very much on how you get into the MSYS bash.exe environment. In my case I execute wineconsole --backend=curses MinGW_4.7.0/msys/1.0/bin/bash.exe to do that, and then from that interactive environment execute the commands below. Here is how I try the --version option for cmake and ctest with redirection under bash.exe. bash.exe-3.1$ cmake --version >& cmake_version.out bash.exe-3.1$ ctest --version >& ctest_version.out For Wine-1.5.19 bash.exe-3.1$ head *.out ==> cmake_version.out <== cmake version 2.8.10.2 ==> ctest_version.out <== ctest version 2.8.10.2 For Wine-1.5.30 bash.exe-3.1$ head *.out ==> cmake_version.out <== cmake version 2.8.10.2 ==> ctest_version.out <== N.B. note the incorrect empty ctest_version.out file for Wine-1.5.30. For both Wine-1.5.19 and Wine-1.5.30 if I don't redirect the output I simply get the following results bash.exe-3.1$ cmake --version cmake version 2.8.10.2 bash.exe-3.1$ ctest --version ctest version 2.8.10.2 So somehow bash.exe redirection for ctest (but not cmake and a small number of other commands I have tried) generates an incorrect empty file for Wine-1.5.30. I never have had trouble with bash.exe redirection for any command (including ctest) on either Linux bash or MSYS bash.exe on Wine-1.5.19. So it is likely there is some minor (but probably standard) variation in how ctest handles its stdout that is triggering this Wine-1.5.30 regression compared to Wine-1.5.19. So there might be other commands as well where bash.exe redirection doesn't work for Wine-1.5.30. If it is already known that MSYS bash.exe redirection is sometimes problematic with Wine-1.5.30 compared to earlier versions, is there some patch I could try to see if it fixes this specific issue? My primary motivation is developing my own free software. Therefore, I only have limited time to help figure out wine bugs although I am willing to report the ones I discover here (and on the bug tracker once discussed here to reduce bug tracker noise). That said, it does appear that git-bisect would be an ideal way to find which commit between Wine-1.5.19 and Wine-1.5.30 caused the bash.exe redirection issue with ctest.exe. Unfortunately, I have zero experience with git-bisect. However, if somebody could give me some step-by-step instructions I could follow by rote that would be great. Ideally, those instructions would be a simple template bash script I could run unattended overnight from Linux that used git-bisect to detect the first commit between Wine-1.5.19 and Wine-1.5.30 where ctest --version >& ctest_version.out produces an empty file under MSYS bash.exe. I can fill in the parts of that template script concerning the wine build for each git commit that is being tested since I have such builds (including necessary *.so links for later wine versions) largely automated now. But I am not sure about how you get into MSYS bash.exe directly (my normal method using wineconsole as above appears to be interactive rather than something you could run unattended) from a Linux bash script so I would need advice about that. Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net) the Time Ephemerides project (timeephem.sf.net) PLplot scientific plotting software package (plplot.sf.net) the libLASi project (unifont.org/lasi) the Loads of Linux Links project (loll.sf.net) and the Linux Brochure Project (lbproject.sf.net) __________________________ Linux-powered Science __________________________

2 3

Patches 96314 & 96328
by Christian Costa May 22, 2013

May 22, 2013

Hi, Is there any problem with these patches? http://source.winehq.org/patches/data/96314 http://source.winehq.org/patches/data/96328 Christian

1 0

Re: [PATCH 2/5] dinput: Support SendForceFeedbackCommand for OSX joysticks
by Charles Davis May 22, 2013

May 22, 2013

On May 21, 2013, at 1:34 PM, Andrew Eikum wrote: > --- > dlls/dinput/joystick_osx.c | 34 ++++++++++++++++++++++++++++++++-- > 1 file changed, 32 insertions(+), 2 deletions(-) > > diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c > index 94398e7..8fb675d 100644 > --- a/dlls/dinput/joystick_osx.c > +++ b/dlls/dinput/joystick_osx.c > @@ -1135,6 +1135,36 @@ static HRESULT WINAPI JoystickAImpl_CreateEffect(IDirectInputDevice8A *iface, > type, params, out, outer); > } > > +static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(IDirectInputDevice8W *iface, > + DWORD flags) > +{ > + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); > + HRESULT hr; > + > + TRACE("%p 0x%x\n", This, flags); > + > + if(!This->ff) > + return DI_NOEFFECT; > + > + hr = FFDeviceSendForceFeedbackCommand(This->ff, flags); > + if(FAILED(hr)){ > + WARN("FFDeviceSendForceFeedbackCommand failed: %08x\n", hr); > + return hr; You can't return the straight HRESULT from ForceFeedback here. That's because the codes in the FACILITY_NULL range on Mac get their values from the 16-bit COM runtime (cf. <CoreFoundation/CFPlugInCOM.h>). You must turn them into their corresponding Win32 codes. Chip

2 1

wine-osX developer for winmm joystick project?
by DavidL May 22, 2013

May 22, 2013

To anybody interested, I think I've found a solution to an old problem of implementing winmm joystick support in WINE for Mac, but lack the necessary skills and experience to code it up myself. WINE-Linux has had it implemented for awhile, but it was never coded up for OS X. winmm is an older interface used for a lot of different peripherals, included joysticks in quite a few classic games. As there were also some problems with dinput for WINE-OSX, originally it was thought the problems with winmm were also a bug. However, the problems with dinput have been solved and it seems the necessary code for winmm joystick support, rather than being buggy, was never actually written for WINE for the Mac. Thus it is an issue in need of development rather than a bug report. So I thought I'd ask if anyone was interested in developing the code to get winmm working in in the Mac-WINE environment? I have an idea about what needs to be written but I lack the experience in Mac-system level programming to be of much use. I did take a look but found the API very arcane. That's why I am asking for someone with more experience. From what I can tell, the code should not be difficult to write for someone who knew what they were doing with regards to Mac system programming. There aren't many functions that need to be written and what ones there are seem simple enough. I have an outline about what functions need to written and modified to get winmm functionality working for the Mac-WINE environment. The requisite changes are here: ( http://bugs.winehq.org/show_bug.cgi?id=18424#c75) It is written in a bug report because originally it was part of the same conversation as the dinput bug. I look forward to hearing back from anyone interested in taking this (I think) short development project up. I'd be happy to learn and help test the code with some classic games that require winmm. Cheers, David

1 0

Re: [PATCH 2/4] ddraw/tests: Add EXCLUSIVE->NORMAL coop level switching tests
by Henri Verbeet May 22, 2013

May 22, 2013

On 21 May 2013 13:18, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > +static void test_coop_level_versions(void) It may make more sense to move that to ddraw2.c and ddraw4.c instead. (IIRC you can't QI a ddraw1 interface from ddraw7.)

2 2

Re: [PATCH 1/4] ddraw: Restore resolution on EXCLUSIVE->NORMAL switch
by Henri Verbeet May 22, 2013

May 22, 2013

On 21 May 2013 13:18, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > The new code does not deliver the resolution change messages to the > correct window, see the todo_wine markers in the next patch. Getting > this right isn't simply a matter of passing the correct window to > wined3d_device_restore_fullscreen_window because the delivery of the > correct messages in the new window == old window case is mostly a lucky > side effect of the window style hacks. Those hacks fail if we pass a > different window, because the style of the new window is different from > what wined3d expects, so it doesn't send any messages. Well, wined3d_device_restore_fullscreen_window() isn't really supposed to generate messages at all, the resize on mode changes happens in device_parent_mode_changed(). The implication seems to be that restoring the display mode is supposed to happen after the new swapchain is created, but before "ddraw->cooperative_level" is updated. > /***************************************************************************** > + * IDirectDraw7::RestoreDisplayMode > + * > + * Restores the display mode to what it was at creation time. Basically. > + * > + * Returns > + * DD_OK on success > + * DDERR_NOEXCLUSIVE mode if the device isn't in fullscreen mode > + * > + *****************************************************************************/ I don't think that really adds anything. > -static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND window, DWORD cooplevel) > +static HRESULT WINAPI ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, > + DWORD cooplevel, BOOL restore_mode) Shadowing the global "restore_mode" is a bit unfortunate. > - TRACE("iface %p, window %p, flags %#x.\n", iface, window, cooplevel); > + TRACE("ddraw %p, window %p, flags %#x, restore_mode %s.\n", ddraw, window, cooplevel, > + restore_mode ? "true" : "false"); I think %#x is generally clear enough for BOOLs. > if(cooplevel & DDSCL_ALLOWREBOOT) > - WARN("(%p) Unhandled flag DDSCL_ALLOWREBOOT, harmless\n", This); > + WARN("(%p) Unhandled flag DDSCL_ALLOWREBOOT, harmless\n", ddraw); > if(cooplevel & DDSCL_ALLOWMODEX) > - WARN("(%p) Unhandled flag DDSCL_ALLOWMODEX, harmless\n", This); > + WARN("(%p) Unhandled flag DDSCL_ALLOWMODEX, harmless\n", ddraw); > if(cooplevel & DDSCL_FPUSETUP) > - WARN("(%p) Unhandled flag DDSCL_FPUSETUP, harmless\n", This); > + WARN("(%p) Unhandled flag DDSCL_FPUSETUP, harmless\n", ddraw); The "(%p)" there is pretty pointless, I usually remove them if I'm editing the line anyway. > @@ -86,6 +86,7 @@ struct ddraw > > /* DirectDraw things, which are not handled by WineD3D */ > DWORD cooperative_level; > + BOOL setcooplevel_ddraw1; > We should probably consolidate the various BOOLs in struct ddraw into a flags field.

2 2

Question about legal requirement on gsoc page
by Christian Costa May 22, 2013

May 22, 2013

*Hi, * *I read on the GSoC page this: * *"You are not allowed to analyze Windows files with the trace functions of Wine" * *What does that mean? * *Thanks * *Christian *

2 2

Re: [PATCH] ws2_32: Automatically sets a socket to non-blocking mode when WSAAsyncSelect or WSAEventSelect is called (try 2).
by Alexandre Julliard May 22, 2013

May 22, 2013

Qian Hong <qhong(a)codeweavers.com> writes: > @@ -5383,7 +5383,11 @@ int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, LONG lEvent) > ret = wine_server_call( req ); > } > SERVER_END_REQ; > - if (!ret) return 0; > + if (!ret) > + { > + _enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); > + return 0; > + } You shouldn't need 2 server calls for this. > @@ -3578,6 +3584,12 @@ static void test_events(int useMessages) > goto end; > } > > + if (set_blocking(src2, TRUE)) > + { > + ok(0, "set_blocking failed, error %d\n", WSAGetLastError()); > + goto end; > + } There's no reason to abort on every failure. -- Alexandre Julliard julliard(a)winehq.org

2 1

Troubles configuring and building wine-1.5.30 on Debian wheezy
by Alan W. Irwin May 22, 2013

May 22, 2013

My use case is building and testing software packages on Wine. My 32-bit build of wine-1.5.19 on x86_64 hardware was fine for this purpose for MinGW/MSYS builds so I stuck with it until today when I attempted to expand my building and testing of software to the Cygwin on Wine platform. I immediately ran into some issues with the Cygwin setup.exe installer so my first instinct was to try the latest experimental wine release, wine-1.5.30, but it's build has changed quite a bit since when I built wine-1.5.19, and I need some help figuring out what to do. The first issue was the configure script complained that the 32-bit version of the X libraries was missing and errored out. I then decided to try the 64-bit version of wine instead (since my Debian system has mostly 64-bit libraries). I got that 64-bit-only build and install to work perfectly, but I could not run anything with it. For example: wine(a)raven> wine64 wine64: error while loading shared libraries: libwine.so.1: cannot open shared object file: No such file or directory I then looked at http://wiki.winehq.org/Wine64 which recommended a WoW64 configuration, where you build both 64-bit and 32-bit versions of Wine and install both. So following those directions, the 64-bit version again built and installed without issues (in fact I just renamed what I did before) but the 32-bit version again errored out on lack of a 32-bit X library. Now Debian wheezy has multiarch implemented properly for some (but not all) packages so I was able to install libx11-dev:i386 which coexisted fine with the installed libx11-dev:amd64 and also solved the 32-bit X issue. But then the 32-bit wine-1.5.30 configure continued further and ran into a similar issue with missing 32-bit freetype6. The error message was configure: error: FreeType 32-bit development files not found. Fonts will not be built. Use the --without-freetype option if you really want this. Accordingly I attempted to install libfreetype6-dev:i386 but on Debian wheezy that conflicts with libfreetype6-dev:amd64, and it appears the only way around this packaging issue for now (until the libfreetype6-dev:i386 and libfreetype6-dev:amd64 packages are taught to coexist) is to create a pure 32-bit Debian wheezy system (which I don't want to do). So here are my questions and further comments: 1. Is there a way to stick with a pure 64-bit Wine system, or is that normally pretty useless because downloaded applications such as the Cygwin installer which apparently is 32-bit, i.e., wine(a)raven> file setup.exe setup.exe: PE32 executable (GUI) Intel 80386 (stripped to external PDB), for MS Windows, UPX compressed wont run on it? 2. If the WoW64 configuration is really the best solution, what are the consequences of dropping libfreetype from the 32-bit configuration (but obviously including it in the 64-bit configuration). IOW, if I just say --without-freetype for the 32-bit configuration (suggested as a possibility above by that error message) will the fonts be built and installed by the 64-bit configuration that includes libfreetype? 3. I would have liked to continue with pure 32-bit wine since that was what I have been used to all these years, but it appears wine-1.5.30 32-bit dependencies are really fearsome compared to the relative modest 32-bit dependencies for wine-1.5.19 so this effectively makes it impossible to build a standalone 32-bit wine system on Debian Wheezy (because no fonts will be built if --without-freetype is used) and might also compromise WoW64 builds (see question 2 above). It obviously doesn't affect pure 64-bit Wine builds, but I couldn't get that to work at all at run time (missing libwine.so.1 (see above)), but if there are workarounds for that issue, then it still might be useless (see question 1 above). Any help/comments on the correct way to build wine-1.5.30 would be much appreciated for the case (as on Debian wheezy) where 32-bit and 64-bit libfreetype packages cannot be installed simultaneously. Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net) the Time Ephemerides project (timeephem.sf.net) PLplot scientific plotting software package (plplot.sf.net) the libLASi project (unifont.org/lasi) the Loads of Linux Links project (loll.sf.net) and the Linux Brochure Project (lbproject.sf.net) __________________________ Linux-powered Science __________________________

5 8

Re: server: Always redraw children when parent's pos/size changed in any way (Try 2).
by Sergey Guralnik May 21, 2013

May 21, 2013

On 2013-05-06 13:24, Sergey Guralnik wrote: > Alexandre Julliard writes: >> ... >> It doesn't make sense to have all these complicated tests if we are >> going to always repaint anyway, which is essentially what your patch >> does. There has to be more to it than that. > > This version uses the same logic as used before, but also it > removes all redundant checks. > > --- > dlls/user32/tests/win.c | 1 - > server/window.c | 32 ++++++-------------------------- > 2 files changed, 6 insertions(+), 27 deletions(-) Is there some problem with this patch? -- Sergey

2 1

[PATCH] Tests that prove ntdll has no notion of HKCR.
by George Stephanos May 21, 2013

May 21, 2013

As instructed, I added a few lines to the already written tests that confirm my claim. Part of the research of the registry merging project was to determine where the implementation is going to be written: advapi32, ntdll or the server itself. The server choice was dismissed since HKCR isn't stored and rather fetched live. These tests prove that advapi32 calls that reference HKCR are either pointed there to \REGISTRY\MACHINE or \REGISTRY\USER and hence, that the merge is to be done in advapi32. http://newtestbot.winehq.org/JobDetails.pl?Key=976 --- dlls/advapi32/tests/registry.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index b2483a7..8437e4d 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -43,6 +43,7 @@ static DWORD (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR); static DWORD (WINAPI *pRegDeleteKeyExA)(HKEY,LPCSTR,REGSAM,DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); +static NTSTATUS (WINAPI * pNtQueryKey)(HANDLE,int,PVOID,ULONG,PULONG); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(UNICODE_STRING*); static NTSTATUS (WINAPI * pRtlFreeUnicodeString)(PUNICODE_STRING); @@ -136,6 +137,7 @@ static void InitFunctionPtrs(void) pRtlFormatCurrentUserKeyPath = (void *)GetProcAddress( hntdll, "RtlFormatCurrentUserKeyPath" ); pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pNtDeleteKey = (void *)GetProcAddress( hntdll, "NtDeleteKey" ); + pNtQueryKey = (void *)GetProcAddress( hntdll, "NtQueryKey" ); } /* delete key and all its subkeys */ @@ -2104,6 +2106,7 @@ static void test_classesroot(void) DWORD type = REG_SZ; static CHAR buffer[8]; LONG res; + void *buf = malloc(300*sizeof(wchar_t)); /* create a key in the user's classes */ if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", &hkey )) @@ -2132,6 +2135,9 @@ static void test_classesroot(void) RegCloseKey( hkey ); return; } + pNtQueryKey( hkcr, 3 /*KeyNameInformation*/, buf, 500*sizeof(wchar_t), (ULONG*)&res ); + ok( wcsncmp((wchar_t*)buf+2, L"\\REGISTRY\\USER", 14) == 0, + "key not from \\REGISTRY\\USER\n"); /* set a value in user's classes */ res = RegSetValueExA(hkey, "val1", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); @@ -2200,6 +2206,9 @@ static void test_classesroot(void) RegCloseKey( hklm ); return; } + pNtQueryKey( hkcr, 3 /*KeyNameInformation*/, buf, 500*sizeof(wchar_t), (ULONG*)&res ); + ok( wcsncmp( (wchar_t*)buf+2, L"\\REGISTRY\\USER", 14) == 0, + "key not from \\REGISTRY\\USER\n"); /* set a value in hklm classes */ res = RegSetValueExA(hklm, "val2", 0, REG_SZ, (const BYTE *)"hklm", sizeof("hklm")); @@ -2227,6 +2236,9 @@ static void test_classesroot(void) KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcr ); ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + pNtQueryKey( hkcr, 3 /*KeyNameInformation*/, buf, 500*sizeof(wchar_t), (ULONG*)&res ); + ok( wcsncmp( (wchar_t*)buf+2, L"\\REGISTRY\\USER", 14) == 0, + "key not from \\REGISTRY\\USER\n"); /* set a value in user's classes */ res = RegSetValueExA(hkey, "val2", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); @@ -2267,6 +2279,9 @@ static void test_classesroot(void) /* try to open that subkey in hkcr */ res = RegOpenKeyExA( hkcr, "subkey1", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcrsub1 ); ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + pNtQueryKey( hkcrsub1, 3 /*KeyNameInformation*/, buf, 500*sizeof(wchar_t), (ULONG*)&res ); + ok( wcsncmp( (wchar_t*)buf+2, L"\\REGISTRY\\MACHINE", 17) == 0, + "key created in hkcr not found in \\REGISTRY\\MACHINE\n"); /* set a value in hklm classes */ res = RegSetValueExA(hklmsub1, "subval1", 0, REG_SZ, (const BYTE *)"hklm", sizeof("hklm")); @@ -2326,6 +2341,9 @@ static void test_classesroot(void) /* new subkey in hkcr */ if (RegCreateKeyExA( hkcr, "subkey2", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkcrsub2, NULL )) return; + pNtQueryKey( hkcrsub2, 3 /*KeyNameInformation*/, buf, 256*sizeof(wchar_t), (ULONG*)&res ); + ok( wcsncmp( (wchar_t*)buf+2, L"\\REGISTRY\\MACHINE", 17) == 0, + "key not found in \\REGISTRY\\MACHINE"); res = RegSetValueExA(hkcrsub2, "subval1", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); -- 1.8.1.msysgit.1

3 11

Re: dbghelp: Add stub SymGetLineNextW64
by Alexandre Julliard May 21, 2013

May 21, 2013

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -1717,6 +1717,17 @@ BOOL WINAPI SymGetLineNext64(HANDLE hProcess, PIMAGEHLP_LINE64 Line) > } > > /****************************************************************** > + * SymGetLineNextW64 (DBGHELP.@) > + * > + */ > +BOOL WINAPI SymGetLineNextW64(HANDLE hProcess, PIMAGEHLP_LINEW64 Line) > +{ > + FIXME("(%p %p) stub \n", hProcess, Line); > + > + return FALSE; > +} It wouldn't be much harder to implement this properly. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: riched20: Added tests for ITextDocument::Open
by Nikolay Sivov May 21, 2013

May 21, 2013

On Tue, May 21, 2013 at 3:45 PM, Jactry Zeng <jactry92(a)gmail.com> wrote: > > > > > If the whole purpose of storing flags names is to output readable debug info I think it's better to have a single separate function that takes flags combination and returns static buffer pointer with a name. This way it will need just to append after bitwise 'and' check. + /* tests for ITextDocument::Open */ + for(; tomNunSingle >= 0; tomNunSingle--) Do you really need to go from the tail here?

1 0

Re: Alexandre Julliard : msvcrt: Don't bother to clean up at process exit.
by Dmitry Timoshkov May 21, 2013

May 21, 2013

Alexandre Julliard <julliard(a)winehq.org> wrote: > case DLL_PROCESS_DETACH: > - msvcrt_free_popen_data(); > msvcrt_free_io(); > + if (lpvReserved) break; > + msvcrt_free_popen_data(); > msvcrt_free_mt_locks(); > msvcrt_free_console(); > msvcrt_free_args(); Shouldn't msvcrt_free_io() be also protected by this guard? -- Dmitry.

3 6

Re: [PATCH] d3dxof: Cleanup separators handling and allow multi-semicolons + single comma separator.
by Alexandre Julliard May 21, 2013

May 21, 2013

Christian Costa <titan.costa(a)gmail.com> writes: > There is one test becoming todo. This will be fixed in another patch. > This patch also should fix bug 30897. > --- > dlls/d3dxof/parsing.c | 35 ++++++++++------------------------- > dlls/d3dxof/tests/d3dxof.c | 22 +++++++++++----------- > 2 files changed, 21 insertions(+), 36 deletions(-) It doesn't work: ../../../tools/runtest -q -P wine -M d3drm.dll -T ../../.. -p d3drm_test.exe.so d3drm.c && touch d3drm.ok d3drm.c:275: Test failed: Cannot load mesh data (hr = 88760311) d3drm.c:280: Test failed: Retrieved name '' instead of 'Object' d3drm.c:283: Test failed: IDirect3DRMMeshBuilder_GetName returned hr = 0 d3drm.c:298: Test failed: Wrong number of vertices 0 (must be 4) d3drm.c:301: Test failed: Wrong number of faces 0 (must be 3) d3drm.c:305: Test failed: Wrong number of vertices 0 (must be 4) d3drm.c:306: Test failed: Wrong number of normals 0 (must be 4) d3drm.c:307: Test failed: Wrong number of face data bytes 0 (must be 22) d3drm.c:315: Test failed: Wrong component n[1].x = 0.000000 (expected -0.229416) d3drm.c:318: Test failed: Wrong component n[2].x = 0.000000 (expected -0.229416) d3drm.c:319: Test failed: Wrong component n[2].y = 4021199976020422122536960.000000 (expected 0.688247) d3drm.c:320: Test failed: Wrong component n[2].z = 9973638011820690691325952.000000 (expected 0.688247) d3drm.c:321: Test failed: Wrong component n[3].x = 0.000000 (expected -0.577350) d3drm.c:323: Test failed: Wrong component n[3].z = 1387759860774554023173815085733773312.000000 (expected 0.577350) d3drm.c:329: Test failed: Cannot get texture coordinates (hr = 88760316) d3drm.c:330: Test failed: Wrong coordinate 1.230000 (must be 0.0) etc. -- Alexandre Julliard julliard(a)winehq.org

1 0