- wine-devel - winehq.org

Incompatibilities between different versions of msvcp dlls
by Piotr Caban 30 Jul '12

30 Jul '12

Hi, There are many small differences between functions exported by different versions of msvcp. Currently only msvcp60 contains a partial copy of msvcp90 dll but it needs to be done for other dlls as well. There are classes that are very similar but have different virtual functions table depending on version of the dll. E.g. ctype class (doesn't contain *_s functions in msvcp71 and msvcp100) and basic_streambuf (in msvcp100 it contains _Lock/_Unlock and lacks *_s functions). In current way of implementing such differences it will lead to keeping a copy of ios.c and locale.c files in msvcp60, msvcp71, msvcp90 and msvcp100. The changes in code are minimal in these cases (e.g. in ctype class case it's enough to remove _s functions in vtable and change offsets in call_* macros for msvcp71/msvcp100). Do you have any ideas about solving this problem? Is it acceptable to add version specific defines to make the files identical between dlls? Piotr

2 1

Re: [PATCH] ntdll: add mmap caching
by Alexandre Julliard 30 Jul '12

30 Jul '12

Michael Blumenkrantz <michael.blumenkrantz(a)gmail.com> writes: > Hi, > > Attached is a patch that I wrote a year ago with the help of Bernhard Loos > (jhgf). For various reasons, I didn't get around to submitting it until now. > > This patch adds caching to NtMapViewOfSection() to reduce the frequency of > blocking server requests which occur, instead replacing them with lookups to a > wine rbtree, which is populated during NtCreateSection() and cleared during > close_handle(). While I don't have any performance statistics to show, this > should yield some definite benefits in nearly every modern game given that they > all repeatedly read mmapped sections of files. > > Bernhard suggested to me, at the time of writing this, that there could be some > potential compatibility issues with regard to sharing, but I don't know nearly > enough about the internals here to speculate. There are worse issues, like the lack of locking, and the fact that you are slowing down the close handle path, which will impact every application for a debatable benefit in a few cases. You'll need to show very convincing benchmarks if you want to pursue this further. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/3] advapi32/tests: Simple tests for TokenIntegrityLevel [try2]
by Nikolay Sivov 30 Jul '12

30 Jul '12

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 30 Jul '12

30 Jul '12

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 30 Jul '12

30 Jul '12

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 30 Jul '12

30 Jul '12

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 30 Jul '12

30 Jul '12

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 30 Jul '12

30 Jul '12

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 30 Jul '12

30 Jul '12

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 30 Jul '12

30 Jul '12

> + 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 29 Jul '12

29 Jul '12

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 29 Jul '12

29 Jul '12

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

[RFC] kernel32: Try to get the drive type from the mountmgr first
by GOUJON Alexandre 28 Jul '12

28 Jul '12

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 ?

1 0

Re: kernel32/tests: Make initonce_callback() static.
by Marvin 28 Jul '12

28 Jul '12

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

1 0

Re: [PATCH] msi/tests: Use always static binding for GetTokenInformation
by Marvin 28 Jul '12

28 Jul '12

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

1 0

Re: mshtml: Properly handle NULL VT_DISPATCH refChild in IHTMLDOMNode::insertBefore
by Marvin 28 Jul '12

28 Jul '12

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

1 0

Re: [2/5] windowscodecs: Add stub IWICMetadataBlockReader to PNG decoder.
by Marvin 28 Jul '12

28 Jul '12

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

1 0

Re: [3/3] kernel32: Some tests for LOCALE_SNAME and neutral locales
by Marvin 28 Jul '12

28 Jul '12

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

1 0

Re: [1/3] kernel32: Some test for handling locales specified by language only
by Marvin 28 Jul '12

28 Jul '12

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

1 0

Re: [PATCH 2/2] d3drm: Implement IDirect3DRMMeshImpl_SetGroupMaterial and forward material from mesh builder to created mesh
by Marvin 28 Jul '12

28 Jul '12

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

1 0

Re: [1/5] windowscodecs: Add test for IWICMetadataBlockReader interface.
by Marvin 28 Jul '12

28 Jul '12

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

1 0

Re: [2/3] kernel32: Fix base for value returned with LOCALE_RETURN_NUMBER
by Marvin 28 Jul '12

28 Jul '12

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

1 0

Re: [1/3] kernel32: Some test for handling locales specified by language only
by Marvin 28 Jul '12

28 Jul '12

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

1 0

Re: [PATCH 3/3 try2] mshtml: Added runtimeStyle tests
by Marvin 28 Jul '12

28 Jul '12

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

1 0

Re: mlang/tests: Simplify the "pointer to start of array" idiom.
by Marvin 28 Jul '12

28 Jul '12

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

1 0

Re: user32: Rearrange ComboBox repositioning code (Resolves one "todo") (Resend).
by Marvin 28 Jul '12

28 Jul '12

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

1 0

What happened to testbot?
by Daniel Jelinski 27 Jul '12

27 Jul '12

It seems that WINEBUILD has taken a break two days ago, no tasks involving building have been completed since then. Regards, Daniel

1 0

Re: Investigating iexplore/activex issues
by Joel Holdsworth 27 Jul '12

27 Jul '12

Hi Qian, That's the easiest solution I've heard so far. Unfortunately I ran straight into bug #25919 (http://bugs.winehq.org/show_bug.cgi?id=25918). Maybe I can find a work-about, unless you know the solution already? Joel On 27 July 2012 at 09:54 Qian Hong <fracting(a)gmail.com> wrote: > On Fri, Jul 27, 2012 at 4:29 PM, Joel Holdsworth > <joel(a)airwebreathe.org.uk> wrote: > > > > On 26 July 2012 at 23:40 Dan Kegel <dank(a)kegel.com> wrote: > > > >> I'm running into a similar problem, > >> http://bugs.winehq.org/show_bug.cgi?id=23058 > >> If you're using a different activex control, > >> please file a new bug, with a way > >> for others to reproduce the problem. > > > > Yes that does sound quite similar. I predict once page loading is fixed, > > this will be the main mode of failure. I'm not sure how easy it will be to > > find a public copy of the product, but I'll see if I can find one. > > > > > > > >> Any chance you could add an HTML5 mode? > >> http://praegnanz.de/html5video/ > >> shows a bunch of HTML5 video player components, > >> and lists which ones have Flash fallback for old browsers. > >> You could turn it on if you detect a Linux client, > >> and otherwise use the old activex solution. > > > > Yes, I would love for that to happen, and I've heard that there are plans in > > the pipeline. It's not so bad - there is a fallback on linux using a simple > > video object which works smoothly. Though that doesn't help for the > > annotations or the point-and-click ui for setting up the analytics, so to > > setup the more clever features of the device I have to go back to windows. > > > > > > > > Joel > > > > > > > > > > Hi Joel, > > Would you like to try np-activex [1] ? > > np-activex is a npapi plugin for Chrome on Windows, at the same time, > it is a ActiveX wrapper. > With np-activex, users can load ActiveX control in Chrome for Win, > without iexplore. > Actually, with Wine's help, np-activex work on Linux as well, though > you have to use Wine to run Chrome for Win on Linux. > > How ever, there are some bugs which will bring us to troubles: > > Bug 21232 - Chrome can't load any webpage unless --no-sandbox is used > Bug 27248 - cannot unpack *.crx (extensions or themes) in Chrome > unless --single-process is used > Bug 27168 - chromium-based apps can't load https sites > > Unfortunately, to workaround all these bugs, we have to use special > version of Chrome with special version of np-activex. > I'm glad if this example is helpful for you: > A guide to sign in China Merchants Bank (CMBChina) on Linux: Wine > Chrome + ActiveX for Chrome + User Agent Switcher > https://groups.google.com/forum/#!msg/non-ie-online-banking/EodETqFrcY0/ySq… > > There might be other bugs related to Chrome/ActiveX, some of them are > covered in this list: > http://code.google.com/p/online-banking-with-wine/wiki/buglist > > Let me know if I can help you further, also please let me know if you > have good news ;-) > Good luck. > > [1] http://code.google.com/p/np-activex/ > > -- > Regards, > Qian Hong > > - > Sent from Ubuntu > http://www.ubuntu.com/

2 1

Re: [1/2] gdiplus: Don't keep a reference to HDC in the GpBitmap object.
by Vincent Povirk 27 Jul '12

27 Jul '12

> an image passed to GdipGetImageGraphicsContext() is destroyed right after > the graphics object was created, then later on all calls using that HDC fail > and silently lead to using invalid or not initilazed values. You have to keep the image alive as long as you're using the Graphics object. If you're not doing that, then you have a use-after-free and I don't trust the results of your test. We shouldn't need to have any HDC for much longer in this case anyway. Once we have a software implementation of line-drawing (which should just be a matter of filling a path from GdipWidenPath), we can get rid of the HBITMAP and HDC on Bitmap objects.

2 3

Investigating iexplore/activex issues
by Joel Holdsworth 27 Jul '12

27 Jul '12

Hi All, I've recently begun working at VCA technology on an IP security camera system. I'm mostly doing embedded linux stuff, but bhe code I'm working with uses an ActiveX control to show the video and the overlaid annotations. I've doing quite a lot of experimentation trying to get the page work correctly on Wine. So far the results have been rather disappointing: wine git-head: wine builtin iexplore - page loads blank, though wireshark shows that html+js has been received. Various ole related fixmes. IE7 & IE8 installed to seperate prefixes - IIRC page fails to load wine 1.4 wine builtin iexplore - page loads, but activex control fails to display. Does anyone have any suggestions for how I can better investigate these issues? And what is the status of ActiveX in wine - is it likely to work at all? Thanks Joel

3 3

Re: winhttp: Always use the 64-bit version of IActiveScriptParse.
by Jacek Caban 27 Jul '12

27 Jul '12

Hi Hans, This won't work on 32-bit. 32-bit JScript exposes only IActiveScriptParse32. That's an example where using inline macros complicates the code. See dlls/mshtml/script.c for how I dealt with this problem. Jacek

1 0

Re: [PATCH 1/4] mshtml: Moved IStream::Read calls to separated function
by Dmitry Timoshkov 27 Jul '12

27 Jul '12

Jacek Caban <jacek(a)codeweavers.com> wrote: > +static HRESULT read_stream(BSCallback *This, IStream *stream, void *buf, DWORD size, DWORD *ret_size) > +{ > + DWORD read_size = 0; > + HRESULT hres; > + > + hres = IStream_Read(stream, buf, size, &read_size); > + This->readed += (*ret_size = read_size); > + return hres; > +} Using 'ret_size' directly in the IStream_Read call would look more natural IMHO, like: hres = IStream_Read(stream, buf, size, ret_size); This->readed += *ret_size; -- Dmitry.

2 1

re: Investigating iexplore/activex issues
by Dan Kegel 27 Jul '12

27 Jul '12

I'm running into a similar problem, http://bugs.winehq.org/show_bug.cgi?id=23058 If you're using a different activex control, please file a new bug, with a way for others to reproduce the problem. Any chance you could add an HTML5 mode? http://praegnanz.de/html5video/ shows a bunch of HTML5 video player components, and lists which ones have Flash fallback for old browsers. You could turn it on if you detect a Linux client, and otherwise use the old activex solution.

2 1

Re: kernel32: implement IsValidLocaleName (with tests)
by Nikolay Sivov 27 Jul '12

27 Jul '12

On 7/27/2012 06:00, Austin English wrote: > > > + if ( !locale_name.matches ) > + return FALSE; > + return TRUE; Considering recent cleanup of such constructs please return like 'return locale_name.matches != 0;' or something like that. > +static void test_IsValidLocaleName(void) > +{ > + static const WCHAR enW[] = {'e','n',0}; > + static const WCHAR enusW[] = {'e','n','-','U','S',0}; > + static const WCHAR zzW[] = {'z','z',0}; > + static const WCHAR zzzzW[] = {'z','z','-','Z','Z',0}; > + BOOL ret; Please iterate through test data so it could be easily extended in future. Also it looks like duplication, please add some invalid locale names tests for LocaleNameToLCID and if return 0 for example, simply use it for validation (you'll get covered with LOCALE_NAME_USER_DEFAULT things for example).

1 0

Re: [1/5] d3drm: Implement IDirect3DRMLight_[Get|Set]ConstantAttenuation
by André Hentschel 26 Jul '12

26 Jul '12

that's the case of "mails to the mailinglist are received weeks later", you can obviously ignore it Am 05.06.2012 23:35, schrieb André Hentschel: > --- > dlls/d3drm/light.c | 11 +++++++---- > 1 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c > index 12c8623..750bb5f 100644 > --- a/dlls/d3drm/light.c > +++ b/dlls/d3drm/light.c > @@ -35,6 +35,7 @@ typedef struct { > D3DRMLIGHTTYPE type; > D3DCOLOR color; > D3DVALUE range; > + D3DVALUE cattenuation; > } IDirect3DRMLightImpl; > > static inline IDirect3DRMLightImpl *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) > @@ -243,9 +244,11 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetConstantAttenuation(IDirect3DRMLig > { > IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); > > - FIXME("(%p/%p)->(%f): stub\n", iface, This, cattenuation); > + TRACE("(%p/%p)->(%f)\n", iface, This, cattenuation); > > - return E_NOTIMPL; > + This->cattenuation = cattenuation; > + > + return D3DRM_OK; > } > > static HRESULT WINAPI IDirect3DRMLightImpl_SetLinearAttenuation(IDirect3DRMLight* iface, > @@ -299,9 +302,9 @@ static D3DVALUE WINAPI IDirect3DRMLightImpl_GetConstantAttenuation(IDirect3DRMLi > { > IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); > > - FIXME("(%p/%p)->(): stub\n", iface, This); > + TRACE("(%p/%p)->()\n", iface, This); > > - return 0; > + return This->cattenuation; > } > > static D3DVALUE WINAPI IDirect3DRMLightImpl_GetLinearAttenuation(IDirect3DRMLight* iface) > > > > -- Best Regards, André Hentschel

1 0

Re: [1/2] ntdll: Implement RtlIpv4StringToAddressW.
by Thomas Faber 26 Jul '12

26 Jul '12

Hi, what can I do to get this in committable shape? I don't see how it can be reasonably split up; tests are in place. I've noticed I forgot to remove the L prefixes on character constants, which I'll correct. I'll gladly fix any other style issues. The function _could_ be implemented using strto(u)l instead of using its own conversion function, but that would require the removal of some tests as "too strict". I much prefer the "correct" version. Thanks for any input. Best regards, Tom

2 1

Apologies for yesterday's 'Marvin' spam
by Francois Gouget 26 Jul '12

26 Jul '12

I wish to apologize to everyone for yesterday's round of 'Marvin' spam. To clean up your mailboxes you can delete all the mails sent to fgouget(a)amboise.dolphin. I'm working on WineTestBot[1] and I was checking for reliability issues so I ran it through a subset of the patches on Wine's web site[2]. Before doing that I checked that it would not spam the patch authors or the patches web site status. But I missed the CC to wine-devel! I have now fixed that oversight and modified WineTestBot[3] so that by default it won't send emails to anybody but the site administrator (me in this case). [1] http://www.winehq.org/pipermail/wine-devel/2012-June/096043.html [2] http://source.winehq.org/patches/ [3] https://github.com/fgouget/winetestbot/commits/libvirt Note that the above branch is a work in progress and not all of it is suitable for use on the current production WineTestBot server. -- Francois Gouget <fgouget(a)codeweavers.com>

1 0

Wine's support for reporting calling conventions
by Roger Cruz 26 Jul '12

26 Jul '12

In dlls/dbghelp/dwarf.c, there is this snippet of code which appears to hard-code the calling convention to CALL_FAR_C. Does Wine not support reporting a function's calling convention correctly then? Is it a limitation of DWARF or just that it is not implemented? I can see that DWARF has a DW_AT_calling_convention field but when I examine a Wine DLL with objdump, it does not show this field in use. /* FIXME: assuming C source code */ sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C); Thanks Roger

3 5

Re: start: Support getting the file to open by AppleEvent.
by Alexandre Julliard 26 Jul '12

26 Jul '12

Per Johansson <pelle(a)morth.org> writes: > Series goal: Implement app bundle start menu / file type associations on OS X. > > > From 681ea02fb9e3df819f812e359d3fe76c77423e32 Mon Sep 17 00:00:00 2001 > From: Per Johansson <per(a)morth.org> > Date: Tue, 17 Apr 2012 21:29:13 +0200 > Subject: start: Support getting the file to open by AppleEvent. > To: wine-patches <wine-patches(a)winehq.org> > Reply-To: wine-devel <wine-devel(a)winehq.org> > > Uses a private API. You really don't want to do that. -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: [PATCH 1/2] ieframe: Added default action implementation for IDocHostUIHandler::GetExternal
by Nikolay Sivov 26 Jul '12

26 Jul '12

On 5/16/2012 14:21, Jacek Caban wrote: > --- > dlls/ieframe/Makefile.in | 1 + > dlls/ieframe/dochost.c | 16 ++- > dlls/ieframe/ieframe.h | 2 + > dlls/ieframe/shelluihelper.c | 378 > ++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 395 insertions(+), 2 deletions(-) > create mode 100644 dlls/ieframe/shelluihelper.c > +*ppDispatch = (IDispatch*)This->shell_ui_helper; > + IDispatch_AddRef(*ppDispatch); > + return S_OK; IShellUIHelper2 supports IDispatch, so these three lines and a cast could be replaced with one QI like: return IShellUIHelper2_QueryInterface(This->shell_ui_helper,&IID_IDispatch, (void**)ppDispatch); if I'm not missing something.

1 0

Re: [PATCH 1/9] hhctrl.ocx: Implement HH_CLOSE_ALL (resend).
by Jacek Caban 26 Jul '12

26 Jul '12

On 07/09/12 02:13, Erich E. Hoover wrote: > + case HH_CLOSE_ALL: { > + struct list *ptr; > + HHInfo *info; > + > + LIST_FOR_EACH(ptr, &window_list) > + { > + info = LIST_ENTRY(ptr, HHInfo, entry); > + TRACE("Destroying window %s.\n", debugstr_w(info->pszType)); > + if (info->WinType.hwndHelp) > + DestroyWindow(info->WinType.hwndHelp); > + list_remove(&info->entry); > + } How is it supposed to work? AFAICS you're destroying windows, removing info object from the list and forget about it. If your intention is to destroy these objects, then ReleaseHelpViewer seems more appropriate. Also moving list_remove call to ReleaseHelpViewer seems preferable, so that it's removed from the list regardless of the reason for being destroyed. Same for list_add_tail, shouldn't it be done in CreateHelpViewer? Jacek

2 4

Re: [PATCH 4/4] dsound: Resample to float, not device format
by Alexander E. Patrakov 26 Jul '12

26 Jul '12

Andrew Eikum wrote: > Before this patch, the chain is > secondary format > =(Resample)=> float > =(Reformat)=> device format > =(Mix)=> float > =(Reformat)=> device format > > Now it's > secondary format > =(Resample)=> float > =(Mix)=> float > =(Reformat)=> device format Overall, this looks like a good cleanup. However, the chart above uses the word "(Mix)" for a combination of two operations: 1) apply volume to each sample, 2) calculate sum of samples corresponding to all playing buffers. I'd like you to resend this patch with these two steps shown separately (this also applies to the copy in the comments in mixer.c). Some notes about the code: The planned optimization that groups secondary buffers by sample rate before resampling the mix of them depends on having the volume applied before resampling, not after. So these operations have to be reordered in a later patch. > void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) > { > dsb->put_aux(dsb, pos, 0, value); > dsb->put_aux(dsb, pos, 1, value); > } ... > - dsb->put_aux = putbpp[dsb->device->pwfx->wBitsPerSample/8 - 1]; > + dsb->put_aux = putieee32; > > dsb->get = dsb->get_aux; > dsb->put = dsb->put_aux; ... and then dsb-> put and dsb->get are possibly overwritten Here it looks like we can also remove put_aux by always using put_ieee32 in put_mono2stereo(). > + vLeft = dsb->volpan.dwTotalLeftAmpFactor / ((float)0xFFFF); > + vRight = dsb->volpan.dwTotalRightAmpFactor / ((float)0xFFFF); If dwTotal{Left,Right}AmpFactor is not something public, then we can as well store it as a float. All of the above can, of course, be addressed later. -- Alexander E. Patrakov

1 0

A copyright question to wine developpers
by Christophe-Marie Duquesne 26 Jul '12

26 Jul '12

Hi, To my understanding, wine is a reimplementation of the MS system. As far as I understand, you take MS public headers and reimplement their functions. If that is how it works, then how do you deal with copyright? The MS headers certainly come with a copyright clause: how is it possible to redistribute these headers with wine? The reason why I ask this: I just rewrote an opensource implementation of a closed-source library. This opensource implementation is meant to be fully compatible with the closed source one: I reimplemented all the functions provided by their header, and anyone using the closed source one should be able to use my library as a replacement. My problem, though, is with the distribution of the header: Since I want to be fully compatible with the closed-source implementation, I have to, somehow, use the same header. I could probably modify it so that is *looks* different, but for the compiler, the API *needs* to be the same. Since you seem to have the same problem with wine (and you probably dealt with it succesfully), I wanted to ask you how you are solving this problem. Do you "rewrite" the headers? Do you copy them "raw"? Thank you, Christophe-Marie Duquesne

5 7

Rethinking WineConf
by Jeremy White 26 Jul '12

26 Jul '12

Hi All, This past Wine conference, while great fun as always, was not as well attended as Wine conferences in the past. So I would like to stir up trouble by suggesting we rethink WineConf. For those that have not attended, the Wine conference has been a mostly annual affair since 2002. It is open to all, but is advertised as being aimed at Wine developers. About 35 people attend each year. It's been in Minnesota about every 3rd year, and is otherwise 'normally' somewhere in Europe. I see the primary goal as creating human bonds between otherwise anonymous people (aka going to the pub). It's a bonus if it also spurs resolution to tricky issues, or motivates people to get more done. So I'd like to ask folks to brain storm with me. How could Wineconf be different? If you've never been, what would encourage you to come? If you've been to a technical conference recently that you thought was well done, what did they do well? Anything we could emulate? Any other ideas, or suggestions? Cheers, Jeremy

17 25

Re: user32: Rearrange ComboBox repositioning code (Resolves one "todo") (Resend).
by Dmitry Timoshkov 26 Jul '12

26 Jul '12

Sergey Guralnik <serhio(a)etersoft.ru> wrote: > user32: Rearrange ComboBox repositioning code. For what it's worth this patch seems reasonable to me. -- Dmitry.

1 0

Re: kernel32: Add UTF-7 support
by Alexandre Julliard 26 Jul '12

26 Jul '12

Alex Henrie <alexhenrie24(a)gmail.com> writes: > Fixes bug 27388. > > This patch has been in the queue since May 21. I'm open to feedback. It should all be in kernel32, not in libwine. Also you must do it without memory allocations. You'd also want more tests for the overflow cases, in particular for partial sequences. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: gdiplus: Store device resolution in the graphics object.
by Dmitry Timoshkov 26 Jul '12

26 Jul '12

Hello, this patch is marked as pending, is there a reason why? Thanks. -- Dmitry.

1 0

[rfc msvcp100] add Container_base::_Orphan_all
by Dan Kegel 25 Jul '12

25 Jul '12

Piotr, can you review this, please? I've only tested this with two apps on 32 bits, I have not tested at all on 64 bits, and am only guessing on the calling convention stuff. Seems to fix http://bugs.winehq.org/show_bug.cgi?id=27698 for Harvest and one other app (I can't reproduce the problem with Origin, and I haven't tried cl.exe).

2 2

Re: [PATCH 7/7] msvcp90/tests: Added destructor tests for class with virtual inheritance
by Marvin 25 Jul '12

25 Jul '12

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://winetestbot.dolphin/JobDetails.pl?Key=161 Your paranoid android. === debiantesting (build) === Patch failed to apply

1 0

Re: mmcndmgr: Implement IMMCVersionInfo (try 6 - Resend)
by Marvin 25 Jul '12

25 Jul '12

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://winetestbot.dolphin/JobDetails.pl?Key=160 Your paranoid android. === debiantesting (build) === Patch failed to apply

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel