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

[PATCH] Tests that prove ntdll has no notion of HKCR.
by George Stephanos 20 May '13

20 May '13

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: [PATCH 6/6] d3d9/tests: d3d9ex video memory accounting tests
by Henri Verbeet 20 May '13

20 May '13

On 14 May 2013 23:46, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > These tests have the potential to break on Windows when other > applications create or release a large number of video memory resources > while the test is running. > Yeah, maybe we don't really need this to be in the tree, although it's good to see for reference.

4 3

Re: msvcm80: Remove pre-attach handler for a dll with manifest.
by Alexandre Julliard 20 May '13

20 May '13

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > Manifest prevents loading of a native dll anyway. Not if it's installed globally. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] ws2_32: Automatically sets a socket to non-blocking mode when WSAAsyncSelect or WSAEventSelect is called.
by Dmitry Timoshkov 20 May '13

20 May '13

Qian Hong <qhong(a)codeweavers.com> wrote: > Fixed http://bugs.winehq.org/show_bug.cgi?id=33076 > > Reference: > http://msdn.microsoft.com/en-us/library/windows/desktop/ms741621%28v=vs.85%… > > See also comment in WSAIoctl: > /* AsyncSelect()'ed sockets are always nonblocking */ This change requires a test case, MSDN is often wrong, so its claims at least need to be very carefully checked. -- Dmitry.

2 5

Re: oledb32: Support DBSTATUS_S_ISNULL when converting to VARIANT
by Marvin 20 May '13

20 May '13

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=25629 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: windowscodecs: Add support for IMILBitmapSource interface.
by Marvin 20 May '13

20 May '13

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=25624 Your paranoid android. === WVISTAX64 (32 bit bitmap) === bitmap: unhandled exception c0000005 at 77370897 === W2K8SE (32 bit bitmap) === bitmap: unhandled exception c0000005 at 778A81CB === W7PROX64 (32 bit bitmap) === bitmap: unhandled exception c0000005 at 77E035F2 === TEST64_W7SP1 (32 bit bitmap) === bitmap: unhandled exception c0000005 at 77593772 === W7PROX64 (64 bit bitmap) === No test summary line found === TEST64_W7SP1 (64 bit bitmap) === Timeout

1 0

Duplicate relocations in DLL
by Alessandro Pignotti 19 May '13

19 May '13

Hi everyone, Packaged with a game, I found a peculiar DLL which has duplicate blocks in the relocation table. I mean that the same pages are relocated twice and this of course breaks the DLL. I'm not sure about what could be a right way to support such (broken) DLLs. A possibility would be to keep track of already relocated pages and skip them if needed. Suggestions are welcome. Regards, Alessandro Pignotti

3 7

wineconsole screen scenarios
by Hugh McMaster 19 May '13

19 May '13

In my effort to improve wineconsole and its calculations of the largest possible window size, three scenarios come into play. 1. wineconsole with --backend=user (or more simply, 'wineconsole app.exe, in which case 'user' is the default). 2. wineconsole with --backend=curses. 3. wineconsole with --backend=curses, but no X server running. Detecting the screen resolution is a simple task with (1) and (2). SystemParametersInfo for (1) and wine's own XRandR for (2) can be used. My concern is with scenario (3). Wine is designed to be used with an X server, but wineconsole can be used in non-X-based environment. While this is possible, it would seem unlikely. Nonetheless, the issue has come up on the wine-devel list before. The question is, should I worry about supporting such a scenario?

5 6

Re: [PATCH] ieframe: Add a IServiceProvider stub to IBindStatusCallback
by Alistair Leslie-Hughes 19 May '13

19 May '13

On 18/05/2013 11:11 PM, Detlef Riekenberg wrote: > -- > By by ... Detlef > > --- > dlls/ieframe/navigate.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 51 insertions(+), 0 deletions(-) Tests to prove the interface exists. Best Regards Alistair Leslie-Hughes

1 0

Re: [PATCH 2/2] Fixing ReleaseCapture of child window bug in EnableWindow (resend)
by Marvin 18 May '13

18 May '13

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=25614 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0