Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 33916: Move AngleArc out of stubs.
by jimtabor＠svn.reactos.org 10 Jun '08

10 Jun '08

Author: jimtabor Date: Tue Jun 10 00:14:35 2008 New Revision: 33916 URL: http://svn.reactos.org/svn/reactos?rev=33916&view=rev Log: Move AngleArc out of stubs. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/arc.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Tue Jun 10 00:14:35 2008 @@ -461,26 +461,6 @@ } #endif return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -STDCALL -AngleArc( - HDC hdc, - int a1, - int a2, - DWORD a3, - FLOAT a4, - FLOAT a5 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; } Modified: trunk/reactos/dll/win32/gdi32/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ar… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/arc.c [iso-8859-1] Tue Jun 10 00:14:35 2008 @@ -51,6 +51,45 @@ nYEndArc); } + +/* + * @implemented + */ +BOOL +STDCALL +AngleArc(HDC hDC, + int X, + int Y, + DWORD Radius, + FLOAT StartAngle, + FLOAT SweepAngle) +{ +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return FALSE; //No meta support for AngleArc + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + BOOL Ret = EMFDRV_AngleArc( hDC, X, Y, Radius, StartAngle, SweepAngle); + return Ret; + } + return FALSE; + } + } +#endif + return NtGdiAngleArc(hDC, X, Y, Radius, (DWORD)StartAngle, (DWORD)SweepAngle); +} + BOOL WINAPI ArcTo(

1 0

[weiden] 33915: shlwapi.dll is already loaded, no need to use LoadLibrary
by weiden＠svn.reactos.org 10 Jun '08

10 Jun '08

Author: weiden Date: Mon Jun 9 22:13:12 2008 New Revision: 33915 URL: http://svn.reactos.org/svn/reactos?rev=33915&view=rev Log: shlwapi.dll is already loaded, no need to use LoadLibrary Modified: trunk/reactos/base/shell/explorer-new/startmnu.c Modified: trunk/reactos/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st… ============================================================================== --- trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] Mon Jun 9 22:13:12 2008 @@ -478,7 +478,7 @@ DbgPrint("IStartMenuCallback::Execute\n"); - hShlwapi = LoadLibrary(TEXT("SHLWAPI.DLL")); + hShlwapi = GetModuleHandle(TEXT("SHLWAPI.DLL")); if (hShlwapi != NULL) { SHINVDEFCMD SHInvokeDefCmd; @@ -492,8 +492,6 @@ pShellFolder, pidl); } - - FreeLibrary(hShlwapi); } return ret;

1 0

[weiden] 33914: - Don't lookup DrawCaptionTempA/W by ordinal but rather by name - Various minor fixes
by weiden＠svn.reactos.org 10 Jun '08

10 Jun '08

Author: weiden Date: Mon Jun 9 21:58:13 2008 New Revision: 33914 URL: http://svn.reactos.org/svn/reactos?rev=33914&view=rev Log: - Don't lookup DrawCaptionTempA/W by ordinal but rather by name - Various minor fixes Modified: trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/base/shell/explorer-new/tbsite.c trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Mon Jun 9 21:58:13 2008 @@ -26,7 +26,13 @@ /* dynamic imports due to lack of support in msvc linker libs */ typedef INT (STDCALL *REGSHELLHOOK)(HWND, DWORD); +#ifdef UNICODE +#define PROC_NAME_DRAWCAPTIONTEMP "DrawCaptionTempW" typedef BOOL (STDCALL *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCWSTR, UINT); +#else +#define PROC_NAME_DRAWCAPTIONTEMP "DrawCaptionTempA" +typedef BOOL (STDCALL *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCSTR, UINT); +#endif typedef HRESULT (STDCALL *SHINVDEFCMD)(HWND, IShellFolder*, LPCITEMIDLIST); static ULONG __inline Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Mon Jun 9 21:58:13 2008 @@ -26,7 +26,7 @@ /* Set DUMP_TASKS to 1 to enable a dump of the tasks and task groups every 5 seconds */ -#define DUMP_TASKS 1 +#define DUMP_TASKS 0 static const TCHAR szTaskSwitchWndClass[] = TEXT("MSTaskSwWClass"); static const TCHAR szRunningApps[] = TEXT("Running Applications"); @@ -1169,19 +1169,25 @@ static INT TaskSwitchWnd_UpdateTbButtonSpacing(IN OUT PTASK_SWITCH_WND This, IN BOOL bHorizontal, + IN UINT uiRows, IN UINT uiBtnsPerLine) { TBMETRICS tbm; tbm.cbSize = sizeof(tbm); - tbm.dwMask = TBMF_BUTTONSPACING; + tbm.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING; + + tbm.cxBarPad = tbm.cyBarPad = 0; if (bHorizontal || uiBtnsPerLine > 1) tbm.cxButtonSpacing = (3 * GetSystemMetrics(SM_CXEDGE) / 2); else tbm.cxButtonSpacing = 0; - tbm.cyButtonSpacing = (3 * GetSystemMetrics(SM_CYEDGE) / 2); + if (!bHorizontal || uiRows > 1) + tbm.cyButtonSpacing = (3 * GetSystemMetrics(SM_CYEDGE) / 2); + else + tbm.cyButtonSpacing = 0; SendMessage(This->hWndToolbar, TB_SETMETRICS, @@ -1209,8 +1215,9 @@ { if (This->ToolbarBtnCount > 0) { + ZeroMemory (&tbm, sizeof (tbm)); tbm.cbSize = sizeof(tbm); - tbm.dwMask = TBMF_PAD | TBMF_BUTTONSPACING; + tbm.dwMask = TBMF_BUTTONSPACING; SendMessage(This->hWndToolbar, TB_GETMETRICS, 0, @@ -1230,6 +1237,7 @@ /* We might need to update the button spacing */ tbm.cxButtonSpacing = TaskSwitchWnd_UpdateTbButtonSpacing(This, Horizontal, + uiRows, uiBtnsPerLine); /* Calculate the ideal width and make sure it's within the allowed range */ @@ -1410,7 +1418,7 @@ BtnSize.cy)); /* We don't want to see partially clipped buttons...not that we could see them... */ -#if 1 +#if 0 SendMessage(This->hWndToolbar, TB_SETEXTENDEDSTYLE, 0, @@ -1420,6 +1428,7 @@ /* Set proper spacing between buttons */ TaskSwitchWnd_UpdateTbButtonSpacing(This, ITrayWindow_IsHorizontal(This->Tray), + 0, 0); /* Register the shell hook */ @@ -1899,6 +1908,7 @@ /* Update the button spacing */ TaskSwitchWnd_UpdateTbButtonSpacing(This, ITrayWindow_IsHorizontal(This->Tray), + 0, 0); break; } @@ -2026,6 +2036,13 @@ break; } } + else + { + Ret = DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + } return Ret; } Modified: trunk/reactos/base/shell/explorer-new/tbsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tb… ============================================================================== --- trunk/reactos/base/shell/explorer-new/tbsite.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/tbsite.c [iso-8859-1] Mon Jun 9 21:58:13 2008 @@ -332,7 +332,8 @@ { LPNMMOUSE nmm = (LPNMMOUSE)lParam; - if (nmm->dwHitInfo == RBHT_CLIENT || nmm->dwItemSpec == (DWORD_PTR)-1) + if (nmm->dwHitInfo == RBHT_CLIENT || nmm->dwHitInfo == RBHT_NOWHERE || + nmm->dwItemSpec == (DWORD_PTR)-1) { /* Make the rebar control appear transparent so the user can drag the tray window */ Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Mon Jun 9 21:58:13 2008 @@ -1294,17 +1294,14 @@ if (hIconStart != NULL) Flags |= DC_ICON; - hUser32 = LoadLibrary(TEXT("USER32.DLL")); + hUser32 = GetModuleHandle(TEXT("USER32.DLL")); if (hUser32 != NULL) { DRAWCAPTEMP DrawCapTemp; - LONG ord = 187; -#ifndef UNICODE - ord = 186; -#endif + /* DrawCaptionTemp */ DrawCapTemp = (DRAWCAPTEMP)GetProcAddress(hUser32, - (LPCSTR)ord); + PROC_NAME_DRAWCAPTIONTEMP); if (DrawCapTemp != NULL) { Ret = DrawCapTemp(NULL, @@ -1315,8 +1312,6 @@ szStartCaption, Flags); } - - FreeLibrary(hUser32); } SelectObject(hDC, @@ -1761,7 +1756,7 @@ bLock))) { /* Reset?? */ - This->Locked = bLock; + This->Locked = bPrevLock; } } }

1 0

[weiden] 33913: Do a more correct check in EDIT_IsInsideDialog ()
by weiden＠svn.reactos.org 10 Jun '08

10 Jun '08

Author: weiden Date: Mon Jun 9 19:31:10 2008 New Revision: 33913 URL: http://svn.reactos.org/svn/reactos?rev=33913&view=rev Log: Do a more correct check in EDIT_IsInsideDialog () Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Mon Jun 9 19:31:10 2008 @@ -4095,13 +4095,8 @@ { if (es->hwndParent && es->hwndParent != GetDesktopWindow()) { - PWINDOW pParent = ValidateHwnd( es->hwndParent ); - - /* TODO: This should really check fnID instead of ExtraDataSize I guess */ - if (pParent && pParent->ExtraDataSize >= DLGWINDOWEXTRA) - { + if (GetClassLongW (es->hwndParent, GCW_ATOM) == (DWORD)MAKEINTATOM(32770)) return TRUE; - } } return FALSE; }

1 0

[tkreuzer] 33912: fix an endless loop bug See issue #2142 for more details.
by tkreuzer＠svn.reactos.org 09 Jun '08

09 Jun '08

Author: tkreuzer Date: Mon Jun 9 15:57:30 2008 New Revision: 33912 URL: http://svn.reactos.org/svn/reactos?rev=33912&view=rev Log: fix an endless loop bug See issue #2142 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Mon Jun 9 15:57:30 2008 @@ -590,10 +590,13 @@ else PrevLink = &pi->LocalClassList; - while (*PrevLink != BaseClass) + CurrentClass = *PrevLink; + while (CurrentClass != BaseClass) { - ASSERT(*PrevLink != NULL); - PrevLink = &BaseClass->Next; + ASSERT(CurrentClass != NULL); + + PrevLink = &CurrentClass->Next; + CurrentClass = CurrentClass->Next; } ASSERT(*PrevLink == BaseClass);

1 0

[cfinck] 33911: Add a value for the now mandatory "username_clean" column as well (which is just the lowercased username) This should finally fix all login problems.
by cfinck＠svn.reactos.org 09 Jun '08

09 Jun '08

Author: cfinck Date: Mon Jun 9 15:52:21 2008 New Revision: 33911 URL: http://svn.reactos.org/svn/reactos?rev=33911&view=rev Log: Add a value for the now mandatory "username_clean" column as well (which is just the lowercased username) This should finally fix all login problems. Modified: trunk/web/reactos.org/htdocs/roscms/inc/subsys_phpbb.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/subsys_phpbb.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/subsys_phpbb.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/subsys_phpbb.php [iso-8859-1] Mon Jun 9 15:52:21 2008 @@ -183,9 +183,10 @@ $phpbb_user_id = $user_id_row['last_user_id'] + 1; $query = "INSERT INTO " . SUBSYS_PHPBB_DBNAME . ".phpbb_users " . - " (user_id, username, user_password, user_email, user_regdate) " . + " (user_id, username, username_clean, user_password, user_email, user_regdate) " . "VALUES ($phpbb_user_id, " . " '" . mysql_real_escape_string($roscms_user_name) . "', " . + " '" . mysql_real_escape_string(strtolower($roscms_user_name)) . "', " . " '" . mysql_real_escape_string($roscms_user_password) . "', " . " '" . mysql_real_escape_string($roscms_user_email) . "', " . " $roscms_user_register)";

1 0

[gbrunmar] 33910: Fixed four more winetests, code taken from wine again
by gbrunmar＠svn.reactos.org 09 Jun '08

09 Jun '08

Author: gbrunmar Date: Mon Jun 9 14:14:36 2008 New Revision: 33910 URL: http://svn.reactos.org/svn/reactos?rev=33910&view=rev Log: Fixed four more winetests, code taken from wine again Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Mon Jun 9 14:14:36 2008 @@ -4137,6 +4137,8 @@ if ((es->style & ES_MULTILINE) && !(es->style & ES_READONLY)) { static const WCHAR tabW[] = {'\t',0}; + if (EDIT_IsInsideDialog(es)) + break; EDIT_EM_ReplaceSel(es, TRUE, tabW, TRUE, TRUE); } break;

1 0

[gbrunmar] 33909: Fixed 11 winetests for edit boxes based on code from wine but tweaked for ReactOS
by gbrunmar＠svn.reactos.org 09 Jun '08

09 Jun '08

Author: gbrunmar Date: Mon Jun 9 14:07:54 2008 New Revision: 33909 URL: http://svn.reactos.org/svn/reactos?rev=33909&view=rev Log: Fixed 11 winetests for edit boxes based on code from wine but tweaked for ReactOS Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Mon Jun 9 14:07:54 2008 @@ -4084,6 +4084,27 @@ return TRUE; } +/* Helper function for WM_CHAR + * + * According to an MSDN blog article titled "Just because you're a control + * doesn't mean that you're necessarily inside a dialog box," multiline edit + * controls without ES_WANTRETURN would attempt to detect whether it is inside + * a dialog box or not. + */ +static BOOL EDIT_IsInsideDialog(EDITSTATE *es) +{ + if (es->hwndParent && es->hwndParent != GetDesktopWindow()) + { + PWINDOW pParent = ValidateHwnd( es->hwndParent ); + + /* TODO: This should really check fnID instead of ExtraDataSize I guess */ + if (pParent && pParent->ExtraDataSize >= DLGWINDOWEXTRA) + { + return TRUE; + } + } + return FALSE; +} /********************************************************************* * @@ -4717,21 +4738,36 @@ } else if (control) EDIT_WM_Copy(es); break; - case VK_RETURN: - /* If the edit doesn't want the return send a message to the default object */ - if(!(es->style & ES_WANTRETURN)) + case VK_RETURN: + /* If the edit doesn't want the return send a message to the default object */ + if(!(es->style & ES_MULTILINE) || !(es->style & ES_WANTRETURN)) { - HWND hwndParent = GetParent(es->hwndSelf); - DWORD dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); - if (HIWORD(dw) == DC_HASDEFID) - { - SendMessageW( hwndParent, WM_COMMAND, - MAKEWPARAM( LOWORD(dw), BN_CLICKED ), - (LPARAM)GetDlgItem( hwndParent, LOWORD(dw) ) ); - } - } - break; - } + HWND hwndParent; + DWORD dw; + + if (!EDIT_IsInsideDialog(es)) return 1; + if (control) break; + + hwndParent = GetParent(es->hwndSelf); + dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); + if (HIWORD(dw) == DC_HASDEFID) + { + SendMessageW( hwndParent, WM_COMMAND, + MAKEWPARAM( LOWORD(dw), BN_CLICKED ), + (LPARAM)GetDlgItem( hwndParent, LOWORD(dw) ) ); + } + else + SendMessageW( hwndParent, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndParent, IDOK ) ); + } + break; + case VK_ESCAPE: + if (!(es->style & ES_MULTILINE)) + SendMessageW(GetParent(es->hwndSelf), WM_COMMAND, IDCANCEL, (LPARAM)GetDlgItem( GetParent(es->hwndSelf), IDCANCEL ) ); + break; + case VK_TAB: + SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); + break; + } return 0; }

1 0

[tkreuzer] 33908: add simple TTF icon to fontview
by tkreuzer＠svn.reactos.org 09 Jun '08

09 Jun '08

Author: tkreuzer Date: Mon Jun 9 13:10:02 2008 New Revision: 33908 URL: http://svn.reactos.org/svn/reactos?rev=33908&view=rev Log: add simple TTF icon to fontview Added: trunk/rosapps/fontview/ttf.ico (with props) Modified: trunk/rosapps/fontview/fontview.rc Modified: trunk/rosapps/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.rc?rev=3… ============================================================================== --- trunk/rosapps/fontview/fontview.rc [iso-8859-1] (original) +++ trunk/rosapps/fontview/fontview.rc [iso-8859-1] Mon Jun 9 13:10:02 2008 @@ -2,6 +2,8 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_TT ICON "ttf.ico" STRINGTABLE DISCARDABLE BEGIN Added: trunk/rosapps/fontview/ttf.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/ttf.ico?rev=33908… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/fontview/ttf.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[jimtabor] 33907: - Fix Ellipes, for Filip Navara, nice work! - Ref: http://www.reactos.org/archives/public/ros-dev/2007-January/009090.html - Test: http://www.reactos.org/pipermail/ros-dev/attachments/20070118/46ace072/attachment-0001.exe
by jimtabor＠svn.reactos.org 09 Jun '08

09 Jun '08

Author: jimtabor Date: Mon Jun 9 11:46:52 2008 New Revision: 33907 URL: http://svn.reactos.org/svn/reactos?rev=33907&view=rev Log: - Fix Ellipes, for Filip Navara, nice work! - Ref: http://www.reactos.org/archives/public/ros-dev/2007-January/009090.html - Test: http://www.reactos.org/pipermail/ros-dev/attachments/20070118/46ace072/atta… Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Mon Jun 9 11:46:52 2008 @@ -166,6 +166,8 @@ return TRUE; } + + /******************************************************************************/ /* @@ -205,12 +207,22 @@ PDC dc; PDC_ATTR Dc_Attr; BOOL ret = TRUE, Cond1, Cond2; - +/* top + ___________________ + +| | + | | + | | + left | | right + | | + | | + 0|___________________| + 0 bottom + + */ /* * Check the parameters. */ - - if (nRightRect <= nLeftRect || nBottomRect <= nTopRect) + DPRINT("nLeftRect: %d, nTopRect: %d, nRightRect: %d, nBottomRect: %d\n",nLeftRect,nTopRect,nRightRect,nBottomRect); + if (nRightRect <= nLeftRect || nTopRect <= nBottomRect) { SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; @@ -272,28 +284,25 @@ RectBounds.bottom = nBottomRect; IntLPtoDP(dc, (LPPOINT)&RectBounds, 2); + DPRINT("1: Left: %d, Top: %d, Right: %d, Bottom: %d\n", + RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom); RectBounds.left += dc->ptlDCOrig.x; RectBounds.right += dc->ptlDCOrig.x; RectBounds.top += dc->ptlDCOrig.y; RectBounds.bottom += dc->ptlDCOrig.y; - - RadiusX = max((RectBounds.right - RectBounds.left) >> 1, 1); - RadiusY = max((RectBounds.bottom - RectBounds.top) >> 1, 1); + DPRINT("2: Left: %d, Top: %d, Right: %d, Bottom: %d\n", + RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom); + + RadiusX = (RectBounds.right - RectBounds.left)/2; + RadiusY = (RectBounds.bottom - RectBounds.top)/2; CenterX = RectBounds.left + RadiusX; CenterY = RectBounds.top + RadiusY; - - if (RadiusX > RadiusY) - { - nx = RadiusX; - ny = RadiusY; - } - else - { - nx = RadiusY; - ny = RadiusX; - } - + DPRINT("3: RadiusX: %d, RadiusY: %d, CenterX: %d, CenterY: %d\n", + RadiusX,RadiusY,CenterX,CenterY); + + nx = RadiusX; + ny = -RadiusY; da = -1; db = 0xFFFF; ix = 0; @@ -389,7 +398,7 @@ BRUSHOBJ_UnlockBrush(FillBrush); PENOBJ_UnlockPen(PenBrush); DC_UnlockDc(dc); - + DPRINT("NtGdiEllipse exit \n"); return ret; }

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