September 2007 - Wine-commits

Juan Lang : crypt32: Add more tests for getting issuer cert from store.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 6aa03fc4c314671234975aecdb1afa81233d7427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa03fc4c314671234975aecd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 09:56:37 2007 -0700 crypt32: Add more tests for getting issuer cert from store. Show that certificates are added to memory stores at the head rather than the tail. --- dlls/crypt32/context.c | 2 +- dlls/crypt32/tests/cert.c | 174 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 174 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6aa03fc4c314671234975…

1 0

Juan Lang : crypt32: Test that the end cert in a chain's store isn' t implicitly searched for issuers.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 192ed7353d15dbd45047945ce8813f9b6cb3b77a URL: http://source.winehq.org/git/wine.git/?a=commit;h=192ed7353d15dbd45047945ce… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 09:57:04 2007 -0700 crypt32: Test that the end cert in a chain's store isn't implicitly searched for issuers. --- dlls/crypt32/tests/chain.c | 62 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 818491f..0698e2c 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1131,16 +1131,18 @@ typedef struct _CONST_BLOB_ARRAY CONST_DATA_BLOB *rgBlob; } CONST_BLOB_ARRAY; -#define TODO_CHAIN 1 -#define TODO_ERROR 2 -#define TODO_INFO 4 +#define TODO_CHAIN 1 +#define TODO_ERROR 2 +#define TODO_INFO 4 +#define TODO_ELEMENTS 8 /* Gets a certificate chain built from a store containing all the certs in * certArray, where the last certificate in the chain is expected to be the * end certificate (the one from which the chain is built.) */ static PCCERT_CHAIN_CONTEXT getChain(const CONST_BLOB_ARRAY *certArray, - DWORD flags, LPSYSTEMTIME checkTime, DWORD todo, DWORD testIndex) + DWORD flags, BOOL includeStore, LPSYSTEMTIME checkTime, DWORD todo, + DWORD testIndex) { HCERTSTORE store; PCCERT_CHAIN_CONTEXT chain = NULL; @@ -1178,8 +1180,8 @@ static PCCERT_CHAIN_CONTEXT getChain(const CONST_BLOB_ARRAY *certArray, FILETIME fileTime; SystemTimeToFileTime(checkTime, &fileTime); - ret = CertGetCertificateChain(NULL, endCert, &fileTime, store, - &chainPara, flags, NULL, &chain); + ret = CertGetCertificateChain(NULL, endCert, &fileTime, + includeStore ? store : NULL, &chainPara, flags, NULL, &chain); if (todo & TODO_CHAIN) todo_wine ok(ret, "Chain %d: CertGetCertificateChain failed: %08x\n", testIndex, GetLastError()); @@ -1203,9 +1205,14 @@ static void checkSimpleChainStatus(const CERT_SIMPLE_CHAIN *simpleChain, const SimpleChainStatusCheck *simpleChainStatus, const CERT_TRUST_STATUS *ignore, DWORD todo, DWORD testIndex, DWORD chainIndex) { - ok(simpleChain->cElement == simpleChainStatus->cElement, - "Chain %d: expected %d elements, got %d\n", testIndex, - simpleChainStatus->cElement, simpleChain->cElement); + if (todo & TODO_ELEMENTS) + todo_wine ok(simpleChain->cElement == simpleChainStatus->cElement, + "Chain %d: expected %d elements, got %d\n", testIndex, + simpleChainStatus->cElement, simpleChain->cElement); + else + ok(simpleChain->cElement == simpleChainStatus->cElement, + "Chain %d: expected %d elements, got %d\n", testIndex, + simpleChainStatus->cElement, simpleChain->cElement); if (simpleChain->cElement == simpleChainStatus->cElement) { DWORD i; @@ -1558,6 +1565,27 @@ static ChainCheck chainCheck[] = { TODO_INFO }, }; +static const CERT_TRUST_STATUS elementStatus8NoStore[] = { + { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, +}; +static const SimpleChainStatusCheck simpleStatus8NoStore[] = { + { sizeof(elementStatus8NoStore) / sizeof(elementStatus8NoStore[0]), + elementStatus8NoStore }, +}; +static ChainCheck chainCheckNoStore[] = { + { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, + { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, + 1, selfSignedSimpleStatus }, + TODO_ERROR | TODO_INFO }, + { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, + { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | + CERT_TRUST_IS_NOT_TIME_VALID, 0 }, + 1, simpleStatus8NoStore }, + TODO_ELEMENTS | TODO_ERROR | TODO_INFO }, +}; + /* Wednesday, Oct 1, 2007 */ static SYSTEMTIME oct2007 = { 2007, 10, 1, 1, 0, 0, 0, 0 }; @@ -1604,8 +1632,8 @@ static void testGetCertChain(void) for (i = 0; i < sizeof(chainCheck) / sizeof(chainCheck[0]); i++) { - chain = getChain(&chainCheck[i].certs, 0, &oct2007, chainCheck[i].todo, - i); + chain = getChain(&chainCheck[i].certs, 0, TRUE, &oct2007, + chainCheck[i].todo, i); if (chain) { checkChainStatus(chain, &chainCheck[i].status, chainCheck[i].todo, @@ -1613,6 +1641,18 @@ static void testGetCertChain(void) CertFreeCertificateChain(chain); } } + for (i = 0; i < sizeof(chainCheckNoStore) / sizeof(chainCheckNoStore[0]); + i++) + { + chain = getChain(&chainCheckNoStore[i].certs, 0, FALSE, &oct2007, + chainCheckNoStore[i].todo, i); + if (chain) + { + checkChainStatus(chain, &chainCheckNoStore[i].status, + chainCheckNoStore[i].todo, i); + CertFreeCertificateChain(chain); + } + } } START_TEST(chain)

1 0

Maarten Lankhorst : dsound: Fix null pointer dereference for waveout in creating buffer.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 7144849d0b08f99d5ed245e9c801c367f8258e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7144849d0b08f99d5ed245e9c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Sep 4 22:58:23 2007 +0200 dsound: Fix null pointer dereference for waveout in creating buffer. --- dlls/dsound/buffer.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 1a99927..5d95078 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1023,13 +1023,16 @@ HRESULT IDirectSoundBufferImpl_Create( use_hw = !!(dsbd->dwFlags & DSBCAPS_LOCHARDWARE); TRACE("use_hw = %d, capf = 0x%08x, device->drvcaps.dwFlags = 0x%08x\n", use_hw, capf, device->drvcaps.dwFlags); - if (use_hw && (device->drvcaps.dwFlags & capf) != capf) + if (use_hw && ((device->drvcaps.dwFlags & capf) != capf || !device->driver)) { - WARN("Format not supported for hardware buffer\n"); + if (device->driver) + WARN("Format not supported for hardware buffer\n"); HeapFree(GetProcessHeap(),0,dsb->pwfx); HeapFree(GetProcessHeap(),0,dsb); *pdsb = NULL; - return DSERR_BADFORMAT; + if ((device->drvcaps.dwFlags & capf) != capf) + return DSERR_BADFORMAT; + return DSERR_GENERIC; } /* FIXME: check hardware sample rate mixing capabilities */

1 0

Maarten Lankhorst : dsound: Fix detection of different sample rates in setformat.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 7a04c24e632857f33f873fe1aa9f8c0b1ee66fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a04c24e632857f33f873fe1a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Sep 5 10:58:52 2007 +0200 dsound: Fix detection of different sample rates in setformat. --- dlls/dsound/primary.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 4c9e125..f358aec 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -71,6 +71,8 @@ static void DSOUND_RecalcPrimary(DirectSoundDevice *device) HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) { HRESULT hres = DS_OK; + TRACE("(%p, %d)\n", device, forcewave); + if (device->driver) { IDsDriver_Close(device->driver); @@ -336,7 +338,7 @@ HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) err = IDsDriverBuffer_Stop(device->hwbuf); if (err == DSERR_BUFFERLOST) { DSOUND_PrimaryClose(device); - err = DSOUND_ReopenDevice(device, !device->driver); + err = DSOUND_ReopenDevice(device, FALSE); if (FAILED(err)) ERR("DSOUND_ReopenDevice failed\n"); else @@ -454,6 +456,7 @@ HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex, err = DS_OK; goto done; } + if (err == S_FALSE) { /* ALSA specific: S_FALSE tells that recreation was successful, @@ -476,20 +479,28 @@ HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex, { DSOUND_PrimaryClose(device); - if (device->drvdesc.dwFlags & DSDDESC_DOMMSYSTEMSETFORMAT) + err = DSOUND_ReopenDevice(device, FALSE); + if (FAILED(err)) { - err = DSOUND_ReopenDevice(device, FALSE); - if (FAILED(err)) - { - WARN("DSOUND_ReopenDevice failed: %08x\n", err); - goto done; - } + WARN("DSOUND_ReopenDevice failed: %08x\n", err); + goto done; } err = DSOUND_PrimaryOpen(device); if (err != DS_OK) { WARN("DSOUND_PrimaryOpen failed\n"); goto done; } + + if (wfex->nSamplesPerSec/100 != device->pwfx->nSamplesPerSec/100 && forced && device->buffer) + { + DSOUND_PrimaryClose(device); + device->pwfx->nSamplesPerSec = wfex->nSamplesPerSec; + err = DSOUND_ReopenDevice(device, TRUE); + if (FAILED(err)) + WARN("DSOUND_ReopenDevice(2) failed: %08x\n", err); + else if (FAILED((err = DSOUND_PrimaryOpen(device)))) + WARN("DSOUND_PrimaryOpen(2) failed: %08x\n", err); + } } if (nSamplesPerSec != device->pwfx->nSamplesPerSec || bpp != device->pwfx->wBitsPerSample || chans != device->pwfx->nChannels) {

1 0

Jeff Latimer : cabinet: Remove unnecessary function.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 30892c8b8d81790428a9ddc6ef1209778695067c URL: http://source.winehq.org/git/wine.git/?a=commit;h=30892c8b8d81790428a9ddc6e… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Sep 6 20:41:52 2007 +1000 cabinet: Remove unnecessary function. --- dlls/cabinet/fdi.c | 33 ++++++++------------------------- 1 files changed, 8 insertions(+), 25 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index eea6218..1056d5f 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -412,26 +412,6 @@ static long FDI_getoffset(HFDI hfdi, INT_PTR hf) } /********************************************************************** - * FDI_realloc (internal) - * - * we can't use _msize; the user might not be using malloc, so we require - * an explicit specification of the previous size. inefficient. - */ -static void *FDI_realloc(HFDI hfdi, void *mem, size_t prevsize, size_t newsize) -{ - void *rslt = NULL; - char *irslt, *imem; - size_t copysize = (prevsize < newsize) ? prevsize : newsize; - if (prevsize == newsize) return mem; - rslt = PFDI_ALLOC(hfdi, newsize); - if (rslt) - for (irslt = (char *)rslt, imem = (char *)mem; (copysize); copysize--) - *irslt++ = *imem++; - PFDI_FREE(hfdi, mem); - return rslt; -} - -/********************************************************************** * FDI_read_string (internal) * * allocate and read an arbitrarily long string from the cabinet @@ -439,19 +419,17 @@ static void *FDI_realloc(HFDI hfdi, void *mem, size_t prevsize, size_t newsize) static char *FDI_read_string(HFDI hfdi, INT_PTR hf, long cabsize) { size_t len=256, - oldlen = 0, base = FDI_getoffset(hfdi, hf), maxlen = cabsize - base; BOOL ok = FALSE; unsigned int i; cab_UBYTE *buf = NULL; - TRACE("(hfdi == ^%p, hf == %ld)\n", hfdi, hf); + TRACE("(hfdi == ^%p, hf == %ld, cabsize == %ld)\n", hfdi, hf, cabsize); do { if (len > maxlen) len = maxlen; - if (!(buf = FDI_realloc(hfdi, buf, oldlen, len))) break; - oldlen = len; + if (!(buf = PFDI_ALLOC(hfdi, len))) break; if (!PFDI_READ(hfdi, hf, buf, len)) break; /* search for a null terminator in what we've just read */ @@ -464,8 +442,13 @@ static char *FDI_read_string(HFDI hfdi, INT_PTR hf, long cabsize) ERR("cabinet is truncated\n"); break; } - len += 256; + /* The buffer is too small for the string. Reset the file to the point + * were we started, free the buffer and increase the size for the next try + */ PFDI_SEEK(hfdi, hf, base, SEEK_SET); + PFDI_FREE(hfdi, buf); + buf = NULL; + len *= 2; } } while (!ok);

1 0

Aric Stewart : imm32: Further tweeks to CFS_POINT and CFS_RECT placement of the default ime window .
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 7f83b940b5144f0079601e43280da06663be2159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f83b940b5144f0079601e432… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 5 13:11:51 2007 +0900 imm32: Further tweeks to CFS_POINT and CFS_RECT placement of the default ime window. --- dlls/imm32/imm.c | 78 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 49 insertions(+), 29 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 38ba65e..b95b257 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1981,6 +1981,7 @@ static void PaintDefaultIMEWnd(HWND hwnd) LPBYTE compdata = NULL; HMONITOR monitor; MONITORINFO mon_info; + INT offX=0, offY=0; GetClientRect(hwnd,&rect); FillRect(hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); @@ -2005,24 +2006,30 @@ static void PaintDefaultIMEWnd(HWND hwnd) pt.y = size.cy; LPtoDP(hdc,&pt,1); - if (root_context->IMC.cfCompForm.dwStyle == CFS_POINT || - root_context->IMC.cfCompForm.dwStyle == CFS_FORCE_POSITION) + /* + * How this works based on tests on windows: + * CFS_POINT: then we start our window at the point and grow it as large + * as it needs to be for the string. + * CFS_RECT: we still use the ptCurrentPos as a starting point and our + * window is only as large as we need for the string, but we do not + * grow such that our window exceeds the given rect. Wrapping if + * needed and possible. If our ptCurrentPos is outside of our rect + * then no window is displayed. + * CFS_FORCE_POSITION: appears to behave just like CFS_POINT + * maybe becase the default MSIME does not do any IME adjusting. + */ + if (root_context->IMC.cfCompForm.dwStyle != CFS_DEFAULT) { POINT cpt = root_context->IMC.cfCompForm.ptCurrentPos; ClientToScreen(root_context->IMC.hWnd,&cpt); rect.left = cpt.x; rect.top = cpt.y; - rect.right = rect.left + pt.x + 20; - rect.bottom = rect.top + pt.y + 20; + rect.right = rect.left + pt.x; + rect.bottom = rect.top + pt.y; + offX=offY=10; monitor = MonitorFromPoint(cpt, MONITOR_DEFAULTTOPRIMARY); } - else if (root_context->IMC.cfCompForm.dwStyle == CFS_RECT) - { - rect = root_context->IMC.cfCompForm.rcArea; - MapWindowPoints( root_context->IMC.hWnd, 0, (POINT *)&rect, 2 ); - monitor = MonitorFromRect(&rect, MONITOR_DEFAULTTOPRIMARY); - } - else + else /* CFS_DEFAULT */ { /* Windows places the default IME window in the bottom left */ HWND target = root_context->IMC.hWnd; @@ -2032,34 +2039,47 @@ static void PaintDefaultIMEWnd(HWND hwnd) rect.top = rect.bottom; rect.right = rect.left + pt.x + 20; rect.bottom = rect.top + pt.y + 20; + offX=offY=10; monitor = MonitorFromWindow(target, MONITOR_DEFAULTTOPRIMARY); } - /* make sure we are on the desktop */ - mon_info.cbSize = sizeof(mon_info); - GetMonitorInfoW(monitor, &mon_info); - - if (rect.bottom > mon_info.rcWork.bottom) - { - int shift = rect.bottom - mon_info.rcWork.bottom; - rect.top -= shift; - rect.bottom -= shift; - } - if (rect.left < 0) + if (root_context->IMC.cfCompForm.dwStyle == CFS_RECT) { - rect.right -= rect.left; - rect.left = 0; + RECT client; + client =root_context->IMC.cfCompForm.rcArea; + MapWindowPoints( root_context->IMC.hWnd, 0, (POINT *)&client, 2 ); + IntersectRect(&rect,&rect,&client); + /* TODO: Wrap the input if needed */ } - if (rect.right > mon_info.rcWork.right) + + if (root_context->IMC.cfCompForm.dwStyle == CFS_DEFAULT) { - int shift = rect.right - mon_info.rcWork.right; - rect.left -= shift; - rect.right -= shift; + /* make sure we are on the desktop */ + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(monitor, &mon_info); + + if (rect.bottom > mon_info.rcWork.bottom) + { + int shift = rect.bottom - mon_info.rcWork.bottom; + rect.top -= shift; + rect.bottom -= shift; + } + if (rect.left < 0) + { + rect.right -= rect.left; + rect.left = 0; + } + if (rect.right > mon_info.rcWork.right) + { + int shift = rect.right - mon_info.rcWork.right; + rect.left -= shift; + rect.right -= shift; + } } SetWindowPos(hwnd, HWND_TOPMOST, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, SWP_NOACTIVATE); - TextOutW(hdc, 10,10, CompString, compstr->dwCompStrLen); + TextOutW(hdc, offX,offY, CompString, compstr->dwCompStrLen); if (oldfont) SelectObject(hdc,oldfont);

1 0

Aric Stewart : comctl32: Flesh out version info.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: bbc57572630a60674086eccd788e0200988c730d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc57572630a60674086eccd7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 5 17:43:10 2007 +0900 comctl32: Flesh out version info. --- dlls/comctl32/comctl32.h | 2 -- dlls/comctl32/rsrc.rc | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 5917a9b..5e74a16 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -153,8 +153,6 @@ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc); BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc); #define COMCTL32_VERSION_MINOR 81 -#define WINE_FILEVERSION 5, COMCTL32_VERSION_MINOR, 4704, 1100 -#define WINE_FILEVERSIONSTR "5.81" /* Our internal stack structure of the window procedures to subclass */ typedef struct _SUBCLASSPROCS { diff --git a/dlls/comctl32/rsrc.rc b/dlls/comctl32/rsrc.rc index e769123..19bbb77 100644 --- a/dlls/comctl32/rsrc.rc +++ b/dlls/comctl32/rsrc.rc @@ -27,6 +27,13 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#define WINE_FILEDESCRIPTION_STR "Wine Common Controls" +#define WINE_FILENAME_STR "comctl32.dll" +#define WINE_FILEVERSION COMCTL32_VERSION, COMCTL32_VERSION_MINOR, 4704, 1100 +#define WINE_FILEVERSIONSTR "5.81" +#define WINE_PRODUCTVERSION WINE_FILEVERSION +#define WINE_PRODUCTVERSION_STR WINE_FILEVERSIONSTR + #include "wine/wine_common_ver.rc" /* BINRES idt_check.bmp */

1 0

Maarten Lankhorst : winealsa: Use correct capture position in getposition.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 5eabdff6aba82b20581bc567a376ba3893f9d6c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eabdff6aba82b20581bc567a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Sep 2 16:37:04 2007 +0200 winealsa: Use correct capture position in getposition. --- dlls/winealsa.drv/dscapture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 243f24a..7c1aaad 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -516,7 +516,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_GetPosition(PIDSCDRIVERBUFFER i hw_wptr = This->mmap_pos; if (lpdwCappos) - *lpdwCappos = realpos_to_fakepos(This, hw_wptr); + *lpdwCappos = realpos_to_fakepos(This, hw_pptr); if (lpdwReadpos) *lpdwReadpos = realpos_to_fakepos(This, hw_wptr);

1 0

Maarten Lankhorst : winealsa: Remove forceformat and 2 orphan LeaveCriticalSection.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 985df9cdf0dc1561cebfa27a01bd7f98d0c7d746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985df9cdf0dc1561cebfa27a0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Sep 5 10:56:59 2007 +0200 winealsa: Remove forceformat and 2 orphan LeaveCriticalSection. --- dlls/winealsa.drv/dsoutput.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index c1cd039..d51e39a 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -73,7 +73,6 @@ struct IDsDriverImpl /* IDsDriverImpl fields */ IDsDriverBufferImpl* primary; UINT wDevID; - DWORD forceformat; }; struct IDsDriverBufferImpl @@ -396,8 +395,6 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx) { if (errno != EBUSY || !This->pcm) { - /* **** */ - LeaveCriticalSection(&This->pcm_crst); WARN("Cannot open sound device: %s\n", snd_strerror(err)); return DSERR_GENERIC; } @@ -407,8 +404,6 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx) err = snd_pcm_open(&pcm, WOutDev[This->drv->wDevID].pcmname, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK); if (err < 0) { - /* **** */ - LeaveCriticalSection(&This->pcm_crst); WARN("Cannot open sound device: %s\n", snd_strerror(err)); return DSERR_BUFFERLOST; } @@ -433,12 +428,7 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx) err = snd_pcm_hw_params_set_rate_near(pcm, hw_params, &rate, NULL); if (err < 0) { rate = pwfx->nSamplesPerSec; WARN("Could not set rate\n"); goto err; } - if (!ALSA_NearMatch(rate, pwfx->nSamplesPerSec) && (This->drv->forceformat++)) - { - WARN("Could not set exact rate %d, instead %d, bombing out\n", pwfx->nSamplesPerSec, rate); - goto err; - } - else if (!ALSA_NearMatch(rate, pwfx->nSamplesPerSec)) + if (!ALSA_NearMatch(rate, pwfx->nSamplesPerSec)) { WARN("Could not set sound rate to %d, but instead to %d\n", pwfx->nSamplesPerSec, rate); pwfx->nSamplesPerSec = rate; @@ -496,7 +486,6 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetFormat(PIDSDRIVERBUFFER iface, LPWA /* **** */ EnterCriticalSection(&This->pcm_crst); - This->drv->forceformat = FALSE; hr = SetFormat(This, pwfx); /* **** */ LeaveCriticalSection(&This->pcm_crst);

1 0

David Hedberg : ddraw: Fix and test case for situation where DDSD_MIPMAPCOUNT is set and dwMipMapCount is 0 .
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: c53487b599a50ddcf0311ffe4be456975f984cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c53487b599a50ddcf0311ffe4… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Sep 3 13:57:24 2007 +0200 ddraw: Fix and test case for situation where DDSD_MIPMAPCOUNT is set and dwMipMapCount is 0. --- dlls/ddraw/ddraw.c | 7 ++++++- dlls/ddraw/tests/dsurface.c | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 696552d..7c6bf5f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2417,7 +2417,12 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, { if(desc2.dwFlags & DDSD_MIPMAPCOUNT) { - /* Mipmap count is given, nothing to do */ + /* Mipmap count is given, should not be 0 */ + if( desc2.u2.dwMipMapCount == 0 ) + { + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; + } } else { diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 6c223f4..59fd4ae 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -183,6 +183,25 @@ static void MipMapCreationTest(void) /* Destroy the surface. */ IDirectDrawSurface_Release(lpDDSMipMapTest); + + + /* Fifth mipmap creation test: try to create a surface with + DDSCAPS_COMPLEX, DDSCAPS_MIPMAP, DDSD_MIPMAPCOUNT, + where dwMipMapCount = 0. This should fail. */ + + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(ddsd).dwMipMapCount = 0; + ddsd.dwWidth = 128; + ddsd.dwHeight = 32; + rc = IDirectDraw_CreateSurface(lpDD, &ddsd, &lpDDSMipMapTest, NULL); + ok(rc==DDERR_INVALIDPARAMS,"CreateSurface returned: %x\n",rc); + + /* Destroy the surface. */ + if( rc == DD_OK ) + IDirectDrawSurface_Release(lpDDSMipMapTest); + } static void SrcColorKey32BlitTest(void)

1 0