Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mf] 15609: fix unix build
by mf＠svn.reactos.com 28 May '05

28 May '05

fix unix build Modified: trunk/reactos/subsys/system/winefile/winefile.rc _____ Modified: trunk/reactos/subsys/system/winefile/winefile.rc --- trunk/reactos/subsys/system/winefile/winefile.rc 2005-05-28 20:06:29 UTC (rev 15608) +++ trunk/reactos/subsys/system/winefile/winefile.rc 2005-05-28 20:07:55 UTC (rev 15609) @@ -40,5 +40,5 @@ #include "ru.rc" #include "si.rc" #include "zh.rc" -#include "sv.rc" +#include "Sv.rc"

1 0

[mf] 15608: remove duplicate file
by mf＠svn.reactos.com 28 May '05

28 May '05

remove duplicate file Deleted: trunk/reactos/subsys/system/winefile/sv.rc _____ Deleted: trunk/reactos/subsys/system/winefile/sv.rc --- trunk/reactos/subsys/system/winefile/sv.rc 2005-05-28 19:47:04 UTC (rev 15607) +++ trunk/reactos/subsys/system/winefile/sv.rc 2005-05-28 20:06:29 UTC (rev 15608) @@ -1,213 +0,0 @@ -/* - * WineFile - * Swedish Language Support - * - * Copyright 2005 David Nordenberg - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT -#pragma code_page(1252) - - -/* Menu */ - - -IDM_WINEFILE MENU FIXED IMPURE -{ - POPUP "&Arkiv" { - MENUITEM "&Íppna\tEnter", ID_ACTIVATE - MENUITEM "&Flytta...\tF7", ID_FILE_MOVE - MENUITEM "&Kopiera...\tF8", 107 - MENUITEM "&I urklipp...\tF9", 118 - MENUITEM "&Ta bort\tDel", 108 - MENUITEM "&Byt namn...", 109 - MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "&Komprimera...", 119 - MENUITEM "Packa &upp...", 120 - MENUITEM SEPARATOR - MENUITEM "&K÷r...", ID_EXECUTE - MENUITEM "&Skriv ut...", 102 - MENUITEM "Associera...", 103 - MENUITEM SEPARATOR - MENUITEM "Skapa mapp...", 111 - MENUITEM "&S÷k...", 104 - MENUITEM "&Võlj filer...", 116 - MENUITEM SEPARATOR -#ifndef _NO_EXTENSIONS - MENUITEM "&Avsluta\tAlt+X" , ID_FILE_EXIT -#else - MENUITEM "&Avsluta", ID_FILE_EXIT -#endif - } - - POPUP "&Disk" { - MENUITEM "&Kopiera disk...", 201 - MENUITEM "&Namnge disk...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formatera disk...", ID_FORMAT_DISK -#ifdef _WIN95 - MENUITEM "&Skapa systemdisk...", -1 /*TODO*/ -#endif - MENUITEM SEPARATOR - MENUITEM "Anslut &Nõtverksenhet", ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Koppla ifrÕn Nõtverksenhet", ID_DISCONNECT_NETWORK_DRIVE - MENUITEM SEPARATOR - MENUITEM "Dela ut...", 254 - MENUITEM "&Ta bort utdelning...", 255 - MENUITEM SEPARATOR - MENUITEM "&Võlj enhet...", 251 - } - - POPUP "&Trõd" { - MENUITEM "&Nõsta nivÕ\t+", 301 - MENUITEM "Ut÷ka &trõd\t*", 302 - MENUITEM "Ut÷ka &alla\tCtrl+*", 303 - MENUITEM "Kollapsa &trõd\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Markera undermappar", 505 - } - - POPUP "&Visa" { - MENUITEM "&Trõd och mapp", 413 - MENUITEM "Bara tr&õd", 411 - MENUITEM "Bara &mapp", 412 - MENUITEM SEPARATOR - MENUITEM "De&la", ID_VIEW_SPLIT - MENUITEM SEPARATOR - MENUITEM "&Namn", ID_VIEW_NAME - MENUITEM "&Alla Fildetaljer" , ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "&Vissa detaljer..." , ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Sortera efter namn", ID_VIEW_SORT_NAME - MENUITEM "Sortera efter t&yp", ID_VIEW_SORT_TYPE - MENUITEM "Sortera efter st&orlek", ID_VIEW_SORT_SIZE - MENUITEM "Sortera efter &datum", ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "Sortera efter &...", ID_VIEW_FILTER - } - - POPUP "&Instõllningar" { - MENUITEM "&Bekrõftelse...", 501 - MENUITEM "&Teckensnitt...", ID_SELECT_FONT - MENUITEM "&Konfigurera verktygsfõlt...", 512 - MENUITEM SEPARATOR - MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Enhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "St&atusfõlt", ID_VIEW_STATUSBAR, CHECKED -#ifndef _NO_EXTENSIONS - MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN -#endif - MENUITEM SEPARATOR - MENUITEM "&Minimera vid k÷rning" , 504 - MENUITEM "&Spara õndringar vid stõngning", 511 - } - - - POPUP "&Sõkerhet" { - MENUITEM "&?tkomst..." , 605 - MENUITEM "&Loggning..." , 606 - MENUITEM "&?gare..." , 607 - } - - POPUP "&F÷nster" { - MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW - MENUITEM "Íverlappande\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ - MENUITEM "Ordna &vertikalt\tCtrl+F4", ID_WINDOW_TILE_VERT -#ifndef _NO_EXTENSIONS - MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT -#endif - MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE - MENUITEM "&Uppdatera\tF5", ID_REFRESH - } - - - POPUP "&?" { - MENUITEM "&Hjõlpavsnitt\tF1", ID_HELP - MENUITEM "Hjõlp &s÷k...\tF1", ID_HELP - MENUITEM "&Anvõnda hjõlpen\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Information om &Winefile...", ID_ABOUT -/* POPUP "Info..." { - MENUITEM "Info about &Wine..." , ID_ABOUT_WINE - MENUITEM "&License..." ID_LICENSE - MENUITEM "&NO WARRANTY" ID_NO_WARRANTY - } */ - } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "K÷r" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Kommando:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Som &symbol" , 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 - PUSHBUTTON "Avbryt" , 2, 158, 23, 47, 14 - PUSHBUTTON "&Hjõlp" , 254, 158, 43, 47, 14 -} - -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Võlj mÕl" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&S÷kvõg:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 - PUSHBUTTON "Avbryt" , 2, 158, 23, 47, 14 - PUSHBUTTON "&Blõddra" , 254, 158, 43, 47, 14 -} - -STRINGTABLE -{ - IDS_FONT_SEL_DLG_NAME "Verkstõll teckensnittsinstõllningar" - IDS_FONT_SEL_ERROR "Ett fel uppstog nõr ett nytt teckensnitt valdes." -} - -STRINGTABLE -{ - IDS_WINEFILE "Winefile" - IDS_ERROR "Fel" - IDS_ROOT_FS "root fs" - IDS_UNIXFS "unixfs" - IDS_DESKTOP "Skrivbord" - IDS_SHELL "Skal" - IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "Ej implementerat õnnu" - IDS_WINE "WINE" - IDS_WINE_FILE "Wine File" -} - -STRINGTABLE -{ - IDS_COL_NAME "Namn" - IDS_COL_SIZE "Storlek" - IDS_COL_CDATE "CDatum" - IDS_COL_ADATE "ADatum" - IDS_COL_MDATE "MDatum" - IDS_COL_IDX "Index/Inode" - IDS_COL_LINKS "Lõnkar" - IDS_COL_ATTR "Attribut" - IDS_COL_SEC "Sõkerhet" -}

1 0

[chorns] 15607: Remove unneeded files
by chorns＠svn.reactos.com 28 May '05

28 May '05

Remove unneeded files Deleted: trunk/reactos/lib/Jamfile Deleted: trunk/reactos/lib/makefile _____ Deleted: trunk/reactos/lib/Jamfile --- trunk/reactos/lib/Jamfile 2005-05-28 19:38:54 UTC (rev 15606) +++ trunk/reactos/lib/Jamfile 2005-05-28 19:47:04 UTC (rev 15607) @@ -1,5 +0,0 @@ -SubDir ROS_TOP Lib ; - -SubInclude ROS_TOP Lib Ntdll ; -SubInclude ROS_TOP Lib Advapi32 ; -SubInclude ROS_TOP Lib Kernel32 ; _____ Deleted: trunk/reactos/lib/makefile --- trunk/reactos/lib/makefile 2005-05-28 19:38:54 UTC (rev 15606) +++ trunk/reactos/lib/makefile 2005-05-28 19:47:04 UTC (rev 15607) @@ -1,19 +0,0 @@ -LIBRARIES = ntdll kernel32 - -BASE_CFLAGS = -I../include - -all: $(LIBRARIES) - -ntdll: dummy - $(MAKE) -C ntdll - -kernel32: dummy - $(MAKE) -C kernel32 - -dummy: - - -docu: - doxygen Doxyfile - -.PHONY: docu

1 0

[navaraf] 15606: Fix a warning.
by navaraf＠svn.reactos.com 28 May '05

28 May '05

Fix a warning. Modified: trunk/reactos/subsys/system/regedit/edit.c _____ Modified: trunk/reactos/subsys/system/regedit/edit.c --- trunk/reactos/subsys/system/regedit/edit.c 2005-05-28 19:38:17 UTC (rev 15605) +++ trunk/reactos/subsys/system/regedit/edit.c 2005-05-28 19:38:54 UTC (rev 15606) @@ -276,7 +276,7 @@ TCHAR ValueString[32]; LPTSTR Remainder; DWORD Base; - DWORD Value; + DWORD Value = 0; switch(uMsg) { case WM_INITDIALOG: @@ -315,19 +315,11 @@ { if ((len = GetWindowTextLength(hwndValue))) { - if (!GetWindowText(hwndValue, ValueString, 32)) + if (GetWindowText(hwndValue, ValueString, 32)) { - Value = 0; - } - else - { Value = _tcstoul (ValueString, &Remainder, 10); } } - else - { - Value = 0; - } } _stprintf (ValueString, _T("%lx"), Value); SetDlgItemText(hwndDlg, IDC_VALUE_DATA, ValueString); @@ -343,19 +335,11 @@ { if ((len = GetWindowTextLength(hwndValue))) { - if (!GetWindowText(hwndValue, ValueString, 32)) + if (GetWindowText(hwndValue, ValueString, 32)) { - Value = 0; - } - else - { Value = _tcstoul (ValueString, &Remainder, 16); } } - else - { - Value = 0; - } } _stprintf (ValueString, _T("%lu"), Value); SetDlgItemText(hwndDlg, IDC_VALUE_DATA, ValueString);

1 0

[chorns] 15605: Add example of how to find the prefix
by chorns＠svn.reactos.com 28 May '05

28 May '05

Add example of how to find the prefix Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-05-28 19:35:23 UTC (rev 15604) +++ trunk/reactos/Makefile 2005-05-28 19:38:17 UTC (rev 15605) @@ -4,7 +4,8 @@ # This variable specifies the prefix of the MinGW installation. On Windows # a prefix is usually not needed, but on linux it is usually "mingw32". If # not present and no executable named "gcc" can be found, then the prefix is -# assumed to be "mingw32". +# assumed to be "mingw32". If your gcc is named i386-mingw32-gcc then set +# ROS_PREFIX to i386-mingw32. Don't include the dash (-) before gcc. # # ROS_INTERMEDIATE # This variable controls where to put intermediate files. Intermediate

1 0

[chorns] 15604: Use detected prefix
by chorns＠svn.reactos.com 28 May '05

28 May '05

Use detected prefix Modified: trunk/reactos/Makefile Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-05-28 19:33:26 UTC (rev 15603) +++ trunk/reactos/Makefile 2005-05-28 19:35:23 UTC (rev 15604) @@ -147,15 +147,15 @@ EXEPOSTFIX = SEP = / mkdir = -$(Q)mkdir -p - gcc = $(Q)mingw32-gcc - gpp = $(Q)mingw32-g++ - ld = $(Q)mingw32-ld - nm = $(Q)mingw32-nm - objdump = $(Q)mingw32-objdump - ar = $(Q)mingw32-ar - objcopy = $(Q)mingw32-objcopy - dlltool = $(Q)mingw32-dlltool - windres = $(Q)mingw32-windres + gcc = $(Q)$(PREFIX)-gcc + gpp = $(Q)$(PREFIX)-g++ + ld = $(Q)$(PREFIX)-ld + nm = $(Q)$(PREFIX)-nm + objdump = $(Q)$(PREFIX)-objdump + ar = $(Q)$(PREFIX)-ar + objcopy = $(Q)$(PREFIX)-objcopy + dlltool = $(Q)$(PREFIX)-dlltool + windres = $(Q)$(PREFIX)-windres rm = $(Q)rm -f cp = $(Q)cp NUL = /dev/null _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-28 19:33:26 UTC (rev 15603) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-28 19:35:23 UTC (rev 15604) @@ -227,6 +227,7 @@ outputDirectory ( new Directory ( "$(OUTPUT)" ) ), installDirectory ( new Directory ( "$(INSTALL)" ) ) { + compilerPrefix = ""; } MingwBackend::~MingwBackend() @@ -482,6 +483,10 @@ void MingwBackend::GenerateGlobalVariables () const { + fprintf ( fMakefile, + "PREFIX := %s\n", + compilerPrefix.c_str () ); + GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data ); GenerateProjectGccOptions ( "=", ProjectNode.non_if_data ); @@ -695,19 +700,22 @@ const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" ); if ( ROS_PREFIXValue.length () > 0 ) { - compilerCommand = ROS_PREFIXValue + "-gcc"; + compilerPrefix = ROS_PREFIXValue; + compilerCommand = compilerPrefix + "-gcc"; detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); } #if defined(WIN32) if ( !detectedCompiler ) { + compilerPrefix = ""; compilerCommand = "gcc"; detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); } #endif if ( !detectedCompiler ) { - compilerCommand = "mingw32-gcc"; + compilerPrefix = "mingw32"; + compilerCommand = compilerPrefix + "-gcc"; detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); } if ( detectedCompiler ) _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-28 19:33:26 UTC (rev 15603) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-28 19:35:23 UTC (rev 15604) @@ -51,6 +51,7 @@ virtual void Process (); std::string AddDirectoryTarget ( const std::string& directory, Directory* directoryTree ); + std::string compilerPrefix; std::string compilerCommand; bool usePipe; Directory* intermediateDirectory;

1 0

[navaraf] 15603: Fix a few warnings...
by navaraf＠svn.reactos.com 28 May '05

28 May '05

Fix a few warnings... Modified: trunk/reactos/lib/glu32/libnurbs/interface/glcurveval.cc Modified: trunk/reactos/lib/glu32/libnurbs/nurbtess/monoTriangulation.cc Modified: trunk/reactos/lib/glu32/libnurbs/nurbtess/sampleMonoPoly.cc Modified: trunk/reactos/lib/glu32/libutil/mipmap.c Modified: trunk/reactos/lib/imagehlp/modify.c _____ Modified: trunk/reactos/lib/glu32/libnurbs/interface/glcurveval.cc --- trunk/reactos/lib/glu32/libnurbs/interface/glcurveval.cc 2005-05-28 19:24:13 UTC (rev 15602) +++ trunk/reactos/lib/glu32/libnurbs/interface/glcurveval.cc 2005-05-28 19:33:26 UTC (rev 15603) @@ -248,6 +248,11 @@ which=3; dimension = 4; break; + /* make GCC happy */ + default: + which=0; + dimension = 0; + break; } inMap1f(which, dimension, ulo, uhi, stride, order, pts); } _____ Modified: trunk/reactos/lib/glu32/libnurbs/nurbtess/monoTriangulation.cc --- trunk/reactos/lib/glu32/libnurbs/nurbtess/monoTriangulation.cc 2005-05-28 19:24:13 UTC (rev 15602) +++ trunk/reactos/lib/glu32/libnurbs/nurbtess/monoTriangulation.cc 2005-05-28 19:33:26 UTC (rev 15603) @@ -1033,8 +1033,8 @@ primStream* pStream) { Int i; - directedLine *temp, *oldtemp; - Int tempIndex, oldtempIndex; + directedLine *temp, *oldtemp = NULL; + Int tempIndex, oldtempIndex = 0; assert(inc_chain != NULL && dec_chain != NULL); _____ Modified: trunk/reactos/lib/glu32/libnurbs/nurbtess/sampleMonoPoly.cc --- trunk/reactos/lib/glu32/libnurbs/nurbtess/sampleMonoPoly.cc 2005-05-28 19:24:13 UTC (rev 15602) +++ trunk/reactos/lib/glu32/libnurbs/nurbtess/sampleMonoPoly.cc 2005-05-28 19:33:26 UTC (rev 15603) @@ -976,11 +976,11 @@ void findLeftGridIndices(directedLine* topEdge, Int firstGridIndex, Int lastGridIndex, gridWrap* grid, Int* ret_indices, Int* ret_innerIndices) { - Int i,k,isHoriz; + Int i,k,isHoriz = 0; Int n_ulines = grid->get_n_ulines(); Real uMin = grid->get_u_min(); Real uMax = grid->get_u_max(); - Real slop, uinterc; + Real slop = 0.0f, uinterc; #ifdef SHORTEN_GRID_LINE //uintercBuf stores all the interction u value for each grid line @@ -1094,7 +1094,7 @@ Int n_ulines = grid->get_n_ulines(); Real uMin = grid->get_u_min(); Real uMax = grid->get_u_max(); - Real slop, uinterc; + Real slop = 0.0f, uinterc; #ifdef SHORTEN_GRID_LINE //uintercBuf stores all the interction u value for each grid line _____ Modified: trunk/reactos/lib/glu32/libutil/mipmap.c --- trunk/reactos/lib/glu32/libutil/mipmap.c 2005-05-28 19:24:13 UTC (rev 15602) +++ trunk/reactos/lib/glu32/libutil/mipmap.c 2005-05-28 19:33:26 UTC (rev 15603) @@ -4839,7 +4839,7 @@ GLint group_size; GLint elements_per_line; const GLubyte *start; - const GLubyte *iter; + const GLubyte *iter = NULL; GLushort *iter2; GLint i, j, k; GLint myswap_bytes; @@ -6650,7 +6650,7 @@ int elementsPerLine; int rowsPerImage; int imageSize; - const GLubyte *start, *rowStart, *iter; + const GLubyte *start, *rowStart, *iter = NULL; GLushort *iter2; int ww, hh, dd, k; _____ Modified: trunk/reactos/lib/imagehlp/modify.c --- trunk/reactos/lib/imagehlp/modify.c 2005-05-28 19:24:13 UTC (rev 15602) +++ trunk/reactos/lib/imagehlp/modify.c 2005-05-28 19:33:26 UTC (rev 15603) @@ -643,7 +643,7 @@ PUCHAR TempDllName; PLOADED_IMAGE LoadedLibrary; ULONG DllNameSize; - USHORT OrdinalNumber; + USHORT OrdinalNumber = 0; USHORT HintIndex; ULONG ExportSize; PIMAGE_EXPORT_DIRECTORY Exports;

1 0

[greatlrd] 15602: fix linux build
by greatlrd＠svn.reactos.com 28 May '05

28 May '05

fix linux build Added: trunk/reactos/subsys/system/winefile/sv.rc _____ Added: trunk/reactos/subsys/system/winefile/sv.rc --- trunk/reactos/subsys/system/winefile/sv.rc 2005-05-28 18:55:20 UTC (rev 15601) +++ trunk/reactos/subsys/system/winefile/sv.rc 2005-05-28 19:24:13 UTC (rev 15602) @@ -0,0 +1,213 @@ +/* + * WineFile + * Swedish Language Support + * + * Copyright 2005 David Nordenberg + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +#pragma code_page(1252) + + +/* Menu */ + + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "&Arkiv" { + MENUITEM "&Íppna\tEnter", ID_ACTIVATE + MENUITEM "&Flytta...\tF7", ID_FILE_MOVE + MENUITEM "&Kopiera...\tF8", 107 + MENUITEM "&I urklipp...\tF9", 118 + MENUITEM "&Ta bort\tDel", 108 + MENUITEM "&Byt namn...", 109 + MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "&Komprimera...", 119 + MENUITEM "Packa &upp...", 120 + MENUITEM SEPARATOR + MENUITEM "&K÷r...", ID_EXECUTE + MENUITEM "&Skriv ut...", 102 + MENUITEM "Associera...", 103 + MENUITEM SEPARATOR + MENUITEM "Skapa mapp...", 111 + MENUITEM "&S÷k...", 104 + MENUITEM "&Võlj filer...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "&Avsluta\tAlt+X" , ID_FILE_EXIT +#else + MENUITEM "&Avsluta", ID_FILE_EXIT +#endif + } + + POPUP "&Disk" { + MENUITEM "&Kopiera disk...", 201 + MENUITEM "&Namnge disk...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formatera disk...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "&Skapa systemdisk...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "Anslut &Nõtverksenhet", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Koppla ifrÕn Nõtverksenhet", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "Dela ut...", 254 + MENUITEM "&Ta bort utdelning...", 255 + MENUITEM SEPARATOR + MENUITEM "&Võlj enhet...", 251 + } + + POPUP "&Trõd" { + MENUITEM "&Nõsta nivÕ\t+", 301 + MENUITEM "Ut÷ka &trõd\t*", 302 + MENUITEM "Ut÷ka &alla\tCtrl+*", 303 + MENUITEM "Kollapsa &trõd\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Markera undermappar", 505 + } + + POPUP "&Visa" { + MENUITEM "&Trõd och mapp", 413 + MENUITEM "Bara tr&õd", 411 + MENUITEM "Bara &mapp", 412 + MENUITEM SEPARATOR + MENUITEM "De&la", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Namn", ID_VIEW_NAME + MENUITEM "&Alla Fildetaljer" , ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "&Vissa detaljer..." , ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Sortera efter namn", ID_VIEW_SORT_NAME + MENUITEM "Sortera efter t&yp", ID_VIEW_SORT_TYPE + MENUITEM "Sortera efter st&orlek", ID_VIEW_SORT_SIZE + MENUITEM "Sortera efter &datum", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Sortera efter &...", ID_VIEW_FILTER + } + + POPUP "&Instõllningar" { + MENUITEM "&Bekrõftelse...", 501 + MENUITEM "&Teckensnitt...", ID_SELECT_FONT + MENUITEM "&Konfigurera verktygsfõlt...", 512 + MENUITEM SEPARATOR + MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Enhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "St&atusfõlt", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Minimera vid k÷rning" , 504 + MENUITEM "&Spara õndringar vid stõngning", 511 + } + + + POPUP "&Sõkerhet" { + MENUITEM "&?tkomst..." , 605 + MENUITEM "&Loggning..." , 606 + MENUITEM "&?gare..." , 607 + } + + POPUP "&F÷nster" { + MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW + MENUITEM "Íverlappande\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ + MENUITEM "Ordna &vertikalt\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT +#endif + MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE + MENUITEM "&Uppdatera\tF5", ID_REFRESH + } + + + POPUP "&?" { + MENUITEM "&Hjõlpavsnitt\tF1", ID_HELP + MENUITEM "Hjõlp &s÷k...\tF1", ID_HELP + MENUITEM "&Anvõnda hjõlpen\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Information om &Winefile...", ID_ABOUT +/* POPUP "Info..." { + MENUITEM "Info about &Wine..." , ID_ABOUT_WINE + MENUITEM "&License..." ID_LICENSE + MENUITEM "&NO WARRANTY" ID_NO_WARRANTY + } */ + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "K÷r" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Kommando:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "Som &symbol" , 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 + PUSHBUTTON "Avbryt" , 2, 158, 23, 47, 14 + PUSHBUTTON "&Hjõlp" , 254, 158, 43, 47, 14 +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Võlj mÕl" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&S÷kvõg:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 + PUSHBUTTON "Avbryt" , 2, 158, 23, 47, 14 + PUSHBUTTON "&Blõddra" , 254, 158, 43, 47, 14 +} + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Verkstõll teckensnittsinstõllningar" + IDS_FONT_SEL_ERROR "Ett fel uppstog nõr ett nytt teckensnitt valdes." +} + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "Fel" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Skrivbord" + IDS_SHELL "Skal" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Ej implementerat õnnu" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "Namn" + IDS_COL_SIZE "Storlek" + IDS_COL_CDATE "CDatum" + IDS_COL_ADATE "ADatum" + IDS_COL_MDATE "MDatum" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "Lõnkar" + IDS_COL_ATTR "Attribut" + IDS_COL_SEC "Sõkerhet" +}

1 0

[chorns] 15601: Close branch
by chorns＠svn.reactos.com 28 May '05

28 May '05

Close branch Deleted: branches/xmlbuildsystem/

1 0

[navaraf] 15600: Define __NO_CTYPE_INLINES.
by navaraf＠svn.reactos.com 28 May '05

28 May '05

Define __NO_CTYPE_INLINES. Modified: trunk/reactos/lib/freetype/freetype.xml _____ Modified: trunk/reactos/lib/freetype/freetype.xml --- trunk/reactos/lib/freetype/freetype.xml 2005-05-28 18:43:25 UTC (rev 15599) +++ trunk/reactos/lib/freetype/freetype.xml 2005-05-28 18:45:55 UTC (rev 15600) @@ -4,6 +4,7 @@ <define name="_DISABLE_TIDENTS" /> <define name="_SEH_NO_NATIVE_NLG" /> <define name="__NTDRIVER__" /> + <define name="__NO_CTYPE_INLINES" /> <library>ntoskrnl</library> <library>hal</library> <directory name="i386">

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