diff --git a/reactos/dll/win32/comctl32/comctl32.rbuild b/reactos/dll/win32/comctl32/comctl32.rbuild
index 630420b5b29..a7da462311c 100644
--- a/reactos/dll/win32/comctl32/comctl32.rbuild
+++ b/reactos/dll/win32/comctl32/comctl32.rbuild
@@ -4,18 +4,19 @@
.
include/reactos/wine
+
0x600
0x501
0x501
wine
- ntdll
- kernel32
- advapi32
- gdi32
user32
- uxtheme
+ gdi32
+ advapi32
+ kernel32
winmm
+ uxtheme
+ ntdll
animate.c
comboex.c
comctl32undoc.c
@@ -37,8 +38,8 @@
propsheet.c
rebar.c
smoothscroll.c
- string.c
status.c
+ string.c
syslink.c
tab.c
theme_combo.c
diff --git a/reactos/dll/win32/comctl32/comctl32_ros.diff b/reactos/dll/win32/comctl32/comctl32_ros.diff
new file mode 100644
index 00000000000..463bb689f03
--- /dev/null
+++ b/reactos/dll/win32/comctl32/comctl32_ros.diff
@@ -0,0 +1,26 @@
+Index: comctl32.rbuild
+===================================================================
+--- comctl32.rbuild (revision 23123)
++++ comctl32.rbuild (working copy)
+@@ -1,4 +1,5 @@
+
++
+
+ .
+ include/reactos/wine
+Index: listview.c
+===================================================================
+--- listview.c (revision 23123)
++++ listview.c (working copy)
+@@ -3770,9 +3770,8 @@
+ if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon))
+ {
+ TRACE("iImage=%d\n", lvItem.iImage);
++ ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top,
++ (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL);
+- ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top,
+- rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, CLR_DEFAULT,
+- (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL);
+ }
+
+ /* Don't bother painting item being edited */
\ No newline at end of file
diff --git a/reactos/dll/win32/comctl32/comctl_Bg.rc b/reactos/dll/win32/comctl32/comctl_Bg.rc
index b14e7681b86..94dd8703c64 100644
--- a/reactos/dll/win32/comctl32/comctl_Bg.rc
+++ b/reactos/dll/win32/comctl32/comctl_Bg.rc
@@ -22,7 +22,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Ñâîéñòâà íà "
+CAPTION "Ñâîéñòâà íà %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Cn.rc b/reactos/dll/win32/comctl32/comctl_Cn.rc
index 1d86f60f177..a9fa9979bed 100644
--- a/reactos/dll/win32/comctl32/comctl_Cn.rc
+++ b/reactos/dll/win32/comctl32/comctl_Cn.rc
@@ -21,7 +21,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "ÊôÐÔ "
+CAPTION "ÊôÐÔ %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "È·¶¨", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Cs.rc b/reactos/dll/win32/comctl32/comctl_Cs.rc
index b66eea2553b..63cc0bbc68b 100644
--- a/reactos/dll/win32/comctl32/comctl_Cs.rc
+++ b/reactos/dll/win32/comctl32/comctl_Cs.rc
@@ -26,7 +26,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Vlastnosti "
+CAPTION "Vlastnosti %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_De.rc b/reactos/dll/win32/comctl32/comctl_De.rc
index d0f9dd893e7..e4b8a1d2caa 100644
--- a/reactos/dll/win32/comctl32/comctl_De.rc
+++ b/reactos/dll/win32/comctl32/comctl_De.rc
@@ -41,7 +41,7 @@ STRINGTABLE DISCARDABLE
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Eigenschaften für "
+CAPTION "Eigenschaften für %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_En.rc b/reactos/dll/win32/comctl32/comctl_En.rc
index 4e3094691a3..369eecd90ff 100644
--- a/reactos/dll/win32/comctl32/comctl_En.rc
+++ b/reactos/dll/win32/comctl32/comctl_En.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Properties for "
+CAPTION "Properties for %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Eo.rc b/reactos/dll/win32/comctl32/comctl_Eo.rc
index ab4f7865a14..bda181759f8 100644
--- a/reactos/dll/win32/comctl32/comctl_Eo.rc
+++ b/reactos/dll/win32/comctl32/comctl_Eo.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Ecoj laý "
+CAPTION "Ecoj laý %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "Bone", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Es.rc b/reactos/dll/win32/comctl32/comctl_Es.rc
index 82450086ca9..ea2968edcaa 100644
--- a/reactos/dll/win32/comctl32/comctl_Es.rc
+++ b/reactos/dll/win32/comctl32/comctl_Es.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Propiedades de "
+CAPTION "Propiedades de %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "Aceptar", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Fr.rc b/reactos/dll/win32/comctl32/comctl_Fr.rc
index 3ac39415ddb..1bf8e230b02 100644
--- a/reactos/dll/win32/comctl32/comctl_Fr.rc
+++ b/reactos/dll/win32/comctl32/comctl_Fr.rc
@@ -24,7 +24,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Propriétés pour "
+CAPTION "Propriétés pour %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Hu.rc b/reactos/dll/win32/comctl32/comctl_Hu.rc
index acf06ee328e..6019777c1bd 100644
--- a/reactos/dll/win32/comctl32/comctl_Hu.rc
+++ b/reactos/dll/win32/comctl32/comctl_Hu.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Tulajdonságok: "
+CAPTION "Tulajdonságok: %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_It.rc b/reactos/dll/win32/comctl32/comctl_It.rc
index b617d50ce4e..c3b06f7073f 100644
--- a/reactos/dll/win32/comctl32/comctl_It.rc
+++ b/reactos/dll/win32/comctl32/comctl_It.rc
@@ -21,7 +21,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Proprietà per "
+CAPTION "Proprietà per %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Ja.rc b/reactos/dll/win32/comctl32/comctl_Ja.rc
index 3c78c890bc9..b00969a3e08 100644
--- a/reactos/dll/win32/comctl32/comctl_Ja.rc
+++ b/reactos/dll/win32/comctl32/comctl_Ja.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Properties for "
+CAPTION "Properties for %s"
FONT 9, "MS UI Gothic"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Ko.rc b/reactos/dll/win32/comctl32/comctl_Ko.rc
index 4c65f17abfd..95de29ae84e 100644
--- a/reactos/dll/win32/comctl32/comctl_Ko.rc
+++ b/reactos/dll/win32/comctl32/comctl_Ko.rc
@@ -21,7 +21,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "¼Ó¼º"
+CAPTION "%s ¼Ó¼º"
FONT 9, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "È®ÀÎ", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
@@ -54,11 +54,11 @@ CAPTION "
FONT 9, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "´Ý±â(&C)", IDCANCEL,308,6,44,14
- PUSHBUTTON "´Ù½Ã(&e)", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "´Ù½Ã(&E)", IDC_RESET_BTN,308,23,44,14
PUSHBUTTON "µµ¿ò¸»(&H)", IDC_HELP_BTN,308,40,44,14
PUSHBUTTON "À§·Î À̵¿(&U)", IDC_MOVEUP_BTN,308,74,44,14
PUSHBUTTON "¾Æ·¡·Î À̵¿(&D)", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "°¡´ÉÇÑ ¹öÆ°(&v)", -1,4,5,84,10
+ LTEXT "°¡´ÉÇÑ ¹öÆ°(&V)", -1,4,5,84,10
LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
PUSHBUTTON "´õÇϱâ(&A) ->", IDOK, 131, 42, 44, 14
PUSHBUTTON "<- Á¦°ÅÇϱâ(&R)", IDC_REMOVE_BTN,131,62,44,14
@@ -81,3 +81,8 @@ STRINGTABLE DISCARDABLE
{
IDS_SEPARATOR "ºÐ¸®ÀÚ"
}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "¾øÀ½"
+}
diff --git a/reactos/dll/win32/comctl32/comctl_Nl.rc b/reactos/dll/win32/comctl32/comctl_Nl.rc
index 770985cd18c..06b23be03e8 100644
--- a/reactos/dll/win32/comctl32/comctl_Nl.rc
+++ b/reactos/dll/win32/comctl32/comctl_Nl.rc
@@ -22,7 +22,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Eigenschappen van "
+CAPTION "Eigenschappen van %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_No.rc b/reactos/dll/win32/comctl32/comctl_No.rc
index 743405cf03e..77b9ec8da70 100644
--- a/reactos/dll/win32/comctl32/comctl_No.rc
+++ b/reactos/dll/win32/comctl32/comctl_No.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Egenskaper for "
+CAPTION "Egenskaper for %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Pl.rc b/reactos/dll/win32/comctl32/comctl_Pl.rc
index 6adbecccd68..252c43eb1a3 100644
--- a/reactos/dll/win32/comctl32/comctl_Pl.rc
+++ b/reactos/dll/win32/comctl32/comctl_Pl.rc
@@ -21,7 +21,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "W³aœciwoœci "
+CAPTION "W³aœciwoœci %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Pt.rc b/reactos/dll/win32/comctl32/comctl_Pt.rc
index dcdb7ae23d3..f3ed6bf506a 100644
--- a/reactos/dll/win32/comctl32/comctl_Pt.rc
+++ b/reactos/dll/win32/comctl32/comctl_Pt.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Propriedades para "
+CAPTION "Propriedades para %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Ru.rc b/reactos/dll/win32/comctl32/comctl_Ru.rc
index a335abee2e6..35418e45cf2 100644
--- a/reactos/dll/win32/comctl32/comctl_Ru.rc
+++ b/reactos/dll/win32/comctl32/comctl_Ru.rc
@@ -22,7 +22,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Ñâîéñòâà äëÿ "
+CAPTION "Ñâîéñòâà äëÿ %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Si.rc b/reactos/dll/win32/comctl32/comctl_Si.rc
index fb5e1bbadd6..90c65148801 100644
--- a/reactos/dll/win32/comctl32/comctl_Si.rc
+++ b/reactos/dll/win32/comctl32/comctl_Si.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Lastnosti"
+CAPTION "Lastnosti %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "V redu", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Sv.rc b/reactos/dll/win32/comctl32/comctl_Sv.rc
index e67f1ff233c..fb4673abd85 100644
--- a/reactos/dll/win32/comctl32/comctl_Sv.rc
+++ b/reactos/dll/win32/comctl32/comctl_Sv.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Egenskaper för "
+CAPTION "Egenskaper för %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Th.rc b/reactos/dll/win32/comctl32/comctl_Th.rc
index c943ce91c55..3195e1b9a55 100644
--- a/reactos/dll/win32/comctl32/comctl_Th.rc
+++ b/reactos/dll/win32/comctl32/comctl_Th.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ "
+CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "µ¡Å§", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Tr.rc b/reactos/dll/win32/comctl32/comctl_Tr.rc
index 1429af83552..c0f65127f9d 100644
--- a/reactos/dll/win32/comctl32/comctl_Tr.rc
+++ b/reactos/dll/win32/comctl32/comctl_Tr.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Özellikler: "
+CAPTION "Özellikler: %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "Tamam", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/comctl_Uk.rc b/reactos/dll/win32/comctl32/comctl_Uk.rc
index 3c52e009d38..95e502dd471 100644
--- a/reactos/dll/win32/comctl32/comctl_Uk.rc
+++ b/reactos/dll/win32/comctl32/comctl_Uk.rc
@@ -22,7 +22,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Âëàñòèâîñò³ äëÿ "
+CAPTION "Âëàñòèâîñò³ äëÿ %s"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/reactos/dll/win32/comctl32/listview.c b/reactos/dll/win32/comctl32/listview.c
index efc0684e9a9..9865746b69c 100644
--- a/reactos/dll/win32/comctl32/listview.c
+++ b/reactos/dll/win32/comctl32/listview.c
@@ -3770,8 +3770,8 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS
if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon))
{
TRACE("iImage=%d\n", lvItem.iImage);
- ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top,
- (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL);
+ ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top,
+ (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL);
}
/* Don't bother painting item being edited */
@@ -5617,10 +5617,12 @@ static BOOL LISTVIEW_GetSubItemRect(LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lp
{
POINT Position;
LVITEMW lvItem;
- INT nColumn = lprc->top;
+ INT nColumn;
if (!lprc) return FALSE;
+ nColumn = lprc->top;
+
TRACE("(nItem=%d, nSubItem=%ld)\n", nItem, lprc->top);
/* On WinNT, a subitem of '0' calls LISTVIEW_GetItemRect */
if (lprc->top == 0)
@@ -6274,7 +6276,13 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem,
memcpy(&item, lpLVItem, offsetof( LVITEMW, iIndent ));
}
item.iItem = nItem;
- if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) item.state &= ~LVIS_STATEIMAGEMASK;
+ if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES)
+ {
+ item.mask |= LVIF_STATE;
+ item.stateMask |= LVIS_STATEIMAGEMASK;
+ item.state &= ~LVIS_STATEIMAGEMASK;
+ item.state |= INDEXTOSTATEIMAGEMASK(1);
+ }
if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo;
/* if we're sorted, sort the list, and update the index */
@@ -6592,6 +6600,7 @@ static INT LISTVIEW_InsertColumnT(LISTVIEW_INFO *infoPtr, INT nColumn,
/* make space for the new column */
LISTVIEW_ScrollColumns(infoPtr, nNewColumn + 1, lpColumnInfo->rcHeader.right - lpColumnInfo->rcHeader.left);
+ LISTVIEW_UpdateItemSize(infoPtr);
return nNewColumn;
@@ -6871,7 +6880,15 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM
{
HIMAGELIST himl = 0;
if(infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES)
+ {
+ LVITEMW item;
+ item.mask = LVIF_STATE;
+ item.stateMask = LVIS_STATEIMAGEMASK;
+ item.state = INDEXTOSTATEIMAGEMASK(1);
+ LISTVIEW_SetItemState(infoPtr, -1, &item);
+
himl = LISTVIEW_CreateCheckBoxIL(infoPtr);
+ }
LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl);
}
diff --git a/reactos/dll/win32/comctl32/propsheet.c b/reactos/dll/win32/comctl32/propsheet.c
index f21852c4f31..907e638a840 100644
--- a/reactos/dll/win32/comctl32/propsheet.c
+++ b/reactos/dll/win32/comctl32/propsheet.c
@@ -2151,8 +2151,7 @@ static void PROPSHEET_SetTitleW(HWND hwndDlg, DWORD dwStyle, LPCWSTR lpszText)
int lenprop = strlenW(psInfo->strPropertiesFor);
dest = Alloc( (lentitle + lenprop + 1)*sizeof (WCHAR));
- strcpyW(dest, psInfo->strPropertiesFor);
- strcatW(dest, lpszText);
+ wsprintfW(dest, psInfo->strPropertiesFor, lpszText);
SetWindowTextW(hwndDlg, dest);
Free(dest);
diff --git a/reactos/dll/win32/comctl32/trackbar.c b/reactos/dll/win32/comctl32/trackbar.c
index aecde79a17b..1acccc43d93 100644
--- a/reactos/dll/win32/comctl32/trackbar.c
+++ b/reactos/dll/win32/comctl32/trackbar.c
@@ -237,7 +237,7 @@ TRACKBAR_GetAutoPageDirection (TRACKBAR_INFO *infoPtr, POINT clickPoint)
return 0;
}
-static void inline
+inline static void
TRACKBAR_PageDown (TRACKBAR_INFO *infoPtr)
{
if (infoPtr->lPos == infoPtr->lRangeMax) return;
@@ -249,7 +249,7 @@ TRACKBAR_PageDown (TRACKBAR_INFO *infoPtr)
}
-static void inline
+inline static void
TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr)
{
if (infoPtr->lPos == infoPtr->lRangeMin) return;
@@ -260,7 +260,7 @@ TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr)
notify_with_scroll (infoPtr, TB_PAGEUP);
}
-static void inline TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr)
+inline static void TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr)
{
if (infoPtr->lPos == infoPtr->lRangeMin) return;
infoPtr->lPos -= infoPtr->lLineSize;
@@ -269,7 +269,7 @@ static void inline TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr)
notify_with_scroll (infoPtr, TB_LINEUP);
}
-static void inline TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr)
+inline static void TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr)
{
if (infoPtr->lPos == infoPtr->lRangeMax) return;
infoPtr->lPos += infoPtr->lLineSize;
@@ -404,7 +404,7 @@ TRACKBAR_InvalidateThumbMove (TRACKBAR_INFO *infoPtr, LONG oldPos, LONG newPos)
TRACKBAR_InvalidateThumb (infoPtr, newPos);
}
-static BOOL inline
+inline static BOOL
TRACKBAR_HasSelection (TRACKBAR_INFO *infoPtr)
{
return infoPtr->lSelMin != infoPtr->lSelMax;
@@ -757,7 +757,7 @@ TRACKBAR_DrawThumb(TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle)
}
-static void inline
+inline static void
TRACKBAR_ActivateToolTip (TRACKBAR_INFO *infoPtr, BOOL fShow)
{
TTTOOLINFOW ti;
@@ -1022,7 +1022,7 @@ TRACKBAR_ClearTics (TRACKBAR_INFO *infoPtr, BOOL fRedraw)
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc)
{
if (lprc == NULL) return 0;
@@ -1036,7 +1036,7 @@ TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc)
}
-static LONG inline
+inline static LONG
TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr)
{
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS)
@@ -1058,7 +1058,7 @@ static int comp_tics(const void *ap, const void *bp)
}
-static LONG inline
+inline static LONG
TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic)
{
if ((iTic < 0) || (iTic >= infoPtr->uNumTics) || !infoPtr->tics)
@@ -1069,7 +1069,7 @@ TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic)
}
-static LONG inline
+inline static LONG
TRACKBAR_GetTicPos (TRACKBAR_INFO *infoPtr, INT iTic)
{
LONG range, width, pos, tic;
@@ -1111,7 +1111,7 @@ TRACKBAR_SetBuddy (TRACKBAR_INFO *infoPtr, BOOL fLocation, HWND hwndBuddy)
}
-static LONG inline
+inline static LONG
TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize)
{
LONG lTemp = infoPtr->lLineSize;
@@ -1122,7 +1122,7 @@ TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize)
}
-static LONG inline
+inline static LONG
TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize)
{
LONG lTemp = infoPtr->lPageSize;
@@ -1133,7 +1133,7 @@ TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize)
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition)
{
LONG oldPos = infoPtr->lPos;
@@ -1152,7 +1152,7 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition)
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange)
{
infoPtr->lRangeMin = (SHORT)LOWORD(lRange);
@@ -1177,7 +1177,7 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange)
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax)
{
infoPtr->lRangeMax = lMax;
@@ -1195,7 +1195,7 @@ TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax)
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin)
{
infoPtr->lRangeMin = lMin;
@@ -1213,7 +1213,7 @@ TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin)
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel)
{
if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)
@@ -1234,7 +1234,7 @@ TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel)
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd)
{
if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)
@@ -1252,7 +1252,7 @@ TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd)
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lStart)
{
if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)
@@ -1270,7 +1270,7 @@ TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lStart)
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength)
{
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_FIXEDLENGTH) {
@@ -1283,7 +1283,7 @@ TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength)
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos)
{
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS)
@@ -1310,7 +1310,7 @@ TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos)
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq)
{
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) {
@@ -1323,7 +1323,7 @@ TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq)
}
-static INT inline
+inline static INT
TRACKBAR_SetTipSide (TRACKBAR_INFO *infoPtr, INT fLocation)
{
INT fTemp = infoPtr->fLocation;
@@ -1334,7 +1334,7 @@ TRACKBAR_SetTipSide (TRACKBAR_INFO *infoPtr, INT fLocation)
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetToolTips (TRACKBAR_INFO *infoPtr, HWND hwndTT)
{
infoPtr->hwndToolTip = hwndTT;
@@ -1343,7 +1343,7 @@ TRACKBAR_SetToolTips (TRACKBAR_INFO *infoPtr, HWND hwndTT)
}
-static BOOL inline
+inline static BOOL
TRACKBAR_SetUnicodeFormat (TRACKBAR_INFO *infoPtr, BOOL fUnicode)
{
BOOL bTemp = infoPtr->bUnicode;
@@ -1702,7 +1702,7 @@ TRACKBAR_KeyDown (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData)
}
-static BOOL inline
+inline static BOOL
TRACKBAR_KeyUp (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData)
{
switch (nVirtKey) {