wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against faf645d01632e4cf7ef056a86a675a12df39a80e.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-10-23 08:03:30 +11:00
parent 6fd31b354c
commit 2677a11f41
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/shell32-Progress_Dialog/0001-shell32-Correct-indentation-in-shfileop.c.patch
View File

@@ -1,4 +1,4 @@
From c89e6c48e313c0de0749a4526c677491764845d3 Mon Sep 17 00:00:00 2001
From e92e88f62a08e84a29395a5b3e1f461e33dc9aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 24 Feb 2015 04:25:29 +0100
Subject: [PATCH] shell32: Correct indentation in shfileop.c.
@@ -8,7 +8,7 @@ Subject: [PATCH] shell32: Correct indentation in shfileop.c.
1 file changed, 329 insertions(+), 331 deletions(-)
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index 807b999d957..f0cadc67f8f 100644
index c454fcaa594..682af15e9d8 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -201,108 +201,107 @@ static int SHELL_ConfirmMsgBox(HWND hWnd, LPWSTR lpszText, LPWSTR lpszCaption, H
@@ -158,7 +158,7 @@ index 807b999d957..f0cadc67f8f 100644
-
- args[0] = (DWORD_PTR)szDir;
- FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
- szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (__ms_va_list*)args);
- szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (va_list*)args);
-
- hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id));
+ WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256];
@@ -190,7 +190,7 @@ index 807b999d957..f0cadc67f8f 100644
+
+ args[0] = (DWORD_PTR)szDir;
+ FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
+ szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (__ms_va_list*)args);
+ szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (va_list*)args);
+ hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id));
+
+ ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems);