From a265261bd41002c686c2860509f701f3b2352772 Mon Sep 17 00:00:00 2001
From: Joachim Henze <Joachim.Henze@reactos.org>
Date: Tue, 12 Sep 2023 01:11:11 +0200
Subject: [PATCH] [0.4.11][COMCTL32] Listview: marqueeRect before starting
 highlight (#5555), RC: VB6-InstallWizard (#2270)

port back:
0.4.15-dev-6456-g 918a8180718f0901e231b12fe2274b82baa926b6 [WINESYNC][COMCTL32] Listview: Initialize marqueeRect from left-click coordinates before starting a marquee highlight (#5555)

The infoPtr->marqueeRect structure is not currently initialized before the
marquee highlight sequence starts, resulting in the RECT having initial
coordinates of (0,0)-(0,0). These coordinates cause the first item in
the listview control to be identified as being within the range of the
marqueeRect's coordinates. This can be best observed when our filebrowser is in details-mode.

That item is then set to LVIS_SELECTED even though it is not part of the
marquee selection.

Wine commit: daf95aaadf3a59f0ccc129a853327417b5e4f07c

author: Hugh McMaster <hugh.mcmaster@outlook.com>
Mon, 26 Apr 2021 10:59:51 +0000 (20:59 +1000)

---------------

Also fix CORE-16650 'VB6 installation does not show the wizard correctly'
by porting back:
0.4.14-dev-844-g ea35843c300f381845b69c634e51ba849a0ea5a7 [COMCTL] Use DIALOG instead of DIALOGEX resources (#2270)

This is needed, because property sheets can modify the dialog resource,
and example code (and some existing applications) expect DIALOG.
One such application is the VB6 setup.
CORE-16650

---------------

also port back a few other trivial improvements from never branches, e.g.:
a tiny fraction of 0.4.14-dev-150-g 00f14ee1f22a1c285462459f859fa17c90ccc19f the type/cast-changes in LISTVIEW_MouseWheel()

---------------

0.4.13-dev-26-g 6122f3f436a4551e2a85318b7e6452a6fbada2c5 [COMCTL32] Remove an unnecessary include

---------------

and port back also a few trivial RC improvements, mainly to keep binary size under control.

Binary size:
comctl32.dll master    RosBEWin2.2.2 GCC8.4.0dbg               1.999.872
comctl32.dll 0.4.14rls RosBEWin2.1.6 GCC4.7.2dbg  1.808.896 -> 1.808.896
comctl32.dll 0.4.13rls RosBEWin2.1.6 GCC4.7.2dbg  1.810.944 -> 1.805.312
comctl32.dll 0.4.12rls RosBEWin2.1.6 GCC4.7.2dbg  1.823.232 -> 1.818.112
comctl32.dll 0.4.11rls RosBEWin2.1.6 GCC4.7.2dbg  1.816.064 -> 1.810.944
comctl32.dll 0.4.10rls RosBEWin2.1.6 GCC4.7.2dbg  1.813.504 -> 1.808.384
comctl32.dll 0.4. 9rls RosBEWin2.1.6 GCC4.7.2dbg  1.813.504 -> 1.808.384
comctl32.dll 0.4. 8rls RosBEWin2.1.6 GCC4.7.2dbg  1.639.424 -> 1.634.304
comctl32.dll 0.4. 7rls RosBEWin2.1.6 GCC4.7.2dbg  1.634.304 -> 1.629.184
---
 dll/win32/comctl32/lang/comctl_Bg.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Cs.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Da.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_De.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_El.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_En.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Eo.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Es.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Et.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Fr.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_He.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Hu.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_It.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Ja.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Ko.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Lt.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Nl.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_No.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Pl.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Pt.rc |  8 ++++----
 dll/win32/comctl32/lang/comctl_Ro.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Ru.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Si.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Sk.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Sq.rc | 10 +++-------
 dll/win32/comctl32/lang/comctl_Sr.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Sv.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Th.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Tr.rc | 16 ++++++++--------
 dll/win32/comctl32/lang/comctl_Tw.rc | 12 ++++++------
 dll/win32/comctl32/lang/comctl_Uk.rc |  6 +++---
 dll/win32/comctl32/lang/comctl_Zh.rc |  8 ++++----
 dll/win32/comctl32/listview.c        | 16 ++++++++--------
 33 files changed, 114 insertions(+), 118 deletions(-)

diff --git a/dll/win32/comctl32/lang/comctl_Bg.rc b/dll/win32/comctl32/lang/comctl_Bg.rc
index acc9f7d83a6..0e455dbb733 100644
--- a/dll/win32/comctl32/lang/comctl_Bg.rc
+++ b/dll/win32/comctl32/lang/comctl_Bg.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Свойства на %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Персонализиране на лентата с инструменти"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Cs.rc b/dll/win32/comctl32/lang/comctl_Cs.rc
index 21caa2049d9..1a7cedbf49e 100644
--- a/dll/win32/comctl32/lang/comctl_Cs.rc
+++ b/dll/win32/comctl32/lang/comctl_Cs.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Vlastnosti %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Průvodce"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Nastavení panelu"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Da.rc b/dll/win32/comctl32/lang/comctl_Da.rc
index 8776b00c7e5..f2e6abba19a 100644
--- a/dll/win32/comctl32/lang/comctl_Da.rc
+++ b/dll/win32/comctl32/lang/comctl_Da.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Egenskaper for %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Guide"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Tilpas Værktøjslinje"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_De.rc b/dll/win32/comctl32/lang/comctl_De.rc
index ff4fc93e6aa..670be5162ff 100644
--- a/dll/win32/comctl32/lang/comctl_De.rc
+++ b/dll/win32/comctl32/lang/comctl_De.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Schließen"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Eigenschaften für %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Assistent"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Symbolleiste einrichten"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_El.rc b/dll/win32/comctl32/lang/comctl_El.rc
index e5176ed2cab..0560d6447b9 100644
--- a/dll/win32/comctl32/lang/comctl_El.rc
+++ b/dll/win32/comctl32/lang/comctl_El.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Ιδιότητες για %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Βοηθός"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Παραμετροποίηση Μπάρας Εργαλείων"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_En.rc b/dll/win32/comctl32/lang/comctl_En.rc
index 366434039bd..590d3e9efe5 100644
--- a/dll/win32/comctl32/lang/comctl_En.rc
+++ b/dll/win32/comctl32/lang/comctl_En.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Properties for %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Customize Toolbar"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Eo.rc b/dll/win32/comctl32/lang/comctl_Eo.rc
index 83cd9468e4c..b4e8eedf84a 100644
--- a/dll/win32/comctl32/lang/comctl_Eo.rc
+++ b/dll/win32/comctl32/lang/comctl_Eo.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Ecoj laŭ %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Estrita Proceduro"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Agordu stangon de la iloj"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Es.rc b/dll/win32/comctl32/lang/comctl_Es.rc
index 2d789d4bf11..dc2eddbf55a 100644
--- a/dll/win32/comctl32/lang/comctl_Es.rc
+++ b/dll/win32/comctl32/lang/comctl_Es.rc
@@ -53,7 +53,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Propiedades de %s"
 FONT 8, "MS Shell Dlg"
@@ -66,7 +66,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Asistente"
 FONT 8, "MS Shell Dlg"
@@ -82,7 +82,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Personalizar barra de herramientas"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Et.rc b/dll/win32/comctl32/lang/comctl_Et.rc
index 7dda761322e..463757a7310 100644
--- a/dll/win32/comctl32/lang/comctl_Et.rc
+++ b/dll/win32/comctl32/lang/comctl_Et.rc
@@ -53,7 +53,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Sule"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "%s atribuudid"
 FONT 8, "MS Shell Dlg"
@@ -66,7 +66,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Viisard"
 FONT 8, "MS Shell Dlg"
@@ -82,7 +82,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Kohanda tööriistariba"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Fr.rc b/dll/win32/comctl32/lang/comctl_Fr.rc
index 209d7e196bd..5c7791bbd75 100644
--- a/dll/win32/comctl32/lang/comctl_Fr.rc
+++ b/dll/win32/comctl32/lang/comctl_Fr.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Propriétés de %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Assistant"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Personnaliser la barre d'outils"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_He.rc b/dll/win32/comctl32/lang/comctl_He.rc
index 9768ba7ebc7..f3f852a4ff9 100644
--- a/dll/win32/comctl32/lang/comctl_He.rc
+++ b/dll/win32/comctl32/lang/comctl_He.rc
@@ -54,7 +54,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "מאפיינים של %s"
 FONT 8, "MS Shell Dlg"
@@ -67,7 +67,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "אשף"
 FONT 8, "MS Shell Dlg"
@@ -83,7 +83,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "התאמת סרגל כלים"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Hu.rc b/dll/win32/comctl32/lang/comctl_Hu.rc
index e1651ec7d34..ed8a1fcdd69 100644
--- a/dll/win32/comctl32/lang/comctl_Hu.rc
+++ b/dll/win32/comctl32/lang/comctl_Hu.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Tulajdonságok: %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Varázsló"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Eszköztár testreszabása"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_It.rc b/dll/win32/comctl32/lang/comctl_It.rc
index 30c0a2de102..a19c0bd2d6c 100644
--- a/dll/win32/comctl32/lang/comctl_It.rc
+++ b/dll/win32/comctl32/lang/comctl_It.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Proprietà di %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Procedura guidata"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Personalizza la barra degli strumenti"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Ja.rc b/dll/win32/comctl32/lang/comctl_Ja.rc
index 3ec783bbdf7..6462a2ed2ea 100644
--- a/dll/win32/comctl32/lang/comctl_Ja.rc
+++ b/dll/win32/comctl32/lang/comctl_Ja.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "%sのプロパティ"
 FONT 9, "MS UI Gothic"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "ウィザード"
 FONT 9, "MS UI Gothic"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ツールバーのカスタマイズ"
 FONT 9, "MS UI Gothic"
diff --git a/dll/win32/comctl32/lang/comctl_Ko.rc b/dll/win32/comctl32/lang/comctl_Ko.rc
index 6c98669d9a2..ecb0fed62d9 100644
--- a/dll/win32/comctl32/lang/comctl_Ko.rc
+++ b/dll/win32/comctl32/lang/comctl_Ko.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "%s 속성"
 FONT 9, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "마법사"
 FONT 9, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "도구바 사용자 정의"
 FONT 9, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Lt.rc b/dll/win32/comctl32/lang/comctl_Lt.rc
index 4b6586fa716..365ad0c8919 100644
--- a/dll/win32/comctl32/lang/comctl_Lt.rc
+++ b/dll/win32/comctl32/lang/comctl_Lt.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "%s savybės"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Vediklis"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Tinkinti mygtukų juostą"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Nl.rc b/dll/win32/comctl32/lang/comctl_Nl.rc
index 37c51872cce..764b118df87 100644
--- a/dll/win32/comctl32/lang/comctl_Nl.rc
+++ b/dll/win32/comctl32/lang/comctl_Nl.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Eigenschappen voor %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Assistent"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Gereedschappenbalk aanpassen"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_No.rc b/dll/win32/comctl32/lang/comctl_No.rc
index 76688c74512..fbe9d66771e 100644
--- a/dll/win32/comctl32/lang/comctl_No.rc
+++ b/dll/win32/comctl32/lang/comctl_No.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Egenskaper for %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Veiviser"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Tilpass verktøylinje"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Pl.rc b/dll/win32/comctl32/lang/comctl_Pl.rc
index f0beb2c4cc3..f889050c976 100644
--- a/dll/win32/comctl32/lang/comctl_Pl.rc
+++ b/dll/win32/comctl32/lang/comctl_Pl.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Zamknij"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Właściwości: %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Kreator"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Dostosowywanie paska narzędzi"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Pt.rc b/dll/win32/comctl32/lang/comctl_Pt.rc
index 6f352d4b33e..075e586451a 100644
--- a/dll/win32/comctl32/lang/comctl_Pt.rc
+++ b/dll/win32/comctl32/lang/comctl_Pt.rc
@@ -52,9 +52,9 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Propriedades de %s"
+CAPTION "Propriedades %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Assistente"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Personalizar barra de ferramentas"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Ro.rc b/dll/win32/comctl32/lang/comctl_Ro.rc
index 1c3e904b9c1..2f274749af2 100644
--- a/dll/win32/comctl32/lang/comctl_Ro.rc
+++ b/dll/win32/comctl32/lang/comctl_Ro.rc
@@ -54,7 +54,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Închide"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Proprietăți pentru %s"
 FONT 8, "MS Shell Dlg"
@@ -67,7 +67,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Asistent"
 FONT 8, "MS Shell Dlg"
@@ -83,7 +83,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Personalizare panou de instrumente"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Ru.rc b/dll/win32/comctl32/lang/comctl_Ru.rc
index 2152c99bbd1..a51f6b0c12c 100644
--- a/dll/win32/comctl32/lang/comctl_Ru.rc
+++ b/dll/win32/comctl32/lang/comctl_Ru.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Свойства: %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Мастер"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройка панели инструментов"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Si.rc b/dll/win32/comctl32/lang/comctl_Si.rc
index bee6d507b51..2ac77745fe1 100644
--- a/dll/win32/comctl32/lang/comctl_Si.rc
+++ b/dll/win32/comctl32/lang/comctl_Si.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Lastnosti %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Čarovnik"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Prilagoditev orodne vrstice"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Sk.rc b/dll/win32/comctl32/lang/comctl_Sk.rc
index d1ebd015bdc..c9addc8886e 100644
--- a/dll/win32/comctl32/lang/comctl_Sk.rc
+++ b/dll/win32/comctl32/lang/comctl_Sk.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "%s - vlastnosti"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Sprievodca"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Prispôsobenie panela nástrojov"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Sq.rc b/dll/win32/comctl32/lang/comctl_Sq.rc
index cb3c7f3fd7e..23e70715164 100644
--- a/dll/win32/comctl32/lang/comctl_Sq.rc
+++ b/dll/win32/comctl32/lang/comctl_Sq.rc
@@ -20,10 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __REACTOS__
-#include "comctl32.h"
-#endif
-
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
@@ -57,7 +53,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Properties for %s"
 FONT 8, "MS Shell Dlg"
@@ -70,7 +66,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 8, "MS Shell Dlg"
@@ -86,7 +82,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Konfiguro Toolbarin"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Sr.rc b/dll/win32/comctl32/lang/comctl_Sr.rc
index b200342d550..f8ee2e08dd0 100644
--- a/dll/win32/comctl32/lang/comctl_Sr.rc
+++ b/dll/win32/comctl32/lang/comctl_Sr.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Svojstva za %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Vodič"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Prilagodi alatnicu"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Sv.rc b/dll/win32/comctl32/lang/comctl_Sv.rc
index a9037d83b42..46b11c4d5f5 100644
--- a/dll/win32/comctl32/lang/comctl_Sv.rc
+++ b/dll/win32/comctl32/lang/comctl_Sv.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Egenskaper för %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Guide"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Anpassa verktygsfältet"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Th.rc b/dll/win32/comctl32/lang/comctl_Th.rc
index 3633f682685..0a7f6512a55 100644
--- a/dll/win32/comctl32/lang/comctl_Th.rc
+++ b/dll/win32/comctl32/lang/comctl_Th.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "คุณสมบัติของ %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ปรับแต่งแถบเครื่องมือ"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Tr.rc b/dll/win32/comctl32/lang/comctl_Tr.rc
index 0ce649e6da8..67012a2cd69 100644
--- a/dll/win32/comctl32/lang/comctl_Tr.rc
+++ b/dll/win32/comctl32/lang/comctl_Tr.rc
@@ -51,9 +51,9 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "%s Husûsiyetleri"
+CAPTION "%s Özellikleri"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "Tamam",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
@@ -64,9 +64,9 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Yardımcı"
+CAPTION "Sihirbaz"
 FONT 8, "MS Shell Dlg"
 BEGIN
   PUSHBUTTON    "< &Geri", IDC_BACK_BUTTON,56,138,55,14
@@ -80,9 +80,9 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Araç Çubuğunu Husûsileştir"
+CAPTION "Araç Çubuğunu Özelleştir"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "Ka&pat",     IDCANCEL,320,6,70,14
@@ -90,10 +90,10 @@ BEGIN
   PUSHBUTTON    "&Yardım",      IDC_HELP_BTN,320,40,70,14
   PUSHBUTTON    "Y&ukarı Taşı",   IDC_MOVEUP_BTN,320,74,70,14
   PUSHBUTTON    "&Aşağı Taşı", IDC_MOVEDN_BTN,320,91,70,14
-  LTEXT         "Ku&llanılabilir Düğmeler:", -1,4,5,120,10
+  LTEXT         "Ku&llanılabilir Butonlar:", -1,4,5,120,10
   LISTBOX       IDC_AVAILBTN_LBOX,5,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
   PUSHBUTTON    "&Ekle ->",    IDOK, 132, 42, 55, 14
   PUSHBUTTON    "<- &Kaldır", IDC_REMOVE_BTN,132,62,55,14
-  LTEXT         "A&raç Çubuğu Düğmeleri:", -1,194,5,120,10
+  LTEXT         "A&raç Çubuğu Butonları:", -1,194,5,120,10
   LISTBOX       IDC_TOOLBARBTN_LBOX, 194,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
diff --git a/dll/win32/comctl32/lang/comctl_Tw.rc b/dll/win32/comctl32/lang/comctl_Tw.rc
index 74a6e78d6bc..5b7a35809d8 100644
--- a/dll/win32/comctl32/lang/comctl_Tw.rc
+++ b/dll/win32/comctl32/lang/comctl_Tw.rc
@@ -52,10 +52,10 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "%s內容"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
   DEFPUSHBUTTON "確定",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
   PUSHBUTTON    "取消",     IDCANCEL,58,122,50,14
@@ -65,10 +65,10 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "精靈"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
   PUSHBUTTON    "< 上一步(&B)", IDC_BACK_BUTTON,56,138,55,14
   DEFPUSHBUTTON "下一步(&N) >", IDC_NEXT_BUTTON,111,138,55,14
@@ -81,10 +81,10 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "自訂工具列"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
   DEFPUSHBUTTON "關閉(&C)",    IDCANCEL,320,6,70,14
   PUSHBUTTON    "重設(&E)",    IDC_RESET_BTN,320,23,70,14
diff --git a/dll/win32/comctl32/lang/comctl_Uk.rc b/dll/win32/comctl32/lang/comctl_Uk.rc
index 42715da32be..4e8d09f22b6 100644
--- a/dll/win32/comctl32/lang/comctl_Uk.rc
+++ b/dll/win32/comctl32/lang/comctl_Uk.rc
@@ -52,7 +52,7 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Властивості для %s"
 FONT 8, "MS Shell Dlg"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Майстер"
 FONT 8, "MS Shell Dlg"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройка панелі інструментів"
 FONT 8, "MS Shell Dlg"
diff --git a/dll/win32/comctl32/lang/comctl_Zh.rc b/dll/win32/comctl32/lang/comctl_Zh.rc
index d19e362729c..b70bbf8eb32 100644
--- a/dll/win32/comctl32/lang/comctl_Zh.rc
+++ b/dll/win32/comctl32/lang/comctl_Zh.rc
@@ -52,9 +52,9 @@ STRINGTABLE
     IDS_BUTTON_CLOSE  "&Close"
 }
 
-IDD_PROPSHEET DIALOGEX 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "属性 %s"
+CAPTION "%s属性"
 FONT 9, "宋体"
 BEGIN
   DEFPUSHBUTTON "确定",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
@@ -65,7 +65,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOGEX 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "向导"
 FONT 9, "宋体"
@@ -81,7 +81,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "自定义工具栏"
 FONT 9, "宋体"
diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c
index dfcf4444568..518d2522238 100644
--- a/dll/win32/comctl32/listview.c
+++ b/dll/win32/comctl32/listview.c
@@ -1347,7 +1347,7 @@ static inline BOOL iterator_rangesitems(ITERATOR* i, RANGES ranges)
 static BOOL iterator_frameditems_absolute(ITERATOR* i, const LISTVIEW_INFO* infoPtr, const RECT *frame)
 {
     RECT rcItem, rcTemp;
-    
+
     /* in case we fail, we want to return an empty iterator */
     if (!iterator_empty(i)) return FALSE;
 
@@ -1746,7 +1746,7 @@ static inline void LISTVIEW_InvalidateItem(const LISTVIEW_INFO *infoPtr, INT nIt
 {
     RECT rcBox;
 
-    if(!is_redrawing(infoPtr)) return; 
+    if(!is_redrawing(infoPtr)) return;
     LISTVIEW_GetItemBox(infoPtr, nItem, &rcBox);
     LISTVIEW_InvalidateRect(infoPtr, &rcBox);
 }
@@ -2124,7 +2124,7 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr)
         }
 #else
 	vertInfo.nMax = infoPtr->nItemCount;
-	
+
 	/* scroll by at least one page */
 	if(vertInfo.nPage < infoPtr->nItemHeight)
 	  vertInfo.nPage = infoPtr->nItemHeight;
@@ -2761,7 +2761,7 @@ static void LISTVIEW_NextIconPosLeft(LISTVIEW_INFO *infoPtr, LPPOINT lpPos)
     infoPtr->currIconPos.y  = 0;
 }
 
-    
+
 /***
  * DESCRIPTION:
  * Moves an icon to the specified position.
@@ -3710,7 +3710,6 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem)
     iterator_destroy(&i);
 
     infoPtr->bDoChangeNotify = bOldChange;
-    
     LISTVIEW_SetItemFocus(infoPtr, nItem);
 }
 
@@ -4152,6 +4151,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN
 
                         /* Begin selection and capture mouse */
                         infoPtr->bMarqueeSelect = TRUE;
+                        infoPtr->marqueeRect = rect;
                         SetCapture(infoPtr->hwndSelf);
                     }
                 }
@@ -9947,7 +9947,7 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode,
 
 static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta)
 {
-    UINT pulScrollLines = 3;
+    INT pulScrollLines = 3;
 
     TRACE("(wheelDelta=%d)\n", wheelDelta);
 
@@ -9976,8 +9976,8 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta)
         {
             int cLineScroll;
             pulScrollLines = min((UINT)LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines);
-            cLineScroll = pulScrollLines * (float)infoPtr->cWheelRemainder / WHEEL_DELTA;
-            infoPtr->cWheelRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines;
+            cLineScroll = pulScrollLines * infoPtr->cWheelRemainder / WHEEL_DELTA;
+            infoPtr->cWheelRemainder -= WHEEL_DELTA * cLineScroll / pulScrollLines;
             LISTVIEW_VScroll(infoPtr, SB_INTERNAL, -cLineScroll);
         }
         break;