Ros-diffs April 2010

ros-diffs@reactos.org

22 participants
435 discussions

[cgutman] 47017: [HOSTS] - Add a simple hosts file - Not used yet

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Apr 25 20:36:15 2010 New Revision: 47017 URL: http://svn.reactos.org/svn/reactos?rev=47017&view=rev Log: [HOSTS] - Add a simple hosts file - Not used yet Added: trunk/reactos/media/drivers/etc/hosts Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/media/drivers/etc/etc.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Apr 25 20:36:15 2010 @@ -634,6 +634,7 @@ media\nls\c_28604.nls 1 media\nls\c_28605.nls 1 media\nls\c_28606.nls 1 +media\drivers\etc\hosts 5 media\drivers\etc\services 5 media\inf\audio.inf 6 media\inf\acpi.inf 6 Modified: trunk/reactos/media/drivers/etc/etc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/drivers/etc/etc.rbui… ============================================================================== --- trunk/reactos/media/drivers/etc/etc.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/drivers/etc/etc.rbuild [iso-8859-1] Sun Apr 25 20:36:15 2010 @@ -1,6 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> + <cdfile installbase="$(CDOUTPUT)">hosts</cdfile> + <installfile installbase="system32/drivers/etc">hosts</installfile> <cdfile installbase="$(CDOUTPUT)">services</cdfile> <installfile installbase="system32/drivers/etc">services</installfile> <if property="KDBG" value="1"> Added: trunk/reactos/media/drivers/etc/hosts URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/drivers/etc/hosts?re… ============================================================================== --- trunk/reactos/media/drivers/etc/hosts (added) +++ trunk/reactos/media/drivers/etc/hosts [iso-8859-1] Sun Apr 25 20:36:15 2010 @@ -1,0 +1,3 @@ +# ReactOS hosts file + +127.0.0.1 localhost

14 years, 8 months

[ekohl] 47016: [NEWINFLIB] Add a UNICODE-aware version of the inflib library. It is not used by other components yet but usetup and mkhive will use it in the future. ATTENTION: This commit might break the build bot because I could not test a build on a Linux system.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Apr 25 17:58:34 2010 New Revision: 47016 URL: http://svn.reactos.org/svn/reactos?rev=47016&view=rev Log: [NEWINFLIB] Add a UNICODE-aware version of the inflib library. It is not used by other components yet but usetup and mkhive will use it in the future. ATTENTION: This commit might break the build bot because I could not test a build on a Linux system. Added: trunk/reactos/lib/newinflib/ (with props) trunk/reactos/lib/newinflib/README.txt (with props) trunk/reactos/lib/newinflib/builddep.h (with props) trunk/reactos/lib/newinflib/infcommon.h (with props) trunk/reactos/lib/newinflib/infcore.c (with props) trunk/reactos/lib/newinflib/infget.c (with props) trunk/reactos/lib/newinflib/infhost.h (with props) trunk/reactos/lib/newinflib/infhostgen.c (with props) trunk/reactos/lib/newinflib/infhostget.c (with props) trunk/reactos/lib/newinflib/infhostput.c (with props) trunk/reactos/lib/newinflib/infhostrtl.c (with props) trunk/reactos/lib/newinflib/inflib.h (with props) trunk/reactos/lib/newinflib/inflib.mak (with props) trunk/reactos/lib/newinflib/inflib.rbuild (with props) trunk/reactos/lib/newinflib/infpriv.h (with props) trunk/reactos/lib/newinflib/infput.c (with props) trunk/reactos/lib/newinflib/infros.h (with props) trunk/reactos/lib/newinflib/infrosgen.c (with props) trunk/reactos/lib/newinflib/infrosget.c (with props) trunk/reactos/lib/newinflib/infrosput.c (with props) Modified: trunk/reactos/lib/lib.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=47016&r… Added: trunk/reactos/lib/newinflib/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/README.txt?r… Added: trunk/reactos/lib/newinflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/builddep.h?r… Added: trunk/reactos/lib/newinflib/infcommon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infcommon.h?… Added: trunk/reactos/lib/newinflib/infcore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infcore.c?re… Added: trunk/reactos/lib/newinflib/infget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infget.c?rev… Added: trunk/reactos/lib/newinflib/infhost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infhost.h?re… Added: trunk/reactos/lib/newinflib/infhostgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infhostgen.c… Added: trunk/reactos/lib/newinflib/infhostget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infhostget.c… Added: trunk/reactos/lib/newinflib/infhostput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infhostput.c… Added: trunk/reactos/lib/newinflib/infhostrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infhostrtl.c… Added: trunk/reactos/lib/newinflib/inflib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/inflib.h?rev… Added: trunk/reactos/lib/newinflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/inflib.mak?r… Added: trunk/reactos/lib/newinflib/inflib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/inflib.rbuil… Added: trunk/reactos/lib/newinflib/infpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infpriv.h?re… Added: trunk/reactos/lib/newinflib/infput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infput.c?rev… Added: trunk/reactos/lib/newinflib/infros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infros.h?rev… Added: trunk/reactos/lib/newinflib/infrosgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infrosgen.c?… Added: trunk/reactos/lib/newinflib/infrosget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infrosget.c?… Added: trunk/reactos/lib/newinflib/infrosput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infrosput.c?…

14 years, 8 months

[fireball] 47015: - RosGdiCreateDC: Remove transformation objects from DC. All needed transformations are performed in usermode (additional bonus is that we remove part of floating point operations done in kernelmode). See issue #5237 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Apr 25 17:44:02 2010 New Revision: 47015 URL: http://svn.reactos.org/svn/reactos?rev=47015&view=rev Log: - RosGdiCreateDC: Remove transformation objects from DC. All needed transformations are performed in usermode (additional bonus is that we remove part of floating point operations done in kernelmode). See issue #5237 for more details. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Sun Apr 25 17:44:02 2010 @@ -22,66 +22,11 @@ /* PUBLIC FUNCTIONS **********************************************************/ -// FIXME: don't use floating point in the kernel! use XFORMOBJ function -static -BOOL -NTAPI -IntGdiCombineTransform( - LPXFORM XFormResult, - LPXFORM xform1, - LPXFORM xform2) -{ - XFORM xformTemp; - /* Check for illegal parameters */ - if (!XFormResult || !xform1 || !xform2) - { - return FALSE; - } - - /* Create the result in a temporary XFORM, since xformResult may be - * equal to xform1 or xform2 */ - xformTemp.eM11 = xform1->eM11 * xform2->eM11 + xform1->eM12 * xform2->eM21; - xformTemp.eM12 = xform1->eM11 * xform2->eM12 + xform1->eM12 * xform2->eM22; - xformTemp.eM21 = xform1->eM21 * xform2->eM11 + xform1->eM22 * xform2->eM21; - xformTemp.eM22 = xform1->eM21 * xform2->eM12 + xform1->eM22 * xform2->eM22; - xformTemp.eDx = xform1->eDx * xform2->eM11 + xform1->eDy * xform2->eM21 + xform2->eDx; - xformTemp.eDy = xform1->eDx * xform2->eM12 + xform1->eDy * xform2->eM22 + xform2->eDy; - *XFormResult = xformTemp; - - return TRUE; -} - -// FIXME: Don't use floating point in the kernel! -static -BOOL -NTAPI -DC_InvertXform(const XFORM *xformSrc, - XFORM *xformDest) -{ - FLOAT determinant; - - determinant = xformSrc->eM11*xformSrc->eM22 - xformSrc->eM12*xformSrc->eM21; - if (determinant > -1e-12 && determinant < 1e-12) - { - return FALSE; - } - - xformDest->eM11 = xformSrc->eM22 / determinant; - xformDest->eM12 = -xformSrc->eM12 / determinant; - xformDest->eM21 = -xformSrc->eM21 / determinant; - xformDest->eM22 = xformSrc->eM11 / determinant; - xformDest->eDx = -xformSrc->eDx * xformDest->eM11 - xformSrc->eDy * xformDest->eM21; - xformDest->eDy = -xformSrc->eDx * xformDest->eM12 - xformSrc->eDy * xformDest->eM22; - - return TRUE; -} - BOOL APIENTRY RosGdiCreateDC( PROS_DCINFO dc, HDC *pdev, LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW* initData ) { HGDIOBJ hNewDC; PDC pNewDC; - XFORM xformWorld2Vport, xformVport2World; /* TESTING: Create primary surface */ if (!PrimarySurface.pSurface && !IntCreatePrimarySurface()) @@ -96,17 +41,6 @@ /* Set physical device pointer */ pNewDC->pPDevice = (PVOID)&PrimarySurface; - - /* Initialize xform objects */ - IntGdiCombineTransform(&xformWorld2Vport, &dc->xfWorld2Wnd, &dc->xfWnd2Vport); - - /* Create inverse of world-to-viewport transformation */ - DC_InvertXform(&xformWorld2Vport, &xformVport2World); - XForm2MatrixS(&(pNewDC->mxWorldToDevice), &xformWorld2Vport); - XForm2MatrixS(&(pNewDC->mxDeviceToWorld), &xformVport2World); - - /* Save the world transformation */ - XForm2MatrixS(&(pNewDC->mxWorldToPage), &dc->xfWorld2Wnd); /* Set default fg/bg colors */ pNewDC->crBackgroundClr = RGB(255, 255, 255); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Sun Apr 25 17:44:02 2010 @@ -23,11 +23,6 @@ struct region *Clipping; CLIPOBJ *CombinedClip; PSWM_WINDOW pWindow; - - /* Transformations */ - MATRIX mxWorldToDevice; - MATRIX mxDeviceToWorld; - MATRIX mxWorldToPage; } DC, *PDC; #define DC_Lock(hDC) \

14 years, 8 months

[fireball] 47014: - WINENT.DRV: Remove bit copying, it's a job of SWM. - SWM: Create a screen DC, and copy window's contents when changing position (significantly faster than doing it from winent.drv, not to say that doing so without interaction with a window manager is not possible). - SWM: Invalidate areas after changing moving a window or changing its size. - GDIOBJ: Add a missing space for code beautification. See issue #5237 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Apr 25 15:28:14 2010 New Revision: 47014 URL: http://svn.reactos.org/svn/reactos?rev=47014&view=rev Log: - WINENT.DRV: Remove bit copying, it's a job of SWM. - SWM: Create a screen DC, and copy window's contents when changing position (significantly faster than doing it from winent.drv, not to say that doing so without interaction with a window manager is not possible). - SWM: Invalidate areas after changing moving a window or changing its size. - GDIOBJ: Add a missing space for code beautification. See issue #5237 for more details. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sun Apr 25 15:28:14 2010 @@ -83,23 +83,6 @@ else RedrawWindow( data->hwnd, NULL, rgn, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); DeleteObject( rgn ); } -} - -void swm_move_whole_window( struct ntdrv_win_data *data, const RECT *old_rect ) -{ - HDC hdc_src, hdc_dst; - HWND parent; - - parent = GetAncestor( data->hwnd, GA_PARENT ); - hdc_src = GetDCEx( parent, 0, DCX_CACHE ); - hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE | DCX_WINDOW ); - - BitBlt( hdc_dst, 0, 0, - data->whole_rect.right - data->whole_rect.left, data->whole_rect.bottom - data->whole_rect.top, - hdc_src, old_rect->left, old_rect->top, SRCCOPY ); - - ReleaseDC( data->hwnd, hdc_dst ); - ReleaseDC( parent, hdc_src ); } HKL CDECL RosDrv_ActivateKeyboardLayout( HKL layout, UINT flags ) @@ -954,10 +937,8 @@ /* Sync position change */ if (!(swp_flags & SWP_NOREDRAW)) // HACK: When removing this, explorer's start menu starts to appear partially. Investigate! { + /* SWM: Change windows position */ SwmPosChanged(hwnd, &data->whole_rect, &old_whole_rect, insert_after, swp_flags); - - /* SWM: Move whole window bits */ - swm_move_whole_window( data, &old_whole_rect ); } /* Pass show/hide information to the window manager */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] Sun Apr 25 15:28:14 2010 @@ -51,7 +51,7 @@ {0, 0, 0, NULL}, /* 02 reserved entry */ {0, 0, 0, NULL}, /* 03 reserved entry */ {0, 0, 0, NULL}, /* 04 reserved entry */ - {0, sizeof(SURFACE), TAG_SURFOBJ, SURFACE_Cleanup}, /* 05 SURFACE */ + {0, sizeof(SURFACE), TAG_SURFOBJ, SURFACE_Cleanup}, /* 05 SURFACE */ {0, 0, 0, NULL}, /* 06 reserved entry */ {0, 0, 0, NULL}, /* 07 reserved entry */ {0, sizeof(PALETTE), TAG_PALETTE, GDI_CleanupDummy}, /* 08 PAL */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Sun Apr 25 15:28:14 2010 @@ -34,6 +34,7 @@ LIST_ENTRY SwmWindows; ERESOURCE SwmLock; +HDC SwmDc; /* Screen DC for copying operations */ /* FUNCTIONS *****************************************************************/ @@ -53,6 +54,23 @@ /* Release user resource */ ExReleaseResourceLite(&SwmLock); KeLeaveCriticalRegion(); +} + +VOID +NTAPI +SwmCreateScreenDc() +{ + ROS_DCINFO RosDc; + + /* Create the display DC */ + RtlZeroMemory(&RosDc, sizeof(ROS_DCINFO)); + RosDc.dwType = OBJ_DC; + SwmDc = (HDC)0; + RosGdiCreateDC(&RosDc, &SwmDc, NULL, NULL, NULL, NULL); + RosGdiSetDeviceClipping(SwmDc, 0, NULL, NULL); + + /* Make it global */ + GDIOBJ_SetOwnership(SwmDc, NULL); } VOID @@ -533,6 +551,18 @@ VOID NTAPI +SwmCopyBits(const RECT *WindowRect, const RECT *OldRect) +{ + /* Lazily create a global screen DC */ + if (!SwmDc) SwmCreateScreenDc(); + + /* Copy bits */ + RosGdiBitBlt(SwmDc, WindowRect->left, WindowRect->top, WindowRect->right - WindowRect->left, + WindowRect->bottom - WindowRect->top, SwmDc, OldRect->left, OldRect->top, SRCCOPY); +} + +VOID +NTAPI SwmPosChanging(HWND hWnd, const RECT *WindowRect) { } @@ -542,6 +572,10 @@ SwmPosChanged(HWND hWnd, const RECT *WindowRect, const RECT *OldRect, HWND hWndAfter, UINT SwpFlags) { PSWM_WINDOW SwmWin, SwmPrev; + LONG Width, Height, OldWidth, OldHeight; + BOOLEAN IsMove = FALSE; + struct region *OldRegion, *DiffRegion; + rectangle_t OldRectSafe; /* Acquire the lock */ SwmAcquire(); @@ -553,6 +587,25 @@ /* Release the lock */ SwmRelease(); return; + } + + /* Save parameters */ + OldRectSafe.left = OldRect->left; OldRectSafe.top = OldRect->top; + OldRectSafe.right = OldRect->right; OldRectSafe.bottom = OldRect->bottom; + + Width = WindowRect->right - WindowRect->left; + Height = WindowRect->bottom - WindowRect->top; + + OldWidth = OldRect->right - OldRect->left; + OldHeight = OldRect->bottom - OldRect->top; + + /* Detect if it's a move without resizing */ + if ((WindowRect->top != OldRect->top || + WindowRect->left != OldRect->left) && + Width == OldWidth && + Height == OldHeight) + { + IsMove = TRUE; } /* Check if window really moved anywhere (origin, size or z order) */ @@ -590,6 +643,36 @@ /* Recalculate all clipping */ SwmClipAllWindows(); + + /* Copy bitmap bits if it's a move */ + if (IsMove) + { + /* FIXME: The window MUST be foreground, otherwise bits will be + copied incorrectly */ + SwmCopyBits(WindowRect, OldRect); + } + + /* Paint area changed after moving or resizing */ + if (Width < OldWidth || + Height < OldHeight || + IsMove) + { + /* Subtract new visible rect from the old one, + and invalidate the result */ + OldRegion = create_empty_region(); + set_region_rect(OldRegion, &OldRectSafe); + + /* Compute the difference into the temp region */ + DiffRegion = create_empty_region(); + subtract_region(DiffRegion, OldRegion, SwmWin->Visible); + + /* Paint it */ + SwmPaintRegion(DiffRegion); + + /* Free temporary regions */ + free_region(OldRegion); + free_region(DiffRegion); + } /* Release the lock */ SwmRelease();

14 years, 8 months

[fireball] 47013: - RosGdiCreateDC: Make sure DC is not tied to any window.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Apr 25 15:19:24 2010 New Revision: 47013 URL: http://svn.reactos.org/svn/reactos?rev=47013&view=rev Log: - RosGdiCreateDC: Make sure DC is not tied to any window. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Sun Apr 25 15:19:24 2010 @@ -149,6 +149,7 @@ /* Create an empty combined clipping region */ pNewDC->CombinedClip = EngCreateClip(); pNewDC->Clipping = create_empty_region(); + pNewDC->pWindow = NULL; /* Set default palette */ pNewDC->hPalette = hSystemPal;

14 years, 8 months

[fireball] 47012: - Initialize SWM after DC implementation init. Doesn't change anything now, but it's more logical because SWM is higher level of abstraction than DCs, palette and other low-level things.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Apr 25 15:17:00 2010 New Revision: 47012 URL: http://svn.reactos.org/svn/reactos?rev=47012&view=rev Log: - Initialize SWM after DC implementation init. Doesn't change anything now, but it's more logical because SWM is higher level of abstraction than DCs, palette and other low-level things. Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sun Apr 25 15:17:00 2010 @@ -357,9 +357,6 @@ /* Initialize handle-mapping */ GDI_InitHandleMapping(); - /* Initialize window manager */ - SwmInitialize(); - /* Create stock objects */ CreateStockBitmap(); PALETTE_Init(); @@ -367,5 +364,8 @@ /* Init video driver implementation */ InitDcImpl(); - return STATUS_SUCCESS; -} + /* Initialize window manager */ + SwmInitialize(); + + return STATUS_SUCCESS; +}

14 years, 8 months

[gschneider] 47011: [SYSSETUP] - Create a modeless syssetup dialog so we can explicitly ignore intermediate WM_CLOSE messages (modal property sheets handle them automatically) See issue #4960 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Apr 25 14:13:01 2010 New Revision: 47011 URL: http://svn.reactos.org/svn/reactos?rev=47011&view=rev Log: [SYSSETUP] - Create a modeless syssetup dialog so we can explicitly ignore intermediate WM_CLOSE messages (modal property sheets handle them automatically) See issue #4960 for more details. 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] Sun Apr 25 14:13:01 2010 @@ -1960,6 +1960,7 @@ case WM_DESTROY: { SetupIsActive(0); + PostQuitMessage(0); return TRUE; } @@ -1999,7 +2000,7 @@ break; case PSN_WIZFINISH: - /* Handle a Finish button click, if necessary */ + DestroyWindow(GetParent(hwndDlg)); break; default: @@ -2269,6 +2270,8 @@ HPROPSHEETPAGE ahpsp[8]; PROPSHEETPAGE psp = {0}; UINT nPages = 0; + HWND hWnd; + MSG msg; /* Clear setup data */ ZeroMemory(&SetupData, sizeof(SETUPDATA)); @@ -2345,7 +2348,7 @@ /* Create the property sheet */ psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; + psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER | PSH_MODELESS; psh.hInstance = hDllInstance; psh.hwndParent = NULL; psh.nPages = nPages; @@ -2358,7 +2361,17 @@ SetupData.hTitleFont = CreateTitleFont(); /* Display the wizard */ - PropertySheet(&psh); + hWnd = (HWND)PropertySheet(&psh); + ShowWindow(hWnd, SW_SHOW); + + while (GetMessage(&msg, NULL, 0, 0)) + { + if(!IsDialogMessage(hWnd, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } DeleteObject(SetupData.hTitleFont); }

14 years, 8 months

[gschneider] 47010: [NETCFGX] - Save DHCP and DNS settings from the basic TCP/IP panel independently of each other See issue #5193 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Apr 25 12:47:10 2010 New Revision: 47010 URL: http://svn.reactos.org/svn/reactos?rev=47010&view=rev Log: [NETCFGX] - Save DHCP and DNS settings from the basic TCP/IP panel independently of each other See issue #5193 for more details. Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Sun Apr 25 12:47:10 2010 @@ -3280,23 +3280,25 @@ RegSetValueExW(hKey, L"DefaultGateway", 0, REG_MULTI_SZ, (LPBYTE)L"", 1 * sizeof(WCHAR)); RegSetValueExW(hKey, L"DefaultGatewayMetric", 0, REG_MULTI_SZ, (LPBYTE)L"\0", sizeof(WCHAR) * 2); } - - if (!pCurrentConfig->Ns || pCurrentConfig->AutoconfigActive) - { - RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)L"", 1 * sizeof(WCHAR)); - } - else - { - pStr = CreateMultiSzString(pCurrentConfig->Ns, IPADDR, &dwSize, TRUE); - if(pStr) - { - RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)pStr, dwSize); - RegDeleteValueW(hKey, L"DhcpNameServer"); - CoTaskMemFree(pStr); - } - } - RegCloseKey(hKey); - } + } + + if (!pCurrentConfig->Ns || pCurrentConfig->AutoconfigActive) + { + RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)L"", 1 * sizeof(WCHAR)); + } + else + { + pStr = CreateMultiSzString(pCurrentConfig->Ns, IPADDR, &dwSize, TRUE); + if(pStr) + { + + RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)pStr, dwSize); + RegDeleteValueW(hKey, L"DhcpNameServer"); + CoTaskMemFree(pStr); + } + } + + RegCloseKey(hKey); } return S_OK; }

14 years, 8 months

[gschneider] 47009: [NETCFGX] - Improve the DNS data exchange between the basic IP settings and the advanced DNS panel - Simplify LaunchAdvancedTcpipSettings

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Apr 25 12:45:06 2010 New Revision: 47009 URL: http://svn.reactos.org/svn/reactos?rev=47009&view=rev Log: [NETCFGX] - Improve the DNS data exchange between the basic IP settings and the advanced DNS panel - Simplify LaunchAdvancedTcpipSettings Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Sun Apr 25 12:45:06 2010 @@ -1762,6 +1762,7 @@ pLast = pCur; pCur = pCur->Next; } + This->pCurrentConfig->AutoconfigActive = FALSE; } INT_PTR @@ -2046,7 +2047,6 @@ VOID LaunchAdvancedTcpipSettings( - HWND hDlg, HWND hwndDlg, TcpipConfNotifyImpl * This) { @@ -2069,14 +2069,14 @@ pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW; pinfo.u3.phpage = hppages; pinfo.nPages = 3; - pinfo.hwndParent = hDlg; + pinfo.hwndParent = hwndDlg; pinfo.pszCaption = szBuffer; StoreTcpipBasicSettings(hwndDlg, This, FALSE); PropertySheetW(&pinfo); InitializeTcpipBasicDlgCtrls(hwndDlg, This->pCurrentConfig); - PropSheet_Changed(hDlg, hwndDlg); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } INT_PTR @@ -2328,6 +2328,8 @@ else { SendDlgItemMessageW(hwndDlg, IDC_FIXEDDNS, BM_SETCHECK, BST_CHECKED, 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), TRUE); if (pCurSettings->Ns) { SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Ns->IpAddress); @@ -2521,7 +2523,7 @@ } break; case IDC_ADVANCED: - LaunchAdvancedTcpipSettings(GetParent(hwndDlg), hwndDlg, (TcpipConfNotifyImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER)); + LaunchAdvancedTcpipSettings(hwndDlg, (TcpipConfNotifyImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER)); break; } break;

14 years, 8 months

[tkreuzer] 47008: [STRSAFE] Implement StringCxxPrintf(Ex)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 25 02:20:34 2010 New Revision: 47008 URL: http://svn.reactos.org/svn/reactos?rev=47008&view=rev Log: [STRSAFE] Implement StringCxxPrintf(Ex) Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] Sun Apr 25 02:20:34 2010 @@ -117,6 +117,7 @@ #define StringCchPrintfEx StringCchPrintfExW #define StringCchVPrintf StringCchVPrintfW #define StringCchVPrintfEx StringCchVPrintfExW +#define _vsnprintfAW _vsnwprintf #else // (STRSAFE_UNICODE != 1) @@ -156,6 +157,7 @@ #define StringCchPrintfEx StringCchPrintfExA #define StringCchVPrintf StringCchVPrintfA #define StringCchVPrintfEx StringCchVPrintfExA +#define _vsnprintfAW _vsnprintf #endif // (STRSAFE_UNICODE != 1) #endif // defined(STRSAFE_UNICODE) @@ -238,13 +240,24 @@ /* Create inlined versions */ #define STRSAFEAPI HRESULT static __inline__ -STRSAFEAPI StringCxxCatWorker(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cxMaxAppend, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags, int UseN) +#define STRSAFE_MAX_CXX STRSAFE_CCHtoCXX(STRSAFE_MAX_CCH) + +STRSAFEAPI +StringCxxCatWorker( + STRSAFE_LPTSTR pszDest, + size_t cxDest, + STRSAFE_LPCTSTR pszSrc, + size_t cxMaxAppend, + STRSAFE_LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags, + int UseN) { HRESULT result; STRSAFE_LPTSTR psz = pszDest; size_t cch = STRSAFE_CXXtoCCH(cxDest); - if (!pszDest || !pszSrc || cch > STRSAFE_MAX_CCH || cch == 0) + if (!pszDest || !pszSrc || cxDest > STRSAFE_MAX_CXX || cxDest == 0) { return STRSAFE_E_INVALID_PARAMETER; } @@ -300,57 +313,118 @@ return result; } -STRSAFEAPI StringCxxCatEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) +STRSAFEAPI +StringCxxCatEx( + STRSAFE_LPTSTR pszDest, + size_t cxDest, + STRSAFE_LPCTSTR pszSrc, + STRSAFE_LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) { return StringCxxCatWorker(pszDest, cxDest, pszSrc, 0, ppszDestEnd, pcbRemaining, dwFlags, 0); } -STRSAFEAPI StringCxxCat(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc) +STRSAFEAPI +StringCxxCat( + STRSAFE_LPTSTR pszDest, + size_t cxDest, + STRSAFE_LPCTSTR pszSrc) { return StringCxxCatWorker(pszDest, cxDest, pszSrc, 0, NULL, NULL, 0, 0); } -STRSAFEAPI StringCxxCatN(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend) +STRSAFEAPI +StringCxxCatN( + STRSAFE_LPTSTR pszDest, + size_t cxDest, + STRSAFE_LPCTSTR pszSrc, + size_t cbMaxAppend) { return StringCxxCatWorker(pszDest, cxDest, pszSrc, cbMaxAppend, NULL, NULL, 0, 1); } -STRSAFEAPI StringCxxCatNEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) +STRSAFEAPI +StringCxxCatNEx( + STRSAFE_LPTSTR pszDest, + size_t cxDest, + STRSAFE_LPCTSTR pszSrc, + size_t cbMaxAppend, + STRSAFE_LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) { return StringCxxCatWorker(pszDest, cxDest, pszSrc, cbMaxAppend, ppszDestEnd, pcbRemaining, dwFlags, 1); } -STRSAFEAPI StringCxxCopy(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc) +STRSAFEAPI +StringCxxCopy( + STRSAFE_LPTSTR pszDest, + size_t cbDest, + STRSAFE_LPCTSTR pszSrc) { return 0; // FIXME } -STRSAFEAPI StringCxxCopyEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) +STRSAFEAPI +StringCxxCopyEx( + STRSAFE_LPTSTR pszDest, + size_t cbDest, + STRSAFE_LPCTSTR pszSrc, + STRSAFE_LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) { return 0; // FIXME } -STRSAFEAPI StringCxxCopyN(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc, size_t cbSrc) +STRSAFEAPI +StringCxxCopyN( + STRSAFE_LPTSTR pszDest, + size_t cbDest, + STRSAFE_LPCTSTR pszSrc, + size_t cbSrc) { return 0; // FIXME } -STRSAFEAPI StringCxxCopyNEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc, size_t cbSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) +STRSAFEAPI +StringCxxCopyNEx( + STRSAFE_LPTSTR pszDest, + size_t cbDest, + STRSAFE_LPCTSTR pszSrc, + size_t cbSrc, + STRSAFE_LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) { return 0; // FIXME } -STRSAFEAPI StringCxxGets(STRSAFE_LPTSTR pszDest, size_t cbDest) +STRSAFEAPI +StringCxxGets( + STRSAFE_LPTSTR pszDest, + size_t cbDest) { return 0; // FIXME } -STRSAFEAPI StringCxxGetsEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) +STRSAFEAPI +StringCxxGetsEx( + STRSAFE_LPTSTR pszDest, + size_t cbDest, + STRSAFE_LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) { return 0; // FIXME } -STRSAFEAPI StringCxxLength(STRSAFE_LPCTSTR psz, size_t cxMax, size_t *pcx) +STRSAFEAPI +StringCxxLength( + STRSAFE_LPCTSTR psz, + size_t cxMax, + size_t *pcx) { size_t cch = STRSAFE_CXXtoCCH(cxMax); @@ -358,7 +432,7 @@ if (pcx) *pcx = 0; - if (!psz || cch > STRSAFE_MAX_CCH || cch == 0) + if (!psz || cxMax > STRSAFE_MAX_CXX || cxMax == 0) { return STRSAFE_E_INVALID_PARAMETER; } @@ -376,32 +450,111 @@ return S_OK; } -STRSAFEAPI StringCxxVPrintf(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszFormat, va_list args) -{ - return 0; // FIXME -} - -STRSAFEAPI StringCxxVPrintfEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCTSTR pszFormat, va_list args) -{ - return 0; // FIXME -} - -STRSAFEAPI StringCxxPrintf(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszFormat, ...) +STRSAFEAPI +StringCxxVPrintfEx( + STRSAFE_LPTSTR pszDest, + size_t cxDest, + STRSAFE_LPTSTR *ppszDestEnd, + size_t *pcxRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCTSTR pszFormat, + va_list args) +{ + size_t cchDest = STRSAFE_CXXtoCCH(cxDest); + size_t cchMax = cchDest - 1; + int iResult; + HRESULT hr; + + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (!pszDest) pszDest = (STRSAFE_LPTSTR)L""; + if (!pszFormat) pszFormat = (STRSAFE_LPTSTR)L""; + } + + if (!pszDest || !pszFormat || cxDest > STRSAFE_MAX_CXX || cxDest == 0) + { + return STRSAFE_E_INVALID_PARAMETER; + } + +#if (STRSAFE_USE_SECURE_CRT == 1) + iResult = _vsntprintf_sAW(pszDest, cchDest, cchMax, pszFormat, args); +#else + iResult = _vsnprintfAW(pszDest, cchMax, pszFormat, args); +#endif + + hr = (iResult == -1) ? STRSAFE_E_INSUFFICIENT_BUFFER : S_OK; + + if ((size_t)iResult >= cchMax) + { + pszDest[cchMax] = 0; + iResult = cchMax; + } + + if (ppszDestEnd) *ppszDestEnd = pszDest + iResult; + + if (pcxRemaining) *pcxRemaining = STRSAFE_CCHtoCXX(cchMax - iResult); + + if (SUCCEEDED(hr)) + { + if ((dwFlags & STRSAFE_FILL_BEHIND_NULL) && (iResult + 1 < cchMax)) + { + memset(pszDest + iResult + 1, + dwFlags & 0xff, + (cchMax - iResult - 1) * sizeof(STRSAFE_TCHAR)); + } + } + else + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + memset(pszDest, dwFlags & 0xff, cchMax * sizeof(STRSAFE_TCHAR)); + } + else if (dwFlags & STRSAFE_NULL_ON_FAILURE) + { + *pszDest = 0; + } + } + + return hr; +} + +STRSAFEAPI +StringCxxVPrintf( + STRSAFE_LPTSTR pszDest, + size_t cxDest, + STRSAFE_LPCTSTR pszFormat, + va_list args) +{ + return StringCxxVPrintfEx(pszDest, cxDest, NULL, NULL, 0, pszFormat, args); +} + +STRSAFEAPI +StringCxxPrintf( + STRSAFE_LPTSTR pszDest, + size_t cxDest, + STRSAFE_LPCTSTR pszFormat, ...) { HRESULT result; va_list args; va_start(args, pszFormat); - result = StringCxxVPrintf(pszDest, cbDest, pszFormat, args); + result = StringCxxVPrintf(pszDest, cxDest, pszFormat, args); va_end(args); return result; } -STRSAFEAPI StringCxxPrintfEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCTSTR pszFormat, ...) +STRSAFEAPI +StringCxxPrintfEx( + STRSAFE_LPTSTR pszDest, + size_t cxDest, + STRSAFE_LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCTSTR pszFormat, ...) { HRESULT result; va_list args; va_start(args, pszFormat); - result = StringCxxVPrintfEx(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags, pszFormat, args); + result = StringCxxVPrintfEx(pszDest, cxDest, ppszDestEnd, pcbRemaining, dwFlags, pszFormat, args); va_end(args); return result; } @@ -458,6 +611,7 @@ #undef StringCchPrintfEx #undef StringCchVPrintf #undef StringCchVPrintfEx +#undef _vsnprintfAW #undef STRSAFE_LPTSTR #undef STRSAFE_LPCTSTR

14 years, 8 months

← Newer
1
2
3
4
5
6
7
8
9
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2010