shellapi.h - correct alignment for SHFILEOPSTRUCTA/W

"Andrew Stadt" <[email protected]>
Newsgroups gmane.comp.gnu.mingw.patches
Message-ID <[email protected]>
I've not verified if any other structures in this header require this, but
it has been confirmed that both SHFILEOPSTRUCTA and SHFILEOPSTRUCTW need
word alignment to work properly (when used with FOF_SIMPLEPROGRESS and
passing pointer via lpszProgressTitle.

Cheers,
Andrew.
shellapi.h.diff (application/octet-stream, 1.1 KB)
diff -u -r w32api-2.1.orig/ChangeLog w32api-2.1/ChangeLog
--- w32api-2.1.orig/ChangeLog	Mon Nov 25 13:15:24 2002
+++ w32api-2.1/ChangeLog	Wed Nov 27 17:51:20 2002
@@ -1,3 +1,8 @@
+2002-11-27  Andrew Stadt  <[email protected]>
+
+	* include/shellapi.h (_SHFILEOPSTRUCTA,_SHFILEOPSTRUCTW):
+	Wrap with pshpack2.h/poppack.h to correct alignment
+
 2002-11-25  Earnie Boyd  <[email protected]>
 
 	* lib/Makefile.in (dist, install): Correct the install destinations.
diff -u -r w32api-2.1.orig/include/shellapi.h w32api-2.1/include/shellapi.h
--- w32api-2.1.orig/include/shellapi.h	Wed Aug 14 17:05:56 2002
+++ w32api-2.1/include/shellapi.h	Wed Nov 27 17:51:38 2002
@@ -154,6 +154,7 @@
 	HANDLE hIcon;
 	HANDLE hProcess;
 } SHELLEXECUTEINFOW,*LPSHELLEXECUTEINFOW;
+#include <pshpack2.h>
 typedef struct _SHFILEOPSTRUCTA {
 	HWND hwnd;
 	UINT wFunc;
@@ -174,6 +175,7 @@
 	PVOID hNameMappings;
 	LPCWSTR lpszProgressTitle;
 } SHFILEOPSTRUCTW,*LPSHFILEOPSTRUCTW;
+#include <poppack.h>
 typedef struct _SHFILEINFOA {
 	HICON hIcon;
 	int iIcon;
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.