Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[tkreuzer] 39282: timedate.cpl: Fix size of the clock on both windows and reactos on any screen resolution.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 1 19:33:13 2009 New Revision: 39282 URL: http://svn.reactos.org/svn/reactos?rev=39282&view=rev Log: timedate.cpl: Fix size of the clock on both windows and reactos on any screen resolution. Modified: trunk/reactos/dll/cpl/timedate/clock.c Modified: trunk/reactos/dll/cpl/timedate/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/clock.c?r… ============================================================================== --- trunk/reactos/dll/cpl/timedate/clock.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/clock.c [iso-8859-1] Sun Feb 1 19:33:13 2009 @@ -196,6 +196,8 @@ PATCOPY); oldMap = SetMapMode(hdcMem, MM_ISOTROPIC); + SetWindowExtEx(hdcMem, 3600, 2700, NULL); + SetViewportExtEx(hdcMem, 800, -600, NULL); SetViewportOrgEx(hdcMem, pClockData->cxClient / 2, pClockData->cyClient / 2,

15 years, 10 months

[tkreuzer] 39281: gdi32: Fix and enable usermode implementation of SetWindowExtEx and SetViewportExtEx. Win32k: remove NtGdiSetWindowExtEx and NtGdiSetViewportExtEx, rewrite IntFixIsotropicMapping, implement IntGetViewportExtEx

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 1 18:49:19 2009 New Revision: 39281 URL: http://svn.reactos.org/svn/reactos?rev=39281&view=rev Log: gdi32: Fix and enable usermode implementation of SetWindowExtEx and SetViewportExtEx. Win32k: remove NtGdiSetWindowExtEx and NtGdiSetViewportExtEx, rewrite IntFixIsotropicMapping, implement IntGetViewportExtEx Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/include/coord.h trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c [iso-8859-1] Sun Feb 1 18:49:19 2009 @@ -327,7 +327,6 @@ int nYExtent, LPSIZE lpSize) { -#if 0 PDC_ATTR Dc_Attr; #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) @@ -349,20 +348,23 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) + { + return FALSE; + } if (lpSize) { - lpSize->cx = Dc_Attr->szlWindowExt.cx; - lpSize->cy = Dc_Attr->szlWindowExt.cy; - } - - if ((Dc_Attr->ptlWindowExt.cx == nXExtent) && (Dc_Attr->ptlWindowExt.cy == nYExtent)) + lpSize->cx = Dc_Attr->szlViewportExt.cx; + lpSize->cy = Dc_Attr->szlViewportExt.cy; + } + + if ((Dc_Attr->szlViewportExt.cx == nXExtent) && (Dc_Attr->szlViewportExt.cy == nYExtent)) return TRUE; - if ((Dc_Attr->iMapMode == MM_ISOTROPIC) && (Dc_Attr->iMapMode == MM_ANISOTROPIC)) - { - if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + if ((Dc_Attr->iMapMode == MM_ISOTROPIC) || (Dc_Attr->iMapMode == MM_ANISOTROPIC)) + { + if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) { if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) { @@ -370,14 +372,12 @@ Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); } } - Dc_Attr->szlWindowExt.cx = nXExtent; - Dc_Attr->szlWindowExt.cy = nYExtent; + Dc_Attr->szlViewportExt.cx = nXExtent; + Dc_Attr->szlViewportExt.cy = nYExtent; if (Dc_Attr->dwLayout & LAYOUT_RTL) NtGdiMirrorWindowOrg(hdc); Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); } return TRUE; -#endif - return NtGdiSetViewportExtEx(hdc, nXExtent, nYExtent, lpSize); } /* @@ -452,7 +452,6 @@ int nYExtent, LPSIZE lpSize) { -#if 0 PDC_ATTR Dc_Attr; #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) @@ -488,14 +487,14 @@ NtGdiMirrorWindowOrg(hdc); Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); } - else if ((Dc_Attr->iMapMode == MM_ISOTROPIC) && (Dc_Attr->iMapMode == MM_ANISOTROPIC)) + else if ((Dc_Attr->iMapMode == MM_ISOTROPIC) || (Dc_Attr->iMapMode == MM_ANISOTROPIC)) { if ((Dc_Attr->szlWindowExt.cx == nXExtent) && (Dc_Attr->szlWindowExt.cy == nYExtent)) return TRUE; - if ((!nXExtent) && (!nYExtent)) return FALSE; - - if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + if ((!nXExtent) || (!nYExtent)) return FALSE; + + if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) { if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) { @@ -509,8 +508,6 @@ Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); } return TRUE; // Return TRUE. -#endif - return NtGdiSetWindowExtEx(hdc, nXExtent, nYExtent, lpSize); } /* Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] Sun Feb 1 18:49:19 2009 @@ -94,31 +94,11 @@ /* Needs to be done in user-mode. */ BOOL APIENTRY -NtGdiSetWindowExtEx ( - HDC hDC, - int XExtent, - int YExtent, - LPSIZE Size - ); - -/* Needs to be done in user-mode. */ -BOOL -APIENTRY NtGdiSetViewportOrgEx ( HDC hDC, int X, int Y, LPPOINT Point - ); - -/* Needs to be done in user-mode. */ -BOOL -APIENTRY -NtGdiSetViewportExtEx ( - HDC hDC, - int XExtent, - int YExtent, - LPSIZE Size ); /* Needs to be done in user-mode. */ Modified: trunk/reactos/subsystems/win32/win32k/include/coord.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/coord.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/coord.h [iso-8859-1] Sun Feb 1 18:49:19 2009 @@ -23,5 +23,6 @@ DWORD Mode); VOID FASTCALL IntMirrorWindowOrg(PDC); +void FASTCALL IntFixIsotropicMapping(PDC dc); #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Sun Feb 1 18:49:19 2009 @@ -37,29 +37,33 @@ void FASTCALL IntFixIsotropicMapping(PDC dc) { - ULONG xdim; - ULONG ydim; - PDC_ATTR Dc_Attr = dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - xdim = EngMulDiv(Dc_Attr->szlViewportExt.cx, - ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzSize, - ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes) / - Dc_Attr->szlWindowExt.cx; - ydim = EngMulDiv(Dc_Attr->szlViewportExt.cy, - ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertSize, - ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes) / - Dc_Attr->szlWindowExt.cy; - - if (xdim > ydim) - { - Dc_Attr->szlViewportExt.cx = Dc_Attr->szlViewportExt.cx * abs(ydim / xdim); - if (!Dc_Attr->szlViewportExt.cx) Dc_Attr->szlViewportExt.cx = 1; - } - else - { - Dc_Attr->szlViewportExt.cy = Dc_Attr->szlViewportExt.cy * abs(xdim / ydim); - if (!Dc_Attr->szlViewportExt.cy) Dc_Attr->szlViewportExt.cy = 1; + PDC_ATTR pDcAttr; + LONG fx, fy, s; + + /* Get a pointer to the DC_ATTR */ + pDcAttr = dc->pDc_Attr; + if (!pDcAttr) pDcAttr = &dc->Dc_Attr; + + /* Check if all values are valid */ + if (pDcAttr->szlWindowExt.cx == 0 || pDcAttr->szlWindowExt.cy == 0 || + pDcAttr->szlViewportExt.cx == 0 || pDcAttr->szlViewportExt.cy == 0) + { + /* Don't recalculate */ + return; + } + + fx = abs(pDcAttr->szlWindowExt.cx * pDcAttr->szlViewportExt.cy); + fy = abs(pDcAttr->szlWindowExt.cy * pDcAttr->szlViewportExt.cx); + + if (fy > fx) + { + s = pDcAttr->szlWindowExt.cy * pDcAttr->szlViewportExt.cx > 0 ? 1 : -1; + pDcAttr->szlViewportExt.cx = s * fx / pDcAttr->szlWindowExt.cy; + } + else if (fx > fy) + { + s = pDcAttr->szlWindowExt.cx * pDcAttr->szlViewportExt.cy > 0 ? 1 : -1; + pDcAttr->szlViewportExt.cy = s * fy / pDcAttr->szlWindowExt.cx; } } @@ -716,78 +720,6 @@ return PrevMapMode; } -BOOL -APIENTRY -NtGdiSetViewportExtEx(HDC hDC, - int XExtent, - int YExtent, - LPSIZE Size) -{ - PDC dc; - PDC_ATTR Dc_Attr; - - dc = DC_LockDc(hDC); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - Dc_Attr = dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - switch (Dc_Attr->iMapMode) - { - case MM_HIENGLISH: - case MM_HIMETRIC: - case MM_LOENGLISH: - case MM_LOMETRIC: - case MM_TEXT: - case MM_TWIPS: - DC_UnlockDc(dc); - return FALSE; - - case MM_ISOTROPIC: - // Here we should (probably) check that SetWindowExtEx *really* has - // been called - break; - } - - if (Size) - { - NTSTATUS Status = STATUS_SUCCESS; - - _SEH2_TRY - { - ProbeForWrite(Size, sizeof(SIZE), 1); - Size->cx = Dc_Attr->szlViewportExt.cx; - Size->cy = Dc_Attr->szlViewportExt.cy; - - Dc_Attr->szlViewportExt.cx = XExtent; - Dc_Attr->szlViewportExt.cy = YExtent; - - if (Dc_Attr->iMapMode == MM_ISOTROPIC) - IntFixIsotropicMapping(dc); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DC_UnlockDc(dc); - return FALSE; - } - } - - - DC_UpdateXforms(dc); - DC_UnlockDc(dc); - - return TRUE; -} BOOL APIENTRY @@ -834,70 +766,6 @@ Dc_Attr->ptlViewportOrg.x = X; Dc_Attr->ptlViewportOrg.y = Y; - - DC_UpdateXforms(dc); - DC_UnlockDc(dc); - - return TRUE; -} - -BOOL -APIENTRY -NtGdiSetWindowExtEx(HDC hDC, - int XExtent, - int YExtent, - LPSIZE Size) -{ - PDC dc; - PDC_ATTR Dc_Attr; - - dc = DC_LockDc(hDC); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - Dc_Attr = dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - switch (Dc_Attr->iMapMode) - { - case MM_HIENGLISH: - case MM_HIMETRIC: - case MM_LOENGLISH: - case MM_LOMETRIC: - case MM_TEXT: - case MM_TWIPS: - DC_UnlockDc(dc); - return FALSE; - } - - if (Size) - { - NTSTATUS Status = STATUS_SUCCESS; - - _SEH2_TRY - { - ProbeForWrite(Size, sizeof(SIZE), 1); - Size->cx = Dc_Attr->szlWindowExt.cx; - Size->cy = Dc_Attr->szlWindowExt.cy; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DC_UnlockDc(dc); - return FALSE; - } - } - - Dc_Attr->szlWindowExt.cx = XExtent; - Dc_Attr->szlWindowExt.cy = YExtent; DC_UpdateXforms(dc); DC_UnlockDc(dc); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sun Feb 1 18:49:19 2009 @@ -65,7 +65,6 @@ UNICODE_STRING DriverName; DWORD Layout = 0; - DisplayDC = NULL; if (hDC == NULL) { RtlInitUnicodeString(&DriverName, L"DISPLAY"); @@ -1264,6 +1263,33 @@ AspectRatio->cy = 0; } return TRUE; +} + +VOID +FASTCALL +IntGetViewportExtEx(PDC pdc, LPSIZE pSize) +{ + PDC_ATTR pDc_Attr; + + /* Get a pointer to the dc attribute */ + pDc_Attr = pdc->pDc_Attr; + if (!pDc_Attr) pDc_Attr = &pdc->Dc_Attr; + + /* Check if we need to recalculate */ + if (pDc_Attr->flXform & PAGE_EXTENTS_CHANGED) + { + /* Check if we need to do isotropic fixup */ + if (pDc_Attr->iMapMode == MM_ISOTROPIC) + { + IntFixIsotropicMapping(pdc); + } + + /* Update xforms, CHECKME: really done here? */ + DC_UpdateXforms(pdc); + } + + /* Copy the viewport extension */ + *pSize = pDc_Attr->szlViewportExt; } BOOL APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] Sun Feb 1 18:49:19 2009 @@ -170,7 +170,6 @@ DC_GET_VAL( UINT, IntGdiGetTextAlign, lTextAlign ) DC_GET_VAL( COLORREF, IntGdiGetTextColor, crForegroundClr ) -DC_GET_VAL_EX( GetViewportExtEx, szlViewportExt.cx, szlViewportExt.cy, SIZE, cx, cy ) DC_GET_VAL_EX( GetViewportOrgEx, ptlViewportOrg.x, ptlViewportOrg.y, POINT, x, y ) DC_GET_VAL_EX( GetWindowExtEx, szlWindowExt.cx, szlWindowExt.cy, SIZE, cx, cy ) DC_GET_VAL_EX( GetWindowOrgEx, ptlWindowOrg.x, ptlWindowOrg.y, POINT, x, y ) Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun Feb 1 18:49:19 2009 @@ -675,9 +675,7 @@ # #ReactOS specific syscalls NtGdiSetDIBits 7 -NtGdiSetViewportExtEx 4 NtGdiSetViewportOrgEx 4 -NtGdiSetWindowExtEx 4 NtGdiSetWindowOrgEx 4 NtGdiGetFontFamilyInfo 4 NtGdiOffsetViewportOrgEx 4

15 years, 10 months

[tkreuzer] 39280: Add tests for SetWindowExtEx, one more test for CreateCompatibleDC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 1 18:37:01 2009 New Revision: 39280 URL: http://svn.reactos.org/svn/reactos?rev=39280&view=rev Log: Add tests for SetWindowExtEx, one more test for CreateCompatibleDC Added: trunk/rostests/apitests/gdi32api/tests/SetWindowExtEx.c (with props) Modified: trunk/rostests/apitests/gdi32api/testlist.c trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Sun Feb 1 18:37:01 2009 @@ -40,6 +40,7 @@ #include "tests/SetDCPenColor.c" #include "tests/SetMapMode.c" #include "tests/SetSysColors.c" +#include "tests/SetWindowExtEx.c" #include "tests/SetWorldTransform.c" @@ -82,6 +83,7 @@ { L"SetDCPenColor", Test_SetDCPenColor }, { L"SetMapMode", Test_SetMapMode }, { L"SetSysColors", Test_SetSysColors }, + { L"SetWindowExtEx", Test_SetWindowExtEx }, { L"SetWorldTransform", Test_SetWorldTransform }, }; Modified: trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c [iso-8859-1] Sun Feb 1 18:37:01 2009 @@ -39,6 +39,12 @@ RTEST(hDC2 == NULL); if (hDC2 != NULL) DeleteDC(hDC2); + /* Check map mode */ + hDC = CreateCompatibleDC(hDCScreen); + SetMapMode(hDC, MM_ISOTROPIC); + hDC2 = CreateCompatibleDC(hDC); + TEST(GetMapMode(hDC2) == MM_TEXT); + // cleanup DeleteDC(hDC); Added: trunk/rostests/apitests/gdi32api/tests/SetWindowExtEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/S… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/SetWindowExtEx.c (added) +++ trunk/rostests/apitests/gdi32api/tests/SetWindowExtEx.c [iso-8859-1] Sun Feb 1 18:37:01 2009 @@ -1,0 +1,275 @@ + + +INT +Test_SetWindowExtEx(PTESTINFO pti) +{ + HDC hDC; + BOOL ret; + SIZE WindowExt, ViewportExt; + PGDI_TABLE_ENTRY pEntry; + DC_ATTR* pDC_Attr; + + hDC = CreateCompatibleDC(0); + ASSERT(hDC); + + SetLastError(0); + ret = SetWindowExtEx(0, 0, 0, NULL); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + TEST(ret == 0); + + SetLastError(0); + ret = SetWindowExtEx((HDC)0x1234, 0, 0, NULL); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + TEST(ret == 0); + + SetLastError(0); + ret = SetWindowExtEx(hDC, 0, 0, NULL); + TEST(GetLastError() == 0); + TEST(ret == 1); + + WindowExt.cx = 1234; + WindowExt.cy = 6789; + SetLastError(0); + ret = SetWindowExtEx(0, 0, 0, &WindowExt); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + TEST(ret == 0); + TEST(WindowExt.cx == 1234); + TEST(WindowExt.cy == 6789); + + DeleteDC(hDC); + + /* Test with a deleted DC */ + SetLastError(0); + ret = SetWindowExtEx(hDC, 0, 0, NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + TEST(ret == 0); + + hDC = CreateCompatibleDC(0); + ASSERT(hDC); + + pEntry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hDC); + ASSERT(pEntry); + pDC_Attr = pEntry->UserData; + ASSERT(pDC_Attr); + + /* Test setting it without changing the map mode (MM_TEXT) */ + ret = SetWindowExtEx(hDC, 10, 20, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 1); + TEST(WindowExt.cy == 1); + + /* Values should not be changed */ + WindowExt.cx = WindowExt.cy = 0; + ret = SetWindowExtEx(hDC, 40, 30, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 1); + TEST(WindowExt.cy == 1); + + /* Check the viewport */ + GetViewportExtEx(hDC, &ViewportExt); + TEST(ViewportExt.cx == 1); + TEST(ViewportExt.cy == 1); + + /* Test setting in isotropic mode with 0 extents */ + SetMapMode(hDC, MM_ISOTROPIC); + WindowExt.cx = WindowExt.cy = 0; + ret = SetWindowExtEx(hDC, 0, 0, &WindowExt); + TEST(ret == 0); + TEST(WindowExt.cx == 3600); + TEST(WindowExt.cy == 2700); + ret = SetWindowExtEx(hDC, 100, 0, &WindowExt); + TEST(ret == 0); + ret = SetWindowExtEx(hDC, 0, 100, &WindowExt); + TEST(ret == 0); + + /* Test setting in isotropic mode */ + ret = SetWindowExtEx(hDC, 21224, 35114, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 3600); + TEST(WindowExt.cy == 2700); + + /* Values should be changed */ + ret = SetWindowExtEx(hDC, + 4 * GetDeviceCaps(GetDC(0), HORZRES), + -4 * GetDeviceCaps(GetDC(0), VERTRES), + &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 21224); + TEST(WindowExt.cy == 35114); + + /* Check the viewport, should be the same */ + GetViewportExtEx(hDC, &ViewportExt); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + + /* again isotropic mode with 1:1 res */ + ret = SetWindowExtEx(hDC, 123, 123, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 4 * GetDeviceCaps(GetDC(0), HORZRES)); + TEST(WindowExt.cy == -4 * GetDeviceCaps(GetDC(0), VERTRES)); + + /* Test flXform */ + TEST(pDC_Attr->flXform & PAGE_EXTENTS_CHANGED); + + /* Check the viewport from the dcattr, without going through gdi */ + TEST(pDC_Attr->szlViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(pDC_Attr->szlViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + + /* Check the viewport with gdi, should not be the same */ + GetViewportExtEx(hDC, &ViewportExt); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), VERTRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + + /* Test flXform */ + TEST(pDC_Attr->flXform & PAGE_EXTENTS_CHANGED); + + /* again isotropic mode with 3:1 res */ + ret = SetWindowExtEx(hDC, 300, 100, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 123); + TEST(WindowExt.cy == 123); + + /* Check the viewport now, should not be the same */ + GetViewportExtEx(hDC, &ViewportExt); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), VERTRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES) / 3); + + /* again isotropic mode with 1:3 res */ + SetViewportExtEx(hDC, 6000, 3000, 0); + ret = SetWindowExtEx(hDC, 200, 600, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 300); + TEST(WindowExt.cy == 100); + + /* Check the viewport now, should not be the same */ + GetViewportExtEx(hDC, &ViewportExt); + TEST(ViewportExt.cx == 1000); + TEST(ViewportExt.cy == 3000); + + /* Test setting in anisotropic mode */ + SetMapMode(hDC, MM_ANISOTROPIC); + ret = SetWindowExtEx(hDC, 80, 60, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 200); + TEST(WindowExt.cy == 600); + + /* Values should be changed */ + ret = SetWindowExtEx(hDC, 500, 500, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 80); + TEST(WindowExt.cy == 60); + + /* Check the viewport */ + GetViewportExtEx(hDC, &ViewportExt); + TEST(ViewportExt.cx == 1000); + TEST(ViewportExt.cy == 3000); + + /* Test setting in low metric mode */ + SetMapMode(hDC, MM_LOMETRIC); + ret = SetWindowExtEx(hDC, 120, 90, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 3600); + TEST(WindowExt.cy == 2700); + + /* Values should not be changed */ + WindowExt.cx = WindowExt.cy = 0; + ret = SetWindowExtEx(hDC, 900, 700, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 3600); + TEST(WindowExt.cy == 2700); + + /* Check the viewport */ + GetViewportExtEx(hDC, &ViewportExt); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + + /* Test setting in high metric mode */ + SetMapMode(hDC, MM_HIMETRIC); + ret = SetWindowExtEx(hDC, 120, 90, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 36000); + TEST(WindowExt.cy == 27000); + + /* Values should not be changed */ + WindowExt.cx = WindowExt.cy = 0; + ret = SetWindowExtEx(hDC, 500, 300, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 36000); + TEST(WindowExt.cy == 27000); + + /* Check the viewport */ + GetViewportExtEx(hDC, &ViewportExt); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + + /* Test setting in low english mode */ + SetMapMode(hDC, MM_LOENGLISH); + ret = SetWindowExtEx(hDC, 320, 290, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 1417); + TEST(WindowExt.cy == 1063); + + /* Values should not be changed */ + WindowExt.cx = WindowExt.cy = 0; + ret = SetWindowExtEx(hDC, 560, 140, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 1417); + TEST(WindowExt.cy == 1063); + + /* Check the viewport */ + GetViewportExtEx(hDC, &ViewportExt); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + + /* Test setting in high english mode */ + SetMapMode(hDC, MM_HIENGLISH); + ret = SetWindowExtEx(hDC, 320, 290, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 14173); + TEST(WindowExt.cy == 10630); + + /* Values should not be changed */ + WindowExt.cx = WindowExt.cy = 0; + ret = SetWindowExtEx(hDC, 1560, 1140, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 14173); + TEST(WindowExt.cy == 10630); + + /* Check the viewport */ + GetViewportExtEx(hDC, &ViewportExt); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + + /* Test setting in twips mode */ + SetMapMode(hDC, MM_TWIPS); + ret = SetWindowExtEx(hDC, 3320, 3290, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 20409); + TEST(WindowExt.cy == 15307); + + /* Values should not be changed */ + WindowExt.cx = WindowExt.cy = 0; + ret = SetWindowExtEx(hDC, 4560, 4140, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 20409); + TEST(WindowExt.cy == 15307); + + /* Check the viewport */ + GetViewportExtEx(hDC, &ViewportExt); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + + /* test manually modifying the dcattr, should go to tests for GetViewportExtEx */ + SetMapMode(hDC, MM_ISOTROPIC); + ret = SetWindowExtEx(hDC, 420, 4140, &WindowExt); + pDC_Attr->szlWindowExt.cx = 0; + GetViewportExtEx(hDC, &ViewportExt); + TEST(pDC_Attr->szlWindowExt.cx == 0); + TEST(ViewportExt.cx == 0); + + DeleteDC(hDC); + + return APISTATUS_NORMAL; + + +} Propchange: trunk/rostests/apitests/gdi32api/tests/SetWindowExtEx.c ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 10 months

[mkupfer] 39279: minor corrections and MUI suggestion

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sun Feb 1 17:57:56 2009 New Revision: 39279 URL: http://svn.reactos.org/svn/reactos?rev=39279&view=rev Log: minor corrections and MUI suggestion Modified: branches/matthias-i18n/media/inf/README Modified: branches/matthias-i18n/media/inf/README URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/README?… ============================================================================== --- branches/matthias-i18n/media/inf/README [iso-8859-1] (original) +++ branches/matthias-i18n/media/inf/README [iso-8859-1] Sun Feb 1 17:57:56 2009 @@ -1,7 +1,7 @@ Internationalization of INF-files: -For internationalization of INF-files each [Strings]-section need a language -sepcific additional one. This section have the name [Strings.LanguageId] e.g. +For internationalization of INF-files each [Strings]-section needs a language +specific additional section. This section has the name [Strings.LanguageId] e.g. [Strings.0407] for German. During setup dependent on the system language the language dependent substitations will be applied and the result will be stored in the registry. That's the way Microsoft described in MSDN: @@ -37,9 +37,9 @@ an_arbitrary_key.0407 = "deutsche version value_1" -In the hope Windows will ignore that additional keys, we can use it to handle -multiple languages at the same time with a default language as well not limited -to english. Additional to Windows we have to implement/modify the +In the hope Micrsosft OS will ignore the additional keys, we can use it to +handle multiple languages at the same time with a default language as well not +limited to english. Additional to Windows we have to implement/modify the registry-related functions to consider the language specific keys, but that's a little effort and i think it doesn't lead into incompatibility. To prevent a bloated registry we could modify that way and add the translated @@ -48,6 +48,10 @@ General issues of multiple (system) languages: We can translate the programm files and perhaps the registry entries in the -described above. But how to handle files/directories with translatabel names? -If we intend to have a (native) language for each user, so the directory +described way above. But how to handle files/directories with translatabel +names? If we intend to have a (native) language for each user, so the directory structure may become confusing and may be hard to handle correctly. + +For the future I recommend a modified MUI-System, maybe we can include the +advantages of gettext of Linux/Unix-systems and store the translations or +language specific stuff at a central place instead of the programm directory.

15 years, 10 months

[tkreuzer] 39278: Fix KiInitGdtEntry

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 1 16:08:01 2009 New Revision: 39278 URL: http://svn.reactos.org/svn/reactos?rev=39278&view=rev Log: Fix KiInitGdtEntry Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Sun Feb 1 16:08:01 2009 @@ -286,7 +286,7 @@ /* Setup TSS entry */ Entry = KiGetGdtEntry(pGdt, KGDT_TSS); - KiInitGdtEntry(Entry, TssBase, I386_TSS, 0); + KiInitGdtEntry(Entry, TssBase, sizeof(KTSS), I386_TSS, 0); /* Setup the gdt descriptor */ Desc.Limit = 12 * sizeof(ULONG64) - 1; Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Sun Feb 1 16:08:01 2009 @@ -69,7 +69,7 @@ VOID FORCEINLINE -KiInitGdtEntry(PKGDTENTRY64 Entry, ULONG64 Base, UCHAR Type, UCHAR Dpl) +KiInitGdtEntry(PKGDTENTRY64 Entry, ULONG64 Base, ULONG Limit, UCHAR Type, UCHAR Dpl) { Entry->Bits.Type = Type; Entry->Bits.Present = 1; @@ -78,6 +78,9 @@ Entry->Bytes.BaseMiddle = (UCHAR)(Base >> 16); Entry->Bytes.BaseHigh = (UCHAR)(Base >> 24); Entry->BaseUpper = (ULONG)(Base >> 32); + Entry->LimitLow = (USHORT)(Limit & 0xFFFF); + Entry->Bits.LimitHigh = (ULONG)((Limit >> 16) & 0xf); + Entry->MustBeZero = 0; } VOID FrLdrSetupGdtIdt();

15 years, 10 months

[dreimer] 39277: Hello, new webspace.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Feb 1 15:39:15 2009 New Revision: 39277 URL: http://svn.reactos.org/svn/reactos?rev=39277&view=rev Log: Hello, new webspace. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Sun Feb 1 15:39:15 2009 @@ -67,7 +67,7 @@ # # The Update Server. # -$_ROSBE_URL = "http://mitglied.lycos.de/reimerdaniel/rosbe" +$_ROSBE_URL = "http://danielreimer.5x.to/rosbe" # # Save the recent dir to cd back there at the end. Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Sun Feb 1 15:39:15 2009 @@ -21,7 +21,7 @@ :: :: The Update Server. :: -set _ROSBE_URL=http://mitglied.lycos.de/reimerdaniel/rosbe +set _ROSBE_URL=http://danielreimer.5x.to/rosbe :: :: Save the recent dir to cd back there at the end.

15 years, 10 months

[dreimer] 39276: fixes...

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Feb 1 14:53:07 2009 New Revision: 39276 URL: http://svn.reactos.org/svn/reactos?rev=39276&view=rev Log: fixes... Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Sun Feb 1 14:53:07 2009 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "1.3" +!define PRODUCT_VERSION "1.4" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -17,15 +17,15 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.3.0.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.4.0.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2008 ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2008 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2009 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.3.0.0" +VIProductVersion "1.4.0.0" CRCCheck force SetCompressor /FINAL /SOLID lzma @@ -238,11 +238,20 @@ SetOverwrite try File /r Root\sSVN.cmd File /r Components\Powershell\Build.ps1 + File /r Components\Powershell\charch.ps1 + File /r Components\Powershell\chdefdir.ps1 + File /r Components\Powershell\chdefgcc.ps1 File /r Components\Powershell\Clean.ps1 + File /r Components\Powershell\Config.ps1 File /r Components\Powershell\Help.ps1 File /r Components\Powershell\MinGW.ps1 + File /r Components\Powershell\options.ps1 + File /r Components\Powershell\reladdr2line.ps1 File /r Components\Powershell\RosBE.ps1 File /r Components\Powershell\rosbe-gcc-env.ps1 + File /r Components\Powershell\scut.ps1 + File /r Components\Powershell\sSVN.ps1 + File /r Components\Powershell\update.ps1 SectionEnd Section "Update Script" SEC11 @@ -252,7 +261,7 @@ File /r Components\Tools\wget.exe File /r Components\Tools\libintl3.dll File /r Components\Tools\libeay32.dll - File /r Components\Tools\ssleay32.dll + File /r Components\Tools\libssl32.dll File /r Components\Tools\libiconv2.dll SetOutPath "$INSTDIR" SetOverwrite try

15 years, 10 months

[dreimer] 39275: Version 1.4 here we come

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Feb 1 14:25:53 2009 New Revision: 39275 URL: http://svn.reactos.org/svn/reactos?rev=39275&view=rev Log: Version 1.4 here we come Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/Build.ps1 # PURPOSE: Perform the build of ReactOS. -# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/Clean.ps1 # PURPOSE: Clean the ReactOS source directory. -# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -1,9 +1,9 @@ # # PROJECT: RosBE - ReactOS Build Environment for Windows # LICENSE: GNU General Public License v2. (see LICENSE.txt) -# FILE: Root/Config.cmd +# FILE: Root/Config.ps1 # PURPOSE: A Basic Config.rbuild Creator for ReactOS. -# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/Help.ps1 # PURPOSE: Display help for the commands included with the ReactOS Build Environment. -# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/MinGW.ps1 # PURPOSE: This script provides/sets up a standard MinGW build environment. -# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -4,7 +4,7 @@ # FILE: Root/RosBE.ps1 # PURPOSE: This script provides/sets up various build environments for # ReactOS. Currently it provides a GCC 4.1.3 build environment. -# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # # @@ -19,7 +19,7 @@ $ENV:APPDATA = $ENV:USERPROFILE } $ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" -$global:_ROSBE_VERSION = 1.3 +$global:_ROSBE_VERSION = 1.4 $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_MODE = "RosBE" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/charch.ps1 # PURPOSE: Tool to change the current Arch to build ROS for in RosBE. -# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # $host.ui.RawUI.WindowTitle = "Change the Architecture to build for..." Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -1,11 +1,10 @@ # # PROJECT: RosBE - ReactOS Build Environment for Windows # LICENSE: GNU General Public License v2. (see LICENSE.txt) -# FILE: Root/chdefdir.cmd +# FILE: Root/chdefdir.ps1 # PURPOSE: Tool to change the current working ReactOS source directory # in RosBE. -# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> -# Peter Ward <dralnix(a)gmail.com> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -1,10 +1,9 @@ # # PROJECT: RosBE - ReactOS Build Environment for Windows # LICENSE: GNU General Public License v2. (see LICENSE.txt) -# FILE: Root/chdefgcc.cmd +# FILE: Root/chdefgcc.ps1 # PURPOSE: Tool to change the current gcc in RosBE. -# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> -# Peter Ward <dralnix(a)gmail.com> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # if ($_ROSBE_MODE -eq "RosBE") { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -1,9 +1,9 @@ # # PROJECT: RosBE - ReactOS Build Environment for Windows # LICENSE: GNU General Public License v2. (see LICENSE.txt) -# FILE: Root/options.cmd +# FILE: Root/options.ps1 # PURPOSE: Starts options.exe and restarts RosBE afterwards. -# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -1,11 +1,9 @@ # # PROJECT: RosBE - ReactOS Build Environment for Windows # LICENSE: GNU General Public License v2. (see LICENSE.txt) -# FILE: Root/reladdr2line.cmd +# FILE: Root/reladdr2line.ps1 # PURPOSE: Converts a value to hex and displays it. -# COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> -# Daniel Reimer <reimer.daniel(a)freenet.de> -# Peter Ward <dralnix(a)gmail.com> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/rosbe-gcc-env.ps1 # PURPOSE: Set up the GCC 4.x.x build environment. -# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -1,9 +1,9 @@ # # PROJECT: RosBE - ReactOS Build Environment for Windows # LICENSE: GNU General Public License v2. (see LICENSE.txt) -# FILE: Root/sSVN.cmd +# FILE: Root/sSVN.ps1 # PURPOSE: Integrated SVN Client. -# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -1,11 +1,9 @@ # # PROJECT: RosBE - ReactOS Build Environment for Windows. # LICENSE: GNU General Public License v2. (see LICENSE.txt) -# FILE: Root/scut.cmd +# FILE: Root/scut.ps1 # PURPOSE: Manages named shortcuts to ReactOS source directories. -# COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> -# Daniel Reimer <reimer.daniel(a)freenet.de> -# Peter Ward <dralnix(a)gmail.com> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # function paramcall($arg) { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/update.ps1 # PURPOSE: RosBE Updater. -# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # # Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Build.cmd :: PURPOSE: Perform the build of ReactOS. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Colin Finck <mail(a)colinfinck.de> :: Peter Ward <dralnix(a)gmail.com> :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -30,6 +30,12 @@ - Modified: Changed the default values of config to the previous setting instead of the real default one if you don't type in anything for a setting. (Daniel Reimer) - Tons of Code cleanup, code reduction and Bugfixes (Daniel Reimer) +- Updated: MingW32 Runtime DLL 3.15.2 (Daniel Reimer) +- Updated: NASM to 2.05.01 (Daniel Reimer) +- Updated: Subversion to 1.5.5 (Daniel Reimer) +- Updated: NSIS to 2.42 (Daniel Reimer) +- Updated: Binutils 2.19.51 Build 20090127. (Daniel Reimer) + *** October 26th, 2008 - RosBE 1.3 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Clean.cmd :: PURPOSE: Clean the ReactOS source directory. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Config.cmd :: PURPOSE: A Basic Config.rbuild Creator for ReactOS. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: @echo off Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Help.cmd :: PURPOSE: Display help for the commands included with the ReactOS Build Environment. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/MinGW.cmd :: PURPOSE: This script provides/sets up a standard MinGW build environment. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -4,7 +4,7 @@ :: FILE: Root/RosBE.cmd :: PURPOSE: This script provides/sets up various build environments for :: ReactOS. Currently it provides a GCC 4.1.3 build environment. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: :: @@ -21,7 +21,7 @@ color 0A if not defined APPDATA set APPDATA=%USERPROFILE% set PATH=%SystemRoot%\system32;%SystemRoot% -set _ROSBE_VERSION=1.3 +set _ROSBE_VERSION=1.4 set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% set _ROSBE_MODE=RosBE Modified: trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Tim… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/TimeDate.cmd :: PURPOSE: Get the current date and time for use in our build log's file name. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/charch.cmd :: PURPOSE: Tool to change the current Arch to build ROS for in RosBE. -:: COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -4,7 +4,7 @@ :: FILE: Root/chdefdir.cmd :: PURPOSE: Tool to change the current working ReactOS source directory :: in RosBE. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/chdefgcc.cmd :: PURPOSE: Tool to change the current gcc in RosBE. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: @echo off Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/options.cmd :: PURPOSE: Starts options.exe and restarts RosBE afterwards. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: @echo off Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/reladdr2line.cmd :: PURPOSE: Converts a value to hex and displays it. -:: COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> +:: COPYRIGHT: Copyright 2009 Christoph von Wittich <Christoph_vW(a)reactos.org> :: Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/rosbe-gcc-env.cmd :: PURPOSE: Set up the GCC 4.x.x build environment. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/sSVN.cmd :: PURPOSE: Integrated SVN Client. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: @echo off Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/scut.cmd :: PURPOSE: Manages named shortcuts to ReactOS source directories. -:: COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> +:: COPYRIGHT: Copyright 2009 Colin Finck <mail(a)colinfinck.de> :: Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Sun Feb 1 14:25:53 2009 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/update.cmd :: PURPOSE: RosBE Updater. -:: COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: @echo off

15 years, 10 months

[hpoussin] 39274: Take into account environment variables specified by gina DLL

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Feb 1 13:52:41 2009 New Revision: 39274 URL: http://svn.reactos.org/svn/reactos?rev=39274&view=rev Log: Take into account environment variables specified by gina DLL Modified: trunk/reactos/base/system/winlogon/sas.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun Feb 1 13:52:41 2009 @@ -170,6 +170,9 @@ { PROFILEINFOW ProfileInfo; LPVOID lpEnvironment = NULL; + LPWSTR lpFullEnv = NULL; + LPCWSTR wstr; + SIZE_T EnvBlockSize = 0, ProfileSize = 0; BOOLEAN Old; BOOL ret = FALSE; @@ -215,7 +218,48 @@ WARN("WL: CreateEnvironmentBlock() failed\n"); goto cleanup; } - /* FIXME: Append variables of Session->Profile->pszEnvironment */ + + if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) + { + /* Count required size for full environment */ + wstr = (LPCWSTR)lpEnvironment; + while (*wstr != UNICODE_NULL) + { + SIZE_T size = wcslen(wstr) + 1; + wstr += size; + EnvBlockSize += size; + } + wstr = Session->Profile->pszEnvironment; + while (*wstr != UNICODE_NULL) + { + SIZE_T size = wcslen(wstr) + 1; + wstr += size; + ProfileSize += size; + } + + /* Allocate enough memory */ + lpFullEnv = HeapAlloc(GetProcessHeap, 0, (EnvBlockSize + ProfileSize + 1) * sizeof(WCHAR)); + if (!lpFullEnv) + { + TRACE("HeapAlloc() failed\n"); + goto cleanup; + } + + /* Fill user environment block */ + CopyMemory( + lpFullEnv, + lpEnvironment, + EnvBlockSize * sizeof(WCHAR)); + CopyMemory( + &lpFullEnv[EnvBlockSize], + Session->Profile->pszEnvironment, + ProfileSize * sizeof(WCHAR)); + lpFullEnv[EnvBlockSize + ProfileSize] = UNICODE_NULL; + } + else + { + lpFullEnv = (LPWSTR)lpEnvironment; + } DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); UpdatePerUserSystemParameters(0, TRUE); @@ -236,7 +280,7 @@ Session->Gina.Context, L"Default", NULL, /* FIXME */ - lpEnvironment)) + lpFullEnv)) { //WCHAR StatusMsg[256]; WARN("WL: WlxActivateUserShell() failed\n"); @@ -263,6 +307,8 @@ { UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); } + if (lpFullEnv != lpEnvironment) + HeapFree(GetProcessHeap(), 0, lpFullEnv); if (lpEnvironment) DestroyEnvironmentBlock(lpEnvironment); RemoveStatusMessage(Session);

15 years, 10 months

[cfinck] 39273: Merge 39259 to finally get netshell working again for Czech

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Feb 1 13:31:51 2009 New Revision: 39273 URL: http://svn.reactos.org/svn/reactos?rev=39273&view=rev Log: Merge 39259 to finally get netshell working again for Czech Modified: branches/ros-branch-0_3_8/reactos/dll/win32/netshell/lang/cs-CZ.rc Modified: branches/ros-branch-0_3_8/reactos/dll/win32/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_8/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] Sun Feb 1 13:31:51 2009 @@ -1,22 +1,22 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 246 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Obecné nastavení" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 LTEXT "Pøipojit prostøednictvím:", -1, 9,9,217,8 - EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Nastavit", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Vybrané komponenty jsou pouívány tímto pøipojením:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Instalovat", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Odstranit", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Popis", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Tak tady bude popis komponenty...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Po pøipojení zobrazit ikonu na hlavním panelu", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP + CHECKBOX "Po pøipojení zobrazit ikonu na hlavním panelu", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Upozornit, kdy bude pøipojení omezené nebo pøeruené", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 @@ -42,7 +42,7 @@ LTEXT "Bytù:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Vlastnosti", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Zakázat", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "",IDC_STATUS,83,20,98,8 RTEXT "",IDC_DURATION,83,34,98,8

15 years, 10 months

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 February 2009