Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[hpoussin] 13935: Add semi-implementation of AttachDeviceToDeviceStackSafe

by hpoussin＠svn.reactos.com

Add semi-implementation of AttachDeviceToDeviceStackSafe Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-03-11 18:34:44 UTC (rev 13934) +++ trunk/reactos/ntoskrnl/io/device.c 2005-03-11 18:46:44 UTC (rev 13935) @@ -126,7 +126,7 @@ ObjectBody, Parent, RemainingPath); if (RemainingPath != NULL && wcschr(RemainingPath + 1, '\\') != NULL) - return STATUS_UNSUCCESSFUL; + return STATUS_OBJECT_PATH_NOT_FOUND; return STATUS_SUCCESS; } @@ -168,8 +168,11 @@ OUT PDEVICE_OBJECT *AttachedToDeviceObject ) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + /* FIXME: IoAttachDeviceToDeviceStackSafe must not call + * IoAttachDeviceToDeviceStack, but the other way around! */ + DPRINT1("IoAttachDeviceToDeviceStackSafe() badly implemented!\n"); + *AttachedToDeviceObject = IoAttachDeviceToDeviceStack(SourceDevice, TargetDevice); + return STATUS_SUCCESS; } /*

19 years, 6 months

[navaraf] 13934: tinus <o112w8r02@sneakemail.com>

by navaraf＠svn.reactos.com

tinus <o112w8r02(a)sneakemail.com> Add a Initialized member to TEXTOBJ so it isn't reinitialized all the time. Modified: trunk/reactos/include/win32k/text.h Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/include/win32k/text.h --- trunk/reactos/include/win32k/text.h 2005-03-11 18:17:29 UTC (rev 13933) +++ trunk/reactos/include/win32k/text.h 2005-03-11 18:34:44 UTC (rev 13934) @@ -7,6 +7,7 @@ { LOGFONTW logfont; FONTOBJ *Font; + BOOLEAN Initialized; /* Don't reinitialize for each DC */ } TEXTOBJ, *PTEXTOBJ; /* Internal interface */ _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-03-11 18:17:29 UTC (rev 13933) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-03-11 18:34:44 UTC (rev 13934) @@ -2971,6 +2971,12 @@ return STATUS_INVALID_HANDLE; } + if (TextObj->Initialized) + { + TEXTOBJ_UnlockText(FontHandle); + return STATUS_SUCCESS; + } + if (! RtlCreateUnicodeString(&FaceName, TextObj->logfont.lfFaceName)) { TEXTOBJ_UnlockText(FontHandle); @@ -3003,6 +3009,7 @@ } else { + TextObj->Initialized = TRUE; Status = STATUS_SUCCESS; }

19 years, 6 months

[navaraf] 13933: tinus <o112w8r02@sneakemail.com>

by navaraf＠svn.reactos.com

tinus <o112w8r02(a)sneakemail.com> Don't allocate 0 bytes of memory for no color map. Modified: trunk/reactos/subsys/win32k/objects/dib.c _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-03-11 17:33:12 UTC (rev 13932) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-03-11 18:17:29 UTC (rev 13933) @@ -883,8 +883,15 @@ if(bi->biBitCount == 4) { Entries = 16; } else if(bi->biBitCount == 8) { Entries = 256; } - bmp->ColorMap = ExAllocatePoolWithTag(PagedPool, sizeof(RGBQUAD)*Entries, TAG_COLORMAP); - RtlCopyMemory(bmp->ColorMap, bmi->bmiColors, sizeof(RGBQUAD)*Entries); + if (Entries) + { + bmp->ColorMap = ExAllocatePoolWithTag(PagedPool, sizeof(RGBQUAD)*Entries, TAG_COLORMAP); + RtlCopyMemory(bmp->ColorMap, bmi->bmiColors, sizeof(RGBQUAD)*Entries); + } + else + { + bmp->ColorMap = NULL; + } } // Clean up in case of errors

19 years, 6 months

[navaraf] 13932: Check BinUtils and GCC version.

by navaraf＠svn.reactos.com

Check BinUtils and GCC version. Modified: trunk/reactos/tools/Makefile Added: trunk/reactos/tools/tools-check.c Added: trunk/reactos/tools/tools-check.mak _____ Modified: trunk/reactos/tools/Makefile --- trunk/reactos/tools/Makefile 2005-03-11 14:07:48 UTC (rev 13931) +++ trunk/reactos/tools/Makefile 2005-03-11 17:33:12 UTC (rev 13932) @@ -18,12 +18,15 @@ LIBS = lib_unicode lib_wpp -CLEAN_FILES = $(TOOLS) +CLEAN_FILES = $(TOOLS) tools-check.tmp tools-check.h -all: $(TOOLS) $(LIBS) zlib_target wmc_target cabman_target cdmake_target mkhive_target rgenstat_target \ +all: $(TOOLS) tools_check $(LIBS) zlib_target wmc_target cabman_target cdmake_target mkhive_target rgenstat_target \ wine2ros_target pipetools_target winebuild_target bin2res_target wrc_target widl_target \ buildno_target +tools_check: + $(MAKE) -f tools-check.mak + regtests$(EXE_POSTFIX): regtests.c @$(HOST_CC) $(CFLAGS) -o regtests$(EXE_POSTFIX) regtests.c _____ Added: trunk/reactos/tools/tools-check.c --- trunk/reactos/tools/tools-check.c 2005-03-11 14:07:48 UTC (rev 13931) +++ trunk/reactos/tools/tools-check.c 2005-03-11 17:33:12 UTC (rev 13932) @@ -0,0 +1,32 @@ +#include "tools-check.h" + +/* + * - Binutils older than 2003/10/01 have broken windres which can't handle + * icons with alpha channel. + * - Binutils between 2004/09/02 and 2004/10/08 have broken handling of + * forward exports in dlltool. + */ + +#if (BINUTILS_VERSION_DATE >= 20040902 && BINUTILS_VERSION_DATE <= 20041008) || \ + (BINUTILS_VERSION_DATE < 20031001) +#error Due to technical reasons your binutils version can't be used to \ + build ReactOS. Please consider upgrading to newer version. See \ + www.mingw.org for details.) +#endif + +/* + * GCC 3.3.1 is lowest allowed version. Older versions have various problems + * with C++ code. + */ + +#if (__GNUC__ == 3 && __GNUC_MINOR__ < 3) || \ + (__GNUC__ < 3) +#error Due to technical reasons your GCC version can't be used to \ + build ReactOS. Please consider upgrading to newer version. See \ + www.mingw.org for details.) +#endif + +/* + * FIXME: GCC 3.4.1 has broken headers which cause Explorer to not build. + * We should warn in this case...maybe add check for the broken headers? + */ _____ Added: trunk/reactos/tools/tools-check.mak --- trunk/reactos/tools/tools-check.mak 2005-03-11 14:07:48 UTC (rev 13931) +++ trunk/reactos/tools/tools-check.mak 2005-03-11 17:33:12 UTC (rev 13932) @@ -0,0 +1,18 @@ +PATH_TO_TOP = .. +include $(PATH_TO_TOP)/rules.mak + +# +# Get the binutils version +# +# The "ld -v" output can be in either of these two formats: +# "GNU ld version 050113 20050113" (nightly build) +# "GNU ld version 2.15.94 20050118" (official release) +# + +BINUTILS_VERSION_DATE=$(word 5,$(shell $(PREFIX)ld -v)) + +all: + @echo #define BINUTILS_VERSION_DATE $(BINUTILS_VERSION_DATE) > tools-check.h + $(HOST_CC) -c tools-check.c -o tools-check.temp + $(RM) tools-check.temp + $(RM) tools-check.h

19 years, 6 months

[royce] 13931: beginning of local stub makefiles, to allow building from subdirectories ( I'm explicitly not allowing a full clean from a subdirectory )

by royce＠svn.reactos.com

beginning of local stub makefiles, to allow building from subdirectories ( I'm explicitly not allowing a full clean from a subdirectory ) Added: branches/xmlbuildsystem/reactos/proxy.mak Modified: branches/xmlbuildsystem/reactos/tools/cabman/makefile _____ Added: branches/xmlbuildsystem/reactos/proxy.mak --- branches/xmlbuildsystem/reactos/proxy.mak 2005-03-11 08:53:28 UTC (rev 13930) +++ branches/xmlbuildsystem/reactos/proxy.mak 2005-03-11 14:07:48 UTC (rev 13931) @@ -0,0 +1,10 @@ +MAKEFLAGS += --no-print-directory --silent + +$(DEFAULT): + @$(MAKE) -C $(TOP) $(DEFAULT) + +all: + @$(MAKE) -C $(TOP) all + +clean: + @$(MAKE) -C $(TOP) $(DEFAULT)_clean _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/makefile --- branches/xmlbuildsystem/reactos/tools/cabman/makefile 2005-03-11 08:53:28 UTC (rev 13930) +++ branches/xmlbuildsystem/reactos/tools/cabman/makefile 2005-03-11 14:07:48 UTC (rev 13931) @@ -1,49 +1,3 @@ -# -# ReactOS Cabinet Manager -# -PATH_TO_TOP = ../.. - -TARGET=cabman$(EXE_POSTFIX) - -all: $(TARGET) - -OBJECTS = cabinet.o mszip.o raw.o main.o dfp.o - -CLEAN_FILES = *.o cabman$(EXE_POSTFIX) - -HOST_CFLAGS = -g -I. -I$(PATH_TO_TOP)/lib/zlib -I$(W32API_PATH)/include -Werror -Wall - -HOST_LFLAGS = -g $(PATH_TO_TOP)/lib/zlib/zlib.host.a - -cabinet.o: cabinet.cxx - $(HOST_CXX) $(HOST_CFLAGS) -c cabinet.cxx -o cabinet.o - -mszip.o: mszip.cxx - $(HOST_CXX) $(HOST_CFLAGS) -c mszip.cxx -o mszip.o - -raw.o: raw.cxx - $(HOST_CXX) $(HOST_CFLAGS) -c raw.cxx -o raw.o - -main.o: main.cxx - $(HOST_CXX) $(HOST_CFLAGS) -c main.cxx -o main.o - -dfp.o: dfp.cxx - $(HOST_CXX) $(HOST_CFLAGS) -c dfp.cxx -o dfp.o - -cabman$(EXE_POSTFIX): $(OBJECTS) - $(HOST_CXX) $(OBJECTS) $(HOST_LFLAGS) -o cabman$(EXE_POSTFIX) - -ifeq ($(HOST),mingw32-linux) -clean: - rm -f *.o - rm -f cabman$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) -clean: - -del *.o - -del cabman$(EXE_POSTFIX) -endif - -.phony: clean - -include $(PATH_TO_TOP)/rules.mak +TOP = ../.. +DEFAULT = cabman +include $(TOP)/proxy.mak \ No newline at end of file

19 years, 6 months

[gvg] 13930: Thomas Larsen <sikker2004@yahoo.com>

by gvg＠svn.reactos.com

Thomas Larsen <sikker2004(a)yahoo.com> - Added Danish language Added: trunk/reactos/lib/cpl/appwiz/Dk.rc Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc _____ Added: trunk/reactos/lib/cpl/appwiz/Dk.rc --- trunk/reactos/lib/cpl/appwiz/Dk.rc 2005-03-11 08:50:04 UTC (rev 13929) +++ trunk/reactos/lib/cpl/appwiz/Dk.rc 2005-03-11 08:53:28 UTC (rev 13930) @@ -0,0 +1,50 @@ +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Installer/Afinstallere" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 + LTEXT "For at installere et nyt Program/Spil, Klik pÕ Installere",-1,36,18,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&Installere...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 + LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + LTEXT "F°lgende Software kan automatisk blive Fjernet. For at fjerne programmer eller µndre hvilken typer komponeter der skal vµre installeret, vµlg fra listen og klik pÕ Tilf°j/Fjern.",-1,36,72,PROPSHEETWIDTH-48,32 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "Tilf°j/&Fjern", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Reactos Installation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Opret Weblink" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Tekst 1", -1, 115, 15, 160, 24 + LTEXT "Tekst 2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Opret Weblink" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Tekst 1",-1,10,0,225,40 + LTEXT "Tekst 2",-1,10,40,120,20 + LTEXT "Tekst 3",-1,10,55,120,20 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Tilf°jer/Fjerner Programmer" + IDS_CPLSYSTEMDESCRIPTION "Installere programmer og opretter genveje." +END Property changes on: trunk/reactos/lib/cpl/appwiz/Dk.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc --- trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-03-11 08:50:04 UTC (rev 13929) +++ trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-03-11 08:53:28 UTC (rev 13930) @@ -27,3 +27,4 @@ #include "En.rc" #include "De.rc" +#include "Dk.rc"

19 years, 6 months

[gvg] 13929: Thomas Larsen <sikker2004@yahoo.com>

by gvg＠svn.reactos.com

Thomas Larsen <sikker2004(a)yahoo.com> - Added Danish language - Corrected English Ressource for missing Title - Split The Res Files to make room for more translation to other langs Added: trunk/reactos/lib/cpl/ncpa/dk.rc Added: trunk/reactos/lib/cpl/ncpa/en.rc Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc _____ Added: trunk/reactos/lib/cpl/ncpa/dk.rc --- trunk/reactos/lib/cpl/ncpa/dk.rc 2005-03-11 08:43:24 UTC (rev 13928) +++ trunk/reactos/lib/cpl/ncpa/dk.rc 2005-03-11 08:50:04 UTC (rev 13929) @@ -0,0 +1,87 @@ +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Netvµrks Indstillinger" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Dine Netwµrks Adaptere:",-1,9,9,217,8 + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Tilf°j",IDC_ADD,9,100,60,14 + PUSHBUTTON "&Fjern",IDC_REMOVE,72,100,60,14 + PUSHBUTTON "&Egenskaber",IDC_PROPERTIES,179,100,60,14 +END + +IDD_NETPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Generelt" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Forbind til Netvµrket/Internettet med:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Konfigure", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Komponeter mµrkeret med et flueben er brugt af den forbindelse:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + PUSHBUTTON "&Installere", IDC_INSTALL, 9, 133, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Afinstallere", IDC_UNINSTALL, 90, 133, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Egenskaber", IDC_PROPERTIES, 174, 133, 65, 14 + GROUPBOX "Beskrivelse", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Komponent Beskrivelse Her...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Vis Ikon i System Tray ved forbindelse.", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + + +IDD_CARDPROPERTIES DIALOG DISCARDABLE 0, 0, 200,180 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Generelt" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Aktiv Forbindelse", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Tids Periode:", -1, 19, 34, 60, 8 + LTEXT "Hastighed:", -1, 19, 48, 60, 8 + GROUPBOX "Netvµrks Aktivitet", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Sendt", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT " Modtaget", -1, 149, 90, 37, 8 + LTEXT "Netvµrks pakker:", -1, 73, 115, 44, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 117, 108, 21, 20 + RTEXT "000.000.000", IDC_RECEIVED, 134, 115, 44, 8 + PUSHBUTTON "&Egenskaber", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Deaktiver", IDC_ENDISABLE, 66, 150, 50, 14 +END + +IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Du kan fÕ din IP opsµtning indstillet automatisk, hvis dit Netvµrkskort underst°tter denne mulighed. Ellers, er du n°d til at sp°rge din 'Netvµrks Administrator' omkring din IP opsµtning.", -1, 9, 9, 228, 27 + CONTROL "Tildel Automatisk en IP Adresse", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "&Brug f°lge IP Adresse:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + LTEXT "IP Adresse:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",0,150,75-2,80,12 + LTEXT "Subnet maske:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",0,150,90-2,80,12 + LTEXT "Standard gateway:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",0,150,105-2,80,12 + CONTROL "Tildel automatisk en DNS server adresse.", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "&Brug f°lgende DNS Server Adresse:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + LTEXT "Fortrukket DNS server:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12 + LTEXT "Alternativ DNS server:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12 + PUSHBUTTON "&Avanceret", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP +} + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Netvµrks Indstillinger" + IDS_CPLSYSTEMDESCRIPTION "Tilpas dine Netvµrks Indstillinger." +END Property changes on: trunk/reactos/lib/cpl/ncpa/dk.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/cpl/ncpa/en.rc --- trunk/reactos/lib/cpl/ncpa/en.rc 2005-03-11 08:43:24 UTC (rev 13928) +++ trunk/reactos/lib/cpl/ncpa/en.rc 2005-03-11 08:50:04 UTC (rev 13929) @@ -0,0 +1,87 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Properties" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Adapters",-1,9,9,217,8 + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Add",IDC_ADD,9,100,60,14 + PUSHBUTTON "&Remove",IDC_REMOVE,72,100,60,14 + PUSHBUTTON "&Properties",IDC_PROPERTIES,179,100,60,14 +END + +IDD_NETPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Connect Using:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Configure", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + PUSHBUTTON "&Install", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Uninstall", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Properties", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + + +IDD_CARDPROPERTIES DIALOG DISCARDABLE 0, 0, 200,180 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Connection", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Duration:", -1, 19, 34, 60, 8 + LTEXT "Speed:", -1, 19, 48, 60, 8 + GROUPBOX "Activity", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Sent", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Received", -1, 149, 90, 37, 8 + LTEXT "Packets:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Properties", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Disable", IDC_ENDISABLE, 66, 150, 50, 14 +END + +IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "You can get IP settings assigned automatically if your network supports this capability. Otherwise, you need to ask your network administrator for the appropriate IP settings.", -1, 9, 9, 228, 27 + CONTROL "Obtain the IP address automatically", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + LTEXT "IP address:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",0,150,75-2,80,12 + LTEXT "Subnet mask:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",0,150,90-2,80,12 + LTEXT "Default gateway:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",0,150,105-2,80,12 + CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "&Use the following DNS server addresses", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + LTEXT "Preferred DNS server:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12 + LTEXT "Alternate DNS server:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12 + PUSHBUTTON "&Advanced", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP +} + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Network Properties" + IDS_CPLSYSTEMDESCRIPTION "Customizes network settings." +END Property changes on: trunk/reactos/lib/cpl/ncpa/en.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc --- trunk/reactos/lib/cpl/ncpa/ncpa.rc 2005-03-11 08:43:24 UTC (rev 13928) +++ trunk/reactos/lib/cpl/ncpa/ncpa.rc 2005-03-11 08:50:04 UTC (rev 13929) @@ -17,95 +17,10 @@ #include <reactos/version.rc> #endif -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_HORIZONTAL ICON "resources/HORIZ.ICO" IDI_VERTICAL ICON "resources/VERTIC.ICO" IDI_NETSTAT ICON "resources/NETCONN.ICO" -IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 -STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Network Adapters",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Add",IDC_ADD,9,100,60,14 - PUSHBUTTON "&Remove",IDC_REMOVE,72,100,60,14 - PUSHBUTTON "&Properties",IDC_PROPERTIES,179,100,60,14 -END - -IDD_NETPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 -STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Connect Using:", -1, 9,9,217,8 - EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP - PUSHBUTTON "&Configure", IDC_CONFIGURE, 189, 38, 50, 14 - LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD - PUSHBUTTON "&Install", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Uninstall", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Properties", IDC_PROPERTIES, 174, 130, 65, 14 - GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX - LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP -END - - -IDD_CARDPROPERTIES DIALOG DISCARDABLE 0, 0, 200,180 -STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Connection", -1, 9, 8, 182, 58, BS_GROUPBOX - LTEXT "Status:", -1, 19, 20, 60, 8 - LTEXT "Duration:", -1, 19, 34, 60, 8 - LTEXT "Speed:", -1, 19, 48, 60, 8 - GROUPBOX "Activity", -1, 9, 74, 182, 70, BS_GROUPBOX - RTEXT "Sent", -1, 26, 90, 60, 8 - ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 - ICON IDI_NETSTAT, -1, 110, 85, 18, 20 - ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 - LTEXT "Received", -1, 149, 90, 37, 8 - LTEXT "Packets:", -1, 17, 115, 32, 8 - RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 - ICON IDI_VERTICAL, -1, 110, 108, 18, 20 - RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Properties", IDC_PROPERTIES, 10, 150, 50, 14 - PUSHBUTTON "&Disable", IDC_ENDISABLE, 66, 150, 50, 14 -END - -IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 -STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "You can get IP settings assigned automatically if your network supports this capability. Otherwise, you need to ask your network administrator for the appropriate IP settings.", -1, 9, 9, 228, 27 - CONTROL "Obtain the IP address automatically", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 - GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX - CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 - LTEXT "IP address:", -1, 14, 75, 135, 8 - CONTROL "",IDC_IPADDR,"SysIPAddress32",0,150,75-2,80,12 - LTEXT "Subnet mask:", -1, 14, 90, 135, 8 - CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",0,150,90-2,80,12 - LTEXT "Default gateway:", -1, 14, 105, 135, 8 - CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",0,150,105-2,80,12 - CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12 - GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX - CONTROL "&Use the following DNS server addresses", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 - LTEXT "Preferred DNS server:", -1, 14, 171, 135, 8 - CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12 - LTEXT "Alternate DNS server:", -1, 14, 186, 135, 8 - CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12 - PUSHBUTTON "&Advanced", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP -} - - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "Network Properties" - IDS_CPLSYSTEMDESCRIPTION "Customizes network settings." -END +#include "en.rc" +#include "dk.rc"

19 years, 6 months

[gvg] 13928: Thomas Larsen <sikker2004@yahoo.com>

by gvg＠svn.reactos.com

Thomas Larsen <sikker2004(a)yahoo.com> - Added Danish language - Move icons to language neutral resources Modified: trunk/reactos/lib/cpl/sysdm/de.rc Modified: trunk/reactos/lib/cpl/sysdm/en.rc Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc _____ Modified: trunk/reactos/lib/cpl/sysdm/de.rc --- trunk/reactos/lib/cpl/sysdm/de.rc 2005-03-11 08:29:40 UTC (rev 13927) +++ trunk/reactos/lib/cpl/sysdm/de.rc 2005-03-11 08:43:24 UTC (rev 13928) @@ -1,9 +1,5 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -IDI_CPLSYSTEM ICON "resources/applet.ico" -IDI_DEVMGR ICON "resources/devmgr.ico" -RC_LICENSE RTDATA "resources/gpl.txt" - IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Allgemein" _____ Modified: trunk/reactos/lib/cpl/sysdm/en.rc --- trunk/reactos/lib/cpl/sysdm/en.rc 2005-03-11 08:29:40 UTC (rev 13927) +++ trunk/reactos/lib/cpl/sysdm/en.rc 2005-03-11 08:43:24 UTC (rev 13928) @@ -1,7 +1,5 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -IDI_CPLSYSTEM ICON "resources/applet.ico" -IDI_DEVMGR ICON "resources/devmgr.ico" RC_LICENSE RTDATA "resources/gpl.txt" IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT _____ Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc --- trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-03-11 08:29:40 UTC (rev 13927) +++ trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-03-11 08:43:24 UTC (rev 13928) @@ -14,7 +14,9 @@ #define REACTOS_STR_ORIGINAL_FILENAME "sysdm.cpl\0" #include <reactos/version.rc> +IDI_CPLSYSTEM ICON "resources/applet.ico" +IDI_DEVMGR ICON "resources/devmgr.ico" #include "en.rc" #include "de.rc" - +#include "dk.rc"

19 years, 6 months

[gvg] 13927: Thomas Larsen <sikker2004@yahoo.com>

by gvg＠svn.reactos.com

Thomas Larsen <sikker2004(a)yahoo.com> - Added Danish language Added: trunk/reactos/lib/cpl/timedate/Dk.rc Modified: trunk/reactos/lib/cpl/timedate/timedate.rc _____ Added: trunk/reactos/lib/cpl/timedate/Dk.rc --- trunk/reactos/lib/cpl/timedate/Dk.rc 2005-03-11 08:22:29 UTC (rev 13926) +++ trunk/reactos/lib/cpl/timedate/Dk.rc 2005-03-11 08:29:40 UTC (rev 13927) @@ -0,0 +1,43 @@ +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 149 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Dato && Tid" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "&Dato", -1, 4, 2, 126, 133 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_SHORTDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 10, 17, 115, 12 + CONTROL "", IDC_MONTHCALENDAR, "SysMonthCal32", + WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER, + 9, 34, 115, 97 + GROUPBOX "&Klokken", + -1, 132, 2, 113, 133 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 144, 17, 90, 12 + LTEXT "Nuvµrende Tidszone:", IDC_TIMEZONE, 4, 138, 241, 8 +END + + +IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tidszone" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "Justere uret automatisk efter &Sommertid/Vintertid.", + IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "Dato/Tid" + IDS_CPLDESCRIPTION "Skifter Dato, Tid og Tidszone informationer." + IDS_TIMEZONETEXT "Nuvµrende tidszone: %s" + IDS_TIMEZONEINVALID "Ugyldig" + IDS_TIMEZONEUNKNOWN "Ukendt" +END Property changes on: trunk/reactos/lib/cpl/timedate/Dk.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/timedate/timedate.rc --- trunk/reactos/lib/cpl/timedate/timedate.rc 2005-03-11 08:22:29 UTC (rev 13926) +++ trunk/reactos/lib/cpl/timedate/timedate.rc 2005-03-11 08:29:40 UTC (rev 13927) @@ -19,5 +19,6 @@ #include "En.rc" #include "De.rc" +#include "Dk.rc" #include "Es.rc" #include "Fr.rc"

19 years, 6 months

[gvg] 13926: Thomas Larsen <sikker2004@yahoo.com>

by gvg＠svn.reactos.com

Thomas Larsen <sikker2004(a)yahoo.com> - Added Danish language Added: trunk/reactos/lib/cpl/control/Dk.rc Modified: trunk/reactos/lib/cpl/control/control.rc _____ Added: trunk/reactos/lib/cpl/control/Dk.rc --- trunk/reactos/lib/cpl/control/Dk.rc 2005-03-11 07:51:43 UTC (rev 13925) +++ trunk/reactos/lib/cpl/control/Dk.rc 2005-03-11 08:22:29 UTC (rev 13926) @@ -0,0 +1,26 @@ +// Danish language resource file (Thomas Larsen, 2005-03-11) + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Luk", IDM_CLOSE + END + POPUP "&Vis" + BEGIN + MENUITEM "Store Ikoner", IDM_LARGEICONS + MENUITEM "SmÕ Ikoner", IDM_SMALLICONS + MENUITEM "Liste", IDM_LIST + MENUITEM "Detaljer", IDM_DETAILS + END + POPUP "Hjµlp" + BEGIN + MENUITEM "Om", IDM_ABOUT + END +END Property changes on: trunk/reactos/lib/cpl/control/Dk.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/control/control.rc --- trunk/reactos/lib/cpl/control/control.rc 2005-03-11 07:51:43 UTC (rev 13925) +++ trunk/reactos/lib/cpl/control/control.rc 2005-03-11 08:22:29 UTC (rev 13926) @@ -17,9 +17,7 @@ #include <../../../include/reactos/version.rc> #endif -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - //////////////////////////////////////////////////////////////////////// ///// // // Icon @@ -39,7 +37,4 @@ #include "En.rc" #include "De.rc" - - - - +#include "Dk.rc"

19 years, 6 months

← Newer
1
...
44
45
46
47
48
49
50
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005