October 2010 - Wine-commits

Alexandre Julliard : winex11: Sending a move/ resize client message to the root requires a SubstructureRedirect mask too.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 6bca77790aea45433ce35a8d5c628400ddba6160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bca77790aea45433ce35a8d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 1 20:06:05 2010 +0200 winex11: Sending a move/resize client message to the root requires a SubstructureRedirect mask too. (cherry picked from commit a4704d3d14273137b05cedfba1bc3cff166dd542) --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b3118cc..8957a44 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2671,7 +2671,7 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) * with a ButtonPress event */ wine_tsx11_lock(); XUngrabPointer( display, CurrentTime ); - XSendEvent(display, root_window, False, SubstructureNotifyMask, &xev); + XSendEvent(display, root_window, False, SubstructureNotifyMask | SubstructureRedirectMask, &xev); wine_tsx11_unlock(); return 0; }

1 0

Ken Thomases : winex11: Pass window property to server in 64KB chunks.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: ee626d20873067c2f15d12c496311d40363eab78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee626d20873067c2f15d12c49… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Aug 23 22:40:19 2010 -0500 winex11: Pass window property to server in 64KB chunks. Large clipboard contents, like images, can exceed the maximum X request size if sent all at once, which can cause the X server to kill the connection. (cherry picked from commit b95275115839ded61f4f56d2c6f444819a7671ce) --- dlls/winex11.drv/clipboard.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 584136a..fcec86b 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -3227,11 +3227,20 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev if (hClipData && (lpClipData = GlobalLock(hClipData))) { + int mode = PropModeReplace; + TRACE("\tUpdating property %s, %d bytes\n", debugstr_w(lpFormat->Name), cBytes); wine_tsx11_lock(); - XChangeProperty(display, request, rprop, event->target, - 8, PropModeReplace, lpClipData, cBytes); + do + { + int nelements = min(cBytes, 65536); + XChangeProperty(display, request, rprop, event->target, + 8, mode, lpClipData, nelements); + mode = PropModeAppend; + cBytes -= nelements; + lpClipData += nelements; + } while (cBytes > 0); wine_tsx11_unlock(); GlobalUnlock(hClipData);

1 0

Vincent Povirk : winecfg: Don't allow virtual desktops smaller than 640x480 .
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 8601c6c00de4cb1450ef564e4841d15a4bc144de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8601c6c00de4cb1450ef564e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 23 17:45:26 2010 -0500 winecfg: Don't allow virtual desktops smaller than 640x480. (cherry picked from commit be1aa20276706f216c76796de91be91300165c3b) --- programs/winecfg/x11drvdlg.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index bf1950c..d3d7220 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -189,6 +189,8 @@ static void set_from_desktop_edits(HWND dialog) static const WCHAR x[] = {'x',0}; static const WCHAR def_width[] = {'8','0','0',0}; static const WCHAR def_height[] = {'6','0','0',0}; + static const WCHAR min_width[] = {'6','4','0',0}; + static const WCHAR min_height[] = {'4','8','0',0}; WCHAR *width, *height, *new; const WCHAR *desktop_name = current_app ? current_app : defaultW; @@ -203,10 +205,20 @@ static void set_from_desktop_edits(HWND dialog) HeapFree(GetProcessHeap(), 0, width); width = strdupW(def_width); } + else if (atoiW(width) < atoiW(min_width)) + { + HeapFree(GetProcessHeap(), 0, width); + width = strdupW(min_width); + } if (!height || !height[0]) { HeapFree(GetProcessHeap(), 0, height); height = strdupW(def_height); } + else if (atoiW(height) < atoiW(min_height)) + { + HeapFree(GetProcessHeap(), 0, height); + height = strdupW(min_height); + } new = HeapAlloc(GetProcessHeap(), 0, (strlenW(width) + strlenW(height) + 2) * sizeof(WCHAR)); strcpyW( new, width );

1 0

Detlef Riekenberg : winhelp.exe16: Add missing separator after command name .
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: b29099857121243aa2f9acf81350437f1619065f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29099857121243aa2f9acf81… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 18 20:24:31 2010 +0200 winhelp.exe16: Add missing separator after command name. (cherry picked from commit 115bf743b86ec2d702161f93c38afcf3dda92b7c) --- programs/winhelp.exe16/winhelp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhelp.exe16/winhelp.c b/programs/winhelp.exe16/winhelp.c index 6bfa3f6..f255d91 100644 --- a/programs/winhelp.exe16/winhelp.c +++ b/programs/winhelp.exe16/winhelp.c @@ -31,11 +31,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhelp); */ WORD WINAPI WinMain16( HINSTANCE16 inst, HINSTANCE16 prev, LPSTR cmdline, WORD show ) { - int len = GetSystemDirectoryA( NULL, 0 ) + sizeof("\\winhlp32.exe") + strlen(cmdline); + int len = GetSystemDirectoryA( NULL, 0 ) + sizeof("\\winhlp32.exe ") + strlen(cmdline); char *buffer = HeapAlloc( GetProcessHeap(), 0, len ); GetSystemDirectoryA( buffer, len ); - strcat( buffer, "\\winhlp32.exe" ); + strcat( buffer, "\\winhlp32.exe " ); strcat( buffer, cmdline ); WINE_TRACE( "starting %s\n", wine_dbgstr_a(buffer) );

1 0

Marcus Meissner : ntdll: Set correct protection flags on sections in builtin DLLs.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 89778ed7779b5397f7fbc3515f324c8c941a5e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=89778ed7779b5397f7fbc3515… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Aug 23 17:12:53 2010 +0200 ntdll: Set correct protection flags on sections in builtin DLLs. (cherry picked from commit 2ca5513a6294a9e653c678bffee58a537d94d54d) --- dlls/ntdll/loader.c | 5 ++--- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/tests/info.c | 14 +++++++------- dlls/ntdll/virtual.c | 31 ++++++++++++++++++++++++++----- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4a2641b..c30243e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1404,9 +1404,8 @@ static void load_builtin_callback( void *module, const char *filename ) builtin_load_info->status = STATUS_INVALID_IMAGE_FORMAT; return; } - virtual_create_system_view( module, nt->OptionalHeader.SizeOfImage, - VPROT_SYSTEM | VPROT_IMAGE | VPROT_COMMITTED | - VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); + + virtual_create_builtin_view( module ); /* create the MODREF */ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index c7b721a..212edf5 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -155,7 +155,7 @@ extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_S /* virtual memory */ extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ); -extern NTSTATUS virtual_create_system_view( void *base, SIZE_T size, DWORD vprot ); +extern NTSTATUS virtual_create_builtin_view( void *base ); extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size ); extern void virtual_clear_thread_stack(void); extern BOOL virtual_handle_stack_fault( void *addr ); diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index a56bcd1..f30c6ab 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1077,15 +1077,15 @@ static void test_queryvirtualmemory(void) MEMORY_BASIC_INFORMATION mbi; char stackbuf[42]; - trace("Check flags of a function entry in NTDLL.DLL\n"); + trace("Check flags of a function entry in NTDLL.DLL at %p\n", pNtQueryVirtualMemory); status = pNtQueryVirtualMemory(NtCurrentProcess(), pNtQueryVirtualMemory, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); - todo_wine ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ); + ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ); - trace("Check flags of heap\n"); + trace("Check flags of heap at %p\n", GetProcessHeap()); status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); @@ -1095,7 +1095,7 @@ static void test_queryvirtualmemory(void) ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_EXECUTE_READWRITE, "mbi.Protect is 0x%x\n", mbi.Protect); - trace("Check flags of stack\n"); + trace("Check flags of stack at %p\n", stackbuf); status = pNtQueryVirtualMemory(NtCurrentProcess(), stackbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); @@ -1103,7 +1103,7 @@ static void test_queryvirtualmemory(void) ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READWRITE); - trace("Check flags of read-only data\n"); + trace("Check flags of read-only data at %p\n", teststring); status = pNtQueryVirtualMemory(NtCurrentProcess(), teststring, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); @@ -1112,13 +1112,13 @@ static void test_queryvirtualmemory(void) if (mbi.Protect != PAGE_READONLY) todo_wine ok( mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READONLY); - trace("Check flags of read-write global data (.bss)\n"); + trace("Check flags of read-write global data (.bss) at %p\n", rwtestbuf); status = pNtQueryVirtualMemory(NtCurrentProcess(), rwtestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); - todo_wine ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); + ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); } static void test_affinity(void) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 84427fb..0158656 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1395,18 +1395,39 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) /*********************************************************************** * virtual_create_system_view */ -NTSTATUS virtual_create_system_view( void *base, SIZE_T size, DWORD vprot ) +NTSTATUS virtual_create_builtin_view( void *module ) { - FILE_VIEW *view; NTSTATUS status; sigset_t sigset; + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); + SIZE_T size = nt->OptionalHeader.SizeOfImage; + IMAGE_SECTION_HEADER *sec; + FILE_VIEW *view; + void *base; + int i; - size = ROUND_SIZE( base, size ); - base = ROUND_ADDR( base, page_mask ); + size = ROUND_SIZE( module, size ); + base = ROUND_ADDR( module, page_mask ); server_enter_uninterrupted_section( &csVirtual, &sigset ); - status = create_view( &view, base, size, vprot ); + status = create_view( &view, base, size, VPROT_SYSTEM | VPROT_IMAGE | + VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); if (!status) TRACE( "created %p-%p\n", base, (char *)base + size ); server_leave_uninterrupted_section( &csVirtual, &sigset ); + + if (status) return status; + + sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + DWORD flags = VPROT_SYSTEM | VPROT_IMAGE | VPROT_COMMITTED; + + if (sec[i].Characteristics & IMAGE_SCN_MEM_EXECUTE) flags |= VPROT_EXEC; + if (sec[i].Characteristics & IMAGE_SCN_MEM_READ) flags |= VPROT_READ; + if (sec[i].Characteristics & IMAGE_SCN_MEM_WRITE) flags |= VPROT_WRITE; + memset (view->prot + (sec[i].VirtualAddress >> page_shift), flags, + ROUND_SIZE( sec[i].VirtualAddress, sec[i].Misc.VirtualSize ) >> page_shift ); + } + return status; }

1 0

Alexandre Julliard : ntdll: Fix the protection state of writable sections.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 78fa6cb861fecf2718b5fddbaec2fb683e6aa512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78fa6cb861fecf2718b5fddba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 26 18:06:10 2010 +0200 ntdll: Fix the protection state of writable sections. (cherry picked from commit 5393f0a947a24c92fb0f6c654f5ac64a423e5081) --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 0158656..1428be0 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1277,7 +1277,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz size = ROUND_SIZE( sec->VirtualAddress, sec->SizeOfRawData ); if (sec->Characteristics & IMAGE_SCN_MEM_READ) vprot |= VPROT_READ; - if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_READ|VPROT_WRITECOPY; + if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_READ|VPROT_WRITE; if (sec->Characteristics & IMAGE_SCN_MEM_EXECUTE) vprot |= VPROT_EXEC; /* Dumb game crack lets the AOEP point into a data section. Adjust. */

1 0

Damjan Jovanovic : notepad: Substitute the page number in the footer.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 54e9bdcb9253490a8c8ad1905a5e9dcbf7823fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e9bdcb9253490a8c8ad1905… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Jul 16 16:54:12 2010 +0200 notepad: Substitute the page number in the footer. (cherry picked from commit 8b593e903f46ed287aec40960da97e33e221a1ce) --- programs/notepad/dialog.c | 62 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 60 insertions(+), 2 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index e19e4d6..ff5df75 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -717,11 +717,67 @@ static int notepad_print_header(HDC hdc, RECT *rc, BOOL dopage, BOOL header, int return 0; } +static WCHAR *expand_header_vars(WCHAR *pattern, int page) +{ + int length = 0; + int i; + BOOL inside = FALSE; + WCHAR *buffer = NULL; + + for (i = 0; pattern[i]; i++) + { + if (inside) + { + if (pattern[i] == '&') + length++; + else if (pattern[i] == 'p') + length += 11; + inside = FALSE; + } + else if (pattern[i] == '&') + inside = TRUE; + else + length++; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)); + if (buffer) + { + int j = 0; + inside = FALSE; + for (i = 0; pattern[i]; i++) + { + if (inside) + { + if (pattern[i] == '&') + buffer[j++] = '&'; + else if (pattern[i] == 'p') + { + static const WCHAR percent_dW[] = {'%','d',0}; + j += wnsprintfW(&buffer[j], 11, percent_dW, page); + } + inside = FALSE; + } + else if (pattern[i] == '&') + inside = TRUE; + else + buffer[j++] = pattern[i]; + } + buffer[j++] = 0; + } + return buffer; +} + static BOOL notepad_print_page(HDC hdc, RECT *rc, BOOL dopage, int page, LPTEXTINFO tInfo) { int b, y; TEXTMETRICW tm; SIZE szMetrics; + WCHAR *footer_text = NULL; + + footer_text = expand_header_vars(Globals.szFooter, page); + if (footer_text == NULL) + return FALSE; if (dopage) { @@ -730,13 +786,14 @@ static BOOL notepad_print_page(HDC hdc, RECT *rc, BOOL dopage, int page, LPTEXTI static const WCHAR failedW[] = { 'S','t','a','r','t','P','a','g','e',' ','f','a','i','l','e','d',0 }; static const WCHAR errorW[] = { 'P','r','i','n','t',' ','E','r','r','o','r',0 }; MessageBoxW(Globals.hMainWnd, failedW, errorW, MB_ICONEXCLAMATION); + HeapFree(GetProcessHeap(), 0, footer_text); return FALSE; } } GetTextMetricsW(hdc, &tm); y = rc->top + notepad_print_header(hdc, rc, dopage, TRUE, page, Globals.szFileName) * tm.tmHeight; - b = rc->bottom - 2 * notepad_print_header(hdc, rc, FALSE, FALSE, page, Globals.szFooter) * tm.tmHeight; + b = rc->bottom - 2 * notepad_print_header(hdc, rc, FALSE, FALSE, page, footer_text) * tm.tmHeight; do { INT m, n; @@ -804,11 +861,12 @@ static BOOL notepad_print_page(HDC hdc, RECT *rc, BOOL dopage, int page, LPTEXTI } } while (tInfo->mptr < tInfo->mend && y < b); - notepad_print_header(hdc, rc, dopage, FALSE, page, Globals.szFooter); + notepad_print_header(hdc, rc, dopage, FALSE, page, footer_text); if (dopage) { EndPage(hdc); } + HeapFree(GetProcessHeap(), 0, footer_text); return TRUE; }

1 0

Austin English : winscard: Add stubs for SCardIsValidContext/ SCardReleaseContext.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: a096bba3db6687e743ca1c254953654f875278f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a096bba3db6687e743ca1c254… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 16 13:20:52 2010 -0500 winscard: Add stubs for SCardIsValidContext/SCardReleaseContext. (cherry picked from commit f146fa0f81fe441620e0379d08d8c9602d973244) --- dlls/winscard/winscard.c | 14 ++++++++++++++ dlls/winscard/winscard.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index b9d5d46..bbf1d72 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -95,9 +95,23 @@ LONG WINAPI SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, return SCARD_F_INTERNAL_ERROR; } +LONG WINAPI SCardIsValidContext(SCARDCONTEXT context) +{ + FIXME("(%lx) stub\n", context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} + LONG WINAPI SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, LPCGUID rgguidInterfaces, DWORD cguidInterfaceCount, LPSTR mszCards, LPDWORD pcchCards) { FIXME(": stub\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } + +LONG WINAPI SCardReleaseContext(SCARDCONTEXT context) +{ + FIXME("(%lx) stub\n", context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 67c0d9f..116cb04 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -33,7 +33,7 @@ @ stub SCardIntroduceReaderGroupA @ stub SCardIntroduceReaderGroupW @ stub SCardIntroduceReaderW -@ stub SCardIsValidContext +@ stdcall SCardIsValidContext(long) @ stdcall SCardListCardsA(long ptr ptr long str long) @ stub SCardListCardsW @ stub SCardListInterfacesA @@ -47,7 +47,7 @@ @ stub SCardLocateCardsByATRW @ stub SCardLocateCardsW @ stub SCardReconnect -@ stub SCardReleaseContext +@ stdcall SCardReleaseContext(long) @ stub SCardReleaseStartedEvent @ stub SCardRemoveReaderFromGroupA @ stub SCardRemoveReaderFromGroupW

1 0

Alexandre Julliard : winex11: Fix handling of the lpDx array in ExtTextOut for the non-Xrender case.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 1869c1364ac4867a1e4a307c202189941c479ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1869c1364ac4867a1e4a307c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 23:10:49 2010 +0200 winex11: Fix handling of the lpDx array in ExtTextOut for the non-Xrender case. (cherry picked from commit b01be941d0b017a9e65ea85f15d0a9e8a5b34060) --- dlls/winex11.drv/text.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/text.c b/dlls/winex11.drv/text.c index 7773588..1431bc1 100644 --- a/dlls/winex11.drv/text.c +++ b/dlls/winex11.drv/text.c @@ -62,14 +62,10 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, if (pfo->lf.lfEscapement && pfo->lpX11Trans) rotated = TRUE; - TRACE("hdc=%p df=%04x %d,%d %s, %d flags=%d lpDx=%p\n", - physDev->hdc, (UINT16)(physDev->font), x, y, + TRACE("hdc=%p df=%04x %d,%d rc %s %s, %d flags=%d lpDx=%p\n", + physDev->hdc, (UINT16)physDev->font, x, y, wine_dbgstr_rect(lprect), debugstr_wn (wstr, count), count, flags, lpDx); - if (lprect != NULL) TRACE("\trect=(%d,%d - %d,%d)\n", - lprect->left, lprect->top, - lprect->right, lprect->bottom ); - /* Draw the rectangle */ if (flags & ETO_OPAQUE) @@ -126,24 +122,26 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, } else { - XTextItem16 *items, *pitem; + XTextItem16 *items; - pitem = items = HeapAlloc( GetProcessHeap(), 0, - count * sizeof(XTextItem16) ); + items = HeapAlloc( GetProcessHeap(), 0, count * sizeof(XTextItem16) ); if(items == NULL) goto FAIL; - for(i = 0; i < count; i++) + items[0].chars = str2b; + items[0].delta = 0; + items[0].nchars = 1; + items[0].font = None; + for(i = 1; i < count; i++) { - pitem->chars = str2b + i; - pitem->delta = lpDx[i]; - pitem->nchars = 1; - pitem->font = None; - pitem++; + items[i].chars = str2b + i; + items[i].delta = (flags & ETO_PDY) ? lpDx[(i - 1) * 2] : lpDx[i - 1]; + items[i].delta -= X11DRV_cptable[pfo->fi->cptable].pTextWidth( pfo, str2b + i - 1, 1 ); + items[i].nchars = 1; + items[i].font = None; } - X11DRV_cptable[pfo->fi->cptable].pDrawText( pfo, gdi_display, physDev->drawable, physDev->gc, - physDev->dc_rect.left + x, physDev->dc_rect.top + y, items, pitem - items ); + physDev->dc_rect.left + x, physDev->dc_rect.top + y, items, count ); HeapFree( GetProcessHeap(), 0, items ); } } @@ -167,7 +165,7 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, x_i, y_i, &str2b[i], 1); if (lpDx) { - offset += lpDx[i]; + offset += (flags & ETO_PDY) ? lpDx[i * 2] : lpDx[i]; } else {

1 0

Harald Hoyer : preloader: Fix moving of auxiliary values.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: c7ba27426099b26adec22aae807ba79360dab8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ba27426099b26adec22aae8… Author: Harald Hoyer <harald(a)redhat.com> Date: Thu Jul 29 12:02:06 2010 +0200 preloader: Fix moving of auxiliary values. (cherry picked from commit 2bea45dd0a0ca74f53d1560e7498419962b9c34d) --- loader/preloader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 83a5172..2dc2872 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -519,7 +519,7 @@ static void set_auxiliary_values( ElfW(auxv_t) *av, const ElfW(auxv_t) *new_av, } else if (new_count < delete_count) /* get rid of unused values */ { - int len = (char *)(av + av_count + 1) - dst; + int len = (char *)(av + av_count + 1) - src; for (i = len - 1; i >= 0; i--) dst[i] = src[i]; } *stack = dst;

1 0