Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 17627: fix a small bug after me, and check if it really got memmory or not.
by greatlrd＠svn.reactos.com 04 Sep '05

04 Sep '05

fix a small bug after me, and check if it really got memmory or not. Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-09-03 23:12:17 UTC (rev 17626) +++ trunk/reactos/subsys/system/cmd/start.c 2005-09-04 09:29:44 UTC (rev 17627) @@ -21,8 +21,8 @@ { TCHAR szFullName[MAX_PATH]; TCHAR first[CMDLINE_LENGTH]; - TCHAR *rest; - TCHAR *param; + TCHAR *rest = NULL; + TCHAR *param = NULL; BOOL bWait = FALSE; BOOL bBat = FALSE; BOOL bCreate = FALSE; @@ -30,11 +30,8 @@ PROCESS_INFORMATION prci; STARTUPINFO stui; + - - - param[0] = _T('\0'); - if (_tcsncmp (Rest, _T("/?"), 2) == 0) { ConOutResPaging(TRUE,STRING_START_HELP1); @@ -50,7 +47,23 @@ } rest = malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); + if (rest == NULL) + { + error_out_of_memory(); + return 1; + } + param =malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); + if (rest == NULL) + { + free(rest); + error_out_of_memory(); + return 1; + } + + param[0] = _T('\0'); + + _tcscpy(rest,Rest); /* Parsing the command that gets called by start, and it's parameters */ @@ -63,8 +76,8 @@ for(i = 0; i < count; i++) { if(rest[i] == _T(' ')) - { - param = malloc ( _tcslen(&rest[i]) + 1 * sizeof(TCHAR)); + { + _tcscpy(param,&rest[i]); rest[i] = _T('\0'); break; @@ -83,7 +96,7 @@ if(rest[i] == _T('\"')) bInside = !bInside; if((rest[i] == _T(' ')) && !bInside) - { + { _tcscpy(param,&rest[i]); rest[i] = _T('\0'); break; @@ -134,6 +147,7 @@ if (param != NULL) free(param); + return 1; } @@ -148,6 +162,7 @@ if (!SearchForExecutable (_T("CMD"), szFullCmdLine)) { error_bad_command (); + if (rest != NULL) free(rest); @@ -179,8 +194,9 @@ if (bBat == FALSE) { _tcscpy (szFullCmdLine, first); - if( param ) + if( param != NULL ) { + _tcscat(szFullCmdLine, _T(" ") ); _tcscat (szFullCmdLine, param); } @@ -224,8 +240,8 @@ ErrorMessage(GetLastError (), _T("Error executing CreateProcess()!!\n")); } -// } + if (rest != NULL) free(rest);

1 0

[greatlrd] 17626: remove some hardcode commadline buffer value. first step to implement dymatic buffer. but we need do it very carefull, so nothing will be broken.
by greatlrd＠svn.reactos.com 03 Sep '05

03 Sep '05

remove some hardcode commadline buffer value. first step to implement dymatic buffer. but we need do it very carefull, so nothing will be broken. Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-09-03 19:59:51 UTC (rev 17625) +++ trunk/reactos/subsys/system/cmd/start.c 2005-09-03 23:12:17 UTC (rev 17626) @@ -21,8 +21,8 @@ { TCHAR szFullName[MAX_PATH]; TCHAR first[CMDLINE_LENGTH]; - TCHAR rest[CMDLINE_LENGTH]; - TCHAR param[CMDLINE_LENGTH]; + TCHAR *rest; + TCHAR *param; BOOL bWait = FALSE; BOOL bBat = FALSE; BOOL bCreate = FALSE; @@ -30,6 +30,9 @@ PROCESS_INFORMATION prci; STARTUPINFO stui; + + + param[0] = _T('\0'); if (_tcsncmp (Rest, _T("/?"), 2) == 0) @@ -46,6 +49,8 @@ Rest = _T("cmd"); } + rest = malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); + _tcscpy(rest,Rest); /* Parsing the command that gets called by start, and it's parameters */ @@ -59,6 +64,7 @@ { if(rest[i] == _T(' ')) { + param = malloc ( _tcslen(&rest[i]) + 1 * sizeof(TCHAR)); _tcscpy(param,&rest[i]); rest[i] = _T('\0'); break; @@ -95,6 +101,7 @@ } /* check for a drive change */ + if (!_tcscmp (first + 1, _T(":")) && _istalpha (*first)) { TCHAR szPath[MAX_PATH]; @@ -106,14 +113,27 @@ if (szPath[0] != (TCHAR)_totupper (*first)) ConErrResPuts (STRING_FREE_ERROR1); + if (rest != NULL) + free(rest); + + if (param != NULL) + free(param); + return 0; } + /* get the PATH environment variable and parse it */ /* search the PATH environment variable for the binary */ if (!SearchForExecutable (rest, szFullName)) { error_bad_command (); + + if (rest != NULL) + free(rest); + + if (param != NULL) + free(param); return 1; } @@ -128,6 +148,12 @@ if (!SearchForExecutable (_T("CMD"), szFullCmdLine)) { error_bad_command (); + if (rest != NULL) + free(rest); + + if (param != NULL) + free(param); + return 1; } @@ -200,6 +226,12 @@ } // } + if (rest != NULL) + free(rest); + + if (param != NULL) + free(param); + return 0; }

1 0

[greatlrd] 17625: fix type can handler \n at text output thx ravelo for the small patch. see file misc.c. prompt.c fix the szParam so it have a buffer set. and do not use szParam for param, the param length can in future very big. when dymatic buffer be implement at command line.
by greatlrd＠svn.reactos.com 03 Sep '05

03 Sep '05

fix type can handler \n at text output thx ravelo for the small patch. see file misc.c. prompt.c fix the szParam so it have a buffer set. and do not use szParam for param, the param length can in future very big. when dymatic buffer be implement at command line. Modified: trunk/reactos/subsys/system/cmd/misc.c Modified: trunk/reactos/subsys/system/cmd/prompt.c _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2005-09-03 19:44:47 UTC (rev 17624) +++ trunk/reactos/subsys/system/cmd/misc.c 2005-09-03 19:59:51 UTC (rev 17625) @@ -381,10 +381,10 @@ while ((--nBufferLength > 0) && ReadFile(hFile, &ch, 1, &dwRead, NULL) && dwRead) { - if (ch == '\r') + if ((ch == '\n') || (ch == '\r')) { - /* overread '\n' */ - ReadFile (hFile, &ch, 1, &dwRead, NULL); + /* read it*/ + lpString[len++] = ch; break; } lpString[len++] = ch; _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 19:44:47 UTC (rev 17624) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 19:59:51 UTC (rev 17625) @@ -192,8 +192,7 @@ #ifdef INCLUDE_CMD_PROMPT INT cmd_prompt (LPTSTR cmd, LPTSTR param) -{ - LPTSTR szParam; +{ if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_PROMPT_HELP1); @@ -210,15 +209,24 @@ so even if param is null you _must_ still set prompt to the default. There seems to be some kinda difference between winxp and 2k in this matter and this way will - cover both. */ + cover both. Do not use fixed size of szParam for param the buffer are 8192bytes + and will later change to dymatic buffer */ + + /* set PROMPT environment variable */ if (param[0] != _T('\0')) - _tcscpy(szParam,param); + { + if (!SetEnvironmentVariable (_T("PROMPT"), param)) + return 1; + } else + { + TCHAR szParam[5]; _tcscpy(szParam,_T("$P$G")); + if (!SetEnvironmentVariable (_T("PROMPT"),szParam)) + return 1; + } - /* set PROMPT environment variable */ - if (!SetEnvironmentVariable (_T("PROMPT"), szParam)) - return 1; + return 0; }

1 0

[ekohl] 17624: Fix GUID->String conversion.
by ekohl＠svn.reactos.com 03 Sep '05

03 Sep '05

Fix GUID->String conversion. Implement CM_Get_Class[_Ex]A/W. Modified: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2005-09-03 18:05:33 UTC (rev 17623) +++ trunk/reactos/include/wine/cfgmgr32.h 2005-09-03 19:44:47 UTC (rev 17624) @@ -139,6 +139,12 @@ CONFIGRET WINAPI CM_Get_Class_Key_Name_ExA( LPGUID, LPSTR, PULONG, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Class_Key_Name_ExW( LPGUID, LPWSTR, PULONG, ULONG, HMACHINE ); #define CM_Get_Class_Key_Name_Ex WINELIB_NAME_AW(CM_Get_Class_Key_Name_Ex) +CONFIGRET WINAPI CM_Get_Class_NameA( LPGUID, PCHAR, PULONG, ULONG ); +CONFIGRET WINAPI CM_Get_Class_NameW( LPGUID, PWCHAR, PULONG, ULONG); +#define CM_Get_Class_Name WINELIB_NAME_AW(CM_Get_Class_Name) +CONFIGRET WINAPI CM_Get_Class_Name_ExA( LPGUID, PCHAR, PULONG, ULONG, HMACHINE ); +CONFIGRET WINAPI CM_Get_Class_Name_ExW( LPGUID, PWCHAR, PULONG, ULONG, HMACHINE ); +#define CM_Get_Class_Name_Ex WINELIB_NAME_AW(CM_Get_Class_Name_Ex) CONFIGRET WINAPI CM_Get_Depth( PULONG, DEVINST, ULONG ); CONFIGRET WINAPI CM_Get_Depth_Ex( PULONG, DEVINST, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyA( DEVINST, ULONG, PULONG, PVOID, PULONG, ULONG ); _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-03 18:05:33 UTC (rev 17623) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-03 19:44:47 UTC (rev 17624) @@ -363,6 +363,21 @@ } +static BOOL GuidToString(LPGUID Guid, LPWSTR String) +{ + LPWSTR lpString; + + if (UuidToStringW(Guid, &lpString) != RPC_S_OK) + return FALSE; + + lstrcpyW(String, lpString); + + RpcStringFree(&lpString); + + return TRUE; +} + + /*********************************************************************** * CM_Get_Class_Key_Name_ExW [SETUPAPI.@] */ @@ -370,7 +385,7 @@ LPGUID ClassGuid, LPWSTR pszKeyName, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %p %p %lx %lx\n", + TRACE("%p %p %p %lx %lx\n", ClassGuid, pszKeyName, pulLength, ulFlags, hMachine); if (ClassGuid == NULL || pszKeyName == NULL || pulLength == NULL) @@ -385,7 +400,7 @@ return CR_BUFFER_SMALL; } - if (UuidToStringW(ClassGuid, &pszKeyName) != RPC_S_OK) + if (!GuidToString(ClassGuid, pszKeyName)) return CR_INVALID_DATA; *pulLength = MAX_GUID_STRING_LEN; @@ -395,6 +410,88 @@ /*********************************************************************** + * CM_Get_Class_NameA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Class_NameA( + LPGUID ClassGuid, PCHAR Buffer, PULONG pulLength, ULONG ulFlags) +{ + TRACE("%p %p %p %lx\n", ClassGuid, Buffer, pulLength, ulFlags); + return CM_Get_Class_Name_ExA(ClassGuid, Buffer, pulLength, ulFlags, + NULL); +} + + +/********************************************************************** * + * CM_Get_Class_NameW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Class_NameW( + LPGUID ClassGuid, PWCHAR Buffer, PULONG pulLength, ULONG ulFlags) +{ + TRACE("%p %p %p %lx\n", ClassGuid, Buffer, pulLength, ulFlags); + return CM_Get_Class_Name_ExW(ClassGuid, Buffer, pulLength, ulFlags, + NULL); +} + + +/********************************************************************** * + * CM_Get_Class_Name_ExA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Class_Name_ExA( + LPGUID ClassGuid, PCHAR Buffer, PULONG pulLength, ULONG ulFlags, + HMACHINE hMachine) +{ + FIXME("%p %p %p %lx %lx\n", + ClassGuid, Buffer, pulLength, ulFlags, hMachine); + return CR_FAILURE; +} + + +/********************************************************************** * + * CM_Get_Class_Name_ExW [SETUPAPI.@] + */ +CONFIGRET WINAPI +CM_Get_Class_Name_ExW( + LPGUID ClassGuid, PWCHAR Buffer, PULONG pulLength, ULONG ulFlags, + HMACHINE hMachine) +{ + WCHAR szGuidString[MAX_GUID_STRING_LEN]; + RPC_BINDING_HANDLE BindingHandle = NULL; + + TRACE("%p %p %p %lx %lx\n", + ClassGuid, Buffer, pulLength, ulFlags, hMachine); + + if (ClassGuid == NULL || Buffer == NULL || pulLength == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (!GuidToString(ClassGuid, szGuidString)) + return CR_INVALID_DATA; + + TRACE("Guid %s\n", debugstr_w(szGuidString)); + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + return PNP_GetClassName(BindingHandle, + szGuidString, + Buffer, + pulLength, + ulFlags); +} + + +/********************************************************************** * * CM_Get_Depth [SETUPAPI.@] */ CONFIGRET WINAPI CM_Get_Depth( _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-09-03 18:05:33 UTC (rev 17623) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-09-03 19:44:47 UTC (rev 17624) @@ -59,10 +59,10 @@ @ stdcall CM_Get_Class_Key_NameW(ptr wstr ptr long) @ stdcall CM_Get_Class_Key_Name_ExA(ptr str ptr long long) @ stdcall CM_Get_Class_Key_Name_ExW(ptr wstr ptr long long) -@ stub CM_Get_Class_NameA -@ stub CM_Get_Class_NameW -@ stub CM_Get_Class_Name_ExA -@ stub CM_Get_Class_Name_ExW +@ stdcall CM_Get_Class_NameA(ptr str ptr long) +@ stdcall CM_Get_Class_NameW(ptr wstr ptr long) +@ stdcall CM_Get_Class_Name_ExA(ptr str ptr long long) +@ stdcall CM_Get_Class_Name_ExW(ptr wstr ptr long long) @ stdcall CM_Get_Depth(ptr long long) @ stdcall CM_Get_Depth_Ex(ptr long long long) @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @@ -166,6 +166,7 @@ @ stub CM_Request_Device_EjectA @ stub CM_Request_Device_EjectW @ stub CM_Request_Eject_PC +@ stub CM_Request_Eject_PC_Ex @ stub CM_Reset_Children_Marks @ stub CM_Reset_Children_Marks_Ex @ stub CM_Run_Detection _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-09-03 18:05:33 UTC (rev 17623) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-09-03 19:44:47 UTC (rev 17624) @@ -862,12 +862,55 @@ IN ULONG ulFlags, IN HMACHINE hMachine); -/* FIXME: Obsolete CM_Get_Class_Name */ -/* FIXME: Obsolete CM_Get_Class_Name_Ex */ +CMAPI +CONFIGRET +WINAPI +CM_Get_Class_NameA( + IN LPGUID ClassGuid, + OUT PCHAR Buffer, + IN OUT PULONG pulLength, + IN ULONG ulFlags); CMAPI CONFIGRET WINAPI +CM_Get_Class_NameW( + IN LPGUID ClassGuid, + OUT PWCHAR Buffer, + IN OUT PULONG pulLength, + IN ULONG ulFlags); + +CMAPI +CONFIGRET +WINAPI +CM_Get_Class_Name_ExA( + IN LPGUID ClassGuid, + OUT PCHAR Buffer, + IN OUT PULONG pulLength, + IN ULONG ulFlags, + IN HMACHINE hMachine); + +CMAPI +CONFIGRET +WINAPI +CM_Get_Class_Name_ExW( + IN LPGUID ClassGuid, + OUT PWCHAR Buffer, + IN OUT PULONG pulLength, + IN ULONG ulFlags, + IN HMACHINE hMachine); + +#ifdef UNICODE +#define CM_Get_Class_Name CM_Get_Class_NameW +#define CM_Get_Class_Name_Ex CM_Get_Class_Name_ExW +#else +#define CM_Get_Class_Name CM_Get_Class_NameA +#define CM_Get_Class_Name_Ex CM_Get_Class_Name_ExA +#endif /* UNICODE */ + +CMAPI +CONFIGRET +WINAPI CM_Get_Class_Key_NameA( IN LPGUID ClassGuid, OUT LPSTR pszKeyName,

1 0

[amunger] 17623: Fix cmd build. Please check your changes before commiting.
by amunger＠svn.reactos.com 03 Sep '05

03 Sep '05

Fix cmd build. Please check your changes before commiting. Modified: trunk/reactos/subsys/system/cmd/prompt.c _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 18:00:54 UTC (rev 17622) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 18:05:33 UTC (rev 17623) @@ -193,6 +193,7 @@ INT cmd_prompt (LPTSTR cmd, LPTSTR param) { + LPTSTR szParam; if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_PROMPT_HELP1);

1 0

[hbirr] 17622: Fixed the return value in KeRundownQueue if the queue is empty. This should fix bug 751.
by hbirr＠svn.reactos.com 03 Sep '05

03 Sep '05

Fixed the return value in KeRundownQueue if the queue is empty. This should fix bug 751. Modified: trunk/reactos/ntoskrnl/ke/queue.c _____ Modified: trunk/reactos/ntoskrnl/ke/queue.c --- trunk/reactos/ntoskrnl/ke/queue.c 2005-09-03 17:40:33 UTC (rev 17621) +++ trunk/reactos/ntoskrnl/ke/queue.c 2005-09-03 18:00:54 UTC (rev 17622) @@ -344,7 +344,7 @@ if (FirstEntry == &Queue->EntryListHead) { /* It is, so don't return anything */ - EnumEntry = NULL; + FirstEntry = NULL; } else {

1 0

[hbirr] 17621: Set the ownership before locking the bitmap in EngCreateDeviceSurface, because GDIOBJ_SetOwnership runs in a dead lock if the object is already locked by the same process.
by hbirr＠svn.reactos.com 03 Sep '05

03 Sep '05

Set the ownership before locking the bitmap in EngCreateDeviceSurface, because GDIOBJ_SetOwnership runs in a dead lock if the object is already locked by the same process. This may fix bug 747. Modified: trunk/reactos/subsys/win32k/eng/surface.c _____ Modified: trunk/reactos/subsys/win32k/eng/surface.c --- trunk/reactos/subsys/win32k/eng/surface.c 2005-09-03 11:51:22 UTC (rev 17620) +++ trunk/reactos/subsys/win32k/eng/surface.c 2005-09-03 17:40:33 UTC (rev 17621) @@ -394,6 +394,8 @@ if (NewSurface == NULL) return 0; + GDIOBJ_SetOwnership(NewSurface, NULL); + BitmapObj = BITMAPOBJ_LockBitmap(NewSurface); if (! BITMAPOBJ_InitBitsLock(BitmapObj)) { @@ -403,8 +405,6 @@ } SurfObj = &BitmapObj->SurfObj; - GDIOBJ_SetOwnership(NewSurface, NULL); - SurfObj->dhsurf = dhsurf; SurfObj->hsurf = NewSurface; SurfObj->sizlBitmap = Size;

1 0

[turner] 17620: Setting my changes back for prompt.c. Greatlord and I agreed about this. These was a miscommication about these changes and the way different MS version handle it.
by turner＠svn.reactos.com 03 Sep '05

03 Sep '05

Setting my changes back for prompt.c. Greatlord and I agreed about this. These was a miscommication about these changes and the way different MS version handle it. Modified: trunk/reactos/subsys/system/cmd/prompt.c _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 11:50:23 UTC (rev 17619) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 11:51:22 UTC (rev 17620) @@ -204,12 +204,20 @@ return 0; } + /* if it is null, then it needs to set to default, + because that means the user entered "prompt" only. + so even if param is null you _must_ still set prompt + to the default. There seems to be some kinda difference + between winxp and 2k in this matter and this way will + cover both. */ + if (param[0] != _T('\0')) + _tcscpy(szParam,param); + else + _tcscpy(szParam,_T("$P$G")); + /* set PROMPT environment variable */ - if (param[0] != _T('\0')) - { - if (!SetEnvironmentVariable (_T("PROMPT"), param)) - return 1; - } + if (!SetEnvironmentVariable (_T("PROMPT"), szParam)) + return 1; return 0; }

1 0

[greatlrd] 17619: Updated translation by Anders, proofread by Andreas Bjerkeholt, rename Sw to sv, Sw stand for another language's. Steven can you send this change to winehq.
by greatlrd＠svn.reactos.com 03 Sep '05

03 Sep '05

Updated translation by Anders, proofread by Andreas Bjerkeholt, rename Sw to sv, Sw stand for another language's. Steven can you send this change to winehq. Added: trunk/reactos/subsys/system/notepad/Sv.rc Deleted: trunk/reactos/subsys/system/notepad/Sw.rc Modified: trunk/reactos/subsys/system/notepad/rsrc.rc _____ Added: trunk/reactos/subsys/system/notepad/Sv.rc --- trunk/reactos/subsys/system/notepad/Sv.rc 2005-09-03 11:23:24 UTC (rev 17618) +++ trunk/reactos/subsys/system/notepad/Sv.rc 2005-09-03 11:50:23 UTC (rev 17619) @@ -0,0 +1,127 @@ +/* + * Notepad (Swedish resources) + * + * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> + * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Fixed by Anders Bergh <anders(a)anders1.org> 2005 + * + * 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 + +MAIN_MENU MENU +{ + POPUP "&Arkiv" { + MENUITEM "&Ny...", CMD_NEW + MENUITEM "&Íppna", CMD_OPEN + MENUITEM "&Spara", CMD_SAVE + MENUITEM "Spara so&m...", CMD_SAVE_AS + MENUITEM "Skriv &ut...", CMD_PRINT + MENUITEM "Utskrifts&format...", CMD_PAGE_SETUP + MENUITEM "Skrivar&instõllningar...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Avsluta", CMD_EXIT + } +POPUP "&Redigera" { + MENUITEM "&?ngra\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Klipp ut\tCtrl+X", CMD_CUT + MENUITEM "K&opiera\tCtrl+C", CMD_COPY + MENUITEM "K&listra in\tCtrl+V", CMD_PASTE + MENUITEM "&Ta bort\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Markera &allt", CMD_SELECT_ALL + MENUITEM "&Tid/datum\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&Automatiskt radbyte", CMD_WRAP + } +POPUP "&S÷k" { + MENUITEM "S÷k...", CMD_SEARCH + MENUITEM "&S÷k nõsta\tF3", CMD_SEARCH_NEXT + } +POPUP "&Hjõlp" { + MENUITEM "&InnehÕll", CMD_HELP_CONTENTS + MENUITEM "&S÷k...", CMD_HELP_SEARCH + MENUITEM "Anvisningar f÷r hjõlpen", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + POPUP "Inf&ormation..." { + MENUITEM "&Licens", CMD_LICENSE + MENUITEM "&INGEN GARANTI", CMD_NO_WARRANTY + MENUITEM "&Om Wine", CMD_ABOUT_WINE + } + } +} + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Skrivarinstõllningar" +{ +LTEXT "&Huvudnot:", 0x140, 10, 07, 40, 15 +EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "&Fotnot:", 0x142, 10, 24, 40, 15 +EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "Marginaler:", 0x144, 10, 43,160, 45 +LTEXT "&Võnsterkant:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Íverkant:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&H÷gerkant:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Nederkant:", 0x14E,100, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Avbryt", 0x152, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Hjõlp", 0x153, 180, 39, 40, 15, WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&n" +STRING_PAGESETUP_FOOTERVALUE, "Sida &s" +STRING_PAGESETUP_LEFTVALUE, "20 mm" +STRING_PAGESETUP_RIGHTVALUE, "20 mm" +STRING_PAGESETUP_TOPVALUE, "25 mm" +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" + +STRING_NOTEPAD, "Anteckningar" +STRING_ERROR, "FEL" +STRING_WARNING, "VARNING" +STRING_INFO, "Information" + +STRING_UNTITLED, "(namnl÷s)" + +STRING_ALL_FILES, "Alla filer (*.*)" +STRING_TEXT_FILES_TXT, "Textfiler (*.txt)" + +STRING_TOOLARGE, "Filen '%s' õr f÷r stor f÷r Anteckningar.\n \ +Anvõnd en annan editor." +STRING_NOTEXT, "Du skrev inte in nÕgon text. \ +\nSkriv nÕgot och f÷rs÷k sedan igen." +STRING_DOESNOTEXIST, "Filen '%s'\nexisterar inte.\n\n \ +Vill du skapa en ny fil?" +STRING_NOTSAVED, "Filen '%s'\nhar õndrats.\n\n \ +Vill du spara õndringarna?" +STRING_NOTFOUND, "'%s' hittades inte." +STRING_OUT_OF_MEMORY, "Det finns inte tillrõckligt med minne f÷r att kunna slutf÷ra \ +den hõr Õtgõrden. \nAvsluta ett eller flera program f÷r att frig÷ra mer minne." + +} _____ Deleted: trunk/reactos/subsys/system/notepad/Sw.rc --- trunk/reactos/subsys/system/notepad/Sw.rc 2005-09-03 11:23:24 UTC (rev 17618) +++ trunk/reactos/subsys/system/notepad/Sw.rc 2005-09-03 11:50:23 UTC (rev 17619) @@ -1,127 +0,0 @@ -/* - * Notepad (Swedish resources) - * - * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> - * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * - * 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 - -MAIN_MENU MENU -{ - POPUP "&Arkiv" { - MENUITEM "&Ny...", CMD_NEW - MENUITEM "Í&ppna", CMD_OPEN - MENUITEM "&Spara", CMD_SAVE - MENUITEM "Spara &som...", CMD_SAVE_AS - MENUITEM "&Skriv ut", CMD_PRINT - MENUITEM "Sid La&yout...", CMD_PAGE_SETUP - MENUITEM "Skrivar &instõllningar...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Avsluta", CMD_EXIT - } -POPUP "&Redigera" { - MENUITEM "&Undo\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Klippa\tCtrl+X", CMD_CUT - MENUITEM "&Kopiera\tCtrl+C", CMD_COPY - MENUITEM "&Klistra in\tCtrl+V", CMD_PASTE - MENUITEM "&Ta bort\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Markera &allt", CMD_SELECT_ALL - MENUITEM "&Tid/Datum\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&Dela lÕnga meningar", CMD_WRAP - } -POPUP "&S÷k" { - MENUITEM "S÷k...", CMD_SEARCH - MENUITEM "&S÷k nõsta\tF3", CMD_SEARCH_NEXT - } -POPUP "&Hjõlp" { - MENUITEM "&InnehÕll", CMD_HELP_CONTENTS - MENUITEM "&S÷k...", CMD_HELP_SEARCH - MENUITEM "Anvõndningen &av hjõlp", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - POPUP "Inf&ormation..." { - MENUITEM "&Licens", CMD_LICENSE - MENUITEM "&INGEN GARANTI", CMD_NO_WARRANTY - MENUITEM "&Om Wine", CMD_ABOUT_WINE - } - } -} - -/* Dialog `Page setup' */ - -DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Sid Layout" -{ -LTEXT "&Huvudnot:", 0x140, 10, 07, 40, 15 -EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&Fotnot:", 0x142, 10, 24, 40, 15 -EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP - -GROUPBOX "Kanter:", 0x144, 10, 43,160, 45 -LTEXT "&Võnster:", 0x145, 20, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Íver:", 0x148, 20, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&H÷ger:", 0x14B, 100, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Under:", 0x14E,100, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Avbryt", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Hjõlp", 0x153, 180, 39, 40, 15, WS_TABSTOP -} - -STRINGTABLE DISCARDABLE -{ -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Page &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ - -STRING_NOTEPAD, "Anteckningar" -STRING_ERROR, "FEL" -STRING_WARNING, "WARNING" -STRING_INFO, "Information" - -STRING_UNTITLED, "(untitled)" - -STRING_ALL_FILES, "Alla filer (*.*)" -STRING_TEXT_FILES_TXT, "Text filer (*.txt)" - -STRING_TOOLARGE, "Filen '%s' õr f÷r stor f÷r notepad.\n \ -Anvõnd en annan editor." -STRING_NOTEXT, "Du skrev inte in nÕgon text. \ -\nSkriv nÕgot och f÷rs÷k sedan igen" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ -Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ -Would you like to save the changes ?" -STRING_NOTFOUND, "'%s' hittades inte." -STRING_OUT_OF_MEMORY, "Inte tillrõkligt med minne f÷r att slutf÷ra \ -den hõr uppgiften. \nAvsluta ett eller flera program f÷r att ÷ka mõngden \nfritt \ -minne." - -} _____ Modified: trunk/reactos/subsys/system/notepad/rsrc.rc --- trunk/reactos/subsys/system/notepad/rsrc.rc 2005-09-03 11:23:24 UTC (rev 17618) +++ trunk/reactos/subsys/system/notepad/rsrc.rc 2005-09-03 11:50:23 UTC (rev 17619) @@ -55,7 +55,7 @@ #include "Ru.rc" #include "Si.rc" #include "Sk.rc" -#include "Sw.rc" +#include "Sv.rc" #include "Th.rc" #include "Wa.rc" #include "Zh.rc"

1 0

[greatlrd] 17618: Swedish translation by David Nordenberg, proofread by Andreas Bjerkeholt
by greatlrd＠svn.reactos.com 03 Sep '05

03 Sep '05

Swedish translation by David Nordenberg, proofread by Andreas Bjerkeholt Added: trunk/reactos/subsys/system/userinit/Sv.rc Modified: trunk/reactos/subsys/system/userinit/userinit.rc _____ Added: trunk/reactos/subsys/system/userinit/Sv.rc --- trunk/reactos/subsys/system/userinit/Sv.rc 2005-09-03 11:22:13 UTC (rev 17617) +++ trunk/reactos/subsys/system/userinit/Sv.rc 2005-09-03 11:23:24 UTC (rev 17618) @@ -0,0 +1,12 @@ +#include "resource.h" +/* + * Copyright 2005 David Nordenberg + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +STRING_USERINIT_FAIL, "Userinit misslyckades att starta anvõndargrõnssnittet!\n" + +} _____ Modified: trunk/reactos/subsys/system/userinit/userinit.rc --- trunk/reactos/subsys/system/userinit/userinit.rc 2005-09-03 11:22:13 UTC (rev 17617) +++ trunk/reactos/subsys/system/userinit/userinit.rc 2005-09-03 11:23:24 UTC (rev 17618) @@ -5,5 +5,6 @@ #define REACTOS_STR_INTERNAL_NAME "userinit\0" #define REACTOS_STR_ORIGINAL_FILENAME "userinit.dll\0" #include <reactos/version.rc> + #include "En.rc" - +#include "Sv.rc"

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