wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Removed patches to use interlocked functions for library refcounts (accepted upstream).

Browse Source
This commit is contained in:
Sebastian Lackner
2015-03-02 16:17:41 +01:00
parent 3efff4cb88
commit e86c1653d8
10 changed files with 112 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,7 +149,7 @@ index 62d7880..ee40e39 100644
- args[0] = (DWORD_PTR)szDir;
- FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
- szText, 0, 0, szBuffer, sizeof(szBuffer), (__ms_va_list*)args);
- szText, 0, 0, szBuffer, sizeof(szBuffer)/sizeof(szBuffer[0]), (__ms_va_list*)args);
- hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id));
+ LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)/sizeof(WCHAR));
+ LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)/sizeof(WCHAR));
@@ -166,7 +166,7 @@ index 62d7880..ee40e39 100644
- op->req->fAnyOperationsAborted = TRUE;
+ args[0] = (DWORD_PTR)szDir;
+ FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
+ szText, 0, 0, szBuffer, sizeof(szBuffer), (__ms_va_list*)args);
+ szText, 0, 0, szBuffer, sizeof(szBuffer)/sizeof(szBuffer[0]), (__ms_va_list*)args);
+ hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id));
+
+ ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems);