[hbelusca] 63545: [CONSRV] - Rename a macro to something meaningful. - Localize selection type strings.
Author: hbelusca Date: Fri Jun 6 21:05:59 2014 New Revision: 63545
URL: http://svn.reactos.org/svn/reactos?rev=63545&view=rev Log: [CONSRV] - Rename a macro to something meaningful. - Localize selection type strings.
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -731,8 +731,8 @@
if ((GuiData->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) == 0) { - LPWSTR SelectionType, WindowTitle = NULL; - SIZE_T Length = 0; + LPWSTR SelTypeStr = NULL , WindowTitle = NULL; + SIZE_T SelTypeStrLength = 0, Length = 0;
/* Clear the old selection */ if (GuiData->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) @@ -740,21 +740,34 @@ InvalidateRect(GuiData->hWindow, &oldRect, FALSE); }
- if (GuiData->Selection.dwFlags & CONSOLE_MOUSE_SELECTION) - { - SelectionType = L"Selection - "; - } - else - { - SelectionType = L"Mark - "; - } - - Length = Console->Title.Length + wcslen(SelectionType) + 1; - WindowTitle = ConsoleAllocHeap(0, Length * sizeof(WCHAR)); - wcscpy(WindowTitle, SelectionType); - wcscat(WindowTitle, Console->Title.Buffer); - SetWindowText(GuiData->hWindow, WindowTitle); - ConsoleFreeHeap(WindowTitle); + /* + * When passing a zero-length buffer size, LoadString(...) returns + * a read-only pointer buffer to the program's resource string. + */ + SelTypeStrLength = + LoadStringW(ConSrvDllInstance, + (GuiData->Selection.dwFlags & CONSOLE_MOUSE_SELECTION) + ? IDS_SELECT_TITLE : IDS_MARK_TITLE, + (LPWSTR)&SelTypeStr, 0); + + /* + * Prepend the selection type string to the current console title + * if we succeeded in retrieving a valid localized string. + */ + if (SelTypeStr) + { + // 3 for " - " and 1 for NULL + Length = Console->Title.Length + (SelTypeStrLength + 3 + 1) * sizeof(WCHAR); + WindowTitle = ConsoleAllocHeap(0, Length); + + wcsncpy(WindowTitle, SelTypeStr, SelTypeStrLength); + WindowTitle[SelTypeStrLength] = L'\0'; + wcscat(WindowTitle, L" - "); + wcscat(WindowTitle, Console->Title.Buffer); + + SetWindowText(GuiData->hWindow, WindowTitle); + ConsoleFreeHeap(WindowTitle); + }
GuiData->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS; ConioPause(Console, PAUSED_FROM_SELECTION); @@ -771,6 +784,7 @@ GuiData->Selection.dwFlags = CONSOLE_NO_SELECTION; ConioUnpause(Console, PAUSED_FROM_SELECTION);
+ /* Restore the console title */ SetWindowText(GuiData->hWindow, Console->Title.Buffer); } } @@ -1305,10 +1319,7 @@
if (GetType(Buffer) == TEXTMODE_BUFFER) { -#ifdef IS_WHITESPACE -#undef IS_WHITESPACE -#endif -#define IS_WHITESPACE(c) \ +#define IS_WORD_SEP(c) \ ((c) == L'\0' || (c) == L' ' || (c) == L'\t' || (c) == L'\r' || (c) == L'\n')
PTEXTMODE_SCREEN_BUFFER TextBuffer = (PTEXTMODE_SCREEN_BUFFER)Buffer; @@ -1320,15 +1331,15 @@ ptrL = ptrR = ConioCoordToPointer(TextBuffer, cL.X, cL.Y);
/* Enlarge the selection by checking for whitespace */ - while ((0 < cL.X) && !IS_WHITESPACE(ptrL->Char.UnicodeChar) - && !IS_WHITESPACE((ptrL-1)->Char.UnicodeChar)) + while ((0 < cL.X) && !IS_WORD_SEP(ptrL->Char.UnicodeChar) + && !IS_WORD_SEP((ptrL-1)->Char.UnicodeChar)) { --cL.X; --ptrL; } while ((cR.X < TextBuffer->ScreenBufferSize.X - 1) && - !IS_WHITESPACE(ptrR->Char.UnicodeChar) && - !IS_WHITESPACE((ptrR+1)->Char.UnicodeChar)) + !IS_WORD_SEP(ptrR->Char.UnicodeChar) && + !IS_WORD_SEP((ptrR+1)->Char.UnicodeChar)) { ++cR.X; ++ptrR;
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Eingabeaufforderung" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Marquage" + IDS_SELECT_TITLE "Sélection" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -30,3 +30,9 @@ */ IDS_TERMINAL_TITLE "Konsola ReactOS" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "Consola ReactOS" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -27,3 +27,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -18,17 +18,18 @@ #define ID_SYSTEM_DEFAULTS 0xFFF6 #define ID_SYSTEM_PROPERTIES 0xFFF7
-#define NCPOPUP_MENU 103 +#define IDS_EDIT 204 +#define IDS_MARK 205 +#define IDS_COPY 206 +#define IDS_PASTE 207 +#define IDS_SELECTALL 208 +#define IDS_SCROLL 209 +#define IDS_FIND 210 +#define IDS_DEFAULTS 211 +#define IDS_PROPERTIES 212
-#define IDS_EDIT 204 -#define IDS_MARK 205 -#define IDS_COPY 206 -#define IDS_PASTE 207 -#define IDS_SELECTALL 208 -#define IDS_SCROLL 209 -#define IDS_FIND 210 -#define IDS_DEFAULTS 211 -#define IDS_PROPERTIES 212 +#define IDS_MARK_TITLE 220 +#define IDS_SELECT_TITLE 221
// Scrollbar resource ids. Unused. /*
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -59,9 +59,6 @@ GuiData->Selection.srSelection.Right, GuiData->Selection.srSelection.Bottom);
-#ifdef IS_WHITESPACE -#undef IS_WHITESPACE -#endif #define IS_WHITESPACE(c) ((c) == L'\0' || (c) == L' ' || (c) == L'\t')
/* Basic size for one line... */
-
hbelusca＠svn.reactos.org