August 2007 - Wine-commits - list.winehq.org

Maarten Lankhorst : dsound: Add SndQueueMin to have less lock contention in mixer.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 575f34e5489660dc4e43ad17ba52daeb6d75beaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=575f34e5489660dc4e43ad17b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jul 30 16:12:29 2007 +0200 dsound: Add SndQueueMin to have less lock contention in mixer. --- dlls/dsound/dsound_main.c | 7 +++++++ dlls/dsound/dsound_private.h | 1 + dlls/dsound/mixer.c | 22 +++++++++++++++------- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 497fa15..2feb935 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -55,6 +55,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); #define DS_HEL_BUFLEN 0x8000 /* HEL: The buffer length of the emulated buffer */ #define DS_SND_QUEUE_MAX 10 /* max number of fragments to prebuffer, each fragment is approximately 10 ms long */ +#define DS_SND_QUEUE_MIN 6 /* If the minimum of prebuffered fragments go below this, forcibly take all locks to prevent underruns */ DirectSoundDevice* DSOUND_renderer[MAXWAVEDRIVERS]; GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; @@ -90,6 +91,7 @@ HRESULT mmErr(UINT err) int ds_emuldriver = 0; int ds_hel_buflen = DS_HEL_BUFLEN; int ds_snd_queue_max = DS_SND_QUEUE_MAX; +int ds_snd_queue_min = DS_SND_QUEUE_MIN; int ds_hw_accel = DS_HW_ACCEL_FULL; int ds_default_playback = 0; int ds_default_capture = 0; @@ -152,6 +154,9 @@ void setup_dsound_options(void) if (!get_config_key( hkey, appkey, "SndQueueMax", buffer, MAX_PATH )) ds_snd_queue_max = atoi(buffer); + if (!get_config_key( hkey, appkey, "SndQueueMin", buffer, MAX_PATH )) + ds_snd_queue_min = atoi(buffer); + if (!get_config_key( hkey, appkey, "HardwareAcceleration", buffer, MAX_PATH )) { if (strcmp(buffer, "Full") == 0) ds_hw_accel = DS_HW_ACCEL_FULL; @@ -184,6 +189,8 @@ void setup_dsound_options(void) WARN("ds_hel_buflen = %d (default=%d)\n",ds_hel_buflen ,DS_HEL_BUFLEN); if (ds_snd_queue_max != DS_SND_QUEUE_MAX) WARN("ds_snd_queue_max = %d (default=%d)\n",ds_snd_queue_max ,DS_SND_QUEUE_MAX); + if (ds_snd_queue_min != DS_SND_QUEUE_MIN) + WARN("ds_snd_queue_min = %d (default=%d)\n",ds_snd_queue_min ,DS_SND_QUEUE_MIN); if (ds_hw_accel != DS_HW_ACCEL_FULL) WARN("ds_hw_accel = %s (default=Full)\n", ds_hw_accel==DS_HW_ACCEL_FULL ? "Full" : diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 91ac107..61ff4a0 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -32,6 +32,7 @@ extern int ds_emuldriver; extern int ds_hel_buflen; extern int ds_snd_queue_max; +extern int ds_snd_queue_min; extern int ds_hw_accel; extern int ds_default_playback; extern int ds_default_capture; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 6390584..c9ede68 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -667,10 +667,10 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mi * For a DirectSoundDevice, go through all the currently playing buffers and * mix them in to the device buffer. * - * playpos = the current play position in the primary buffer * writepos = the current safe-to-write position in the primary buffer * mixlen = the maximum amount to mix into the primary buffer * (beyond the current writepos) + * mustlock = Do we have to fight for lock because we otherwise risk an underrun? * recover = true if the sound device may have been reset and the write * position in the device buffer changed * all_stopped = reports back if all buffers have stopped @@ -678,12 +678,12 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mi * Returns: the length beyond the writepos that was mixed to. */ -static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, - DWORD mixlen, BOOL recover, BOOL *all_stopped) +static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, DWORD mixlen, BOOL mustlock, BOOL recover, BOOL *all_stopped) { INT i, len; DWORD minlen = 0; IDirectSoundBufferImpl *dsb; + BOOL gotall = TRUE; /* unless we find a running buffer, all have stopped */ *all_stopped = TRUE; @@ -696,8 +696,11 @@ static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos if (dsb->buflen && dsb->state && !dsb->hwbuf) { TRACE("Checking %p, mixlen=%d\n", dsb, mixlen); - RtlAcquireResourceShared(&dsb->lock, TRUE); - + if (!RtlAcquireResourceShared(&dsb->lock, mustlock)) + { + gotall = FALSE; + continue; + } /* if buffer is stopping it is stopped now */ if (dsb->state == STATE_STOPPING) { dsb->state = STATE_STOPPED; @@ -733,7 +736,7 @@ static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos } TRACE("Mixed at least %d from all buffers\n", minlen); - + if (!gotall) return 0; return minlen; } @@ -816,6 +819,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) DWORD playpos, writepos, writelead, maxq, frag, prebuff_max, prebuff_left, size1, size2; LPVOID buf1, buf2; BOOL lock = (device->hwbuf && !(device->drvdesc.dwFlags & DSDDESC_DONTNEEDPRIMARYLOCK)); + BOOL mustlock = FALSE; int nfiller; /* the sound of silence */ @@ -890,11 +894,15 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) device->mixpos = writepos; } + /* Do we risk an 'underrun' if we don't advance pointer? */ + if (writelead/device->fraglen <= ds_snd_queue_min || recover) + mustlock = TRUE; + if (lock) IDsDriverBuffer_Lock(device->hwbuf, &buf1, &size1, &buf2, &size2, writepos, maxq, 0); /* do the mixing */ - frag = DSOUND_MixToPrimary(device, writepos, maxq, recover, &all_stopped); + frag = DSOUND_MixToPrimary(device, writepos, maxq, mustlock, recover, &all_stopped); /* update the mix position, taking wrap-around into acount */ device->mixpos = writepos + frag;

1 0

Francois Gouget : comctl32: According to the PSDK, DrawShadowText() takes a non-const RECT pointer.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 22d09f78fc1d8e25027dd71e7f8dbd5aa63d21b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d09f78fc1d8e25027dd71e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 19:01:00 2007 +0200 comctl32: According to the PSDK, DrawShadowText() takes a non-const RECT pointer. --- dlls/comctl32/commctrl.c | 8 +++----- include/commctrl.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index c09bc04..4bfe1a5 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1528,12 +1528,10 @@ LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet) * * Draw text with shadow. */ -int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, const RECT *pRect, DWORD dwFlags, +int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, RECT *rect, DWORD dwFlags, COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset) { - RECT rect = *pRect; - - FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, pRect, dwFlags, + FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, rect, dwFlags, crText, crShadow, ixOffset, iyOffset); - return DrawTextW(hdc, pszText, cch, &rect, DT_LEFT); + return DrawTextW(hdc, pszText, cch, rect, DT_LEFT); } diff --git a/include/commctrl.h b/include/commctrl.h index a1e82a9..2a49e00 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -713,7 +713,7 @@ BOOL WINAPI GetWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR*); BOOL WINAPI RemoveWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR); LRESULT WINAPI DefSubclassProc(HWND, UINT, WPARAM, LPARAM); -int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, const RECT*, DWORD, COLORREF, COLORREF, int, int); +int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, RECT*, DWORD, COLORREF, COLORREF, int, int); /* Header control */

1 0

Francois Gouget : crypt32: Fix the CryptReleaseContext() prototype.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: a33993bcbd960a4024a81a1009ae6c6c5b5a4019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33993bcbd960a4024a81a100… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 19:02:53 2007 +0200 crypt32: Fix the CryptReleaseContext() prototype. --- dlls/advapi32/crypt.c | 4 ++-- include/wincrypt.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index a7273b9..60131bb 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -568,12 +568,12 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; - TRACE("(0x%lx, %08x)\n", hProv, dwFlags); + TRACE("(0x%lx, %08lx)\n", hProv, dwFlags); if (!pProv) { diff --git a/include/wincrypt.h b/include/wincrypt.h index 46bc094..8700f56 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3383,7 +3383,7 @@ BOOL WINAPI CryptHashData (HCRYPTHASH hHash, CONST BYTE *pbData, DWORD dwDataLen BOOL WINAPI CryptHashSessionKey (HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags); BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey); -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags); +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags); BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); BOOL WINAPI CryptSetProviderA (LPCSTR pszProvName, DWORD dwProvType);

1 0

Francois Gouget : crypt32: Add some missing CERT_XXX_ID constants.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: fa489d08d34bbcbd84cbc0b1ef7cb168156a4ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa489d08d34bbcbd84cbc0b1e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 19:02:31 2007 +0200 crypt32: Add some missing CERT_XXX_ID constants. --- include/wincrypt.h | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 8700f56..51e7f51 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2182,7 +2182,25 @@ static const WCHAR CERT_PHYSICAL_STORE_AUTH_ROOT_NAME[] = #define CERT_ARCHIVED_KEY_HASH_PROP_ID 65 #define CERT_AUTO_ENROLL_RETRY_PROP_ID 66 #define CERT_AIA_URL_RETRIEVED_PROP_ID 67 -#define CERT_FIRST_RESERVED_PROP_ID 68 +#define CERT_AUTHORITY_INFO_ACCESS_PROP_ID 68 +#define CERT_BACKED_UP_PROP_ID 69 +#define CERT_OCSP_RESPONSE_PROP_ID 70 +#define CERT_REQUEST_ORIGINATOR_PROP_ID 71 +#define CERT_SOURCE_LOCATION_PROP_ID 72 +#define CERT_SOURCE_URL_PROP_ID 73 +#define CERT_NEW_KEY_PROP_ID 74 +#define CERT_OCSP_CACHE_PREFIX_PROP_ID 75 +#define CERT_SMART_CARD_ROOT_INFO_PROP_ID 76 +#define CERT_NO_AUTO_EXPIRE_CHECK_PROP_ID 77 +#define CERT_NCRYPT_KEY_HANDLE_PROP_ID 78 +#define CERT_HCRYPTPROV_OR_NCRYPT_KEY_HANDLE_PROP_ID 79 +#define CERT_SUBJECT_INFO_ACCESS_PROP_ID 80 +#define CERT_CA_OCSP_AUTHORITY_INFO_ACCESS_PROP_ID 81 +#define CERT_CA_DISABLE_CRL_PROP_ID 82 +#define CERT_ROOT_PROGRAM_CERT_POLICIES_PROP_ID 83 +#define CERT_ROOT_PROGRAM_NAME_CONSTRAINTS_PROP_ID 84 + +#define CERT_FIRST_RESERVED_PROP_ID 85 #define CERT_LAST_RESERVED_PROP_ID 0x00007fff #define CERT_FIRST_USER_PROP_ID 0x00008000 #define CERT_LAST_USER_PROP_ID 0x0000ffff

1 0

Francois Gouget : crypt32: Add FIXMEs for a couple of missing includes.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: db895bb51aaf7d80618c31a18d98fc2e2d41135c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db895bb51aaf7d80618c31a18… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 19:02:23 2007 +0200 crypt32: Add FIXMEs for a couple of missing includes. --- include/wincrypt.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 51e7f51..4b4f389 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -24,6 +24,9 @@ extern "C" { #endif +/* FIXME: #include <bcrypt.h> */ +/* FIXME: #include <ncrypt.h> */ + /* some typedefs for function parameters */ typedef unsigned int ALG_ID; typedef unsigned long HCRYPTPROV;

1 0

Francois Gouget : dxdiagn: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: ed366f22a291ca72af1eba0966063dacff96dd0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed366f22a291ca72af1eba096… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 18:59:43 2007 +0200 dxdiagn: Fix compilation on systems that don't support nameless unions. --- dlls/dxdiagn/provider.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index fe0543c..c30600b 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -20,9 +20,9 @@ */ #include "config.h" -#include "wine/debug.h" #define COBJMACROS +#define NONAMELESSUNION #include "dxdiag_private.h" #include "wine/unicode.h" #include "winver.h" @@ -33,6 +33,8 @@ #include "mmddk.h" #include <ddraw.h> +#include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); /* IDxDiagProvider IUnknown parts follow: */ @@ -478,7 +480,7 @@ static HRESULT DXDiag_InitDXDiagDisplayContainer(IDxDiagContainer* pSubCont) if (surface_descr.dwFlags & DDSD_HEIGHT) add_prop_ui4( pDisplayAdapterSubCont, dwHeight, surface_descr.dwHeight ); if (surface_descr.dwFlags & DDSD_PIXELFORMAT) - add_prop_ui4( pDisplayAdapterSubCont, dwBpp, surface_descr.ddpfPixelFormat.dwRGBBitCount ); + add_prop_ui4( pDisplayAdapterSubCont, dwBpp, surface_descr.u4.ddpfPixelFormat.u1.dwRGBBitCount ); } add_prop_str( pDisplayAdapterSubCont, szVendorId, szEmpty );

1 0

Robert Reif : msvcrt/tests: Add _aligned_malloc tests.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: cf7c156fe3a54b64b9339754de9dab8fb8e45199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7c156fe3a54b64b9339754d… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Jul 27 20:04:25 2007 -0400 msvcrt/tests: Add _aligned_malloc tests. --- dlls/msvcrt/tests/heap.c | 315 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 315 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf7c156fe3a54b64b9339…

1 0

Dmitry Timoshkov : gdi32: Make GetFontData traces more readable.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 991d2d2632e8144c0461004896e8172632719015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991d2d2632e8144c046100489… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jul 31 19:42:27 2007 +0900 gdi32: Make GetFontData traces more readable. --- dlls/gdi32/freetype.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cdd23ef..8615fb7 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4373,8 +4373,9 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, FT_ULong len; FT_Error err; - TRACE("font=%p, table=%08x, offset=%08x, buf=%p, cbData=%x\n", - font, table, offset, buf, cbData); + TRACE("font=%p, table=%c%c%c%c, offset=0x%x, buf=%p, cbData=0x%x\n", + font, LOBYTE(LOWORD(table)), HIBYTE(LOWORD(table)), + LOBYTE(HIWORD(table)), HIBYTE(HIWORD(table)), offset, buf, cbData); if(!FT_IS_SFNT(ft_face)) return GDI_ERROR;

1 0

Robert Reif : msvcrt: Add _aligned_malloc functions.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: fc77a467cddd3dfd29110a777c87a043baeb9c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc77a467cddd3dfd29110a777… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Jul 27 20:02:23 2007 -0400 msvcrt: Add _aligned_malloc functions. --- dlls/msvcrt/heap.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 5 ++ include/msvcrt/malloc.h | 6 ++ 3 files changed, 166 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index ab6dd01..d51675d 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -23,6 +23,7 @@ #include "msvcrt.h" #include "mtdll.h" +#include "msvcrt/errno.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -31,6 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define LOCK_HEAP _mlock( _HEAP_LOCK ) #define UNLOCK_HEAP _munlock( _HEAP_LOCK ) +/* _aligned */ +#define SAVED_PTR(x) ((void *)((DWORD_PTR)((char *)x - sizeof(void *)) & \ + ~(sizeof(void *) - 1))) +#define ALIGN_PTR(ptr, alignment, offset) ((void *) \ + ((((DWORD_PTR)((char *)ptr + alignment + sizeof(void *) + offset)) & \ + ~(alignment - 1)) - offset)) + typedef void (*MSVCRT_new_handler_func)(unsigned long size); @@ -314,3 +322,150 @@ int CDECL _set_sbh_threshold(size_t threshold) MSVCRT_sbh_threshold = threshold; return 1; } + +/********************************************************************* + * _aligned_free (MSVCRT.@) + */ +void CDECL _aligned_free(void *memblock) +{ + TRACE("(%p)\n", memblock); + + if (memblock) + { + void **saved = SAVED_PTR(memblock); + MSVCRT_free(*saved); + } +} + +/********************************************************************* + * _aligned_offset_malloc (MSVCRT.@) + */ +void * CDECL _aligned_offset_malloc(size_t size, size_t alignment, + size_t offset) +{ + void *memblock, *temp, **saved; + TRACE("(%u, %u, %u)\n", size, alignment, offset); + + /* alignment must be a power of 2 */ + if ((alignment & (alignment - 1)) != 0) + { + msvcrt_set_errno(EINVAL); + return NULL; + } + + /* offset must be less than size */ + if (offset >= size) + { + msvcrt_set_errno(EINVAL); + return NULL; + } + + /* don't align to less than void pointer size */ + if (alignment < sizeof(void *)) + alignment = sizeof(void *); + + /* allocate enough space for void pointer and alignment */ + temp = MSVCRT_malloc(size + alignment + sizeof(void *)); + + if (!temp) + return NULL; + + /* adjust pointer for proper alignment and offset */ + memblock = ALIGN_PTR(temp, alignment, offset); + + /* Save the real allocation address below returned address */ + /* so it can be found later to free. */ + saved = SAVED_PTR(memblock); + *saved = temp; + + return memblock; +} + +/********************************************************************* + * _aligned_malloc (MSVCRT.@) + */ +void * CDECL _aligned_malloc(size_t size, size_t alignment) +{ + TRACE("(%u, %u)\n", size, alignment); + return _aligned_offset_malloc(size, alignment, 0); +} + +/********************************************************************* + * _aligned_offset_realloc (MSVCRT.@) + */ +void * CDECL _aligned_offset_realloc(void *memblock, size_t size, + size_t alignment, size_t offset) +{ + void * temp, **saved; + size_t old_padding, new_padding; + TRACE("(%p, %u, %u, %u)\n", memblock, size, alignment, offset); + + if (!memblock) + return _aligned_offset_malloc(size, alignment, offset); + + /* alignment must be a power of 2 */ + if ((alignment & (alignment - 1)) != 0) + { + msvcrt_set_errno(EINVAL); + return NULL; + } + + /* offset must be less than size */ + if (offset >= size) + { + msvcrt_set_errno(EINVAL); + return NULL; + } + + if (size == 0) + { + _aligned_free(memblock); + return NULL; + } + + /* don't align to less than void pointer size */ + if (alignment < sizeof(void *)) + alignment = sizeof(void *); + + /* make sure alignment and offset didn't change */ + saved = SAVED_PTR(memblock); + if (memblock != ALIGN_PTR(*saved, alignment, offset)) + { + msvcrt_set_errno(EINVAL); + return NULL; + } + + old_padding = (char *)*saved - (char *)memblock; + + temp = MSVCRT_realloc(*saved, size + alignment + sizeof(void *)); + + if (!temp) + return NULL; + + /* adjust pointer for proper alignment and offset */ + memblock = ALIGN_PTR(temp, alignment, offset); + + /* Save the real allocation address below returned address */ + /* so it can be found later to free. */ + saved = SAVED_PTR(memblock); + + /* a new start address may require different padding to get the */ + /* proper alignment */ + new_padding = (char *)temp - (char *)memblock; + if (new_padding != old_padding) + memmove((char *)memblock + old_padding, (char *)memblock + new_padding, size); + + *saved = temp; + + return memblock; +} + +/********************************************************************* + * _aligned_realloc (MSVCRT.@) + */ +void * CDECL _aligned_realloc(void *memblock, size_t size, + size_t alignment) +{ + TRACE("(%p, %u, %u)\n", memblock, size, alignment); + return _aligned_offset_realloc(memblock, size, alignment, 0); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index cb427ab..fc81898 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -163,6 +163,11 @@ @ cdecl _adj_fptan() @ extern _adjust_fdiv MSVCRT__adjust_fdiv # extern _aexit_rtn +@ cdecl _aligned_free(ptr) +@ cdecl _aligned_malloc(long long) +@ cdecl _aligned_offset_malloc(long long long) +@ cdecl _aligned_offset_realloc(ptr long long long) +@ cdecl _aligned_realloc(ptr long long) @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) MSVCRT__assert @ stub _atodbl #(ptr str) diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h index 25ae615..bee2173 100644 --- a/include/msvcrt/malloc.h +++ b/include/msvcrt/malloc.h @@ -86,6 +86,12 @@ void free(void*); void* malloc(size_t); void* realloc(void*,size_t); +void _aligned_free(void*); +void* _aligned_malloc(size_t,size_t); +void* _aligned_offset_malloc(size_t,size_t,size_t); +void* _aligned_realloc(void*,size_t,size_t); +void* _aligned_offset_realloc(void*,size_t,size_t,size_t); + size_t _get_sbh_threshold(void); int _set_sbh_threshold(size_t size);

1 0

Roderick Colenbrander : wined3d: Compile against standard GL headers.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 2c12c17ab62596fcb42436c609f41b0461bc6f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c12c17ab62596fcb42436c60… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Jul 31 11:34:22 2007 +0200 wined3d: Compile against standard GL headers. --- dlls/wined3d/state.c | 2 +- include/wine/wined3d_gl.h | 109 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 106 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c12c17ab62596fcb4243…

1 0