mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

winpr: fix anonymous enum members and menbers without a size

This commit is contained in:
David Fort 2019-11-25 13:05:09 +01:00 committed by akallabeth
parent 3aa6047b3a
commit 5e6775ce95
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
channels/drive/client/drive_file.c
View File

@ -594,29 +594,29 @@ BOOL drive_file_set_information(DRIVE_FILE* file, UINT32 FsInformationClass, UIN
if (liCreationTime.QuadPart != 0) if (liCreationTime.QuadPart != 0)
{ {
ftCreationTime.dwHighDateTime = liCreationTime.HighPart; ftCreationTime.dwHighDateTime = liCreationTime.u.HighPart;
ftCreationTime.dwLowDateTime = liCreationTime.LowPart; ftCreationTime.dwLowDateTime = liCreationTime.u.LowPart;
pftCreationTime = &ftCreationTime; pftCreationTime = &ftCreationTime;
} }
if (liLastAccessTime.QuadPart != 0) if (liLastAccessTime.QuadPart != 0)
{ {
ftLastAccessTime.dwHighDateTime = liLastAccessTime.HighPart; ftLastAccessTime.dwHighDateTime = liLastAccessTime.u.HighPart;
ftLastAccessTime.dwLowDateTime = liLastAccessTime.LowPart; ftLastAccessTime.dwLowDateTime = liLastAccessTime.u.LowPart;
pftLastAccessTime = &ftLastAccessTime; pftLastAccessTime = &ftLastAccessTime;
} }
if (liLastWriteTime.QuadPart != 0) if (liLastWriteTime.QuadPart != 0)
{ {
ftLastWriteTime.dwHighDateTime = liLastWriteTime.HighPart; ftLastWriteTime.dwHighDateTime = liLastWriteTime.u.HighPart;
ftLastWriteTime.dwLowDateTime = liLastWriteTime.LowPart; ftLastWriteTime.dwLowDateTime = liLastWriteTime.u.LowPart;
pftLastWriteTime = &ftLastWriteTime; pftLastWriteTime = &ftLastWriteTime;
} }
if (liChangeTime.QuadPart != 0 && liChangeTime.QuadPart > liLastWriteTime.QuadPart) if (liChangeTime.QuadPart != 0 && liChangeTime.QuadPart > liLastWriteTime.QuadPart)
{ {
ftLastWriteTime.dwHighDateTime = liChangeTime.HighPart; ftLastWriteTime.dwHighDateTime = liChangeTime.u.HighPart;
ftLastWriteTime.dwLowDateTime = liChangeTime.LowPart; ftLastWriteTime.dwLowDateTime = liChangeTime.u.LowPart;
pftLastWriteTime = &ftLastWriteTime; pftLastWriteTime = &ftLastWriteTime;
} }

6
winpr/include/winpr/wtypes.h.in
View File

@ -309,7 +309,7 @@ typedef union _ULARGE_INTEGER
{ {
DWORD LowPart; DWORD LowPart;
DWORD HighPart; DWORD HighPart;
}; } DUMMYSTRUCTNAME;
struct struct
{ {
@ -326,7 +326,7 @@ typedef union _LARGE_INTEGER
{ {
DWORD LowPart; DWORD LowPart;
LONG HighPart; LONG HighPart;
}; } DUMMYSTRUCTNAME;
struct struct
{ {
@ -367,7 +367,7 @@ typedef struct _RPC_SID
UCHAR Revision; UCHAR Revision;
UCHAR SubAuthorityCount; UCHAR SubAuthorityCount;
RPC_SID_IDENTIFIER_AUTHORITY IdentifierAuthority; RPC_SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
ULONG SubAuthority[]; ULONG SubAuthority[1];
} RPC_SID, *PRPC_SID, *PSID; } RPC_SID, *PRPC_SID, *PSID;
typedef struct _ACL typedef struct _ACL

4
winpr/libwinpr/sspi/NTLM/ntlm_compute.c
View File

@ -183,8 +183,8 @@ void ntlm_current_time(BYTE* timestamp)
FILETIME filetime; FILETIME filetime;
ULARGE_INTEGER time64; ULARGE_INTEGER time64;
GetSystemTimeAsFileTime(&filetime); GetSystemTimeAsFileTime(&filetime);
time64.LowPart = filetime.dwLowDateTime; time64.u.LowPart = filetime.dwLowDateTime;
time64.HighPart = filetime.dwHighDateTime; time64.u.HighPart = filetime.dwHighDateTime;
CopyMemory(timestamp, &(time64.QuadPart), 8); CopyMemory(timestamp, &(time64.QuadPart), 8);
} }

4
winpr/libwinpr/sysinfo/sysinfo.c
View File

@ -275,8 +275,8 @@ VOID GetSystemTimeAsFileTime(LPFILETIME lpSystemTimeAsFileTime)
/* time represented in tenths of microseconds since midnight of January 1, 1601 */ /* time represented in tenths of microseconds since midnight of January 1, 1601 */
time64.QuadPart = time(NULL) + 11644473600LL; /* Seconds since January 1, 1601 */ time64.QuadPart = time(NULL) + 11644473600LL; /* Seconds since January 1, 1601 */
time64.QuadPart *= 10000000; /* Convert timestamp to tenths of a microsecond */ time64.QuadPart *= 10000000; /* Convert timestamp to tenths of a microsecond */
lpSystemTimeAsFileTime->dwLowDateTime = time64.LowPart; lpSystemTimeAsFileTime->dwLowDateTime = time64.u.LowPart;
lpSystemTimeAsFileTime->dwHighDateTime = time64.HighPart; lpSystemTimeAsFileTime->dwHighDateTime = time64.u.HighPart;
} }
BOOL GetSystemTimeAdjustment(PDWORD lpTimeAdjustment, PDWORD lpTimeIncrement, BOOL GetSystemTimeAdjustment(PDWORD lpTimeAdjustment, PDWORD lpTimeIncrement,