May 2007 - Wine-Commits - list.winehq.org

Andrew Talbot : dsound: Exclude unused headers.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: 1e4c97175ec0863f44f39e36bdaa4d57e776d554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e4c97175ec0863f44f39e36b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 2 21:23:43 2007 +0100 dsound: Exclude unused headers. --- dlls/dsound/buffer.c | 1 - dlls/dsound/capture.c | 1 - dlls/dsound/dsound.c | 1 - dlls/dsound/duplex.c | 2 -- dlls/dsound/mixer.c | 1 - dlls/dsound/primary.c | 1 - dlls/dsound/propset.c | 1 - dlls/dsound/sound3d.c | 1 - 8 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 3f75037..252fbc8 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -27,7 +27,6 @@ #include "winbase.h" #include "winuser.h" #include "mmsystem.h" -#include "winreg.h" #include "winternl.h" #include "wine/debug.h" #include "dsound.h" diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 240138f..34c36dd 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -34,7 +34,6 @@ #include "winuser.h" #include "mmsystem.h" #include "mmddk.h" -#include "winreg.h" #include "winternl.h" #include "winnls.h" #include "wine/debug.h" diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index b10a8d3..fbcc798 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -28,7 +28,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winreg.h" #include "mmsystem.h" #include "winternl.h" #include "mmddk.h" diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 26fd28c..c61432d 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -29,9 +29,7 @@ #include "winuser.h" #include "mmsystem.h" #include "mmddk.h" -#include "winreg.h" #include "winternl.h" -#include "winnls.h" #include "wine/debug.h" #include "dsound.h" #include "dsdriver.h" diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index adbee9e..1388e6f 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -29,7 +29,6 @@ #include "winbase.h" #include "winuser.h" #include "mmsystem.h" -#include "winreg.h" #include "winternl.h" #include "wine/debug.h" #include "dsound.h" diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 0725bd2..46314cd 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -27,7 +27,6 @@ #include "winbase.h" #include "winuser.h" #include "mmsystem.h" -#include "winreg.h" #include "winternl.h" #include "mmddk.h" #include "wine/debug.h" diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index b83ae37..7773293 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -26,7 +26,6 @@ #include "winbase.h" #include "winuser.h" #include "mmsystem.h" -#include "winreg.h" #include "winternl.h" #include "winnls.h" #include "vfwmsgs.h" diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 6145cff..2ee050d 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -46,7 +46,6 @@ #include "winbase.h" #include "winuser.h" #include "mmsystem.h" -#include "winreg.h" #include "winternl.h" #include "mmddk.h" #include "wine/debug.h"

1 0

Andrew Talbot : ifsmgr.vxd: Constify some variables.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: 2d50aa364415ddf54057d2f65ac8ac5e15851624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d50aa364415ddf54057d2f65… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 2 21:24:22 2007 +0100 ifsmgr.vxd: Constify some variables. --- dlls/ifsmgr.vxd/ifsmgr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ifsmgr.vxd/ifsmgr.c b/dlls/ifsmgr.vxd/ifsmgr.c index 3086039..499507f 100644 --- a/dlls/ifsmgr.vxd/ifsmgr.c +++ b/dlls/ifsmgr.vxd/ifsmgr.c @@ -60,7 +60,7 @@ struct win32apireq { unsigned short ar_pad; }; -static void win32apieq_2_CONTEXT(struct win32apireq *pIn,CONTEXT86 *pCxt) +static void win32apieq_2_CONTEXT(const struct win32apireq *pIn, CONTEXT86 *pCxt) { memset(pCxt,0,sizeof(*pCxt)); @@ -80,7 +80,7 @@ static void win32apieq_2_CONTEXT(struct win32apireq *pIn,CONTEXT86 *pCxt) /* FIXME: pIn->ar_pad ignored */ } -static void CONTEXT_2_win32apieq(CONTEXT86 *pCxt,struct win32apireq *pOut) +static void CONTEXT_2_win32apieq(const CONTEXT86 *pCxt, struct win32apireq *pOut) { memset(pOut,0,sizeof(struct win32apireq));

1 0

Andrew Talbot : dpnet: Exclude unused headers.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: 57459dc51840d358c55dbf1c7f6e4f5762f93f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57459dc51840d358c55dbf1c7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 2 21:23:32 2007 +0100 dpnet: Exclude unused headers. --- dlls/dpnet/address.c | 1 - dlls/dpnet/client.c | 1 - dlls/dpnet/dpnet_main.c | 1 - dlls/dpnet/peer.c | 1 - dlls/dpnet/server.c | 1 - 5 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 01708bd..0e45b80 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -28,7 +28,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" #include "objbase.h" #include "wine/debug.h" diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index c630715..89e87e6 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -28,7 +28,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" #include "objbase.h" #include "wine/debug.h" diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 36bfc71..44788d4 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -27,7 +27,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" #include "objbase.h" #include "wine/debug.h" diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index de131af..cb4b638 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -27,7 +27,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" #include "objbase.h" #include "wine/debug.h" diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index d6cc211..085b15f 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -27,7 +27,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" #include "objbase.h" #include "wine/debug.h"

1 0

Huw Davies : ole32: Cope with a realloc returning a different pointer.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: 962d8b60113a4b66ce81202645178928c9f0bd8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=962d8b60113a4b66ce8120264… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 2 16:48:22 2007 +0100 ole32: Cope with a realloc returning a different pointer. --- dlls/ole32/ifs.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 37ef44e..bd8f483 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -56,7 +56,7 @@ typedef struct { DWORD SpyedAllocationsLeft; /* number of spyed allocations left */ BOOL SpyReleasePending; /* CoRevokeMallocSpy called with spyed allocations left*/ LPVOID * SpyedBlocks; /* root of the table */ - int SpyedBlockTableLength; /* size of the table*/ + DWORD SpyedBlockTableLength;/* size of the table*/ } _Malloc32; /* this is the static object instance */ @@ -73,7 +73,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION IMalloc32_SpyCS = { &critsect_debug, -1, 0, 0, 0, 0 }; /* resize the old table */ -static int SetSpyedBlockTableLength ( int NewLength ) +static int SetSpyedBlockTableLength ( DWORD NewLength ) { LPVOID *NewSpyedBlocks; @@ -103,7 +103,9 @@ static int AddMemoryLocation(LPVOID * pMem) Current++; if (Current >= Malloc32.SpyedBlocks + Malloc32.SpyedBlockTableLength) { /* no more space in table, grow it */ + DWORD old_length = Malloc32.SpyedBlockTableLength; if (!SetSpyedBlockTableLength( Malloc32.SpyedBlockTableLength + 0x1000 )) return 0; + Current = Malloc32.SpyedBlocks + old_length; } };

1 0

Andrew Talbot : dnsapi: Exclude unused header.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: 54f844bffc3c717a0069e7469fb4f1a46c257655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f844bffc3c717a0069e7469… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 2 21:24:00 2007 +0100 dnsapi: Exclude unused header. --- dlls/dnsapi/record.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index eaba46a..d8941fd 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -38,7 +38,6 @@ #include "windef.h" #include "winbase.h" -#include "winerror.h" #include "winnls.h" #include "windns.h"

1 0

Andrew Talbot : imaadp32.acm: Constify some variables.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: cb66a66f16d43c414aacf18a28f5a3948149c000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb66a66f16d43c414aacf18a2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 2 21:24:31 2007 +0100 imaadp32.acm: Constify some variables. --- dlls/imaadp32.acm/imaadp32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index ca788e7..e5b1544 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -93,7 +93,7 @@ static const Format ADPCM_Formats[] = /*********************************************************************** * ADPCM_GetFormatIndex */ -static DWORD ADPCM_GetFormatIndex(LPWAVEFORMATEX wfx) +static DWORD ADPCM_GetFormatIndex(const WAVEFORMATEX *wfx) { int i, hi; const Format* fmts; @@ -773,7 +773,7 @@ static LRESULT ADPCM_StreamClose(PACMDRVSTREAMINSTANCE adsi) * ADPCM_StreamSize * */ -static LRESULT ADPCM_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE adss) +static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSIZE adss) { switch (adss->fdwSize) {

1 0

Andrew Talbot : kernel32: Constify a variable.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: a22c7a6c3480ae8aff6d2be21082e4c22fc0f76b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22c7a6c3480ae8aff6d2be21… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 2 21:24:46 2007 +0100 kernel32: Constify a variable. --- dlls/kernel32/heap.c | 2 +- dlls/ntdll/heap.c | 4 ++-- include/winbase.h | 2 +- include/winternl.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index dfaf69a..610cff0 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -287,7 +287,7 @@ LPVOID WINAPI HeapReAlloc( HANDLE heap, DWORD flags, LPVOID ptr, SIZE_T size ) return RtlReAllocateHeap( heap, flags, ptr, size ); } -SIZE_T WINAPI HeapSize( HANDLE heap, DWORD flags, LPVOID ptr ) +SIZE_T WINAPI HeapSize( HANDLE heap, DWORD flags, LPCVOID ptr ) { return RtlSizeHeap( heap, flags, ptr ); } diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 25aefd9..571dd23 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1511,7 +1511,7 @@ BOOLEAN WINAPI RtlUnlockHeap( HANDLE heap ) * NOTES * The size may be bigger than what was passed to RtlAllocateHeap(). */ -SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, PVOID ptr ) +SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr ) { SIZE_T ret; HEAP *heapPtr = HEAP_GetPtr( heap ); @@ -1531,7 +1531,7 @@ SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, PVOID ptr ) } else { - ARENA_INUSE *pArena = (ARENA_INUSE *)ptr - 1; + const ARENA_INUSE *pArena = (const ARENA_INUSE *)ptr - 1; ret = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes; } if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection ); diff --git a/include/winbase.h b/include/winbase.h index da9c547..c45fbf1 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1742,7 +1742,7 @@ BOOL WINAPI HeapLock(HANDLE); LPVOID WINAPI HeapReAlloc(HANDLE,DWORD,LPVOID,SIZE_T); BOOL WINAPI HeapQueryInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T); BOOL WINAPI HeapSetInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T); -SIZE_T WINAPI HeapSize(HANDLE,DWORD,LPVOID); +SIZE_T WINAPI HeapSize(HANDLE,DWORD,LPCVOID); BOOL WINAPI HeapUnlock(HANDLE); BOOL WINAPI HeapValidate(HANDLE,DWORD,LPCVOID); BOOL WINAPI HeapWalk(HANDLE,LPPROCESS_HEAP_ENTRY); diff --git a/include/winternl.h b/include/winternl.h index 1dc6011..fa3696f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2193,7 +2193,7 @@ void WINAPI RtlSetLastWin32Error(DWORD); void WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus(NTSTATUS); NTSTATUS WINAPI RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN); NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); -SIZE_T WINAPI RtlSizeHeap(HANDLE,ULONG,PVOID); +SIZE_T WINAPI RtlSizeHeap(HANDLE,ULONG,const void*); NTSTATUS WINAPI RtlStringFromGUID(REFGUID,PUNICODE_STRING); LPDWORD WINAPI RtlSubAuthoritySid(PSID,DWORD); LPBYTE WINAPI RtlSubAuthorityCountSid(PSID);

1 0

Andrew Talbot : dxerr8: Exclude unused header.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: e6903fa7bfbc7e2078f5673ca5d95adc9c5d1903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6903fa7bfbc7e2078f5673ca… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 2 21:23:54 2007 +0100 dxerr8: Exclude unused header. --- dlls/dxerr8/dxerr8.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dxerr8/dxerr8.c b/dlls/dxerr8/dxerr8.c index 9a0160d..9207ae2 100644 --- a/dlls/dxerr8/dxerr8.c +++ b/dlls/dxerr8/dxerr8.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" #include "mmsystem.h" #include "dsound.h"

1 0

Andrew Talbot : dxerr9: Exclude unused header.
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: e9924fe3173bd7ead1d0d7fe6096df9129a8a23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9924fe3173bd7ead1d0d7fe6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 2 21:24:10 2007 +0100 dxerr9: Exclude unused header. --- dlls/dxerr9/dxerr9.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dxerr9/dxerr9.c b/dlls/dxerr9/dxerr9.c index ff2a5c4..63822d2 100644 --- a/dlls/dxerr9/dxerr9.c +++ b/dlls/dxerr9/dxerr9.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" #include "mmsystem.h" #include "dmerror.h"

1 0

Aric Stewart : gdi32: GetGlyphOutline needs to look at linked fonts as well .
by Alexandre Julliard May 3, 2007

May 3, 2007

Module: wine Branch: master Commit: ec9f7550865f6d4bd2629016452bc3085cbf9d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9f7550865f6d4bd26290164… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 2 11:15:12 2007 -0500 gdi32: GetGlyphOutline needs to look at linked fonts as well. --- dlls/gdi32/freetype.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index caadf4b..d3ca23b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -439,6 +439,7 @@ static BOOL have_installed_roman_font = FALSE; /* CreateFontInstance will fail i static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_','\0'}; +static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph); /**************************************** * Notes on .fon files @@ -3354,12 +3355,13 @@ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, * question rather than an HDC. * */ -DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format, +DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, LPGLYPHMETRICS lpgm, DWORD buflen, LPVOID buf, const MAT2* lpmat) { static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; - FT_Face ft_face = font->ft_face; + FT_Face ft_face = incoming_font->ft_face; + GdiFont *font = incoming_font; FT_UInt glyph_index; DWORD width, height, pitch, needed = 0; FT_Bitmap ft_bitmap; @@ -3378,8 +3380,10 @@ DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format, if(format & GGO_GLYPH_INDEX) { glyph_index = glyph; format &= ~GGO_GLYPH_INDEX; - } else - glyph_index = get_glyph_index(font, glyph); + } else { + get_glyph_index_linked(incoming_font, glyph, &font, &glyph_index); + ft_face = font->ft_face; + } if(glyph_index >= font->gmsize) { font->gmsize = (glyph_index / INIT_GM_SIZE + 1) * INIT_GM_SIZE;

1 0