Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 22578: - There are more then only the 3 or 4 heap flags WINE's Windows 95 code supports(there are about 18), so it's a bit stupid to mask them all out, especially since that breaks settable/tag flags.
by ion＠svn.reactos.org 24 Jun '06

24 Jun '06

Author: ion Date: Sat Jun 24 22:01:53 2006 New Revision: 22578 URL: http://svn.reactos.org/svn/reactos?rev=22578&view=rev Log: - There are more then only the 3 or 4 heap flags WINE's Windows 95 code supports(there are about 18), so it's a bit stupid to mask them all out, especially since that breaks settable/tag flags. Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=22578&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c (original) +++ trunk/reactos/lib/rtl/heap.c Sat Jun 24 22:01:53 2006 @@ -1217,7 +1217,7 @@ RtlRaiseStatus( STATUS_NO_MEMORY ); return NULL; } - flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY; + //flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY; flags |= heapPtr->flags; if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->critSection ); @@ -1362,8 +1362,8 @@ /* Validate the parameters */ - Flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY | - HEAP_REALLOC_IN_PLACE_ONLY; + //Flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY | + // HEAP_REALLOC_IN_PLACE_ONLY; Flags |= heapPtr->flags; Size = (Size + 7) & ~7; if (Size < HEAP_MIN_BLOCK_SIZE) @@ -1891,6 +1891,7 @@ subheap = HEAP_FindSubHeap( heapPtr, pInUse ); /* Hack */ + DPRINT1("V/F: %lx %p\n", subheap->UserValue, subheap->UserFlags); if (UserValue) *UserValue = subheap->UserValue; if (UserFlags) *UserFlags = subheap->UserFlags; return TRUE;

1 0

[ion] 22577: - Silence debug message
by ion＠svn.reactos.org 24 Jun '06

24 Jun '06

Author: ion Date: Sat Jun 24 21:07:15 2006 New Revision: 22577 URL: http://svn.reactos.org/svn/reactos?rev=22577&view=rev Log: - Silence debug message Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=22577&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c (original) +++ trunk/reactos/lib/rtl/heap.c Sat Jun 24 21:07:15 2006 @@ -1266,7 +1266,7 @@ if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); - DPRINT1("(%p,%08lx,%08lx): returning %p\n", + DPRINT("(%p,%08lx,%08lx): returning %p\n", heap, flags, size, (PVOID)(pInUse + 1) ); return (PVOID)(pInUse + 1); }

1 0

[ion] 22576: - Fix implementation of RtlSetUserValueHeap and RtlGetUserInfoHeap to write their flags to the subheap and not the actual main heap structure (since those flags are valid for each allocation). - Make heap allocations 8-byte aligned again.
by ion＠svn.reactos.org 24 Jun '06

24 Jun '06

Author: ion Date: Sat Jun 24 21:05:05 2006 New Revision: 22576 URL: http://svn.reactos.org/svn/reactos?rev=22576&view=rev Log: - Fix implementation of RtlSetUserValueHeap and RtlGetUserInfoHeap to write their flags to the subheap and not the actual main heap structure (since those flags are valid for each allocation). - Make heap allocations 8-byte aligned again. Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=22576&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c (original) +++ trunk/reactos/lib/rtl/heap.c Sat Jun 24 21:05:05 2006 @@ -87,6 +87,8 @@ struct tagSUBHEAP *next; /* Next sub-heap */ struct tagHEAP *heap; /* Main heap structure */ ULONG magic; /* Magic number */ + ULONG UserFlags; + PVOID UserValue; } SUBHEAP, *PSUBHEAP; @@ -100,7 +102,6 @@ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ ULONG flags; /* Heap flags */ ULONG magic; /* Magic number */ - PVOID UserValue; PRTL_HEAP_COMMIT_ROUTINE commitRoutine; } HEAP, *PHEAP; @@ -1250,6 +1251,9 @@ pInUse->threadId = (ULONG)NtCurrentTeb()->Cid.UniqueThread; pInUse->magic = ARENA_INUSE_MAGIC; + /* Save user flags */ + subheap->UserFlags = flags & HEAP_SETTABLE_USER_FLAGS; + /* Shrink the block */ HEAP_ShrinkBlock( subheap, pInUse, size ); @@ -1262,7 +1266,7 @@ if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); - DPRINT("(%p,%08lx,%08lx): returning %p\n", + DPRINT1("(%p,%08lx,%08lx): returning %p\n", heap, flags, size, (PVOID)(pInUse + 1) ); return (PVOID)(pInUse + 1); } @@ -1855,9 +1859,15 @@ IN PVOID UserValue) { HEAP *heapPtr = HEAP_GetPtr(HeapHandle); + ARENA_INUSE *pInUse; + SUBHEAP *subheap; + + /* Get the subheap */ + pInUse = (ARENA_INUSE *)BaseAddress - 1; + subheap = HEAP_FindSubHeap( heapPtr, pInUse ); /* Hack */ - heapPtr->UserValue = UserValue; + subheap->UserValue = UserValue; return TRUE; } @@ -1873,10 +1883,16 @@ OUT PULONG UserFlags) { HEAP *heapPtr = HEAP_GetPtr(HeapHandle); + ARENA_INUSE *pInUse; + SUBHEAP *subheap; + + /* Get the subheap */ + pInUse = (ARENA_INUSE *)BaseAddress - 1; + subheap = HEAP_FindSubHeap( heapPtr, pInUse ); /* Hack */ - if (UserValue) *UserValue = heapPtr->UserValue; - if (UserFlags) *UserFlags = heapPtr->flags & HEAP_SETTABLE_USER_FLAGS; + if (UserValue) *UserValue = subheap->UserValue; + if (UserFlags) *UserFlags = subheap->UserFlags; return TRUE; }

1 0

[greatlrd] 22575: fixing so u can edit rsrc.rc again with vs
by greatlrd＠svn.reactos.org 24 Jun '06

24 Jun '06

Author: greatlrd Date: Sat Jun 24 20:51:12 2006 New Revision: 22575 URL: http://svn.reactos.org/svn/reactos?rev=22575&view=rev Log: fixing so u can edit rsrc.rc again with vs Modified: trunk/reactos/base/applications/calc/Hu.rc trunk/reactos/base/applications/calc/Ru.rc Modified: trunk/reactos/base/applications/calc/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Hu.… ============================================================================== --- trunk/reactos/base/applications/calc/Hu.rc (original) +++ trunk/reactos/base/applications/calc/Hu.rc Sat Jun 24 20:51:12 2006 @@ -23,7 +23,7 @@ #include "resource.h" #include "winecalc.h" -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { Modified: trunk/reactos/base/applications/calc/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Ru.… ============================================================================== --- trunk/reactos/base/applications/calc/Ru.rc (original) +++ trunk/reactos/base/applications/calc/Ru.rc Sat Jun 24 20:51:12 2006 @@ -22,7 +22,7 @@ #include "resource.h" #include "winecalc.h" -LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE {

1 0

[greatlrd] 22574: 1. Fix the russain rc to be open with VS 2. move all langues rc to rsrc.rc so we can open them in VS without genrate project file for VS we already doing it on few other dll/exe
by greatlrd＠svn.reactos.org 24 Jun '06

24 Jun '06

Author: greatlrd Date: Sat Jun 24 20:44:30 2006 New Revision: 22574 URL: http://svn.reactos.org/svn/reactos?rev=22574&view=rev Log: 1. Fix the russain rc to be open with VS 2. move all langues rc to rsrc.rc so we can open them in VS without genrate project file for VS we already doing it on few other dll/exe Added: trunk/reactos/base/applications/cacls/rsrc.rc (with props) Modified: trunk/reactos/base/applications/cacls/Ru.rc trunk/reactos/base/applications/cacls/cacls.rc Modified: trunk/reactos/base/applications/cacls/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/Ru… ============================================================================== --- trunk/reactos/base/applications/cacls/Ru.rc (original) +++ trunk/reactos/base/applications/cacls/Ru.rc Sat Jun 24 20:44:30 2006 @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { Modified: trunk/reactos/base/applications/cacls/cacls.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/ca… ============================================================================== --- trunk/reactos/base/applications/cacls/cacls.rc (original) +++ trunk/reactos/base/applications/cacls/cacls.rc Sat Jun 24 20:44:30 2006 @@ -6,9 +6,5 @@ #define REACTOS_STR_ORIGINAL_FILENAME "cacls.exe\0" #include <reactos/version.rc> -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#include "rsrc.rc" -#include "En.rc" -#include "Nl.rc" -#include "Ru.rc" -#include "De.rc" Added: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc (added) +++ trunk/reactos/base/applications/cacls/rsrc.rc Sat Jun 24 20:44:30 2006 @@ -1,0 +1,15 @@ + + +#include <windows.h> +#include "resource.h" + +/* define language neutral resources */ + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* include localised resources */ +#include "En.rc" +#include "Nl.rc" +#include "Ru.rc" +#include "De.rc" + Propchange: trunk/reactos/base/applications/cacls/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 22573: Ukrainian translation from temarez see bug 1624
by greatlrd＠svn.reactos.org 24 Jun '06

24 Jun '06

Author: greatlrd Date: Sat Jun 24 20:24:25 2006 New Revision: 22573 URL: http://svn.reactos.org/svn/reactos?rev=22573&view=rev Log: Ukrainian translation from temarez see bug 1624 Added: trunk/reactos/dll/win32/wininet/wininet_Uk.rc (with props) Modified: trunk/reactos/dll/win32/wininet/rsrc.rc Modified: trunk/reactos/dll/win32/wininet/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/wininet/rsrc.rc (original) +++ trunk/reactos/dll/win32/wininet/rsrc.rc Sat Jun 24 20:24:25 2006 @@ -57,3 +57,4 @@ #include "wininet_Ru.rc" #include "wininet_Si.rc" #include "wininet_Tr.rc" +#include "wininet_Uk.rc" Added: trunk/reactos/dll/win32/wininet/wininet_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_Uk.rc (added) +++ trunk/reactos/dll/win32/wininet/wininet_Uk.rc Sat Jun 24 20:24:25 2006 @@ -1,0 +1,46 @@ +/* + * wininet.dll (Ukrainian resources) + * + * Copyright 2006 Artem Reznikov + * + * 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_UKRAINIAN, SUBLANG_DEFAULT + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ââåä³òü Ìåðåæíèé Ïàðîëü" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Áóäü ëàñêà, ââåä³òü Âàø³ ³ì'ÿ òà ïàðîëü:", -1, 40, 6, 150, 15 + LTEXT "Ïðîêñ³", -1, 40, 26, 50, 10 + LTEXT "Îáëàñòü", -1, 40, 46, 50, 10 + LTEXT "Êîðèñòóâà÷", -1, 40, 66, 50, 10 + LTEXT "Ïàðîëü", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Çáåðåãòè öåé ïàðîëü (íåáåçïå÷íî)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "Ï³äêëþ÷åííÿ ïî ëîêàëüí³é ìåðåæ³" +} Propchange: trunk/reactos/dll/win32/wininet/wininet_Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 22572: Ukrainian translation from temarez see bug 1624
by greatlrd＠svn.reactos.org 24 Jun '06

24 Jun '06

Author: greatlrd Date: Sat Jun 24 20:21:53 2006 New Revision: 22572 URL: http://svn.reactos.org/svn/reactos?rev=22572&view=rev Log: Ukrainian translation from temarez see bug 1624 Added: trunk/reactos/dll/win32/user32/Uk.rc (with props) Modified: trunk/reactos/dll/win32/user32/user32.rc Added: trunk/reactos/dll/win32/user32/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/Uk.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/user32/Uk.rc (added) +++ trunk/reactos/dll/win32/user32/Uk.rc Sat Jun 24 20:21:53 2006 @@ -1,0 +1,75 @@ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +///////////////////////////////////////////////////////////////////////////// +// +// Dialogs +// + +SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 +STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +FONT 8, "Bitstream Vera Sans" +CAPTION "Âèá³ð â³êíà" +BEGIN + LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL + PUSHBUTTON "&OK", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ñêàñóâàòè", 2, 120, 120, 40, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +///////////////////////////////////////////////////////////////////////////// +// +// Menus +// + +EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + POPUP "DUMMY" + BEGIN + MENUITEM "&Ñêàñóâàòè", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "&Âèð³çàòè", WM_CUT + MENUITEM "&Êîï³þâàòè", WM_COPY + MENUITEM "Âñò&àâèòè", WM_PASTE + MENUITEM "Â&èäàëèòè", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "Âèä³ëèòè âñ&å", EM_SETSEL + END +} + + +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + MENUITEM "&Â³äíîâèòè", 61728 + MENUITEM "Ï&åðåì³ñòèòè", 61456 + MENUITEM "Ðîç&ì³ð", 61440 + MENUITEM "Ç&ãîðíóòè", 61472 + MENUITEM "&Ðîçãîðíóòè", 61488 + MENUITEM SEPARATOR + MENUITEM "&Çàêðèòè\tAlt-F4", 61536 +} + +///////////////////////////////////////////////////////////////////////////// +// +// Strings +// + +STRINGTABLE +{ + IDS_ERROR, "Ïîìèëêà" + IDS_OK, "OK" + IDS_CANCEL, "Ñêàñóâàòè" + IDS_ABORT, "Ï&åðåðâàòè" + IDS_RETRY, "&Ïîâòîðèòè" + IDS_IGNORE, "Ïð&îïóñòèòè" + IDS_YES, "&Òàê" + IDS_NO, "Í&³" + IDS_HELP, "Äîâ³äêà" + IDS_TRYAGAIN, "Ïî&âòîðèòè" + IDS_CONTINUE, "&Ïðîäîâæèòè" +} + +STRINGTABLE +{ + IDS_MDI_MOREWINDOWS, "Óñ&³ â³êíà..." +} + Propchange: trunk/reactos/dll/win32/user32/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rc… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rc (original) +++ trunk/reactos/dll/win32/user32/user32.rc Sat Jun 24 20:21:53 2006 @@ -73,3 +73,4 @@ #include "Sv.rc" #include "Hu.rc" #include "Es.rc" +#include "Uk.rc"

1 0

[greatlrd] 22571: Update Ukrainian translation from temarez see bug 1624
by greatlrd＠svn.reactos.org 24 Jun '06

24 Jun '06

Author: greatlrd Date: Sat Jun 24 20:18:32 2006 New Revision: 22571 URL: http://svn.reactos.org/svn/reactos?rev=22571&view=rev Log: Update Ukrainian translation from temarez see bug 1624 Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Uk… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc Sat Jun 24 20:18:32 2006 @@ -1,5 +1,8 @@ /* + * Common Dialogs library (Ukrainian resources) + * * Copyright 2004 Ilya Korniyko + * Copyright 2006 Artem Reznikov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -142,7 +145,7 @@ GROUPBOX "&Çðàçîê",grp2,98,72,120,36,WS_GROUP CTEXT "ÀàÁáAaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Ñêðèïò:",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -294,6 +297,36 @@ CONTROL "Ë&àíäøàôò", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END +PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ïàðàìåòðè ñòîð³íêè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "Ïàï³ð", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&Ðîçì³ð:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "Ïîäà&÷à:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Îð³ºíòàö³ÿ", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Êíèæêîâàt", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Àëüáîìíà", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Ïîëÿ", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "&ë³âå:", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&ïðàâå:", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&âåðõíº:", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&íèæíº:", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "Ïðèí&òåð...", psh3, 184, 220, 48, 14 +END + NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN CAPTION "Â³äêðèòè" @@ -430,3 +463,13 @@ IDS_COLOR_AQUA "Àêâàìàðèí" IDS_COLOR_WHITE "Á³ëèé" } + +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "Îáåð³òü ðîçì³ð øðèôòó ì³æ %d òà %d ïò." + IDS_SAVE_BUTTON "& Çáåðåãòè" + IDS_SAVE_IN "Çáåðåãòè &â:" + IDS_SAVE "Çáåðåãòè" + IDS_SAVE_AS "Çáåðåãòè ÿê" + IDS_OPEN_FILE "Â³äêðèòè ôàéë" +}

1 0

[greatlrd] 22570: Update Ukrainian translation from temarez see bug 1624
by greatlrd＠svn.reactos.org 24 Jun '06

24 Jun '06

Author: greatlrd Date: Sat Jun 24 20:15:22 2006 New Revision: 22570 URL: http://svn.reactos.org/svn/reactos?rev=22570&view=rev Log: Update Ukrainian translation from temarez see bug 1624 Modified: trunk/reactos/base/setup/welcome/Uk.rc Modified: trunk/reactos/base/setup/welcome/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/Uk.rc?r… ============================================================================== --- trunk/reactos/base/setup/welcome/Uk.rc (original) +++ trunk/reactos/base/setup/welcome/Uk.rc Sat Jun 24 20:15:22 2006 @@ -65,7 +65,7 @@ /* Topic descriptions */ STRINGTABLE DISCARDABLE BEGIN - IDS_TOPICDESC0 "Ñòâîðåííÿ íîâî¿ ³íñòàëÿö³¿ ReactOS íà Âàøîìó êîìïþòåð³ ÷è îíîâëåííÿ ³ñíóþ÷î¿ ³íñòàëÿö³¿." + IDS_TOPICDESC0 "Ñòâîðåííÿ íîâî¿ ³íñòàëÿö³¿ ReactOS íà Âàøîìó êîìï'þòåð³ ÷è îíîâëåííÿ ³ñíóþ÷î¿ ³íñòàëÿö³¿." IDS_TOPICDESC1 "Ïðîãëÿíóòè CD." IDS_TOPICDESC2 "Íàòèñí³òü äëÿ âèõîäó ç ö³º¿ ïðîãðàìè." // IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."

1 0

[ion] 22569: - Fix boot
by ion＠svn.reactos.org 24 Jun '06

24 Jun '06

Author: ion Date: Sat Jun 24 20:05:37 2006 New Revision: 22569 URL: http://svn.reactos.org/svn/reactos?rev=22569&view=rev Log: - Fix boot Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Sat Jun 24 20:05:37 2006 @@ -358,7 +358,6 @@ ULONG CFlushSize; UCHAR PrcbPad0[88]; #else - ULONG CFlushSize; UCHAR PrcbPad0[92]; #endif KSPIN_LOCK_QUEUE LockQueue[LockQueueMaximumLock];

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