December 2005 - Wine-commits

Jacek Caban : urlmon: Added some tests and fixes of file protocol.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: 7458d7416986a8e0680c4e40866393ebdecd6a51 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7458d7416986a8e0680c4e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 19 09:52:30 2005 +0100 urlmon: Added some tests and fixes of file protocol. --- dlls/urlmon/file.c | 35 +++++++++++++++++++++++------------ dlls/urlmon/tests/protocol.c | 24 +++++++++++++++++++----- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 61c312c..b76bb4a 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -110,7 +110,9 @@ static HRESULT WINAPI FileProtocol_Start LARGE_INTEGER size; DWORD len; LPWSTR url, mime = NULL; + LPCWSTR file_name; WCHAR null_char = 0; + BOOL first_call = FALSE; HRESULT hres; static const WCHAR wszFile[] = {'f','i','l','e',':'}; @@ -134,33 +136,39 @@ static HRESULT WINAPI FileProtocol_Start return hres; } - hres = FindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); - if(SUCCEEDED(hres)) - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, mime); + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL); if(!This->file) { + first_call = TRUE; + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); - This->file = CreateFileW(url+sizeof(wszFile)/sizeof(WCHAR), GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + file_name = url+sizeof(wszFile)/sizeof(WCHAR); + if(file_name[0] == '/' && file_name[1] == '/' && file_name[2] == '/') + file_name += 3; + + This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(This->file == INVALID_HANDLE_VALUE) { This->file = NULL; IInternetProtocolSink_ReportResult(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, GetLastError(), NULL); HeapFree(GetProcessHeap(), 0, url); - CoTaskMemFree(mime); return INET_E_RESOURCE_NOT_FOUND; } - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_CACHEFILENAMEAVAILABLE, - url+sizeof(wszFile)/sizeof(WCHAR)); - if(mime) - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, mime); - IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); + IInternetProtocolSink_ReportProgress(pOIProtSink, + BINDSTATUS_CACHEFILENAMEAVAILABLE, file_name); + + hres = FindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); + if(SUCCEEDED(hres)) { + IInternetProtocolSink_ReportProgress(pOIProtSink, + BINDSTATUS_MIMETYPEAVAILABLE, mime); + CoTaskMemFree(mime); + } } - CoTaskMemFree(mime); HeapFree(GetProcessHeap(), 0, url); if(GetFileSizeEx(This->file, &size)) @@ -168,6 +176,9 @@ static HRESULT WINAPI FileProtocol_Start BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION, size.u.LowPart, size.u.LowPart); + if(first_call) + IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); + return S_OK; } diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 42b5e56..382e5f0 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -91,15 +91,17 @@ static HRESULT WINAPI ProtocolSink_Repor switch(ulStatusCode) { case BINDSTATUS_MIMETYPEAVAILABLE: CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) ok(!lstrcmpW(szStatusText, text_html), "szStatusText != text/html\n"); + break; case BINDSTATUS_DIRECTBIND: - CHECK_EXPECT2(ReportProgress_DIRECTBIND); - if(szStatusText) - ok(!lstrcmpW(szStatusText, text_html), "szStatusText != text/html\n"); + CHECK_EXPECT(ReportProgress_DIRECTBIND); + ok(szStatusText == NULL, "szStatucText != NULL\n"); break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: CHECK_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); + ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) ok(!lstrcmpW(szStatusText, file_name), "szStatusText != file_name\n"); break; @@ -241,9 +243,10 @@ static void file_protocol_start(IInterne SET_EXPECT(ReportProgress_SENDINGREQUEST); SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); - SET_EXPECT(ReportResult); } SET_EXPECT(ReportData); + if(is_first) + SET_EXPECT(ReportResult); expect_hrResult = S_OK; @@ -256,9 +259,10 @@ static void file_protocol_start(IInterne CHECK_CALLED(ReportProgress_SENDINGREQUEST); CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); - CHECK_CALLED(ReportResult); } CHECK_CALLED(ReportData); + if(is_first) + CHECK_CALLED(ReportResult); } static void test_file_protocol_url(LPCWSTR url) @@ -365,6 +369,7 @@ static void test_file_protocol(void) { static const WCHAR index_url2[] = {'f','i','l','e',':','/','/','i','n','d','e','x','.','h','t','m','l',0}; static const WCHAR wszFile[] = {'f','i','l','e',':',0}; + static const WCHAR wszFile2[] = {'f','i','l','e',':','/','/','/',0}; static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static const char html_doc[] = "<HTML></HTML>"; @@ -388,6 +393,15 @@ static void test_file_protocol(void) { file_name = buf + sizeof(wszFile)/sizeof(WCHAR)-1; test_file_protocol_url(buf); + memcpy(buf, wszFile2, sizeof(wszFile2)); + len = sizeof(wszFile2)/sizeof(WCHAR)-1; + len += GetCurrentDirectoryW(sizeof(buf)/sizeof(WCHAR)-len, buf+len); + buf[len++] = '\\'; + memcpy(buf+len, wszIndexHtml, sizeof(wszIndexHtml)); + + file_name = buf + sizeof(wszFile2)/sizeof(WCHAR)-1; + test_file_protocol_url(buf); + DeleteFileW(wszIndexHtml); hres = CoCreateInstance(&CLSID_FileProtocol, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,

1 0

Rein Klazes : x11drv: Do not use the scroll rectangle for clipping in ScrollDC.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: 3df678a5afcb54bcd6b92ba14227c7a5b44bef73 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3df678a5afcb54bcd6b92ba… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Dec 19 09:53:04 2005 +0100 x11drv: Do not use the scroll rectangle for clipping in ScrollDC. With a conformance test. --- dlls/user/tests/win.c | 17 ++++++++++++++++- dlls/x11drv/scroll.c | 44 +++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 447ca34..6cef7a9 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -2954,7 +2954,7 @@ static void test_scrolldc( HWND parent) ScrollDC( hdc, 5, -20, &rc, &cliprc, hrgn, &rcu); colr = GetPixel( hdc, (rc.left+rc.right)/2, ( rc.top + rc.bottom) /2 - 1); ok ( colr == 0, "pixel should be black, color is %08lx\n", colr); - + /* test with NULL clip rect */ ScrollDC( hdc, 20, -20, &rc, NULL, hrgn, &rcu); /*FillRgn(hdc, hrgn, GetStockObject(WHITE_BRUSH));*/ trace("update rect: %ld,%ld - %ld,%ld\n", @@ -2969,6 +2969,21 @@ static void test_scrolldc( HWND parent) CombineRgn(exprgn, exprgn, tmprgn, RGN_OR); if (winetest_debug > 0) dump_region(exprgn); ok(EqualRgn(exprgn, hrgn), "wrong update region\n"); + /* test clip rect > scroll rect */ + FillRect( hdc, &rc, GetStockObject(WHITE_BRUSH)); + rc2=rc; + InflateRect( &rc2, -(rc.right-rc.left)/4, -(rc.bottom-rc.top)/4); + FillRect( hdc, &rc2, GetStockObject(BLACK_BRUSH)); + ScrollDC( hdc, 10, 10, &rc2, &rc, hrgn, &rcu); + SetRectRgn( exprgn, 25, 25, 75, 35); + SetRectRgn( tmprgn, 25, 35, 35, 75); + CombineRgn(exprgn, exprgn, tmprgn, RGN_OR); + ok(EqualRgn(exprgn, hrgn), "wrong update region\n"); + colr = GetPixel( hdc, 80, 80); + ok ( colr == 0, "pixel should be black, color is %08lx\n", colr); + trace("update rect: %ld,%ld - %ld,%ld\n", + rcu.left, rcu.top, rcu.right, rcu.bottom); + if (winetest_debug > 0) dump_region(hrgn); /* clean up */ DeleteObject(hrgn); diff --git a/dlls/x11drv/scroll.c b/dlls/x11drv/scroll.c index e0c2f83..cf80870 100644 --- a/dlls/x11drv/scroll.c +++ b/dlls/x11drv/scroll.c @@ -91,34 +91,21 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I } else CombineRgn( visrgn, visrgn, clipRgn, RGN_AND); /* only those pixels in the scroll rectangle that remain in the clipping - * rect are scrolled. So first combine Scroll and Clipping rectangles, - * if available */ - if( lprcScroll) - { - if( lprcClip) - IntersectRect( &rcClip, lprcClip, lprcScroll); - else - rcClip = *lprcScroll; - } + * rect are scrolled. */ + if( lprcClip) + rcClip = *lprcClip; else - { - if( lprcClip) - rcClip = *lprcClip; - else - GetClipBox( hdc, &rcClip); - } - /* Then clip again to get the source rectangle that will remain in the - * clipping rect */ + GetClipBox( hdc, &rcClip); rcSrc = rcClip; - if (lprcClip) - { - OffsetRect( &rcSrc, -dx, -dy); - IntersectRect( &rcSrc, &rcSrc, &rcClip); - } + OffsetRect( &rcClip, -dx, -dy); + IntersectRect( &rcSrc, &rcSrc, &rcClip); + /* if an scroll rectangle is specified, only the pixels within that + * rectangle are scrolled */ + if( lprcScroll) + IntersectRect( &rcSrc, &rcSrc, lprcScroll); /* now convert to device coordinates */ LPtoDP(hdc, (LPPOINT)&rcSrc, 2); TRACE("source rect: %s\n", wine_dbgstr_rect(&rcSrc)); - /* also dx and dy */ SetRect(&offset, 0, 0, dx, dy); LPtoDP(hdc, (LPPOINT)&offset, 2); @@ -160,6 +147,17 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I code = X11DRV_END_EXPOSURES; ExtEscape( hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, sizeof(ExpRgn), (LPSTR)&ExpRgn ); + /* Intersect clip and scroll rectangles, allowing NULL values */ + if( lprcScroll) + if( lprcClip) + IntersectRect( &rcClip, lprcClip, lprcScroll); + else + rcClip = *lprcScroll; + else + if( lprcClip) + rcClip = *lprcClip; + else + GetClipBox( hdc, &rcClip); /* Convert the combined clip rectangle to device coordinates */ LPtoDP(hdc, (LPPOINT)&rcClip, 2); if( hrgn )

1 0

Alexandre Julliard : ntdll: Don't use a real guard page at the bottom of the stack.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: efffa663308a9c2338dd1ed577fd40414e982f10 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efffa663308a9c2338dd1ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 17 18:47:03 2005 +0100 ntdll: Don't use a real guard page at the bottom of the stack. A no-access page is enough, we can't properly raise an overflow exception anyway. --- dlls/kernel/process.c | 2 +- dlls/ntdll/thread.c | 3 +-- dlls/ntdll/virtual.c | 8 ++------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 42c4033..e75fccb 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -994,7 +994,7 @@ static void *init_stack(void) NtCurrentTeb()->Tib.StackLimit = (char *)base + page_size; /* setup guard page */ - VirtualProtect( base, 1, PAGE_READWRITE | PAGE_GUARD, NULL ); + VirtualProtect( base, page_size, PAGE_NOACCESS, NULL ); return NtCurrentTeb()->Tib.StackBase; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 07cd08d..9896703 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -223,8 +223,7 @@ static void start_thread( struct wine_pt /* setup the guard page */ size = page_size; - NtProtectVirtualMemory( NtCurrentProcess(), &teb->DeallocationStack, &size, - PAGE_READWRITE | PAGE_GUARD, NULL ); + NtProtectVirtualMemory( NtCurrentProcess(), &teb->DeallocationStack, &size, PAGE_NOACCESS, NULL ); RtlFreeHeap( GetProcessHeap(), 0, info ); RtlAcquirePebLock(); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 3cd9fff..922c1b3 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1178,17 +1178,13 @@ NTSTATUS VIRTUAL_HandleFault( LPCVOID ad RtlEnterCriticalSection( &csVirtual ); if ((view = VIRTUAL_FindView( addr ))) { - BYTE vprot = view->prot[((const char *)addr - (const char *)view->base) >> page_shift]; - void *page = (void *)((UINT_PTR)addr & ~page_mask); - char *stack = NtCurrentTeb()->Tib.StackLimit; + void *page = ROUND_ADDR( addr, page_mask ); + BYTE vprot = view->prot[((const char *)page - (const char *)view->base) >> page_shift]; if (vprot & VPROT_GUARD) { VIRTUAL_SetProt( view, page, page_mask + 1, vprot & ~VPROT_GUARD ); ret = STATUS_GUARD_PAGE_VIOLATION; } - /* is it inside the stack guard page? */ - if (((const char *)addr >= stack - (page_mask + 1)) && ((const char *)addr < stack)) - ret = STATUS_STACK_OVERFLOW; } RtlLeaveCriticalSection( &csVirtual ); return ret;

1 0

Alexandre Julliard : ntdll: New implementation of relay thunks.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: 5dc6d959526bc4854361c240408edc7a7075e81c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5dc6d959526bc4854361c24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 18 10:45:01 2005 +0100 ntdll: New implementation of relay thunks. New implementation of relay thunks that doesn't require modifying code on the fly, so that the thunks can be put in the text section. Some performance improvements. --- dlls/ntdll/loader.c | 4 dlls/ntdll/ntdll_misc.h | 2 dlls/ntdll/relay.c | 505 ++++++++++++++++++++-------------------------- tools/winebuild/build.h | 2 tools/winebuild/import.c | 3 tools/winebuild/spec32.c | 179 ++++++++++++---- tools/winebuild/utils.c | 9 + 7 files changed, 366 insertions(+), 338 deletions(-)

1 0

Alexander N. Sørnes : winecfg: Updated Norwegian Bokmaal resources.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: 97c6c634d5bbb5147f8ee2e432cc2288026eeab2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=97c6c634d5bbb5147f8ee2e… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Mon Dec 19 09:52:20 2005 +0100 winecfg: Updated Norwegian Bokmaal resources. --- programs/winecfg/No.rc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index cef2a52..d92dd09 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -21,12 +21,12 @@ */ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - + IDR_WINECFG MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "Configure", IDC_AUDIO_CONFIGURE + MENUITEM "Oppsett", IDC_AUDIO_CONFIGURE END END @@ -67,12 +67,12 @@ BEGIN CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Aktiver dobbelt hurtigminne for skrivebordet",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 - + LTEXT "Du kan velge � emulere et Windows-skrivebord, der alle vinduene er bundet i en virtuell skjerm, eller du kan f� vinduene til � oppf�re seg som andre programmer p� skrivebordet.", IDC_STATIC,15,73,228,28 LTEXT "Skrivebordsstrrelse:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED - CONTROL "Virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", + CONTROL "Emuler et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 EDITTEXT IDC_DESKTOP_WIDTH,64,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED @@ -132,12 +132,12 @@ BEGIN LTEXT "&Sti:",IDC_STATIC,15,123,20,9 EDITTEXT IDC_EDIT_PATH,41,120,160,13,ES_AUTOHSCROLL | WS_TABSTOP PUSHBUTTON "&Bla . . .",IDC_BUTTON_BROWSE_PATH,206,120,40,13 - + LTEXT "&Type:",IDC_STATIC_TYPE,15,138,21,10 COMBOBOX IDC_COMBO_TYPE,41,135,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - + LTEXT "Volumnavn og serienummer",IDC_LABELSERIAL_STATIC,15,155,95,10 - + PUSHBUTTON "Avan&sert visning",IDC_BUTTON_SHOW_HIDE_ADVANCED,186,136,60,13 CONTROL "&Finn automatisk fra enhet:",IDC_RADIO_AUTODETECT,"Button", BS_AUTORADIOBUTTON,15,166,93,10 @@ -158,12 +158,12 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 - LTEXT "Lyddriver: ",IDC_STATIC,15,20,227,30 + GROUPBOX " Valg av driver ",IDC_STATIC,8,4,244,195 + LTEXT "Velg en lyddriver ved � krysse av i boksen ved siden av den du vil bruke. Deaktiver lyd ved � ikke velge noen. Det anbefales ikke � velge flere drivere. Driverens oppsett kan endres ved � h�yreklikke p� den.",IDC_STATIC,15,20,227,30 CONTROL "Enheter",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 PUSHBUTTON "Kontrollpanel",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 - LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,215,90,10 + LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Driveremulering",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END

1 0

Robert Reif : winecfg: Use sound tree view for driver selection.
by Alexandre Julliard 17 Dec '05

17 Dec '05

Module: wine Branch: refs/heads/master Commit: f0c55e7d52a25285837b0907f682391ee95a27a5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f0c55e7d52a25285837b090… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Dec 17 12:30:06 2005 +0100 winecfg: Use sound tree view for driver selection. - Move driver selection and configuration into tree view. - Only show loadable drivers. --- programs/winecfg/.gitignore | 1 programs/winecfg/Bg.rc | 28 +- programs/winecfg/De.rc | 26 +- programs/winecfg/En.rc | 26 +- programs/winecfg/Es.rc | 26 +- programs/winecfg/Fi.rc | 27 +- programs/winecfg/Fr.rc | 27 +- programs/winecfg/Ja.rc | 28 +- programs/winecfg/Ko.rc | 26 +- programs/winecfg/Makefile.in | 6 - programs/winecfg/Nl.rc | 26 +- programs/winecfg/No.rc | 26 +- programs/winecfg/Ru.rc | 28 +- programs/winecfg/audio.c | 475 +++++++++++++++++++++++++++--------------- programs/winecfg/main.c | 2 programs/winecfg/resource.h | 15 + programs/winecfg/winecfg.c | 9 + programs/winecfg/winecfg.h | 4 programs/winecfg/winecfg.rc | 37 +++ 19 files changed, 546 insertions(+), 297 deletions(-)

1 0

Vitaliy Margolen : imagehlp: Forward StackWalk64 to dbghelp.StackWalk64.
by Alexandre Julliard 17 Dec '05

17 Dec '05

Module: wine Branch: refs/heads/master Commit: 33832c95d837df4e8669d6678cb1d54045eba75f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=33832c95d837df4e8669d66… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Dec 17 12:24:46 2005 +0100 imagehlp: Forward StackWalk64 to dbghelp.StackWalk64. --- dlls/imagehlp/imagehlp.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index ac5a2ae..9ca6c89 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -41,7 +41,7 @@ @ stdcall SearchTreeForFile(str str str) dbghelp.SearchTreeForFile @ stdcall SetImageConfigInformation(ptr ptr) @ stdcall SplitSymbols(str str str long) -@ stub StackWalk64 +@ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk64 @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk @ stdcall SymCleanup(long) dbghelp.SymCleanup @ stdcall SymEnumSourceFiles(long long str ptr ptr) dbghelp.SymEnumSourceFiles

1 0

Juan Lang : crypt32: Implement more implicit properties, with tests.
by Alexandre Julliard 17 Dec '05

17 Dec '05

Module: wine Branch: refs/heads/master Commit: a67b6f49ecc8beefe91f91ce9e2b26e8414d93f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a67b6f49ecc8beefe91f91c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Sat Dec 17 12:24:59 2005 +0100 crypt32: Implement more implicit properties, with tests. --- dlls/crypt32/cert.c | 49 ++++++++++++++++++++++++++-------- dlls/crypt32/tests/cert.c | 65 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 92 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 4911090..4f822d1 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1877,6 +1877,22 @@ DWORD WINAPI CertEnumCertificateContextP return ret; } +static BOOL CRYPT_GetCertHashProp(PWINE_CERT_CONTEXT context, DWORD dwPropId, + ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData, + DWORD *pcbData) +{ + BOOL ret = CryptHashCertificate(0, algID, 0, toHash, toHashLen, pvData, + pcbData); + if (ret) + { + CRYPT_DATA_BLOB blob = { *pcbData, pvData }; + + ret = CRYPT_SetCertificateContextProperty(context, dwPropId, + 0, &blob); + } + return ret; +} + static BOOL WINAPI CRYPT_GetCertificateContextProperty( PWINE_CERT_CONTEXT context, DWORD dwPropId, void *pvData, DWORD *pcbData) { @@ -1919,26 +1935,34 @@ static BOOL WINAPI CRYPT_GetCertificateC switch (dwPropId) { case CERT_SHA1_HASH_PROP_ID: - ret = CryptHashCertificate(0, CALG_SHA1, 0, + ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_SHA1, context->cert.pbCertEncoded, context->cert.cbCertEncoded, pvData, pcbData); - if (ret) - { - CRYPT_DATA_BLOB blob = { *pcbData, pvData }; - - ret = CRYPT_SetCertificateContextProperty(context, dwPropId, - 0, &blob); - } break; - case CERT_KEY_PROV_INFO_PROP_ID: case CERT_MD5_HASH_PROP_ID: - case CERT_SIGNATURE_HASH_PROP_ID: - case CERT_KEY_IDENTIFIER_PROP_ID: + ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_MD5, + context->cert.pbCertEncoded, context->cert.cbCertEncoded, pvData, + pcbData); + break; + case CERT_SUBJECT_NAME_MD5_HASH_PROP_ID: + ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_MD5, + context->cert.pCertInfo->Subject.pbData, + context->cert.pCertInfo->Subject.cbData, + pvData, pcbData); + break; case CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID: + ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_MD5, + context->cert.pCertInfo->SubjectPublicKeyInfo.PublicKey.pbData, + context->cert.pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData, + pvData, pcbData); + break; + case CERT_SIGNATURE_HASH_PROP_ID: case CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID: - case CERT_SUBJECT_NAME_MD5_HASH_PROP_ID: FIXME("implicit property %ld\n", dwPropId); + SetLastError(CRYPT_E_NOT_FOUND); break; + default: + SetLastError(CRYPT_E_NOT_FOUND); } } LeaveCriticalSection(&context->cs); @@ -2100,6 +2124,7 @@ static BOOL WINAPI CRYPT_SetCertificateC case CERT_PVK_FILE_PROP_ID: case CERT_SIGNATURE_HASH_PROP_ID: case CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID: + case CERT_SUBJECT_NAME_MD5_HASH_PROP_ID: case CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID: case CERT_ENROLLMENT_PROP_ID: case CERT_CROSS_CERT_DIST_POINTS_PROP_ID: diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index a2c2b15..3ce36fb 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1100,6 +1100,26 @@ static void testCertOpenSystemStore(void RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); } +static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID, + PCCERT_CONTEXT context, DWORD propID) +{ + BYTE hash[20] = { 0 }, hashProperty[20]; + BOOL ret; + DWORD size; + + memset(hash, 0, sizeof(hash)); + memset(hashProperty, 0, sizeof(hashProperty)); + size = sizeof(hash); + ret = CryptHashCertificate(0, algID, 0, data, dataLen, hash, &size); + ok(ret, "CryptHashCertificate failed: %08lx\n", GetLastError()); + ret = CertGetCertificateContextProperty(context, propID, hashProperty, + &size); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", + GetLastError()); + ok(!memcmp(hash, hashProperty, size), "Unexpected hash for property %ld\n", + propID); +} + static void testCertProperties(void) { PCCERT_CONTEXT context = CertCreateCertificateContext(X509_ASN_ENCODING, @@ -1148,10 +1168,21 @@ static void testCertProperties(void) CERT_CERT_PROP_ID, 0, bigCert2); */ - /* This crashes. + /* These all crash. ret = CertGetCertificateContextProperty(context, CERT_ACCESS_STATE_PROP_ID, 0, NULL); + ret = CertGetCertificateContextProperty(context, CERT_HASH_PROP_ID, + NULL, NULL); + ret = CertGetCertificateContextProperty(context, CERT_HASH_PROP_ID, + hashProperty, NULL); */ + /* A missing prop */ + size = 0; + ret = CertGetCertificateContextProperty(context, + CERT_KEY_PROV_INFO_PROP_ID, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); + /* And, an implicit property */ size = sizeof(access); ret = CertGetCertificateContextProperty(context, CERT_ACCESS_STATE_PROP_ID, &access, &size); @@ -1181,15 +1212,8 @@ static void testCertProperties(void) NULL); ok(ret, "CertSetCertificateContextProperty failed: %08lx\n", GetLastError()); - size = sizeof(hash); - ret = CryptHashCertificate(0, 0, 0, bigCert, sizeof(bigCert) - 1, - hash, &size); - ok(ret, "CryptHashCertificate failed: %08lx\n", GetLastError()); - ret = CertGetCertificateContextProperty(context, CERT_HASH_PROP_ID, - hashProperty, &size); - ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); - ok(!memcmp(hash, hashProperty, sizeof(hash)), "Unexpected hash\n"); + checkHash(bigCert, sizeof(bigCert) - 1, CALG_SHA1, context, + CERT_HASH_PROP_ID); /* Now that the hash property is set, we should get one property when * enumerating. @@ -1203,6 +1227,27 @@ static void testCertProperties(void) } while (propID != 0); ok(numProps == 1, "Expected 1 properties, got %ld\n", numProps); + /* Check a few other implicit properties */ + checkHash(bigCert, sizeof(bigCert) - 1, CALG_MD5, context, + CERT_MD5_HASH_PROP_ID); + checkHash( + context->pCertInfo->Subject.pbData, + context->pCertInfo->Subject.cbData, + CALG_MD5, context, CERT_SUBJECT_NAME_MD5_HASH_PROP_ID); + checkHash( + context->pCertInfo->SubjectPublicKeyInfo.PublicKey.pbData, + context->pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData, + CALG_MD5, context, CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID); + + /* Odd: this doesn't fail on other certificates, so there must be + * something weird about this cert that causes it to fail. + */ + size = 0; + ret = CertGetCertificateContextProperty(context, + CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); + todo_wine ok(!ret && GetLastError() == ERROR_INVALID_DATA, + "Expected ERROR_INVALID_DATA, got %08lx\n", GetLastError()); + CertFreeCertificateContext(context); } }

1 0

Robert Reif : wineoss: Shorten MIDI names.
by Alexandre Julliard 17 Dec '05

17 Dec '05

Module: wine Branch: refs/heads/master Commit: 8accfc1defe49ba86c1f935a374b87bc337e67ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8accfc1defe49ba86c1f935… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Dec 17 12:25:19 2005 +0100 wineoss: Shorten MIDI names. Shorten MIDI names to fit into 32 byte array without overflow. --- dlls/winmm/wineoss/midi.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c index 4ea5090..03b982f 100644 --- a/dlls/winmm/wineoss/midi.c +++ b/dlls/winmm/wineoss/midi.c @@ -230,7 +230,7 @@ LRESULT OSS_MidiInit(void) sinfo.device = i; status = ioctl(midiSeqFD, SNDCTL_SYNTH_INFO, &sinfo); if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','(','#','%','d',')',' ','-',' ','d','i','s','a','b','l','e','d',0}; + static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','(','#','%','d',')',' ','d','i','s','a','b','l','e','d',0}; ERR("ioctl for synth info failed on %d, disabling it.\n", i); wsprintfW(MidiOutDev[i].caps.szPname, fmt, i); @@ -310,7 +310,7 @@ LRESULT OSS_MidiInit(void) /* Product Version. We simply say "1" */ MidiOutDev[numsynthdevs + i].caps.vDriverVersion = 0x001; if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','(','#','%','d',')',' ','-',' ','d','i','s','a','b','l','e','d',0}; + static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','(','#','%','d',')',' ','d','i','s','a','b','l','e','d',0}; wsprintfW(MidiOutDev[numsynthdevs + i].caps.szPname, fmt, numsynthdevs + i); MidiOutDev[numsynthdevs + i].bEnabled = FALSE; } else { @@ -341,7 +341,7 @@ LRESULT OSS_MidiInit(void) /* Product Version. We simply say "1" */ MidiInDev[i].caps.vDriverVersion = 0x001; if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','I','n',' ','(','#','%','d',')',' ','-',' ','d','i','s','a','b','l','e','d',0}; + static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','I','n',' ','(','#','%','d',')',' ','d','i','s','a','b','l','e','d',0}; wsprintfW(MidiInDev[i].caps.szPname, fmt, numsynthdevs + i); MidiInDev[i].state = -1; } else {

1 0

Dmitry Timoshkov : x11drv: ScrollDC should not clip output if a clipping rect is not specified.
by Alexandre Julliard 17 Dec '05

17 Dec '05

Module: wine Branch: refs/heads/master Commit: 8d9fb6331e86c8ecea4ca16e12a1121c4cb6559a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d9fb6331e86c8ecea4ca16… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Dec 17 12:24:37 2005 +0100 x11drv: ScrollDC should not clip output if a clipping rect is not specified. Add a ScrollDC test with NULL clipping rect. Add another set of ScrollDC tests written by Rein Klazes. --- dlls/user/tests/win.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/x11drv/scroll.c | 9 ++++++-- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index e1f787b..447ca34 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -2923,6 +2923,60 @@ static void test_scroll(void) DestroyWindow( hwnd); } +static void test_scrolldc( HWND parent) +{ + HDC hdc; + HRGN exprgn, tmprgn, hrgn; + RECT rc, rc2, rcu, cliprc; + HWND hwnd1; + COLORREF colr; + + hrgn = CreateRectRgn(0,0,0,0); + + hwnd1 = CreateWindowExA(0, "static", NULL, + WS_CHILD| WS_VISIBLE, + 25, 50, 100, 100, parent, 0, 0, NULL); + ShowWindow( parent, SW_SHOW); + UpdateWindow( parent); + GetClientRect( hwnd1, &rc); + hdc = GetDC( hwnd1); + /* paint the upper half of the window black */ + rc2 = rc; + rc2.bottom = ( rc.top + rc.bottom) /2; + FillRect( hdc, &rc2, GetStockObject(BLACK_BRUSH)); + /* clip region is the lower half */ + cliprc=rc; + cliprc.top = (rc.top + rc.bottom) /2; + /* test whether scrolled pixels are properly clipped */ + colr = GetPixel( hdc, (rc.left+rc.right)/2, ( rc.top + rc.bottom) /2 - 1); + ok ( colr == 0, "pixel should be black, color is %08lx\n", colr); + /* this scroll should not cause any visible changes */ + ScrollDC( hdc, 5, -20, &rc, &cliprc, hrgn, &rcu); + colr = GetPixel( hdc, (rc.left+rc.right)/2, ( rc.top + rc.bottom) /2 - 1); + ok ( colr == 0, "pixel should be black, color is %08lx\n", colr); + + ScrollDC( hdc, 20, -20, &rc, NULL, hrgn, &rcu); + /*FillRgn(hdc, hrgn, GetStockObject(WHITE_BRUSH));*/ + trace("update rect: %ld,%ld - %ld,%ld\n", + rcu.left, rcu.top, rcu.right, rcu.bottom); + if (winetest_debug > 0) dump_region(hrgn); + SetRect(&rc2, 0, 0, 100, 100); + ok(EqualRect(&rcu, &rc2), "rects do not match (%ld,%ld-%ld,%ld) / (%ld,%ld-%ld,%ld)\n", + rcu.left, rcu.top, rcu.right, rcu.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); + + exprgn = CreateRectRgn(0, 0, 20, 80); + tmprgn = CreateRectRgn(0, 80, 100, 100); + CombineRgn(exprgn, exprgn, tmprgn, RGN_OR); + if (winetest_debug > 0) dump_region(exprgn); + ok(EqualRgn(exprgn, hrgn), "wrong update region\n"); + + /* clean up */ + DeleteObject(hrgn); + DeleteObject(exprgn); + DeleteObject(tmprgn); + DestroyWindow(hwnd1); +} + static void test_params(void) { HWND hwnd; @@ -3533,6 +3587,7 @@ START_TEST(win) test_validatergn(hwndMain); test_nccalcscroll( hwndMain); test_scrollvalidate( hwndMain); + test_scrolldc( hwndMain); test_scroll(); test_IsWindowUnicode(); test_vis_rgn(hwndMain); diff --git a/dlls/x11drv/scroll.c b/dlls/x11drv/scroll.c index 78144da..e0c2f83 100644 --- a/dlls/x11drv/scroll.c +++ b/dlls/x11drv/scroll.c @@ -110,7 +110,11 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I /* Then clip again to get the source rectangle that will remain in the * clipping rect */ rcSrc = rcClip; - IntersectRect( &rcSrc, &rcSrc, &rcClip); + if (lprcClip) + { + OffsetRect( &rcSrc, -dx, -dy); + IntersectRect( &rcSrc, &rcSrc, &rcClip); + } /* now convert to device coordinates */ LPtoDP(hdc, (LPPOINT)&rcSrc, 2); TRACE("source rect: %s\n", wine_dbgstr_rect(&rcSrc)); @@ -141,7 +145,7 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I TRACE("destination rect: %s\n", wine_dbgstr_rect(&rect)); BitBlt( hdc, rect.left, rect.top, - rect.right - rect.left, rect.bottom -rect.top, + rect.right - rect.left, rect.bottom - rect.top, hdc, rect.left - dx, rect.top - dy, SRCCOPY); } /* compute the update areas. This is the combined clip rectangle @@ -181,6 +185,7 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I if( !hrgnUpdate) DeleteObject( hrgn); } + /* restore original clipping region */ SelectClipRgn( hdc, clipRgn); DeleteObject( visrgn); DeleteObject( DstRgn);

1 0