From bbc86a61db0c0f1ef19f3036ededd6389dcf0374 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Mon, 27 Jan 2020 16:54:42 -0600
Subject: [PATCH] comctrl-rebar-capture: Fix name.

---
 ...ebar-behaviour-when-there-s-capture-.patch |  0
 .../definition                                |  0
 patches/patchinstall.sh                       | 38 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)
 rename patches/{comctrl-rebar-capture => comctl32-rebar-capture}/0001-comctl32-Fixed-rebar-behaviour-when-there-s-capture-.patch (100%)
 rename patches/{comctrl-rebar-capture => comctl32-rebar-capture}/definition (100%)

diff --git a/patches/comctrl-rebar-capture/0001-comctl32-Fixed-rebar-behaviour-when-there-s-capture-.patch b/patches/comctl32-rebar-capture/0001-comctl32-Fixed-rebar-behaviour-when-there-s-capture-.patch
similarity index 100%
rename from patches/comctrl-rebar-capture/0001-comctl32-Fixed-rebar-behaviour-when-there-s-capture-.patch
rename to patches/comctl32-rebar-capture/0001-comctl32-Fixed-rebar-behaviour-when-there-s-capture-.patch
diff --git a/patches/comctrl-rebar-capture/definition b/patches/comctl32-rebar-capture/definition
similarity index 100%
rename from patches/comctrl-rebar-capture/definition
rename to patches/comctl32-rebar-capture/definition
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 0147ae23..631a1571 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -96,8 +96,8 @@ patch_enable_all ()
 	enable_cmd_launch_association="$1"
 	enable_comctl32_Listview_DrawItem="$1"
 	enable_comctl32_alpha_bitmaps="$1"
+	enable_comctl32_rebar_capture="$1"
 	enable_comctl32_version_6="$1"
-	enable_comctrl_rebar_capture="$1"
 	enable_comdlg32_lpstrFileTitle="$1"
 	enable_configure_Absolute_RPATH="$1"
 	enable_crypt32_CMS_Certificates="$1"
@@ -418,12 +418,12 @@ patch_enable ()
 		comctl32-alpha-bitmaps)
 			enable_comctl32_alpha_bitmaps="$2"
 			;;
+		comctl32-rebar-capture)
+			enable_comctl32_rebar_capture="$2"
+			;;
 		comctl32-version_6)
 			enable_comctl32_version_6="$2"
 			;;
-		comctrl-rebar-capture)
-			enable_comctrl_rebar_capture="$2"
-			;;
 		comdlg32-lpstrFileTitle)
 			enable_comdlg32_lpstrFileTitle="$2"
 			;;
@@ -2377,6 +2377,21 @@ if test "$enable_comctl32_alpha_bitmaps" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset comctl32-rebar-capture
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#14750] comctl32: Fixed rebar behaviour when there's capture and no drag.
+# |
+# | Modified files:
+# |   *	dlls/comctl32/rebar.c
+# |
+if test "$enable_comctl32_rebar_capture" -eq 1; then
+	patch_apply comctl32-rebar-capture/0001-comctl32-Fixed-rebar-behaviour-when-there-s-capture-.patch
+	(
+		printf '%s\n' '+    { "Andrej Shadura", "comctl32: Fixed rebar behaviour when there'\''s capture and no drag.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset comctl32-version_6
 # |
 # | Modified files:
@@ -2389,21 +2404,6 @@ if test "$enable_comctl32_version_6" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset comctrl-rebar-capture
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#14750] comctl32: Fixed rebar behaviour when there's capture and no drag.
-# |
-# | Modified files:
-# |   *	dlls/comctl32/rebar.c
-# |
-if test "$enable_comctrl_rebar_capture" -eq 1; then
-	patch_apply comctrl-rebar-capture/0001-comctl32-Fixed-rebar-behaviour-when-there-s-capture-.patch
-	(
-		printf '%s\n' '+    { "Andrej Shadura", "comctl32: Fixed rebar behaviour when there'\''s capture and no drag.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset comdlg32-lpstrFileTitle
 # |
 # | This patchset fixes the following Wine bugs: