Rename LARGE_INTEGER/ULARGE_INTEGER member s to u
ge at gse.nl
ge at gse.nl
Wed Jan 21 14:54:40 CST 2004
ChangeLog:
Rename LARGE_INTEGER and ULARGE_INTEGER members "s" to "u" to conform
with PSDK and w32api
Index: dlls/d3d8/directx.c
===================================================================
RCS file: /home/wine/wine/dlls/d3d8/directx.c,v
retrieving revision 1.57
diff -u -r1.57 directx.c
--- dlls/d3d8/directx.c 6 Jan 2004 22:08:34 -0000 1.57
+++ dlls/d3d8/directx.c 21 Jan 2004 11:53:12 -0000
@@ -127,8 +127,8 @@
if (Adapter == 0) { /* Display */
strcpy(pIdentifier->Driver, "Display");
strcpy(pIdentifier->Description, "Direct3D Display");
- pIdentifier->DriverVersion.s.HighPart = 1;
- pIdentifier->DriverVersion.s.LowPart = 0;
+ pIdentifier->DriverVersion.u.HighPart = 1;
+ pIdentifier->DriverVersion.u.LowPart = 0;
pIdentifier->VendorId = 0;
pIdentifier->DeviceId = 0;
pIdentifier->SubSysId = 0;
Index: dlls/dmloader/loaderstream.c
===================================================================
RCS file: /home/wine/wine/dlls/dmloader/loaderstream.c,v
retrieving revision 1.6
diff -u -r1.6 loaderstream.c
--- dlls/dmloader/loaderstream.c 20 Jan 2004 00:21:41 -0000 1.6
+++ dlls/dmloader/loaderstream.c 21 Jan 2004 11:53:12 -0000
@@ -136,10 +136,10 @@
if (This->hFile == INVALID_HANDLE_VALUE) return E_FAIL;
- liNewPos.s.HighPart = dlibMove.s.HighPart;
- liNewPos.s.LowPart = SetFilePointer (This->hFile, dlibMove.s.LowPart, &liNewPos.s.HighPart, dwOrigin);
+ liNewPos.u.HighPart = dlibMove.u.HighPart;
+ liNewPos.u.LowPart = SetFilePointer (This->hFile, dlibMove.u.LowPart, &liNewPos.u.HighPart, dwOrigin);
- if (liNewPos.s.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) return E_FAIL;
+ if (liNewPos.u.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) return E_FAIL;
if (plibNewPosition) plibNewPosition->QuadPart = liNewPos.QuadPart;
return S_OK;
Index: dlls/kernel/cpu.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/cpu.c,v
retrieving revision 1.3
diff -u -r1.3 cpu.c
--- dlls/kernel/cpu.c 4 Dec 2003 01:41:53 -0000 1.3
+++ dlls/kernel/cpu.c 21 Jan 2004 11:53:12 -0000
@@ -187,7 +187,7 @@
if (IsProcessorFeaturePresent( PF_RDTSC_INSTRUCTION_AVAILABLE )) {
/* i586 optimized version */
__asm__ __volatile__ ( "rdtsc"
- : "=a" (counter->s.LowPart), "=d" (counter->s.HighPart) );
+ : "=a" (counter->u.LowPart), "=d" (counter->u.HighPart) );
counter->QuadPart = counter->QuadPart / 1000; /* see below */
return TRUE;
}
@@ -226,8 +226,8 @@
return TRUE;
}
#endif
- frequency->s.LowPart = 1000000;
- frequency->s.HighPart = 0;
+ frequency->u.LowPart = 1000000;
+ frequency->u.HighPart = 0;
return TRUE;
}
Index: dlls/kernel/file.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/file.c,v
retrieving revision 1.7
diff -u -r1.7 file.c
--- dlls/kernel/file.c 16 Jan 2004 21:23:32 -0000 1.7
+++ dlls/kernel/file.c 21 Jan 2004 11:53:12 -0000
@@ -338,8 +338,8 @@
return FALSE;
}
- lpFileSize->s.LowPart = info.nFileSizeLow;
- lpFileSize->s.HighPart = info.nFileSizeHigh;
+ lpFileSize->u.LowPart = info.nFileSizeLow;
+ lpFileSize->u.HighPart = info.nFileSizeHigh;
return TRUE;
}
@@ -357,10 +357,10 @@
TRACE( "%p %lx%08lx %lx%08lx\n",
hFile, offset_high, offset_low, count_high, count_low );
- count.s.LowPart = count_low;
- count.s.HighPart = count_high;
- offset.s.LowPart = offset_low;
- offset.s.HighPart = offset_high;
+ count.u.LowPart = count_low;
+ count.u.HighPart = count_high;
+ offset.u.LowPart = offset_low;
+ offset.u.HighPart = offset_high;
status = NtLockFile( hFile, 0, NULL, NULL,
NULL, &offset, &count, NULL, TRUE, TRUE );
@@ -398,10 +398,10 @@
hFile, overlapped->OffsetHigh, overlapped->Offset,
count_high, count_low, flags );
- count.s.LowPart = count_low;
- count.s.HighPart = count_high;
- offset.s.LowPart = overlapped->Offset;
- offset.s.HighPart = overlapped->OffsetHigh;
+ count.u.LowPart = count_low;
+ count.u.HighPart = count_high;
+ offset.u.LowPart = overlapped->Offset;
+ offset.u.HighPart = overlapped->OffsetHigh;
status = NtLockFile( hFile, overlapped->hEvent, NULL, NULL,
NULL, &offset, &count, NULL,
@@ -422,10 +422,10 @@
NTSTATUS status;
LARGE_INTEGER count, offset;
- count.s.LowPart = count_low;
- count.s.HighPart = count_high;
- offset.s.LowPart = offset_low;
- offset.s.HighPart = offset_high;
+ count.u.LowPart = count_low;
+ count.u.HighPart = count_high;
+ offset.u.LowPart = offset_low;
+ offset.u.HighPart = offset_high;
status = NtUnlockFile( hFile, NULL, &offset, &count, NULL);
if (status) SetLastError( RtlNtStatusToDosError(status) );
Index: dlls/kernel/system.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/system.c,v
retrieving revision 1.5
diff -u -r1.5 system.c
--- dlls/kernel/system.c 5 Nov 2003 00:46:44 -0000 1.5
+++ dlls/kernel/system.c 21 Jan 2004 11:53:12 -0000
@@ -79,7 +79,7 @@
if (!(SYS_timer = CreateWaitableTimerA( NULL, FALSE, NULL ))) return 0;
- when.s.LowPart = when.s.HighPart = 0;
+ when.u.LowPart = when.u.HighPart = 0;
SetWaitableTimer( SYS_timer, &when, (SYS_TIMER_RATE+500)/1000, SYSTEM_TimerTick, 0, FALSE );
for (;;) SleepEx( INFINITE, TRUE );
}
Index: dlls/kernel/time.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/time.c,v
retrieving revision 1.37
diff -u -r1.37 time.c
--- dlls/kernel/time.c 1 Dec 2003 22:47:28 -0000 1.37
+++ dlls/kernel/time.c 21 Jan 2004 11:53:12 -0000
@@ -69,8 +69,8 @@
NTSTATUS status;
SystemTimeToFileTime( systime, &ft );
- st.s.LowPart = ft.dwLowDateTime;
- st.s.HighPart = ft.dwHighDateTime;
+ st.u.LowPart = ft.dwLowDateTime;
+ st.u.HighPart = ft.dwHighDateTime;
RtlLocalTimeToSystemTime( &st, &st2 );
if ((status = NtSetSystemTime(&st2, NULL)))
@@ -121,8 +121,8 @@
NTSTATUS status;
SystemTimeToFileTime( systime, &ft );
- t.s.LowPart = ft.dwLowDateTime;
- t.s.HighPart = ft.dwHighDateTime;
+ t.u.LowPart = ft.dwLowDateTime;
+ t.u.HighPart = ft.dwHighDateTime;
if ((status = NtSetSystemTime(&t, NULL)))
SetLastError( RtlNtStatusToDosError(status) );
return !status;
@@ -472,8 +472,8 @@
{
LARGE_INTEGER t;
NtQuerySystemTime( &t );
- time->dwLowDateTime = t.s.LowPart;
- time->dwHighDateTime = t.s.HighPart;
+ time->dwLowDateTime = t.u.LowPart;
+ time->dwHighDateTime = t.u.HighPart;
}
@@ -728,12 +728,12 @@
NTSTATUS status;
LARGE_INTEGER local, utc;
- local.s.LowPart = localft->dwLowDateTime;
- local.s.HighPart = localft->dwHighDateTime;
+ local.u.LowPart = localft->dwLowDateTime;
+ local.u.HighPart = localft->dwHighDateTime;
if (!(status = RtlLocalTimeToSystemTime( &local, &utc )))
{
- utcft->dwLowDateTime = utc.s.LowPart;
- utcft->dwHighDateTime = utc.s.HighPart;
+ utcft->dwLowDateTime = utc.u.LowPart;
+ utcft->dwHighDateTime = utc.u.HighPart;
}
else SetLastError( RtlNtStatusToDosError(status) );
@@ -748,12 +748,12 @@
NTSTATUS status;
LARGE_INTEGER local, utc;
- utc.s.LowPart = utcft->dwLowDateTime;
- utc.s.HighPart = utcft->dwHighDateTime;
+ utc.u.LowPart = utcft->dwLowDateTime;
+ utc.u.HighPart = utcft->dwHighDateTime;
if (!(status = RtlSystemTimeToLocalTime( &utc, &local )))
{
- localft->dwLowDateTime = local.s.LowPart;
- localft->dwHighDateTime = local.s.HighPart;
+ localft->dwLowDateTime = local.u.LowPart;
+ localft->dwHighDateTime = local.u.HighPart;
}
else SetLastError( RtlNtStatusToDosError(status) );
@@ -768,8 +768,8 @@
TIME_FIELDS tf;
LARGE_INTEGER t;
- t.s.LowPart = ft->dwLowDateTime;
- t.s.HighPart = ft->dwHighDateTime;
+ t.u.LowPart = ft->dwLowDateTime;
+ t.u.HighPart = ft->dwHighDateTime;
RtlTimeToTimeFields(&t, &tf);
syst->wYear = tf.Year;
@@ -800,8 +800,8 @@
tf.Milliseconds = syst->wMilliseconds;
RtlTimeFieldsToTime(&tf, &t);
- ft->dwLowDateTime = t.s.LowPart;
- ft->dwHighDateTime = t.s.HighPart;
+ ft->dwLowDateTime = t.u.LowPart;
+ ft->dwHighDateTime = t.u.HighPart;
return TRUE;
}
@@ -848,8 +848,8 @@
NtQuerySystemTime(&ft);
RtlSystemTimeToLocalTime(&ft, &ft2);
- lft.dwLowDateTime = ft2.s.LowPart;
- lft.dwHighDateTime = ft2.s.HighPart;
+ lft.dwLowDateTime = ft2.u.LowPart;
+ lft.dwHighDateTime = ft2.u.HighPart;
FileTimeToSystemTime(&lft, systime);
}
@@ -867,7 +867,7 @@
LARGE_INTEGER t;
NtQuerySystemTime(&t);
- ft.dwLowDateTime = t.s.LowPart;
- ft.dwHighDateTime = t.s.HighPart;
+ ft.dwLowDateTime = t.u.LowPart;
+ ft.dwHighDateTime = t.u.HighPart;
FileTimeToSystemTime(&ft, systime);
}
Index: dlls/kernel/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/virtual.c,v
retrieving revision 1.1
diff -u -r1.1 virtual.c
--- dlls/kernel/virtual.c 13 Nov 2003 20:58:56 -0000 1.1
+++ dlls/kernel/virtual.c 21 Jan 2004 11:53:12 -0000
@@ -343,8 +343,8 @@
}
}
- size.s.LowPart = size_low;
- size.s.HighPart = size_high;
+ size.u.LowPart = size_low;
+ size.u.HighPart = size_high;
status = NtCreateSection( &ret, access, &attr, &size, protect, sec_type, hFile );
SetLastError( RtlNtStatusToDosError(status) );
@@ -453,8 +453,8 @@
LARGE_INTEGER offset;
ULONG protect;
- offset.s.LowPart = offset_low;
- offset.s.HighPart = offset_high;
+ offset.u.LowPart = offset_low;
+ offset.u.HighPart = offset_high;
if (access & FILE_MAP_WRITE) protect = PAGE_READWRITE;
else if (access & FILE_MAP_READ) protect = PAGE_READONLY;
Index: dlls/ntdll/cdrom.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/cdrom.c,v
retrieving revision 1.40
diff -u -r1.40 cdrom.c
--- dlls/ntdll/cdrom.c 15 Dec 2003 19:46:51 -0000 1.40
+++ dlls/ntdll/cdrom.c 21 Jan 2004 11:53:12 -0000
@@ -686,8 +686,8 @@
fsize = FRAME_OF_TOC(toc, toc.LastTrack+1)
- FRAME_OF_TOC(toc, 1); /* Total size in frames */
- dg->Cylinders.s.LowPart = fsize / (64 * 32);
- dg->Cylinders.s.HighPart = 0;
+ dg->Cylinders.u.LowPart = fsize / (64 * 32);
+ dg->Cylinders.u.HighPart = 0;
dg->MediaType = RemovableMedia;
dg->TracksPerCylinder = 64;
dg->SectorsPerTrack = 32;
@@ -1318,8 +1318,8 @@
switch (raw->TrackMode)
{
case YellowMode2:
- if (raw->DiskOffset.s.HighPart) FIXME("Unsupported value\n");
- cdr.cdread_lba = raw->DiskOffset.s.LowPart; /* FIXME ? */
+ if (raw->DiskOffset.u.HighPart) FIXME("Unsupported value\n");
+ cdr.cdread_lba = raw->DiskOffset.u.LowPart; /* FIXME ? */
cdr.cdread_bufaddr = buffer;
cdr.cdread_buflen = raw->SectorCount * sectSize;
io = ioctl(cdrom_cache[dev].fd, CDROMREADMODE2, &cdr);
@@ -1336,9 +1336,9 @@
* talking of 0.2 ms of sound
*/
/* 2048 = 2 ** 11 */
- if (raw->DiskOffset.s.HighPart & ~2047) FIXME("Unsupported value\n");
- cdra.addr.lba = ((raw->DiskOffset.s.LowPart >> 11) |
- (raw->DiskOffset.s.HighPart << (32 - 11))) - 1;
+ if (raw->DiskOffset.u.HighPart & ~2047) FIXME("Unsupported value\n");
+ cdra.addr.lba = ((raw->DiskOffset.u.LowPart >> 11) |
+ (raw->DiskOffset.u.HighPart << (32 - 11))) - 1;
FIXME("reading at %u\n", cdra.addr.lba);
cdra.addr_format = CDROM_LBA;
cdra.nframes = raw->SectorCount;
Index: dlls/ntdll/file.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/file.c,v
retrieving revision 1.36
diff -u -r1.36 file.c
--- dlls/ntdll/file.c 9 Jan 2004 20:09:08 -0000 1.36
+++ dlls/ntdll/file.c 21 Jan 2004 11:53:12 -0000
@@ -377,8 +377,8 @@
ovp->offset = 0;
else
{
- ovp->offset = offset->s.LowPart;
- if (offset->s.HighPart) FIXME("NIY-high part\n");
+ ovp->offset = offset->u.LowPart;
+ if (offset->u.HighPart) FIXME("NIY-high part\n");
}
ovp->apc = apc;
ovp->apc_user = apc_user;
@@ -399,7 +399,7 @@
LARGE_INTEGER timeout;
/* let some APC be run, this will read some already pending data */
- timeout.s.LowPart = timeout.s.HighPart = 0;
+ timeout.u.LowPart = timeout.u.HighPart = 0;
NtDelayExecution( TRUE, &timeout );
}
return io_status->u.Status;
@@ -559,8 +559,8 @@
ovp->async.iosb = io_status;
ovp->count = length;
if (offset) {
- ovp->offset = offset->s.LowPart;
- if (offset->s.HighPart) FIXME("NIY-high part\n");
+ ovp->offset = offset->u.LowPart;
+ if (offset->u.HighPart) FIXME("NIY-high part\n");
} else {
ovp->offset = 0;
}
@@ -583,7 +583,7 @@
LARGE_INTEGER timeout;
/* let some APC be run, this will write as much data as possible */
- timeout.s.LowPart = timeout.s.HighPart = 0;
+ timeout.u.LowPart = timeout.u.HighPart = 0;
NtDelayExecution( TRUE, &timeout );
}
return io_status->u.Status;
@@ -833,10 +833,10 @@
if ((reply->type == FILE_TYPE_DISK) ||
(reply->type == FILE_TYPE_REMOTE))
{
- fsi->AllocationSize.s.HighPart = reply->alloc_high;
- fsi->AllocationSize.s.LowPart = reply->alloc_low;
- fsi->EndOfFile.s.HighPart = reply->size_high;
- fsi->EndOfFile.s.LowPart = reply->size_low;
+ fsi->AllocationSize.u.HighPart = reply->alloc_high;
+ fsi->AllocationSize.u.LowPart = reply->alloc_low;
+ fsi->EndOfFile.u.HighPart = reply->size_high;
+ fsi->EndOfFile.u.LowPart = reply->size_low;
fsi->NumberOfLinks = reply->links;
fsi->DeletePending = FALSE; /* FIXME */
fsi->Directory = (reply->attr & FILE_ATTRIBUTE_DIRECTORY);
@@ -861,8 +861,8 @@
req->whence = SEEK_CUR;
if (!(status = wine_server_call( req )))
{
- fpi->CurrentByteOffset.s.HighPart = reply->new_high;
- fpi->CurrentByteOffset.s.LowPart = reply->new_low;
+ fpi->CurrentByteOffset.u.HighPart = reply->new_high;
+ fpi->CurrentByteOffset.u.LowPart = reply->new_low;
used = sizeof(*fpi);
}
}
@@ -917,8 +917,8 @@
SERVER_START_REQ( set_file_pointer )
{
req->handle = hFile;
- req->low = fpi->CurrentByteOffset.s.LowPart;
- req->high = fpi->CurrentByteOffset.s.HighPart;
+ req->low = fpi->CurrentByteOffset.u.LowPart;
+ req->high = fpi->CurrentByteOffset.u.HighPart;
req->whence = SEEK_SET;
status = wine_server_call( req );
}
@@ -1125,10 +1125,10 @@
SERVER_START_REQ( lock_file )
{
req->handle = hFile;
- req->offset_low = offset->s.LowPart;
- req->offset_high = offset->s.HighPart;
- req->count_low = count->s.LowPart;
- req->count_high = count->s.HighPart;
+ req->offset_low = offset->u.LowPart;
+ req->offset_high = offset->u.HighPart;
+ req->count_low = count->u.LowPart;
+ req->count_high = count->u.HighPart;
req->shared = !exclusive;
req->wait = !dont_wait;
ret = wine_server_call( req );
@@ -1178,7 +1178,7 @@
NTSTATUS status;
TRACE( "%p %lx%08lx %lx%08lx\n",
- hFile, offset->s.HighPart, offset->s.LowPart, count->s.HighPart, count->s.LowPart );
+ hFile, offset->u.HighPart, offset->u.LowPart, count->u.HighPart, count->u.LowPart );
if (io_status || key)
{
@@ -1189,10 +1189,10 @@
SERVER_START_REQ( unlock_file )
{
req->handle = hFile;
- req->offset_low = offset->s.LowPart;
- req->offset_high = offset->s.HighPart;
- req->count_low = count->s.LowPart;
- req->count_high = count->s.HighPart;
+ req->offset_low = offset->u.LowPart;
+ req->offset_high = offset->u.HighPart;
+ req->count_low = count->u.LowPart;
+ req->count_high = count->u.HighPart;
status = wine_server_call( req );
}
SERVER_END_REQ;
Index: dlls/ntdll/sync.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/sync.c,v
retrieving revision 1.33
diff -u -r1.33 sync.c
--- dlls/ntdll/sync.c 6 Nov 2003 00:08:05 -0000 1.33
+++ dlls/ntdll/sync.c 21 Jan 2004 11:53:12 -0000
@@ -365,7 +365,7 @@
SERVER_START_REQ( set_timer )
{
- if (!when->s.LowPart && !when->s.HighPart)
+ if (!when->u.LowPart && !when->u.HighPart)
{
/* special case to start timeout on now+period without too many calculations */
req->expire.sec = 0;
@@ -539,7 +539,7 @@
/* convert sec/usec to NT time */
RtlSecondsSince1970ToTime( (time_t)arg1, &time );
time.QuadPart += (DWORD)arg2 * 10;
- proc( arg3, time.s.LowPart, time.s.HighPart );
+ proc( arg3, time.u.LowPart, time.u.HighPart );
break;
case APC_ASYNC_IO:
check_async_list( arg1, (DWORD) arg2 );
Index: dlls/ntdll/time.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/time.c,v
retrieving revision 1.35
diff -u -r1.35 time.c
--- dlls/ntdll/time.c 2 Oct 2003 04:29:30 -0000 1.35
+++ dlls/ntdll/time.c 21 Jan 2004 11:53:12 -0000
@@ -519,7 +519,7 @@
*/
BOOLEAN WINAPI RtlTimeToSecondsSince1970( const LARGE_INTEGER *Time, LPDWORD Seconds )
{
- ULONGLONG tmp = ((ULONGLONG)Time->s.HighPart << 32) | Time->s.LowPart;
+ ULONGLONG tmp = ((ULONGLONG)Time->u.HighPart << 32) | Time->u.LowPart;
tmp = RtlLargeIntegerDivide( tmp, 10000000, NULL );
tmp -= SECS_1601_TO_1970;
if (tmp > 0xffffffff) return FALSE;
@@ -542,7 +542,7 @@
*/
BOOLEAN WINAPI RtlTimeToSecondsSince1980( const LARGE_INTEGER *Time, LPDWORD Seconds )
{
- ULONGLONG tmp = ((ULONGLONG)Time->s.HighPart << 32) | Time->s.LowPart;
+ ULONGLONG tmp = ((ULONGLONG)Time->u.HighPart << 32) | Time->u.LowPart;
tmp = RtlLargeIntegerDivide( tmp, 10000000, NULL );
tmp -= SECS_1601_TO_1980;
if (tmp > 0xffffffff) return FALSE;
@@ -565,8 +565,8 @@
void WINAPI RtlSecondsSince1970ToTime( DWORD Seconds, LARGE_INTEGER *Time )
{
ULONGLONG secs = Seconds * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970;
- Time->s.LowPart = (DWORD)secs;
- Time->s.HighPart = (DWORD)(secs >> 32);
+ Time->u.LowPart = (DWORD)secs;
+ Time->u.HighPart = (DWORD)(secs >> 32);
}
/******************************************************************************
@@ -584,8 +584,8 @@
void WINAPI RtlSecondsSince1980ToTime( DWORD Seconds, LARGE_INTEGER *Time )
{
ULONGLONG secs = Seconds * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1980;
- Time->s.LowPart = (DWORD)secs;
- Time->s.HighPart = (DWORD)(secs >> 32);
+ Time->u.LowPart = (DWORD)secs;
+ Time->u.HighPart = (DWORD)(secs >> 32);
}
/******************************************************************************
Index: dlls/ntdll/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v
retrieving revision 1.22
diff -u -r1.22 virtual.c
--- dlls/ntdll/virtual.c 16 Jan 2004 04:52:17 -0000 1.22
+++ dlls/ntdll/virtual.c 21 Jan 2004 11:53:12 -0000
@@ -1347,8 +1347,8 @@
SERVER_START_REQ( create_mapping )
{
req->file_handle = file;
- req->size_high = size ? size->s.HighPart : 0;
- req->size_low = size ? size->s.LowPart : 0;
+ req->size_high = size ? size->u.HighPart : 0;
+ req->size_low = size ? size->u.LowPart : 0;
req->protect = vprot;
req->access = access;
req->inherit = (attr->Attributes & OBJ_INHERIT) != 0;
@@ -1410,11 +1410,11 @@
}
TRACE("handle=%p addr=%p off=%lx%08lx size=%x access=%lx\n",
- handle, *addr_ptr, offset->s.HighPart, offset->s.LowPart, size, protect );
+ handle, *addr_ptr, offset->u.HighPart, offset->u.LowPart, size, protect );
/* Check parameters */
- if ((offset->s.LowPart & granularity_mask) ||
+ if ((offset->u.LowPart & granularity_mask) ||
(*addr_ptr && ((UINT_PTR)*addr_ptr & granularity_mask)))
return STATUS_INVALID_PARAMETER;
@@ -1462,14 +1462,14 @@
if (size_high)
ERR("Sizes larger than 4Gb not supported\n");
- if ((offset->s.LowPart >= size_low) ||
- (*size_ptr > size_low - offset->s.LowPart))
+ if ((offset->u.LowPart >= size_low) ||
+ (*size_ptr > size_low - offset->u.LowPart))
{
res = STATUS_INVALID_PARAMETER;
goto error;
}
- if (*size_ptr) size = ROUND_SIZE( offset->s.LowPart, *size_ptr );
- else size = size_low - offset->s.LowPart;
+ if (*size_ptr) size = ROUND_SIZE( offset->u.LowPart, *size_ptr );
+ else size = size_low - offset->u.LowPart;
switch(protect)
{
@@ -1511,14 +1511,14 @@
/* Map the file */
- TRACE("handle=%p size=%x offset=%lx\n", handle, size, offset->s.LowPart );
+ TRACE("handle=%p size=%x offset=%lx\n", handle, size, offset->u.LowPart );
- ret = VIRTUAL_mmap( unix_handle, ptr, size, offset->s.LowPart, offset->s.HighPart,
+ ret = VIRTUAL_mmap( unix_handle, ptr, size, offset->u.LowPart, offset->u.HighPart,
VIRTUAL_GetUnixProt( prot ), flags | MAP_FIXED, &removable );
if (ret != ptr)
{
ERR( "VIRTUAL_mmap %p %x %lx%08lx failed\n",
- ptr, size, offset->s.HighPart, offset->s.LowPart );
+ ptr, size, offset->u.HighPart, offset->u.LowPart );
res = STATUS_NO_MEMORY; /* FIXME */
goto error;
}
Index: dlls/ole32/antimoniker.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/antimoniker.c,v
retrieving revision 1.16
diff -u -r1.16 antimoniker.c
--- dlls/ole32/antimoniker.c 11 Sep 2003 03:06:25 -0000 1.16
+++ dlls/ole32/antimoniker.c 21 Jan 2004 11:53:12 -0000
@@ -287,9 +287,9 @@
/* Normaly the sizemax must be the size of DWORD ! but I tested this function it ususlly return 16 bytes */
/* more than the number of bytes used by AntiMoniker::Save function */
- pcbSize->s.LowPart = sizeof(DWORD)+16;
+ pcbSize->u.LowPart = sizeof(DWORD)+16;
- pcbSize->s.HighPart=0;
+ pcbSize->u.HighPart=0;
return S_OK;
}
Index: dlls/ole32/compobj.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/compobj.c,v
retrieving revision 1.85
diff -u -r1.85 compobj.c
--- dlls/ole32/compobj.c 16 Jan 2004 21:26:08 -0000 1.85
+++ dlls/ole32/compobj.c 21 Jan 2004 11:53:13 -0000
@@ -1006,10 +1006,10 @@
hres = IStream_Stat(pStm,&ststg,0);
if (hres) return hres;
- buflen = ststg.cbSize.s.LowPart;
+ buflen = ststg.cbSize.u.LowPart;
buffer = HeapAlloc(GetProcessHeap(),0,buflen);
- seekto.s.LowPart = 0;
- seekto.s.HighPart = 0;
+ seekto.u.LowPart = 0;
+ seekto.u.HighPart = 0;
hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
if (hres) {
FIXME("IStream_Seek failed, %lx\n",hres);
Index: dlls/ole32/compositemoniker.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/compositemoniker.c,v
retrieving revision 1.26
diff -u -r1.26 compositemoniker.c
--- dlls/ole32/compositemoniker.c 6 Jan 2004 22:08:34 -0000 1.26
+++ dlls/ole32/compositemoniker.c 21 Jan 2004 11:53:13 -0000
@@ -442,8 +442,8 @@
if (pcbSize!=NULL)
return E_POINTER;
- pcbSize->s.LowPart =0;
- pcbSize->s.HighPart=0;
+ pcbSize->u.LowPart =0;
+ pcbSize->u.HighPart=0;
IMoniker_Enum(iface,TRUE,&enumMk);
@@ -453,8 +453,8 @@
IMoniker_Release(pmk);
- pcbSize->s.LowPart +=ptmpSize.s.LowPart;
- pcbSize->s.HighPart+=ptmpSize.s.HighPart;
+ pcbSize->u.LowPart +=ptmpSize.u.LowPart;
+ pcbSize->u.HighPart+=ptmpSize.u.HighPart;
}
IEnumMoniker_Release(enumMk);
Index: dlls/ole32/datacache.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/datacache.c,v
retrieving revision 1.21
diff -u -r1.21 datacache.c
--- dlls/ole32/datacache.c 11 Sep 2003 03:06:25 -0000 1.21
+++ dlls/ole32/datacache.c 21 Jan 2004 11:53:13 -0000
@@ -696,7 +696,7 @@
LPCWSTR name = elem->pwcsName;
return (elem->type == STGTY_STREAM)
- && (elem->cbSize.s.LowPart >= sizeof(PresentationDataHeader))
+ && (elem->cbSize.u.LowPart >= sizeof(PresentationDataHeader))
&& (strlenW(name) == 11)
&& (strncmpW(name, OlePres, 8) == 0)
&& (name[8] >= '0') && (name[8] <= '9')
@@ -765,8 +765,8 @@
{
/* Rewind the stream before returning it. */
LARGE_INTEGER offset;
- offset.s.LowPart = 0;
- offset.s.HighPart = 0;
+ offset.u.LowPart = 0;
+ offset.u.HighPart = 0;
IStream_Seek(pStm, offset, STREAM_SEEK_SET, NULL);
*ppStm = pStm;
@@ -835,8 +835,8 @@
/*
* Skip the header
*/
- offset.s.HighPart = 0;
- offset.s.LowPart = sizeof(PresentationDataHeader);
+ offset.u.HighPart = 0;
+ offset.u.LowPart = sizeof(PresentationDataHeader);
hres = IStream_Seek(
presStream,
@@ -844,14 +844,14 @@
STREAM_SEEK_SET,
NULL);
- streamInfo.cbSize.s.LowPart -= offset.s.LowPart;
+ streamInfo.cbSize.u.LowPart -= offset.u.LowPart;
/*
* Allocate a buffer for the metafile bits.
*/
metafileBits = HeapAlloc(GetProcessHeap(),
0,
- streamInfo.cbSize.s.LowPart);
+ streamInfo.cbSize.u.LowPart);
/*
* Read the metafile bits.
@@ -859,7 +859,7 @@
hres = IStream_Read(
presStream,
metafileBits,
- streamInfo.cbSize.s.LowPart,
+ streamInfo.cbSize.u.LowPart,
NULL);
/*
@@ -867,7 +867,7 @@
*/
if (SUCCEEDED(hres))
{
- newMetafile = SetMetaFileBitsEx(streamInfo.cbSize.s.LowPart, metafileBits);
+ newMetafile = SetMetaFileBitsEx(streamInfo.cbSize.u.LowPart, metafileBits);
}
/*
Index: dlls/ole32/filemoniker.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/filemoniker.c,v
retrieving revision 1.28
diff -u -r1.28 filemoniker.c
--- dlls/ole32/filemoniker.c 6 Jan 2004 22:08:34 -0000 1.28
+++ dlls/ole32/filemoniker.c 21 Jan 2004 11:53:13 -0000
@@ -459,8 +459,8 @@
sizeof(WORD)+ /* constant : 0x3 */
len*sizeof(WCHAR); /* unicde filePath string */
- pcbSize->s.LowPart=sizeMAx;
- pcbSize->s.HighPart=0;
+ pcbSize->u.LowPart=sizeMAx;
+ pcbSize->u.HighPart=0;
return S_OK;
}
Index: dlls/ole32/git.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/git.c,v
retrieving revision 1.8
diff -u -r1.8 git.c
--- dlls/ole32/git.c 9 Sep 2003 19:39:31 -0000 1.8
+++ dlls/ole32/git.c 21 Jan 2004 11:53:13 -0000
@@ -309,8 +309,8 @@
}
/* rewind stream, in case it's used again */
- move.s.LowPart = 0;
- move.s.HighPart = 0;
+ move.u.LowPart = 0;
+ move.u.HighPart = 0;
IStream_Seek(entry->stream, move, STREAM_SEEK_SET, NULL);
/* addref it */
Index: dlls/ole32/hglobalstream.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/hglobalstream.c,v
retrieving revision 1.21
diff -u -r1.21 hglobalstream.c
--- dlls/ole32/hglobalstream.c 16 Jan 2004 21:22:41 -0000 1.21
+++ dlls/ole32/hglobalstream.c 21 Jan 2004 11:53:13 -0000
@@ -283,14 +283,14 @@
/*
* Start the stream at the beginning.
*/
- newStream->currentPosition.s.HighPart = 0;
- newStream->currentPosition.s.LowPart = 0;
+ newStream->currentPosition.u.HighPart = 0;
+ newStream->currentPosition.u.LowPart = 0;
/*
* Initialize the size of the stream to the size of the handle.
*/
- newStream->streamSize.s.HighPart = 0;
- newStream->streamSize.s.LowPart = GlobalSize(newStream->supportHandle);
+ newStream->streamSize.u.HighPart = 0;
+ newStream->streamSize.u.LowPart = GlobalSize(newStream->supportHandle);
}
return newStream;
@@ -446,19 +446,19 @@
* Using the known size of the stream, calculate the number of bytes
* to read from the block chain
*/
- bytesToReadFromBuffer = min( This->streamSize.s.LowPart - This->currentPosition.s.LowPart, cb);
+ bytesToReadFromBuffer = min( This->streamSize.u.LowPart - This->currentPosition.u.LowPart, cb);
/*
* Lock the buffer in position and copy the data.
*/
supportBuffer = GlobalLock(This->supportHandle);
- memcpy(pv, (char *) supportBuffer+This->currentPosition.s.LowPart, bytesToReadFromBuffer);
+ memcpy(pv, (char *) supportBuffer+This->currentPosition.u.LowPart, bytesToReadFromBuffer);
/*
* Move the current position to the new position
*/
- This->currentPosition.s.LowPart+=bytesToReadFromBuffer;
+ This->currentPosition.u.LowPart+=bytesToReadFromBuffer;
/*
* Return the number of bytes read.
@@ -519,14 +519,14 @@
}
else
{
- newSize.s.HighPart = 0;
- newSize.s.LowPart = This->currentPosition.s.LowPart + cb;
+ newSize.u.HighPart = 0;
+ newSize.u.LowPart = This->currentPosition.u.LowPart + cb;
}
/*
* Verify if we need to grow the stream
*/
- if (newSize.s.LowPart > This->streamSize.s.LowPart)
+ if (newSize.u.LowPart > This->streamSize.u.LowPart)
{
/* grow stream */
IStream_SetSize(iface, newSize);
@@ -537,12 +537,12 @@
*/
supportBuffer = GlobalLock(This->supportHandle);
- memcpy((char *) supportBuffer+This->currentPosition.s.LowPart, pv, cb);
+ memcpy((char *) supportBuffer+This->currentPosition.u.LowPart, pv, cb);
/*
* Move the current position to the new position
*/
- This->currentPosition.s.LowPart+=cb;
+ This->currentPosition.u.LowPart+=cb;
/*
* Return the number of bytes read.
@@ -575,8 +575,8 @@
ULARGE_INTEGER newPosition;
- TRACE("(%p, %lx%08lx, %ld, %p)\n", iface, dlibMove.s.HighPart,
- dlibMove.s.LowPart, dwOrigin, plibNewPosition);
+ TRACE("(%p, %lx%08lx, %ld, %p)\n", iface, dlibMove.u.HighPart,
+ dlibMove.u.LowPart, dwOrigin, plibNewPosition);
/*
* The file pointer is moved depending on the given "function"
@@ -585,8 +585,8 @@
switch (dwOrigin)
{
case STREAM_SEEK_SET:
- newPosition.s.HighPart = 0;
- newPosition.s.LowPart = 0;
+ newPosition.u.HighPart = 0;
+ newPosition.u.LowPart = 0;
break;
case STREAM_SEEK_CUR:
newPosition = This->currentPosition;
@@ -628,27 +628,27 @@
HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface;
HGLOBAL supportHandle;
- TRACE("(%p, %ld)\n", iface, libNewSize.s.LowPart);
+ TRACE("(%p, %ld)\n", iface, libNewSize.u.LowPart);
/*
* As documented.
*/
- if (libNewSize.s.HighPart != 0)
+ if (libNewSize.u.HighPart != 0)
return STG_E_INVALIDFUNCTION;
- if (This->streamSize.s.LowPart == libNewSize.s.LowPart)
+ if (This->streamSize.u.LowPart == libNewSize.u.LowPart)
return S_OK;
/*
* Re allocate the HGlobal to fit the new size of the stream.
*/
- supportHandle = GlobalReAlloc(This->supportHandle, libNewSize.s.LowPart, 0);
+ supportHandle = GlobalReAlloc(This->supportHandle, libNewSize.u.LowPart, 0);
if (supportHandle == 0)
return STG_E_MEDIUMFULL;
This->supportHandle = supportHandle;
- This->streamSize.s.LowPart = libNewSize.s.LowPart;
+ This->streamSize.u.LowPart = libNewSize.u.LowPart;
return S_OK;
}
@@ -674,7 +674,7 @@
ULARGE_INTEGER totalBytesWritten;
TRACE("(%p, %p, %ld, %p, %p)\n", iface, pstm,
- cb.s.LowPart, pcbRead, pcbWritten);
+ cb.u.LowPart, pcbRead, pcbWritten);
/*
* Sanity check
@@ -682,28 +682,28 @@
if ( pstm == 0 )
return STG_E_INVALIDPOINTER;
- totalBytesRead.s.LowPart = totalBytesRead.s.HighPart = 0;
- totalBytesWritten.s.LowPart = totalBytesWritten.s.HighPart = 0;
+ totalBytesRead.u.LowPart = totalBytesRead.u.HighPart = 0;
+ totalBytesWritten.u.LowPart = totalBytesWritten.u.HighPart = 0;
/*
* use stack to store data temporarly
* there is surely more performant way of doing it, for now this basic
* implementation will do the job
*/
- while ( cb.s.LowPart > 0 )
+ while ( cb.u.LowPart > 0 )
{
- if ( cb.s.LowPart >= 128 )
+ if ( cb.u.LowPart >= 128 )
copySize = 128;
else
- copySize = cb.s.LowPart;
+ copySize = cb.u.LowPart;
IStream_Read(iface, tmpBuffer, copySize, &bytesRead);
- totalBytesRead.s.LowPart += bytesRead;
+ totalBytesRead.u.LowPart += bytesRead;
IStream_Write(pstm, tmpBuffer, bytesRead, &bytesWritten);
- totalBytesWritten.s.LowPart += bytesWritten;
+ totalBytesWritten.u.LowPart += bytesWritten;
/*
* Check that read & write operations were succesfull
@@ -715,9 +715,9 @@
}
if (bytesRead!=copySize)
- cb.s.LowPart = 0;
+ cb.u.LowPart = 0;
else
- cb.s.LowPart -= bytesRead;
+ cb.u.LowPart -= bytesRead;
}
/*
@@ -725,14 +725,14 @@
*/
if (pcbRead)
{
- pcbRead->s.LowPart = totalBytesRead.s.LowPart;
- pcbRead->s.HighPart = totalBytesRead.s.HighPart;
+ pcbRead->u.LowPart = totalBytesRead.u.LowPart;
+ pcbRead->u.HighPart = totalBytesRead.u.HighPart;
}
if (pcbWritten)
{
- pcbWritten->s.LowPart = totalBytesWritten.s.LowPart;
- pcbWritten->s.HighPart = totalBytesWritten.s.HighPart;
+ pcbWritten->u.LowPart = totalBytesWritten.u.LowPart;
+ pcbWritten->u.HighPart = totalBytesWritten.u.HighPart;
}
return hr;
}
Index: dlls/ole32/itemmoniker.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/itemmoniker.c,v
retrieving revision 1.21
diff -u -r1.21 itemmoniker.c
--- dlls/ole32/itemmoniker.c 11 Sep 2003 03:06:25 -0000 1.21
+++ dlls/ole32/itemmoniker.c 21 Jan 2004 11:53:13 -0000
@@ -363,13 +363,13 @@
/* for more details see ItemMonikerImpl_Save coments */
- pcbSize->s.LowPart = sizeof(DWORD) + /* DWORD which contains delimiter length */
+ pcbSize->u.LowPart = sizeof(DWORD) + /* DWORD which contains delimiter length */
delimiterLength + /* item delimiter string */
sizeof(DWORD) + /* DWORD which contains item name length */
nameLength + /* item name string */
34; /* this constant was added ! because when I tested this function it usually */
/* returns 34 bytes more than the number of bytes used by IMoniker::Save function */
- pcbSize->s.HighPart=0;
+ pcbSize->u.HighPart=0;
return S_OK;
}
Index: dlls/ole32/memlockbytes.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/memlockbytes.c,v
retrieving revision 1.16
diff -u -r1.16 memlockbytes.c
--- dlls/ole32/memlockbytes.c 26 Nov 2003 03:36:18 -0000 1.16
+++ dlls/ole32/memlockbytes.c 21 Jan 2004 11:53:13 -0000
@@ -200,19 +200,19 @@
ERR("Cannot ILockBytes_Stat, %lx\n",hres);
return hres;
}
- FIXME("cbSize is %ld\n",stbuf.cbSize.s.LowPart);
- *phglobal = GlobalAlloc( GMEM_MOVEABLE|GMEM_SHARE, stbuf.cbSize.s.LowPart);
+ FIXME("cbSize is %ld\n",stbuf.cbSize.u.LowPart);
+ *phglobal = GlobalAlloc( GMEM_MOVEABLE|GMEM_SHARE, stbuf.cbSize.u.LowPart);
if (!*phglobal)
return E_INVALIDARG;
memset(&start,0,sizeof(start));
- hres = ILockBytes_ReadAt(plkbyt, start, GlobalLock(*phglobal), stbuf.cbSize.s.LowPart, &xread);
+ hres = ILockBytes_ReadAt(plkbyt, start, GlobalLock(*phglobal), stbuf.cbSize.u.LowPart, &xread);
GlobalUnlock(*phglobal);
if (hres != S_OK) {
FIXME("%p->ReadAt failed with %lx\n",plkbyt,hres);
return hres;
}
- if (stbuf.cbSize.s.LowPart != xread) {
- FIXME("Read size is not requested size %ld vs %ld?\n",stbuf.cbSize.s.LowPart, xread);
+ if (stbuf.cbSize.u.LowPart != xread) {
+ FIXME("Read size is not requested size %ld vs %ld?\n",stbuf.cbSize.u.LowPart, xread);
}
return S_OK;
}
@@ -264,8 +264,8 @@
/*
* Initialize the size of the array to the size of the handle.
*/
- newLockBytes->byteArraySize.s.HighPart = 0;
- newLockBytes->byteArraySize.s.LowPart = GlobalSize(
+ newLockBytes->byteArraySize.u.HighPart = 0;
+ newLockBytes->byteArraySize.u.LowPart = GlobalSize(
newLockBytes->supportHandle);
}
@@ -414,15 +414,15 @@
/*
* Make sure the offset is valid.
*/
- if (ulOffset.s.LowPart > This->byteArraySize.s.LowPart)
+ if (ulOffset.u.LowPart > This->byteArraySize.u.LowPart)
return E_FAIL;
/*
* Using the known size of the array, calculate the number of bytes
* to read.
*/
- bytesToReadFromBuffer = min(This->byteArraySize.s.LowPart -
- ulOffset.s.LowPart, cb);
+ bytesToReadFromBuffer = min(This->byteArraySize.u.LowPart -
+ ulOffset.u.LowPart, cb);
/*
* Lock the buffer in position and copy the data.
@@ -430,7 +430,7 @@
supportBuffer = GlobalLock(This->supportHandle);
memcpy(pv,
- (char *) supportBuffer + ulOffset.s.LowPart,
+ (char *) supportBuffer + ulOffset.u.LowPart,
bytesToReadFromBuffer);
/*
@@ -489,14 +489,14 @@
}
else
{
- newSize.s.HighPart = 0;
- newSize.s.LowPart = ulOffset.s.LowPart + cb;
+ newSize.u.HighPart = 0;
+ newSize.u.LowPart = ulOffset.u.LowPart + cb;
}
/*
* Verify if we need to grow the stream
*/
- if (newSize.s.LowPart > This->byteArraySize.s.LowPart)
+ if (newSize.u.LowPart > This->byteArraySize.u.LowPart)
{
/* grow stream */
if (HGLOBALLockBytesImpl_SetSize(iface, newSize) == STG_E_MEDIUMFULL)
@@ -508,7 +508,7 @@
*/
supportBuffer = GlobalLock(This->supportHandle);
- memcpy((char *) supportBuffer + ulOffset.s.LowPart, pv, cb);
+ memcpy((char *) supportBuffer + ulOffset.u.LowPart, pv, cb);
/*
* Return the number of bytes written.
@@ -550,22 +550,22 @@
/*
* As documented.
*/
- if (libNewSize.s.HighPart != 0)
+ if (libNewSize.u.HighPart != 0)
return STG_E_INVALIDFUNCTION;
- if (This->byteArraySize.s.LowPart == libNewSize.s.LowPart)
+ if (This->byteArraySize.u.LowPart == libNewSize.u.LowPart)
return S_OK;
/*
* Re allocate the HGlobal to fit the new size of the stream.
*/
- supportHandle = GlobalReAlloc(This->supportHandle, libNewSize.s.LowPart, 0);
+ supportHandle = GlobalReAlloc(This->supportHandle, libNewSize.u.LowPart, 0);
if (supportHandle == 0)
return STG_E_MEDIUMFULL;
This->supportHandle = supportHandle;
- This->byteArraySize.s.LowPart = libNewSize.s.LowPart;
+ This->byteArraySize.u.LowPart = libNewSize.u.LowPart;
return S_OK;
}
Index: dlls/ole32/memlockbytes16.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/memlockbytes16.c,v
retrieving revision 1.5
diff -u -r1.5 memlockbytes16.c
--- dlls/ole32/memlockbytes16.c 26 Nov 2003 03:36:18 -0000 1.5
+++ dlls/ole32/memlockbytes16.c 21 Jan 2004 11:53:13 -0000
@@ -193,8 +193,8 @@
/*
* Initialize the size of the array to the size of the handle.
*/
- newLockBytes->byteArraySize.s.HighPart = 0;
- newLockBytes->byteArraySize.s.LowPart = GlobalSize16(
+ newLockBytes->byteArraySize.u.HighPart = 0;
+ newLockBytes->byteArraySize.u.LowPart = GlobalSize16(
newLockBytes->supportHandle);
return (HGLOBALLockBytesImpl16*)MapLS(newLockBytes);
@@ -329,7 +329,7 @@
ULONG bytesReadBuffer = 0;
ULONG bytesToReadFromBuffer;
- TRACE("(%p,%ld,%p,%ld,%p)\n",This,ulOffset.s.LowPart,pv,cb,pcbRead);
+ TRACE("(%p,%ld,%p,%ld,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbRead);
/*
* If the caller is not interested in the number of bytes read,
* we use another buffer to avoid "if" statements in the code.
@@ -340,15 +340,15 @@
/*
* Make sure the offset is valid.
*/
- if (ulOffset.s.LowPart > This->byteArraySize.s.LowPart)
+ if (ulOffset.u.LowPart > This->byteArraySize.u.LowPart)
return E_FAIL;
/*
* Using the known size of the array, calculate the number of bytes
* to read.
*/
- bytesToReadFromBuffer = min(This->byteArraySize.s.LowPart -
- ulOffset.s.LowPart, cb);
+ bytesToReadFromBuffer = min(This->byteArraySize.u.LowPart -
+ ulOffset.u.LowPart, cb);
/*
* Lock the buffer in position and copy the data.
@@ -356,7 +356,7 @@
supportBuffer = GlobalLock16(This->supportHandle);
memcpy(pv,
- (char *) supportBuffer + ulOffset.s.LowPart,
+ (char *) supportBuffer + ulOffset.u.LowPart,
bytesToReadFromBuffer);
/*
@@ -402,7 +402,7 @@
ULARGE_INTEGER newSize;
ULONG bytesWritten = 0;
- TRACE("(%p,%ld,%p,%ld,%p)\n",This,ulOffset.s.LowPart,pv,cb,pcbWritten);
+ TRACE("(%p,%ld,%p,%ld,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbWritten);
/*
* If the caller is not interested in the number of bytes written,
* we use another buffer to avoid "if" statements in the code.
@@ -413,13 +413,13 @@
if (cb == 0)
return S_OK;
- newSize.s.HighPart = 0;
- newSize.s.LowPart = ulOffset.s.LowPart + cb;
+ newSize.u.HighPart = 0;
+ newSize.u.LowPart = ulOffset.u.LowPart + cb;
/*
* Verify if we need to grow the stream
*/
- if (newSize.s.LowPart > This->byteArraySize.s.LowPart)
+ if (newSize.u.LowPart > This->byteArraySize.u.LowPart)
{
/* grow stream */
if (HGLOBALLockBytesImpl16_SetSize(iface, newSize) == STG_E_MEDIUMFULL)
@@ -431,7 +431,7 @@
*/
supportBuffer = GlobalLock16(This->supportHandle);
- memcpy((char *) supportBuffer + ulOffset.s.LowPart, pv, cb);
+ memcpy((char *) supportBuffer + ulOffset.u.LowPart, pv, cb);
/*
* Return the number of bytes written.
@@ -471,26 +471,26 @@
HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface;
HGLOBAL16 supportHandle;
- TRACE("(%p,%ld)\n",This,libNewSize.s.LowPart);
+ TRACE("(%p,%ld)\n",This,libNewSize.u.LowPart);
/*
* As documented.
*/
- if (libNewSize.s.HighPart != 0)
+ if (libNewSize.u.HighPart != 0)
return STG_E_INVALIDFUNCTION;
- if (This->byteArraySize.s.LowPart == libNewSize.s.LowPart)
+ if (This->byteArraySize.u.LowPart == libNewSize.u.LowPart)
return S_OK;
/*
* Re allocate the HGlobal to fit the new size of the stream.
*/
- supportHandle = GlobalReAlloc16(This->supportHandle, libNewSize.s.LowPart, 0);
+ supportHandle = GlobalReAlloc16(This->supportHandle, libNewSize.u.LowPart, 0);
if (supportHandle == 0)
return STG_E_MEDIUMFULL;
This->supportHandle = supportHandle;
- This->byteArraySize.s.LowPart = libNewSize.s.LowPart;
+ This->byteArraySize.u.LowPart = libNewSize.u.LowPart;
return S_OK;
}
Index: dlls/ole32/oleproxy.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/oleproxy.c,v
retrieving revision 1.12
diff -u -r1.12 oleproxy.c
--- dlls/ole32/oleproxy.c 14 Oct 2003 05:24:21 -0000 1.12
+++ dlls/ole32/oleproxy.c 21 Jan 2004 11:53:13 -0000
@@ -184,14 +184,14 @@
return hres;
}
- msg->cbBuffer = ststg.cbSize.s.LowPart;
+ msg->cbBuffer = ststg.cbSize.u.LowPart;
if (msg->Buffer)
- msg->Buffer = HeapReAlloc(GetProcessHeap(),0,msg->Buffer,ststg.cbSize.s.LowPart);
+ msg->Buffer = HeapReAlloc(GetProcessHeap(),0,msg->Buffer,ststg.cbSize.u.LowPart);
else
- msg->Buffer = HeapAlloc(GetProcessHeap(),0,ststg.cbSize.s.LowPart);
+ msg->Buffer = HeapAlloc(GetProcessHeap(),0,ststg.cbSize.u.LowPart);
- seekto.s.LowPart = 0;seekto.s.HighPart = 0;
+ seekto.u.LowPart = 0;seekto.u.HighPart = 0;
hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
if (hres) {
FIXME("IStream_Seek failed, %lx\n",hres);
Index: dlls/ole32/rpc.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/rpc.c,v
retrieving revision 1.13
diff -u -r1.13 rpc.c
--- dlls/ole32/rpc.c 14 Oct 2003 05:24:21 -0000 1.13
+++ dlls/ole32/rpc.c 21 Jan 2004 11:53:13 -0000
@@ -547,7 +547,7 @@
if (hres) return hres;
hres = IStream_Write(pStm,marshalbuffer,bufferlen,&res);
if (hres) goto out;
- seekto.s.LowPart = 0;seekto.s.HighPart = 0;
+ seekto.u.LowPart = 0;seekto.u.HighPart = 0;
hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
hres = CoUnmarshalInterface(pStm,&IID_IClassFactory,ppv);
out:
Index: dlls/ole32/stg_bigblockfile.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/stg_bigblockfile.c,v
retrieving revision 1.12
diff -u -r1.12 stg_bigblockfile.c
--- dlls/ole32/stg_bigblockfile.c 19 Jan 2004 21:44:02 -0000 1.12
+++ dlls/ole32/stg_bigblockfile.c 21 Jan 2004 11:53:13 -0000
@@ -222,10 +222,10 @@
if (This->hfile == INVALID_HANDLE_VALUE)
return FALSE;
- This->filesize.s.LowPart = GetFileSize(This->hfile,
- &This->filesize.s.HighPart);
+ This->filesize.u.LowPart = GetFileSize(This->hfile,
+ &This->filesize.u.HighPart);
- if( This->filesize.s.LowPart || This->filesize.s.HighPart )
+ if( This->filesize.u.LowPart || This->filesize.u.HighPart )
{
/* create the file mapping object
*/
@@ -246,7 +246,7 @@
This->maplist = NULL;
- TRACE("file len %lu\n", This->filesize.s.LowPart);
+ TRACE("file len %lu\n", This->filesize.u.LowPart);
return TRUE;
}
@@ -278,12 +278,12 @@
*/
ILockBytes_AddRef(This->pLkbyt);
- This->filesize.s.LowPart = GlobalSize(This->hbytearray);
- This->filesize.s.HighPart = 0;
+ This->filesize.u.LowPart = GlobalSize(This->hbytearray);
+ This->filesize.u.HighPart = 0;
This->pbytearray = GlobalLock(This->hbytearray);
- TRACE("mem on %p len %lu\n", This->pbytearray, This->filesize.s.LowPart);
+ TRACE("mem on %p len %lu\n", This->pbytearray, This->filesize.u.LowPart);
return TRUE;
}
@@ -338,10 +338,10 @@
*
*/
if (This->blocksize * (index + 1)
- > ROUND_UP(This->filesize.s.LowPart, This->blocksize))
+ > ROUND_UP(This->filesize.u.LowPart, This->blocksize))
{
TRACE("out of range %lu vs %lu\n", This->blocksize * (index + 1),
- This->filesize.s.LowPart);
+ This->filesize.u.LowPart);
return NULL;
}
@@ -368,12 +368,12 @@
/*
* make sure that the block physically exists
*/
- if ((This->blocksize * (index + 1)) > This->filesize.s.LowPart)
+ if ((This->blocksize * (index + 1)) > This->filesize.u.LowPart)
{
ULARGE_INTEGER newSize;
- newSize.s.HighPart = 0;
- newSize.s.LowPart = This->blocksize * (index + 1);
+ newSize.u.HighPart = 0;
+ newSize.u.LowPart = This->blocksize * (index + 1);
BIGBLOCKFILE_SetSize(This, newSize);
}
@@ -409,10 +409,10 @@
*/
void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize)
{
- if (This->filesize.s.LowPart == newSize.s.LowPart)
+ if (This->filesize.u.LowPart == newSize.u.LowPart)
return;
- TRACE("from %lu to %lu\n", This->filesize.s.LowPart, newSize.s.LowPart);
+ TRACE("from %lu to %lu\n", This->filesize.u.LowPart, newSize.u.LowPart);
/*
* unmap all views, must be done before call to SetEndFile
*/
@@ -442,7 +442,7 @@
* This hack is only needed when saving to smbfs.
*/
memset(buf, '0', 10);
- SetFilePointer(This->hfile, newSize.s.LowPart, NULL, FILE_BEGIN);
+ SetFilePointer(This->hfile, newSize.u.LowPart, NULL, FILE_BEGIN);
WriteFile(This->hfile, buf, 10, NULL, NULL);
/*
* END HACK
@@ -451,7 +451,7 @@
/*
* set the new end of file
*/
- SetFilePointer(This->hfile, newSize.s.LowPart, NULL, FILE_BEGIN);
+ SetFilePointer(This->hfile, newSize.u.LowPart, NULL, FILE_BEGIN);
SetEndOfFile(This->hfile);
/*
@@ -479,8 +479,8 @@
This->pbytearray = GlobalLock(This->hbytearray);
}
- This->filesize.s.LowPart = newSize.s.LowPart;
- This->filesize.s.HighPart = newSize.s.HighPart;
+ This->filesize.u.LowPart = newSize.u.LowPart;
+ This->filesize.u.HighPart = newSize.u.HighPart;
BIGBLOCKFILE_RemapAllMappedPages(This);
}
@@ -671,8 +671,8 @@
if( !This->hfilemap )
return FALSE;
- if (lowoffset + PAGE_SIZE > This->filesize.s.LowPart)
- numBytesToMap = This->filesize.s.LowPart - lowoffset;
+ if (lowoffset + PAGE_SIZE > This->filesize.u.LowPart)
+ numBytesToMap = This->filesize.u.LowPart - lowoffset;
else
numBytesToMap = PAGE_SIZE;
@@ -831,7 +831,7 @@
{
MappedPage *next = list->next;
- if (list->page_index * PAGE_SIZE > This->filesize.s.LowPart)
+ if (list->page_index * PAGE_SIZE > This->filesize.u.LowPart)
{
TRACE("discarding %lu\n", list->page_index);
Index: dlls/ole32/stg_stream.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/stg_stream.c,v
retrieving revision 1.18
diff -u -r1.18 stg_stream.c
--- dlls/ole32/stg_stream.c 5 Sep 2003 23:08:33 -0000 1.18
+++ dlls/ole32/stg_stream.c 21 Jan 2004 11:53:13 -0000
@@ -106,14 +106,14 @@
/*
* Start the stream at the beginning.
*/
- newStream->currentPosition.s.HighPart = 0;
- newStream->currentPosition.s.LowPart = 0;
+ newStream->currentPosition.u.HighPart = 0;
+ newStream->currentPosition.u.LowPart = 0;
/*
* Initialize the rest of the data.
*/
- newStream->streamSize.s.HighPart = 0;
- newStream->streamSize.s.LowPart = 0;
+ newStream->streamSize.u.HighPart = 0;
+ newStream->streamSize.u.LowPart = 0;
newStream->bigBlockChain = 0;
newStream->smallBlockChain = 0;
@@ -294,16 +294,16 @@
/*
* This code supports only streams that are <32 bits in size.
*/
- assert(This->streamSize.s.HighPart == 0);
+ assert(This->streamSize.u.HighPart == 0);
if(curProperty.startingBlock == BLOCK_END_OF_CHAIN)
{
- assert( (This->streamSize.s.HighPart == 0) && (This->streamSize.s.LowPart == 0) );
+ assert( (This->streamSize.u.HighPart == 0) && (This->streamSize.u.LowPart == 0) );
}
else
{
- if ( (This->streamSize.s.HighPart == 0) &&
- (This->streamSize.s.LowPart < LIMIT_TO_USE_SMALL_BLOCK) )
+ if ( (This->streamSize.u.HighPart == 0) &&
+ (This->streamSize.u.LowPart < LIMIT_TO_USE_SMALL_BLOCK) )
{
This->smallBlockChain = SmallBlockChainStream_Construct(
This->parentStorage->ancestorStorage,
@@ -355,7 +355,7 @@
* Using the known size of the stream, calculate the number of bytes
* to read from the block chain
*/
- bytesToReadFromBuffer = min( This->streamSize.s.LowPart - This->currentPosition.s.LowPart, cb);
+ bytesToReadFromBuffer = min( This->streamSize.u.LowPart - This->currentPosition.u.LowPart, cb);
/*
* Depending on the type of chain that was opened when the stream was constructed,
@@ -399,7 +399,7 @@
/*
* Advance the pointer for the number of positions read.
*/
- This->currentPosition.s.LowPart += *pcbRead;
+ This->currentPosition.u.LowPart += *pcbRead;
if(*pcbRead != cb)
{
@@ -469,14 +469,14 @@
}
else
{
- newSize.s.HighPart = 0;
- newSize.s.LowPart = This->currentPosition.s.LowPart + cb;
+ newSize.u.HighPart = 0;
+ newSize.u.LowPart = This->currentPosition.u.LowPart + cb;
}
/*
* Verify if we need to grow the stream
*/
- if (newSize.s.LowPart > This->streamSize.s.LowPart)
+ if (newSize.u.LowPart > This->streamSize.u.LowPart)
{
/* grow stream */
IStream_SetSize(iface, newSize);
@@ -509,7 +509,7 @@
/*
* Advance the position pointer for the number of positions written.
*/
- This->currentPosition.s.LowPart += *pcbWritten;
+ This->currentPosition.u.LowPart += *pcbWritten;
return S_OK;
}
@@ -533,7 +533,7 @@
ULARGE_INTEGER newPosition;
TRACE("(%p, %ld, %ld, %p)\n",
- iface, dlibMove.s.LowPart, dwOrigin, plibNewPosition);
+ iface, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
/*
* The caller is allowed to pass in NULL as the new position return value.
@@ -552,8 +552,8 @@
switch (dwOrigin)
{
case STREAM_SEEK_SET:
- plibNewPosition->s.HighPart = 0;
- plibNewPosition->s.LowPart = 0;
+ plibNewPosition->u.HighPart = 0;
+ plibNewPosition->u.LowPart = 0;
break;
case STREAM_SEEK_CUR:
*plibNewPosition = This->currentPosition;
@@ -593,12 +593,12 @@
StgProperty curProperty;
BOOL Success;
- TRACE("(%p, %ld)\n", iface, libNewSize.s.LowPart);
+ TRACE("(%p, %ld)\n", iface, libNewSize.u.LowPart);
/*
* As documented.
*/
- if (libNewSize.s.HighPart != 0)
+ if (libNewSize.u.HighPart != 0)
return STG_E_INVALIDFUNCTION;
/*
@@ -607,7 +607,7 @@
if (!(This->grfMode & (STGM_WRITE | STGM_READWRITE)))
return STG_E_ACCESSDENIED;
- if (This->streamSize.s.LowPart == libNewSize.s.LowPart)
+ if (This->streamSize.u.LowPart == libNewSize.u.LowPart)
return S_OK;
/*
@@ -615,7 +615,7 @@
*/
if ((This->smallBlockChain == 0) && (This->bigBlockChain == 0))
{
- if (libNewSize.s.LowPart < LIMIT_TO_USE_SMALL_BLOCK)
+ if (libNewSize.u.LowPart < LIMIT_TO_USE_SMALL_BLOCK)
{
This->smallBlockChain = SmallBlockChainStream_Construct(
This->parentStorage->ancestorStorage,
@@ -640,9 +640,9 @@
* Determine if we have to switch from small to big blocks or vice versa
*/
if ( (This->smallBlockChain!=0) &&
- (curProperty.size.s.LowPart < LIMIT_TO_USE_SMALL_BLOCK) )
+ (curProperty.size.u.LowPart < LIMIT_TO_USE_SMALL_BLOCK) )
{
- if (libNewSize.s.LowPart >= LIMIT_TO_USE_SMALL_BLOCK)
+ if (libNewSize.u.LowPart >= LIMIT_TO_USE_SMALL_BLOCK)
{
/*
* Transform the small block chain into a big block chain
@@ -669,8 +669,8 @@
This->ownerProperty,
&curProperty);
- curProperty.size.s.HighPart = libNewSize.s.HighPart;
- curProperty.size.s.LowPart = libNewSize.s.LowPart;
+ curProperty.size.u.HighPart = libNewSize.u.HighPart;
+ curProperty.size.u.LowPart = libNewSize.u.LowPart;
if (Success)
{
@@ -705,7 +705,7 @@
ULARGE_INTEGER totalBytesWritten;
TRACE("(%p, %p, %ld, %p, %p)\n",
- iface, pstm, cb.s.LowPart, pcbRead, pcbWritten);
+ iface, pstm, cb.u.LowPart, pcbRead, pcbWritten);
/*
* Sanity check
@@ -713,28 +713,28 @@
if ( pstm == 0 )
return STG_E_INVALIDPOINTER;
- totalBytesRead.s.LowPart = totalBytesRead.s.HighPart = 0;
- totalBytesWritten.s.LowPart = totalBytesWritten.s.HighPart = 0;
+ totalBytesRead.u.LowPart = totalBytesRead.u.HighPart = 0;
+ totalBytesWritten.u.LowPart = totalBytesWritten.u.HighPart = 0;
/*
* use stack to store data temporarily
* there is surely a more performant way of doing it, for now this basic
* implementation will do the job
*/
- while ( cb.s.LowPart > 0 )
+ while ( cb.u.LowPart > 0 )
{
- if ( cb.s.LowPart >= 128 )
+ if ( cb.u.LowPart >= 128 )
copySize = 128;
else
- copySize = cb.s.LowPart;
+ copySize = cb.u.LowPart;
IStream_Read(iface, tmpBuffer, copySize, &bytesRead);
- totalBytesRead.s.LowPart += bytesRead;
+ totalBytesRead.u.LowPart += bytesRead;
IStream_Write(pstm, tmpBuffer, bytesRead, &bytesWritten);
- totalBytesWritten.s.LowPart += bytesWritten;
+ totalBytesWritten.u.LowPart += bytesWritten;
/*
* Check that read & write operations were successful
@@ -746,9 +746,9 @@
}
if (bytesRead!=copySize)
- cb.s.LowPart = 0;
+ cb.u.LowPart = 0;
else
- cb.s.LowPart -= bytesRead;
+ cb.u.LowPart -= bytesRead;
}
/*
@@ -756,14 +756,14 @@
*/
if (pcbRead)
{
- pcbRead->s.LowPart = totalBytesRead.s.LowPart;
- pcbRead->s.HighPart = totalBytesRead.s.HighPart;
+ pcbRead->u.LowPart = totalBytesRead.u.LowPart;
+ pcbRead->u.HighPart = totalBytesRead.u.HighPart;
}
if (pcbWritten)
{
- pcbWritten->s.LowPart = totalBytesWritten.s.LowPart;
- pcbWritten->s.HighPart = totalBytesWritten.s.HighPart;
+ pcbWritten->u.LowPart = totalBytesWritten.u.LowPart;
+ pcbWritten->u.HighPart = totalBytesWritten.u.HighPart;
}
return hr;
}
Index: dlls/ole32/storage.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/storage.c,v
retrieving revision 1.35
diff -u -r1.35 storage.c
--- dlls/ole32/storage.c 8 Oct 2003 19:08:23 -0000 1.35
+++ dlls/ole32/storage.c 21 Jan 2004 11:53:13 -0000
@@ -796,7 +796,7 @@
IStream16* iface,LARGE_INTEGER offset,DWORD whence,ULARGE_INTEGER *newpos
) {
ICOM_THIS(IStream16Impl,iface);
- TRACE_(relay)("(%p)->([%ld.%ld],%ld,%p)\n",This,offset.s.HighPart,offset.s.LowPart,whence,newpos);
+ TRACE_(relay)("(%p)->([%ld.%ld],%ld,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos);
switch (whence) {
/* unix SEEK_xx should be the same as win95 ones */
@@ -804,31 +804,31 @@
/* offset must be ==0 (<0 is invalid, and >0 cannot be handled
* right now.
*/
- assert(offset.s.HighPart==0);
- This->offset.s.HighPart = offset.s.HighPart;
- This->offset.s.LowPart = offset.s.LowPart;
+ assert(offset.u.HighPart==0);
+ This->offset.u.HighPart = offset.u.HighPart;
+ This->offset.u.LowPart = offset.u.LowPart;
break;
case SEEK_CUR:
- if (offset.s.HighPart < 0) {
+ if (offset.u.HighPart < 0) {
/* FIXME: is this negation correct ? */
- offset.s.HighPart = -offset.s.HighPart;
- offset.s.LowPart = (0xffffffff ^ offset.s.LowPart)+1;
+ offset.u.HighPart = -offset.u.HighPart;
+ offset.u.LowPart = (0xffffffff ^ offset.u.LowPart)+1;
- assert(offset.s.HighPart==0);
- assert(This->offset.s.LowPart >= offset.s.LowPart);
- This->offset.s.LowPart -= offset.s.LowPart;
+ assert(offset.u.HighPart==0);
+ assert(This->offset.u.LowPart >= offset.u.LowPart);
+ This->offset.u.LowPart -= offset.u.LowPart;
} else {
- assert(offset.s.HighPart==0);
- This->offset.s.LowPart+= offset.s.LowPart;
+ assert(offset.u.HighPart==0);
+ This->offset.u.LowPart+= offset.u.LowPart;
}
break;
case SEEK_END:
- assert(offset.s.HighPart==0);
- This->offset.s.LowPart = This->stde.pps_size-offset.s.LowPart;
+ assert(offset.u.HighPart==0);
+ This->offset.u.LowPart = This->stde.pps_size-offset.u.LowPart;
break;
}
- if (This->offset.s.LowPart>This->stde.pps_size)
- This->offset.s.LowPart=This->stde.pps_size;
+ if (This->offset.u.LowPart>This->stde.pps_size)
+ This->offset.u.LowPart=This->stde.pps_size;
if (newpos) *newpos = This->offset;
return S_OK;
}
@@ -848,11 +848,11 @@
if (!pcbRead) bytesread=&xxread;
*bytesread = 0;
- if (cb>This->stde.pps_size-This->offset.s.LowPart)
- cb=This->stde.pps_size-This->offset.s.LowPart;
+ if (cb>This->stde.pps_size-This->offset.u.LowPart)
+ cb=This->stde.pps_size-This->offset.u.LowPart;
if (This->stde.pps_size < 0x1000) {
/* use small block reader */
- blocknr = STORAGE_get_nth_next_small_blocknr(This->hf,This->stde.pps_sb,This->offset.s.LowPart/SMALLSIZE);
+ blocknr = STORAGE_get_nth_next_small_blocknr(This->hf,This->stde.pps_sb,This->offset.u.LowPart/SMALLSIZE);
while (cb) {
int cc;
@@ -861,10 +861,10 @@
return E_FAIL;
}
cc = cb;
- if (cc>SMALLSIZE-(This->offset.s.LowPart&(SMALLSIZE-1)))
- cc=SMALLSIZE-(This->offset.s.LowPart&(SMALLSIZE-1));
- memcpy((LPBYTE)pv,block+(This->offset.s.LowPart&(SMALLSIZE-1)),cc);
- This->offset.s.LowPart+=cc;
+ if (cc>SMALLSIZE-(This->offset.u.LowPart&(SMALLSIZE-1)))
+ cc=SMALLSIZE-(This->offset.u.LowPart&(SMALLSIZE-1));
+ memcpy((LPBYTE)pv,block+(This->offset.u.LowPart&(SMALLSIZE-1)),cc);
+ This->offset.u.LowPart+=cc;
(LPBYTE)pv+=cc;
*bytesread+=cc;
cb-=cc;
@@ -872,7 +872,7 @@
}
} else {
/* use big block reader */
- blocknr = STORAGE_get_nth_next_big_blocknr(This->hf,This->stde.pps_sb,This->offset.s.LowPart/BIGSIZE);
+ blocknr = STORAGE_get_nth_next_big_blocknr(This->hf,This->stde.pps_sb,This->offset.u.LowPart/BIGSIZE);
while (cb) {
int cc;
@@ -881,10 +881,10 @@
return E_FAIL;
}
cc = cb;
- if (cc>BIGSIZE-(This->offset.s.LowPart&(BIGSIZE-1)))
- cc=BIGSIZE-(This->offset.s.LowPart&(BIGSIZE-1));
- memcpy((LPBYTE)pv,block+(This->offset.s.LowPart&(BIGSIZE-1)),cc);
- This->offset.s.LowPart+=cc;
+ if (cc>BIGSIZE-(This->offset.u.LowPart&(BIGSIZE-1)))
+ cc=BIGSIZE-(This->offset.u.LowPart&(BIGSIZE-1));
+ memcpy((LPBYTE)pv,block+(This->offset.u.LowPart&(BIGSIZE-1)),cc);
+ This->offset.u.LowPart+=cc;
(LPBYTE)pv+=cc;
*bytesread+=cc;
cb-=cc;
@@ -911,7 +911,7 @@
TRACE_(relay)("(%p)->(%p,%ld,%p)\n",This,pv,cb,pcbWrite);
/* do we need to junk some blocks? */
- newsize = This->offset.s.LowPart+cb;
+ newsize = This->offset.u.LowPart+cb;
oldsize = This->stde.pps_size;
if (newsize < oldsize) {
if (oldsize < 0x1000) {
@@ -1107,7 +1107,7 @@
/* finally the write pass */
if (This->stde.pps_size < 0x1000) {
- blocknr = STORAGE_get_nth_next_small_blocknr(hf,This->stde.pps_sb,This->offset.s.LowPart/SMALLSIZE);
+ blocknr = STORAGE_get_nth_next_small_blocknr(hf,This->stde.pps_sb,This->offset.u.LowPart/SMALLSIZE);
assert(blocknr>=0);
while (cb>0) {
/* we ensured that it is allocated above */
@@ -1118,10 +1118,10 @@
if (!STORAGE_get_small_block(hf,blocknr,block))
return E_FAIL;
- cc = SMALLSIZE-(This->offset.s.LowPart&(SMALLSIZE-1));
+ cc = SMALLSIZE-(This->offset.u.LowPart&(SMALLSIZE-1));
if (cc>cb)
cc=cb;
- memcpy( ((LPBYTE)block)+(This->offset.s.LowPart&(SMALLSIZE-1)),
+ memcpy( ((LPBYTE)block)+(This->offset.u.LowPart&(SMALLSIZE-1)),
(LPBYTE)((char *) pv+curoffset),
cc
);
@@ -1130,12 +1130,12 @@
cb -= cc;
curoffset += cc;
(LPBYTE)pv += cc;
- This->offset.s.LowPart += cc;
+ This->offset.u.LowPart += cc;
*byteswritten += cc;
blocknr = STORAGE_get_next_small_blocknr(hf,blocknr);
}
} else {
- blocknr = STORAGE_get_nth_next_big_blocknr(hf,This->stde.pps_sb,This->offset.s.LowPart/BIGSIZE);
+ blocknr = STORAGE_get_nth_next_big_blocknr(hf,This->stde.pps_sb,This->offset.u.LowPart/BIGSIZE);
assert(blocknr>=0);
while (cb>0) {
/* we ensured that it is allocated above, so it better is */
@@ -1146,10 +1146,10 @@
if (!STORAGE_get_big_block(hf,blocknr,block))
return E_FAIL;
- cc = BIGSIZE-(This->offset.s.LowPart&(BIGSIZE-1));
+ cc = BIGSIZE-(This->offset.u.LowPart&(BIGSIZE-1));
if (cc>cb)
cc=cb;
- memcpy( ((LPBYTE)block)+(This->offset.s.LowPart&(BIGSIZE-1)),
+ memcpy( ((LPBYTE)block)+(This->offset.u.LowPart&(BIGSIZE-1)),
(LPBYTE)((char *) pv+curoffset),
cc
);
@@ -1158,7 +1158,7 @@
cb -= cc;
curoffset += cc;
(LPBYTE)pv += cc;
- This->offset.s.LowPart += cc;
+ This->offset.u.LowPart += cc;
*byteswritten += cc;
blocknr = STORAGE_get_next_big_blocknr(hf,blocknr);
}
@@ -1345,7 +1345,7 @@
WideCharToMultiByte( CP_ACP, 0, This->stde.pps_rawname, -1, nameA, len, NULL, NULL );
pstatstg->pwcsName=(LPOLESTR16)MapLS( nameA );
pstatstg->type = This->stde.pps_type;
- pstatstg->cbSize.s.LowPart = This->stde.pps_size;
+ pstatstg->cbSize.u.LowPart = This->stde.pps_size;
pstatstg->mtime = This->stde.pps_ft1; /* FIXME */ /* why? */
pstatstg->atime = This->stde.pps_ft2; /* FIXME */
pstatstg->ctime = This->stde.pps_ft2; /* FIXME */
@@ -1469,8 +1469,8 @@
lpstr = MapSL((SEGPTR)*ppstm);
DuplicateHandle( GetCurrentProcess(), This->hf, GetCurrentProcess(),
&lpstr->hf, 0, TRUE, DUPLICATE_SAME_ACCESS );
- lpstr->offset.s.LowPart = 0;
- lpstr->offset.s.HighPart = 0;
+ lpstr->offset.u.LowPart = 0;
+ lpstr->offset.u.HighPart = 0;
ppsent=STORAGE_get_free_pps_entry(lpstr->hf);
if (ppsent<0)
@@ -1571,8 +1571,8 @@
IStream16_fnRelease((IStream16*)lpstr);
return E_FAIL;
}
- lpstr->offset.s.LowPart = 0;
- lpstr->offset.s.HighPart = 0;
+ lpstr->offset.u.LowPart = 0;
+ lpstr->offset.u.HighPart = 0;
lpstr->ppsent = newpps;
return S_OK;
}
Index: dlls/ole32/storage32.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/storage32.c,v
retrieving revision 1.44
diff -u -r1.44 storage32.c
--- dlls/ole32/storage32.c 22 Sep 2003 19:46:13 -0000 1.44
+++ dlls/ole32/storage32.c 21 Jan 2004 11:53:14 -0000
@@ -678,7 +678,7 @@
end:
if (res == S_OK)
{
- TRACE("<-- STATSTG: pwcsName: %s, type: %ld, cbSize.Low/High: %ld/%ld, grfMode: %08lx, grfLocksSupported: %ld, grfStateBits: %08lx\n", debugstr_w(pstatstg->pwcsName), pstatstg->type, pstatstg->cbSize.s.LowPart, pstatstg->cbSize.s.HighPart, pstatstg->grfMode, pstatstg->grfLocksSupported, pstatstg->grfStateBits);
+ TRACE("<-- STATSTG: pwcsName: %s, type: %ld, cbSize.Low/High: %ld/%ld, grfMode: %08lx, grfLocksSupported: %ld, grfStateBits: %08lx\n", debugstr_w(pstatstg->pwcsName), pstatstg->type, pstatstg->cbSize.u.LowPart, pstatstg->cbSize.u.HighPart, pstatstg->grfMode, pstatstg->grfLocksSupported, pstatstg->grfStateBits);
}
TRACE("<-- %08lx\n", res);
return res;
@@ -762,8 +762,8 @@
renamedProperty.propertyType = currentProperty.propertyType;
renamedProperty.startingBlock = currentProperty.startingBlock;
- renamedProperty.size.s.LowPart = currentProperty.size.s.LowPart;
- renamedProperty.size.s.HighPart = currentProperty.size.s.HighPart;
+ renamedProperty.size.u.LowPart = currentProperty.size.u.LowPart;
+ renamedProperty.size.u.HighPart = currentProperty.size.u.HighPart;
renamedProperty.previousProperty = PROPERTY_NULL;
renamedProperty.nextProperty = PROPERTY_NULL;
@@ -936,8 +936,8 @@
newStreamProperty.propertyType = PROPTYPE_STREAM;
newStreamProperty.startingBlock = BLOCK_END_OF_CHAIN;
- newStreamProperty.size.s.LowPart = 0;
- newStreamProperty.size.s.HighPart = 0;
+ newStreamProperty.size.u.LowPart = 0;
+ newStreamProperty.size.u.HighPart = 0;
newStreamProperty.previousProperty = PROPERTY_NULL;
newStreamProperty.nextProperty = PROPERTY_NULL;
@@ -1121,8 +1121,8 @@
newProperty.propertyType = PROPTYPE_STORAGE;
newProperty.startingBlock = BLOCK_END_OF_CHAIN;
- newProperty.size.s.LowPart = 0;
- newProperty.size.s.HighPart = 0;
+ newProperty.size.u.LowPart = 0;
+ newProperty.size.u.HighPart = 0;
newProperty.previousProperty = PROPERTY_NULL;
newProperty.nextProperty = PROPERTY_NULL;
@@ -1243,8 +1243,8 @@
/*
* initialize the size used by the property stream
*/
- newSize.s.HighPart = 0;
- newSize.s.LowPart = storage->bigBlockSize * blockCount;
+ newSize.u.HighPart = 0;
+ newSize.u.LowPart = storage->bigBlockSize * blockCount;
/*
* add a property block to the property chain
@@ -1872,8 +1872,8 @@
HRESULT hr;
ULARGE_INTEGER size;
- size.s.HighPart = 0;
- size.s.LowPart = 0;
+ size.u.HighPart = 0;
+ size.u.LowPart = 0;
hr = StorageBaseImpl_OpenStream(
(IStorage*)parentStorage,
@@ -2280,8 +2280,8 @@
/*
* Add one block for the big block depot and one block for the properties
*/
- size.s.HighPart = 0;
- size.s.LowPart = This->bigBlockSize * 3;
+ size.u.HighPart = 0;
+ size.u.LowPart = This->bigBlockSize * 3;
BIGBLOCKFILE_SetSize(This->bigBlockFile, size);
/*
@@ -2348,8 +2348,8 @@
rootProp.nextProperty = PROPERTY_NULL;
rootProp.dirProperty = PROPERTY_NULL;
rootProp.startingBlock = BLOCK_END_OF_CHAIN;
- rootProp.size.s.HighPart = 0;
- rootProp.size.s.LowPart = 0;
+ rootProp.size.u.HighPart = 0;
+ rootProp.size.u.LowPart = 0;
StorageImpl_WriteProperty(This, 0, &rootProp);
}
@@ -3125,8 +3125,8 @@
BOOL readSuccessful;
ULONG bytesRead;
- offsetInPropSet.s.HighPart = 0;
- offsetInPropSet.s.LowPart = index * PROPSET_BLOCK_SIZE;
+ offsetInPropSet.u.HighPart = 0;
+ offsetInPropSet.u.LowPart = index * PROPSET_BLOCK_SIZE;
readSuccessful = BlockChainStream_ReadAt(
This->rootBlockChain,
@@ -3203,9 +3203,9 @@
StorageUtl_ReadDWord(
currentProperty,
OFFSET_PS_SIZE,
- &buffer->size.s.LowPart);
+ &buffer->size.u.LowPart);
- buffer->size.s.HighPart = 0;
+ buffer->size.u.HighPart = 0;
}
return readSuccessful;
@@ -3224,8 +3224,8 @@
BOOL writeSuccessful;
ULONG bytesWritten;
- offsetInPropSet.s.HighPart = 0;
- offsetInPropSet.s.LowPart = index * PROPSET_BLOCK_SIZE;
+ offsetInPropSet.u.HighPart = 0;
+ offsetInPropSet.u.LowPart = index * PROPSET_BLOCK_SIZE;
memset(currentProperty, 0, PROPSET_BLOCK_SIZE);
@@ -3289,7 +3289,7 @@
StorageUtl_WriteDWord(
currentProperty,
OFFSET_PS_SIZE,
- buffer->size.s.LowPart);
+ buffer->size.u.LowPart);
writeSuccessful = BlockChainStream_WriteAt(This->rootBlockChain,
offsetInPropSet,
@@ -3401,8 +3401,8 @@
* Copy the contents of the small block chain to the big block chain
* by small block size increments.
*/
- offset.s.LowPart = 0;
- offset.s.HighPart = 0;
+ offset.u.LowPart = 0;
+ offset.u.HighPart = 0;
cbTotalRead = 0;
cbTotalWritten = 0;
@@ -3423,7 +3423,7 @@
&cbWritten);
cbTotalWritten += cbWritten;
- offset.s.LowPart += This->smallBlockSize;
+ offset.u.LowPart += This->smallBlockSize;
} while (successRead && successWrite);
HeapFree(GetProcessHeap(),0,buffer);
@@ -3434,8 +3434,8 @@
* Destroy the small block chain.
*/
propertyIndex = (*ppsbChain)->ownerPropertyIndex;
- size.s.HighPart = 0;
- size.s.LowPart = 0;
+ size.u.HighPart = 0;
+ size.u.LowPart = 0;
SmallBlockChainStream_SetSize(*ppsbChain, size);
SmallBlockChainStream_Destroy(*ppsbChain);
*ppsbChain = 0;
@@ -4262,8 +4262,8 @@
void* buffer,
ULONG* bytesRead)
{
- ULONG blockNoInSequence = offset.s.LowPart / This->parentStorage->bigBlockSize;
- ULONG offsetInBlock = offset.s.LowPart % This->parentStorage->bigBlockSize;
+ ULONG blockNoInSequence = offset.u.LowPart / This->parentStorage->bigBlockSize;
+ ULONG offsetInBlock = offset.u.LowPart % This->parentStorage->bigBlockSize;
ULONG bytesToReadInBuffer;
ULONG blockIndex;
BYTE* bufferWalker;
@@ -4350,8 +4350,8 @@
const void* buffer,
ULONG* bytesWritten)
{
- ULONG blockNoInSequence = offset.s.LowPart / This->parentStorage->bigBlockSize;
- ULONG offsetInBlock = offset.s.LowPart % This->parentStorage->bigBlockSize;
+ ULONG blockNoInSequence = offset.u.LowPart / This->parentStorage->bigBlockSize;
+ ULONG offsetInBlock = offset.u.LowPart % This->parentStorage->bigBlockSize;
ULONG bytesToWrite;
ULONG blockIndex;
BYTE* bufferWalker;
@@ -4446,9 +4446,9 @@
/*
* Figure out how many blocks are needed to contain the new size
*/
- numBlocks = newSize.s.LowPart / This->parentStorage->bigBlockSize;
+ numBlocks = newSize.u.LowPart / This->parentStorage->bigBlockSize;
- if ((newSize.s.LowPart % This->parentStorage->bigBlockSize) != 0)
+ if ((newSize.u.LowPart % This->parentStorage->bigBlockSize) != 0)
numBlocks++;
blockIndex = BlockChainStream_GetHeadOfChain(This);
@@ -4546,9 +4546,9 @@
/*
* Figure out how many blocks are needed to contain this stream
*/
- newNumBlocks = newSize.s.LowPart / This->parentStorage->bigBlockSize;
+ newNumBlocks = newSize.u.LowPart / This->parentStorage->bigBlockSize;
- if ((newSize.s.LowPart % This->parentStorage->bigBlockSize) != 0)
+ if ((newSize.u.LowPart % This->parentStorage->bigBlockSize) != 0)
newNumBlocks++;
/*
@@ -4620,10 +4620,10 @@
{
ULARGE_INTEGER size = BlockChainStream_GetSize(This);
- if (newSize.s.LowPart == size.s.LowPart)
+ if (newSize.u.LowPart == size.u.LowPart)
return TRUE;
- if (newSize.s.LowPart < size.s.LowPart)
+ if (newSize.u.LowPart < size.u.LowPart)
{
BlockChainStream_Shrink(This, newSize);
}
@@ -4632,7 +4632,7 @@
ULARGE_INTEGER fileSize =
BIGBLOCKFILE_GetSize(This->parentStorage->bigBlockFile);
- ULONG diff = newSize.s.LowPart - size.s.LowPart;
+ ULONG diff = newSize.u.LowPart - size.u.LowPart;
/*
* Make sure the file stays a multiple of blocksize
@@ -4641,7 +4641,7 @@
diff += (This->parentStorage->bigBlockSize -
(diff % This->parentStorage->bigBlockSize) );
- fileSize.s.LowPart += diff;
+ fileSize.u.LowPart += diff;
BIGBLOCKFILE_SetSize(This->parentStorage->bigBlockFile, fileSize);
BlockChainStream_Enlarge(This, newSize);
@@ -4681,9 +4681,9 @@
* size of them
*/
ULARGE_INTEGER result;
- result.s.HighPart = 0;
+ result.u.HighPart = 0;
- result.s.LowPart =
+ result.u.LowPart =
BlockChainStream_GetCount(This) *
This->parentStorage->bigBlockSize;
@@ -4764,8 +4764,8 @@
*nextBlockInChain = BLOCK_END_OF_CHAIN;
- offsetOfBlockInDepot.s.HighPart = 0;
- offsetOfBlockInDepot.s.LowPart = blockIndex * sizeof(ULONG);
+ offsetOfBlockInDepot.u.HighPart = 0;
+ offsetOfBlockInDepot.u.LowPart = blockIndex * sizeof(ULONG);
/*
* Read those bytes in the buffer from the small block file.
@@ -4803,8 +4803,8 @@
DWORD buffer;
ULONG bytesWritten;
- offsetOfBlockInDepot.s.HighPart = 0;
- offsetOfBlockInDepot.s.LowPart = blockIndex * sizeof(ULONG);
+ offsetOfBlockInDepot.u.HighPart = 0;
+ offsetOfBlockInDepot.u.LowPart = blockIndex * sizeof(ULONG);
StorageUtl_WriteDWord(&buffer, 0, nextBlock);
@@ -4849,14 +4849,14 @@
BOOL success = TRUE;
ULONG smallBlocksPerBigBlock;
- offsetOfBlockInDepot.s.HighPart = 0;
+ offsetOfBlockInDepot.u.HighPart = 0;
/*
* Scan the small block depot for a free block
*/
while (nextBlockIndex != BLOCK_UNUSED)
{
- offsetOfBlockInDepot.s.LowPart = blockIndex * sizeof(ULONG);
+ offsetOfBlockInDepot.u.LowPart = blockIndex * sizeof(ULONG);
success = BlockChainStream_ReadAt(
This->parentStorage->smallBlockDepotChain,
@@ -4943,8 +4943,8 @@
&rootProp);
rootProp.startingBlock = sbStartIndex;
- rootProp.size.s.HighPart = 0;
- rootProp.size.s.LowPart = This->parentStorage->bigBlockSize;
+ rootProp.size.u.HighPart = 0;
+ rootProp.size.u.LowPart = This->parentStorage->bigBlockSize;
StorageImpl_WriteProperty(
This->parentStorage,
@@ -4970,10 +4970,10 @@
This->parentStorage->rootPropertySetIndex,
&rootProp);
- if (rootProp.size.s.LowPart <
+ if (rootProp.size.u.LowPart <
(blocksRequired * This->parentStorage->bigBlockSize))
{
- rootProp.size.s.LowPart += This->parentStorage->bigBlockSize;
+ rootProp.size.u.LowPart += This->parentStorage->bigBlockSize;
BlockChainStream_SetSize(
This->parentStorage->smallBlockRootChain,
@@ -5005,9 +5005,9 @@
{
ULARGE_INTEGER offsetInBigBlockFile;
ULONG blockNoInSequence =
- offset.s.LowPart / This->parentStorage->smallBlockSize;
+ offset.u.LowPart / This->parentStorage->smallBlockSize;
- ULONG offsetInBlock = offset.s.LowPart % This->parentStorage->smallBlockSize;
+ ULONG offsetInBlock = offset.u.LowPart % This->parentStorage->smallBlockSize;
ULONG bytesToReadInBuffer;
ULONG blockIndex;
ULONG bytesReadFromBigBlockFile;
@@ -5016,7 +5016,7 @@
/*
* This should never happen on a small block file.
*/
- assert(offset.s.HighPart==0);
+ assert(offset.u.HighPart==0);
/*
* Find the first block in the stream that contains part of the buffer.
@@ -5048,11 +5048,11 @@
/*
* Calculate the offset of the small block in the small block file.
*/
- offsetInBigBlockFile.s.HighPart = 0;
- offsetInBigBlockFile.s.LowPart =
+ offsetInBigBlockFile.u.HighPart = 0;
+ offsetInBigBlockFile.u.LowPart =
blockIndex * This->parentStorage->smallBlockSize;
- offsetInBigBlockFile.s.LowPart += offsetInBlock;
+ offsetInBigBlockFile.u.LowPart += offsetInBlock;
/*
* Read those bytes in the buffer from the small block file.
@@ -5095,9 +5095,9 @@
{
ULARGE_INTEGER offsetInBigBlockFile;
ULONG blockNoInSequence =
- offset.s.LowPart / This->parentStorage->smallBlockSize;
+ offset.u.LowPart / This->parentStorage->smallBlockSize;
- ULONG offsetInBlock = offset.s.LowPart % This->parentStorage->smallBlockSize;
+ ULONG offsetInBlock = offset.u.LowPart % This->parentStorage->smallBlockSize;
ULONG bytesToWriteInBuffer;
ULONG blockIndex;
ULONG bytesWrittenFromBigBlockFile;
@@ -5106,7 +5106,7 @@
/*
* This should never happen on a small block file.
*/
- assert(offset.s.HighPart==0);
+ assert(offset.u.HighPart==0);
/*
* Find the first block in the stream that contains part of the buffer.
@@ -5139,11 +5139,11 @@
/*
* Calculate the offset of the small block in the small block file.
*/
- offsetInBigBlockFile.s.HighPart = 0;
- offsetInBigBlockFile.s.LowPart =
+ offsetInBigBlockFile.u.HighPart = 0;
+ offsetInBigBlockFile.u.LowPart =
blockIndex * This->parentStorage->smallBlockSize;
- offsetInBigBlockFile.s.LowPart += offsetInBlock;
+ offsetInBigBlockFile.u.LowPart += offsetInBlock;
/*
* Write those bytes in the buffer to the small block file.
@@ -5184,9 +5184,9 @@
ULONG numBlocks;
ULONG count = 0;
- numBlocks = newSize.s.LowPart / This->parentStorage->smallBlockSize;
+ numBlocks = newSize.u.LowPart / This->parentStorage->smallBlockSize;
- if ((newSize.s.LowPart % This->parentStorage->smallBlockSize) != 0)
+ if ((newSize.u.LowPart % This->parentStorage->smallBlockSize) != 0)
numBlocks++;
blockIndex = SmallBlockChainStream_GetHeadOfChain(This);
@@ -5297,9 +5297,9 @@
/*
* Figure out how many blocks are needed to contain this stream
*/
- newNumBlocks = newSize.s.LowPart / This->parentStorage->smallBlockSize;
+ newNumBlocks = newSize.u.LowPart / This->parentStorage->smallBlockSize;
- if ((newSize.s.LowPart % This->parentStorage->smallBlockSize) != 0)
+ if ((newSize.u.LowPart % This->parentStorage->smallBlockSize) != 0)
newNumBlocks++;
/*
@@ -5373,10 +5373,10 @@
{
ULARGE_INTEGER size = SmallBlockChainStream_GetSize(This);
- if (newSize.s.LowPart == size.s.LowPart)
+ if (newSize.u.LowPart == size.u.LowPart)
return TRUE;
- if (newSize.s.LowPart < size.s.LowPart)
+ if (newSize.u.LowPart < size.u.LowPart)
{
SmallBlockChainStream_Shrink(This, newSize);
}
@@ -5819,8 +5819,8 @@
BYTE sig[8];
ULARGE_INTEGER offset;
- offset.s.HighPart = 0;
- offset.s.LowPart = 0;
+ offset.u.HighPart = 0;
+ offset.u.LowPart = 0;
ILockBytes_ReadAt(plkbyt, offset, sig, sizeof(sig), NULL);
@@ -7086,15 +7086,15 @@
{
/*Get the OleType from the CompObj Stream */
- iSeekPos.s.LowPart = sizeof(CompObj.byUnknown1) + sizeof(CompObj.clsid);
- iSeekPos.s.HighPart = 0;
+ iSeekPos.u.LowPart = sizeof(CompObj.byUnknown1) + sizeof(CompObj.clsid);
+ iSeekPos.u.HighPart = 0;
IStream_Seek(pStream, iSeekPos, STREAM_SEEK_SET, NULL);
IStream_Read(pStream, &CompObj.dwCLSIDNameLength, sizeof(CompObj.dwCLSIDNameLength), NULL);
- iSeekPos.s.LowPart = CompObj.dwCLSIDNameLength;
+ iSeekPos.u.LowPart = CompObj.dwCLSIDNameLength;
IStream_Seek(pStream, iSeekPos, STREAM_SEEK_CUR , NULL);
IStream_Read(pStream, &CompObj.dwOleTypeNameLength, sizeof(CompObj.dwOleTypeNameLength), NULL);
- iSeekPos.s.LowPart = CompObj.dwOleTypeNameLength;
+ iSeekPos.u.LowPart = CompObj.dwOleTypeNameLength;
IStream_Seek(pStream, iSeekPos, STREAM_SEEK_CUR , NULL);
IStream_Read(pStream, dwSize, sizeof(*dwSize), NULL);
@@ -7233,8 +7233,8 @@
pOleStreamData[1].dwOleTypeNameLength = strlen(strMetafilePictName) +1;
strcpy(pOleStreamData[1].strOleTypeName, strMetafilePictName);
- iSeekPos.s.HighPart = 0;
- iSeekPos.s.LowPart = sizeof(olePress.byUnknown1);
+ iSeekPos.u.HighPart = 0;
+ iSeekPos.u.LowPart = sizeof(olePress.byUnknown1);
/* Get Presentation Data */
IStream_Seek(pStream, iSeekPos, STREAM_SEEK_SET, NULL);
Index: dlls/oleaut32/olefont.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/olefont.c,v
retrieving revision 1.23
diff -u -r1.23 olefont.c
--- dlls/oleaut32/olefont.c 5 Sep 2003 23:08:33 -0000 1.23
+++ dlls/oleaut32/olefont.c 21 Jan 2004 11:53:14 -0000
@@ -1704,18 +1704,18 @@
if (pcbSize==NULL)
return E_POINTER;
- pcbSize->s.HighPart = 0;
- pcbSize->s.LowPart = 0;
+ pcbSize->u.HighPart = 0;
+ pcbSize->u.LowPart = 0;
- pcbSize->s.LowPart += sizeof(BYTE); /* Version */
- pcbSize->s.LowPart += sizeof(WORD); /* Lang code */
- pcbSize->s.LowPart += sizeof(BYTE); /* Flags */
- pcbSize->s.LowPart += sizeof(WORD); /* Weight */
- pcbSize->s.LowPart += sizeof(DWORD); /* Size */
- pcbSize->s.LowPart += sizeof(BYTE); /* StrLength */
+ pcbSize->u.LowPart += sizeof(BYTE); /* Version */
+ pcbSize->u.LowPart += sizeof(WORD); /* Lang code */
+ pcbSize->u.LowPart += sizeof(BYTE); /* Flags */
+ pcbSize->u.LowPart += sizeof(WORD); /* Weight */
+ pcbSize->u.LowPart += sizeof(DWORD); /* Size */
+ pcbSize->u.LowPart += sizeof(BYTE); /* StrLength */
if (this->description.lpstrName!=0)
- pcbSize->s.LowPart += lstrlenW(this->description.lpstrName);
+ pcbSize->u.LowPart += lstrlenW(this->description.lpstrName);
return S_OK;
}
Index: dlls/oleaut32/tmarshal.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/tmarshal.c,v
retrieving revision 1.22
diff -u -r1.22 tmarshal.c
--- dlls/oleaut32/tmarshal.c 9 Jan 2004 22:18:50 -0000 1.22
+++ dlls/oleaut32/tmarshal.c 21 Jan 2004 11:53:14 -0000
@@ -163,16 +163,16 @@
goto fail;
}
hres = IStream_Stat(pStm,&ststg,0);
- tempbuf = HeapAlloc(GetProcessHeap(), 0, ststg.cbSize.s.LowPart);
+ tempbuf = HeapAlloc(GetProcessHeap(), 0, ststg.cbSize.u.LowPart);
memset(&seekto,0,sizeof(seekto));
hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
if (hres) { FIXME("Failed Seek %lx\n",hres); goto fail;}
- hres = IStream_Read(pStm,tempbuf,ststg.cbSize.s.LowPart,&res);
+ hres = IStream_Read(pStm,tempbuf,ststg.cbSize.u.LowPart,&res);
if (hres) { FIXME("Failed Read %lx\n",hres); goto fail;}
IStream_Release(pStm);
- xsize = ststg.cbSize.s.LowPart;
+ xsize = ststg.cbSize.u.LowPart;
xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize));
- hres = xbuf_add(buf,tempbuf,ststg.cbSize.s.LowPart);
+ hres = xbuf_add(buf,tempbuf,ststg.cbSize.u.LowPart);
HeapFree(GetProcessHeap(),0,tempbuf);
return hres;
fail:
Index: dlls/oleaut32/vartype.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/vartype.c,v
retrieving revision 1.4
diff -u -r1.4 vartype.c
--- dlls/oleaut32/vartype.c 13 Jan 2004 23:02:34 -0000 1.4
+++ dlls/oleaut32/vartype.c 21 Jan 2004 11:53:14 -0000
@@ -4220,7 +4220,7 @@
DEC_HI32(pDecOut) = 0;
/* Note: This assumes 2s complement integer representation */
- if (pLi->s.HighPart & 0x80000000)
+ if (pLi->u.HighPart & 0x80000000)
{
DEC_SIGNSCALE(pDecOut) = SIGNSCALE(DECIMAL_NEG,0);
DEC_LO64(pDecOut) = -pLi->QuadPart;
@@ -4228,8 +4228,8 @@
else
{
DEC_SIGNSCALE(pDecOut) = SIGNSCALE(DECIMAL_POS,0);
- DEC_MID32(pDecOut) = pLi->s.HighPart;
- DEC_LO32(pDecOut) = pLi->s.LowPart;
+ DEC_MID32(pDecOut) = pLi->u.HighPart;
+ DEC_LO32(pDecOut) = pLi->u.LowPart;
}
return S_OK;
}
@@ -4306,8 +4306,8 @@
ULARGE_INTEGER ul64;
ul64.QuadPart = (ULONG64)ulLeft + (ULONG64)ulRight + (ULONG64)*pulHigh;
- *pulHigh = ul64.s.HighPart;
- return ul64.s.LowPart;
+ *pulHigh = ul64.u.HighPart;
+ return ul64.u.LowPart;
}
/* Subtract two unsigned 32 bit values with underflow */
@@ -4328,10 +4328,10 @@
invert = 1;
}
if (invert)
- ul64.s.HighPart = -ul64.s.HighPart ;
+ ul64.u.HighPart = -ul64.u.HighPart ;
- *pulHigh = ul64.s.HighPart;
- return ul64.s.LowPart;
+ *pulHigh = ul64.u.HighPart;
+ return ul64.u.LowPart;
}
/* Multiply two unsigned 32 bit values with overflow */
@@ -4340,8 +4340,8 @@
ULARGE_INTEGER ul64;
ul64.QuadPart = (ULONG64)ulLeft * (ULONG64)ulRight + (ULONG64)*pulHigh;
- *pulHigh = ul64.s.HighPart;
- return ul64.s.LowPart;
+ *pulHigh = ul64.u.HighPart;
+ return ul64.u.LowPart;
}
/* Compare two decimals that have the same scale */
Index: dlls/rpcrt4/ndr_ole.c
===================================================================
RCS file: /home/wine/wine/dlls/rpcrt4/ndr_ole.c,v
retrieving revision 1.6
diff -u -r1.6 ndr_ole.c
--- dlls/rpcrt4/ndr_ole.c 5 Sep 2003 23:08:32 -0000 1.6
+++ dlls/rpcrt4/ndr_ole.c 21 Jan 2004 11:53:14 -0000
@@ -154,20 +154,20 @@
ICOM_THIS(RpcStreamImpl, iface);
switch (origin) {
case STREAM_SEEK_SET:
- This->pos = move.s.LowPart;
+ This->pos = move.u.LowPart;
break;
case STREAM_SEEK_CUR:
- This->pos = This->pos + move.s.LowPart;
+ This->pos = This->pos + move.u.LowPart;
break;
case STREAM_SEEK_END:
- This->pos = *This->size + move.s.LowPart;
+ This->pos = *This->size + move.u.LowPart;
break;
default:
return STG_E_INVALIDFUNCTION;
}
if (newPos) {
- newPos->s.LowPart = This->pos;
- newPos->s.HighPart = 0;
+ newPos->u.LowPart = This->pos;
+ newPos->u.HighPart = 0;
}
return S_OK;
}
@@ -176,7 +176,7 @@
ULARGE_INTEGER newSize)
{
ICOM_THIS(RpcStreamImpl, iface);
- *This->size = newSize.s.LowPart;
+ *This->size = newSize.u.LowPart;
return S_OK;
}
Index: dlls/shell32/shfldr_mycomp.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shfldr_mycomp.c,v
retrieving revision 1.12
diff -u -r1.12 shfldr_mycomp.c
--- dlls/shell32/shfldr_mycomp.c 20 Jan 2004 01:37:24 -0000 1.12
+++ dlls/shell32/shfldr_mycomp.c 21 Jan 2004 11:53:15 -0000
@@ -596,14 +596,14 @@
if (_ILIsDrive (pidl)) {
_ILSimpleGetText (pidl, szPath, MAX_PATH);
GetDiskFreeSpaceExA (szPath, NULL, &ulBytes, NULL);
- StrFormatByteSizeA (ulBytes.s.LowPart, psd->str.u.cStr, MAX_PATH);
+ StrFormatByteSizeA (ulBytes.u.LowPart, psd->str.u.cStr, MAX_PATH);
}
break;
case 3: /* free size */
if (_ILIsDrive (pidl)) {
_ILSimpleGetText (pidl, szPath, MAX_PATH);
GetDiskFreeSpaceExA (szPath, &ulBytes, NULL, NULL);
- StrFormatByteSizeA (ulBytes.s.LowPart, psd->str.u.cStr, MAX_PATH);
+ StrFormatByteSizeA (ulBytes.u.LowPart, psd->str.u.cStr, MAX_PATH);
}
break;
}
Index: dlls/shlwapi/istream.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/istream.c,v
retrieving revision 1.9
diff -u -r1.9 istream.c
--- dlls/shlwapi/istream.c 24 Sep 2003 05:14:39 -0000 1.9
+++ dlls/shlwapi/istream.c 21 Jan 2004 11:53:15 -0000
@@ -160,15 +160,15 @@
ICOM_THIS(ISHFileStream, iface);
DWORD dwPos;
- TRACE("(%p,%ld,%ld,%p)\n", This, dlibMove.s.LowPart, dwOrigin, pNewPos);
+ TRACE("(%p,%ld,%ld,%p)\n", This, dlibMove.u.LowPart, dwOrigin, pNewPos);
IStream_fnCommit(iface, 0); /* If ever buffered, this will be needed */
- dwPos = SetFilePointer(This->hFile, dlibMove.s.LowPart, NULL, dwOrigin);
+ dwPos = SetFilePointer(This->hFile, dlibMove.u.LowPart, NULL, dwOrigin);
if (pNewPos)
{
- pNewPos->s.HighPart = 0;
- pNewPos->s.LowPart = dwPos;
+ pNewPos->u.HighPart = 0;
+ pNewPos->u.LowPart = dwPos;
}
return S_OK;
}
@@ -180,7 +180,7 @@
{
ICOM_THIS(ISHFileStream, iface);
- TRACE("(%p,%ld)\n", This, libNewSize.s.LowPart);
+ TRACE("(%p,%ld)\n", This, libNewSize.u.LowPart);
IStream_fnCommit(iface, 0); /* If ever buffered, this will be needed */
return E_NOTIMPL;
}
@@ -196,7 +196,7 @@
ULONGLONG ulSize;
HRESULT hRet = S_OK;
- TRACE("(%p,%p,%ld,%p,%p)\n", This, pstm, cb.s.LowPart, pcbRead, pcbWritten);
+ TRACE("(%p,%p,%ld,%p,%p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten);
if (pcbRead)
pcbRead->QuadPart = 0;
@@ -265,7 +265,7 @@
ULARGE_INTEGER cb, DWORD dwLockType)
{
ICOM_THIS(ISHFileStream, iface);
- TRACE("(%p,%ld,%ld,%ld)\n", This, libOffset.s.LowPart, cb.s.LowPart, dwLockType);
+ TRACE("(%p,%ld,%ld,%ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType);
return E_NOTIMPL;
}
@@ -293,8 +293,8 @@
else
lpStat->pwcsName = StrDupW(This->lpszPath);
lpStat->type = This->type;
- lpStat->cbSize.s.LowPart = fi.nFileSizeLow;
- lpStat->cbSize.s.HighPart = fi.nFileSizeHigh;
+ lpStat->cbSize.u.LowPart = fi.nFileSizeLow;
+ lpStat->cbSize.u.HighPart = fi.nFileSizeHigh;
lpStat->mtime = fi.ftLastWriteTime;
lpStat->ctime = fi.ftCreationTime;
lpStat->atime = fi.ftLastAccessTime;
Index: dlls/urlmon/umon.c
===================================================================
RCS file: /home/wine/wine/dlls/urlmon/umon.c,v
retrieving revision 1.25
diff -u -r1.25 umon.c
--- dlls/urlmon/umon.c 13 Dec 2003 00:03:30 -0000 1.25
+++ dlls/urlmon/umon.c 21 Jan 2004 11:53:15 -0000
@@ -498,7 +498,7 @@
TRACE("res = %ld gle = %08lx url len = %ld\n", hres, GetLastError(), len);
- last_read_pos.s.LowPart = last_read_pos.s.HighPart = 0;
+ last_read_pos.u.LowPart = last_read_pos.u.HighPart = 0;
fmt.cfFormat = 0;
fmt.ptd = NULL;
fmt.dwAspect = 0;
@@ -525,7 +525,7 @@
(total_read == bufread) ? BSCF_FIRSTDATANOTIFICATION :
BSCF_INTERMEDIATEDATANOTIFICATION,
total_read, &fmt, &stg);
- last_read_pos.s.LowPart += bufread; /* FIXME */
+ last_read_pos.u.LowPart += bufread; /* FIXME */
} else
break;
}
Index: dlls/winedos/int2f.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/int2f.c,v
retrieving revision 1.5
diff -u -r1.5 int2f.c
--- dlls/winedos/int2f.c 22 Sep 2003 19:33:07 -0000 1.5
+++ dlls/winedos/int2f.c 21 Jan 2004 11:53:15 -0000
@@ -806,8 +806,8 @@
break;
case 1:
/* FIXME: computation is wrong */
- rri.DiskOffset.s.HighPart = 0;
- rri.DiskOffset.s.LowPart = at << 11;
+ rri.DiskOffset.u.HighPart = 0;
+ rri.DiskOffset.u.LowPart = at << 11;
rri.TrackMode = YellowMode2;
rri.SectorCount = num;
DeviceIoControl(h, IOCTL_CDROM_RAW_READ, &rri, sizeof(rri),
Index: dlls/winedos/vga.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/vga.c,v
retrieving revision 1.42
diff -u -r1.42 vga.c
--- dlls/winedos/vga.c 9 Oct 2003 19:49:05 -0000 1.42
+++ dlls/winedos/vga.c 21 Jan 2004 11:53:15 -0000
@@ -289,7 +289,7 @@
{
LARGE_INTEGER when;
- when.s.LowPart = when.s.HighPart = 0;
+ when.u.LowPart = when.u.HighPart = 0;
SetWaitableTimer( VGA_timer, &when, arg, VGA_Poll, 0, FALSE );
}
Index: dlls/winedos/vxd.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/vxd.c,v
retrieving revision 1.5
diff -u -r1.5 vxd.c
--- dlls/winedos/vxd.c 25 Nov 2003 00:42:27 -0000 1.5
+++ dlls/winedos/vxd.c 21 Jan 2004 11:53:15 -0000
@@ -1126,8 +1126,8 @@
TRACE("NtCreateSection: name=%s\n", atom? name : NULL);
result = CreateFileMappingA(hFile, NULL, protect,
- size? size->s.HighPart : 0,
- size? size->s.LowPart : 0,
+ size? size->u.HighPart : 0,
+ size? size->u.LowPart : 0,
atom? name : NULL);
}
@@ -1289,12 +1289,12 @@
InheritDisposition, AllocationType, Protect);
TRACE("NtMapViewOfSection: "
"base=%lx, offset=%lx, size=%lx, access=%lx\n",
- (DWORD)address, SectionOffset? SectionOffset->s.LowPart : 0,
+ (DWORD)address, SectionOffset? SectionOffset->u.LowPart : 0,
ViewSize? *ViewSize : 0, access);
result = (DWORD)MapViewOfFileEx(SectionHandle, access,
- SectionOffset? SectionOffset->s.HighPart : 0,
- SectionOffset? SectionOffset->s.LowPart : 0,
+ SectionOffset? SectionOffset->u.HighPart : 0,
+ SectionOffset? SectionOffset->u.LowPart : 0,
ViewSize? *ViewSize : 0, address);
TRACE("NtMapViewOfSection: result=%lx\n", result);
Index: files/dos_fs.c
===================================================================
RCS file: /home/wine/wine/files/dos_fs.c,v
retrieving revision 1.147
diff -u -r1.147 dos_fs.c
--- files/dos_fs.c 20 Jan 2004 01:40:23 -0000 1.147
+++ files/dos_fs.c 21 Jan 2004 11:53:15 -0000
@@ -1668,8 +1668,8 @@
time_t unixtime;
struct tm* tm;
- li.s.LowPart = ft->dwLowDateTime;
- li.s.HighPart = ft->dwHighDateTime;
+ li.u.LowPart = ft->dwLowDateTime;
+ li.u.HighPart = ft->dwHighDateTime;
RtlTimeToSecondsSince1970( &li, &t );
unixtime = t;
tm = gmtime( &unixtime );
Index: files/drive.c
===================================================================
RCS file: /home/wine/wine/files/drive.c,v
retrieving revision 1.104
diff -u -r1.104 drive.c
--- files/drive.c 25 Nov 2003 01:51:07 -0000 1.104
+++ files/drive.c 21 Jan 2004 11:53:15 -0000
@@ -1552,31 +1552,31 @@
if (!DRIVE_GetFreeSpace(drive, &size, &available)) return FALSE;
/* Cap the size and available at 2GB as per specs. */
- if ((size.s.HighPart) ||(size.s.LowPart > 0x7fffffff))
+ if ((size.u.HighPart) ||(size.u.LowPart > 0x7fffffff))
{
- size.s.HighPart = 0;
- size.s.LowPart = 0x7fffffff;
+ size.u.HighPart = 0;
+ size.u.LowPart = 0x7fffffff;
}
- if ((available.s.HighPart) ||(available.s.LowPart > 0x7fffffff))
+ if ((available.u.HighPart) ||(available.u.LowPart > 0x7fffffff))
{
- available.s.HighPart =0;
- available.s.LowPart = 0x7fffffff;
+ available.u.HighPart =0;
+ available.u.LowPart = 0x7fffffff;
}
sec_size = (DRIVE_GetType(drive)==DRIVE_CDROM) ? 2048 : 512;
- size.s.LowPart /= sec_size;
- available.s.LowPart /= sec_size;
+ size.u.LowPart /= sec_size;
+ available.u.LowPart /= sec_size;
/* FIXME: probably have to adjust those variables too for CDFS */
cluster_sec = 1;
- while (cluster_sec * 65536 < size.s.LowPart) cluster_sec *= 2;
+ while (cluster_sec * 65536 < size.u.LowPart) cluster_sec *= 2;
if (cluster_sectors)
*cluster_sectors = cluster_sec;
if (sector_bytes)
*sector_bytes = sec_size;
if (free_clusters)
- *free_clusters = available.s.LowPart / cluster_sec;
+ *free_clusters = available.u.LowPart / cluster_sec;
if (total_clusters)
- *total_clusters = size.s.LowPart / cluster_sec;
+ *total_clusters = size.u.LowPart / cluster_sec;
return TRUE;
}
@@ -1648,14 +1648,14 @@
if (total)
{
- total->s.HighPart = size.s.HighPart;
- total->s.LowPart = size.s.LowPart;
+ total->u.HighPart = size.u.HighPart;
+ total->u.LowPart = size.u.LowPart;
}
if (totalfree)
{
- totalfree->s.HighPart = available.s.HighPart;
- totalfree->s.LowPart = available.s.LowPart;
+ totalfree->u.HighPart = available.u.HighPart;
+ totalfree->u.LowPart = available.u.LowPart;
}
if (avail)
@@ -1679,8 +1679,8 @@
/* Quick hack, should eventually be fixed to work 100% with
Windows2000 (see comment above). */
- avail->s.HighPart = available.s.HighPart;
- avail->s.LowPart = available.s.LowPart;
+ avail->u.HighPart = available.u.HighPart;
+ avail->u.LowPart = available.u.LowPart;
}
return TRUE;
Index: files/file.c
===================================================================
RCS file: /home/wine/wine/files/file.c,v
retrieving revision 1.200
diff -u -r1.200 file.c
--- files/file.c 16 Jan 2004 04:49:13 -0000 1.200
+++ files/file.c 21 Jan 2004 11:53:15 -0000
@@ -1189,8 +1189,8 @@
return FALSE;
}
- offset.s.LowPart = overlapped->Offset;
- offset.s.HighPart = overlapped->OffsetHigh;
+ offset.u.LowPart = overlapped->Offset;
+ offset.u.HighPart = overlapped->OffsetHigh;
io_status = (PIO_STATUS_BLOCK)overlapped;
io_status->u.Status = STATUS_PENDING;
@@ -1234,8 +1234,8 @@
if (overlapped != NULL)
{
- offset.s.LowPart = overlapped->Offset;
- offset.s.HighPart = overlapped->OffsetHigh;
+ offset.u.LowPart = overlapped->Offset;
+ offset.u.HighPart = overlapped->OffsetHigh;
poffset = &offset;
hEvent = overlapped->hEvent;
io_status = (PIO_STATUS_BLOCK)overlapped;
@@ -1276,8 +1276,8 @@
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
- offset.s.LowPart = overlapped->Offset;
- offset.s.HighPart = overlapped->OffsetHigh;
+ offset.u.LowPart = overlapped->Offset;
+ offset.u.HighPart = overlapped->OffsetHigh;
io_status = (PIO_STATUS_BLOCK)overlapped;
io_status->u.Status = STATUS_PENDING;
@@ -1316,8 +1316,8 @@
if (overlapped)
{
- offset.s.LowPart = overlapped->Offset;
- offset.s.HighPart = overlapped->OffsetHigh;
+ offset.u.LowPart = overlapped->Offset;
+ offset.u.HighPart = overlapped->OffsetHigh;
poffset = &offset;
hEvent = overlapped->hEvent;
piosb = (PIO_STATUS_BLOCK)overlapped;
Index: include/objbase.h
===================================================================
RCS file: /home/wine/wine/include/objbase.h,v
retrieving revision 1.35
diff -u -r1.35 objbase.h
--- include/objbase.h 14 Oct 2003 20:23:01 -0000 1.35
+++ include/objbase.h 21 Jan 2004 11:53:15 -0000
@@ -322,8 +322,8 @@
#define LISet32(li, v) ((li).HighPart = (v) < 0 ? -1 : 0, (li).LowPart = (v))
#define ULISet32(li, v) ((li).HighPart = 0, (li).LowPart = (v))
#else
-#define LISet32(li, v) ((li).s.HighPart = (v) < 0 ? -1 : 0, (li).s.LowPart = (v))
-#define ULISet32(li, v) ((li).s.HighPart = 0, (li).s.LowPart = (v))
+#define LISet32(li, v) ((li).u.HighPart = (v) < 0 ? -1 : 0, (li).u.LowPart = (v))
+#define ULISet32(li, v) ((li).u.HighPart = 0, (li).u.LowPart = (v))
#endif
/*****************************************************************************
Index: include/winnt.h
===================================================================
RCS file: /home/wine/wine/include/winnt.h,v
retrieving revision 1.177
diff -u -r1.177 winnt.h
--- include/winnt.h 9 Jan 2004 22:18:49 -0000 1.177
+++ include/winnt.h 21 Jan 2004 11:53:16 -0000
@@ -2918,7 +2918,18 @@
DWORD LowPart;
LONG HighPart;
#endif
- } DUMMYSTRUCTNAME;
+ } u;
+#if ! defined(NONAMELESSSTRUCT) || defined(__cplusplus)
+ struct {
+#ifdef WORDS_BIGENDIAN
+ LONG HighPart;
+ DWORD LowPart;
+#else
+ DWORD LowPart;
+ LONG HighPart;
+#endif
+ };
+#endif
LONGLONG QuadPart;
} LARGE_INTEGER, *PLARGE_INTEGER;
@@ -2931,7 +2942,18 @@
DWORD LowPart;
DWORD HighPart;
#endif
- } DUMMYSTRUCTNAME;
+ } u;
+#if ! defined(NONAMELESSSTRUCT) || defined(__cplusplus)
+ struct {
+#ifdef WORDS_BIGENDIAN
+ DWORD HighPart;
+ DWORD LowPart;
+#else
+ DWORD LowPart;
+ DWORD HighPart;
+#endif
+ };
+#endif
ULONGLONG QuadPart;
} ULARGE_INTEGER, *PULARGE_INTEGER;
Index: misc/registry.c
===================================================================
RCS file: /home/wine/wine/misc/registry.c,v
retrieving revision 1.134
diff -u -r1.134 registry.c
--- misc/registry.c 21 Oct 2003 23:57:25 -0000 1.134
+++ misc/registry.c 21 Jan 2004 11:53:16 -0000
@@ -435,8 +435,8 @@
/* read text */
txt = _xmalloc(head.textsize);
- fpi.CurrentByteOffset.s.LowPart = head.textoff;
- fpi.CurrentByteOffset.s.HighPart = 0;
+ fpi.CurrentByteOffset.u.LowPart = head.textoff;
+ fpi.CurrentByteOffset.u.HighPart = 0;
if (NtSetInformationFile(hf, &iosb, &fpi, sizeof(fpi),
FilePositionInformation) != STATUS_SUCCESS)
{
Index: programs/rpcss/rpcss_main.c
===================================================================
RCS file: /home/wine/wine/programs/rpcss/rpcss_main.c,v
retrieving revision 1.5
diff -u -r1.5 rpcss_main.c
--- programs/rpcss/rpcss_main.c 4 Jun 2003 20:29:05 -0000 1.5
+++ programs/rpcss/rpcss_main.c 21 Jan 2004 11:53:16 -0000
@@ -93,11 +93,11 @@
#if defined(NONAMELESSSTRUCT)
#define FILETIME_TO_ULARGEINT(filetime, ularge) \
- ( ularge.s.LowPart = filetime.dwLowDateTime, \
- ularge.s.HighPart = filetime.dwHighDateTime )
+ ( ularge.u.LowPart = filetime.dwLowDateTime, \
+ ularge.u.HighPart = filetime.dwHighDateTime )
#define ULARGEINT_TO_FILETIME(ularge, filetime) \
- ( filetime.dwLowDateTime = ularge.s.LowPart, \
- filetime.dwHighDateTime = ularge.s.HighPart )
+ ( filetime.dwLowDateTime = ularge.u.LowPart, \
+ filetime.dwHighDateTime = ularge.u.HighPart )
#else
#define FILETIME_TO_ULARGEINT(filetime, ularge) \
( ularge.LowPart = filetime.dwLowDateTime, \
Index: programs/wcmd/directory.c
===================================================================
RCS file: /home/wine/wine/programs/wcmd/directory.c,v
retrieving revision 1.18
diff -u -r1.18 directory.c
--- programs/wcmd/directory.c 16 Oct 2003 19:12:49 -0000 1.18
+++ programs/wcmd/directory.c 21 Jan 2004 11:53:16 -0000
@@ -231,8 +231,8 @@
file_size.LowPart = (fd+i)->nFileSizeLow;
file_size.HighPart = (fd+i)->nFileSizeHigh;
#else
- file_size.s.LowPart = (fd+i)->nFileSizeLow;
- file_size.s.HighPart = (fd+i)->nFileSizeHigh;
+ file_size.u.LowPart = (fd+i)->nFileSizeLow;
+ file_size.u.HighPart = (fd+i)->nFileSizeHigh;
#endif
byte_count.QuadPart += file_size.QuadPart;
}
@@ -264,8 +264,8 @@
file_size.LowPart = (fd+i)->nFileSizeLow;
file_size.HighPart = (fd+i)->nFileSizeHigh;
#else
- file_size.s.LowPart = (fd+i)->nFileSizeLow;
- file_size.s.HighPart = (fd+i)->nFileSizeHigh;
+ file_size.u.LowPart = (fd+i)->nFileSizeLow;
+ file_size.u.HighPart = (fd+i)->nFileSizeHigh;
#endif
byte_count.QuadPart += file_size.QuadPart;
if (!bare) {
More information about the wine-patches
mailing list