wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 09bf88092d0748ceac355098a942b01b267e8773

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-05-15 08:53:14 +10:00
parent 7348f0b12b
commit 7966caf282
9 changed files with 37 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,14 @@
From d606011cab7ce44de90b6945796deee86bacba44 Mon Sep 17 00:00:00 2001
From 23e9d4f9e18d24215fbed8e595757163370fa073 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.
---
dlls/shell32/shlfileop.c | 787 +++++++++++++++++++++++------------------------
1 file changed, 393 insertions(+), 394 deletions(-)
dlls/shell32/shlfileop.c | 794 +++++++++++++++++++++++------------------------
1 file changed, 396 insertions(+), 398 deletions(-)
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index 117d668..975106a 100644
index 9358980..260b4c2 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -207,108 +207,107 @@ static int SHELL_ConfirmMsgBox(HWND hWnd, LPWSTR lpszText, LPWSTR lpszCaption, H
@@ -824,7 +824,7 @@ index 117d668..975106a 100644
}
/*************************************************************************
* SHFileOperationA [SHELL32.@]
@@ -862,42 +861,42 @@ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more)
@@ -862,46 +861,45 @@ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more)
*/
int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp)
{
@@ -848,6 +848,10 @@ index 117d668..975106a 100644
- if (ForFree)
- {
- retCode = SHFileOperationW(&nFileOp);
- /* Windows 95/98 returns S_OK for this case. */
- if (retCode == ERROR_ACCESS_DENIED && (GetVersion() & 0x80000000))
- retCode = S_OK;
-
- heap_free(ForFree); /* we cannot use wString, it was changed */
- break;
- }
@@ -884,6 +888,9 @@ index 117d668..975106a 100644
+ if (ForFree)
+ {
+ retCode = SHFileOperationW(&nFileOp);
+ /* Windows 95/98 returns S_OK for this case. */
+ if (retCode == ERROR_ACCESS_DENIED && (GetVersion() & 0x80000000))
+ retCode = S_OK;
+ heap_free(ForFree); /* we cannot use wString, it was changed */
+ break;
+ }
@@ -903,7 +910,7 @@ index 117d668..975106a 100644
}
#define ERROR_SHELL_INTERNAL_FILE_NOT_FOUND 1026
@@ -927,7 +926,7 @@ typedef struct
@@ -931,7 +929,7 @@ typedef struct
static inline void grow_list(FILE_LIST *list)
{
FILE_ENTRY *new = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list->feFiles,
@@ -912,7 +919,7 @@ index 117d668..975106a 100644
list->feFiles = new;
list->num_alloc *= 2;
}
@@ -1019,7 +1018,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles)
@@ -1024,7 +1022,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles)
/* empty list */
if (!szFiles[0])
return ERROR_ACCESS_DENIED;
@@ -921,7 +928,7 @@ index 117d668..975106a 100644
flList->feFiles = heap_alloc_zero(flList->num_alloc * sizeof(FILE_ENTRY));
while (*ptr)
@@ -1122,7 +1121,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST
@@ -1129,7 +1127,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST
/* Don't ask the user about overwriting files when he accepted to overwrite the
folder. FIXME: this is not exactly what Windows does - e.g. there would be
an additional confirmation for a nested folder */
@@ -930,7 +937,7 @@ index 117d668..975106a 100644
SHFileOperationW(&fileOp);
}
@@ -1335,7 +1334,7 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom)
@@ -1342,7 +1340,7 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom)
/* Windows also checks only the first item */
bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO)
@@ -939,7 +946,7 @@ index 117d668..975106a 100644
if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (!bTrash && lpFileOp->fFlags & FOF_WANTNUKEWARNING))
if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, bTrash, flFrom))
@@ -1370,11 +1369,11 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom)
@@ -1377,11 +1375,11 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom)
break;
}
}
@@ -953,7 +960,7 @@ index 117d668..975106a 100644
else
ret = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE);
@@ -1499,8 +1498,8 @@ static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con
@@ -1506,8 +1504,8 @@ static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con
static void check_flags(FILEOP_FLAGS fFlags)
{
WORD wUnsupportedFlags = FOF_NO_CONNECTED_ELEMENTS |
@@ -964,7 +971,7 @@ index 117d668..975106a 100644
if (fFlags & wUnsupportedFlags)
FIXME("Unsupported flags: %04x\n", fFlags);
@@ -1583,19 +1582,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
@@ -1590,19 +1588,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
*/
void WINAPI SHFreeNameMappings(HANDLE hNameMapping)
{
@@ -994,7 +1001,7 @@ index 117d668..975106a 100644
}
/*************************************************************************
@@ -1701,14 +1700,14 @@ DWORD WINAPI SheChangeDirW(LPWSTR path)
@@ -1708,14 +1706,14 @@ DWORD WINAPI SheChangeDirW(LPWSTR path)
}
/*************************************************************************