Alexandre Julliard : shlwapi: Remove unneeded UNALIGNED attributes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6289a5848b4745a2f0a086fce51195ca08b81992
URL:    https://gitlab.winehq.org/wine/wine/-/commit/6289a5848b4745a2f0a086fce51195c...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Oct 20 12:44:51 2023 +0200

shlwapi: Remove unneeded UNALIGNED attributes.

They are causing compiler warnings.

---

 dlls/shlwapi/ordinal.c       |  4 ++--
 dlls/shlwapi/tests/ordinal.c | 10 +++++-----
 include/shlwapi.h            |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index bf43a17fba2..f99dbf795ff 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -4282,7 +4282,7 @@ HRESULT WINAPI SHCreatePropertyBagOnRegKey (HKEY hKey, LPCWSTR subkey,
  *  failure: 0
  *
  */
-INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags,
+INT WINAPI SHFormatDateTimeW(const FILETIME *fileTime, DWORD *flags,
     LPWSTR buf, UINT size)
 {
 #define SHFORMATDT_UNSUPPORTED_FLAGS (FDTF_RELATIVE | FDTF_LTRDATE | FDTF_RTLDATE | FDTF_NOAUTOREADINGORDER)
@@ -4346,7 +4346,7 @@ INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags,
  * See SHFormatDateTimeW.
  *
  */
-INT WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *fileTime, DWORD *flags,
+INT WINAPI SHFormatDateTimeA(const FILETIME *fileTime, DWORD *flags,
     LPSTR buf, UINT size)
 {
     WCHAR *bufW;
diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 676a537744d..474c447686d 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -51,8 +51,8 @@ static HRESULT(WINAPI *pIConnectionPoint_InvokeWithCancel)(IConnectionPoint*,DIS
 static HRESULT(WINAPI *pConnectToConnectionPoint)(IUnknown*,REFIID,BOOL,IUnknown*, LPDWORD,IConnectionPoint **);
 static HRESULT(WINAPI *pSHPropertyBag_ReadLONG)(IPropertyBag *,LPCWSTR,LPLONG);
 static LONG   (WINAPI *pSHSetWindowBits)(HWND, INT, UINT, UINT);
-static INT    (WINAPI *pSHFormatDateTimeA)(const FILETIME UNALIGNED*, DWORD*, LPSTR, UINT);
-static INT    (WINAPI *pSHFormatDateTimeW)(const FILETIME UNALIGNED*, DWORD*, LPWSTR, UINT);
+static INT    (WINAPI *pSHFormatDateTimeA)(const FILETIME*, DWORD*, LPSTR, UINT);
+static INT    (WINAPI *pSHFormatDateTimeW)(const FILETIME*, DWORD*, LPWSTR, UINT);
 static DWORD  (WINAPI *pSHGetObjectCompatFlags)(IUnknown*, const CLSID*);
 static BOOL   (WINAPI *pGUIDFromStringA)(LPSTR, CLSID *);
 static HRESULT (WINAPI *pIUnknown_QueryServiceExec)(IUnknown*, REFIID, const GUID*, DWORD, DWORD, VARIANT*, VARIANT*);
@@ -1668,8 +1668,8 @@ static void test_SHSetWindowBits(void)
 
 static void test_SHFormatDateTimeA(const SYSTEMTIME *st)
 {
-    FILETIME UNALIGNED filetime;
-    FILETIME UNALIGNED filetimeCheck;
+    FILETIME filetime;
+    FILETIME filetimeCheck;
     SYSTEMTIME universalSystemTime;
     CHAR buff[100], buff2[100], buff3[100];
     BOOL dstMatch;
@@ -1837,7 +1837,7 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st)
 
 static void test_SHFormatDateTimeW(void)
 {
-    FILETIME UNALIGNED filetime;
+    FILETIME filetime;
     SYSTEMTIME universalSystemTime;
     WCHAR buff[100], buff2[100], buff3[100], *p1, *p2;
     SYSTEMTIME st;
diff --git a/include/shlwapi.h b/include/shlwapi.h
index 15615786c4a..aafbdd3870b 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -1166,8 +1166,8 @@ WINSHLWAPI BOOL WINAPI IsOS(DWORD);
 #define FDTF_RTLDATE            0x00000200
 #define FDTF_NOAUTOREADINGORDER 0x00000400
 
-WINSHLWAPI int WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *filetime, DWORD *flags, LPSTR buffer, UINT size);
-WINSHLWAPI int WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *filetime, DWORD *flags, LPWSTR buffer, UINT size);
+WINSHLWAPI int WINAPI SHFormatDateTimeA(const FILETIME *filetime, DWORD *flags, LPSTR buffer, UINT size);
+WINSHLWAPI int WINAPI SHFormatDateTimeW(const FILETIME *filetime, DWORD *flags, LPWSTR buffer, UINT size);
 
 typedef struct
 {