[PATCH v2 0/1] MR6425: include: Name parameters in LPPROGRESS_ROUTINE typedef

[Ostap Brehin (＠osbre)]

Source: https://learn.microsoft.com/en-us/windows/win32/api/winbase/nc-winbase-lppro...

--
  v2: include: Name parameters in LPPROGRESS_ROUTINE typedef

https://gitlab.winehq.org/wine/wine/-/merge_requests/6425

[PATCH v2 1/1] include: Name parameters in LPPROGRESS_ROUTINE typedef

[Ostap Brehin]

From: Ostap Brehin

---
 include/winbase.h | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/include/winbase.h b/include/winbase.h
index fe143cc7a61..abac1b75769 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1035,9 +1035,17 @@ typedef struct _WIN32_FILE_ATTRIBUTES_DATA {
  * This one seems to be a Win32 only definition. It also is defined with
  * WINAPI instead of CALLBACK in the windows headers.
  */
-typedef DWORD (CALLBACK *LPPROGRESS_ROUTINE)(LARGE_INTEGER, LARGE_INTEGER, LARGE_INTEGER,
-                                           LARGE_INTEGER, DWORD, DWORD, HANDLE,
-                                           HANDLE, LPVOID);
+typedef DWORD (CALLBACK *LPPROGRESS_ROUTINE)(
+    LARGE_INTEGER TotalFileSize, 
+    LARGE_INTEGER TotalBytesTransferred, 
+    LARGE_INTEGER StreamSize, 
+    LARGE_INTEGER StreamBytesTransferred, 
+    DWORD dwStreamNumber, 
+    DWORD dwCallbackReason, 
+    HANDLE hSourceFile,
+    HANDLE hDestinationFile, 
+    LPVOID lpData
+);

typedef DWORD (WINAPI *APPLICATION_RECOVERY_CALLBACK)(PVOID);

[PATCH v2 1/1] include: Name parameters in LPPROGRESS_ROUTINE typedef

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=148167

Your paranoid android.

=== debian11b (64 bit WoW report) ===

ddraw:
ddraw2.c:3814: Test failed: Expected (0,0)-(640,480), got (0,0)-(1024,768).
ddraw2.c:3839: Test failed: Expected (0,0)-(640,480), got (0,0)-(1024,768).
ddraw4.c:3969: Test failed: Expected message 0x5, but didn't receive it.

[Ostap Brehin (＠osbre)]

On Tue Sep  3 10:57:24 2024 +0000, Alfred Agrell wrote:
> One benefit of this change is better IDE autocomplete.
> I agree with naming the parameters, though I'm not sure why CALLBACK is
> being changed to WINAPI; it is a callback.

@Alcaro Thanks! Changed it back to `CALLBACK`.