Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 31532: Getting closer to what I would call Default Dialogs. Sad but true. It still does not activate skinning.
by dreimer＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: dreimer Date: Tue Jan 1 15:07:06 2008 New Revision: 31532 URL: http://svn.reactos.org/svn/reactos?rev=31532&view=rev Log: Getting closer to what I would call Default Dialogs. Sad but true. It still does not activate skinning. Modified: trunk/rosapps/roscalc/lang/de-DE.rc trunk/rosapps/roscalc/lang/en-US.rc trunk/rosapps/roscalc/lang/es-ES.rc trunk/rosapps/roscalc/lang/it-IT.rc Modified: trunk/rosapps/roscalc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/de-DE.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/de-DE.rc (original) +++ trunk/rosapps/roscalc/lang/de-DE.rc Tue Jan 1 15:07:06 2008 @@ -6,7 +6,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Rechner" MENU IDR_MENU_SCIENTIFIC_1 -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, @@ -166,7 +166,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Rechner" MENU IDR_MENU_STANDARD -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP @@ -229,10 +229,10 @@ DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOG DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Über ReactOS Rechner" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,105,148,52,16 CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | @@ -248,10 +248,10 @@ WS_VSCROLL END -IDD_DIALOG_STAT DIALOG DISCARDABLE 0, 0, 163, 85 +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistik Box" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP Modified: trunk/rosapps/roscalc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/en-US.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/en-US.rc (original) +++ trunk/rosapps/roscalc/lang/en-US.rc Tue Jan 1 15:07:06 2008 @@ -6,7 +6,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Calculator" MENU IDR_MENU_SCIENTIFIC_1 -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, @@ -166,7 +166,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Calculator" MENU IDR_MENU_STANDARD -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP @@ -229,10 +229,10 @@ DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOG DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "About ReactOS Calc" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,105,148,52,16 CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | @@ -248,10 +248,10 @@ WS_VSCROLL END -IDD_DIALOG_STAT DIALOG DISCARDABLE 0, 0, 163, 85 +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistics box" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP Modified: trunk/rosapps/roscalc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/es-ES.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/es-ES.rc (original) +++ trunk/rosapps/roscalc/lang/es-ES.rc Tue Jan 1 15:07:06 2008 @@ -11,7 +11,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculadora ReactOS" MENU IDR_MENU_SCIENTIFIC_1 -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, @@ -171,7 +171,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculadora ReactOS" MENU IDR_MENU_STANDARD -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP @@ -234,10 +234,10 @@ DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOG DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Acerca de Calculadora ReactOS" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Aceptar",IDOK,105,148,52,16 CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | @@ -253,10 +253,10 @@ WS_VSCROLL END -IDD_DIALOG_STAT DIALOG DISCARDABLE 0, 0, 163, 85 +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistics box" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP Modified: trunk/rosapps/roscalc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/it-IT.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/it-IT.rc (original) +++ trunk/rosapps/roscalc/lang/it-IT.rc Tue Jan 1 15:07:06 2008 @@ -6,7 +6,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calcolatrice ReactOS" MENU IDR_MENU_SCIENTIFIC_1 -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, @@ -166,7 +166,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calcolatrice ReactOS" MENU IDR_MENU_STANDARD -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP @@ -229,10 +229,10 @@ DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOG DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Informazioni su ReactOS Calc" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,105,148,52,16 CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | @@ -248,10 +248,10 @@ WS_VSCROLL END -IDD_DIALOG_STAT DIALOG DISCARDABLE 0, 0, 163, 85 +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Finestra di statistica" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

1 0

[jimtabor] 31531: Merry New Year post!
by jimtabor＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: jimtabor Date: Tue Jan 1 08:53:10 2008 New Revision: 31531 URL: http://svn.reactos.org/svn/reactos?rev=31531&view=rev Log: Merry New Year post! Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Tue Jan 1 08:53:10 2008 @@ -369,11 +369,11 @@ typedef struct _DC { HGDIOBJ hHmgr; // Handle for this DC object. - PVOID pvEntry; + ULONG Count; ULONG lucExcLock; - ULONG Tid; - - DHPDEV PDev; // GDIDEVICE.PDev + PVOID Tid; + + DHPDEV PDev; // GDIDEVICE.hPDev INT DC_Type; INT DC_Flags; PVOID pPDev; // PGDIDEVICE

1 0

[greatlrd] 31530: rename Pdev to hPDev in GDIDEVICE struct fixed bug in DxEngGetDCState
by greatlrd＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: greatlrd Date: Tue Jan 1 04:08:07 2008 New Revision: 31530 URL: http://svn.reactos.org/svn/reactos?rev=31530&view=rev Log: rename Pdev to hPDev in GDIDEVICE struct fixed bug in DxEngGetDCState Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/icm.c Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/driverobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/driverobj.c Tue Jan 1 04:08:07 2008 @@ -84,7 +84,7 @@ DrvObjUser->pvObj = pvObj; DrvObjUser->pFreeProc = pFreeObjProc; DrvObjUser->hdev = hdev; - DrvObjUser->dhpdev = ((GDIDEVICE*)hdev)->PDev; + DrvObjUser->dhpdev = ((GDIDEVICE*)hdev)->hPDev; /* fill internal object */ ExInitializeFastMutex(&DrvObjInt->Lock); Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Tue Jan 1 04:08:07 2008 @@ -458,7 +458,7 @@ /* Associate the hdev */ SurfObj->hdev = Dev; - SurfObj->dhpdev = Device->PDev; + SurfObj->dhpdev = Device->hPDev; /* Hook up specified functions */ BitmapObj->flHooks = Hooks; Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Jan 1 04:08:07 2008 @@ -62,7 +62,7 @@ PVOID pvGammaRamp; - DHPDEV PDev; + DHPDEV hPDev; DEVMODEW DMW; HSURF FillPatterns[HS_DDI_MAX]; DEVINFO DevInfo; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Tue Jan 1 04:08:07 2008 @@ -402,12 +402,18 @@ /************************************************************************/ /* DxEngGetDCState */ /************************************************************************/ +/* Note type 0 = ? */ +/* Note type 1 = ? */ +/* Note type 2 = ? */ +/* Note type 3 = Get Driver hdev */ + DWORD DxEngGetDCState(HDC hDC, DWORD type) { - PEDD_DIRECTDRAW_GLOBAL pEDDgpl = NULL; PDC pDC = DC_LockDc(hDC); + DWORD retVal = 0; + if (pDC) { switch (type) @@ -421,17 +427,16 @@ case 3: { PGDIDEVICE GDIDevice = (PGDIDEVICE)pDC->pPDev; - pEDDgpl = GDIDevice->pEDDgpl; - DC_UnlockDc(pDC); - return (DWORD)pEDDgpl; + retVal = (DWORD)GDIDevice->hPDev; } default: UNIMPLEMENTED; break; } + DC_UnlockDc(pDC); } - return 0; + return retVal; } /************************************************************************/ 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 Tue Jan 1 04:08:07 2008 @@ -460,7 +460,7 @@ PrimarySurface.DMW.dmSize = sizeof (PrimarySurface.DMW); if (SetupDevMode(&PrimarySurface.DMW, DisplayNumber)) { - PrimarySurface.PDev = PrimarySurface.DriverFunctions.EnablePDEV( + PrimarySurface.hPDev = PrimarySurface.DriverFunctions.EnablePDEV( &PrimarySurface.DMW, L"", HS_DDI_MAX, @@ -472,7 +472,7 @@ NULL, L"", (HANDLE) (PrimarySurface.VideoFileObject->DeviceObject)); - DoDefault = (NULL == PrimarySurface.PDev); + DoDefault = (NULL == PrimarySurface.hPDev); if (DoDefault) { DPRINT1("DrvEnablePDev with registry parameters failed\n"); @@ -487,7 +487,7 @@ { RtlZeroMemory(&(PrimarySurface.DMW), sizeof(DEVMODEW)); PrimarySurface.DMW.dmSize = sizeof (PrimarySurface.DMW); - PrimarySurface.PDev = PrimarySurface.DriverFunctions.EnablePDEV( + PrimarySurface.hPDev = PrimarySurface.DriverFunctions.EnablePDEV( &PrimarySurface.DMW, L"", HS_DDI_MAX, @@ -500,7 +500,7 @@ L"", (HANDLE) (PrimarySurface.VideoFileObject->DeviceObject)); - if (NULL == PrimarySurface.PDev) + if (NULL == PrimarySurface.hPDev) { ObDereferenceObject(PrimarySurface.VideoFileObject); DPRINT1("DrvEnablePDEV with default parameters failed\n"); @@ -532,7 +532,7 @@ /* Complete initialization of the physical device */ PrimarySurface.DriverFunctions.CompletePDEV( - PrimarySurface.PDev, + PrimarySurface.hPDev, (HDEV)&PrimarySurface); DPRINT("calling DRIVER_ReferenceDriver\n"); @@ -635,17 +635,17 @@ DPRINT("calling EnableSurface\n"); /* Enable the drawing surface */ PrimarySurface.Handle = - PrimarySurface.DriverFunctions.EnableSurface(PrimarySurface.PDev); + PrimarySurface.DriverFunctions.EnableSurface(PrimarySurface.hPDev); if (NULL == PrimarySurface.Handle) { -/* PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.PDev, FALSE);*/ - PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.PDev); +/* PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.hPDev, FALSE);*/ + PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.hPDev); ObDereferenceObject(PrimarySurface.VideoFileObject); DPRINT1("DrvEnableSurface failed\n"); return FALSE; } - PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.PDev, TRUE); + PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.hPDev, TRUE); calledFromUser = UserIsEntered(); //fixme: possibly upgrade a shared lock if (!calledFromUser){ @@ -656,7 +656,7 @@ IntAttachMonitor(&PrimarySurface, PrimarySurface.DisplayNumber); SurfObj = EngLockSurface((HSURF)PrimarySurface.Handle); - SurfObj->dhpdev = PrimarySurface.PDev; + SurfObj->dhpdev = PrimarySurface.hPDev; SurfSize = SurfObj->sizlBitmap; SurfaceRect.left = SurfaceRect.top = 0; SurfaceRect.right = SurfObj->sizlBitmap.cx; @@ -703,9 +703,9 @@ */ DPRINT("Reseting display\n" ); - PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.PDev, FALSE); - PrimarySurface.DriverFunctions.DisableSurface(PrimarySurface.PDev); - PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.PDev); + PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.hPDev, FALSE); + PrimarySurface.DriverFunctions.DisableSurface(PrimarySurface.hPDev); + PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.hPDev); PrimarySurface.PreparedDriver = FALSE; KeSetEvent(&VideoDriverNeedsPreparation, 1, FALSE); KeResetEvent(&VideoDriverPrepared); @@ -793,12 +793,12 @@ NewDC->DC_Type = DC_TYPE_DIRECT; NewDC->IsIC = CreateAsIC; - NewDC->PDev = PrimarySurface.PDev; + NewDC->PDev = PrimarySurface.hPDev; if(pUMdhpdev) pUMdhpdev = NewDC->PDev; NewDC->pPDev = (PVOID)&PrimarySurface; NewDC->w.hBitmap = PrimarySurface.Handle; - NewDC->w.bitsPerPixel = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cBitsPixel * + NewDC->w.bitsPerPixel = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cBitsPixel * ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cPlanes; DPRINT("Bits per pel: %u\n", NewDC->w.bitsPerPixel); @@ -1272,7 +1272,7 @@ if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; sDc_Attr = dcs->pDc_Attr; if(!sDc_Attr) sDc_Attr = &dcs->Dc_Attr; - + dc->w.flags = dcs->w.flags & ~DC_SAVED; dc->w.hFirstBitmap = dcs->w.hFirstBitmap; @@ -2386,7 +2386,7 @@ } Dc_Attr = NewDC->pDc_Attr; if(!Dc_Attr) Dc_Attr = &NewDC->Dc_Attr; - + NewDC->hHmgr = (HGDIOBJ) hDC; // Save the handle for this DC object. NewDC->w.xformWorld2Wnd.eM11 = 1.0f; NewDC->w.xformWorld2Wnd.eM12 = 0.0f; @@ -2653,7 +2653,7 @@ DC_UnlockDc(dc); if (!Resource) return; KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite( Resource , TRUE); + ExAcquireResourceExclusiveLite( Resource , TRUE); } VOID @@ -3366,7 +3366,7 @@ } while (pPDev != NULL); KeLeaveCriticalRegion(); if (!pPDev) return NULL; - return pGdiDevice->PDev; + return pGdiDevice->hPDev; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c Tue Jan 1 04:08:07 2008 @@ -98,7 +98,7 @@ { int NewValue = i * 256; if (NewValue > 65535) NewValue = 65535; - + Ramp->Red[i] = Ramp->Green[i] = Ramp->Blue[i] = ((WORD)NewValue); } return TRUE; @@ -122,7 +122,7 @@ dc = DC_LockDc(hDC); if (!dc) { - SetLastWin32Error(ERROR_INVALID_HANDLE); + SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } @@ -132,7 +132,7 @@ DC_UnlockDc(dc); SetLastWin32Error(STATUS_NO_MEMORY); return FALSE; - } + } Ret = IntGetDeviceGammaRamp((HDEV)dc->pPDev, SafeRamp); @@ -208,7 +208,7 @@ (pGDev->DevInfo.iDitherFormat == BMF_32BPP)) { if (pGDev->DriverFunctions.IcmSetDeviceGammaRamp) - return pGDev->DriverFunctions.IcmSetDeviceGammaRamp( pGDev->PDev, + return pGDev->DriverFunctions.IcmSetDeviceGammaRamp( pGDev->hPDev, IGRF_RGB_256WORDS, pGDev->pvGammaRamp); @@ -232,7 +232,7 @@ // PALOBJ_cGetColors check mode flags and update Gamma Correction. // Set the HDEV to pal and go. palGDI->hPDev = hPDev; - Ret = pGDev->DriverFunctions.SetPalette(pGDev->PDev, + Ret = pGDev->DriverFunctions.SetPalette(pGDev->hPDev, palPtr, 0, 0, @@ -270,9 +270,9 @@ if (!pGDev->DriverFunctions.IcmSetDeviceGammaRamp) { // No driver support if (!(pGDev->DevInfo.flGraphicsCaps2 & GCAPS2_CHANGEGAMMARAMP)) - { // Driver does not support Gamma Ramp, so test to see we + { // Driver does not support Gamma Ramp, so test to see we // have BMF_8BPP only and palette operation support. - if ((pGDev->DevInfo.iDitherFormat != BMF_8BPP) || + if ((pGDev->DevInfo.iDitherFormat != BMF_8BPP) || !(pGDev->GDIInfo.flRaster & RC_PALETTE)) return FALSE; } } @@ -338,7 +338,7 @@ dc = DC_LockDc(hDC); if (!dc) { - SetLastWin32Error(ERROR_INVALID_HANDLE); + SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } @@ -348,7 +348,7 @@ DC_UnlockDc(dc); SetLastWin32Error(STATUS_NO_MEMORY); return FALSE; - } + } _SEH_TRY { ProbeForRead( Ramp,

1 0

[janderwald] 31529: - use default CLSID for ControlPanel extension - add network hood shellfolder byMike McCormack (wine sync) - happy new year!
by janderwald＠svn.reactos.org 31 Dec '07

31 Dec '07

Author: janderwald Date: Mon Dec 31 22:13:36 2007 New Revision: 31529 URL: http://svn.reactos.org/svn/reactos?rev=31529&view=rev Log: - use default CLSID for ControlPanel extension - add network hood shellfolder byMike McCormack (wine sync) - happy new year! Added: trunk/reactos/dll/win32/shell32/shfldr_netplaces.c (with props) Modified: trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shellole.c trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c (original) +++ trunk/reactos/dll/win32/shell32/pidl.c Mon Dec 31 22:13:36 2007 @@ -1381,21 +1381,7 @@ LPITEMIDLIST _ILCreateControlPanel(void) { - LPITEMIDLIST parent = _ILCreateGuid(PT_GUID, &CLSID_MyComputer), ret = NULL; - - TRACE("()\n"); - if (parent) - { - LPITEMIDLIST cpl = _ILCreateGuid(PT_SHELLEXT, &CLSID_ControlPanel); - - if (cpl) - { - ret = ILCombine(parent, cpl); - SHFree(cpl); - } - SHFree(parent); - } - return ret; + return _ILCreateGuid(PT_SHELLEXT, &CLSID_ControlPanel); } LPITEMIDLIST _ILCreatePrinters(void) @@ -1627,6 +1613,23 @@ return IsEqualIID(iid, &CLSID_MyDocuments); return FALSE; } + +BOOL _ILIsControlPanel(LPCITEMIDLIST pidl) +{ + REFIID iid = _ILGetGUIDPointer(pidl); + + TRACE("(%p)\n",pidl); + + if (iid) + return IsEqualIID(iid, &CLSID_ControlPanel); + return FALSE; +} + +LPITEMIDLIST _ILCreateNetHood(void) +{ + return _ILCreateGuid(PT_GUID, &CLSID_NetworkPlaces); +} + BOOL _ILIsMyComputer(LPCITEMIDLIST pidl) { Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h (original) +++ trunk/reactos/dll/win32/shell32/pidl.h Mon Dec 31 22:13:36 2007 @@ -204,7 +204,8 @@ BOOL _ILIsUnicode (LPCITEMIDLIST pidl); BOOL _ILIsDesktop (LPCITEMIDLIST pidl); BOOL _ILIsMyComputer (LPCITEMIDLIST pidl); -BOOL _ILIsMyDocuments (LPCITEMIDLIST pidl); +BOOL _ILIsMyDocuments (LPCITEMIDLIST pidl); +BOOL _ILIsControlPanel (LPCITEMIDLIST pidl); BOOL _ILIsBitBucket (LPCITEMIDLIST pidl); BOOL _ILIsDrive (LPCITEMIDLIST pidl); BOOL _ILIsFolder (LPCITEMIDLIST pidl); @@ -254,6 +255,7 @@ LPITEMIDLIST _ILCreateControlPanel (void); LPITEMIDLIST _ILCreatePrinters (void); LPITEMIDLIST _ILCreateNetwork (void); +LPITEMIDLIST _ILCreateNetHood (void); LPITEMIDLIST _ILCreateBitBucket (void); LPITEMIDLIST _ILCreateDrive (LPCWSTR); Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Mon Dec 31 22:13:36 2007 @@ -73,4 +73,5 @@ <file>she_ocmenu.c</file> <file>shv_item_new.c</file> <file>folder_options.c</file> + <file>shfldr_netplaces.c</file> </module> Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h Mon Dec 31 22:13:36 2007 @@ -94,6 +94,7 @@ HRESULT WINAPI ISF_MyComputer_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI ISF_Printers_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI ISF_MyDocuments_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); +HRESULT WINAPI ISF_NetworkPlaces_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV); HRESULT WINAPI IControlPanel_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); Modified: trunk/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.c (original) +++ trunk/reactos/dll/win32/shell32/shellole.c Mon Dec 31 22:13:36 2007 @@ -75,6 +75,7 @@ {&CLSID_FolderShortcut, &FolderShortcut_Constructor}, #endif {&CLSID_MyDocuments, &ISF_MyDocuments_Constructor}, + {&CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor}, {&CLSID_Printers, &ISF_Printers_Constructor}, {&CLSID_RecycleBin, &RecycleBin_Constructor}, {&CLSID_OpenWith, &SHEOW_Constructor}, Added: trunk/reactos/dll/win32/shell32/shfldr_netplaces.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_n… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_netplaces.c (added) +++ trunk/reactos/dll/win32/shell32/shfldr_netplaces.c Mon Dec 31 22:13:36 2007 @@ -1,0 +1,656 @@ +/* + * Network Places (Neighbourhood) folder + * + * Copyright 1997 Marcus Meissner + * Copyright 1998, 1999, 2002 Juergen Schmied + * Copyright 2003 Mike McCormack for Codeweavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" + +#include "pidl.h" +#include "enumidlist.h" +#include "undocshell.h" +#include "shell32_main.h" +#include "shresdef.h" +#include "wine/debug.h" +#include "debughlp.h" +#include "shfldr.h" + +WINE_DEFAULT_DEBUG_CHANNEL (shell); + +/*********************************************************************** +* IShellFolder implementation +*/ + +typedef struct { + const IShellFolder2Vtbl *lpVtbl; + LONG ref; + const IPersistFolder2Vtbl *lpVtblPersistFolder2; + + /* both paths are parsible from the desktop */ + LPITEMIDLIST pidlRoot; /* absolute pidl */ +} IGenericSFImpl; + +static const IShellFolder2Vtbl vt_ShellFolder2; +static const IPersistFolder2Vtbl vt_NP_PersistFolder2; + + +#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) +#define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); + +#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) +#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) +#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2) + +static shvheader NetworkPlacesSFHeader[] = { + {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10} +}; + +#define NETWORKPLACESSHELLVIEWCOLUMNS 2 + +/************************************************************************** +* ISF_NetworkPlaces_Constructor +*/ +HRESULT WINAPI ISF_NetworkPlaces_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + IGenericSFImpl *sf; + + TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); + + if (!ppv) + return E_POINTER; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + sf = (IGenericSFImpl *) HeapAlloc ( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof (IGenericSFImpl)); + if (!sf) + return E_OUTOFMEMORY; + + sf->ref = 0; + sf->lpVtbl = &vt_ShellFolder2; + sf->lpVtblPersistFolder2 = &vt_NP_PersistFolder2; + sf->pidlRoot = _ILCreateNetHood(); /* my qualified pidl */ + + if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) + { + IUnknown_Release (_IUnknown_ (sf)); + return E_NOINTERFACE; + } + + TRACE ("--(%p)\n", sf); + return S_OK; +} + +/************************************************************************** + * ISF_NetworkPlaces_fnQueryInterface + * + * NOTE + * supports not IPersist/IPersistFolder + */ +static HRESULT WINAPI ISF_NetworkPlaces_fnQueryInterface (IShellFolder2 *iface, REFIID riid, LPVOID *ppvObj) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); + + *ppvObj = NULL; + + if (IsEqualIID (riid, &IID_IUnknown) || + IsEqualIID (riid, &IID_IShellFolder) || + IsEqualIID (riid, &IID_IShellFolder2)) + { + *ppvObj = This; + } + else if (IsEqualIID (riid, &IID_IPersist) || + IsEqualIID (riid, &IID_IPersistFolder) || + IsEqualIID (riid, &IID_IPersistFolder2)) + { + *ppvObj = _IPersistFolder2_ (This); + } + + if (*ppvObj) + { + IUnknown_AddRef ((IUnknown *) (*ppvObj)); + TRACE ("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); + return S_OK; + } + TRACE ("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ISF_NetworkPlaces_fnAddRef (IShellFolder2 * iface) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE ("(%p)->(count=%u)\n", This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI ISF_NetworkPlaces_fnRelease (IShellFolder2 * iface) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE ("(%p)->(count=%u)\n", This, refCount + 1); + + if (!refCount) { + TRACE ("-- destroying IShellFolder(%p)\n", This); + SHFree (This->pidlRoot); + HeapFree (GetProcessHeap(), 0, This); + } + return refCount; +} + +/************************************************************************** +* ISF_NetworkPlaces_fnParseDisplayName +*/ +static HRESULT WINAPI ISF_NetworkPlaces_fnParseDisplayName (IShellFolder2 * iface, + HWND hwndOwner, LPBC pbcReserved, LPOLESTR lpszDisplayName, + DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + HRESULT hr = E_UNEXPECTED; + + TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", This, + hwndOwner, pbcReserved, lpszDisplayName, debugstr_w (lpszDisplayName), + pchEaten, ppidl, pdwAttributes); + + *ppidl = 0; + if (pchEaten) + *pchEaten = 0; /* strange but like the original */ + + TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr); + + return hr; +} + +/************************************************************************** +* ISF_NetworkPlaces_fnEnumObjects +*/ +static HRESULT WINAPI ISF_NetworkPlaces_fnEnumObjects (IShellFolder2 * iface, + HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, + hwndOwner, dwFlags, ppEnumIDList); + + *ppEnumIDList = IEnumIDList_Constructor(); + + TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); + + return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; +} + +/************************************************************************** +* ISF_NetworkPlaces_fnBindToObject +*/ +static HRESULT WINAPI ISF_NetworkPlaces_fnBindToObject (IShellFolder2 * iface, + LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This, + pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); + + return SHELL32_BindToChild (This->pidlRoot, NULL, pidl, riid, ppvOut); +} + +/************************************************************************** +* ISF_NetworkPlaces_fnBindToStorage +*/ +static HRESULT WINAPI ISF_NetworkPlaces_fnBindToStorage (IShellFolder2 * iface, + LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", This, + pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); + + *ppvOut = NULL; + return E_NOTIMPL; +} + +/************************************************************************** +* ISF_NetworkPlaces_fnCompareIDs +*/ + +static HRESULT WINAPI ISF_NetworkPlaces_fnCompareIDs (IShellFolder2 * iface, + LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + int nReturn; + + TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); + nReturn = SHELL32_CompareIDs (_IShellFolder_ (This), lParam, pidl1, pidl2); + TRACE ("-- %i\n", nReturn); + return nReturn; +} + +/************************************************************************** +* ISF_NetworkPlaces_fnCreateViewObject +*/ +static HRESULT WINAPI ISF_NetworkPlaces_fnCreateViewObject (IShellFolder2 * iface, + HWND hwndOwner, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + LPSHELLVIEW pShellView; + HRESULT hr = E_INVALIDARG; + + TRACE ("(%p)->(hwnd=%p,%s,%p)\n", This, + hwndOwner, shdebugstr_guid (riid), ppvOut); + + if (!ppvOut) + return hr; + + *ppvOut = NULL; + + if (IsEqualIID (riid, &IID_IDropTarget)) + { + WARN ("IDropTarget not implemented\n"); + hr = E_NOTIMPL; + } + else if (IsEqualIID (riid, &IID_IContextMenu)) + { + WARN ("IContextMenu not implemented\n"); + hr = E_NOTIMPL; + } + else if (IsEqualIID (riid, &IID_IShellView)) + { + pShellView = IShellView_Constructor ((IShellFolder *) iface); + if (pShellView) + { + hr = IShellView_QueryInterface (pShellView, riid, ppvOut); + IShellView_Release (pShellView); + } + } + TRACE ("-- (%p)->(interface=%p)\n", This, ppvOut); + return hr; +} + +/************************************************************************** +* ISF_NetworkPlaces_fnGetAttributesOf +*/ +static HRESULT WINAPI ISF_NetworkPlaces_fnGetAttributesOf (IShellFolder2 * iface, + UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + HRESULT hr = S_OK; + + TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", This, + cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); + + if (!rgfInOut) + return E_INVALIDARG; + if (cidl && !apidl) + return E_INVALIDARG; + + if (*rgfInOut == 0) + *rgfInOut = ~0; + + if (cidl == 0) + { + IShellFolder *psfParent = NULL; + LPCITEMIDLIST rpidl = NULL; + + hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, (LPCITEMIDLIST*)&rpidl); + if(SUCCEEDED(hr)) + { + SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); + IShellFolder_Release(psfParent); + } + } + else + { + while (cidl > 0 && *apidl) + { + pdump (*apidl); + SHELL32_GetItemAttributes (_IShellFolder_ (This), *apidl, rgfInOut); + apidl++; + cidl--; + } + } + + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ + *rgfInOut &= ~SFGAO_VALIDATE; + + TRACE ("-- result=0x%08x\n", *rgfInOut); + return hr; +} + +/************************************************************************** +* ISF_NetworkPlaces_fnGetUIObjectOf +* +* PARAMETERS +* hwndOwner [in] Parent window for any output +* cidl [in] array size +* apidl [in] simple pidl array +* riid [in] Requested Interface +* prgfInOut [ ] reserved +* ppvObject [out] Resulting Interface +* +*/ +static HRESULT WINAPI ISF_NetworkPlaces_fnGetUIObjectOf (IShellFolder2 * iface, + HWND hwndOwner, UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, + UINT * prgfInOut, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + LPITEMIDLIST pidl; + IUnknown *pObj = NULL; + HRESULT hr = E_INVALIDARG; + + TRACE ("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n", This, + hwndOwner, cidl, apidl, shdebugstr_guid (riid), prgfInOut, ppvOut); + + if (!ppvOut) + return hr; + + *ppvOut = NULL; + + if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) + { + pObj = (LPUNKNOWN) ISvItemCm_Constructor ((IShellFolder *) iface, This->pidlRoot, apidl, cidl); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) + { + pObj = (LPUNKNOWN) IDataObject_Constructor (hwndOwner, This->pidlRoot, apidl, cidl); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IExtractIconA) && (cidl == 1)) + { + pidl = ILCombine (This->pidlRoot, apidl[0]); + pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); + SHFree (pidl); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) + { + pidl = ILCombine (This->pidlRoot, apidl[0]); + pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); + SHFree (pidl); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) + { + hr = IShellFolder_QueryInterface (iface, &IID_IDropTarget, (LPVOID *) & pObj); + } + else + hr = E_NOINTERFACE; + + if (SUCCEEDED(hr) && !pObj) + hr = E_OUTOFMEMORY; + + *ppvOut = pObj; + TRACE ("(%p)->hr=0x%08x\n", This, hr); + return hr; +} + +/************************************************************************** +* ISF_NetworkPlaces_fnGetDisplayNameOf +* +*/ +static HRESULT WINAPI ISF_NetworkPlaces_fnGetDisplayNameOf (IShellFolder2 * iface, + LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); + pdump (pidl); + + if (!strRet) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +/************************************************************************** +* ISF_NetworkPlaces_fnSetNameOf +* Changes the name of a file object or subfolder, possibly changing its item +* identifier in the process. +* +* PARAMETERS +* hwndOwner [in] Owner window for output +* pidl [in] simple pidl of item to change +* lpszName [in] the items new display name +* dwFlags [in] SHGNO formatting flags +* ppidlOut [out] simple pidl returned +*/ +static HRESULT WINAPI ISF_NetworkPlaces_fnSetNameOf (IShellFolder2 * iface, + HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */ + LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, + hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); + return E_FAIL; +} + +static HRESULT WINAPI ISF_NetworkPlaces_fnGetDefaultSearchGUID ( + IShellFolder2 * iface, GUID * pguid) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_NetworkPlaces_fnEnumSearches (IShellFolder2 * iface, + IEnumExtraSearch ** ppenum) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_NetworkPlaces_fnGetDefaultColumn (IShellFolder2 * iface, + DWORD dwRes, ULONG * pSort, ULONG * pDisplay) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)\n", This); + + if (pSort) + *pSort = 0; + if (pDisplay) + *pDisplay = 0; + + return S_OK; +} + +static HRESULT WINAPI ISF_NetworkPlaces_fnGetDefaultColumnState ( + IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)\n", This); + + if (!pcsFlags || iColumn >= NETWORKPLACESSHELLVIEWCOLUMNS) + return E_INVALIDARG; + *pcsFlags = NetworkPlacesSFHeader[iColumn].pcsFlags; + return S_OK; +} + +static HRESULT WINAPI ISF_NetworkPlaces_fnGetDetailsEx (IShellFolder2 * iface, + LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_NetworkPlaces_fnGetDetailsOf (IShellFolder2 * iface, + LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_NetworkPlaces_fnMapColumnToSCID (IShellFolder2 * iface, + UINT column, SHCOLUMNID * pscid) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)\n", This); + + return E_NOTIMPL; +} + +static const IShellFolder2Vtbl vt_ShellFolder2 = { + ISF_NetworkPlaces_fnQueryInterface, + ISF_NetworkPlaces_fnAddRef, + ISF_NetworkPlaces_fnRelease, + ISF_NetworkPlaces_fnParseDisplayName, + ISF_NetworkPlaces_fnEnumObjects, + ISF_NetworkPlaces_fnBindToObject, + ISF_NetworkPlaces_fnBindToStorage, + ISF_NetworkPlaces_fnCompareIDs, + ISF_NetworkPlaces_fnCreateViewObject, + ISF_NetworkPlaces_fnGetAttributesOf, + ISF_NetworkPlaces_fnGetUIObjectOf, + ISF_NetworkPlaces_fnGetDisplayNameOf, + ISF_NetworkPlaces_fnSetNameOf, + /* ShellFolder2 */ + ISF_NetworkPlaces_fnGetDefaultSearchGUID, + ISF_NetworkPlaces_fnEnumSearches, + ISF_NetworkPlaces_fnGetDefaultColumn, + ISF_NetworkPlaces_fnGetDefaultColumnState, + ISF_NetworkPlaces_fnGetDetailsEx, + ISF_NetworkPlaces_fnGetDetailsOf, + ISF_NetworkPlaces_fnMapColumnToSCID +}; + +/************************************************************************ + * INPFldr_PersistFolder2_QueryInterface + */ +static HRESULT WINAPI INPFldr_PersistFolder2_QueryInterface (IPersistFolder2 * iface, + REFIID iid, LPVOID * ppvObj) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)\n", This); + + return IUnknown_QueryInterface (_IUnknown_ (This), iid, ppvObj); +} + +/************************************************************************ + * INPFldr_PersistFolder2_AddRef + */ +static ULONG WINAPI INPFldr_PersistFolder2_AddRef (IPersistFolder2 * iface) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(count=%u)\n", This, This->ref); + + return IUnknown_AddRef (_IUnknown_ (This)); +} + +/************************************************************************ + * ISFPersistFolder_Release + */ +static ULONG WINAPI INPFldr_PersistFolder2_Release (IPersistFolder2 * iface) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(count=%u)\n", This, This->ref); + + return IUnknown_Release (_IUnknown_ (This)); +} + +/************************************************************************ + * INPFldr_PersistFolder2_GetClassID + */ +static HRESULT WINAPI INPFldr_PersistFolder2_GetClassID ( + IPersistFolder2 * iface, CLSID * lpClassId) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)\n", This); + + if (!lpClassId) + return E_POINTER; + + *lpClassId = CLSID_NetworkPlaces; + + return S_OK; +} + +/************************************************************************ + * INPFldr_PersistFolder2_Initialize + * + * NOTES: it makes no sense to change the pidl + */ +static HRESULT WINAPI INPFldr_PersistFolder2_Initialize ( + IPersistFolder2 * iface, LPCITEMIDLIST pidl) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(%p)\n", This, pidl); + + return E_NOTIMPL; +} + +/************************************************************************** + * IPersistFolder2_fnGetCurFolder + */ +static HRESULT WINAPI INPFldr_PersistFolder2_GetCurFolder ( + IPersistFolder2 * iface, LPITEMIDLIST * pidl) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(%p)\n", This, pidl); + + if (!pidl) + return E_POINTER; + + *pidl = ILClone (This->pidlRoot); + + return S_OK; +} + +static const IPersistFolder2Vtbl vt_NP_PersistFolder2 = +{ + INPFldr_PersistFolder2_QueryInterface, + INPFldr_PersistFolder2_AddRef, + INPFldr_PersistFolder2_Release, + INPFldr_PersistFolder2_GetClassID, + INPFldr_PersistFolder2_Initialize, + INPFldr_PersistFolder2_GetCurFolder +}; Propchange: trunk/reactos/dll/win32/shell32/shfldr_netplaces.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h Mon Dec 31 22:13:36 2007 @@ -110,6 +110,8 @@ #define IDS_CONTROLPANEL 148 #define IDS_NEWFOLDER 149 #define IDS_FOLDER_OPTIONS 150 +#define IDS_COLUMN_EXTENSION 151 +#define IDS_NO_EXTENSION 152 /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964

1 0

[dchapyshev] 31528: Happy New Year! ;)
by dchapyshev＠svn.reactos.org 31 Dec '07

31 Dec '07

Author: dchapyshev Date: Mon Dec 31 21:55:37 2007 New Revision: 31528 URL: http://svn.reactos.org/svn/reactos?rev=31528&view=rev Log: Happy New Year! ;) Modified: trunk/reactos/include/reactos/version.rc Modified: trunk/reactos/include/reactos/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.rc… ============================================================================== --- trunk/reactos/include/reactos/version.rc (original) +++ trunk/reactos/include/reactos/version.rc Mon Dec 31 21:55:37 2007 @@ -20,7 +20,7 @@ #define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Development Team\0" #define REACTOS_DEFAULT_STR_DESCRIPTION "ReactOS Core Component\0" #define REACTOS_DEFAULT_STR_INTERNAL_NAME "\0" -#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-2007 ReactOS Team\0" +#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-2008 ReactOS Team\0" #define REACTOS_DEFAULT_STR_PRODUCT_NAME "ReactOS Operating System\0" /* Set defaults for everything, unless overridden */

1 0

[jimtabor] 31527: Add documented gdi object types enum.
by jimtabor＠svn.reactos.org 31 Dec '07

31 Dec '07

Author: jimtabor Date: Mon Dec 31 21:54:41 2007 New Revision: 31527 URL: http://svn.reactos.org/svn/reactos?rev=31527&view=rev Log: Add documented gdi object types enum. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Mon Dec 31 21:54:41 2007 @@ -96,6 +96,43 @@ GdiDpToLp, GdiLpToDp, } TRANSFORMTYPE, *PTRANSFORMTYPE; + +typedef enum _GDIOBJTYPE +{ + GDIObjType_DEF_TYPE, + GDIObjType_DC_TYPE, + GDIObjType_UNUSED1_TYPE, + GDIObjType_UNUSED2_TYPE, + GDIObjType_RGN_TYPE, + GDIObjType_SURF_TYPE, + GDIObjType_CLIENTOBJ_TYPE, + GDIObjType_PATH_TYPE, + GDIObjType_PAL_TYPE, + GDIObjType_ICMLCS_TYPE, + GDIObjType_LFONT_TYPE, + GDIObjType_RFONT_TYPE, + GDIObjType_PFE_TYPE, + GDIObjType_PFT_TYPE, + GDIObjType_ICMCXF_TYPE, + GDIObjType_SPRITE_TYPE, + GDIObjType_BRUSH_TYPE, + GDIObjType_UMPD_TYPE, + GDIObjType_UNUSED4_TYPE, + GDIObjType_SPACE_TYPE, + GDIObjType_UNUSED5_TYPE, + GDIObjType_META_TYPE, + GDIObjType_EFSTATE_TYPE, + GDIObjType_BMFD_TYPE, + GDIObjType_VTFD_TYPE, + GDIObjType_TTFD_TYPE, + GDIObjType_RC_TYPE, + GDIObjType_TEMP_TYPE, + GDIObjType_DRVOBJ_TYPE, + GDIObjType_DCIOBJ_TYPE, + GDIObjType_SPOOL_TYPE, +} GDIOBJTYPE, *PGDIOBJTYPE; + +#define GDIObjType_MAX_TYPE GDIObjType_SPOOL_TYPE #define GdiWorldSpaceToPageSpace 0x203 @@ -538,9 +575,9 @@ PGD_STRETCHBLTROP StretchBltROP; PFN_DrvPlgBlt PlgBlt; PGD_ALPHABLEND AlphaBlend; -// PFN_DrvSynthesizeFont SynthesizeFont; + PVOID SynthesizeFont; PVOID Unknown5; -// PFN_DrvGetSynthesizedFontFiles GetSynthesizedFontFiles; + PVOID GetSynthesizedFontFiles; PVOID Unknown6; PGD_TRANSPARENTBLT TransparentBlt; PFN_DrvQueryPerBandInfo QueryPerBandInfo;

1 0

[spetreolle] 31526: usetup: translate error codes, fix a typo
by spetreolle＠svn.reactos.org 31 Dec '07

31 Dec '07

Author: spetreolle Date: Mon Dec 31 21:29:49 2007 New Revision: 31526 URL: http://svn.reactos.org/svn/reactos?rev=31526&view=rev Log: usetup: translate error codes, fix a typo Modified: trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/fr-FR.h Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Mon Dec 31 21:29:49 2007 @@ -1308,7 +1308,7 @@ "Setup found that at least one harddisk contains an incompatible\n" "partition table that can not be handled properly!\n" "\n" - "Creating or deleting partitions can destroy the partiton table.\n" + "Creating or deleting partitions can destroy the partition table.\n" "\n" " \x07 Press F3 to quit Setup." " \x07 Press ENTER to continue.", Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Mon Dec 31 21:29:49 2007 @@ -1253,187 +1253,187 @@ { { //ERROR_NOT_INSTALLED - "ReactOS is not completely installed on your\n" - "computer. If you quit Setup now, you will need to\n" - "run Setup again to install ReactOS.\n" + "ReactOS n'est pas completement installe sur votre\n" + "ordinateur. Si vous quittez Setup maintenant, vous devrez\n" + "lancer Setup de nouveau pour installer ReactOS.\n" "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue" + " \x07 Appuyer sur ENTER pour continuer Setup.\n" + " \x07 Appuyer sur F3 pour quitter Setup.", + "F3= Quitter ENTER = Continuer" }, { //ERROR_NO_HDD - "Setup could not find a harddisk.\n", - "ENTER = Reboot computer" + "Setup n'a pu trouver un disque dur.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_NO_SOURCE_DRIVE - "Setup could not find its source drive.\n", - "ENTER = Reboot computer" + "Setup n'a pu trouver son lecteur source.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_LOAD_TXTSETUPSIF - "Setup failed to load the file TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "Setup n'a pas reussi a charger le fichier TXTSETUP.SIF.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_CORRUPT_TXTSETUPSIF - "Setup found a corrupt TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "Setup a trouve un fichier TXTSETUP.SIF corrompu.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_SIGNATURE_TXTSETUPSIF, - "Setup found an invalid signature in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "Setup a trouve une signature invalide dans TXTSETUP.SIF.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_DRIVE_INFORMATION - "Setup could not retrieve system drive information.\n", - "ENTER = Reboot computer" + "Setup n'a pu recuperer les informations du disque système.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_WRITE_BOOT, - "failed to install FAT bootcode on the system partition.", - "ENTER = Reboot computer" + "Echec de l'installation du code de démarrage FAT sur la partition systeme.", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_LOAD_COMPUTER, - "Setup failed to load the computer type list.\n", - "ENTER = Reboot computer" + "Setup n'a pu charger la liste de type d'ordinateurs.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_LOAD_DISPLAY, - "Setup failed to load the display settings list.\n", - "ENTER = Reboot computer" + "Setup n'a pu charger la liste de réglages des écrans.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_LOAD_KEYBOARD, - "Setup failed to load the keyboard type list.\n", - "ENTER = Reboot computer" + "Setup n'a pu charger la liste de types de claviers.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_LOAD_KBLAYOUT, - "Setup failed to load the keyboard layout list.\n", - "ENTER = Reboot computer" + "Setup n'a pu charger la liste de dispositions de claviers.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_WARN_PARTITION, - "Setup found that at least one harddisk contains an incompatible\n" - "partition table that can not be handled properly!\n" + "Setup a detecte qu'au moins un dique dur contient une table\n" + "de partition incompatible qui ne peut etre prise en compte!\n" "\n" - "Creating or deleting partitions can destroy the partiton table.\n" + "Creer ou effacer des partitions peut detruire la table de partition.\n" "\n" - " \x07 Press F3 to quit Setup." - " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + " \x07 Appuyer sur F3 pour quitter Setup." + " \x07 Appuyer sur ENTER pour continuer Setup.", + "F3= Quitter ENTER = Continuer" }, { //ERROR_NEW_PARTITION, - "You can not create a new Partition inside\n" - "of an already existing Partition!\n" + "Vous ne pouvez creer une nouvelle Partition à l'interieur\n" + "d'une Partition deja existante!\n" "\n" - " * Press any key to continue.", + " * Appuyez sur une touche pour continuer.", NULL }, { //ERROR_DELETE_SPACE, - "You can not delete unpartitioned disk space!\n" + "Vous ne pouvez supprimer de l'espace disque non partitionne!\n" "\n" - " * Press any key to continue.", + " * Appuyez sur une touche pour continuer.", NULL }, { //ERROR_INSTALL_BOOTCODE, - "Setup failed to install the FAT bootcode on the system partition.", - "ENTER = Reboot computer" + "Echec de l'installation du code de démarrage FAT sur la partition systeme.", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_NO_FLOPPY, - "No disk in drive A:.", - "ENTER = Continue" + "Pas de disque dans le lecteur A:.", + "ENTER = Continuer" }, { //ERROR_UPDATE_KBSETTINGS, - "Setup failed to update keyboard layout settings.", - "ENTER = Reboot computer" + "Setup n'a pu mettre a jour les reglages de disposition du clavier.", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_UPDATE_DISPLAY_SETTINGS, - "Setup failed to update display registry settings.", - "ENTER = Reboot computer" + "Setup n'a pu mettre a jour les reglages de l'ecran.", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_IMPORT_HIVE, - "Setup failed to import a hive file.", - "ENTER = Reboot computer" + "Setup n'a pu importer un fichier ruche.", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_FIND_REGISTRY - "Setup failed to find the registry data files.", - "ENTER = Reboot computer" + "Setup n'a pu trouver les fichiers de la base de registres.", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_CREATE_HIVE, - "Setup failed to create the registry hives.", - "ENTER = Reboot computer" + "Setup n'a pu creer les ruches de la base de registres.", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_INITIALIZE_REGISTRY, - "Setup failed to set the initialize the registry.", - "ENTER = Reboot computer" + "Setup n'a pu initialiser la base de registres.", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_INVALID_CABINET_INF, - "Cabinet has no valid inf file.\n", - "ENTER = Reboot computer" + "Le Cabinet n'a pas de fichier inf valide.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_CABINET_MISSING, - "Cabinet not found.\n", - "ENTER = Reboot computer" + "Cabinet non trouve.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_CABINET_SCRIPT, - "Cabinet has no setup script.\n", - "ENTER = Reboot computer" + "Cabinet n'a pas de script de setup.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", - "ENTER = Reboot computer" + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_CREATE_DIR, - "Setup could not create install directories.", - "ENTER = Reboot computer" + "Setup n'a pu creer les repertoires d'installation.", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "Setup n'a pu trouver la section 'Directories'\n" + "dans TXTSETUP.SIF.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" - "in the cabinet.\n", - "ENTER = Reboot computer" + "Setup n'a pu trouver la section 'Directories\n" + "dans le cabinet.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_CREATE_INSTALL_DIR - "Setup could not create the install directory.", - "ENTER = Reboot computer" + "Setup n'a pu creer le repertoire d'installation.", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_FIND_SETUPDATA, - "Setup failed to find the 'SetupData' section\n" + "Setup n'a pu trouver la section 'SetupData'\n" "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_WRITE_PTABLE, - "Setup failed to write partition tables.\n" - "ENTER = Reboot computer" + "Setup n'a pu ecrire les tables de partition.\n" + "ENTER = Redemarrer l'ordinateur" }, { NULL,

1 0

[mpiulachs] 31525: Add missing error entries for Russian and Swedish
by mpiulachs＠svn.reactos.org 31 Dec '07

31 Dec '07

Author: mpiulachs Date: Mon Dec 31 21:22:25 2007 New Revision: 31525 URL: http://svn.reactos.org/svn/reactos?rev=31525&view=rev Log: Add missing error entries for Russian and Swedish Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sv-SE.h Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Mon Dec 31 21:22:25 2007 @@ -1236,6 +1236,197 @@ } }; +MUI_ERROR ruRUErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "ReactOS is not completely installed on your\n" + "computer. If you quit Setup now, you will need to\n" + "run Setup again to install ReactOS.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + "F3= Quit ENTER = Continue" + }, + { + //ERROR_NO_HDD + "Setup could not find a harddisk.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Setup could not find its source drive.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Setup failed to load the file TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Setup found a corrupt TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Setup found an invalid signature in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_DRIVE_INFORMATION + "Setup could not retrieve system drive information.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_BOOT, + "failed to install FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_COMPUTER, + "Setup failed to load the computer type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_DISPLAY, + "Setup failed to load the display settings list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KEYBOARD, + "Setup failed to load the keyboard type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Setup failed to load the keyboard layout list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WARN_PARTITION, + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partiton table.\n" + "\n" + " \x07 Press F3 to quit Setup." + " \x07 Press ENTER to continue.", + "F3= Quit ENTER = Continue" + }, + { + //ERROR_NEW_PARTITION, + "You can not create a new Partition inside\n" + "of an already existing Partition!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "You can not delete unpartitioned disk space!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Setup failed to install the FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_FLOPPY, + "No disk in drive A:.", + "ENTER = Continue" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Setup failed to update keyboard layout settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Setup failed to update display registry settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_IMPORT_HIVE, + "Setup failed to import a hive file.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_REGISTRY + "Setup failed to find the registry data files.", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_HIVE, + "Setup failed to create the registry hives.", + "ENTER = Reboot computer" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Setup failed to set the initialize the registry.", + "ENTER = Reboot computer" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet has no valid inf file.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet not found.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet has no setup script.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_COPY_QUEUE, + "Setup failed to open the copy file queue.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_DIR, + "Setup could not create install directories.", + "ENTER = Reboot computer" + }, + { + //ERROR_TXTSETUP_SECTION, + "Setup failed to find the 'Directories' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SECTION, + "Setup failed to find the 'Directories' section\n" + "in the cabinet.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Setup could not create the install directory.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_SETUPDATA, + "Setup failed to find the 'SetupData' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_PTABLE, + "Setup failed to write partition tables.\n" + "ENTER = Reboot computer" + }, + { + NULL, + NULL + } +}; MUI_PAGE ruRUPages[] = { Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Mon Dec 31 21:22:25 2007 @@ -1236,6 +1236,197 @@ } }; +MUI_ERROR svSEErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "ReactOS is not completely installed on your\n" + "computer. If you quit Setup now, you will need to\n" + "run Setup again to install ReactOS.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + "F3= Quit ENTER = Continue" + }, + { + //ERROR_NO_HDD + "Setup could not find a harddisk.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Setup could not find its source drive.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Setup failed to load the file TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Setup found a corrupt TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Setup found an invalid signature in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_DRIVE_INFORMATION + "Setup could not retrieve system drive information.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_BOOT, + "failed to install FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_COMPUTER, + "Setup failed to load the computer type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_DISPLAY, + "Setup failed to load the display settings list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KEYBOARD, + "Setup failed to load the keyboard type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Setup failed to load the keyboard layout list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WARN_PARTITION, + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partiton table.\n" + "\n" + " \x07 Press F3 to quit Setup." + " \x07 Press ENTER to continue.", + "F3= Quit ENTER = Continue" + }, + { + //ERROR_NEW_PARTITION, + "You can not create a new Partition inside\n" + "of an already existing Partition!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "You can not delete unpartitioned disk space!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Setup failed to install the FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_FLOPPY, + "No disk in drive A:.", + "ENTER = Continue" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Setup failed to update keyboard layout settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Setup failed to update display registry settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_IMPORT_HIVE, + "Setup failed to import a hive file.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_REGISTRY + "Setup failed to find the registry data files.", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_HIVE, + "Setup failed to create the registry hives.", + "ENTER = Reboot computer" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Setup failed to set the initialize the registry.", + "ENTER = Reboot computer" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet has no valid inf file.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet not found.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet has no setup script.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_COPY_QUEUE, + "Setup failed to open the copy file queue.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_DIR, + "Setup could not create install directories.", + "ENTER = Reboot computer" + }, + { + //ERROR_TXTSETUP_SECTION, + "Setup failed to find the 'Directories' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SECTION, + "Setup failed to find the 'Directories' section\n" + "in the cabinet.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Setup could not create the install directory.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_SETUPDATA, + "Setup failed to find the 'SetupData' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_PTABLE, + "Setup failed to write partition tables.\n" + "ENTER = Reboot computer" + }, + { + NULL, + NULL + } +}; MUI_PAGE svSEPages[] = {

1 0

[mpiulachs] 31524: Allow usetup page title localization
by mpiulachs＠svn.reactos.org 31 Dec '07

31 Dec '07

Author: mpiulachs Date: Mon Dec 31 20:56:13 2007 New Revision: 31524 URL: http://svn.reactos.org/svn/reactos?rev=31524&view=rev Log: Allow usetup page title localization Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Mon Dec 31 20:56:13 2007 @@ -3428,8 +3428,10 @@ while (Page != REBOOT_PAGE) { CONSOLE_ClearScreen(); - CONSOLE_SetUnderlinedTextXY(4, 3, " ReactOS " KERNEL_VERSION_STR " Setup "); CONSOLE_Flush(); + + //CONSOLE_SetUnderlinedTextXY(4, 3, " ReactOS " KERNEL_VERSION_STR " Setup "); + //CONSOLE_Flush(); switch (Page) { @@ -3540,7 +3542,6 @@ Page = BootLoaderHarddiskPage(&Ir); break; - /* Repair pages */ case REPAIR_INTRO_PAGE: Page = RepairIntroPage(&Ir); Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Mon Dec 31 20:56:13 2007 @@ -4,6 +4,12 @@ static MUI_ENTRY deDELanguagePageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Language Selection.", @@ -43,6 +49,12 @@ static MUI_ENTRY deDEWelcomePageEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, @@ -120,6 +132,12 @@ TEXT_UNDERLINE }, { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Das ReactOS Setup ist noch in einer fruehen Entwicklungsphase. Es unter-", @@ -207,6 +225,12 @@ static MUI_ENTRY deDELicensePageEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 6, @@ -326,6 +350,12 @@ static MUI_ENTRY deDEDevicePageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Die untere Liste zeigt die derzeitigen Geraeteeinstellungen.", @@ -413,6 +443,12 @@ static MUI_ENTRY deDERepairPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Das ReactOS Setup ist noch in einer fruehen Entwicklungsphase. Es unter-", @@ -470,6 +506,12 @@ static MUI_ENTRY deDEComputerPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Sie wollen den Computertyp aendern, der installiert wird.", @@ -516,6 +558,12 @@ static MUI_ENTRY deDEFlushPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 10, 6, "Das System vergewissert sich, dass alle Daten gespeichert sind.", @@ -550,6 +598,12 @@ static MUI_ENTRY deDEQuitPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 10, 6, "ReactOS wurde nicht vollstaendig installiert", @@ -590,6 +644,12 @@ static MUI_ENTRY deDEDisplayPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Sie wollen den Bildschirmtyp aendern, der installiert wird.", @@ -635,6 +695,12 @@ static MUI_ENTRY deDESuccessPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 10, 6, "Die Standardkomponenten von ReactOS wurden erfolgreich installiert.", @@ -674,6 +740,12 @@ static MUI_ENTRY deDEBootPageEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, @@ -716,6 +788,12 @@ static MUI_ENTRY deDESelectPartitionEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Diese Liste zeigt existierende Partitionen an und den freien", @@ -768,6 +846,12 @@ static MUI_ENTRY deDEFormatPartitionEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Formatiere Partition", @@ -802,6 +886,12 @@ static MUI_ENTRY deDEInstallDirectoryEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup installiert die ReactOS Installationsdateien in die ausgewaehlte", @@ -841,6 +931,12 @@ static MUI_ENTRY deDEFileCopyEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 11, 12, @@ -876,6 +972,12 @@ static MUI_ENTRY deDEBootLoaderEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup installiert nun den Boot-Sektor.", @@ -916,6 +1018,12 @@ static MUI_ENTRY deDEKeyboardSettingsEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Sie wollen den Tastaturtyp aendern, der installiert wird.", @@ -962,6 +1070,12 @@ static MUI_ENTRY deDELayoutSettingsEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Sie wollen das Tastaturlayout aendern, der installiert wird.", @@ -1009,6 +1123,12 @@ static MUI_ENTRY deDEPrepareCopyEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup bereitet ihren Computer fuer die Installation vor.", @@ -1031,6 +1151,12 @@ static MUI_ENTRY deDESelectFSEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 17, @@ -1072,6 +1198,12 @@ static MUI_ENTRY deDEDeletePartitionEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Mon Dec 31 20:56:13 2007 @@ -4,6 +4,12 @@ static MUI_ENTRY elGRLanguagePageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Language Selection.", @@ -43,6 +49,12 @@ static MUI_ENTRY elGRWelcomePageEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, @@ -208,6 +220,12 @@ static MUI_ENTRY elGRLicensePageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 6, "Licensing:", @@ -326,6 +344,12 @@ static MUI_ENTRY elGRDevicePageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Ç ðáñáêÜôù ëßóôá äåß÷íåé ôéò ñõèìßóåéò óõóêåõþí.", @@ -413,6 +437,12 @@ static MUI_ENTRY elGRRepairPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Ç åãêáôÜóôáóç ôïõ ReactOS âñßóêåôáé óå ðñþéìï óôÜäéï áíÜðôõîçò. Äåí õðïóôçñßæåé áêüìá", @@ -470,6 +500,12 @@ static MUI_ENTRY elGRComputerPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "ÈÝëåôå íá áëëÜîåôå ôïí ôýðï ôïõ õðïëïãéóôÞ ðïõ èá åãêáôáóôáèåß.", @@ -516,6 +552,12 @@ static MUI_ENTRY elGRFlushPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 10, 6, "Ôï óýóôçìá åðéâåâáéþíåé ôþñá üôé üëá ôá äåäïìÝíá áðïèçêåýôçêáí óôï äßóêï", @@ -550,6 +592,12 @@ static MUI_ENTRY elGRQuitPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 10, 6, "Ôï ReactOS äåí åãêáôáóôÜèçêå ðëÞñùò", @@ -590,6 +638,12 @@ static MUI_ENTRY elGRDisplayPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "ÈÝëåôå íá áëëÜîåôå ôïí ôýðï ôçò åìöÜíéóçò ðïõ èá åãêáôáóôáèåß.", @@ -635,6 +689,12 @@ static MUI_ENTRY elGRSuccessPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 10, 6, "Ôá âáóéêÜ óôïé÷åßá ôïõ ReactOS åãêáôáóôÜèçêáí åðéôõ÷þò.", @@ -674,6 +734,12 @@ static MUI_ENTRY elGRBootPageEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, @@ -716,6 +782,12 @@ static MUI_ENTRY elGRSelectPartitionEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "The list below shows existing partitions and unused disk", @@ -768,6 +840,12 @@ static MUI_ENTRY elGRFormatPartitionEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Format partition", @@ -795,6 +873,12 @@ static MUI_ENTRY elGRInstallDirectoryEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, @@ -841,6 +925,12 @@ static MUI_ENTRY elGRFileCopyEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 11, 12, @@ -876,6 +966,12 @@ static MUI_ENTRY elGRBootLoaderEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup is installing the boot loader", @@ -916,6 +1012,12 @@ static MUI_ENTRY elGRKeyboardSettingsEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the type of keyboard to be installed.", @@ -962,6 +1064,12 @@ static MUI_ENTRY elGRLayoutSettingsEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the keyboard layout to be installed.", @@ -1009,6 +1117,12 @@ static MUI_ENTRY elGRPrepareCopyEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup prepares your computer for copying the ReactOS files. ", @@ -1031,6 +1145,12 @@ static MUI_ENTRY elGRSelectFSEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 17, @@ -1072,6 +1192,12 @@ static MUI_ENTRY elGRDeletePartitionEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Mon Dec 31 20:56:13 2007 @@ -4,6 +4,12 @@ static MUI_ENTRY enUSLanguagePageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Language Selection", @@ -43,6 +49,12 @@ static MUI_ENTRY enUSWelcomePageEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, @@ -208,6 +220,12 @@ static MUI_ENTRY enUSLicensePageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 6, "Licensing:", @@ -326,6 +344,12 @@ static MUI_ENTRY enUSDevicePageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "The list below shows the current device settings.", @@ -413,6 +437,12 @@ static MUI_ENTRY enUSRepairPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "ReactOS Setup is in an early development phase. It does not yet", @@ -470,6 +500,12 @@ static MUI_ENTRY enUSComputerPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the type of computer to be installed.", @@ -516,6 +552,12 @@ static MUI_ENTRY enUSFlushPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 10, 6, "The system is now making sure all data is stored on your disk", @@ -550,6 +592,12 @@ static MUI_ENTRY enUSQuitPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 10, 6, "ReactOS is not completely installed", @@ -590,6 +638,12 @@ static MUI_ENTRY enUSDisplayPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the type of display to be installed.", @@ -635,6 +689,12 @@ static MUI_ENTRY enUSSuccessPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 10, 6, "The basic components of ReactOS have been installed successfully.", @@ -674,6 +734,12 @@ static MUI_ENTRY enUSBootPageEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, @@ -716,6 +782,12 @@ static MUI_ENTRY enUSSelectPartitionEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "The list below shows existing partitions and unused disk", @@ -768,6 +840,12 @@ static MUI_ENTRY enUSFormatPartitionEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Format partition", @@ -795,6 +873,12 @@ static MUI_ENTRY enUSInstallDirectoryEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, @@ -841,6 +925,12 @@ static MUI_ENTRY enUSFileCopyEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 11, 12, @@ -876,6 +966,12 @@ static MUI_ENTRY enUSBootLoaderEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup is installing the boot loader", @@ -916,6 +1012,12 @@ static MUI_ENTRY enUSKeyboardSettingsEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the type of keyboard to be installed.", @@ -962,6 +1064,12 @@ static MUI_ENTRY enUSLayoutSettingsEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the keyboard layout to be installed.", @@ -1009,6 +1117,12 @@ static MUI_ENTRY enUSPrepareCopyEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup prepares your computer for copying the ReactOS files. ", @@ -1031,6 +1145,12 @@ static MUI_ENTRY enUSSelectFSEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 17, @@ -1072,6 +1192,12 @@ static MUI_ENTRY enUSDeletePartitionEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Mon Dec 31 20:56:13 2007 @@ -4,6 +4,12 @@ static MUI_ENTRY esESLanguagePageEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Selección de idioma", @@ -43,6 +49,12 @@ static MUI_ENTRY esESWelcomePageEntries[] = { + { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -116,7 +128,7 @@ { 4, 3, - " Instalación de ReactOS " KERNEL_VERSION_STR, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -207,6 +219,12 @@ static MUI_ENTRY esESLicensePageEntries[] = { + { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 6, @@ -326,6 +344,12 @@ static MUI_ENTRY esESDevicePageEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "La lista inferior muestra la configuración del dispositivo actual.", @@ -413,6 +437,12 @@ static MUI_ENTRY esESRepairPageEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "El instalador de ReactOS se encuentra en una etapa preliminar.", @@ -470,6 +500,12 @@ static MUI_ENTRY esESComputerPageEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Desea modificar el tipo de equipo a instalar.", @@ -516,6 +552,12 @@ static MUI_ENTRY esESFlushPageEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "El sistema se está asegurando que todos los datos sean salvados", @@ -550,6 +592,12 @@ static MUI_ENTRY esESQuitPageEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "ReactOS no ha sido instalado completamente", @@ -590,6 +638,12 @@ static MUI_ENTRY esESDisplayPageEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Desea modificar el tipo de pantalla a instalar.", @@ -635,6 +689,12 @@ static MUI_ENTRY esESSuccessPageEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "Los componentes básicos de ReactOS han sido instalados correctamente.", @@ -674,6 +734,12 @@ static MUI_ENTRY esESBootPageEntries[] = { + { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -716,6 +782,12 @@ static MUI_ENTRY esESSelectPartitionEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "La lista inferior muestra las particiones existentes y el espacio libre", @@ -768,6 +840,12 @@ static MUI_ENTRY esESFormatPartitionEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Formato de la partición", @@ -795,6 +873,12 @@ static MUI_ENTRY esESInstallDirectoryEntries[] = { + { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -841,6 +925,12 @@ static MUI_ENTRY esESFileCopyEntries[] = { + { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 11, 12, @@ -876,6 +966,12 @@ static MUI_ENTRY esESBootLoaderEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "El programam está instalando el cargador de arranque", @@ -916,6 +1012,12 @@ static MUI_ENTRY esESKeyboardSettingsEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Desea cambiar el tipo de teclado instalado.", @@ -962,6 +1064,12 @@ static MUI_ENTRY esESLayoutSettingsEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Desea cambiar la disposición del teclado a instalar.", @@ -1009,6 +1117,12 @@ static MUI_ENTRY esESPrepareCopyEntries[] = { { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "El programa prepara su computadora para copiar los archivos de ReactOS. ", @@ -1031,6 +1145,12 @@ static MUI_ENTRY esESSelectFSEntries[] = { + { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 17, @@ -1072,6 +1192,12 @@ static MUI_ENTRY esESDeletePartitionEntries[] = { + { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -1110,6 +1236,198 @@ } }; +MUI_ERROR esESErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "ReactOS is not completely installed on your\n" + "computer. If you quit Setup now, you will need to\n" + "run Setup again to install ReactOS.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + "F3= Quit ENTER = Continue" + }, + { + //ERROR_NO_HDD + "Setup could not find a harddisk.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Setup could not find its source drive.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Setup failed to load the file TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Setup found a corrupt TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Setup found an invalid signature in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_DRIVE_INFORMATION + "Setup could not retrieve system drive information.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_BOOT, + "failed to install FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_COMPUTER, + "Setup failed to load the computer type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_DISPLAY, + "Setup failed to load the display settings list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KEYBOARD, + "Setup failed to load the keyboard type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Setup failed to load the keyboard layout list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WARN_PARTITION, + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partiton table.\n" + "\n" + " \x07 Press F3 to quit Setup." + " \x07 Press ENTER to continue.", + "F3= Quit ENTER = Continue" + }, + { + //ERROR_NEW_PARTITION, + "You can not create a new Partition inside\n" + "of an already existing Partition!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "You can not delete unpartitioned disk space!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Setup failed to install the FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_FLOPPY, + "No disk in drive A:.", + "ENTER = Continue" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Setup failed to update keyboard layout settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Setup failed to update display registry settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_IMPORT_HIVE, + "Setup failed to import a hive file.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_REGISTRY + "Setup failed to find the registry data files.", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_HIVE, + "Setup failed to create the registry hives.", + "ENTER = Reboot computer" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Setup failed to set the initialize the registry.", + "ENTER = Reboot computer" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet has no valid inf file.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet not found.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet has no setup script.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_COPY_QUEUE, + "Setup failed to open the copy file queue.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_DIR, + "Setup could not create install directories.", + "ENTER = Reboot computer" + }, + { + //ERROR_TXTSETUP_SECTION, + "Setup failed to find the 'Directories' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SECTION, + "Setup failed to find the 'Directories' section\n" + "in the cabinet.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Setup could not create the install directory.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_SETUPDATA, + "Setup failed to find the 'SetupData' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_PTABLE, + "Setup failed to write partition tables.\n" + "ENTER = Reboot computer" + }, + { + NULL, + NULL + } +}; + MUI_PAGE esESPages[] = { { Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Mon Dec 31 20:56:13 2007 @@ -4,6 +4,12 @@ static MUI_ENTRY frFRLanguagePageEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Selection de la langue.", @@ -43,6 +49,12 @@ static MUI_ENTRY frFRWelcomePageEntries[] = { + { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -116,7 +128,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR, + "Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -213,6 +225,12 @@ static MUI_ENTRY frFRLicensePageEntries[] = { + { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 6, @@ -332,6 +350,12 @@ static MUI_ENTRY frFRDevicePageEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "La liste ci-dessous montre les reglages materiels actuels.", @@ -419,6 +443,12 @@ static MUI_ENTRY frFRRepairPageEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "L'Installation de ReactOS est en phase de developpement.", @@ -482,6 +512,12 @@ static MUI_ENTRY frFRComputerPageEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Vous voulez changer le type d'ordinateur installe.", @@ -528,6 +564,12 @@ static MUI_ENTRY frFRFlushPageEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "Le systeme s'assure que toutes les donnees sont ecrites sur le disque", @@ -562,6 +604,12 @@ static MUI_ENTRY frFRQuitPageEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "ReactOS n'est pas completement installe", @@ -602,6 +650,12 @@ static MUI_ENTRY frFRDisplayPageEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Vous voulez changer le type d'ecran a installer.", @@ -647,6 +701,12 @@ static MUI_ENTRY frFRSuccessPageEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "Les composants standards de ReactOS ont ete installes avec succes.", @@ -686,6 +746,12 @@ static MUI_ENTRY frFRBootPageEntries[] = { + { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -728,6 +794,12 @@ static MUI_ENTRY frFRSelectPartitionEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "La liste suivante montre les partitions existantes et", @@ -780,6 +852,12 @@ static MUI_ENTRY frFRFormatPartitionEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Formater la partition", @@ -807,6 +885,12 @@ static MUI_ENTRY frFRInstallDirectoryEntries[] = { + { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -853,6 +937,12 @@ static MUI_ENTRY frFRFileCopyEntries[] = { + { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 11, 12, @@ -888,6 +978,12 @@ static MUI_ENTRY frFRBootLoaderEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup installe le chargeur de demarrage", @@ -928,6 +1024,12 @@ static MUI_ENTRY frFRKeyboardSettingsEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Vous voulez changer le type de clavier a installer.", @@ -974,6 +1076,12 @@ static MUI_ENTRY frFRLayoutSettingsEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Vous voulez changer la disposition du clavier.", @@ -1021,6 +1129,12 @@ static MUI_ENTRY frFRPrepareCopyEntries[] = { { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup prepare votre ordinateur pour copier les fichiers de ReactOS. ", @@ -1043,6 +1157,12 @@ static MUI_ENTRY frFRSelectFSEntries[] = { + { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 17, @@ -1084,6 +1204,12 @@ static MUI_ENTRY frFRDeletePartitionEntries[] = { + { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Mon Dec 31 20:56:13 2007 @@ -4,6 +4,12 @@ static MUI_ENTRY itITLanguagePageEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Language Selection.", @@ -43,6 +49,12 @@ static MUI_ENTRY itITWelcomePageEntries[] = { + { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -116,7 +128,13 @@ { 4, 3, - " Installazione di ReactOS " KERNEL_VERSION_STR, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -208,6 +226,12 @@ static MUI_ENTRY itITLicensePageEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 6, "Licenza:", @@ -326,6 +350,12 @@ static MUI_ENTRY itITDevicePageEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "La lista inferiore mostra la configurazione della periferica corrente.", @@ -413,6 +443,12 @@ static MUI_ENTRY itITRepairPageEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Il setup di ReactOS è ancora in una fase preliminare.", @@ -470,6 +506,12 @@ static MUI_ENTRY itITComputerPageEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Desidera modificare il computer da installare.", @@ -516,6 +558,12 @@ static MUI_ENTRY itITFlushPageEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "Il sistema si sta accertando che tutti i dati vengano salvati", @@ -550,6 +598,12 @@ static MUI_ENTRY itITQuitPageEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "ReactOS non è stato installato completamente", @@ -590,6 +644,12 @@ static MUI_ENTRY itITDisplayPageEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Desidera modificare il tipo di schermo.", @@ -635,6 +695,12 @@ static MUI_ENTRY itITSuccessPageEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "I componenti base di ReactOS sono stati installati correttamente.", @@ -674,6 +740,12 @@ static MUI_ENTRY itITBootPageEntries[] = { + { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -716,6 +788,12 @@ static MUI_ENTRY itITSelectPartitionEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "La lista seguente mostra le partizioni esistenti e lo spazio", @@ -768,6 +846,12 @@ static MUI_ENTRY itITFormatPartitionEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Formattazione della partizione", @@ -795,6 +879,12 @@ static MUI_ENTRY itITInstallDirectoryEntries[] = { + { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -841,6 +931,12 @@ static MUI_ENTRY itITFileCopyEntries[] = { + { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 11, 12, @@ -876,6 +972,12 @@ static MUI_ENTRY itITBootLoaderEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup sta installando il bootloader", @@ -916,6 +1018,12 @@ static MUI_ENTRY itITKeyboardSettingsEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Volete cambiare il tipo di tastiere da installare.", @@ -962,6 +1070,12 @@ static MUI_ENTRY itITLayoutSettingsEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Volete cambiare il tipo di layout di tastiera da installare.", @@ -1009,6 +1123,12 @@ static MUI_ENTRY itITPrepareCopyEntries[] = { { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup prepara il computer per la copia dei file di ReactOS. ", @@ -1031,6 +1151,12 @@ static MUI_ENTRY itITSelectFSEntries[] = { + { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 17, @@ -1072,6 +1198,12 @@ static MUI_ENTRY itITDeletePartitionEntries[] = { + { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Mon Dec 31 20:56:13 2007 @@ -4,6 +4,12 @@ static MUI_ENTRY ruRULanguagePageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Language Selection.", @@ -43,6 +49,12 @@ static MUI_ENTRY ruRUWelcomePageEntries[] = { + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -208,6 +220,12 @@ static MUI_ENTRY ruRULicensePageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 6, "¨æ¥§¨ï:", @@ -326,6 +344,12 @@ static MUI_ENTRY ruRUDevicePageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, " á¯¨áª¥ ¨¦¥ ¯à¨¢¥¤¥ë ãáâà®©áâ¢ ¨ ¨å ¯ à ¬¥âàë.", @@ -413,6 +437,12 @@ static MUI_ENTRY ruRURepairPageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "ReactOS å®¤¨âáï ¢ à ¥© áâ ¤¨¨ à §à ¡®âª¨ ¨ ¥ ¯®¤¤¥à¦¨¢ ¥â ¢á¥", @@ -470,6 +500,12 @@ static MUI_ENTRY ruRUComputerPageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "ë å®â¨â¥ ¨§¬¥¨âì ãáâ ¢«¨¢ ¥¬ë© â¨¯ ª®¬¯ìîâ¥à .", @@ -516,6 +552,12 @@ static MUI_ENTRY ruRUFlushPageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "¨áâ¥¬ ¯à®¢¥àï¥â ¢á¥ «¨ ¤ ë¥ § ¯¨á ë ¤¨áª", @@ -550,6 +592,12 @@ static MUI_ENTRY ruRUQuitPageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "ReactOS ãáâ ®¢«¥ ¥ ¯®«®áâìî", @@ -590,6 +638,12 @@ static MUI_ENTRY ruRUDisplayPageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "ë å®â¨â¥ ¨§¬¥¨âì ãáâ ¢«¨¢ ¥¬ë© â¨¯ íªà .", @@ -635,6 +689,12 @@ static MUI_ENTRY ruRUSuccessPageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "á®¢ë¥ ª®¬¯®¥âë ReactOS ¡ë«¨ ãá¯¥è® ãáâ ®¢«¥ë.", @@ -674,6 +734,12 @@ static MUI_ENTRY ruRUBootPageEntries[] = { + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -716,6 +782,12 @@ static MUI_ENTRY ruRUSelectPartitionEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "The list below shows existing partitions and unused disk", @@ -768,6 +840,12 @@ static MUI_ENTRY ruRUFormatPartitionEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Format partition", @@ -795,6 +873,12 @@ static MUI_ENTRY ruRUInstallDirectoryEntries[] = { + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -841,6 +925,12 @@ static MUI_ENTRY ruRUFileCopyEntries[] = { + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 11, 12, @@ -876,6 +966,12 @@ static MUI_ENTRY ruRUBootLoaderEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup is installing the boot loader", @@ -916,6 +1012,12 @@ static MUI_ENTRY ruRUKeyboardSettingsEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the type of keyboard to be installed.", @@ -962,6 +1064,12 @@ static MUI_ENTRY ruRULayoutSettingsEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the keyboard layout to be installed.", @@ -1009,6 +1117,12 @@ static MUI_ENTRY ruRUPrepareCopyEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup prepares your computer for copying the ReactOS files. ", @@ -1031,6 +1145,12 @@ static MUI_ENTRY ruRUSelectFSEntries[] = { + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 17, @@ -1072,6 +1192,12 @@ static MUI_ENTRY ruRUDeletePartitionEntries[] = { + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Mon Dec 31 20:56:13 2007 @@ -4,6 +4,12 @@ static MUI_ENTRY svSELanguagePageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Language Selection.", @@ -43,6 +49,12 @@ static MUI_ENTRY svSEWelcomePageEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, @@ -208,6 +220,12 @@ static MUI_ENTRY svSELicensePageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 6, "Licensering:", @@ -326,6 +344,12 @@ static MUI_ENTRY svSEDevicePageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Listan nedanför visar inställningarna för maskinvaran.", @@ -413,6 +437,12 @@ static MUI_ENTRY svSERepairPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "ReactOS Setup är i en tidig utvecklingsfas och saknar därför ett antal", @@ -470,6 +500,12 @@ static MUI_ENTRY svSEComputerPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Ändra vilken typ av dator som ska installeras.", @@ -516,6 +552,12 @@ static MUI_ENTRY svSEFlushPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 10, 6, "Datorn försäkrar sig om att all data är lagrad på hårdisken.", @@ -550,6 +592,12 @@ static MUI_ENTRY svSEQuitPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 10, 6, "Installationen av ReactOS har inte slutförts.", @@ -590,6 +638,12 @@ static MUI_ENTRY svSEDisplayPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Ändra vilken typ av bildskärmsinställning som ska installeras.", @@ -635,6 +689,12 @@ static MUI_ENTRY svSESuccessPageEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 10, 6, "ReactOS har nu installerats på datorn.", @@ -674,6 +734,12 @@ static MUI_ENTRY svSEBootPageEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, @@ -716,6 +782,12 @@ static MUI_ENTRY svSESelectPartitionEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "The list below shows existing partitions and unused disk", @@ -768,6 +840,12 @@ static MUI_ENTRY svSEFormatPartitionEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Format partition", @@ -795,6 +873,12 @@ static MUI_ENTRY svSEInstallDirectoryEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, @@ -841,6 +925,12 @@ static MUI_ENTRY svSEFileCopyEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 11, 12, @@ -876,6 +966,12 @@ static MUI_ENTRY svSEBootLoaderEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup is installing the boot loader", @@ -916,6 +1012,12 @@ static MUI_ENTRY svSEKeyboardSettingsEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the type of keyboard to be installed.", @@ -962,6 +1064,12 @@ static MUI_ENTRY svSELayoutSettingsEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the keyboard layout to be installed.", @@ -1009,6 +1117,12 @@ static MUI_ENTRY svSEPrepareCopyEntries[] = { { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup prepares your computer for copying the ReactOS files. ", @@ -1031,6 +1145,12 @@ static MUI_ENTRY svSESelectFSEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 17, @@ -1072,6 +1192,12 @@ static MUI_ENTRY svSEDeletePartitionEntries[] = { + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, { 6, 8, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Mon Dec 31 20:56:13 2007 @@ -4,6 +4,12 @@ static MUI_ENTRY ukUALanguagePageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "¨¡ià ¬®¢¨", @@ -43,6 +49,12 @@ static MUI_ENTRY ukUAWelcomePageEntries[] = { + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -208,6 +220,12 @@ static MUI_ENTRY ukUALicensePageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 6, "iæ¥§iï:", @@ -326,6 +344,12 @@ static MUI_ENTRY ukUADevicePageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, " á¯¨áªã ¨¦ç¥ ¯à¨¢¥¤¥i ¯à¨áâà®õ i õå ¯ à ¬¥âà¨.", @@ -413,6 +437,12 @@ static MUI_ENTRY ukUARepairPageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "ReactOS Setup is in an early development phase. It does not yet", @@ -470,6 +500,12 @@ static MUI_ENTRY ukUAComputerPageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the type of computer to be installed.", @@ -516,6 +552,12 @@ static MUI_ENTRY ukUAFlushPageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "The system is now making sure all data is stored on your disk", @@ -550,6 +592,12 @@ static MUI_ENTRY ukUAQuitPageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "ReactOS is not completely installed", @@ -590,6 +638,12 @@ static MUI_ENTRY ukUADisplayPageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the type of display to be installed.", @@ -635,6 +689,12 @@ static MUI_ENTRY ukUASuccessPageEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 10, 6, "The basic components of ReactOS have been installed successfully.", @@ -674,6 +734,12 @@ static MUI_ENTRY ukUABootPageEntries[] = { + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -716,6 +782,12 @@ static MUI_ENTRY ukUASelectPartitionEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "The list below shows existing partitions and unused disk", @@ -768,6 +840,12 @@ static MUI_ENTRY ukUAFormatPartitionEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Format partition", @@ -795,6 +873,12 @@ static MUI_ENTRY ukUAInstallDirectoryEntries[] = { + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8, @@ -841,6 +925,12 @@ static MUI_ENTRY ukUAFileCopyEntries[] = { + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 11, 12, @@ -876,6 +966,12 @@ static MUI_ENTRY ukUABootLoaderEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup is installing the boot loader", @@ -916,6 +1012,12 @@ static MUI_ENTRY ukUAKeyboardSettingsEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the type of keyboard to be installed.", @@ -962,6 +1064,12 @@ static MUI_ENTRY ukUALayoutSettingsEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "You want to change the keyboard layout to be installed.", @@ -1009,6 +1117,12 @@ static MUI_ENTRY ukUAPrepareCopyEntries[] = { { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { 6, 8, "Setup prepares your computer for copying the ReactOS files. ", @@ -1031,6 +1145,12 @@ static MUI_ENTRY ukUASelectFSEntries[] = { + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 17, @@ -1072,6 +1192,12 @@ static MUI_ENTRY ukUADeletePartitionEntries[] = { + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, { 6, 8,

1 0

[jimtabor] 31523: Implement gdi ScaleViewport/WindowExtEx and mirror region support. Mirroring is not finished and is unplugged.
by jimtabor＠svn.reactos.org 31 Dec '07

31 Dec '07

Author: jimtabor Date: Mon Dec 31 20:26:57 2007 New Revision: 31523 URL: http://svn.reactos.org/svn/reactos?rev=31523&view=rev Log: Implement gdi ScaleViewport/WindowExtEx and mirror region support. Mirroring is not finished and is unplugged. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/coord.c trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Mon Dec 31 20:26:57 2007 @@ -674,47 +674,6 @@ return 0; } - -/* - * @unimplemented - */ -BOOL -STDCALL -ScaleViewportExtEx( - HDC a0, - int a1, - int a2, - int a3, - int a4, - LPSIZE a5 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -STDCALL -ScaleWindowExtEx( - HDC a0, - int a1, - int a2, - int a3, - int a4, - LPSIZE a5 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - /* * @implemented */ @@ -1463,22 +1422,6 @@ } return retValue; } - - - -/* - * @unimplemented - */ -BOOL -STDCALL -MirrorRgn(HWND hwnd,HRGN hrgn) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - /* * @unimplemented 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 (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c Mon Dec 31 20:26:57 2007 @@ -565,6 +565,86 @@ /* * @implemented */ +BOOL +STDCALL +ScaleViewportExtEx( + HDC a0, + int a1, + int a2, + int a3, + int a4, + LPSIZE a5 + ) +{ +#if 0 + if (GDI_HANDLE_GET_TYPE(a0) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(a0) == GDI_OBJECT_TYPE_METADC) + return MFDRV_; + else + { + PLDC pLDC = GdiGetLDC(a0); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_; + } + } + } +#endif + if (!GdiIsHandleValid((HGDIOBJ) a0) || + (GDI_HANDLE_GET_TYPE(a0) != GDI_OBJECT_TYPE_DC)) return FALSE; + + return NtGdiScaleViewportExtEx(a0, a1, a2, a3, a4, a5); +} + +/* + * @implemented + */ +BOOL +STDCALL +ScaleWindowExtEx( + HDC a0, + int a1, + int a2, + int a3, + int a4, + LPSIZE a5 + ) +{ +#if 0 + if (GDI_HANDLE_GET_TYPE(a0) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(a0) == GDI_OBJECT_TYPE_METADC) + return MFDRV_; + else + { + PLDC pLDC = GdiGetLDC(a0); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_; + } + } + } +#endif + if (!GdiIsHandleValid((HGDIOBJ) a0) || + (GDI_HANDLE_GET_TYPE(a0) != GDI_OBJECT_TYPE_DC)) return FALSE; + + return NtGdiScaleWindowExtEx(a0, a1, a2, a3, a4, a5); +} + +/* + * @implemented + */ DWORD STDCALL GetLayout(HDC hdc Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Mon Dec 31 20:26:57 2007 @@ -1,80 +1,30 @@ #include "precomp.h" -/* - * @implemented - */ -int STDCALL -SelectClipRgn( - HDC hdc, - HRGN hrgn -) -{ - return ExtSelectClipRgn(hdc, hrgn, RGN_COPY); -} - - -/* - * @implemented - */ -int -STDCALL -GetClipRgn( - HDC hdc, - HRGN hrgn - ) -{ - return NtGdiGetRandomRgn(hdc, hrgn, 1); -} - - -HRGN -WINAPI -CreatePolygonRgn( const POINT * lppt, int cPoints, int fnPolyFillMode) -{ - return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, (PPOINT) lppt, (PULONG) &cPoints, 1, GdiPolyPolyRgn); -} - - -HRGN -WINAPI -CreatePolyPolygonRgn( const POINT* lppt, - const INT* lpPolyCounts, - int nCount, - int fnPolyFillMode) -{ - return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, (PPOINT) lppt, (PULONG) lpPolyCounts, (ULONG) nCount, GdiPolyPolyRgn ); -} - -HRGN -WINAPI -CreateEllipticRgnIndirect( - const RECT *prc -) -{ - /* Notes if prc is NULL it will crash on All Windows NT I checked 2000/XP/VISTA */ - return NtGdiCreateEllipticRgn(prc->left, prc->top, prc->right, prc->bottom); - -} - -HRGN -WINAPI -CreateRectRgn(int x1, int y1, int x2,int y2) -{ - /* FIXME Some part need be done in user mode */ - return NtGdiCreateRectRgn(x1,y1,x2,y2); -} - - -HRGN -WINAPI -CreateRectRgnIndirect( - const RECT *prc -) -{ - /* Notes if prc is NULL it will crash on All Windows NT I checked 2000/XP/VISTA */ - return CreateRectRgn(prc->left, prc->top, prc->right, prc->bottom); - +static +VOID +FASTCALL +SortRects(PRECT pRect, INT nCount) +{ + INT i = 0, a = 0, b = 0; + RECT sRect; + + if (nCount > 0) + { + for(;;) + { + do + { + if(pRect[b].top != pRect[i].bottom) break; + if(pRect[b].left < pRect[a].left) + { + sRect = pRect[a]; + pRect[a] = pRect[b]; + pRect[b] = sRect; + } + } while(0); + } + } } /* @@ -85,7 +35,7 @@ DeleteRegion( HRGN hRgn ) { #if 0 - PREGION_ATTR Rgn_Attr; + PRGN_ATTR Rgn_Attr; if ((GdiGetHandleUserData((HGDIOBJ) hRgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) && ( Rgn_Attr != NULL )) @@ -110,6 +60,131 @@ } #endif return NtGdiDeleteObjectApp((HGDIOBJ) hRgn); +} + +INT +FASTCALL +MirrorRgnByWidth(HRGN hRgn, INT Width, HRGN *phRgn) +{ + INT cRgnDSize, Ret = 0; + PRGNDATA pRgnData; + + cRgnDSize = NtGdiGetRegionData(hRgn, 0, NULL); + + if (cRgnDSize) + { + pRgnData = LocalAlloc(LMEM_FIXED, cRgnDSize * sizeof(LONG)); + if (pRgnData) + { + if ( GetRegionData(hRgn, cRgnDSize, pRgnData) ) + { + HRGN hRgnex; + INT i, SaveL = pRgnData->rdh.rcBound.left; + pRgnData->rdh.rcBound.left = Width - pRgnData->rdh.rcBound.right; + pRgnData->rdh.rcBound.right = Width - SaveL; + if (pRgnData->rdh.nCount > 0) + { + PRECT pRect = (PRECT)&pRgnData->Buffer; + for (i = 0; i < pRgnData->rdh.nCount; i++) + { + SaveL = pRect[i].left; + pRect[i].left = Width - pRect[i].right; + pRect[i].right = Width - SaveL; + } + } + SortRects((PRECT)&pRgnData->Buffer, pRgnData->rdh.nCount); + hRgnex = ExtCreateRegion(NULL, cRgnDSize , pRgnData); + if (hRgnex) + { + if (phRgn) phRgn = (HRGN *)hRgnex; + else + { + CombineRgn(hRgn, hRgnex, *phRgn, RGN_COPY); + DeleteObject(hRgnex); + } + Ret = 1; + } + } + LocalFree(pRgnData); + } + } + return Ret; +} + +INT +STDCALL +MirrorRgnDC(HDC hdc, HRGN hRgn, HRGN *phRgn) +{ + if (!GdiIsHandleValid((HGDIOBJ) hdc) || + (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC)) return 0; + + return MirrorRgnByWidth(hRgn, NtGdiGetDeviceWidth(hdc), phRgn); +} + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +HRGN +WINAPI +CreatePolygonRgn( const POINT * lppt, int cPoints, int fnPolyFillMode) +{ + return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, (PPOINT) lppt, (PULONG) &cPoints, 1, GdiPolyPolyRgn); +} + + +/* + * @implemented + */ +HRGN +WINAPI +CreatePolyPolygonRgn( const POINT* lppt, + const INT* lpPolyCounts, + int nCount, + int fnPolyFillMode) +{ + return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, (PPOINT) lppt, (PULONG) lpPolyCounts, (ULONG) nCount, GdiPolyPolyRgn ); +} + + +/* + * @implemented + */ +HRGN +WINAPI +CreateEllipticRgnIndirect( + const RECT *prc +) +{ + /* Notes if prc is NULL it will crash on All Windows NT I checked 2000/XP/VISTA */ + return NtGdiCreateEllipticRgn(prc->left, prc->top, prc->right, prc->bottom); + +} + +/* + * @implemented + */ +HRGN +WINAPI +CreateRectRgn(int x1, int y1, int x2,int y2) +{ + /* FIXME Some part need be done in user mode */ + return NtGdiCreateRectRgn(x1,y1,x2,y2); +} + +/* + * @implemented + */ +HRGN +WINAPI +CreateRectRgnIndirect( + const RECT *prc +) +{ + /* Notes if prc is NULL it will crash on All Windows NT I checked 2000/XP/VISTA */ + return CreateRectRgn(prc->left, prc->top, prc->right, prc->bottom); + } /* @@ -136,6 +211,47 @@ return NULL; } +/* + * @implemented + */ +int +STDCALL +GetClipRgn( + HDC hdc, + HRGN hrgn + ) +{ + INT Ret = NtGdiGetRandomRgn(hdc, hrgn, 1); +// if (Ret) + // { + // if(GetLayout(hdc) & LAYOUT_RTL) MirrorRgnDC(hdc,(HRGN)Ret, NULL); + // } + return Ret; +} + +/* + * @implemented + */ +BOOL +STDCALL +MirrorRgn(HWND hwnd, HRGN hrgn) +{ + RECT Rect; + GetWindowRect(hwnd, &Rect); + return MirrorRgnByWidth(hrgn, Rect.right - Rect.left, NULL); +} + +/* + * @implemented + */ +int STDCALL +SelectClipRgn( + HDC hdc, + HRGN hrgn +) +{ + return ExtSelectClipRgn(hdc, hrgn, RGN_COPY); +} /* * @implemented @@ -149,7 +265,7 @@ int nBottomRect) { #if 0 - PREGION_ATTR Rgn_Attr; + PRGN_ATTR Rgn_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) #endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs