Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[janderwald] 28798: - scroll window with ScrollWindowEx - fix a bug in GuiConsoleWndProc - scrolling does not work yet

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Sep 3 07:49:23 2007 New Revision: 28798 URL: http://svn.reactos.org/svn/reactos?rev=28798&view=rev Log: - scroll window with ScrollWindowEx - fix a bug in GuiConsoleWndProc - scrolling does not work yet Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Mon Sep 3 07:49:23 2007 @@ -1745,7 +1745,7 @@ static LRESULT -GuiConsoleHandleScroll(HWND hwnd, UINT uMsg, WPARAM wParam) +GuiConsoleHandleScroll(HWND hwnd, UINT uMsg, WPARAM wParam, PGUI_CONSOLE_DATA GuiData) { SCROLLINFO sInfo; int old_pos; @@ -1793,10 +1793,6 @@ sInfo.nPos = sInfo.nMax; break; - break; - - - default: break; } @@ -1825,8 +1821,16 @@ /// fixme scroll window /// - // ScrollWindow - //UpdateWindow(hwnd); + ScrollWindowEx(hwnd, + 0, + GuiData->CharHeight * (old_pos - sInfo.nPos), + NULL, + NULL, + NULL, + NULL, + SW_INVALIDATE); + + UpdateWindow(hwnd); } return 0; } @@ -1881,7 +1885,7 @@ break; case WM_HSCROLL: case WM_VSCROLL: - Result = GuiConsoleHandleScroll(hWnd, msg, wParam); + Result = GuiConsoleHandleScroll(hWnd, msg, wParam, GuiData); break; case WM_SIZE: GuiConsoleResize(hWnd, wParam, lParam);

17 years

[jimtabor] 28797: - Win32k: DC_ATTR: Moved to it. - We need to decide how to optimize the syncing. CreateD/IC/CompatibleDC, GetDCState and SelectObject use the sync in one form. This can become ugly. Some DC handles do not belong to the current process. We need to reorder the mess in dc.c and clean it up. - Gdi32: The only ones using it are GetCurrentObject and with out updates Get/SetDCBrush/PenColor. - Implemented an example of RealizePalette. Moved SetBk/TextColor into dc.c, don't use them. -

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Sep 3 07:43:21 2007 New Revision: 28797 URL: http://svn.reactos.org/svn/reactos?rev=28797&view=rev Log: - Win32k: DC_ATTR: Moved to it. - We need to decide how to optimize the syncing. CreateD/IC/CompatibleDC, GetDCState and SelectObject use the sync in one form. This can become ugly. Some DC handles do not belong to the current process. We need to reorder the mess in dc.c and clean it up. - Gdi32: The only ones using it are GetCurrentObject and with out updates Get/SetDCBrush/PenColor. - Implemented an example of RealizePalette. Moved SetBk/TextColor into dc.c, don't use them. - Update gdi32.def. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/hacks.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/palette.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Mon Sep 3 07:43:21 2007 @@ -520,7 +520,7 @@ PtInRegion@12=NtGdiPtInRegion@12 PtVisible@12=NtGdiPtVisible@12 QueryFontAssocStatus@0 -RealizePalette@4=NtGdiRealizePalette@4 +RealizePalette@4 RectInRegion@8=NtGdiRectInRegion@8 RectVisible@8=NtGdiRectVisible@8 Rectangle@20 @@ -588,7 +588,7 @@ SetSystemPaletteUse@8 SetTextAlign@8=NtGdiSetTextAlign@8 SetTextCharacterExtra@8 -SetTextColor@8=NtGdiSetTextColor@8 +SetTextColor@8 SetTextJustification@12 SetViewportExtEx@16=NtGdiSetViewportExtEx@16 SetViewportOrgEx@16=NtGdiSetViewportOrgEx@16 Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/hacks… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/hacks.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/hacks.c Mon Sep 3 07:43:21 2007 @@ -108,18 +108,6 @@ * @implemented * */ -COLORREF -STDCALL -SetBkColor(HDC hdc, - COLORREF crColor) -{ - return NtGdiSetBkColor(hdc,crColor); -} - -/* - * @implemented - * - */ HGDIOBJ STDCALL SelectObject(HDC hdc, Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Mon Sep 3 07:43:21 2007 @@ -320,13 +320,13 @@ STDCALL GetDCObject( HDC hDC, INT iType) { -#if 0 +//#if 0 if((iType == GDI_OBJECT_TYPE_BRUSH) || (iType == GDI_OBJECT_TYPE_EXTPEN)|| (iType == GDI_OBJECT_TYPE_PEN) || (iType == GDI_OBJECT_TYPE_COLORSPACE)) { - HGDIOBJ hGO; + HGDIOBJ hGO = NULL; PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return NULL; @@ -348,7 +348,7 @@ } return hGO; } -#endif +//#endif return NtGdiGetDCObject( hDC, iType ); } @@ -691,12 +691,12 @@ HDC hdc ) { -#if 0 +//#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return CLR_INVALID; return (COLORREF) Dc_Attr->ulPenClr; -#endif +//#endif return NtUserGetDCBrushColor(hdc); } @@ -709,12 +709,12 @@ HDC hdc ) { -#if 0 +//#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return CLR_INVALID; return (COLORREF) Dc_Attr->ulPenClr; -#endif +//#endif return NtUserGetDCPenColor(hdc); } @@ -728,7 +728,7 @@ COLORREF crColor ) { -#if 0 +//#if 0 PDC_ATTR Dc_Attr; COLORREF OldColor = CLR_INVALID; @@ -745,7 +745,7 @@ } } return OldColor; -#endif +//#endif return NtUserSetDCBrushColor(hdc, crColor); } @@ -759,27 +759,122 @@ COLORREF crColor ) { +//#if 0 + PDC_ATTR Dc_Attr; + COLORREF OldColor = CLR_INVALID; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return OldColor; + else + { + OldColor = (COLORREF) Dc_Attr->ulPenClr; + Dc_Attr->ulPenClr = (ULONG) crColor; + + if ( Dc_Attr->crPenClr != crColor ) + { + Dc_Attr->ulDirty_ |= DIRTY_LINE; + Dc_Attr->crPenClr = crColor; + } + } + return OldColor; +//#endif + return NtUserSetDCPenColor(hdc, crColor); +} + +/* + * @implemented + */ +COLORREF +STDCALL +SetTextColor( + HDC hdc, + COLORREF crColor +) +{ #if 0 PDC_ATTR Dc_Attr; COLORREF OldColor = CLR_INVALID; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return OldColor; - else - { - OldColor = (COLORREF) Dc_Attr->ulPenClr; - Dc_Attr->ulPenClr = (ULONG) crColor; - - if ( Dc_Attr->crPenClr != crColor ) - { - Dc_Attr->ulDirty_ |= DIRTY_LINE; - Dc_Attr->crPenClr = crColor; - } +#if 0 + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetTextColor( hDC, crColor ); + else + { + PLDC pLDC = Dc_Attr->pvLDC; + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + if return EMFDRV_SetTextColor( hDC, crColor ); + } + } + } +#endif + OldColor = (COLORREF) Dc_Attr->ulForegroundClr; + Dc_Attr->ulForegroundClr = (ULONG) crColor; + + if ( Dc_Attr->crForegroundClr != crColor ) + { + Dc_Attr->ulDirty_ |= DIRTY_TEXT; + Dc_Attr->crForegroundClr = crColor; } return OldColor; #endif - return NtUserSetDCPenColor(hdc, crColor); -} - + return NtGdiSetTextColor(hdc, crColor); +} + +/* + * @implemented + */ +COLORREF +STDCALL +SetBkColor( + HDC hdc, + COLORREF crColor +) +{ +#if 0 + PDC_ATTR Dc_Attr; + COLORREF OldColor = CLR_INVALID; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return OldColor; +#if 0 + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetBkColor( hDC, crColor ); + else + { + PLDC pLDC = Dc_Attr->pvLDC; + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + if return EMFDRV_SetBkColor( hDC, crColor ); + } + } + } +#endif + OldColor = (COLORREF) Dc_Attr->ulBackgroundClr; + Dc_Attr->ulBackgroundClr = (ULONG) crColor; + + if ( Dc_Attr->crBackgroundClr != crColor ) + { + Dc_Attr->ulDirty_ |= DIRTY_LINE; + Dc_Attr->crBackgroundClr = crColor; + } + return OldColor; +#endif + return NtGdiSetBkColor(hdc, crColor); +} /* * @implemented Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/palette.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/palette.c Mon Sep 3 07:43:21 2007 @@ -66,6 +66,36 @@ /* * @implemented */ +UINT +WINAPI +RealizePalette(HDC hDC) /* [in] Handle of device context */ +{ +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_(hDC); + else + { + HPALETTE Pal = GetDCObject(hDC, GDI_OBJECT_TYPE_PALETTE); + PLDC pLDC = GdiGetLDC((HDC) Pal); + if ( !pLDC ) return FALSE; + if (pLDC->iType == LDC_EMFLDC) return EMFDRV_(Pal); + return FALSE; + } + } +#endif +// return UserRealizePalette(hDC); + +//HACK!!!!! + return NtGdiRealizePalette(hDC); +} + + +/* + * @implemented + */ UINT WINAPI SetDIBColorTable(HDC hDC, 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 (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Sep 3 07:43:21 2007 @@ -252,6 +252,7 @@ NewDC->Dc_Attr.crBackgroundClr = OrigDC->Dc_Attr.crBackgroundClr; NewDC->Dc_Attr.jBkMode = OrigDC->Dc_Attr.jBkMode; NewDC->Dc_Attr.jROP2 = OrigDC->Dc_Attr.jROP2; + DC_UnlockDc(NewDC); DC_UnlockDc(OrigDC); if (NULL != DisplayDC) @@ -264,6 +265,7 @@ NtGdiDeleteObject(hVisRgn); DC_InitDC(hNewDC); + DCU_SynchDcAttrtoUser(hNewDC, -1); return hNewDC; } @@ -933,9 +935,17 @@ NtGdiSetTextAlign(hNewDC, TA_TOP); NtGdiSetBkColor(hNewDC, RGB(255, 255, 255)); NtGdiSetBkMode(hNewDC, OPAQUE); + DCU_SynchDcAttrtoUser(hNewDC, -1); } else { + /* From MSDN2: + The CreateIC function creates an information context for the specified device. + The information context provides a fast way to get information about the + device without creating a device context (DC). However, GDI drawing functions + cannot accept a handle to an information context. + */ + NewDC->DC_Type = DC_TYPE_INFO; DC_UnlockDc( NewDC ); } @@ -1360,6 +1370,7 @@ newdc->w.hClipRgn = NtGdiCreateRectRgn( 0, 0, 0, 0 ); NtGdiCombineRgn( newdc->w.hClipRgn, dc->w.hClipRgn, 0, RGN_COPY ); } + DCU_SyncDcAttrtoUser(newdc, -1); DC_UnlockDc( newdc ); DC_UnlockDc( dc ); return hnewdc; @@ -2101,6 +2112,7 @@ default: break; } + DCU_SyncDcAttrtoUser(dc, -1); DC_UnlockDc( dc ); return objOrg; } @@ -2335,7 +2347,6 @@ PDC NewDC; HDC hDC; PWSTR Buf = NULL; -// PDC_ATTR DC_Attr = NULL; if (Driver != NULL) { @@ -2356,7 +2367,7 @@ } return NULL; } -#if 0 +//#if 0 PVOID NewMem = NULL; ULONG MemSize = sizeof(DC_ATTR); //PAGE_SIZE it will allocate that size NTSTATUS Status = ZwAllocateVirtualMemory(NtCurrentProcess(), @@ -2382,16 +2393,15 @@ } } KeLeaveCriticalRegion(); -#endif +//#endif NewDC = DC_LockDc(hDC); /* FIXME - Handle NewDC == NULL! */ -#if 0 +//#if 0 if(NewMem) { NewDC->pDc_Attr = NewMem; // Store pointer - DC_Attr = NewMem; - } -#endif + } +//#endif if (Driver != NULL) { RtlCopyMemory(&NewDC->DriverName, Driver, sizeof(UNICODE_STRING)); @@ -2408,39 +2418,31 @@ NewDC->w.xformVport2World = NewDC->w.xformWorld2Wnd; NewDC->w.vport2WorldValid = TRUE; -// XForm2MatrixS( &DC_Attr->mxWorldToDevice, &NewDC->w.xformWorld2Vport); -// XForm2MatrixS( &DC_Attr->mxDevicetoWorld, &NewDC->w.xformVport2World); -// XForm2MatrixS( &DC_Attr->mxWorldToPage, &NewDC->w.xformWorld2Wnd); - // Setup syncing bits for the dcattr data packets. -// NewDC->Dc_Attr.flXform = DEVICE_TO_PAGE_INVALID; -// DC_Attr->flXform = NewDC->Dc_Attr.flXform; -// NewDC->Dc_Attr.ulDirty_ = 0; // Server side -// DC_Attr->ulDirty_ = 0; // Client side + NewDC->Dc_Attr.flXform = DEVICE_TO_PAGE_INVALID; + + NewDC->Dc_Attr.ulDirty_ = 0; // Server side NewDC->Dc_Attr.iMapMode = MM_TEXT; -// DC_Attr->iMapMode = MM_TEXT; NewDC->Dc_Attr.szlWindowExt.cx = 1; // Float to Int,,, WRONG! NewDC->Dc_Attr.szlWindowExt.cy = 1; NewDC->Dc_Attr.szlViewportExt.cx = 1; NewDC->Dc_Attr.szlViewportExt.cy = 1; -// DC_Attr->szlWindowExt.cx = 1; -// DC_Attr->szlWindowExt.cy = 1; -// DC_Attr->szlViewportExt.cx = 1; -// DC_Attr->szlViewportExt.cy = 1; - NewDC->Dc_Attr.crForegroundClr = 0; NewDC->Dc_Attr.ulForegroundClr = 0; NewDC->Dc_Attr.ulBackgroundClr = 0xffffff; NewDC->Dc_Attr.crBackgroundClr = 0xffffff; -// DC_Attr->ulBackgroundClr = 0xffffff; -// DC_Attr->crBackgroundClr = 0xffffff; + + NewDC->Dc_Attr.ulPenClr = RGB( 0, 0, 0 ); + NewDC->Dc_Attr.crPenClr = RGB( 0, 0, 0 ); + + NewDC->Dc_Attr.ulBrushClr = RGB( 255, 255, 255 ); // Do this way too. + NewDC->Dc_Attr.crBrushClr = RGB( 255, 255, 255 ); NewDC->Dc_Attr.hlfntNew = NtGdiGetStockObject(SYSTEM_FONT); -// DC_Attr->hlfntNew = NewDC->Dc_Attr.hlfntNew; // It's a service to the user. TextIntRealizeFont(NewDC->Dc_Attr.hlfntNew); NewDC->w.hPalette = NtGdiGetStockObject(DEFAULT_PALETTE); @@ -2477,10 +2479,10 @@ */ } -VOID FASTCALL -DC_FreeDC(HDC DCToFree) -{ -#if 0 +VOID +FASTCALL +DC_FreeDcAttr(HDC DCToFree) +{ KeEnterCriticalRegion(); { INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)DCToFree); @@ -2500,7 +2502,14 @@ } } KeLeaveCriticalRegion(); -#endif +} + +VOID FASTCALL +DC_FreeDC(HDC DCToFree) +{ +//#if 0 + DC_FreeDcAttr(DCToFree); +//#endif if (!GDIOBJ_FreeObj(GdiHandleTable, DCToFree, GDI_OBJECT_TYPE_DC)) { DPRINT("DC_FreeDC failed\n"); 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 (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Mon Sep 3 07:43:21 2007 @@ -8,7 +8,6 @@ VOID CopytoUserDcAttr(PDC dc, PDC_ATTR Dc_Attr, FLONG Dirty) { - Dc_Attr->hpen = dc->Dc_Attr.hpen; Dc_Attr->hbrush = dc->Dc_Attr.hbrush; Dc_Attr->hColorSpace = dc->Dc_Attr.hColorSpace; @@ -67,9 +66,17 @@ } if ( Dirty & DIRTY_LINE || (Dc_Attr->ulDirty_ & DIRTY_LINE)) { - dc->Dc_Attr.ulPenClr = Dc_Attr->ulPenClr; - dc->Dc_Attr.crPenClr = Dc_Attr->crPenClr; + dc->Dc_Attr.crBackgroundClr = Dc_Attr->crBackgroundClr; + dc->Dc_Attr.ulBackgroundClr = Dc_Attr->ulBackgroundClr; + dc->Dc_Attr.ulPenClr = Dc_Attr->ulPenClr; + dc->Dc_Attr.crPenClr = Dc_Attr->crPenClr; Dc_Attr->ulDirty_ &= ~DIRTY_LINE; + } + if ( Dirty & DIRTY_TEXT || (Dc_Attr->ulDirty_ & DIRTY_TEXT)) + { + dc->Dc_Attr.crForegroundClr = Dc_Attr->crForegroundClr; + dc->Dc_Attr.ulForegroundClr = Dc_Attr->ulForegroundClr; + Dc_Attr->ulDirty_ &= ~DIRTY_TEXT; } } @@ -133,6 +140,7 @@ else { NTSTATUS Status = STATUS_SUCCESS; + KeEnterCriticalRegion(); _SEH_TRY { ProbeForWrite(DC_Attr, @@ -152,6 +160,7 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; + KeLeaveCriticalRegion(); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -173,6 +182,7 @@ else { NTSTATUS Status = STATUS_SUCCESS; + KeEnterCriticalRegion(); _SEH_TRY { ProbeForWrite(Dc_Attr, @@ -185,14 +195,9 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) - { - TryHarder = TRUE; - } - if (TryHarder) - { - return ReadWriteVMDcAttr( dc, Dirty, TRUE); - } + KeLeaveCriticalRegion(); + if(!NT_SUCCESS(Status)) TryHarder = TRUE; + if (TryHarder) return ReadWriteVMDcAttr( dc, Dirty, TRUE); } return TRUE; } @@ -218,6 +223,7 @@ else { NTSTATUS Status = STATUS_SUCCESS; + KeEnterCriticalRegion(); _SEH_TRY { ProbeForRead(Dc_Attr, @@ -230,14 +236,9 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) - { - TryHarder = TRUE; - } - if (TryHarder) - { - return ReadWriteVMDcAttr( dc, Dirty, FALSE); - } + KeLeaveCriticalRegion(); + if(!NT_SUCCESS(Status)) TryHarder = TRUE; + if (TryHarder) return ReadWriteVMDcAttr( dc, Dirty, FALSE); } return TRUE; }

17 years

[janderwald] 28796: - halfplement console scrolling support

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Sep 3 07:29:18 2007 New Revision: 28796 URL: http://svn.reactos.org/svn/reactos?rev=28796&view=rev Log: - halfplement console scrolling support Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Mon Sep 3 07:29:18 2007 @@ -634,7 +634,35 @@ } } - +VOID +FASTCALL +GuiConsoleInitScrollbar(PCSRSS_CONSOLE Console, HWND hwnd) +{ + SCROLLINFO sInfo; + + /* set scrollbar sizes */ + sInfo.cbSize = sizeof(SCROLLINFO); + sInfo.fMask = SIF_RANGE | SIF_POS; + sInfo.nMin = 0; + sInfo.nMax = Console->ActiveBuffer->MaxY; + sInfo.nPos = 0; + SetScrollInfo(hwnd, SB_HORZ, &sInfo, TRUE); + ShowScrollBar(hwnd, SB_VERT, TRUE); + + if (Console->ActiveBuffer->MaxX > Console->Size.X) + { + sInfo.cbSize = sizeof(SCROLLINFO); + sInfo.fMask = SIF_RANGE | SIF_POS; + sInfo.nMin = 0; + sInfo.nPos = 0; + sInfo.nMax = Console->ActiveBuffer->MaxX; + SetScrollInfo(hwnd, SB_HORZ, &sInfo, TRUE); + } + else + { + ShowScrollBar(hwnd, SB_HORZ, FALSE); + } +} static BOOL FASTCALL GuiConsoleHandleNcCreate(HWND hWnd, CREATESTRUCTW *Create) @@ -743,6 +771,7 @@ SetTimer(hWnd, 1, CURSOR_BLINK_TIME, NULL); GuiConsoleCreateSysMenu(Console); + GuiConsoleInitScrollbar(Console, hWnd); SetEvent(GuiData->hGuiInitEvent); return (BOOL) DefWindowProcW(hWnd, WM_NCCREATE, 0, (LPARAM) Create); @@ -1532,14 +1561,11 @@ DPRINT1("GuiConsoleResize X %d Y %d\n", LOWORD(lParam), HIWORD(lParam)); } } - -VOID FASTCALL -GuiConsoleCreateScrollBar(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, HWND NewWindow) +VOID +FASTCALL +GuiConsoleHandleScrollbarMenu() { HMENU hMenu; - HWND hVScrollBar; - HWND hHScrollBar; - SCROLLINFO sInfo; hMenu = CreatePopupMenu(); if (hMenu == NULL) @@ -1547,7 +1573,6 @@ DPRINT("CreatePopupMenu failed\n"); return; } - //InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_SCROLLHERE); //InsertItem(hMenu, MFT_SEPARATOR, MIIM_FTYPE, 0, NULL, -1); //InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_SCROLLTOP); @@ -1559,54 +1584,6 @@ //InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_SCROLLUP); //InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_SCROLLDOWN); - hVScrollBar = CreateWindowExW(0L, - L"ScrollBar", - (LPWSTR)NULL, - WS_CHILD | WS_VSCROLL, - 0, - 0, - 200, - 50, - NewWindow, - NULL, //hMenu, - GetModuleHandleW(NULL), - (LPVOID)GuiData); - - if (hVScrollBar) - { - - /* set scrollbar sizes */ - sInfo.cbSize = sizeof(SCROLLINFO); - sInfo.fMask = SIF_RANGE | SIF_POS; - sInfo.nMin = 0; - sInfo.nMax = Console->ActiveBuffer->MaxY; - sInfo.nPos = 0; - SetScrollInfo(hVScrollBar, SB_CTL, &sInfo, TRUE); - ShowScrollBar(NewWindow, SB_CTL, TRUE); - GuiData->hVScrollBar = hVScrollBar; - } - - if (Console->ActiveBuffer->MaxX > Console->Size.X) - { - hHScrollBar = CreateWindowExW(0L, - L"ScrollBar", - (LPWSTR)NULL, - WS_CHILD | WS_HSCROLL, - 0, - 0, - 200, - CW_USEDEFAULT, - NewWindow, - hMenu, - GetModuleHandleW(NULL), - (LPVOID)GuiData); - if (hHScrollBar) - { - sInfo.nMax = Console->ActiveBuffer->MaxX; - SetScrollInfo(hHScrollBar, SB_CTL, &sInfo, TRUE); - GuiData->hHScrollBar = hHScrollBar; - } - } } static VOID FASTCALL @@ -1751,12 +1728,12 @@ if (Console->Size.X < Console->ActiveBuffer->MaxX) { /* show scrollbar when window becomes smaller than active screen buffer */ - //ShowScrollBar(GuiData->hHScrollBar, SB_CTL, TRUE); + ShowScrollBar(pConInfo->hConsoleWindow, SB_CTL, TRUE); } else { /* hide scrollbar */ - //ShowScrollBar(GuiData->hHScrollBar, SB_CTL, FALSE); + ShowScrollBar(pConInfo->hConsoleWindow, SB_CTL, FALSE); } } if (ProcessData) @@ -1764,6 +1741,94 @@ ConioUnlockScreenBuffer(ActiveBuffer); } InvalidateRect(pConInfo->hConsoleWindow, NULL, TRUE); +} + +static +LRESULT +GuiConsoleHandleScroll(HWND hwnd, UINT uMsg, WPARAM wParam) +{ + SCROLLINFO sInfo; + int old_pos; + + /* set scrollbar sizes */ + sInfo.cbSize = sizeof(SCROLLINFO); + sInfo.fMask = SIF_RANGE | SIF_POS | SIF_PAGE | SIF_TRACKPOS; + + if (!GetScrollInfo(hwnd, + (uMsg == WM_HSCROLL ? SB_HORZ : SB_VERT), + &sInfo)) + { + return FALSE; + } + + old_pos = sInfo.nPos; + + switch(LOWORD(wParam)) + { + case SB_LINELEFT: + sInfo.nPos -= 1; + break; + + case SB_LINERIGHT: + sInfo.nPos += 1; + break; + + case SB_PAGELEFT: + sInfo.nPos -= sInfo.nPage; + break; + + case SB_PAGERIGHT: + sInfo.nPos += sInfo.nPage; + break; + + case SB_THUMBTRACK: + sInfo.nPage = sInfo.nTrackPos; + break; + + case SB_TOP: + sInfo.nPos = sInfo.nMin; + break; + + case SB_BOTTOM: + sInfo.nPos = sInfo.nMax; + break; + + break; + + + + default: + break; + } + + sInfo.fMask = SIF_POS; + sInfo.cbSize = sizeof(SCROLLINFO); + + SetScrollInfo(hwnd, + (uMsg == WM_HSCROLL ? SB_HORZ : SB_VERT), + &sInfo, + TRUE); + + sInfo.cbSize = sizeof(SCROLLINFO); + sInfo.fMask = SIF_POS; + + if (!GetScrollInfo(hwnd, + (uMsg == WM_HSCROLL ? SB_HORZ : SB_VERT), + &sInfo)) + { + return 0; + } + + if (old_pos != sInfo.nPos) + { + /// + /// fixme scroll window + /// + + // ScrollWindow + //UpdateWindow(hwnd); + } + return 0; } static LRESULT CALLBACK @@ -1814,6 +1879,10 @@ case WM_SYSCOMMAND: Result = GuiConsoleHandleSysMenuCommand(hWnd, wParam, lParam, GuiData); break; + case WM_HSCROLL: + case WM_VSCROLL: + Result = GuiConsoleHandleScroll(hWnd, msg, wParam); + break; case WM_SIZE: GuiConsoleResize(hWnd, wParam, lParam); break; @@ -1863,7 +1932,7 @@ } NewWindow = CreateWindowW(L"ConsoleWindowClass", Title, - WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX, //WS_OVERLAPPEDWINDOW + WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_HSCROLL | WS_VSCROLL, //WS_OVERLAPPEDWINDOW CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, @@ -1878,8 +1947,6 @@ } if (NULL != NewWindow) { - // scrollbar support - //GuiConsoleCreateScrollBar(Console, (PGUI_CONSOLE_DATA)Console->PrivateData, NewWindow); SetWindowLongW(hWnd, GWL_USERDATA, GetWindowLongW(hWnd, GWL_USERDATA) + 1); ShowWindow(NewWindow, SW_SHOW); }

17 years

[arty] 28795: Straggler edits.

by arty＠svn.reactos.org

Author: arty Date: Mon Sep 3 05:59:48 2007 New Revision: 28795 URL: http://svn.reactos.org/svn/reactos?rev=28795&view=rev Log: Straggler edits. Added: trunk/reactos/hal/halppc/directory.rbuild Modified: trunk/reactos/lib/lib.mak Added: trunk/reactos/hal/halppc/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halppc/directory.rbuild (added) +++ trunk/reactos/hal/halppc/directory.rbuild Mon Sep 3 05:59:48 2007 @@ -1,0 +1,6 @@ +<directory name="generic"> + <xi:include href="generic/generic.rbuild" /> +</directory> +<directory name="up"> + <xi:include href="up/halup.rbuild" /> +</directory> Modified: trunk/reactos/lib/lib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.mak?rev=28795&r1=2… ============================================================================== --- trunk/reactos/lib/lib.mak (original) +++ trunk/reactos/lib/lib.mak Mon Sep 3 05:59:48 2007 @@ -4,3 +4,6 @@ include lib/inflib/inflib.mak include lib/3rdparty/zlib/zlib.mak include lib/cmlib/cmlib.mak +ifeq ($(ARCH),powerpc) +include lib/ppcmmu/ppcmmu.mak +endif

17 years

[janderwald] 28794: - add hActiveBuffer member to struct to ensure that modifying the screenbuffer is secured - fix a bugs in the screen buffer resize code - resizing now "works" (unfortunately a few drawing bugs show up)

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Sep 3 05:58:43 2007 New Revision: 28794 URL: http://svn.reactos.org/svn/reactos?rev=28794&view=rev Log: - add hActiveBuffer member to struct to ensure that modifying the screenbuffer is secured - fix a bugs in the screen buffer resize code - resizing now "works" (unfortunately a few drawing bugs show up) Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/conio.h (original) +++ trunk/reactos/subsystems/win32/csrss/include/conio.h Mon Sep 3 05:58:43 2007 @@ -70,6 +70,7 @@ WORD WaitingChars; WORD WaitingLines; /* number of chars and lines in input queue */ PCSRSS_SCREEN_BUFFER ActiveBuffer; /* Pointer to currently active screen buffer */ + HANDLE hActiveBuffer; WORD Mode; /* Console mode flags */ WORD EchoCount; /* count of chars to echo, in line buffered mode */ UNICODE_STRING Title; /* Title of console */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Mon Sep 3 05:58:43 2007 @@ -153,6 +153,7 @@ Console->Mode = ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_MOUSE_INPUT; Console->EarlyReturn = FALSE; Console->ActiveBuffer = NULL; + Console->hActiveBuffer = INVALID_HANDLE_VALUE; InitializeListHead(&Console->InputEvents); Console->CodePage = GetOEMCP(); Console->OutputCodePage = GetOEMCP(); @@ -174,20 +175,22 @@ /* allocate console screen buffer */ NewBuffer = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(CSRSS_SCREEN_BUFFER)); + if (NULL == NewBuffer) + { + RtlFreeUnicodeString(&Console->Title); + DeleteCriticalSection(&Console->Header.Lock); + CloseHandle(Console->ActiveEvent); + return STATUS_INSUFFICIENT_RESOURCES; + } /* init screen buffer with defaults */ NewBuffer->CursorInfo.bVisible = TRUE; NewBuffer->CursorInfo.dwSize = 5; /* make console active, and insert into console list */ Console->ActiveBuffer = (PCSRSS_SCREEN_BUFFER) NewBuffer; + Console->hActiveBuffer = INVALID_HANDLE_VALUE; /* add a reference count because the buffer is tied to the console */ InterlockedIncrement(&Console->ActiveBuffer->Header.ReferenceCount); - if (NULL == NewBuffer) - { - RtlFreeUnicodeString(&Console->Title); - DeleteCriticalSection(&Console->Header.Lock); - CloseHandle(Console->ActiveEvent); - return STATUS_INSUFFICIENT_RESOURCES; - } + if (! GuiMode) { @@ -332,6 +335,7 @@ ProcessData->Console = 0; return Request->Status = Status; } + Console->hActiveBuffer = Request->Data.AllocConsoleRequest.OutputHandle; } /* Duplicate the Event */ @@ -1065,6 +1069,7 @@ #endif Console->ActiveBuffer = NULL; + Console->hActiveBuffer = INVALID_HANDLE_VALUE; ConioCleanupConsole(Console); CloseHandle(Console->ActiveEvent); @@ -2272,6 +2277,7 @@ } /* tie console to new buffer */ Console->ActiveBuffer = Buff; + Console->hActiveBuffer = Request->Data.SetScreenBufferRequest.OutputHandle; /* inc ref count on new buffer */ InterlockedIncrement(&Buff->Header.ReferenceCount); /* Redraw the console */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Mon Sep 3 05:58:43 2007 @@ -1614,7 +1614,15 @@ { DWORD windx, windy; RECT rect; - + PCSRSS_SCREEN_BUFFER ActiveBuffer; + PCSRSS_PROCESS_DATA ProcessData = NULL; + + if (Console->ProcessList.Flink != &Console->ProcessList) + { + ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSRSS_PROCESS_DATA, ProcessEntry); + ConioLockScreenBuffer(ProcessData, Console->hActiveBuffer, (Object_t **)&ActiveBuffer); + } + /* apply text / background color */ GuiData->ScreenText = pConInfo->ScreenText; GuiData->ScreenBackground = pConInfo->ScreenBackground; @@ -1625,38 +1633,51 @@ windx = LOWORD(pConInfo->ScreenBuffer); windy = HIWORD(pConInfo->ScreenBuffer); - if (windx != Console->ActiveBuffer->MaxX || windy != Console->ActiveBuffer->MaxY) + if (windx != ActiveBuffer->MaxX || windy != ActiveBuffer->MaxY) { BYTE * Buffer = HeapAlloc(Win32CsrApiHeap, 0, windx * windy * 2); + if (Buffer) { DWORD Offset = 0; DWORD BufferOffset = 0; USHORT CurrentY; BYTE * OldBuffer; + USHORT value; DWORD diff; - DWORD value = ((((DWORD)Console->ActiveBuffer->DefaultAttrib) << 16) | 0x20); - - OldBuffer = Console->ActiveBuffer->Buffer; - - for (CurrentY = 0; CurrentY < min(Console->ActiveBuffer->MaxY, windy); CurrentY++) - { - if (windx < Console->ActiveBuffer->MaxX) + DWORD i; + + value = MAKEWORD(' ', ActiveBuffer->DefaultAttrib); + + DPRINT("MaxX %d MaxY %d windx %d windy %d value %04x DefaultAttrib %d\n",ActiveBuffer->MaxX, ActiveBuffer->MaxY, windx, windy, value, ActiveBuffer->DefaultAttrib); + OldBuffer = ActiveBuffer->Buffer; + + for (CurrentY = 0; CurrentY < min(ActiveBuffer->MaxY, windy); CurrentY++) + { + if (windx <= ActiveBuffer->MaxX) { /* reduce size */ RtlCopyMemory(&Buffer[Offset], &OldBuffer[BufferOffset], windx * 2); Offset += (windx * 2); - BufferOffset += (Console->ActiveBuffer->MaxX * 2); + BufferOffset += (ActiveBuffer->MaxX * 2); } else { /* enlarge size */ - diff = windx - Console->ActiveBuffer->MaxX; - - RtlCopyMemory(&Buffer[Offset], &OldBuffer[BufferOffset], Console->ActiveBuffer->MaxX * 2); - Offset += (Console->ActiveBuffer->MaxX * 2); + RtlCopyMemory(&Buffer[Offset], &OldBuffer[BufferOffset], ActiveBuffer->MaxX * 2); + Offset += (ActiveBuffer->MaxX * 2); + + diff = windx - ActiveBuffer->MaxX; /* zero new part of it */ - memset(&Buffer[Offset], value, (diff * 2)); +#if HAVE_WMEMSET + wmemset((WCHAR*)&Buffer[Offset], value, diff); +#else + for (i = 0; i < diff * 2; i++) + { + Buffer[Offset * 2] = ' '; + Buffer[Offset * 2 + 1] = ActiveBuffer->DefaultAttrib; + } +#endif Offset += (diff * 2); BufferOffset += (Console->ActiveBuffer->MaxX * 2); } @@ -1665,17 +1686,54 @@ if (windy > Console->ActiveBuffer->MaxY) { diff = windy - Console->ActiveBuffer->MaxX; - memset(&Buffer[Offset], value, diff * 2 * windx); - } - (void)InterlockedExchangePointer((PVOID volatile *)Console->ActiveBuffer->Buffer, Buffer); +#if HAVE_WMEMSET + wmemset((WCHAR*)&Buffer[Offset], value, diff * windx); +#else + for (i = 0; i < diff * 2; i++) + { + Buffer[Offset * 2] = ' '; + Buffer[Offset * 2 + 1] = ActiveBuffer->DefaultAttrib; + } +#endif + } + + (void)InterlockedExchangePointer((PVOID volatile *)&Console->ActiveBuffer->Buffer, Buffer); HeapFree(Win32CsrApiHeap, 0, OldBuffer); Console->ActiveBuffer->MaxX = windx; Console->ActiveBuffer->MaxY = windy; + InvalidateRect(pConInfo->hConsoleWindow, NULL, TRUE); + } + else + { + if (ProcessData) + { + ConioUnlockScreenBuffer(ActiveBuffer); + } + return; } } windx = LOWORD(pConInfo->WindowSize); windy = HIWORD(pConInfo->WindowSize); + + if (windx > Console->Size.X) + { + PWCHAR LineBuffer = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, windx * sizeof(WCHAR)); + if (LineBuffer) + { + HeapFree(Win32CsrApiHeap, 0, GuiData->LineBuffer); + GuiData->LineBuffer = LineBuffer; + } + else + { + if (ProcessData) + { + ConioUnlockScreenBuffer(ActiveBuffer); + } + return; + } + } + if (windx != Console->Size.X || windy != Console->Size.Y) { @@ -1701,7 +1759,10 @@ //ShowScrollBar(GuiData->hHScrollBar, SB_CTL, FALSE); } } - /* repaint window */ + if (ProcessData) + { + ConioUnlockScreenBuffer(ActiveBuffer); + } InvalidateRect(pConInfo->hConsoleWindow, NULL, TRUE); } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h Mon Sep 3 05:58:43 2007 @@ -23,6 +23,7 @@ #include <win32csr.h> #include <tchar.h> +#include <wchar.h> #include <cpl.h> #include "resource.h"

17 years

[arty] 28793: Added freeldr and hal from PPC branch, along with needed headers and build changes. Next ntoskrnl and add ppc dir under libcntptr, which didn't exist when I forked.

by arty＠svn.reactos.org

Author: arty Date: Mon Sep 3 05:57:36 2007 New Revision: 28793 URL: http://svn.reactos.org/svn/reactos?rev=28793&view=rev Log: Added freeldr and hal from PPC branch, along with needed headers and build changes. Next ntoskrnl and add ppc dir under libcntptr, which didn't exist when I forked. Added: branches/powerpc/reactos/lib/mmu/ppcmmu.mak trunk/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_pci.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c trunk/reactos/boot/freeldr/freeldr/include/bytesex.h trunk/reactos/hal/halppc/ trunk/reactos/hal/halppc/generic/ trunk/reactos/hal/halppc/generic/beep.c trunk/reactos/hal/halppc/generic/bus.c trunk/reactos/hal/halppc/generic/cmos.c trunk/reactos/hal/halppc/generic/display.c trunk/reactos/hal/halppc/generic/dma.c trunk/reactos/hal/halppc/generic/drive.c trunk/reactos/hal/halppc/generic/enum.c trunk/reactos/hal/halppc/generic/fmutex.c trunk/reactos/hal/halppc/generic/font.c trunk/reactos/hal/halppc/generic/generic.rbuild trunk/reactos/hal/halppc/generic/halinit.c trunk/reactos/hal/halppc/generic/ipi.c trunk/reactos/hal/halppc/generic/irql.c trunk/reactos/hal/halppc/generic/isa.c trunk/reactos/hal/halppc/generic/kdbg.c trunk/reactos/hal/halppc/generic/mca.c trunk/reactos/hal/halppc/generic/misc.c trunk/reactos/hal/halppc/generic/pci.c trunk/reactos/hal/halppc/generic/portio.c trunk/reactos/hal/halppc/generic/processor.c trunk/reactos/hal/halppc/generic/profil.c trunk/reactos/hal/halppc/generic/pwroff.c trunk/reactos/hal/halppc/generic/reboot.c trunk/reactos/hal/halppc/generic/resource.c trunk/reactos/hal/halppc/generic/spinlock.c trunk/reactos/hal/halppc/generic/sysbus.c trunk/reactos/hal/halppc/generic/sysinfo.c trunk/reactos/hal/halppc/generic/systimer.S trunk/reactos/hal/halppc/generic/time.c trunk/reactos/hal/halppc/generic/timer.c trunk/reactos/hal/halppc/include/ trunk/reactos/hal/halppc/include/apic.h trunk/reactos/hal/halppc/include/bus.h trunk/reactos/hal/halppc/include/hal.h trunk/reactos/hal/halppc/include/haldma.h trunk/reactos/hal/halppc/include/halirq.h trunk/reactos/hal/halppc/include/halp.h trunk/reactos/hal/halppc/include/ioapic.h trunk/reactos/hal/halppc/include/mps.h trunk/reactos/hal/halppc/up/ trunk/reactos/hal/halppc/up/halinit_up.c trunk/reactos/hal/halppc/up/halup.rbuild trunk/reactos/hal/halppc/up/halup.rc trunk/reactos/include/psdk/intrin_ppc.h trunk/reactos/include/reactos/elf/elf-powerpc.h trunk/reactos/include/reactos/elf/reactos.h trunk/reactos/include/reactos/libs/ppcmmu/ trunk/reactos/include/reactos/libs/ppcmmu/mmu.h trunk/reactos/include/reactos/libs/ppcmmu/mmuutil.h trunk/reactos/include/reactos/ppcboot.h trunk/reactos/include/reactos/ppcdebug.h trunk/reactos/include/reactos/ppcfont.h trunk/reactos/lib/rtl/powerpc/ trunk/reactos/lib/rtl/powerpc/debug.c trunk/reactos/lib/rtl/powerpc/except.c trunk/reactos/lib/rtl/powerpc/interlocked.c trunk/reactos/lib/rtl/powerpc/thread.c trunk/reactos/ntoskrnl/include/internal/powerpc/intrin_i.h Removed: branches/powerpc/reactos/lib/mmu/makefile Modified: branches/powerpc/reactos/lib/mmu/mmuobject.c branches/powerpc/reactos/lib/mmu/mmuobject.h branches/powerpc/reactos/lib/mmu/mmuutil.c trunk/reactos/Makefile trunk/reactos/ReactOS-ppc.rbuild trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild trunk/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/of.h trunk/reactos/boot/freeldr/freeldr/mm/mm.c trunk/reactos/hal/hal.rbuild trunk/reactos/hal/hal/hal.rbuild trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/powerpc/ketypes.h trunk/reactos/include/ndk/powerpc/mmtypes.h trunk/reactos/include/psdk/rpc.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/arc/arc.h trunk/reactos/include/reactos/debug.h trunk/reactos/include/reactos/elf/machine.h trunk/reactos/include/reactos/rosldr.h trunk/reactos/lib/rtl/exception.c trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/powerpc/reactos/lib/mmu/makefile URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/makefil… Modified: branches/powerpc/reactos/lib/mmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/mmuobje… Modified: branches/powerpc/reactos/lib/mmu/mmuobject.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/mmuobje… Modified: branches/powerpc/reactos/lib/mmu/mmuutil.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/mmuutil… Added: branches/powerpc/reactos/lib/mmu/ppcmmu.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/ppcmmu.… Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28793&r1=2879… Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=287… Modified: trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/boot… Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Added: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Added: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Added: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Added: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Added: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Added: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Added: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Added: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Added: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… Modified: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… Added: trunk/reactos/boot/freeldr/freeldr/include/bytesex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/of.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… Modified: trunk/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.rbuild?rev=28793&r… Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=287… Added: trunk/reactos/hal/halppc/generic/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/beep.c?… Added: trunk/reactos/hal/halppc/generic/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/bus.c?r… Added: trunk/reactos/hal/halppc/generic/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/cmos.c?… Added: trunk/reactos/hal/halppc/generic/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/display… Added: trunk/reactos/hal/halppc/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/dma.c?r… Added: trunk/reactos/hal/halppc/generic/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/drive.c… Added: trunk/reactos/hal/halppc/generic/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/enum.c?… Added: trunk/reactos/hal/halppc/generic/fmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/fmutex.… Added: trunk/reactos/hal/halppc/generic/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/font.c?… Added: trunk/reactos/hal/halppc/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/generic… Added: trunk/reactos/hal/halppc/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/halinit… Added: trunk/reactos/hal/halppc/generic/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/ipi.c?r… Added: trunk/reactos/hal/halppc/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/irql.c?… Added: trunk/reactos/hal/halppc/generic/isa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/isa.c?r… Added: trunk/reactos/hal/halppc/generic/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/kdbg.c?… Added: trunk/reactos/hal/halppc/generic/mca.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/mca.c?r… Added: trunk/reactos/hal/halppc/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/misc.c?… Added: trunk/reactos/hal/halppc/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/pci.c?r… Added: trunk/reactos/hal/halppc/generic/portio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/portio.… Added: trunk/reactos/hal/halppc/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/process… Added: trunk/reactos/hal/halppc/generic/profil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/profil.… Added: trunk/reactos/hal/halppc/generic/pwroff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/pwroff.… Added: trunk/reactos/hal/halppc/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/reboot.… Added: trunk/reactos/hal/halppc/generic/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/resourc… Added: trunk/reactos/hal/halppc/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/spinloc… Added: trunk/reactos/hal/halppc/generic/sysbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/sysbus.… Added: trunk/reactos/hal/halppc/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/sysinfo… Added: trunk/reactos/hal/halppc/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/systime… Added: trunk/reactos/hal/halppc/generic/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/time.c?… Added: trunk/reactos/hal/halppc/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/timer.c… Added: trunk/reactos/hal/halppc/include/apic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/apic.h?… Added: trunk/reactos/hal/halppc/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/bus.h?r… Added: trunk/reactos/hal/halppc/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/hal.h?r… Added: trunk/reactos/hal/halppc/include/haldma.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/haldma.… Added: trunk/reactos/hal/halppc/include/halirq.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/halirq.… Added: trunk/reactos/hal/halppc/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/halp.h?… Added: trunk/reactos/hal/halppc/include/ioapic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/ioapic.… Added: trunk/reactos/hal/halppc/include/mps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/mps.h?r… Added: trunk/reactos/hal/halppc/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halinit_up.c… Added: trunk/reactos/hal/halppc/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halup.rbuild… Added: trunk/reactos/hal/halppc/up/halup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halup.rc?rev… Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… Modified: trunk/reactos/include/ndk/powerpc/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/powerpc/ketype… Modified: trunk/reactos/include/ndk/powerpc/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/powerpc/mmtype… Added: trunk/reactos/include/psdk/intrin_ppc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_ppc.h?… Modified: trunk/reactos/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpc.h?rev=287… Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… Added: trunk/reactos/include/reactos/elf/elf-powerpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/elf/elf-po… Modified: trunk/reactos/include/reactos/elf/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/elf/machin… Added: trunk/reactos/include/reactos/elf/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/elf/reacto… Added: trunk/reactos/include/reactos/libs/ppcmmu/mmu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/ppcmm… Added: trunk/reactos/include/reactos/libs/ppcmmu/mmuutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/ppcmm… Added: trunk/reactos/include/reactos/ppcboot.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ppcboot.h?… Added: trunk/reactos/include/reactos/ppcdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ppcdebug.h… Added: trunk/reactos/include/reactos/ppcfont.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ppcfont.h?… Modified: trunk/reactos/include/reactos/rosldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/rosldr.h?r… Modified: trunk/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=28… Added: trunk/reactos/lib/rtl/powerpc/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/powerpc/debug.c?re… Added: trunk/reactos/lib/rtl/powerpc/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/powerpc/except.c?r… Added: trunk/reactos/lib/rtl/powerpc/interlocked.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/powerpc/interlocke… Added: trunk/reactos/lib/rtl/powerpc/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/powerpc/thread.c?r… Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=287… Added: trunk/reactos/ntoskrnl/include/internal/powerpc/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=…

17 years

[dreimer] 28792: Activated German RC File. Add BS_MULTILINE to one Checkbox. Fixed some Text Lengths to fit.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Sep 3 03:34:31 2007 New Revision: 28792 URL: http://svn.reactos.org/svn/reactos?rev=28792&view=rev Log: Activated German RC File. Add BS_MULTILINE to one Checkbox. Fixed some Text Lengths to fit. Modified: trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/intl/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rc (original) +++ trunk/reactos/dll/cpl/intl/intl.rc Mon Sep 3 03:34:31 2007 @@ -21,7 +21,7 @@ */ //#include "lang/cs-CZ.rc" -//#include "lang/de-DE.rc" +#include "lang/de-DE.rc" //#include "lang/el-GR.rc" #include "lang/en-US.rc" //#include "lang/es-ES.rc" Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc Mon Sep 3 03:34:31 2007 @@ -23,7 +23,7 @@ EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Geografische Lage", -1, 5, 172, 234, 55 LTEXT "Wählen Sie Ihren Standort, sodass Dienste sie mit lokalen Informationen, wie Nachrichten und Wettervorhersagen, versorgen können.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + COMBOBOX IDC_LOCATION_COMBO, 14, 210, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END @@ -37,7 +37,7 @@ PUSHBUTTON "&Details...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Zusätzliche Sprachunterstützung", IDC_GROUPBOX, 5, 62, 234, 82 LTEXT "Die meisten Sprachen sind standardmäßig installiert. Um weitere Sprachen zu installieren, aktivieren Sie die unteren Kontollkästchen.", -1, 12, 72, 220, 18 - CHECKBOX "Dateien für Sprachen mit &komplexer Schrift und Rechts-nach-Links Schreibstil installieren", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22 + CHECKBOX "Dateien für Sprachen mit &komplexer Schrift und Rechts-nach-Links Schreibstil installieren", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE CHECKBOX "Dateien für &ostasiatische Sprachen installieren", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22 END @@ -49,11 +49,11 @@ GROUPBOX "Sprache für Unicode-Inkompatible Programme", IDC_GROUPBOX, 5, 5, 234, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Diese Einstellung ermöglicht es Unicode-Inkompatiblen Programmen, Menüs und Dialoge in der örtlichen Sprache darzustellen. Dies beeinflusst Unicode-Kompatible Programme nicht, wird aber für alle Nutzer des Computers angewendet.", -1, 14, 18, 223, 33 - LTEXT "Wählen Sie eine Sprache aus, die der Sprachversion des Unicode-Inkompatiblen Programmes entspricht, dass Sie nutzen wollen:", -1, 14, 55, 223, 18 + LTEXT "Wählen Sie eine Sprache aus, die der Sprachversion des Programmes entspricht, dass Sie nutzen wollen:", -1, 14, 55, 223, 18 GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88 LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD GROUPBOX "Standardeinstellungen für Benutzerkonten", -1, 5, 193, 234, 30 - CHECKBOX "&Alle Einstellungen auf das derzeitige Benutzerkonto und auf das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22 + CHECKBOX "Einstellungen &auf das aktive und Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22 END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 @@ -152,7 +152,7 @@ LTEXT "Kalendertypus:", -1, 13, 48, 56, 10 COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - LTEXT "Muslimischer Kalender:", -1, 13, 65, 60, 12 + LTEXT "Muslim. Kalender:", -1, 13, 65, 60, 12 COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED GROUPBOX "Kurzes Datumsformat", IDC_GROUPBOX, 7, 83, 230, 81

17 years

[dreimer] 28791: I missed a Dialog in my Translation :-P

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Sep 3 03:04:40 2007 New Revision: 28791 URL: http://svn.reactos.org/svn/reactos?rev=28791&view=rev Log: I missed a Dialog in my Translation :-P Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc Mon Sep 3 03:04:40 2007 @@ -48,12 +48,12 @@ BEGIN GROUPBOX "Sprache für Unicode-Inkompatible Programme", IDC_GROUPBOX, 5, 5, 234, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Diese Einstellung ermöglicht es Unicode-Inkompatiblen Programmen, Menüs und Dialoge in der örtlichen Sprache darzustellen. Dies beeinflusst Unicode-Kompatible Programme nicht, aber wird für alle Nutzer des Computers angewendet.", -1, 14, 18, 223, 33 + LTEXT "Diese Einstellung ermöglicht es Unicode-Inkompatiblen Programmen, Menüs und Dialoge in der örtlichen Sprache darzustellen. Dies beeinflusst Unicode-Kompatible Programme nicht, wird aber für alle Nutzer des Computers angewendet.", -1, 14, 18, 223, 33 LTEXT "Wählen Sie eine Sprache aus, die der Sprachversion des Unicode-Inkompatiblen Programmes entspricht, dass Sie nutzen wollen:", -1, 14, 55, 223, 18 GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88 LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD GROUPBOX "Standardeinstellungen für Benutzerkonten", -1, 5, 193, 234, 30 - CHECKBOX "&Alle Einstellungen auf das derzeitige und auf das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22 + CHECKBOX "&Alle Einstellungen auf das derzeitige Benutzerkonto und auf das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22 END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 @@ -143,33 +143,33 @@ CAPTION "Datum" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Calendar", IDC_GROUPBOX, 7, 7, 230, 74 - LTEXT "If year typed as two digits, then show it as year between:", -1, 13, 18, 215, 8 + GROUPBOX "Kalender", IDC_GROUPBOX, 7, 7, 230, 74 + LTEXT "Eine Zweistellige Jahreszahl in folgendem Zeitraum interpretieren:", -1, 13, 18, 215, 8 EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "and", -1, 55, 32, 17, 8 + LTEXT "und", -1, 55, 32, 17, 8 EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 - LTEXT "Calendar type:", -1, 13, 48, 56, 10 + LTEXT "Kalendertypus:", -1, 13, 48, 56, 10 COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - LTEXT "Muslim Calendar:", -1, 13, 65, 60, 12 + LTEXT "Muslimischer Kalender:", -1, 13, 65, 60, 12 COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - GROUPBOX "Short date format", IDC_GROUPBOX, 7, 83, 230, 81 - LTEXT "Sample:", -1, 13, 95, 63, 10 + GROUPBOX "Kurzes Datumsformat", IDC_GROUPBOX, 7, 83, 230, 81 + LTEXT "Beispiel:", -1, 13, 95, 63, 10 EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Sample - right to left read:", -1, 13, 109, 60, 16 + LTEXT "Beispiel - Rechts nach Links:", -1, 13, 109, 60, 16 EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "Short format:", -1, 13, 131, 60, 10 + LTEXT "Kurzes Format:", -1, 13, 131, 60, 10 COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Date components separator:", -1, 13, 148, 113, 10 + LTEXT "Datumstrennzeichen:", -1, 13, 148, 113, 10 COMBOBOX IDC_SHRTDATESEP_COMBO, 180, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - GROUPBOX "Long date format", IDC_GROUPBOX, 7, 167, 230, 64 - LTEXT "Sample:", -1, 13, 179, 61, 10 + GROUPBOX "Langes Datumsformat", IDC_GROUPBOX, 7, 167, 230, 64 + LTEXT "Beispiel:", -1, 13, 179, 61, 10 EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Sample - right to left read:", -1, 13, 193, 61, 16 + LTEXT "Beispiel - Rechts nach Links:", -1, 13, 193, 61, 16 EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "Long format:", -1, 13, 215, 60, 10 + LTEXT "Langes Format:", -1, 13, 215, 60, 10 COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE END

17 years

[dreimer] 28790: Updated German Resource File. I was NOT able to test it, because intl seems to be broken, but before anybody else commits a translation...

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Sep 3 02:39:17 2007 New Revision: 28790 URL: http://svn.reactos.org/svn/reactos?rev=28790&view=rev Log: Updated German Resource File. I was NOT able to test it, because intl seems to be broken, but before anybody else commits a translation... Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc Mon Sep 3 02:39:17 2007 @@ -1,36 +1,100 @@ -/* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Allgemein" +CAPTION "Regionale Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Standardsprache", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Wählen Sie eine Sprache und Region aus welche Sie benutzen wollen:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + GROUPBOX "Standards und Formate", -1, 5, 5, 234, 162 + LTEXT "Diese Einstellungen beeinflussen, wie einige Programme Zahlen, Währung, Datum, und Zeit formatieren.", -1, 14, 17, 220, 25 + LTEXT "Wählen Sie ein Element, um dessen Einstellungen anzuzeigen, oder wählen Sie ""Anpassen..."", um Ihr eigenes Format zu wählen:", -1, 14, 37, 220, 22 + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "&Anpassen...", IDC_SETUP_BUTTON, 178, 56, 52, 13 + LTEXT "Beispiele", -1, 14, 73, 70, 10 + LTEXT "Zahl:", -1, 16, 86, 48, 10 + LTEXT "Währung:", -1, 16, 101, 48, 10 + LTEXT "Zeit:", -1, 16, 116, 48, 10 + LTEXT "Kurzes Datum:", -1, 16, 131, 48, 10 + LTEXT "Langes Datum:", -1, 16, 146, 48, 10 + EDITTEXT IDC_NUMSAMPLE_EDIT, 89, 86, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_MONEYSAMPLE_EDIT, 89, 101, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE_EDIT, 89, 116, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Geografische Lage", -1, 5, 172, 234, 55 + LTEXT "Wählen Sie Ihren Standort, sodass Dienste sie mit lokalen Informationen, wie Nachrichten und Wettervorhersagen, versorgen können.", -1, 14, 184, 210, 24 + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT END +IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Sprachen" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Eingabesprachen und Textdienste", IDC_GROUPBOX, 5, 5, 234, 52 + LTEXT "Um Ihre Sprache einsehen oder ändern zu können wählen Sie ""Details...""", -1, 12, 15, 220, 18 + PUSHBUTTON "&Details...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 + GROUPBOX "Zusätzliche Sprachunterstützung", IDC_GROUPBOX, 5, 62, 234, 82 + LTEXT "Die meisten Sprachen sind standardmäßig installiert. Um weitere Sprachen zu installieren, aktivieren Sie die unteren Kontollkästchen.", -1, 12, 72, 220, 18 + CHECKBOX "Dateien für Sprachen mit &komplexer Schrift und Rechts-nach-Links Schreibstil installieren", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22 + CHECKBOX "Dateien für &ostasiatische Sprachen installieren", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22 +END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 +IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Erweitert" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Sprache für Unicode-Inkompatible Programme", IDC_GROUPBOX, 5, 5, 234, 90 + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Diese Einstellung ermöglicht es Unicode-Inkompatiblen Programmen, Menüs und Dialoge in der örtlichen Sprache darzustellen. Dies beeinflusst Unicode-Kompatible Programme nicht, aber wird für alle Nutzer des Computers angewendet.", -1, 14, 18, 223, 33 + LTEXT "Wählen Sie eine Sprache aus, die der Sprachversion des Unicode-Inkompatiblen Programmes entspricht, dass Sie nutzen wollen:", -1, 14, 55, 223, 18 + GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88 + LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD + GROUPBOX "Standardeinstellungen für Benutzerkonten", -1, 5, 193, 234, 30 + CHECKBOX "&Alle Einstellungen auf das derzeitige und auf das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22 +END + +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Zahlen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 + GROUPBOX "Besispiel", -1, 7, 7, 230, 53, WS_CHILD | WS_VISIBLE + LTEXT "Positiv:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_NUMBERSPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Negativ:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_NUMBERSNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Dezimaltrennzeichen:", -1, 8, 67, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERDSYMBOL, 137, 65, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Anzahl an Dezimalstellen:", -1, 8, 83, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNDIGDEC, 137, 81, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Zifferngruppierungssymb&ol:", -1, 8, 100, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDIGITGRSYM, 137, 97, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Zifferngruppierung:", -1, 8, 117, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDGROUPING, 137, 113, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "N&egatives Vorzeichen:", -1, 8, 134, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNSIGNSYM, 137, 129, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Format für negative Zahlen:", -1, 8, 149, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNNUMFORMAT, 137, 145, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Füh&rende Nullen anzeigen:", -1, 8, 166, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDISPLEADZER, 137, 161, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Listentrennzeichen:", -1, 8, 181, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSLSEP, 137, 177, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Maßsystem:", -1, 8, 197, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSMEASSYS, 137, 193, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Währung" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Darstellung", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + GROUPBOX "Darstellung", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE LTEXT "Positiv:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Negativ:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Währungssymbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP @@ -50,47 +114,69 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Uhrzeit" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Darstellung", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + GROUPBOX "Darstellung", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE LTEXT "Beispiel:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - EDITTEXT IDC_TIMESAMPLE, 100, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Zeitformat:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEFORMAT, 100, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + COMBOBOX IDC_TIMEFORMAT, 88, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&Trennzeichen:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMESEPARATOR, 100, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Symbol für &Vormittag:", -1, 13, 88, 86, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEAMSYMBOL, 100, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Symbol für &Nachmittag:", -1, 13, 106, 86, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEPMSYMBOL, 100, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE + COMBOBOX IDC_TIMESEPARATOR, 88, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbol für &Vormittag:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 88, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbol für &Nachmittag:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 88, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 140, 230, 80, WS_VISIBLE LTEXT "Zeitformat\n\n\ h = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\ h = 12 Stunden H = 24 Stunden\n\n\ -hh, mm, ss = führende Null h, m, s = keine führende Null", -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP +hh, mm, ss = führende Null h, m, s = keine führende Null", -1, 13, 150, 214, 50, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Datum" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 5",-1,73,74,90,8 + GROUPBOX "Calendar", IDC_GROUPBOX, 7, 7, 230, 74 + LTEXT "If year typed as two digits, then show it as year between:", -1, 13, 18, 215, 8 + EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "and", -1, 55, 32, 17, 8 + EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP + CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 + LTEXT "Calendar type:", -1, 13, 48, 56, 10 + COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED + LTEXT "Muslim Calendar:", -1, 13, 65, 60, 12 + COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED + GROUPBOX "Short date format", IDC_GROUPBOX, 7, 83, 230, 81 + LTEXT "Sample:", -1, 13, 95, 63, 10 + EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Sample - right to left read:", -1, 13, 109, 60, 16 + EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "Short format:", -1, 13, 131, 60, 10 + COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Date components separator:", -1, 13, 148, 113, 10 + COMBOBOX IDC_SHRTDATESEP_COMBO, 180, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + GROUPBOX "Long date format", IDC_GROUPBOX, 7, 167, 230, 64 + LTEXT "Sample:", -1, 13, 179, 61, 10 + EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Sample - right to left read:", -1, 13, 193, 61, 16 + EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "Long format:", -1, 13, 215, 60, 10 + COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE END - -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Regionale Einstellungen" -FONT 8, "MS Shell Dlg" +STRINGTABLE BEGIN - + IDS_CUSTOMIZE_TITLE "Regionale Einstellungen bearbeiten" END - STRINGTABLE BEGIN

17 years

[janderwald] 28789: - improve error checking - add hasQemuNoRebootOption stub

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Sep 3 02:27:03 2007 New Revision: 28789 URL: http://svn.reactos.org/svn/reactos?rev=28789&view=rev Log: - improve error checking - add hasQemuNoRebootOption stub Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Sep 3 02:27:03 2007 @@ -208,6 +208,16 @@ return isFileExisting(qemupath); } //---------------------------------------------------------------------------------------- + bool RosBootTest::hasQemuNoRebootOption() + { + /// + /// FIXME + /// extract version + /// + + return true; + } +//---------------------------------------------------------------------------------------- bool RosBootTest::getQemuDir(string & qemupath) { string::size_type pos; @@ -275,9 +285,10 @@ m_BootCmd += _T(" -pidfile "); m_BootCmd += m_PidFile; #endif - - m_BootCmd += _T(" -no-reboot "); - + if (hasQemuNoRebootOption()) + { + m_BootCmd += _T(" -no-reboot "); + } return true; } //---------------------------------------------------------------------------------------- @@ -335,6 +346,11 @@ /* check if ROS_HDD_IMAGE points to hdd image */ if (!isFileExisting(m_HDDImage)) { + if (!m_CDImage.length ()) + { + cerr << "Error: HDD image is not existing and CDROM image not provided" << endl; + return false; + } /* create it */ return createHDDImage(m_HDDImage); } @@ -346,9 +362,20 @@ * but also no override by * ROS_BOOT_CMD */ + if (!m_CDImage.length ()) + { + cerr << "Error: no HDD and CDROM image provided" << endl; + return false; + } + getDefaultHDDImage(m_HDDImage); return createHDDImage(m_HDDImage); } + /* + * verify the provided ROS_BOOT_CMD for hdd image + * + */ + bool hdaboot = false; string::size_type pos = m_BootCmd.find (_T("-boot c")); if (pos != string::npos) @@ -392,34 +419,28 @@ //---------------------------------------------------------------------------------------- bool RosBootTest::configureCDImage() { - if (m_CDImage.length()) - { - /* we have a cd image lets check if its valid */ - if (!isFileExisting(m_CDImage)) - { - cerr << "Error: ROS_CD_IMAGE is not valid" << endl; - return false; - } + if (!m_BootCmd.length ()) + { + if (m_CDImage.length()) + { + /* we have a cd image lets check if its valid */ + if (isFileExisting(m_CDImage)) + { + cerr << "Using CDROM image " << m_CDImage << endl; + return true; + } + } + if (isFileExisting(_T("ReactOS-RegTest.iso"))) + { + m_CDImage = _T("ReactOS-RegTest.iso"); + cerr << "Falling back to default CDROM image " << m_CDImage << endl; + return true; + } + cerr << "No CDROM image found, boot device is HDD" << endl; + m_CDImage = _T(""); return true; } - /* ROS_CD_IMAGE is not set - * lets check if m_BootCmd provides it - */ - - if (!m_BootCmd.length()) - { - /* ROS_BOOT_CMD not set - * check if theres a default image - */ - - if (isFileExisting(_T("ReactOS-RegTest.iso"))) - { - m_CDImage = _T("ReactOS-RegTest.iso"); - } - return true; - } - string::size_type pos = m_BootCmd.find(_T("-boot ")); if (pos == string::npos) { Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Mon Sep 3 02:27:03 2007 @@ -102,6 +102,7 @@ bool readConfigurationValues(ConfigParser & conf_parser); bool configureQemu(); bool configureVmWare(); + bool hasQemuNoRebootOption(); void cleanup(); //--------------------------------------------------------------------------------------- ///

17 years

← Newer
1
...
50
51
52
53
54
55
56
...
59
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 September 2007