Autosyncing with Wine HEAD

svn path=/trunk/; revision=34337

reactos/dll/win32/comdlg32/cdlg.h

@@ -177,6 +177,7 @@ extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILCombine)(LPCITEMIDLIST,LPCITEMIDLIS
 extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILGetNext)(LPITEMIDLIST);
 extern BOOL (WINAPI *COMDLG32_PIDL_ILRemoveLastID)(LPCITEMIDLIST);
 extern BOOL (WINAPI *COMDLG32_PIDL_ILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
+extern UINT (WINAPI *COMDLG32_PIDL_ILGetSize)(LPCITEMIDLIST);
 
 /* SHELL */
 extern LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD);

reactos/dll/win32/comdlg32/cdlg32.c

@@ -47,6 +47,7 @@ LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILCombine)(LPCITEMIDLIST,LPCITEMIDLIST);
 LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILGetNext)(LPITEMIDLIST);
 BOOL (WINAPI *COMDLG32_PIDL_ILRemoveLastID)(LPCITEMIDLIST);
 BOOL (WINAPI *COMDLG32_PIDL_ILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
+UINT (WINAPI *COMDLG32_PIDL_ILGetSize)(LPCITEMIDLIST);
 
 /* SHELL */
 LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD);
@@ -95,6 +96,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
 		GPA(COMDLG32_PIDL_ILGetNext, SHELL32_hInstance, (LPCSTR)153L);
 		GPA(COMDLG32_PIDL_ILClone, SHELL32_hInstance, (LPCSTR)18L);
 		GPA(COMDLG32_PIDL_ILRemoveLastID, SHELL32_hInstance, (LPCSTR)17L);
+		GPA(COMDLG32_PIDL_ILGetSize, SHELL32_hInstance, (LPCSTR)152L);
 
 		/* SHELL */
 

reactos/dll/win32/comdlg32/cdlg_Bg.rc

@@ -47,7 +47,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Съхрани като ..."
+CAPTION "Съхрани като..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Име на файл:", 1090, 6, 6, 76, 9
@@ -371,7 +371,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "Файлът не съществува.\nИскате ли да го създадете?"
     IDS_OVERWRITEFILE       "Файлът вече съществува.\nИскате ли да го замените?"
     IDS_INVALID_FILENAME_TITLE "Невалидни знаци в пътя"
-    IDS_INVALID_FILENAME    "Името на файла не може да съдържа следните символи: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Името на файла не може да съдържа следните символи:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Пътят не съществува"
     IDS_FILENOTEXISTING     "Файлът не съществува"
 }

reactos/dll/win32/comdlg32/cdlg_Ca.rc

@@ -40,7 +40,7 @@ FONT 8, "MS Shell Dlg"
  DEFPUSHBUTTON "D'acord", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Anul·lació", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Només &lectura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Només &lectura", 1040, 208, 68, 60, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
 
@@ -62,7 +62,7 @@ FONT 8, "MS Shell Dlg"
  DEFPUSHBUTTON "D'acord", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Anul·lació", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Fer-ne còpia", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Fer-ne còpia", 1040, 208, 68, 60, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
 
@@ -95,9 +95,9 @@ CAPTION "Configuraci
 FONT 8, "MS Shell Dlg"
 {
  GROUPBOX "Impressora:", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "Impressora per &defecte", 1056, 16, 20, 80, 12
+ RADIOBUTTON "Impressora per &defecte", 1056, 16, 20, 90, 12
  LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Impressora &especificada:", 1057, 16, 50, 80, 12
+ RADIOBUTTON "Impressora &especificada:", 1057, 16, 50, 90, 12
  COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  DEFPUSHBUTTON "D'acord", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Anul·lació", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
@@ -126,7 +126,7 @@ FONT 8, "MS Shell Dlg"
     LTEXT           "&Estil del tipus de lletra:",1089 ,108,3,44,9
     COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Grandària:",1090,179,3,30,9
+    LTEXT           "&Grandària:",1090,179,3,33,9
     COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
     DEFPUSHBUTTON   "D'acord",IDOK,218,6,40,14,WS_GROUP
@@ -135,7 +135,7 @@ FONT 8, "MS Shell Dlg"
     PUSHBUTTON      "A&juda" , 1038,218,57,40,14,WS_GROUP
     GROUPBOX        "Efectes",1072,6,72,84,34,WS_GROUP
     CHECKBOX        "&Barrar-lo", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX        "&Subratllar-lo", 1041, 10,94,50,10, BS_AUTOCHECKBOX
+    CHECKBOX        "&Subratllar-lo", 1041, 10,94,60,10, BS_AUTOCHECKBOX
     LTEXT           "&Color:", 1091 ,6,110,30,9
     COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
                     CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
@@ -189,7 +189,7 @@ FONT 8, "MS Shell Dlg"
  LTEXT "&Cercar:",  -1, 4, 8, 42, 8
  EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
  CHECKBOX "C&ercar mots sencers", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Distingir majúscules de minúscules", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "&Distingir majúscules de minúscules", 1041, 4, 42, 124, 12, BS_AUTOCHECKBOX | WS_TABSTOP
  GROUPBOX "Direcció", 1072, 107, 26, 68, 28
  CONTROL "&Amunt", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
  CONTROL "A&vall", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
@@ -206,10 +206,10 @@ FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Cercar:", -1, 4, 9, 48, 8
  EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "&Substituir per:", 1090, -1, 4, 26, 48, 8
+ LTEXT "&Substituir per:", -1, 4, 26, 48, 8
  EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
  CHECKBOX "Cercar &mots sencers", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Distingir majúscules de minúscules", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "&Distingir majúscules de minúscules", 1041, 5, 62, 129, 12, BS_AUTOCHECKBOX | WS_TABSTOP
  DEFPUSHBUTTON "C&ontinucació", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "S&ubstitució", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Substitució &automàtica", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP

reactos/dll/win32/comdlg32/cdlg_Cn.rc

@@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "另存为 ..."
+CAPTION "另存为..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "文件名(&N):", 1090, 6, 6, 76, 9
@@ -370,7 +370,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "找不到文件\n是否创建新文件?"
     IDS_OVERWRITEFILE       "文件已经存在。\n要替换吗?"
     IDS_INVALID_FILENAME_TITLE "文件名中存在无效的字符"
-    IDS_INVALID_FILENAME    "文件名中不能包含任何一下字符:: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "文件名中不能包含任何一下字符::\n                          / : < > |"
     IDS_PATHNOTEXISTING     "文件夹不存在"
     IDS_FILENOTEXISTING     "文件不存在"
 }

reactos/dll/win32/comdlg32/cdlg_Cs.rc

@@ -119,7 +119,7 @@ FONT 8, "MS Shell Dlg"
 }
 
 
-CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 13, 54, 264, 147
+CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Písmo"
 FONT 8, "MS Shell Dlg"
@@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg"
 }
 
 
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 185
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Barvy"
 FONT 8, "MS Shell Dlg"
@@ -163,11 +163,11 @@ FONT 8, "MS Shell Dlg"
  EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT "&Zelená:",727/*1095*/,249,140,24,10
  EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "&Modrá:", 1096, 150, 166, 40, 9
+ LTEXT "&Modrá:", 728, 249, 154, 24, 10
  EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT "&Odstín:" , 723 /*1091*/,202,126,22,10
  EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "&Sytost:" , 1092, 150, 146, 40, 9
+ LTEXT "&Sytost:" , 724, 202, 140, 22, 10
  EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT "&Jas:" , 725 /*1093*/,202,154,22,10
  EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
@@ -373,7 +373,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "Soubor neexistuje.\nChcete ho vytvoøit ?"
     IDS_OVERWRITEFILE       "Soubor již existuje.\nChcete ho pøepsat novým ?"
     IDS_INVALID_FILENAME_TITLE "Nedovolený(é) znak(y) v cestì k souboru."
-    IDS_INVALID_FILENAME    "Název souboru nesmí obsahovat žádný z následujících znaků: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Název souboru nesmí obsahovat žádný z následujících znaků:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Adresáø neexistuje"
     IDS_FILENOTEXISTING     "Soubor neexistuje"
 }

reactos/dll/win32/comdlg32/cdlg_Da.rc

@@ -1,5 +1,6 @@
 /*
  * Copyright 1995 Morten Welinder
+ * Copyright 2008 Jens Albretsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -46,7 +47,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Gem som ..."
+CAPTION "Gem som..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Filnavn:", 1090, 6, 6, 76, 9
@@ -206,14 +207,278 @@ CAPTION "Erstat"
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Find hvad:",  -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT "&Erstat med:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Kun hele ord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "&Kun hele ord", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Forskel på store/små &bogstaver", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "Forskel på store/små &bogstaver", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- DEFPUSHBUTTON "&Find næste", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+
- PUSHBUTTON "&Erstat", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "&Find næste", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "Erstat &alle", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Erstat", psh1      , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuller", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Erstat &alle", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjælp", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuller", IDCANCEL         , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjælp", pshHelp    , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Udskriv"
+FONT 8, "MS Shell Dlg"
+{
+    DEFPUSHBUTTON   "OK",     IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Annuller", IDCANCEL, 232,164, 48,14, WS_GROUP
+    PUSHBUTTON      "&Hjælp",  pshHelp,  50, 161, 48,14, WS_GROUP
+
+    GROUPBOX        "Printer",        grp4,   8,  4, 272,84, WS_GROUP
+    CONTROL         "Udskriv til fi&l",chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+    PUSHBUTTON      "&Egenskaber",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Navn:",         stc6,  16, 20,  46,8
+    COMBOBOX                          cmb4,  62, 18, 142,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Status:",        stc8,  16, 36,  46,10, SS_NOPREFIX
+    LTEXT           "Dummy State",    stc12, 62, 36, 214,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Type:",          stc7,  16, 48,  46,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",     stc11, 62, 48, 214,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Hvor:",          stc10, 16, 60,  46,10, SS_NOPREFIX
+    LTEXT           "Dummy Location", stc14, 62, 60, 214,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Kommentar:",     stc9,  16, 72,  46,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",   stc13, 62, 72, 142,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Kopier",         grp2, 160, 92, 120,64, WS_GROUP
+    LTEXT           "Antal &kopier:", stc5,168,108,68,8
+    ICON            "",               ico3, 161,124,  76,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "&hold sammen",   chx2,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP,237,124,38,24
+    EDITTEXT                          edt3, 237,106,  35,12, WS_GROUP | ES_NUMBER
+
+    GROUPBOX        "Udskriv område", grp1,   8,92,  144,64, WS_GROUP
+    CONTROL         "&Alle"           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "Si&der",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+    CONTROL         "&Markeret",      rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+    EDITTEXT                          edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
+    EDITTEXT                          edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
+    RTEXT           "&fra:" ,         stc2,  52,124,  20,8
+    RTEXT           "&til:",          stc3, 100,124,  16,8
+}
+
+PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Printer Indstillinger"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
+    PUSHBUTTON      "Annuller",IDCANCEL,232,156,48,14
+/*    PUSHBUTTON      "Netværk...", psh5, 284,156,48,14 */
+
+    GROUPBOX        "Printer",        grp4,   8,  4, 272,84, WS_GROUP
+    PUSHBUTTON      "&Egenskaber",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Navn:",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Status:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Type:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Hvor:",          stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Kommentar:",     stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Papir",          grp2,   8, 92, 164,56, WS_GROUP
+    LTEXT           "Størrelse:",     stc2,  16,108,  36, 8
+    COMBOBOX                          cmb2,  52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "&Kilde:",        stc3,  16,128,  36, 8
+    COMBOBOX                          cmb3,  52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+
+    GROUPBOX        "Orientering",    grp1, 180, 92, 100,56, WS_GROUP
+    ICON            "",               ico1, 195,112,  18,20, WS_GROUP
+    CONTROL         "P&ortræt",       rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+    CONTROL         "L&andskab",      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 "Papir opsætning"
+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 "Papir", grp2, 8, 96, 224, 56, BS_GROUPBOX
+  LTEXT "&Størrelse:", stc2, 16, 112, 36, 8
+  COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+  LTEXT "&Bakke:", stc3, 16, 132, 36, 8
+  COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+  GROUPBOX "Orientering", grp1, 8, 156, 64, 56, BS_GROUPBOX
+  AUTORADIOBUTTON "&Portræt", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
+  AUTORADIOBUTTON "&Landskab", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
+  GROUPBOX "Kanter", grp4, 80, 156, 152, 56, BS_GROUPBOX
+  LTEXT "&Venstre:", stc15, 88, 172, 21, 8
+  EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+  LTEXT "&Højre:", stc16, 159, 172, 27, 8
+  EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+  LTEXT "T&op:", stc17, 88, 192, 21, 8
+  EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+  LTEXT "&Bund:", 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 "Annuller", IDCANCEL, 126, 220, 50, 14
+  PUSHBUTTON "P&rinter...", 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 "Åben"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT	"Kig &i:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
+    COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+
+    LTEXT	"" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
+    LISTBOX	IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
+
+    LTEXT	"&Filnavn:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+    EDITTEXT	IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
+
+    LTEXT	"Fil&type:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
+    COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+    CONTROL	"Åben &skrivebeskyttet",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+
+    DEFPUSHBUTTON	"&Åben",		 IDOK,222,110,50,14
+    PUSHBUTTON		"Annuler",		 IDCANCEL,222,128,50,14
+    PUSHBUTTON		"&Hjælp",		 pshHelp,222,145,50,14
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_ABOUTBOX            "&Om FolderPicker Test"
+    IDS_DOCUMENTFOLDERS     "Dokument foldere"
+    IDS_PERSONAL            "Mine dokumenter"
+    IDS_FAVORITES           "Mine favoriter"
+    IDS_PATH                "System sti"
+    IDS_DESKTOP             "Skrivebord"
+    IDS_FONTS               "Skrifttype"
+    IDS_MYCOMPUTER          "Min computer"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_SYSTEMFOLDERS       "System foldere"
+    IDS_LOCALHARDRIVES      "Lokal Harddiske"
+    IDS_FILENOTFOUND        "Kunne ikke finde filen"
+    IDS_VERIFYFILE          "Angiv korrekt filnavn"
+    IDS_CREATEFILE          "Filen eksisterer ikke.\nVil du lave den?"
+    IDS_OVERWRITEFILE       "Filen findes allerede.\nVil du erstatte den?"
+    IDS_INVALID_FILENAME_TITLE "Ugyldige tegn i stien"
+    IDS_INVALID_FILENAME    "A filnavn må ikke indeholde følgende tegn:\n                          / : < > |"
+    IDS_PATHNOTEXISTING     "Stien eksisterer ikke."
+    IDS_FILENOTEXISTING     "Filen eksisterer ikke."
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_UPFOLDER         "Et niveau op"
+    IDS_NEWFOLDER        "Lav ny folder"
+    IDS_LISTVIEW         "Liste"
+    IDS_REPORTVIEW       "Detaljer"
+    IDS_TODESKTOP        "Gennemse til skrivebord"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    PD32_PRINT_TITLE       "Udskriv"
+
+    PD32_VALUE_UREADABLE                  "Ulæselig Entry"
+    PD32_INVALID_PAGE_RANGE "Denne værdi ligger ikke indenfor side range.\n\
+Indtast en værdi mellem %d og %d."
+    PD32_FROM_NOT_ABOVE_TO                "'fra' kan ikke overstige 'til'."
+    PD32_MARGINS_OVERLAP                  "Margenen overlapper eller er uden \
+for papirets kanter.\nGenindtast Margin."
+    PD32_NR_OF_COPIES_EMPTY               "'Antal kopier' må ikke være tomt."
+    PD32_TOO_LARGE_COPIES                 "Dette nummer af kopier er ikke \
+understøttet af din printer.\nIndtast et tal mellem 1 og %d."
+    PD32_PRINT_ERROR                      "Der opstod en printer fejl."
+    PD32_NO_DEFAULT_PRINTER               "Ingen standard printer defineret."
+    PD32_CANT_FIND_PRINTER                "Kan ikke finde printeren."
+    PD32_OUT_OF_MEMORY                    "Ikke mere hukommelse."
+    PD32_GENERIC_ERROR                    "Der opsted en fejl."
+    PD32_DRIVER_UNKNOWN                   "Ukendt printer driver."
+    PD32_NO_DEVICES                       "Før du kan udføre printer relatede opgaver\
+så som side opsætning eller udskrive et dokument, er du nød til at indstallere en printer. \
+indstaller en og prøv igen."
+
+    PD32_DEFAULT_PRINTER                  "Standard printer; "
+    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "Der er %d dokumenter in køen"
+    PD32_MARGINS_IN_INCHES                "Margener [tommer]"
+    PD32_MARGINS_IN_MILIMETERS            "Margener [mm]"
+    PD32_MILIMETERS                       "mm"
+
+    PD32_PRINTER_STATUS_READY             "Klar"
+    PD32_PRINTER_STATUS_PAUSED            "Pauset; "
+    PD32_PRINTER_STATUS_ERROR             "Fejl; "
+    PD32_PRINTER_STATUS_PENDING_DELETION  "Venter på sletning; "
+    PD32_PRINTER_STATUS_PAPER_JAM         "Papir kludder; "
+    PD32_PRINTER_STATUS_PAPER_OUT         "Ikke mere papir; "
+    PD32_PRINTER_STATUS_MANUAL_FEED       "Indsæt papir manuelt; "
+    PD32_PRINTER_STATUS_PAPER_PROBLEM     "Papir problem; "
+    PD32_PRINTER_STATUS_OFFLINE           "Printer slukket; "
+    PD32_PRINTER_STATUS_IO_ACTIVE         "I/O Aktiv; "
+    PD32_PRINTER_STATUS_BUSY              "Igang; "
+    PD32_PRINTER_STATUS_PRINTING          "Udskriver; "
+    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "Udskrivningbakken er fuld; "
+    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Ikke tilgængelig; "
+    PD32_PRINTER_STATUS_WAITING           "Venter; "
+    PD32_PRINTER_STATUS_PROCESSING        "Tænker; "
+    PD32_PRINTER_STATUS_INITIALIZING      "Klargører; "
+    PD32_PRINTER_STATUS_WARMING_UP        "Varmer op; "
+    PD32_PRINTER_STATUS_TONER_LOW         "Toner næsten slut; "
+    PD32_PRINTER_STATUS_NO_TONER          "Ikke mere toner; "
+    PD32_PRINTER_STATUS_PAGE_PUNT         "Page punt; "
+    PD32_PRINTER_STATUS_USER_INTERVENTION "Stoppet af brugeren; "
+    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Ikke mere hukommelse; "
+    PD32_PRINTER_STATUS_DOOR_OPEN         "Printer låget er åben; "
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Print server ukendt; "
+    PD32_PRINTER_STATUS_POWER_SAVE        "Energispare mode; "
+}
+
+STRINGTABLE DISCARDABLE /* Font styles */
+{
+    IDS_FONT_REGULAR       "Normal"
+    IDS_FONT_BOLD          "Fed"
+    IDS_FONT_ITALIC        "Kursiv"
+    IDS_FONT_BOLD_ITALIC   "Fed Kursiv"
+}
+
+
+
+STRINGTABLE DISCARDABLE /* Color names */
+{
+    IDS_COLOR_BLACK     "Sort"
+    IDS_COLOR_MAROON    "Mørkerød"
+    IDS_COLOR_GREEN     "Grøn"
+    IDS_COLOR_OLIVE     "Oliven"
+    IDS_COLOR_NAVY      "Navy"
+    IDS_COLOR_PURPLE    "Lilla"
+    IDS_COLOR_TEAL      "Teal"
+    IDS_COLOR_GRAY      "Grå"
+    IDS_COLOR_SILVER    "Sølv"
+    IDS_COLOR_RED       "Rød"
+    IDS_COLOR_LIME      "Lime"
+    IDS_COLOR_YELLOW    "Gul"
+    IDS_COLOR_BLUE      "Blå"
+    IDS_COLOR_FUCHSIA   "Violet"
+    IDS_COLOR_AQUA      "Cyan"
+    IDS_COLOR_WHITE     "Hvid"
+}
+
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_FONT_SIZE   "Vælg en skrift størrelse mellem %d og %d punkter."
+    IDS_SAVE_BUTTON "&Gem"
+    IDS_SAVE_IN     "Gem &i:"
+    IDS_SAVE        "Gem"
+    IDS_SAVE_AS     "Gem som"
+    IDS_OPEN_FILE   "Åben fil"
 }

reactos/dll/win32/comdlg32/cdlg_De.rc

@@ -47,7 +47,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Speichern als ..."
+CAPTION "Speichern als..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "Datei&name:", 1090, 6, 6, 76, 9

reactos/dll/win32/comdlg32/cdlg_El.rc

@@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Αποθήκευση ως ..."
+CAPTION "Αποθήκευση ως..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "File &Όνομα:", 1090, 6, 6, 76, 9
@@ -277,6 +277,7 @@ BEGIN
     LTEXT           "Κατάσταση:",     stc8,  16, 36,  36,10, SS_NOPREFIX
     LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Τύπος:",         stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Που:",           stc10, 16, 60,  36,10, SS_NOPREFIX
     LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Σχόλιο:",        stc9,  16, 72,  36,10, SS_NOPREFIX
@@ -369,7 +370,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "Το αρχείο δεν υπάρχει.\nΘέλετε να δημιουργήσετε το αρχείο;"
     IDS_OVERWRITEFILE       "Το αρχείο υπάρχει ήδη.\nΘέλετε να το αντικαταστήσετε;"
     IDS_INVALID_FILENAME_TITLE "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι"
-    IDS_INVALID_FILENAME    "Ένα όνομα αρχείο δε μπορεί να περιέχει κάποιον από τους παρακάτω χαρακτήρες: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Ένα όνομα αρχείο δε μπορεί να περιέχει κάποιον από τους παρακάτω χαρακτήρες:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Το μονοπάτι δεν υπάρχει"
     IDS_FILENOTEXISTING     "Το αρχείο δεν υπάρχει"
 }

reactos/dll/win32/comdlg32/cdlg_En.rc

@@ -20,7 +20,7 @@
  * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
  */
 
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Save As ..."
+CAPTION "Save As..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "File &Name:", 1090, 6, 6, 76, 9
@@ -103,8 +103,8 @@ FONT 8, "MS Shell Dlg"
  PUSHBUTTON "Cancel", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "&Setup", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
  GROUPBOX "Orientation", grp2, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "Po&rtrait", rad3, 50, 100, 40, 12
+ RADIOBUTTON "Po&rtrait", rad3, 50, 100, 50, 12
- RADIOBUTTON "&Landscape", rad4, 50, 115, 40, 12
+ RADIOBUTTON "&Landscape", rad4, 50, 115, 50, 12
  ICON "LANDSCAP", stc10, 10, 95, 32, 32
  ICON "PORTRAIT", stc11, 10, 95, 32, 32
  GROUPBOX "Paper", grp3, 120, 85, 180, 50, BS_GROUPBOX
@@ -191,7 +191,7 @@ FONT 8, "MS Shell Dlg"
  CHECKBOX "Match &Whole Word Only", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  CHECKBOX "Match &Case", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
  GROUPBOX "Direction", grp1, 107, 26, 68, 28
- CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 30, 12
  CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
 
  DEFPUSHBUTTON "&Find Next", IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
@@ -370,7 +370,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "File does not exist.\nDo you want to create file?"
     IDS_OVERWRITEFILE       "File already exists.\nDo you want to replace it?"
     IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path"
-    IDS_INVALID_FILENAME    "A filename cannot contain any of the following characters: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "A filename cannot contain any of the following characters:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Path does not exist"
     IDS_FILENOTEXISTING     "File does not exist"
 }

reactos/dll/win32/comdlg32/cdlg_Eo.rc

@@ -116,7 +116,7 @@ FONT 8, "MS Shell Dlg"
 }
 
 
-CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 147
+CHOOSE_FONT DIALOG DISCARDABLE 36, 24, 264, 147
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Tiparo"
 FONT 8, "MS Shell Dlg"
@@ -368,7 +368,7 @@ IDS_VERIFYFILE          "Kontrolu la
 IDS_CREATEFILE          "Dosiero estas neekzistanta\nÆu vi volas krei dosieron?"
 IDS_OVERWRITEFILE       "Dosiero estas jam ekzistanta.\nÆu vi volas superskribi øin?"
 IDS_INVALID_FILENAME_TITLE "Nekorekta(j) tipo(j) en vojo"
-IDS_INVALID_FILENAME    "La dosiernomo ne povas enhavi la jenajn tipojn: \n / : < > |"
+IDS_INVALID_FILENAME    "La dosiernomo ne povas enhavi la jenajn tipojn:\n / : < > |"
 IDS_PATHNOTEXISTING     "Vojo estas neekzistanta"
 IDS_FILENOTEXISTING     "Dosiero estas neekzistanta"
 }

reactos/dll/win32/comdlg32/cdlg_Es.rc

@@ -1,6 +1,6 @@
 /*
  * Copyright 1995 Jon Tombs
- * Copyright 2004, 2005 José Manuel Ferrer Ortiz
+ * Copyright 2004, 2005, 2008 José Manuel Ferrer Ortiz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -38,8 +38,8 @@ FONT 8, "MS Shell Dlg"
  COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  LTEXT "U&nidades:", 1091, 110, 104, 92, 9
  COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Abrir", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "Abrir", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "A&yuda", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
  CHECKBOX "&Sólo lectura", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
@@ -60,8 +60,8 @@ FONT 8, "MS Shell Dlg"
  COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  LTEXT "U&nidades:", 1091, 110, 104, 92, 9
  COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "&Guardar como", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "&Guardar como", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "A&yuda", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
  CHECKBOX "&Sólo lectura", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
@@ -78,8 +78,8 @@ FONT 8, "MS Shell Dlg"
  RADIOBUTTON "&Todo", rad1, 16, 45, 60, 12
  RADIOBUTTON "Selecc&ión", rad2, 16, 60, 60, 12
  RADIOBUTTON "&Páginas", rad3, 16, 75, 60, 12
- DEFPUSHBUTTON "Imprimir", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "Imprimir", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "&Configuración", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
  LTEXT "&Desde:", 1090, 60, 80, 30, 9
  LTEXT "&Hasta:", 1091, 120, 80, 30, 9
@@ -130,10 +130,10 @@ FONT 8, "MS Shell Dlg"
     LTEXT           "&Tamaño:",stc3,179,3,30,9
     COMBOBOX        cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "Aceptar",IDOK,218,6,40,14,WS_GROUP
+    DEFPUSHBUTTON   "Aceptar",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
-    PUSHBUTTON      "Cancelar",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "Cancelar",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "A&plicar", psh3,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "A&plicar", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "A&yuda" , pshHelp,218,57,40,14,WS_GROUP
+    PUSHBUTTON      "A&yuda" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
     GROUPBOX        "&Efectos",grp1,6,72,84,34,WS_GROUP
     CHECKBOX        "&Tachado", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
     CHECKBOX        "&Subrayado", chx2, 10,94,50,10, BS_AUTOCHECKBOX
@@ -173,8 +173,8 @@ FONT 8, "MS Shell Dlg"
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
  CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
  CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "Aceptar",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "Aceptar",  1,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "A&yuda", pshHelp,100,166, 44, 14
  PUSHBUTTON "Añadir a &colores personalizados", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "&Definir colores personalizados >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
@@ -187,14 +187,15 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Buscar"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "Buscar:", -1, 4, 8, 42, 8
+ LTEXT "&Buscar:", -1, 4, 8, 42, 8
  EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Sólo palabra entera", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Sólo palabra &entera", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  CHECKBOX "&Mayúsculas/minúsculas", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
  GROUPBOX "Dirección", grp1, 107, 26, 68, 28
  CONTROL "A&rriba", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
  CONTROL "&Abajo", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "Buscar &siguiente", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+
+ DEFPUSHBUTTON "Buscar &siguiente", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
  PUSHBUTTON "Cancelar", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "A&yuda", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
 }
@@ -205,13 +206,14 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Reemplazar"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "Buscar:", -1, 4, 9, 48, 8
+ LTEXT "&Buscar:", -1, 4, 9, 48, 8
  EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "Re&emplazar por:", -1, 4, 26, 48, 8
+ LTEXT "Reem&plazar por:", -1, 4, 26, 48, 8
  EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Comparar palabra entera solamente", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Sólo palabra &entera", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  CHECKBOX "&Mayúsculas/minúsculas", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- DEFPUSHBUTTON "Reemplazar &siguiente", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+
+ DEFPUSHBUTTON "Reemplazar &siguiente", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
  PUSHBUTTON "&Reemplazar", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Reemplazar &todo", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Cancelar", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
@@ -235,13 +237,13 @@ FONT 8, "MS Shell Dlg"
     LTEXT           "&Nombre:",       stc6,  16, 20,  36,8
     COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     LTEXT           "Estado:",        stc8,  16, 36,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Estado ficticio",stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Tipo:",          stc7,  16, 48,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Tipo ficticio",  stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Dónde:",         stc10, 16, 60,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Lugar ficticio", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Comentario:",    stc9,  16, 72,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Remark",   stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Nota ficticia",  stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
 
     GROUPBOX        "Copias",         grp2, 160, 92, 120,64, WS_GROUP
     LTEXT           "Número de &copias:",stc5,168,108,68,8
@@ -274,13 +276,13 @@ BEGIN
     LTEXT           "&Nombre:",       stc6,  16, 20,  36,8
     COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     LTEXT           "Estado:",        stc8,  16, 36,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Estado ficticio",stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Tipo:",          stc7,  16, 48,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Tipo ficticio",  stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Dónde:",         stc10, 16, 60,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Lugar ficticio", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Comentario:",    stc9,  16, 72,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Remark",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Nota ficticia",  stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
 
     GROUPBOX        "Papel",          grp2,   8, 92, 164,56, WS_GROUP
     LTEXT           "&Tamaño:",       stc2,  16,108,  36, 8
@@ -369,7 +371,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "El archivo no existe\n¿Desea crearlo?"
     IDS_OVERWRITEFILE       "El archivo ya existe.\n¿Desea reemplazarlo?"
     IDS_INVALID_FILENAME_TITLE "Caracter(es) inválidos en la ruta"
-    IDS_INVALID_FILENAME    "Un nombre de archivo no puede contener ninguno de los siguientes caracteres: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Un nombre de archivo no puede contener ninguno de los siguientes caracteres:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "La ruta no existe"
     IDS_FILENOTEXISTING     "El archivo no existe"
 }
@@ -406,9 +408,9 @@ defecto."
     PD32_GENERIC_ERROR                    "Ocurrió un error."
     PD32_DRIVER_UNKNOWN                   "Manejador de la impresora \
 desconocido."
-    PD32_NO_DEVICES                       "Before you can perform printer-related tasks \
+    PD32_NO_DEVICES                       "Antes de que pueda realizar tareas de impresión \
-such as page setup or printing a document, you need to install a printer. \
+como configurar la página o imprimir un documento, necesita instalar una impresora. \
-Please install one and retry."
+Por favor, instale una y vuelva a intentarlo."
 
     PD32_DEFAULT_PRINTER                  "Impresora por defecto; "
     PD32_NR_OF_DOCUMENTS_IN_QUEUE         "Hay %d documentos en la cola"
@@ -444,6 +446,14 @@ Please install one and retry."
     PD32_PRINTER_STATUS_POWER_SAVE        "Modo de ahorro de energía; "
 }
 
+STRINGTABLE DISCARDABLE /* Font styles */
+{
+    IDS_FONT_REGULAR       "Normal"
+    IDS_FONT_BOLD          "Negrita"
+    IDS_FONT_ITALIC        "Cursiva"
+    IDS_FONT_BOLD_ITALIC   "Cursiva negrita"
+}
+
 STRINGTABLE DISCARDABLE /* Color names */
 {
     IDS_COLOR_BLACK     "Negro"

reactos/dll/win32/comdlg32/cdlg_Fi.rc

@@ -370,7 +370,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "Tiedostoa ei ole olemassa\nHaluatko luoda tiedoston"
     IDS_OVERWRITEFILE       "Tiedosto on jo olemassa.\nHaluatko ylikirjoitaa sen?"
     IDS_INVALID_FILENAME_TITLE "Kansio sisältää epäkelpoja merkkejä"
-    IDS_INVALID_FILENAME    "Tiedoston nimi ei voi sisältää näitä merkkejä: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Tiedoston nimi ei voi sisältää näitä merkkejä:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Kansiota ei ole"
     IDS_FILENOTEXISTING     "Tiedostoa ei ole"
 }
@@ -393,7 +393,7 @@ STRINGTABLE DISCARDABLE
     PD32_FROM_NOT_ABOVE_TO                "Alukuarvo ei voi olla suurempi kuin loppuarvo."
     PD32_MARGINS_OVERLAP                  "Marginaalit ovat päällekäin tai ulkona paperin alueelta.\nMääritä marginaalit uudestaan."
     PD32_NR_OF_COPIES_EMPTY               "Kopioiden määrä täytyy antaa."
-    PD32_TOO_LARGE_COPIES                 "Tulostin ei tue näin montaa kopiota. \nValitse arvo väliltä 1 ja %d."
+    PD32_TOO_LARGE_COPIES                 "Tulostin ei tue näin montaa kopiota.\nValitse arvo väliltä 1 ja %d."
     PD32_PRINT_ERROR                      "Tulostinvirhe."
     PD32_NO_DEFAULT_PRINTER               "Oletustulostinta ei ole määritetty."
     PD32_CANT_FIND_PRINTER                "Tulostinta ei löydy."

reactos/dll/win32/comdlg32/cdlg_Fr.rc

@@ -3,7 +3,7 @@
  * French language support
  *
  * Copyright 1995 Alexandre Julliard
- * Copyright 2005 Jonathan Ernst
+ * Copyright 2005-2008 Jonathan Ernst
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -31,15 +31,15 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ouvrir"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "&Nom de fichier:", 1090, 6, 6, 76, 9
+ LTEXT "&Nom de fichier :", 1090, 6, 6, 76, 9
  EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
  LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
  LTEXT "&Répertoires", -1, 110, 6, 92, 9
  LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
  LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Liste des fichiers de &type:", 1089, 6, 104, 90, 9
+ LTEXT "Liste des fichiers de &type :", 1089, 6, 104, 90, 9
  COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Lecteurs:", 1091, 110, 104, 92, 9
+ LTEXT "&Lecteurs :", 1091, 110, 104, 92, 9
  COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  DEFPUSHBUTTON "OK", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Annuler", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
@@ -50,16 +50,16 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Enregistrer sous ..."
+CAPTION "Enregistrer sous..."
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "&Nom de fichier:", 1090, 6, 6, 76, 9
+ LTEXT "&Nom de fichier :", 1090, 6, 6, 76, 9
  EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
  LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Répertoires:", -1, 110, 6, 92, 9
+ LTEXT "&Répertoires :", -1, 110, 6, 92, 9
  LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
  LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Liste des fichiers de &type:", 1089, 6, 104, 90, 9
+ LTEXT "Liste des fichiers de &type :", 1089, 6, 104, 90, 9
  COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  LTEXT "&Lecteurs:", 1091, 110, 104, 92, 9
  COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
@@ -75,7 +75,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Imprimer"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "Imprimante:", 1088, 6, 6, 40, 9
+ LTEXT "Imprimante :", 1088, 6, 6, 40, 9
  LTEXT "", 1089, 60, 6, 150, 9
  GROUPBOX "Étendue", grp1, 6, 30, 160, 65, BS_GROUPBOX
  RADIOBUTTON "&Tout", rad1, 16, 45, 60, 12
@@ -112,8 +112,8 @@ FONT 8, "MS Shell Dlg"
  ICON "LANDSCAP", stc10, 10, 95, 32, 32
  ICON "PORTRAIT", stc11, 10, 95, 32, 32
  GROUPBOX "Papier", grp3, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Taille :", 1089, 130, 95, 30, 9
+ LTEXT "&Taille :", 1089, 130, 95, 30, 9
- LTEXT "&Ali&mentation :", 1090, 130, 110, 30, 9
+ LTEXT "&Source :", 1090, 130, 110, 30, 9
  COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
 }
@@ -156,20 +156,20 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Couleurs"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "Couleurs de &base:",   1088, 4,    4,  140, 10
+ LTEXT "Couleurs de &base :",   1088, 4,    4,  140, 10
- LTEXT "&Couleurs personnalisées:",  1089, 4,   106, 140, 10
+ LTEXT "&Couleurs personnalisées :",  1089, 4,   106, 140, 10
  LTEXT "Couleur |  &Uni",  1090, 150, 151,  48, 10
- LTEXT   "&Rouge:", 726 /*1094*/,249,126,24,10
+ LTEXT   "&Rouge :", 726 /*1094*/,249,126,24,10
  EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Vert:",727/*1095*/,249,140,24,10
+ LTEXT   "&Vert :",727/*1095*/,249,140,24,10
  EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "Bl&eu:",728 /*1096*/,249,154,24,10
+ LTEXT   "Bl&eu :",728 /*1096*/,249,154,24,10
  EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Teinte:" ,723 /*1091*/,202,126,22,10
+ LTEXT  "&Teinte :" ,723 /*1091*/,202,126,22,10
  EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Sat.:" ,724 /*1092*/,202,140,22,10
+ LTEXT  "&Sat. :" ,724 /*1092*/,202,140,22,10
  EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Lum.:" ,725 /*1093*/,202,154,22,10
+ LTEXT  "&Lum. :" ,725 /*1093*/,202,154,22,10
  EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
@@ -190,7 +190,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Rechercher"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "&Rechercher:", -1, 4, 8, 42, 8
+ LTEXT "&Rechercher :", -1, 4, 8, 42, 8
  EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
  CHECKBOX "M&ot seulement", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  CHECKBOX "Respect des &majuscules/minuscules", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
@@ -209,9 +209,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Remplacer"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "&Rechercher:", -1, 4, 9, 48, 8
+ LTEXT "&Rechercher :", -1, 4, 9, 48, 8
  EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "R&emplacer par:", -1, 4, 26, 48, 8
+ LTEXT "R&emplacer par :", -1, 4, 26, 48, 8
  EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
  CHECKBOX "M&ot seulement", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  CHECKBOX "Respect des &majuscules/minuscules", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
@@ -237,13 +237,13 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Imprimante",     grp4,   8,  4, 272,84, WS_GROUP
     CONTROL         "Imprimer dans un fichier", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
     PUSHBUTTON      "Propriétés",     psh2, 212, 17,  60,14, WS_GROUP
-    LTEXT           "&Nom:",          stc6,  16, 20,  36,8
+    LTEXT           "&Nom :",          stc6,  16, 20,  36,8
     COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "Etat:",          stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "État :",          stc8,  16, 36,  36,10, SS_NOPREFIX
     LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Type:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Type :",          stc7,  16, 48,  36,10, SS_NOPREFIX
     LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Emplacement:",   stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Emplacement :",   stc10, 16, 60,  36,10, SS_NOPREFIX
     LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Commentaire:",   stc9,  16, 72,  36,10, SS_NOPREFIX
     LTEXT           "Dummy Remark",   stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
@@ -260,8 +260,8 @@ FONT 8, "MS Shell Dlg"
     CONTROL         "Selection",      rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
     EDITTEXT                          edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
     EDITTEXT                          edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
-    RTEXT           "&de:",           stc2,  52,124,  20,8
+    RTEXT           "&de :",           stc2,  52,124,  20,8
-    RTEXT           "&à:",            stc3, 100,124,  16,8
+    RTEXT           "&à :",            stc3, 100,124,  16,8
 }
 
 PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
@@ -276,15 +276,15 @@ BEGIN
 
     GROUPBOX        "Imprimante",     grp4,   8,  4, 272,84, WS_GROUP
     PUSHBUTTON      "&Propriétés",    psh2, 212, 17,  60,14, WS_GROUP
-    LTEXT           "&Nom:",          stc6,  16, 20,  36,8
+    LTEXT           "&Nom :",          stc6,  16, 20,  36,8
     COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "Etat:",          stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "État:",          stc8,  16, 36,  36,10, SS_NOPREFIX
     LTEXT           "[aucun]",        stc12, 60, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Type:",          stc7,  16, 48,  36,10, SS_NOPREFIX
     LTEXT           "[aucun]",        stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Emplacement:",   stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Emplacement :",   stc10, 16, 60,  36,10, SS_NOPREFIX
     LTEXT           "[aucun]",        stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Commentaire:",   stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Commentaire :",   stc9,  16, 72,  36,10, SS_NOPREFIX
     LTEXT           "[aucun]",        stc13, 60, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
 
     GROUPBOX        "Papier",         grp2,   8, 92, 164,56, WS_GROUP
@@ -308,21 +308,21 @@ BEGIN
   CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
   CONTROL "", rct3, "Static", SS_GRAYRECT,  84, 88, 80, 4
   GROUPBOX "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX
-  LTEXT "&Taille:", stc2, 16, 112, 36, 8
+  LTEXT "&Taille :", stc2, 16, 112, 36, 8
   COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
-  LTEXT "&Source:", stc3, 16, 132, 36, 8
+  LTEXT "&Source :", stc3, 16, 132, 36, 8
   COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
   GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX
   AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "P&aysage", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
   GROUPBOX "Marges", grp4, 80, 156, 152, 56, BS_GROUPBOX
-  LTEXT "&Droite:", stc15, 88, 172, 21, 8
+  LTEXT "&Droite :", stc15, 88, 172, 21, 8
   EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
-  LTEXT "&Gauche:", stc16, 159, 172, 27, 8
+  LTEXT "&Gauche :", stc16, 159, 172, 27, 8
   EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
-  LTEXT "&Haut:", stc17, 88, 192, 21, 8
+  LTEXT "&Haut :", stc17, 88, 192, 21, 8
   EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
-  LTEXT "&Bas:", stc18, 159, 192, 23, 8
+  LTEXT "&Bas :", 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 "Annuler", IDCANCEL, 126, 220, 50, 14
@@ -340,7 +340,7 @@ FONT 8, "MS Shell Dlg"
     LTEXT	"" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
     LISTBOX	IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
 
-    LTEXT	"&Nom du fichier:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+    LTEXT	"&Nom du fichier :",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
     EDITTEXT	IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
 
     LTEXT	"&Type du fichier",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
@@ -356,9 +356,9 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_ABOUTBOX            "À propos du choix de répertoires"
-    IDS_DOCUMENTFOLDERS     "Répertoire Documents"
+    IDS_DOCUMENTFOLDERS     "Répertoire documents"
-    IDS_PERSONAL            "Mes Documents"
+    IDS_PERSONAL            "Mes documents"
-    IDS_FAVORITES           "Mes Favoris"
+    IDS_FAVORITES           "Mes favoris"
     IDS_PATH                "Répertoire système"
     IDS_DESKTOP             "Bureau"
     IDS_FONTS               "Polices"
@@ -371,10 +371,10 @@ STRINGTABLE DISCARDABLE
     IDS_LOCALHARDRIVES      "Disques locaux"
     IDS_FILENOTFOUND        "Fichier non trouvé"
     IDS_VERIFYFILE          "Prière de vérifier que le nom de fichier indiqué est correct"
-    IDS_CREATEFILE          "Ce fichier n'existe pas.\nSouhaitez-vous le créer ?"
+    IDS_CREATEFILE          "Ce fichier n'existe pas.\nSouhaitez-vous le créer ?"
-    IDS_OVERWRITEFILE       "Ce fichier existe déjà.\nVoulez-vous le remplacer ?"
+    IDS_OVERWRITEFILE       "Ce fichier existe déjà.\nVoulez-vous le remplacer ?"
     IDS_INVALID_FILENAME_TITLE "Le chemin d'accès contient des caractères invalides"
-    IDS_INVALID_FILENAME    "Un nom de fichier ne peut contenir un des caractères suivants : \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Un nom de fichier ne peut contenir un des caractères suivants :\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Le chemin d'accès n'existe pas"
     IDS_FILENOTEXISTING     "Le fichier n'existe pas"
 }
@@ -395,11 +395,11 @@ STRINGTABLE DISCARDABLE
     PD32_VALUE_UREADABLE                  "Entrée illisible"
     PD32_INVALID_PAGE_RANGE "Cette valeur n'est pas dans l'intervalle de pages\n\
 Veuillez indiquer une valeur entre %d et %d."
-    PD32_FROM_NOT_ABOVE_TO                "Le champ 'de' ne peut être plus grand \
+    PD32_FROM_NOT_ABOVE_TO                "Le champ « de » ne peut être plus grand \
-que le champ 'à'."
+que le champ « à »."
     PD32_MARGINS_OVERLAP                  "Les marges se recouvrent ou dépassent du papier\n\
 Veuillez indiquer de nouvelles valeurs."
-    PD32_NR_OF_COPIES_EMPTY               "Le champ 'Copies' est vide.\n\
+    PD32_NR_OF_COPIES_EMPTY               "Le champ « Copies » est vide.\n\
 Veuillez entrer un nombre et r&essayer."
     PD32_TOO_LARGE_COPIES                 "Votre imprimante ne peut gérer autant de copies.\n\
 Veuillez indiquer un nombre de copies entre 1 et %d."
@@ -413,40 +413,49 @@ Veuillez indiquer un nombre de copies entre 1 et %d."
 comme la configuration de l'imprimante ou l'impression d'un document, vous devez installer une imprimante. \
 Veuillez en installer une et réessayez."
 
-    PD32_DEFAULT_PRINTER                  "Imprimante par défaut; "
+    PD32_DEFAULT_PRINTER                  "Imprimante par défaut ; "
     PD32_NR_OF_DOCUMENTS_IN_QUEUE         "Il y a %d documents dans la file d'attente"
     PD32_MARGINS_IN_INCHES                "Marges [pouces]"
     PD32_MARGINS_IN_MILIMETERS            "Marges [mm]"
     PD32_MILIMETERS                       "mm"
 
-    PD32_PRINTER_STATUS_READY             "Prêt; "
+    PD32_PRINTER_STATUS_READY             "Prêt ; "
-    PD32_PRINTER_STATUS_PAUSED            "Suspendu; "
+    PD32_PRINTER_STATUS_PAUSED            "Suspendu ; "
-    PD32_PRINTER_STATUS_ERROR             "Erreur; "
+    PD32_PRINTER_STATUS_ERROR             "Erreur ; "
-    PD32_PRINTER_STATUS_PENDING_DELETION  "En attente de suppression; "
+    PD32_PRINTER_STATUS_PENDING_DELETION  "En attente de suppression ; "
-    PD32_PRINTER_STATUS_PAPER_JAM         "Bourrage papier; "
+    PD32_PRINTER_STATUS_PAPER_JAM         "Bourrage papier ; "
-    PD32_PRINTER_STATUS_PAPER_OUT         "Plus de papier; "
+    PD32_PRINTER_STATUS_PAPER_OUT         "Plus de papier ; "
-    PD32_PRINTER_STATUS_MANUAL_FEED       "Insertion manuelle du papier; "
+    PD32_PRINTER_STATUS_MANUAL_FEED       "Insertion manuelle du papier ; "
     PD32_PRINTER_STATUS_PAPER_PROBLEM     "Problème de papier; "
     PD32_PRINTER_STATUS_OFFLINE           "L'imprimante n'est pas en ligne; "
     PD32_PRINTER_STATUS_IO_ACTIVE         "IO Active; "
     PD32_PRINTER_STATUS_BUSY              "Occupée; "
     PD32_PRINTER_STATUS_PRINTING          "En cours d'impression; "
     PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "Le bac de sortie est plein; "
-    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Non disponible; "
+    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Non disponible ; "
-    PD32_PRINTER_STATUS_WAITING           "En attente; "
+    PD32_PRINTER_STATUS_WAITING           "En attente ; "
-    PD32_PRINTER_STATUS_PROCESSING        "Traitement en cours; "
+    PD32_PRINTER_STATUS_PROCESSING        "Traitement en cours ; "
-    PD32_PRINTER_STATUS_INITIALIZING      "Démarrage en cours; "
+    PD32_PRINTER_STATUS_INITIALIZING      "Démarrage en cours ; "
-    PD32_PRINTER_STATUS_WARMING_UP        "Préchauffage; "
+    PD32_PRINTER_STATUS_WARMING_UP        "Préchauffage ; "
-    PD32_PRINTER_STATUS_TONER_LOW         "Toner presque vide; "
+    PD32_PRINTER_STATUS_TONER_LOW         "Toner presque vide ; "
-    PD32_PRINTER_STATUS_NO_TONER          "Pas de toner; "
+    PD32_PRINTER_STATUS_NO_TONER          "Pas de toner ; "
-    PD32_PRINTER_STATUS_PAGE_PUNT         "Page punt; "
+    PD32_PRINTER_STATUS_PAGE_PUNT         "Abandon de page ; "
-    PD32_PRINTER_STATUS_USER_INTERVENTION "Annulé par utilisateur; "
+    PD32_PRINTER_STATUS_USER_INTERVENTION "Annulé par utilisateur ; "
-    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Plus assez de mémoire; "
+    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Plus assez de mémoire ; "
-    PD32_PRINTER_STATUS_DOOR_OPEN         "La porte de l'imprimante est ouverte; "
+    PD32_PRINTER_STATUS_DOOR_OPEN         "La porte de l'imprimante est ouverte ; "
-    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Serveur d'impression inconnu; "
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Serveur d'impression inconnu ; "
-    PD32_PRINTER_STATUS_POWER_SAVE        "Mode économie d'énergie; "
+    PD32_PRINTER_STATUS_POWER_SAVE        "Mode économie d'énergie ; "
 }
 
+STRINGTABLE DISCARDABLE /* Font styles */
+{
+    IDS_FONT_REGULAR       "Normal"
+    IDS_FONT_BOLD          "Gras"
+    IDS_FONT_ITALIC        "Italique"
+    IDS_FONT_BOLD_ITALIC   "Gras italique"
+}
+
+
 STRINGTABLE DISCARDABLE /* Color names */
 {
     IDS_COLOR_BLACK     "Noir"
@@ -471,7 +480,7 @@ STRINGTABLE DISCARDABLE
 {
     IDS_FONT_SIZE   "Sélectionnez une taille de police entre %d et %d points."
     IDS_SAVE_BUTTON "&Sauver"
-    IDS_SAVE_IN     "Sauver &dans:"
+    IDS_SAVE_IN     "Sauver &dans :"
     IDS_SAVE        "Enregistrer"
     IDS_SAVE_AS     "Enregistrer sous"
     IDS_OPEN_FILE   "Ouvrir Fichier"

reactos/dll/win32/comdlg32/cdlg_Hu.rc

@@ -45,7 +45,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Mentés új néven ..."
+CAPTION "Mentés új néven..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "File &neve:", 1090, 6, 6, 76, 9
@@ -179,21 +179,21 @@ FONT 8, "MS Shell Dlg"
  PUSHBUTTON  "&t",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
 }
 
-FINDDLGORD DIALOG 36, 24, 236, 62
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Keresés"
 FONT 8, "MS Shell Dlg"
 BEGIN
         LTEXT "&Mit keressen:", -1, 4, 8, 48, 8
-        EDITTEXT 1152, 51, 7, 124, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+        EDITTEXT edt1, 51, 7, 124, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
-        CONTROL "Teljes &szavak keresése", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 4, 26, 100, 12
+        CHECKBOX "Teljes &szavak keresése", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-        CONTROL "Kis/&nagybetû különb.", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 92, 12
+        CHECKBOX "Kis/&nagybetû különb.", chx2, 4, 42, 92, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-        GROUPBOX "Irány", 1072, 97, 26, 78, 28
+        GROUPBOX "Irány", grp1, 97, 26, 78, 28
-        CONTROL "&Vissza", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 102, 38, 32, 12
+        CONTROL "&Vissza", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 102, 38, 32, 12
-        CONTROL "&Elõre", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+        CONTROL "&Elõre", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
-        CONTROL "&Következõ", 1, "BUTTON", WS_GROUP | WS_TABSTOP, 182, 5, 50, 14
+        DEFPUSHBUTTON "&Következõ", IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP
-        CONTROL "Mégsem", 2, "BUTTON", WS_GROUP | WS_TABSTOP, 182, 23, 50, 14
+        PUSHBUTTON "Mégsem", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
-        PUSHBUTTON "&Segítség", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+        PUSHBUTTON "&Segítség", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
 END
 
 REPLACEDLGORD DIALOG 36, 24, 230, 94

reactos/dll/win32/comdlg32/cdlg_It.rc

@@ -48,7 +48,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Salva con nome ..."
+CAPTION "Salva con nome..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Nome file:", 1090, 6, 6, 76, 9
@@ -371,7 +371,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "Il file non esiste\nCreare il file"
     IDS_OVERWRITEFILE       "Il file esiste già.\nSovrascriverlo?"
     IDS_INVALID_FILENAME_TITLE "Caratteri invalidi nel percorso"
-    IDS_INVALID_FILENAME    "Il nome di un file non può contenere i seguenrti caratteri: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Il nome di un file non può contenere i seguenrti caratteri:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Il percorso specificato non esiste"
     IDS_FILENOTEXISTING     "Il file non esiste"
 }

reactos/dll/win32/comdlg32/cdlg_Ja.rc

@@ -338,4 +338,9 @@ STRINGTABLE DISCARDABLE
     IDS_FILENOTFOUND        "ﾌｧｲﾙが見つかりません。"
     IDS_VERIFYFILE          "ﾌｧｲﾙ名を確認してください。"
     IDS_CREATEFILE          "このﾌｧｲﾙは存在しません。\n作成しますか?"
+    IDS_OVERWRITEFILE       "File already exists.\nDo you want to replace it?"
+    IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path"
+    IDS_INVALID_FILENAME    "A filename cannot contain any of the following characters:\n                          / : < > |"
+    IDS_PATHNOTEXISTING     "Path does not exist"
+    IDS_FILENOTEXISTING     "File does not exist"
 }

reactos/dll/win32/comdlg32/cdlg_Ko.rc

@@ -22,7 +22,7 @@
  * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
  */
 
-LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -48,7 +48,7 @@ FONT 9, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "다른 이름으로 저장 ..."
+CAPTION "다른 이름으로 저장..."
 FONT 9, "MS Shell Dlg"
 {
  LTEXT "파일 이름(&N):", 1090, 6, 6, 76, 9
@@ -372,7 +372,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "파일은 존재하지 않습니다\n파일을 만들겠습니까?"
     IDS_OVERWRITEFILE       "파일은 이미 존재합니다.\n덮어쓰겠습니까?"
     IDS_INVALID_FILENAME_TITLE "경로에 올바르지 않은 문자가 있습니다h"
-    IDS_INVALID_FILENAME    "파일이름에는 다음 문자만 포함될 수 있습니다: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "파일이름에는 다음 문자만 포함될 수 있습니다:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "경로가 존재하지 않습니다."
     IDS_FILENOTEXISTING     "파일이 존재하지 않습니다"
 }
@@ -445,6 +445,14 @@ STRINGTABLE DISCARDABLE
     PD32_PRINTER_STATUS_POWER_SAVE        "전원 절약 모드; "
 }
 
+STRINGTABLE DISCARDABLE /* Font styles */
+{
+    IDS_FONT_REGULAR       "보통"
+    IDS_FONT_BOLD          "굵게"
+    IDS_FONT_ITALIC        "기울임꼴"
+    IDS_FONT_BOLD_ITALIC   "굵은 기움임꼴"
+}
+
 STRINGTABLE DISCARDABLE /* Color names */
 {
     IDS_COLOR_BLACK     "검정"

reactos/dll/win32/comdlg32/cdlg_Nl.rc

@@ -47,7 +47,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Opslaan als ..."
+CAPTION "Opslaan als..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "Bestands&naam:", 1090, 6, 6, 76, 9

reactos/dll/win32/comdlg32/cdlg_No.rc

@@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Lagre som . . ."
+CAPTION "Lagre som..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "Fil&navn:", 1090, 6, 6, 76, 9
@@ -268,7 +268,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
     PUSHBUTTON      "Avbryt",IDCANCEL,232,156,48,14
-/*    PUSHBUTTON      "Nettverk . . .", psh5, 284,156,48,14 */
+/*    PUSHBUTTON      "Nettverk...", psh5, 284,156,48,14 */
 
     GROUPBOX        "Skriver",        grp4,   8,  4, 272,84, WS_GROUP
     PUSHBUTTON      "&Egenskaper",    psh2, 212, 17,  60,14, WS_GROUP
@@ -322,7 +322,7 @@ BEGIN
   EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
   DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
   PUSHBUTTON "Avbryt", IDCANCEL, 126, 220, 50, 14
-  PUSHBUTTON "Sk&river . . .", psh3, 184, 220, 48, 14
+  PUSHBUTTON "Sk&river...", psh3, 184, 220, 48, 14
 END
 
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164

reactos/dll/win32/comdlg32/cdlg_Pl.rc

@@ -372,7 +372,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "Plik nie istnieje.t\nCzy chcesz go utworzyć?"
     IDS_OVERWRITEFILE       "Plik istnieje.\nCzy chcesz go zastšpić?"
     IDS_INVALID_FILENAME_TITLE "Błędny(e) znak(i) w nazwie"
-    IDS_INVALID_FILENAME    "Nazwa pliku nie może zawierać znaków: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Nazwa pliku nie może zawierać znaków:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Katalog nie istnieje"
     IDS_FILENOTEXISTING     "Plik nie istnieje"
 }

reactos/dll/win32/comdlg32/cdlg_Pt.rc

@@ -73,7 +73,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Salvar Como ..."
+CAPTION "Salvar Como..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "Nome do &Arquivo:", 1090, 6, 6, 76, 9
@@ -96,7 +96,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Gravar Como ..."
+CAPTION "Gravar Como..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "Nome do &Ficheiro:", 1090, 6, 6, 76, 9
@@ -760,7 +760,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE	"Arquivo não existe\nVocê gostaria de cria-lo"
     IDS_OVERWRITEFILE       "Arquivo já existe.\nGostaria de substituí-lo?"
     IDS_INVALID_FILENAME_TITLE "Caracter(es) inválidos no caminho"
-    IDS_INVALID_FILENAME    "Um nome de arquivo não pode conter quaisquer dos seguintes caracteres: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Um nome de arquivo não pode conter quaisquer dos seguintes caracteres:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Caminho não existe"
     IDS_FILENOTEXISTING     "Arquivo não existe"
 }
@@ -776,7 +776,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE	"O ficheiro não existe\nGostaria de o criar"
     IDS_OVERWRITEFILE       "O ficheiro já existe.\nGostaria de o substituir?"
     IDS_INVALID_FILENAME_TITLE "Caracter(es) inválidos na localização"
-    IDS_INVALID_FILENAME    "Um nome de ficheiro não pode conter quaisquer dos seguintes caracteres: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Um nome de ficheiro não pode conter quaisquer dos seguintes caracteres:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "A localização não existe"
     IDS_FILENOTEXISTING     "O ficheiro não existe"
 }

reactos/dll/win32/comdlg32/cdlg_Ro.rc

@@ -49,7 +49,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Salvare ca ..."
+CAPTION "Salvare ca..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Nume fișier:", 1090, 6, 6, 76, 9
@@ -373,7 +373,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "Fişierul nu există.\nDoriți să creați acest fișier?"
     IDS_OVERWRITEFILE       "Fișierul există deja.\nDoriți să îl înlocuiți?"
     IDS_INVALID_FILENAME_TITLE "Caracter(e) invalid(e) în cale"
-    IDS_INVALID_FILENAME    "Numele de fișier nu poate conține caracterele următoare: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Numele de fișier nu poate conține caracterele următoare:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Calea nu există"
     IDS_FILENOTEXISTING     "Fişierul nu există"
 }

reactos/dll/win32/comdlg32/cdlg_Ru.rc

@@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Сохранить как ..."
+CAPTION "Сохранить как..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Имя файла:", 1090, 6, 6, 76, 9
@@ -370,7 +370,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "Файла не существует\nХотите ли Вы его создать?"
     IDS_OVERWRITEFILE       "Файл уже существует.\nЗаменить его?"
     IDS_INVALID_FILENAME_TITLE "Некорректный символ в записи пути"
-    IDS_INVALID_FILENAME    "Имя файла не может содержать следующие символы: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Имя файла не может содержать следующие символы:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Путь не существует"
     IDS_FILENOTEXISTING     "Файл не существует"
 }

reactos/dll/win32/comdlg32/cdlg_Si.rc

@@ -48,7 +48,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Shrani kot ..."
+CAPTION "Shrani kot..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "Ime &datoteke:", 1090, 6, 6, 76, 9
@@ -256,10 +256,10 @@ FONT 8, "MS Shell Dlg"
     CONTROL         "&Vse",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,30,12
     CONTROL         "St&rani",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,30,12
     CONTROL         "I&zbor",     rad2,"Button",BS_AUTORADIOBUTTON,16,138,30,12
-    EDITTEXT                          edt1,  64,122,  26,12, WS_GROUP | ES_NUMBER
+    EDITTEXT                          edt1,  66,122,  26,12, WS_GROUP | ES_NUMBER
     EDITTEXT                          edt2, 108,122,  26,12, WS_GROUP | ES_NUMBER
-    LTEXT           "&od:",         stc2,  52,124,  10,8
+    RTEXT           "&od:",         stc2,  52,124,  12,8
-    LTEXT           "&do:",           stc3, 94,124,  10,8
+    RTEXT           "&do:",           stc3, 94,124,  12,8
 }
 
 PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
@@ -270,7 +270,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "V redu",IDOK,180,156,48,14,WS_GROUP
     PUSHBUTTON      "Prekliči",IDCANCEL,232,156,48,14
-/*    PUSHBUTTON      "Omrežje ...", psh5, 284,156,48,14 */
+/*    PUSHBUTTON      "Omrežje...", psh5, 284,156,48,14 */
 
     GROUPBOX        "Tiskalnik",        grp4,   8,  4, 272,84, WS_GROUP
     PUSHBUTTON      "&Lastnosti",    psh2, 212, 17,  60,14, WS_GROUP
@@ -324,7 +324,7 @@ BEGIN
   EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
   DEFPUSHBUTTON "V redu", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
   PUSHBUTTON "Prekliči", IDCANCEL, 126, 220, 50, 14
-  PUSHBUTTON "&Tiskalnik ...", psh3, 184, 220, 48, 14
+  PUSHBUTTON "&Tiskalnik...", psh3, 184, 220, 48, 14
 END
 
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
@@ -372,7 +372,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "Datoteka ne obstaja.\nAli jo želite ustvariti?"
     IDS_OVERWRITEFILE       "Datoteka že obstaja.\nAli jo želite zamenjati?"
     IDS_INVALID_FILENAME_TITLE "Neveljavni znaki v imenu"
-    IDS_INVALID_FILENAME    "Ime datoteke ne sme vsebovati naslednjih znakov: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Ime datoteke ne sme vsebovati naslednjih znakov:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Pot ne obstaja"
     IDS_FILENOTEXISTING     "Datoteka ne obstaja"
 }

reactos/dll/win32/comdlg32/cdlg_Sk.rc

@@ -341,7 +341,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "File does not exist\nDo you want to create file"
     IDS_OVERWRITEFILE       "File does already exist.\nDo you want to replace it?"
     IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path"
-    IDS_INVALID_FILENAME    "A filename cannot contain any of the following characters: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "A filename cannot contain any of the following characters:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Cesta neexistuje"
     IDS_FILENOTEXISTING     "Súbor neexistuje"
 }

reactos/dll/win32/comdlg32/cdlg_Sv.rc

@@ -20,7 +20,7 @@
  * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
  */
 
-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
+LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Spara som ..."
+CAPTION "Spara som..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Filnamn:", 1090, 6, 6, 76, 9
@@ -363,7 +363,7 @@ STRINGTABLE DISCARDABLE
  IDS_CREATEFILE          "Filen finns inte\nVill du skapa fil"
  IDS_OVERWRITEFILE       "Filen finns redan.\nVill du ersätta den?"
  IDS_INVALID_FILENAME_TITLE "Illegalt tecken i sökväg"
- IDS_INVALID_FILENAME    "Ett filnamn kan inte innehålla någon av följande tecken: \n                                               / : < > |"
+ IDS_INVALID_FILENAME    "Ett filnamn kan inte innehålla någon av följande tecken:\n                                               / : < > |"
  IDS_PATHNOTEXISTING     "Sökvägen finns inte"
  IDS_FILENOTEXISTING     "Filen finns inte"
 }

reactos/dll/win32/comdlg32/cdlg_Th.rc

@@ -139,8 +139,11 @@ FONT 8, "MS Shell Dlg"
     LTEXT           "ÊÕ:", stc4 ,6,110,30,9
     COMBOBOX        cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
 		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "µÑÇÍÂèÒ§",grp2,98,72,160,49,WS_GROUP
+    GROUPBOX        "µÑÇÍÂèÒ§",grp2,98,72,120,36,WS_GROUP
-    CTEXT           "AÚBC¡¢£",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+    CTEXT           "AÚBC¡¢£",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+    LTEXT           "Scr&ipt:",stc7 ,98,114,40,9
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
+                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
 

reactos/dll/win32/comdlg32/cdlg_Tr.rc

@@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Farklı Kaydet ..."
+CAPTION "Farklı Kaydet..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "Dosya &Adı:", 1090, 6, 6, 76, 9
@@ -371,7 +371,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "Dosya mevcut değil\nDosyayı oluşturmak ister misiniz?"
     IDS_OVERWRITEFILE       "Dosya zaten var.\nDeğiştirmek ister misiniz?"
     IDS_INVALID_FILENAME_TITLE "Dosya yolunda geçersiz karakter(ler)"
-    IDS_INVALID_FILENAME    "Bir dosya adı aşağıdaki karakterleri içeremez: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "Bir dosya adı aşağıdaki karakterleri içeremez:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Dosya yolu mevcut değil"
     IDS_FILENOTEXISTING     "Dosya mevcut değil"
 }

reactos/dll/win32/comdlg32/cdlg_Uk.rc

@@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg"
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Çáåðåãòè ÿê ..."
+CAPTION "Çáåðåãòè ÿê..."
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "&&²ì'ÿ ôàéëó:", 1090, 6, 6, 76, 9
@@ -309,7 +309,7 @@ FONT 8, "MS Shell Dlg"
     EDITTEXT	IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
 
     LTEXT	"Ôàéëè &òèïó",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
-    COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     CONTROL	"Ëèøå äëÿ &÷èòàííÿ",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
 
@@ -339,7 +339,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "Ôàéë íå ³ñíóº\n×è õî÷åòå Âè éîãî ñòâîðèòè?"
     IDS_OVERWRITEFILE       "Ôàéë óæå ³ñíóº.\nÇàì³íèòè éîãî?"
     IDS_INVALID_FILENAME_TITLE "Íåâ³ðíèé ñèìâîë â çàïèñó øëÿõó"
-    IDS_INVALID_FILENAME    "²ì'ÿ ôàéëó íå ìîæå ì³ñòèòè íàñòóïí³ ñèìâîëè: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "²ì'ÿ ôàéëó íå ìîæå ì³ñòèòè íàñòóïí³ ñèìâîëè:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Øëÿõ íå ³ñíóº"
     IDS_FILENOTEXISTING     "Ôàéë íå ³ñíóº"
 }

reactos/dll/win32/comdlg32/cdlg_Wa.rc

@@ -174,7 +174,7 @@ FONT 8, "MS Shell Dlg"
  EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
  CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
  CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
  DEFPUSHBUTTON "I Va",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

reactos/dll/win32/comdlg32/cdlg_Zh.rc

@@ -215,7 +215,7 @@ STRINGTABLE DISCARDABLE
     IDS_CREATEFILE          "File does not exist\nDo you want to create file"
     IDS_OVERWRITEFILE       "File does already exist.\nDo you want to replace it?"
     IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path"
-    IDS_INVALID_FILENAME    "A filename cannot contain any of the following characters: \n                          / : < > |"
+    IDS_INVALID_FILENAME    "A filename cannot contain any of the following characters:\n                          / : < > |"
     IDS_PATHNOTEXISTING     "Path does not exist"
     IDS_FILENOTEXISTING     "File does not exist"
 }

reactos/dll/win32/comdlg32/cdlg_xx.rc

@@ -40,20 +40,20 @@ STRINGTABLE DISCARDABLE
 {
     IDS_FAKEDOCTEXT
         "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. \
-        Nulla a tortor. Etiam aliquet libero venenatis nunc. \n \
+        Nulla a tortor. Etiam aliquet libero venenatis nunc.\n\
-        \n \
+\n\
         Sed augue ante, fermentum sit amet, imperdiet et, gravida eu, enim. \
-        Donec nibh quam, sodales in, commodo vel, facilisis id, neque. \n \
+        Donec nibh quam, sodales in, commodo vel, facilisis id, neque.\n\
-        \n \
+\n\
         Nunc eleifend bibendum nibh. Phasellus in lorem. Ut vel odio quis \
-        libero adipiscing consequat. Donec consectetuer laoreet mauris. \n \
+        libero adipiscing consequat. Donec consectetuer laoreet mauris.\n\
-        \n \
+\n\
         Maecenas tempor, ligula sed congue nonummy, arcu dolor ornare erat, \
-        egestas iaculis magna purus sed turpis. \n \
+        egestas iaculis magna purus sed turpis.\n\
-        \n \
+\n\
         Morbi ultricies est non ipsum. Cum sociis natoque penatibus et magnis \
-        dis parturient montes, nascetur ridiculus mus. \n \
+        dis parturient montes, nascetur ridiculus mus.\n\
-        \n \
+\n\
         Duis sit amet nibh quis purus sollicitudin blandit. Curabitur justo. \
         Phasellus varius, erat eu luctus pharetra, odio elit fringilla leo, \
         non vulputate turpis elit id neque. Vestibulum sit amet tellus sed \

reactos/dll/win32/comdlg32/comdlg32.rbuild

@@ -19,6 +19,7 @@
 	<file>rsrc.rc</file>
 	<file>comdlg32.spec</file>
 	<library>wine</library>
+	<library>uuid</library>
 	<library>shell32</library>
 	<library>shlwapi</library>
 	<library>comctl32</library>
@@ -28,7 +29,6 @@
 	<library>advapi32</library>
 	<library>kernel32</library>
 	<library>ole32</library>
-	<library>uuid</library>
 	<library>ntdll</library>
 </module>
 </group>

reactos/dll/win32/comdlg32/filedlg.c

@@ -196,7 +196,7 @@ static void    FILEDLG95_SHELL_Clean(HWND hwnd);
 static BOOL    FILEDLG95_SHELL_BrowseToDesktop(HWND hwnd);
 
 /* Functions used by the EDIT box */
-static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed, char separator);
+static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed);
 
 /* Functions used by the filetype combo box */
 static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd);
@@ -858,11 +858,10 @@ LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode)
     return hook_result;
 }
 
-static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer)
+static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID result)
 {
-    UINT sizeUsed = 0, n, total;
+    UINT len, total;
-    LPWSTR lpstrFileList = NULL;
+    WCHAR *p, *buffer;
-    WCHAR lpstrCurrentDir[MAX_PATH];
     FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
 
     TRACE("CDM_GETFILEPATH:\n");
@@ -871,81 +870,31 @@ static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer
         return -1;
 
     /* get path and filenames */
-    COMDLG32_GetDisplayNameOf(fodInfos->ShellInfos.pidlAbsCurrent, lpstrCurrentDir);
+    len = SendMessageW( fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0 );
-    n = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, ' ');
+    buffer = HeapAlloc( GetProcessHeap(), 0, (len + 2 + MAX_PATH) * sizeof(WCHAR) );
-
+    COMDLG32_GetDisplayNameOf( fodInfos->ShellInfos.pidlAbsCurrent, buffer );
-    TRACE("path >%s< filespec >%s< %d files\n",
+    if (len)
-         debugstr_w(lpstrCurrentDir),debugstr_w(lpstrFileList),n);
-
-    if( fodInfos->unicode )
     {
-        LPWSTR bufW = buffer;
+        p = buffer + strlenW(buffer);
-        total = lstrlenW(lpstrCurrentDir) + 1 + sizeUsed;
+        *p++ = '\\';
-
+        SendMessageW( fodInfos->DlgInfos.hwndFileName, WM_GETTEXT, len + 1, (LPARAM)p );
-        /* Prepend the current path */
+    }
-        n = lstrlenW(lpstrCurrentDir) + 1;
+    if (fodInfos->unicode)
-        memcpy( bufW, lpstrCurrentDir, min(n,size) * sizeof(WCHAR));
+    {
-        if(n<size)
+        total = strlenW( buffer) + 1;
-        {
+        if (result) lstrcpynW( result, buffer, size );
-            /* 'n' includes trailing \0 */
+        TRACE( "CDM_GETFILEPATH: returning %u %s\n", total, debugstr_w(result));
-            bufW[n-1] = '\\';
-            lstrcpynW( &bufW[n], lpstrFileList, size - n );
-        }
-        TRACE("returned -> %s\n",debugstr_wn(bufW, total));
     }
     else
     {
-        LPSTR bufA = buffer;
+        total = WideCharToMultiByte( CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL );
-        total = WideCharToMultiByte(CP_ACP, 0, lpstrCurrentDir, -1, 
+        if (total <= size) WideCharToMultiByte( CP_ACP, 0, buffer, -1, result, size, NULL, NULL );
-                                    NULL, 0, NULL, NULL);
+        TRACE( "CDM_GETFILEPATH: returning %u %s\n", total, debugstr_a(result));
-        total += WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed, 
-                                    NULL, 0, NULL, NULL);
-
-        /* Prepend the current path */
-        n = WideCharToMultiByte(CP_ACP, 0, lpstrCurrentDir, -1, 
-                                bufA, size, NULL, NULL);
-
-        if(n<size)
-        {
-            /* 'n' includes trailing \0 */
-            bufA[n-1] = '\\';
-            WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed, 
-                                &bufA[n], size-n, NULL, NULL);
-        }
-
-        TRACE("returned -> %s\n",debugstr_an(bufA, total));
     }
-    MemFree(lpstrFileList);
+    HeapFree( GetProcessHeap(), 0, buffer );
-
     return total;
 }
 
-static INT_PTR FILEDLG95_Handle_GetFileSpec(HWND hwnd, DWORD size, LPVOID buffer)
-{
-    UINT sizeUsed = 0;
-    LPWSTR lpstrFileList = NULL;
-    FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
-
-    TRACE("CDM_GETSPEC:\n");
-
-    FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, ' ');
-    if( fodInfos->unicode )
-    {
-        lstrcpynW( buffer, lpstrFileList, size );
-    }
-    else
-    {
-        LPSTR bufA = buffer;
-        DWORD sizeA = WideCharToMultiByte( CP_ACP, 0, lpstrFileList, sizeUsed, NULL, 0, NULL, NULL);
-        WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed, bufA, size, NULL, NULL);
-        if (size && size < sizeA) bufA[size - 1] = 0;
-        sizeUsed = sizeA;
-    }
-    MemFree(lpstrFileList);
-
-    return sizeUsed;
-}
-
 /***********************************************************************
 *         FILEDLG95_HandleCustomDialogMessages
 *
@@ -979,8 +928,22 @@ static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM
             retval = lstrlenW(lpstrPath);
             break;
 
+        case CDM_GETFOLDERIDLIST:
+            retval = COMDLG32_PIDL_ILGetSize(fodInfos->ShellInfos.pidlAbsCurrent);
+            if (retval <= wParam)
+                memcpy((void*)lParam, fodInfos->ShellInfos.pidlAbsCurrent, retval);
+            break;
+
         case CDM_GETSPEC:
-            retval = FILEDLG95_Handle_GetFileSpec(hwnd, (UINT)wParam, (LPSTR)lParam);
+            TRACE("CDM_GETSPEC:\n");
+            retval = SendMessageW(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0) + 1;
+            if (lParam)
+            {
+                if (fodInfos->unicode)
+                    SendMessageW(fodInfos->DlgInfos.hwndFileName, WM_GETTEXT, wParam, lParam);
+                else
+                    SendMessageA(fodInfos->DlgInfos.hwndFileName, WM_GETTEXT, wParam, lParam);
+            }
             break;
 
         case CDM_SETCONTROLTEXT:
@@ -1797,7 +1760,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
   TRACE("hwnd=%p\n", hwnd);
 
   /* get the files from the edit control */
-  nFileCount = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, '\0');
+  nFileCount = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed);
 
   /* try if the user selected a folder in the shellview */
   if(nFileCount == 0)
@@ -3204,7 +3167,7 @@ static HRESULT COMDLG32_StrRetToStrNW (LPWSTR dest, DWORD len, LPSTRRET src, LPI
  * The delimiter is specified by the parameter 'separator',
  *  usually either a space or a nul
  */
-static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed, char separator)
+static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed)
 {
 	FileOpenDlgInfos *fodInfos  = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
 	UINT nStrCharCount = 0;	/* index in src buffer */
@@ -3238,7 +3201,7 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U
 	      (*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount];
 	      nStrCharCount++;
 	    }
-	    (*lpstrFileList)[nFileIndex++] = separator;
+	    (*lpstrFileList)[nFileIndex++] = 0;
 	    nFileCount++;
 	  }
 	  nStrCharCount++;
@@ -3253,7 +3216,6 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U
 	}
 
         /* trailing \0 */
-        if (nFileIndex && separator) nFileIndex--;  /* remove trailing separator */
         (*lpstrFileList)[nFileIndex++] = '\0';
 
         *sizeUsed = nFileIndex;

reactos/dll/win32/comdlg32/filedlg31.c

@@ -143,10 +143,10 @@ static LPCWSTR FD31_GetFileType(LPCWSTR cfptr, LPCWSTR fptr, const WORD index)
  */
 static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath)
 {
-    WCHAR		buffer[BUFFILE];
+    WCHAR   buffer[BUFFILE];
-    HWND 		hdlg, hdlgDir;
+    HWND    hdlg;
-    LRESULT             lRet = TRUE;
+    LRESULT lRet = TRUE;
-    HCURSOR             hCursorWait, oldCursor;
+    HCURSOR hCursorWait, oldCursor;
 
     TRACE("Trying to change to %s\n", debugstr_w(newPath));
     if  ( newPath[0] && !SetCurrentDirectoryW( newPath ))
@@ -180,7 +180,7 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath)
     /* list of directories */
     strcpyW(buffer, FILE_star);
 
-    if ((hdlgDir = GetDlgItem(hWnd, lst2)) != 0) {
+    if (GetDlgItem(hWnd, lst2) != 0) {
         lRet = DlgDirListW(hWnd, buffer, lst2, stc1, DDL_EXCLUSIVE | DDL_DIRECTORY);
     }
     SetCursor(oldCursor);

reactos/dll/win32/comdlg32/printdlg.c

@@ -1247,7 +1247,6 @@ static LRESULT check_printer_setup(HWND hDlg)
 {
     DWORD needed,num;
     WCHAR resourcestr[256],resultstr[256];
-    int res;
 
     EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &needed, &num);
     if(needed == 0)
@@ -1260,7 +1259,7 @@ static LRESULT check_printer_setup(HWND hDlg)
     {
           LoadStringW(COMDLG32_hInstance, PD32_NO_DEVICES,resultstr, 255);
           LoadStringW(COMDLG32_hInstance, PD32_PRINT_TITLE,resourcestr, 255);
-          res = MessageBoxW(hDlg, resultstr, resourcestr,MB_OK | MB_ICONWARNING);
+          MessageBoxW(hDlg, resultstr, resourcestr,MB_OK | MB_ICONWARNING);
           return FALSE;
     }
 }
@@ -2566,15 +2565,13 @@ _c_str2sizeW(const PAGESETUPDLGW *dlga, LPCWSTR strin) {
  */
 static BOOL
 PRINTDLG_PS_UpdateDlgStructA(HWND hDlg, PageSetupDataA *pda) {
-    DEVNAMES	*dn;
     DEVMODEA	*dm;
     DWORD 	paperword;
 
     memcpy(pda->dlga, &pda->curdlg, sizeof(pda->curdlg));
     pda->dlga->hDevMode  = pda->pdlg.hDevMode;
     pda->dlga->hDevNames = pda->pdlg.hDevNames;
-    
+
-    dn = GlobalLock(pda->pdlg.hDevNames);
     dm = GlobalLock(pda->pdlg.hDevMode);
 
     /* Save paper orientation into device context */
@@ -2599,7 +2596,6 @@ PRINTDLG_PS_UpdateDlgStructA(HWND hDlg, PageSetupDataA *pda) {
     else
         FIXME("could not get dialog text for papersize cmbbox?\n");
 
-    GlobalUnlock(pda->pdlg.hDevNames);
     GlobalUnlock(pda->pdlg.hDevMode);
 
     return TRUE;

reactos/dll/win32/compstui/compstui.rbuild

@@ -1,15 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="compstui" type="win32dll" baseaddress="${BASEADDRESS_COMPSTUI}" installbase="system32" installname="compstui.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="compstui.spec.def" />
+	<importlibrary definition="compstui.spec.def" />
-        <include base="compstui">.</include>
+	<include base="compstui">.</include>
-        <include base="ReactOS">include/reactos/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
-        <define name="__WINESRC__" />
+	<define name="__WINESRC__" />
-        <define name="__USE_W32API" />
+	<define name="WINVER">0x600</define>
-        <define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x600</define>
-        <define name="_WIN32_WINNT">0x501</define>
+	<file>compstui_main.c</file>
-        <define name="WINVER">0x501</define>
+	<file>compstui.spec</file>
-        <library>wine</library>
+	<library>wine</library>
-        <library>kernel32</library>
+	<library>kernel32</library>
-        <library>ntdll</library>
+	<library>ntdll</library>
-        <file>compstui_main.c</file>
-        <file>compstui.spec</file>
 </module>
+</group>

reactos/dll/win32/cryptnet/cryptnet_main.c

@@ -453,17 +453,6 @@ static BOOL CRYPT_GetObjectFromCache(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject,
     return ret;
 }
 
-static inline LPWSTR strndupW(LPWSTR string, int len)
-{
-    LPWSTR ret = NULL;
-    if (string && (ret = CryptMemAlloc((len + 1) * sizeof(WCHAR))) != NULL)
-    {
-        memcpy(ret, string, len * sizeof(WCHAR));
-        ret[len] = 0;
-    }
-    return ret;
-}
-
 /* Parses the URL, and sets components's lpszHostName and lpszUrlPath members
  * to NULL-terminated copies of those portions of the URL (to be freed with
  * CryptMemFree.)

reactos/dll/win32/cryptui/cryptui.c

@@ -1,43 +0,0 @@
-/* $Id: dllmain.c 21873 2006-05-10 08:41:27Z cwittich $
-*
-* COPYRIGHT:       See COPYING in the top level directory
-* PROJECT:         ReactOS system libraries
-* FILE:            dll/win32/crypui/cryptui.c
-* PURPOSE:         Library main function
-* PROGRAMMER:      Christoph von Wittich
-* UPDATE HISTORY:
-*
-*/
-
-#include <windows.h>
-#include <cryptuiapi.h>
-
-#define NDEBUG
-#include <debug.h>
-
-INT STDCALL
-DllMain(PVOID hinstDll,
-		ULONG dwReason,
-		PVOID reserved)
-{
-	switch (dwReason)
-	{
-	case DLL_PROCESS_ATTACH:
-		break;
-
-	case DLL_PROCESS_DETACH:
-		break;
-	}
-	return TRUE;
-}
-
-BOOL
-WINAPI
-CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr)
-{
-	UNIMPLEMENTED
-	return FALSE;
-}
-
-
-/* EOF */

reactos/dll/win32/cryptui/cryptui.def

@@ -1,10 +0,0 @@
-; $Id: advapi32.def 24529 2006-10-15 19:58:57Z weiden $
-;
-; cryptui.def
-;
-; ReactOS Operating System
-;
-LIBRARY cryptui.dll
-EXPORTS
-CryptUIDlgCertMgr@4
-; EOF

reactos/dll/win32/cryptui/cryptui.rbuild

@@ -1,11 +1,18 @@
-<module name="cryptui" type="win32dll" baseaddress="${BASEADDRESS_CRYPTUI}" installbase="system32" installname="cryptui.dll" allowwarnings="true">
+<?xml version="1.0"?>
-	<importlibrary definition="cryptui.def" />
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-	<include base="cryptui">.</include>
+<group>
-	<define name="_WIN32_IE">0x600</define>
+<module name="cryptui" type="win32dll" baseaddress="${BASEADDRESS_CRYPTUI}" installbase="system32" installname="cryptui.dll" allowwarnings="true">
-	<define name="_WIN32_WINNT">0x501</define>
+	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<define name="WINVER">0x501</define>
+	<importlibrary definition="cryptui.spec.def" />
-	<library>advapi32</library>
+	<include base="cryptui">.</include>
-	<library>kernel32</library>
+	<include base="ReactOS">include/reactos/wine</include>
-	<library>ntdll</library>
+	<define name="__WINESRC__" />
-	<file>cryptui.c</file>
+	<define name="WINVER">0x600</define>
-</module>
+	<define name="_WIN32_WINNT">0x600</define>
+	<file>main.c</file>
+	<file>cryptui.spec</file>
+	<library>wine</library>
+	<library>kernel32</library>
+	<library>ntdll</library>
+</module>
+</group>

reactos/dll/win32/cryptui/cryptui.spec

@@ -0,0 +1,48 @@
+1 stub ACUIProviderInvokeUI
+2 stub CryptUIDlgCertMgr
+3 stub CryptUIDlgFreeCAContext
+4 stub CryptUIDlgSelectCA
+5 stub CryptUIDlgSelectCertificateA
+6 stub CryptUIDlgSelectCertificateFromStore
+7 stub CryptUIDlgSelectCertificateW
+8 stub CryptUIDlgSelectStoreA
+9 stub CryptUIDlgSelectStoreW
+10 stub CryptUIDlgViewCRLA
+11 stub CryptUIDlgViewCRLW
+12 stub CryptUIDlgViewCTLA
+13 stub CryptUIDlgViewCTLW
+14 stub CryptUIDlgViewCertificateA
+15 stub CryptUIDlgViewCertificatePropertiesA
+16 stub CryptUIDlgViewCertificatePropertiesW
+17 stub CryptUIDlgViewCertificateW
+18 stub CryptUIDlgViewContext
+19 stub CryptUIDlgViewSignerInfoA
+20 stub CryptUIDlgViewSignerInfoW
+21 stub CryptUIFreeCertificatePropertiesPagesA
+22 stub CryptUIFreeCertificatePropertiesPagesW
+23 stub CryptUIFreeViewSignaturesPagesA
+24 stub CryptUIFreeViewSignaturesPagesW
+25 stub CryptUIGetCertificatePropertiesPagesA
+26 stub CryptUIGetCertificatePropertiesPagesW
+27 stub CryptUIGetViewSignaturesPagesA
+28 stub CryptUIGetViewSignaturesPagesW
+29 stub CryptUIStartCertMgr
+30 stub CryptUIWizBuildCTL
+31 stub CryptUIWizCertRequest
+32 stub CryptUIWizCreateCertRequestNoDS
+33 stub CryptUIWizDigitalSign
+34 stub CryptUIWizExport
+35 stub CryptUIWizFreeCertRequestNoDS
+36 stub CryptUIWizFreeDigitalSignContext
+37 stub CryptUIWizImport
+38 stub CryptUIWizQueryCertRequestNoDS
+39 stub CryptUIWizSubmitCertRequestNoDS
+40 stub DllRegisterServer
+41 stub DllUnregisterServer
+42 stub EnrollmentCOMObjectFactory_getInstance
+43 stub I_CryptUIProtect
+44 stub I_CryptUIProtectFailure
+45 stub LocalEnroll
+46 stub LocalEnrollNoDS
+47 stub RetrievePKCS7FromCA
+48 stub WizardFree

reactos/dll/win32/cryptui/main.c

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2008 Juan Lang
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(cryptui);
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+    TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
+
+    switch (fdwReason)
+    {
+        case DLL_WINE_PREATTACH:
+            return FALSE;    /* prefer native version */
+        case DLL_PROCESS_ATTACH:
+            DisableThreadLibraryCalls(hinstDLL);
+            break;
+        case DLL_PROCESS_DETACH:
+            break;
+        default:
+            break;
+    }
+    return TRUE;
+}

reactos/dll/win32/gdiplus/brush.c

@@ -433,6 +433,12 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image,
     return Ok;
 }
 
+GpStatus WINGDIPAPI GdipCreateTextureIAI(GpImage *image, GDIPCONST GpImageAttributes *imageattr,
+    INT x, INT y, INT width, INT height, GpTexture **texture)
+{
+    return GdipCreateTextureIA(image,imageattr,(REAL)x,(REAL)y,(REAL)width,(REAL)height,texture);
+}
+
 GpStatus WINGDIPAPI GdipGetBrushType(GpBrush *brush, GpBrushType *type)
 {
     if(!brush || !type)  return InvalidParameter;

reactos/dll/win32/gdiplus/font.c

@@ -445,7 +445,7 @@ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily)
         return InvalidParameter;
     TRACE("Deleting %p (%s)\n", FontFamily, debugstr_w(FontFamily->FamilyName));
 
-    if (FontFamily->FamilyName) GdipFree (FontFamily->FamilyName);
+    GdipFree (FontFamily->FamilyName);
     GdipFree (FontFamily);
 
     return Ok;

reactos/dll/win32/gdiplus/gdiplus.rbuild

@@ -1,33 +1,35 @@
-<module name="gdiplus" type="win32dll" baseaddress="${BASEADDRESS_GDIPLUS}" installbase="system32" installname="gdiplus.dll" allowwarnings="true" entrypoint="0">
+<?xml version="1.0"?>
-        <importlibrary definition="gdiplus.spec.def" />
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-        <include base="gdiplus">.</include>
+<group>
-        <include base="ReactOS">include/reactos/wine</include>
+<module name="gdiplus" type="win32dll" baseaddress="${BASEADDRESS_GDIPLUS}" installbase="system32" installname="gdiplus.dll" allowwarnings="true">
-        <define name="__WINESRC__" />
+	<importlibrary definition="gdiplus.spec.def" />
-        <define name="__USE_W32API" />
+	<include base="gdiplus">.</include>
-        <define name="_WIN32_IE">0x600</define>
+	<include base="ReactOS">include/reactos/wine</include>
-        <define name="_WIN32_WINNT">0x501</define>
+	<define name="__WINESRC__" />
-        <define name="WINVER">0x501</define>
+	<define name="WINVER">0x600</define>
-        <library>wine</library>
+	<define name="_WIN32_WINNT">0x600</define>
-        <library>shlwapi</library>
+	<file>brush.c</file>
-        <library>oleaut32</library>
+	<file>customlinecap.c</file>
-        <library>ole32</library>
+	<file>font.c</file>
-        <library>user32</library>
+	<file>gdiplus.c</file>
-        <library>gdi32</library>
+	<file>graphics.c</file>
-        <library>kernel32</library>
+	<file>graphicspath.c</file>
-        <library>uuid</library>
+	<file>image.c</file>
-        <library>ntdll</library>
+	<file>imageattributes.c</file>
-        <file>brush.c</file>
+	<file>matrix.c</file>
-        <file>customlinecap.c</file>
+	<file>pathiterator.c</file>
-        <file>font.c</file>
+	<file>pen.c</file>
-        <file>gdiplus.c</file>
+	<file>region.c</file>
-        <file>graphics.c</file>
+	<file>stringformat.c</file>
-        <file>graphicspath.c</file>
+	<file>gdiplus.spec</file>
-        <file>image.c</file>
+	<library>wine</library>
-        <file>imageattributes.c</file>
+	<library>uuid</library>
-        <file>matrix.c</file>
+	<library>shlwapi</library>
-        <file>pathiterator.c</file>
+	<library>oleaut32</library>
-        <file>pen.c</file>
+	<library>ole32</library>
-        <file>stringformat.c</file>
+	<library>user32</library>
-		<file>region.c</file>
+	<library>gdi32</library>
-        <file>gdiplus.spec</file>
+	<library>kernel32</library>
-</module>
+	<library>ntdll</library>
+</module>
+</group>

reactos/dll/win32/gdiplus/gdiplus.spec

@@ -52,16 +52,16 @@
 @ stdcall GdipCloneCustomLineCap(ptr ptr)
 @ stdcall GdipCloneFont(ptr ptr)
 @ stub GdipCloneFontFamily
-@ stub GdipCloneImage
+@ stdcall GdipCloneImage(ptr ptr)
 @ stdcall GdipCloneImageAttributes(ptr ptr)
 @ stdcall GdipCloneMatrix(ptr ptr)
 @ stdcall GdipClonePath(ptr ptr)
 @ stdcall GdipClonePen(ptr ptr)
-@ stub GdipCloneRegion
+@ stdcall GdipCloneRegion(ptr ptr)
 @ stdcall GdipCloneStringFormat(ptr ptr)
 @ stdcall GdipClosePathFigure(ptr)
 @ stdcall GdipClosePathFigures(ptr)
-@ stub GdipCombineRegionPath
+@ stdcall GdipCombineRegionPath(ptr ptr long)
 @ stdcall GdipCombineRegionRect(ptr ptr long)
 @ stdcall GdipCombineRegionRectI(ptr ptr long)
 @ stdcall GdipCombineRegionRegion(ptr ptr long)
@@ -123,11 +123,11 @@
 @ stdcall GdipCreatePen1(long long long ptr)
 @ stdcall GdipCreatePen2(ptr long long ptr)
 @ stdcall GdipCreateRegion(ptr)
-@ stub GdipCreateRegionHrgn
+@ stdcall GdipCreateRegionHrgn(ptr ptr)
 @ stdcall GdipCreateRegionPath(ptr ptr)
 @ stdcall GdipCreateRegionRect(ptr ptr)
 @ stdcall GdipCreateRegionRectI(ptr ptr)
-@ stub GdipCreateRegionRgnData
+@ stdcall GdipCreateRegionRgnData(ptr long ptr)
 @ stdcall GdipCreateSolidFill(long ptr)
 @ stdcall GdipCreateStreamOnFile(ptr long ptr)
 @ stdcall GdipCreateStringFormat(long long ptr)
@@ -135,7 +135,7 @@
 @ stub GdipCreateTexture2I
 @ stub GdipCreateTexture
 @ stdcall GdipCreateTextureIA(ptr ptr long long long long ptr)
-@ stub GdipCreateTextureIAI
+@ stdcall GdipCreateTextureIAI(ptr ptr long long long long ptr)
 @ stdcall GdipDeleteBrush(ptr)
 @ stub GdipDeleteCachedBitmap
 @ stdcall GdipDeleteCustomLineCap(ptr)
@@ -156,8 +156,8 @@
 @ stdcall GdipDrawArcI(ptr ptr long long long long long long)
 @ stdcall GdipDrawBezier(ptr ptr long long long long long long long long)
 @ stdcall GdipDrawBezierI(ptr ptr long long long long long long long long)
-@ stub GdipDrawBeziers
+@ stdcall GdipDrawBeziers(ptr ptr ptr long)
-@ stub GdipDrawBeziersI
+@ stdcall GdipDrawBeziersI(ptr ptr ptr long)
 @ stub GdipDrawCachedBitmap
 @ stub GdipDrawClosedCurve2
 @ stub GdipDrawClosedCurve2I
@@ -375,8 +375,8 @@
 @ stub GdipGetPropertyItem
 @ stdcall GdipGetPropertyItemSize(ptr long ptr)
 @ stub GdipGetPropertySize
-@ stub GdipGetRegionBounds
+@ stdcall GdipGetRegionBounds(ptr ptr ptr)
-@ stub GdipGetRegionBoundsI
+@ stdcall GdipGetRegionBoundsI(ptr ptr ptr)
 @ stdcall GdipGetRegionData(ptr ptr long ptr)
 @ stdcall GdipGetRegionDataSize(ptr ptr)
 @ stdcall GdipGetRegionHRgn(ptr ptr ptr)
@@ -415,9 +415,9 @@
 @ stub GdipInitializePalette
 @ stub GdipInvertMatrix
 @ stub GdipIsClipEmpty
-@ stub GdipIsEmptyRegion
+@ stdcall GdipIsEmptyRegion(ptr ptr ptr)
-@ stub GdipIsEqualRegion
+@ stdcall GdipIsEqualRegion(ptr ptr ptr ptr)
-@ stub GdipIsInfiniteRegion
+@ stdcall GdipIsInfiniteRegion(ptr ptr ptr)
 @ stdcall GdipIsMatrixEqual(ptr ptr ptr)
 @ stdcall GdipIsMatrixIdentity(ptr ptr)
 @ stub GdipIsMatrixInvertible
@@ -451,10 +451,10 @@
 @ stub GdipNewInstalledFontCollection
 @ stub GdipNewPrivateFontCollection
 @ stdcall GdipPathIterCopyData(ptr ptr ptr ptr long long)
-@ stub GdipPathIterEnumerate
+@ stdcall GdipPathIterEnumerate(ptr ptr ptr ptr long)
 @ stdcall GdipPathIterGetCount(ptr ptr)
 @ stub GdipPathIterGetSubpathCount
-@ stub GdipPathIterHasCurve
+@ stdcall GdipPathIterHasCurve(ptr ptr)
 @ stub GdipPathIterIsValid
 @ stub GdipPathIterNextMarker
 @ stub GdipPathIterNextMarkerPath
@@ -608,15 +608,15 @@
 @ stdcall GdipTransformPath(ptr ptr)
 @ stub GdipTransformPoints
 @ stub GdipTransformPointsI
-@ stub GdipTransformRegion
+@ stdcall GdipTransformRegion(ptr ptr)
 @ stub GdipTranslateClip
 @ stub GdipTranslateClipI
 @ stub GdipTranslateLineTransform
 @ stdcall GdipTranslateMatrix(ptr long long long)
 @ stub GdipTranslatePathGradientTransform
 @ stub GdipTranslatePenTransform
-@ stub GdipTranslateRegion
+@ stdcall GdipTranslateRegion(ptr long long)
-@ stub GdipTranslateRegionI
+@ stdcall GdipTranslateRegionI(ptr long long)
 @ stub GdipTranslateTextureTransform
 @ stdcall GdipTranslateWorldTransform(ptr long long long)
 @ stdcall GdipVectorTransformMatrixPoints(ptr ptr long)

reactos/dll/win32/gdiplus/graphics.c

@@ -997,6 +997,54 @@ GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1,
     return retval;
 }
 
+GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics *graphics, GpPen *pen,
+    GDIPCONST GpPointF *points, INT count)
+{
+    INT i;
+    GpStatus ret;
+
+    if(!graphics || !pen || !points || (count <= 0))
+        return InvalidParameter;
+
+    for(i = 0; i < floor(count / 4); i++){
+        ret = GdipDrawBezier(graphics, pen,
+                             points[4*i].X, points[4*i].Y,
+                             points[4*i + 1].X, points[4*i + 1].Y,
+                             points[4*i + 2].X, points[4*i + 2].Y,
+                             points[4*i + 3].X, points[4*i + 3].Y);
+        if(ret != Ok)
+            return ret;
+    }
+
+    return Ok;
+}
+
+GpStatus WINGDIPAPI GdipDrawBeziersI(GpGraphics *graphics, GpPen *pen,
+    GDIPCONST GpPoint *points, INT count)
+{
+    GpPointF *pts;
+    GpStatus ret;
+    INT i;
+
+    if(!graphics || !pen || !points || (count <= 0))
+        return InvalidParameter;
+
+    pts = GdipAlloc(sizeof(GpPointF) * count);
+    if(!pts)
+        return OutOfMemory;
+
+    for(i = 0; i < count; i++){
+        pts[i].X = (REAL)points[i].X;
+        pts[i].Y = (REAL)points[i].Y;
+    }
+
+    ret = GdipDrawBeziers(graphics,pen,pts,count);
+
+    GdipFree(pts);
+
+    return ret;
+}
+
 GpStatus WINGDIPAPI GdipDrawCurve(GpGraphics *graphics, GpPen *pen,
     GDIPCONST GpPointF *points, INT count)
 {

reactos/dll/win32/gdiplus/graphicspath.c

@@ -813,7 +813,7 @@ GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y,
     ptf[1].X = x;
     ptf[1].Y = y+height;
 
-    if((retstat = GdipAddPathLine2(path,(GDIPCONST GpPointF*)&ptf,2)) != Ok)  goto fail;
+    if((retstat = GdipAddPathLine2(path, ptf, 2)) != Ok)  goto fail;
     path->pathdata.Types[path->pathdata.Count-1] |= PathPointTypeCloseSubpath;
 
     /* free backup */

reactos/dll/win32/gdiplus/image.c

@@ -240,6 +240,15 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap,
     return Ok;
 }
 
+GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage)
+{
+    if (!(image && cloneImage)) return InvalidParameter;
+
+    FIXME("stub: %p, %p", image, cloneImage);
+
+    return NotImplemented;
+}
+
 GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename,
     GpBitmap **bitmap)
 {

reactos/dll/win32/gdiplus/pathiterator.c

@@ -87,6 +87,24 @@ GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator* iterator,
     return Ok;
 }
 
+GpStatus WINGDIPAPI GdipPathIterHasCurve(GpPathIterator* iterator, BOOL* hasCurve)
+{
+    INT i;
+
+    if(!iterator)
+        return InvalidParameter;
+
+    *hasCurve = FALSE;
+
+    for(i = 0; i < iterator->pathdata.Count; i++)
+        if((iterator->pathdata.Types[i] & PathPointTypePathTypeMask) == PathPointTypeBezier){
+            *hasCurve = TRUE;
+            break;
+        }
+
+    return Ok;
+}
+
 GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator* iterator,
     INT *resultCount, INT* startIndex, INT* endIndex, BOOL* isClosed)
 {
@@ -141,3 +159,17 @@ GpStatus WINGDIPAPI GdipPathIterGetCount(GpPathIterator* iterator, INT* count)
 
     return Ok;
 }
+
+GpStatus WINGDIPAPI GdipPathIterEnumerate(GpPathIterator* iterator, INT* resultCount,
+    GpPointF *points, BYTE *types, INT count)
+{
+    if((count < 0) || !resultCount)
+        return InvalidParameter;
+
+    if(count == 0){
+        *resultCount = 0;
+        return Ok;
+    }
+
+    return GdipPathIterCopyData(iterator, resultCount, points, types, 0, count-1);
+}

reactos/dll/win32/gdiplus/region.c

@@ -67,6 +67,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
  *
  */
 
+GpStatus WINGDIPAPI GdipCloneRegion(GpRegion *region, GpRegion **clone)
+{
+    FIXME("(%p %p): stub\n", region, clone);
+
+    *clone = NULL;
+    return NotImplemented;
+}
+
+GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *region, GpPath *path, CombineMode mode)
+{
+    FIXME("(%p %p %d): stub\n", region, path, mode);
+    return NotImplemented;
+}
+
 GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, GDIPCONST GpRectF *rect,
                                           CombineMode mode)
 {
@@ -120,12 +134,42 @@ GpStatus WINGDIPAPI GdipCreateRegionRectI(GDIPCONST GpRect *rect, GpRegion **reg
     return NotImplemented;
 }
 
+GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRegion **region)
+{
+    FIXME("(%p, %d, %p): stub\n", data, size, region);
+
+    *region = NULL;
+    return NotImplemented;
+}
+
+GpStatus WINGDIPAPI GdipCreateRegionHrgn(HRGN hrgn, GpRegion **region)
+{
+    FIXME("(%p, %p): stub\n", hrgn, region);
+
+    *region = NULL;
+    return NotImplemented;
+}
+
 GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region)
 {
     FIXME("(%p): stub\n", region);
     return NotImplemented;
 }
 
+GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, GpRectF *rect)
+{
+    FIXME("(%p, %p, %p): stub\n", region, graphics, rect);
+
+    return NotImplemented;
+}
+
+GpStatus WINGDIPAPI GdipGetRegionBoundsI(GpRegion *region, GpGraphics *graphics, GpRect *rect)
+{
+    FIXME("(%p, %p, %p): stub\n", region, graphics, rect);
+
+    return NotImplemented;
+}
+
 GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, UINT *needed)
 {
     FIXME("(%p, %p, %d, %p): stub\n", region, buffer, size, needed);
@@ -148,6 +192,28 @@ GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *region, GpGraphics *graphics, HR
     return NotImplemented;
 }
 
+GpStatus WINGDIPAPI GdipIsEmptyRegion(GpRegion *region, GpGraphics *graphics, BOOL *res)
+{
+    FIXME("(%p, %p, %p): stub\n", region, graphics, res);
+
+    return NotImplemented;
+}
+
+GpStatus WINGDIPAPI GdipIsEqualRegion(GpRegion *region, GpRegion *region2, GpGraphics *graphics,
+                                      BOOL *res)
+{
+    FIXME("(%p, %p, %p, %p): stub\n", region, region2, graphics, res);
+
+    return NotImplemented;
+}
+
+GpStatus WINGDIPAPI GdipIsInfiniteRegion(GpRegion *region, GpGraphics *graphics, BOOL *res)
+{
+    FIXME("(%p, %p, %p): stub\n", region, graphics, res);
+
+    return NotImplemented;
+}
+
 GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *region)
 {
     static int calls;
@@ -167,3 +233,24 @@ GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *region)
 
     return NotImplemented;
 }
+
+GpStatus WINGDIPAPI GdipTransformRegion(GpRegion *region, GpMatrix *matrix)
+{
+    FIXME("(%p, %p): stub\n", region, matrix);
+
+    return NotImplemented;
+}
+
+GpStatus WINGDIPAPI GdipTranslateRegion(GpRegion *region, REAL dx, REAL dy)
+{
+    FIXME("(%p, %f, %f): stub\n", region, dx, dy);
+
+    return NotImplemented;
+}
+
+GpStatus WINGDIPAPI GdipTranslateRegionI(GpRegion *region, INT dx, INT dy)
+{
+    FIXME("(%p, %d, %d): stub\n", region, dx, dy);
+
+    return NotImplemented;
+}

reactos/media/doc/README.WINE

@@ -43,6 +43,7 @@ reactos/dll/win32/compstui        # Autosync
 reactos/dll/win32/crypt32         # Synced to Wine-1_0-rc1
 reactos/dll/win32/cryptdll        # Autosync
 reactos/dll/win32/cryptnet        # Autosync
+reactos/dll/win32/cryptui         # Autosync
 reactos/dll/win32/dbghelp         # Synced to Wine-20080106
 reactos/dll/win32/dciman32        # Synced to Wine-1_0-rc2
 reactos/dll/win32/gdiplus         # Autosync