November 2005 - Wine-commits

wine/dlls/dsound mixer.c
by Alexandre Julliard 01 Nov '05

01 Nov '05

ChangeSet ID: 21013 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/01 04:18:55 Modified files: dlls/dsound : mixer.c Log message: Davin McCall <davmac(a)davmac.org> PhaseCancel subtracts secondary buffer from primary buffer, not the other way around. Patch: http://cvs.winehq.org/patch.py?id=21013 Old revision New revision Changes Path 1.41 1.42 +8 -8 wine/dlls/dsound/mixer.c Index: wine/dlls/dsound/mixer.c diff -u -p wine/dlls/dsound/mixer.c:1.41 wine/dlls/dsound/mixer.c:1.42 --- wine/dlls/dsound/mixer.c 1 Nov 2005 10:18:55 -0000 +++ /dev/null 1 Nov 2005 10:18:55 -0000 @@ -536,8 +536,8 @@ static void DSOUND_PhaseCancel(IDirectSo for (i = 0; i < todo; i++) { /* 8-bit WAV is unsigned */ - field = (*ibuf++ - 128); - field -= (*obuf - 128); + field = (*obuf - 128); + field -= (*ibuf++ - 128); if (field > 127) field = 127; else if (field < -128) field = -128; *obuf++ = field + 128; @@ -549,8 +549,8 @@ static void DSOUND_PhaseCancel(IDirectSo for (i = 0; i < todo; i++) { /* 8-bit WAV is unsigned */ - field = (*ibuf++ - 128); - field -= (*obuf - 128); + field = (*obuf - 128); + field -= (*ibuf++ - 128); if (field > 127) field = 127; else if (field < -128) field = -128; *obuf++ = field + 128; @@ -569,8 +569,8 @@ static void DSOUND_PhaseCancel(IDirectSo for (i = 0; i < todo; i++) { /* 16-bit WAV is signed */ - field = *ibufs++; - field -= *obufs; + field = *obufs; + field -= *ibufs++; if (field > 32767) field = 32767; else if (field < -32768) field = -32768; *obufs++ = field; @@ -582,8 +582,8 @@ static void DSOUND_PhaseCancel(IDirectSo for (i = 0; i < todo; i++) { /* 16-bit WAV is signed */ - field = *ibufs++; - field -= *obufs; + field = *obufs; + field -= *ibufs++; if (field > 32767) field = 32767; else if (field < -32768) field = -32768; *obufs++ = field;

1 0

wine/dlls/user painting.c
by Alexandre Julliard 01 Nov '05

01 Nov '05

ChangeSet ID: 21012 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/01 03:53:59 Modified files: dlls/user : painting.c Log message: Michael Kaufmann <hallo(a)michael-kaufmann.ch> ScrollWindowEx: Don't move the caret of child windows and hide it only if it's in the source or in the destination rectangle. Patch: http://cvs.winehq.org/patch.py?id=21012 Old revision New revision Changes Path 1.34 1.35 +66 -18 wine/dlls/user/painting.c Index: wine/dlls/user/painting.c diff -u -p wine/dlls/user/painting.c:1.34 wine/dlls/user/painting.c:1.35 --- wine/dlls/user/painting.c 1 Nov 2005 9:53:59 -0000 +++ /dev/null 1 Nov 2005 9:53:59 -0000 @@ -346,30 +346,75 @@ static void update_now( HWND hwnd, UINT /************************************************************************* * fix_caret * - * Helper for ScrollWindowEx. + * Helper for ScrollWindowEx: + * If the return value is 0, no special caret handling is necessary. + * Otherwise the return value is the handle of the window that owns the + * caret. Its caret needs to be hidden during the scroll operation and + * moved to new_caret_pos if move_caret is TRUE. */ -static HWND fix_caret(HWND hWnd, LPRECT lprc, UINT flags) +static HWND fix_caret(HWND hWnd, const LPRECT scroll_rect, INT dx, INT dy, + UINT flags, LPBOOL move_caret, LPPOINT new_caret_pos) { GUITHREADINFO info; + RECT rect, mapped_rcCaret; + BOOL hide_caret = FALSE; if (!GetGUIThreadInfo( GetCurrentThreadId(), &info )) return 0; if (!info.hwndCaret) return 0; - if (info.hwndCaret == hWnd || - ((flags & SW_SCROLLCHILDREN) && IsChild(hWnd, info.hwndCaret))) + + if (info.hwndCaret == hWnd) { - POINT pt; - pt.x = info.rcCaret.left; - pt.y = info.rcCaret.top; - MapWindowPoints( info.hwndCaret, hWnd, (LPPOINT)&info.rcCaret, 2 ); - if( IntersectRect(lprc, lprc, &info.rcCaret) ) + /* Move the caret if it's (partially) in the source rectangle */ + if (IntersectRect(&rect, scroll_rect, &info.rcCaret)) { - HideCaret(0); - lprc->left = pt.x; - lprc->top = pt.y; - return info.hwndCaret; + *move_caret = TRUE; + hide_caret = TRUE; + new_caret_pos->x = info.rcCaret.left + dx; + new_caret_pos->y = info.rcCaret.top + dy; + } + else + { + *move_caret = FALSE; + + /* Hide the caret if it's in the destination rectangle */ + rect = *scroll_rect; + OffsetRect(&rect, dx, dy); + hide_caret = IntersectRect(&rect, &rect, &info.rcCaret); + } + } + else + { + if ((flags & SW_SCROLLCHILDREN) && IsChild(hWnd, info.hwndCaret)) + { + *move_caret = FALSE; + + /* Hide the caret if it's in the source or in the destination + rectangle */ + mapped_rcCaret = info.rcCaret; + MapWindowPoints(info.hwndCaret, hWnd, (LPPOINT)&mapped_rcCaret, 2); + + if (IntersectRect(&rect, scroll_rect, &mapped_rcCaret)) + { + hide_caret = TRUE; + } + else + { + rect = *scroll_rect; + OffsetRect(&rect, dx, dy); + hide_caret = IntersectRect(&rect, &rect, &mapped_rcCaret); + } } + else + return 0; } - return 0; + + if (hide_caret) + { + HideCaret(info.hwndCaret); + return info.hwndCaret; + } + else + return 0; } @@ -756,8 +801,9 @@ INT WINAPI ScrollWindowEx( HWND hwnd, IN HRGN hrgnWinupd = 0; HDC hDC; RECT rc, cliprc; - RECT caretrc; HWND hwndCaret = NULL; + BOOL moveCaret = FALSE; + POINT newCaretPos; TRACE( "%p, %d,%d hrgnUpdate=%p rcUpdate = %p %s %04x\n", hwnd, dx, dy, hrgnUpdate, rcUpdate, wine_dbgstr_rect(rect), flags ); @@ -780,11 +826,13 @@ INT WINAPI ScrollWindowEx( HWND hwnd, IN if( hrgnUpdate ) bOwnRgn = FALSE; else if( bUpdate ) hrgnUpdate = CreateRectRgn( 0, 0, 0, 0 ); + newCaretPos.x = newCaretPos.y = 0; + if( !IsRectEmpty(&cliprc) && (dx || dy)) { DWORD dcxflags = DCX_CACHE; DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); - caretrc = rc; - hwndCaret = fix_caret(hwnd, &caretrc, flags); + + hwndCaret = fix_caret(hwnd, &rc, dx, dy, flags, &moveCaret, &newCaretPos); if( style & WS_CLIPSIBLINGS) dcxflags |= DCX_CLIPSIBLINGS; if( GetClassLongW( hwnd, GCL_STYLE ) & CS_PARENTDC) @@ -859,7 +907,7 @@ INT WINAPI ScrollWindowEx( HWND hwnd, IN } if( hwndCaret ) { - SetCaretPos( caretrc.left + dx, caretrc.top + dy ); + if ( moveCaret ) SetCaretPos( newCaretPos.x, newCaretPos.y ); ShowCaret(hwndCaret); }

1 0

wine/dlls/shell32 shlfolder.c shfldr_fs.c shfl ...
by Alexandre Julliard 01 Nov '05

01 Nov '05

ChangeSet ID: 21011 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/01 03:34:03 Modified files: dlls/shell32 : shlfolder.c shfldr_fs.c shfldr_desktop.c shfldr.h Log message: Robert Shearman <rob(a)codeweavers.com> Convert SHELL32_BindToChild to Unicode and fix up the callers. Patch: http://cvs.winehq.org/patch.py?id=21011 Old revision New revision Changes Path 1.104 1.105 +14 -17 wine/dlls/shell32/shlfolder.c 1.47 1.48 +3 -1 wine/dlls/shell32/shfldr_fs.c 1.47 1.48 +1 -4 wine/dlls/shell32/shfldr_desktop.c 1.10 1.11 +1 -1 wine/dlls/shell32/shfldr.h Index: wine/dlls/shell32/shlfolder.c diff -u -p wine/dlls/shell32/shlfolder.c:1.104 wine/dlls/shell32/shlfolder.c:1.105 --- wine/dlls/shell32/shlfolder.c 1 Nov 2005 9:34: 3 -0000 +++ /dev/null 1 Nov 2005 9:34: 3 -0000 @@ -192,12 +192,12 @@ HRESULT SHELL32_ParseNextElement (IShell * pathRoot can be NULL for Folders beeing a drive. * In this case the absolute path is build from pidlChild (eg. C:) */ -HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCSTR pathRoot, +static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlChild, REFCLSID clsid, REFIID riid, LPVOID * ppvOut) { HRESULT hr; - TRACE ("%p %s %p\n", pidlRoot, pathRoot, pidlChild); + TRACE ("%p %s %p\n", pidlRoot, debugstr_w(pathRoot), pidlChild); if (SUCCEEDED ((hr = SHCoCreateInstance (NULL, clsid, NULL, riid, ppvOut)))) { LPITEMIDLIST pidlAbsolute = ILCombine (pidlRoot, pidlChild); @@ -208,32 +208,29 @@ HRESULT SHELL32_CoCreateInitSF (LPCITEMI SUCCEEDED (IUnknown_QueryInterface ((IUnknown *) * ppvOut, &IID_IPersistFolder3, (LPVOID *) & ppf))) { PERSIST_FOLDER_TARGET_INFO ppfti; - char szDestPath[MAX_PATH]; ZeroMemory (&ppfti, sizeof (ppfti)); + /* fill the PERSIST_FOLDER_TARGET_INFO */ + ppfti.dwAttributes = -1; + ppfti.csidl = -1; + /* build path */ if (pathRoot) { - lstrcpyA (szDestPath, pathRoot); - PathAddBackslashA(szDestPath); /* FIXME: why have drives a backslash here ? */ - } else { - szDestPath[0] = '\0'; + lstrcpynW (ppfti.szTargetParsingName, pathRoot, MAX_PATH - 1); + PathAddBackslashW(ppfti.szTargetParsingName); /* FIXME: why have drives a backslash here ? */ } if (pidlChild) { - LPSTR pszChild = _ILGetTextPointer(pidlChild); + LPCSTR pszChild = _ILGetTextPointer(pidlChild); + int len = lstrlenW(ppfti.szTargetParsingName); if (pszChild) - lstrcatA (szDestPath, pszChild); + MultiByteToWideChar (CP_ACP, 0, pszChild, -1, ppfti.szTargetParsingName + len, MAX_PATH - len); else hr = E_INVALIDARG; } - /* fill the PERSIST_FOLDER_TARGET_INFO */ - ppfti.dwAttributes = -1; - ppfti.csidl = -1; - MultiByteToWideChar (CP_ACP, 0, szDestPath, -1, ppfti.szTargetParsingName, MAX_PATH); - IPersistFolder3_InitializeEx (ppf, NULL, pidlAbsolute, &ppfti); IPersistFolder3_Release (ppf); } @@ -265,7 +262,7 @@ HRESULT SHELL32_CoCreateInitSF (LPCITEMI * means you probably can't use it for your IShellFolder implementation. */ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, - LPCSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut) + LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut) { GUID const *clsid; IShellFolder *pSF; @@ -290,10 +287,10 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLI /* see if folder CLSID should be overridden by desktop.ini file */ if (pathRoot) { - MultiByteToWideChar(CP_ACP, 0, pathRoot, -1, wszFolderPath, MAX_PATH); + lstrcpynW(wszFolderPath, pathRoot, MAX_PATH); pwszPathTail = PathAddBackslashW(wszFolderPath); } - MultiByteToWideChar(CP_ACP, 0, _ILGetTextPointer(pidlChild), -1, pwszPathTail, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, _ILGetTextPointer(pidlChild), -1, pwszPathTail, MAX_PATH - (int)(pwszPathTail - wszFolderPath)); if (SHELL32_GetCustomFolderAttributeFromPath (wszFolderPath, wszDotShellClassInfo, wszCLSID, wszCLSIDValue, CHARS_IN_GUID)) CLSIDFromString (wszCLSIDValue, &clsidFolder); Index: wine/dlls/shell32/shfldr_fs.c diff -u -p wine/dlls/shell32/shfldr_fs.c:1.47 wine/dlls/shell32/shfldr_fs.c:1.48 --- wine/dlls/shell32/shfldr_fs.c 1 Nov 2005 9:34: 4 -0000 +++ /dev/null 1 Nov 2005 9:34: 4 -0000 @@ -481,11 +481,13 @@ IShellFolder_fnBindToObject (IShellFolde LPBC pbc, REFIID riid, LPVOID * ppvOut) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); + WCHAR szPath[MAX_PATH]; TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbc, shdebugstr_guid (riid), ppvOut); - return SHELL32_BindToChild (This->pidlRoot, This->sPathTarget, pidl, riid, + MultiByteToWideChar(CP_ACP, 0, This->sPathTarget, -1, szPath, MAX_PATH); + return SHELL32_BindToChild (This->pidlRoot, szPath, pidl, riid, ppvOut); } Index: wine/dlls/shell32/shfldr_desktop.c diff -u -p wine/dlls/shell32/shfldr_desktop.c:1.47 wine/dlls/shell32/shfldr_desktop.c:1.48 --- wine/dlls/shell32/shfldr_desktop.c 1 Nov 2005 9:34: 4 -0000 +++ /dev/null 1 Nov 2005 9:34: 4 -0000 @@ -341,14 +341,11 @@ static HRESULT WINAPI ISF_Desktop_fnBind LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) { IGenericSFImpl *This = (IGenericSFImpl *)iface; - char szPath[MAX_PATH]; TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); - WideCharToMultiByte( CP_ACP, 0, This->sPathTarget, -1, - szPath, MAX_PATH, NULL, NULL ); - return SHELL32_BindToChild( This->pidlRoot, szPath, pidl, riid, ppvOut ); + return SHELL32_BindToChild( This->pidlRoot, This->sPathTarget, pidl, riid, ppvOut ); } /************************************************************************** Index: wine/dlls/shell32/shfldr.h diff -u -p wine/dlls/shell32/shfldr.h:1.10 wine/dlls/shell32/shfldr.h:1.11 --- wine/dlls/shell32/shfldr.h 1 Nov 2005 9:34: 4 -0000 +++ /dev/null 1 Nov 2005 9:34: 4 -0000 @@ -43,7 +43,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (I DWORD dwOutLen); HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, - LPCSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut); + LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut); HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path);

1 0

wine/dlls/ntdll signal_i386.c exception.c
by Alexandre Julliard 01 Nov '05

01 Nov '05

ChangeSet ID: 21010 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/01 03:21:03 Modified files: dlls/ntdll : signal_i386.c exception.c Log message: Robert Shearman <rob(a)codeweavers.com> Make the call exception handler function more compatible with NT and with what Shrinker expects. Patch: http://cvs.winehq.org/patch.py?id=21010 Old revision New revision Changes Path 1.101 1.102 +37 -22 wine/dlls/ntdll/signal_i386.c 1.86 1.87 +0 -2 wine/dlls/ntdll/exception.c Index: wine/dlls/ntdll/signal_i386.c diff -u -p wine/dlls/ntdll/signal_i386.c:1.101 wine/dlls/ntdll/signal_i386.c:1.102 --- wine/dlls/ntdll/signal_i386.c 1 Nov 2005 9:21: 3 -0000 +++ /dev/null 1 Nov 2005 9:21: 3 -0000 @@ -1387,33 +1387,48 @@ __ASM_GLOBAL_FUNC( DbgUserBreakPoint, "i /********************************************************************** * EXC_CallHandler (internal) + * + * Some exception handlers depend on EBP to have a fixed position relative to + * the exception frame. + * Shrinker depends on (*1) doing what it does, + * (*2) being the exact instruction it is and (*3) beginning with 0x64 + * (i.e. the %fs prefix to the movl instruction). It also depends on the + * function calling the handler having only 5 parameters (*4). */ __ASM_GLOBAL_FUNC( EXC_CallHandler, " pushl %ebp\n" " movl %esp, %ebp\n" -" subl $12, %esp\n" -" movl 28(%ebp), %eax\n" -" movl 12(%ebp), %edx\n" -" movl %eax, -8(%ebp)\n" -" movl %edx, -4(%ebp)\n" -" leal -12(%ebp), %eax\n" -" .byte 0x64\n" -" movl (0),%ecx\n" -" movl %ecx,(%eax)\n" -" .byte 0x64\n" -" movl %eax,(0)\n" -" movl 20(%ebp), %eax\n" -" pushl %eax\n" -" movl 16(%ebp), %eax\n" -" pushl %eax\n" -" movl 8(%ebp), %eax\n" -" pushl %edx\n" -" pushl %eax\n" -" call *24(%ebp)\n" -" movl -12(%ebp), %edx\n" -" .byte 0x64\n" -" movl %edx,(0)\n" +" movl 28(%ebp), %edx\n" /* ugly hack to pass the 6th param needed because of Shrinker */ +" pushl 24(%ebp)\n" +" pushl 20(%ebp)\n" +" pushl 16(%ebp)\n" +" pushl 12(%ebp)\n" +" pushl 8(%ebp)\n" +" call call_exception_handler\n" " leave\n" " ret\n" ); +__ASM_GLOBAL_FUNC(call_exception_handler, +" pushl %ebp\n" +" movl %esp, %ebp\n" +" pushl 12(%ebp)\n" /* make any exceptions in this... */ +" pushl %edx\n" /* handler be handled by... */ +" .byte 0x64\n" +" pushl (0)\n" /* nested_handler (passed in edx). */ +" .byte 0x64\n" +" movl %esp,(0)\n" /* push the new exception frame onto the exception stack. */ +" pushl 20(%ebp)\n" +" pushl 16(%ebp)\n" +" pushl 12(%ebp)\n" +" pushl 8(%ebp)\n" +" movl 24(%ebp), %ecx\n" /* (*1) */ +" call *%ecx\n" /* call handler. (*2) */ +" .byte 0x64\n" +" movl (0), %esp\n" /* restore previous... (*3) */ +" .byte 0x64\n" +" popl (0)\n" /* exception frame. */ +" movl %ebp, %esp\n" /* restore saved stack, in case it was corrupted */ +" popl %ebp\n" +" ret $20\n" /* (*4) */ +); #endif /* __i386__ */ Index: wine/dlls/ntdll/exception.c diff -u -p wine/dlls/ntdll/exception.c:1.86 wine/dlls/ntdll/exception.c:1.87 --- wine/dlls/ntdll/exception.c 1 Nov 2005 9:21: 3 -0000 +++ /dev/null 1 Nov 2005 9:21: 3 -0000 @@ -114,8 +114,6 @@ static DWORD EXC_UnwindHandler( EXCEPTIO * * Call an exception handler, setting up an exception frame to catch exceptions * happening during the handler execution. - * Please do not change the first 4 parameters order in any way - some exceptions handlers - * rely on Base Pointer (EBP) to have a fixed position related to the exception frame * * For i386 this function is implemented in assembler in signal_i386.c. */

1 0

CVSROOT/. log_accum
by Alexandre Julliard 01 Nov '05

01 Nov '05

ChangeSet ID: 21009 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2005/11/01 03:10:49 Modified files: . : log_accum Log message: Added support for sending XML notifications to the CIA bot. Patch: http://cvs.winehq.org/patch.py?id=21009 Old revision New revision Changes Path 1.29 1.30 +98 -18 CVSROOT/log_accum

1 0