June 2008 - Wine-commits - list.winehq.org

Rob Shearman : widl: Factor out the finding of a registered type to reduce code duplication.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 50e54c0c1539dd1adc37805ec618909cea7e94cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e54c0c1539dd1adc37805ec… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 23 22:27:53 2008 +0100 widl: Factor out the finding of a registered type to reduce code duplication. --- tools/widl/parser.y | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6846368..ba909bc 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1900,16 +1900,22 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at return type; } -type_t *find_type(const char *name, int t) +static type_t *find_type_helper(const char *name, int t) { struct rtype *cur = type_hash[hash_ident(name)]; while (cur && (cur->t != t || strcmp(cur->name, name))) cur = cur->next; - if (!cur) { + return cur ? cur->type : NULL; +} + +type_t *find_type(const char *name, int t) +{ + type_t *type = find_type_helper(name, t); + if (!type) { error_loc("type '%s' not found\n", name); return NULL; } - return cur->type; + return type; } static type_t *find_type2(char *name, int t) @@ -1921,25 +1927,18 @@ static type_t *find_type2(char *name, int t) int is_type(const char *name) { - struct rtype *cur = type_hash[hash_ident(name)]; - while (cur && (cur->t || strcmp(cur->name, name))) - cur = cur->next; - if (cur) return TRUE; - return FALSE; + return find_type_helper(name, 0) != NULL; } static type_t *get_type(unsigned char type, char *name, int t) { - struct rtype *cur = NULL; type_t *tp; if (name) { - cur = type_hash[hash_ident(name)]; - while (cur && (cur->t != t || strcmp(cur->name, name))) - cur = cur->next; - } - if (cur) { - free(name); - return cur->type; + tp = find_type_helper(name, t); + if (tp) { + free(name); + return tp; + } } tp = make_type(type, NULL); tp->name = name;

1 0

Maarten Lankhorst : quartz: Clear pin value if not connected.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: e8a023f9f860e06d10907fed03bdd6b496bb7f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a023f9f860e06d10907fed0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jun 19 21:18:26 2008 -0700 quartz: Clear pin value if not connected. --- dlls/quartz/pin.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 18079f3..766dad9 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -408,7 +408,10 @@ HRESULT WINAPI IPinImpl_ConnectedTo(IPin * iface, IPin ** ppPin) hr = S_OK; } else + { hr = VFW_E_NOT_CONNECTED; + *ppPin = NULL; + } } LeaveCriticalSection(This->pCritSec);

1 0

Maarten Lankhorst : quartz: Add support for VideoInfoHeader2 to AVI Decompressor.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 9009e68c5b4aa7ff3dc592e8563e53591735916a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9009e68c5b4aa7ff3dc592e85… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jun 19 21:17:08 2008 -0700 quartz: Add support for VideoInfoHeader2 to AVI Decompressor. --- dlls/quartz/avidec.c | 46 +++++++++++++++++++++++++++++++--------------- 1 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index e35f144..79fd4d8 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -31,6 +31,7 @@ #include "strmif.h" #include "vfwmsgs.h" #include "vfw.h" +#include "dvdmedia.h" #include <assert.h> @@ -179,35 +180,44 @@ static HRESULT AVIDec_ConnectInput(TransformFilterImpl* pTransformFilter, const /* Check root (GUID w/o FOURCC) */ if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) && - (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Video)+4, sizeof(GUID)-4)) && - (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo))) + (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Video)+4, sizeof(GUID)-4))) { - VIDEOINFOHEADER* format = (VIDEOINFOHEADER*)pmt->pbFormat; - - This->hvid = ICLocate(pmt->majortype.Data1, pmt->subtype.Data1, &format->bmiHeader, NULL, ICMODE_DECOMPRESS); + VIDEOINFOHEADER *format1 = (VIDEOINFOHEADER *)pmt->pbFormat; + VIDEOINFOHEADER2 *format2 = (VIDEOINFOHEADER2 *)pmt->pbFormat; + BITMAPINFOHEADER *bmi; + + if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) + bmi = &format1->bmiHeader; + else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) + bmi = &format2->bmiHeader; + else + goto failed; + TRACE("Fourcc: %s\n", debugstr_an((char *)&pmt->subtype.Data1, 4)); + + This->hvid = ICLocate(pmt->majortype.Data1, pmt->subtype.Data1, bmi, NULL, ICMODE_DECOMPRESS); if (This->hvid) { AM_MEDIA_TYPE* outpmt = &((OutputPin*)This->tf.ppPins[1])->pin.mtCurrent; const CLSID* outsubtype; DWORD bih_size; - DWORD output_depth = format->bmiHeader.biBitCount; + DWORD output_depth = bmi->biBitCount; DWORD result; - switch(format->bmiHeader.biBitCount) + switch(bmi->biBitCount) { case 32: outsubtype = &MEDIASUBTYPE_RGB32; break; case 24: outsubtype = &MEDIASUBTYPE_RGB24; break; case 16: outsubtype = &MEDIASUBTYPE_RGB565; break; case 8: outsubtype = &MEDIASUBTYPE_RGB8; break; default: - TRACE("Non standard input depth %d, forced ouptut depth to 32\n", format->bmiHeader.biBitCount); + WARN("Non standard input depth %d, forced output depth to 32\n", bmi->biBitCount); outsubtype = &MEDIASUBTYPE_RGB32; output_depth = 32; break; } /* Copy bitmap header from media type to 1 for input and 1 for output */ - bih_size = format->bmiHeader.biSize + format->bmiHeader.biClrUsed * 4; + bih_size = bmi->biSize + bmi->biClrUsed * 4; This->pBihIn = CoTaskMemAlloc(bih_size); if (!This->pBihIn) { @@ -220,25 +230,31 @@ static HRESULT AVIDec_ConnectInput(TransformFilterImpl* pTransformFilter, const hr = E_OUTOFMEMORY; goto failed; } - memcpy(This->pBihIn, &format->bmiHeader, bih_size); - memcpy(This->pBihOut, &format->bmiHeader, bih_size); + memcpy(This->pBihIn, bmi, bih_size); + memcpy(This->pBihOut, bmi, bih_size); /* Update output format as non compressed bitmap */ This->pBihOut->biCompression = 0; This->pBihOut->biBitCount = output_depth; This->pBihOut->biSizeImage = This->pBihOut->biWidth * This->pBihOut->biHeight * This->pBihOut->biBitCount / 8; - + TRACE("Size: %u\n", This->pBihIn->biSize); result = ICDecompressQuery(This->hvid, This->pBihIn, This->pBihOut); if (result != ICERR_OK) { - TRACE("Unable to found a suitable output format (%d)\n", result); + ERR("Unable to found a suitable output format (%d)\n", result); goto failed; } /* Update output media type */ CopyMediaType(outpmt, pmt); outpmt->subtype = *outsubtype; - memcpy(&(((VIDEOINFOHEADER*)outpmt->pbFormat)->bmiHeader), This->pBihOut, This->pBihOut->biSize); + + if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) + memcpy(&(((VIDEOINFOHEADER *)outpmt->pbFormat)->bmiHeader), This->pBihOut, This->pBihOut->biSize); + else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) + memcpy(&(((VIDEOINFOHEADER2 *)outpmt->pbFormat)->bmiHeader), This->pBihOut, This->pBihOut->biSize); + else + assert(0); /* Update buffer size of media samples in output */ ((OutputPin*)This->tf.ppPins[1])->allocProps.cbBuffer = This->pBihOut->biSizeImage; @@ -251,7 +267,7 @@ static HRESULT AVIDec_ConnectInput(TransformFilterImpl* pTransformFilter, const failed: AVIDec_Cleanup(pTransformFilter); - + TRACE("Connection refused\n"); return hr; }

1 0

Maarten Lankhorst : quartz: Only enumerate renderers if bRender is set in filtermapper.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: b157969d49bd81d23b542b19d55a8c1f8bd004d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b157969d49bd81d23b542b19d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jun 16 17:27:09 2008 -0700 quartz: Only enumerate renderers if bRender is set in filtermapper. --- dlls/quartz/filtermapper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index eeba0b1..b54ccea 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1071,7 +1071,7 @@ static HRESULT WINAPI FilterMapper2_EnumMatchingFilters( const REGFILTERPINS2 * rfp2 = rf2.u.s1.rgPins2 + i; bInputMatch = bInputMatch || (!(rfp2->dwFlags & REG_PINFLAG_B_OUTPUT) && - (!bRender || (rfp2->dwFlags & REG_PINFLAG_B_RENDERER)) && + (!bRender == !(rfp2->dwFlags & REG_PINFLAG_B_RENDERER)) && MatchTypes(bExactMatch, rfp2->nMediaTypes, rfp2->lpMediaType, cInputTypes, pInputTypes)); bOutputMatch = bOutputMatch || ((rfp2->dwFlags & REG_PINFLAG_B_OUTPUT) && MatchTypes(bExactMatch, rfp2->nMediaTypes, rfp2->lpMediaType, cOutputTypes, pOutputTypes));

1 0

Maarten Lankhorst : quartz: DSoundRender shouldn' t delete buffer when already connected.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: d283bcdb6230f2dd255cc085d12690802cbf6527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d283bcdb6230f2dd255cc085d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jun 16 17:16:38 2008 -0700 quartz: DSoundRender shouldn't delete buffer when already connected. --- dlls/quartz/dsoundrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 29596ea..49dd4b1 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -780,7 +780,7 @@ static HRESULT WINAPI DSoundRender_InputPin_ReceiveConnection(IPin * iface, IPin This->pin.pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin); } - else + else if (hr != VFW_E_ALREADY_CONNECTED) { if (DSImpl->dsbuffer) IDirectSoundBuffer_Release(DSImpl->dsbuffer);

1 0

Maarten Lankhorst : quartz: Have thread safety in memallocator.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 3d43a629d05967af6fc9fd056f995b2a563f4f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d43a629d05967af6fc9fd056… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jun 15 17:52:09 2008 -0700 quartz: Have thread safety in memallocator. --- dlls/quartz/memallocator.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index d4539aa..7969193 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -257,7 +257,8 @@ static HRESULT WINAPI BaseMemAllocator_Decommit(IMemAllocator * iface) } else { - assert(This->lWaiting == 0); + if (This->lWaiting != 0) + ERR("Waiting: %d\n", This->lWaiting); This->bCommitted = FALSE; CloseHandle(This->hSemWaiting); @@ -286,19 +287,24 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa *pSample = NULL; - if (!This->bCommitted) - return VFW_E_NOT_COMMITTED; + EnterCriticalSection(This->pCritSect); + if (!This->bCommitted || This->bDecommitQueued) + hr = VFW_E_NOT_COMMITTED; + else + ++This->lWaiting; + LeaveCriticalSection(This->pCritSect); + if (FAILED(hr)) + return hr; - This->lWaiting++; if (WaitForSingleObject(This->hSemWaiting, (dwFlags & AM_GBF_NOWAIT) ? 0 : INFINITE) != WAIT_OBJECT_0) { - This->lWaiting--; + InterlockedDecrement(&This->lWaiting); return VFW_E_TIMEOUT; } - This->lWaiting--; EnterCriticalSection(This->pCritSect); { + --This->lWaiting; if (!This->bCommitted) hr = VFW_E_NOT_COMMITTED; else if (This->bDecommitQueued) @@ -347,7 +353,8 @@ static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMed { HRESULT hrfree; - assert(This->lWaiting == 0); + if (This->lWaiting != 0) + ERR("Waiting: %d\n", This->lWaiting); This->bCommitted = FALSE; This->bDecommitQueued = FALSE;

1 0

Maarten Lankhorst : quartz: Implement VideoRenderer_GetCurrentImage.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: dae09d000c96d1f26ef20585a4eb864b8e1d9bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dae09d000c96d1f26ef20585a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jun 10 18:45:25 2008 +0200 quartz: Implement VideoRenderer_GetCurrentImage. --- dlls/quartz/videorenderer.c | 80 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index fa3905e..bda9fdf 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -87,6 +87,9 @@ typedef struct VideoRendererImpl BOOL bAggregatable; REFERENCE_TIME rtLastStop; MediaSeekingImpl mediaSeeking; + + /* During pause we can hold a single sample, for use in GetCurrentImage */ + IMediaSample *sample_held; } VideoRendererImpl; static LRESULT CALLBACK VideoWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -408,6 +411,15 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) } #endif + if (This->state == State_Paused) + { + if (This->sample_held) + IMediaSample_Release(This->sample_held); + + This->sample_held = pSample; + IMediaSample_AddRef(pSample); + } + if (This->pClock && This->state == State_Running) { REFERENCE_TIME time, trefstart, trefstop; @@ -585,6 +597,7 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) MediaSeekingImpl_Init((IBaseFilter*)pVideoRenderer, VideoRendererImpl_Change, VideoRendererImpl_Change, VideoRendererImpl_Change, &pVideoRenderer->mediaSeeking, &pVideoRenderer->csFilter); pVideoRenderer->mediaSeeking.lpVtbl = &VideoRendererImpl_Seeking_Vtbl; + pVideoRenderer->sample_held = NULL; *ppv = (LPVOID)pVideoRenderer; } else @@ -774,9 +787,15 @@ static HRESULT WINAPI VideoRenderer_Stop(IBaseFilter * iface) EnterCriticalSection(&This->csFilter); { This->state = State_Stopped; + + if (This->sample_held) + { + IMediaSample_Release(This->sample_held); + This->sample_held = NULL; + } } LeaveCriticalSection(&This->csFilter); - + return S_OK; } @@ -812,6 +831,12 @@ static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tSta This->rtStreamStart = tStart; This->state = State_Running; + + if (This->sample_held) + { + IMediaSample_Release(This->sample_held); + This->sample_held = NULL; + } } LeaveCriticalSection(&This->csFilter); @@ -1438,8 +1463,59 @@ static HRESULT WINAPI Basicvideo_GetCurrentImage(IBasicVideo *iface, long *pBufferSize, long *pDIBImage) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); + BITMAPINFOHEADER *bmiHeader; + LONG needed_size; + AM_MEDIA_TYPE *amt = &This->pInputPin->pin.mtCurrent; + char *ptr; + + EnterCriticalSection(&This->csFilter); + + if (!This->sample_held) + { + LeaveCriticalSection(&This->csFilter); + return (This->state == State_Paused ? E_UNEXPECTED : VFW_E_NOT_PAUSED); + } + + FIXME("(%p/%p)->(%p, %p): partial stub\n", This, iface, pBufferSize, pDIBImage); - FIXME("(%p/%p)->(%p, %p): stub !!!\n", This, iface, pBufferSize, pDIBImage); + if (IsEqualIID(&amt->formattype, &FORMAT_VideoInfo)) + { + bmiHeader = &((VIDEOINFOHEADER *)amt->pbFormat)->bmiHeader; + } + else if (IsEqualIID(&amt->formattype, &FORMAT_VideoInfo2)) + { + bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; + } + else + { + FIXME("Unknown type %s\n", debugstr_guid(&amt->subtype)); + LeaveCriticalSection(&This->csFilter); + return VFW_E_RUNTIME_ERROR; + } + + needed_size = bmiHeader->biSize; + needed_size += IMediaSample_GetActualDataLength(This->sample_held); + + if (!pDIBImage) + { + *pBufferSize = needed_size; + LeaveCriticalSection(&This->csFilter); + return S_OK; + } + + if (needed_size < *pBufferSize) + { + ERR("Buffer too small %u/%lu\n", needed_size, *pBufferSize); + LeaveCriticalSection(&This->csFilter); + return E_FAIL; + } + *pBufferSize = needed_size; + + memcpy(pDIBImage, bmiHeader, bmiHeader->biSize); + IMediaSample_GetPointer(This->sample_held, (BYTE **)&ptr); + memcpy((char *)pDIBImage + bmiHeader->biSize, ptr, IMediaSample_GetActualDataLength(This->sample_held)); + + LeaveCriticalSection(&This->csFilter); return S_OK; }

1 0

Maarten Lankhorst : quartz: Implement GraphConfig_Reconfigure.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 0bdc8bc5c115dc65a93ce1e41bfe0a2ca0fcbfcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bdc8bc5c115dc65a93ce1e41… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jun 23 13:15:46 2008 -0700 quartz: Implement GraphConfig_Reconfigure. --- dlls/quartz/filtergraph.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index eb31cf8..6ceb125 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5032,10 +5032,20 @@ static HRESULT WINAPI GraphConfig_Reconfigure(IGraphConfig *iface, HANDLE hAbortEvent) { ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + HRESULT hr; - FIXME("(%p)->(%p, %p, %x, %p): stub!\n", This, pCallback, pvContext, dwFlags, hAbortEvent); - - return E_NOTIMPL; + WARN("(%p)->(%p, %p, %x, %p): partial stub!\n", This, pCallback, pvContext, dwFlags, hAbortEvent); + + if (hAbortEvent) + FIXME("The parameter hAbortEvent is not handled!\n"); + + EnterCriticalSection(&This->cs); + + hr = IGraphConfigCallback_Reconfigure(pCallback, pvContext, dwFlags); + + LeaveCriticalSection(&This->cs); + + return hr; } static HRESULT WINAPI GraphConfig_AddFilterToCache(IGraphConfig *iface,

1 0

Paul Vriens : setupapi/tests: Add a simple test for the DelReg directive.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 68a3ed219e7f1196106e8701691fdbfab082fbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a3ed219e7f1196106e87016… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jun 23 21:45:14 2008 +0200 setupapi/tests: Add a simple test for the DelReg directive. --- dlls/setupapi/tests/install.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 0044f01..ff3be6d 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -137,6 +137,44 @@ static void test_cmdline(void) ok(DeleteFile(infwithspaces), "Expected source inf to exist, last error was %d\n", GetLastError()); } +static const char *cmdline_inf_reg = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" + "DelReg=Del.Settings\n" + "[Del.Settings]\n" + "HKCU,Software\\Wine\\setupapitest\n"; + +static void test_registry(void) +{ + HKEY key; + LONG res; + char path[MAX_PATH]; + + /* First create a registry structure we would like to be deleted */ + ok(!RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest\\setupapitest", &key), + "Expected RegCreateKeyA to succeed\n"); + + /* Doublecheck if the registry key is present */ + ok(!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest\\setupapitest", &key), + "Expected registry key to exist\n"); + + create_inf_file(inffile, cmdline_inf_reg); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + run_cmdline("DefaultInstall", 128, path); + + /* Check if the registry key is recursively deleted */ + res = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", &key); + todo_wine + ok(res == ERROR_FILE_NOT_FOUND, "Didn't expect the registry key to exist\n"); + /* Just in case */ + if (res == ERROR_SUCCESS) + { + RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest\\setupapitest"); + RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest"); + } + ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); +} + static void test_install_svc_from(void) { char inf[2048]; @@ -386,6 +424,7 @@ START_TEST(install) assert(hhook != 0); test_cmdline(); + test_registry(); test_install_svc_from(); test_driver_install();

1 0

Hans Leidekker : wininet: Make a test pass on IE6.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 95d572dd7e1f1ff67faff2063f8ae10f65f70b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d572dd7e1f1ff67faff2063… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jun 23 20:59:08 2008 +0200 wininet: Make a test pass on IE6. --- dlls/wininet/tests/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index dfe48c0..513afb8 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1677,7 +1677,7 @@ static void test_header_handling_order(int port) size = sizeof(status); ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + ok(status == 200 || status == 400 /* IE6 */, "request failed with status %u\n", status); InternetCloseHandle(request); InternetCloseHandle(connect);

1 0