Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 34276: GetLastActivePopup is still unimplemented, we return the current window handle if it is valid.
by jimtabor＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: jimtabor Date: Thu Jul 3 02:17:32 2008 New Revision: 34276 URL: http://svn.reactos.org/svn/reactos?rev=34276&view=rev Log: GetLastActivePopup is still unimplemented, we return the current window handle if it is valid. Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Thu Jul 3 02:17:32 2008 @@ -921,8 +921,24 @@ HWND STDCALL GetLastActivePopup(HWND hWnd) { - UNIMPLEMENTED; - return 0; + PWINDOW Wnd, WndParent; + HWND Ret = NULL; + + Wnd = ValidateHwnd(hWnd); + if (Wnd != NULL) + { + _SEH_TRY + { + WndParent = NULL; + Ret = hWnd; + } + _SEH_HANDLE + { + /* Do nothing */ + } + _SEH_END; + } + return Ret; }

1 0

[mkupfer] 34275: - Fix to allow characters for computer name as specified in MSDN, even '-' - See issue #3304 for more details.
by mkupfer＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: mkupfer Date: Thu Jul 3 02:09:05 2008 New Revision: 34275 URL: http://svn.reactos.org/svn/reactos?rev=34275&view=rev Log: - Fix to allow characters for computer name as specified in MSDN, even '-' - See issue #3304 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] Thu Jul 3 02:09:05 2008 @@ -298,22 +298,10 @@ p = (PWCHAR)lpComputerName; while (*p != 0) { - if ((!iswctype (*p, _ALPHA) && !iswctype (*p, _DIGIT)) || - *p == L'!' || - *p == L'@' || - *p == L'#' || - *p == L'$' || - *p == L'%' || - *p == L'^' || - *p == L'&' || - *p == L'\'' || - *p == L')' || - *p == L'(' || - *p == L'.' || - *p == L'_' || - *p == L'{' || - *p == L'}' || - *p == L'~') + if (!(iswalnum(*p) || *p == L'!' || *p == L'@' || *p == L'#' || + *p == L'$' || *p == L'%' || *p == L'^' || *p == L'&' || *p == L'\'' || + *p == L')' || *p == L'(' || *p == L'.' || *p == L'-' || *p == L'_' || + *p == L'{' || *p == L'}' || *p == L'~')) return FALSE; Length++;

1 0

[jimtabor] 34274: - Fixed an issue with Avira AntiVir Personal, reported by Christoph von Wittich. - GetLastActivePopup is unimplemented and returns a zero. So User32 locally checks and sees the zero and passes it to win32k for processing. There an (kbug) exception is thrown.
by jimtabor＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: jimtabor Date: Thu Jul 3 02:05:50 2008 New Revision: 34274 URL: http://svn.reactos.org/svn/reactos?rev=34274&view=rev Log: - Fixed an issue with Avira AntiVir Personal, reported by Christoph von Wittich. - GetLastActivePopup is unimplemented and returns a zero. So User32 locally checks and sees the zero and passes it to win32k for processing. There an (kbug) exception is thrown. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Jul 3 02:05:50 2008 @@ -3633,6 +3633,8 @@ } Wnd = Window->Wnd; + + if (!Wnd) return 0; // No go on zero. if ((INT)Index >= 0) {

1 0

[cwittich] 34273: don't crash when no command line argument is given
by cwittich＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: cwittich Date: Thu Jul 3 02:01:19 2008 New Revision: 34273 URL: http://svn.reactos.org/svn/reactos?rev=34273&view=rev Log: don't crash when no command line argument is given Modified: trunk/reactos/tools/gendib/gendib.c Modified: trunk/reactos/tools/gendib/gendib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.c?rev=… ============================================================================== --- trunk/reactos/tools/gendib/gendib.c [iso-8859-1] (original) +++ trunk/reactos/tools/gendib/gendib.c [iso-8859-1] Thu Jul 3 02:01:19 2008 @@ -1025,6 +1025,9 @@ static unsigned DestBpp[] = { 8, 16, 32 }; + if (argc < 2) + return 0; + for (Index = 0; Index < sizeof(DestBpp) / sizeof(DestBpp[0]); Index++) { Generate(argv[1], DestBpp[Index]);

1 0

[jimtabor] 34272: Move PostMessage out of gdi into user.
by jimtabor＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: jimtabor Date: Thu Jul 3 01:29:30 2008 New Revision: 34272 URL: http://svn.reactos.org/svn/reactos?rev=34272&view=rev Log: Move PostMessage out of gdi into user. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Thu Jul 3 01:29:30 2008 @@ -540,6 +540,7 @@ ProbeForRead(lpaRgbValues, sizeof(INT), 1); +// Developers: We are thread locked and calling gdi. Ret = IntSetSysColors(cElements, (INT*)lpaElements, (COLORREF*)lpaRgbValues); } _SEH_HANDLE @@ -552,6 +553,10 @@ SetLastNtError(Status); Ret = FALSE; } + if (Ret) + { + UserPostMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); + } UserLeave(); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Thu Jul 3 01:29:30 2008 @@ -189,8 +189,6 @@ Elements++; Colors++; } - UserPostMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); - return nColors > 0; }

1 0

[jimtabor] 34271: Fix MSVC issue.
by jimtabor＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: jimtabor Date: Thu Jul 3 00:58:33 2008 New Revision: 34271 URL: http://svn.reactos.org/svn/reactos?rev=34271&view=rev Log: Fix MSVC issue. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Thu Jul 3 00:58:33 2008 @@ -108,7 +108,8 @@ if (OldTID != NewTID) { - if ((List = IntWinListChildren(UserGetWindowObject(IntGetDesktopWindow())))) + List = IntWinListChildren(UserGetWindowObject(IntGetDesktopWindow())); + if (List) { for (phWnd = List; *phWnd; ++phWnd) {

1 0

[jimtabor] 34270: Bug 972: - Fixes the problem of selecting Explorer START menu than mouse over and clicking another application. - Doesn't fix the problem of selecting Explorer START menu than mouse over to the opened file Explorer and clicking on it. - Why, one might ask? The file Explorer shares the same TID.
by jimtabor＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: jimtabor Date: Wed Jul 2 23:51:51 2008 New Revision: 34270 URL: http://svn.reactos.org/svn/reactos?rev=34270&view=rev Log: Bug 972: - Fixes the problem of selecting Explorer START menu than mouse over and clicking another application. - Doesn't fix the problem of selecting Explorer START menu than mouse over to the opened file Explorer and clicking on it. - Why, one might ask? The file Explorer shares the same TID. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Wed Jul 2 23:51:51 2008 @@ -96,6 +96,42 @@ MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, UserGetWindowLong(hWnd, GWL_STYLE, FALSE) & WS_MINIMIZE), (LPARAM)hWndPrev); + + if (Window && hWndPrev) + { + PWINDOW_OBJECT cWindow; + HWND *List, *phWnd; + HANDLE OldTID = IntGetWndThreadId(UserGetWindowObject(hWndPrev)); + HANDLE NewTID = IntGetWndThreadId(Window); + + DPRINT("SendActiveMessage Old -> %x, New -> %x\n", OldTID, NewTID); + + if (OldTID != NewTID) + { + if ((List = IntWinListChildren(UserGetWindowObject(IntGetDesktopWindow())))) + { + for (phWnd = List; *phWnd; ++phWnd) + { + cWindow = UserGetWindowObject(*phWnd); + if (cWindow && (IntGetWndThreadId(cWindow) == OldTID)) + { // FALSE if the window is being deactivated, + // ThreadId that owns the window being activated. + co_IntSendMessage(*phWnd, WM_ACTIVATEAPP, FALSE, (LPARAM)NewTID); + } + } + for (phWnd = List; *phWnd; ++phWnd) + { + cWindow = UserGetWindowObject(*phWnd); + if (cWindow && (IntGetWndThreadId(cWindow) == NewTID)) + { // TRUE if the window is being activated, + // ThreadId that owns the window being deactivated. + co_IntSendMessage(*phWnd, WM_ACTIVATEAPP, TRUE, (LPARAM)OldTID); + } + } + ExFreePool(List); + } + } + } } }

1 0

[silverblade] 34269: Still not happy with my mmdrv from last year, so killed it. Starting again with a better-structured approach...
by silverblade＠svn.reactos.org 02 Jul '08

02 Jul '08

Author: silverblade Date: Wed Jul 2 17:27:45 2008 New Revision: 34269 URL: http://svn.reactos.org/svn/reactos?rev=34269&view=rev Log: Still not happy with my mmdrv from last year, so killed it. Starting again with a better-structured approach... Removed: branches/silverblade-audio/dll/win32/mmdrv/TODO branches/silverblade-audio/dll/win32/mmdrv/auxil.c branches/silverblade-audio/dll/win32/mmdrv/common.c branches/silverblade-audio/dll/win32/mmdrv/entry.c branches/silverblade-audio/dll/win32/mmdrv/kernel.c branches/silverblade-audio/dll/win32/mmdrv/midi.c branches/silverblade-audio/dll/win32/mmdrv/mmddk.h branches/silverblade-audio/dll/win32/mmdrv/mmdef.h branches/silverblade-audio/dll/win32/mmdrv/mmdrv.h branches/silverblade-audio/dll/win32/mmdrv/mme.c branches/silverblade-audio/dll/win32/mmdrv/mmioctl.h branches/silverblade-audio/dll/win32/mmdrv/session.c branches/silverblade-audio/dll/win32/mmdrv/utils.c branches/silverblade-audio/dll/win32/mmdrv/wave.c branches/silverblade-audio/dll/win32/mmdrv/wave.h branches/silverblade-audio/dll/win32/mmdrv/wave_io.c Modified: branches/silverblade-audio/dll/win32/mmdrv/mmdrv.def branches/silverblade-audio/dll/win32/mmdrv/mmdrv.rbuild branches/silverblade-audio/lib/drivers/sound/legacy/devname.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/silverblade-audio/dll/win32/mmdrv/TODO URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/auxil.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/common.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/entry.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/kernel.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/midi.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/mmddk.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/mmdef.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Modified: branches/silverblade-audio/dll/win32/mmdrv/mmdrv.def URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/mmdrv.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Modified: branches/silverblade-audio/dll/win32/mmdrv/mmdrv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/mme.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/mmioctl.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/session.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/utils.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/wave.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/wave.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Removed: branches/silverblade-audio/dll/win32/mmdrv/wave_io.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… Modified: branches/silverblade-audio/lib/drivers/sound/legacy/devname.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s…

1 0

[jimtabor] 34268: Cleanup drawing lines and curves with round rect.
by jimtabor＠svn.reactos.org 02 Jul '08

02 Jul '08

Author: jimtabor Date: Wed Jul 2 13:12:07 2008 New Revision: 34268 URL: http://svn.reactos.org/svn/reactos?rev=34268&view=rev Log: Cleanup drawing lines and curves with round rect. Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Wed Jul 2 13:12:07 2008 @@ -1395,7 +1395,6 @@ app_fill_ellipse(dc, r, FillBrushObj); else // > W < H { - app_fill_arc(dc, rect( r.x, r.y, r.width - 1, Hellipse), 0, 180, FillBrushObj,FALSE); app_fill_arc(dc, rect(r.x, Bottom - Hellipse - 1, r.width - 1, Hellipse), @@ -1411,17 +1410,17 @@ } else // < W < H { - app_fill_arc(dc, rect(r.x, r.y, Wellipse, Hellipse), + app_fill_arc(dc, rect(r.x, r.y, rx+rx, ry+ry), 90, 180, FillBrushObj, FALSE); - app_fill_arc(dc, rect(r.x, Bottom - Hellipse - 1, Wellipse, Hellipse), + app_fill_arc(dc, rect(r.x, r.y+r.height-ry-ry, rx+rx, ry+ry), 180, 270, FillBrushObj, FALSE); - app_fill_arc(dc, rect(Right - Wellipse - 1, Bottom - Hellipse - 1, Wellipse, Hellipse), + app_fill_arc(dc, rect(r.x+r.width-rx-rx, r.y+r.height-ry-ry, rx+rx, ry+ry), 270, 360, FillBrushObj,FALSE); - app_fill_arc(dc, rect(Right - Wellipse - 1, r.y, Wellipse, Hellipse ), - 0, 90, FillBrushObj,FALSE); + app_fill_arc(dc, rect(r.x+r.width-rx-rx, r.y, rx+rx, ry+ry), + 0, 90, FillBrushObj,FALSE); } if (Wellipse < r.width) { @@ -1463,7 +1462,6 @@ app_draw_ellipse(dc, r, PenBrushObj); else // > W < H { - app_draw_arc(dc, rect( r.x, r.y, r.width - 1, Hellipse - 1), 0, 180, PenBrushObj, FALSE); app_draw_arc(dc, rect(r.x, Bottom - Hellipse, r.width - 1, Hellipse - 1), @@ -1479,16 +1477,16 @@ } else // < W < H { - app_draw_arc(dc, rect(r.x, r.y, Wellipse-1, Hellipse - 1), + app_draw_arc(dc, rect(r.x, r.y, rx+rx, ry+ry), 90, 180, PenBrushObj, FALSE); - app_draw_arc(dc, rect(r.x, Bottom - Hellipse, Wellipse - 1, Hellipse - 1), + app_draw_arc(dc, rect(r.x,r.y+r.height-ry-ry,rx+rx,ry+ry), 180, 270, PenBrushObj, FALSE); - app_draw_arc(dc, rect(Right - Wellipse, Bottom - Hellipse, Wellipse - 1, Hellipse - 1), + app_draw_arc(dc, rect(r.x+r.width-rx-rx, r.y+r.height-ry-ry, rx+rx, ry+ry), 270, 360, PenBrushObj, FALSE); - app_draw_arc(dc, rect(Right - Wellipse, r.y, Wellipse - 1, Hellipse - 1 ), + app_draw_arc(dc, rect(r.x+r.width-rx-rx,r.y,rx+rx,ry+ry), 0, 90, PenBrushObj, FALSE); } if ( Hellipse < r.height)

1 0

[jmorlan] 34267: - NtGdiAlphaBlend: If hDCSrc == hDCDest and a bitmap can't be locked, don't unlock the DC twice. Fix typo in if condition which prevented detection of bad source bitmap. - NtGdiBitBlt: Fix null pointer access when cleaning up after failure to lock source bitmap. - NtGdiStretchBlt: Fail gracefully if a bitmap can't be locked. Don't delete XlateObj if it couldn't be created. - NtGdiPolyPatBlt: Actually *use* the safe copy that so much code was dedicated to creating. :) - Trim a fe
by jmorlan＠svn.reactos.org 02 Jul '08

02 Jul '08

Author: jmorlan Date: Wed Jul 2 12:20:28 2008 New Revision: 34267 URL: http://svn.reactos.org/svn/reactos?rev=34267&view=rev Log: - NtGdiAlphaBlend: If hDCSrc == hDCDest and a bitmap can't be locked, don't unlock the DC twice. Fix typo in if condition which prevented detection of bad source bitmap. - NtGdiBitBlt: Fix null pointer access when cleaning up after failure to lock source bitmap. - NtGdiStretchBlt: Fail gracefully if a bitmap can't be locked. Don't delete XlateObj if it couldn't be created. - NtGdiPolyPatBlt: Actually *use* the safe copy that so much code was dedicated to creating. :) - Trim a few bits of redundant code. Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Wed Jul 2 12:20:28 2008 @@ -40,8 +40,8 @@ BLENDFUNCTION BlendFunc, HANDLE hcmXform) { - PDC DCDest = NULL; - PDC DCSrc = NULL; + PDC DCDest; + PDC DCSrc; BITMAPOBJ *BitmapDest, *BitmapSrc; RECTL DestRect, SourceRect; BOOL Status; @@ -106,7 +106,8 @@ BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); if (!BitmapDest) { - DC_UnlockDc(DCSrc); + if (hDCSrc != hDCDest) + DC_UnlockDc(DCSrc); DC_UnlockDc(DCDest); return FALSE; } @@ -115,10 +116,11 @@ else { BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - if (!BitmapDest) + if (!BitmapSrc) { BITMAPOBJ_UnlockBitmap(BitmapDest); - DC_UnlockDc(DCSrc); + if (hDCSrc != hDCDest) + DC_UnlockDc(DCSrc); DC_UnlockDc(DCDest); return FALSE; } @@ -169,7 +171,7 @@ IN DWORD crBackColor, IN FLONG fl) { - PDC DCDest = NULL; + PDC DCDest; PDC DCSrc = NULL; PDC_ATTR Dc_Attr = NULL; BITMAPOBJ *BitmapDest, *BitmapSrc = NULL; @@ -219,10 +221,6 @@ DCSrc = DCDest; } } - else - { - DCSrc = NULL; - } Dc_Attr = DCDest->pDc_Attr; if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; @@ -265,10 +263,6 @@ goto cleanup; } } - else - { - BitmapSrc = NULL; - } if (UsesPattern) { @@ -280,10 +274,6 @@ } BrushOrigin = *((PPOINTL)&BrushObj->ptOrigin); IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush); - } - else - { - BrushObj = NULL; } /* Create the XLATEOBJ. */ @@ -301,7 +291,7 @@ } /* Perform the bitblt operation */ - Status = IntEngBitBlt( BitmapDest ? &BitmapDest->SurfObj : NULL, BitmapSrc ? &BitmapSrc->SurfObj : NULL, NULL, + Status = IntEngBitBlt(&BitmapDest->SurfObj, BitmapSrc ? &BitmapSrc->SurfObj : NULL, NULL, DCDest->CombinedClip, XlateObj, &DestRect, &SourcePoint, NULL, BrushObj ? &BrushInst.BrushObject : NULL, @@ -315,7 +305,7 @@ { BITMAPOBJ_UnlockBitmap(BitmapDest); } - if (UsesSource && BitmapSrc != BitmapDest) + if (BitmapSrc != NULL && BitmapSrc != BitmapDest) { BITMAPOBJ_UnlockBitmap(BitmapSrc); } @@ -734,13 +724,13 @@ DWORD ROP, IN DWORD dwBackColor) { - PDC DCDest = NULL; + PDC DCDest; PDC DCSrc = NULL; PDC_ATTR Dc_Attr; - BITMAPOBJ *BitmapDest, *BitmapSrc; + BITMAPOBJ *BitmapDest, *BitmapSrc = NULL; RECTL DestRect; RECTL SourceRect; - BOOL Status; + BOOL Status = FALSE; XLATEOBJ *XlateObj = NULL; PGDIBRUSHOBJ BrushObj = NULL; BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000); @@ -790,10 +780,6 @@ DCSrc = DCDest; } } - else - { - DCSrc = NULL; - } /* Offset the destination and source by the origin of their DCs. */ // FIXME: ptlDCOrig is in device coordinates! @@ -817,12 +803,20 @@ /* Determine surfaces to be used in the bitblt */ BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (BitmapDest == NULL) + goto failed; if (UsesSource) { if (DCSrc->w.hBitmap == DCDest->w.hBitmap) + { BitmapSrc = BitmapDest; + } else + { BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + if (BitmapSrc == NULL) + goto failed; + } int sw = BitmapSrc->SurfObj.sizlBitmap.cx; int sh = BitmapSrc->SurfObj.sizlBitmap.cy; @@ -871,7 +865,6 @@ if (0 == (DestRect.right-DestRect.left) || 0 == (DestRect.bottom-DestRect.top) || 0 == (SourceRect.right-SourceRect.left) || 0 == (SourceRect.bottom-SourceRect.top)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); - Status = FALSE; goto failed; } @@ -880,13 +873,9 @@ if (XlateObj == (XLATEOBJ*)-1) { SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - Status = FALSE; + XlateObj = NULL; goto failed; } - } - else - { - BitmapSrc = NULL; } if (UsesPattern) @@ -897,13 +886,8 @@ if (NULL == BrushObj) { SetLastWin32Error(ERROR_INVALID_HANDLE); - Status = FALSE; goto failed; } - } - else - { - BrushObj = NULL; } /* Perform the bitblt operation */ @@ -921,11 +905,14 @@ { BRUSHOBJ_UnlockBrush(BrushObj); } - if (UsesSource && DCSrc->w.hBitmap != DCDest->w.hBitmap) + if (BitmapSrc && DCSrc->w.hBitmap != DCDest->w.hBitmap) { BITMAPOBJ_UnlockBitmap(BitmapSrc); } - BITMAPOBJ_UnlockBitmap(BitmapDest); + if (BitmapDest) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + } if (UsesSource && hDCSrc != hDCDest) { DC_UnlockDc(DCSrc); @@ -1162,7 +1149,7 @@ } } - Ret = IntGdiPolyPatBlt(hDC, dwRop, (PPATRECT)pRects, cRects, Mode); + Ret = IntGdiPolyPatBlt(hDC, dwRop, rb, cRects, Mode); if (cRects > 0) ExFreePool(rb);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs