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

[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

Re: [PATCH 2/2]vbscript: Implemented builtin function CBool
by Marvin May 21, 2013

May 21, 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=25647 Your paranoid android. === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP2 (32 bit) === No test summary line found === WXPX64 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAX64 (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === WXPX64 (64 bit) === No test summary line found === WVISTAX64 (64 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/2]vbscript: Implemented builtin function CInt
by Marvin May 21, 2013

May 21, 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=25646 Your paranoid android. === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP2 (32 bit) === No test summary line found === WXPX64 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAX64 (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === WXPX64 (64 bit) === No test summary line found === WVISTAX64 (64 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/2]vbscript: Implemented builtin function CInt
by Jacek Caban May 21, 2013

May 21, 2013

Hi Zhan, On 05/17/13 16:53, Zhan Jianyu wrote: > This patch is built based on Jaceks's newly-submitted patch: > > commit 48a862306288d69d3623d5ecdc0f5a5a40addafe > ( vbscript: Round half to even in to_int) > > Thanks, Jacek. :-) > > With his patch, CInt could be implementd in a clean way, without > any introduced helper function. > > This patch also add tests for any corner cases, and it has passed testbot's > testing. > > --- > dlls/vbscript/global.c | 14 ++++++++++++-- > dlls/vbscript/tests/api.vbs | 23 +++++++++++++++++++++++ > 2 files changed, 35 insertions(+), 2 deletions(-) As you may check here: http://source.winehq.org/patches/ your patch is marked as 'Apply failure'. Did you prepare the patch against recent Wine Git? Please rebase and resend the patch. Cheers, Jacek

1 0

Re: Troubles configuring and building wine-1.5.30 on Debian wheezy
by Hugh McMaster May 21, 2013

May 21, 2013

On Monday May 20 at 22:24:58, Alan W. Irwin wrote: >wine at raven> wine64 >wine64: error while loading shared libraries: libwine.so.1: cannot >open shared object file: No such file or directory Hi Alan, This error is caused by a regression in Wine 1.5.30. It is not present in version 1.5.29. The general source for Wine 1.5.30 on WineHQ does contain a patch to resolve the issue. The patch is available from http://source.winehq.org/git/wine.git/patch/ce4b6451aabbe83809c7483c748cfa0…. To apply it, you will need to save the patch with either the extension .patch or .txt in the Wine source directory. You will then need to run the patch command from the source directory: patch -p1 < name.patch Alternatively, you can use Git to obtain the latest source: git clone git://source.winehq.org/git/wine.git ~/wine-git This option will come with the patch already applied and a lot of other changes. --- Hugh

1 0

Re: [1/4] server: Add support for console font size, maximum window size, etc.
by Dmitry Timoshkov May 20, 2013

May 20, 2013

Hugh McMaster <hugh.mcmaster(a)masterindexing.com> wrote: > This patch modifies server/protocol.def and server/console.c to add support > for console font size detection and console window size rendering. It also > tidies up a few inconsistencies in the repeated usage of aspects of the > screen buffer struct. Your patches are full of formatting and white space changes, please don't do that. -- Dmitry.

2 1