July 2008 - Wine-Commits - list.winehq.org

Alexander Nicolaysen Sørnes : regedit: Use strchrW instead of custom code in Unicode file import.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: e83d8dad0459abdddf6ff32c11ea39a4c83ed543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e83d8dad0459abdddf6ff32c1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 11 02:54:04 2008 +0200 regedit: Use strchrW instead of custom code in Unicode file import. --- programs/regedit/regproc.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 2f8b826..4721bf3 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -707,7 +707,6 @@ void processRegLinesW(FILE *in) size_t check = -1; WCHAR* s; /* The pointer into line for where the current fgets should read */ - int i; buf = HeapAlloc(GetProcessHeap(), 0, lineSize * sizeof(WCHAR)); CHECK_ENOUGH_MEMORY(buf); @@ -761,14 +760,7 @@ void processRegLinesW(FILE *in) /* If we didn't read the eol nor the eof go around for the rest */ while(1) { - for(i = 0; s[i] != 0; i++) - { - if(s[i] == '\n') - { - s_eol = &s[i]; - break; - } - } + s_eol = strchrW(s, '\n'); /* If it is a comment line then discard it and go around again */ if (buf[0] == '#') {

1 0

Andrew Talbot : oleaut32: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: 3ac0983ab428341cdd9beb6616e533323ec51b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac0983ab428341cdd9beb661… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jul 11 10:41:47 2008 +0100 oleaut32: Remove unneeded address-of operators from array names. --- dlls/oleaut32/olepicture.c | 6 +++--- dlls/oleaut32/typelib.c | 2 +- dlls/oleaut32/typelib2.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index cad5b7b..ea0297f 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1845,7 +1845,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { TRACE("Reading all data from stream.\n"); xbuf = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, origsize); if (headerisdata) - memcpy (xbuf, &header, 8); + memcpy (xbuf, header, 8); while (1) { while (xread < origsize) { hr = IStream_Read(pStm,xbuf+xread,origsize-xread,&nread); @@ -1871,7 +1871,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { xbuf = This->data = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, This->datalen); if (headerisdata) - memcpy (xbuf, &header, 8); + memcpy (xbuf, header, 8); while (xread < This->datalen) { ULONG nread; @@ -1927,7 +1927,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { FIXME("Unknown magic %04x, %d read bytes:\n",magic,xread); hr=E_FAIL; for (i=0;i<xread+8;i++) { - if (i<8) MESSAGE("%02x ",((unsigned char*)&header)[i]); + if (i<8) MESSAGE("%02x ",((unsigned char*)header)[i]); else MESSAGE("%02x ",xbuf[i-8]); if (i % 10 == 9) MESSAGE("\n"); } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index bbdae10..472ab8d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2989,7 +2989,7 @@ static sltg_ref_lookup_t *SLTG_DoRefs(SLTG_RefInfo *pRef, ITypeLibImpl *pTL, FIXME("Ref magic = %x\n", pRef->magic); return NULL; } - name = ( (char*)(&pRef->names) + pRef->number); + name = ( (char*)pRef->names + pRef->number); table = HeapAlloc(GetProcessHeap(), 0, sizeof(*table) + ((pRef->number >> 3) - 1) * sizeof(table->refs[0])); table->num = pRef->number >> 3; diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 7b14b4f..cbcd7f0 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -728,7 +728,7 @@ static int ctl2_alloc_importfile( importfile->guid = guidoffset; importfile->lcid = This->typelib_header.lcid2; importfile->version = major_version | (minor_version << 16); - memcpy(&importfile->filename, encoded_string, length); + memcpy(importfile->filename, encoded_string, length); return offset; } @@ -3336,7 +3336,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 * iface) if (This->typelib_header.varflags & HELPDLLFLAG) if (!ctl2_write_chunk(hFile, &This->helpStringDll, sizeof(This->helpStringDll))) return retval; if (!ctl2_write_chunk(hFile, This->typelib_typeinfo_offsets, This->typelib_header.nrtypeinfos * 4)) return retval; - if (!ctl2_write_chunk(hFile, &This->typelib_segdir, sizeof(This->typelib_segdir))) return retval; + if (!ctl2_write_chunk(hFile, This->typelib_segdir, sizeof(This->typelib_segdir))) return retval; if (!ctl2_write_segment(This, hFile, MSFT_SEG_TYPEINFO )) return retval; if (!ctl2_write_segment(This, hFile, MSFT_SEG_GUIDHASH )) return retval; if (!ctl2_write_segment(This, hFile, MSFT_SEG_GUID )) return retval;

1 0

Andrew Talbot : ole32: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: 749184a1e8a0edb9d9e4bf15aa8bffabd6c56816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=749184a1e8a0edb9d9e4bf15a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jul 11 10:41:44 2008 +0100 ole32: Remove unneeded address-of operators from array names. --- dlls/ole32/moniker.c | 10 +++++----- dlls/ole32/rpc.c | 2 +- dlls/ole32/stg_prop.c | 2 +- dlls/ole32/storage32.c | 4 ++-- dlls/ole32/stubmanager.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 65e0091..4e56462 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -464,7 +464,7 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD grfFlags, const void *pv = GlobalLock(hglobal); rot_entry->object = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MInterfacePointer, abData[size])); rot_entry->object->ulCntData = size; - memcpy(&rot_entry->object->abData, pv, size); + memcpy(rot_entry->object->abData, pv, size); GlobalUnlock(hglobal); } } @@ -530,7 +530,7 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD grfFlags, const void *pv = GlobalLock(hglobal); moniker = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[size])); moniker->ulCntData = size; - memcpy(&moniker->abData, pv, size); + memcpy(moniker->abData, pv, size); GlobalUnlock(hglobal); } } @@ -642,7 +642,7 @@ RunningObjectTableImpl_IsRunning( IRunningObjectTable* iface, IMoniker *pmkObjec LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, const struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + !memcmp(moniker_data->abData, rot_entry->moniker_data->abData, moniker_data->ulCntData)) { hr = S_OK; break; @@ -714,7 +714,7 @@ RunningObjectTableImpl_GetObject( IRunningObjectTable* iface, LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + !memcmp(moniker_data->abData, rot_entry->moniker_data->abData, moniker_data->ulCntData)) { IStream *pStream; hr = create_stream_on_mip_ro(rot_entry->object, &pStream); @@ -860,7 +860,7 @@ RunningObjectTableImpl_GetTimeOfLastChange(IRunningObjectTable* iface, LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, const struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + !memcmp(moniker_data->abData, rot_entry->moniker_data->abData, moniker_data->ulCntData)) { *pfiletime = rot_entry->last_modified; hr = S_OK; diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index df1c100..b805dba 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1584,7 +1584,7 @@ HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) oxid_info->ipidRemUnknown.Data1 = 0xffffffff; oxid_info->ipidRemUnknown.Data2 = 0xffff; oxid_info->ipidRemUnknown.Data3 = 0xffff; - memcpy(&oxid_info->ipidRemUnknown.Data4, &oxid, sizeof(OXID)); + memcpy(oxid_info->ipidRemUnknown.Data4, &oxid, sizeof(OXID)); oxid_info->psa = NULL /* FIXME */; return S_OK; diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index d9dafe6..747cf9f 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1717,7 +1717,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, len = var->u.pclipdata->cbSize; StorageUtl_WriteDWord((LPBYTE)&cf_hdr[0], 0, len + 8); StorageUtl_WriteDWord((LPBYTE)&cf_hdr[1], 0, var->u.pclipdata->ulClipFmt); - hr = IStream_Write(This->stm, &cf_hdr, sizeof(cf_hdr), &count); + hr = IStream_Write(This->stm, cf_hdr, sizeof(cf_hdr), &count); if (FAILED(hr)) goto end; hr = IStream_Write(This->stm, &var->u.pclipdata->pClipData, len, &count); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a64e595..7d79a39 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7237,8 +7237,8 @@ HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName /* Initialize the CompObj structure */ memset(&IStorageCompObj, 0, sizeof(IStorageCompObj)); - memcpy(&(IStorageCompObj.byUnknown1), pCompObjUnknown1, sizeof(pCompObjUnknown1)); - memcpy(&(IStorageCompObj.byUnknown2), pCompObjUnknown2, sizeof(pCompObjUnknown2)); + memcpy(IStorageCompObj.byUnknown1, pCompObjUnknown1, sizeof(pCompObjUnknown1)); + memcpy(IStorageCompObj.byUnknown2, pCompObjUnknown2, sizeof(pCompObjUnknown2)); /* Create a CompObj stream if it doesn't exist */ diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 8d7b382..9918fbc 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -84,7 +84,7 @@ struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) sm->oxid_info.ipidRemUnknown.Data2 = 0xffff; sm->oxid_info.ipidRemUnknown.Data3 = 0xffff; assert(sizeof(sm->oxid_info.ipidRemUnknown.Data4) == sizeof(apt->oxid)); - memcpy(&sm->oxid_info.ipidRemUnknown.Data4, &apt->oxid, sizeof(OXID)); + memcpy(sm->oxid_info.ipidRemUnknown.Data4, &apt->oxid, sizeof(OXID)); sm->oxid_info.dwAuthnHint = RPC_C_AUTHN_LEVEL_NONE; sm->oxid_info.psa = NULL /* FIXME */;

1 0

Andrew Talbot : ntdll: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: 741b65c200d3b075835eb277e31078595accbc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=741b65c200d3b075835eb277e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jul 11 10:41:42 2008 +0100 ntdll: Remove unneeded address-of operators from array names. --- dlls/ntdll/cdrom.c | 2 +- dlls/ntdll/heap.c | 2 +- dlls/ntdll/nt.c | 10 +++++----- dlls/ntdll/sec.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 47bda87..f6fed81 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -567,7 +567,7 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi { #ifdef SCSI_IOCTL_GET_IDLUN UINT32 idlun[2]; - if (ioctl(fd, SCSI_IOCTL_GET_IDLUN, &idlun) != -1) + if (ioctl(fd, SCSI_IOCTL_GET_IDLUN, idlun) != -1) { *port = (idlun[0] >> 24) & 0xff; *iface = ((idlun[0] >> 16) & 0xff) + 2; diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2b87e10..d57db49 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1106,7 +1106,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c processHeap = subheap->heap; /* assume the first heap we create is the process main heap */ list_init( &processHeap->entry ); /* make sure structure alignment is correct */ - assert( (ULONG_PTR)&processHeap->freeList % ALIGNMENT == 0 ); + assert( (ULONG_PTR)processHeap->freeList % ALIGNMENT == 0 ); } return (HANDLE)subheap->heap; diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c241e94..18b8309 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -170,11 +170,11 @@ NTSTATUS WINAPI NtAdjustPrivilegesToken( req->get_modified_state = (PreviousState != NULL); if (!DisableAllPrivileges) { - wine_server_add_data( req, &NewState->Privileges, + wine_server_add_data( req, NewState->Privileges, NewState->PrivilegeCount * sizeof(NewState->Privileges[0]) ); } if (PreviousState && BufferLength >= FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges )) - wine_server_set_reply( req, &PreviousState->Privileges, + wine_server_set_reply( req, PreviousState->Privileges, BufferLength - FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) ); ret = wine_server_call( req ); if (PreviousState) @@ -347,7 +347,7 @@ NTSTATUS WINAPI NtQueryInformationToken( TOKEN_PRIVILEGES *tpriv = tokeninfo; req->handle = token; if (tpriv && tokeninfolength > FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges )) - wine_server_set_reply( req, &tpriv->Privileges, tokeninfolength - FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) ); + wine_server_set_reply( req, tpriv->Privileges, tokeninfolength - FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) ); status = wine_server_call( req ); if (retlen) *retlen = FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) + reply->len; if (tpriv) tpriv->PrivilegeCount = reply->len / sizeof(LUID_AND_ATTRIBUTES); @@ -471,9 +471,9 @@ NTSTATUS WINAPI NtPrivilegeCheck( { req->handle = ClientToken; req->all_required = ((RequiredPrivileges->Control & PRIVILEGE_SET_ALL_NECESSARY) ? TRUE : FALSE); - wine_server_add_data( req, &RequiredPrivileges->Privilege, + wine_server_add_data( req, RequiredPrivileges->Privilege, RequiredPrivileges->PrivilegeCount * sizeof(RequiredPrivileges->Privilege[0]) ); - wine_server_set_reply( req, &RequiredPrivileges->Privilege, + wine_server_set_reply( req, RequiredPrivileges->Privilege, RequiredPrivileges->PrivilegeCount * sizeof(RequiredPrivileges->Privilege[0]) ); status = wine_server_call( req ); diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 7dad537..af3a138 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1577,7 +1577,7 @@ NtAccessCheck( wine_server_add_data( req, sacl, sd.sacl_len ); wine_server_add_data( req, dacl, sd.dacl_len ); - wine_server_set_reply( req, &PrivilegeSet->Privilege, *ReturnLength - FIELD_OFFSET( PRIVILEGE_SET, Privilege ) ); + wine_server_set_reply( req, PrivilegeSet->Privilege, *ReturnLength - FIELD_OFFSET( PRIVILEGE_SET, Privilege ) ); status = wine_server_call( req );

1 0

Andrew Talbot : localspl: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: 716e1486b4afc23824835ab61481780090955211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=716e1486b4afc23824835ab61… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jul 11 10:41:33 2008 +0100 localspl: Remove unneeded address-of operators from array names. --- dlls/localspl/localmon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index b29b844..ef35576 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -530,7 +530,7 @@ static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) if (!port) return FALSE; port->type = type; - memcpy(&port->nameW, pName, len); + memcpy(port->nameW, pName, len); *phPort = (HANDLE) port; EnterCriticalSection(&port_handles_cs); @@ -743,7 +743,7 @@ static BOOL WINAPI localmon_XcvOpenPort(LPCWSTR pName, ACCESS_MASK GrantedAccess xcv = heap_alloc( sizeof(xcv_t) + len); if (xcv) { xcv->GrantedAccess = GrantedAccess; - memcpy(&xcv->nameW, pName, len); + memcpy(xcv->nameW, pName, len); *phXcv = (HANDLE) xcv; EnterCriticalSection(&xcv_handles_cs); list_add_tail(&xcv_handles, &xcv->entry);

1 0

Andrew Talbot : msi: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: 0f75796a2849186efc6376e366612fc2de103445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f75796a2849186efc6376e36… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jul 11 10:41:39 2008 +0100 msi: Remove unneeded address-of operators from array names. --- dlls/msi/msi.c | 2 +- dlls/msi/suminfo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f903d05..0bd23fa 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2846,7 +2846,7 @@ UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions, MD5Final( &ctx ); UnmapViewOfFile( p ); - memcpy( pHash->dwData, &ctx.digest, sizeof pHash->dwData ); + memcpy( pHash->dwData, ctx.digest, sizeof pHash->dwData ); r = ERROR_SUCCESS; } CloseHandle( mapping ); diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 35dc652..5d73c57 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -443,7 +443,7 @@ MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount ) if( !si ) return si; - memset( &si->property, 0, sizeof si->property ); + memset( si->property, 0, sizeof si->property ); si->update_count = uiUpdateCount; IStorage_AddRef( stg ); si->storage = stg;

1 0

Andrew Talbot : mscms: Remove unneeded address-of operator from array name.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: da1a84f6e4e5937d71b3227b116c01d8b23aac9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1a84f6e4e5937d71b3227b1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jul 11 10:41:36 2008 +0100 mscms: Remove unneeded address-of operator from array name. --- dlls/mscms/icc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/icc.c b/dlls/mscms/icc.c index 3b0ec22..6297bff 100644 --- a/dlls/mscms/icc.c +++ b/dlls/mscms/icc.c @@ -73,7 +73,7 @@ DWORD MSCMS_get_tag_count( const icProfile *iccprofile ) void MSCMS_get_tag_by_index( icProfile *iccprofile, DWORD index, icTag *tag ) { - icTag *tmp = (icTag *)((char *)&iccprofile->data + index * sizeof(icTag)); + icTag *tmp = (icTag *)((char *)iccprofile->data + index * sizeof(icTag)); tag->sig = tmp->sig; tag->offset = tmp->offset;

1 0

Andrew Talbot : kernel32: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: dffba6aa4b0cd524e6606762825a0d24b6a2b70e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffba6aa4b0cd524e66067628… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jul 11 10:41:30 2008 +0100 kernel32: Remove unneeded address-of operators from array names. --- dlls/kernel32/instr.c | 2 +- dlls/kernel32/locale.c | 2 +- dlls/kernel32/relay16.c | 2 +- dlls/kernel32/task.c | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c index 3a9f335..5e28d95 100644 --- a/dlls/kernel32/instr.c +++ b/dlls/kernel32/instr.c @@ -709,7 +709,7 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) idt[1].LimitLow = 0x100; /* FIXME */ idt[2].LimitLow = 0x11E; /* FIXME */ idt[3].LimitLow = 0x500; /* FIXME */ - store_reg( context, instr[1], (BYTE *)&idt + offset, long_op ); + store_reg( context, instr[1], (BYTE *)idt + offset, long_op ); context->Eip += prefixlen + len + 1; return ExceptionContinueExecution; } diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 1130349..5fdb307 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3255,7 +3255,7 @@ BOOL WINAPI IsValidLanguageGroup(LGRPID lgrpid, DWORD dwFlags) sprintfW( szValueName, szFormat, lgrpid ); - if (NLS_RegGetDword( hKey, szValueName, (LPDWORD)&szValue )) + if (NLS_RegGetDword( hKey, szValueName, (LPDWORD)szValue )) { bSupported = TRUE; diff --git a/dlls/kernel32/relay16.c b/dlls/kernel32/relay16.c index 3712aec..e34eb36 100644 --- a/dlls/kernel32/relay16.c +++ b/dlls/kernel32/relay16.c @@ -277,7 +277,7 @@ static const CALLFROM16 *get_entry_point( STACK16FRAME *frame, LPSTR module, LPS /* Retrieve entry point call structure */ p = MapSL( MAKESEGPTR( frame->module_cs, frame->callfrom_ip ) ); /* p now points to lret, get the start of CALLFROM16 structure */ - return (CALLFROM16 *)(p - (BYTE *)&((CALLFROM16 *)0)->ret); + return (CALLFROM16 *)(p - FIELD_OFFSET( CALLFROM16, ret )); } diff --git a/dlls/kernel32/task.c b/dlls/kernel32/task.c index b2f1ae6..fcba2e9 100644 --- a/dlls/kernel32/task.c +++ b/dlls/kernel32/task.c @@ -196,7 +196,7 @@ static SEGPTR TASK_AllocThunk(void) if (!(pTask = TASK_GetCurrent())) return 0; sel = pTask->hCSAlias; - pThunk = (THUNKS *)&pTask->thunks; + pThunk = (THUNKS *)pTask->thunks; base = (char *)pThunk - (char *)pTask; while (!pThunk->free) { @@ -231,7 +231,7 @@ static BOOL TASK_FreeThunk( SEGPTR thunk ) if (!(pTask = TASK_GetCurrent())) return 0; sel = pTask->hCSAlias; - pThunk = (THUNKS *)&pTask->thunks; + pThunk = (THUNKS *)pTask->thunks; base = (char *)pThunk - (char *)pTask; while (sel && (sel != HIWORD(thunk))) { @@ -286,7 +286,7 @@ static TDB *TASK_Create( NE_MODULE *pModule, UINT16 cmdShow, LPCSTR cmdline, BYT /* Create the thunks block */ - TASK_CreateThunks( hTask, (char *)&pTask->thunks - (char *)pTask, 7 ); + TASK_CreateThunks( hTask, (char *)pTask->thunks - (char *)pTask, 7 ); /* Copy the module name */ @@ -315,7 +315,7 @@ static TDB *TASK_Create( NE_MODULE *pModule, UINT16 cmdShow, LPCSTR cmdline, BYT pTask->pdb.savedint23 = 0; pTask->pdb.savedint24 = 0; pTask->pdb.fileHandlesPtr = - MAKESEGPTR( GlobalHandleToSel16(pTask->hPDB), (int)&((PDB16 *)0)->fileHandles ); + MAKESEGPTR( GlobalHandleToSel16(pTask->hPDB), FIELD_OFFSET( PDB16, fileHandles )); pTask->pdb.hFileHandles = 0; memset( pTask->pdb.fileHandles, 0xff, sizeof(pTask->pdb.fileHandles) ); /* FIXME: should we make a copy of the environment? */ @@ -348,7 +348,7 @@ static TDB *TASK_Create( NE_MODULE *pModule, UINT16 cmdShow, LPCSTR cmdline, BYT /* Default DTA overwrites command line */ - pTask->dta = MAKESEGPTR( pTask->hPDB, (int)&pTask->pdb.cmdLine - (int)&pTask->pdb ); + pTask->dta = MAKESEGPTR( pTask->hPDB, FIELD_OFFSET( PDB16, cmdLine )); /* Create scheduler event for 16-bit tasks */

1 0

Andrew Talbot : hlink: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: 3427b94384fd47b5eae2c2fca7b1a967915f6368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3427b94384fd47b5eae2c2fca… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jul 10 23:08:59 2008 +0100 hlink: Remove unneeded address-of operators from array names. --- dlls/hlink/link.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index ca9f12c..ff34556 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -676,7 +676,7 @@ static HRESULT WINAPI IPersistStream_fnLoad(IPersistStream* iface, DWORD read; HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); - r = IStream_Read(pStm, &hdr, sizeof(hdr), &read); + r = IStream_Read(pStm, hdr, sizeof(hdr), &read); if (read != sizeof(hdr) || (hdr[0] != HLINK_SAVE_MAGIC)) { r = E_FAIL; @@ -749,7 +749,7 @@ static HRESULT WINAPI IPersistStream_fnSave(IPersistStream* iface, if (This->TargetFrameName) hdr[1] |= HLINK_SAVE_TARGET_FRAME_PRESENT; - IStream_Write(pStm, &hdr, sizeof(hdr), NULL); + IStream_Write(pStm, hdr, sizeof(hdr), NULL); if (This->TargetFrameName) {

1 0

Andrew Talbot : hhctrl.ocx: Remove unneeded address-of operator from array name.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: ab6d29eb5d9d2c59fcf51b7231bf1b2854423c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6d29eb5d9d2c59fcf51b723… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jul 10 23:08:56 2008 +0100 hhctrl.ocx: Remove unneeded address-of operator from array name. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index a2081ce..0e81a99 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -587,7 +587,7 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) heap_free(szBuf); } - SendMessageW(hToolbar, TB_ADDBUTTONSW, dwNumButtons, (LPARAM)&buttons); + SendMessageW(hToolbar, TB_ADDBUTTONSW, dwNumButtons, (LPARAM)buttons); SendMessageW(hToolbar, TB_AUTOSIZE, 0, 0); ShowWindow(hToolbar, SW_SHOW);

1 0