Ros-diffs January 2013

ros-diffs@reactos.org

11 participants
185 discussions

[hbelusca] 58087: [REGEDIT] - Use REG_OPTION_NON_VOLATILE instead of 0 in RegCreateKeyEx. - Do not rename keys when they have the same name, case-insensitive (as Windows does), fix for r58079 / COR...
by hbelusca＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: hbelusca Date: Tue Jan 1 16:06:02 2013 New Revision: 58087 URL: http://svn.reactos.org/svn/reactos?rev=58087&view=rev Log: [REGEDIT] - Use REG_OPTION_NON_VOLATILE instead of 0 in RegCreateKeyEx. - Do not rename keys when they have the same name, case-insensitive (as Windows does), fix for r58079 / CORE-6205. Modified: trunk/reactos/base/applications/regedit/edit.c trunk/reactos/base/applications/regedit/find.c trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] Tue Jan 1 16:06:02 2013 @@ -1344,7 +1344,7 @@ } /* create the destination subkey */ - lResult = RegCreateKeyExW(hDestKey, lpDestSubKey, 0, NULL, 0, KEY_WRITE, NULL, + lResult = RegCreateKeyExW(hDestKey, lpDestSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hDestSubKey, &dwDisposition); if (lResult) goto done; @@ -1399,11 +1399,11 @@ if (!lpSrcSubKey) return ERROR_INVALID_FUNCTION; - if (wcscmp(lpDestSubKey, lpSrcSubKey) == 0) - { - /* destination name equals source name */ - return ERROR_SUCCESS; - } + if (_wcsicmp(lpDestSubKey, lpSrcSubKey) == 0) + { + /* Destination name equals source name */ + return ERROR_SUCCESS; + } lResult = CopyKey(hDestKey, lpDestSubKey, hSrcKey, lpSrcSubKey); if (lResult == ERROR_SUCCESS) Modified: trunk/reactos/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/find.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/find.c [iso-8859-1] Tue Jan 1 16:06:02 2013 @@ -586,7 +586,7 @@ DWORD dwDisposition; DWORD dwData; - if (RegCreateKeyExW(HKEY_CURRENT_USER, g_szGeneralRegKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition) == ERROR_SUCCESS) + if (RegCreateKeyExW(HKEY_CURRENT_USER, g_szGeneralRegKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition) == ERROR_SUCCESS) { dwData = (dwFlags >> 0) & 0x0000FFFF; RegSetValueExW(hKey, s_szFindFlags, 0, REG_DWORD, (const BYTE *) &dwData, sizeof(dwData)); Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] Tue Jan 1 16:06:02 2013 @@ -458,17 +458,16 @@ if (!parseKeyName(stdInput, &keyClass, &keyPath)) return ERROR_INVALID_PARAMETER; - res = RegCreateKeyExW( - keyClass, /* Class */ - keyPath, /* Sub Key */ - 0, /* MUST BE 0 */ - NULL, /* object type */ - REG_OPTION_NON_VOLATILE, /* option, REG_OPTION_NON_VOLATILE ... */ - KEY_ALL_ACCESS, /* access mask, KEY_ALL_ACCESS */ - NULL, /* security attribute */ - &currentKeyHandle, /* result */ - &dwDisp); /* disposition, REG_CREATED_NEW_KEY or - REG_OPENED_EXISTING_KEY */ + res = RegCreateKeyExW(keyClass, /* Class */ + keyPath, /* Sub Key */ + 0, /* MUST BE 0 */ + NULL, /* object type */ + REG_OPTION_NON_VOLATILE, /* option, REG_OPTION_NON_VOLATILE ... */ + KEY_ALL_ACCESS, /* access mask, KEY_ALL_ACCESS */ + NULL, /* security attribute */ + &currentKeyHandle, /* result */ + &dwDisp); /* disposition, REG_CREATED_NEW_KEY or + REG_OPENED_EXISTING_KEY */ if (res == ERROR_SUCCESS) currentKeyName = GetMultiByteString(stdInput); Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] Tue Jan 1 16:06:02 2013 @@ -593,7 +593,7 @@ do { wsprintf(szNewKey, szNewKeyFormat, iIndex++); - nResult = RegCreateKeyExW(hKey, szNewKey, 0, NULL, 0, KEY_WRITE, NULL, &hNewKey, &dwDisposition); + nResult = RegCreateKeyExW(hKey, szNewKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hNewKey, &dwDisposition); if (hNewKey && dwDisposition == REG_OPENED_EXISTING_KEY) { RegCloseKey(hNewKey);

1 0

[hbelusca] 58086: Fix comment
by hbelusca＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: hbelusca Date: Tue Jan 1 14:57:12 2013 New Revision: 58086 URL: http://svn.reactos.org/svn/reactos?rev=58086&view=rev Log: Fix comment Modified: trunk/reactos/base/applications/regedit/error.c Modified: trunk/reactos/base/applications/regedit/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/error.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/error.c [iso-8859-1] Tue Jan 1 14:57:12 2013 @@ -60,7 +60,7 @@ { SIZE_T strLen = _vscwprintf(lpMessage, args); - /* Create a buffer on the heap and zero-out it (LPTR) */ + /* Create a buffer on the heap and zero it out (LPTR) */ lpMsgBuf = (LPWSTR)LocalAlloc(LPTR, (strLen + 1) * sizeof(WCHAR)); if (lpMsgBuf) {

1 0

[hbelusca] 58085: [REGEDIT] Fix totally broken InfoMessageBox function. ~=~=\|/ **** Happy New Year 2013 !!!! **** \|/=~=~
by hbelusca＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: hbelusca Date: Tue Jan 1 14:55:53 2013 New Revision: 58085 URL: http://svn.reactos.org/svn/reactos?rev=58085&view=rev Log: [REGEDIT] Fix totally broken InfoMessageBox function. ~=~=\|/ **** Happy New Year 2013 !!!! **** \|/=~=~ Modified: trunk/reactos/base/applications/regedit/error.c Modified: trunk/reactos/base/applications/regedit/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/error.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/error.c [iso-8859-1] Tue Jan 1 14:55:53 2013 @@ -40,7 +40,7 @@ va_end(args); - iRet = MessageBoxW(hWnd, (Status && lpMsgBuf ? lpMsgBuf : L"Error displaying error message.\n"), lpTitle, MB_OK | MB_ICONERROR); + iRet = MessageBoxW(hWnd, (Status && lpMsgBuf ? lpMsgBuf : L"Error displaying error message."), lpTitle, MB_OK | MB_ICONERROR); if (lpMsgBuf) LocalFree(lpMsgBuf); @@ -52,22 +52,25 @@ { int iRet = 0; LPWSTR lpMsgBuf = NULL; - DWORD Status = 0; va_list args = NULL; va_start(args, lpMessage); - Status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, - lpMessage, - 0, - 0, - (LPWSTR)&lpMsgBuf, - 0, - &args); + if (lpMessage) + { + SIZE_T strLen = _vscwprintf(lpMessage, args); + + /* Create a buffer on the heap and zero-out it (LPTR) */ + lpMsgBuf = (LPWSTR)LocalAlloc(LPTR, (strLen + 1) * sizeof(WCHAR)); + if (lpMsgBuf) + { + _vsnwprintf(lpMsgBuf, strLen, lpMessage, args); + } + } va_end(args); - iRet = MessageBoxW(hWnd, (Status && lpMsgBuf ? lpMsgBuf : L"Error displaying error message.\n"), lpTitle, uType); + iRet = MessageBoxW(hWnd, (lpMessage && lpMsgBuf ? lpMsgBuf : L"Error displaying info message."), lpTitle, uType); if (lpMsgBuf) LocalFree(lpMsgBuf);

1 0

[tfaber] 58084: [KERNEL32] - Fix escape sequence parsing in CreateProcessInternalW. Patch by Vincenzo Cotugno.
by tfaber＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: tfaber Date: Tue Jan 1 14:18:27 2013 New Revision: 58084 URL: http://svn.reactos.org/svn/reactos?rev=58084&view=rev Log: [KERNEL32] - Fix escape sequence parsing in CreateProcessInternalW. Patch by Vincenzo Cotugno. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Tue Jan 1 14:18:27 2013 @@ -2625,7 +2625,7 @@ while (NULL != (ScanString = wcschr(ScanString, L'^'))) { ScanString++; - if (*ScanString == L'\"' || *ScanString == L'^' || *ScanString == L'\"') + if (*ScanString == L'\"' || *ScanString == L'^' || *ScanString == L'\\') { Escape = TRUE; break;

1 0

[janderwald] 58083: [SETUP][SYSSETUP] - Restore focus after closing GPL window - Patch by vort CORE-6837 #resolve #comment fixed in rev 58083
by janderwald＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: janderwald Date: Tue Jan 1 12:12:19 2013 New Revision: 58083 URL: http://svn.reactos.org/svn/reactos?rev=58083&view=rev Log: [SETUP][SYSSETUP] - Restore focus after closing GPL window - Patch by vort CORE-6837 #resolve #comment fixed in rev 58083 Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Tue Jan 1 12:12:19 2013 @@ -348,6 +348,7 @@ if (HIWORD(wParam) == BN_CLICKED && IDC_VIEWGPL == LOWORD(wParam)) { DialogBox(hDllInstance, MAKEINTRESOURCE(IDD_GPL), NULL, GplDlgProc); + SetForegroundWindow(GetParent(hwndDlg)); } break;

1 0

[tkreuzer] 58082: [WIN32K] Rewrite EngMulDiv.
by tkreuzer＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: tkreuzer Date: Tue Jan 1 12:09:53 2013 New Revision: 58082 URL: http://svn.reactos.org/svn/reactos?rev=58082&view=rev Log: [WIN32K] Rewrite EngMulDiv. Modified: trunk/reactos/win32ss/gdi/eng/math.c Modified: trunk/reactos/win32ss/gdi/eng/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/math.c?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/math.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/math.c [iso-8859-1] Tue Jan 1 12:09:53 2013 @@ -21,53 +21,57 @@ #include <win32k.h> -/* - * FIXME: Is there a better algorithm, like FT_MulDiv? - * - * @implemented - */ -INT APIENTRY EngMulDiv( - INT nMultiplicand, - INT nMultiplier, - INT nDivisor) +INT +APIENTRY +EngMulDiv( + _In_ INT iMultiplicand, + _In_ INT iMultiplier, + _In_ INT iDivisor) { -#if SIZEOF_LONG_LONG >= 8 - long long ret; + INT64 i64Multiplied, i64Result; - if (!nDivisor) return -1; + /* Check for divide by zero */ + if (iDivisor == 0) + { + /* Quick sign check and return "infinite" */ + return ((iMultiplicand ^ iMultiplier) < 0) ? INT_MIN : INT_MAX; + } /* We want to deal with a positive divisor to simplify the logic. */ - if (nDivisor < 0) + if (iDivisor < 0) { - nMultiplicand = - nMultiplicand; - nDivisor = -nDivisor; + iMultiplicand = -iMultiplicand; + iDivisor = -iDivisor; } - /* If the result is positive, we "add" to round. else, we subtract to round. */ - if ( ( (nMultiplicand < 0) && (nMultiplier < 0) ) || - ( (nMultiplicand >= 0) && (nMultiplier >= 0) ) ) - ret = (((long long)nMultiplicand * nMultiplier) + (nDivisor/2)) / nDivisor; + /* Do the multiplication */ + i64Multiplied = Int32x32To64(iMultiplicand, iMultiplier); + + /* If the result is positive, we add to round, else we subtract to round. */ + if (i64Multiplied >= 0) + { + i64Multiplied += (iDivisor / 2); + } else - ret = (((long long)nMultiplicand * nMultiplier) - (nDivisor/2)) / nDivisor; - - if ((ret > 2147483647) || (ret < -2147483647)) return -1; - return ret; -#else - if (!nDivisor) return -1; - - /* We want to deal with a positive divisor to simplify the logic. */ - if (nDivisor < 0) { - nMultiplicand = - nMultiplicand; - nDivisor = -nDivisor; + i64Multiplied -= (iDivisor / 2); } - /* If the result is positive, we "add" to round. else, we subtract to round. */ - if ( ( (nMultiplicand < 0) && (nMultiplier < 0) ) || - ( (nMultiplicand >= 0) && (nMultiplier >= 0) ) ) - return ((nMultiplicand * nMultiplier) + (nDivisor/2)) / nDivisor; + /* Now do the divide */ + i64Result = i64Multiplied / iDivisor; - return ((nMultiplicand * nMultiplier) - (nDivisor/2)) / nDivisor; + /* Check for positive overflow */ + if (i64Result > INT_MAX) + { + return INT_MAX; + } -#endif + /* Check for negative overflow. */ + if (i64Result < INT_MIN) + { + return INT_MIN; + } + + return (INT)i64Result; } +

1 0

[tkreuzer] 58081: [WIN32K] Exchange fields individually in PDEVOBJ_vSwitchPdev() instead of duplicating a full PDEV structure on the stack. This saves a lot of stack space.
by tkreuzer＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: tkreuzer Date: Tue Jan 1 11:57:58 2013 New Revision: 58081 URL: http://svn.reactos.org/svn/reactos?rev=58081&view=rev Log: [WIN32K] Exchange fields individually in PDEVOBJ_vSwitchPdev() instead of duplicating a full PDEV structure on the stack. This saves a lot of stack space. Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Tue Jan 1 11:57:58 2013 @@ -342,51 +342,67 @@ } VOID +FORCEINLINE +SwitchPointer( + _Inout_ PVOID pvPointer1, + _Inout_ PVOID pvPointer2) +{ + PVOID *ppvPointer1 = pvPointer1; + PVOID *ppvPointer2 = pvPointer2; + PVOID pvTemp; + + pvTemp = *ppvPointer1; + *ppvPointer1 = *ppvPointer2; + *ppvPointer2 = pvTemp; +} + +VOID NTAPI PDEVOBJ_vSwitchPdev( PPDEVOBJ ppdev, PPDEVOBJ ppdev2) { - PDEVOBJ pdevTmp; - DWORD tmpStateFlags; - - /* Exchange data */ - pdevTmp = *ppdev; + union + { + DRIVER_FUNCTIONS pfn; + GDIINFO gdiinfo; + DEVINFO devinfo; + DWORD StateFlags; + } temp; /* Exchange driver functions */ + temp.pfn = ppdev->pfn; ppdev->pfn = ppdev2->pfn; - ppdev2->pfn = pdevTmp.pfn; + ppdev2->pfn = temp.pfn; /* Exchange LDEVs */ - ppdev->pldev = ppdev2->pldev; - ppdev2->pldev = pdevTmp.pldev; + SwitchPointer(&ppdev->pldev, &ppdev2->pldev); /* Exchange DHPDEV */ - ppdev->dhpdev = ppdev2->dhpdev; - ppdev2->dhpdev = pdevTmp.dhpdev; + SwitchPointer(&ppdev->dhpdev, &ppdev2->dhpdev); /* Exchange surfaces and associate them with their new PDEV */ - ppdev->pSurface = ppdev2->pSurface; - ppdev2->pSurface = pdevTmp.pSurface; + SwitchPointer(&ppdev->pSurface, &ppdev2->pSurface); ppdev->pSurface->SurfObj.hdev = (HDEV)ppdev; ppdev2->pSurface->SurfObj.hdev = (HDEV)ppdev2; /* Exchange devinfo */ + temp.devinfo = ppdev->devinfo; ppdev->devinfo = ppdev2->devinfo; - ppdev2->devinfo = pdevTmp.devinfo; + ppdev2->devinfo = temp.devinfo; /* Exchange gdiinfo */ + temp.gdiinfo = ppdev->gdiinfo; ppdev->gdiinfo = ppdev2->gdiinfo; - ppdev2->gdiinfo = pdevTmp.gdiinfo; + ppdev2->gdiinfo = temp.gdiinfo; /* Exchange DEVMODE */ - ppdev->pdmwDev = ppdev2->pdmwDev; - ppdev2->pdmwDev = pdevTmp.pdmwDev; + SwitchPointer(&ppdev->pdmwDev, &ppdev2->pdmwDev); /* Exchange state flags */ - tmpStateFlags = ppdev->pGraphicsDevice->StateFlags; + temp.StateFlags = ppdev->pGraphicsDevice->StateFlags; ppdev->pGraphicsDevice->StateFlags = ppdev2->pGraphicsDevice->StateFlags; - ppdev2->pGraphicsDevice->StateFlags = tmpStateFlags; + ppdev2->pGraphicsDevice->StateFlags = temp.StateFlags; /* Notify each driver instance of its new HDEV association */ ppdev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); @@ -407,6 +423,7 @@ /* Lock the PDEV */ EngAcquireSemaphore(ppdev->hsemDevLock); + /* And everything else */ EngAcquireSemaphore(ghsemPDEV); @@ -613,9 +630,10 @@ /** Exported functions ********************************************************/ +_Must_inspect_result_ _Ret_z_ LPWSTR APIENTRY -EngGetDriverName(IN HDEV hdev) +EngGetDriverName(_In_ HDEV hdev) { PPDEVOBJ ppdev = (PPDEVOBJ)hdev;

1 0

[tkreuzer] 58080: [FREELDR] Fix a copy pasta, noticed by r3ddr4g0n.
by tkreuzer＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: tkreuzer Date: Tue Jan 1 11:37:59 2013 New Revision: 58080 URL: http://svn.reactos.org/svn/reactos?rev=58080&view=rev Log: [FREELDR] Fix a copy pasta, noticed by r3ddr4g0n. Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Tue Jan 1 11:37:59 2013 @@ -184,7 +184,6 @@ (FileHeader->NumberOfSections != FREELDR_SECTION_COUNT) || (FileHeader->PointerToSymbolTable != 0) || (FileHeader->NumberOfSymbols != 0) || - (FileHeader->NumberOfSymbols != 0) || (FileHeader->SizeOfOptionalHeader != 0xE0)) { return FALSE;

1 0

[janderwald] 58079: [REGEDIT] - Check if the new name equals the old name. In that case don't rename key. - Fixes regedit accidentaly deleting keys when a key is clicked and the rename field appear...
by janderwald＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: janderwald Date: Tue Jan 1 11:28:25 2013 New Revision: 58079 URL: http://svn.reactos.org/svn/reactos?rev=58079&view=rev Log: [REGEDIT] - Check if the new name equals the old name. In that case don't rename key. - Fixes regedit accidentaly deleting keys when a key is clicked and the rename field appears CORE-6205 #resolve #comment finally regedit is usable Modified: trunk/reactos/base/applications/regedit/edit.c Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] Tue Jan 1 11:28:25 2013 @@ -1399,6 +1399,12 @@ if (!lpSrcSubKey) return ERROR_INVALID_FUNCTION; + if (wcscmp(lpDestSubKey, lpSrcSubKey) == 0) + { + /* destination name equals source name */ + return ERROR_SUCCESS; + } + lResult = CopyKey(hDestKey, lpDestSubKey, hSrcKey, lpSrcSubKey); if (lResult == ERROR_SUCCESS) SHDeleteKey(hSrcKey, lpSrcSubKey);

1 0

[tkreuzer] 58078: [WIN32K] - Fix a typo from r58077
by tkreuzer＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: tkreuzer Date: Tue Jan 1 11:02:11 2013 New Revision: 58078 URL: http://svn.reactos.org/svn/reactos?rev=58078&view=rev Log: [WIN32K] - Fix a typo from r58077 Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Tue Jan 1 11:02:11 2013 @@ -471,7 +471,7 @@ case DC_TRIVIAL: Ret = (*BltRectFunc)(OutputObj, InputObj, - psoSrc, + psoMask, pxlo, &OutputRect, &InputPoint, @@ -499,7 +499,7 @@ Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; Ret = (*BltRectFunc)(OutputObj, InputObj, - psoSrc, + psoMask, pxlo, &CombinedRect, &Pt,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2013