[ros-diffs] [dreimer] 44684: Sync reg, xcopy, wordpad and winhlp32 to Wine 1.1.35. Add recent rc file changes in servman to all languages.

Author: dreimer
Date: Mon Dec 21 17:40:25 2009
New Revision: 44684

URL: http://svn.reactos.org/svn/reactos?rev=44684&view=rev
Log:
Sync reg, xcopy, wordpad and winhlp32 to Wine 1.1.35.
Add recent rc file changes in servman to all languages.

Modified:
    trunk/reactos/base/applications/cmdutils/reg/Ru.rc
    trunk/reactos/base/applications/cmdutils/reg/reg.c
    trunk/reactos/base/applications/cmdutils/xcopy/De.rc
    trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc
    trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc
    trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc
    trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc
    trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc
    trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc
    trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc
    trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc
    trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc
    trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc
    trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc
    trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc
    trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc
    trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc
    trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc
    trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc
    trunk/reactos/base/applications/winhlp32/hlpfile.c
    trunk/reactos/base/applications/winhlp32/winhelp.c
    trunk/reactos/base/applications/wordpad/wordpad.c

Modified: trunk/reactos/base/applications/cmdutils/reg/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/Ru.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/Ru.rc [iso-8859-1] Mon Dec 21 17:40:25
2009
@@ -31,4 +31,9 @@
     STRING_ADD_USAGE, "REG ADD <ключ> [/v <параметр> | /ve]
[/t <тип>] [/s <разделитель>] [/d данные] [/f]\n"
     STRING_DELETE_USAGE, "REG DELETE <ключ> [/v <параметр> |
/ve | /va] [/f]\n"
     STRING_QUERY_USAGE, "REG QUERY <ключ> [/v <параметр> |
/ve] [/s]\n"
+    STRING_SUCCESS, "Операция успешно завершена\n"
+    STRING_INVALID_KEY, "Ошибка: неправильное имя
ключа\n"
+    STRING_INVALID_CMDLINE, "Ошибка: неправильные
параметры командной строки\n"
+    STRING_NO_REMOTE, "Ошибка: невозможно добавить
ключи на удаленной машине\n"
+    STRING_CANNOT_FIND, "Ошибка: не удалось найти
указанный ключ реестра или значение\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] Mon Dec 21 17:40:25
2009
@@ -280,13 +280,6 @@
         DWORD count;
         LONG rc;
 
-        if (value_name)
-        {
-            RegCloseKey(subkey);
-            reg_message(STRING_INVALID_CMDLINE);
-            return 1;
-        }
-
         rc = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
             &maxValue, NULL, NULL, NULL);
         if (rc != ERROR_SUCCESS)
@@ -296,9 +289,7 @@
             return 1;
         }
         maxValue++;
-        
         szValue = HeapAlloc(GetProcessHeap(),0,maxValue*sizeof(WCHAR));
-        if (!szValue) return 1;
 
         while (1)
         {
@@ -306,14 +297,12 @@
             rc = RegEnumValueW(subkey, 0, szValue, &count, NULL, NULL, NULL, NULL);
             if (rc == ERROR_SUCCESS)
             {
-                rc = RegDeleteValueW(subkey,szValue);
+                rc = RegDeleteValueW(subkey, szValue);
                 if (rc != ERROR_SUCCESS)
                     break;
             }
             else break;
         }
-        
-        HeapFree(GetProcessHeap(), 0, szValue); 
         if (rc != ERROR_SUCCESS)
         {
             /* FIXME  delete failed */

Modified: trunk/reactos/base/applications/cmdutils/xcopy/De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] Mon Dec 21 17:40:25
2009
@@ -75,7 +75,7 @@
 [/C]  Nach Fehlern den Kopiervorgang fortsetzen\n\
 [/A]  Nur Dateien mit Archivbit kopieren\n\
 [/M]  Nur Dateien mit Archivbit kopieren, danach Archivbit löschen\n\
-[/D | /D:m-d-y] Kopiere neue Dateien und Dateien, die neuer als das\n\
+[/D | /D:M-T-J] Kopiere neue Dateien und Dateien, die neuer als das\n\
 \t\tangegebene Datum sind. Wird kein Datum angegegebn, werden nur\n\
 \t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n"
 

Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -107,8 +107,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
 /*  LTEXT "Some services depend on other services, system drivers and load order
groups. If a system component is stopped or it is not running properly, dependant services
can be affected.", IDC_STATIC,8, 7, 238, 26 */
   LTEXT "Íÿêîè óñëóãè çàâèñÿò îò äðóãè óñëóãè, âîäà÷è (driver) è çàðåæäàò äðóãè
ãðóïè. Àêî íÿêîÿ ñèñòåìíà ñúñòàâêà å ñïðÿíà èëè íå ðàáîòè ïðàâèëíî, çàâèñèìèòå îò íåÿ
óñëóãè ìîæå äà áúäàò çàñåãíàòè.", IDC_STATIC,8, 7, 238, 26
   LTEXT "Òàçè óñëóãà çàâèñè îò ñëåäíèòå ñúñòàâêè", IDC_STATIC, 8, 57, 236, 9

Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -106,8 +106,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "Einige Dienste sind von anderen Diensten, Systemtreibern und Ladegruppen
abhängig. Falls eine Systemkomponente anhält oder nicht einwandfrei ausgeführt wird, kann
dies Auswirkungen auf abhängige Dienste haben.", IDC_STATIC,8, 7, 238, 38
   LTEXT "Dieser Dienst ist von diesen Systemkomponenten abhängig", IDC_STATIC,
8, 57, 236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -106,8 +106,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "Some services depend on other services, system drivers and load order
groups. If a system component is stopped or it is not running properly, dependant services
can be affected.", IDC_STATIC,8, 7, 238, 26
   LTEXT "This service depends on the following components", IDC_STATIC, 8, 57,
236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -106,8 +106,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "Algunos servicios dependen de otros servicios, controladores de sistemas y
grupos de orden de carga. Si un componente de sistema se detiene o no funciona
correctamente, es posible que otros servicios dependientes resulten afectados.",
IDC_STATIC,8, 7, 238, 26
   LTEXT "Este servicio depende de los siguientes componentes", IDC_STATIC, 8,
57, 236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -107,8 +107,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "Certains services dépendent d'autres services, pilotes système et
groupes d'ordre de chargement. Si un composant système est arrêté ou ne fonctionne pas
correctement, les services dépendants peuvent être affectés.", IDC_STATIC,8, 7, 238,
36
   LTEXT "Ce service dépend des composants système suivants", IDC_STATIC, 8, 57,
236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -106,8 +106,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "Beberapa layanan bergantung pada layanan lainnya, driver sistem dan grup
urutan pengambilan. Jika komponen sistem dihentikan atau tidak berjalan dengan benar,
layanan yang bergantung akan dipengaruhi.", IDC_STATIC,8, 7, 238, 26
   LTEXT "Layanan ini tergantun pada komponen berikut", IDC_STATIC, 8, 57, 236,
9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -106,8 +106,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "Alcuni servizi dipendono da altri servizi, driver di sistema e gruppi di
ordine di caricamento. Se un componente di sistema viene fermato o non sta funzionando
regolarmente, i servizi dipendenti possono venire influenzati.", IDC_STATIC,8, 7,
238, 26
   LTEXT "Questo servizio dipende dai seguenti componenti", IDC_STATIC, 8, 57,
236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -106,8 +106,8 @@
 FONT 9, "MS UI Gothic",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "‘¼‚̃T[ƒrƒXAƒVƒXƒeƒ€
ƒhƒ‰ƒCƒoA“ǂݍž‚ݏ‡ƒOƒ‹[ƒv‚ȂǂɈˑ¶‚µ‚Ä‚¢‚éƒT[ƒrƒX‚ª‚ ‚è‚Ü‚·BƒVƒXƒeƒ€
ƒRƒ“ƒ|[ƒlƒ“ƒg‚ª’âŽ~‚·‚é‚©A‚Ü‚½‚͐³í‚ÉŽÀs‚³‚ê‚È‚¢ê‡AˆË‘¶‚·‚éƒT[ƒrƒX‚ª‰e‹¿‚³‚ê‚Ä‚¢‚éê‡‚ª‚ ‚è‚Ü‚·B",
IDC_STATIC,8, 7, 238, 26
   LTEXT "‚±‚̃T[ƒrƒX‚ªˆË‘¶‚·‚éƒRƒ“ƒ|[ƒlƒ“ƒg", IDC_STATIC, 8, 57, 236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -109,8 +109,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "ÀϺΠ¼­ºñ½º´Â ´Ù¸¥ ¼­ºñ½º³ª ½Ã½ºÅÛ µå¶óÀ̹ö, ±×·ì µî¿¡ Á¾¼ÓµÇ¾î ÀÖ½À´Ï´Ù.
¸¸¾à ½Ã½ºÅÛ ÄÄÆ÷³ÍÆ®°¡ Á¤ÁöµÇ¾ú°Å³ª Á¦´ë·Î µ¿ÀÛÇÏÁö ¾Ê´Â´Ù¸é, Á¾¼ÓµÈ ¼­ºñ½º¿¡ ¿µÇâÀ» ³¢Ä¥
¼ö ÀÖ½À´Ï´Ù.", IDC_STATIC,8, 7, 238, 26
   LTEXT "ÀÌ ¼­ºñ½º´Â ´ÙÀ½ ÄÄÆ÷³ÍÆ®¿¡ Á¾¼ÓµÇ¾î ÀÖ½À´Ï´Ù.", IDC_STATIC, 8, 57,
236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -106,8 +106,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "Noen tjenester depend på andre tjenester, system drivere og laster system
grupper. Hvis system komponenten er stoppet eller ikke kjøre riktig, dependant services
can be affected.", IDC_STATIC,8, 7, 238, 26
   LTEXT "Denne tjenesten depends på følgende komponenter", IDC_STATIC, 8, 57,
236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -113,8 +113,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "Niektóre us³ugi s¹ zale¿ne od innych us³ug, sterowników systemowych i grup
kolejnoœci ³adowania. Je¿eli sk³adnik systemu jest zatrzymany lub nie dzia³a prawid³owo,
mo¿e to mieæ.", IDC_STATIC,8, 7, 238, 26
   LTEXT "Ta us³uga jest zale¿na od nastêpuj¹cych sk³adników systemu",
IDC_STATIC, 8, 57, 236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -108,8 +108,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "Unele servicii depind de alte servicii sau drivere de sistem și încarcă
alte grupuri. Dacă o componentă de sistem a oprit un astfel de serviciu sau dacă acesta
nu funcționează corect, serviciile care depind de el pot avea probleme.",
IDC_STATIC,8, 7, 238, 26
   LTEXT "Acest serviciu depinde de următoarele componente:", IDC_STATIC, 8,
57, 236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -105,8 +105,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL
"",IDC_DEPEND_TREE1,"SysTreeView32",0x50010007,8,70,236,68,0x00000200
-  CONTROL
"",IDC_DEPEND_TREE2,"SysTreeView32",0x50010007,8,151,234,67,0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "Íåêîòîðûå ñëóæáû çàâèñÿò îò äðóãèõ. Åñëè ñëóæáà îñòàíîâëåíà èëè íåïðàâèëüíî
ðàáîòàåò, ýòî îòðàæàåòñÿ íà çàâèñèìûõ îò íåå ñëóæáàõ.", IDC_STATIC,8, 7, 238, 26
   LTEXT "Ýòà ñëóæáà çàâèñèò îò ñëåäóþùèõ êîìïîíåíòîâ:", IDC_STATIC, 8, 59, 236,
9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -111,8 +111,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "Some services depend on other services, system drivers and load order
groups. If a system component is stopped or it is not running properly, dependant services
can be affected.", IDC_STATIC,8, 7, 238, 26
   LTEXT "This service depends on the following components", IDC_STATIC, 8, 57,
236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -115,8 +115,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "¡ÒÃãËéºÃÔ¡ÒúҧÍÂèÒ§¢Ö鹡ѺºÃÔ¡ÒÃÍ×è¹æ´éÇÂ, µÑǢѺà¤Å×è͹¢Í§Ãкº
áÅСÒô֧¢éÍÁÙŵÒÁÅӴѺ¡ÅØèÁ ¶éÒÊèǹ»ÃСͺµèÒ§æ¢Í§ÃкºËÂØ´·Ó§Ò¹Å§ ËÃ×ÍäÁè·Ó§Ò¹µÒÁÊÁ¤ÇÃ
¡ÒÃãËéºÃÔ¡ÒÃẺäÁè¡Ó˹´àͧ¨ÐÁռŷѹ·Õ", IDC_STATIC,8, 7, 238, 26
   LTEXT "¡ÒÃãËéºÃÔ¡ÒùÕé¢Öé¹ÍÂÙè¡ÑºÊèǹ»ÃСͺÍ×è¹æ·ÕèµÒÁÁÒ´éÇÂ", IDC_STATIC, 8,
57, 236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc [iso-8859-1] Mon Dec 21
17:40:25 2009
@@ -114,8 +114,8 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME |
WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70,
236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151,
234, 67, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 70, 236, 68
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER |
WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT
| TVS_DISABLEDRAGDROP, 8, 151, 234, 67
   LTEXT "Äåÿê³ ñëóæáè çàëåæàòü â³ä ³íøèõ ñëóæá, ñèñòåìíèõ äðàéâåð³â àáî ñïèñêó
çàâàíòàæåííÿ ãðóï ñëóæá. ßêùî ñëóæáà çóïèíåíà àáî íåïðàâèëüíî ïðàöþº, öå âïëèâຠíà
çàëåæí³ â³ä íå¿ ñëóæáè.", IDC_STATIC,8, 7, 238, 26
   LTEXT "Öÿ ñëóæáà çàëåæèòü â³ä íàñòóïíèõ êîìïîíåíò³â", IDC_STATIC, 8, 57, 236,
9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] Mon Dec 21 17:40:25
2009
@@ -797,28 +797,34 @@
          */
         str += strlen(str) + 1;     /* skip hotspot name */
 
+        hslink = NULL;
         switch (start[7 + 15 * i + 0])
         /* The next two chars always look like 0x04 0x00 ???
          * What are they for ?
          */
         {
+        case 0xC8:
+            hslink = (HLPFILE_HOTSPOTLINK*)
+                HLPFILE_AllocLink(rd, hlp_link_macro, str, -1, 0, 0, 1, -1);
+            break;
+
         case 0xE6:
         case 0xE7:
             hslink = (HLPFILE_HOTSPOTLINK*)
                 HLPFILE_AllocLink(rd, (start[7 + 15 * i + 0] & 1) ? hlp_link_link :
hlp_link_popup,
                                   file->lpszPath, -1, HLPFILE_Hash(str),
                                   0, 1, -1);
-            if (hslink)
-            {
-                hslink->x      = GET_USHORT(start, 7 + 15 * i + 3);
-                hslink->y      = GET_USHORT(start, 7 + 15 * i + 5);
-                hslink->width  = GET_USHORT(start, 7 + 15 * i + 7);
-                hslink->height = GET_USHORT(start, 7 + 15 * i + 9);
-                /* target = GET_UINT(start, 7 + 15 * i + 11); */
-            }
             break;
         default:
             WINE_FIXME("unknown hotsport target 0x%x\n", start[7 + 15 * i +
0]);
+        }
+        if (hslink)
+        {
+            hslink->x      = GET_USHORT(start, 7 + 15 * i + 3);
+            hslink->y      = GET_USHORT(start, 7 + 15 * i + 5);
+            hslink->width  = GET_USHORT(start, 7 + 15 * i + 7);
+            hslink->height = GET_USHORT(start, 7 + 15 * i + 9);
+            /* target = GET_UINT(start, 7 + 15 * i + 11); */
         }
         str += strlen(str) + 1;
     }

Modified: trunk/reactos/base/applications/winhlp32/winhelp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Mon Dec 21 17:40:25
2009
@@ -541,6 +541,7 @@
 {
     WINHELP_WINDOW**    w;
     BOOL bExit;
+    HWND hTextWnd;
 
     for (w = &Globals.win_list; *w; w = &(*w)->next)
     {
@@ -561,6 +562,10 @@
 
     if (win == Globals.active_popup)
         Globals.active_popup = NULL;
+
+    hTextWnd = GetDlgItem(win->hMainWnd, CTL_ID_TEXT);
+    SetWindowLongPtr(hTextWnd, GWLP_WNDPROC,
+                     (LONG_PTR)win->origRicheditWndProc);
 
     WINHELP_DeleteButtons(win);
 

Modified: trunk/reactos/base/applications/wordpad/wordpad.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Mon Dec 21 17:40:25
2009
@@ -1280,6 +1280,13 @@
 static void dialog_find(LPFINDREPLACEW fr, BOOL replace)
 {
     static WCHAR findBuffer[MAX_STRING_LEN];
+
+    /* Allow only one search/replace dialog to open */
+    if(hFindWnd != NULL)
+    {
+        SetActiveWindow(hFindWnd);
+        return;
+    }
 
     ZeroMemory(fr, sizeof(FINDREPLACEW));
     fr->lStructSize = sizeof(FINDREPLACEW);