wine-commits February 2007

wine-commits@winehq.org

4 participants
839 discussions

Maarten Lankhorst : winealsa: Fix typo.
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: cda92aeba9206fc26d9cd375e63d4788cf62786a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda92aeba9206fc26d9cd375e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 21 20:18:04 2007 +0100 winealsa: Fix typo. --- dlls/winealsa.drv/alsa.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 1a1fd19..353a9c2 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(alsa); #ifdef USE_PIPE_SYNC #define INIT_OMR(omr) do { if (pipe(omr->msg_pipe) < 0) { omr->msg_pipe[0] = omr->msg_pipe[1] = -1; } } while (0) -#define CLOSE_OMR(Omr) do { close(omr->msg_pipe[0]); close(omr->msg_pipe[1]); } while (0) +#define CLOSE_OMR(omr) do { close(omr->msg_pipe[0]); close(omr->msg_pipe[1]); } while (0) #define SIGNAL_OMR(omr) do { int x = 0; write((omr)->msg_pipe[1], &x, sizeof(x)); } while (0) #define CLEAR_OMR(omr) do { int x = 0; read((omr)->msg_pipe[0], &x, sizeof(x)); } while (0) #define RESET_OMR(omr) do { } while (0) @@ -119,7 +119,6 @@ void ALSA_WaitRingMessage(ALSA_MSG_RING* omr, DWORD sleep) WAIT_OMR(omr, sleep); } - /****************************************************************** * ALSA_AddRingMessage *

1 0

Maarten Lankhorst : dsound: Use an inline for ring buffer pointer difference calculation.
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: c38bcb96d711aca8ae7b16114a3e9c168f97ed19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38bcb96d711aca8ae7b16114… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 21 20:17:22 2007 +0100 dsound: Use an inline for ring buffer pointer difference calculation. --- dlls/dsound/mixer.c | 54 +++++++++++++++++++++++++------------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 8eba8c0..b961cf6 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -724,6 +724,19 @@ void DSOUND_ForceRemix(IDirectSoundBufferImpl *dsb) } /** + * Calculate the distance between two buffer offsets, taking wraparound + * into account. + */ +static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2) +{ + if (ptr1 >= ptr2) { + return ptr1 - ptr2; + } else { + return buflen + ptr1 - ptr2; + } +} + +/** * Mix some frames from the given secondary buffer "dsb" into the device * primary buffer. * @@ -744,18 +757,10 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD playpos, DWORD wri /* determine this buffer's write position */ DWORD buf_writepos = DSOUND_CalcPlayPosition(dsb, writepos, writepos); /* determine how much already-mixed data exists */ - DWORD buf_done = - ((dsb->buf_mixpos < buf_writepos) ? dsb->buflen : 0) + - dsb->buf_mixpos - buf_writepos; - DWORD primary_done = - ((dsb->primary_mixpos < writepos) ? dsb->device->buflen : 0) + - dsb->primary_mixpos - writepos; - DWORD adv_done = - ((dsb->device->mixpos < writepos) ? dsb->device->buflen : 0) + - dsb->device->mixpos - writepos; - DWORD played = - ((buf_writepos < dsb->playpos) ? dsb->buflen : 0) + - buf_writepos - dsb->playpos; + DWORD buf_done = DSOUND_BufPtrDiff(dsb->buflen, dsb->buf_mixpos, buf_writepos); + DWORD primary_done = DSOUND_BufPtrDiff(dsb->device->buflen, dsb->primary_mixpos, writepos); + DWORD adv_done = DSOUND_BufPtrDiff(dsb->device->buflen, dsb->device->mixpos, writepos); + DWORD played = DSOUND_BufPtrDiff(dsb->buflen, buf_writepos, dsb->playpos); DWORD buf_left = dsb->buflen - buf_writepos; int still_behind; @@ -883,9 +888,7 @@ post_mix: * advance its underrun detector...*/ if (still_behind) return 0; if ((mixlen - len) < primary_done) return 0; - slen = ((dsb->primary_mixpos < dsb->device->mixpos) ? - dsb->device->buflen : 0) + dsb->primary_mixpos - - dsb->device->mixpos; + slen = DSOUND_BufPtrDiff(dsb->device->buflen, dsb->primary_mixpos, dsb->device->mixpos); if (slen > mixlen) { /* the primary_done and still_behind checks above should have worked */ FIXME("problem with advancement calculation (advlen=%d > mixlen=%d)\n", slen, mixlen); @@ -1087,22 +1090,19 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) DSOUND_CheckReset(device, writepos); /* check how much prebuffering is left */ - inq = device->mixpos; - if (inq < writepos) - inq += device->buflen; - inq -= writepos; + inq = DSOUND_BufPtrDiff(device->buflen, device->mixpos, writepos); /* find the maximum we can prebuffer */ - if (!paused) { - maxq = playpos; - if (maxq < writepos) - maxq += device->buflen; - maxq -= writepos; - } else maxq = device->buflen; + if (!paused) + maxq = DSOUND_BufPtrDiff(device->buflen, playpos, writepos); + /* If we get the whole buffer, difference is 0, so we need to set whole buffer then */ + if (paused || !maxq) + maxq = device->buflen; /* clip maxq to device->prebuf */ frag = device->prebuf * device->fraglen; - if (maxq > frag) maxq = frag; + if (maxq > frag) + maxq = frag; /* check for consistency */ if (inq > maxq) { @@ -1248,7 +1248,7 @@ void CALLBACK DSOUND_callback(HWAVEOUT hwo, UINT msg, DWORD dwUser, DWORD dw1, D playpos = pwplay * fraglen; mixpos = device->mixpos; /* check remaining mixed data */ - inq = ((mixpos < playpos) ? buflen : 0) + mixpos - playpos; + inq = DSOUND_BufPtrDiff(buflen, mixpos, playpos); mixq = inq / fraglen; if ((inq - (mixq * fraglen)) > 0) mixq++; /* complete the playing buffer */

1 0

Maarten Lankhorst : dsound: Add some comments from earlier patch that makes code a little better understandable .
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: 0036298a140645e1aacd3a22c272647998ef09e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0036298a140645e1aacd3a22c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 21 20:16:22 2007 +0100 dsound: Add some comments from earlier patch that makes code a little better understandable. --- dlls/dsound/mixer.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 90 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 1597aa0..8eba8c0 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -98,6 +98,14 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) dsb->writelead = (dsb->freq / 100) * dsb->pwfx->nBlockAlign; } +/** + * Check for application callback requests for when the play position + * reaches certain points. + * + * The offsets that will be triggered will be those between the recorded + * "last played" position for the buffer (i.e. dsb->playpos) and "len" bytes + * beyond that position. + */ void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, int len) { int i; @@ -163,6 +171,10 @@ static inline BYTE cvtS16toU8(INT16 s) return (s >> 8) ^ (unsigned char)0x80; } +/** + * Copy a single frame from the given input buffer to the given output buffer. + * Translate 8 <-> 16 bits and mono <-> stereo + */ static inline void cp_fields(const IDirectSoundBufferImpl *dsb, BYTE *ibuf, BYTE *obuf ) { DirectSoundDevice * device = dsb->device; @@ -209,7 +221,24 @@ static inline void cp_fields(const IDirectSoundBufferImpl *dsb, BYTE *ibuf, BYTE } } -/* Now with PerfectPitch (tm) technology */ +/** + * Mix at most the given amount of data into the given device buffer from the + * given secondary buffer, starting from the dsb's first currently unmixed + * frame (buf_mixpos), translating frequency (pitch), stereo/mono and + * bits-per-sample. The secondary buffer sample is looped if it is not + * long enough and it is a looping buffer. + * (Doesn't perform any mixing - this is a straight copy operation). + * + * Now with PerfectPitch (tm) technology + * + * dsb = the secondary buffer + * buf = the device buffer + * len = number of bytes to store in the device buffer + * + * Returns: the number of bytes read from the secondary buffer + * (ie. len, adjusted for frequency, number of channels and sample size, + * and limited by buffer length for non-looping buffers) + */ static INT DSOUND_MixerNorm(IDirectSoundBufferImpl *dsb, BYTE *buf, INT len) { INT i, size, ipos, ilen; @@ -356,6 +385,10 @@ static void DSOUND_MixerVol(IDirectSoundBufferImpl *dsb, BYTE *buf, INT len) } } +/** + * Make sure the device's tmp_buffer is at least the given size. Return a + * pointer to it. + */ static LPBYTE DSOUND_tmpbuffer(DirectSoundDevice *device, DWORD len) { TRACE("(%p,%d)\n", device, len); @@ -372,6 +405,19 @@ static LPBYTE DSOUND_tmpbuffer(DirectSoundDevice *device, DWORD len) return device->tmp_buffer; } +/** + * Mix (at most) the given number of bytes into the given position of the + * device buffer, from the secondary buffer "dsb" (starting at the current + * mix position for that buffer). + * + * Returns the number of bytes actually mixed into the device buffer. This + * will match fraglen unless the end of the secondary buffer is reached + * (and it is not looping). + * + * dsb = the secondary buffer to mix from + * writepos = position (offset) in device buffer to write at + * fraglen = number of bytes to mix + */ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD fraglen) { INT i, len, ilen, field, todo; @@ -381,9 +427,15 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO len = fraglen; if (!(dsb->playflags & DSBPLAY_LOOPING)) { + /* This buffer is not looping, so make sure the requested + * length will not take us past the end of the buffer */ int secondary_remainder = dsb->buflen - dsb->buf_mixpos; int adjusted_remainder = MulDiv(dsb->device->pwfx->nAvgBytesPerSec, secondary_remainder, dsb->nAvgBytesPerSec); assert(adjusted_remainder >= 0); + /* The adjusted remainder must be at least one sample, + * otherwise we will never reach the end of the + * secondary buffer, as there will perpetually be a + * fractional remainder */ TRACE("secondary_remainder = %d, adjusted_remainder = %d, len = %d\n", secondary_remainder, adjusted_remainder, len); if (adjusted_remainder < len) { TRACE("clipping len to remainder of secondary buffer\n"); @@ -404,12 +456,16 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO TRACE("MixInBuffer (%p) len = %d, dest = %d\n", dsb, len, writepos); + /* first, copy the data from the DirectSoundBuffer into the temporary + buffer, translating frequency/bits-per-sample/number-of-channels + to match the device settings */ ilen = DSOUND_MixerNorm(dsb, ibuf, len); if ((dsb->dsbd.dwFlags & DSBCAPS_CTRLPAN) || (dsb->dsbd.dwFlags & DSBCAPS_CTRLVOLUME) || (dsb->dsbd.dwFlags & DSBCAPS_CTRL3D)) DSOUND_MixerVol(dsb, ibuf, len); + /* Now mix the temporary buffer into the devices main buffer */ if (dsb->device->pwfx->wBitsPerSample == 8) { BYTE *obuf = dsb->device->buffer + writepos; @@ -667,8 +723,23 @@ void DSOUND_ForceRemix(IDirectSoundBufferImpl *dsb) LeaveCriticalSection(&dsb->lock); } +/** + * Mix some frames from the given secondary buffer "dsb" into the device + * primary buffer. + * + * dsb = the secondary buffer + * playpos = the current play position in the device buffer (primary buffer) + * writepos = the current safe-to-write position in the device buffer + * mixlen = the maximum number of bytes in the primary buffer to mix, from the + * current writepos. + * + * Returns: the number of bytes beyond the writepos that were mixed. + */ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD playpos, DWORD writepos, DWORD mixlen) { + /* The buffer's primary_mixpos may be before or after the the device + * buffer's mixpos, but both must be ahead of writepos. */ + DWORD len, slen; /* determine this buffer's write position */ DWORD buf_writepos = DSOUND_CalcPlayPosition(dsb, writepos, writepos); @@ -823,6 +894,19 @@ post_mix: return slen; } +/** + * 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) + * recover = true if the sound device may have been reset and the write + * position in the device buffer changed + * + * Returns: the length beyond the writepos that was mixed to. + */ static DWORD DSOUND_MixToPrimary(DirectSoundDevice *device, DWORD playpos, DWORD writepos, DWORD mixlen, BOOL recover) { INT i, len, maxlen = 0; @@ -941,6 +1025,11 @@ void DSOUND_WaveQueue(DirectSoundDevice *device, DWORD mixq) /* #define SYNC_CALLBACK */ +/** + * Perform mixing for a Direct Sound device. That is, go through all the + * secondary buffers (the sound bites currently playing) and mix them in + * to the primary buffer (the device buffer). + */ static void DSOUND_PerformMix(DirectSoundDevice *device) { int nfiller;

1 0

Anatoly Lyutin : wineconsole: Use MAKELPARM instead of MAKELONG.
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: 777ba7da9a45b80d468787d48dd8e8753aaf5fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=777ba7da9a45b80d468787d48… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Wed Feb 21 17:28:35 2007 +0300 wineconsole: Use MAKELPARM instead of MAKELONG. --- programs/wineconsole/dialog.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 0ec3bac..2f2c314 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -615,10 +615,10 @@ static INT_PTR WINAPI WCUSER_ConfigDlgProc(HWND hDlg, UINT msg, WPARAM wParam, L SetDlgItemInt(hDlg, IDC_CNF_WIN_WIDTH, di->config.win_width, FALSE); SetDlgItemInt(hDlg, IDC_CNF_WIN_HEIGHT, di->config.win_height, FALSE); - SendMessage(GetDlgItem(hDlg,IDC_CNF_WIN_HEIGHT_UD), UDM_SETRANGE, (WPARAM) 0, MAKELONG (nMaxUD, 0)); - SendMessage(GetDlgItem(hDlg,IDC_CNF_WIN_WIDTH_UD), UDM_SETRANGE, (WPARAM) 0, MAKELONG (nMaxUD, 0)); - SendMessage(GetDlgItem(hDlg,IDC_CNF_SB_HEIGHT_UD), UDM_SETRANGE, (WPARAM) 0, MAKELONG (nMaxUD, 0)); - SendMessage(GetDlgItem(hDlg,IDC_CNF_SB_WIDTH_UD), UDM_SETRANGE, (WPARAM) 0, MAKELONG (nMaxUD, 0)); + SendMessage(GetDlgItem(hDlg,IDC_CNF_WIN_HEIGHT_UD), UDM_SETRANGE, 0, MAKELPARAM (nMaxUD, 0)); + SendMessage(GetDlgItem(hDlg,IDC_CNF_WIN_WIDTH_UD), UDM_SETRANGE, 0, MAKELPARAM (nMaxUD, 0)); + SendMessage(GetDlgItem(hDlg,IDC_CNF_SB_HEIGHT_UD), UDM_SETRANGE, 0, MAKELPARAM (nMaxUD, 0)); + SendMessage(GetDlgItem(hDlg,IDC_CNF_SB_WIDTH_UD), UDM_SETRANGE, 0, MAKELPARAM (nMaxUD, 0)); SendDlgItemMessage(hDlg, IDC_CNF_CLOSE_EXIT, BM_SETCHECK, (di->config.exit_on_die) ? BST_CHECKED : BST_UNCHECKED, 0L);

1 0

Misha Koshelev : oleview: Respect size of array ITypeInfo_GetNames returns.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 49e8770563a004e92932b2e67f5c5f61e07ba8d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e8770563a004e92932b2e67… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Tue Feb 20 19:13:12 2007 -0600 oleview: Respect size of array ITypeInfo_GetNames returns. --- programs/oleview/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 64e3084..91c1775 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -531,10 +531,10 @@ int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) AddToTLDataStrW(tld, bstrName); AddToTLDataStrW(tld, wszOpenBrackets2); - for(j=0; j<pFuncDesc->cParams; j++) + for(j=0; j<namesNo-1; j++) { if(j != 0) AddToTLDataStrW(tld, wszComa); - if(pFuncDesc->cParams != 1) + if(namesNo-1 != 1) { AddToTLDataStrW(tld, wszNewLine); AddSpaces(tld, tabSize);

1 0

Rob Shearman : kernel32: Fix an off-by-one error in GetComputerNameExA/W.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: a5317eb846e779159924cf0254b3837d10e28019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5317eb846e779159924cf025… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 21 17:13:25 2007 +0000 kernel32: Fix an off-by-one error in GetComputerNameExA/W. The dns_* functions expect the input buffer to have space for size characters plus the nul terminating character. --- dlls/kernel32/computername.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index d0d9d04..eebaed7 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -406,7 +406,7 @@ BOOL WINAPI GetComputerNameA(LPSTR name, LPDWORD size) BOOL WINAPI GetComputerNameExA(COMPUTER_NAME_FORMAT type, LPSTR name, LPDWORD size) { char buf[256]; - int len = sizeof (buf), ret; + int len = sizeof(buf) - 1, ret; TRACE("%d, %p, %p\n", type, name, size); switch( type ) { @@ -458,7 +458,7 @@ BOOL WINAPI GetComputerNameExA(COMPUTER_NAME_FORMAT type, LPSTR name, LPDWORD si BOOL WINAPI GetComputerNameExW( COMPUTER_NAME_FORMAT type, LPWSTR name, LPDWORD size ) { char buf[256]; - int len = sizeof (buf), ret; + int len = sizeof(buf) - 1, ret; TRACE("%d, %p, %p\n", type, name, size); switch( type )

1 0

Rob Shearman : wininet: Fix the case of partial SSL reads from the peek buffer.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: ba590a185ae00c51ae10e5bc93938991330d79f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba590a185ae00c51ae10e5bc9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 21 17:11:57 2007 +0000 wininet: Fix the case of partial SSL reads from the peek buffer. Don't return FALSE for a partial read. Fall through to SSL_read and use the logic for partial reads there instead of having separate logic and recursively calling NETCON_recv. Based on a patch by Michael Moss. --- dlls/wininet/netconnection.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 2418b97..ec2b18d 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -497,12 +497,10 @@ BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags, int *recvd /* out */) { + *recvd = 0; if (!NETCON_connected(connection)) return FALSE; if (!len) - { - *recvd = 0; return TRUE; - } if (!connection->useSSL) { *recvd = recv(connection->socketFD, buf, len, flags); @@ -543,19 +541,13 @@ BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int f HeapFree(GetProcessHeap(), 0, connection->peek_msg_mem); connection->peek_msg_mem = NULL; connection->peek_msg = NULL; - /* check if the peek buffer held too few data */ - if ((flags & MSG_WAITALL) && (*recvd < len)) - { - int recv2 = 0; - /* recursive call - but now the peek buffer is empty */ - if (!NETCON_recv(connection, (char*)buf + *recvd, len - *recvd, flags, &recv2)) - return FALSE; - *recvd += recv2; - } } - return TRUE; + /* check if we got enough data from the peek buffer */ + if (!(flags & MSG_WAITALL) || (*recvd == len)) + return TRUE; + /* otherwise, fall through */ } - *recvd = pSSL_read(connection->ssl_s, buf, len); + *recvd += pSSL_read(connection->ssl_s, (char*)buf + *recvd, len - *recvd); if (flags & MSG_PEEK) /* must copy stuff into buffer */ { connection->peek_len = *recvd;

1 0

Rob Shearman : dbghelp: ImageName is usually blank, so print LoadedImageName in elf_load_debug_info_map.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 272d7ab46a67cda384ef17f8238b1935f4b56222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272d7ab46a67cda384ef17f82… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 21 17:11:22 2007 +0000 dbghelp: ImageName is usually blank, so print LoadedImageName in elf_load_debug_info_map. --- dlls/dbghelp/elf_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 79feca5..bbce495 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -917,7 +917,7 @@ static BOOL elf_load_debug_info_from_map(struct module* module, if (fmap->with_crc && (fmap->crc != calc_crc32(fmap))) { ERR("Bad CRC for module %s (got %08x while expecting %08lx)\n", - module->module.ImageName, calc_crc32(fmap), fmap->crc); + module->module.LoadedImageName, calc_crc32(fmap), fmap->crc); /* we don't tolerate mis-matched files */ return FALSE; }

1 0

Rob Shearman : server: Add get_token_impersonation_level server call for retrieving the impersonation level from a token .
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: d342d1413cd1ca7ca49e4d42906c4bb51e8fba5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d342d1413cd1ca7ca49e4d429… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 21 17:10:45 2007 +0000 server: Add get_token_impersonation_level server call for retrieving the impersonation level from a token. Add tests for GetTokenInformation(TokenImpersonationLevel). --- dlls/advapi32/tests/security.c | 24 ++++++++++++++++++++---- dlls/ntdll/nt.c | 15 ++++++++++++++- include/wine/server_protocol.h | 17 ++++++++++++++++- server/protocol.def | 7 +++++++ server/request.h | 2 ++ server/token.c | 17 +++++++++++++++++ server/trace.c | 13 +++++++++++++ 7 files changed, 89 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 201c649..95d2f9c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -840,7 +840,7 @@ static void test_AccessCheck(void) /* test GetTokenInformation for the various attributes */ static void test_token_attr(void) { - HANDLE Token; + HANDLE Token, ImpersonationToken; DWORD Size; TOKEN_PRIVILEGES *Privileges; TOKEN_GROUPS *Groups; @@ -848,6 +848,7 @@ static void test_token_attr(void) BOOL ret; DWORD i, GLE; LPSTR SidString; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; /* cygwin-like use case */ ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &Token); @@ -855,16 +856,20 @@ static void test_token_attr(void) if (ret) { BYTE buf[1024]; - DWORD bufsize = sizeof(buf); - ret = GetTokenInformation(Token, TokenUser,(void*)buf, bufsize, &bufsize); + Size = sizeof(buf); + ret = GetTokenInformation(Token, TokenUser,(void*)buf, Size, &Size); ok(ret, "GetTokenInformation failed with error %d\n", GetLastError()); + Size = sizeof(ImpersonationLevel); + ret = GetTokenInformation(Token, TokenImpersonationLevel, &ImpersonationLevel, Size, &Size); + GLE = GetLastError(); + ok(!ret && (GLE == ERROR_INVALID_PARAMETER), "GetTokenInformation(TokenImpersonationLevel) on primary token should have failed with ERROR_INVALID_PARAMETER instead of %d\n", GLE); CloseHandle(Token); } if(!pConvertSidToStringSidA) return; - ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token); + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &Token); GLE = GetLastError(); ok(ret || (GLE == ERROR_CALL_NOT_IMPLEMENTED), "OpenProcessToken failed with error %d\n", GLE); @@ -928,6 +933,17 @@ static void test_token_attr(void) trace("\t%s, 0x%x\n", Name, Privileges->Privileges[i].Attributes); } HeapFree(GetProcessHeap(), 0, Privileges); + + ret = DuplicateToken(Token, SecurityAnonymous, &ImpersonationToken); + ok(ret, "DuplicateToken failed with error %d\n", GetLastError()); + + Size = sizeof(ImpersonationLevel); + ret = GetTokenInformation(ImpersonationToken, TokenImpersonationLevel, &ImpersonationLevel, Size, &Size); + ok(ret, "GetTokenInformation(TokenImpersonationLevel) failed with error %d\n", GetLastError()); + ok(ImpersonationLevel == SecurityAnonymous, "ImpersonationLevel should have been SecurityAnonymous instead of %d\n", ImpersonationLevel); + + CloseHandle(ImpersonationToken); + CloseHandle(Token); } typedef union _MAX_SID diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 43ce6e1..ce3c31a 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -217,8 +217,10 @@ NTSTATUS WINAPI NtQueryInformationToken( case TokenType: len = sizeof (TOKEN_TYPE); break; -#if 0 case TokenImpersonationLevel: + len = sizeof(SECURITY_IMPERSONATION_LEVEL); + break; +#if 0 case TokenStatistics: #endif /* 0 */ default: @@ -352,6 +354,17 @@ NTSTATUS WINAPI NtQueryInformationToken( owner->Owner = sid; } break; + case TokenImpersonationLevel: + SERVER_START_REQ( get_token_impersonation_level ) + { + SECURITY_IMPERSONATION_LEVEL *impersonation_level = tokeninfo; + req->handle = token; + status = wine_server_call( req ); + if (status == STATUS_SUCCESS) + *impersonation_level = reply->impersonation_level; + } + SERVER_END_REQ; + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b5c6201..db13e0c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3992,6 +3992,18 @@ struct get_object_info_reply }; +struct get_token_impersonation_level_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_token_impersonation_level_reply +{ + struct reply_header __header; + int impersonation_level; +}; + + enum request { REQ_new_process, @@ -4210,6 +4222,7 @@ enum request REQ_open_symlink, REQ_query_symlink, REQ_get_object_info, + REQ_get_token_impersonation_level, REQ_NB_REQUESTS }; @@ -4433,6 +4446,7 @@ union generic_request struct open_symlink_request open_symlink_request; struct query_symlink_request query_symlink_request; struct get_object_info_request get_object_info_request; + struct get_token_impersonation_level_request get_token_impersonation_level_request; }; union generic_reply { @@ -4654,8 +4668,9 @@ union generic_reply struct open_symlink_reply open_symlink_reply; struct query_symlink_reply query_symlink_reply; struct get_object_info_reply get_object_info_reply; + struct get_token_impersonation_level_reply get_token_impersonation_level_reply; }; -#define SERVER_PROTOCOL_VERSION 277 +#define SERVER_PROTOCOL_VERSION 278 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index e4f16a9..69daab3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2862,3 +2862,10 @@ enum message_type unsigned int access; /* granted access mask */ unsigned int ref_count; /* object ref count */ @END + +/* Query the impersonation level of an impersonation token */ +@REQ(get_token_impersonation_level) + obj_handle_t handle; /* handle to the object */ +@REPLY + int impersonation_level; /* impersonation level of the impersonation token */ +@END diff --git a/server/request.h b/server/request.h index 9119ec1..b24d7c7 100644 --- a/server/request.h +++ b/server/request.h @@ -326,6 +326,7 @@ DECL_HANDLER(create_symlink); DECL_HANDLER(open_symlink); DECL_HANDLER(query_symlink); DECL_HANDLER(get_object_info); +DECL_HANDLER(get_token_impersonation_level); #ifdef WANT_REQUEST_HANDLERS @@ -548,6 +549,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_open_symlink, (req_handler)req_query_symlink, (req_handler)req_get_object_info, + (req_handler)req_get_token_impersonation_level, }; #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/token.c b/server/token.c index c4906a5..573634b 100644 --- a/server/token.c +++ b/server/token.c @@ -1386,6 +1386,23 @@ DECL_HANDLER(get_token_groups) } } +DECL_HANDLER(get_token_impersonation_level) +{ + struct token *token; + + if ((token = (struct token *)get_handle_obj( current->process, req->handle, + TOKEN_QUERY, + &token_ops ))) + { + if (token->primary) + set_error( STATUS_INVALID_PARAMETER ); + else + reply->impersonation_level = token->impersonation_level; + + release_object( token ); + } +} + DECL_HANDLER(set_security_object) { data_size_t sd_size = get_req_data_size(); diff --git a/server/trace.c b/server/trace.c index 50926f5..d4bcf08 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3443,6 +3443,16 @@ static void dump_get_object_info_reply( const struct get_object_info_reply *req fprintf( stderr, " ref_count=%08x", req->ref_count ); } +static void dump_get_token_impersonation_level_request( const struct get_token_impersonation_level_request *req ) +{ + fprintf( stderr, " handle=%p", req->handle ); +} + +static void dump_get_token_impersonation_level_reply( const struct get_token_impersonation_level_reply *req ) +{ + fprintf( stderr, " impersonation_level=%d", req->impersonation_level ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -3660,6 +3670,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_open_symlink_request, (dump_func)dump_query_symlink_request, (dump_func)dump_get_object_info_request, + (dump_func)dump_get_token_impersonation_level_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -3879,6 +3890,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_open_symlink_reply, (dump_func)dump_query_symlink_reply, (dump_func)dump_get_object_info_reply, + (dump_func)dump_get_token_impersonation_level_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4098,6 +4110,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "open_symlink", "query_symlink", "get_object_info", + "get_token_impersonation_level", }; static const struct

1 0

Rob Shearman : server: Check object's security when creating handles.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 6a76a0ac7a891ffac54bad82ef742c1ca18fd2aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a76a0ac7a891ffac54bad82e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 21 13:59:59 2007 +0000 server: Check object's security when creating handles. Don't check object's security when duplicating a handle of the same or lower access rights. Based on a patch by Vitaliy Margolen. --- dlls/advapi32/tests/security.c | 2 +- server/handle.c | 66 +++++++++++++++++++++++++++++++--------- server/security.h | 1 + server/token.c | 30 ++++++++++++++++++ 4 files changed, 83 insertions(+), 16 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ef342b5..201c649 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -857,7 +857,7 @@ static void test_token_attr(void) BYTE buf[1024]; DWORD bufsize = sizeof(buf); ret = GetTokenInformation(Token, TokenUser,(void*)buf, bufsize, &bufsize); - todo_wine ok(ret, "GetTokenInformation failed with error %d\n", GetLastError()); + ok(ret, "GetTokenInformation failed with error %d\n", GetLastError()); CloseHandle(Token); } diff --git a/server/handle.c b/server/handle.c index 4b52280..852b3f5 100644 --- a/server/handle.c +++ b/server/handle.c @@ -36,6 +36,7 @@ #include "handle.h" #include "process.h" #include "thread.h" +#include "security.h" #include "request.h" struct handle_entry @@ -222,11 +223,10 @@ static obj_handle_t alloc_entry( struct handle_table *table, void *obj, unsigned /* allocate a handle for an object, incrementing its refcount */ /* return the handle, or 0 on error */ -obj_handle_t alloc_handle( struct process *process, void *ptr, unsigned int access, unsigned int attr ) +static obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr ) { struct object *obj = ptr; - access = obj->ops->map_access( obj, access ); access &= ~RESERVED_ALL; if (attr & OBJ_INHERIT) access |= RESERVED_INHERIT; if (!process->handles) @@ -237,9 +237,20 @@ obj_handle_t alloc_handle( struct process *process, void *ptr, unsigned int acce return alloc_entry( process->handles, obj, access ); } +/* allocate a handle for an object, checking the dacl allows the process to */ +/* access it and incrementing its refcount */ +/* return the handle, or 0 on error */ +obj_handle_t alloc_handle( struct process *process, void *ptr, unsigned int access, unsigned int attr ) +{ + struct object *obj = ptr; + access = obj->ops->map_access( obj, access ); + if (access && !check_object_access( obj, &access )) return 0; + return alloc_handle_no_access_check( process, ptr, access, attr ); +} + /* allocate a global handle for an object, incrementing its refcount */ /* return the handle, or 0 on error */ -static obj_handle_t alloc_global_handle( void *obj, unsigned int access ) +static obj_handle_t alloc_global_handle_no_access_check( void *obj, unsigned int access ) { if (!global_table) { @@ -250,6 +261,15 @@ static obj_handle_t alloc_global_handle( void *obj, unsigned int access ) return handle_local_to_global( alloc_entry( global_table, obj, access )); } +/* allocate a global handle for an object, checking the dacl allows the */ +/* process to access it and incrementing its refcount and incrementing its refcount */ +/* return the handle, or 0 on error */ +static obj_handle_t alloc_global_handle( void *obj, unsigned int access ) +{ + if (access && !check_object_access( obj, &access )) return 0; + return alloc_global_handle_no_access_check( obj, access ); +} + /* return a handle entry, or NULL if the handle is invalid */ static struct handle_entry *get_handle( struct process *process, obj_handle_t handle ) { @@ -449,25 +469,41 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str unsigned int access, unsigned int attr, unsigned int options ) { obj_handle_t res; + struct handle_entry *entry; + unsigned int src_access; struct object *obj = get_handle_obj( src, src_handle, 0, NULL ); if (!obj) return 0; + if ((entry = get_handle( src, src_handle ))) + src_access = entry->access; + else /* pseudo-handle, give it full access */ + { + src_access = obj->ops->map_access( obj, GENERIC_ALL ); + clear_error(); + } + src_access &= ~RESERVED_ALL; + if (options & DUP_HANDLE_SAME_ACCESS) + access = src_access; + else + access = obj->ops->map_access( obj, access ) & ~RESERVED_ALL; + + /* asking for the more access rights than src_access? */ + if (access & ~src_access) { - struct handle_entry *entry = get_handle( src, src_handle ); - if (entry) - access = entry->access; - else /* pseudo-handle, give it full access */ - { - access = obj->ops->map_access( obj, GENERIC_ALL ); - clear_error(); - } + if (options & DUP_HANDLE_MAKE_GLOBAL) + res = alloc_global_handle( obj, access ); + else + res = alloc_handle( dst, obj, access, attr ); } - access &= ~RESERVED_ALL; - if (options & DUP_HANDLE_MAKE_GLOBAL) - res = alloc_global_handle( obj, access ); else - res = alloc_handle( dst, obj, access, attr ); + { + if (options & DUP_HANDLE_MAKE_GLOBAL) + res = alloc_global_handle_no_access_check( obj, access ); + else + res = alloc_handle_no_access_check( dst, obj, access, attr ); + } + release_object( obj ); return res; } diff --git a/server/security.h b/server/security.h index 191688d..20f42e3 100644 --- a/server/security.h +++ b/server/security.h @@ -47,6 +47,7 @@ extern int token_check_privileges( struct token *token, int all_required, unsigned int count, LUID_AND_ATTRIBUTES *usedprivs); extern const ACL *token_get_default_dacl( struct token *token ); extern void security_set_thread_token( struct thread *thread, obj_handle_t handle ); +extern int check_object_access( struct object *obj, unsigned int *access ); static inline int thread_single_check_privilege( struct thread *thread, const LUID *priv) { diff --git a/server/token.c b/server/token.c index f49b355..c4906a5 100644 --- a/server/token.c +++ b/server/token.c @@ -1005,6 +1005,36 @@ static void set_object_sd( struct object *obj, const struct security_descriptor obj->sd = pnew_sd; } +int check_object_access(struct object *obj, unsigned int *access) +{ + GENERIC_MAPPING mapping; + struct token *token = current->token ? current->token : current->process->token; + LUID_AND_ATTRIBUTES priv; + unsigned int status, priv_count = 1; + int res; + + mapping.GenericAll = obj->ops->map_access( obj, GENERIC_ALL ); + + if (!obj->sd) + { + if (*access & MAXIMUM_ALLOWED) + *access = mapping.GenericAll; + return TRUE; + } + + mapping.GenericRead = obj->ops->map_access( obj, GENERIC_READ ); + mapping.GenericWrite = obj->ops->map_access( obj, GENERIC_WRITE ); + mapping.GenericExecute = obj->ops->map_access( obj, GENERIC_EXECUTE ); + + res = token_access_check( token, obj->sd, *access, &priv, &priv_count, + &mapping, access, &status ) == STATUS_SUCCESS && + status == STATUS_SUCCESS; + + if (!res) set_error( STATUS_ACCESS_DENIED ); + return res; +} + + /* open a security token */ DECL_HANDLER(open_token) {

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2007