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

Re: [PATCH 3/3] advapi32/tests: Simple tests for TokenIntegrityLevel [try2]
by Nikolay Sivov July 30, 2012

July 30, 2012

On 7/30/2012 19:08, Detlef Riekenberg wrote: > try2: now using EqualSid. > > Thanks Nikolay for comments > > > - 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; > + } I probably missed that, you need to use win_skip here. > > r = pConvertStringSidToSidA( NULL, NULL ); > ok( !r, "expected failure with NULL parameters\n" ); > @@ -4274,6 +4275,73 @@ static void test_kernel_objects_security(void) > CloseHandle(token); > } > > +static void test_TokenIntegrityLevel(void) > +{ > + TOKEN_MANDATORY_LABEL *tml; > + HANDLE token; > + DWORD size; > + DWORD res; > + LPVOID buffer = NULL; > + char *sidname = NULL; > + static SID medium_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, > + {SECURITY_MANDATORY_HIGH_RID}}; > + static SID high_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, > + {SECURITY_MANDATORY_MEDIUM_RID}}; > + > + if(!pConvertSidToStringSidA) > + { > + skip("ConvertSidToStringSidA not available\n"); > + return; > + } and here. > + > + SetLastError(0xdeadbeef); > + res = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); > + ok(res, "got %d with %d (expected TRUE)\n", res, GetLastError()); > + if (!res) > + return; Does it really fail on some test machine? > + > + 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); > + SetLastError(0xdeadbeef); > + res = GetTokenInformation(token, TokenIntegrityLevel, buffer, size, &size); > + } Again, you don't need to allocate anything here, so you don't need cleanup code.

1 0

Re: (resend)[1/2]usp10: cache OUTLINETEXTMETRICW instead of just TEXTMETRICW
by Alexandre Julliard July 30, 2012

July 30, 2012

Aric Stewart <aric(a)codeweavers.com> writes: > --- > dlls/usp10/usp10.c | 28 +++++++++++++++++----------- > dlls/usp10/usp10_internal.h | 2 +- > 2 files changed, 18 insertions(+), 12 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M comctl32.dll -T ../../.. -p comctl32_test.exe.so ipaddress.c && touch ipaddress.ok wine: Unhandled page fault on read access to 0x0000005c at address 0x555aef2c (thread 002c), starting debugger... Unhandled exception: page fault on read access to 0x0000005c in 32-bit code (0x555aef2c). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:555aef2c ESP:0032efa0 EBP:0032efe8 EFLAGS:00010206( R- -- I - -P- ) EAX:00131190 EBX:555c0bb4 ECX:00131190 EDX:00000000 ESI:00131140 EDI:00000000 Stack dump: 0x0032efa0: 00110000 00000000 00000008 686def04 0x0032efb0: 6872a969 687735a8 0032f078 00000001 0x0032efc0: 00000000 0000007c 027f0c7f 687735a8 0x0032efd0: 00130ed8 00000000 555aee8b 687735a8 0x0032efe0: 00130ed8 00000000 0032f008 686d2fd9 0x0032eff0: 00131140 00000000 00000000 687735a8 Backtrace: =>0 0x555aef2c ScriptString_pSize+0xac(ssa=0x131140) [/home/julliard/wine/wine/dlls/usp10/usp10.c:3496] in usp10 (0x0032efe8) 1 0x686d2fd9 EDIT_CalcLineWidth_SL+0x38(es=0x130ed8) [/home/julliard/wine/wine/dlls/user32/edit.c:821] in user32 (0x0032f008) 2 0x686d787f EDIT_EM_ReplaceSel+0x79e(es=<internal error>, can_undo=0, lpsz_replace="1", send_update=0, honor_limit=0) [/home/julliard/wine/wine/dlls/user32/edit.c:2655] in user32 (0x0032f098) 3 0x686db93c EditWndProc_common+0x256b(hwnd=0x50026, msg=0xc, wParam=0, lParam=0x32f5c4, unicode=0x1) [/home/julliard/wine/wine/dlls/user32/edit.c:3876] in user32 (0x0032f128) 4 0x6873b60b EditWndProcW+0x3a(hwnd=0x50026, msg=0xc, wParam=0, lParam=0x32f5c4) [/home/julliard/wine/wine/dlls/user32/winproc.c:1081] in user32 (0x0032f158) 5 0x6873b42a WINPROC_wrapper+0x19() in user32 (0x0032f188) 6 0x6873bb7c call_window_proc+0x5b(hwnd=0x50026, msg=0xc, wp=0, lp=0x32f5c4, result=0x32f20c, arg=0x6873b5d0) [/home/julliard/wine/wine/dlls/user32/winproc.c:242] in user32 (0x0032f1d8) 7 0x6873e5ad CallWindowProcW+0x5c(func=0x6873b5d0, hwnd=0x50026, msg=0xc, wParam=0, lParam=0x32f5c4) [/home/julliard/wine/wine/dlls/user32/winproc.c:980] in user32 (0x0032f228) fixme:dbghelp_dwarf:compute_location Only supporting one breg (edi/24 -> esi/23) 8 0x685c1cf5 IPADDRESS_SubclassProc+0xc4(hwnd=0x50026, uMsg=0xc, wParam=0, lParam=0x32f5c4) [/home/julliard/wine/wine/dlls/comctl32/ipaddress.c:555] in comctl32 (0x0032f2a8) 9 0x6873b42a WINPROC_wrapper+0x19() in user32 (0x0032f2d8) 10 0x6873bb7c call_window_proc+0x5b(hwnd=0x50026, msg=0xc, wp=0, lp=0x32f5c4, result=0x32f3a8, arg=0x685c1c30) [/home/julliard/wine/wine/dlls/user32/winproc.c:242] in user32 (0x0032f328) 11 0x6873e328 WINPROC_call_window+0x107(hwnd=0x50026, msg=0xc, wParam=0, lParam=0x32f5c4, result=0x32f3a8, unicode=0x1, mapping=1750868266) [/home/julliard/wine/wine/dlls/user32/winproc.c:908] in user32 (0x0032f378) 12 0x686fe88d call_window_proc+0x8c(hwnd=0x50026, msg=0xc, wparam=0, lparam=0x32f5c4, unicode=0x1, same_thread=0x1, mapping=1750868266) [/home/julliard/wine/wine/dlls/user32/message.c:2211] in user32 (0x0032f3d8) 13 0x6870557e send_message+0x20d(info=0x32f464, res_ptr=0x32f460, unicode=0x1) [/home/julliard/wine/wine/dlls/user32/message.c:3084] in user32 (0x0032f448) 14 0x687059ec SendMessageW+0x4b(hwnd=0x50026, msg=0xc, wparam=0, lparam=0x32f5c4) [/home/julliard/wine/wine/dlls/user32/message.c:3278] in user32 (0x0032f498) 15 0x6872d43b SetWindowTextW+0x6a(hwnd=0x50026, lpString="1") [/home/julliard/wine/wine/dlls/user32/win.c:2592] in user32 (0x0032f4c8) 16 0x685c2b7a IPADDRESS_WindowProc+0xaf9(hwnd=0xc0060, uMsg=0x465, wParam=0, lParam=0x7f000001) [/home/julliard/wine/wine/dlls/comctl32/ipaddress.c:365] in comctl32 (0x0032f638) 17 0x6873b42a WINPROC_wrapper+0x19() in user32 (0x0032f668) 18 0x6873bb7c call_window_proc+0x5b(hwnd=0xc0060, msg=0x465, wp=0, lp=0x7f000001, result=0x32fbf8, arg=0x685c2080) [/home/julliard/wine/wine/dlls/user32/winproc.c:242] in user32 (0x0032f6b8) 19 0x6873d210 WINPROC_CallProcAtoW+0xaf(callback=0x6873bb20, hwnd=0xc0060, msg=0x465, wParam=0, lParam=0x7f000001, result=0x32fbf8, arg=0x685c2080, mapping=WMCHAR_MAP_SENDMESSAGE) [/home/julliard/wine/wine/dlls/user32/winproc.c:502] in user32 (0x0032fb78) 20 0x6873e39b WINPROC_call_window+0x17a(hwnd=0xc0060, msg=0x465, wParam=0, lParam=0x7f000001, result=0x32fbf8, unicode=0, mapping=WMCHAR_MAP_SENDMESSAGE) [/home/julliard/wine/wine/dlls/user32/winproc.c:910] in user32 (0x0032fbc8) 21 0x686fe88d call_window_proc+0x8c(hwnd=0xc0060, msg=0x465, wparam=0, lparam=0x7f000001, unicode=0, same_thread=0x1, mapping=WMCHAR_MAP_SENDMESSAGE) [/home/julliard/wine/wine/dlls/user32/message.c:2211] in user32 (0x0032fc28) 22 0x6870557e send_message+0x20d(info=0x32fcb4, res_ptr=0x32fcb0, unicode=0) [/home/julliard/wine/wine/dlls/user32/message.c:3084] in user32 (0x0032fc98) 23 0x68705993 SendMessageA+0x52(hwnd=0xc0060, msg=0x465, wparam=0, lparam=0x7f000001) [/home/julliard/wine/wine/dlls/user32/message.c:3300] in user32 (0x0032fce8) 24 0x684f4ca3 func_ipaddress+0x1a2() [/home/julliard/wine/wine/dlls/comctl32/tests/ipaddress.c:56] in comctl32_test (0x0032fd58) 25 0x684d8807 main+0x386(argc=<couldn't compute location>, argv=<couldn't compute location>) [/home/julliard/wine/wine/dlls/comctl32/tests/../../../include/wine/test.h:557] in comctl32_test (0x0032fe28) 26 0x6856ae35 __wine_spec_exe_entry+0x74(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in comctl32_test (0x0032fe70) 27 0x7b85c9fc call_process_entry+0xb() in kernel32 (0x0032fe88) 28 0x7b85dbcf start_process+0x5e(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/kernel32/process.c:1083] in kernel32 (0x0032fec8) 29 0x7bc76ed0 call_thread_func_wrapper+0xb() in ntdll (0x0032fed8) 30 0x7bc79c0d call_thread_func+0x7c(entry=0x7b85db70, arg=0x7ffdf000, frame=0x32ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2522] in ntdll (0x0032ffa8) 31 0x7bc76eae call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 32 0x7bc4ee5e start_process+0x1d(kernel_start=0x7b85db70) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2653] in ntdll (0x0032ffe8) 33 0x6802947d wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 34 0x6802953b wine_switch_to_stack+0x2a(func=0x7bc4ee40, arg=0x7b85db70, stack=0x330000) [/home/julliard/wine/wine/libs/wine/port.c:59] in libwine.so.1 (0xffb4dc78) 35 0x7bc547e8 LdrInitializeThunk+0x3b7(kernel_start=0x7b85db70, unknown2=0, unknown3=0, unknown4=0) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2709] in ntdll (0xffb4dce8) 36 0x7b863cd8 __wine_kernel_init+0xbb7() [/home/julliard/wine/wine/dlls/kernel32/process.c:1255] in kernel32 (0xffb4ebe8) 37 0x7bc54e63 __wine_process_init+0x182() [/home/julliard/wine/wine/dlls/ntdll/loader.c:2918] in ntdll (0xffb4ec68) 38 0x680270c2 wine_init+0x2a1(argc=0x3, argv=0xffb4f1b4, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:831] in libwine.so.1 (0xffb4ecc8) 39 0x7bf00ebb main+0x7a(argc=0x3, argv=0xffb4f1b4) [/home/julliard/wine/wine/loader/main.c:230] in <wine-loader> (0xffb4f108) 40 0x681c0e46 __libc_start_main+0xe5() in libc.so.6 (0xffb4f188) 0x555aef2c ScriptString_pSize+0xac [/home/julliard/wine/wine/dlls/usp10/usp10.c:3496] in usp10: movl 0x5c(%edx),%edx 3496 analysis->sz->cy = analysis->glyphs[0].sc->tm->otmTextMetrics.tmHeight; -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: include: fix mingw64 build
by Nicolas Le Cam July 30, 2012

July 30, 2012

2012/6/29 Austin English <austinenglish(a)gmail.com>: > Fixes http://bugs.winehq.org/show_bug.cgi?id=30980 > > -- > -Austin > > > Hi Austin, I already tried to fix it on Wine side, see [1], but Alexandre told me on IRC that the bug needs to be fixed in mingw-w64, as it shouldn't include crtdefs.h by default. BTW, won't that break mingw32 build ? [1] http://source.winehq.org/patches/data/84070 -- Nicolas Le Cam

4 13

Re: mshtml/tests: Use proper helpers for iface calls
by Marvin July 30, 2012

July 30, 2012

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

1 0

Re: urlmon/tests: Use proper helpers for iface calls
by Marvin July 30, 2012

July 30, 2012

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

1 0

Re: ieframe/tests: Use proper helpers for iface calls
by Marvin July 30, 2012

July 30, 2012

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

1 0

Re: [PATCH 3/3] advapi32/tests: Test GetTokenInformation with TokenIntegrityLevel
by Nikolay Sivov July 30, 2012

July 30, 2012

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(); > }

1 0

Re: windowscodecs: Implement IWICPalette_InitializeFromPalette.
by Vincent Povirk July 30, 2012

July 30, 2012

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

1 0

Re: [PATCH 3/3] winemenubuilder: Implement OS X application bundles.
by Per Johansson July 29, 2012

July 29, 2012

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

1 0

Re: [PATCH 2/3] ntdll: Support TokenIntegrityLevel in NtQueryInformationToken
by Nikolay Sivov July 29, 2012

July 29, 2012

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.

1 0