July 2012 - Wine-Devel - list.winehq.org

Re: mshtml/tests: Use proper helpers for iface calls

by Marvin

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=20437 Your paranoid android. === WVISTAADM (32 bit htmldoc) === htmldoc.c:2548: Test failed: unexpected call GetExternal htmldoc.c:475: Test failed: unexpected riid: {719C3050-F9D3-11CF-A493-00400523A8A0} htmldoc.c:475: Test failed: unexpected riid: {A0AAC450-A77B-11CF-91D0-00AA00C14A7C} htmldoc.c:505: Test failed: unexpected call htmldoc.c:2548: Test failed: unexpected call GetExternal htmldoc.c:475: Test failed: unexpected riid: {719C3050-F9D3-11CF-A493-00400523A8A0} htmldoc.c:475: Test failed: unexpected riid: {A0AAC450-A77B-11CF-91D0-00AA00C14A7C} htmldoc.c:505: Test failed: unexpected call

July 30, 2012

Re: urlmon/tests: Use proper helpers for iface calls

by Marvin

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=20436 Your paranoid android. === WVISTAADM (32 bit url) === url.c:1880: Test failed: binding failed: 800c0005, expected 00000000 url.c:1891: Test failed: res = 00002ee7, expected 00000000 url.c:3016: Test failed: IMoniker_BindToStorage failed: 800c0005 url.c:3017: Test failed: unk == NULL url.c:1880: Test failed: binding failed: 800c0005, expected 00000000 url.c:1891: Test failed: res = 00002ee7, expected 00000000 url.c:3016: Test failed: IMoniker_BindToStorage failed: 800c0005 url.c:3017: Test failed: unk == NULL url.c:1670: Test failed: unexpected call Obj_OnProgress_FINDINGRESOURCE url.c:1880: Test failed: binding failed: 800c0005, expected 00000000 url.c:1891: Test failed: res = 00002ee7, expected 00000000 url.c:1674: Test failed: unexpected call OnProgress_FINDINGRESOURCE url.c:1880: Test failed: binding failed: 800c0005, expected 00000000 url.c:1891: Test failed: res = 00002ee7, expected 00000000 url.c:3016: Test failed: IMoniker_BindToStorage failed: 800c0005 url.c:3017: Test failed: unk == NULL url.c:1880: Test failed: binding failed: 800c0005, expected 800c0019 url.c:1891: Test failed: res = 00002efd, expected 800c0019 url.c:3005: Test failed: Got 800c0005 url.c:3099: Test failed: expected QueryInterface_IHttpSecurity url.c:3100: Test failed: expected QueryService_IHttpSecurity url.c:3101: Test failed: expected OnSecurityProblem url.c:1674: Test failed: unexpected call OnProgress_FINDINGRESOURCE url.c:1880: Test failed: binding failed: 800c0005, expected 800c0019 url.c:1891: Test failed: res = 00002efd, expected 800c0019 url.c:3005: Test failed: Got 800c0005 url.c:3099: Test failed: expected QueryInterface_IHttpSecurity url.c:3100: Test failed: expected QueryService_IHttpSecurity url.c:3101: Test failed: expected OnSecurityProblem url.c:1674: Test failed: unexpected call OnProgress_FINDINGRESOURCE url.c:1880: Test failed: binding failed: 800c0005, expected 00000000 url.c:1891: Test failed: res = 00002efd, expected 00000000 url.c:3016: Test failed: IMoniker_BindToStorage failed: 800c0005 url.c:3017: Test failed: unk == NULL url.c:3099: Test failed: expected QueryInterface_IHttpSecurity url.c:3100: Test failed: expected QueryService_IHttpSecurity url.c:3101: Test failed: expected OnSecurityProblem url.c:3119: Test failed: expected OnResponse url.c:3123: Test failed: expected OnProgress_MIMETYPEAVAILABLE url.c:3124: Test failed: expected OnProgress_BEGINDOWNLOADDATA url.c:3125: Test failed: expected OnProgress_ENDDOWNLOADDATA url.c:3133: Test failed: expected OnDataAvailable url.c:1674: Test failed: unexpected call OnProgress_FINDINGRESOURCE url.c:1880: Test failed: binding failed: 800c0005, expected 00000000 url.c:1891: Test failed: res = 00002efd, expected 00000000 url.c:3008: Test failed: IMoniker_BindToStorage failed: 800c0005 url.c:3009: Test failed: unk == NULL url.c:3011: Test failed: Expected security problem to be ignored. url.c:3099: Test failed: expected QueryInterface_IHttpSecurity url.c:3100: Test failed: expected QueryService_IHttpSecurity url.c:3101: Test failed: expected OnSecurityProblem url.c:1674: Test failed: unexpected call OnProgress_FINDINGRESOURCE url.c:1880: Test failed: binding failed: 800c0005, expected 00000000 url.c:1891: Test failed: res = 00002ee7, expected 00000000 url.c:3113: Test failed: expected OnProgress_SENDINGREQUEST url.c:3119: Test failed: expected OnResponse url.c:3123: Test failed: expected OnProgress_MIMETYPEAVAILABLE url.c:3124: Test failed: expected OnProgress_BEGINDOWNLOADDATA url.c:3125: Test failed: expected OnProgress_ENDDOWNLOADDATA url.c:3137: Test failed: expected OnDataAvailable url.c:1674: Test failed: unexpected call OnProgress_FINDINGRESOURCE url.c:1880: Test failed: binding failed: 800c0005, expected 00000000 url.c:1891: Test failed: res = 00002ee7, expected 00000000 url.c:3113: Test failed: expected OnProgress_SENDINGREQUEST url.c:3119: Test failed: expected OnResponse url.c:3123: Test failed: expected OnProgress_MIMETYPEAVAILABLE url.c:3124: Test failed: expected OnProgress_BEGINDOWNLOADDATA url.c:3125: Test failed: expected OnProgress_ENDDOWNLOADDATA url.c:3137: Test failed: expected OnDataAvailable url.c:1670: Test failed: unexpected call Obj_OnProgress_FINDINGRESOURCE url.c:1880: Test failed: binding failed: 800c0005, expected 00000000 url.c:1891: Test failed: res = 00002ee7, expected 00000000 url.c:3333: Test failed: expected Obj_OnProgress_SENDINGREQUEST url.c:3337: Test failed: expected OnResponse url.c:3339: Test failed: expected Obj_OnProgress_MIMETYPEAVAILABLE url.c:3340: Test failed: expected Obj_OnProgress_BEGINDOWNLOADDATA url.c:3346: Test failed: expected Obj_OnProgress_CLASSIDAVAILABLE url.c:3347: Test failed: expected Obj_OnProgress_BEGINSYNCOPERATION url.c:3348: Test failed: expected Obj_OnProgress_ENDSYNCOPERATION url.c:3349: Test failed: expected OnObjectAvailable url.c:1674: Test failed: unexpected call OnProgress_FINDINGRESOURCE url.c:1880: Test failed: binding failed: 800c0005, expected 00000000 url.c:1891: Test failed: res = 00002ee7, expected 00000000 url.c:3113: Test failed: expected OnProgress_SENDINGREQUEST url.c:3119: Test failed: expected OnResponse url.c:3123: Test failed: expected OnProgress_MIMETYPEAVAILABLE url.c:3124: Test failed: expected OnProgress_BEGINDOWNLOADDATA url.c:3125: Test failed: expected OnProgress_ENDDOWNLOADDATA url.c:3137: Test failed: expected OnDataAvailable url.c:1670: Test failed: unexpected call Obj_OnProgress_FINDINGRESOURCE Timeout === TEST64_W7SP1 (64 bit url) === url.c:3569: Test failed: expected OnProgress_DOWNLOADINGDATA

July 30, 2012

Re: ieframe/tests: Use proper helpers for iface calls

by Marvin

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=20435 Your paranoid android. === WNT4WSSP6 (32 bit intshcut) === intshcut.c:112: Test failed: interface {cabb0da0-da57-11cf-9974-0020afd79762} could not be queried intshcut.c:380: Test failed: SetUrl failed, hr=0x80041001 intshcut.c:381: Test failed: SetUrl failed, hr=0x80041001 intshcut.c:383: Test failed: unexpected URL change www.winehq.org -> http://www.winehq.org (expected http://www.winehq.org/) intshcut.c:384: Test failed: unexpected URL change ftp.winehq.org -> ftp://ftp.winehq.org (expected ftp://ftp.winehq.org/) intshcut.c:231: Test failed: Unable to get an IPropertySetStorage, hr=0x80004002 intshcut: unhandled exception c0000005 at 00402932 === WNT4WSSP6 (32 bit webbrowser) === webbrowser.c:3289: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3289: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3289: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3428: Test failed: Creating WebBrowser object failed: 80040154 webbrowser: unhandled exception c0000005 at 0040810F === W2KPROSP4 (32 bit webbrowser) === webbrowser.c:2596: Test failed: expected GetOverridesKeyPath webbrowser.c:2601: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2602: Test failed: expected Invoke_FILEDOWNLOAD webbrowser.c:3015: Test failed: doc_disp == NULL webbrowser: unhandled exception c0000005 at 00402F21

July 30, 2012

Re: [PATCH 3/3] advapi32/tests: Test GetTokenInformation with TokenIntegrityLevel

by Nikolay Sivov

On 7/29/2012 02:24, Detlef Riekenberg wrote: > -- > By by ... Detlef > --- > dlls/advapi32/tests/security.c | 99 ++++++++++++++++++++++++++++++++++++++-- > 1 files changed, 94 insertions(+), 5 deletions(-) > > diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c > index 28e43ec..93bbc62 100644 > --- a/dlls/advapi32/tests/security.c > +++ b/dlls/advapi32/tests/security.c > @@ -167,6 +167,8 @@ static void init(void) > pSetSecurityDescriptorControl = (void *)GetProcAddress(hmod, "SetSecurityDescriptorControl"); > pGetSecurityInfo = (void *)GetProcAddress(hmod, "GetSecurityInfo"); > pCreateRestrictedToken = (void *)GetProcAddress(hmod, "CreateRestrictedToken"); > + pConvertSidToStringSidA = (void *)GetProcAddress( hmod, "ConvertSidToStringSidA" ); > + pConvertStringSidToSidA = (void *)GetProcAddress( hmod, "ConvertStringSidToSidA" ); > > myARGC = winetest_get_mainargs( &myARGV ); > } > @@ -211,12 +213,11 @@ static void test_sid(void) > BOOL r; > LPSTR str = NULL; > > - pConvertSidToStringSidA = (void *)GetProcAddress( hmod, "ConvertSidToStringSidA" ); > - if( !pConvertSidToStringSidA ) > - return; > - pConvertStringSidToSidA = (void *)GetProcAddress( hmod, "ConvertStringSidToSidA" ); > - if( !pConvertStringSidToSidA ) > + if( !pConvertSidToStringSidA || !pConvertStringSidToSidA ) > + { > + skip("ConvertSidToStringSidA or ConvertStringSidToSidA not available\n"); > return; > + } > > r = pConvertStringSidToSidA( NULL, NULL ); > ok( !r, "expected failure with NULL parameters\n" ); > @@ -4274,6 +4275,93 @@ static void test_kernel_objects_security(void) > CloseHandle(token); > } > > +static void test_TokenIntegrityLevel(void) > +{ > + TOKEN_MANDATORY_LABEL *tml; > + UCHAR expected_authority[] = SECURITY_MANDATORY_LABEL_AUTHORITY; > + HANDLE token; > + DWORD size; > + DWORD res; > + LPVOID buffer = NULL; > + char *sidname = NULL; > + ULONG level; > + SID *psid; > + > + if(!pConvertSidToStringSidA) > + { > + skip("ConvertSidToStringSidA not available\n"); > + return; > + } > + > + SetLastError(0xdeadbeef); > + res = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); > + ok(res, "got %d with %d (expected TRUE)\n", res, GetLastError()); > + if (!res) > + return; > + > + SetLastError(0xdeadbeef); > + res = GetTokenInformation(token, TokenIntegrityLevel, NULL, 0, &size); > + > + /* not supported before Vista */ > + if (!res && (GetLastError() == ERROR_INVALID_PARAMETER)) > + { > + skip("TokenIntegrityLevel not supported\n"); > + CloseHandle(token); > + return; > + } > + > + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) > + { > + buffer = HeapAlloc(GetProcessHeap(), 0, size * 2); > + SetLastError(0xdeadbeef); > + res = GetTokenInformation(token, TokenIntegrityLevel, buffer, size, &size); > + } You don't need that, buffer size is fixed for this case. > + > + ok(res, "got %d with %d (expected TRUE)\n", res, GetLastError()); > + > + if (!res || !buffer) > + goto cleanup; > + > + tml = buffer; > + > + psid = tml->Label.Sid; > + ok(psid != NULL, "Label.Sid: NULL\n"); > + if (!psid) > + goto cleanup; > + > + ok(tml->Label.Attributes == (SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED), > + "got 0x%x (expected 0x%x)\n", tml->Label.Attributes, (SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED)); Attributes value probably depends on system setup, I believe you can disable all that intergity level stuff. If it doesn't currently fail on testbot let's keep it that way for now. > + > + res = pConvertSidToStringSidA(psid, &sidname); > + trace("sid: %s\n", sidname); > + LocalFree(sidname); > + > + ok(psid->Revision == 1, "got Revision %d (expected 1)\n", psid->Revision); > + ok(psid->SubAuthorityCount == 1, "got SubAuthorityCount %d (expected 1)\n", psid->SubAuthorityCount); > + ok(!memcmp(psid->IdentifierAuthority.Value, expected_authority, sizeof(expected_authority)), > + "got IdentifierAuthority %d, %d, %d, %d, %d, %d (expected 0,0,0,0,0,16)\n", > + psid->IdentifierAuthority.Value[0], psid->IdentifierAuthority.Value[1], > + psid->IdentifierAuthority.Value[2], psid->IdentifierAuthority.Value[3], > + psid->IdentifierAuthority.Value[4], psid->IdentifierAuthority.Value[5]); > + > + level = psid->SubAuthority[0]; > + ok((level == SECURITY_MANDATORY_MEDIUM_RID) || (level == SECURITY_MANDATORY_HIGH_RID), > + "got level 0x%x (expected 0x%x or 0x%x)\n", level, SECURITY_MANDATORY_MEDIUM_RID, SECURITY_MANDATORY_HIGH_RID); All this mess should be replaced with EqualSid() > + > + SetLastError(0xdeadbeef); > + res = GetTokenInformation(token, TokenIntegrityLevel, buffer, size - 1, &size); > + ok(!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), > + "got %d and %u (expected FALSE and ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError()); Doesn't make much sense, behaviour is not specific to TokenIntegrityLevel. > + > + SetLastError(0xdeadbeef); > + res = GetTokenInformation(token, TokenIntegrityLevel, buffer, size + 1, &size); > + ok(res, "got %d and %u (expected TRUE)\n", res, GetLastError()); Same here. > + > +cleanup: > + HeapFree(GetProcessHeap(), 0, buffer); > + CloseHandle(token); > +} > + > START_TEST(security) > { > init(); > @@ -4311,4 +4399,5 @@ START_TEST(security) > test_GetUserNameA(); > test_GetUserNameW(); > test_CreateRestrictedToken(); > + test_TokenIntegrityLevel(); > }

July 30, 2012

Re: windowscodecs: Implement IWICPalette_InitializeFromPalette.

by Vincent Povirk

> + EnterCriticalSection(&This->lock); > + This->colors = colors; > + This->count = count; > + This->type = type; > + LeaveCriticalSection(&This->lock); You're leaking the previous value of This->colors.

July 30, 2012

Re: __wine_uuidof causing a wall of "warning: returning reference to temporary" on g++

by Jacek Caban

On 7/29/12 4:32 PM, Ilya Konstantinov wrote: > Hi, > > I've just started porting my C++ application to Linux with Winelib. > > Upon first attempts to compile, I've received a wall of "warning: > returning reference to temporary" on Wine's headers from g++. > All of those seem to stem from guidgen.h definition of > __wine_uuidof / __CRT_UUID_DECL for C++. > > All in all, g++ seems to be right -- we are indeed returning a > reference to a IID struct that's allocated on the stack. I don't see these warnings here. Also Wine has the same code for __uuidof as mingw-w64, which is much more widely used with g++ (Wine is mostly tested on C), and I never heard about such problem. Do you have any idea about what could be different in your setup? What's your g++ version? > If I remove the '&' in this definition (in guidgen.h): > template<typename T> const GUID &__wine_uuidof(); > the warnings stop, but then I wonder, did the original author have > some good reasoning for returning a reference in the first place? The idea is that if matches closer to the meaning of __uuidof, which should return a reference to constant IID structure. I'd expect compiler to be smart enough to produce same code without the reference anyway (after all it's an inline function), but still being more explicit would be nice. Could you please test if the attached patch fixes the problem for you? Jacek

July 29, 2012

Re: [PATCH 3/3] winemenubuilder: Implement OS X application bundles.

by Per Johansson

24 jul 2012 kl. 17:40 skrev Per Johansson: > <0003-winemenubuilder-Implement-OS-X-application-bundles.txt> Just noticed I managed to intruduce a typo when removing associations support (the associations init function shouldn't be NULL). Please disregard this for now. Regards, -- Per Johansson

July 29, 2012

__wine_uuidof causing a wall of "warning: returning reference to temporary" on g++

by Ilya Konstantinov

Hi, I've just started porting my C++ application to Linux with Winelib. Upon first attempts to compile, I've received a wall of "warning: returning reference to temporary" on Wine's headers from g++. All of those seem to stem from guidgen.h definition of __wine_uuidof / __CRT_UUID_DECL for C++. All in all, g++ seems to be right -- we are indeed returning a reference to a IID struct that's allocated on the stack. If I remove the '&' in this definition (in guidgen.h): template<typename T> const GUID &__wine_uuidof(); the warnings stop, but then I wonder, did the original author have some good reasoning for returning a reference in the first place? Thanks.

July 29, 2012

Re: [PATCH 2/3] ntdll: Support TokenIntegrityLevel in NtQueryInformationToken

by Nikolay Sivov

On 7/29/2012 02:24, Detlef Riekenberg wrote: > + { > + /* report always "S-1-16-12288" (high mandatory level) */ > + static BYTE high_level[] = {1, /* SID_VERSION */ > + 1, /* One SubAuthority entry */ > + 0,0,0,0,0,16, /* SECURITY_MANDATORY_LABEL_AUTHORITY */ > + 0,0x30,0,0}; /* SECURITY_MANDATORY_HIGH_RID */ > + This is ugly. Better way is: static const SID highlabel = { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_HIGH_RID } }; and comment is not needed after that cause level is now obvious with these defines.

July 29, 2012

[RFC] kernel32: Try to get the drive type from the mountmgr first

by GOUJON Alexandre

On 07/22/2012 03:36 PM, Alexandre Goujon wrote: > Should fix bug #17037 > --- > dlls/kernel32/tests/volume.c | 2 ++ > dlls/kernel32/volume.c | 3 ++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c > index 8152ae1..175095f 100644 > --- a/dlls/kernel32/tests/volume.c > +++ b/dlls/kernel32/tests/volume.c > @@ -908,6 +908,8 @@ static void test_cdrom_ioctl(void) > handle = CreateFileA(drive_full_path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); > if(handle == INVALID_HANDLE_VALUE) > { > + /* GetDriveType also reports DRIVE_CDROM even if there is no disc in is the drive. > + In this case, the last error is ERROR_ACCESS_DENIED */ > trace("Failed to open the device : %u\n", GetLastError()); > continue; > } > diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c > index 8377e41..cdd4e46 100644 > --- a/dlls/kernel32/volume.c > +++ b/dlls/kernel32/volume.c > @@ -1538,6 +1538,7 @@ UINT WINAPI GetDriveTypeW(LPCWSTR root) /* [in] String describing drive */ > HANDLE handle; > UINT ret; > > + if ((ret = get_mountmgr_drive_type( root )) != DRIVE_UNKNOWN) return ret; > if (!open_device_root( root, &handle )) return DRIVE_NO_ROOT_DIR; > > status = NtQueryVolumeInformationFile( handle, &io, &info, sizeof(info), FileFsDeviceInformation ); > @@ -1557,7 +1558,7 @@ UINT WINAPI GetDriveTypeW(LPCWSTR root) /* [in] String describing drive */ > case FILE_DEVICE_DISK_FILE_SYSTEM: > if (info.Characteristics & FILE_REMOTE_DEVICE) ret = DRIVE_REMOTE; > else if (info.Characteristics & FILE_REMOVABLE_MEDIA) ret = DRIVE_REMOVABLE; > - else if ((ret = get_mountmgr_drive_type( root )) == DRIVE_UNKNOWN) ret = DRIVE_FIXED; > + else ret = DRIVE_FIXED; > break; > default: > ret = DRIVE_UNKNOWN; Hi, This one is marked as Pending meaning it's unclear at first glance why this change is needed. So here's a detailed explanation. The app in bug #17037 calls GetDriveType on each drive from A to Z looking for a CD drive. It appears genuine GetDriveType returns DRIVE_CDROM even if no disc is in the drive. Let's suppose D is the letter mapped to your CD drive. Calling GetDriveTypeW( L"D:\" ) will first try to get a handle from open_device_root which fails. The last error is STATUS_OBJECT_PATH_NOT_FOUND, hence the bug. In fact, open_device_root calls NtOpenFile with \??\D:\. Following the call chain, the culprit is nt_to_unix_file_name_attr which calls stat() on "/home/<yourlogin>/.wine/dosdevices/d:/". This file doesn't exist because the drive has no mount point but "/home/alex/.wine/dosdevices/d::/" does exist. Either I had to change nt_to_unix_file_name_attr to call stat(D::) in case where stat(D:) fails or use the mountmgr. And as get_mountmgr_drive_type was already called in GetDriveType, I though moving the call before open_device_root was simpler and less invasive than modifying nt_to_unix_file_name_attr. Is it the proper way to fix the bug ? Any idea on how to get that one in ?

July 28, 2012