niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

shlwapi: Remove unneeded UNALIGNED attributes.

Browse source 
They are causing compiler warnings.
This commit is contained in:
Alexandre Julliard 2023-10-20 12:44:51 +02:00
parent 9a4e41c45d
commit 6289a5848b
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/shlwapi/ordinal.c
View file

@ -4282,7 +4282,7 @@ HRESULT WINAPI SHCreatePropertyBagOnRegKey (HKEY hKey, LPCWSTR subkey,
* failure: 0 * failure: 0
* *
*/ */
INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags, INT WINAPI SHFormatDateTimeW(const FILETIME *fileTime, DWORD *flags,
LPWSTR buf, UINT size) LPWSTR buf, UINT size)
{ {
#define SHFORMATDT_UNSUPPORTED_FLAGS (FDTF_RELATIVE | FDTF_LTRDATE | FDTF_RTLDATE | FDTF_NOAUTOREADINGORDER) #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. * See SHFormatDateTimeW.
* *
*/ */
INT WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *fileTime, DWORD *flags, INT WINAPI SHFormatDateTimeA(const FILETIME *fileTime, DWORD *flags,
LPSTR buf, UINT size) LPSTR buf, UINT size)
{ {
WCHAR *bufW; WCHAR *bufW;

10
dlls/shlwapi/tests/ordinal.c
View file

@ -51,8 +51,8 @@ static HRESULT(WINAPI *pIConnectionPoint_InvokeWithCancel)(IConnectionPoint*,DIS
static HRESULT(WINAPI *pConnectToConnectionPoint)(IUnknown*,REFIID,BOOL,IUnknown*, LPDWORD,IConnectionPoint **); static HRESULT(WINAPI *pConnectToConnectionPoint)(IUnknown*,REFIID,BOOL,IUnknown*, LPDWORD,IConnectionPoint **);
static HRESULT(WINAPI *pSHPropertyBag_ReadLONG)(IPropertyBag *,LPCWSTR,LPLONG); static HRESULT(WINAPI *pSHPropertyBag_ReadLONG)(IPropertyBag *,LPCWSTR,LPLONG);
static LONG (WINAPI *pSHSetWindowBits)(HWND, INT, UINT, UINT); static LONG (WINAPI *pSHSetWindowBits)(HWND, INT, UINT, UINT);
static INT (WINAPI *pSHFormatDateTimeA)(const FILETIME UNALIGNED*, DWORD*, LPSTR, UINT); static INT (WINAPI *pSHFormatDateTimeA)(const FILETIME*, DWORD*, LPSTR, UINT);
static INT (WINAPI *pSHFormatDateTimeW)(const FILETIME UNALIGNED*, DWORD*, LPWSTR, UINT); static INT (WINAPI *pSHFormatDateTimeW)(const FILETIME*, DWORD*, LPWSTR, UINT);
static DWORD (WINAPI *pSHGetObjectCompatFlags)(IUnknown*, const CLSID*); static DWORD (WINAPI *pSHGetObjectCompatFlags)(IUnknown*, const CLSID*);
static BOOL (WINAPI *pGUIDFromStringA)(LPSTR, CLSID *); static BOOL (WINAPI *pGUIDFromStringA)(LPSTR, CLSID *);
static HRESULT (WINAPI *pIUnknown_QueryServiceExec)(IUnknown*, REFIID, const GUID*, DWORD, DWORD, VARIANT*, VARIANT*); 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) static void test_SHFormatDateTimeA(const SYSTEMTIME *st)
{ {
FILETIME UNALIGNED filetime; FILETIME filetime;
FILETIME UNALIGNED filetimeCheck; FILETIME filetimeCheck;
SYSTEMTIME universalSystemTime; SYSTEMTIME universalSystemTime;
CHAR buff[100], buff2[100], buff3[100]; CHAR buff[100], buff2[100], buff3[100];
BOOL dstMatch; BOOL dstMatch;
@ -1837,7 +1837,7 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st)
static void test_SHFormatDateTimeW(void) static void test_SHFormatDateTimeW(void)
{ {
FILETIME UNALIGNED filetime; FILETIME filetime;
SYSTEMTIME universalSystemTime; SYSTEMTIME universalSystemTime;
WCHAR buff[100], buff2[100], buff3[100], *p1, *p2; WCHAR buff[100], buff2[100], buff3[100], *p1, *p2;
SYSTEMTIME st; SYSTEMTIME st;

4
include/shlwapi.h
View file

@ -1166,8 +1166,8 @@ WINSHLWAPI BOOL WINAPI IsOS(DWORD);
#define FDTF_RTLDATE 0x00000200 #define FDTF_RTLDATE 0x00000200
#define FDTF_NOAUTOREADINGORDER 0x00000400 #define FDTF_NOAUTOREADINGORDER 0x00000400
WINSHLWAPI int WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *filetime, DWORD *flags, LPSTR buffer, UINT size); WINSHLWAPI int WINAPI SHFormatDateTimeA(const FILETIME *filetime, DWORD *flags, LPSTR buffer, UINT size);
WINSHLWAPI int WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *filetime, DWORD *flags, LPWSTR buffer, UINT size); WINSHLWAPI int WINAPI SHFormatDateTimeW(const FILETIME *filetime, DWORD *flags, LPWSTR buffer, UINT size);
typedef struct typedef struct
{ {