From 24e8307d9a80ddf8773f47e0a83d3c4db8258291 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Fri, 14 Jun 2019 13:02:35 +0100
Subject: [PATCH] [ui] update progress bar position for screen readers

* Make sure to call the original winproc on PBM_SETPOS and friends.
* Closes #1289
---
 src/rufus.rc | 10 +++++-----
 src/ui.c     |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/rufus.rc b/src/rufus.rc
index 46eac479..f61b78fd 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.6.1540"
+CAPTION "Rufus 3.6.1541"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -394,8 +394,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,1540,0
- PRODUCTVERSION 3,6,1540,0
+ FILEVERSION 3,6,1541,0
+ PRODUCTVERSION 3,6,1541,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -413,13 +413,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.6.1540"
+            VALUE "FileVersion", "3.6.1541"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.6.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.6.1540"
+            VALUE "ProductVersion", "3.6.1541"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/ui.c b/src/ui.c
index c22b26f9..810399cc 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -888,6 +888,7 @@ static INT_PTR CALLBACK ProgressCallback(HWND hCtrl, UINT message, WPARAM wParam
 		return (INT_PTR)TRUE;
 
 	case PBM_SETRANGE:
+		CallWindowProc(progress_original_proc, hCtrl, message, wParam, lParam);
 		// Don't bother sanity checking min and max: If *you* want to
 		// be an ass about the progress bar range, it's *your* problem.
 		min = (uint32_t)(lParam & 0xFFFF);
@@ -895,11 +896,13 @@ static INT_PTR CALLBACK ProgressCallback(HWND hCtrl, UINT message, WPARAM wParam
 		return (INT_PTR)TRUE;
 
 	case PBM_SETPOS:
+		CallWindowProc(progress_original_proc, hCtrl, message, wParam, lParam);
 		pos = (WORD)wParam;
 		InvalidateRect(hProgress, NULL, TRUE);
 		return (INT_PTR)TRUE;
 
 	case PBM_SETMARQUEE:
+		CallWindowProc(progress_original_proc, hCtrl, message, wParam, lParam);
 		if ((wParam == TRUE) && (!marquee_mode)) {
 			marquee_mode = TRUE;
 			pos = min;