- wine-devel - winehq.org

Re: crypt32: CryptProtectData/CryptUnprotectData
by Alexandre Julliard 04 May '05

04 May '05

Kees Cook <kees(a)outflux.net> writes: > ChangeLog: > Black-box implementation of CryptProtectData/CryptUnprotectData > > This is a resend, since it looks like current patches are making their > way into CVS now. :) It was reviewed last week by several people, and > includes docs, tests, etc. I don't understand while you come up with such an elaborate scheme of storing things in the registry when it's clearly not the way this thing is supposed to work. If you can't figure out what Windows does, then just xoring the data with 0xdeadbeef or something like this would be at least as secure as your solution, and would actually be much closer to the proper behavior. -- Alexandre Julliard julliard(a)winehq.org

3 8

wineconf presentations
by Ivan Leo Puoti 04 May '05

04 May '05

Please send all presentations/PDFs/whatever to ivanleo(a)gmail.com and I'll upload them to the server that will be providing the wineconf videos. Ivan.

2 1

Development method
by David Hemmo 04 May '05

04 May '05

Hello, Right now, each time I make a modification (even one line) I do a 'make' followed by a 'make install'. Is there a faster way ? Thanks David Hemmo

4 5

regression due to patch 16515 2005-03-09
by Timm Reasbeck 04 May '05

04 May '05

The application of this patch causes a menu item to not be displayed. In appplication TablEdit Demo available at http://www.tabledit.com/download/tabled32.exe there is under the "File" entry of the menubar a submenu entry for both "Import" and "Export" which are both present when run under WINE before this patch is applied. After application the "Import" submenu is no longer present. The loss of this submenu persists into the current 20050405 release. I am running Slackware 10.0 on a AMD K6 500Mhz with self-compiled binaries from CVS as per regression testing procedure on winehq.com. -- Timm Reasbeck

3 2

vfwcapture interface nearly fully implemented (For msn at least)
by Maarten Lankhorst 04 May '05

04 May '05

I thought I'd move it around a little and put it in qcap, where I *think* it should reside, I know CaptureGraphBuilder has to, so I moved it to I had to copy some files from quartz for it though media.c is enummedia.c in quartz pin.c is a diet version of quartz' pin.c regsvr.c is meant to register the vfwcapture and the capturegraphbuilder class, also copied from quartz qcap_main.c is basically a modified version of quartz' main.c vfwcapture related files: vfwcapture.c - front-end com interface v4l.c - Does the magic between /dev/video and vfwcapture null.c - NULL renderer, in case v4l isn't available the functions get enabled capture.h - headers that are used for null.c/v4l.c/vfwcapture.c Current todo list: - Implement YUV formats (If anyone has some documentation on it I would be grateful, if you want to write the renderers yourself (Should be easy) I would be eternal grateful) - Add resizing (Help me!!! Fix my Resize function (24 bits to 24 bits) and send the results to me), currently resizing (Clipping and flipping image horizontal) should crash when format < 320x240 - Find a way for devenum to keep /dev/video* apart (I have a vague idea on how to do it) - Fix Capture_SetMediaType function to try to adjust size I'll do the last thing of my TODO list myself, but if you're interested in helping you're free to do so :) If your webcam isn't detected in msn messenger there could be several reasons: 1. Make sure you use the BUILTIN devenum,quartz and qcap 2. Make sure you regsvr32'd the *BUILTIN* qcap and quartz (regsvr32 qcap) 3. Delete HKEY_CURRENT_USER/Software/Microsoft/ActiveMovie 4. Check permissions for /dev/video* 5. Adjust #define VIDEODEVICE (in dlls/qcap/vfwcapture.c) to get the right video device.. 6. Try starting up msn with WINEDEBUG=-all,+qcap_v4l and check for output, especially the ERR lines You could get something like: err:qcap_v4l:Capture_Initialise /dev/video1: (Some explanation why the initialisation failed here) in that case it should be obvious why it wouldn't work and how you can fix it :) If it can't render your webcam, write a renderer for it and give me a copy of it. If it your image gets clipped, dig into msdn and write a proper resize function and pass me a copy. If you're too lazy to apply my quartz fixes patch, native quartz will work too.. (I tested it).. but I offer no guarantees on it.. If something else happens, tell me the results, and I'll look at it.. (If not covered by the above ;)) At this point, it is not recommended to use this in msn but you're free to try, you will need a native msvfw32.dll, because a function msn uses is not implemented in the builtin This patch will only work for wine-cvs, since it uses some patches that are for now only in the wine cvs tree Devices I tested this on: A creative usb webcam (zc030x driver), images looked distorted because of driver issues, not because of bugs on my side bttv, worked perfect, because for some reason it initialised with a resolution of 320x240, so I didn't need to touch it Index: dlls/quartz/enummedia.c =================================================================== RCS file: /home/wine/wine/dlls/quartz/enummedia.c,v retrieving revision 1.5 diff -u -p -r1.5 enummedia.c --- dlls/quartz/enummedia.c 6 Jan 2005 19:36:47 -0000 1.5 +++ dlls/quartz/enummedia.c 1 May 2005 00:10:56 -0000 @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); HRESULT CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc) { memcpy(pDest, pSrc, sizeof(AM_MEDIA_TYPE)); + if (!pSrc->pbFormat) return S_OK; if (!(pDest->pbFormat = CoTaskMemAlloc(pSrc->cbFormat))) return E_OUTOFMEMORY; memcpy(pDest->pbFormat, pSrc->pbFormat, pSrc->cbFormat); @@ -45,6 +46,7 @@ void DeleteMediaType(AM_MEDIA_TYPE * pMe IUnknown_Release(pMediaType->pUnk); pMediaType->pUnk = NULL; } + CoTaskMemFree(pMediaType); } BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards) @@ -90,7 +92,11 @@ HRESULT IEnumMediaTypesImpl_Construct(co pEnumMediaTypes->enumMediaDetails.cMediaTypes = pDetails->cMediaTypes; pEnumMediaTypes->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * pDetails->cMediaTypes); for (i = 0; i < pDetails->cMediaTypes; i++) - pEnumMediaTypes->enumMediaDetails.pMediaTypes[i] = pDetails->pMediaTypes[i]; + if (FAILED(CopyMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i], &pDetails->pMediaTypes[i]))) { + while (--i > 0) CoTaskMemFree(pEnumMediaTypes->enumMediaDetails.pMediaTypes[i].pbFormat); + CoTaskMemFree(pEnumMediaTypes->enumMediaDetails.pMediaTypes); + return E_OUTOFMEMORY; + } *ppEnum = (IEnumMediaTypes *)(&pEnumMediaTypes->lpVtbl); return S_OK; } @@ -136,12 +142,14 @@ static ULONG WINAPI IEnumMediaTypesImpl_ if (!refCount) { + int i; + for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) + if (This->enumMediaDetails.pMediaTypes[i].pbFormat) + CoTaskMemFree(This->enumMediaDetails.pMediaTypes[i].pbFormat); CoTaskMemFree(This->enumMediaDetails.pMediaTypes); CoTaskMemFree(This); - return 0; } - else - return refCount; + return refCount; } static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cMediaTypes, AM_MEDIA_TYPE ** ppMediaTypes, ULONG * pcFetched) @@ -159,7 +167,13 @@ static HRESULT WINAPI IEnumMediaTypesImp ULONG i; *ppMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * cFetched); for (i = 0; i < cFetched; i++) - (*ppMediaTypes)[i] = This->enumMediaDetails.pMediaTypes[This->uIndex + i]; + if (FAILED(CopyMediaType(&(*ppMediaTypes)[i], &This->enumMediaDetails.pMediaTypes[This->uIndex + i]))) { + while (--i) + CoTaskMemFree((*ppMediaTypes)[i].pbFormat); + CoTaskMemFree(*ppMediaTypes); + *ppMediaTypes = NULL; + return E_OUTOFMEMORY; + } } if ((cMediaTypes != 1) || pcFetched) Index: dlls/quartz/filtergraph.c =================================================================== RCS file: /home/wine/wine/dlls/quartz/filtergraph.c,v retrieving revision 1.27 diff -u -p -r1.27 filtergraph.c --- dlls/quartz/filtergraph.c 24 Mar 2005 21:01:37 -0000 1.27 +++ dlls/quartz/filtergraph.c 1 May 2005 00:10:58 -0000 @@ -245,6 +245,9 @@ static ULONG Filtergraph_Release(IFilter TRACE("(%p)->(): new ref = %ld\n", This, ref); if (ref == 0) { + int i; + for (i = 0; i < This->nFilters; i++) + IBaseFilter_Release(This->ppFiltersInGraph[i]); IFilterMapper2_Release(This->pFilterMapper2); CloseHandle(This->hEventCompletion); EventsQueue_Destroy(&This->evqueue); @@ -556,8 +559,7 @@ static HRESULT GetInternalConnections(IB IPin_QueryDirection(ppin, &pindir); if (pindir == PINDIR_OUTPUT) i++; - else - IPin_Release(ppin); + IPin_Release(ppin); } *pppins = CoTaskMemAlloc(sizeof(IPin*)*i); /* Retrieve output pins */ @@ -605,10 +607,8 @@ static HRESULT WINAPI Graphbuilder_Conne TRACE("(%p/%p)->(%p, %p)\n", This, iface, ppinOut, ppinIn); /* Try direct connection first */ - TRACE("Try direct connection first\n"); hr = IPin_Connect(ppinOut, ppinIn, NULL); if (SUCCEEDED(hr)) { - TRACE("Direct connection successful\n"); return S_OK; } TRACE("Direct connection failed, trying to insert other filters\n"); @@ -648,7 +648,7 @@ static HRESULT WINAPI Graphbuilder_Conne VARIANT var; GUID clsid; IPin** ppins; - IPin* ppinfilter; + IPin* ppinfilter = NULL; IBaseFilter* pfilter = NULL; hr = GetFilterInfo(pMoniker, &clsid, &var); @@ -677,6 +677,7 @@ static HRESULT WINAPI Graphbuilder_Conne ERR("Enumpins (%lx)\n", hr); goto error; } + hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin); if (FAILED(hr)) { ERR("Next (%lx)\n", hr); @@ -703,17 +704,22 @@ static HRESULT WINAPI Graphbuilder_Conne TRACE("pins to consider: %ld\n", nb); for(i = 0; i < nb; i++) { TRACE("Processing pin %d\n", i); - hr = IGraphBuilder_Connect(iface, ppins[0], ppinIn); + hr = IGraphBuilder_Connect(iface, ppins[i], ppinIn); if (FAILED(hr)) { - TRACE("Cannot render pin %p (%lx)\n", ppinfilter, hr); - return hr; + TRACE("Cannot render pin %p (%lx)\n", ppinfilter, hr); } + IPin_Release(ppins[i]); + if (SUCCEEDED(hr)) break; } + while (++i < nb) IPin_Release(ppins[i]); CoTaskMemFree(ppins); + IBaseFilter_Release(pfilter); + IPin_Release(ppinfilter); + break; } - break; error: + if (ppinfilter) IPin_Release(ppinfilter); if (pfilter) { IGraphBuilder_RemoveFilter(iface, pfilter); IBaseFilter_Release(pfilter); @@ -1167,7 +1173,9 @@ static HRESULT WINAPI Mediacontrol_Invok return S_OK; } -static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, REFERENCE_TIME tStart) +typedef HRESULT(WINAPI *fnFoundFilter)(IBaseFilter *); + +static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundFilter FoundFilter) { HRESULT hr; IPin* pInputPin; @@ -1176,7 +1184,8 @@ static HRESULT ExploreGraph(IFilterGraph ULONG i; PIN_INFO PinInfo; - TRACE("%p %p %lld\n", pGraph, pOutputPin, tStart); + TRACE("%p %p\n", pGraph, pOutputPin); + PinInfo.pFilter = NULL; hr = IPin_ConnectedTo(pOutputPin, &pInputPin); @@ -1201,20 +1210,33 @@ static HRESULT ExploreGraph(IFilterGraph /* Explore the graph downstream from this pin * FIXME: We should prevent exploring from a pin more than once. This can happens when * several input pins are connected to the same output (a MUX for instance). */ - ExploreGraph(pGraph, ppPins[i], tStart); + ExploreGraph(pGraph, ppPins[i], FoundFilter); + IPin_Release(ppPins[i]); } CoTaskMemFree(ppPins); } - TRACE("Run filter %p\n", PinInfo.pFilter); - IBaseFilter_Run(PinInfo.pFilter, tStart); + TRACE("Doing stuff with filter %p\n", PinInfo.pFilter); + FoundFilter(PinInfo.pFilter); } + if (PinInfo.pFilter) IBaseFilter_Release(PinInfo.pFilter); return hr; } -/*** IMediaControl methods ***/ -static HRESULT WINAPI Mediacontrol_Run(IMediaControl *iface) { +static HRESULT WINAPI SendRun(IBaseFilter *pFilter) { + return IBaseFilter_Run(pFilter, 0); +} + +static HRESULT WINAPI SendPause(IBaseFilter *pFilter) { + return IBaseFilter_Pause(pFilter); +} + +static HRESULT WINAPI SendStop(IBaseFilter *pFilter) { + return IBaseFilter_Stop(pFilter); +} + +static HRESULT WINAPI SendTheFilterAMessage(IMediaControl *iface, fnFoundFilter FoundFilter) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); int i; IBaseFilter* pfilter; @@ -1223,19 +1245,10 @@ static HRESULT WINAPI Mediacontrol_Run(I IPin* pPin; LONG dummy; PIN_DIRECTION dir; - TRACE("(%p/%p)->()\n", This, iface); - EnterCriticalSection(&This->cs); - - if (This->state == State_Running) - { - LeaveCriticalSection(&This->cs); - return S_OK; - } - - /* Explorer the graph from source filters to renderers, determine renderers number and - * run filters from renderers to source filters */ + /* Explorer the graph from source filters to renderers, determine renderers + * number and run filters from renderers to source filters */ This->nRenderers = 0; ResetEvent(This->hEventCompletion); @@ -1253,6 +1266,7 @@ static HRESULT WINAPI Mediacontrol_Run(I while(IEnumPins_Next(pEnum, 1, &pPin, &dummy) == S_OK) { IPin_QueryDirection(pPin, &dir); + IPin_Release(pPin); if (dir == PINDIR_INPUT) { source = FALSE; @@ -1266,34 +1280,56 @@ static HRESULT WINAPI Mediacontrol_Run(I while(IEnumPins_Next(pEnum, 1, &pPin, &dummy) == S_OK) { /* Explore the graph downstream from this pin */ - ExploreGraph(This, pPin, 0); + ExploreGraph(This, pPin, FoundFilter); + IPin_Release(pPin); } - IBaseFilter_Run(pfilter, 0); + FoundFilter(pfilter); } IEnumPins_Release(pEnum); } - This->state = State_Running; + return S_FALSE; +} + +/*** IMediaControl methods ***/ +static HRESULT WINAPI Mediacontrol_Run(IMediaControl *iface) { + ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); + TRACE("(%p/%p)->()\n", This, iface); + + if (This->state == State_Running) return S_OK; + EnterCriticalSection(&This->cs); + SendTheFilterAMessage(iface, SendRun); + This->state = State_Running; LeaveCriticalSection(&This->cs); - return S_FALSE; } static HRESULT WINAPI Mediacontrol_Pause(IMediaControl *iface) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); + TRACE("(%p/%p)->()\n", This, iface); - TRACE("(%p/%p)->(): stub !!!\n", This, iface); + if (This->state == State_Paused) return S_OK; - return S_OK; + EnterCriticalSection(&This->cs); + SendTheFilterAMessage(iface, SendPause); + This->state = State_Paused; + LeaveCriticalSection(&This->cs); + return S_FALSE; } static HRESULT WINAPI Mediacontrol_Stop(IMediaControl *iface) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); + TRACE("(%p/%p)->()\n", This, iface); - TRACE("(%p/%p)->(): stub !!!\n", This, iface); + if (This->state == State_Stopped) return S_OK; - return S_OK; + EnterCriticalSection(&This->cs); + if (This->state == State_Running) SendTheFilterAMessage(iface, SendPause); + SendTheFilterAMessage(iface, SendStop); + This->state = State_Stopped; + LeaveCriticalSection(&This->cs); + return S_FALSE; } static HRESULT WINAPI Mediacontrol_GetState(IMediaControl *iface, Index: dlls/quartz/pin.c =================================================================== RCS file: /home/wine/wine/dlls/quartz/pin.c,v retrieving revision 1.13 diff -u -p -r1.13 pin.c --- dlls/quartz/pin.c 2 Mar 2005 10:12:12 -0000 1.13 +++ dlls/quartz/pin.c 1 May 2005 00:10:59 -0000 @@ -49,7 +49,6 @@ static void Copy_PinInfo(PIN_INFO * pDes strcpyW(pDest->achName, pSrc->achName); pDest->dir = pSrc->dir; pDest->pFilter = pSrc->pFilter; - IBaseFilter_AddRef(pDest->pFilter); } /* Function called as a helper to IPin_Connect */ @@ -311,6 +310,7 @@ HRESULT WINAPI IPinImpl_QueryPinInfo(IPi TRACE("(%p/%p)->(%p)\n", This, iface, pInfo); Copy_PinInfo(pInfo, &This->pinInfo); + IBaseFilter_AddRef(pInfo->pFilter); return S_OK; } diff -Nru wine-old/dlls/qcap/capturegraph.c wine-new/dlls/qcap/capturegraph.c --- wine-old/dlls/qcap/capturegraph.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/qcap/capturegraph.c 2005-04-29 00:31:34.000000000 +0200 @@ -0,0 +1,196 @@ +/* Capture Graph Builder, Minimal edition.. + * Copyright 2005 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * TODO: Implement CaptureGraphBuilder2, and make all calls from + * CaptureGraphBuilder forward to it.. + */ + +#include "config.h" + +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "qcap_private.h" + +#include "uuids.h" +#include "mmreg.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "windef.h" +#include "winbase.h" +#include "dshow.h" +#include "evcode.h" +#include "strmif.h" +#include "ddraw.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qcap); + +static const ICaptureGraphBuilderVtbl Builder_Vtbl; + +typedef struct CaptureGraphImpl +{ + const ICaptureGraphBuilderVtbl * lpVtbl; + IGraphBuilder *mygraph; + + ULONG refCount; + CRITICAL_SECTION csFilter; +} CaptureGraphImpl; + +HRESULT CaptureGraphBuilder_create(IUnknown * pUnkOuter, LPVOID * ppv) +{ + CaptureGraphImpl * pCapture; + TRACE("(%p, %p)\n", pUnkOuter, ppv); + *ppv = NULL; + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + pCapture = CoTaskMemAlloc(sizeof(CaptureGraphImpl)); + pCapture->lpVtbl = &Builder_Vtbl; + pCapture->refCount = 1; + pCapture->mygraph = NULL; + InitializeCriticalSection(&pCapture->csFilter); + *ppv = (LPVOID)pCapture; + return S_OK; +} + +static HRESULT WINAPI CaptureGraphBuilder_QueryInterface(ICaptureGraphBuilder * iface, REFIID riid, LPVOID * ppv) +{ + struct CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + TRACE("(%p/%p)->(%s, %p)\n", This, iface, qcdebugstr_guid(riid), ppv); + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_ICaptureGraphBuilder)) + *ppv = (LPVOID)This; + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } + + FIXME("No interface for %s!\n", qcdebugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI CaptureGraphBuilder_AddRef(ICaptureGraphBuilder * iface) +{ + CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->refCount); + + TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, refCount - 1); + return refCount; +} + +static ULONG WINAPI CaptureGraphBuilder_Release(ICaptureGraphBuilder * iface) +{ + CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->refCount); + + TRACE("(%p/%p)->() Release from %ld\n", This, iface, refCount + 1); + + if (!refCount) { + TRACE("Destroying everything..\n"); + DeleteCriticalSection(&This->csFilter); + if (This->mygraph != NULL) + IGraphBuilder_Release((IGraphBuilder *)This->mygraph); + CoTaskMemFree(This); + return 0; + } + else return refCount; +} + +static HRESULT WINAPI CaptureGraphBuilder_SetFilterGraph(ICaptureGraphBuilder * iface, IGraphBuilder *pfg) +{ +/* The graph builder will automatically create a filter graph if you don't call this method. If you call this method after the graph builder has created its own filter graph, the call will fail. */ + struct CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + if (This->mygraph != NULL) return E_NOTIMPL; + This->mygraph = pfg; + IGraphBuilder_AddRef((IGraphBuilder *)This->mygraph); + TRACE("%p: %p\n", iface, pfg); + return S_OK; +} + +static HRESULT WINAPI CaptureGraphBuilder_GetFilterGraph(ICaptureGraphBuilder * iface, IGraphBuilder **pfg) +{ + struct CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + FIXME("%p: Make our own filtergraph if we haven't got one already - stub\n", iface); + if (This->mygraph == NULL) return E_NOTIMPL; + + *pfg = This->mygraph; + IGraphBuilder_AddRef((IGraphBuilder *)This->mygraph); + + TRACE("%p: %p\n", iface, *pfg); + return S_OK; +} + +static HRESULT WINAPI CaptureGraphBuilder_SetOutputFileName(ICaptureGraphBuilder * iface, const GUID *pType, LPCOLESTR lpstrFile,IBaseFilter **ppf, IFileSinkFilter **ppSink) +{ + FIXME("%p: %p, %p, %p, %p - stub\n", iface, pType, lpstrFile, *ppf, *ppSink); + return E_NOTIMPL; +} + +static HRESULT WINAPI CaptureGraphBuilder_FindInterface(ICaptureGraphBuilder * iface, const GUID *pCategory, IBaseFilter *pf, REFIID riid, void **ppint) +{ + struct CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + FIXME("%p: %s %p %s %p - unwanted partial stub!\n", This, qcdebugstr_guid(pCategory), pf, qcdebugstr_guid(riid), *ppint); + return IBaseFilter_QueryInterface(pf, riid, ppint); + /* Looks for the specified interface on the filter, upstream and + * downstream from the filter, and, optionally, only on the output + * pin of the given category. + */ +} + +static HRESULT WINAPI CaptureGraphBuilder_RenderStream(ICaptureGraphBuilder * iface, const GUID *pCategory, IUnknown *pSource, IBaseFilter *pfCompressor, IBaseFilter *pfRenderer) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI CaptureGraphBuilder_ControlStream(ICaptureGraphBuilder * iface, const GUID *pCategory, IBaseFilter *pFilter, REFERENCE_TIME *pstart, REFERENCE_TIME *pstop, WORD wStartCookie, WORD wStopCookie) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI CaptureGraphBuilder_AllocCapFile(ICaptureGraphBuilder * iface, LPCOLESTR lpstr, DWORDLONG dwlSize) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI CaptureGraphBuilder_CopyCaptureFile(ICaptureGraphBuilder * iface, LPOLESTR lpwstrOld, LPOLESTR lpwstrNew, int fAllowEscAbort, IAMCopyCaptureFileProgress *pCallback) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static const ICaptureGraphBuilderVtbl Builder_Vtbl = +{ + CaptureGraphBuilder_QueryInterface, + CaptureGraphBuilder_AddRef, + CaptureGraphBuilder_Release, + CaptureGraphBuilder_SetFilterGraph, + CaptureGraphBuilder_GetFilterGraph, + CaptureGraphBuilder_SetOutputFileName, + CaptureGraphBuilder_FindInterface, + CaptureGraphBuilder_RenderStream, + CaptureGraphBuilder_ControlStream, + CaptureGraphBuilder_AllocCapFile, + CaptureGraphBuilder_CopyCaptureFile +}; + diff -Nru wine-old/dlls/qcap/capture.h wine-new/dlls/qcap/capture.h --- wine-old/dlls/qcap/capture.h 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/qcap/capture.h 2005-05-01 01:51:50.000000000 +0200 @@ -0,0 +1,35 @@ +/* DirectShow private capture header (QCAP.DLL) + * + * Copyright 2005 Maarten Lankhorst + * + * This file contains the (internal) driver registration functions, + * driver enumeration APIs and DirectDraw creation functions. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __CAPTURE_H__ +#define __CAPTURE_H__ + +HRESULT Capture_Initialise(void ** pointer, IPin *pOut, USHORT card); +HRESULT Capture_GetMediaType(void * pBox, AM_MEDIA_TYPE ** mT); +HRESULT Capture_SetMediaType(void * pBox, AM_MEDIA_TYPE * mT); +HRESULT Capture_Run(void * pBox, FILTER_STATE *state); +HRESULT Capture_Stop(void * pBox, FILTER_STATE *state); +HRESULT Capture_Pause(void * pBox, FILTER_STATE *state); +HRESULT Capture_Destroy(void * pBox); + +#endif /* __CAPTURE_H__ */ + diff -Nru wine-old/dlls/qcap/enumpins.c wine-new/dlls/qcap/enumpins.c --- wine-old/dlls/qcap/enumpins.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/qcap/enumpins.c 2005-04-29 13:40:15.000000000 +0200 @@ -0,0 +1,183 @@ +/* + * Generic Implementation of IPin Interface + * + * Copyright 2003 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "qcap_private.h" +#include "pin.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "uuids.h" +#include "vfwmsgs.h" +#include <assert.h> + +WINE_DEFAULT_DEBUG_CHANNEL(qcap); + +typedef struct IEnumPinsImpl +{ + const IEnumPinsVtbl * lpVtbl; + ULONG refCount; + ENUMPINDETAILS enumPinDetails; + ULONG uIndex; +} IEnumPinsImpl; + +static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl; + +HRESULT IEnumPinsImpl_Construct(const ENUMPINDETAILS * pDetails, IEnumPins ** ppEnum) +{ + IEnumPinsImpl * pEnumPins = CoTaskMemAlloc(sizeof(IEnumPinsImpl)); + TRACE("()\n"); + if (!pEnumPins) + { + *ppEnum = NULL; + return E_OUTOFMEMORY; + } + pEnumPins->lpVtbl = &IEnumPinsImpl_Vtbl; + pEnumPins->refCount = 1; + pEnumPins->uIndex = 0; + CopyMemory(&pEnumPins->enumPinDetails, pDetails, sizeof(ENUMPINDETAILS)); + *ppEnum = (IEnumPins *)(&pEnumPins->lpVtbl); + return S_OK; +} + +static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID riid, LPVOID * ppv) +{ + TRACE("(%s, %p)\n", qcdebugstr_guid(riid), ppv); + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = (LPVOID)iface; + else if (IsEqualIID(riid, &IID_IEnumPins)) + *ppv = (LPVOID)iface; + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } + + FIXME("No interface for %s!\n", qcdebugstr_guid(riid)); + + return E_NOINTERFACE; +} +static ULONG WINAPI IEnumPinsImpl_AddRef(IEnumPins * iface) +{ + IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->refCount); + + TRACE("() -> %lu\n", refCount); + + return refCount; +} + +static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) +{ + IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->refCount); + + TRACE("() -> %lu\n", refCount); + + if (!refCount) + { + CoTaskMemFree(This); + return 0; + } + else + return refCount; +} + +static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins, ULONG * pcFetched) +{ + ULONG cFetched; + IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + + TRACE("()\n"); + + cFetched = min(This->enumPinDetails.cPins, This->uIndex + cPins) - This->uIndex; + + TRACE("(%lu, %p, %p)\n", cPins, ppPins, pcFetched); + + if (cFetched > 0) + { + ULONG i; + for (i = 0; i < cFetched; i++) { + IPin_AddRef(This->enumPinDetails.ppPins[This->uIndex + i]); + ppPins[i] = This->enumPinDetails.ppPins[This->uIndex + i]; + } + } + + if ((cPins != 1) || pcFetched) + *pcFetched = cFetched; + + This->uIndex += cFetched; + + if (cFetched != cPins) + return S_FALSE; + return S_OK; +} + +static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins) +{ + IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + + TRACE("(%lu)\n", cPins); + + if (This->uIndex + cPins < This->enumPinDetails.cPins) + { + This->uIndex += cPins; + return S_OK; + } + return S_FALSE; +} + +static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins * iface) +{ + IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + + TRACE("IEnumPinsImpl::Reset()\n"); + + This->uIndex = 0; + return S_OK; +} + +static HRESULT WINAPI IEnumPinsImpl_Clone(IEnumPins * iface, IEnumPins ** ppEnum) +{ + HRESULT hr; + IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + + TRACE("(%p)\n", ppEnum); + + hr = IEnumPinsImpl_Construct(&This->enumPinDetails, ppEnum); + if (FAILED(hr)) + return hr; + return IEnumPins_Skip(*ppEnum, This->uIndex); +} + +static const IEnumPinsVtbl IEnumPinsImpl_Vtbl = +{ + IEnumPinsImpl_QueryInterface, + IEnumPinsImpl_AddRef, + IEnumPinsImpl_Release, + IEnumPinsImpl_Next, + IEnumPinsImpl_Skip, + IEnumPinsImpl_Reset, + IEnumPinsImpl_Clone +}; + diff -Nru wine-old/dlls/qcap/Makefile.in wine-new/dlls/qcap/Makefile.in --- wine-old/dlls/qcap/Makefile.in 2004-05-14 23:37:32.000000000 +0200 +++ wine-new/dlls/qcap/Makefile.in 2005-05-01 01:56:42.000000000 +0200 @@ -3,8 +3,19 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = qcap.dll +IMPORTS = ole32 kernel32 advapi32 user32 +EXTRALIBS = -lstrmiids -luuid $(LIBUNICODE) -C_SRCS = qcap_main.c +C_SRCS = \ + capturegraph.c \ + enumpins.c \ + media.c \ + null.c \ + pin.c \ + qcap_main.c \ + regsvr.c \ + v4l.c \ + vfwcapture.c RC_SRCS = version.rc diff -Nru wine-old/dlls/qcap/media.c wine-new/dlls/qcap/media.c --- wine-old/dlls/qcap/media.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/qcap/media.c 2005-05-01 01:48:09.000000000 +0200 @@ -0,0 +1,229 @@ +/* + * Implementation of IEnumMediaTypes Interface + * + * Copyright 2003 Robert Shearman + * Copyright 2005 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "qcap_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qcap); + +HRESULT CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc) +{ + memcpy(pDest, pSrc, sizeof(AM_MEDIA_TYPE)); + if (!pDest->pbFormat) return S_OK; + if (!(pDest->pbFormat = CoTaskMemAlloc(pSrc->cbFormat))) + return E_OUTOFMEMORY; + memcpy(pDest->pbFormat, pSrc->pbFormat, pSrc->cbFormat); + return S_OK; +} + +void DeleteMediaType(AM_MEDIA_TYPE * pMediaType) +{ + if (pMediaType->pbFormat) + { + CoTaskMemFree(pMediaType->pbFormat); + pMediaType->pbFormat = NULL; + } + if (pMediaType->pUnk) + { + IUnknown_Release(pMediaType->pUnk); + pMediaType->pUnk = NULL; + } + CoTaskMemFree(pMediaType); +} + +BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards) +{ + TRACE("pmt1: "); + dump_AM_MEDIA_TYPE(pmt1); + TRACE("pmt2: "); + dump_AM_MEDIA_TYPE(pmt2); + return (((bWildcards && (IsEqualGUID(&pmt1->majortype, &GUID_NULL) || IsEqualGUID(&pmt2->majortype, &GUID_NULL))) || IsEqualGUID(&pmt1->majortype, &pmt2->majortype)) && + ((bWildcards && (IsEqualGUID(&pmt1->subtype, &GUID_NULL) || IsEqualGUID(&pmt2->subtype, &GUID_NULL))) || IsEqualGUID(&pmt1->subtype, &pmt2->subtype))); +} + +void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) +{ + if (!pmt) + return; + TRACE("\t%s\n\t%s\n\t...\n\t%s\n", qcdebugstr_guid(&pmt->majortype), qcdebugstr_guid(&pmt->subtype), qcdebugstr_guid(&pmt->formattype)); +} + +typedef struct IEnumMediaTypesImpl +{ + const IEnumMediaTypesVtbl * lpVtbl; + ULONG refCount; + ENUMMEDIADETAILS enumMediaDetails; + ULONG uIndex; +} IEnumMediaTypesImpl; + +static const struct IEnumMediaTypesVtbl IEnumMediaTypesImpl_Vtbl; + +HRESULT IEnumMediaTypesImpl_Construct(const ENUMMEDIADETAILS * pDetails, IEnumMediaTypes ** ppEnum) +{ + ULONG i; + IEnumMediaTypesImpl * pEnumMediaTypes = CoTaskMemAlloc(sizeof(IEnumMediaTypesImpl)); + + if (!pEnumMediaTypes) + { + *ppEnum = NULL; + return E_OUTOFMEMORY; + } + pEnumMediaTypes->lpVtbl = &IEnumMediaTypesImpl_Vtbl; + pEnumMediaTypes->refCount = 1; + pEnumMediaTypes->uIndex = 0; + pEnumMediaTypes->enumMediaDetails.cMediaTypes = pDetails->cMediaTypes; + pEnumMediaTypes->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * pDetails->cMediaTypes); + for (i = 0; i < pDetails->cMediaTypes; i++) + CopyMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i], &pDetails->pMediaTypes[i]); + *ppEnum = (IEnumMediaTypes *)(&pEnumMediaTypes->lpVtbl); + return S_OK; +} + +static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface, REFIID riid, LPVOID * ppv) +{ + TRACE("(%s, %p)\n", qcdebugstr_guid(riid), ppv); + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = (LPVOID)iface; + else if (IsEqualIID(riid, &IID_IEnumMediaTypes)) + *ppv = (LPVOID)iface; + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } + + FIXME("No interface for %s!\n", qcdebugstr_guid(riid)); + + return E_NOINTERFACE; +} + +static ULONG WINAPI IEnumMediaTypesImpl_AddRef(IEnumMediaTypes * iface) +{ + IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->refCount); + + TRACE("()\n"); + + return refCount; +} + +static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) +{ + IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->refCount); + + TRACE("()\n"); + + if (!refCount) + { + int i; + for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) + if (This->enumMediaDetails.pMediaTypes[i].pbFormat) + CoTaskMemFree(This->enumMediaDetails.pMediaTypes[i].pbFormat); + CoTaskMemFree(This->enumMediaDetails.pMediaTypes); + CoTaskMemFree(This); + return 0; + } + else + return refCount; +} + +static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cMediaTypes, AM_MEDIA_TYPE ** ppMediaTypes, ULONG * pcFetched) +{ + ULONG cFetched; + IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + + cFetched = min(This->enumMediaDetails.cMediaTypes, This->uIndex + cMediaTypes) - This->uIndex; + + TRACE("(%lu, %p, %p)\n", cMediaTypes, ppMediaTypes, pcFetched); + TRACE("Next uIndex: %lu, cFetched: %lu\n", This->uIndex, cFetched); + + if (cFetched > 0) + { + ULONG i; + *ppMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * cFetched); + for (i = 0; i < cFetched; i++) + CopyMediaType(&(*ppMediaTypes)[i], &This->enumMediaDetails.pMediaTypes[This->uIndex + i]); + } + + if ((cMediaTypes != 1) || pcFetched) + *pcFetched = cFetched; + + This->uIndex += cFetched; + + if (cFetched != cMediaTypes) + return S_FALSE; + return S_OK; +} + +static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface, ULONG cMediaTypes) +{ + IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + + TRACE("(%lu)\n", cMediaTypes); + + if (This->uIndex + cMediaTypes < This->enumMediaDetails.cMediaTypes) + { + This->uIndex += cMediaTypes; + return S_OK; + } + return S_FALSE; +} + +static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) +{ + IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + + TRACE("()\n"); + + This->uIndex = 0; + return S_OK; +} + +static HRESULT WINAPI IEnumMediaTypesImpl_Clone(IEnumMediaTypes * iface, IEnumMediaTypes ** ppEnum) +{ + HRESULT hr; + IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + + TRACE("(%p)\n", ppEnum); + hr = IEnumMediaTypesImpl_Construct(&This->enumMediaDetails, ppEnum); + + if (FAILED(hr)) + return hr; + return IEnumMediaTypes_Skip(*ppEnum, This->uIndex); +} + +static const IEnumMediaTypesVtbl IEnumMediaTypesImpl_Vtbl = +{ + IEnumMediaTypesImpl_QueryInterface, + IEnumMediaTypesImpl_AddRef, + IEnumMediaTypesImpl_Release, + IEnumMediaTypesImpl_Next, + IEnumMediaTypesImpl_Skip, + IEnumMediaTypesImpl_Reset, + IEnumMediaTypesImpl_Clone +}; + diff -Nru wine-old/dlls/qcap/null.c wine-new/dlls/qcap/null.c --- wine-old/dlls/qcap/null.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/qcap/null.c 2005-05-01 01:49:06.000000000 +0200 @@ -0,0 +1,84 @@ +/* DirectShow capture services (QCAP.DLL) + * + * Copyright 2005 Maarten Lankhorst + * + * This file contains the part of the vfw capture interface that + * does the actual capturing stuff required for capturing + * and setting/getting media format.. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Why on earth am I writing a copyright notice for a NULL renderer??? + */ + +#include "config.h" +#ifndef HAVE_LINUX_VIDEODEV_H + +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "qcap_private.h" +#include "pin.h" + +#include "uuids.h" +#include "mmreg.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "windef.h" +#include "winbase.h" +#include "dshow.h" +#include "strmif.h" +#include "ddraw.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +HRESULT Capture_Initialise(void ** pointer, IPin *pOut, USHORT card) +{ + ERR("No DirectShow Video for Wine Capture support compiled\n"); + return E_FAIL; +} + +HRESULT Capture_GetMediaType(void * pBox, AM_MEDIA_TYPE ** mT) +{ + return E_FAIL; +} + +HRESULT Capture_SetMediaType(void * pBox, AM_MEDIA_TYPE * mT) +{ + return E_FAIL; +} + +HRESULT Capture_Run(void * pBox, FILTER_STATE *state) +{ + return E_FAIL; +} + +HRESULT Capture_Stop(void * pBox, FILTER_STATE *state) +{ + return E_FAIL; +} + +HRESULT Capture_Pause(void * pBox, FILTER_STATE *state) +{ + return E_FAIL; +} + +HRESULT Capture_Destroy(void * pBox) +{ + return E_FAIL; +} + +#endif + diff -Nru wine-old/dlls/qcap/pin.c wine-new/dlls/qcap/pin.c --- wine-old/dlls/qcap/pin.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/qcap/pin.c 2005-04-30 18:44:10.000000000 +0200 @@ -0,0 +1,411 @@ +/* + * Generic Implementation of IPin Interface + * + * Copyright 2003 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "qcap_private.h" +#include "pin.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "uuids.h" +#include "vfwmsgs.h" +#include <assert.h> + +WINE_DEFAULT_DEBUG_CHANNEL(qcap); + +#define ALIGNDOWN(value,boundary) ((value) & ~(boundary-1)) +#define ALIGNUP(value,boundary) (ALIGNDOWN(value - 1, boundary) + boundary) + +static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc) +{ + /* Tempting to just do a memcpy, but the name field is + 128 characters long! We will probably never exceed 10 + most of the time, so we are better off copying + each field manually */ + strcpyW(pDest->achName, pSrc->achName); + pDest->dir = pSrc->dir; + pDest->pFilter = pSrc->pFilter; +} + +HRESULT WINAPI IPinImpl_ConnectedTo(IPin * iface, IPin ** ppPin) +{ + HRESULT hr; + IPinImpl *This = (IPinImpl *)iface; + +/* TRACE("(%p)\n", ppPin);*/ + + EnterCriticalSection(This->pCritSec); + { + if (This->pConnectedTo) + { + *ppPin = This->pConnectedTo; + IPin_AddRef(*ppPin); + hr = S_OK; + } + else + hr = VFW_E_NOT_CONNECTED; + } + LeaveCriticalSection(This->pCritSec); + + return hr; +} + +HRESULT WINAPI IPinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt) +{ + HRESULT hr; + IPinImpl *This = (IPinImpl *)iface; + + TRACE("(%p/%p)->(%p)\n", This, iface, pmt); + + EnterCriticalSection(This->pCritSec); + { + if (This->pConnectedTo) + { + CopyMediaType(pmt, &This->mtCurrent); + hr = S_OK; + } + else + { + ZeroMemory(pmt, sizeof(*pmt)); + hr = VFW_E_NOT_CONNECTED; + } + } + LeaveCriticalSection(This->pCritSec); + + return hr; +} + +HRESULT WINAPI IPinImpl_QueryPinInfo(IPin * iface, PIN_INFO * pInfo) +{ + IPinImpl *This = (IPinImpl *)iface; + + TRACE("(%p/%p)->(%p)\n", This, iface, pInfo); + + Copy_PinInfo(pInfo, &This->pinInfo); + IBaseFilter_AddRef(pInfo->pFilter); + + return S_OK; +} + +HRESULT WINAPI IPinImpl_QueryDirection(IPin * iface, PIN_DIRECTION * pPinDir) +{ + IPinImpl *This = (IPinImpl *)iface; + + TRACE("(%p/%p)->(%p)\n", This, iface, pPinDir); + + *pPinDir = This->pinInfo.dir; + + return S_OK; +} + +HRESULT WINAPI IPinImpl_QueryId(IPin * iface, LPWSTR * Id) +{ + IPinImpl *This = (IPinImpl *)iface; + + TRACE("(%p/%p)->(%p)\n", This, iface, Id); + + *Id = CoTaskMemAlloc((strlenW(This->pinInfo.achName) + 1) * sizeof(WCHAR)); + if (!Id) + return E_OUTOFMEMORY; + + strcpyW(*Id, This->pinInfo.achName); + + return S_OK; +} + +HRESULT WINAPI IPinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) +{ + IPinImpl *This = (IPinImpl *)iface; + + TRACE("(%p/%p)->(%p)\n", This, iface, pmt); + + if (!This->fnQueryAccept) return S_OK; + + return (This->fnQueryAccept(This->pUserData, pmt) == S_OK ? S_OK : S_FALSE); +} + +HRESULT WINAPI IPinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) +{ + IPinImpl *This = (IPinImpl *)iface; + + TRACE("(%p/%p)->(%p, %p)\n", This, iface, apPin, cPin); + + return E_NOTIMPL; /* to tell caller that all input pins connected to all output pins */ +} + +/* Function called as a helper to IPin_Connect */ +/* specific AM_MEDIA_TYPE - it cannot be NULL */ +/* NOTE: not part of standard interface */ +static HRESULT OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) +{ + OutputPin *This = (OutputPin *)iface; + HRESULT hr; + IMemAllocator * pMemAlloc = NULL; + ALLOCATOR_PROPERTIES actual; /* FIXME: should we put the actual props back in to This? */ + + TRACE("(%p, %p)\n", pReceivePin, pmt); + dump_AM_MEDIA_TYPE(pmt); + + /* FIXME: call queryacceptproc */ + + This->pin.pConnectedTo = pReceivePin; + IPin_AddRef(pReceivePin); + CopyMediaType(&This->pin.mtCurrent, pmt); + + hr = IPin_ReceiveConnection(pReceivePin, iface, pmt); + + /* get the IMemInputPin interface we will use to deliver samples to the + * connected pin */ + if (SUCCEEDED(hr)) + { + hr = IPin_QueryInterface(pReceivePin, &IID_IMemInputPin, (LPVOID)&This->pMemInputPin); + + if (SUCCEEDED(hr)) + hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pMemAlloc); + + if (hr == VFW_E_NO_ALLOCATOR) + { + /* Input pin provides no allocator, use standard memory allocator */ + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)&pMemAlloc); + + if (SUCCEEDED(hr)) + { + hr = IMemInputPin_NotifyAllocator(This->pMemInputPin, pMemAlloc, FALSE); + } + } + + if (SUCCEEDED(hr)) + hr = IMemAllocator_SetProperties(pMemAlloc, &This->allocProps, &actual); + + if (pMemAlloc) + IMemAllocator_Release(pMemAlloc); + + /* break connection if we couldn't get the allocator */ + if (FAILED(hr)) + IPin_Disconnect(pReceivePin); + } + + if (FAILED(hr)) + { + IPin_Release(This->pin.pConnectedTo); + This->pin.pConnectedTo = NULL; + DeleteMediaType(&This->pin.mtCurrent); + } + + TRACE(" -- %lx\n", hr); + return hr; +} + +HRESULT OutputPin_Init(const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES * props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, OutputPin * pPinImpl) +{ + TRACE("\n"); + + /* Common attributes */ + pPinImpl->pin.refCount = 1; + pPinImpl->pin.pConnectedTo = NULL; + pPinImpl->pin.fnQueryAccept = pQueryAccept; + pPinImpl->pin.pUserData = pUserData; + pPinImpl->pin.pCritSec = pCritSec; + Copy_PinInfo(&pPinImpl->pin.pinInfo, pPinInfo); + + /* Output pin attributes */ + pPinImpl->pMemInputPin = NULL; + pPinImpl->pConnectSpecific = OutputPin_ConnectSpecific; + if (props) + { + memcpy(&pPinImpl->allocProps, props, sizeof(pPinImpl->allocProps)); + if (pPinImpl->allocProps.cbAlign == 0) + pPinImpl->allocProps.cbAlign = 1; + } + else + ZeroMemory(&pPinImpl->allocProps, sizeof(pPinImpl->allocProps)); + + return S_OK; +} + +HRESULT WINAPI OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) +{ + HRESULT hr; + OutputPin *This = (OutputPin *)iface; + + TRACE("(%p/%p)->(%p, %p)\n", This, iface, pReceivePin, pmt); + dump_AM_MEDIA_TYPE(pmt); + + /* If we try to connect to ourself, we will definitely deadlock. + * There are other cases where we could deadlock too, but this + * catches the obvious case */ + assert(pReceivePin != iface); + + EnterCriticalSection(This->pin.pCritSec); + { + /* if we have been a specific type to connect with, then we can either connect + * with that or fail. We cannot choose different AM_MEDIA_TYPE */ + if (pmt && !IsEqualGUID(&pmt->majortype, &GUID_NULL) && !IsEqualGUID(&pmt->subtype, &GUID_NULL)) + hr = This->pConnectSpecific(iface, pReceivePin, pmt); + else + { + /* negotiate media type */ + + IEnumMediaTypes * pEnumCandidates; + AM_MEDIA_TYPE * pmtCandidate; /* Candidate media type */ + + if (SUCCEEDED(hr = IPin_EnumMediaTypes(iface, &pEnumCandidates))) + { + hr = VFW_E_NO_ACCEPTABLE_TYPES; /* Assume the worst, but set to S_OK if connected successfully */ + + /* try this filter's media types first */ + while (S_OK == IEnumMediaTypes_Next(pEnumCandidates, 1, &pmtCandidate, NULL)) + { + if (( !pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE) ) && + (This->pConnectSpecific(iface, pReceivePin, pmtCandidate) == S_OK)) + { + hr = S_OK; + TRACE("o_o\n"); + DeleteMediaType(pmtCandidate); + break; + } + DeleteMediaType(pmtCandidate); + } + IEnumMediaTypes_Release(pEnumCandidates); + } + + /* then try receiver filter's media types */ + if (hr != S_OK && SUCCEEDED(hr = IPin_EnumMediaTypes(pReceivePin, &pEnumCandidates))) /* if we haven't already connected successfully */ + { + hr = VFW_E_NO_ACCEPTABLE_TYPES; /* Assume the worst, but set to S_OK if connected successfully */ + + while (S_OK == IEnumMediaTypes_Next(pEnumCandidates, 1, &pmtCandidate, NULL)) + { + if (( !pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE) ) && + (This->pConnectSpecific(iface, pReceivePin, pmtCandidate) == S_OK)) + { + hr = S_OK; + DeleteMediaType(pmtCandidate); + break; + } + DeleteMediaType(pmtCandidate); + } /* while */ + IEnumMediaTypes_Release(pEnumCandidates); + } /* if not found */ + } /* if negotiate media type */ + } /* if succeeded */ + LeaveCriticalSection(This->pin.pCritSec); + + TRACE(" -- %lx\n", hr); + return hr; +} + +HRESULT WINAPI OutputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) +{ + ERR("Incoming connection on an output pin! (%p, %p)\n", pReceivePin, pmt); + + return E_UNEXPECTED; +} + +HRESULT WINAPI OutputPin_Disconnect(IPin * iface) +{ + HRESULT hr; + OutputPin *This = (OutputPin *)iface; + + TRACE("()\n"); + + EnterCriticalSection(This->pin.pCritSec); + { + if (This->pMemInputPin) + { + IMemInputPin_Release(This->pMemInputPin); + This->pMemInputPin = NULL; + } + if (This->pin.pConnectedTo) + { + IPin_Release(This->pin.pConnectedTo); + This->pin.pConnectedTo = NULL; + hr = S_OK; + } + else + hr = S_FALSE; + } + LeaveCriticalSection(This->pin.pCritSec); + + return hr; +} + +HRESULT OutputPin_GetDeliveryBuffer(OutputPin * This, IMediaSample ** ppSample, const REFERENCE_TIME * tStart, const REFERENCE_TIME * tStop, DWORD dwFlags) +{ + HRESULT hr; + + TRACE("(%p, %p, %p, %lx)\n", ppSample, tStart, tStop, dwFlags); + + EnterCriticalSection(This->pin.pCritSec); + { + if (!This->pin.pConnectedTo) + hr = VFW_E_NOT_CONNECTED; + else + { + IMemAllocator * pAlloc = NULL; + + hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); + + if (SUCCEEDED(hr)) + hr = IMemAllocator_GetBuffer(pAlloc, ppSample, (REFERENCE_TIME *)tStart, (REFERENCE_TIME *)tStop, dwFlags); + + if (SUCCEEDED(hr)) + hr = IMediaSample_SetTime(*ppSample, (REFERENCE_TIME *)tStart, (REFERENCE_TIME *)tStop); + + if (pAlloc) + IMemAllocator_Release(pAlloc); + } + } + LeaveCriticalSection(This->pin.pCritSec); + + return hr; +} + +HRESULT OutputPin_SendSample(OutputPin * This, IMediaSample * pSample) +{ + HRESULT hr = S_OK; + IMemInputPin * pMemConnected = NULL; + + EnterCriticalSection(This->pin.pCritSec); + { + if (!This->pin.pConnectedTo || !This->pMemInputPin) + hr = VFW_E_NOT_CONNECTED; + else + { + /* we don't have the lock held when using This->pMemInputPin, + * so we need to AddRef it to stop it being deleted while we are + * using it. */ + pMemConnected = This->pMemInputPin; + IMemInputPin_AddRef(pMemConnected); + } + } + LeaveCriticalSection(This->pin.pCritSec); + + if (SUCCEEDED(hr)) + { + /* NOTE: if we are in a critical section when Receive is called + * then it causes some problems (most notably with the native Video + * Renderer) if we are re-entered for whatever reason */ + hr = IMemInputPin_Receive(pMemConnected, pSample); + IMemInputPin_Release(pMemConnected); + } + + return hr; +} + diff -Nru wine-old/dlls/qcap/pin.h wine-new/dlls/qcap/pin.h --- wine-old/dlls/qcap/pin.h 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/qcap/pin.h 2005-04-29 14:01:43.000000000 +0200 @@ -0,0 +1,81 @@ +/* + * IPin function declarations to allow inheritance + * + * Copyright 2003 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* This function will process incoming samples to the pin. + * Any return value valid in IMemInputPin::Receive is allowed here + */ +typedef HRESULT (* SAMPLEPROC)(LPVOID userdata, IMediaSample * pSample); + +/* This function will determine whether a type is supported or not. + * It is allowed to return any error value (within reason), as opposed + * to IPin::QueryAccept which is only allowed to return S_OK or S_FALSE. + */ +typedef HRESULT (* QUERYACCEPTPROC)(LPVOID userdata, const AM_MEDIA_TYPE * pmt); + +/* This function is called prior to finalizing a connection with + * another pin and can be used to get things from the other pin + * like IMemInput interfaces. + */ +typedef HRESULT (* PRECONNECTPROC)(IPin * iface, IPin * pConnectPin); + +typedef struct IPinImpl +{ + const struct IPinVtbl * lpVtbl; + ULONG refCount; + LPCRITICAL_SECTION pCritSec; + PIN_INFO pinInfo; + IPin * pConnectedTo; + AM_MEDIA_TYPE mtCurrent; + ENUMMEDIADETAILS enumMediaDetails; + QUERYACCEPTPROC fnQueryAccept; + LPVOID pUserData; +} IPinImpl; + +typedef struct OutputPin +{ + /* inheritance C style! */ + IPinImpl pin; + + IMemInputPin * pMemInputPin; + HRESULT (* pConnectSpecific)(IPin * iface, IPin * pReceiver, const AM_MEDIA_TYPE * pmt); + ALLOCATOR_PROPERTIES allocProps; +} OutputPin; + +/*** Initializers ***/ +HRESULT OutputPin_Init(const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, OutputPin * pPinImpl); + +/* Common */ +HRESULT WINAPI IPinImpl_ConnectedTo(IPin * iface, IPin ** ppPin); +HRESULT WINAPI IPinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt); +HRESULT WINAPI IPinImpl_QueryPinInfo(IPin * iface, PIN_INFO * pInfo); +HRESULT WINAPI IPinImpl_QueryDirection(IPin * iface, PIN_DIRECTION * pPinDir); +HRESULT WINAPI IPinImpl_QueryId(IPin * iface, LPWSTR * Id); +HRESULT WINAPI IPinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt); +HRESULT WINAPI IPinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum); +HRESULT WINAPI IPinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin); + +/* Output Pin */ +HRESULT WINAPI OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); +HRESULT WINAPI OutputPin_Disconnect(IPin * iface); +HRESULT WINAPI OutputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); + +HRESULT OutputPin_GetDeliveryBuffer(OutputPin * This, IMediaSample ** ppSample, const REFERENCE_TIME * tStart, const REFERENCE_TIME * tStop, DWORD dwFlags); +HRESULT OutputPin_SendSample(OutputPin * This, IMediaSample * pSample); + diff -Nru wine-old/dlls/qcap/qcap_main.c wine-new/dlls/qcap/qcap_main.c --- wine-old/dlls/qcap/qcap_main.c 2004-05-21 22:54:48.000000000 +0200 +++ wine-new/dlls/qcap/qcap_main.c 2005-05-01 01:53:20.000000000 +0200 @@ -1,7 +1,10 @@ -/* - * Qcap implementation +/* DirectShow Capture Base Functions (QCAP.DLL) * - * Copyright (C) 2003 Dominik Strasser + * Copyright 2002 Lionel Ulmer + * Copyright 2005 Maarten Lankhorst + * + * This file contains the (internal) driver registration functions, + * driver enumeration APIs and DirectDraw creation functions. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,26 +21,206 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" #include "wine/debug.h" -#include "winerror.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); +static DWORD dll_ref = 0; + +/* For the moment, do nothing here. */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + switch(fdwReason) { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +/****************************************************************************** + * DirectShow ClassFactory + */ +typedef struct { + IClassFactory ITF_IClassFactory; + + DWORD ref; + HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); +} IClassFactoryImpl; + +struct object_creation_info +{ + const CLSID *clsid; + HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); +}; + +static const struct object_creation_info object_creation[] = +{ + { &CLSID_VfwCapture, &VfwCapture_create }, + { &CLSID_CaptureGraphBuilder, &CaptureGraphBuilder_create } +}; + +static HRESULT WINAPI +DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *ppobj = This; + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + + ULONG ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + + +static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + HRESULT hres; + LPUNKNOWN punk; + + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); + + *ppobj = NULL; + hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); + if (SUCCEEDED(hres)) { + hres = IUnknown_QueryInterface(punk, riid, ppobj); + IUnknown_Release(punk); + } + return hres; +} + +static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + FIXME("(%p)->(%d),stub!\n",This,dolock); + return S_OK; +} + +static IClassFactoryVtbl DSCF_Vtbl = +{ + DSCF_QueryInterface, + DSCF_AddRef, + DSCF_Release, + DSCF_CreateInstance, + DSCF_LockServer +}; + +/******************************************************************************* + * DllGetClassObject [QCAP.@] + * Retrieves class object from a DLL object + * + * NOTES + * Docs say returns STDAPI + * + * PARAMS + * rclsid [I] CLSID for the class object + * riid [I] Reference to identifier of interface for class object + * ppv [O] Address of variable to receive interface pointer for riid + * + * RETURNS + * Success: S_OK + * Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG, + * E_UNEXPECTED + */ +DWORD WINAPI QCAP_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + unsigned int i; + IClassFactoryImpl *factory; + + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if ( !IsEqualGUID( &IID_IClassFactory, riid ) + && ! IsEqualGUID( &IID_IUnknown, riid) ) + return E_NOINTERFACE; + + for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + { + if (IsEqualGUID(object_creation[i].clsid, rclsid)) + break; + } + + if (i == sizeof(object_creation)/sizeof(object_creation[0])) + { + FIXME("%s: no class found.\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + + factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); + if (factory == NULL) return E_OUTOFMEMORY; + + factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; + factory->ref = 1; + + factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; + + *ppv = &(factory->ITF_IClassFactory); + return S_OK; +} + /*********************************************************************** - * DllRegisterServer (QCAP.@) + * DllCanUnloadNow (QCAP.@) */ -HRESULT WINAPI QCAP_DllRegisterServer() +HRESULT WINAPI QCAP_DllCanUnloadNow() { - FIXME("(): stub\n"); - return 0; + return dll_ref != 0 ? S_FALSE : S_OK; } + +#define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } , #name }, + +static struct { + const GUID riid; + const char *name; +} InterfaceDesc[] = +{ +#include "uuids.h" + { { 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0} }, NULL } +}; + /*********************************************************************** - * DllGetClassObject (QCAP.@) + * qcdebugstr_guid (internal) + * + * Gives a text version of QCap Guids */ -HRESULT WINAPI QCAP_DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +const char * qcdebugstr_guid( const GUID * id ) { - FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid)); - return CLASS_E_CLASSNOTAVAILABLE; + int i; + char * name = NULL; + + for (i=0;InterfaceDesc[i].name && !name;i++) { + if (IsEqualGUID(&InterfaceDesc[i].riid, id)) return InterfaceDesc[i].name; + } + return debugstr_guid(id); } + diff -Nru wine-old/dlls/qcap/qcap_private.h wine-new/dlls/qcap/qcap_private.h --- wine-old/dlls/qcap/qcap_private.h 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/qcap/qcap_private.h 2005-04-29 00:27:34.000000000 +0200 @@ -0,0 +1,64 @@ +/* Quartz Capture private interfaces (QCAP.DLL) + * + * Copyright 2005 Maarten Lankhorst + * + * This file contains the (internal) driver registration functions, + * driver enumeration APIs and DirectDraw creation functions. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __QCAP_PRIVATE_INCLUDED__ +#define __QCAP_PRIVATE_INCLUDED__ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wtypes.h" +#include "wingdi.h" +#include "winuser.h" +#include "dshow.h" + +#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) + +HRESULT VfwCapture_create(IUnknown * pUnkOuter, LPVOID * ppv); +HRESULT CaptureGraphBuilder_create(IUnknown * pUnkOuter, LPVOID * ppv); + +typedef struct tagENUMPINDETAILS +{ + ULONG cPins; + IPin ** ppPins; +} ENUMPINDETAILS; + +typedef struct tagENUMEDIADETAILS +{ + ULONG cMediaTypes; + AM_MEDIA_TYPE * pMediaTypes; +} ENUMMEDIADETAILS; + +HRESULT IEnumPinsImpl_Construct(const ENUMPINDETAILS * pDetails, IEnumPins ** ppEnum); +HRESULT IEnumMediaTypesImpl_Construct(const ENUMMEDIADETAILS * pDetails, IEnumMediaTypes ** ppEnum); + +extern const char * qcdebugstr_guid(const GUID * id); + +HRESULT CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc); +void DeleteMediaType(AM_MEDIA_TYPE * pmt); +BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards); +void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); + +#endif /* __QCAP_PRIVATE_INCLUDED__ */ diff -Nru wine-old/dlls/qcap/qcap.spec wine-new/dlls/qcap/qcap.spec --- wine-old/dlls/qcap/qcap.spec 2003-07-30 05:48:55.000000000 +0200 +++ wine-new/dlls/qcap/qcap.spec 2005-04-28 23:07:08.000000000 +0200 @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() QCAP_DllCanUnloadNow @ stdcall -private DllGetClassObject(ptr ptr ptr) QCAP_DllGetClassObject @ stdcall -private DllRegisterServer() QCAP_DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllUnregisterServer() QCAP_DllUnregisterServer diff -Nru wine-old/dlls/qcap/regsvr.c wine-new/dlls/qcap/regsvr.c --- wine-old/dlls/qcap/regsvr.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/qcap/regsvr.c 2005-04-29 00:28:39.000000000 +0200 @@ -0,0 +1,940 @@ +/* + * self-registerable dll functions for qcap.dll + * + * Copyright (C) 2003 John K. Hohm + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#define COBJMACROS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "winerror.h" + +#include "ole2.h" +#include "uuids.h" +#include "strmif.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qcap); + +/* + * Near the bottom of this file are the exported DllRegisterServer and + * DllUnregisterServer, which make all this worthwhile. + */ + +/*********************************************************************** + * interface for self-registering + */ +struct regsvr_interface +{ + IID const *iid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + IID const *base_iid; /* can be NULL to omit */ + int num_methods; /* can be <0 to omit */ + CLSID const *ps_clsid; /* can be NULL to omit */ + CLSID const *ps_clsid32; /* can be NULL to omit */ +}; + +static HRESULT register_interfaces(struct regsvr_interface const *list); +static HRESULT unregister_interfaces(struct regsvr_interface const *list); + +struct regsvr_coclass +{ + CLSID const *clsid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + LPCSTR ips; /* can be NULL to omit */ + LPCSTR ips32; /* can be NULL to omit */ + LPCSTR ips32_tmodel; /* can be NULL to omit */ + LPCSTR progid; /* can be NULL to omit */ + LPCSTR viprogid; /* can be NULL to omit */ + LPCSTR progid_extra; /* can be NULL to omit */ +}; + +static HRESULT register_coclasses(struct regsvr_coclass const *list); +static HRESULT unregister_coclasses(struct regsvr_coclass const *list); + +struct regsvr_mediatype_parsing +{ + CLSID const *majortype; /* NULL for end of list */ + CLSID const *subtype; + LPCSTR line[11]; /* NULL for end of list */ +}; + +static HRESULT register_mediatypes_parsing(struct regsvr_mediatype_parsing const *list); +static HRESULT unregister_mediatypes_parsing(struct regsvr_mediatype_parsing const *list); + +struct regsvr_mediatype_extension +{ + CLSID const *majortype; /* NULL for end of list */ + CLSID const *subtype; + LPCSTR extension; +}; + +struct mediatype +{ + CLSID const *majortype; /* NULL for end of list */ + CLSID const *subtype; + DWORD fourcc; +}; + +struct pin +{ + DWORD flags; /* 0xFFFFFFFF for end of list */ + struct mediatype mediatypes[11]; +}; + +struct regsvr_filter +{ + CLSID const *clsid; /* NULL for end of list */ + CLSID const *category; + WCHAR name[50]; + DWORD merit; + struct pin pins[11]; +}; + +static HRESULT register_mediatypes_extension(struct regsvr_mediatype_extension const *list); +static HRESULT unregister_mediatypes_extension(struct regsvr_mediatype_extension const *list); + +static HRESULT register_filters(struct regsvr_filter const *list); +static HRESULT unregister_filters(struct regsvr_filter const *list); + +/*********************************************************************** + * static string constants + */ +static WCHAR const interface_keyname[10] = { + 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; +static WCHAR const base_ifa_keyname[14] = { + 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', + 'e', 0 }; +static WCHAR const num_methods_keyname[11] = { + 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; +static WCHAR const ps_clsid_keyname[15] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', 0 }; +static WCHAR const ps_clsid32_keyname[17] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', '3', '2', 0 }; +static WCHAR const clsid_keyname[6] = { + 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const curver_keyname[7] = { + 'C', 'u', 'r', 'V', 'e', 'r', 0 }; +static WCHAR const ips_keyname[13] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + 0 }; +static WCHAR const ips32_keyname[15] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + '3', '2', 0 }; +static WCHAR const progid_keyname[7] = { + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const viprogid_keyname[25] = { + 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', + 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', + 0 }; +static char const tmodel_valuename[] = "ThreadingModel"; +static WCHAR const mediatype_name[11] = { + 'M', 'e', 'd', 'i', 'a', ' ', 'T', 'y', 'p', 'e', 0 }; +static WCHAR const subtype_valuename[8] = { + 'S', 'u', 'b', 't', 'y', 'p', 'e', 0 }; +static WCHAR const sourcefilter_valuename[14] = { + 'S', 'o', 'u', 'r', 'c', 'e', ' ', 'F', 'i', 'l', 't', 'e', 'r', 0 }; +static WCHAR const extensions_keyname[11] = { + 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', 0 }; + +/*********************************************************************** + * static helper functions + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); +static LONG register_key_defvalueW(HKEY base, WCHAR const *name, + WCHAR const *value); +static LONG register_key_defvalueA(HKEY base, WCHAR const *name, + char const *value); +static LONG register_progid(WCHAR const *clsid, + char const *progid, char const *curver_progid, + char const *name, char const *extra); +static LONG recursive_delete_key(HKEY key); +static LONG recursive_delete_keyA(HKEY base, char const *name); +static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); + +/*********************************************************************** + * register_interfaces + */ +static HRESULT register_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + HKEY iid_key; + + StringFromGUID2(list->iid, buf, 39); + res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_interface_key; + + if (list->name) { + res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->base_iid) { + register_key_guid(iid_key, base_ifa_keyname, list->base_iid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (0 <= list->num_methods) { + static WCHAR const fmt[3] = { '%', 'd', 0 }; + HKEY key; + + res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + + wsprintfW(buf, fmt, list->num_methods); + res = RegSetValueExW(key, NULL, 0, REG_SZ, + (CONST BYTE*)buf, + (lstrlenW(buf) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid) { + register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid32) { + register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + error_close_iid_key: + RegCloseKey(iid_key); + } + +error_close_interface_key: + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_interfaces + */ +static HRESULT unregister_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, + KEY_READ | KEY_WRITE, &interface_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->iid, buf, 39); + res = recursive_delete_keyW(interface_key, buf); + } + + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * register_coclasses + */ +static HRESULT register_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + HKEY clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->name) { + res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips) { + res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips32) { + HKEY ips32_key; + + res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &ips32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->ips32, + lstrlenA(list->ips32) + 1); + if (res == ERROR_SUCCESS && list->ips32_tmodel) + res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, + (CONST BYTE*)list->ips32_tmodel, + strlen(list->ips32_tmodel) + 1); + RegCloseKey(ips32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->progid) { + res = register_key_defvalueA(clsid_key, progid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->progid, NULL, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->viprogid) { + res = register_key_defvalueA(clsid_key, viprogid_keyname, + list->viprogid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->viprogid, list->progid, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + error_close_clsid_key: + RegCloseKey(clsid_key); + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_coclasses + */ +static HRESULT unregister_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->clsid, buf, 39); + res = recursive_delete_keyW(coclass_key, buf); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->progid) { + res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + + if (list->viprogid) { + res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * register_mediatypes_parsing + */ +static HRESULT register_mediatypes_parsing(struct regsvr_mediatype_parsing const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY mediatype_key; + WCHAR buf[39]; + int i; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, mediatype_name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &mediatype_key, NULL); + if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); + + for (; res == ERROR_SUCCESS && list->majortype; ++list) { + HKEY majortype_key = NULL; + HKEY subtype_key = NULL; + + StringFromGUID2(list->majortype, buf, 39); + res = RegCreateKeyExW(mediatype_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &majortype_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_keys; + + StringFromGUID2(list->subtype, buf, 39); + res = RegCreateKeyExW(majortype_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &subtype_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_keys; + + StringFromGUID2(&CLSID_AsyncReader, buf, 39); + res = RegSetValueExW(subtype_key, sourcefilter_valuename, 0, REG_SZ, (CONST BYTE*)buf, + (lstrlenW(buf) + 1) * sizeof(WCHAR)); + if (res != ERROR_SUCCESS) goto error_close_keys; + + for(i = 0; list->line[i]; i++) { + char buffer[3]; + wsprintfA(buffer, "%d", i); + res = RegSetValueExA(subtype_key, buffer, 0, REG_SZ, (CONST BYTE*)list->line[i], + lstrlenA(list->line[i])); + if (res != ERROR_SUCCESS) goto error_close_keys; + } + +error_close_keys: + if (majortype_key) + RegCloseKey(majortype_key); + if (subtype_key) + RegCloseKey(subtype_key); + } + + RegCloseKey(mediatype_key); + + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * register_mediatypes_extension + */ +static HRESULT register_mediatypes_extension(struct regsvr_mediatype_extension const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY mediatype_key; + HKEY extensions_root_key = NULL; + WCHAR buf[39]; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, mediatype_name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &mediatype_key, NULL); + if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); + + res = RegCreateKeyExW(mediatype_key, extensions_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &extensions_root_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->majortype; ++list) { + HKEY extension_key; + + res = RegCreateKeyExA(extensions_root_key, list->extension, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &extension_key, NULL); + if (res != ERROR_SUCCESS) break; + + StringFromGUID2(list->majortype, buf, 39); + res = RegSetValueExW(extension_key, mediatype_name, 0, REG_SZ, (CONST BYTE*)buf, + (lstrlenW(buf) + 1) * sizeof(WCHAR)); + if (res != ERROR_SUCCESS) goto error_close_key; + + StringFromGUID2(list->subtype, buf, 39); + res = RegSetValueExW(extension_key, subtype_valuename, 0, REG_SZ, (CONST BYTE*)buf, + (lstrlenW(buf) + 1) * sizeof(WCHAR)); + if (res != ERROR_SUCCESS) goto error_close_key; + + StringFromGUID2(&CLSID_AsyncReader, buf, 39); + res = RegSetValueExW(extension_key, sourcefilter_valuename, 0, REG_SZ, (CONST BYTE*)buf, + (lstrlenW(buf) + 1) * sizeof(WCHAR)); + if (res != ERROR_SUCCESS) goto error_close_key; + +error_close_key: + RegCloseKey(extension_key); + } + +error_return: + RegCloseKey(mediatype_key); + if (extensions_root_key) + RegCloseKey(extensions_root_key); + + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_mediatypes_parsing + */ +static HRESULT unregister_mediatypes_parsing(struct regsvr_mediatype_parsing const *list) +{ + LONG res; + HKEY mediatype_key; + HKEY majortype_key; + WCHAR buf[39]; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, mediatype_name, 0, + KEY_READ | KEY_WRITE, &mediatype_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); + + for (; res == ERROR_SUCCESS && list->majortype; ++list) { + StringFromGUID2(list->majortype, buf, 39); + res = RegOpenKeyExW(mediatype_key, buf, 0, + KEY_READ | KEY_WRITE, &majortype_key); + if (res == ERROR_FILE_NOT_FOUND) { + res = ERROR_SUCCESS; + continue; + } + if (res != ERROR_SUCCESS) break; + + StringFromGUID2(list->subtype, buf, 39); + res = recursive_delete_keyW(majortype_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + + /* Removed majortype key if there is no more subtype key */ + res = RegDeleteKeyW(majortype_key, 0); + if (res == ERROR_ACCESS_DENIED) res = ERROR_SUCCESS; + + RegCloseKey(majortype_key); + } + + RegCloseKey(mediatype_key); + + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_mediatypes_extension + */ +static HRESULT unregister_mediatypes_extension(struct regsvr_mediatype_extension const *list) +{ + LONG res; + HKEY mediatype_key; + HKEY extensions_root_key = NULL; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, mediatype_name, 0, + KEY_READ | KEY_WRITE, &mediatype_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); + + res = RegOpenKeyExW(mediatype_key, extensions_keyname, 0, + KEY_READ | KEY_WRITE, &extensions_root_key); + if (res == ERROR_FILE_NOT_FOUND) + res = ERROR_SUCCESS; + else if (res == ERROR_SUCCESS) + for (; res == ERROR_SUCCESS && list->majortype; ++list) { + res = recursive_delete_keyA(extensions_root_key, list->extension); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + } + + RegCloseKey(mediatype_key); + if (extensions_root_key) + RegCloseKey(extensions_root_key); + + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * register_filters + */ +static HRESULT register_filters(struct regsvr_filter const *list) +{ + HRESULT hr; + IFilterMapper2* pFM2 = NULL; + + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&pFM2); + + if (SUCCEEDED(hr)) { + for (; SUCCEEDED(hr) && list->clsid; ++list) { + REGFILTER2 rf2; + REGFILTERPINS2* prfp2; + int i; + + for (i = 0; list->pins[i].flags != 0xFFFFFFFF; i++) ; + rf2.dwVersion = 2; + rf2.dwMerit = list->merit; + rf2.u.s1.cPins2 = i; + rf2.u.s1.rgPins2 = prfp2 = (REGFILTERPINS2*) CoTaskMemAlloc(i*sizeof(REGFILTERPINS2)); + if (!prfp2) { + hr = E_OUTOFMEMORY; + break; + } + for (i = 0; list->pins[i].flags != 0xFFFFFFFF; i++) { + REGPINTYPES* lpMediatype; + CLSID* lpClsid; + int j, nbmt; + + for (nbmt = 0; list->pins[i].mediatypes[nbmt].majortype; nbmt++) ; + /* Allocate a single buffer for regpintypes struct and clsids */ + lpMediatype = (REGPINTYPES*) CoTaskMemAlloc(nbmt*(sizeof(REGPINTYPES) + 2*sizeof(CLSID))); + if (!lpMediatype) { + hr = E_OUTOFMEMORY; + break; + } + lpClsid = (CLSID*) (lpMediatype + nbmt); + for (j = 0; j < nbmt; j++) { + (lpMediatype + j)->clsMajorType = lpClsid + j*2; + memcpy(lpClsid + j*2, list->pins[i].mediatypes[j].majortype, sizeof(CLSID)); + (lpMediatype + j)->clsMinorType = lpClsid + j*2 + 1; + if (list->pins[i].mediatypes[j].subtype) + memcpy(lpClsid + j*2 + 1, list->pins[i].mediatypes[j].subtype, sizeof(CLSID)); + else { + /* Subtype are often a combination of major type + fourcc/tag */ + memcpy(lpClsid + j*2 + 1, list->pins[i].mediatypes[j].majortype, sizeof(CLSID)); + *(DWORD*)(lpClsid + j*2 + 1) = list->pins[i].mediatypes[j].fourcc; + } + } + prfp2[i].dwFlags = list->pins[i].flags; + prfp2[i].cInstances = 0; + prfp2[i].nMediaTypes = j; + prfp2[i].lpMediaType = lpMediatype; + prfp2[i].nMediums = 0; + prfp2[i].lpMedium = NULL; + prfp2[i].clsPinCategory = NULL; + } + + if (FAILED(hr)) { + ERR("failed to register with hresult 0x%lx\n", hr); + CoTaskMemFree(prfp2); + break; + } + + hr = IFilterMapper2_RegisterFilter(pFM2, list->clsid, list->name, NULL, list->category, NULL, &rf2); + + while (i) { + CoTaskMemFree((REGPINTYPES*)prfp2[i-1].lpMediaType); + i--; + } + CoTaskMemFree(prfp2); + } + } + + if (pFM2) + IFilterMapper2_Release(pFM2); + + CoUninitialize(); + + return hr; +} + +/*********************************************************************** + * unregister_filters + */ +static HRESULT unregister_filters(struct regsvr_filter const *list) +{ + HRESULT hr; + IFilterMapper2* pFM2; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&pFM2); + + if (SUCCEEDED(hr)) { + for (; SUCCEEDED(hr) && list->clsid; ++list) + hr = IFilterMapper2_UnregisterFilter(pFM2, list->category, NULL, list->clsid); + IFilterMapper2_Release(pFM2); + } + + CoUninitialize(); + + return hr; +} + +/*********************************************************************** + * regsvr_key_guid + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) +{ + WCHAR buf[39]; + + StringFromGUID2(guid, buf, 39); + return register_key_defvalueW(base, name, buf); +} + +/*********************************************************************** + * regsvr_key_defvalueW + */ +static LONG register_key_defvalueW( + HKEY base, + WCHAR const *name, + WCHAR const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + (lstrlenW(value) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_key_defvalueA + */ +static LONG register_key_defvalueA( + HKEY base, + WCHAR const *name, + char const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + lstrlenA(value) + 1); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_progid + */ +static LONG register_progid( + WCHAR const *clsid, + char const *progid, + char const *curver_progid, + char const *name, + char const *extra) +{ + LONG res; + HKEY progid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) return res; + + if (name) { + res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, + (CONST BYTE*)name, strlen(name) + 1); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (clsid) { + res = register_key_defvalueW(progid_key, clsid_keyname, clsid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (curver_progid) { + res = register_key_defvalueA(progid_key, curver_keyname, + curver_progid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (extra) { + HKEY extra_key; + + res = RegCreateKeyExA(progid_key, extra, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &extra_key, NULL); + if (res == ERROR_SUCCESS) + RegCloseKey(extra_key); + } + +error_close_progid_key: + RegCloseKey(progid_key); + return res; +} + +/*********************************************************************** + * recursive_delete_key + */ +static LONG recursive_delete_key(HKEY key) +{ + LONG res; + WCHAR subkey_name[MAX_PATH]; + DWORD cName; + HKEY subkey; + + for (;;) { + cName = sizeof(subkey_name) / sizeof(WCHAR); + res = RegEnumKeyExW(key, 0, subkey_name, &cName, + NULL, NULL, NULL, NULL); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { + res = ERROR_SUCCESS; /* presumably we're done enumerating */ + break; + } + res = RegOpenKeyExW(key, subkey_name, 0, + KEY_READ | KEY_WRITE, &subkey); + if (res == ERROR_FILE_NOT_FOUND) continue; + if (res != ERROR_SUCCESS) break; + + res = recursive_delete_key(subkey); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) break; + } + + if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); + return res; +} + +/*********************************************************************** + * recursive_delete_keyA + */ +static LONG recursive_delete_keyA(HKEY base, char const *name) +{ + LONG res; + HKEY key; + + res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); + if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; + if (res != ERROR_SUCCESS) return res; + res = recursive_delete_key(key); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * recursive_delete_keyW + */ +static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) +{ + LONG res; + HKEY key; + + res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); + if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; + if (res != ERROR_SUCCESS) return res; + res = recursive_delete_key(key); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * coclass list + */ +static struct regsvr_coclass const coclass_list[] = { + { &CLSID_VfwCapture, + "Video input for wine", + NULL, + "qcap.dll", + "Both" + }, + { &CLSID_CaptureGraphBuilder, + "Capture Graph Builder", + NULL, + "qcap.dll", + "Both" + }, + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * interface list + */ + +static struct regsvr_interface const interface_list[] = { + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * mediatype list + */ + +static struct regsvr_mediatype_parsing const mediatype_parsing_list[] = { + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * mediatype list + */ + +static struct regsvr_mediatype_extension const mediatype_extension_list[] = { + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * filter list + */ + +static struct regsvr_filter const filter_list[] = { + { &CLSID_VfwCapture, + &CLSID_VideoInputDeviceCategory, + { 'V','i','d','e','o',' ','4',' ','w','i','n','e',0 }, + 0x400000, + { { 0xFFFFFFFF } } + }, + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * DllRegisterServer (QCAP.@) + */ +HRESULT WINAPI QCAP_DllRegisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = register_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = register_interfaces(interface_list); + if (SUCCEEDED(hr)) + hr = register_mediatypes_parsing(mediatype_parsing_list); + if (SUCCEEDED(hr)) + hr = register_mediatypes_extension(mediatype_extension_list); + if (SUCCEEDED(hr)) + hr = register_filters(filter_list); + return hr; +} + +/*********************************************************************** + * DllUnregisterServer (QCAP.@) + */ +HRESULT WINAPI QCAP_DllUnregisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = unregister_filters(filter_list); + if (SUCCEEDED(hr)) + hr = unregister_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = unregister_interfaces(interface_list); + if (SUCCEEDED(hr)) + hr = unregister_mediatypes_parsing(mediatype_parsing_list); + if (SUCCEEDED(hr)) + hr = unregister_mediatypes_extension(mediatype_extension_list); + return hr; +} diff -Nru wine-old/dlls/qcap/v4l.c wine-new/dlls/qcap/v4l.c --- wine-old/dlls/qcap/v4l.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/qcap/v4l.c 2005-05-01 02:08:03.000000000 +0200 @@ -0,0 +1,667 @@ +/* DirectShow capture services (QCAP.DLL) + * + * Copyright 2005 Maarten Lankhorst + * + * This file contains the part of the vfw capture interface that + * does the actual Video4Linux(1/2) stuff required for capturing + * and setting/getting media format.. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" +#ifdef HAVE_LINUX_VIDEODEV_H + +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "qcap_private.h" +#include "pin.h" + +#include "uuids.h" +#include "mmreg.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "windef.h" +#include "winbase.h" +#include "dshow.h" +#include "strmif.h" +#include "ddraw.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +#include <stdio.h> +#include <sys/ioctl.h> +#include <sys/stat.h> +#include <sys/mman.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <asm/types.h> +#include <linux/videodev.h> +#include <fcntl.h> +#include <unistd.h> +#include "winnls.h" +#include "capture.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l); + +/* NOTE: Currently the V4L2 is unsupported and I'm not working on it, + * I have undefined HAVE_V4L2 so that I could leave the code in place + * without having to update it.. + */ +#undef HAVE_V4L2 + +struct CaptureBox; + +typedef void (* Renderer)(struct CaptureBox *, LPBYTE bufferin, LPBYTE stream); + +typedef struct CaptureBox { +/* Dunno what to put in here? */ + UINT width, height, bitDepth, fps; + UINT outputwidth, outputheight; + + CRITICAL_SECTION CritSect; + + IPin *pOut; + int fd, isV4l2, mmap; + int iscommitted, stopped; + +/* mmap (V4l1) */ + struct video_mmap *grab_buf; + struct video_mbuf gb_buffers; + void *pmap; + int buffers, palette; + +/* read (V4l1) */ + int imagesize; + char * grab_data; + + int curframe; + + HANDLE thread; + Renderer renderer; +} CaptureBox; + +struct renderlist { + int depth; + char* name; + Renderer renderer; +}; + +static void renderer_RGB24(CaptureBox *capBox, LPBYTE bufferin, LPBYTE stream); +static void renderer_RGB32(CaptureBox *capBox, LPBYTE bufferin, LPBYTE stream); + +static const struct renderlist renderlist_V4l[] = { + { 0, "NULL renderer", NULL }, + { 8, "Gray scales", NULL }, /* 1, Intentional not suported */ + { 0, "High 240 cube (BT848)", NULL }, /* 2, Intentional not supported */ + { 16, "16 bit RGB (565)", NULL }, /* 3, Intentional not supported */ + { 24, "24 bit RGB values", renderer_RGB24 }, /* 4, Supported, and tested */ + { 32, "32 bit RGB values", renderer_RGB32 }, /* 5, Supported, and tested */ + { 16, "15 bit RGB (555)", NULL }, /* 6, Intentional not supported */ + { 16, "YUV 422 (Not P)", NULL }, /* 7, Should be supported */ + { 16, "YUYV (Not P)", NULL }, /* 8, Should be supported */ + { 16, "UYVY (Not P)", NULL }, /* 9, Should be supported */ + { 12, "YUV 420 (Not P)", NULL }, /* 10, Should be supported */ + { 0, "Raw capturing (BT848)", NULL }, /* 11, Intentional not supported */ + { 16, "YUV 422 (Planar)", NULL }, /* 12, Should be supported */ + { 12, "YUV 411 (Planar)", NULL }, /* 13, Should be supported */ + { 12, "YUV 420 (Planar)", NULL }, /* 14, Should be supported */ + { 10, "YUV 410 (Planar)", NULL }, /* 15, Should be supported */ + { 0, NULL, NULL }, +}; + +const int fallback_V4l[] = { 4, 5, 7, 8, 9, 12, 13, 14, 15, 10 }; +/* Fallback: First try raw formats, then yuv, then yuv with a color channel missing */ + +static int xioctl(int fd, int request, void * arg) +{ + int r; + + do r = ioctl (fd, request, arg); + while (-1 == r && EINTR == errno); + + return r; +} + +HRESULT Capture_Initialise(void ** pointer, IPin * pOut, USHORT card) +{ + CaptureBox * capBox = CoTaskMemAlloc(sizeof(CaptureBox)); + char device[128]; + struct stat st; +#ifdef HAVE_V4L2 + struct v4l2_capability caps; +#endif + struct video_capability capa; + struct video_picture pict; + struct video_window window; + + /* Because I don't want to change every return failure, + I'll let VfwCapture clean up if *pointer != NULL + and the call failed.. + */ + + *pointer = NULL; /* Until we're succesful */ + + if (!capBox) { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + sprintf(device, "/dev/video%i", card); + + FIXME("(): Allow use of more then 1 video adapter, like I did in avicap\n"); + + if (stat (device, &st) == -1) { + ERR("%s: %s\n", device, strerror(errno)); + CoTaskMemFree(capBox); + return E_FAIL; + } + + if (!S_ISCHR (st.st_mode)) { + ERR("%s: Not a device\n", device); + CoTaskMemFree(capBox); + return E_FAIL; + } + + capBox->fd = open(device, O_RDWR | O_NONBLOCK); + if (capBox->fd == -1) { + ERR("%s: Failed to open: %s\n", device, strerror(errno)); + CoTaskMemFree(capBox); + return E_FAIL; + } + +#ifdef HAVE_V4L2 + if (xioctl(capBox->fd, VIDIOC_QUERYCAP, &caps) >= 0) { + capBox->isV4l2 = 1; +/* There are 5 reasons I don't add V4l2 support + * 1. Webcams don't use it + * 2. It is more complicated then V4l and more complicated then it needs to be + * 3. V4l2 devices can fall back to V4l + * 4. No one really misses it if I leave it out.. + * 5. (MAIN REASON) *I* don't miss it, if you do, write V4l2 support yourself! + */ + ERR("Tinkerer detected? Thou shalt not define HAVE_V4L2\n"); + CoTaskMemFree(capBox); + close(capBox->fd); + return E_FAIL; + } else +#endif /* HAVE_V4L2 */ + { + capBox->isV4l2 = 0; + memset(&capa, 0, sizeof(capa)); + + if (xioctl(capBox->fd, VIDIOCGCAP, &capa) == -1) { + if (errno != EINVAL && errno != 515) ERR("%s: Querying failed: %s\n", device, strerror(errno)); + else ERR("%s: Querying failed: Not a V4L compatible device", device); + close(capBox->fd); + CoTaskMemFree(capBox); + return E_FAIL; + } + + if (!(capa.type & VID_TYPE_CAPTURE)) { + ERR("%s: This is not a video capture device\n", device); + close(capBox->fd); + CoTaskMemFree(capBox); + return E_FAIL; + } + TRACE("Amount of inputs on %s: %d\n", capa.name, capa.channels); + + if (xioctl(capBox->fd, VIDIOCGPICT, &pict) == -1) { + ERR("%s: Acquiring picture properties failed, this shouldn't happen..\n", device); + close(capBox->fd); + CoTaskMemFree(capBox); + return E_FAIL; + } + + TRACE("%s: Suggested picture depth: %d, suggested picture palette: %d\n", device, pict.depth, pict.palette); + TRACE("%s: Hue %d, Color %d, Contrast %d\n", device, pict.hue,pict.colour,pict.contrast); +/* This will most likely fail, and if it does we will fall back to 32 bits, + of which each first bit will be nothing but rubble, waste of bandwidth */ + TRACE("%s: Suggested format: \"%s\"\n", device, renderlist_V4l[pict.palette].name); + if (!renderlist_V4l[pict.palette].renderer) + { + int palet = pict.palette, formatenum; + WARN("No renderer available for \"%s\", trying to fall back to defaults\n", renderlist_V4l[pict.palette].name); + capBox->renderer = NULL; + for (formatenum = 0; formatenum < (sizeof(fallback_V4l) / sizeof(int)); formatenum++) { + int currentrender = fallback_V4l[formatenum]; + if (renderlist_V4l[currentrender].renderer == NULL) continue; + pict.depth = renderlist_V4l[currentrender].depth; + pict.palette = currentrender; + if (xioctl(capBox->fd, VIDIOCSPICT, &pict) == -1) { + TRACE("%s: Could not render with \"%s\"\n (%d)", device, renderlist_V4l[currentrender].name, currentrender); + continue; + } + TRACE("%s: Found a suitable renderer: \"%s\" (%d)\n", device, renderlist_V4l[currentrender].name, currentrender); + capBox->renderer = renderlist_V4l[currentrender].renderer; + break; + } + if (!capBox->renderer) { + close(capBox->fd); + CoTaskMemFree(capBox); + ERR("%s: This device wants to use \"%s\", but this format isn't available, and it didn't accept one of our other formats, GIVING UP!\n\n", device, renderlist_V4l[palet].name); + return E_FAIL; + } + } else { + TRACE("Using the suggested format\n"); + capBox->renderer = renderlist_V4l[pict.palette].renderer; + } + + memset(&window, 0, sizeof(window)); + if (xioctl(capBox->fd, VIDIOCGWIN, &window) == -1) { + ERR("%s: Getting resolution failed.. (%s), giving up\n", device, strerror(errno)); + close(capBox->fd); + CoTaskMemFree(capBox); + return E_FAIL; + } + + capBox->height = window.height; + capBox->width = window.width; + capBox->bitDepth = 24; +/* Try mmap */ + + if (xioctl(capBox->fd, VIDIOCGMBUF, &capBox->gb_buffers) != -1 && capBox->gb_buffers.frames) { + capBox->mmap = 1; + capBox->buffers = capBox->gb_buffers.frames; + if (capBox->gb_buffers.frames > 2) { + TRACE("%s: %d buffers granted, but only using 2 anyway\n", device, capBox->gb_buffers.frames); + capBox->buffers = 2; + } else if (capBox->gb_buffers.frames == 1) { + TRACE("%s: Only 1 buffer granted, which is below the tested 2\n", device); + } else { + TRACE("%s: Using %d buffers\n", device, capBox->gb_buffers.frames); + } + capBox->pmap = mmap(0, capBox->gb_buffers.size, PROT_READ|PROT_WRITE, MAP_SHARED, capBox->fd, 0); + if (capBox->pmap != MAP_FAILED) { + int i; + capBox->grab_buf = CoTaskMemAlloc(sizeof(struct video_mmap) * capBox->buffers); + if(!capBox->grab_buf) { + ERR("Out of memory?\n"); + munmap(capBox->pmap, capBox->gb_buffers.size); + close(capBox->fd); + CoTaskMemFree(capBox); + return E_OUTOFMEMORY; + } + + /* Setup mmap capture buffers. */ + for (i = 0; i < capBox->buffers; i++) { + capBox->grab_buf[i].format = pict.palette; + capBox->grab_buf[i].frame = i; + capBox->grab_buf[i].width = capBox->width; + capBox->grab_buf[i].height = capBox->height; + if (xioctl(capBox->fd, VIDIOCMCAPTURE, &capBox->grab_buf[i]) == -1) + { + ERR("%s: Error setting up capture IOCTL: %s\n", device, strerror(errno)); + Capture_Destroy(capBox); + return E_FAIL; + } + } + } else capBox->mmap = 0; + } + if (!capBox->mmap) { + capBox->buffers = 1; + capBox->imagesize = renderlist_V4l[pict.palette].depth * capBox->height * capBox->width / 8; + capBox->grab_data = CoTaskMemAlloc(capBox->imagesize); + if (!capBox->grab_data) + { + ERR("%s: Out of memory?\n", device); + close(capBox->fd); + CoTaskMemFree(capBox); + return E_OUTOFMEMORY; + } + } + } + + capBox->pOut = pOut; + capBox->fps = 3; + capBox->stopped = 0; + capBox->curframe = 0; + InitializeCriticalSection(&capBox->CritSect); + *pointer = capBox; + +/* I had to set output to 320x240 for pin connection, the builtin filtergraph reconnect doesn't work + * we will try to change to this format later anyway, in Capture_SetFormat */ + capBox->outputwidth = 320; + capBox->outputheight = 240; + capBox->iscommitted = 0; + TRACE("Using format: %d bits - %d x %d\n", capBox->bitDepth, capBox->width, capBox->height); + return S_OK; +} + +HRESULT Capture_Destroy(void * pBox) +{ + CaptureBox *capBox = (CaptureBox *)pBox; +/* Destroy file handlers etc? This function can't fail.. */ +#ifdef HAVE_V4L2 + if (capBox->isV4l2) { +/* We should destroy V4l2 stuff here but we don't use it */ + } else +#endif + if (capBox->mmap) { + munmap(capBox->pmap, capBox->gb_buffers.size); + CoTaskMemFree(capBox->grab_buf); + } else CoTaskMemFree(capBox->grab_data); + close(capBox->fd); + DeleteCriticalSection(&capBox->CritSect); + return S_OK; +} + +HRESULT Capture_SetMediaType(void * pBox, AM_MEDIA_TYPE * mT) +{ + CaptureBox *capBox = (CaptureBox *)pBox; + TRACE("%p\n", capBox); + if (((VIDEOINFOHEADER *)mT->pbFormat)->bmiHeader.biBitCount != 24 || + ((VIDEOINFOHEADER *)mT->pbFormat)->bmiHeader.biCompression != BI_RGB) + { + ERR("Invalid media type suggested\n"); + return VFW_E_INVALIDMEDIATYPE; + } +#ifdef HAVE_V4L2 + if (capBox->isV4l2) { +/* We should do V4l2 resizing here but V4l2 is not really supported.. */ + } else +#endif + { + struct video_window window; + + } + + capBox->outputwidth = ((VIDEOINFOHEADER *)mT->pbFormat)->bmiHeader.biWidth; + capBox->outputheight = ((VIDEOINFOHEADER *)mT->pbFormat)->bmiHeader.biHeight; + + FIXME("%p -> (%p) - %d %d\n", capBox, mT, capBox->outputwidth, capBox->outputheight); + return S_OK; +} + +HRESULT Capture_GetMediaType(void * pBox, AM_MEDIA_TYPE ** mT) +{ + CaptureBox *capBox = (CaptureBox *)pBox; + TRACE("%p\n", capBox); + VIDEOINFOHEADER *vi; + mT[0] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + if (!mT[0]) return E_OUTOFMEMORY; + vi = CoTaskMemAlloc(sizeof(VIDEOINFOHEADER)); + mT[0]->cbFormat = sizeof(VIDEOINFOHEADER); + if (!vi) + { + CoTaskMemFree(mT[0]); + return E_OUTOFMEMORY; + } + memcpy(&mT[0]->majortype, &MEDIATYPE_Video, sizeof(GUID)); + memcpy(&mT[0]->subtype, &MEDIASUBTYPE_RGB24, sizeof(GUID)); + memcpy(&mT[0]->formattype, &FORMAT_VideoInfo, sizeof(GUID)); + mT[0]->bFixedSizeSamples = TRUE; + mT[0]->bTemporalCompression = FALSE; + mT[0]->pUnk = NULL; + mT[0]->lSampleSize = capBox->outputwidth * capBox->outputheight * capBox->bitDepth / 8; + TRACE("Output format: %d x %d - %d bits = %lu KB\n", capBox->outputwidth, capBox->outputheight, capBox->bitDepth, mT[0]->lSampleSize/1024); + vi->rcSource.left = 0; vi->rcSource.top = 0; + vi->rcTarget.left = 0; vi->rcTarget.top = 0; + vi->rcSource.right = capBox->width; vi->rcSource.bottom = capBox->height; + vi->rcTarget.right = capBox->outputwidth; vi->rcTarget.bottom = capBox->outputheight; + vi->dwBitRate = capBox->fps * mT[0]->lSampleSize; + vi->dwBitErrorRate = 0; + vi->AvgTimePerFrame = (LONGLONG)10000000.0 / (LONGLONG)capBox->fps; + vi->bmiHeader.biSize = 40; + vi->bmiHeader.biWidth = capBox->outputwidth; + vi->bmiHeader.biHeight = capBox->outputheight; + vi->bmiHeader.biPlanes = 1; + vi->bmiHeader.biBitCount = 24; + vi->bmiHeader.biCompression = BI_RGB; + vi->bmiHeader.biSizeImage = mT[0]->lSampleSize; + vi->bmiHeader.biClrUsed = vi->bmiHeader.biClrImportant = 0; + vi->bmiHeader.biXPelsPerMeter = 100; + vi->bmiHeader.biYPelsPerMeter = 100; + mT[0]->pbFormat = (void *)vi; + dump_AM_MEDIA_TYPE(mT[0]); + return S_OK; +} + +static void renderer_RGB24(CaptureBox *capBox, LPBYTE bufferin, LPBYTE stream) +{ + int size = capBox->height * capBox->width * 3; + TRACE("%p\n", capBox); + memcpy(bufferin, stream, size); +} + +static void renderer_RGB32(CaptureBox *capBox, LPBYTE bufferin, LPBYTE stream) +{ + int size = capBox->height * capBox->width * 4; + int pointer = 0, offset = 1; + TRACE("()\n"); + + /* I guess it's easier - but slower to do this per byte.. */ + + while (pointer + offset <= size) { + bufferin[pointer] = stream[pointer + offset]; + pointer++; + bufferin[pointer] = stream[pointer + offset]; + pointer++; + bufferin[pointer] = stream[pointer + offset]; + pointer++; + offset++; + } +} + +#define CHECKRANGE(a) (a > 255 ? 255 : (a < 0 ? 0 : a)) + +static void Resize(CaptureBox * capBox, LPBYTE output, LPBYTE input) +{ +/* outputheight < height */ +/* outputwidth < width */ + int depth = capBox->bitDepth / 8; + int inoffset = 0, outoffset = (capBox->outputheight-1) * capBox->outputwidth * depth; + int ow = capBox->outputwidth * depth; + while (outoffset) { + outoffset -= ow; + int x; + for (x = 0; x < ow; x++) + output[outoffset + x] = input[inoffset + x]; + inoffset += capBox->width * depth; + } +} + +static void Capture_GetFrame(CaptureBox * capBox, LPBYTE * pInput) +{ +#ifdef HAVE_V4L2 + if (capBox->isV4l2) { + } else +#endif + if (capBox->mmap) { + if (xioctl(capBox->fd, VIDIOCSYNC, &capBox->grab_buf[capBox->curframe]) == -1) + TRACE("Syncing ioctl failed: %s\n", strerror(errno)); + *pInput = ((char *)capBox->pmap) + capBox->gb_buffers.offsets[capBox->curframe]; + } else { + int retval; + while ((retval = read(capBox->fd, capBox->grab_data, capBox->imagesize)) == -1) + if (errno != EAGAIN) break; + if (retval == -1) + ERR("Error occured while reading from device: %s\n", strerror(errno)); + *pInput = capBox->grab_data; + } +} + +static void Capture_FreeFrame(CaptureBox * capBox) +{ +#ifdef HAVE_V4L2 + if (capBox->isV4l2) { + } else +#endif + if (capBox->mmap) { + if (xioctl(capBox->fd, VIDIOCMCAPTURE, &capBox->grab_buf[capBox->curframe]) == -1) + TRACE("Freeing frame for capture failed: %s\n", strerror(errno)); + } + if (++capBox->curframe == capBox->buffers) capBox->curframe = 0; +} + +static DWORD WINAPI ReadThread(LPVOID lParam) { + CaptureBox * capBox = lParam; + HRESULT hr; + IMediaSample *pSample = NULL; + unsigned long framecount = 0; + LPBYTE pTarget, pInput, pOutput; + pOutput = CoTaskMemAlloc(capBox->width * capBox->height * 3); + + while (1) { + EnterCriticalSection(&capBox->CritSect); + if (capBox->stopped) break; + hr = OutputPin_GetDeliveryBuffer((OutputPin *)capBox->pOut, &pSample, NULL, NULL, 0); + if (SUCCEEDED(hr)) { + IMediaSample_SetActualDataLength(pSample, capBox->outputheight * capBox->outputwidth * capBox->bitDepth / 8); + IMediaSample_GetPointer(pSample, &pTarget); + /* TODO: Check return values.. */ + Capture_GetFrame(capBox, &pInput); + capBox->renderer(capBox, pOutput, pInput); + Resize(capBox, pTarget, pOutput); + hr = OutputPin_SendSample((OutputPin *)capBox->pOut, pSample); + FIXME("%p -> Frame %lu: %lx\n", capBox, ++framecount, hr); + IMediaSample_Release(pSample); + Capture_FreeFrame(capBox); + } + LeaveCriticalSection(&capBox->CritSect); + if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) { + ERR("Received error: %lx\n", hr); + } + } + LeaveCriticalSection(&capBox->CritSect); + CoTaskMemFree(pOutput); + + return 0x0; +} + +HRESULT Capture_Run(void * pBox, FILTER_STATE *state) +{ + CaptureBox *capBox = (CaptureBox *)pBox; + HANDLE thread; + HRESULT hr; + + TRACE("%p -> (%p)\n", capBox, state); + + if (*state == State_Running) return S_OK; + + EnterCriticalSection(&capBox->CritSect); + + capBox->stopped = 0; + + if (*state == State_Stopped) + { + *state = State_Running; + if (!capBox->iscommitted++) { + IMemAllocator * pAlloc = NULL; + ALLOCATOR_PROPERTIES ap, actual; + ap.cBuffers = 3; + ap.cbBuffer = capBox->outputwidth * capBox->outputheight * capBox->bitDepth / 8; + ap.cbAlign = 1; + ap.cbPrefix = 0; + + hr = IMemInputPin_GetAllocator(((OutputPin *)capBox->pOut)->pMemInputPin, &pAlloc); + + if (SUCCEEDED(hr)) + hr = IMemAllocator_SetProperties(pAlloc, &ap, &actual); + + if (SUCCEEDED(hr)) + hr = IMemAllocator_Commit(pAlloc); + + if (pAlloc) + IMemAllocator_Release(pAlloc); + + TRACE("Committing allocator: %lx\n", hr); + } + + thread = CreateThread(NULL, 0, ReadThread, capBox, 0, NULL); + if (thread) { + capBox->thread = thread; + SetThreadPriority(thread, THREAD_PRIORITY_IDLE); + LeaveCriticalSection(&capBox->CritSect); + return S_OK; + } + ERR("Creating thread failed.. %lx\n", GetLastError()); + LeaveCriticalSection(&capBox->CritSect); + return E_FAIL; + } + + ResumeThread(capBox->thread); + *state = State_Running; + LeaveCriticalSection(&capBox->CritSect); + return S_OK; +} + +HRESULT Capture_Pause(void * pBox, FILTER_STATE *state) +{ + CaptureBox *capBox = (CaptureBox *)pBox; + TRACE("%p -> (%p)\n", capBox, state); + if (*state == State_Paused) return S_OK; + if (*state == State_Stopped) Capture_Run(pBox, state); + EnterCriticalSection(&capBox->CritSect); + *state = State_Paused; + SuspendThread(capBox->thread); + LeaveCriticalSection(&capBox->CritSect); + return S_OK; +} + +HRESULT Capture_Stop(void * pBox, FILTER_STATE *state) +{ + CaptureBox *capBox = (CaptureBox *)pBox; + TRACE("%p -> (%p)\n", capBox, state); + if (*state == State_Stopped) return S_OK; + + EnterCriticalSection(&capBox->CritSect); + + if (capBox->thread) { + if (*state == State_Paused) + ResumeThread(capBox->thread); + *state = State_Stopped; + capBox->stopped = 1; + capBox->thread = 0; + if (capBox->iscommitted) { + HRESULT hr; + IMemInputPin *pMem = NULL; + IMemAllocator * pAlloc = NULL; + IPin *pConnect = NULL; + + capBox->iscommitted = 0; + + hr = IPin_ConnectedTo(capBox->pOut, &pConnect); + + if (SUCCEEDED(hr)) + hr = IPin_QueryInterface(pConnect, &IID_IMemInputPin, (void **) &pMem); + + if (SUCCEEDED(hr)) + hr = IMemInputPin_GetAllocator(pMem, &pAlloc); + + if (SUCCEEDED(hr)) + hr = IMemAllocator_Decommit(pAlloc); + + if (pAlloc) + IMemAllocator_Release(pAlloc); + + if (pMem) + IMemInputPin_Release(pMem); + + if (pConnect) + IPin_Release(pConnect); + + if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) + ERR("Decommitting allocator: %lx\n", hr); + } + } + + LeaveCriticalSection(&capBox->CritSect); + return S_OK; +} + +#endif /* HAVE_LINUX_VIDEODEV_H */ + diff -Nru wine-old/dlls/qcap/vfwcapture.c wine-new/dlls/qcap/vfwcapture.c --- wine-old/dlls/qcap/vfwcapture.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/qcap/vfwcapture.c 2005-05-01 01:59:57.000000000 +0200 @@ -0,0 +1,614 @@ +/* Video For Windows Steering structure + * + * Copyright 2005 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Ugh, Now I can't tell what's worser, COM or the bugs in filtergraph, pins, enummedia and devenum.. + * This file is only compiled if we found a working videodev.h + * If it doesn't exist, null.c will be compiled instead + */ + +/* /dev/videoX where X = videodevice, will look at a more legal way later.. + * So here we use /dev/video0 */ +#define VIDEODEVICE 0 + +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "config.h" +#include "qcap_private.h" +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qcap); + +#include "pin.h" +#include "capture.h" +#include "uuids.h" +#include "mmreg.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "windef.h" +#include "winbase.h" +#include "dshow.h" +#include "strmif.h" +#include "ddraw.h" + +static const IBaseFilterVtbl VfwCapture_Vtbl; +static const IAMStreamConfigVtbl IAMStreamConfig_VTable; +static const IPinVtbl VfwPin_Vtbl; + +static HRESULT VfwPin_Construct(IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +static const WCHAR wszOutputPinName[] = { 'O','u','t','p','u','t',0 }; + +typedef struct VfwCapture +{ + const struct IBaseFilterVtbl * lpVtbl; + const struct IAMStreamConfigVtbl * IAMStreamConfig_vtbl; + + LPVOID myCap; + ULONG refCount; + FILTER_INFO filterInfo; + FILTER_STATE state; + CRITICAL_SECTION csFilter; + + IPin * pOutputPin; +} VfwCapture; + +/* VfwPin implementation */ +typedef struct VfwPinImpl +{ + OutputPin pin; + + LPVOID myCap; + IKsPropertySetVtbl * KSP_VT; +} VfwPinImpl; + +HRESULT VfwCapture_create(IUnknown * pUnkOuter, LPVOID * ppv) +{ + VfwCapture *pVfwCapture; + HRESULT hr; + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + pVfwCapture = CoTaskMemAlloc(sizeof(VfwCapture)); + + if (!pVfwCapture) + return E_OUTOFMEMORY; + + pVfwCapture->lpVtbl = &VfwCapture_Vtbl; + pVfwCapture->IAMStreamConfig_vtbl = &IAMStreamConfig_VTable; + pVfwCapture->refCount = 1; + pVfwCapture->filterInfo.achName[0] = '\0'; + pVfwCapture->filterInfo.pGraph = NULL; + pVfwCapture->state = State_Stopped; + InitializeCriticalSection(&pVfwCapture->csFilter); + hr = VfwPin_Construct((IBaseFilter *)&pVfwCapture->lpVtbl, &pVfwCapture->csFilter, &pVfwCapture->pOutputPin); + if (!SUCCEEDED(hr)) + { + CoTaskMemFree(pVfwCapture); + return E_OUTOFMEMORY; + } else { + hr = Capture_Initialise(&pVfwCapture->myCap, pVfwCapture->pOutputPin, VIDEODEVICE); + ((VfwPinImpl *)pVfwCapture->pOutputPin)->myCap = pVfwCapture->myCap; + if (FAILED(hr)) { + if (pVfwCapture->myCap) + CoTaskMemFree(pVfwCapture->myCap); + IPin_Release((IPin *)pVfwCapture->pOutputPin); + CoTaskMemFree(pVfwCapture); + return hr; + } + } + *ppv = (LPVOID)pVfwCapture; + TRACE("-- created at %p\n", pVfwCapture); + + return S_OK; +} + +static HRESULT WINAPI VfwCapture_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("(%s, %p)\n", qcdebugstr_guid(riid), ppv); + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IPersist)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IMediaFilter)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IBaseFilter)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IAMStreamConfig)) + *ppv = (LPVOID)&(This->IAMStreamConfig_vtbl); + + if (*ppv) + { + TRACE("Returning %s interface\n", qcdebugstr_guid(riid)); + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } + + FIXME("No interface for %s!\n", qcdebugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI VfwCapture_AddRef(IBaseFilter * iface) +{ + VfwCapture *This = (VfwCapture *)iface; + ULONG refCount = InterlockedIncrement(&This->refCount); + + TRACE("(%p/%p)->() New refcount: %ld\n", This, iface, refCount); + + return refCount; +} + +static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) +{ + VfwCapture *This = (VfwCapture *)iface; + ULONG refCount = InterlockedDecrement(&This->refCount); + TRACE("(%p/%p)->() New refcount: %ld\n", This, iface, refCount); + + if (!refCount) + { + TRACE("(): Destroying everything!\n"); + if (This->state != State_Stopped) + Capture_Stop(This->myCap, &This->state); + Capture_Destroy(This->myCap); + CoTaskMemFree(This->myCap); + if (((IPinImpl *)This->pOutputPin)->pConnectedTo != NULL) + { + IPin_Disconnect(((IPinImpl *)This->pOutputPin)->pConnectedTo); + IPin_Disconnect(This->pOutputPin); + } + IPin_Release(This->pOutputPin); + DeleteCriticalSection(&This->csFilter); + This->lpVtbl = NULL; + CoTaskMemFree(This); + } + return refCount; +} + +/** IPersist methods **/ + +static HRESULT WINAPI VfwCapture_GetClassID(IBaseFilter * iface, CLSID * pClsid) +{ + TRACE("(%p)\n", pClsid); + *pClsid = CLSID_VfwCapture; + return S_OK; +} + +/** IMediaFilter methods **/ + +static HRESULT WINAPI VfwCapture_Stop(IBaseFilter * iface) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("()\n"); + return Capture_Stop(This->myCap, &This->state); +} + +static HRESULT WINAPI VfwCapture_Pause(IBaseFilter * iface) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("()\n"); + return Capture_Pause(This->myCap, &This->state); +} + +static HRESULT WINAPI VfwCapture_Run(IBaseFilter * iface, REFERENCE_TIME tStart) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("(%lx%08lx)\n", (ULONG)(tStart >> 32), (ULONG)tStart); + return Capture_Run(This->myCap, &This->state); +} + +static HRESULT WINAPI VfwCapture_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("(%lu, %p)\n", dwMilliSecsTimeout, pState); + *pState = This->state; + return S_OK; +} + +static HRESULT WINAPI VfwCapture_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock) +{ + TRACE("(%p)\n", pClock); + return S_OK; +} + +static HRESULT WINAPI VfwCapture_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock) +{ + TRACE("(%p)\n", ppClock); + return S_OK; +} + +/** IBaseFilter methods **/ + +static HRESULT WINAPI VfwCapture_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) +{ + ENUMPINDETAILS epd; + VfwCapture *This = (VfwCapture *)iface; + + TRACE("(%p)\n", ppEnum); + + epd.cPins = 1; + epd.ppPins = &This->pOutputPin; + return IEnumPinsImpl_Construct(&epd, ppEnum); +} + +static HRESULT WINAPI VfwCapture_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) +{ + FIXME("(%s, %p) - stub\n", debugstr_w(Id), ppPin); + return E_NOTIMPL; +} + +static HRESULT WINAPI VfwCapture_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) +{ + VfwCapture *This = (VfwCapture *)iface; + + TRACE("(%p)\n", pInfo); + + strcpyW(pInfo->achName, This->filterInfo.achName); + pInfo->pGraph = This->filterInfo.pGraph; + + if (pInfo->pGraph) + IFilterGraph_AddRef(pInfo->pGraph); + return S_OK; +} + +static HRESULT WINAPI VfwCapture_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) +{ + VfwCapture *This = (VfwCapture *)iface; + + TRACE("(%p, %s)\n", pGraph, debugstr_w(pName)); + + if (pName) + strcpyW(This->filterInfo.achName, pName); + else + *This->filterInfo.achName = 0; + This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */ + + return S_OK; +} + +static HRESULT WINAPI VfwCapture_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo) +{ + FIXME("(%p) - stub\n", pVendorInfo); + return E_NOTIMPL; +} + +static const IBaseFilterVtbl VfwCapture_Vtbl = +{ + VfwCapture_QueryInterface, + VfwCapture_AddRef, + VfwCapture_Release, + VfwCapture_GetClassID, + VfwCapture_Stop, + VfwCapture_Pause, + VfwCapture_Run, + VfwCapture_GetState, + VfwCapture_SetSyncSource, + VfwCapture_GetSyncSource, + VfwCapture_EnumPins, + VfwCapture_FindPin, + VfwCapture_QueryFilterInfo, + VfwCapture_JoinFilterGraph, + VfwCapture_QueryVendorInfo +}; + +/* AMStreamConfig interface, we only need to implement {G,S}etFormat */ +static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig * iface, REFIID riid, LPVOID * ppv) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IAMStreamConfig)) + { + *ppv = (LPVOID)iface; + return S_OK; + } + + FIXME("No interface for iid %s\n", qcdebugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI AMStreamConfig_AddRef(IAMStreamConfig * iface) +{ + ICOM_THIS_MULTI(VfwCapture, IAMStreamConfig_vtbl, iface); + TRACE("%p --> Forwarding to VfwCapture (%p)\n", iface, This); + return IUnknown_AddRef((IUnknown *)This); +} + +static ULONG WINAPI AMStreamConfig_Release(IAMStreamConfig * iface) +{ + ICOM_THIS_MULTI(VfwCapture, IAMStreamConfig_vtbl, iface); + TRACE("%p --> Forwarding to VfwCapture (%p)\n", iface, This); + return IUnknown_Release((IUnknown *)This); +} + +static HRESULT WINAPI AMStreamConfig_SetFormat(IAMStreamConfig *iface, + AM_MEDIA_TYPE *pmt) { + HRESULT hr; + ICOM_THIS_MULTI(VfwCapture, IAMStreamConfig_vtbl, iface); + + TRACE("(%p): %p->%p\n", iface, pmt, pmt->pbFormat); + + if (This->state != State_Stopped) + { + TRACE("Returning not stopped error\n"); + return VFW_E_NOT_STOPPED; + } + + dump_AM_MEDIA_TYPE(pmt); + + if (((IPinImpl *)This->pOutputPin)->pConnectedTo != NULL) { + hr = IPin_QueryAccept(((IPinImpl *)This->pOutputPin)->pConnectedTo, pmt); + TRACE("Would accept: %ld\n", hr); + if (hr == S_FALSE) + return VFW_E_INVALIDMEDIATYPE; + } + + hr = Capture_SetMediaType(This->myCap, pmt); + if (SUCCEEDED(hr) && This->filterInfo.pGraph != NULL && + ((IPinImpl *)This->pOutputPin)->pConnectedTo != NULL) { + hr = IFilterGraph_Reconnect(This->filterInfo.pGraph, This->pOutputPin); + if (SUCCEEDED(hr)) + TRACE("Reconnection completed, with new media format..\n"); + } + TRACE("Returning: %ld\n", hr); + return hr; +} + +static HRESULT WINAPI AMStreamConfig_GetFormat(IAMStreamConfig *iface, + AM_MEDIA_TYPE **pmt) { + ICOM_THIS_MULTI(VfwCapture, IAMStreamConfig_vtbl, iface); + + TRACE("%p -> (%p)\n", iface, pmt); + return Capture_GetMediaType(This->myCap, pmt); +} + +static HRESULT WINAPI AMStreamConfig_GetNumberOfCapabilities(IAMStreamConfig *iface, int *piCount, int *piSize) +{ + FIXME("%p: %p %p - stub, intentional\n", iface, piCount, piSize); + return E_NOTIMPL; /* Not implemented for this interface */ +} + +static HRESULT WINAPI AMStreamConfig_GetStreamCaps(IAMStreamConfig *iface, +int iIndex, AM_MEDIA_TYPE **pmt, BYTE *pSCC) +{ + FIXME("%p: %d %p %p - stub, intentional\n", iface, iIndex, pmt, pSCC); + return E_NOTIMPL; /* Not implemented for this interface */ +} + +static const IAMStreamConfigVtbl IAMStreamConfig_VTable = +{ + AMStreamConfig_QueryInterface, + AMStreamConfig_AddRef, + AMStreamConfig_Release, + AMStreamConfig_SetFormat, + AMStreamConfig_GetFormat, + AMStreamConfig_GetNumberOfCapabilities, + AMStreamConfig_GetStreamCaps +}; + +/* IKsPropertySet interface */ +static HRESULT WINAPI KSP_QueryInterface(IKsPropertySet * iface, REFIID riid, LPVOID * ppv) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IKsPropertySet)) + { + *ppv = (LPVOID)iface; + return S_OK; + } + + FIXME("No interface for iid %s\n", qcdebugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI KSP_AddRef(IKsPropertySet * iface) +{ + ICOM_THIS_MULTI(VfwPinImpl, KSP_VT, iface); + TRACE("%p --> Forwarding to VfwPin (%p)\n", iface, This); + return IUnknown_AddRef((IUnknown *)This); +} + +static ULONG WINAPI KSP_Release(IKsPropertySet * iface) +{ + ICOM_THIS_MULTI(VfwPinImpl, KSP_VT, iface); + TRACE("%p --> Forwarding to VfwPin (%p)\n", iface, This); + return IUnknown_Release((IUnknown *)This); +} + +static HRESULT WINAPI KSP_Set(IKsPropertySet * iface, REFGUID guidPropSet, DWORD dwPropID, LPVOID pInstanceData, DWORD cbInstanceData, LPVOID pPropData, DWORD cbPropData) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI KSP_Get(IKsPropertySet * iface, REFGUID guidPropSet, DWORD dwPropID, LPVOID pInstanceData, DWORD cbInstanceData, LPVOID pPropData, DWORD cbPropData, DWORD *pcbReturned) +{ + TRACE("()\n"); + if (!IsEqualIID(guidPropSet, &AMPROPSETID_Pin)) + return E_PROP_SET_UNSUPPORTED; + if (pPropData == NULL && pcbReturned == NULL) + return E_POINTER; + if (pcbReturned) + *pcbReturned = sizeof(GUID); + if (pPropData == NULL) + return S_OK; + if (cbPropData < sizeof(GUID)) + return E_UNEXPECTED; + *(GUID *)pPropData = PIN_CATEGORY_PREVIEW; + FIXME("() Not adding a pin with PIN_CATEGORY_CAPTURE for a reason..\n"); + return S_OK; +} + +static HRESULT WINAPI KSP_QuerySupported(IKsPropertySet * iface, REFGUID guidPropSet, DWORD dwPropID, DWORD *pTypeSupport) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static IKsPropertySetVtbl KSP_VTable = +{ + KSP_QueryInterface, + KSP_AddRef, + KSP_Release, + KSP_Set, + KSP_Get, + KSP_QuerySupported +}; + +static HRESULT VfwPin_Construct(IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) +{ + ALLOCATOR_PROPERTIES ap; + VfwPinImpl * pPinImpl; + PIN_INFO piOutput; + + pPinImpl = CoTaskMemAlloc(sizeof(*pPinImpl)); + if (!pPinImpl) + return E_OUTOFMEMORY; + + ap.cBuffers = 3; + ap.cbBuffer = 230400; + ap.cbAlign = 1; + ap.cbPrefix = 0; + + piOutput.dir = PINDIR_OUTPUT; + piOutput.pFilter = pBaseFilter; + strcpyW(piOutput.achName, wszOutputPinName); + + if (SUCCEEDED(OutputPin_Init(&piOutput, &ap, pBaseFilter, NULL, pCritSec, &pPinImpl->pin))) + { + pPinImpl->KSP_VT = &KSP_VTable; + pPinImpl->pin.pin.lpVtbl = &VfwPin_Vtbl; + *ppPin = (IPin *)(&pPinImpl->pin.pin.lpVtbl); + return S_OK; + } + return E_FAIL; +} + +static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) +{ + VfwPinImpl *This = (VfwPinImpl *)iface; + TRACE("%s %p\n", qcdebugstr_guid(riid), ppv); + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IPin)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IKsPropertySet)) + *ppv = (LPVOID)&(This->KSP_VT); + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } + + FIXME("No interface for %s!\n", qcdebugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI VfwPin_AddRef(IPin * iface) +{ + VfwPinImpl *This = (VfwPinImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->pin.pin.refCount); + + TRACE("() -> new refcount: %lu\n", refCount); + + return refCount; +} + +static ULONG WINAPI VfwPin_Release(IPin * iface) +{ + VfwPinImpl *This = (VfwPinImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); + TRACE("() -> new refcount: %lu\n", refCount); + + if (!refCount) + { + CoTaskMemFree(This); + return 0; + } + return refCount; +} + +static HRESULT WINAPI VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) +{ + ENUMMEDIADETAILS emd; + AM_MEDIA_TYPE *pmt; + HRESULT hr; + + VfwPinImpl *This = (VfwPinImpl *)iface; + emd.cMediaTypes = 1; + hr = Capture_GetMediaType(This->myCap, &pmt); + emd.pMediaTypes = pmt; + if (SUCCEEDED(hr)) hr = IEnumMediaTypesImpl_Construct(&emd, ppEnum); + TRACE("%p -- %lx\n", This, hr); + DeleteMediaType(pmt); + return hr; +} + +static HRESULT WINAPI VfwPin_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) +{ + TRACE("(%p)->(%p, %p)\n", iface, apPin, cPin); + return E_NOTIMPL; +} + +static HRESULT WINAPI VfwPin_EndOfStream(IPin * iface) +{ + TRACE("()\n"); + return E_UNEXPECTED; +} + +static HRESULT WINAPI VfwPin_BeginFlush(IPin * iface) +{ + TRACE("(%p)->()\n", iface); + return E_UNEXPECTED; +} + +static HRESULT WINAPI VfwPin_EndFlush(IPin * iface) +{ + TRACE("(%p)->()\n", iface); + return E_UNEXPECTED; +} + +static HRESULT WINAPI VfwPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +{ + TRACE("(%p)->(%lx%08lx, %lx%08lx, %e)\n", iface, (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); + return E_UNEXPECTED; +} + +static const IPinVtbl VfwPin_Vtbl = +{ + VfwPin_QueryInterface, + VfwPin_AddRef, + VfwPin_Release, + OutputPin_Connect, + OutputPin_ReceiveConnection, + OutputPin_Disconnect, + IPinImpl_ConnectedTo, + IPinImpl_ConnectionMediaType, + IPinImpl_QueryPinInfo, + IPinImpl_QueryDirection, + IPinImpl_QueryId, + IPinImpl_QueryAccept, + VfwPin_EnumMediaTypes, + VfwPin_QueryInternalConnections, + VfwPin_EndOfStream, + VfwPin_BeginFlush, + VfwPin_EndFlush, + VfwPin_NewSegment +}; +

2 1

Lotus Notes 7
by Robert Lunnon 04 May '05

04 May '05

I'm having a look at the public beta of Notes 7 with a view to making this work but I get quite a few MSI errors. How do I override the built in msi. Bob

2 1

Re: crypt32: CryptProtectData/CryptUnprotectData
by Juan Lang 03 May '05

03 May '05

Hi Kees, > If I understand correctly, you want me to: > - parse the Windows data format as best I can > - produce output that looks like the Windows data format > - do some kind of encryption on the data so that nothing needs to be > stored to the computer between calls of CryptProtectData and > CryptUnprotectData. (The existing patches intentionally avoid > any encryption.) > > From looking at Wine's configure.ac, it seems safe to depend on openssl > being available. Is that correct? Someone previously posted pretty good information about the format of CryptProtectData on MSDN. I think it should be possible to implement a close facsimile, except that the user's credentials (password) would be missing in Wine since there isn't any at the moment. If you have time to do this, it would be ideal. Failing that, doing any stateless transformation (e.g. no change at all, or xor-ing with some magic value) would be preferrable to storing this data in the registry, if I understood Alexandre's comments correctly. We're trying to avoid proliferation of OpenSSL in Wine. Relying on CryptoAPI is a safer bet. --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

3 2

short-circuting a dialog box?
by Kees Cook 03 May '05

03 May '05

I'm trying to figure out if there is a way to short-circuit a dialog box. Basically, I want to traps calls to DialogBoxParam, pump calls into lpDialogFunc for dialog init, and then clicking of the "Ok" button, and finally trap calls to EndDialog. It seems that this is ... hard. :) There is a lot of resource loading, window initialization code, etc that goes on inside DialogBoxParam, and I'd need to handle all of that, I think. There even appears to be issues with 16 vs 32 bit handler addresses, etc. Looks really ugly. Is there a simpler way to programatically click "Ok" on a dialog box? (The dialog box coming from code that I don't have source for...) -- Kees Cook @outflux.net

5 7

wineconf videos
by Ivan Leo Puoti 03 May '05

03 May '05

We need some help with editing, questions can be heard in the background, but I think that if someone could turn the volume of the comments up it would be almost as good as if the people speaking had a microphone. Also we need someone to split the sound from the video so we can have audio files for those without fast connections. Ivan.

2 1

Benchmarking Wine againt XP Part 2
by Tom Wickline 03 May '05

03 May '05

This is part two of the results..... Tom

3 5

Commercial Support
by MediaHost (TM) 03 May '05

03 May '05

The point I wanted to make is, that only submitting patches or saying, "we give wine support", may hurt the wine project more than it helps: 1.) I didn't want to write this, so not to make this thread as an opportunity to make some self advertisement, but I need to explain: Linux Vendors are in fact solution and support providers. We ourselves (StartCom Linux) had the opportunity's to get a certain applications for a certain customers going, by "fixing" a few lines. This does not mean, that this fix was worth for the development efforts of wine. I prefer to let others doing this job better than we do... We do not maintain a wine source tree per se, nor do we checkout from CVS nor do we intend to do it anytime soon. We build and rather fix our current RPM from official releases and provide that to the customer. However, we very carefully monitor the wine devel list and know exactly what's going on (more or less) and are mostly up to date. Based on that informations we publish a new RPM's for our distributions or not. Therefor our efforts are not for the development of wine, but rather for the usability of the end user. 2.) Linux Support and solution issues are not only based on Wine. Wine is just one (important) application contributing to this effort. Now, a person or company listed in such a list, might be able to hack up a few patches, but might not be able to maintain a support level needed. Does that mean, that a patch submitting individual gives better support than a Linux Vendor with all the staff at hand? Having GOLD and SILVER listings makes that issue even more difficult....(Shahar, I know you submitted some nice work for unicode support, but does that make you own wine or making you a better wine supporting company than others??) 3.) I think, if you want to advertise your services, setup a appropriate website and make your offerings. Maybe instead of a list there should be a reference to some google searches suggesting a query....I personally think, that the community based wine should stay that way and leave the commercial issues going their own way. Well, I hope I made my point and wont bother anymore concerning this issue. Hope that this input was useful and gave you some food for thoughts.... -- Regards Signer: Eddy Nigg Company: StartCom Linux at www.startcom.org <http://www.startcom.org/> MediaHost^(TM) at www.mediahost.org <http://www.mediahost.org/> Skype: startcom <callto://startcom/> Phone: +1.213.341.0390 Import StartCom Public CA <http://cert.startcom.org/index.php?app=109>

1 0

Commercial support
by Shachar Shemesh 03 May '05

03 May '05

Hi Jer, When you finally get around to adding a "commercial support" to Winehq, I would love this list to include: "Lingnu Open Source Consulting", web at http://www.lingnu.com. On a different note. There is a page at http://www.winehq.org/site/support, but there does not appear to be any link to it. Shachar -- Shachar Shemesh Lingnu Open Source Consulting ltd. Have you backed up today's work? http://www.lingnu.com/backup.html

2 1

Make test status - latest CVS
by Shachar Shemesh 03 May '05

03 May '05

The results, this time really from CVS tip: Shachar -- Shachar Shemesh Lingnu Open Source Consulting ltd. http://www.lingnu.com/

2 13

Re: Anyone remember winemine?
by William Poetra Yoga H 03 May '05

03 May '05

--- Richard Cohen <richard(a)daijobu.co.uk> wrote: > The original patch > > http://www.winehq.org/hypermail/wine-patches/2004/09/0395.html > > was from me, back in last September. It included a test which showed > that it was correct. But AJ didn't like the way I did the test :( and I > haven't got round to resubmitting it. > > Richard. > Oops, sorry. Well, I think you should resubmit it then :) Maybe without the test attached it would be accepted by Alexandre? --- Detlef Riekenberg <wine.dev(a)web.de> wrote: > William Poetra Yoga H wrote: > > > > Sorry, I mean winmine, one that comes with Windows 98, for example. > > > Well, can you post a link to the binary? I don't have Win98 right now... > The > > WinXP winmine doesn't. > > winmine.exe (from win98se) does not shift > (tested with wine-cvs.2005.05.02 and win98se) > Weird... Did it call AdjustWindowRect? But after opening winmine.exe (from winxp) with vi, I didn't find an AdjustWindowRect, which means that the two programs are different in the way they handle the screen for new games. I think Richard should try again (yes, try without the test if Alexandre doesn't like it...) William Poetra Yoga Hadisoeseno __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Re: winamp and OleMainThreadWindow
by luis lenders 03 May '05

03 May '05

Hi, whenever i run winamp i get an "extra" window like in attached screenshot (in the upper left corner): http://uk.f257.mail.yahoo.com/ym/ShowLetter/Untitled.jpg?viewimg=1&box=Inbo… Further investigation shows it's this window: trace:win:WIN_CreateWindowEx "OleMainThreadWndName" "OleMainThreadWndClass 0x### ##### " ex=00000000 style=88000000 -2147483648,-2147483648 -2147483648x-21474836 48 parent=(nil) menu=(nil) inst=0x65f00000 params=(nil) trace:win:dump_window_styles style: WS_POPUP WS_DISABLED trace:win:dump_window_styles exstyle: trace:win:WIN_CreateWindowEx winproc type is 2 (WIN_PROC_32A) trace:win:WIN_SetWindowLong 0x10022 -12 0 3 trace:win:WIN_CreateWindowEx created window 0x10022 Googling shows it's a kind of hidden window but somehow in wine it gets displayed. Anyone knows why it is displayed and how to get rid of the window, as in windows it is not shown.. Send instant messages to your online friends http://uk.messenger.yahoo.com

2 1

Re: Anyone remember winemine?
by William Poetra Yoga H 02 May '05

02 May '05

--- Saulius Krasuckas <saulius2(a)ar.fi.lt> wrote: > > Sorry, I mean winmine, one that comes with Windows 98, for example. > Well, can you post a link to the binary? I don't have Win98 right now... The WinXP winmine doesn't. > > Assuming winemine shouldn't shift down by 1 pixel (and it shouldn't), > > Why it shouldn't, when the real minesweeper shifts? > > > the old winemine behaviour is a bug, right? > > I was pretty sure it is an exact mimic of original binary, which comes > from M$. And yes, I didn't look at the code. > Because I think (by reading the code) that the winemine code didn't tell it to shift down... :P William Poetra Yoga Hadisoeseno __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

3 2

Re: Quicken/CreateCompatibleBitmap issue revisited
by Juan Lang 02 May '05

02 May '05

Hi Rein, > Indeed, what happens if you try this obvious patch: (snip context) - if ((width >= 0x10000) || (height >= 0x10000)) + if ((height && width >= 0x10000) || (width && height >= 0x10000)) This obvious patch is quite wrong, height && width evaluantes to either 0 or 1, same with width && height, so now the fixme will never be produced. --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

Re: Anyone remember winemine?
by William Poetra Yoga H 02 May '05

02 May '05

--- Andreas Mohr <andi(a)rhlx01.fht-esslingen.de> wrote: > Hi, > > On Mon, May 02, 2005 at 02:31:10AM -0700, William Poetra Yoga H wrote: > > > > --- Saulius Krasuckas <saulius2(a)ar.fi.lt> wrote: > > > > > > Sorry, I mean winmine, one that comes with Windows 98, for example. > > > > > > > Well, can you post a link to the binary? I don't have Win98 right now... > The > > WinXP winmine doesn't. > You certainly know that you'd be bound to violate the > Winmine Software Licensing Restrictions Contractual Terms Of Use > Legal End-User License Agreement > then, right? ;-)) > > Andreas Mohr > Well... I'd rather be bound by the LGPL (winemine) :-D Have you tried the patch? If it's good then I'll submit it :) William Poetra Yoga Hadisoeseno __________________________________ Do you Yahoo!? Read only the mail you want - Yahoo! Mail SpamGuard. http://promotions.yahoo.com/new_mail

2 1

Re: Make test status - latest CVS
by Juan Lang 02 May '05

02 May '05

Shachar Shemesh wrote: > make[3]: Entering directory `/home/sun/sources/wine/dlls/ole32/tests' > ../../../tools/runtest -q -P wine -M ole32.dll -T ../../.. -p > ole32_test.exe.so stg_prop.c && touch stg_prop.ok > err:heap:HEAP_ValidateInUseArena Heap 401e0000: in-use arena 40218fc8 > next block has PREV_FREE flag > err:heap:HEAP_ValidateInUseArena Heap 401e0000: prev arena 40218f60 is > not prev for in-use 40218fc8 > err:heap:HEAP_ValidateInUseArena Heap 401e0000: prev arena 40218f60 is > not prev for in-use 40218fc8 > err:heap:HEAP_ValidateInUseArena Heap 401e0000: in-use arena 40218fe8 > next block has PREV_FREE flag > err:heap:HEAP_ValidateInUseArena Heap 401e0000: in-use arena 40218fe8 > next block has PREV_FREE flag > stg_prop.c:372: Test failed: Didn't get expected type or value for > property I don't see the same thing here. Could you send me a heap trace? --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Re: Make test fails on pristine CVS checkout
by gslink 02 May '05

02 May '05

The RH updates for FC3 include a new version of gcc. If you install this it causes problems with things like the kernel and Wine. The Wine CVS will not compile with the new gcc 4. I have not had time to find out why.

2 1

Re: Anyone remember winemine?
by William Poetra Yoga H 02 May '05

02 May '05

--- Andreas Mohr <andi(a)rhlx01.fht-esslingen.de> wrote: > Hi, > > On Sun, May 01, 2005 at 08:45:46PM -0700, William Poetra Yoga H wrote: > > Hi, anyone here remember winemine? The whole window just shifts down by one > > pixel whenever we click the smiley in the middle. This patch fixes it. > Oh, I certainly do! > > Nice to have this *very* long-standing bug finally fixed! > > Andreas > Well, being a newbie I simply changed the 2 lines (in the patch). I think it would fix other things too, and I actually still have some fixes for menu bars but I think I'll post them one by one. But I think someone needs to actually verify that the patch doesn't break other apps (hey, maybe a simple check is to submit it and see if it gets merged :P). William Poetra Yoga Hadisoeseno __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

1 0

Re: Anyone remember winemine?
by William Poetra Yoga H 02 May '05

02 May '05

--- Saulius Krasuckas <saulius2(a)ar.fi.lt> wrote: > * On Sun, 1 May 2005, William Poetra Yoga H wrote: > > Hi, anyone here remember winemine? The whole window just shifts down by > > one pixel whenever we click the smiley in the middle. This patch fixes > > it. > > And so does the original winemine, doesn't it? > Which "original winemine"? I mean, this patch fixes the canculations of the window size in user32.dll.so, and it indirectly affects winemine. Assuming winemine shouldn't shift down by 1 pixel (and it shouldn't), the old winemine behaviour is a bug, right? William Poetra Yoga Hadisoeseno __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

Anyone remember winemine?
by William Poetra Yoga H 02 May '05

02 May '05

Hi, anyone here remember winemine? The whole window just shifts down by one pixel whenever we click the smiley in the middle. This patch fixes it. P.S: Sorry about my last patch, I didn't check that nonclient.c has moved from windows/ to dlls/user/ :P William Poetra Yoga Hadisoeseno __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com Index: dlls/user/nonclient.c =================================================================== RCS file: /home/wine/wine/dlls/user/nonclient.c,v retrieving revision 1.1 diff -p -u -r1.1 nonclient.c --- dlls/user/nonclient.c 25 Apr 2005 11:33:36 -0000 1.1 +++ dlls/user/nonclient.c 2 May 2005 03:38:54 -0000 @@ -398,7 +398,7 @@ LONG NC_HandleNCCalcSize( HWND hwnd, REC winRect->top += MENU_GetMenuBarHeight( hwnd, winRect->right - winRect->left, - -tmpRect.left, -tmpRect.top ) + 1; + -tmpRect.left, -tmpRect.top ); } if( exStyle & WS_EX_CLIENTEDGE) @@ -1025,7 +1025,7 @@ static void NC_DoNCPaint( HWND hwnd, H TRACE("Calling DrawMenuBar with rect (%ld, %ld)-(%ld, %ld)\n", r.left, r.top, r.right, r.bottom); - rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ) + 1; + rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ); } TRACE("After MenuBar, rect is (%ld, %ld)-(%ld, %ld).\n",

1 0

Re: wine-20050419 crashes warcraft 3
by William Poetra Yoga H 02 May '05

02 May '05

--- Sebastien Fievet <sebastien.fievet(a)free.fr> wrote: > I had to hard-reboot the box to recover. Unfortunately, i am unable to give > any > trace or log, because each time i launch Warcraft it hangs, leaving me with > no > alternative but rebooting the system. > Maybe you can do: wine wc3.exe 2>&1 | tee ~/log Then when you reboot, the errors should go to ~/log. I've tried this with xkill'ing the terminal I run it in, and I'm not sure if this works for a crash, but it's worth a try ;) William Poetra Yoga Hadisoeseno __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

1 0

Put all Wineconf slides on Winehq
by Boaz Harrosh 01 May '05

01 May '05

For the sake of all the mis fortunate who could not attend Wineconf this year. Could someone, Please, collect all presentations and put them on Winehq. I thought that it could be nice if Wineconf page's "Agenda" could be updated to what it actually was, with links from each session to it's slides, and if possible some commentary on important Q&A that arose. Please ... Free Life Boaz

2 1

Re: Benchmarking Wine againt XP Part 1
by Tom Wickline 01 May '05

01 May '05

On 4/30/05, wino(a)piments.com <wino(a)piments.com> wrote: > On Fri, 29 Apr 2005 20:13:51 +0200, Tom Wickline <twickline(a)gmail.com> > wrote: > > > This is part one of the results...... > > > > Tom > > And that's all I got. The msg shows as 15k but those two lines are all I > see. > > dont know if it got filtered by the mailing list or my email client > (opera) did not like it. > > What format/tool did you use? Hello, Part 1 is just 4 text files, I have no idea why Opera would dislike text file attachments. You can download the text files from : http://www.winehq.org/hypermail/wine-devel/2005/04/0645.html Tom > > I'd be very interested to see you results anyway. > > Thx. >

1 0

wine-20050419 crashes warcraft 3
by Sebastien Fievet 01 May '05

01 May '05

Hi all, I recently compiled wine-20050419, and decided to give Warcraft 3 a try. The game installed nicely but crashed at runtime, freezing my computer. I had to hard-reboot the box to recover. Unfortunately, i am unable to give any trace or log, because each time i launch Warcraft it hangs, leaving me with no alternative but rebooting the system. On the other hand, the world editor works more or less : i can't see the menu bar above the map entry, but i can play with the landscape elements and build a map. I also managed to play "Starcraft" and "Atomic Bomberman", which don't make use of opengl, so it sounds like my installation is correct. Running Warcraft with or without "-opengl", in managed or desktop mode, as root or normal user, with any windows version (from win98 up to winxp) amounts to the same crash. My config is: - kernel 2.4.26 running on a k6-2 500MHz. - xorg server 6.8.1 - GeForce 4 MX440 with latest NVidia drivers (1.7174) Everything compiled locally with gcc 3.3.4. Any (little) help is more than welcomed! regards, Seb.

2 1

Bugzilla voting
by Dustin Navea 01 May '05

01 May '05

Just had a quick question about the voting process on Bugzilla, hope Jeremy sees this and can answer it. It seems that when a bug is voted for by 1 person, it does not become confirmed like it used to, it now takes 2 votes. This seems a little unnecessary, as 1 vote would mean that 2 people are experiencing the same problem (the reporter and the person casting the vote), in which case it is most likely a bug, and not some mis-configuration. If we are worried that a bug reporter might exploit this and confirm his own bugs by using the voting system, we could always set it up to disallow votes from the reporter, couldn't we? Just my thoughts. Hoping you will see my point and lower the "number of votes to confirm" value by 1.. Dustin

2 1

Adobe Photoshop
by A＠A 01 May '05

01 May '05

When I´ve installed Abobe Photoshop CS2 it was closed without any error Logs: fixme:msi:MsiGetProductInfoA "{236BB7C4-4419-42FD-0409-1E257A25E34D}" "PackageCode" 0x406fdbc8 0x406fdc38 fixme:msi:MsiGetProductInfoW L"{236BB7C4-4419-42FD-0409-1E257A25E34D}" L"PackageCode" 0x403e3f38 0x406fdc38 err:dc:DCE_FreeWindowDCE [0x10026] GetDC() without ReleaseDC()! fixme:msi:MsiInstallProductW L"Z:\\soft\\win\\Photoshop CS2\\Photoshop CS2\\Adobe(R) Photoshop(R) CS2\\Adobe Photoshop CS2.msi" L" SETUPEXEDIR=\"Z: \\soft\\win\\Photoshop CS2\\Photoshop CS2\\Adobe(R) Photoshop(R) CS2\"" fixme:msi:ACTION_AppSearchReg AppSearch unimplemented for RegLocator (key path L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{786C5747-1033-0000-B58E-000000000001}") fixme:msi:ACTION_AppSearchReg AppSearch unimplemented for RegLocator (key path L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{B74D4E10-1033-0000-0000-000000000001}") fixme:msi:ACTION_AppSearchReg AppSearch unimplemented for RegLocator (key path L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{ECA57BE9-1E11-4F5F-807D-950BD40DA776}") fixme:msi:ACTION_AppSearchReg AppSearch unimplemented for RegLocator (key path L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{E9787678-1033-0000-8E67-000000000001}") fixme:msi:ACTION_AppSearchReg AppSearch unimplemented for RegLocator (key path L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\[ProductCode]") fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"FindRelatedProducts" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"ValidateProductID" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"IsolateComponents" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"MigrateFeatureStates" fixme:msi:ACTION_PerformUIAction UNHANDLED MSI ACTION L"InstallWelcome" fixme:msi:ACTION_PerformUIAction UNHANDLED MSI ACTION L"SetupProgress" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"ExecuteAction" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveExistingProducts" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"AllocateRegistrySpace" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnpublishComponents" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"MsiUnpublishAssemblies" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnpublishFeatures" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"StopServices" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"DeleteServices" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterComPlus" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"SelfUnregModules" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterTypeLibraries" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveODBC" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterFonts" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveRegistryValues" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterClassInfo" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterExtensionInfo" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterProgIdInfo" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterMIMEInfo" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveIniValues" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveShortcuts" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveEnvironmentStrings" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveDuplicateFiles" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveFiles" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveFolders" fixme:msi:ACTION_CustomAction Rollback only action... rollbacks not supported yet err:msi:ACTION_ProcessExecSequence Execution halted due to error (1603) -- Linux forever

1 0

Adobe Photoshop
by A＠A 01 May '05

01 May '05

When I´ve installed Abobe Photoshop CS2 it was closed without any error Logs: fixme:msi:MsiGetProductInfoA "{236BB7C4-4419-42FD-0409-1E257A25E34D}" "PackageCode" 0x406fdbc8 0x406fdc38 fixme:msi:MsiGetProductInfoW L"{236BB7C4-4419-42FD-0409-1E257A25E34D}" L"PackageCode" 0x403e3f38 0x406fdc38 err:dc:DCE_FreeWindowDCE [0x10026] GetDC() without ReleaseDC()! fixme:msi:MsiInstallProductW L"Z:\\soft\\win\\Photoshop CS2\\Photoshop CS2\\Adobe(R) Photoshop(R) CS2\\Adobe Photoshop CS2.msi" L" SETUPEXEDIR=\"Z: \\soft\\win\\Photoshop CS2\\Photoshop CS2\\Adobe(R) Photoshop(R) CS2\"" fixme:msi:ACTION_AppSearchReg AppSearch unimplemented for RegLocator (key path L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{786C5747-1033-0000-B58E-000000000001}") fixme:msi:ACTION_AppSearchReg AppSearch unimplemented for RegLocator (key path L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{B74D4E10-1033-0000-0000-000000000001}") fixme:msi:ACTION_AppSearchReg AppSearch unimplemented for RegLocator (key path L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{ECA57BE9-1E11-4F5F-807D-950BD40DA776}") fixme:msi:ACTION_AppSearchReg AppSearch unimplemented for RegLocator (key path L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{E9787678-1033-0000-8E67-000000000001}") fixme:msi:ACTION_AppSearchReg AppSearch unimplemented for RegLocator (key path L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\[ProductCode]") fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"FindRelatedProducts" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"ValidateProductID" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"IsolateComponents" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"MigrateFeatureStates" fixme:msi:ACTION_PerformUIAction UNHANDLED MSI ACTION L"InstallWelcome" fixme:msi:ACTION_PerformUIAction UNHANDLED MSI ACTION L"SetupProgress" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"ExecuteAction" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveExistingProducts" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"AllocateRegistrySpace" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnpublishComponents" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"MsiUnpublishAssemblies" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnpublishFeatures" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"StopServices" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"DeleteServices" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterComPlus" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"SelfUnregModules" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterTypeLibraries" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveODBC" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterFonts" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveRegistryValues" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterClassInfo" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterExtensionInfo" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterProgIdInfo" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"UnregisterMIMEInfo" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveIniValues" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveShortcuts" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveEnvironmentStrings" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveDuplicateFiles" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveFiles" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveFolders" fixme:msi:ACTION_CustomAction Rollback only action... rollbacks not supported yet -- Linux forever

1 0

Mouse warp questions
by Stefan Dösinger 01 May '05

01 May '05

Hello, I have a a question about the mouse warp code in dlls/dinput/mouse.c Why is MOUSE_HACK still defined? From reading the archives I concluded that warping the mouse in three states was disabled long ago(1), but MOUSE_HACK is still defined. I found a patch sent to wine-patches in 2003 which commented this define line(2). My problem is that this MOUSE_HACK breaks the mouse in Settlers 3, bug 2475 (3). Is there any reason why the mouse hack is still/again activated? Thanks, Stefan References: (1)http://www.winehq.org/hypermail/wine-devel/2004/06/0325.html (2)http://www.winehq.com/hypermail/wine-patches/2003/01/0019.html (3)http://bugs.winehq.org/show_bug.cgi?id=2475

3 6

Re: EnumMedia patch
by Robert Shearman 01 May '05

01 May '05

Maarten Lankhorst wrote: > This patch fixes AM_MEDIA_TYPE->pbFormat not being handled correctly, > unfortunately, this also means some stuff has to be rewritten to avoid > memleaks, instead of CoTaskMemFree(AM_MEDIA_TYPE), DeleteMediaType has > to be used.. This also fixes the errors i had with msn webcam, i feel > like i stumbled over every bug in quartz now...... > >------------------------------------------------------------------------ > >@@ -45,6 +46,7 @@ void DeleteMediaType(AM_MEDIA_TYPE * pMe > IUnknown_Release(pMediaType->pUnk); > pMediaType->pUnk = NULL; > } >+ CoTaskMemFree(pMediaType); > } > > BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards) > > This change is wrong. DeleteMediaType is not supposed to free the memory used for the AM_MEDIA_TYPE structure itself as the function is also used in places where the AM_MEDIA_TYPE was not allocated using CoTaskMemAlloc. Rob

2 2

Re: dlls/dinput/mouse.c - GetDeviceState
by Lionel Ulmer 01 May '05

01 May '05

On Wed, Jun 16, 2004 at 08:50:50PM +0200, James Dean Anderson wrote: > this patch adds a missing errorcode in GetDeviceState in > dlls/dinput/mouse.c which prevented the mouse to work in some game. Well, I finally found the time to clean my wine-devel mailing list and do the DInput test program and now I can confirm that this patch is right and should go in CVS (really sorry for the ... errm ... 10 month delay). The only problem is that it does not apply anymore (as the name of the file changed) and that I am a bit away on my Linux box (live from WineConf :-) ) to rework it. So either one can resubmit synced to current CVS or I will do it on Wednesday when I come back home. Lionel Index: dlls/dinput/mouse.c =================================================================== RCS file: /home/wine/wine/dlls/dinput/mouse.c,v retrieving revision 1.3 diff -u -d -r1.3 mouse.c --- dlls/dinput/mouse.c 4 Jun 2004 18:06:37 -0000 1.3 +++ dlls/dinput/mouse.c 16 Jun 2004 18:17:16 -0000 @@ -677,6 +677,8 @@ LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr ) { ICOM_THIS(SysMouseImpl,iface); + + if(This->acquired == 0) return DIERR_NOTACQUIRED; EnterCriticalSection(&(This->crit)); TRACE("(this=%p,0x%08lx,%p): \n",This,len,ptr); -- Lionel Ulmer - http://www.bbrox.org/

2 1

DirectX 9 patches
by Oliver Stieber 01 May '05

01 May '05

Hi, I've put an updated patch and some new screeshost on sourceforge for the time being http://directxwine.sourceforge.net/, I'm now at the point where I'm happy to stop fixing bugs in DirectX 9 and start sending in more patches.. Thanks for evertyone help and support. Oliver. Send instant messages to your online friends http://uk.messenger.yahoo.com

3 3

DirectX 9 Patch
by Timothy Mann 30 Apr '05

30 Apr '05

Hey everyone, I was recently messing around with Oliver's new patch and it took me a while to figure out how to apply it. So, in case anyone else is like me and doesn't want to ask, the command that I used to patch wine-20050419 from within the wine directory was: patch -p2 < (path_to_patch)/d3d9patch.2005-04-28-2.diff I hope that this will help someone. I know that most people on here already know how to use the patch utility, but I did not. --Tim

1 0

Bug 1536
by Dustin Navea 30 Apr '05

30 Apr '05

Can someone take a look at http://bugs.winehq.org/show_bug.cgi?id=1536 and help out the author? He has posted a WINEDEBUG=+key,+keyboard log to the bug and I am unable to determine the problem. There are a few other bugs referenced near the bottom with similar (but not the same) problems which need looking at as well. Thanks. Dustin

1 0

Make test fails on pristine CVS checkout
by Shachar Shemesh 30 Apr '05

30 Apr '05

Hi, Following the discussion in Wineconf, I'm forwarding test failures to the list. Methodology - Debian SID. I did "apt-get build-dep wine" (install most wine dependencies), and checked out a pristine CVS. ./configure (no parameters), make depend, make. Next I deleted the ~/.wine directory, and ran make test. > make[3]: Entering directory `/home/sun/sources/wine/dlls/dsound/tests' > ../../../tools/runtest -q -P wine -M dsound.dll -T ../../.. -p > dsound_test.exe.so capture.c && touch capture.ok > err:wave:widDsCreate DirectSoundCapture flag not set > This sound card's driver does not support direct access > The (slower) DirectSound HEL mode will be used instead. > err:wave:widDsCreate DirectSoundCapture flag not set > This sound card's driver does not support direct access > The (slower) DirectSound HEL mode will be used instead. > ../../../tools/runtest -q -P wine -M dsound.dll -T ../../.. -p > dsound_test.exe.so ds3d.c && touch ds3d.ok > err:wave:DSDB_MapBuffer Could not map sound device for direct access > (Input/output error) > err:wave:DSDB_MapBuffer Use: "HardwareAcceleration" = "Emulation" in > the [dsound] section of your config file. > ds3d.c:880: Test failed: DirectSoundCreate() failed: E_FAIL > ds3d.c:962: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:1034: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:880: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:962: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:1034: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > ds3d.c:639: Test failed: DirectSoundCreate() failed: DSERR_ALLOCATED > fixme:winmm:MMDRV_Exit Closing while ll-driver open > make[3]: *** [ds3d.ok] Error 30 > make[3]: Leaving directory `/home/sun/sources/wine/dlls/dsound/tests' > make[2]: *** [tests/__test__] Error 2 > make[2]: Leaving directory `/home/sun/sources/wine/dlls/dsound' > make[1]: *** [dsound/__test__] Error 2 > make[1]: Leaving directory `/home/sun/sources/wine/dlls' > make: *** [dlls/__test__] Error 2 Seems that wine does not gracefully fallback when the sound driver is incorrectly set, and requires a config file. Shachar -- Shachar Shemesh Lingnu Open Source Consulting ltd. http://www.lingnu.com/

1 4

Benchmarking Wine againt XP Part 1
by Tom Wickline 29 Apr '05

29 Apr '05

This is part one of the results...... Tom

1 0

Re: DirectX 9 patches
by Hiji 29 Apr '05

29 Apr '05

FREAKIN' AMAZING! Seeing those screenshots in a Linux environment are jaw-dropping. :) Hiji --- Oliver Stieber <oliver_stieber(a)yahoo.co.uk> wrote: > Hi, > > I've put an updated patch and some new screeshost on > sourceforge for the time being > http://directxwine.sourceforge.net/, I'm now at the > point where I'm happy to stop fixing bugs in DirectX > 9 > and start sending in more patches.. > > Thanks for evertyone help and support. > Oliver. > > Send instant messages to your online friends > http://uk.messenger.yahoo.com > > __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Re: Benchmarking Wine againt XP
by Tom Wickline 29 Apr '05

29 Apr '05

On 4/29/05, Lars Segerlund <lars.segerlund(a)comsys.se> wrote: > > Could you just summarise the results in a mail, I am tickled pink to see the results. > / regards Lars Segerlund. > Sure, I'll have everything in a nice text file in a day or so... Cheers, Tom

1 0

No sound from winealsa driver
by Stephen Torri 29 Apr '05

29 Apr '05

The following trace was obtain using the wine CVS version updated as of 4/28/2005. I am attempting to play the Soldier of Fortune II demo. Stephen ------------ sound section of config ------------ ;"Drivers" = "wineoss.drv" ; default for most common configurations ;"Drivers" = "winearts.drv" ; for KDE "Drivers" = "winealsa.drv" ; for ALSA users ;"Drivers" = "winejack.drv" ; for Jack sound server ;"Drivers" = "winenas.drv" ; for NAS sound system ;"Drivers" = "wineaudioio.drv" ; for Solaris machines ;"Drivers" = "" ; to disable sound "WaveMapper" = "msacm.drv" "MidiMapper" = "midimap.drv" [Alsa] "PlaybackDevice"="hw" [dsound] ;; HEL only: Number of waveOut fragments ahead to mix in new buffers. ;"HELmargin" = "5" ;; HEL only: Number of waveOut fragments ahead to queue to driver. ;"HELqueue" = "5" ;; Max number of fragments to prebuffer ;"SndQueueMax" = "28" ;; Min number of fragments to prebuffer ;"SndQueueMin" = "12" ;; Forces emulation mode (using wave api) ;"HardwareAcceleration" = "Emulation" ;; Sets default playback device (0 - number of devices - 1) ;"DefaultPlayback" = "0" ; use first device (/dev/dsp) ;"DefaultPlayback" = "1" ; use second device (/dev/dsp1) ;"DefaultPlayback" = "2" ; use third device (/dev/dsp2) ;; Sets default capture device (0 - number of devices - 1) ;"DefaultCapture" = "0" ; use first device (/dev/dsp) ;"DefaultCapture" = "1" ; use second device (/dev/dsp1) ;"DefaultCapture" = "2" ; use third device (/dev/dsp2) ------------- Trace ------------- bash-2.05b$ export WINEDEBUG=trace+wave bash-2.05b$ wine SoF2.exe +set sv_cheats 1 trace:wave:ALSA_WaveInit using waveout device "hw:0" trace:wave:ALSA_WaveInit dev=0 id=Intel ICH name=Intel ICH5 subdev=0 subdev_nam e=subdevice #0 subdev_avail=0 subdev_num=1 stream=PLAYBACK subclass=GENERIC MIX trace:wave:ALSA_TraceParameters FLAGS: sampleres=true overrng=false pause=true resume=true syncstart=false batch=false block=true double=false halfd=false joi nt=false trace:wave:ALSA_TraceParameters access=(null) trace:wave:ALSA_TraceParameters format=S32_LE trace:wave:ALSA_TraceParameters channels_min=2, channels_min_max=6 trace:wave:ALSA_TraceParameters buffer_size_min=2, buffer_size_min_max=16384 trace:wave:ALSA_TraceParameters rate=48000 trace:wave:ALSA_TraceParameters buffer_time_min=41 buffer_time_max=341334 trace:wave:ALSA_TraceParameters periods_min=1 periods_max=1024 trace:wave:ALSA_TraceParameters period_size_min=2, period_size_min_max=16384 trace:wave:ALSA_TraceParameters period_time_min=41 period_time_max=341334 trace:wave:ALSA_TraceParameters tick_time=1000 fixme:wave:ALSA_WaveInit - trace:wave:ALSA_WaveInit Configured with dwFmts=00008000 dwSupport=00000060 trace:wave:ALSA_WaveInit using waveout device "hw:1" trace:wave:ALSA_WaveInit using waveout device "hw:2" trace:wave:ALSA_WaveInit using waveout device "hw:3" trace:wave:ALSA_WaveInit using waveout device "hw:4" trace:wave:ALSA_WaveInit using waveout device "hw:5" trace:wave:ALSA_WaveInit using wavein device "plug:hw:0" trace:wave:ALSA_WaveInit dev=0 id=Intel ICH name=Intel ICH5 subdev=0 subdev_nam e=subdevice #0 subdev_avail=0 subdev_num=1 stream=CAPTURE subclass=GENERIC MIX trace:wave:ALSA_TraceParameters FLAGS: sampleres=false overrng=true pause=true resume=true syncstart=true batch=true block=true double=true halfd=true joint=t rue trace:wave:ALSA_TraceParameters access=(null) trace:wave:ALSA_TraceParameters format=S32_LE trace:wave:ALSA_TraceParameters channels_min=1, channels_min_max=10000 trace:wave:ALSA_TraceParameters buffer_size_min=1, buffer_size_min_max=14660155 03 trace:wave:ALSA_TraceParameters rate_min=4000 rate_max=4294967295 trace:wave:ALSA_TraceParameters buffer_time_min=1 buffer_time_max=4294967295 trace:wave:ALSA_TraceParameters periods_min=0 periods_max=4294967295 trace:wave:ALSA_TraceParameters period_size_min=0, period_size_min_max=14660183 67 trace:wave:ALSA_TraceParameters period_time_min=166 period_time_max=341334 trace:wave:ALSA_TraceParameters tick_time=1000 trace:wave:ALSA_WaveInit Configured with dwFmts=000fffff trace:wave:ALSA_WaveInit using wavein device "plug:hw:1" trace:wave:ALSA_WaveInit using wavein device "plug:hw:2" trace:wave:ALSA_WaveInit using wavein device "plug:hw:3" trace:wave:ALSA_WaveInit using wavein device "plug:hw:4" trace:wave:ALSA_WaveInit using wavein device "plug:hw:5" trace:wave:ALSA_widMessage (0, DRVM_INIT, 00000000, 00000000, 00000000); trace:wave:ALSA_widMessage (0, WIDM_GETNUMDEVS, 00000000, 00000000, 00000000); trace:wave:ALSA_wodMessage (0, DRVM_INIT, 00000000, 00000000, 00000000); trace:wave:ALSA_wodMessage (0, WODM_GETNUMDEVS, 00000000, 00000000, 00000000); fixme:opengl:query_function_pbuffer gl_version is: "1.5.3 NVIDIA 71.74" fixme:opengl:query_function_pbuffer glx_exts is: "GLX_EXT_visual_info GLX_EXT_v isual_rating GLX_SGIX_fbconfig GLX_SGIX_pbuffer GLX_SGI_video_sync GLX_SGI_swap _control GLX_ARB_multisample GLX_NV_float_buffer GLX_ARB_get_proc_address " fixme:opengl:query_function_pbuffer gl_version is: "1.5.3 NVIDIA 71.74" fixme:opengl:query_function_pbuffer glx_exts is: "GLX_EXT_visual_info GLX_E isual_rating GLX_SGIX_fbconfig GLX_SGIX_pbuffer GLX_SGI_video_sync GLX_SGI_ _control GLX_ARB_multisample GLX_NV_float_buffer GLX_ARB_get_proc_address " fixme:keyboard:RegisterHotKey ((nil),0,0x00000001,9): stub fixme:keyboard:RegisterHotKey ((nil),1,0x00000001,27): stub fixme:ole:CoCreateInstance no classfactory created for CLSID {5959df60-2911 -11d1-b049-0020af30269a}, hres is 0x80040154 fixme:opengl:wglSwapIntervalEXT (1),stub! fixme:keyboard:UnregisterHotKey ((nil),0): stub fixme:keyboard:UnregisterHotKey ((nil),1): stub trace:wave:ALSA_widMessage (0, DRVM_EXIT, 00000000, 00000000, 00000000); trace:wave:ALSA_wodMessage (0, DRVM_EXIT, 00000000, 00000000, 00000000);

2 2

Menubar problems with OpenGL program
by Ryan May 29 Apr '05

29 Apr '05

Hi, I have a problem with the menubar in an OpenGL program I use, WeatherScope. With Wine-20050211 and newer, the menubar is overdrawn by the OpenGL background color. I can still get the pop up menus to appear if I click the area where the menu should be. Also, if I switch focus to a different app, like an Xterm, the menubar will appear. It appears that clipping is correct, because the OpenGL drawing in the program does not appear where the menubar should be, only the background color. This problem does not appear in wine versions before 20050211. Anyone have any clues where to go with this? (WeatherScope is available at: http://sdg.ocs.ou.edu/builds/final/win/WeatherScope/WeatherScope-1.2.1.exe) Ryan -- Ryan May Graduate Research Assistant School of Meteorology University of Oklahoma

3 3

Benchmarking Wine againt XP
by Tom Wickline 28 Apr '05

28 Apr '05

Hello, Over the last couple weeks Ive been on a little benchmark craze and now that I'm done I thought I would share my results. All the benchmarks were run on my duel boot laptop under the same resolutions and I tried to choose the same settings in the test apps as well to keep everything as fair as possible. ------------------------- I sent the results twice but our MODERATOR bounces the results! So if anyone is interested in this let me know or take it up with the MODERATOR! ------------------------- Testing Software PCMark-04 : http://www.futuremark.com/download/?pcmark04.shtml 3DMark 2001SE : http://www.3dfxzone.it/dir/tools/testing/video.htm 3DMark 2000 v1.1 : http://www.3dfxzone.it/dir/tools/testing/video.htm DronezMark : http://www.3dfxzone.it/dir/tools/testing/video.htm GL Excess 1.2 : http://www.glexcess.com/files.htm UT2004 demo 3334 : http://www.3dgamers.com/games/unrealtourn2k4/downloads/ Umark : http://unrealmark.net/ Performance Test : http://www.passmark.com/ftp/petst.exe Quake 3 : http://www.3dgamers.com/games/quake3arena/downloads/ Notes: PCMark04 : Requirement's include IE6, WMP9, WMP Encoder and DX9 So if a test other than graphics has a N/A it is because I don't have the required software currently installed that being IE6 or WMP/Encoder. Performance Test : The medium and High detail 3D test will work if there run as a single test. After the low detail test is run a error saying that no 3D accelerator could be found and the test is aborted. (Wine bug) 3DMark2001SE : The nature scene will play in the demo but not in the test. I also had to disable the sprite test or 3DMark2001SE crashes. 3DMark 2000 v1.1 : XP is "My Project" and Wine is My Project 1" UT2004/Quake were mostly just for fun, I need to install the native Linux clients and see just how close Wine is to native game play..... System Specs: Gentoo current, 3.8GHZ CPU, 1GB RAM, 60Gig 7200rpm HD, 256MB Gforce 6800 Go video. Notice: Before you put any merritt into any of my results I would highly recommend that you run the benchmark software yourself. I am only sharing *MY* results your results may very depending on your Linux distro, Linux config, Wine config as well as your systems hardware. Cheers, Tom Wickline

4 3

MSN Webcam patch
by Maarten Lankhorst 28 Apr '05

28 Apr '05

I am stuck on it, it seems that if I enable WINEDEBUG=+quartz it crashes THEORETICALLY, although wrong, this should be ok, since it doesn't disrupt anything BUT I asked others to test my patch, and unfortunately THEY weren't that lucky, it crashed, wether winedebug was enabled or not... so what I'm asking is, perhaps someone can find out what's wrong? I attached 4 files capturegraph.patch - implements icapturegraphbuilder (stubbed) quartzfix.patch - several fixes for quartz v4l.patch - implements the vfwcapture interface capture.c - in case you don't have a working v4l(2) device, i provided a version that doesn't actually do anything, while still invoking the crash just make sure you do 'regsvr32 quartz.dll' (with quartz = builtin) also devenum has to be builtin to invoke the crash: install msn messenger (you need internet explorer installed too) run msnmsgr with WINEDEBUG=+quartz,+qcap Unfortunately, I don't know how to fix this, and if this doesn't get fixed, it doesn't seem worth the effort to continue working on msn webcams :/ perhaps your shared minds at wineconf will be able to fix it, or those who stay at home ;) From what I can tell, the crash occurs in OutputPin_ConnectSpecific (wine/dlls/quartz/pin.c), exact line: hr = IPin_ReceiveConnection(pReceivePin, iface, pmt); I think pReceivePin is a pin provided by MSN messenger itself, so if it is a crash caused by differences between the quartz msn expects, and our implementation of quartz it will help to resolve cross-quartz differences (well that's the theory anyway :P) if this can't be fixed, I'll try to port this interface to qcap, where it should belong, but it it's not there because a lot of things from quartz is used.. which means i have to do a lot double...

1 0

Resizing an image?
by Maarten Lankhorst 28 Apr '05

28 Apr '05

I'm trying to resize a raw image (only rgb values) and flipping it vertically i got 2 pointers, and the size they are both rgb24 I wanted to do this with stretchdibits, but it requires a device context, and I am not sure that if i create one with createcompatibledc, it will be 24 bits.. so my question is how can i resize a raw dib image, where input = pointer1 and output = pointer2? preferably tilting it too

1 0

Re: shell32 - ShellDDEInit
by Robert Shearman 28 Apr '05

28 Apr '05

Steven Edwards wrote: >The ReactOS guys are tired of seeing the fixme message. > > But they forgot to include a FIXME for the unimplemented callback. The attached untested patch is probably better. Rob

1 0

Re: shell32 - ShellDDEInit
by Andreas Mohr 28 Apr '05

28 Apr '05

Hi, On Wed, Apr 27, 2005 at 07:34:05PM -0700, Steven Edwards wrote: > + WCHAR wszSHELL_PROGMAN[] = {'P','R','O','G','M','A','N',0}; > + WCHAR wszSHELL_TOPIC[] = {'P','r','o','g','m','a','n',0}; > + WCHAR wszSHELL_SERVICE[] = {'P','r','o','g','m','a','n',0}; > + WCHAR wszSHELL_STAR[] = {'*',0}; > + WCHAR wszSHELL_SHELL[] = {'S','h','e','l','l',0}; > + WCHAR wszSHELL_APPPROPS[] = {'A','p','p','P','r','o','p', 'e', 'r', 't', 'i', 'e', 's',0}; > + WCHAR wszSHELL_FOLDERS[] = {'F','o','l','d','e','r','s',0}; I suppose this should be const WCHAR? We might want to remain as easily pageable (or rather discardable - .rodata) as possible. Andreas Mohr

1 0

Re: advapi32: Add more RegLoadKey tests
by Alexandre Julliard 27 Apr '05

27 Apr '05

James Hawkins <truiken(a)gmail.com> writes: > @@ -1340,7 +1340,7 @@ static void load_keys( struct key *key, > if ((read_next_line( &info ) != 1) || > strcmp( info.buffer, "WINE REGISTRY Version 2" )) > { > - set_error( STATUS_NOT_REGISTRY_FILE ); > + set_error( STATUS_SUCCESS ); > goto done; > } I don't think you want to fail silently here. > @@ -1382,6 +1382,19 @@ static void load_registry( struct key *k > { > struct file *file; > int fd; > + > + static const WCHAR machineW[] = { 'M','A','C','H','I','N','E',0 }; > + static const WCHAR userW[] = { 'U','S','E','R',0 }; > + > + if (key && key->parent) > + { > + if (strcmpiW( key->parent->name, machineW ) && > + strcmpiW( key->parent->name, userW )) > + { > + set_error( STATUS_ACCESS_DENIED ); > + return; > + } > + } We discussed this already, we don't want to do it that way (not to mention that keys can be named Machine or User inside the tree too, so your test is wrong anyway). Note that a lot of your new tests fail on XP too, so I'm not sure there's much point in changing the Wine code to make them succeed. -- Alexandre Julliard julliard(a)winehq.org

2 1

Anyone working on implementing AccessCheck?
by Michael Ost 27 Apr '05

27 Apr '05

We have an installer program (for the Native Instruments Komplete VST plugin package) that fails to run because NtAccessCheck is stubbed out --- that's our best guess at this point, anyway, from watching the WINEDBG trace while the program ran. I noticed that in the last few months someone implemented GetFileSecurity that the installer uses as well --- it looks like Troy Rollo? from scanning the cvs archives. Thanks for that. But NtAccessCheck is still stubbed out. Is that call at all related? any work underway? any suggestions on direction for implementing it? And, how seriously should I take the FIXME("returns fake SECURITY_DESCRIPTOR") in GetFileSecurity. Thanks... mo =================================== Michael Ost, Software Architect Muse Research, Inc. most(a)museresearch.com

2 2

Regressions from 20050310 to 20050419 for PCAD-2000 application
by Marcos Vicente Cruz 27 Apr '05

27 Apr '05

Hi, I've notice a regression using some PCAD applications together. If you open more then two PCAD's apps at same time the last one freezes. For example if I open Schematic and PCB it works flawlessly but opening Library Executive one of the others freezes until you close the last opened. It happens only using 20050419 version of wine. In the other hand this version doesn't have a focus bug that forced starting a PCAD application from a Desktop window. Best Regards Marcos

1 0

CDMA PCMCIA cards on WINE?
by NSK 27 Apr '05

27 Apr '05

Hello, Somebody from SuSE mailing list told me to send an e-mail to winehq regarding this: I have a Vodafone GPRS/3G (CDMA) PCMCIA card. I tried running Vodafone's software in WINE emulation but it is impossible (it crashes). Is there anything I can do about this? Here is more info about this hardware: # lspci -vv 0000:02:00.0 USB Controller: OPTi Inc. 82C861 (rev 10) (prog-if 10 [OHCI]) Subsystem: OPTi Inc. 82C861 Control: I/O- Mem+ BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Step ping- SERR- FastB2B- Status: Cap- 66Mhz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort - <MAbort- >SERR- <PERR- Interrupt: pin A routed to IRQ 0 Region 0: Memory at 2f800000 (32-bit, non-prefetchable) The card seems to incorporate a USB circuit which somehow is connected to an internal antenna, most probably via some sort of modem. The card had labels "Qualcomm CDMA" and "Manufactured by Opti". After searching on the Internet I found the site of Qualcomm ( http://www.cdmatech.com/ ) but I don't know which chipset the card uses. It can connect to both GPRS and CDMA networks but it doesn't work in USA (only in EU). Its datarates are 384kbits downstream and 64kbits upstream (I think). Vodafone supports this card only on Windows. The card is locked until the software transmits a PIN code that I type. I am afraid that even if I make this hardware work on GNU/Linux, I won't know how to transmit my PIN to unlock it. Thanks, -- NSK http://portal.wikinerds.org

1 0

Re: Hierarchical namespace for tests
by Alexandre Julliard 27 Apr '05

27 Apr '05

Paul Millar <p.millar(a)physics.gla.ac.uk> writes: > Hopefully not a controversial one. I think it will prove useful to separate the > different tests' namespace. This would allow identical filenames to appear > in different DLL tests directories without confusion (c.f. "generated.c" > currently). > > The proposed namespace would be simply > <dllname> "/" <filename> ":" <lineno> > Examples are: > user/sysparams:186 > winspool/info:128 The problem with this is that the result is not a valid path, which breaks tools that parse the output to let you jump to the error, like emacs compile mode. -- Alexandre Julliard julliard(a)winehq.org

3 2

unix filenames in notepad
by Michael Jung 27 Apr '05

27 Apr '05

If you apply the attached patch and import the attached registry file (which registers a junction point for the unixfs shell namespace extension), you can select and open files from the unix filesystem in notepad (The file has to be accessible by a drive letter based wine path though). In retrospect this is not as surprising as I first thought. If I pay for some beer, perhaps at wineconf someone can give me some insight on the unix path <-> wine path conversion magic ;) Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

2 2

[Bug 2097] Unable to start game Rites of War
by Stephen Torri 27 Apr '05

27 Apr '05

Can a developer take a look at Bug #2097? I need some assistance on figuring our what is wrong with this game. In particular I would like to have someone that can tutor me in trouble shooting problems running applications. I want to be more of an active solution contributor than a problem generator. Stephen

1 0

Window don't stay minimized problem
by Vitaliy Margolen 27 Apr '05

27 Apr '05

I'm still having this problem. Here is what I found so far: - All Delphi apps don't minimize properly because they depend on WM_SYSCOMMAND SC_MINIMIZE, SC_RESTORE etc. - If I insert these messages before WM_SHOWWINDOW in X11DRV_MapNotify / X11DRV_UnmapNotify it still doesn't work. App makes few more steps but does not minimize. Instead it changes size of the main window and shows an extra window (hidden Delphi Application window). - Comparing messages received by app I see WM_ACTIVATEAPP sent prematurely and WM_KILLFOCUS too late. Does any one have suggestions where to insert this messages? Also, could someone enlighten my on how and where do we handle window management stuff? I see to many places (server, x11drv, user). I guess what I'm trying to find how they all are link together? Here is a comparison of messages received by hidden application window while handling minimize request. wine native WM_SYSCOMMAND SC_MINIMIZE WM_SYSCOMMAND SC_MINIMIZE Minimize start WM_QUERYNEWPALETTE WM_ACTIVATEAPP WM_WINDOWPOSCHANGING WM_NCACTIVATE WM_NCACTIVATE WM_ACTIVATE WM_ACTIVATE WM_SETFOCUS WM_SETFOCUS WM_WINDOWPOSCHANGING WM_WINDOWPOSCHANGING WM_NCCALCSIZE WM_NCCALCSIZE WM_WINDOWPOSCHANGED WM_WINDOWPOSCHANGED WM_MOVE WM_MOVE WM_SIZE WM_SIZE WM_KILLFOCUS WM_GETTEXT WM_WINDOWPOSCHANGING WM_WINDOWPOSCHANGING WM_NCCALCSIZE WM_NCCALCSIZE WM_WINDOWPOSCHANGED WM_WINDOWPOSCHANGED WM_MOVE WM_MOVE WM_SIZE WM_SIZE WM_NCACTIVATE WM_GETTEXT WM_ACTIVATE WM_ACTIVATEAPP Minimize end WM_WINDOWPOSCHANGING WM_WINDOWPOSCHANGED WM_MOVE WM_NCACTIVATE WM_ACTIVATE WM_KILLFOCUS -- Best regards, Vitaliy

1 0

Re: Copy Wine fonts in c:\windows\fonts
by Alexandre Julliard 27 Apr '05

27 Apr '05

Vincent Béron <vberon(a)mecano.gme.usherb.ca> writes: > Would a symlink be better? We copy wine.inf over... > > Changelog: > Copy Wine fonts in c:\windows\fonts so they can be easily used. That shouldn't be necessary, the fonts should be loaded directly from their unix directory. -- Alexandre Julliard julliard(a)winehq.org

3 2

Re: USB status ...Who maintains wineserver?
by Damjan Jovanovic 26 Apr '05

26 Apr '05

--- Mike McCormack <mike(a)codeweavers.com> wrote: > > > I think it might be Alexander, and I think the > general > > suggestion was "avoid changes to the wineserver". > > Anyone else know? > > I'll point out to you once again that Wine is not > the right place to > implement drivers. Drivers that are loaded in the > kernel in Windows > also belong in the kernel in Linux, not in Wine. I don't care about Windows kernel drivers, just replicating the interface to them from user space software so that user-space drivers (which are abundant in Windows) can work. > Wine cannot present a driver interface to the rest > of the system, nor to > other programs. Winelibs can. > If you want to get a scanner going, the best way > would be to make it > work with SANE or V4L, Sure, please convince every hardware manufacturer in the world to release all the documentation for all their hardware so we can make Linux drivers. There is a reason SANE and V4L only support _some_ (read: few) hardware. > and then get SANE or V4L to > work with Wine's > still imaging interface. That is much better than > getting it to only > work in Wine, as other applications will be able to > use it via SANE, etc. > > Have a look at the work that Maarten Lankhorst is > doing on Web cameras > ... he's doing things the right way. > You can continue trying to modify CreateFile, > ReadFile, WriteFile etc. > to make it work, but you'll realize sooner or later > that a handle is > tied to a unix fd. In fact, it's tied to an "object" in wineserver: what fd would HWINDOW and HICON represent? > This is by design. Alexandre > has said time and time > again that he considers Wine to be just like any > other application on > the system; it reads file through the 'nix FS, and > through unix file > descriptors. > > If you still want to loader the Windows driver, go > and have a look at > ndis wrapper. http://ndiswrapper.sourceforge.net/ > > If you *still* insist that you're going to load > drivers in Wine, then > don't be suprised if your patches are quietly > dropped, and your requests > for help are quietly ignored. Then don't be surprised if I make it into a commercial project :-). Enough talk, I'm off to code. > Mike > > __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

4 3

msn webcam status
by Maarten Lankhorst 26 Apr '05

26 Apr '05

just thought I'd drop by and say how things are going.. i submitted a lot of patches already, and trying to get those commited, although they are not directly required for webcam support, they are meant to increase general stability, and fix some bugs: - dlls/avicap32: wrote a basic capgetdriverdescription (Trying to get it committed) - dlls/devenum: wrote videoinputdevice enumeration based on capgetdriverdescription (Trying to get it committed) - dlls/quartz: wrote some general fixes for filtergraph.c/pin.c added capturegraphbuilder interface (Trying to get those committed) of course, there's also the vfwcapture interface itself, after trying to get it to work with a real webcam, instead of the very flexible bttv driver, i came to the conclusion i needed to do some major background changes the vfwcapture interface itself won't change, because that part is now near perfect, but the stuff behind it is messy on itself, the interface is not useful, it needs the other fixes I posted above, so now I'm just waiting until those patches are implemented, my disk is getting too full with all those patches (only semi joking, i'm losing track of them..)

1 0

Re: DirectX 8
by Ann and Jason Edmeades 26 Apr '05

26 Apr '05

> I've been moving house over the past couple of weeks > which is why I dropped off the face of the earth for a > while. Phew - I was worried I'd have to try to understand all of your patch :-) Welcome back and keep up the good work Jason

2 1

MFC TreeCtrl display problem #2
by Green, Shaun E. 26 Apr '05

26 Apr '05

Sorry, I need to be more specific here. The top (very first) folder icon is the only invisible item. The text is legible. For all other nodes except the top one, folder icons and text display just fine. Shaun

1 0

MFC TreeCtrl display problem
by Green, Shaun E. 26 Apr '05

26 Apr '05

I'm running an MFC app using Wine-20050419 and the very top node of a TreeCtrl is not displayed. All the children and siblings look fine, when I expand the tree. This could be another one of those 2.6.x series display bugs I've seen, but this same .exe does not exhibit this problem using Wine-20050310 so I'm back to using that for now. Shaun

1 0

DirectX 9
by Oliver Stieber 26 Apr '05

26 Apr '05

Hi all, I've been moving house over the past couple of weeks which is why I dropped off the face of the earth for a while. Between moving I've managed to get a lot more DirectX 9 work done, Roller coster tycoon, Warhammer 40K, tenage mutat ninja turtles and the increadables are now the same under WINE as Windows. Evil genius, Kohan 2 and Axis and Allies have a few graphics problems but are still playable and colin McRea raley 2004 now plays ok, but there are lot of graphics issues. i expect Settlers Heritige of the King and Myst 4 will work but I haven't been able to test since I lost the demo disk. hopefully the problems with Halflife2 and world of warcraft are fixed, but again I don't have coppies to test. The majority of the interface seperation work has been completed and development is starting to stabalize, I'll try to get the patches in as soon as I've synced with winecvs, it should be a lot quicker as I'm now only going to be chasing the moving target or winecvs, previously I was chasing winecvs, and changes Alixander made to the patches I sent and my DirectX work which was a little too hectic. Oliver. Send instant messages to your online friends http://uk.messenger.yahoo.com

3 2

Re: USB status ...Who maintains wineserver?
by Hiji 26 Apr '05

26 Apr '05

> If you want to get a scanner going, the best way > would be to make it > work with SANE or V4L, and then get SANE or V4L to > work with Wine's > still imaging interface. > > Have a look at the work that Maarten Lankhorst is > doing on Web cameras > ... he's doing things the right way. > > If you still want to loader the Windows driver, go > and have a look at > ndis wrapper. http://ndiswrapper.sourceforge.net/ Conceptually, I think a combination of two solutions would be the best solution. * The first is obvious: bridge the gap between Wine and the existing support (SANE, V4L, ALSA, etc.) This way, you don't reinvent the wheel and use what's in existence. * The second is not-so-obvious, but crucial: load the Windows driver in a way that is similar to NdisWrapper or DriverLoader (where those items are modules that wrap around the Windows driver [I think!]). Why is this important? Because the reality is that beyond the generic USB hardware (scanner, webcam, mouse, etc.), there won't be a Linux equivalent driver for a specialized piece of hardware (Guitarport, DVC100, MP3 Player, etc.) Of course, this is "easier said than done", but I think its a good starting point for the ambitious. . . Hiji __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Re: DirectX 9
by Hiji 26 Apr '05

26 Apr '05

--- Tom Wickline <twickline(a)gmail.com> wrote: > On 4/26/05, Oliver Stieber > <oliver_stieber(a)yahoo.co.uk> wrote: > > Hi all, > > > > I've been moving house over the past couple of > weeks > > which is why I dropped off the face of the earth > for a > > while. > > > > Between moving I've managed to get a lot more > DirectX > > 9 work done, Roller coster tycoon, Warhammer 40K, > > tenage mutat ninja turtles and the increadables > are > > now the same under WINE as Windows. Evil genius, > Kohan > > 2 and Axis and Allies have a few graphics problems > but > > are still playable and colin McRea raley 2004 now > > plays ok, but there are lot of graphics issues. i > > expect Settlers Heritige of the King and Myst 4 > will > > work but I haven't been able to test since I lost > the > > demo disk. hopefully the problems with Halflife2 > and > > world of warcraft are fixed, but again I don't > have > > coppies to test. > > > > There was some funds in the "Wine Party Fund" that > Jeremy offered others > to purchase games for dev/testing. So you may want > to contact Jeremy about this. > > Tom Also, FYI: http://half.ebay.com and the amazon.com marketplace (used) usually have pretty good deals on games! :) Also, if you're in the U.S., Target's clearance endrack has good deals too. (I bought Spiderman, Catwoman, and The Hobbit for about $5 USD each!) Hiji __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Re: D3D9 Work?
by Oliver Stieber 26 Apr '05

26 Apr '05

--- Benjamin Cutler <cutler(a)cs.colostate.edu> wrote: > I was discussing this with some others who hang out > in the #winehackers > channel, and I'm curious who else might be working > on the D3D9 portion > of Wine. I was unsure of how ready for inclusion > into the main branch > the unofficial patches are, but I've heard from a > couple sources that > most of the patch isn't. I'd like to get some > opinions on what's ready > and what's not. I'd hate to start submitting pieces > of the patch, only > to find out that person X was already working on > that part and had > something better in mind, or even worse to find out > that somebody's been > maintaining contact with Oliver and I'm just getting > overeager to see > the patches in Wine. > > Somebody also mentioned that there are others > waiting for Oliver's > patches to be submitted so that they can continue > their D3D9 work, so I > was curious if there were any of you out there that > fall into that category. > I too have been keen to merge the work with winehead, this hasn't happen todate for a couple of reasons. 1: I've been moving house so I an afford to continue directX 9 work. 2: Because a lot of the work I was doing involved interface a structure changes large areas of the code were affected, combining this with the day or two turn around with patches into wine cvs and I was spending more time merging with wine than developing directX. Because the patches I would send into winecvs would be outdated so quickly I was reluctant to send them in. The work has now stabalise a lot, so sending in patches should be troublesome, I never managed to figure out how to work svk properly. Oliver. Send instant messages to your online friends http://uk.messenger.yahoo.com

1 0

Re: Add strncpyW to unicode.h
by Jeff Latimer 26 Apr '05

26 Apr '05

I have just been reading the lists and realise that strncpyW/strncpy is bad news for some reason. Please consider this patch withdrawn. Wouldn't it be better to implement strncpyW as a wrapper for memcpy? Given that all the other string functions are implemeted with the (W) version, having strncpyW missing is a bit confusing. Jeff Latimer Jeff Latimer wrote: > An implementation of strncpyW. > > Jeff Latimer > >------------------------------------------------------------------------ > >Index: unicode.h >=================================================================== >RCS file: /home/wine/wine/include/wine/unicode.h,v >retrieving revision 1.31 >diff -u -r1.31 unicode.h >--- unicode.h 21 Apr 2005 17:18:50 -0000 1.31 >+++ unicode.h 25 Apr 2005 10:48:05 -0000 >@@ -191,6 +191,18 @@ > return dst; > } > >+static inline WCHAR *strncpyW( WCHAR *dst, const WCHAR *src, int maxlen ) >+{ >+ WCHAR *p = dst; >+ if (maxlen > 0 ) >+ { >+ maxlen--; >+ while (((*p++ = *src++) && maxlen--)); >+ } >+ if (*p) *p++ = (WCHAR) "\0"; >+ return dst; >+} >+ > static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) > { > while (*str1 && (*str1 == *str2)) { str1++; str2++; } > >

2 3

ComboBoxEx focus bug
by felix.nawothnig＠t-online.de 26 Apr '05

26 Apr '05

Hi. I'm trying to fix PR 1114 and ran into the following problem: The listbox of WinRAR isn't updated because CBN_SELENDOK isn't sent. CBN_SELENDOK is supposed to be sent by CBRollUp() called by the LBN_SELCHANGE handler but isn't because the listbox (of the combobox) is already rolled up when LBN_SELCHANGE is received. The premature CBRollUp() is caused by a click into the combo/listbox which SetFocus()es the listbox which causes a KILLFOCUS sent to the edit control which was holding the focus before and then forwards the KILLFOCUS to it's parent (the ComboLBox) which rolls the listbox up and issues CBN_SELENDCANCEL. (This causes also a visible difference between native and builtin comctl32 - native ComboBoxEx rolls up on mouseup, ours rolls up on mousedown) So the problem is that the editbox has the focus although the listbox is rolled down - this is the case for DROPDOWN comboboxes but only possible since the listbox takes care of this special case and forwards the focus to the edit control. Since a ComboBoxEx is a DROPDOWNLIST with an edit control drawn itself the editbox has to lose the focus when the listbox is rolled down. The listbox code actually takes care of that and sets the focus to the listbox if it's not child of a DROPDOWN CB but the CBN_SETFOCUS handling in comboex.c sets the focus back to the edit control for some reason, stating: * We also need to set the focus back to the Edit control * after passing the command to the parent of the ComboEx. Putting an "case CBN_SETFOCUS:" before the CBN_SELENDOK case (making sure that the focus isn't set to the edit control after a CBN_SETFOCUS) makes WinRAR work, makes the listbox roll up on mouseup (looks exactly like native comctl32) and doesn't seem to cause any problems. However, if the ComboBoxEx receives another CBN_* (except those handled by case statements which all *don't* set the focus to the edit box) I think it will set the focus back to the edit control (although the listbox is still rolled down) and when the user then selects an item it will again roll up and send CBN_SELENDCANCEL. So would it be right to completly remove the focus-forwarding to the edit control? (Since I know nothing about Win32 programming, the comments talk about MSIE4 expecting some specific behaviour and I don't wanna cause a regression I decided to ask here first :) -flexo

1 0

Re: Bug 2904
by Juan Lang 26 Apr '05

26 Apr '05

> Hey guys, can one of you have a look at bug 2904? Isn't this the same thing? http://www.winehq.org/hypermail/wine-devel/2005/04/0494.html Whether or not the patch Michael attached is the "real" fix, it should solve the immediate problem (the assert failure.) --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

Exception in DefWindowProcA
by Paul Vriens 26 Apr '05

26 Apr '05

Hi, when running proces explorer (V9.0.3) and some hacks, I get an exception in DefWindowProcA: trace:message:SPY_EnterMessage (0x20022) DefWindowProc32: WM_GETTEXT [000d] wp=00000100 lp=00000000 Call kernel32.WideCharToMultiByte(00000000,00000000,6b2592e0 L"Process Explorer - Sysinternals: www.sysinternals.com",ffffffff,00000000,00000100,00000000,00000000) ret=61b8be5 Ret kernel32.WideCharToMultiByte() retval=00000000 ret=61b8be52 trace:seh:EXC_RtlRaiseException code=c0000005 flags=0 addr=0x61b8be5c It somewhat boils down to this piece of code in defwnd.c: line:754 if (wndPtr->text) { if (!WideCharToMultiByte( CP_ACP, 0, wndPtr->text, -1, dest, wParam, NULL, NULL )) dest[wParam-1] = 0; result = strlen( dest ); } else dest[0] = '\0'; WIN_ReleasePtr( wndPtr ); dest = NULL in my case so I added some tests for this: if (wndPtr->text) { if (!WideCharToMultiByte( CP_ACP, 0, wndPtr->text, -1, dest, wParam, NULL, NULL )) { if (dest) dest[wParam-1] = 0; } if (dest) result = strlen( dest ); else result = 0; } This makes the GUI appear but I want to find out if the call is valid or that we indeed should check for dest being NULL. Any ideas? Cheers, Paul.

1 0

Re: OLEAUT32: (resend) Floating point locale, no negative zero
by Alexandre Julliard 26 Apr '05

26 Apr '05

Alex Villacis Lasso <a_villacis(a)palosanto.com> writes: > Changelog: > * Force Single|Double conversion to BSTR to use the decimal separator > defined by the current locale, because that is what native oleaut32 > does, and to be consistent with later parsing of floating-point > numbers, which uses current locale. Failure to apply this patch causes > vartype test to fail in non-US locales with a decimal separator other > than a period. > * The number form "-0" is *not* allowed to be returned in a > Single|Double conversion to BSTR in case of numeric undeflow, use > unsigned zero instead. Some applications depend on this. Test included. That's ugly, I think we really want to do our own formatting instead of using the system printf and hacking the string afterwards. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: PATCH: gcc4 alias fixes
by Dan Kegel 26 Apr '05

26 Apr '05

Dimitrie O. Paun wrote: >> This is the patch I use for gcc4.0 here. >> >> I am not really sure why this aliasing was introduced, >> but it will not work this way anymore. > > I still don't understand why it doesn't work. > > It was introduced because using macros it not always acceptable. > Some source uses these functions in ways that break if they are > defined as macros. > > Defining them as inline functions work, but we can't do so for > varargs, in which case we used aliases. > > What was the reason to break them, and why they don't work? > They are aliasing to things that _are_ defined, so I'm not > sure what is going on there. http://www.gnu.org/software/gcc/gcc-4.0/changes.html says (not that I really understand it totally): --- snip --- Given __attribute__((alias("target"))) it is now an error if target is not a symbol, defined in the same translation unit. This also applies to aliases created by #pragma weak alias=target. This is because it's meaningless to define an alias to an undefined symbol. On Solaris, the native assembler would have caught this error, but GNU as does not. --- snip --- - Dan -- Trying to get a job as a c++ developer? See http://kegel.com/academy/getting-hired.html

2 1

How to deal with different struct sizes per OS
by Paul Vriens 26 Apr '05

26 Apr '05

Hi, while dealing with the SYSTEM_PROCESS_INFORMATION struct in winternl.h I found that the struct has different sizes for NT/W2K/W2K3. How do we deal with this? Have a struct per OS and deal with it in the handling part (ntdll/nt.c in this case) for what *version* returns? Should the default one be the most extensive one? We obviously need a run-time check. While I'm at it, this struct contains another struct (VM_COUNTERS). Do we want the seperate items in SYSTEM_PROCESS_INFORMATION or a reference to VM_COUNTERS? (VM_COUNTERS looks cleaner). Cheers, Paul Vriens.

1 0

Bug 2904
by Dustin Navea 25 Apr '05

25 Apr '05

Hey guys, can one of you have a look at bug 2904? The reporter left a slightly barebones report, but I was able to find the patch that caused the problem, and posted all the relevant info I could find in my comments. Hopefully someone can write up a quick fix.. Thanks Dustin P.S. It's great to be back maintaining the database.. Now for all those bugs Ive missed over the last couple of years! ;-)

1 0

Re: avicap32 patch
by Juan Lang 25 Apr '05

25 Apr '05

Hi Maarten, > +#ifdef HAVE_LINUX_VIDEODEV_H > +#include <stdio.h> > +#include <sys/ioctl.h> > +#include <sys/stat.h> > +#include <errno.h> > +#include <asm/types.h> > +#include <linux/videodev.h> > +#include <fcntl.h> > +#include <unistd.h> > +#include "winnls.h" > +#endif You need to include "winnls.h" unconditionally, capGetDriverDescriptionW is always compiled with calls to MultiByteToWideChar. > + sprintf(device, "/dev/video%i", devnum); Why not use snprintf(device, sizeof(device) ...) instead? > + strcpy(name, caps.card); Ug. Please don't use strcpy. Even though caps.card and name happen to be declared of the same size, and caps.card is very likely null-terminated, it takes a bit of searching around to make sure that's the case. It's easier to verify it's correct if you use lstrncpyA or memcpy instead. Since you NULL-terminate in the next line, I'd suggest memcpy. > + sprintf(version, "%s v%u.%u.%u", It's also not obvious how large version is. I'd recommend passing in the length of the buffer and using snprintf instead. You might as well pass in the length of name, too. > + strncpy(lpszName, devname, cbName); You won't be able to use strncpy anymore, see Alexandre's commit: http://www.winehq.org/hypermail/wine-cvs/2005/04/0275.html --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

WoW, er Wine on Windows--Re: Still more fun?
by Augustus Saunders 25 Apr '05

25 Apr '05

I've been avidly following WWN for some time now, and now that other people have brought up this topic (using WINE dlls on Windows), I wanted to jump in. (I'm not subscribed, so please CC me on any response) My employer is vaguely considering pursuing a product idea, depending on 1) how difficult this is to do, 2) how complete WINE is in the areas we're interested in, and 3) presuming the licensing works out. But that's neither here nor there, so let me describe what we want to do. We are interested in creating an "application launcher" application, where-in you run our application, choose any other application installed on your system, and it is executed, but links against any WINE dlls that we provide instead of system dlls. So we want to put all of the WINE dlls (that we care to use) in say, "C:\Program Files\LauncherApp\WINE" or some such, and injecting that ahead of WINDOWS and SYSTEM32 directories, but only for apps run from our launcher. Anything we don't provide should just fall back on the system dlls. As for what we hope to accomplish, well, it might seem like massive overkill to try using WINE, but it's the only plausible way I've come up with. Basically, we want to substitute all the graphics/windowing/GDI etc so that we can record all the painting/rendering into some kind of WMF type thingy. The idea is to get screen captures as metafiles that are perfectly screen-accurate. There are numerous ways to grab a bitmap rendering of a window/screen, but that's useless. Also, you can (sometimes) get an application to print to your metafile, but that is for printing documents and does not show the application as it appears on screen. The end result? Essentially vector graphic screen shots. I can imagine some weird interactions caused by using wine dlls and system dlls at the same time. I can also imagine that things might go berzerk when a WINE-linked app's window's overlapped a regular app--it would probably be necessary to forward some stuff to the WIN32 system so that windows would interact and messages get sent properly. In fact, for us, it would be ok to forward everything to WIN32 versions, and have WINE maintain a "shadow" copy of all the windows in memory that we capture from, but aren't on-screen. But that could be a huge performance drain. It seems like this could be a ton of work, or practically trivial, and I can't tell which. Finally, how much is DirectDraw/D3D used outside of games? We're only interested in desktop/office type apps, and I presume we can safely ignore trapping anything sent through DirectX. I appreciate any feedback anybody has. Thanks- Augustus PS I'm not subscribed (I just read WWN), so please CC me on any responses. Thanks.

4 4

TrashCan - Day 4
by Steven Edwards 25 Apr '05

25 Apr '05

Hi, This one is much better but still far from perfect. Trashing files to ~/.Trash now works and its cleanly put in to a new function. Alexandre wants to have the default behavior to be to use C:\Recycled so I am going to add a registry entry and a option to winecfg so that the user can enable FreeDesktop trash if they wish. Any suggestions on Key/Value name and location? Thanks Steven __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Re: Some fixes for filtergraph.c (#2)
by Christian Costa 25 Apr '05

25 Apr '05

> > >>> >> This is not correct, you must connect all pins, not just the first >> that succeeds. > > > Asleep? ;) You can't connect an input pin more then once > (VFW_E_ALREADY_CONNECTED), anyway this function always returned S_OK, > I fixed that too now... If you still think multiple connects should > happen > http://msdn.microsoft.com/library/en-us/directshow/htm/ipinconnect.asp ;) No, no. It's not necessary. I'm convinced. :-) > > static HRESULT WINAPI Mediacontrol_Pause(IMediaControl *iface) { > ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); >+ TRACE("(%p/%p)->()\n", This, iface); > >- TRACE("(%p/%p)->(): stub !!!\n", This, iface); >+ if (This->state == State_Paused) return S_OK; >+ >+ SendTheFilterAMessage(iface, SendPause); >+ This->state = State_Paused; > > return S_OK; > } > > Shouldn't S_FALSE be returned in the last statement? > > static HRESULT WINAPI Mediacontrol_Stop(IMediaControl *iface) { > ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); >+ TRACE("(%p/%p)->()\n", This, iface); > >- TRACE("(%p/%p)->(): stub !!!\n", This, iface); >+ if (This->state == State_Stopped) return S_OK; >+ if (This->state == State_Running) SendTheFilterAMessage(iface, SendPause); >+ SendTheFilterAMessage(iface, SendStop); >+ This->state = State_Stopped; > > return S_OK; > } > > I think you should move the critical section out of SendTheFilterAMessage and put it in Run, Pause and Stop methods. Bye, Christian PS: SendTheFilterAMessage and FoundFilter are really odd names, no?

2 1

Re: Privilege Checks For RegLoadKey, RegUnloadKey & RegSaveKey
by Alexandre Julliard 25 Apr '05

25 Apr '05

Robert Shearman <rob(a)codeweavers.com> writes: > Changelog: > - Fix access rights for RegOpenKeyEx and RegCreateKeyEx calls. > - Add privilege checks for RegLoadKey, RegUnloadKey & RegSaveKey calls. This breaks the crypt tests: ../../../tools/runtest -q -P wine -M advapi32.dll -T ../../.. -p advapi32_test.exe.so crypt.c && touch crypt.ok crypt.c:224: Test failed: 8009000f -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: tools/widl
by Alexandre Julliard 25 Apr '05

25 Apr '05

Ge van Geldorp <gvg(a)reactos.com> writes: > + switch(var->type->type) > + { > + case RPC_FC_BYTE: > + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); > + print_client("0x%02x, /* FC_BYTE */\n", RPC_FC_BYTE); > + break; > + case RPC_FC_CHAR: > + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); > + print_client("0x%02x, /* FC_CHAR */\n", RPC_FC_CHAR); > + break; > + case RPC_FC_WCHAR: > + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); > + print_client("0x%02x, /* FC_WCHAR */\n", RPC_FC_WCHAR); > + break; > + case RPC_FC_USHORT: > + case RPC_FC_SHORT: > + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); > + print_client("0x%02x, /* FC_USHORT */\n", RPC_FC_SHORT); > + break; > + case RPC_FC_ULONG: > + case RPC_FC_LONG: > + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); > + print_client("0x%02x, /* FC_LONG */\n", RPC_FC_LONG); > + break; > + case RPC_FC_HYPER: > + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); > + print_client("0x%02x, /* FC_HYPER */\n", RPC_FC_HYPER); > + break; > + case RPC_FC_IGNORE: > + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); > + print_client("0x%02x, /* FC_IGNORE */\n", RPC_FC_IGNORE); > + break; > + case RPC_FC_SMALL: > + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); > + print_client("0x%02x, /* FC_SMALL */\n", RPC_FC_SMALL); > + break; > + case RPC_FC_FLOAT: > + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); > + print_client("0x%02x, /* FC_FLOAT */\n", RPC_FC_FLOAT); > + break; > + case RPC_FC_DOUBLE: > + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); > + print_client("0x%02x, /* FC_DOUBLE */\n", RPC_FC_DOUBLE); > + break; You should add some sort of get_fc_name() function instead of duplicating a big switch like that every time you want to print a name. > static void write_function_stubs(type_t *iface) > { > - func_t *cur = iface->funcs; > - char *handle_name = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); > + char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); > + int explitit_handle = is_attr(iface->attrs, ATTR_IMPLICIT_HANDLE); > + func_t *func = iface->funcs; > + var_t* var; Your patch would be a lot easier to review if you avoided renaming existing local variables. If you really think the names need to be changed please do it in a separate patch. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: Installing Mozilla
by Juan Lang 25 Apr '05

25 Apr '05

--- Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> wrote: > Is the Mozilla Installer Installshield or MSI based? Otherwise is it > open source? Perhaps an easier way to backtrace the problem? I believe it's open source. The crash was due to Mozilla attempting to write to a value that's exported by msvcrt.dll. It was declared in msvcrt's spec file, but never defined. Thus Mozilla was writing to a garbage pointer. It's been fixed in Wine. There's a separate issue that Mozilla probably isn't doing the right thing. It's overwriting a buffer it doesn't own and whose size is not documented, and it should be writing only four characters but is writing more. Now that Wine is fixed this is unlikely to cause anyone any trouble, but it's still not right. --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

3 3

writejump purpose
by Robert Lunnon 25 Apr '05

25 Apr '05

In kthread.c there is this code that is only defined for I386 glibc, but the solaris port uses Solaris libc so the function does nothing. What is the purpose of this function and exactly what should the semantics be ? BOb static inline void writejump( const char *symbol, void *dest ) { #if defined(__GLIBC__) && defined(__i386__) unsigned char *addr = wine_dlsym( RTLD_NEXT, symbol, NULL, 0 ); if (!addr) return; /* write a relative jump at the function address */ mprotect((void*)((unsigned int)addr & ~(getpagesize()-1)), 5, PROT_READ| PROT_EXEC|PROT_WRITE); addr[0] = 0xe9; *(int *)(addr+1) = (unsigned char *)dest - (addr + 5); mprotect((void*)((unsigned int)addr & ~(getpagesize()-1)), 5, PROT_READ| PROT_EXEC); # ifdef HAVE_VALGRIND_MEMCHECK_H VALGRIND_DISCARD_TRANSLATIONS( addr, 5 ); # endif #endif /* __GLIBC__ && __i386__ */ }

2 1

Wine no longer compiles
by Ivan Gyurdiev 25 Apr '05

25 Apr '05

Haven't been able to compile cvs wine for the last few weeks. This is Fedora Rawhide with gcc4. Any suggestions? gcc -c -I. -I. -I../../../include -I../../../include -I../../../include/msvcrt -I./.. -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o file.o file.c In file included from ../../../include/winnt.h:27, from ../../../include/windef.h:204, from ../../../include/wine/test.h:25, from file.c:21: ../../../include/msvcrt/ctype.h:72: warning: conflicting types for built-in function ‘iswalnum’ ../../../include/msvcrt/ctype.h:73: warning: conflicting types for built-in function ‘iswalpha’ ../../../include/msvcrt/ctype.h:75: warning: conflicting types for built-in function ‘iswcntrl’ ../../../include/msvcrt/ctype.h:77: warning: conflicting types for built-in function ‘iswdigit’ ../../../include/msvcrt/ctype.h:78: warning: conflicting types for built-in function ‘iswgraph’ ../../../include/msvcrt/ctype.h:79: warning: conflicting types for built-in function ‘iswlower’ ../../../include/msvcrt/ctype.h:80: warning: conflicting types for built-in function ‘iswprint’ ../../../include/msvcrt/ctype.h:81: warning: conflicting types for built-in function ‘iswpunct’ ../../../include/msvcrt/ctype.h:82: warning: conflicting types for built-in function ‘iswspace’ ../../../include/msvcrt/ctype.h:83: warning: conflicting types for built-in function ‘iswupper’ ../../../include/msvcrt/ctype.h:84: warning: conflicting types for built-in function ‘iswxdigit’ ../../../include/msvcrt/ctype.h:85: warning: conflicting types for built-in function ‘towlower’ ../../../include/msvcrt/ctype.h:86: warning: conflicting types for built-in function ‘towupper’ ../../../include/msvcrt/io.h:179: error: ‘open’ aliased to external symbol ‘_open’ ../../../include/msvcrt/io.h:180: error: ‘sopen’ aliased to undefined symbol ‘_sopen’ ../../../include/msvcrt/process.h:129: error: ‘execl’ aliased to undefined symbol ‘_execl’ ../../../include/msvcrt/process.h:130: error: ‘execle’ aliased to undefined symbol ‘_execle’ ../../../include/msvcrt/process.h:131: error: ‘execlp’ aliased to undefined symbol ‘_execlp’ ../../../include/msvcrt/process.h:132: error: ‘execlpe’ aliased to undefined symbol ‘_execlpe’ ../../../include/msvcrt/process.h:133: error: ‘spawnl’ aliased to undefined symbol ‘_spawnl’ ../../../include/msvcrt/process.h:134: error: ‘spawnle’ aliased to undefined symbol ‘_spawnle’ ../../../include/msvcrt/process.h:135: error: ‘spawnlp’ aliased to undefined symbol ‘_spawnlp’ ../../../include/msvcrt/process.h:136: error: ‘spawnlpe’ aliased to undefined symbol ‘_spawnlpe’ -- Ivan Gyurdiev <ivg2(a)cornell.edu> Cornell University

2 1

PATCH: gcc4 alias fixes
by Marcus Meissner 24 Apr '05

24 Apr '05

Hi, This is the patch I use for gcc4.0 here. I am not really sure why this aliasing was introduced, but it will not work this way anymore. Ciao, Marcus diff -ruN -x CVS wine-20050419/include/msvcrt/conio.h marcus-wine-20050419/include/msvcrt/conio.h --- wine-20050419/include/msvcrt/conio.h 2004-07-19 13:07:44.000000000 +0200 +++ marcus-wine-20050419/include/msvcrt/conio.h 2005-04-13 13:03:23.000000000 +0200 @@ -53,7 +53,7 @@ static inline unsigned short outpw(unsigned short i, unsigned short j) { return _outpw(i, j); } #endif -#ifdef __GNUC__ +#if defined(__GNUC__) && (__GNUC__ < 4) extern int cprintf(const char*,...) __attribute__((alias("_cprintf"),format(printf,1,2))); extern int cscanf(const char*,...) __attribute__((alias("_cscanf"),format(scanf,1,2))); #else diff -ruN -x CVS wine-20050419/include/msvcrt/io.h marcus-wine-20050419/include/msvcrt/io.h --- wine-20050419/include/msvcrt/io.h 2004-07-19 13:07:44.000000000 +0200 +++ marcus-wine-20050419/include/msvcrt/io.h 2005-04-13 13:03:23.000000000 +0200 @@ -175,7 +175,7 @@ #endif static inline int write(int fd, const void* buf, unsigned int size) { return _write(fd, buf, size); } -#ifdef __GNUC__ +#if defined(__GNUC__) && (__GNUC__ < 4) extern int open(const char*,int,...) __attribute__((alias("_open"))); extern int sopen(const char*,int,int,...) __attribute__((alias("_sopen"))); #else diff -ruN -x CVS wine-20050419/include/msvcrt/process.h marcus-wine-20050419/include/msvcrt/process.h --- wine-20050419/include/msvcrt/process.h 2004-07-19 13:07:44.000000000 +0200 +++ marcus-wine-20050419/include/msvcrt/process.h 2005-04-13 13:03:23.000000000 +0200 @@ -125,7 +125,7 @@ static inline int spawnvp(int flags, const char* name, const char* const* argv) { return _spawnvp(flags, name, argv); } static inline int spawnvpe(int flags, const char* name, const char* const* argv, const char* const* envv) { return _spawnvpe(flags, name, argv, envv); } -#ifdef __GNUC__ +#if defined(__GNUC__) && (__GNUC__ < 4) extern int execl(const char*,const char*,...) __attribute__((alias("_execl"))); extern int execle(const char*,const char*,...) __attribute__((alias("_execle"))); extern int execlp(const char*,const char*,...) __attribute__((alias("_execlp")));

2 1

Debugging with GDB [was: Re: World of Warcraft - crash in game]
by Alex Woods 24 Apr '05

24 Apr '05

On Thu, Mar 03, 2005 at 08:13:41AM +1100, Troy Rollo wrote: > On Thu, 3 Mar 2005 03:43, Alex Woods wrote: > > Unfortunately, I never got to try out this method properly. WoW has > > it's own dbghelp.dll that it checks on login and that contains different > > functions to wine's dbghelp. So I got stuck there, but it's not all bad > > news. > > In that case you may be able to use GDB directly on the executable (without > winedbg) and attach after the app has started with > "gdb /usr/local/bin/wine-pthread process-id". The major drawback of this is > that it cannot tell the difference between a first chance exception and a > last chance exception, so if the app uses exception handling you may end up > using GDB's "pass" command a lot. Well, after a long break, I'm back at trying to debug wine + WoW again. Somewhere alsa stopped working for me totally in wine (multilib problem I think). Now that it's working again, running the winmm and dsound tests I don't get any crashes, which I did before. I still get crashes in WoW though, with both OSS and ALSA, so I figure I'll try to get to the bottom of the common problems first before going back to see if ALSA is still a problem. I'm attaching to the process with gdb, but it's not catching things at the point where they go wrong. Typically I am just seeing a stack like this though: #0 0x56752a01 in ?? () I might be doing something wrong. It's been a long time since I used gdb for anything threaded, and never with NTLM. I've tried attaching to wine-pthread process and the wine-preloader process, with pretty much the same results. It's a real shame that +relay slows things down too much for be to be able to get to the point where a crash occurs. Does anyone have any suggestions as to how I might get a handle on where things are going wrong? How are exceptions caught by wine? A lot of the time WoW handles the error so can I work back from there? A lot of the time I get a report like this: This application has encountered a critical error: Not enough memory Program: C:\Program Files\World of Warcraft\WoW.exe File: C:\build\buildWoW\WoW\Source\WorldClient\MapMem.cpp Line: 589 WoWBuild: 4341 ------------------------------------------------------------------------------ ---------------------------------------- Stack Trace (Manual) ---------------------------------------- Address Frame Logical addr Module 0064F43E 55C0F970 0001:0024E43E C:\Program Files\World of Warcraft\WoW.exe 006500A5 55C0F988 0001:0024F0A5 C:\Program Files\World of Warcraft\WoW.exe 00651464 55C0F9A8 0001:00250464 C:\Program Files\World of Warcraft\WoW.exe 006B9F82 55C0F9D0 0001:002B8F82 C:\Program Files\World of Warcraft\WoW.exe 006D8FC6 55C0FAF4 0001:002D7FC6 C:\Program Files\World of Warcraft\WoW.exe 006B16AE 55C0FB20 0001:002B06AE C:\Program Files\World of Warcraft\WoW.exe 006B13B7 55C0FB3C 0001:002B03B7 C:\Program Files\World of Warcraft\WoW.exe 00689769 55C0FB4C 0001:00288769 C:\Program Files\World of Warcraft\WoW.exe 0048E70F 55C0FC00 0001:0008D70F C:\Program Files\World of Warcraft\WoW.exe 0048E293 55C0FC8C 0001:0008D293 C:\Program Files\World of Warcraft\WoW.exe 0076DDE1 55C0FCB0 0001:0036CDE1 C:\Program Files\World of Warcraft\WoW.exe 00762520 55C0FCD8 0001:00361520 C:\Program Files\World of Warcraft\WoW.exe 00760C72 55C0FCE4 0001:0035FC72 C:\Program Files\World of Warcraft\WoW.exe 0044224E 55C0FDAC 0001:0004124E C:\Program Files\World of Warcraft\WoW.exe 0041B8E6 55C0FDE4 0001:0001A8E6 C:\Program Files\World of Warcraft\WoW.exe 004175EA 55C0FE5C 0001:000165EA C:\Program Files\World of Warcraft\WoW.exe 00416D71 55C0FE74 0001:00015D71 C:\Program Files\World of Warcraft\WoW.exe 004044B0 55C0FF14 0001:000034B0 C:\Program Files\World of Warcraft\WoW.exe 55A58B9B 55C0FFF4 0001:00057B9B c:\windows\system\kernel32.dll Am I right in thinking that the logical address is the address I should use to look up the point it's failing in kernel32.dll? Using that and an asm dump of kernel32.dll.so places it in the error section of FindFirstFileExW I think: 57b82: 00 57b83: 89 04 24 mov %eax,(%esp) 57b86: e8 91 80 00 00 call 5fc1c <HeapFree> 57b8b: 83 ec 0c sub $0xc,%esp 57b8e: 8d 45 e8 lea 0xffffffe8(%ebp),%eax 57b91: 89 04 24 mov %eax,(%esp) 57b94: e8 37 21 fe ff call 39cd0 <RtlFreeUnicodeString> 57b99: 83 ec 04 sub $0x4,%esp 57b9c: c7 45 b0 ff ff ff ff movl $0xffffffff,0xffffffb0(%ebp) 57ba3: 8b 45 b0 mov 0xffffffb0(%ebp),%eax 57ba6: 8b 5d fc mov 0xfffffffc(%ebp),%ebx 57ba9: c9 leave 57baa: c2 18 00 ret $0x18 If I attach to wine-pthread and stick a breakpoint in that function, it does indeed get called right before WoW crashes out with the Out of memory error. I guess I'll work that back, seeing as I it's something I've found out during the course of writing this email, but any suggestions as to how I can make debugging easier would be truly appreciated, as would any answers to my questions. Cheers. -- Alex

2 2

Re: Installing Mozilla
by Juan Lang 24 Apr '05

24 Apr '05

Alex wrote: > I'm encountering a crash when trying to install Mozilla 1.7.7 under > wine. I am using a fresh CVS checkout, but I've tried older revisions > with the same result. So far, this evidence points to a bug in Mozilla rather than in Wine. It may very well be triggered by a bug in Wine.. > Here is a backtrace. It's falling over trying to write to > 0x99806858. Mozilla's passing an apparently invalid pointer to WideCharToMultiByte. Question is, where does this come from? Running with WINEDEBUG=nls may give a clue what string it's trying to convert, which may give some indication of the problem. Running with WINEDEBUG=relay will probably give a better clue, but be prepared for a huge log. But since the Mozilla source is available, you may be able to hunt it down more easily using that. --Juan __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

4 3

Odd problem with process handles
by Robert Lunnon 24 Apr '05

24 Apr '05

I am having a problem with the attached segfault in ie6 I have attached a gdb backtrace and the last part of a relay dump. hModule is 0xffffffffe and gets dereferenced to find e_magic presumably from the psp. Obviously dereferencing 0xfffffffe is not good which raises an exception The exception is caught and appears to be ignored the first time it occurs but this seems unusual to me Can anyone shed light on this, is this normal or do I have a problem. What's going on here ? More info follows Bob ============================================================================ Starting program: /opt/cfw/wine/bin/wine iexplore Program received signal SIGSEGV, Segmentation fault. 0xd1cbfb5f in RtlImageNtHeader (hModule=0xfffffffe) at loader.c:1907 1907 if (dos->e_magic == IMAGE_DOS_SIGNATURE) (gdb) print dos $1 = (IMAGE_DOS_HEADER *) 0xfffffffe *** Aparrently in this code 1895 /*********************************************************************** 1896 * RtlImageNtHeader (NTDLL.@) 1897 */ 1898 PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) 1899 { 1900 IMAGE_NT_HEADERS *ret; 1901 1902 __TRY 1903 { 1904 IMAGE_DOS_HEADER *dos = (IMAGE_DOS_HEADER *)hModule; (gdb) 1905 1906 ret = NULL; 1907 if (dos->e_magic == IMAGE_DOS_SIGNATURE) 1908 { 1909 ret = (IMAGE_NT_HEADERS *)((char *)dos + dos->e_lfanew); 1910 if (ret->Signature != IMAGE_NT_SIGNATURE) ret = NULL; 1911 } 1912 } 1913 __EXCEPT(page_fault) 1914 { (gdb) 1915 return NULL; 1916 } 1917 __ENDTRY 1918 return ret; 1919 } **** Relay output 00b:Ret kernel32.LoadLibraryA() retval=00000000 ret=70c2429c 000b:Call kernel32.GetLastError() ret=70c242a9 000b:Ret kernel32.GetLastError() retval=0000007e ret=70c242a9 000b:Call kernel32.InterlockedExchange(70c2bd84,ffffffff) ret=70c242f0 000b:Ret kernel32.InterlockedExchange() retval=00000000 ret=70c242f0 000b:Call kernel32.GetProcAddress(ffffffff,70c24832 "ApphelpCheckShellObject") ret=70c24399 000b:Call ntdll.RtlInitAnsiString(7fd8dc18,70c24832 "ApphelpCheckShellObject") ret=7fe1e655 000b:Ret ntdll.RtlInitAnsiString() retval=7fd80018 ret=7fe1e655 000b:Call ntdll.LdrGetProcedureAddress(ffffffff,7fd8dc18,00000000,7fd8dc20) ret=7fe1e667 **** GDB Backtrace (gdb) bt #0 0xd1cbfb5f in RtlImageNtHeader (hModule=0xfffffffe) at loader.c:1907 #1 0xd1cc0018 in RtlImageDirectoryEntryToData (module=0xfffffffe, image=0, dir=0, size=0x7fd8db3c) at loader.c:2025 #2 0xd1cbdcd1 in LdrGetProcedureAddress (module=0xffffffff, name=0x7fd8dc18, ord=0, address=0x7fd8dc20) at loader.c:1154 #3 0xd1ccabcf in call_stdcall_function (func=0xd1cbdc9b <LdrGetProcedureAddress>, nb_args=4, args=0x7fd8dc08) at relay.c:521 #4 0xd1ccb2e0 in RELAY_CallFrom32 (ret_addr=2145511015) at relay.c:603 #5 0xd1d00025 in __wine_spec_exp_ordinals () from /opt/cfw/wine/lib/wine/ntdll.dll.so #6 0xd1ccab7d in call_stdcall_function (func=0x7fe1e62b <GetProcAddress>, nb_args=2, args=0x7fd8dce4) at relay.c:519 #7 0xd1ccb2e0 in RELAY_CallFrom32 (ret_addr=1891779481) at relay.c:603 #8 0x7fec08dd in __wine_spec_forwards () from /opt/cfw/wine/lib/wine/kernel32.dll.so #9 0x70c23bd1 in ?? () #10 0x71191420 in ?? () #11 0x711819aa in ?? () #12 0x7118a3c9 in ?? () #13 0x71165a1c in ?? () #14 0x7fbab1af in WINPROC_wrapper () from /opt/cfw/wine/lib/wine/user32.dll.so #15 0x7fbab61d in WINPROC_CallWndProc (proc=0x71165af5, hwnd=0x20022, msg=129, wParam=0, lParam=2144920548) at ../../windows/winproc.c:418 #16 0x7fbb21a6 in CallWindowProcA (func=0x71165af5, hwnd=0x20022, msg=129, wParam=0, lParam=2144920548) at ../../windows/winproc.c:3202 #17 0x7fbea1f4 in call_window_proc (hwnd=0x20022, msg=129, wparam=0, lparam=2144920548, unicode=0, same_thread=1) at message.c:1521 #18 0x7fbec0cb in SendMessageTimeoutA (hwnd=0x20022, msg=129, wparam=0, lparam=2144920548, flags=0, timeout=4294967295, res_ptr=0x7fd8df78) at message.c:2376 #19 0x7fbec299 in SendMessageA (hwnd=0x20022, msg=129, wparam=0, lparam=2144920548) at message.c:2420 #20 0xd1ccabcf in call_stdcall_function (func=0x7fbec266 <SendMessageA>, nb_args=4, args=0x7fd8e040) at relay.c:521 #21 0xd1ccb2e0 in RELAY_CallFrom32 (ret_addr=2137925787) at relay.c:603 #22 0x7fc3e3a1 in __wine_spec_exp_ordinals () from /opt/cfw/wine/lib/wine/user32.dll.so #23 0xd1cca480 in call_cdecl_function (func=0x7f6e23b6 <X11DRV_CreateWindow>, nb_args=3, args=0x7fd8e1c0) at relay.c:462 #24 0xd1ccb2c2 in RELAY_CallFrom32 (ret_addr=2142912231) at relay.c:599 #25 0x7f71a3a1 in __wine_spec_exp_ordinals () from /opt/cfw/wine/lib/wine/x11drv.dll.so #26 0x7fba4554 in CreateWindowExA (exStyle=256, className=0x7fd8e538 "IEFrame", windowName=0x7fd8e74c "Microsoft Internet Explorer", style=47120384, x=-2147483648, y=-2147483648, width=-2147483648, height=-2147483648, parent=0x0, menu=0x94, instance=0x71160000, data=0x7ff39fb8) at ../../windows/win.c:1245 #27 0xd1ccae57 in call_stdcall_function (func=0x7fba43da <CreateWindowExA>, nb_args=12, args=0x7fd8e4fc) at relay.c:535 #28 0xd1ccb2e0 in RELAY_CallFrom32 (ret_addr=1891617362) at relay.c:603 #29 0x7fc3c851 in __wine_spec_exp_ordinals () from /opt/cfw/wine/lib/wine/user32.dll.so #30 0x71181c0e in ?? () #31 0x71181acf in ?? () #32 0x71181a86 in ?? () #33 0x7101f031 in ?? () #34 0x00401ecd in ?? () #35 0x00401f7d in ?? () #36 0x7fe2cbf2 in start_process (arg=0x0) at process.c:1044

2 1

Re: Odd problem with process handles
by Juan Lang 24 Apr '05

24 Apr '05

Hi Bob, > hModule is 0xffffffffe and gets dereferenced to find e_magic > presumably from the psp. Could you try the following really quick patch? I have no idea where the -1 value to GetProcAddress comes from, LoadLibraryA returned NULL. I'm also not sure whether the check belongs in here or in GetProcAddress. But this might let it get further for you. Index: dlls/ntdll/loader.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/loader.c,v retrieving revision 1.87 diff -u -r1.87 loader.c --- dlls/ntdll/loader.c 21 Mar 2005 10:52:26 -0000 1.87 +++ dlls/ntdll/loader.c 24 Apr 2005 17:09:39 -0000 @@ -2017,6 +2017,8 @@ const IMAGE_NT_HEADERS *nt; DWORD addr; + if ( module == (HMODULE)-1 ) + return NULL; if ((ULONG_PTR)module & 1) /* mapped as data file */ { module = (HMODULE)((ULONG_PTR)module & ~1); __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

More problems in ie6
by Robert Lunnon 24 Apr '05

24 Apr '05

In addition to the bad process handle I get intermittent crashes in IE6 which seems to be due to the creation of more than 8 threads or when a thread is ended (IE it occurs after thread 8 starts, then exits then another thread 8 starts (9th thread creation)) Thread 8 is the first thread that actually exited in the program. Are there any resource limits to per process thread creation in wine ? This seems to lead to a crash in temp_stacks +111 but temp stacks should not hold any executable code. The web site that seems to tickle this problem is www.gamedude.com.au Any Guesses anyone ? Bob

1 0

Copy Protection
by Dustin Navea 24 Apr '05

24 Apr '05

Guys, bug 2895 got me thinkin.. If we only support a handful of games that use copy protection, shouldnt we file a bug in Bugzilla and append that to 1434 (Get games working perfectly)? That way we can attach any copy protection related bugs to this metabug? If you are agreeable to to that, I will go ahead and file it. Dustin

2 1

Re: Some fixes for filtergraph.c
by Christian Costa 24 Apr '05

24 Apr '05

Hi Maarten, Maarten Lankhorst wrote: > This doesn't fix everything, just theroutines i called.. some other > similar functions aren't fixed because filtergraph.c is really THAT > leaky..b mostly with reference counts.. Yes, Indeed. :-) Here are some comments : > >------------------------------------------------------------------------ > >--- wine-20050310/dlls/quartz/filtergraph.c 2005-03-02 11:12:12.000000000 +0100 >+++ wine/dlls/quartz/filtergraph.c 2005-04-24 00:50:30.000000000 +0200 >@@ -556,8 +556,7 @@ > IPin_QueryDirection(ppin, &pindir); > if (pindir == PINDIR_OUTPUT) > i++; >- else >- IPin_Release(ppin); >+ IPin_Release(ppin); > } > *pppins = CoTaskMemAlloc(sizeof(IPin*)*i); > /* Retrieve output pins */ >@@ -650,6 +649,7 @@ > IPin** ppins; > IPin* ppinfilter; > IBaseFilter* pfilter = NULL; >+ BOOL HaveEnumPin = FALSE; > > Why don't you just set ppinfilter to NULL and do "if (ppinfilter) IPin_Release(ppinfilter);" at the end ? > hr = GetFilterInfo(pMoniker, &clsid, &var); > IMoniker_Release(pMoniker); >@@ -677,6 +677,7 @@ > ERR("Enumpins (%lx)\n", hr); > goto error; > } >+ > hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin); > if (FAILED(hr)) { > ERR("Next (%lx)\n", hr); >@@ -687,6 +688,7 @@ > goto error; > } > IEnumPins_Release(penumpins); >+ HaveEnumPin = TRUE; > > See above. > hr = IPin_Connect(ppinOut, ppinfilter, NULL); > if (FAILED(hr)) { >@@ -703,17 +705,21 @@ > TRACE("pins to consider: %ld\n", nb); > for(i = 0; i < nb; i++) { > TRACE("Processing pin %d\n", i); >- hr = IGraphBuilder_Connect(iface, ppins[0], ppinIn); >+ hr = IGraphBuilder_Connect(iface, ppins[i], ppinIn); > if (FAILED(hr)) { >- TRACE("Cannot render pin %p (%lx)\n", ppinfilter, hr); >- return hr; >+ TRACE("Cannot render pin %p (%lx)\n", ppinfilter, hr); > } >+ IPin_Release(ppins[i]); >+ if (SUCCEEDED(hr)) break; > This is not correct, you must connect all pins, not just the first that succeeds. > } > CoTaskMemFree(ppins); >+ IBaseFilter_Release(pfilter); >+ IPin_Release(ppinfilter); >+ break; > } >- break; > > error: >+ if (HaveEnumPin) IPin_Release(ppinfilter); > See above. > if (pfilter) { > IGraphBuilder_RemoveFilter(iface, pfilter); > IBaseFilter_Release(pfilter); >@@ -1175,13 +1181,16 @@ > ULONG nb; > ULONG i; > PIN_INFO PinInfo; >+ BOOL HavePinInfo = FALSE; > > TRACE("%p %p %lld\n", pGraph, pOutputPin, tStart); > > hr = IPin_ConnectedTo(pOutputPin, &pInputPin); > >- if (SUCCEEDED(hr)) >+ if (SUCCEEDED(hr)) { >+ HavePinInfo = TRUE; > hr = IPin_QueryPinInfo(pInputPin, &PinInfo); >+ } > > Personally, I would set PinIno.pFilter to NULL on failure and do if (PinIno.pFilter) release... at the end. But it's just a matter of taste. > if (SUCCEEDED(hr)) > hr = GetInternalConnections(PinInfo.pFilter, pInputPin, &ppPins, &nb); >@@ -1202,6 +1211,7 @@ > * FIXME: We should prevent exploring from a pin more than once. This can happens when > * several input pins are connected to the same output (a MUX for instance). */ > ExploreGraph(pGraph, ppPins[i], tStart); >+ IPin_Release(ppPins[i]); > } > > CoTaskMemFree(ppPins); >@@ -1210,6 +1220,7 @@ > IBaseFilter_Run(PinInfo.pFilter, tStart); > } > >+ if (HavePinInfo) IBaseFilter_Release(PinInfo.pFilter); > return hr; > } > >@@ -1255,9 +1266,11 @@ > IPin_QueryDirection(pPin, &dir); > if (dir == PINDIR_INPUT) > { >+ IPin_Release(pPin); > source = FALSE; > break; > } >+ IPin_Release(pPin); > That would be simplier to do a single call to IPinRelease after IPin_QueryDirection. > } > if (source == TRUE) > { >@@ -1267,6 +1280,7 @@ > { > /* Explore the graph downstream from this pin */ > ExploreGraph(This, pPin, 0); >+ IPin_Release(pPin); > } > IBaseFilter_Run(pfilter, 0); > } > > Nice patch, BTW! :-) Bye, Christian

1 0

Re: WoW, er Wine on Windows--Re: Still more fun?
by Steven Edwards 24 Apr '05

24 Apr '05

--- Augustus Saunders <augustus.saunders(a)verilogix.net> wrote: > I appreciate any feedback anybody has. Thanks- It wont work for DirectX. Wine directX structures and implementation is incompatible with Windows currently. Normal Win32 dlls work fine. Thanks Steven __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Re: [AppDB] Version 1.00 of Warcraft III added by Christopher Morgan
by Jesse Allen 23 Apr '05

23 Apr '05

On 4/23/05, AppDB <appdb(a)winehq.org> wrote: > > Version 1.00 of Warcraft III added by Christopher Morgan > ------------------------------------------------------- > http://appdb.winehq.org/appview.php?versionId=3051 > This version has been submitted by Ben Klein. > > Best regards. > The AppDB team > http://www.winehq.org/ > > If you don't want to receive any other e-mail, please change your preferences: > http://appdb.winehq.org/preferences.php > > Hmmm. Should we be avoiding duplicate information? I already maintain a howto listed under "1.00+". In it I already cover, one running the game, including NoCD patches (though I encourage running official exe's and show how it's done) and second the issues with game movies. What this new note does not cover is running under opengl, working multiplayer and battle.net modes, winver settings to use, differentiation of wine versions, and miscellenous bugs. This new note may be a little misleading because Warcraft 3 uses D3D8 so Oliver's patch is not required, but it may be an improvement, I don't know. I typically run the game in opengl. There are other instances of duplicate information in the Appdb, perhaps we need to clean this up. But it is enormous work. I have a hard time just keeping my howto up to date. Jesse

2 1

Re: Installing Mozilla
by Juan Lang 23 Apr '05

23 Apr '05

--- James Hawkins <truiken(a)gmail.com> wrote: > Just because Mozilla is passing a bad memory address doesn't mean > it's a bug in Mozilla. For example Mozilla could have requested > some information from wine and we gave them the bad memory address. While that's certainly possible in general, that doesn't appear to be the case here. The bad pointer is the destination address of WideCharToMultiByte, not the source. Typically this will some buffer or other internal to Mozilla. I'm not claiming there isn't a bug in Wine. But I think the immediate thing we're seeing is a bug in Mozilla (likely triggered by a bug in Wine.) The nls trace might be interesting, because the source pointer appears to be valid. So, what string are they trying to translate? An error message perhaps? That might point to the cause of the problem. --Juan __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

4 6

Re: Installing Mozilla
by Juan Lang 23 Apr '05

23 Apr '05

--- Dustin Navea <speeddymon(a)gmail.com> wrote: > Perhaps they are thinking along the lines of the whole string being for > example "GMT -06:00 Central Time" ? In which case they wouldnt want to > convert just the GMT as it would product the wrong result. Apples and oranges. By "converting," I mean "WideCharToMultiByte," that is, character conversion from Unicode to ANSI. Converting more of the string doesn't help. The correct value in this case would be "CDT", and they wouldn't produce that. See their code. I agree with you a bug (and patch) ought to be filed against Mozilla. I may someday, but in the meanwhile, feel free. --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

Re: Installing Mozilla
by Juan Lang 23 Apr '05

23 Apr '05

--- Alexandre Julliard <julliard(a)winehq.org> wrote: > Actually, judging from the pointer values I get on my XP box the > buffers seem to be 64 chars long. Okay, changing patch to match. > Still, I'm not sure why Mozilla feels the need to overwrite them, that > doesn't seem right. No, it doesn't, although their comments explain the motivation: on some versions of Windows NT, the value is incorrectly set for some time zones. Nonetheless the code is doing the wrong thing: it's converting an entire string, e.g. "GMT Standard Time", rather than the time zone portion alone ("GMT"). --Juan __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

2 1

Re: ole32: fix for big-endian machines
by Alexandre Julliard 23 Apr '05

23 Apr '05

Juan Lang <juan_lang(a)yahoo.com> writes: > > void StorageUtl_ReadWord(const BYTE* buffer, ULONG offset, WORD* value) > { > - memcpy(value, buffer+offset, sizeof(WORD)); > + *value = le16toh(*(WORD *)(buffer+offset)); > } Why are you removing the memcpy? Are the offsets guaranteed to always be properly aligned? > +#ifdef WORDS_BIGENDIAN > + > +/* FIXME: more-optimal versions may be in <byteswap.h>, <sys/bswap.h>, or > + * <sys/endian.h>. Use config checks to find 'em. No, you don't want config checks, what you want to use here is RtlUshortByteSwap/RtlUlongByteSwap. -- Alexandre Julliard julliard(a)winehq.org

1 0

windows file dialogs with unix file path
by Michael Lin 23 Apr '05

23 Apr '05

Hi all, Back in Nov 2004, there was a brief discussion about extending the Windows file dialogs to allow browsing the Unix file system. Does anyone know if this have been implemented yet? If not, any suggestions on how to implement it? I am porting a windows application to linux using winelib, and using unix file path rather than window file path would be desired. Thanks, Michael

10 16

Re: windows file dialogs with unix file path
by Steven Edwards 23 Apr '05

23 Apr '05

Hi, --- Francois Gouget <fgouget(a)free.fr> wrote: > Hmm, I feel like I've seen that before. Where??? Windows is supposed to be able to be able to handle anything for a drive letter now. I have seen the Euro symbol used for a drive letter. It would be more inituitive to the user to have unix:/ rather than Z: but I don't think GetLogicalDriveStrings() can handle this http://msdn.microsoft.com/library/default.asp?url=/library/en-us/fileio/fs/… so you would need to use RtlDosFilenameToNtFilename or whatever it was called and do some magic with the object manager such as pointing to \\.\unix\ and maybe add "unix:" to the list of built-in device names (like LPTx, AUX, NUL, etc.). Then you might be able to hack a dialog to point to the device name. Thanks Steven __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Installing Mozilla
by Alex Woods 22 Apr '05

22 Apr '05

Hello, I'm encountering a crash when trying to install Mozilla 1.7.7 under wine. I am using a fresh CVS checkout, but I've tried older revisions with the same result. Here is a backtrace. It's falling over trying to write to 0x99806858. Backtrace: =>1 0x557581df wine_cp_wcstombs(table=0x5584855c, flags=0x0, src=0x55c08a38, srclen=0x12, dst=0x99806858, dstlen=0x20, defchar=0x0, used=0x0) [/var/tmp/portage/wine-cvs-1.1/work/wine/libs/unicode/wctomb.c:161] in libwine_unicode.so.1 (0x55c08934) 2 0x55a3a4f1 WideCharToMultiByte+0xe1(page=0x0, flags=0x0, src=0x55c08a38, srclen=0xffffffff, dst=0x99806858, dstlen=0x20, defchar=0x0, used=0x0) [/var/tmp/portage/wine-cvs-1.1/work/wine/dlls/kernel/locale.c:1651] in kernel32 (0x55c08970) 3 0x60f61cfd PR_AttachThread+0x56a in nspr4 (0x55c08ae0) 4 0x60f62956 in nspr4 (+0x12956) (0x55c08b08) 5 0x61d42e13 NS_GetMemoryManager+0x1b in xpcom (0x55c08b30) 6 0x61d7680a public: virtual int __thiscall nsCaseInsensitiveCStringComparator::operator()(char,char)const +0x716 in xpcom (0x55c08b5c) 7 0x61d548ff in xpcom (+0x148ff) (0x55c08b88) 8 0x61d566ed NS_NewNativeLocalFile+0x53 in xpcom (0x55c08ce4) 9 0x00416296 in setup (+0x16296) (0x55c0cd44) 10 0x00405958 in setup (+0x5958) (0x55c0ee5c) 11 0x00415e2f in setup (+0x15e2f) (0x55c0fe94) 12 0x00424375 EntryPoint+0xce in setup (0x55c0ff20) 13 0x55a4e645 start_process+0xf5(arg=0x0) [/var/tmp/portage/wine-cvs-1.1/work/wine/dlls/kernel/process.c:1044] in kernel32 (0x55c0fff4) 14 0x55585c71 wine_switch_to_stack+0x11 in libwine.so.1 (0x00000000) I've created a +relay trace, which shows the following stuff happening just before things go pear shaped: 0011:Ret ntdll.RtlAllocateHeap() retval=559752b0 ret=572beb67 0011:Ret msvcrt.calloc() retval=559752b0 ret=60f53690 0011:Call msvcrt._strdup(60f68130 "shma") ret=60f536a2 0011:Call ntdll.RtlAllocateHeap(558c0000,00000000,00000005) ret=572bebe7 0011:Ret ntdll.RtlAllocateHeap() retval=559752d0 ret=572bebe7 0011:Ret msvcrt._strdup() retval=559752d0 ret=60f536a2 0011:Call msvcrt.getenv(60f664f4 "NSPR_LOG_MODULES") ret=60f58ed1 0011:Ret msvcrt.getenv() retval=00000000 ret=60f58ed1 0011:Call kernel32.GetVersionExA(55c089a0) ret=60f61cbc 0011:Call ntdll.RtlGetVersion(55c0877c) ret=55a71f38 0011:Ret ntdll.RtlGetVersion() retval=00000000 ret=55a71f38 0011:Ret kernel32.GetVersionExA() retval=00000001 ret=60f61cbc 0011:Call kernel32.GetTimeZoneInformation(55c08a34) ret=60f61cd6 0011:Call ntdll.RtlQueryTimeZoneInformation(55c08a34) ret=55a6fae5 0011:Ret ntdll.RtlQueryTimeZoneInformation() retval=00000000 ret=55a6fae5 0011:Call ntdll.NtQuerySystemTime(55c08874) ret=55a6ebc5 0011:Ret ntdll.NtQuerySystemTime() retval=00000000 ret=55a6ebc5 0011:Ret kernel32.GetTimeZoneInformation() retval=00000000 ret=60f61cd6 0011:Call kernel32.WideCharToMultiByte(00000000,00000000,55c08a38 L"GMT Standard Time",ffffffff,99806858,00000020,00000000,00000000) ret=60f61cfd So, it's probably worth saying that I'm on UK time. Possibly also worth noting that I am using an x86_64, with wine -m32 compiled. Any ideas? Cheers. -- Alex

1 1

version change broke InstMsiA.exe
by James Hawkins 22 Apr '05

22 Apr '05

Hi, The following patch broke InstMsiA.exe: Modified files: dlls/ntdll : version.c Log message: Ivan Leo Puoti <puoti(a)inwind.it> Better EXE version check in VERSION_GetLinkedDllVersion. Patch: http://cvs.winehq.org/patch.py?id=14894 Here is +ver: trace:ver:VERSION_Init getting version from L"AppDefaults\\InstMsiA.exe\\Version" trace:ver:VERSION_Init getting default version trace:ver:VERSION_GetLinkedDllVersion L"InstMsiA.exe": 07.00/05.01/05.01/04.00 trace:ver:VERSION_GetLinkedDllVersion 07.00/05.01/05.01/04.00 trace:ver:RtlGetVersion <-- Windows XP (L"Service Pack 2") .... trace:ver:RtlGetVersion <-- Windows XP (L"Service Pack 2") trace:ver:VERSION_Init getting version from L"AppDefaults\\msiinst.exe\\Version" trace:ver:VERSION_Init getting default version trace:ver:VERSION_GetLinkedDllVersion L"msiinst.exe": 07.00/05.01/05.01/04.00 trace:ver:VERSION_GetLinkedDllVersion 07.00/05.01/05.01/04.00 trace:ver:RtlGetVersion <-- Windows XP (L"Service Pack 2") ... Before the change GetLinkedDllVersion recognized InstMsiA.exe as win98, but now it's XP SP2. I'm not sure how to change this test to make it work because both InstMsiA.exe (win9x version) and InstMsiW.exe (nt/xp version) return 07.00/05.01/05.01/04.00 for GetLinkedDllVersion. One solution is to just use the config file and specify win98, but since we are moving away from the config file I think it would be worth figuring out why this isn't working yet. -- James Hawkins

1 0

wine and gcc 4.0
by Florian Goth 22 Apr '05

22 Apr '05

Hi! I've just installed gcc 4.0 and now wine(CVS) stops compiling in ./wine/dlls/msvcrt/tests : gcc -c -I. -I. -I../../../include -I../../../include -I../../../include/msvcrt -I./.. -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -O2 -o headers.o headers.c In file included from headers.c:33: ../../../include/msvcrt/wchar.h:201: warning: conflicting types for built-in function 'iswalnum' ../../../include/msvcrt/wchar.h:202: warning: conflicting types for built-in function 'iswalpha' ../../../include/msvcrt/wchar.h:204: warning: conflicting types for built-in function 'iswcntrl' ../../../include/msvcrt/wchar.h:206: warning: conflicting types for built-in function 'iswdigit' ../../../include/msvcrt/wchar.h:207: warning: conflicting types for built-in function 'iswgraph' ../../../include/msvcrt/wchar.h:208: warning: conflicting types for built-in function 'iswlower' ../../../include/msvcrt/wchar.h:209: warning: conflicting types for built-in function 'iswprint' ../../../include/msvcrt/wchar.h:210: warning: conflicting types for built-in function 'iswpunct' ../../../include/msvcrt/wchar.h:211: warning: conflicting types for built-in function 'iswspace' ../../../include/msvcrt/wchar.h:212: warning: conflicting types for built-in function 'iswupper' ../../../include/msvcrt/wchar.h:213: warning: conflicting types for built-in function 'iswxdigit' ../../../include/msvcrt/wchar.h:214: warning: conflicting types for built-in function 'towlower' ../../../include/msvcrt/wchar.h:215: warning: conflicting types for built-in function 'towupper' ../../../include/msvcrt/io.h:179: error: 'open' aliased to undefined symbol '_open' ../../../include/msvcrt/io.h:180: error: 'sopen' aliased to undefined symbol '_sopen' ../../../include/msvcrt/conio.h:57: error: 'cprintf' aliased to undefined symbol '_cprintf' ../../../include/msvcrt/conio.h:58: error: 'cscanf' aliased to undefined symbol '_cscanf' ../../../include/msvcrt/process.h:129: error: 'execl' aliased to undefined symbol '_execl' ../../../include/msvcrt/process.h:130: error: 'execle' aliased to undefined symbol '_execle' ../../../include/msvcrt/process.h:131: error: 'execlp' aliased to undefined symbol '_execlp' ../../../include/msvcrt/process.h:132: error: 'execlpe' aliased to undefined symbol '_execlpe' ../../../include/msvcrt/process.h:133: error: 'spawnl' aliased to undefined symbol '_spawnl' ../../../include/msvcrt/process.h:134: error: 'spawnle' aliased to undefined symbol '_spawnle' ../../../include/msvcrt/process.h:135: error: 'spawnlp' aliased to undefined symbol '_spawnlp' ../../../include/msvcrt/process.h:136: error: 'spawnlpe' aliased to undefined symbol '_spawnlpe' make: *** [headers.o] Error 1 make died with exit status 2

2 1

/tmp using
by Vitaly Lipatov 22 Apr '05

22 Apr '05

I suppose to make patch for using TMPDIR environment variable as temp directory if it is not empty. There is hardcoded path to /tmp for wine server directory, and I would like to use ~/tmp dir... Will it change accepted and or it is not wrong intention? -- Vitaly Lipatov, ALT Linux Team Russia, Saint-Petersburg, www.etersoft.ru

2 1

Last call for PGP key signing party
by Shachar Shemesh 22 Apr '05

22 Apr '05

Hi all, This is your last chance to get your very own PGP key signed by your community. So far, we have 6.5 participants (hoping to get it to 7 by tomorrow). This means 7 brand new signatures on your PGP key. Read the previous announcement (http://www.winehq.org/hypermail/wine-devel/2005/04/0057.html and http://www.winehq.org/hypermail/wine-devel/2005/04/0084.html) for details on what you need to do. New submissions should be possible to get right up to the party itself, assuming I can get our hosts to lend me the use of a printer (Will you?). Thanks, Shachar -- Shachar Shemesh Lingnu Open Source Consulting ltd. Have you backed up today's work? http://www.lingnu.com/backup.html

2 1

shell32/shflder_unixfs: Use shell kind ITEMIDLISTs
by Michael Jung 22 Apr '05

22 Apr '05

This silences some ERROR messages when browsing in the namespace extension and allows to apply shell32's helper functions. Changelog: Use the shell32 typical binary format for ITEMIDLISTs. Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

1 0

Win16 programs and Wine internal messages
by Richard Cohen 22 Apr '05

22 Apr '05

Closing Win16 programs using the Window manager doesn't work any more, because 16 bit programs don't recognize the WINE internal messages, so they don't get processed. This patch moves the internal messages to just below 0xffff, but perhaps there is a better way? Richard.

2 2

Re: USB status ...Who maintains wineserver?
by Damjan Jovanovic 22 Apr '05

22 Apr '05

--- Hiji <hijinio(a)yahoo.com> wrote: > > > --- Lars Segerlund <lars.segerlund(a)comsys.se> > > wrote: > > > > > > > > What is the status of wines USB support ? > > > > Is there anything done yet or am I on my own > ? > > > > Can someone also giva a hint on the > > feasibiliyt, > > > > complexity of managing a USB > > > > implementation for wine ? I am rather good at > > > linux > > > > device drivers and such. > > > > / regards, Lars Segerlund. > > > > There's not much I can say in the way of > > > development, > > > but as a user, getting USB support (beyond > what's > > > supported in the kernel) would be a HUGE leap of > > > improvement for Wine. I think others have said > > > before > > > that there are a lot of apps out there that will > > run > > > on Wine, but are useless because they depend on > > > their > > > hardware counterpart. (In the music world, > > > Guitarport > > > comes to mind.) > > > > > > Hiji > > > I have proposed several possible solutions for > using > > USB under Linux. In fact, I have given 4 possible > > ways > > of doing it, one of which I have hacked up (and > > gotten > > to work, at least partially). > > > > If you're interested in the details, let me know, > > and > > I'll email you (or look at the "Wine device > drivers > > proposal" email in the Wine archives in the past > > month > > or so). > > Phew, I thought I'd type a short reply! Interested > > in > > working on this? I can't do it all alone. > > Damjan > > There's not much I can do other then try to > encourage > you and Lars to work together (as I'm not a C > developer). Damjan, it sounds like you have already > covered a lot of the groundwork through your > research > and understanding of the USB infrastructure (from > both > the Windows, Linux and Wine worlds). Lars, I see > you > have both the motivation and experience with Linux > device drivers to work on Wine USB. > > To me, it sounds like a perfect match for you two to > pair up and work on implementing additional USB > functionality. > > I suppose the last piece missing is to consult the > expert on the wineserver (as far as USB is > concerned) > to see if any changes would truely need to be made > there. Who would that be? I think it might be Alexander, and I think the general suggestion was "avoid changes to the wineserver". Anyone else know? > Hiji > > __________________________________________________ > Do You Yahoo!? > Tired of spam? Yahoo! Mail has the best spam > protection around > http://mail.yahoo.com > > __________________________________ Do you Yahoo!? Plan great trips with Yahoo! Travel: Now over 17,000 guides! http://travel.yahoo.com/p-travelguide

2 1

Re: WineHQ: Janitorial update
by Michael Jung 22 Apr '05

22 Apr '05

Hi Dimitrie, On Friday 22 April 2005 05:47, Dimitrie O. Paun wrote: > ChangeLog > ... > Some W->A warnings are invalid. While you're at it, I think the CryptAcquireContextW W->A call in advapi32/crypt.c should also be considered an invalid warning. CryptAcquireContext calls the CSP dll's CPAcquireContext function, which is only present as an ASCII version. Thus, if we would get rid of this W->A call, we would get an A->W->A conversion chain in case of CryptAcquireContextA. Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

1 0

Re: Program cannot be run in DOS mode
by Dustin Navea 21 Apr '05

21 Apr '05

I dont think (although I could be wrong) that programs compiled in vs6 would have dependencies on .net, even if they were compiled on xp.. You said that you are able to get other programs to run, such as winzip and solitaire? If that is the case, then what I said above more than likely _is_ wrong :-/ in which case not much can be done. You could always try your hand at implementing the missing .net functions, but this may be a bigger task than it is worth. The other option if you must get it going on linux is to port it to linux using winelib, although if it is dependent on .net that may not be possible either.. Anyone else have any comments on this? Dustin Brendan Clark Ribera wrote: > Yeah, I know enough of Linux to do that. It just strikes me as weird > that all of the executables I've downloaded (WinZip, etc) have produced > no errors. Someone suggested this might be due to .NET dependencies in > the Windows XP binaries, but I might as well try a newer version of Wine. > > Brendan > > On Tue, 19 Apr 2005, Dustin Navea wrote: > >> Hi, that does seem a little strange. It could be that there is >> something wrong with the package. How familiar are you with Linux? >> Familiar enough to know what CVS is and how to use it to get the >> bleeding edge version of wine, and enough to know how to compile it >> from scratch, if I pointed you to the guide that tells you how? >> >> Dustin >> >> Brendan Clark Ribera wrote: >> >>> >>> The version I'm running is from an RPM on winehq.com (I'm running >>> Fedora Core 2). Also, I considered the .NET problem, so I compiled a >>> little "Hello World" program in Visual Studio 6, which also produced >>> this error. I don't know if perhaps VS 6 has been made to >>> encorporate .NET libraries, but I was really surprised to see that >>> program not work. >>> >>> Someone else suggested trying an NT-based winver, which I found not >>> to help. >>> >>> Brendan [-info not relevant to the nature of this specific email snipped-]

1 0

Re: D3D9 Work?
by Ann and Jason Edmeades 21 Apr '05

21 Apr '05

Hi, FYI I stopped d3d9/wined3d work when I got to a point I had completed the parts I was doing, and Oliver had sped ahead so I was ending up duplicating work he was doing - I've put it to one side while waiting on the cvs tree to get up to where he was. The last I heard, Raphael was also willing to look into the shader side of things, and had an outstanding patch for hardware vertex buffer objects to help performance, but I think again this was waiting on Oliver's commits. However, if there seems to be problems, I don't mind continuing, or helping people work through his patch into manageable chunks for submission - I can easily give guidance in this area. I have only limited time, and work a patch at a time, until it gets in cvs, because as is the case with his current patch, basically it needs reworking into submittable chunks! However, I think we should give Oliver a little more time (I wont be touching it until after wineconf anyway). Not knowing anthing about d3d8/9 shouldn't hold you back - I knew nothing when I started on the d3d8 stuff, and it doesn't take that long to pick up the threads. FWIW I tried applying the patch sent on here the other day and it failed to compile (WINED3DFORMAT vs D3DFORMAT), but after fixing that, I tried running a simple textured demo and it failed (Tutorial 5 from http://www.two-kings.de/tutorials/d3d.html) - Any chance you could see if it works for you and if it does send me (offline) a patch for current cvs? Regards, Jason

1 0

Re: wine/server registry.c
by James Hawkins 21 Apr '05

21 Apr '05

On 4/20/05, Alexandre Julliard <julliard(a)winehq.org> wrote: > > Modified files: > server : registry.c > > Log message: > Load system.reg and userdef.reg at server init time. > Hi Alexandre, A while back I sent in a patch that restricted RegCreateKey (and it's internal implementation) from creating keys in HKLM and HKU as stated by msdn and the tests, and you replied: > I don't think there's any point in replicating that behavior. I doubt > there's any such check on Windows either, it's most likely just a side > effect of the way the registry files are "mounted" at different places > in the tree. Once we have a proper implementation of > RegLoadKey/RegUnloadKey we should get the same behavior automatically. We now have an implementation of RegLoadKey and I was wondering if it's time to switch from CreateKey to LoadKey in the registry initialization. If not, what remains to be done? Aside from the reg init topic, is there any other change needed to the registry subsection? I guess what I'm asking for is a registry TODO if you have one in mind. Thanks, James Hawkins

2 3

D3D9 Work?
by Benjamin Cutler 21 Apr '05

21 Apr '05

I was discussing this with some others who hang out in the #winehackers channel, and I'm curious who else might be working on the D3D9 portion of Wine. I was unsure of how ready for inclusion into the main branch the unofficial patches are, but I've heard from a couple sources that most of the patch isn't. I'd like to get some opinions on what's ready and what's not. I'd hate to start submitting pieces of the patch, only to find out that person X was already working on that part and had something better in mind, or even worse to find out that somebody's been maintaining contact with Oliver and I'm just getting overeager to see the patches in Wine. Somebody also mentioned that there are others waiting for Oliver's patches to be submitted so that they can continue their D3D9 work, so I was curious if there were any of you out there that fall into that category. At present, the best I can really do to contribute is help keep the branch synced up with the current CVS (migrating the 20050310 patch to 20050419 resulted in a lot of conflicts that took me most of the night to work through), but given some time I could probably learn enough about DX9 to get a better handle on how things are supposed to work and start making more solid contributions. That will probably have to wait until late May, however, once this college year ends.

2 1

Lotus Notes 6.51 and Wine 20050419
by Kevin DeKorte 21 Apr '05

21 Apr '05

I just installed Wine 20050419 and Lotus Notes 6.5.1 is still hanging and using all the CPU when I click on the bookmark on the left hand side and there are no error messages on the console. Rolling back to 20041201 corrects this behavior. Kevin

1 0

emule and riched20
by Michael Jung 21 Apr '05

21 Apr '05

Hi Krzysztof, thanks to your work on riched20.dll, eMule (http://www.emule-project.net) runs on wine out of the box (Some display glitches in riched, but fully usable otherwise). However, your last patch added an assert statement, which is violated by emule. I did not try to find the real problem, but removing the assert lets emule work again. Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

1 0

wine on remote X11 displays
by Michael Riedel 21 Apr '05

21 Apr '05

Hi, I compiled wine20050419 under slackware 10.1 via tools/wineinstall. After starting a xterm window on a remote X11 terminal (via properly initialized DISPLAY environment variable) I tried to start several wine progs (wcmd, winefile ...) and Windows applications (wine c:\\...) but each time I get X Error of failed request: BadShmSeg (invalid shared segment parameter) Major opcode of failed request: 144 (MIT-SHM) Minor opcode of failed request: 2 (X_ShmDetach) Segment id in failed request: 0x2400017 Serial number of failed request: 2058 Current serial number in output stream: 2090 If I correctly understand this error message the issue is related to the MIT shared memory extension which indeed is only supported by a local running X server (am I correct?). I tried to use available resources (google ..) but found nothing. What I have to do? Thanks for your time and support. Michael --

6 5

Re: Resend: RICHED20: fall back to simple test
by Mike McCormack 20 Apr '05

20 Apr '05

Hi Phil, This patch broke Internet Explorer 6 installation. The installer gets into an infinite loop reading the License text for the first dialog. Mike Phil Krylov wrote: > Hi, > > this version of patch is made against current CVS. > > ChangeLog: > > Make RTF reader fall back to simple text if a correct RTF header is not > detected. This should fix some installers. > > Patch: > > Index: dlls/riched20/editor.c > =================================================================== > RCS file: /home/wine/wine/dlls/riched20/editor.c,v > retrieving revision 1.22 > diff -p -u -r1.22 editor.c > --- dlls/riched20/editor.c 11 Apr 2005 14:22:21 -0000 1.22 > +++ dlls/riched20/editor.c 13 Apr 2005 07:13:21 -0000 > @@ -233,36 +233,40 @@ ME_TextBuffer *ME_MakeText() { > return buf; > } > > -#define STREAMIN_BUFFER_SIZE 4096 /* M$ compatibility */ > > -static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream, ME_Style *style) > +static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) > { > - BYTE buffer[STREAMIN_BUFFER_SIZE+1]; > WCHAR wszText[STREAMIN_BUFFER_SIZE+1]; > + WCHAR *pText; > > TRACE("%08lx %p\n", dwFormat, stream); > - stream->dwError = 0; > > do { > - long nDataSize = 0, nWideChars = 0; > - stream->dwError = stream->pfnCallback(stream->dwCookie, > - (dwFormat & SF_UNICODE ? (BYTE *)wszText : buffer), > - STREAMIN_BUFFER_SIZE, &nDataSize); > - > - if (stream->dwError) > - break; > - if (!nDataSize) > - break; > + long nWideChars = 0; > + > + if (!stream->dwSize) > + { > + ME_StreamInFill(stream); > + if (stream->editstream->dwError) > + break; > + if (!stream->dwSize) > + break; > + } > > if (!(dwFormat & SF_UNICODE)) > { > /* FIXME? this is doomed to fail on true MBCS like UTF-8, luckily they're unlikely to be used as CP_ACP */ > - nWideChars = MultiByteToWideChar(CP_ACP, 0, buffer, nDataSize, wszText, STREAMIN_BUFFER_SIZE); > + nWideChars = MultiByteToWideChar(CP_ACP, 0, stream->buffer, stream->dwSize, wszText, STREAMIN_BUFFER_SIZE); > + pText = wszText; > } > else > - nWideChars = nDataSize>>1; > - ME_InsertTextFromCursor(editor, 0, wszText, nWideChars, style); > - if (nDataSize<STREAMIN_BUFFER_SIZE) > + { > + nWideChars = stream->dwSize >> 1; > + pText = (WCHAR *)stream->buffer; > + } > + > + ME_InsertTextFromCursor(editor, 0, pText, nWideChars, style); > + if (stream->dwSize < STREAMIN_BUFFER_SIZE) > break; > } while(1); > ME_CommitUndo(editor); > @@ -428,6 +432,16 @@ void ME_RTFReadHook(RTF_Info *info) { > } > } > > +void > +ME_StreamInFill(ME_InStream *stream) > +{ > + stream->editstream->dwError = stream->editstream->pfnCallback(stream->editstream->dwCookie, > + stream->buffer, > + sizeof(stream->buffer), > + &stream->dwSize); > + stream->dwUsed = 0; > +} > + > static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stream) > { > RTF_Info parser; > @@ -435,6 +449,7 @@ static LRESULT ME_StreamIn(ME_TextEditor > int from, to, to2, nUndoMode; > ME_UndoItem *pUI; > int nEventMask = editor->nEventMask; > + ME_InStream inStream; > > TRACE("%p %p\n", stream, editor->hWnd); > editor->nEventMask = 0; > @@ -457,37 +472,60 @@ static LRESULT ME_StreamIn(ME_TextEditor > > nUndoMode = editor->nUndoMode; > editor->nUndoMode = umIgnore; > - if (format & SF_RTF) { > - /* setup the RTF parser */ > - memset(&parser, 0, sizeof parser); > - RTFSetEditStream(&parser, stream); > - parser.rtfFormat = format&(SF_TEXT|SF_RTF); > - parser.hwndEdit = editor->hWnd; > - parser.editor = editor; > - parser.style = style; > - WriterInit(&parser); > - RTFInit(&parser); > - RTFSetReadHook(&parser, ME_RTFReadHook); > - BeginFile(&parser); > - > - /* do the parsing */ > - RTFRead(&parser); > - RTFFlushOutputBuffer(&parser); > - RTFDestroy(&parser); > - > - style = parser.style; > - } > - else if (format & SF_TEXT) > - ME_StreamInText(editor, format, stream, style); > - else > - ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); > - ME_GetSelection(editor, &to, &to2); > - /* put the cursor at the top */ > - if (!(format & SFF_SELECTION)) > - SendMessageA(editor->hWnd, EM_SETSEL, 0, 0); > - else > + > + inStream.editstream = stream; > + inStream.editstream->dwError = 0; > + inStream.dwSize = 0; > + inStream.dwUsed = 0; > + > + if (format & SF_RTF) > { > - /* FIXME where to put cursor now ? */ > + /* Check if it's really RTF, and if it is not, use plain text */ > + ME_StreamInFill(&inStream); > + if (!inStream.editstream->dwError) > + { > + if (strncmp(inStream.buffer, "{\\rtf1", 6) && strncmp(inStream.buffer, "{\\urtf", 6)) > + { > + format &= ~SF_RTF; > + format |= SF_TEXT; > + } > + } > + } > + > + if (!inStream.editstream->dwError) > + { > + if (format & SF_RTF) { > + /* setup the RTF parser */ > + memset(&parser, 0, sizeof parser); > + RTFSetEditStream(&parser, &inStream); > + parser.rtfFormat = format&(SF_TEXT|SF_RTF); > + parser.hwndEdit = editor->hWnd; > + parser.editor = editor; > + parser.style = style; > + WriterInit(&parser); > + RTFInit(&parser); > + RTFSetReadHook(&parser, ME_RTFReadHook); > + BeginFile(&parser); > + > + /* do the parsing */ > + RTFRead(&parser); > + RTFFlushOutputBuffer(&parser); > + RTFDestroy(&parser); > + > + style = parser.style; > + } > + else if (format & SF_TEXT) > + ME_StreamInText(editor, format, &inStream, style); > + else > + ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); > + ME_GetSelection(editor, &to, &to2); > + /* put the cursor at the top */ > + if (!(format & SFF_SELECTION)) > + SendMessageA(editor->hWnd, EM_SETSEL, 0, 0); > + else > + { > + /* FIXME where to put cursor now ? */ > + } > } > > editor->nUndoMode = nUndoMode; > Index: dlls/riched20/editor.h > =================================================================== > RCS file: /home/wine/wine/dlls/riched20/editor.h,v > retrieving revision 1.12 > diff -p -u -r1.12 editor.h > --- dlls/riched20/editor.h 24 Mar 2005 21:01:37 -0000 1.12 > +++ dlls/riched20/editor.h 13 Apr 2005 07:13:21 -0000 > @@ -213,6 +213,7 @@ void ME_Redo(ME_TextEditor *editor); > void ME_EmptyUndoStack(ME_TextEditor *editor); > int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, int nChars, BOOL bCRLF); > ME_DisplayItem *ME_FindItemAtOffset(ME_TextEditor *editor, ME_DIType nItemType, int nOffset, int *nItemOffset); > +void ME_StreamInFill(ME_InStream *stream); > > extern int me_debug; > extern HANDLE me_heap; > Index: dlls/riched20/editstr.h > =================================================================== > RCS file: /home/wine/wine/dlls/riched20/editstr.h,v > retrieving revision 1.8 > diff -p -u -r1.8 editstr.h > --- dlls/riched20/editstr.h 22 Mar 2005 16:41:36 -0000 1.8 > +++ dlls/riched20/editstr.h 13 Apr 2005 07:13:21 -0000 > @@ -197,6 +197,18 @@ typedef struct tagME_FontTableItem { > WCHAR *szFaceName; > } ME_FontTableItem; > > + > +#define STREAMIN_BUFFER_SIZE 4096 /* M$ compatibility */ > + > +struct tagME_InStream { > + EDITSTREAM *editstream; > + DWORD dwSize; > + DWORD dwUsed; > + BYTE buffer[STREAMIN_BUFFER_SIZE]; > +}; > +typedef struct tagME_InStream ME_InStream; > + > + > #define STREAMOUT_BUFFER_SIZE 4096 > #define STREAMOUT_FONTTBL_SIZE 8192 > #define STREAMOUT_COLORTBL_SIZE 1024 > Index: dlls/riched20/reader.c > =================================================================== > RCS file: /home/wine/wine/dlls/riched20/reader.c,v > retrieving revision 1.11 > diff -p -u -r1.11 reader.c > --- dlls/riched20/reader.c 22 Mar 2005 16:41:36 -0000 1.11 > +++ dlls/riched20/reader.c 13 Apr 2005 07:13:21 -0000 > @@ -123,41 +123,35 @@ static inline void RTFFree(void *p) > int _RTFGetChar(RTF_Info *info) > { > int ch; > + ME_InStream *stream = info->stream; > > TRACE("\n"); > > /* if the last buffer wasn't full, it's EOF */ > - if (info->dwInputSize > 0 && > - info->dwInputSize == info->dwInputUsed && > - info->dwInputSize < sizeof(info->InputBuffer)) > + if (stream->dwSize > 0 && stream->dwSize == stream->dwUsed > + && stream->dwSize < sizeof(stream->buffer)) > return EOF; > - if (info->dwInputSize <= info->dwInputUsed) > + if (stream->dwSize <= stream->dwUsed) > { > - long count = 0; > - info->editstream.dwError = info->editstream.pfnCallback(info->editstream.dwCookie, > - info->InputBuffer, sizeof(info->InputBuffer), &count); > + ME_StreamInFill(stream); > /* if error, it's EOF */ > - if (info->editstream.dwError) > + if (stream->editstream->dwError) > return EOF; > /* if no bytes read, it's EOF */ > - if (count == 0) > + if (stream->dwSize == 0) > return EOF; > - info->dwInputSize = count; > - info->dwInputUsed = 0; > } > - ch = info->InputBuffer[info->dwInputUsed++]; > + ch = stream->buffer[stream->dwUsed++]; > if (!ch) > return EOF; > return ch; > } > > -void RTFSetEditStream(RTF_Info *info, EDITSTREAM *es) > +void RTFSetEditStream(RTF_Info *info, ME_InStream *stream) > { > TRACE("\n"); > > - info->editstream.dwCookie = es->dwCookie; > - info->editstream.dwError = es->dwError; > - info->editstream.pfnCallback = es->pfnCallback; > + info->stream = stream; > } > > static void > Index: dlls/riched20/rtf.h > =================================================================== > RCS file: /home/wine/wine/dlls/riched20/rtf.h,v > retrieving revision 1.9 > diff -p -u -r1.9 rtf.h > --- dlls/riched20/rtf.h 22 Mar 2005 16:41:36 -0000 1.9 > +++ dlls/riched20/rtf.h 13 Apr 2005 07:13:21 -0000 > @@ -1078,10 +1078,7 @@ struct _RTF_Info { > char *inputName; > char *outputName; > > - EDITSTREAM editstream; > - char InputBuffer[0x1000]; > - DWORD dwInputSize; > - DWORD dwInputUsed; > + ME_InStream *stream; > > /* edit window to output to */ > HWND hwndEdit; > @@ -1155,7 +1152,7 @@ void RTFMsg (RTF_Info *, const char *fmt > void RTFPanic (RTF_Info *, const char *fmt, ...); > > void RTFFlushOutputBuffer( RTF_Info *info ); > -void RTFSetEditStream(RTF_Info *, EDITSTREAM *es); > +void RTFSetEditStream(RTF_Info *info, ME_InStream *stream); > > void WriterInit (RTF_Info *); > int BeginFile (RTF_Info *); >

3 4

Re:Tooltips in own windows
by luis lenders 20 Apr '05

20 Apr '05

hmm, not quite sure if that's correct what i just wrote. I just investigated this with winamp. Now i use this config file: WINE REGISTRY Version 2 [x11drv] ;"Managed" = "N" "UseTakeFocus" = "Y" # [/wineconf] Now i see the tooltip problem. When i uncomment the "Managed" line problem is still there. if i use WINE REGISTRY Version 2 [x11drv] "Managed" = "N" "UseTakeFocus" = "N" # [/wineconf] the tooltip problem is gone! Maybe it could help you to fix the problem, but at this moment i wouldn't have an idea how :) --- luis lenders <lgvlenders(a)yahoo.co.uk> wrote: > Don't know if this is of any help to you but i > noticed > this problem too using some apps and it dissapears , > if i remember correctly, using native comctl32. So > you > might run the apps using WINEDEBUG=+comctl32 to > track > down the problem. Regards > > > > > > > > > > > I just wanted to make sure folks were aware of a > tooltip regression, > since I don't think I have seen mention of it here. > It > is easily seen in > any Control Spy, but effects other apps (though not > all, curiously). It > manifests itself as a complete window border around > tooltips. I have not > tracked down where the regression occured, but could > do so if no one > else was looking at this. > > Send instant messages to your online friends > http://uk.messenger.yahoo.com > Send instant messages to your online friends http://uk.messenger.yahoo.com

1 0

Re:Tooltips in own windows
by luis lenders 20 Apr '05

20 Apr '05

Don't know if this is of any help to you but i noticed this problem too using some apps and it dissapears , if i remember correctly, using native comctl32. So you might run the apps using WINEDEBUG=+comctl32 to track down the problem. Regards I just wanted to make sure folks were aware of a tooltip regression, since I don't think I have seen mention of it here. It is easily seen in any Control Spy, but effects other apps (though not all, curiously). It manifests itself as a complete window border around tooltips. I have not tracked down where the regression occured, but could do so if no one else was looking at this. Send instant messages to your online friends http://uk.messenger.yahoo.com

1 0

Re:VfwCapture question (and attached a v4l2 patch for msn 6.2 webcam - Attempt 1)
by luis lenders 20 Apr '05

20 Apr '05

Hi, looking at the screenshot this looks quite promising i must say! Although i do not use this app personally i think this is, like office and directx games (for which development unfortunately seems to have stopped :( ), one of them "killer applications" meaning widely used and very popular and the main reason why people stick to windows. So if if you could get this to work flawlessy it could boost wine usage quite a bit i think. You should really try to get this into cvs and keep up the good work! Regards Send instant messages to your online friends http://uk.messenger.yahoo.com

1 0

Re: Fix the PropSysFreeString() prototype
by Marcus Meissner 20 Apr '05

20 Apr '05

On Wed, Apr 20, 2005 at 05:05:54PM +0200, Francois Gouget wrote: > > PropSysFreeString() is declared as stdcall both in the .spec file and in > the ole2prop.h but it was missing the WINAPI qualifier in ole2.c. > > Changelog: > > * dlls/ole32/ole2.c > > Francois Gouget <fgouget(a)free.fr> > Specify the proper call convention in the PropSysFreeString() > implementation. > Fixes a winapi_check warning. gcc should have already warned here ... interesting. Ciao, Marcus

2 1

Tooltips in own windows
by Duane Clark 20 Apr '05

20 Apr '05

I just wanted to make sure folks were aware of a tooltip regression, since I don't think I have seen mention of it here. It is easily seen in any Control Spy, but effects other apps (though not all, curiously). It manifests itself as a complete window border around tooltips. I have not tracked down where the regression occured, but could do so if no one else was looking at this.

1 0

Re: Ugly dclipper winapi_check hack
by Vincent Béron 20 Apr '05

20 Apr '05

Le mer 20/04/2005 à 05:29, Francois Gouget a écrit : > > winapi_check assumes that all the functions declared in a given spec > file are implemented in a C file located in the same directory. This > seems to hold true except for DirectDrawCreateClipper() which is > implemented in a sub-directory. > > This causes winapi_check to not notice the DirectDrawCreateClipper() > implementation and to complain that it's missing. So I hacked it so it > also takes into account C files located in ddraw/dclipper/ for > ddraw.spec. > > If anyone has an idea for a better fix (or if you know of other APIs > that should have the same problem) I'm all ears as I don't like this > solution much. If you're heading that way (a bit of spring cleaning of winapi_check), could you also look at how it thinks api names are unique? It complains about ValidateVertexShader (in d3d8 and d3d9), but that function takes 1 arg in d3d8 and 2 in d3d9. I'm not sure if it read one of the spec file before the other or what. Vincent

3 3

Re: Ugly dclipper winapi_check hack
by Christian Costa 20 Apr '05

20 Apr '05

Hi Francois, I plan to flatten the ddraw directory and perform some file renaming. This will fix the problem once done. Bye, Christian > Message du 20/04/05 11:39 > De : "Francois Gouget" > A : wine-patches(a)winehq.org > Copie à : > Objet : Ugly dclipper winapi_check hack > > > winapi_check assumes that all the functions declared in a given spec > file are implemented in a C file located in the same directory. This > seems to hold true except for DirectDrawCreateClipper() which is > implemented in a sub-directory. > > This causes winapi_check to not notice the DirectDrawCreateClipper() > implementation and to complain that it's missing. So I hacked it so it > also takes into account C files located in ddraw/dclipper/ for > ddraw.spec. > > If anyone has an idea for a better fix (or if you know of other APIs > that should have the same problem) I'm all ears as I don't like this > solution much. > > > Changelog: > > * tools/winapi_check/modules.pm > > Francois Gouget > Hack so winapi_check finds the DirectDrawCreateClipper() > implementation in ddraw/dclipper/main.c. > > > -- > Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ > tcA thgirypoC muinelliM latigiD eht detaloiv tsuj evah uoY> > [ p20050420-dclipper.diff (0.8 Ko) ]

2 1

Wine 20050419 + DX9
by Benjamin Cutler 20 Apr '05

20 Apr '05

I spent most of the night trying to merge the old 20050310 patch into the 20050419 release, and I came up with the diff linked below. Keep in mind that I only attempted to get it to compile, I did not attempt to make sure it was stable or correct. For what it's worth, I *was* able to get my test games to launch and they ran pretty much exactly as they did with the old patches, but that's no guarantee of anything. Oliver seems to be MIA. His home page has disappeared and nobody I've asked has been able to successfully contact him. If somebody wants to clean this up and merge it back into the main WINE tree, please do, because I don't know enough about DX9 to even think of attempting such an undertaking myself. http://www.cs.colostate.edu/~cutler/d3d9patch.2005-04-19.diff Of course, I'll feel rather foolish if Oliver pops up tomorrow and has a real patch, but here's what I can offer for now.

1 0

set ver = ?
by Wesley Parish 20 Apr '05

20 Apr '05

Addendum: I got past the unloading into temporary folder stage of MicrosoftVirtualPC2004EnglishTrial.exe, before it told me I should read the documents to see what the minimum system requirements were. Then it died on me. Bummer. // does Wine have anything that does that? I've just tried "wine MS\ .net\ framework\ SDK\ -\ with\ C-sharp\ compiler\ Setup.exe" and it told me that it couldn't install on Win95, Win98 etc, and I'd have to upgrade to NT 4.0 before it would install. Any hints, ideas, previous experience on configuring Wine for suchlike? Thanks Wesley Parish -- Clinersterton beademung, with all of love - RIP James Blish ----- Mau e ki, he aha te mea nui? You ask, what is the most important thing? Maku e ki, he tangata, he tangata, he tangata. I reply, it is people, it is people, it is people.

4 6

ie6install richedit regression
by Paul van Schayck 20 Apr '05

20 Apr '05

http://cvs.winehq.org/patch.py?id=17049 This richedit patch broke ie6install.exe (doesn't start). As far as I can see the character stream is not setuped correctly. There is an endless loop of ME_PropagateCharOffset. This is going wrong somewhere in ME_Stream*. Paul

2 1

Segmentation Fault
by Mark Greenbank 20 Apr '05

20 Apr '05

Hi all, I'm getting a Segmentation Fault when building wine on Solaris 10: The command itself is: ../tools/winebuild/winebuild -w --def \ -o advapi32/advapi32.spec.def --export advapi32/advapi32.spec gdb stack strace shows: #0 0xfef229ec in strlen () from /lib/libc.so.1 (gdb) where #0 0xfef229ec in strlen () from /lib/libc.so.1 #1 0xfef77cbe in _ndoprnt () from /lib/libc.so.1 #2 0xfef7a837 in fprintf () from /lib/libc.so.1 #3 0x0805b7e5 in BuildDef32File (outfile=0x8074e98, spec=0x8075450) at spec32.c:851 #4 0x08053f34 in main (argc=7, argv=0x80471d0) at main.c:474 For some reason, the input_file variable is NULL upon entry to BuildDef32File. Any help would be appreciated. mark

2 2

Re: Status and (nearby) future of wined3d
by Oliver Stieber 20 Apr '05

20 Apr '05

--- Paul Vriens <Paul.Vriens(a)xs4all.nl> wrote: > Hi, > > what will happen to the wined3d stuff, now Oliver > has some 'problems' > staying on-line? > Thanks to everyone I should be ok for a while, now. > > If the sole reason for that is that it couldn't be > merged/applied to CVS > I could give it a try. But that's about the only > thing I can do > regarding wined3d stuff. > I've just merged with wine head and am about to resend the patches, and another couple for stateblocks and sampler states. After that there's vertex declarations and resource tracking, pointsprites , non-power2 textures, memory management, D3DPOOL_DEFAULT texture operations and a few more tidyups. Then I should have all the stable work synced with winehead. After that stateblocks need to be refactored to get offscreen textures, swapchains and multiple devices/threads working properly which may take a while to stabalise. A software vertex pipeline also needs writing to fill in the gaps in the hardware support which is faily easy, and d3d8 interfaces need to wrap up wined3d. Shaders needs moving across from d3d8 which is faily simple and shader 2.0 support needs writing which is a little tricker. > Cheers, > > Paul. > > > Send instant messages to your online friends http://uk.messenger.yahoo.com

3 2

Re: Make VIRTUAL_SetFaultHandler an internal function
by Alexandre Julliard 20 Apr '05

20 Apr '05

"Dimitrie O. Paun" <dpaun(a)rogers.com> writes: > I guess this has no chance of going away until we have a DIB engine, > which is not even on the horizon. Actually it should be possible to handle the fault using a vectored handler, without requiring internal functions at all. -- Alexandre Julliard julliard(a)winehq.org

5 15

Re: Program cannot be run in DOS mode
by Dustin Navea 20 Apr '05

20 Apr '05

Hi, that does seem a little strange. It could be that there is something wrong with the package. How familiar are you with Linux? Familiar enough to know what CVS is and how to use it to get the bleeding edge version of wine, and enough to know how to compile it from scratch, if I pointed you to the guide that tells you how? Dustin Brendan Clark Ribera wrote: > > The version I'm running is from an RPM on winehq.com (I'm running Fedora > Core 2). Also, I considered the .NET problem, so I compiled a little > "Hello World" program in Visual Studio 6, which also produced this > error. I don't know if perhaps VS 6 has been made to encorporate .NET > libraries, but I was really surprised to see that program not work. > > Someone else suggested trying an NT-based winver, which I found not to > help. > > Brendan > > On Tue, 19 Apr 2005, Dustin Navea wrote: > >> One other thing I should add is that apparently .NET programs do not >> run under wine, or the few that do, exhibit problems like the one you >> are having, so that could also be causing your error. >> >> Dustin >> >> Brendan Clark Ribera wrote: >> >>> >>> >>> >>> Hello, >>> >>> I'm fairly new to wine, and I've encountered a bit of a puzzle. I'm >>> trying to run a data conversion application under wine, and I'm >>> getting one consistant error: >>> >>> [goodweb@kinase wine]$ ./ReAdW.exe >>> Warning: unprotecting the first 64KB of memory to allow real-mode >>> calls. >>> NULL pointer accesses will no longer be caught. >>> This program cannot be run in DOS mode. >>> >>> This program was written in VC++, compiled on WinXP using Visual >>> Studio .NET 2003. It uses several proprietary dlls (it's something >>> we *need* to use, though). >>> >>> To test my wine installation, I tried copying a few Windows programs >>> from another machine (sol.exe, namely): all programs I copied >>> genereated the same output. I downloaded WinZip, however, and it >>> installed perfectly. I had similar luck with the Mozilla activex >>> control for Windows. >>> >>> Does anyone know what could be causing this, and how to fix it? >>> >>> Thanks! >>> >>> Brendan Ribera >>> >>> >>> >>> >> >> > > >

1 0

Re: Program cannot be run in DOS mode
by Brendan Clark Ribera 19 Apr '05

19 Apr '05

> > Brendan Clark Ribera wrote: >> [goodweb@kinase wine]$ ./ReAdW.exe >> Warning: unprotecting the first 64KB of memory to allow real-mode >> calls. >> NULL pointer accesses will no longer be caught. >> This program cannot be run in DOS mode. >> >> This program was written in VC++, compiled on WinXP using Visual Studio >> .NET 2003. It uses several proprietary dlls (it's something we *need* >> to use, though). > > As a wild guess try setting winver to a NT version of windows. > > Ivan. Hmm, I get no effect by chaning the winver to either NT setting. The version of solitaire I tried was from a winxp machine, and that's what I've been using as my winver. Brendan

1 0

Program cannot be run in DOS mode
by Brendan Clark Ribera 19 Apr '05

19 Apr '05

Hello, I'm fairly new to wine, and I've encountered a bit of a puzzle. I'm trying to run a data conversion application under wine, and I'm getting one consistant error: [goodweb@kinase wine]$ ./ReAdW.exe Warning: unprotecting the first 64KB of memory to allow real-mode calls. NULL pointer accesses will no longer be caught. This program cannot be run in DOS mode. This program was written in VC++, compiled on WinXP using Visual Studio .NET 2003. It uses several proprietary dlls (it's something we *need* to use, though). To test my wine installation, I tried copying a few Windows programs from another machine (sol.exe, namely): all programs I copied genereated the same output. I downloaded WinZip, however, and it installed perfectly. I had similar luck with the Mozilla activex control for Windows. Does anyone know what could be causing this, and how to fix it? Thanks! Brendan Ribera

2 1

UT2004 regresion: windows creation
by Raphael 19 Apr '05

19 Apr '05

Hi, we have a regression on UT2004 cf attached screenshot you can see game reporting (on WM_CREATE) WINEDEBUG="+win" logs reports: trace:win:WIN_CreateWindowEx L"" L"UT2004UnrealWWindowsViewportWindow" ex=00040000 style=10cf0000 -2147483648,-2147483648 648x507 parent=(nil) menu=(nil) inst=0x11000000 params=0x7251fec0 trace:win:dump_window_styles style: WS_VISIBLE WS_CAPTION WS_SYSMENU WS_THICKFRAME WS_GROUP WS_TABSTOP WS_MINIMIZEBOX WS_MAXIMIZEBOX trace:win:dump_window_styles exstyle: WS_EX_APPWINDOW trace:win:WIN_CreateWindowEx winproc type is 3 (WIN_PROC_32W) trace:win:GetWindowRect hwnd 0x1002e (0,0)-(648,507) trace:win:WINPOS_GetMinMaxInfo 1034 778 / -5 -5 / 1032 776 / 112 27 fixme:system:SystemParametersInfoW Unimplemented action: 59 (SPI_SETSTICKYKEYS) fixme:mmtime:timeEndPeriod Stub; we set our timer resolution at minimum fixme:mmtime:timeEndPeriod Stub; we set our timer resolution at minimum trace:win:WIN_CreateWindowEx L"IDC_CrashBox" L"#32770" ex=00000001 style=80c808c2 241,237 542x293 parent=(nil) menu=(nil) inst=0x11000000 params=(nil) trace:win:dump_window_styles style: WS_POPUP WS_CAPTION WS_SYSMENU 000008c2 trace:win:dump_window_styles exstyle: WS_EX_DLGMODALFRAME trace:win:WIN_CreateWindowEx winproc type is 3 (WIN_PROC_32W) trace:win:WIN_SetWindowLong 0x10030 12 77d33060 3 trace:win:WIN_SetWindowLong 0x10030 0 0 3 trace:win:WIN_SetWindowLong 0x10030 0 0 3 trace:win:WIN_SetWindowLong 0x10030 0 0 3 trace:win:WIN_SetWindowLong 0x10030 0 0 3 How can help me to fix this problem (all Unreal games are broken) ? Regards, Raphael

1 0

VfwCapture question (and attached a v4l2 patch for msn 6.2 webcam - Attempt 1)
by Maarten Lankhorst 19 Apr '05

19 Apr '05

Now that I'm pretty much done with cleaning up the stuff, I'm wondering on how to seperate /dev/video0 from /dev/video1, in the current code I don't have the seperation, and I'm unsure on how to add it... Anyway, this is my first attempt to get v4l2 to work with msn 6.2, it is very unstable but it somehow.. works.. to transmit images over the web though, here's what the patch does: - add a lot more instability (sad but true) - adds some routines to avicap32, so capGetDriverDescription works (partially.. currently only v4l1) - makes devenum create videoinputdevices based on the information from capGetDriverDescription, native devenum does the same - add a stub capturegraphbuilder (minimum required for msn - capturegraphbuilder.c) - add a semi-stubbed vfwcapture interface (v4wsource.c and capture.c) Currently it requires a video4linux2 device for the vfwcapture interface, but since the bttv driver supports v4l1 too, I'll work on it. The code will crash when transmission is halted (because of the testbed thread not being stopped), but I thought I would add this so you would know I'm still working on it :). to compile the code, make sure you have /usr/include/linux/videodev{,2}.h and then compile with make CC="gcc -DENABLE_V4L" Don't expect to much from it.. oh and you need to use the native msvfw32.dll to native to transmit images.. you can probably steal it from a windows installation or download it from dll-files... I made a screenshot of the preview screen at http://vladserver.ath.cx/MSN.jpg - II actully transmitted too, frame counter was at 7846 until it crashed (Destroying VfwCapture, TestBed thread crashed) But if you really want to help, can someone _*PLEASE*_ figure out why it crashes if it's started with WINEDEBUG=+quartz and when you go to webcam settings screen? you can save me a lot of frustration.. thanks!!! diff -Nru wine-old/dlls/avicap32/avicap32_main.c wine-new/dlls/avicap32/avicap32_main.c --- wine-old/dlls/avicap32/avicap32_main.c 2003-09-09 21:39:32.000000000 +0200 +++ wine-new/dlls/avicap32/avicap32_main.c 2005-04-19 12:55:40.000000000 +0200 @@ -28,6 +28,18 @@ #include "winternl.h" #include "wine/debug.h" +#ifdef ENABLE_V4L +#include <stdio.h> +#include <sys/ioctl.h> +#include <sys/stat.h> +#include <errno.h> +#include <asm/types.h> +#include <linux/videodev.h> +#include <fcntl.h> +#include <unistd.h> +#include "winnls.h" +#endif + WINE_DEFAULT_DEBUG_CHANNEL(avicap); @@ -63,15 +75,82 @@ return retW; } +#ifdef ENABLE_V4L +static int xioctl(int fd, int request, void * arg) +{ + int r; + + do r = ioctl (fd, request, arg); + while (-1 == r && EINTR == errno); + + return r; +} + +static int queryvideodevice(int devnum, struct video_capability* capa) +{ + int fd = -1; + char device[128]; + struct stat st; + sprintf(device, "/dev/video%i", devnum); + + if (stat (device, &st) == -1) { + ERR("%s: %s\n", device, strerror(errno)); + return -1; + } + + if (!S_ISCHR (st.st_mode)) { + ERR("%s: Not a device\n", device); + return -1; + } + + fd = open(device, O_RDWR | O_NONBLOCK); + if (fd == -1) { + ERR("%s: Failed to open: %s\n", device, strerror(errno)); + return -1; + } + + memset(capa, 0, sizeof(capa)); + if (xioctl(fd, VIDIOCGCAP, capa) == -1) { +/* errno 515 is used by some webcam drivers for unknown IOICTL command */ + if (errno != EINVAL && errno != 515) ERR("%s: Querying failed: %s\n", device, strerror(errno)); + else ERR("%s: Querying failed: Not a V4L compatible device", device); + close(fd); + return -1; + } + + if (!(capa->type & VID_TYPE_CAPTURE)) { + ERR("%s: This is not a video capture device\n", device); + close(fd); + return -1; + } + TRACE("Name: %s\n", capa->name); + return fd; +} +#endif + /*********************************************************************** * capGetDriverDescriptionA (AVICAP32.@) */ BOOL VFWAPI capGetDriverDescriptionA(WORD wDriverIndex, LPSTR lpszName, INT cbName, LPSTR lpszVer, INT cbVer) { +#ifndef ENABLE_V4L FIXME("(%d, %p, %d, %p, %d) stub!\n", wDriverIndex, lpszName, cbName, - lpszVer, cbVer); + lpszVer, cbVer); return FALSE; +#else + struct video_capability capa; + int fd; + + fd = queryvideodevice(wDriverIndex, &capa); + if (fd == -1) return FALSE; + close(fd); + + strncpy (lpszName, capa.name, cbName); + snprintf(lpszVer, cbVer, "Video For Wine v1.0.%i", wDriverIndex); + TRACE("Version: %s - Name: %s\n", lpszVer, lpszName); + return TRUE; +#endif } /*********************************************************************** @@ -80,7 +159,24 @@ BOOL VFWAPI capGetDriverDescriptionW(WORD wDriverIndex, LPWSTR lpszName, INT cbName, LPWSTR lpszVer, INT cbVer) { +#ifndef ENABLE_V4L FIXME("(%d, %p, %d, %p, %d) stub!\n", wDriverIndex, lpszName, cbName, lpszVer, cbVer); return FALSE; +#else + struct video_capability capa; + int fd; + char original[32]; + + fd = queryvideodevice(wDriverIndex, &capa); + if (fd == -1) return FALSE; + close(fd); + + MultiByteToWideChar(CP_UTF8, 0, capa.name, 31, lpszName, cbName); + snprintf(original, cbVer, "Video For Wine v%i.0", wDriverIndex); + MultiByteToWideChar(CP_UTF8, 0, original, sizeof(original), lpszVer, cbVer); + TRACE("Version: %s - Name: %s\n", debugstr_w(lpszVer), debugstr_w(lpszName)); + return TRUE; +#endif } + diff -Nru wine-old/dlls/avicap32/Makefile.in wine-new/dlls/avicap32/Makefile.in --- wine-old/dlls/avicap32/Makefile.in 2003-10-11 03:09:21.000000000 +0200 +++ wine-new/dlls/avicap32/Makefile.in 2005-04-19 12:55:40.000000000 +0200 @@ -3,7 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = avicap32.dll -IMPORTS = ntdll +IMPORTS = ntdll unicows kernel32 C_SRCS = avicap32_main.c diff -Nru wine-old/dlls/devenum/createdevenum.c wine-new/dlls/devenum/createdevenum.c --- wine-old/dlls/devenum/createdevenum.c 2005-01-25 11:56:39.000000000 +0100 +++ wine-new/dlls/devenum/createdevenum.c 2005-04-19 13:27:49.000000000 +0200 @@ -117,6 +117,7 @@ if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || + IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) { hbasekey = HKEY_CURRENT_USER; @@ -142,6 +143,7 @@ { if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || + IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) { HRESULT hr = DEVENUM_CreateSpecialCategories(); @@ -413,6 +415,44 @@ CoTaskMemFree(pTypes); } } + res = DEVENUM_CreateAMCategoryKey(&CLSID_VideoInputDeviceCategory); + if (SUCCEEDED(res)) + for (i = 0; i < 10; i++) { + WCHAR szDeviceName[80], szDeviceVersion[80]; + + if (capGetDriverDescriptionW ((WORD) i, + szDeviceName, sizeof (szDeviceName), + szDeviceVersion, sizeof (szDeviceVersion))) { + IMoniker * pMoniker = NULL; + TRACE("\nSuccess !\n"); + + rfp2.nMediaTypes = 1; + pTypes = CoTaskMemAlloc(rfp2.nMediaTypes * sizeof(REGPINTYPES)); + if (!pTypes) { + IFilterMapper2_Release(pMapper); + return E_OUTOFMEMORY; + } + + pTypes[0].clsMajorType = &MEDIATYPE_Video; + pTypes[0].clsMinorType = &MEDIASUBTYPE_RGB24; + + rfp2.lpMediaType = pTypes; + + res = IFilterMapper2_RegisterFilter(pMapper, + &CLSID_VfwCapture, + szDeviceName, + &pMoniker, + &CLSID_VideoInputDeviceCategory, + szDeviceName, + &rf2); + + /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ + if (pMoniker) IMoniker_Release(pMoniker); + + if (i == iDefaultDevice) FIXME("Default device\n"); + CoTaskMemFree(pTypes); + } + } } if (pMapper) diff -Nru wine-old/dlls/devenum/devenum_main.c wine-new/dlls/devenum/devenum_main.c --- wine-old/dlls/devenum/devenum_main.c 2004-12-07 15:37:11.000000000 +0100 +++ wine-new/dlls/devenum/devenum_main.c 2005-04-19 12:10:12.000000000 +0200 @@ -122,7 +122,7 @@ {&CLSID_AudioCompressorCategory, acmcat, TRUE}, {&CLSID_VideoCompressorCategory, vidcat, TRUE}, {&CLSID_LegacyAmFilterCategory, filtcat, TRUE}, - {&CLSID_VideoInputDeviceCategory, vfwcat, FALSE}, + {&CLSID_VideoInputDeviceCategory, vfwcat, TRUE}, {&CLSID_AudioInputDeviceCategory, wavein, FALSE}, {&CLSID_AudioRendererCategory, waveout, FALSE}, {&CLSID_MidiRendererCategory, midiout, FALSE}, @@ -156,7 +156,7 @@ pMapper = (IFilterMapper2*)mapvptr; - IFilterMapper2_CreateCategory(pMapper, &CLSID_VideoInputDeviceCategory, MERIT_DO_NOT_USE, friendlyvidcap); + IFilterMapper2_CreateCategory(pMapper, &CLSID_VideoInputDeviceCategory, MERIT_NORMAL, friendlyvidcap); IFilterMapper2_CreateCategory(pMapper, &CLSID_LegacyAmFilterCategory, MERIT_NORMAL, friendlydshow); IFilterMapper2_CreateCategory(pMapper, &CLSID_VideoCompressorCategory, MERIT_DO_NOT_USE, friendlyvidcomp); IFilterMapper2_CreateCategory(pMapper, &CLSID_AudioInputDeviceCategory, MERIT_DO_NOT_USE, friendlyaudcap); diff -Nru wine-old/dlls/devenum/devenum_private.h wine-new/dlls/devenum/devenum_private.h --- wine-old/dlls/devenum/devenum_private.h 2004-12-13 22:19:02.000000000 +0100 +++ wine-new/dlls/devenum/devenum_private.h 2005-04-19 12:55:40.000000000 +0200 @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "winreg.h" #include "winerror.h" @@ -38,6 +39,7 @@ #include "olectl.h" #include "wine/unicode.h" #include "uuids.h" +#include "vfw.h" /********************************************************************** * Dll lifetime tracking declaration for devenum.dll diff -Nru wine-old/dlls/devenum/Makefile.in wine-new/dlls/devenum/Makefile.in --- wine-old/dlls/devenum/Makefile.in 2004-08-19 21:31:20.000000000 +0200 +++ wine-new/dlls/devenum/Makefile.in 2005-04-19 12:55:40.000000000 +0200 @@ -3,7 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = devenum.dll -IMPORTS = ole32 oleaut32 winmm user32 advapi32 kernel32 +IMPORTS = ole32 oleaut32 winmm user32 advapi32 kernel32 avicap32 EXTRALIBS = -lstrmiids -luuid C_SRCS = \ diff -Nru wine-old/dlls/msvideo/msvideo_main.c wine-new/dlls/msvideo/msvideo_main.c --- wine-old/dlls/msvideo/msvideo_main.c 2005-02-17 12:51:01.000000000 +0100 +++ wine-new/dlls/msvideo/msvideo_main.c 2005-04-19 12:10:12.000000000 +0200 @@ -1132,7 +1132,7 @@ } /*********************************************************************** - * ICSeqCompressFrameEnd [MSVFW32.@] + * ICSeqCompressFrameStart [MSVFW32.@] */ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) { diff -Nru wine-old/dlls/quartz/capture.c wine-new/dlls/quartz/capture.c --- wine-old/dlls/quartz/capture.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/quartz/capture.c 2005-04-19 17:22:37.000000000 +0200 @@ -0,0 +1,246 @@ +/* DirectShow capture services (QUARTZ.DLL) + * + * Copyright 2005 Maarten Lankhorst + * + * This file contains the (internal) driver registration functions, + * driver enumeration APIs and DirectDraw creation functions. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "quartz_private.h" +#include "control_private.h" +#include "pin.h" +#include "capture.h" + +#include "uuids.h" +#include "mmreg.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "fourcc.h" +#include "windef.h" +#include "winbase.h" +#include "dshow.h" +#include "strmif.h" +#include "ddraw.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +#ifdef ENABLE_V4L +#include <stdio.h> +#include <sys/ioctl.h> +#include <sys/stat.h> +#include <errno.h> +#include <asm/types.h> +#include <linux/videodev.h> +#include <fcntl.h> +#include <unistd.h> +#include "winnls.h" +#endif + +WINE_DEFAULT_DEBUG_CHANNEL(quartz); + +#ifdef ENABLE_V4L +static int xioctl(int fd, int request, void * arg) +{ + int r; + + do r = ioctl (fd, request, arg); + while (-1 == r && EINTR == errno); + + return r; +} +#endif + +HRESULT Capture_Initialise(CaptureBox * capBox, IPin * pOut, USHORT card) +{ +#ifdef ENABLE_V4L + char device[128]; + struct stat st; + struct v4l2_capability caps; + + sprintf(device, "/dev/video%i", 0); + + FIXME("(): Allow use of more then 1 video adapter, like I did in avicap\n"); + FIXME("(): Add support for Video4Linux, currently only allowing v4l2\n"); + + if (stat (device, &st) == -1) { + ERR("%s: %s\n", device, strerror(errno)); + return E_FAIL; + } + + if (!S_ISCHR (st.st_mode)) { + ERR("%s: Not a device\n", device); + return E_FAIL; + } + + capBox->fd = open(device, O_RDWR | O_NONBLOCK); + if (capBox->fd == -1) { + ERR("%s: Failed to open: %s\n", device, strerror(errno)); + return E_FAIL; + } +#define QUERY(io, sendwhat) if (xioctl(capBox->fd, io, sendwhat) == -1) { ERR("%s: Can not perform ioctl: %s\n", device, strerror(errno)); close(capBox->fd); return E_FAIL; } +#define FQUERY(io, sendwhat) if (xioctl(capBox->fd, io, sendwhat) == -1) { TRACE("%s: ioctl failed: %s - continuing anyway\n", device, strerror(errno)); } + QUERY(VIDIOC_QUERYCAP, &caps); + FIXME("Queried...\n"); + + struct v4l2_input in; + int inputs = 0; + + in.index = 0; + + while( ioctl( capBox->fd, VIDIOC_ENUMINPUT, &in ) >= 0 ) { + in.index = ++inputs; + } + + if( !inputs ) { + ERR("No inputs available on device\n"); + close(capBox->fd); + return E_FAIL; + } + TRACE("Amount of inputs: %d\n", inputs); + struct v4l2_format imgformat; + + imgformat.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + memset( &(imgformat.fmt.pix), 0, sizeof( struct v4l2_pix_format ) ); + imgformat.fmt.pix.pixelformat = V4L2_PIX_FMT_RGB32; + imgformat.fmt.pix.field = V4L2_FIELD_INTERLACED; + imgformat.fmt.pix.width = 320; + imgformat.fmt.pix.height = 240; + + QUERY(VIDIOC_S_FMT, &imgformat); + + capBox->height = imgformat.fmt.pix.height; + capBox->width = imgformat.fmt.pix.width; + capBox->bitDepth = 24; + capBox->pOut = pOut; + capBox->fps = 2; + FIXME("Using format: 24 bits - %d x %d\n", imgformat.fmt.pix.width, imgformat.fmt.pix.height); + return S_OK; +#else + ERR("Video 4 Linux 2 support not enabled, and currently NOT supporting V4L1\n\tReturning E_NOTIMPL"); + return E_NOTIMPL; +#endif +} + +HRESULT Capture_Destroy(CaptureBox * capBox) +{ +/* Destroy file handlers etc? This function can't fail.. */ + close(capBox->fd); + return S_OK; +} + +HRESULT Capture_SetMediaType(CaptureBox * capBox, AM_MEDIA_TYPE * mT) +{ +/* Only time I can imagine this doesn't return is with incompatible type */ +/* We should check rcTarget rectangle? */ + FIXME("%p -> (%p)\n", capBox, mT); + capBox->width = ((BITMAPINFOHEADER *)mT->pbFormat)->biWidth; + capBox->height = ((BITMAPINFOHEADER *)mT->pbFormat)->biHeight; + capBox->bitDepth = ((BITMAPINFOHEADER *)mT->pbFormat)->biBitCount; + return S_OK; +} + +HRESULT Capture_GetMediaType(CaptureBox * capBox, AM_MEDIA_TYPE ** mT) +{ + FIXME("%p\n", capBox); + VIDEOINFOHEADER *vi; + mT[0] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + if (!mT[0]) return E_OUTOFMEMORY; + vi = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + mT[0]->cbFormat = sizeof(AM_MEDIA_TYPE); + if (!vi) + { + CoTaskMemFree(mT[0]); + return E_OUTOFMEMORY; + } + memcpy(&mT[0]->majortype, &MEDIATYPE_Video, sizeof(GUID)); + memcpy(&mT[0]->subtype, &MEDIASUBTYPE_RGB24, sizeof(GUID)); + memcpy(&mT[0]->formattype, &FORMAT_VideoInfo, sizeof(GUID)); + mT[0]->bFixedSizeSamples = 1; + mT[0]->bTemporalCompression = 0; + ZeroMemory(&vi->rcSource, sizeof(RECT)); + ZeroMemory(&vi->rcTarget, sizeof(RECT)); + vi->dwBitRate = capBox->fps * capBox->width * capBox->height * capBox->bitDepth / 8; + vi->dwBitErrorRate = 0; + vi->AvgTimePerFrame = 10000000 / capBox->fps; + vi->bmiHeader.biSize = capBox->width * capBox->height * capBox->bitDepth / 8; + vi->bmiHeader.biWidth = capBox->width; + vi->bmiHeader.biHeight = capBox->height; + vi->bmiHeader.biPlanes = 1; + vi->bmiHeader.biBitCount = 24; + vi->bmiHeader.biCompression = vi->bmiHeader.biSizeImage = 0; + vi->bmiHeader.biClrUsed = vi->bmiHeader.biClrImportant = 0; + mT[0]->pbFormat = (void *)vi; + return S_OK; +} + +DWORD WINAPI TestBed(LPVOID lParam) { + CaptureBox * capBox = lParam; + HRESULT hr; + IMediaSample *pSample = NULL; + unsigned long framecount = 1; + + hr = OutputPin_CommitAllocator((OutputPin *)capBox->pOut); + TRACE("Meat 0: %lx\n", hr); + if (SUCCEEDED(hr)) while (1) { + unsigned char readbuffer[320*240*4]; + int heightidx = 0, width; + BYTE * myData; + OutputPin_GetDeliveryBuffer((OutputPin *)capBox->pOut, &pSample, NULL, NULL, 0); + IMediaSample_SetActualDataLength(pSample, 230400); + IMediaSample_GetPointer(pSample, &myData); + read(capBox->fd, readbuffer, sizeof(readbuffer)); + while (heightidx < 240) { + for (width = 0; width < 320; width++) { + int p0ink = (239-heightidx)*320*3+width*3; + int p0ink2 = width*4+heightidx*320*4; + myData[p0ink + 2] = readbuffer[p0ink2 + 1]; + myData[p0ink + 1] = readbuffer[p0ink2 + 2]; + myData[p0ink + 0] = readbuffer[p0ink2 + 3]; + } + heightidx++; + } + hr = OutputPin_SendSample((OutputPin *)capBox->pOut, pSample); + FIXME("%p -> Frame %lu: %lx\n", capBox, framecount++, hr); + usleep(250*1000); + IMediaSample_Release(pSample); + } + return 0x0; +} + +HRESULT Capture_Run(CaptureBox * capBox, FILTER_STATE *state) +{ + DWORD dwThreadId = 0; + *state = State_Running; + FIXME("%p -> (%p) stub\n", capBox, state); + return CreateThread(NULL, 0, TestBed, capBox, 0, &dwThreadId) ? S_OK : E_FAIL; +} + +HRESULT Capture_Pause(CaptureBox *capBox, FILTER_STATE *state) +{ + FIXME("%p -> (%p) stub\n", capBox, state); + return S_OK; +} + +HRESULT Capture_Stop(CaptureBox *capBox, FILTER_STATE *state) +{ + FIXME("%p -> (%p) stub\n", capBox, state); + return S_OK; +} + diff -Nru wine-old/dlls/quartz/capturegraph.c wine-new/dlls/quartz/capturegraph.c --- wine-old/dlls/quartz/capturegraph.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/quartz/capturegraph.c 2005-04-19 12:10:12.000000000 +0200 @@ -0,0 +1,209 @@ +/* Capture Graph Builder, Minimal edition.. + * Copyright 2005 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * TODO: Implement CaptureGraphBuilder2, and make all calls from + * CaptureGraphBuilder forward to it.. + */ + +#include "config.h" + +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "quartz_private.h" + +#include "uuids.h" +#include "mmreg.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "windef.h" +#include "winbase.h" +#include "dshow.h" +#include "evcode.h" +#include "strmif.h" +#include "ddraw.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(quartz); + +static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; + +static const ICaptureGraphBuilderVtbl Builder_Vtbl; + +typedef struct CaptureGraphImpl +{ + const ICaptureGraphBuilderVtbl * lpVtbl; + IGraphBuilder *mygraph; + + ULONG refCount; + CRITICAL_SECTION csFilter; +} CaptureGraphImpl; + +HRESULT CaptureGraphBuilder_create(IUnknown * pUnkOuter, LPVOID * ppv) +{ + CaptureGraphImpl * pCapture; + TRACE("(%p, %p)\n", pUnkOuter, ppv); + *ppv = NULL; + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + pCapture = CoTaskMemAlloc(sizeof(CaptureGraphImpl)); + pCapture->lpVtbl = &Builder_Vtbl; + pCapture->refCount = 1; + pCapture->mygraph = NULL; + InitializeCriticalSection(&pCapture->csFilter); + *ppv = (LPVOID)pCapture; + return S_OK; +} + +static HRESULT WINAPI CaptureGraphBuilder_QueryInterface(ICaptureGraphBuilder * iface, REFIID riid, LPVOID * ppv) +{ + struct CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_ICaptureGraphBuilder)) + { + *ppv = (LPVOID)This; + TRACE("Asking for myself?\n"); + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } + + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI CaptureGraphBuilder_AddRef(ICaptureGraphBuilder * iface) +{ + CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->refCount); + + TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, refCount - 1); + return refCount; +} + +static ULONG WINAPI CaptureGraphBuilder_Release(ICaptureGraphBuilder * iface) +{ + CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->refCount); + + TRACE("(%p/%p)->() Release from %ld\n", This, iface, refCount + 1); + + if (!refCount) { + FIXME("Release IGraphFilter or w/e\n"); + DeleteCriticalSection(&This->csFilter); + This->lpVtbl = NULL; + if (This->mygraph != NULL) + IGraphBuilder_Release((IGraphBuilder *)This->mygraph); + CoTaskMemFree(This); + return 0; + } + else return refCount; +} + +static HRESULT WINAPI CaptureGraphBuilder_SetFilterGraph(ICaptureGraphBuilder * iface, IGraphBuilder *pfg) +{ +/* The graph builder will automatically create a filter graph if you don't call this method. If you call this method after the graph builder has created its own filter graph, the call will fail. */ + struct CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + if (This->mygraph != NULL) return E_NOTIMPL; + This->mygraph = pfg; + IGraphBuilder_AddRef((IGraphBuilder *)This->mygraph); + TRACE("%p: %p\n", iface, pfg); + return S_OK; +} + +static HRESULT WINAPI CaptureGraphBuilder_GetFilterGraph(ICaptureGraphBuilder * iface, IGraphBuilder **pfg) +{ + struct CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + FIXME("%p: Make our own filtergraph if we haven't got one already\n", iface); + if (This->mygraph == NULL) return E_NOTIMPL; + + *pfg = This->mygraph; + IGraphBuilder_AddRef((IGraphBuilder *)This->mygraph); + + TRACE("%p: %p\n", iface, *pfg); + return S_OK; +} + +static HRESULT WINAPI CaptureGraphBuilder_SetOutputFileName(ICaptureGraphBuilder * iface, const GUID *pType, LPCOLESTR lpstrFile,IBaseFilter **ppf, IFileSinkFilter **ppSink) +{ + FIXME("%p: %p, %p, %p, %p - stub\n", iface, pType, lpstrFile, *ppf, *ppSink); + return E_NOTIMPL; +} + +static HRESULT WINAPI CaptureGraphBuilder_FindInterface(ICaptureGraphBuilder * iface, const GUID *pCategory, IBaseFilter *pf, REFIID riid, void **ppint) +{ + struct CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + TRACE("%p: %s .. %p .. %s .. %p - unwanted stub workaround!\n", iface, qzdebugstr_guid(pCategory), pf, qzdebugstr_guid(riid), *ppint); + return IBaseFilter_QueryInterface(pf, riid, ppint); + /* Looks for the specified interface on the filter, upstream and + * downstream from the filter, and, optionally, only on the output + * pin of the given category. + */ +} + +/* [call_as(FindInterface)] HRESULT RemoteFindInterface( + [in, unique] const GUID *pCategory, + [in] IBaseFilter *pf, + [in] REFIID riid, + [out] IUnknown **ppint); + ^- What is this? */ + +static HRESULT WINAPI CaptureGraphBuilder_RenderStream(ICaptureGraphBuilder * iface, const GUID *pCategory, IUnknown *pSource, IBaseFilter *pfCompressor, IBaseFilter *pfRenderer) +{ + FIXME("%p: .. Stub? !!! -- SHOULD NORMALLY WORK!!..\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI CaptureGraphBuilder_ControlStream(ICaptureGraphBuilder * iface, const GUID *pCategory, IBaseFilter *pFilter, REFERENCE_TIME *pstart, REFERENCE_TIME *pstop, WORD wStartCookie, WORD wStopCookie) +{ + FIXME("%p: .. Stub? !!! ..\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI CaptureGraphBuilder_AllocCapFile(ICaptureGraphBuilder * iface, LPCOLESTR lpstr, DWORDLONG dwlSize) +{ + FIXME("%p: .. Stub? !!! ..\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI CaptureGraphBuilder_CopyCaptureFile(ICaptureGraphBuilder * iface, LPOLESTR lpwstrOld, LPOLESTR lpwstrNew, int fAllowEscAbort, IAMCopyCaptureFileProgress *pCallback) +{ + FIXME("%p: .. Stub? !!! ..\n", iface); + return E_NOTIMPL; +} + +static const ICaptureGraphBuilderVtbl Builder_Vtbl = +{ + CaptureGraphBuilder_QueryInterface, + CaptureGraphBuilder_AddRef, + CaptureGraphBuilder_Release, + CaptureGraphBuilder_SetFilterGraph, + CaptureGraphBuilder_GetFilterGraph, + CaptureGraphBuilder_SetOutputFileName, + CaptureGraphBuilder_FindInterface, + CaptureGraphBuilder_RenderStream, + CaptureGraphBuilder_ControlStream, + CaptureGraphBuilder_AllocCapFile, + CaptureGraphBuilder_CopyCaptureFile +}; + diff -Nru wine-old/dlls/quartz/capture.h wine-new/dlls/quartz/capture.h --- wine-old/dlls/quartz/capture.h 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/quartz/capture.h 2005-04-19 13:29:26.000000000 +0200 @@ -0,0 +1,38 @@ +/* DirectShow private capture header (QUARTZ.DLL) + * + * Copyright 2005 Maarten Lankhorst + * + * This file contains the (internal) driver registration functions, + * driver enumeration APIs and DirectDraw creation functions. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +typedef struct CaptureBox { +/* Dunno what to put in here? */ + UINT width, height, bitDepth, fps; + IPin *pOut; + int fd; +} CaptureBox; + +HRESULT Capture_Query(USHORT card); +HRESULT Capture_Initialise(CaptureBox * capBox, IPin *pOut, USHORT card); +HRESULT Capture_GetMediaType(CaptureBox * capBox, AM_MEDIA_TYPE ** mT); +HRESULT Capture_SetMediaType(CaptureBox * capBox, AM_MEDIA_TYPE * mT); +HRESULT Capture_Run(CaptureBox * capBox, FILTER_STATE *state); +HRESULT Capture_Stop(CaptureBox * capBox, FILTER_STATE *state); +HRESULT Capture_Pause(CaptureBox * capBox, FILTER_STATE *state); +HRESULT Capture_Destroy(CaptureBox * capBox); + diff -Nru wine-old/dlls/quartz/enummedia.c wine-new/dlls/quartz/enummedia.c --- wine-old/dlls/quartz/enummedia.c 2005-01-06 20:36:47.000000000 +0100 +++ wine-new/dlls/quartz/enummedia.c 2005-04-19 12:10:12.000000000 +0200 @@ -20,6 +20,17 @@ #include "quartz_private.h" +#include "uuids.h" +#include "mmreg.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "fourcc.h" +#include "windef.h" +#include "winbase.h" +#include "dshow.h" +#include "strmif.h" +#include "ddraw.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); @@ -61,7 +72,37 @@ { if (!pmt) return; - TRACE("\t%s\n\t%s\n\t...\n\t%s\n", qzdebugstr_guid(&pmt->majortype), qzdebugstr_guid(&pmt->subtype), qzdebugstr_guid(&pmt->formattype)); + TRACE("(): Printing out full format\n" + "\tMajor.Minor: %s.%s\n" + "\tFixedSize [%d] - Temporal [%d]\n" + "\tSample size [%lu] - Format type: %s\n" + "\tcb Format: %lu - Pointer: %p\n", + qzdebugstr_guid(&pmt->majortype), qzdebugstr_guid(&pmt->subtype), + pmt->bFixedSizeSamples, pmt->bTemporalCompression, + pmt->lSampleSize, qzdebugstr_guid(&pmt->formattype), + pmt->cbFormat, pmt->pbFormat); + if (!strcmp(qzdebugstr_guid(&pmt->formattype), qzdebugstr_guid(&FORMAT_VideoInfo))) { + BITMAPINFOHEADER *bmi; + VIDEOINFOHEADER *pvi; + pvi = (void *)pmt->pbFormat; + + TRACE("(): Printing out whole video info header\n" + "\tSource rectangle: (%lu,%lu,%lu,%lu)\n" + "\tTarget rectangle: (%lu,%lu,%lu,%lu)\n" + "\tBitrate: %lu, Error rate: %lu\n" + "\tTime per frame: %lu\n", + pvi->rcSource.left, pvi->rcSource.right, pvi->rcSource.top, pvi->rcSource.bottom, + pvi->rcTarget.left, pvi->rcTarget.right, pvi->rcTarget.top, pvi->rcTarget.bottom, + pvi->dwBitRate, pvi->dwBitErrorRate, + (ulong) pvi->AvgTimePerFrame); + bmi = &pvi->bmiHeader; + TRACE("(): Printing out bmi header\n" + "\tSize, in pixels: %lu\n" + "\tFormat: %ldx%ld\n" + "\tBit count: %d\n" + "\tSize image: %lu\n", + bmi->biSize, bmi->biWidth, bmi->biHeight, bmi->biBitCount, bmi->biSizeImage); + } } typedef struct IEnumMediaTypesImpl diff -Nru wine-old/dlls/quartz/main.c wine-new/dlls/quartz/main.c --- wine-old/dlls/quartz/main.c 2005-03-02 13:23:22.000000000 +0100 +++ wine-new/dlls/quartz/main.c 2005-04-19 12:10:12.000000000 +0200 @@ -71,7 +71,9 @@ { &CLSID_AVIDec, AVIDec_create }, { &CLSID_SystemClock, &QUARTZ_CreateSystemClock }, { &CLSID_ACMWrapper, &ACMWrapper_create }, - { &CLSID_WAVEParser, &WAVEParser_create } + { &CLSID_VfwCapture, &VfwCapture_create }, + { &CLSID_WAVEParser, &WAVEParser_create }, + { &CLSID_CaptureGraphBuilder, &CaptureGraphBuilder_create } }; static HRESULT WINAPI diff -Nru wine-old/dlls/quartz/Makefile.in wine-new/dlls/quartz/Makefile.in --- wine-old/dlls/quartz/Makefile.in 2005-02-10 18:13:18.000000000 +0100 +++ wine-new/dlls/quartz/Makefile.in 2005-04-19 12:10:12.000000000 +0200 @@ -10,6 +10,8 @@ acmwrapper.c \ avidec.c \ avisplit.c \ + capture.c \ + capturegraph.c \ control.c \ dsoundrender.c \ enumfilters.c \ @@ -27,6 +29,7 @@ regsvr.c \ systemclock.c \ transform.c \ + v4wsource.c \ videorenderer.c \ waveparser.c diff -Nru wine-old/dlls/quartz/pin.c wine-new/dlls/quartz/pin.c --- wine-old/dlls/quartz/pin.c 2005-03-02 11:12:12.000000000 +0100 +++ wine-new/dlls/quartz/pin.c 2005-04-19 12:10:12.000000000 +0200 @@ -66,12 +66,17 @@ dump_AM_MEDIA_TYPE(pmt); /* FIXME: call queryacceptproc */ + wine_dbg_add_option("quartz", 15, 0); This->pin.pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin); CopyMediaType(&This->pin.mtCurrent, pmt); + wine_dbg_add_option("quartz", 15, 0); hr = IPin_ReceiveConnection(pReceivePin, iface, pmt); + FIXME("(): MSN Crashes if quartz debug channel (TRACE & WARN somewhere before here\n" + "\t\tManually enabling full debug on quartz now -- %lx\n", hr); + wine_dbg_add_option("quartz", 15, 0); /* get the IMemInputPin interface we will use to deliver samples to the * connected pin */ diff -Nru wine-old/dlls/quartz/quartz_private.h wine-new/dlls/quartz/quartz_private.h --- wine-old/dlls/quartz/quartz_private.h 2005-02-10 18:13:18.000000000 +0100 +++ wine-new/dlls/quartz/quartz_private.h 2005-04-19 12:10:12.000000000 +0200 @@ -52,6 +52,8 @@ HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv); +HRESULT VfwCapture_create(IUnknown * pUnkOuter, LPVOID * ppv); +HRESULT CaptureGraphBuilder_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT EnumMonikerImpl_Create(IMoniker ** ppMoniker, ULONG nMonikerCount, IEnumMoniker ** ppEnum); diff -Nru wine-old/dlls/quartz/regsvr.c wine-new/dlls/quartz/regsvr.c --- wine-old/dlls/quartz/regsvr.c 2005-02-10 18:13:18.000000000 +0100 +++ wine-new/dlls/quartz/regsvr.c 2005-04-19 12:10:12.000000000 +0200 @@ -922,6 +922,18 @@ "quartz.dll", "Both" }, + { &CLSID_VfwCapture, + "Video for wine capture interface", + NULL, + "quartz.dll", + "Both" + }, + { &CLSID_CaptureGraphBuilder, + "Capture Graph Builder", + NULL, + "quartz.dll", + "Both" + }, { NULL } /* list terminator */ }; @@ -1112,6 +1124,18 @@ { 0xFFFFFFFF }, } }, + { &CLSID_VfwCapture, + &CLSID_VideoInputDeviceCategory, + {'V','i','d','e','o',' ','F','o','r',' ','W','i','n','e',' ','(','V','4','W',')', 0}, + 0x800000, + { { REG_PINFLAG_B_OUTPUT, + { { &MEDIATYPE_Stream, &GUID_NULL }, + { NULL } + }, + }, + { 0xFFFFFFFF }, + } + }, /* This creates a fake device for us with an ugly name */ { NULL } /* list terminator */ }; diff -Nru wine-old/dlls/quartz/v4wsource.c wine-new/dlls/quartz/v4wsource.c --- wine-old/dlls/quartz/v4wsource.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/quartz/v4wsource.c 2005-04-19 13:28:31.000000000 +0200 @@ -0,0 +1,591 @@ +/* Video For Windows Steering structure + * + * Copyright 2005 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * LETS SING IT ALL TOGETHER NOW! ON MY MARK! + * COM SUCKS ASS! + */ + +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "quartz_private.h" +#include "control_private.h" +#include "pin.h" +#include "capture.h" + +#include "uuids.h" +#include "mmreg.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "fourcc.h" +#include "windef.h" +#include "winbase.h" +#include "dshow.h" +#include "strmif.h" +#include "ddraw.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(quartz); + +static const IBaseFilterVtbl VfwCapture_Vtbl; +static const IAMStreamConfigVtbl IAMStreamConfig_VTable; +static const IPinVtbl VfwPin_Vtbl; + +static HRESULT VfwPin_Construct(IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +static const WCHAR wszOutputPinName[] = { 'O','u','t','p','u','t',0 }; + +typedef struct VfwCapture +{ + const struct IBaseFilterVtbl * lpVtbl; + const struct IAMStreamConfigVtbl * IAMStreamConfig_vtbl; + + CaptureBox myCap; /* Keep this as first, for FakeAMConfigImpl */ + ULONG refCount; + FILTER_INFO filterInfo; + FILTER_STATE state; + CRITICAL_SECTION csFilter; + + IPin * pOutputPin; +} VfwCapture; + +typedef struct FakeAMConfigImpl { + const struct IAMStreamConfigVtbl * IAMStreamConfig_vtbl; + CaptureBox myCap; +} FakeAMConfigImpl; + +/* VfwPin implementation */ +typedef struct VfwPinImpl +{ + OutputPin pin; + + CaptureBox *myCap; + IKsPropertySetVtbl * KSP_VT; + HANDLE hEvent; + BOOL bFlushing; +} VfwPinImpl; + +HRESULT VfwCapture_create(IUnknown * pUnkOuter, LPVOID * ppv) +{ + VfwCapture *pVfwCapture; + HRESULT hr; + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + pVfwCapture = CoTaskMemAlloc(sizeof(VfwCapture)); + + if (!pVfwCapture) + return E_OUTOFMEMORY; + + pVfwCapture->lpVtbl = &VfwCapture_Vtbl; + pVfwCapture->IAMStreamConfig_vtbl = &IAMStreamConfig_VTable; + pVfwCapture->refCount = 1; + pVfwCapture->filterInfo.achName[0] = '\0'; + pVfwCapture->filterInfo.pGraph = NULL; + InitializeCriticalSection(&pVfwCapture->csFilter); + hr = VfwPin_Construct((IBaseFilter *)&pVfwCapture->lpVtbl, &pVfwCapture->csFilter, &pVfwCapture->pOutputPin); + if (!SUCCEEDED(hr)) + { + CoTaskMemFree(pVfwCapture); + return E_OUTOFMEMORY; + } else { + ((VfwPinImpl *)pVfwCapture->pOutputPin)->myCap = &pVfwCapture->myCap; + hr = Capture_Initialise(&pVfwCapture->myCap, pVfwCapture->pOutputPin, 0); + if (FAILED(hr)) { + IPin_Release((IPin *)pVfwCapture->pOutputPin); + CoTaskMemFree(pVfwCapture); + return hr; + } + } + *ppv = (LPVOID)pVfwCapture; + TRACE("-- created at %p\n", pVfwCapture); + + return S_OK; +} + +static HRESULT WINAPI VfwCapture_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IPersist)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IMediaFilter)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IBaseFilter)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IAMStreamConfig)) + *ppv = (LPVOID)&(This->IAMStreamConfig_vtbl); + + if (*ppv) + { + TRACE("Returning %s interface\n", qzdebugstr_guid(riid)); + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } + + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI VfwCapture_AddRef(IBaseFilter * iface) +{ + VfwCapture *This = (VfwCapture *)iface; + ULONG refCount = InterlockedIncrement(&This->refCount); + + TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, refCount - 1); + + return refCount; +} + +static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) +{ + VfwCapture *This = (VfwCapture *)iface; + ULONG refCount = InterlockedDecrement(&This->refCount); + TRACE("(%p/%p)->() Release from %ld\n", This, iface, refCount + 1); + + if (!refCount) + { + TRACE("(): Destroying everything!\n"); + if (This->state != State_Stopped) + Capture_Stop(&This->myCap, &This->state); + Capture_Destroy(&This->myCap); + IPin_Release(This->pOutputPin); + DeleteCriticalSection(&This->csFilter); + This->lpVtbl = NULL; + CoTaskMemFree(This); + } + return refCount; +} + +/** IPersist methods **/ + +static HRESULT WINAPI VfwCapture_GetClassID(IBaseFilter * iface, CLSID * pClsid) +{ + TRACE("(%p)\n", pClsid); + *pClsid = CLSID_VfwCapture; + return S_OK; +} + +/** IMediaFilter methods **/ + +static HRESULT WINAPI VfwCapture_Stop(IBaseFilter * iface) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("()\n"); + return Capture_Stop(&This->myCap, &This->state); +} + +static HRESULT WINAPI VfwCapture_Pause(IBaseFilter * iface) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("()\n"); + return Capture_Pause(&This->myCap, &This->state); +} + +static HRESULT WINAPI VfwCapture_Run(IBaseFilter * iface, REFERENCE_TIME tStart) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("(%lx%08lx)\n", (ULONG)(tStart >> 32), (ULONG)tStart); + return Capture_Run(&This->myCap, &This->state); +} + +static HRESULT WINAPI VfwCapture_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("(%lu, %p)\n", dwMilliSecsTimeout, pState); + *pState = This->state; + return S_OK; +} + +static HRESULT WINAPI VfwCapture_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock) +{ + TRACE("(%p)\n", pClock); + return S_OK; +} + +static HRESULT WINAPI VfwCapture_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock) +{ + TRACE("(%p)\n", ppClock); + return S_OK; +} + +/** IBaseFilter methods **/ + +static HRESULT WINAPI VfwCapture_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) +{ + ENUMPINDETAILS epd; + VfwCapture *This = (VfwCapture *)iface; + + TRACE("(%p)\n", ppEnum); + + epd.cPins = 1; + epd.ppPins = &This->pOutputPin; + return IEnumPinsImpl_Construct(&epd, ppEnum); +} + +static HRESULT WINAPI VfwCapture_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) +{ + FIXME("(%s, %p) - stub\n", debugstr_w(Id), ppPin); + return E_NOTIMPL; +} + +static HRESULT WINAPI VfwCapture_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) +{ + VfwCapture *This = (VfwCapture *)iface; + + TRACE("(%p)\n", pInfo); + + strcpyW(pInfo->achName, This->filterInfo.achName); + pInfo->pGraph = This->filterInfo.pGraph; + + if (pInfo->pGraph) + IFilterGraph_AddRef(pInfo->pGraph); + return S_OK; +} + +static HRESULT WINAPI VfwCapture_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) +{ + VfwCapture *This = (VfwCapture *)iface; + + TRACE("(%p, %s)\n", pGraph, debugstr_w(pName)); + + if (pName) + strcpyW(This->filterInfo.achName, pName); + else + *This->filterInfo.achName = 0; + This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */ + + return S_OK; +} + +static HRESULT WINAPI VfwCapture_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo) +{ + FIXME("(%p)\n", pVendorInfo); + return E_NOTIMPL; +} + +static const IBaseFilterVtbl VfwCapture_Vtbl = +{ + VfwCapture_QueryInterface, + VfwCapture_AddRef, + VfwCapture_Release, + VfwCapture_GetClassID, + VfwCapture_Stop, + VfwCapture_Pause, + VfwCapture_Run, + VfwCapture_GetState, + VfwCapture_SetSyncSource, + VfwCapture_GetSyncSource, + VfwCapture_EnumPins, + VfwCapture_FindPin, + VfwCapture_QueryFilterInfo, + VfwCapture_JoinFilterGraph, + VfwCapture_QueryVendorInfo +}; + +/* AMStreamConfig interface, we only need to implement {G,S}etFormat */ +static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig * iface, REFIID riid, LPVOID * ppv) +{ + FIXME("%p: stub, not worth the effort\n", iface); + return S_OK; +} + +static ULONG WINAPI AMStreamConfig_AddRef(IAMStreamConfig * iface) +{ + FIXME("%p: stub, not worth the effort\n", iface); + return 1; +} + +static ULONG WINAPI AMStreamConfig_Release(IAMStreamConfig * iface) +{ + FIXME("%p: stub, not worth the effort\n", iface); + return 1; +} + +static HRESULT WINAPI AMStreamConfig_SetFormat(IAMStreamConfig *iface, + AM_MEDIA_TYPE *pmt) { + FakeAMConfigImpl *This = (FakeAMConfigImpl *)iface; + BITMAPINFOHEADER *bmi; + VIDEOINFOHEADER *pvi; + TRACE("(): Printing out full format\n" + "\tMajor.Minor: %s.%s\n" + "\tFixedSize [%d] - Temporal [%d]\n" + "\tSample size [%lu] - Format type: %s\n" + "\tcb Format: %lu - Pointer: %p\n", + qzdebugstr_guid(&pmt->majortype), qzdebugstr_guid(&pmt->subtype), + pmt->bFixedSizeSamples, pmt->bTemporalCompression, + pmt->lSampleSize, qzdebugstr_guid(&pmt->formattype), + pmt->cbFormat, pmt->pbFormat); + // Presume pbFormat is a video + pvi = (void *)pmt->pbFormat; + TRACE("(): Printing out whole video info header\n" + "\tSource rectangle: (%lu,%lu,%lu,%lu)\n" + "\tTarget rectangle: (%lu,%lu,%lu,%lu)\n" + "\tBitrate: %lu, Error rate: %lu\n" + "\tTime per frame: %lu\n", + pvi->rcSource.left, pvi->rcSource.right, pvi->rcSource.top, pvi->rcSource.bottom, + pvi->rcTarget.left, pvi->rcTarget.right, pvi->rcTarget.top, pvi->rcTarget.bottom, + pvi->dwBitRate, pvi->dwBitErrorRate, + (ulong) pvi->AvgTimePerFrame); + bmi = &pvi->bmiHeader; + TRACE("(): Printing out bmi header\n" + "\tSize, in pixels: %lu\n" + "\tFormat: %ldx%ld\n" + "\tBit count: %d\n" + "\tSize image: %lu\n", + bmi->biSize, bmi->biWidth, bmi->biHeight, bmi->biBitCount, bmi->biSizeImage); + return Capture_SetMediaType(&This->myCap, pmt); +} + +static HRESULT WINAPI AMStreamConfig_GetFormat(IAMStreamConfig *iface, + AM_MEDIA_TYPE **pmt) { + FakeAMConfigImpl *This = (FakeAMConfigImpl *)iface; + TRACE("%p -> (%p)\n", iface, pmt); + return Capture_GetMediaType(&This->myCap, pmt); +} + +static HRESULT WINAPI AMStreamConfig_GetNumberOfCapabilities(IAMStreamConfig *iface, int *piCount, int *piSize) +{ + TRACE("%p: %p %p\n", iface, piCount, piSize); + return E_NOTIMPL; /* Not implemented for this interface */ +} + +static HRESULT WINAPI AMStreamConfig_GetStreamCaps(IAMStreamConfig *iface, +int iIndex, AM_MEDIA_TYPE **pmt, BYTE *pSCC) +{ + TRACE("%p: %d %p %p\n", iface, iIndex, pmt, pSCC); + return E_NOTIMPL; /* Not implemented for this interface */ +} + +static const IAMStreamConfigVtbl IAMStreamConfig_VTable = +{ + AMStreamConfig_QueryInterface, + AMStreamConfig_AddRef, + AMStreamConfig_Release, + AMStreamConfig_SetFormat, + AMStreamConfig_GetFormat, + AMStreamConfig_GetNumberOfCapabilities, + AMStreamConfig_GetStreamCaps +}; + +/* IKsPropertySet interface */ +static HRESULT WINAPI KSP_QueryInterface(IKsPropertySet * iface, REFIID riid, LPVOID * ppv) +{ + TRACE("%p: stub, not worth the effort\n", iface); + return S_OK; +} + +static ULONG WINAPI KSP_AddRef(IKsPropertySet * iface) +{ + TRACE("%p: stub, not worth the effort\n", iface); + return 1; +} + +static ULONG WINAPI KSP_Release(IKsPropertySet * iface) +{ + TRACE("%p: stub, not worth the effort\n", iface); + return 1; +} + +static HRESULT WINAPI KSP_Set(IKsPropertySet * iface, REFGUID guidPropSet, DWORD dwPropID, LPVOID pInstanceData, DWORD cbInstanceData, LPVOID pPropData, DWORD cbPropData) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI KSP_Get(IKsPropertySet * iface, REFGUID guidPropSet, DWORD dwPropID, LPVOID pInstanceData, DWORD cbInstanceData, LPVOID pPropData, DWORD cbPropData, DWORD *pcbReturned) +{ + TRACE("()\n"); + if (!IsEqualIID(guidPropSet, &AMPROPSETID_Pin)) + return E_PROP_SET_UNSUPPORTED; + if (pPropData == NULL && pcbReturned == NULL) + return E_POINTER; + if (pcbReturned) + *pcbReturned = sizeof(GUID); + if (pPropData == NULL) + return S_OK; + if (cbPropData < sizeof(GUID)) + return E_UNEXPECTED; + *(GUID *)pPropData = PIN_CATEGORY_PREVIEW; + TRACE("() Returning CaP\n"); + return S_OK; +} + +static HRESULT WINAPI KSP_QuerySupported(IKsPropertySet * iface, REFGUID guidPropSet, DWORD dwPropID, DWORD *pTypeSupport) +{ + TRACE("%p: stub\n", iface); + return E_NOTIMPL; +} + +static IKsPropertySetVtbl KSP_VTable = +{ + KSP_QueryInterface, + KSP_AddRef, + KSP_Release, + KSP_Set, + KSP_Get, + KSP_QuerySupported +}; + +static HRESULT AcceptProcAFR(LPVOID iface, const AM_MEDIA_TYPE *pmt) +{ + VfwPinImpl *This = (VfwPinImpl *)iface; + FIXME("%p: %p\n", This, pmt); + return S_FALSE; +} + +static HRESULT VfwPin_Construct(IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) +{ + VfwPinImpl * pPinImpl; + PIN_INFO piOutput; + ALLOCATOR_PROPERTIES ap; + + pPinImpl = CoTaskMemAlloc(sizeof(*pPinImpl)); + if (!pPinImpl) + return E_OUTOFMEMORY; + + piOutput.dir = PINDIR_OUTPUT; + piOutput.pFilter = pBaseFilter; + strcpyW(piOutput.achName, wszOutputPinName); + ap.cBuffers = 8; + ap.cbBuffer = 256*1024; + ap.cbAlign = 0; + ap.cbPrefix = 0; + + if (SUCCEEDED(OutputPin_Init(&piOutput, &ap, pBaseFilter, AcceptProcAFR, pCritSec, &pPinImpl->pin))) + { + pPinImpl->KSP_VT = &KSP_VTable; + pPinImpl->pin.pin.lpVtbl = &VfwPin_Vtbl; + pPinImpl->hEvent = CreateEventW(NULL, 0, 0, NULL); + pPinImpl->bFlushing = FALSE; + *ppPin = (IPin *)(&pPinImpl->pin.pin.lpVtbl); + return S_OK; + } + return E_FAIL; +} + +static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) +{ + VfwPinImpl *This = (VfwPinImpl *)iface; + TRACE("%s %p\n", qzdebugstr_guid(riid), ppv); + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IPin)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IKsPropertySet)) + *ppv = (LPVOID)&(This->KSP_VT); + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } + + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI VfwPin_Release(IPin * iface) +{ + VfwPinImpl *This = (VfwPinImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); + TRACE("()\n"); + + if (!refCount) + { + CloseHandle(This->hEvent); + CoTaskMemFree(This); + return 0; + } + return refCount; +} + +static HRESULT WINAPI VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) +{ + ENUMMEDIADETAILS emd; + AM_MEDIA_TYPE q[1]; + HRESULT hr; + int x = 0; + + VfwPinImpl *This = (VfwPinImpl *)iface; + FIXME("(%p) - stub Why does this work and other things don't?!\n", ppEnum); + emd.cMediaTypes = 1; + for (; x < 1; x++) { + VIDEOINFOHEADER *pvi; + CopyMemory(&q[x].majortype, &MEDIATYPE_Video, sizeof (GUID)); + CopyMemory(&q[x].subtype, &MEDIASUBTYPE_RGB24, sizeof (GUID)); + q[x].bFixedSizeSamples = TRUE; + q[x].bTemporalCompression = FALSE; + q[x].lSampleSize = 230400; + CopyMemory(&q[x].formattype, &FORMAT_VideoInfo, sizeof (GUID)); + q[x].cbFormat = sizeof(VIDEOINFOHEADER); + q[x].pbFormat = CoTaskMemAlloc(q[x].cbFormat); + pvi = (VIDEOINFOHEADER *)q[x].pbFormat; + pvi->rcSource.left = 0; pvi->rcSource.top = 0; + pvi->rcTarget.left = 0; pvi->rcTarget.top = 0; + pvi->rcSource.right = 320; pvi->rcSource.bottom = 240; + pvi->rcTarget.right = 320; pvi->rcTarget.bottom = 240; + pvi->dwBitRate = 10; + pvi->dwBitErrorRate = 0; + pvi->AvgTimePerFrame = (LONGLONG)(10000000.0 / 25); + pvi->bmiHeader.biSize = 40; + pvi->bmiHeader.biWidth = 320; + pvi->bmiHeader.biHeight = 240; + pvi->bmiHeader.biBitCount = 24; + pvi->bmiHeader.biCompression = BI_RGB; + pvi->bmiHeader.biSizeImage = 320*240*3; + pvi->bmiHeader.biXPelsPerMeter = 320; + pvi->bmiHeader.biYPelsPerMeter = 240; + pvi->bmiHeader.biClrUsed = 0; + pvi->bmiHeader.biPlanes = 1; + pvi->bmiHeader.biClrImportant = 0; + } + emd.pMediaTypes = q; + hr = IEnumMediaTypesImpl_Construct(&emd, ppEnum); + TRACE("%p -- %lx\n", This, hr); + /* CoTaskMemFree(q[0].pbFormat); */ + return hr; +} + +static const IPinVtbl VfwPin_Vtbl = +{ + VfwPin_QueryInterface, + IPinImpl_AddRef, + VfwPin_Release, + OutputPin_Connect, + OutputPin_ReceiveConnection, + IPinImpl_Disconnect, + IPinImpl_ConnectedTo, + IPinImpl_ConnectionMediaType, + IPinImpl_QueryPinInfo, + IPinImpl_QueryDirection, + IPinImpl_QueryId, + IPinImpl_QueryAccept, + VfwPin_EnumMediaTypes, + IPinImpl_QueryInternalConnections, + OutputPin_EndOfStream, + OutputPin_BeginFlush, + OutputPin_EndFlush, + OutputPin_NewSegment +}; + diff -Nru wine-old/include/axextend.idl wine-new/include/axextend.idl --- wine-old/include/axextend.idl 2003-07-01 06:33:35.000000000 +0200 +++ wine-new/include/axextend.idl 2005-04-19 12:10:12.000000000 +0200 @@ -69,6 +69,23 @@ interface IQualityControl; interface ISeekingPassThru; +/***************************************************************************** + * IAMStreamConfig interface + */ +[ + object, + uuid(c6e13340-30ac-11d0-a18c-00a0c9118956), + pointer_default(unique) +] +interface IAMStreamConfig : IUnknown +{ + HRESULT SetFormat( [in] AM_MEDIA_TYPE *pmt); + HRESULT GetFormat( [in] AM_MEDIA_TYPE **pmt); + HRESULT GetNumberOfCapabilities( [out] int *piCount, [out] int *piSize); + HRESULT GetStreamCaps( [in] int iIndex, [out] AM_MEDIA_TYPE **pmt, + [out] BYTE *pSCC); +} + typedef struct { CLSID Clsid;

1 0

Undefined function CHR() in expression
by marty＠texxar.cz 19 Apr '05

19 Apr '05

I'm trying to get my acounting program working under wine. So far I got it up and running with all dlls it needs. But whe I try to import .mdb database file I get the following error from the accounting program: "Undefined function CHR() in expression: INSERT INTO ........ P657'+CHR(13)+CHR(10)+......." and wine debug gives me this almost at the same time: ...... fixme:variant:VarBstrFromDec semi-stub fixme:variant:VarBstrFromDec semi-stub fixme:variant:VarBstrFromDec semi-stub fixme:ole:MSFT_ReadValue BSTR length = -1? fixme:ole:MSFT_ReadValue BSTR length = -1? fixme:ole:ITypeLibComp_fnBind (L"CHR", 107e4b, 0x3, 0x4068ac60, 0x4068ac54, 0x4068ac6c): stub fixme:ole:ITypeLibComp_fnBind (L"CHR", 107e4b, 0x3, 0x4068ac60, 0x4068ac54, 0x4068ac6c): stub fixme:ole:ITypeLibComp_fnBind (L"CHR", 107e4b, 0x3, 0x4068ac60, 0x4068ac54, 0x4068ac6c): stub ........ I understand this function converts ASCII code into the char. But I don;t know how to find out which library is causing the problem. Here is list of loaded libs when the app starts up: trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\advapi32.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\gdi32.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\user32.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\iphlpapi.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\rpcrt4.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\ole32.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\shlwapi.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\comctl32.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\shell32.dll" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module "krnl386.exe" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module "system.drv" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module "GDI.EXE" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module "USER.EXE" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module "keyboard.drv" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\x11drv.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\imm32.dll" : builtin err:dialog:EndDialog got invalid window handle ((nil)); buggy app !? trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\advapi32.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\gdi32.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\user32.dll" : builtin trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\StwGrd50.dll" : native trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\MSVCRT.dll" : native trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\MFC42.DLL" : native trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\iphlpapi.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\rpcrt4.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\ole32.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\shlwapi.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\comctl32.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\shell32.dll" : builtin trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\StwRex50.dll" : native trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\winspool.drv" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\oleaut32.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\winmm.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\lz32.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\version.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\msvfw32.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\comdlg32.dll" : builtin trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\StwTb633.dll" : native trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\StwRp50C.dll" : native trace:loaddll:MODULE_LoadModule16 Loaded module "krnl386.exe" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module "system.drv" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module "GDI.EXE" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module "USER.EXE" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module "keyboard.drv" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\x11drv.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\imm32.dll" : builtin trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\MFC42LOC.DLL" : native trace:loaddll:MODULE_LoadModule16 Loaded module "MMSYSTEM.DLL" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\msacm32.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\msacm.drv" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\midimap.drv" : builtin trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\StwTb63C.dll" : native trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\uxtheme.dll" : builtin fixme:ole:CoRegisterMessageFilter stub trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\riched20.dll" : builtin trace:loaddll:load_dll Loaded module L"c:\\windows\\system\\riched32.dll" : builtin err:x11drv:X11DRV_CreateWindow invalid window width -4 err:x11drv:X11DRV_CreateWindow invalid window width -22 err:x11drv:X11DRV_CreateWindow invalid window width -4 fixme:richedit:RichEditANSIWndProc EM_FORMATRANGE: stub fixme:richedit:RichEditANSIWndProc EM_DISPLAYBAND: stub trace:loaddll:load_dll Loaded module L"C:\\PROGRAM FILES\\COMMON FILES\\MICROSOFT SHARED\\DAO\\DAO360.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\mswstr10.dll" : native trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\MSJET40.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\vbajet32.dll" : native trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\expsrv.dll" : native trace:loaddll:MODULE_FlushModrefs Unloaded module L"C:\\windows\\system\\vbajet32.dll" : native trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\MSJINT40.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\MSJTER40.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\MSWDAT10.DLL" : native trace:loaddll:MODULE_FlushModrefs Unloaded module L"C:\\windows\\system\\MSWDAT10.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\MSWDAT10.DLL" : native trace:loaddll:MODULE_FlushModrefs Unloaded module L"C:\\windows\\system\\MSWDAT10.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\MSDART32.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\PROGRAM FILES\\COMMON FILES\\SYSTEM\\ADO\\MSADO15.DLL" : native fixme:ole:CoCreateInstance no classfactory created for CLSID {6c736db1-bd94-11d0-8a23-00aa00b58e10}, hres is 0x80040154 trace:loaddll:load_dll Loaded module L"C:\\PROGRAM FILES\\COMMON FILES\\SYSTEM\\OLE DB\\OLEDB32.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\PROGRAM FILES\\COMMON FILES\\SYSTEM\\OLE DB\\OLEDB32R.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\MSJETOLEDB40.DLL" : native fixme:ole:CoCreateInstance no classfactory created for CLSID {ecabb0c0-7f19-11d2-978e-0000f8757e2a}, hres is 0x80040154 trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\mtxdm.dll" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\MSJTES40.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\windows\\system\\VBAJET32.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\MSRD3X40.DLL" : native fixme:richedit:RichEditANSIWndProc EM_FORMATRANGE: stub fixme:richedit:RichEditANSIWndProc EM_DISPLAYBAND: stub fixme:commdlg:GetFileName95 Flags 0x00800000 not yet implemented fixme:advapi:GetFileSecurityW (L"C:\\Program Files\\StormWare\\Pohoda\\Data\\Pohoda.sys") : returns fake SECURITY_DESCRIPTOR trace:loaddll:load_dll Loaded module L"C:\\Program Files\\StormWare\\Pohoda\\PhDB.dll" : native Thanks, Marty

2 1

Pipe names are case sensitive.
by Troy Rollo 19 Apr '05

19 Apr '05

Pipe names are currently case sensitive. This affects instmsiw.exe since the service is created as "MSIService" and connected to as "MsiService". The result is that instmsiw.exe always fails to query the service status. I have insmsiw.exe from Office 2K working (at least to get as far as installing Microsoft's version of MSI) with the patches I just sent through to wine-patches, plus the hack below (which will also fix the problem for other IPC objects). One alternative to this hack would appear to be to make sync_namespace case insensitive in wineserver, although I am not sure if that is the correct approach. It seems to me that sync_namespace must have been chosen as case sensitive for a reason, although a grep doesn't reveal anything that should obviously be case sensitive in that namespace. A third alternative would be to have find_object and create_object take a flag that forces case insensitivity even in a case sensitive namespace. Which approach is to be preferred here? Index: ntdll/path.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/path.c,v retrieving revision 1.28 diff -u -r1.28 path.c --- ntdll/path.c 13 Aug 2004 23:53:44 -0000 1.28 +++ ntdll/path.c 19 Apr 2005 05:34:20 -0000 @@ -360,6 +360,16 @@ break; } + /* This is an ugly hack that will never make it into WINE */ + if (offset == 4) + { + WCHAR *src = ptr + offset; + WCHAR *dst = ntpath->Buffer + strlenW(ntpath->Buffer); + + while (*src) + *dst++ = RtlUpcaseUnicodeChar(*src++); + *dst = 0; + } else strcatW(ntpath->Buffer, ptr + offset); ntpath->Length = strlenW(ntpath->Buffer) * sizeof(WCHAR);

4 4

Re: msi: PublishComponents and MsiGetQualifiedComponentExW
by Mike McCormack 19 Apr '05

19 Apr '05

Aric Stewart wrote: > + WCHAR buf[21]; > + WCHAR buf2[21]; It would be nicer to get rid of the magic numbers, and to call the variables something more meaningful than buf1, buf2. > + rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view); > + if (rc != ERROR_SUCCESS) > + return ERROR_SUCCESS; > + > + rc = MSI_IterateRecords(view, NULL, ITERATE_PublishComponent, package); > > return rc; > } You need to release the view you opened. MSI_IterateRecords leaves the view intact (it does not call msiobj_release). > @@ -1297,11 +1298,93 @@ > DWORD Unused1, DWORD Unused2, LPWSTR lpPathBuf, > DWORD* pcchPathBuf) > { > - FIXME("%s %s %li %s %li %li %p %p\n", debugstr_w(szComponent), > + HKEY hkey; > + UINT rc; > + WCHAR info[124]; What is info, and why is it 124 bytes long? > + DWORD sz; > + LPWSTR product = NULL; > + LPWSTR component = NULL; > + LPWSTR ptr; > + GUID clsid; > + > + TRACE("%s %s %li %s %li %li %p %p\n", debugstr_w(szComponent), > debugstr_w(szQualifier), dwInstallMode, debugstr_w(szProduct), > Unused1, Unused2, lpPathBuf, pcchPathBuf); > + > + rc = MSIREG_OpenUserComponentsKey(szComponent, &hkey, FALSE); > + if (rc != ERROR_SUCCESS) > + return ERROR_INDEX_ABSENT; > + > + sz = sizeof(info); > + rc = RegQueryValueExW( hkey, szQualifier, NULL, NULL, (LPVOID) info, &sz); > + if (rc != ERROR_SUCCESS) > + return ERROR_INDEX_ABSENT; You need to close the hkey you opened. > + rc = MsiProvideQualifiedComponentW(szwComponent, szwQualifier, > + dwInstallMode, lpwPathBuf, &pcchwPathBuf); > + > + HeapFree(GetProcessHeap(),0,szwComponent); > + HeapFree(GetProcessHeap(),0,szwQualifier); > + WideCharToMultiByte(CP_ACP, 0, lpwPathBuf, pcchwPathBuf, lpPathBuf, > + *pcchPathBuf, NULL, NULL); > + *pcchPathBuf = pcchwPathBuf; This is wrong for multibyte locales, isn't it? > Index: dlls/msi/msipriv.h > =================================================================== > RCS file: /home/wine/wine/dlls/msi/msipriv.h,v > retrieving revision 1.52 > diff -u -r1.52 msipriv.h > --- dlls/msi/msipriv.h 11 Apr 2005 12:47:20 -0000 1.52 > +++ dlls/msi/msipriv.h 18 Apr 2005 18:57:52 -0000 > @@ -357,6 +357,7 @@ > extern UINT MSIREG_OpenFeatures(HKEY* key); > extern UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create); > extern UINT MSIREG_OpenComponents(HKEY* key); > +extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); > extern UINT MSIREG_OpenComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); > extern UINT MSIREG_OpenProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create); > extern UINT MSIREG_OpenUserFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create); Can't we have one or two functions that do the same thing as all the above to avoid the duplication of similar code? Mike

2 1

regression: scrolling in WordViewer97
by Saulius Krasuckas 19 Apr '05

19 Apr '05

The patch [1] causes WordViewer97 to stop redrawing correctly after the visible part of a loaded document has been scrolled. I may switch to another workspace and back to paint the thing OK and this annoys me. I think it is a bug. Is it related to another bug reports? Or should I fill a new one? [1] http://www.winehq.org/hypermail/wine-cvs/2005/03/0493.html

3 2

set ver = ?
by Wesley Parish 19 Apr '05

19 Apr '05

does Wine have anything that does that? I've just tried "wine MS\ .net\ framework\ SDK\ -\ with\ C-sharp\ compiler\ Setup.exe" and it told me that it couldn't install on Win95, Win98 etc, and I'd have to upgrade to NT 4.0 before it would install. Any hints, ideas, previous experience on configuring Wine for suchlike? Thanks Wesley Parish -- Clinersterton beademung, with all of love - RIP James Blish ----- Mau e ki, he aha te mea nui? You ask, what is the most important thing? Maku e ki, he tangata, he tangata, he tangata. I reply, it is people, it is people, it is people.

2 1

Re: NTDLL: implement NtSignalAndWaitForSingleObject
by Robert Shearman 19 Apr '05

19 Apr '05

Mike McCormack wrote: > > ChangeLog: > * implement NtSignalAndWaitForSingleObject >Index: server/thread.c >=================================================================== >RCS file: /home/wine/wine/server/thread.c,v >retrieving revision 1.110 >diff -u -p -r1.110 thread.c >--- server/thread.c 4 Mar 2005 12:38:36 -0000 1.110 >+++ server/thread.c 18 Apr 2005 16:28:02 -0000 >@@ -577,6 +577,73 @@ void wake_up( struct object *obj, int ma > } > } > >+/* >+ * signal_object >+ * >+ * Try signaling an event flag, a semaphore or a mutex. >+ * FIXME: find out which operation to do by checking the type of object >+ */ >+static void signal_object( obj_handle_t handle ) >+{ >+ /* is it an event flag? */ >+ set_error( STATUS_SUCCESS ); >+ event_operation( handle, SET_EVENT ); >+ if (get_error() != STATUS_OBJECT_TYPE_MISMATCH) >+ return; >+ >+ /* is it a semaphore? */ >+ set_error( STATUS_SUCCESS ); >+ release_semaphore( handle, 1, NULL ); >+ if (get_error() != STATUS_OBJECT_TYPE_MISMATCH) >+ return; >+ >+ /* is it a mutex? */ >+ set_error( STATUS_SUCCESS ); >+ release_mutex( handle, NULL ); >+ if (get_error() != STATUS_OBJECT_TYPE_MISMATCH) >+ return; >+ >+ set_error( STATUS_INVALID_HANDLE ); >+} > > I think this is a little ugly. I'd prefer to see this code do a switch on obj->ops and call the relevant function with the raw object instead of a handle. >+ >+static void signal_and_wait( obj_handle_t hsignal, struct object *wait, >+ int flags, const abs_time_t *timeout ) >+{ >+ int r; >+ >+ if (!wait_on( 1, &wait, flags, timeout )) >+ return; >+ >+ /* signal the object */ >+ signal_object( hsignal ); >+ if (get_error()) >+ { >+ end_wait( current ); >+ return; >+ } >+ >+ /* check if we woke ourselves up */ >+ if (!current->wait) >+ return; >+ >+ r = check_wait( current ); >+ if (r != -1) >+ { >+ end_wait( current ); >+ set_error( r ); >+ return; >+ } >+ >+ /* check if we need to wait */ >+ if (!(flags & SELECT_TIMEOUT)) >+ return; >+ >+ current->wait->user = add_timeout_user( &current->wait->timeout, >+ thread_timeout, current->wait ); >+ if (!current->wait->user) >+ end_wait( current ); >+} >+ > /* queue an async procedure call */ > int thread_queue_apc( struct thread *thread, struct object *owner, void *func, > enum apc_type type, int system, void *arg1, void *arg2, void *arg3 ) > > This seems to be pretty similar to select_on. Would it not be possible to use that function instead of duplicating that code? Rob

2 4

Enabling Gecko in MSHTML
by Jacek Caban 18 Apr '05

18 Apr '05

Hi. Now MSHTML is ready for a patch that enables HTML rendering over Gecko API. I attached the patch that makes IE works with Wine's MSHTML. Any comments/suggestions are welcome. If you want to see how it works, you need to have a working installation of IE and Mozilla installed under Wine. Then just set mshtml.dll to be loaded as built in. Excluding many not implemented parts of API, it needs a better algorithm searching for Mozilla installation (eg. currently it can't work with only Mozilla ActiveX Control installed) and better messaging user that it needs Mozilla, but I'll fix it in next patches. I'm not sure if I should presently send it to wine-patches. I still hope we can make it work with Linux versions of Mozilla. It would be much better as applications could 'just run' for users that have Linux Mozilla installed (and most have), without any additional installation/downloading . I tried to do it, but without success as yet. Problem is that we need to pass a native window handle to nsIBaseWindow::InitWindow (you may see this call in view.c). In case of windows version it's no problem as it means passing HWND, but in case of Linux it is Gtk/GdkWindow (well, not always as Mozilla can be built to use xlib or qt, but currently in most cases it's not and we can take care of it later). To not use gtk/gdk directly in Wine we could patch Mozilla to detect XID passed and use gdk_window_foreign_new to create GdkWindow. It should work, I believe, but I was not able to do so. It would be wonderful if anyone could give me any insight on it, eg. I'm not sure if I have a good understanding of how to get the XID for Wine's window. Also I'd like to know if using gdk inside Wine's windows needs any tricks/is possible. If you think I should give up and stay with the Windows version, I'll send this patch to wine-patches. Thanks, Jacek ? dlls/mshtml/diff ? dlls/mshtml/nsapi.c ? dlls/mshtml/nsembd.c ? dlls/mshtml/nsiface.idl ? dlls/mshtml/tests Index: dlls/mshtml/.cvsignore =================================================================== RCS file: /home/wine/wine/dlls/mshtml/.cvsignore,v retrieving revision 1.2 diff -u -p -r1.2 .cvsignore --- dlls/mshtml/.cvsignore 24 Mar 2004 03:36:47 -0000 1.2 +++ dlls/mshtml/.cvsignore 17 Apr 2005 20:50:52 -0000 @@ -1,3 +1,4 @@ Makefile mshtml.dll.dbg.c mshtml.spec.def +nsiface.h Index: dlls/mshtml/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/mshtml/Makefile.in,v retrieving revision 1.10 diff -u -p -r1.10 Makefile.in --- dlls/mshtml/Makefile.in 14 Apr 2005 11:30:50 -0000 1.10 +++ dlls/mshtml/Makefile.in 17 Apr 2005 20:50:52 -0000 @@ -10,9 +10,12 @@ EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ htmldoc.c \ main.c \ + nsembd.c \ oleobj.c \ persist.c \ view.c + +IDL_SRCS = nsiface.idl @MAKE_DLL_RULES@ Index: dlls/mshtml/htmldoc.c =================================================================== RCS file: /home/wine/wine/dlls/mshtml/htmldoc.c,v retrieving revision 1.6 diff -u -p -r1.6 htmldoc.c --- dlls/mshtml/htmldoc.c 15 Apr 2005 16:12:45 -0000 1.6 +++ dlls/mshtml/htmldoc.c 17 Apr 2005 20:50:52 -0000 @@ -106,6 +106,7 @@ static ULONG WINAPI HTMLDocument_Release TRACE("(%p) ref = %lu\n", This, ref); if(!ref) { + NSContainer_Destroy(This->nscontainer); if(This->client) IOleClientSite_Release(This->client); if(This->ipsite) @@ -949,6 +950,8 @@ HRESULT HTMLDocument_Create(IUnknown *pU hres = IHTMLDocument_QueryInterface(HTMLDOC(ret), riid, ppvObject); if(FAILED(hres)) HeapFree(GetProcessHeap(), 0, ret); + + ret->nscontainer = NSContainer_Create(ret); HTMLDocument_Persist_Init(ret); HTMLDocument_OleObj_Init(ret); Index: dlls/mshtml/main.c =================================================================== RCS file: /home/wine/wine/dlls/mshtml/main.c,v retrieving revision 1.9 diff -u -p -r1.9 main.c --- dlls/mshtml/main.c 14 Apr 2005 11:30:50 -0000 1.9 +++ dlls/mshtml/main.c 17 Apr 2005 20:50:52 -0000 @@ -30,8 +30,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" -#include "winreg.h" #include "ole2.h" #include "docobj.h" @@ -43,78 +41,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -#include "initguid.h" - -DEFINE_GUID( CLSID_MozillaBrowser, 0x1339B54C,0x3453,0x11D2,0x93,0xB9,0x00,0x00,0x00,0x00,0x00,0x00); - -typedef HRESULT (WINAPI *fnGetClassObject)(REFCLSID rclsid, REFIID iid, LPVOID *ppv); -typedef BOOL (WINAPI *fnCanUnloadNow)(); - -static HMODULE hMozCtl; - HINSTANCE hInst; -/* convert a guid to a wide character string */ -static void MSHTML_guid2wstr( const GUID *guid, LPWSTR wstr ) -{ - char str[40]; - - sprintf(str, "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - MultiByteToWideChar( CP_ACP, 0, str, -1, wstr, 40 ); -} - -static BOOL MSHTML_GetMozctlPath( LPWSTR szPath, DWORD sz ) -{ - DWORD r, type; - BOOL ret = FALSE; - HKEY hkey; - static const WCHAR szPre[] = { - 'S','o','f','t','w','a','r','e','\\', - 'C','l','a','s','s','e','s','\\', - 'C','L','S','I','D','\\',0 }; - static const WCHAR szPost[] = { - '\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0 }; - WCHAR szRegPath[(sizeof(szPre)+sizeof(szPost))/sizeof(WCHAR)+40]; - - strcpyW( szRegPath, szPre ); - MSHTML_guid2wstr( &CLSID_MozillaBrowser, &szRegPath[strlenW(szRegPath)] ); - strcatW( szRegPath, szPost ); - - TRACE("key = %s\n", debugstr_w( szRegPath ) ); - - r = RegOpenKeyW( HKEY_LOCAL_MACHINE, szRegPath, &hkey ); - if( r != ERROR_SUCCESS ) - return FALSE; - - r = RegQueryValueExW( hkey, NULL, NULL, &type, (LPBYTE)szPath, &sz ); - ret = ( r == ERROR_SUCCESS ) && ( type == REG_SZ ); - RegCloseKey( hkey ); - - return ret; -} - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { - WCHAR szPath[MAX_PATH]; - switch(fdwReason) { case DLL_PROCESS_ATTACH: - if(MSHTML_GetMozctlPath(szPath, sizeof szPath)) { - hMozCtl = LoadLibraryExW(szPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - if(!hMozCtl) - ERR("Can't load the Mozilla ActiveX control\n"); - }else { - MESSAGE("You need to install the Mozilla ActiveX control to\n"); - MESSAGE("use Wine's builtin MSHTML dll.\n"); - } hInst = hInstDLL; break; case DLL_PROCESS_DETACH: - if(hMozCtl) - FreeLibrary( hMozCtl ); + close_gecko(); break; } return TRUE; @@ -205,20 +141,6 @@ static HRESULT ClassFactory_Create(REFII HRESULT WINAPI MSHTML_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { HRESULT hres; - fnGetClassObject pGetClassObject; - - TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv ); - - if(hMozCtl && IsEqualGUID(&CLSID_HTMLDocument, rclsid)) { - pGetClassObject = (fnGetClassObject) GetProcAddress(hMozCtl, "DllGetClassObject"); - if(pGetClassObject) { - hres = pGetClassObject(&CLSID_MozillaBrowser, riid, ppv); - if(SUCCEEDED(hres)) { - TRACE("returning Mozilla ActiveX Control hres = %08lx *ppv = %p\n", hres, *ppv); - return hres; - } - } - } if(IsEqualGUID(&CLSID_HTMLDocument, rclsid)) { hres = ClassFactory_Create(riid, ppv, HTMLDocument_Create); @@ -232,21 +154,8 @@ HRESULT WINAPI MSHTML_DllGetClassObject( HRESULT WINAPI MSHTML_DllCanUnloadNow(void) { - fnCanUnloadNow pCanUnloadNow = NULL; - HRESULT hres; - - TRACE("()\n"); - - if(hMozCtl) - pCanUnloadNow = (fnCanUnloadNow) GetProcAddress(hMozCtl, "DllCanUnloadNow"); - if(!pCanUnloadNow) - return S_FALSE; - - hres = pCanUnloadNow(); - - TRACE("hres = %08lx\n", hres); - - return hres; + FIXME("()\n"); + return S_FALSE; } /* appears to have the same prototype as WinMain */ Index: dlls/mshtml/mshtml_private.h =================================================================== RCS file: /home/wine/wine/dlls/mshtml/mshtml_private.h,v retrieving revision 1.6 diff -u -p -r1.6 mshtml_private.h --- dlls/mshtml/mshtml_private.h 15 Apr 2005 16:12:45 -0000 1.6 +++ dlls/mshtml/mshtml_private.h 17 Apr 2005 20:50:52 -0000 @@ -16,7 +16,37 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "nsiface.h" + +#define NS_OK ((nsresult)0x00000000L) +#define NS_NOINTERFACE ((nsresult)0x80004002L) +#define NS_ERROR_NOT_IMPLEMENTED ((nsresult)0x80004001L) + +#define NS_FAILED(res) ((res) & 0x80000000) +#define NS_SUCCEEDED(res) (!NS_FAILED(res)) + +typedef struct HTMLDocument HTMLDocument; + typedef struct { + const nsIWebBrowserChromeVtbl *lpWebBrowserChromeVtbl; + const nsIEmbeddingSiteWindowVtbl *lpEmbeddingSiteWindowVtbl; + + HTMLDocument *doc; + + nsIWebBrowser *webbrowser; + nsIWebNavigation *navigation; + nsIBaseWindow *window; + + LPWSTR url; +} NSContainer; + +#define NSWBCHROME(x) ((nsIWebBrowserChrome*) &(x)->lpWebBrowserChromeVtbl) +#define NSEMBSW(x) ((nsIEmbeddingSiteWindow*) &(x)->lpEmbeddingSiteWindowVtbl) + +NSContainer* NSContainer_Create(HTMLDocument *pdoc); +void NSContainer_Destroy(NSContainer *This); + +struct HTMLDocument { IHTMLDocument2Vtbl *lpHTMLDocument2Vtbl; IPersistMonikerVtbl *lpPersistMonikerVtbl; IPersistFileVtbl *lpPersistFileVtbl; @@ -28,12 +58,14 @@ typedef struct { ULONG ref; + NSContainer *nscontainer; + IOleClientSite *client; IOleInPlaceSite *ipsite; IOleInPlaceFrame *frame; HWND hwnd; -} HTMLDocument; +}; #define HTMLDOC(x) ((IHTMLDocument2*) &(x)->lpHTMLDocument2Vtbl) #define PERSIST(x) ((IPersist*) &(x)->lpPersistFileVtbl) @@ -50,5 +82,7 @@ HRESULT HTMLDocument_Create(IUnknown*,RE void HTMLDocument_Persist_Init(HTMLDocument*); void HTMLDocument_OleObj_Init(HTMLDocument*); void HTMLDocument_View_Init(HTMLDocument*); + +void close_gecko(); extern HINSTANCE hInst; Index: dlls/mshtml/persist.c =================================================================== RCS file: /home/wine/wine/dlls/mshtml/persist.c,v retrieving revision 1.2 diff -u -p -r1.2 persist.c --- dlls/mshtml/persist.c 12 Apr 2005 11:57:51 -0000 1.2 +++ dlls/mshtml/persist.c 17 Apr 2005 20:50:52 -0000 @@ -78,7 +78,33 @@ static HRESULT WINAPI PersistMoniker_IsD static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAvailable, IMoniker *pimkName, LPBC pibc, DWORD grfMode) { - FIXME("(%p)->(%x %p %p %08lx)\n", iface, fFullyAvailable, pimkName, pibc, grfMode); + PERSISTMON_THIS + LPWSTR url; + HRESULT hres; + nsresult nsres; + + FIXME("(%p)->(%x %p %p %08lx)\n", This, fFullyAvailable, pimkName, pibc, grfMode); + + hres = IMoniker_GetDisplayName(pimkName, pibc, NULL, &url); + if(FAILED(hres)) + return hres; + TRACE("got url: %s\n", debugstr_w(url)); + + /* FIXME: + * This is a HACK, we should use moniker's BindToStorage instead of gecko's LoadURI. + */ + if(This->nscontainer) { + if(This->nscontainer->window) { + nsres = nsIWebNavigation_LoadURI(This->nscontainer->navigation, url, LOAD_FLAGS_NONE, NULL, NULL, NULL); + if(NS_FAILED(nsres)) + WARN("LoadURI failed: %08lx\n", nsres); + }else { + This->nscontainer->url = url; + } + }else { + HeapFree(GetProcessHeap(), 0, url); + } + return S_OK; } Index: dlls/mshtml/view.c =================================================================== RCS file: /home/wine/wine/dlls/mshtml/view.c,v retrieving revision 1.3 diff -u -p -r1.3 view.c --- dlls/mshtml/view.c 15 Apr 2005 16:12:45 -0000 1.3 +++ dlls/mshtml/view.c 17 Apr 2005 20:50:52 -0000 @@ -70,8 +70,35 @@ static void paint_disabled(HWND hwnd) { static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - if(msg == WM_PAINT) - paint_disabled(hwnd); + HTMLDocument *This; + nsresult nsres; + + static const WCHAR wszTHIS[] = {'T','H','I','S',0}; + + if(msg == WM_CREATE) { + This = *(HTMLDocument**)lParam; + TRACE("(%p)->(WM_CREATE)\n", This); + SetPropW(hwnd, wszTHIS, This); + }else { + This = (HTMLDocument*)GetPropW(hwnd, wszTHIS); + } + + switch(msg) { + case WM_PAINT: + TRACE("(%p)->(WM_PAINT)\n", This); + if(!This->nscontainer) + paint_disabled(hwnd); + break; + case WM_SIZE: + TRACE("(%p)->(WM_SIZE)\n", This); + if(This->nscontainer && This->nscontainer->window) { + nsres = nsIBaseWindow_SetSize(This->nscontainer->window, + LOWORD(lParam), HIWORD(lParam), TRUE); + if(NS_FAILED(nsres)) + WARN("SetSize failed: %08lx\n", nsres); + } + break; + }; return DefWindowProcW(hwnd, msg, wParam, lParam); } @@ -90,6 +117,68 @@ static void register_serverwnd_class() serverwnd_class = RegisterClassExW(&wndclass); } +static void activate_container(HTMLDocument *This, LPRECT rect) { + nsIWebBrowserSetup *wbsetup; + nsresult nsres; + + if(!This->nscontainer) + return; + + if(!This->nscontainer->window) { + nsres = nsIWebBrowser_QueryInterface(This->nscontainer->webbrowser, &IID_nsIBaseWindow, + (void**)&This->nscontainer->window); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIBaseWindow interface: %08lx\n", nsres); + return; + } + } + + nsres = nsIWebBrowser_SetContainerWindow(This->nscontainer->webbrowser, NSWBCHROME(This->nscontainer)); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIWebBrowser_QueryInterface(This->nscontainer->webbrowser, + &IID_nsIWebBrowserSetup, (void**)&wbsetup); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIWebBrowserSetup_SetProperty(wbsetup, SETUP_IS_CHROME_WRAPPER, TRUE); + if(NS_FAILED(nsres)) + ERR("SetProperty failed: %08lx\n", nsres); + nsIWebBrowserSetup_Release(wbsetup); + }else { + ERR("Could not get nsIWebBrowserSetup interface\n"); + } + nsres = nsIWebBrowser_QueryInterface(This->nscontainer->webbrowser, + &IID_nsIBaseWindow, (void**)&This->nscontainer->window); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIBaseWindow_InitWindow(This->nscontainer->window, This->hwnd, NULL, + 0, 0, rect->right, rect->bottom); + if(nsres == NS_OK) { + nsres = nsIBaseWindow_Create(This->nscontainer->window); + if(NS_FAILED(nsres)) + ERR("Creating window failed: %08lx\n", nsres); + nsres = nsIBaseWindow_SetVisibility(This->nscontainer->window, TRUE); + if(NS_FAILED(nsres)) + ERR("SetVisibility failed: %08lx\n", nsres); + nsIBaseWindow_SetEnabled(This->nscontainer->window, TRUE); + if(NS_FAILED(nsres)) + ERR("SetEnabled failes: %08lx\n", nsres); + }else { + ERR("Initializing window failed: %08lx\n", nsres); + } + }else { + ERR("Could not get nsIBaseWindow interface: %08lx\n", nsres); + } + }else { + WARN("SetContainerWindow failed: %08lx\n", nsres); + } + + if(This->nscontainer->url) { + nsres = nsIWebNavigation_LoadURI(This->nscontainer->navigation, This->nscontainer->url, + LOAD_FLAGS_NONE, NULL, NULL, NULL); + if(NS_FAILED(nsres)) + WARN("LoadURI failed: %08lx\n", nsres); + HeapFree(GetProcessHeap(), 0, This->nscontainer->url); + This->nscontainer->url = NULL; + } +} /********************************************************** * IOleDocumentView implementation @@ -211,7 +300,7 @@ static HRESULT WINAPI OleDocumentView_Sh TRACE("(%p)->(%x)\n", This, fShow); if(This->hwnd) - ShowWindow(This->hwnd, fShow); + ShowWindow(This->hwnd, fShow ? SW_SHOW : SW_HIDE); return S_OK; } @@ -297,6 +386,8 @@ static HRESULT WINAPI OleDocumentView_UI IOleInPlaceFrame_Release(This->frame); This->frame = pIPFrame; This->hwnd = hwnd; + + activate_container(This, &posrect); }else { static const WCHAR wszEmpty[] = {0}; --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ dlls/mshtml/nsiface.idl 2005-04-17 22:52:17.000000000 +0200 @@ -0,0 +1,221 @@ +/* + * Copyright 2005 Jacek Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * NOTE: + * This file is not an usual idl file. Interfaces in this file are XPCOM interfaces + * (NOT MSCOM!), but we generate the header file compatibile with XPCOM by WIDL. + * The main reason to do this is that we have to use them in the C code. + */ + +import "wtypes.idl"; + +typedef HRESULT nsresult; +typedef ULONG nsrefcnt; + +typedef IID nsIID; +typedef nsIID nsCID; +typedef REFIID nsIIDRef; +typedef nsIIDRef nsCIDRef; + +typedef void** nsQIResult; +typedef LPSTR nsstring; +typedef WCHAR PRUnichar; +typedef LPWSTR nswstring; +typedef ULONG PRUint32; +typedef LONG PRInt32; +typedef BOOL PRBool; + +interface nsIWebBrowserChrome; + +[ + object, + uuid(00000000-0000-0000-c000-000000000046) +] +interface nsISupports +{ + nsresult QueryInterface([in] nsIIDRef riid, [out] nsQIResult result); + nsrefcnt AddRef(); + nsrefcnt Release(); +} + +/* Currently we don't need a full declaration of this interfaces */ +typedef nsISupports nsIWeakReference; +typedef nsISupports nsIURIContentListener; +typedef nsISupports nsIDOMWindow; +typedef nsISupports nsIInputStream; +typedef nsISupports nsIDOMDocument; +typedef nsISupports nsIURI; +typedef nsISupports nsISHistory; + +[ + object, + uuid(8bb35ed9-e332-462d-9155-4a002ab5c958) +] +interface nsIServiceManager : nsISupports +{ + void getService([in] nsCIDRef aClass, [in] nsIIDRef aIID, [out] nsQIResult result); + void getServiceByContactID([in] nsstring aContactID, [in] nsIIDRef aIID, + [out] nsQIResult result); + BOOL isServiceInstantiated([in] nsCIDRef aClass, [in] nsIIDRef aIID); + BOOL isServiceInstantiatedByContractID([in] nsstring aContractID, [in] nsIIDRef aIID); +} + +[ + object, + uuid(db242e01-e4d9-11d2-9dde-000064657374) +] +interface nsIObserver : nsISupports +{ + nsresult Observe([in] nsISupports *aSubject, [in] nsstring aTopic, [in] nswstring aData); +} + +[ + object, + uuid(a88e5a60-205a-4bb1-94e1-2628daf51eae) +] +interface nsIComponentManager : nsISupports +{ + nsresult GetClassObject([in] nsCIDRef aClass, [in] nsIIDRef aIID, [out] nsQIResult result); + nsresult GetClassObjectByContractID([in] nsstring aContractID, [in] nsIIDRef aIID, + [out] nsQIResult result); + nsresult CreateInstance([in] nsCIDRef aClass, [in] nsISupports *aDelegate, [in] nsIIDRef aIID, + [out] nsQIResult result); + nsresult CreateInstanceByContractID([in] nsstring aContractID, [in] nsISupports *aDelegate, + [in] nsIIDRef aIID, [out] nsQIResult result); +} + +[ + object, + uuid(69e5df00-7b8b-11d3-af61-00a024ffc08c) +] +interface nsIWebBrowser : nsISupports +{ + nsresult AddWebBrowserListener(nsIWeakReference *aListener, const nsIID *aIID); + nsresult RemoveWebBrowserListener(nsIWeakReference *aListener, const nsIID *aIID); + nsresult GetContainerWindow(nsIWebBrowserChrome **aContainerWindow); + nsresult SetContainerWindow(nsIWebBrowserChrome *aContainerWindow); + nsresult GetParentURIContentListener(nsIURIContentListener **aParentURIContentListener); + nsresult SetParentURIContentListener(nsIURIContentListener *aParentURIContentListener); + nsresult GetContentDOMWindow(nsIDOMWindow **aContentDOMWindow); +} + +[ + object, + uuid(ba434c60-9d52-11d3-afb0-00a024ffc08c) +] +interface nsIWebBrowserChrome : nsISupports +{ + nsresult SetStatus([in] PRUint32 statusType, [in] const PRUnichar *status); + nsresult GetWebBrowser(nsIWebBrowser **aWebBrowser); + nsresult SetWebBrowser(nsIWebBrowser *aWebBrowser); + nsresult GetChromeFlags(PRUint32 *aChromeFlags); + nsresult SetChromeFlags(PRUint32 aChromeFlags); + nsresult DestroyBrowserWindow(); + nsresult SizeBrowserTo(PRInt32 aCX, PRInt32 aCY); + nsresult ShowAsModal(); + nsresult IsWindowModal(PRBool *_retval); + nsresult ExitModalEventLoop(nsresult aStatus); +} + +[ + object, + uuid(3e5432cd-9568-4bd1-8cbe-d50aba110743) +] +interface nsIEmbeddingSiteWindow : nsISupports +{ + nsresult SetDimensions(PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy); + nsresult GetDimensions(PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy); + nsresult SetFocus(); + nsresult GetVisibility(PRBool *aVisibility); + nsresult SetVisibility(PRBool aVisibility); + nsresult GetTitle(PRUnichar **aTitle); + nsresult SetTitle(const PRUnichar *aTitle); + nsresult GetSiteWindow(void **aSiteWindow); +} + +cpp_quote("#define SETUP_IS_CHROME_WRAPPER 7"); + +[ + object, + uuid(f15398a0-8018-11d3-af70-00a024ffc08c) +] +interface nsIWebBrowserSetup : nsISupports +{ + nsresult SetProperty(PRUint32 aId, PRUint32 aValue); +} + +typedef void* nativeWindow; +typedef void* nsIWidget; + +[ + object, + uuid(046bc8a0-8015-11d3-af70-00a024ffc08c) +] +interface nsIBaseWindow : nsISupports +{ + nsresult InitWindow(nativeWindow parentNativeWindow, nsIWidget *parentWidget, PRInt32 x, + PRInt32 y, PRInt32 cx, PRInt32 cy); + nsresult Create(); + nsresult Destroy(); + nsresult SetPosition(PRInt32 x, PRInt32 y); + nsresult GetPosition(PRInt32 *x, PRInt32 *y); + nsresult SetSize(PRInt32 cx, PRInt32 cy, PRBool fRepaint); + nsresult GetSize(PRInt32 *cx, PRInt32 *cy); + nsresult SetPositionAndSize(PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy, PRBool fRepaint); + nsresult GetPositionAndSize(PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy); + nsresult Repaint(PRBool force); + nsresult GetParentWidget(nsIWidget **aParentWidget); + nsresult SetParentWidget(nsIWidget *aParentWidget); + nsresult GetParentNativeWindow(nativeWindow *aParentNativeWindow); + nsresult SetParentNativeWindow(nativeWindow aParentNativeWindow); + nsresult GetVisibility(PRBool *aVisibility); + nsresult SetVisibility(PRBool aVisibility); + nsresult GetEnabled(PRBool *aEnabled); + nsresult SetEnabled(PRBool aEnabled); + nsresult GetBlurSuppression(PRBool *aBlurSuppression); + nsresult SetBlurSuppression(PRBool aBlurSuppression); + nsresult GetMainWidget(nsIWidget **aMainWidget); + nsresult SetFocus(); + nsresult GetTitle(PRUnichar **aTitle); + nsresult SetTitle(const PRUnichar *aTitle); +} + +cpp_quote("#define LOAD_FLAGS_NONE 0"); + +[ + object, + uuid(f5d9e7b0-d930-11d3-b057-00a024ffc08c) +] +interface nsIWebNavigation : nsISupports +{ + nsresult GetCanGoBack(PRBool *aCanGoBack); + nsresult GetCanGoForward(PRBool *aCanGoForward); + nsresult GoBack(); + nsresult GoForward(); + nsresult GotoIndex(PRInt32 index); + nsresult LoadURI(const PRUnichar *aURI, PRUint32 aLoadFlags, nsIURI *aReferrer, + nsIInputStream *aPostData, nsIInputStream *aHeaders); + nsresult Reload(PRUint32 aReloadFlags); + nsresult Stop(PRUint32 aStopFlags); + nsresult GetDocument(nsIDOMDocument **aDocument); + nsresult GetCurrentURI(nsIURI **aCurrentURI); + nsresult GetReferringURI(nsIURI **aReferringURI); + nsresult GetSessionHistory(nsISHistory **aSessionHistory); + nsresult SetSessionHistory(nsISHistory *aSessionHistory); +} --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ dlls/mshtml/nsembd.c 2005-04-17 19:58:35.000000000 +0200 @@ -0,0 +1,500 @@ +/* + * Copyright 2005 Jacek Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "ole2.h" +#include "docobj.h" + +#include "mshtml.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +#include "initguid.h" +#include "mshtml_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +DEFINE_GUID(CLSID_StartupNotifier, 0x1f59b001,0x02c9,0x11d5,0xae,0x76,0xcc,0x92,0xf7,0xdb,0x9e,0x03); +DEFINE_GUID(CLSID_nsWebBrowser, 0xf1eac761,0x87e9,0x11d3,0xaf,0x80,0x00,0xa0,0x24,0xff,0xc0,0x8c); + +#define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1" +#define NS_WEBBROWSER_CONTRACTID "@mozilla.org/embedding/browser/nsWebBrowser;1" + +#define APPSTARTUP_TOPIC "app-startup" + +#define PR_UINT32_MAX 0xffffffff + +static const WCHAR mozilla_key_path[] = + {'S','o','f','t','w','a','r','e','\\', + 'm','o','z','i','l','l','a','.','o','r','g','\\', + 'G','R','E',0}; + +static const WCHAR wszGreHome[] = {'G','r','e','H','o','m','e',0}; + +typedef struct { + void *d1; + PRUint32 d2; + void *d3; +} nsString; + +/* Currently we don't need a full declaration */ +typedef int nsIFile; + +static nsresult (*NS_InitXPCOM2)(nsIServiceManager**,void*,void*); +static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*); +static nsresult (*NS_StringContainerInit)(nsString*); +static nsresult (*NS_StringContainerFinish)(nsString*); +static nsresult (*NS_StringSetData)(nsString*,const PRUnichar*,PRUint32); +static nsresult (*NS_NewLocalFile)(const nsString*,PRBool,nsIFile**); + +static HINSTANCE xpcom_handle = 0; +static PRUnichar mozilla_path[MAX_PATH]; + +static nsIServiceManager *pServMgr = NULL; +static nsIComponentManager *pCompMgr = NULL; + +static BOOL get_path() { + DWORD res, type, i; + HKEY mozilla_key, hkey; + WCHAR key_name[100]; + BOOL ret = FALSE; + + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, mozilla_key_path, &mozilla_key); + if(res != ERROR_SUCCESS) { + TRACE("Could not open key %s\n", debugstr_w(mozilla_key_path)); + return FALSE; + } + + for(i=0; !ret && RegEnumKeyW(mozilla_key, i, key_name, sizeof(key_name)/sizeof(WCHAR)) == ERROR_SUCCESS; i++) { + RegOpenKeyW(mozilla_key, key_name, &hkey); + res = RegQueryValueExW(hkey, wszGreHome, NULL, &type, (LPBYTE)mozilla_path, &type); + if(res == ERROR_SUCCESS) + ret = TRUE; + RegCloseKey(hkey); + } + + RegCloseKey(mozilla_key); + return ret; +} + +void close_gecko() +{ + if(pCompMgr) + nsIComponentManager_Release(pCompMgr); + + if(pServMgr) + NS_ShutdownXPCOM(pServMgr); + + if(xpcom_handle) + FreeLibrary(xpcom_handle); +} + +static void try_load_gecko() +{ + nsresult nsres; + nsIObserver *pStartNotif; + nsString path; + nsIFile *moz_dir; + + static BOOL tried_load = FALSE; + static const WCHAR strXPCOM[] = {'x','p','c','o','m','.','d','l','l',0}; + + TRACE("()\n"); + + if(tried_load) + return; + tried_load = TRUE; + + if(!get_path()) { + MESSAGE("Could not load Mozilla. HTML rendering will be disabled.\n"); + return; + } + + TRACE("found path %s\n", debugstr_w(mozilla_path)); + + xpcom_handle = LoadLibraryW(strXPCOM); + if(!xpcom_handle) { + /* FIXME: + * We don't have SetDllDirectory implemented so we have to modify PATH. + */ + WCHAR path_env[MAX_PATH]; + static WCHAR wszPATH[] = {'P','A','T','H',0}; + int len; + + GetEnvironmentVariableW(wszPATH, path_env, sizeof(path_env)/sizeof(WCHAR)); + len = strlenW(path_env); + path_env[len++] = ';'; + strcpyW(path_env+len, mozilla_path); + SetEnvironmentVariableW(wszPATH, path_env); + + xpcom_handle = LoadLibraryW(strXPCOM); + if(!xpcom_handle) { + ERR("Could not load XPCOM: %ld\n", GetLastError()); + close_gecko(); + return; + } + } + +#define NS_DLSYM(func) \ + func = (typeof(func))GetProcAddress(xpcom_handle, #func); \ + if(!func) \ + ERR("Could not GetProcAddress(" #func ") failed\n"); + + NS_DLSYM(NS_InitXPCOM2) + NS_DLSYM(NS_ShutdownXPCOM) + NS_DLSYM(NS_StringContainerInit) + NS_DLSYM(NS_StringContainerFinish) + NS_DLSYM(NS_StringSetData) + NS_DLSYM(NS_NewLocalFile) + +#undef NS_DLSYM + + nsres = NS_StringContainerInit(&path); + if(NS_FAILED(nsres)) { + ERR("NS_StringContainerInit failed: %08lx\n", nsres); + close_gecko(); + return; + } + + nsres = NS_StringSetData(&path, mozilla_path, PR_UINT32_MAX); + if(NS_FAILED(nsres)) { + ERR("NS_StringSetData failed: %08lx\n", nsres); + close_gecko(); + return; + } + + nsres = NS_NewLocalFile(&path, FALSE, &moz_dir); + if(NS_FAILED(nsres)) { + ERR("NS_NewLocalFile failed: %08lx\n", nsres); + close_gecko(); + return; + } + + nsres = NS_InitXPCOM2(&pServMgr, moz_dir, NULL); + if(NS_FAILED(nsres)) { + ERR("NS_InitXPCOM2 failed: %08lx\n", nsres); + close_gecko(); + return; + } + + nsres = nsIServiceManager_QueryInterface(pServMgr, &IID_nsIComponentManager, (void**)&pCompMgr); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIComponentManager: %08lx\n", nsres); + close_gecko(); + return; + } + + nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_APPSTARTUPNOTIFIER_CONTRACTID, + NULL, &IID_nsIObserver, (void**)&pStartNotif); + if(NS_FAILED(nsres)) { + ERR("could not get appstartup-notifier: %08lx\n", nsres); + close_gecko(); + return; + } + + nsres = nsIObserver_Observe(pStartNotif, NULL, APPSTARTUP_TOPIC, NULL); + if(NS_FAILED(nsres)) { + ERR("Observe failed: %08lx\n", nsres); + close_gecko(); + return; + } + + nsres = NS_StringContainerFinish(&path); + if(NS_FAILED(nsres)) + ERR("NS_StringContainerFinish failed: %08lx\n", nsres); +} + +static nsIWebBrowser* ns_create_webbrowser() +{ + nsIWebBrowser *ret; + nsresult nsres; + + try_load_gecko(); + + if(!pCompMgr) + return NULL; + + nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, + NS_WEBBROWSER_CONTRACTID, NULL, &IID_nsIWebBrowser, (void**)&ret); + if(NS_FAILED(nsres)) { + ERR("Creating WebBrowser failed: %08lx\n", nsres); + return NULL; + } + + TRACE("ending\n"); + + return ret; +} + +/********************************************************** + * nsIWebBrowserChrome implementation + */ +#define NSWBCHROME_THIS \ + NSContainer* const This=(NSContainer*)((char*)(iface)-offsetof(NSContainer,lwebbrowserChromeVtbl)); + +static nsresult WINAPI NSWBChrome_QueryInterface(nsIWebBrowserChrome *iface, nsIIDRef riid, + void **ppvObject) +{ + NSContainer *This = (NSContainer*)iface; + + *ppvObject = NULL; + if(IsEqualGUID(&IID_nsISupports, riid)) { + TRACE("(%p)->(IID_nsISupports, %p)\n", This, ppvObject); + *ppvObject = NSWBCHROME(This); + }else if(IsEqualGUID(&IID_nsIWebBrowserChrome, riid)) { + TRACE("(%p)->(IID_nsIWebBrowserChrome, %p)\n", This, ppvObject); + *ppvObject = NSWBCHROME(This); + }else if(IsEqualGUID(&IID_nsIEmbeddingSiteWindow, riid)) { + TRACE("(%p)->(IID_nsIEmbeddingSiteWindow, %p)\n", This, ppvObject); + *ppvObject = NSEMBSW(This); + } + + if(*ppvObject) { + nsIWebBrowserChrome_AddRef(iface); + return NS_OK; + } + + TRACE("(%p)->(%s %p): not supported interface\n", iface, debugstr_guid(riid), ppvObject); + return NS_NOINTERFACE; +} + +static nsrefcnt WINAPI NSWBChrome_AddRef(nsIWebBrowserChrome *iface) +{ + NSContainer *This = (NSContainer*)iface; + TRACE("(%p)\n", iface); + return IHTMLDocument2_AddRef(HTMLDOC(This->doc)); +} + +static nsrefcnt WINAPI NSWBChrome_Release(nsIWebBrowserChrome *iface) +{ + NSContainer *This = (NSContainer*)iface; + TRACE("(%p)\n", iface); + return IHTMLDocument2_Release(HTMLDOC(This->doc)); +} + +static nsresult WINAPI NSWBChrome_SetStatus(nsIWebBrowserChrome *iface, PRUint32 statusType, const PRUnichar *status) +{ + WARN("(%p)->(%ld %s)\n", iface, statusType, debugstr_w(status)); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSWBChrome_GetWebBrowser(nsIWebBrowserChrome *iface, nsIWebBrowser **aWebBrowser) +{ + WARN("(%p)->(%p)\n", iface, aWebBrowser); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSWBChrome_SetWebBrowser(nsIWebBrowserChrome *iface, nsIWebBrowser *aWebBrowser) +{ + WARN("(%p)->(%p)\n", iface, aWebBrowser); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSWBChrome_GetChromeFlags(nsIWebBrowserChrome *iface, PRUint32 *aChromeFlags) +{ + WARN("(%p)->(%p)\n", iface, aChromeFlags); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSWBChrome_SetChromeFlags(nsIWebBrowserChrome *iface, PRUint32 aChromeFlags) +{ + WARN("(%p)->(%08lx)\n", iface, aChromeFlags); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSWBChrome_DestroyBrowserWindow(nsIWebBrowserChrome *iface) +{ + WARN("(%p)\n", iface); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSWBChrome_SizeBrowserTo(nsIWebBrowserChrome *iface, PRInt32 aCX, PRInt32 aCY) +{ + WARN("(%p)->(%ld %ld)\n", iface, aCX, aCY); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSWBChrome_ShowAsModal(nsIWebBrowserChrome *iface) +{ + WARN("(%p)\n", iface); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSWBChrome_IsWindowModal(nsIWebBrowserChrome *iface, PRBool *_retval) +{ + WARN("(%p)->(%p)\n", iface, _retval); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSWBChrome_ExitModalEventLoop(nsIWebBrowserChrome *iface, nsresult aStatus) +{ + WARN("(%p)->(%08lx)\n", iface, aStatus); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static const nsIWebBrowserChromeVtbl NSWBChromeVtbl = { + NSWBChrome_QueryInterface, + NSWBChrome_AddRef, + NSWBChrome_Release, + NSWBChrome_SetStatus, + NSWBChrome_GetWebBrowser, + NSWBChrome_SetWebBrowser, + NSWBChrome_GetChromeFlags, + NSWBChrome_SetChromeFlags, + NSWBChrome_DestroyBrowserWindow, + NSWBChrome_SizeBrowserTo, + NSWBChrome_ShowAsModal, + NSWBChrome_IsWindowModal, + NSWBChrome_ExitModalEventLoop +}; + +/********************************************************** + * nsIEmbeddingSiteWindow implementation + */ +#define NSESW_THIS \ + NSContainer* const This=(NSContainer*)((char*)(iface)-offsetof(NSContainer,lpEmbeddingSiteWindowVtbl)); + +static nsresult WINAPI NSEmbdSiteWin_QueryInterface(nsIEmbeddingSiteWindow *iface, + nsIIDRef riid, void **ppvObject) +{ + NSESW_THIS + return nsIWebBrowserChrome_QueryInterface(NSWBCHROME(This), riid, ppvObject); +} + +static nsrefcnt WINAPI NSEmbdSiteWin_AddRef(nsIEmbeddingSiteWindow *iface) +{ + NSESW_THIS + return nsIWebBrowserChrome_AddRef(NSWBCHROME(This)); +} + +static nsrefcnt WINAPI NSEmbdSiteWin_Release(nsIEmbeddingSiteWindow *iface) +{ + NSESW_THIS + return nsIWebBrowserChrome_Release(NSWBCHROME(This)); +} + +static nsresult WINAPI NSEmbdSiteWin_SetDimensions(nsIEmbeddingSiteWindow *iface, + PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy) +{ + WARN("(%p)->(%08lx %ld %ld %ld %ld)\n", iface, flags, x, y, cx, cy); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSEmbdSiteWin_GetDimensions(nsIEmbeddingSiteWindow *iface, + PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy) +{ + WARN("(%p)->(%08lx %p %p %p %p)\n", iface, flags, x, y, cx, cy); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSEmbdSiteWin_SetFocus(nsIEmbeddingSiteWindow *iface) +{ + WARN("(%p)", iface); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSEmbdSiteWin_GetVisibility(nsIEmbeddingSiteWindow *iface, PRBool *aVisibility) +{ + WARN("(%p)->(%p)\n", iface, aVisibility); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSEmbdSiteWin_SetVisibility(nsIEmbeddingSiteWindow *iface, PRBool aVisibility) +{ + WARN("(%p)->(%x)\n", iface, aVisibility); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSEmbdSiteWin_GetTitle(nsIEmbeddingSiteWindow *iface, PRUnichar **aTitle) +{ + WARN("(%p)->(%p)\n", iface, aTitle); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult WINAPI NSEmbdSiteWin_SetTitle(nsIEmbeddingSiteWindow *iface, const PRUnichar *aTitle) +{ + WARN("(%p)->(%s)\n", iface, debugstr_w(aTitle)); + return NS_OK; +} + +static nsresult WINAPI NSEmbdSiteWin_GetSiteWindow(nsIEmbeddingSiteWindow *iface, void **aSiteWindow) +{ + WARN("(%p)->(%p)\n", iface, aSiteWindow); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static const nsIEmbeddingSiteWindowVtbl NSEmbdSiteWinVtbl = { + NSEmbdSiteWin_QueryInterface, + NSEmbdSiteWin_AddRef, + NSEmbdSiteWin_Release, + NSEmbdSiteWin_SetDimensions, + NSEmbdSiteWin_GetDimensions, + NSEmbdSiteWin_SetFocus, + NSEmbdSiteWin_GetVisibility, + NSEmbdSiteWin_SetVisibility, + NSEmbdSiteWin_GetTitle, + NSEmbdSiteWin_SetTitle, + NSEmbdSiteWin_GetSiteWindow, +}; + +NSContainer* NSContainer_Create(HTMLDocument *pdoc) +{ + NSContainer *ret; + nsIWebBrowser *nswb; + nsresult nsres; + + nswb = ns_create_webbrowser(); + if(!nswb) + return NULL; + + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(NSContainer)); + ret->lpWebBrowserChromeVtbl = &NSWBChromeVtbl; + ret->lpEmbeddingSiteWindowVtbl = &NSEmbdSiteWinVtbl; + ret->doc = pdoc; + ret->webbrowser = nswb; + + nsres = nsIWebBrowser_QueryInterface(ret->webbrowser, &IID_nsIWebNavigation, (void**)&ret->navigation); + if(NS_FAILED(nsres)) + ERR("Could not get nsIWebNavigation interface: %08lx\n", nsres); + + ret->window = NULL; + ret->url = NULL; + + return ret; +} + +void NSContainer_Destroy(NSContainer *This) +{ + nsIWebBrowser_Release(This->webbrowser); + nsIWebNavigation_Release(This->navigation); + if(This->window) + nsIBaseWindow_Release(This->window); + HeapFree(GetProcessHeap(), 0, This); +} +

2 2

Re: USB status ...
by Hiji 18 Apr '05

18 Apr '05

> > --- Lars Segerlund <lars.segerlund(a)comsys.se> > wrote: > > > > > > What is the status of wines USB support ? > > > Is there anything done yet or am I on my own ? > > > Can someone also giva a hint on the > feasibiliyt, > > > complexity of managing a USB > > > implementation for wine ? I am rather good at > > linux > > > device drivers and such. > > > / regards, Lars Segerlund. > > There's not much I can say in the way of > > development, > > but as a user, getting USB support (beyond what's > > supported in the kernel) would be a HUGE leap of > > improvement for Wine. I think others have said > > before > > that there are a lot of apps out there that will > run > > on Wine, but are useless because they depend on > > their > > hardware counterpart. (In the music world, > > Guitarport > > comes to mind.) > > > > Hiji > I have proposed several possible solutions for using > USB under Linux. In fact, I have given 4 possible > ways > of doing it, one of which I have hacked up (and > gotten > to work, at least partially). > > If you're interested in the details, let me know, > and > I'll email you (or look at the "Wine device drivers > proposal" email in the Wine archives in the past > month > or so). > Phew, I thought I'd type a short reply! Interested > in > working on this? I can't do it all alone. > Damjan There's not much I can do other then try to encourage you and Lars to work together (as I'm not a C developer). Damjan, it sounds like you have already covered a lot of the groundwork through your research and understanding of the USB infrastructure (from both the Windows, Linux and Wine worlds). Lars, I see you have both the motivation and experience with Linux device drivers to work on Wine USB. To me, it sounds like a perfect match for you two to pair up and work on implementing additional USB functionality. I suppose the last piece missing is to consult the expert on the wineserver (as far as USB is concerned) to see if any changes would truely need to be made there. Who would that be? Hiji __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

xrealloc size is 0?
by Mark Greenbank 18 Apr '05

18 Apr '05

Hi again, Still trying to compile wine for Solaris 10 but this time I'm getting a message during the build that virtual memory has been exhausted. I traced this to an xrealloc call requesting a realloc of 0 size; could this be correct? Thanks, Mark

3 2

Re: Still more fun?
by Steven Edwards 18 Apr '05

18 Apr '05

Hi Rolf, --- Rolf Kalbermatter <rolf.kalbermatter(a)citeng.com> wrote: > Why would you need the .local file? Has there anything changed in XP or > 2003 which would > prefer Windows or system DLLs over local DLLs in the same directory as > the calling executable? > > I always was under the impression that the executable directory was the > first to be searched by LoadLibrary() for a DLL and it has worked that > way for me in the past, too. The behavior of LoadLibrary has changed at least once that I know of for Windows 2003. The default search order can be set per application in the registry as well. Microsoft even does the programname.exe.local trick with the IE5 setup wizard. Extract the IE5 wizard in to a temp folder and lauch IE5 setup and you will see the *.exe.local file. iTunes even does it. Thanks Steven __________________________________ Do you Yahoo!? Make Yahoo! your home page http://www.yahoo.com/r/hs

1 0

Re: powrprof: yes, again
by Alexandre Julliard 18 Apr '05

18 Apr '05

Benjamin Cutler <cutler(a)cs.colostate.edu> writes: > + r = RegOpenKeyExA(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); > + if (r != ERROR_SUCCESS) { > + TRACE("RegOpenKeyEx failed: %ld\n", r); > + bSuccess = FALSE; > + goto end; > + } > + > + r = RegQueryValueExA(hKey, "LastID", 0, 0, lpValue, &cbValue); > + if (r != ERROR_SUCCESS) { > + TRACE("RegQueryValueEx failed: %ld\n", r); > + bSuccess = FALSE; > + goto end; > + } > + > + r = RegSetValueExA(hKey, "LastID", 0, REG_SZ, lpValue, strlen(lpValue)); > + if (r != ERROR_SUCCESS) { > + TRACE("RegSetValueEx failed: %ld\n", r); > + bSuccess = FALSE; If you can open the key for write access it means you have the needed permissions, there's no need to actually try to write a value. > + PPRegSemaphore = OpenSemaphoreA(SEMAPHORE_ALL_ACCESS, 0, "PowerProfileRegistrySemaphore"); > + if (PPRegSemaphore == NULL) { > + /* FIXME: The 'default' security attributes are probably not > + * correct, but they should work for now */ > + SECURITY_ATTRIBUTES SecAttributes = { sizeof(SECURITY_ATTRIBUTES), NULL, 0 }; > + PPRegSemaphore = CreateSemaphoreA(&SecAttributes, 1, 1, "PowerProfileRegistrySemaphore"); CreateSemaphore works fine if the semaphore exists, no need to try an OpenSemaphore first. Also using Unicode functions right away would avoid the need for someone to come back and change them later. -- Alexandre Julliard julliard(a)winehq.org

1 0

Input needed regarding changing the SYSTEM_PROCESS_INFORMATION struct
by Paul Vriens 18 Apr '05

18 Apr '05

Hi, our current structure is incorrect: #ifdef __WINESRC__ DWORD dwOffset; DWORD dwThreadCount; DWORD dwUnknown1[6]; FILETIME ftCreationTime; DWORD dwUnknown2[5]; WCHAR *pszProcessName; DWORD dwBasePriority; DWORD dwProcessID; DWORD dwParentProcessID; DWORD dwHandleCount; DWORD dwUnknown3; DWORD dwUnknown4; DWORD dwVirtualBytesPeak; DWORD dwVirtualBytes; DWORD dwPageFaults; DWORD dwWorkingSetPeak; DWORD dwWorkingSet; DWORD dwUnknown5; DWORD dwPagedPool; DWORD dwUnknown6; DWORD dwNonPagedPool; DWORD dwPageFileBytesPeak; DWORD dwPrivateBytes; DWORD dwPageFileBytes; DWORD dwUnknown7[4]; THREADINFO ti[1]; #else I would like this to change into: typedef struct _SYSTEM_PROCESS_INFORMATION { #ifdef __WINESRC__ DWORD dwOffset; DWORD dwThreadCount; DWORD dwUnknown1[6]; FILETIME ftCreationTime; FILETIME ftUserTime; FILETIME ftKernelTime; UNICODE_STRING lpProcessName; DWORD dwBasePriority; DWORD dwProcessId; DWORD dwParentProcessId; DWORD dwHandleCount; DWORD dwUnknown2[2]; VM_COUNTERS VmCounters; IO_COUNTERS IoCounters; THREAD_INFO Threads[1]; #else Is this acceptable and what are the possible pitfalls I have to look into? One thing to note is that the defined struct for windows is also not correct but is specified as such on MSDN. Another thing is, how can I make a unit test to cover both windows and wine. I can only use items from the windows struct to test. What I did as a quick hack is have a private copy of the struct in the test itself. Cheers, Paul.

1 0

Problems with InstallShield
by Andrew Neil Ramage 18 Apr '05

18 Apr '05

I this a known problem ? Trying to install a program (Personal Ancestral File 5) with InstallShield generates the following error messages when InstallShield is loading. What is wrong ? fixme:ole:RegisterTypeLib Registering non-oleautomation interface! fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:sync:SetNamedPipeHandleState 0x5c 0x411bb5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x411bb5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x412c05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x411bb5f8 (nil) (nil) fixme:ole:RegisterTypeLib Registering non-oleautomation interface! fixme:ole:RegisterTypeLib Registering non-oleautomation interface! fixme:ole:RegisterTypeLib Registering non-oleautomation interface! fixme:sync:SetNamedPipeHandleState 0x5c 0x411bb5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x412d05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x411bb5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x412e05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x413e05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x412e05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x413e05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x414e05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x413f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x413f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x414005f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x414105f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x414105f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x5c 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x78 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x98 0x41b305f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x98 0x41c325f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x415105f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x415105f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x90 0x41b445f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x90 0x41c465f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x9c 0x41b445f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x9c 0x41b455f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x9c 0x41c475f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x9c 0x41b455f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x9c 0x41c475f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41d495f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41e4b5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41f4d5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41f4b5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x4225f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x4225f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x4225f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x4225f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x4225f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x4225f5f8 (nil) (nil) fixme:ole:RegisterTypeLib Registering non-oleautomation interface! fixme:ole:RegisterTypeLib Registering non-oleautomation interface! fixme:ole:RegisterTypeLib Registering non-oleautomation interface! fixme:ole:RegisterTypeLib Registering non-oleautomation interface! fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:sync:SetNamedPipeHandleState 0xa8 0x41b515f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41c535f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41b515f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41c535f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41b515f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41c535f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41b515f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41c535f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41b4a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41c4c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41b4a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41c4c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41b4a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41c4c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41b4a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41c4c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41b4a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41c4c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41b4a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41c4c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41b4a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41c4c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xac 0x41b4a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41c4c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xa8 0x41b4a5f8 (nil) (nil) fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:sync:SetNamedPipeHandleState 0xb0 0x41d815f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e835f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d815f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e835f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d815f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e835f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d815f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e835f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d815f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e835f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d815f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e835f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d815f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e835f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d815f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e835f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d815f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e835f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d815f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e835f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d815f8 (nil) (nil) fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:sync:SetNamedPipeHandleState 0xb0 0x41e915f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d8a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e9a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d8a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e9a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d8a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e9a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d8a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e9a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d8a5f8 (nil) (nil) fixme:ole:RegisterTypeLib Registering non-oleautomation interface! fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:sync:SetNamedPipeHandleState 0xb0 0x41d8a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e9a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d8a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e9a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d8a5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e9b5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xcc 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xcc 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xcc 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xcc 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xcc 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4215f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x422715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41e8c5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41ea05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41d9e5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x422715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x422715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x422715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x422715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x422715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x41eae5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x422715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xc8 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x4226f5f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xb0 0x423715f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x415105f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x419a05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x419a05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x419a05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x419a05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x419a05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x412f05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x419a05f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0xe8 0x42bd25f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x10c 0x42dd65f8 (nil) (nil) fixme:sync:SetNamedPipeHandleState 0x70 0x430e05f8 (nil) (nil) andrew@zeus:~/Download/Software> -- Andrew Shiny, shiny, shiny boots of leather Whiplash girlchild in the dark Comes in bells, your servant, don't forsake him Strike, dear mistress, and cure his heart Venus in Furs by the Velevet Underground (The Velvet Underground & Nico)

2 1

Shrinker again
by Uwe Bonnes 18 Apr '05

18 Apr '05

Hallo, some programs still use patching packer like shrinker. http://www.multipcb.de/download/netviewer.exe is such a program. It doesn't run... Here a part of the debuglog where I think the error happens: 0009:Call kernel32.LocalAlloc(00000000,00005386) ret=004b80c0 0009:Call ntdll.RtlAllocateHeap(40350000,00000000,00005386) ret=404b8941 0009:Ret ntdll.RtlAllocateHeap() retval=403a0580 ret=404b8941 0009:Ret kernel32.LocalAlloc() retval=403a0580 ret=004b80c0 0009:Call kernel32.VirtualQuery(004b45a0,406bfe38,0000001c) ret=004b6ba8 0009:Call ntdll.NtQueryVirtualMemory(ffffffff,004b45a0,00000000,406bfe38,0000001c,406bfd68) ret=404f364c 0009:Ret ntdll.NtQueryVirtualMemory() retval=00000000 ret=404f364c 0009:Ret kernel32.VirtualQuery() retval=0000001c ret=004b6ba8 0009:Call kernel32.VirtualProtect(00400118,000000e0,00000004,406bfe4c) ret=004b77f5 0009:Call ntdll.NtProtectVirtualMemory(ffffffff,406bfd7c,406bfd80,00000004,406bfe4c) ret=404f36da 0009:Ret ntdll.NtProtectVirtualMemory() retval=00000000 ret=404f36da 0009:Ret kernel32.VirtualProtect() retval=00000001 ret=004b77f5 0009:Call kernel32.VirtualProtect(00400118,000000e0,00000002,406bfe4c) ret=004b7826 0009:Call ntdll.NtProtectVirtualMemory(ffffffff,406bfd7c,406bfd80,00000002,406bfe4c) ret=404f36da 0009:Ret ntdll.NtProtectVirtualMemory() retval=00000000 ret=404f36da 0009:Ret kernel32.VirtualProtect() retval=00000001 ret=004b7826 0009:Call kernel32.GetCurrentProcess() ret=004b60aa 0009:Ret kernel32.GetCurrentProcess() retval=ffffffff ret=004b60aa 0009:Call kernel32.SetUnhandledExceptionFilter(004b6435) ret=004b60cb 0009:Ret kernel32.SetUnhandledExceptionFilter() retval=00000000 ret=004b60cb 0009:Call kernel32.ReadProcessMemory(ffffffff,401aa80d,406bfa28,00000008,406bfa30) ret=004b61c3 0009:Call ntdll.NtReadVirtualMemory(ffffffff,401aa80d,406bfa28,00000008,406bfa30) ret=404d2dba 0009: read_process_memory( handle=0xffffffff, addr=0x401aa80d ) 0009: *attached* 0009: *signal* signal=19 0009: read_process_memory() = 0 { data={e0,50,56,ff,55,0c,83,c4} } 0009:Ret ntdll.NtReadVirtualMemory() retval=00000000 ret=404d2dba 0009:Ret kernel32.ReadProcessMemory() retval=00000001 ret=004b61c3 0009:Call kernel32.GetLastError() ret=004b73bc 0009:Ret kernel32.GetLastError() retval=00000000 ret=004b73bc 0009:Call kernel32.CloseHandle(0000004c) ret=004b7f3e 0009:Call ntdll.NtClose(0000004c) ret=404d3741 0009: close_handle( handle=0x4c ) 0009: close_handle() = 0 { fd=11 } 0009:Ret ntdll.NtClose() retval=00000000 ret=404d3741 0009:Ret kernel32.CloseHandle() retval=00000001 ret=004b7f3e 0009:Call kernel32.GetLocalTime(406bf8dc) ret=004b8da6 This time is then used to print an error message like K:\usr\local\tmp\netviewer.exe (3.5) 04/18/05 15:36:46 - Dispatcher initialisation error 02 It seems that the program is not satisfied with what it reads from memory adress 0x401aa80d. 0009:trace:module:import_dll --- RtlRaiseStatus ntdll.dll.566 = 0x401aa780 is the debug output where the address nearest to 0x401aa80d is mentioned before. Any idea is shrinker can ever run with wine att all? And if it can run, what has to be done to wine? Thanks -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

3 4

Re: USB status ...
by Damjan Jovanovic 18 Apr '05

18 Apr '05

--- Hiji <hijinio(a)yahoo.com> wrote: > > --- Lars Segerlund <lars.segerlund(a)comsys.se> wrote: > > > > What is the status of wines USB support ? > > > > I have an IDE for a developement board and I > really > > would like to flash it from > > Linux, ( I don't have windows), and this uses USB > > to talk to the board. > > Is there anything done yet or am I on my own ? > > > > Can someone also giva a hint on the feasibiliyt, > > complexity of managing a USB > > implementation for wine ? I am rather good at > linux > > device drivers and such. > > > > / regards, Lars Segerlund. > > There's not much I can say in the way of > development, > but as a user, getting USB support (beyond what's > supported in the kernel) would be a HUGE leap of > improvement for Wine. I think others have said > before > that there are a lot of apps out there that will run > on Wine, but are useless because they depend on > their > hardware counterpart. (In the music world, > Guitarport > comes to mind.) > > Hiji > > __________________________________________________ > Do You Yahoo!? > Tired of spam? Yahoo! Mail has the best spam > protection around > http://mail.yahoo.com > > I have proposed several possible solutions for using USB under Linux. In fact, I have given 4 possible ways of doing it, one of which I have hacked up (and gotten to work, at least partially). If you're interested in the details, let me know, and I'll email you (or look at the "Wine device drivers proposal" email in the Wine archives in the past month or so). Briefly, Windows apps never use USB directly (there is no equivalent of libusb on Windows; well there is libusb-win32, but no closed-source projects use it). They open a "device file" of the form \\Device\Options; so for instance my scanner driver opens \\MiiScan0 and \\MiiScan0\0\0\2. This opening is done using CreateFile(), which returns a handle. 3 other important functions are then used: WriteFile() - USB bulk writes ReadFile() - USB bulk reads DeviceIoControl() - USB control messages Windows 2000 and XP have a set interface for using scanners, for example, so the parameters to these functions would be well known. For most other hardware it is trivial to reverse engineer it if necessary. The problem is, Wine does all I/O (ie. ReadFile(), WriteFile(), DeviceIoControl()) using the @&#$!"* wineserver, by querying the wineserver for a file descriptor (int obtained by the POSIX open() function in Linux), and then doing read() or write(), while DeviceIoControl() in wine delegates to CDROM_DeviceIoControl() or fails. CreateFile() is reasonably easy to hack - but the problem is that you need ways to: 1. Associate particular file descriptors to a dynamically linked library that would be identified by the CreateFile() argument (eg. for \\MiiScan0\, maybe the library would be MiiScan0.so). 2. Load up the library on CreateFile() with a reference count of 1 and unload it when CloseHandle() decrements the reference count to 0. 3. Use the library's functions for reading, writing, and ioctl's. 4. (This is the hardest part) Make ReadFile(), WriteFile() and DeviceIoControl() aware of which file descriptor identifies which library, and call the right libraries functions. This probably requires changes to the wineserver. Phew, I thought I'd type a short reply! Interested in working on this? I can't do it all alone. Bye Damjan __________________________________ Do you Yahoo!? Plan great trips with Yahoo! Travel: Now over 17,000 guides! http://travel.yahoo.com/p-travelguide

1 0

Re: widl: generate header when proxy/stub is generated
by Juan Lang 18 Apr '05

18 Apr '05

--- Alexandre Julliard <julliard(a)winehq.org> wrote: > Surely there's a better way to fix this than by forcing generation of > the header even when it's not requested. Certainly, and I did this partly out of laziness. But I also notice that midl generates the header every time as well. At least, "midl /client stub foo.idl" generates foo.h as well as foo_[ip].c and dlldata.c. And that brings up a further question: should widl flags be made (somewhat) compatible with midl ones to ease porting? --Juan __________________________________ Do you Yahoo!? Make Yahoo! your home page http://www.yahoo.com/r/hs

2 1

Menu - loop of sending and receiving WM_TIMER
by Jose Alonso 18 Apr '05

18 Apr '05

If a Menu is accessed and the application used the function SetTimer, then the application and the wineserver use 100% of the CPU (loop of sending and receiving WM_TIMER). function used: SetTimer(NULL, 0, 100, TimerProc) Description of the loop: dlls/user/menu.c MENU_TrackMenu while (!fEndMenu) { ... for (;;) { (1) if (PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE )) ... { (2) DispatchMessageW( &msg ); } if (!fEndMenu) fRemove = TRUE; /* finally remove message from the queue */ if (fRemove && !(mt.trackFlags & TF_SKIPREMOVE) ) (3) PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); else mt.trackFlags &= ~TF_SKIPREMOVE; } (1) The WM_TIMER is peeked and the timer is not restarted (PM_NOREMOVE) (2) The WM_TIMER is dispatched here (3) The WM_TIMER is only removed from the queue. The next PeekMessageW (1) return immediately with WM_TIMER since the timer was not restarted. I propose to unconditionally restart the timer when the timer message is generated. Are there any collateral effect? --- server/queue.c.orig 2005-03-24 16:16:54.000000000 -0300 +++ server/queue.c 2005-04-13 16:10:42.000000000 -0300 @@ -972,7 +972,7 @@ if (win && timer->win != win) continue; if (timer->msg >= get_first && timer->msg <= get_last) { - if (remove) restart_timer( queue, timer ); + restart_timer( queue, timer ); return timer; } } -- alonso

2 7

NtMapViewOfSection - Chasing more holes
by Robert Lunnon 18 Apr '05

18 Apr '05

NtMapView of Section is returning bad values from the wineserver calls trace:virtual:MapViewOfFileEx Mapping Section View handle=58, pid=ffffffff, addr=0 zbits=0 commit=0, offs_l=0 offs_h=0 count=0 trace:virtual:NtMapViewOfSection handle=58 process=ffffffff addr=0 off=000000000 size=0 access=4 View: 7f640000 - 7f640fff (anonymous) 7f640000 - 7f640fff c-rw- trace:virtual:NtMapViewOfSection handle=58 size=1000 offset=000000000 trace:virtual:MapViewOfFileEx Mapping Section View handle=78, pid=ffffffff, addr=0 zbits=0 commit=0, offs_l=0 offs_h=0 count=0 trace:virtual:NtMapViewOfSection handle=78 process=ffffffff addr=0 off=000000000 size=0 access=2 Breakpoint 2, NtMapViewOfSection (handle=0x78, process=0xffffffff, addr_ptr=0x7fd8ed48, zero_bits=0, commit_size=0, offset=0x7fd8ed1c, size_ptr=0x7fd8ed44, inherit=ViewShare, alloc_type=0, protect=2) at virtual.c:1737 1737 ERR("Sizes larger than 4Gb not supported\n"); (gdb) disp base 1: base = (void *) 0x0 (gdb) disp header_size 2: header_size = 0 (gdb) disp size_high 3: size_high = 74960 (gdb) disp size_low 4: size_low = 77824 (gdb) disp res 5: res = 0 (gdb) This doesn't seem right to me. Bob

3 4

Without debug when a program finish
by Joaquín Fernández 18 Apr '05

18 Apr '05

I have a program and when i finish it (with click on X or in File->Exit), then ocurr an exception and the debugger is on. I want when the program is finished the debugger don't start, and i can get the console prompt again. The program is functioning correctly, only when i finish the program i have problems, so i think that must have an environment variable or an option for avoiding the debugger. Regards Joaquín P.D.: Here is the messages when i close the application: wine: Unhandled exception (thread 0009), starting debugger... WineDbg starting on pid 0x8 Unhandled exception: page fault on write access to 0x00000004 in 32-bit code (0x005e3e0e). In 32 bit mode. Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:005e3e0e ESP:77a63b68 EBP:77a63b84 EFLAGS:00210202( - 00 - -RI1) EAX:7f5701e0 EBX:00000000 ECX:00000010 EDX:00000000 ESI:7f482e2c EDI:00000004 Stack dump: 0x77a63b68: 7772ab90 77716560 7f482e30 7f570b34 0x77a63b78: 00000000 00000e20 00000010 77730aa0 0x77a63b88: 005dde5a 7f570098 7f482e3c 77b399d0 0x77a63b98: 005c3baa 7f482e30 0042473c 7f482e30 0x77a63ba8: 7f482e40 0053944a 77b28590 00000000 0x77a63bb8: 77a63f20 77bb7a08 0000000a 00000000 Backtrace: =>1 0x005e3e0e in bw600 (+0x1e3e0e) (0x77a63b84) 2 0x005dde5a in bw600 (+0x1dde5a) (0x77730aa0) 3 0x5d8930ec (0x83e58955) 4 0x00000000 (0x00000000) 0x005e3e0e: movl %ebx,0x4(%edx) Wine-dbg>quit -- -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.2.4 (GNU/Linux) mQFCBEFI/gARAwDd2+ojasT3rCyRktSw+Ix3m+yoxSD0NkpMLlunmJxwvn6wKZVl mDw76/Zu9mqDWWeSGdSl+60T7fDLrJZSEB45O9T5jdujj01GFeer7xuiuHBTFw8o CXqD/hzhqYc46ecAoIQQjZ2qZtOWLPRBbegK/nyOIguNAv9QGiKPLBS8o0ksxEUp EfLAExVmu6Zp693uKGf6XrBWNcLriuwRPr1mjy3N/bhMlqc3vcTeUBwxiUuX5h2P NQgB3d2AbJS6oEvhmZL0Bn/8Ij/MSvVrartmCXuw9eSx0aMC/R7Kw9TtUfxFVUGx fQKwoA9BXNElPLcNohbBS/fH87IMMxCJyn+rmTeNCEcUEQ7UgvVCdlzZ8+L4PdlH qGR81nhZVEwPRnSSesLpSHRC1QQVoceBeb7PICr/b2eZiKMX+bQ+Sm9hcXXDrW4g TWFudWVsIEZlcm7DoW5kZXogUXVpbGVzIDxqb2FxdWluQGNhc2FkZWFsYWJhbnph Lm9yZz6IXgQTEQIAHgUCQUj+AAIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRBH 677/q7xL4e15AJwNfSpeaXXMH2EjuKblfeBe51MrUgCcCP5jEnpXrDXLWULIW5yD t6VdHlU= =a8BM -----END PGP PUBLIC KEY BLOCK-----

1 0

Re: How to implement a callback function
by Rolf Kalbermatter 17 Apr '05

17 Apr '05

Eric Pouech [pouech-eric(a)wanadoo.fr] wrote: >luis lenders a écrit : >> So how could i pass the data in lpVideoHdr to the application? Any >> help appreciated as i'm still quite a beginner in this :) >it seems that you open somehow a capture session. >Within this session, you can set a user defined callback to be passed every >frame captured. >On the WM_CAP_SET_CALLBACK_FRAME message, your session should store the pointer >to the function in the session data (you should have something for that somewhere). >Everytime you complete the capture of a frame in a given session, and this >callback has been defined, then you should call it (by passing the current >LPVIDEOHDR which is likely to be the structure to contain the data for the >captured frame). I believe that the capture session is inherently tied to the capture window created with capCreateCaptureWindowA/W(). After all, the capture API dates back to Windows 3.x where it was common to do background processing by delegating the action to a window message loop, since no other multitasking method was available. Maybe that 32bit Windows has another implementation for this, but I'm not sure. Rolf Kalbermatter

1 0

How to implement a callback function
by luis lenders 17 Apr '05

17 Apr '05

Hi , i would like to implement this function: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/h… Here fpProc is a pointer to the preview callback function Applications use this to get access to the videodata. Right now i already have a preview window. If i'm correct it is similar to this function:http://msdn.microsoft.com/library/default.asp?url=/library/en-us/m… Here the structure LPVIDEOHDR lpVHdr contains the information about the videodata. My question is how all of this could be implemented; right now i have : case WM_CAP_SET_CALLBACK_FRAME: LPVIDEOHDR lpVideoHdr; //defined in vfw.h typedef LRESULT (CALLBACK * CAPVIDEOCALLBACK)(HWND hwnd, LPVIDEOHDR lpVideoHdr); CAPVIDEOCALLBACK *framecallback = (CAPVIDEOCALLBACK *)lParam; {so what goes here? } return TRUE; break; So how could i pass the data in lpVideoHdr to the application? Any help appreciated as i'm still quite a beginner in this :) Regards Send instant messages to your online friends http://uk.messenger.yahoo.com

3 2

Calc
by A＠A 17 Apr '05

17 Apr '05

I've ported M$ Calc using winelib. Is this program needed for wine? -- Linux forever

4 3

Implementing get_default_drive_device under Solaris
by Robert Lunnon 17 Apr '05

17 Apr '05

I am trying to Implement get_default_drive_device for Solaris but its unclear to me what this is supposed to do. It get passed the links in ~/.wine/dosdevices then tries to determine a mount point for them. Reading the Linux code the function only seems to return a mount point if the dosdevices link actually points at a directory something is mounted on. Is this what is supposed to happen, or is it supposed to find the device that the symlinks target directory actually resides on ? Bob

2 3

Re: Still more fun?
by Rolf Kalbermatter 17 Apr '05

17 Apr '05

Steven Edwards [steven_ed4153(a)yahoo.com] wrote: >I think it would be good in testing Wine/ReactOS vs Windows for Winelib applications developers. >You can make a dummy file in your application directory called application.exe.local to force >Windows to use the dlls in the local directory. So say you have IEXPLORE.EXE you would create >IEXPLORE.EXE.LOCAL and drop the Mingw compiled dlls in to the application folder and see how >it runs. Why would you need the .local file? Has there anything changed in XP or 2003 which would prefer Windows or system DLLs over local DLLs in the same directory as the calling executable? I always was under the impression that the executable directory was the first to be searched by LoadLibrary() for a DLL and it has worked that way for me in the past, too. Rolf Kalbermatter

1 0

MSN Webcam patch (New: Now WITH Completely randomly transmitted images)
by Maarten Lankhorst 17 Apr '05

17 Apr '05

SInce stuff is missing from msvideo (ICSeqCompressFrame{Start,,Stop}) you have to use native MSVFW32.DLL This will crash when you stop msn webcam (Because of the CreateThread continuing to run) In general it is very unstable, but at least it proves you can use 'webcam's under wine. How does it work? apply patch set quartz, qcap and devenum to builtin (qcap just to be sure..) set msvfw32 to native (and make sure you have a native msvfw32) regsvr32 quartz.dll Run msn messenger (I tested it with MSN 6.2, dutch version, not sure wether it will work under 7.0) Now you can use the 'webcam' If you want, you can even make some patterns by changing the following lines in capture.c ;) for (pl0ink = 0;pl0ink < 320*240*3;pl0ink++) myData[pl0ink] = (BYTE) (rand() % 256); This patch is not very stable yet, but it's still a work in progress.. If anyone got some links to gstreamer tutorials that would help me with this, I would happily accept :) diff -Nru wine-old/dlls/devenum/createdevenum.c wine-new/dlls/devenum/createdevenum.c --- wine-old/dlls/devenum/createdevenum.c 2005-01-25 11:56:39.000000000 +0100 +++ wine-new/dlls/devenum/createdevenum.c 2005-04-15 21:23:47.000000000 +0200 @@ -117,6 +117,7 @@ if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || + IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) { hbasekey = HKEY_CURRENT_USER; @@ -142,6 +143,7 @@ { if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || + IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) { HRESULT hr = DEVENUM_CreateSpecialCategories(); @@ -413,6 +415,7 @@ CoTaskMemFree(pTypes); } } + res = DEVENUM_CreateAMCategoryKey(&CLSID_VideoInputDeviceCategory); } if (pMapper) diff -Nru wine-old/dlls/devenum/devenum_main.c wine-new/dlls/devenum/devenum_main.c --- wine-old/dlls/devenum/devenum_main.c 2004-12-07 15:37:11.000000000 +0100 +++ wine-new/dlls/devenum/devenum_main.c 2005-04-15 21:23:47.000000000 +0200 @@ -122,7 +122,7 @@ {&CLSID_AudioCompressorCategory, acmcat, TRUE}, {&CLSID_VideoCompressorCategory, vidcat, TRUE}, {&CLSID_LegacyAmFilterCategory, filtcat, TRUE}, - {&CLSID_VideoInputDeviceCategory, vfwcat, FALSE}, + {&CLSID_VideoInputDeviceCategory, vfwcat, TRUE}, {&CLSID_AudioInputDeviceCategory, wavein, FALSE}, {&CLSID_AudioRendererCategory, waveout, FALSE}, {&CLSID_MidiRendererCategory, midiout, FALSE}, @@ -156,7 +156,7 @@ pMapper = (IFilterMapper2*)mapvptr; - IFilterMapper2_CreateCategory(pMapper, &CLSID_VideoInputDeviceCategory, MERIT_DO_NOT_USE, friendlyvidcap); + IFilterMapper2_CreateCategory(pMapper, &CLSID_VideoInputDeviceCategory, MERIT_NORMAL, friendlyvidcap); IFilterMapper2_CreateCategory(pMapper, &CLSID_LegacyAmFilterCategory, MERIT_NORMAL, friendlydshow); IFilterMapper2_CreateCategory(pMapper, &CLSID_VideoCompressorCategory, MERIT_DO_NOT_USE, friendlyvidcomp); IFilterMapper2_CreateCategory(pMapper, &CLSID_AudioInputDeviceCategory, MERIT_DO_NOT_USE, friendlyaudcap); diff -Nru wine-old/dlls/msvideo/msvideo_main.c wine-new/dlls/msvideo/msvideo_main.c --- wine-old/dlls/msvideo/msvideo_main.c 2005-02-17 12:51:01.000000000 +0100 +++ wine-new/dlls/msvideo/msvideo_main.c 2005-04-17 20:35:19.000000000 +0200 @@ -1132,7 +1132,7 @@ } /*********************************************************************** - * ICSeqCompressFrameEnd [MSVFW32.@] + * ICSeqCompressFrameStart [MSVFW32.@] */ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) { diff -Nru wine-old/dlls/quartz/capture.c wine-new/dlls/quartz/capture.c --- wine-old/dlls/quartz/capture.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/quartz/capture.c 2005-04-17 17:32:58.000000000 +0200 @@ -0,0 +1,166 @@ +/* DirectShow capture services (QUARTZ.DLL) + * + * Copyright 2005 Maarten Lankhorst + * + * This file contains the (internal) driver registration functions, + * driver enumeration APIs and DirectDraw creation functions. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "quartz_private.h" +#include "control_private.h" +#include "pin.h" +#include "capture.h" + +#include "uuids.h" +#include "mmreg.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "fourcc.h" +#include "windef.h" +#include "winbase.h" +#include "dshow.h" +#include "strmif.h" +#include "ddraw.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(quartz); + +HRESULT Capture_Initialise(CaptureBox * capBox, IPin * pOut, USHORT card) +{ +/* Connect to webcam through gstreamer or whatever source */ + capBox->width = 320; + capBox->height = 240; + capBox->bitDepth = 24; + capBox->pOut = pOut; + capBox->fps = 30; + return S_OK; +} + +HRESULT Capture_Destroy(CaptureBox * capBox) +{ +/* Destroy file handlers etc? This function can't fail.. */ + return S_OK; +} + +HRESULT Capture_SetMediaType(CaptureBox * capBox, AM_MEDIA_TYPE * mT) +{ +/* Only time I can imagine this doesn't return is with incompatible type */ +/* We should check rcTarget rectangle? */ + FIXME("%p -> (%p)\n", capBox, mT); + capBox->width = ((BITMAPINFOHEADER *)mT->pbFormat)->biWidth; + capBox->height = ((BITMAPINFOHEADER *)mT->pbFormat)->biHeight; + capBox->bitDepth = ((BITMAPINFOHEADER *)mT->pbFormat)->biBitCount; + return S_OK; +} + +HRESULT Capture_GetMediaType(CaptureBox * capBox, AM_MEDIA_TYPE ** mT) +{ + FIXME("%p\n", capBox); + VIDEOINFOHEADER *vi; + mT[0] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + if (!mT[0]) return E_OUTOFMEMORY; + vi = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + mT[0]->cbFormat = sizeof(AM_MEDIA_TYPE); + if (!vi) + { + CoTaskMemFree(mT[0]); + return E_OUTOFMEMORY; + } + memcpy(&mT[0]->majortype, &MEDIATYPE_Video, sizeof(GUID)); + memcpy(&mT[0]->subtype, &MEDIASUBTYPE_RGB24, sizeof(GUID)); + memcpy(&mT[0]->formattype, &FORMAT_VideoInfo, sizeof(GUID)); + mT[0]->bFixedSizeSamples = 1; + mT[0]->bTemporalCompression = 0; + ZeroMemory(&vi->rcSource, sizeof(RECT)); + ZeroMemory(&vi->rcTarget, sizeof(RECT)); + vi->dwBitRate = capBox->fps * capBox->width * capBox->height * capBox->bitDepth / 8; + vi->dwBitErrorRate = 0; + vi->AvgTimePerFrame = 10000000 / capBox->fps; + vi->bmiHeader.biSize = capBox->width * capBox->height * capBox->bitDepth / 8; + vi->bmiHeader.biWidth = capBox->width; + vi->bmiHeader.biHeight = capBox->height; + vi->bmiHeader.biPlanes = 1; + vi->bmiHeader.biBitCount = 24; + vi->bmiHeader.biCompression = vi->bmiHeader.biSizeImage = 0; + vi->bmiHeader.biClrUsed = vi->bmiHeader.biClrImportant = 0; + mT[0]->pbFormat = (void *)vi; + return S_OK; +} + +DWORD WINAPI TestBed(LPVOID lParam) { + CaptureBox * capBox = lParam; + HRESULT hr; + long pl0ink; int m33p; + IMediaSample *pSample = NULL; + RGBTRIPLE * pData = NULL; + + usleep(1000000); + hr = OutputPin_CommitAllocator((OutputPin *)capBox->pOut); + TRACE("Meat 0: %lx\n", hr); + hr = OutputPin_GetDeliveryBuffer((OutputPin *)capBox->pOut, &pSample, NULL, NULL, 0); + TRACE("Meat 1: %lx - %p\n", hr, pSample); + hr = IMediaSample_SetActualDataLength(pSample, 230400); + TRACE("Meat 2: %lx\n", hr); + hr = IMediaSample_GetPointer(pSample, (BYTE **)&pData); + TRACE("Meat 3: %lx\n", hr); + for (pl0ink = 0;pl0ink < 320*240;pl0ink++) { + pData[pl0ink].rgbtRed = (BYTE) (rand() % 256); + pData[pl0ink].rgbtGreen = (BYTE) (rand() % 256); + pData[pl0ink].rgbtBlue = (BYTE) (rand() % 256); + } + TRACE("Meat 4\n"); + hr = OutputPin_SendSample((OutputPin *)capBox->pOut, pSample); + FIXME("%p -> stub: %lx\n", capBox, hr); + IMediaSample_Release(pSample); + if (SUCCEEDED(hr)) for (m33p = 0; m33p < 256; m33p++) { + BYTE * myData; + OutputPin_GetDeliveryBuffer((OutputPin *)capBox->pOut, &pSample, NULL, NULL, 0); + IMediaSample_SetActualDataLength(pSample, 230400); + IMediaSample_GetPointer(pSample, &myData); + for (pl0ink = 0;pl0ink < 320*240*3;pl0ink++) + myData[pl0ink] = (BYTE) (rand() % 256); + hr = OutputPin_SendSample((OutputPin *)capBox->pOut, pSample); + FIXME("%p -> Frame %d: %lx\n", capBox, m33p + 2, hr); + usleep(1000*1000); + IMediaSample_Release(pSample); + } + return 0x0; +} + +HRESULT Capture_Run(CaptureBox * capBox, FILTER_STATE *state) +{ + DWORD dwThreadId = 0; + *state = State_Running; + return CreateThread(NULL, 0, TestBed, capBox, 0, &dwThreadId) ? S_OK : E_FAIL; +} + +HRESULT Capture_Pause(CaptureBox *capBox, FILTER_STATE *state) +{ + FIXME("%p -> (%p) stub\n", capBox, state); + return S_OK; +} + +HRESULT Capture_Stop(CaptureBox *capBox, FILTER_STATE *state) +{ + FIXME("%p -> (%p) stub\n", capBox, state); + return S_OK; +} + diff -Nru wine-old/dlls/quartz/capturegraph.c wine-new/dlls/quartz/capturegraph.c --- wine-old/dlls/quartz/capturegraph.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/quartz/capturegraph.c 2005-04-15 21:23:47.000000000 +0200 @@ -0,0 +1,209 @@ +/* Capture Graph Builder, Minimal edition.. + * Copyright 2005 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * TODO: Implement CaptureGraphBuilder2, and make all calls from + * CaptureGraphBuilder forward to it.. + */ + +#include "config.h" + +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "quartz_private.h" + +#include "uuids.h" +#include "mmreg.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "windef.h" +#include "winbase.h" +#include "dshow.h" +#include "evcode.h" +#include "strmif.h" +#include "ddraw.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(quartz); + +static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; + +static const ICaptureGraphBuilderVtbl Builder_Vtbl; + +typedef struct CaptureGraphImpl +{ + const ICaptureGraphBuilderVtbl * lpVtbl; + IGraphBuilder *mygraph; + + ULONG refCount; + CRITICAL_SECTION csFilter; +} CaptureGraphImpl; + +HRESULT CaptureGraphBuilder_create(IUnknown * pUnkOuter, LPVOID * ppv) +{ + CaptureGraphImpl * pCapture; + TRACE("(%p, %p)\n", pUnkOuter, ppv); + *ppv = NULL; + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + pCapture = CoTaskMemAlloc(sizeof(CaptureGraphImpl)); + pCapture->lpVtbl = &Builder_Vtbl; + pCapture->refCount = 1; + pCapture->mygraph = NULL; + InitializeCriticalSection(&pCapture->csFilter); + *ppv = (LPVOID)pCapture; + return S_OK; +} + +static HRESULT WINAPI CaptureGraphBuilder_QueryInterface(ICaptureGraphBuilder * iface, REFIID riid, LPVOID * ppv) +{ + struct CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_ICaptureGraphBuilder)) + { + *ppv = (LPVOID)This; + TRACE("Asking for myself?\n"); + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } + + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI CaptureGraphBuilder_AddRef(ICaptureGraphBuilder * iface) +{ + CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->refCount); + + TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, refCount - 1); + return refCount; +} + +static ULONG WINAPI CaptureGraphBuilder_Release(ICaptureGraphBuilder * iface) +{ + CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->refCount); + + TRACE("(%p/%p)->() Release from %ld\n", This, iface, refCount + 1); + + if (!refCount) { + FIXME("Release IGraphFilter or w/e\n"); + DeleteCriticalSection(&This->csFilter); + This->lpVtbl = NULL; + if (This->mygraph != NULL) + IGraphBuilder_Release((IGraphBuilder *)This->mygraph); + CoTaskMemFree(This); + return 0; + } + else return refCount; +} + +static HRESULT WINAPI CaptureGraphBuilder_SetFilterGraph(ICaptureGraphBuilder * iface, IGraphBuilder *pfg) +{ +/* The graph builder will automatically create a filter graph if you don't call this method. If you call this method after the graph builder has created its own filter graph, the call will fail. */ + struct CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + if (This->mygraph != NULL) return E_NOTIMPL; + This->mygraph = pfg; + IGraphBuilder_AddRef((IGraphBuilder *)This->mygraph); + TRACE("%p: %p\n", iface, pfg); + return S_OK; +} + +static HRESULT WINAPI CaptureGraphBuilder_GetFilterGraph(ICaptureGraphBuilder * iface, IGraphBuilder **pfg) +{ + struct CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + FIXME("%p: Make our own filtergraph if we haven't got one already\n", iface); + if (This->mygraph == NULL) return E_NOTIMPL; + + *pfg = This->mygraph; + IGraphBuilder_AddRef((IGraphBuilder *)This->mygraph); + + TRACE("%p: %p\n", iface, *pfg); + return S_OK; +} + +static HRESULT WINAPI CaptureGraphBuilder_SetOutputFileName(ICaptureGraphBuilder * iface, const GUID *pType, LPCOLESTR lpstrFile,IBaseFilter **ppf, IFileSinkFilter **ppSink) +{ + FIXME("%p: %p, %p, %p, %p - stub\n", iface, pType, lpstrFile, *ppf, *ppSink); + return E_NOTIMPL; +} + +static HRESULT WINAPI CaptureGraphBuilder_FindInterface(ICaptureGraphBuilder * iface, const GUID *pCategory, IBaseFilter *pf, REFIID riid, void **ppint) +{ + struct CaptureGraphImpl *This = (CaptureGraphImpl *)iface; + TRACE("%p: %s .. %p .. %s .. %p - unwanted stub workaround!\n", iface, qzdebugstr_guid(pCategory), pf, qzdebugstr_guid(riid), *ppint); + return IBaseFilter_QueryInterface(pf, riid, ppint); + /* Looks for the specified interface on the filter, upstream and + * downstream from the filter, and, optionally, only on the output + * pin of the given category. + */ +} + +/* [call_as(FindInterface)] HRESULT RemoteFindInterface( + [in, unique] const GUID *pCategory, + [in] IBaseFilter *pf, + [in] REFIID riid, + [out] IUnknown **ppint); + ^- What is this? */ + +static HRESULT WINAPI CaptureGraphBuilder_RenderStream(ICaptureGraphBuilder * iface, const GUID *pCategory, IUnknown *pSource, IBaseFilter *pfCompressor, IBaseFilter *pfRenderer) +{ + FIXME("%p: .. Stub? !!! -- SHOULD NORMALLY WORK!!..\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI CaptureGraphBuilder_ControlStream(ICaptureGraphBuilder * iface, const GUID *pCategory, IBaseFilter *pFilter, REFERENCE_TIME *pstart, REFERENCE_TIME *pstop, WORD wStartCookie, WORD wStopCookie) +{ + FIXME("%p: .. Stub? !!! ..\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI CaptureGraphBuilder_AllocCapFile(ICaptureGraphBuilder * iface, LPCOLESTR lpstr, DWORDLONG dwlSize) +{ + FIXME("%p: .. Stub? !!! ..\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI CaptureGraphBuilder_CopyCaptureFile(ICaptureGraphBuilder * iface, LPOLESTR lpwstrOld, LPOLESTR lpwstrNew, int fAllowEscAbort, IAMCopyCaptureFileProgress *pCallback) +{ + FIXME("%p: .. Stub? !!! ..\n", iface); + return E_NOTIMPL; +} + +static const ICaptureGraphBuilderVtbl Builder_Vtbl = +{ + CaptureGraphBuilder_QueryInterface, + CaptureGraphBuilder_AddRef, + CaptureGraphBuilder_Release, + CaptureGraphBuilder_SetFilterGraph, + CaptureGraphBuilder_GetFilterGraph, + CaptureGraphBuilder_SetOutputFileName, + CaptureGraphBuilder_FindInterface, + CaptureGraphBuilder_RenderStream, + CaptureGraphBuilder_ControlStream, + CaptureGraphBuilder_AllocCapFile, + CaptureGraphBuilder_CopyCaptureFile +}; + diff -Nru wine-old/dlls/quartz/capture.h wine-new/dlls/quartz/capture.h --- wine-old/dlls/quartz/capture.h 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/quartz/capture.h 2005-04-15 21:23:47.000000000 +0200 @@ -0,0 +1,37 @@ +/* DirectShow private capture header (QUARTZ.DLL) + * + * Copyright 2005 Maarten Lankhorst + * + * This file contains the (internal) driver registration functions, + * driver enumeration APIs and DirectDraw creation functions. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +typedef struct CaptureBox { +/* Dunno what to put in here? */ + UINT width, height, bitDepth, fps; + IPin *pOut; +} CaptureBox; + +HRESULT Capture_Query(USHORT card); +HRESULT Capture_Initialise(CaptureBox * capBox, IPin *pOut, USHORT card); +HRESULT Capture_GetMediaType(CaptureBox * capBox, AM_MEDIA_TYPE ** mT); +HRESULT Capture_SetMediaType(CaptureBox * capBox, AM_MEDIA_TYPE * mT); +HRESULT Capture_Run(CaptureBox * capBox, FILTER_STATE *state); +HRESULT Capture_Stop(CaptureBox * capBox, FILTER_STATE *state); +HRESULT Capture_Pause(CaptureBox * capBox, FILTER_STATE *state); +HRESULT Capture_Destroy(CaptureBox * capBox); + diff -Nru wine-old/dlls/quartz/enummedia.c wine-new/dlls/quartz/enummedia.c --- wine-old/dlls/quartz/enummedia.c 2005-01-06 20:36:47.000000000 +0100 +++ wine-new/dlls/quartz/enummedia.c 2005-04-15 21:23:47.000000000 +0200 @@ -20,6 +20,17 @@ #include "quartz_private.h" +#include "uuids.h" +#include "mmreg.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "fourcc.h" +#include "windef.h" +#include "winbase.h" +#include "dshow.h" +#include "strmif.h" +#include "ddraw.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); @@ -61,7 +72,37 @@ { if (!pmt) return; - TRACE("\t%s\n\t%s\n\t...\n\t%s\n", qzdebugstr_guid(&pmt->majortype), qzdebugstr_guid(&pmt->subtype), qzdebugstr_guid(&pmt->formattype)); + TRACE("(): Printing out full format\n" + "\tMajor.Minor: %s.%s\n" + "\tFixedSize [%d] - Temporal [%d]\n" + "\tSample size [%lu] - Format type: %s\n" + "\tcb Format: %lu - Pointer: %p\n", + qzdebugstr_guid(&pmt->majortype), qzdebugstr_guid(&pmt->subtype), + pmt->bFixedSizeSamples, pmt->bTemporalCompression, + pmt->lSampleSize, qzdebugstr_guid(&pmt->formattype), + pmt->cbFormat, pmt->pbFormat); + if (!strcmp(qzdebugstr_guid(&pmt->formattype), qzdebugstr_guid(&FORMAT_VideoInfo))) { + BITMAPINFOHEADER *bmi; + VIDEOINFOHEADER *pvi; + pvi = (void *)pmt->pbFormat; + + TRACE("(): Printing out whole video info header\n" + "\tSource rectangle: (%lu,%lu,%lu,%lu)\n" + "\tTarget rectangle: (%lu,%lu,%lu,%lu)\n" + "\tBitrate: %lu, Error rate: %lu\n" + "\tTime per frame: %lu\n", + pvi->rcSource.left, pvi->rcSource.right, pvi->rcSource.top, pvi->rcSource.bottom, + pvi->rcTarget.left, pvi->rcTarget.right, pvi->rcTarget.top, pvi->rcTarget.bottom, + pvi->dwBitRate, pvi->dwBitErrorRate, + (ulong) pvi->AvgTimePerFrame); + bmi = &pvi->bmiHeader; + TRACE("(): Printing out bmi header\n" + "\tSize, in pixels: %lu\n" + "\tFormat: %ldx%ld\n" + "\tBit count: %d\n" + "\tSize image: %lu\n", + bmi->biSize, bmi->biWidth, bmi->biHeight, bmi->biBitCount, bmi->biSizeImage); + } } typedef struct IEnumMediaTypesImpl diff -Nru wine-old/dlls/quartz/main.c wine-new/dlls/quartz/main.c --- wine-old/dlls/quartz/main.c 2005-03-02 13:23:22.000000000 +0100 +++ wine-new/dlls/quartz/main.c 2005-04-15 21:23:47.000000000 +0200 @@ -71,7 +71,9 @@ { &CLSID_AVIDec, AVIDec_create }, { &CLSID_SystemClock, &QUARTZ_CreateSystemClock }, { &CLSID_ACMWrapper, &ACMWrapper_create }, - { &CLSID_WAVEParser, &WAVEParser_create } + { &CLSID_VfwCapture, &VfwCapture_create }, + { &CLSID_WAVEParser, &WAVEParser_create }, + { &CLSID_CaptureGraphBuilder, &CaptureGraphBuilder_create } }; static HRESULT WINAPI diff -Nru wine-old/dlls/quartz/Makefile.in wine-new/dlls/quartz/Makefile.in --- wine-old/dlls/quartz/Makefile.in 2005-02-10 18:13:18.000000000 +0100 +++ wine-new/dlls/quartz/Makefile.in 2005-04-17 19:15:20.000000000 +0200 @@ -10,6 +10,8 @@ acmwrapper.c \ avidec.c \ avisplit.c \ + capture.c \ + capturegraph.c \ control.c \ dsoundrender.c \ enumfilters.c \ @@ -27,6 +29,7 @@ regsvr.c \ systemclock.c \ transform.c \ + v4wsource.c \ videorenderer.c \ waveparser.c diff -Nru wine-old/dlls/quartz/pin.c wine-new/dlls/quartz/pin.c --- wine-old/dlls/quartz/pin.c 2005-03-02 11:12:12.000000000 +0100 +++ wine-new/dlls/quartz/pin.c 2005-04-15 21:23:47.000000000 +0200 @@ -66,12 +66,17 @@ dump_AM_MEDIA_TYPE(pmt); /* FIXME: call queryacceptproc */ + wine_dbg_add_option("quartz", 15, 0); This->pin.pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin); CopyMediaType(&This->pin.mtCurrent, pmt); + wine_dbg_add_option("quartz", 15, 0); hr = IPin_ReceiveConnection(pReceivePin, iface, pmt); + FIXME("(): MSN Crashes if quartz debug channel (TRACE & WARN somewhere before here\n" + "\t\tManually enabling full debug on quartz now -- %lx\n", hr); + wine_dbg_add_option("quartz", 15, 0); /* get the IMemInputPin interface we will use to deliver samples to the * connected pin */ diff -Nru wine-old/dlls/quartz/quartz_private.h wine-new/dlls/quartz/quartz_private.h --- wine-old/dlls/quartz/quartz_private.h 2005-02-10 18:13:18.000000000 +0100 +++ wine-new/dlls/quartz/quartz_private.h 2005-04-15 21:23:47.000000000 +0200 @@ -52,6 +52,8 @@ HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv); +HRESULT VfwCapture_create(IUnknown * pUnkOuter, LPVOID * ppv); +HRESULT CaptureGraphBuilder_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT EnumMonikerImpl_Create(IMoniker ** ppMoniker, ULONG nMonikerCount, IEnumMoniker ** ppEnum); diff -Nru wine-old/dlls/quartz/regsvr.c wine-new/dlls/quartz/regsvr.c --- wine-old/dlls/quartz/regsvr.c 2005-02-10 18:13:18.000000000 +0100 +++ wine-new/dlls/quartz/regsvr.c 2005-04-15 21:23:47.000000000 +0200 @@ -922,6 +922,18 @@ "quartz.dll", "Both" }, + { &CLSID_VfwCapture, + "Video for wine capture interface", + NULL, + "quartz.dll", + "Both" + }, + { &CLSID_CaptureGraphBuilder, + "Capture Graph Builder", + NULL, + "quartz.dll", + "Both" + }, { NULL } /* list terminator */ }; @@ -1112,6 +1124,18 @@ { 0xFFFFFFFF }, } }, + { &CLSID_VfwCapture, + &CLSID_VideoInputDeviceCategory, + {'V','i','d','e','o',' ','F','o','r',' ','W','i','n','e',' ','(','V','4','W',')', 0}, + 0x800000, + { { REG_PINFLAG_B_OUTPUT, + { { &MEDIATYPE_Stream, &GUID_NULL }, + { NULL } + }, + }, + { 0xFFFFFFFF }, + } + }, /* This creates a fake device for us with an ugly name */ { NULL } /* list terminator */ }; diff -Nru wine-old/dlls/quartz/v4wsource.c wine-new/dlls/quartz/v4wsource.c --- wine-old/dlls/quartz/v4wsource.c 1970-01-01 01:00:00.000000000 +0100 +++ wine-new/dlls/quartz/v4wsource.c 2005-04-15 22:09:20.000000000 +0200 @@ -0,0 +1,600 @@ +/* Video For Windows Steering structure + * + * Copyright 2005 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * LETS SING IT ALL TOGETHER NOW! ON MY MARK! + * COM SUCKS ASS! + */ + +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "quartz_private.h" +#include "control_private.h" +#include "pin.h" +#include "capture.h" + +#include "uuids.h" +#include "mmreg.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "fourcc.h" +#include "windef.h" +#include "winbase.h" +#include "dshow.h" +#include "strmif.h" +#include "ddraw.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(quartz); + +static const IBaseFilterVtbl VfwCapture_Vtbl; +static const IAMStreamConfigVtbl IAMStreamConfig_VTable; +static const IPinVtbl VfwPin_Vtbl; + +static HRESULT VfwPin_Construct(IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +static const WCHAR wszOutputPinName[] = { 'O','u','t','p','u','t',0 }; + +typedef struct VfwCapture +{ + const struct IBaseFilterVtbl * lpVtbl; + const struct IAMStreamConfigVtbl * IAMStreamConfig_vtbl; + + CaptureBox myCap; /* Keep this as first, for FakeAMConfigImpl */ + ULONG refCount; + FILTER_INFO filterInfo; + FILTER_STATE state; + CRITICAL_SECTION csFilter; + + IPin * pOutputPin; +} VfwCapture; + +typedef struct FakeAMConfigImpl { + const struct IAMStreamConfigVtbl * IAMStreamConfig_vtbl; + CaptureBox myCap; +} FakeAMConfigImpl; + +/* VfwPin implementation */ +typedef struct VfwPinImpl +{ + OutputPin pin; + + CaptureBox *myCap; + IKsPropertySetVtbl * KSP_VT; + HANDLE hEvent; + BOOL bFlushing; + DATAREQUEST * pHead; /* head of data request list */ +} VfwPinImpl; + +HRESULT VfwCapture_create(IUnknown * pUnkOuter, LPVOID * ppv) +{ + VfwCapture *pVfwCapture; + HRESULT hr; + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + pVfwCapture = CoTaskMemAlloc(sizeof(VfwCapture)); + + if (!pVfwCapture) + return E_OUTOFMEMORY; + + pVfwCapture->lpVtbl = &VfwCapture_Vtbl; + pVfwCapture->IAMStreamConfig_vtbl = &IAMStreamConfig_VTable; + pVfwCapture->refCount = 1; + pVfwCapture->filterInfo.achName[0] = '\0'; + pVfwCapture->filterInfo.pGraph = NULL; + InitializeCriticalSection(&pVfwCapture->csFilter); + hr = VfwPin_Construct((IBaseFilter *)&pVfwCapture->lpVtbl, &pVfwCapture->csFilter, &pVfwCapture->pOutputPin); + if (!SUCCEEDED(hr)) + { + CoTaskMemFree(pVfwCapture); + return E_OUTOFMEMORY; + } else { + ((VfwPinImpl *)pVfwCapture->pOutputPin)->myCap = &pVfwCapture->myCap; + hr = Capture_Initialise(&pVfwCapture->myCap, pVfwCapture->pOutputPin, 0); + if (FAILED(hr)) { + IPin_Release((IPin *)pVfwCapture->pOutputPin); + CoTaskMemFree(pVfwCapture); + return hr; + } + } + *ppv = (LPVOID)pVfwCapture; + TRACE("-- created at %p\n", pVfwCapture); + + return S_OK; +} + +static HRESULT WINAPI VfwCapture_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IPersist)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IMediaFilter)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IBaseFilter)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IAMStreamConfig)) + *ppv = (LPVOID)&(This->IAMStreamConfig_vtbl); + + if (*ppv) + { + TRACE("Returning %s interface\n", qzdebugstr_guid(riid)); + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } + + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI VfwCapture_AddRef(IBaseFilter * iface) +{ + VfwCapture *This = (VfwCapture *)iface; + ULONG refCount = InterlockedIncrement(&This->refCount); + + TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, refCount - 1); + + return refCount; +} + +static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) +{ + VfwCapture *This = (VfwCapture *)iface; + ULONG refCount = InterlockedDecrement(&This->refCount); + TRACE("(%p/%p)->() Release from %ld\n", This, iface, refCount + 1); + + if (!refCount) + { + TRACE("(): Destroying everything!\n"); + if (This->state != State_Stopped) + Capture_Stop(&This->myCap, &This->state); + Capture_Destroy(&This->myCap); + IPin_Release(This->pOutputPin); + DeleteCriticalSection(&This->csFilter); + This->lpVtbl = NULL; + CoTaskMemFree(This); + } + return refCount; +} + +/** IPersist methods **/ + +static HRESULT WINAPI VfwCapture_GetClassID(IBaseFilter * iface, CLSID * pClsid) +{ + TRACE("(%p)\n", pClsid); + *pClsid = CLSID_VfwCapture; + return S_OK; +} + +/** IMediaFilter methods **/ + +static HRESULT WINAPI VfwCapture_Stop(IBaseFilter * iface) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("()\n"); + return Capture_Stop(&This->myCap, &This->state); +} + +static HRESULT WINAPI VfwCapture_Pause(IBaseFilter * iface) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("()\n"); + return Capture_Pause(&This->myCap, &This->state); +} + +static HRESULT WINAPI VfwCapture_Run(IBaseFilter * iface, REFERENCE_TIME tStart) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("(%lx%08lx)\n", (ULONG)(tStart >> 32), (ULONG)tStart); + return Capture_Run(&This->myCap, &This->state); +} + +static HRESULT WINAPI VfwCapture_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) +{ + VfwCapture *This = (VfwCapture *)iface; + TRACE("(%lu, %p)\n", dwMilliSecsTimeout, pState); + *pState = This->state; + return S_OK; +} + +static HRESULT WINAPI VfwCapture_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock) +{ + TRACE("(%p)\n", pClock); + return S_OK; +} + +static HRESULT WINAPI VfwCapture_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock) +{ + TRACE("(%p)\n", ppClock); + return S_OK; +} + +/** IBaseFilter methods **/ + +static HRESULT WINAPI VfwCapture_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) +{ + ENUMPINDETAILS epd; + VfwCapture *This = (VfwCapture *)iface; + + TRACE("(%p)\n", ppEnum); + + epd.cPins = 1; + epd.ppPins = &This->pOutputPin; + return IEnumPinsImpl_Construct(&epd, ppEnum); +} + +static HRESULT WINAPI VfwCapture_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) +{ + FIXME("(%s, %p) - stub\n", debugstr_w(Id), ppPin); + return E_NOTIMPL; +} + +static HRESULT WINAPI VfwCapture_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) +{ + VfwCapture *This = (VfwCapture *)iface; + + TRACE("(%p)\n", pInfo); + + strcpyW(pInfo->achName, This->filterInfo.achName); + pInfo->pGraph = This->filterInfo.pGraph; + + if (pInfo->pGraph) + IFilterGraph_AddRef(pInfo->pGraph); + return S_OK; +} + +static HRESULT WINAPI VfwCapture_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) +{ + VfwCapture *This = (VfwCapture *)iface; + + TRACE("(%p, %s)\n", pGraph, debugstr_w(pName)); + + if (pName) + strcpyW(This->filterInfo.achName, pName); + else + *This->filterInfo.achName = 0; + This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */ + + return S_OK; +} + +static HRESULT WINAPI VfwCapture_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo) +{ + FIXME("(%p)\n", pVendorInfo); + return E_NOTIMPL; +} + +static const IBaseFilterVtbl VfwCapture_Vtbl = +{ + VfwCapture_QueryInterface, + VfwCapture_AddRef, + VfwCapture_Release, + VfwCapture_GetClassID, + VfwCapture_Stop, + VfwCapture_Pause, + VfwCapture_Run, + VfwCapture_GetState, + VfwCapture_SetSyncSource, + VfwCapture_GetSyncSource, + VfwCapture_EnumPins, + VfwCapture_FindPin, + VfwCapture_QueryFilterInfo, + VfwCapture_JoinFilterGraph, + VfwCapture_QueryVendorInfo +}; + +/* AMStreamConfig interface, we only need to implement {G,S}etFormat */ +static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig * iface, REFIID riid, LPVOID * ppv) +{ + FIXME("%p: stub, not worth the effort\n", iface); + return S_OK; +} + +static ULONG WINAPI AMStreamConfig_AddRef(IAMStreamConfig * iface) +{ + FIXME("%p: stub, not worth the effort\n", iface); + return 1; +} + +static ULONG WINAPI AMStreamConfig_Release(IAMStreamConfig * iface) +{ + FIXME("%p: stub, not worth the effort\n", iface); + return 1; +} + +static HRESULT WINAPI AMStreamConfig_SetFormat(IAMStreamConfig *iface, + AM_MEDIA_TYPE *pmt) { + FakeAMConfigImpl *This = (FakeAMConfigImpl *)iface; + BITMAPINFOHEADER *bmi; + VIDEOINFOHEADER *pvi; + TRACE("(): Printing out full format\n" + "\tMajor.Minor: %s.%s\n" + "\tFixedSize [%d] - Temporal [%d]\n" + "\tSample size [%lu] - Format type: %s\n" + "\tcb Format: %lu - Pointer: %p\n", + qzdebugstr_guid(&pmt->majortype), qzdebugstr_guid(&pmt->subtype), + pmt->bFixedSizeSamples, pmt->bTemporalCompression, + pmt->lSampleSize, qzdebugstr_guid(&pmt->formattype), + pmt->cbFormat, pmt->pbFormat); + // Presume pbFormat is a video + pvi = (void *)pmt->pbFormat; + TRACE("(): Printing out whole video info header\n" + "\tSource rectangle: (%lu,%lu,%lu,%lu)\n" + "\tTarget rectangle: (%lu,%lu,%lu,%lu)\n" + "\tBitrate: %lu, Error rate: %lu\n" + "\tTime per frame: %lu\n", + pvi->rcSource.left, pvi->rcSource.right, pvi->rcSource.top, pvi->rcSource.bottom, + pvi->rcTarget.left, pvi->rcTarget.right, pvi->rcTarget.top, pvi->rcTarget.bottom, + pvi->dwBitRate, pvi->dwBitErrorRate, + (ulong) pvi->AvgTimePerFrame); + bmi = &pvi->bmiHeader; + TRACE("(): Printing out bmi header\n" + "\tSize, in pixels: %lu\n" + "\tFormat: %ldx%ld\n" + "\tBit count: %d\n" + "\tSize image: %lu\n", + bmi->biSize, bmi->biWidth, bmi->biHeight, bmi->biBitCount, bmi->biSizeImage); + return Capture_SetMediaType(&This->myCap, pmt); +} + +static HRESULT WINAPI AMStreamConfig_GetFormat(IAMStreamConfig *iface, + AM_MEDIA_TYPE **pmt) { + FakeAMConfigImpl *This = (FakeAMConfigImpl *)iface; + TRACE("%p -> (%p)\n", iface, pmt); + return Capture_GetMediaType(&This->myCap, pmt); +} + +static HRESULT WINAPI AMStreamConfig_GetNumberOfCapabilities(IAMStreamConfig *iface, int *piCount, int *piSize) +{ + TRACE("%p: %p %p\n", iface, piCount, piSize); + return E_NOTIMPL; /* Not implemented for this interface */ +} + +static HRESULT WINAPI AMStreamConfig_GetStreamCaps(IAMStreamConfig *iface, +int iIndex, AM_MEDIA_TYPE **pmt, BYTE *pSCC) +{ + TRACE("%p: %d %p %p\n", iface, iIndex, pmt, pSCC); + return E_NOTIMPL; /* Not implemented for this interface */ +} + +static const IAMStreamConfigVtbl IAMStreamConfig_VTable = +{ + AMStreamConfig_QueryInterface, + AMStreamConfig_AddRef, + AMStreamConfig_Release, + AMStreamConfig_SetFormat, + AMStreamConfig_GetFormat, + AMStreamConfig_GetNumberOfCapabilities, + AMStreamConfig_GetStreamCaps +}; + +/* IKsPropertySet interface */ +static HRESULT WINAPI KSP_QueryInterface(IKsPropertySet * iface, REFIID riid, LPVOID * ppv) +{ + TRACE("%p: stub, not worth the effort\n", iface); + return S_OK; +} + +static ULONG WINAPI KSP_AddRef(IKsPropertySet * iface) +{ + TRACE("%p: stub, not worth the effort\n", iface); + return 1; +} + +static ULONG WINAPI KSP_Release(IKsPropertySet * iface) +{ + TRACE("%p: stub, not worth the effort\n", iface); + return 1; +} + +static HRESULT WINAPI KSP_Set(IKsPropertySet * iface, REFGUID guidPropSet, DWORD dwPropID, LPVOID pInstanceData, DWORD cbInstanceData, LPVOID pPropData, DWORD cbPropData) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI KSP_Get(IKsPropertySet * iface, REFGUID guidPropSet, DWORD dwPropID, LPVOID pInstanceData, DWORD cbInstanceData, LPVOID pPropData, DWORD cbPropData, DWORD *pcbReturned) +{ + TRACE("()\n"); + if (!IsEqualIID(guidPropSet, &AMPROPSETID_Pin)) + return E_PROP_SET_UNSUPPORTED; + if (pPropData == NULL && pcbReturned == NULL) + return E_POINTER; + if (pcbReturned) + *pcbReturned = sizeof(GUID); + if (pPropData == NULL) + return S_OK; + if (cbPropData < sizeof(GUID)) + return E_UNEXPECTED; + *(GUID *)pPropData = PIN_CATEGORY_PREVIEW; + TRACE("() Returning CaP\n"); + return S_OK; +} + +static HRESULT WINAPI KSP_QuerySupported(IKsPropertySet * iface, REFGUID guidPropSet, DWORD dwPropID, DWORD *pTypeSupport) +{ + TRACE("%p: stub\n", iface); + return E_NOTIMPL; +} + +static IKsPropertySetVtbl KSP_VTable = +{ + KSP_QueryInterface, + KSP_AddRef, + KSP_Release, + KSP_Set, + KSP_Get, + KSP_QuerySupported +}; + +static HRESULT AcceptProcAFR(LPVOID iface, const AM_MEDIA_TYPE *pmt) +{ + VfwPinImpl *This = (VfwPinImpl *)iface; + FIXME("%p: %p\n", This, pmt); + return S_FALSE; +} + +static HRESULT VfwPin_Construct(IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) +{ + VfwPinImpl * pPinImpl; + PIN_INFO piOutput; + ALLOCATOR_PROPERTIES ap; + + pPinImpl = CoTaskMemAlloc(sizeof(*pPinImpl)); + if (!pPinImpl) + return E_OUTOFMEMORY; + + piOutput.dir = PINDIR_OUTPUT; + piOutput.pFilter = pBaseFilter; + strcpyW(piOutput.achName, wszOutputPinName); + ap.cBuffers = 8; + ap.cbBuffer = 256*1024; + ap.cbAlign = 0; + ap.cbPrefix = 0; + + if (SUCCEEDED(OutputPin_Init(&piOutput, &ap, pBaseFilter, AcceptProcAFR, pCritSec, &pPinImpl->pin))) + { + pPinImpl->KSP_VT = &KSP_VTable; + pPinImpl->pin.pin.lpVtbl = &VfwPin_Vtbl; + pPinImpl->hEvent = CreateEventW(NULL, 0, 0, NULL); + pPinImpl->bFlushing = FALSE; + pPinImpl->pHead = NULL; + *ppPin = (IPin *)(&pPinImpl->pin.pin.lpVtbl); + return S_OK; + } + return E_FAIL; +} + +static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) +{ + VfwPinImpl *This = (VfwPinImpl *)iface; + TRACE("%s %p\n", qzdebugstr_guid(riid), ppv); + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IPin)) + *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IKsPropertySet)) + *ppv = (LPVOID)&(This->KSP_VT); + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } + + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI VfwPin_Release(IPin * iface) +{ + VfwPinImpl *This = (VfwPinImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); + TRACE("()\n"); + + if (!refCount) + { + DATAREQUEST * pCurrent; + DATAREQUEST * pNext; + for (pCurrent = This->pHead; pCurrent; pCurrent = pNext) + { + pNext = pCurrent->pNext; + CoTaskMemFree(pCurrent); + } + CloseHandle(This->hEvent); + CoTaskMemFree(This); + return 0; + } + return refCount; +} + +static HRESULT WINAPI VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) +{ + ENUMMEDIADETAILS emd; + AM_MEDIA_TYPE q[1]; + HRESULT hr; + int x = 0; + + VfwPinImpl *This = (VfwPinImpl *)iface; + FIXME("(%p) - stub Why does this work and other things don't?!\n", ppEnum); + emd.cMediaTypes = 1; + for (; x < 1; x++) { + VIDEOINFOHEADER *pvi; + CopyMemory(&q[x].majortype, &MEDIATYPE_Video, sizeof (GUID)); + CopyMemory(&q[x].subtype, &MEDIASUBTYPE_RGB24, sizeof (GUID)); + q[x].bFixedSizeSamples = TRUE; + q[x].bTemporalCompression = FALSE; + q[x].lSampleSize = 230400; + CopyMemory(&q[x].formattype, &FORMAT_VideoInfo, sizeof (GUID)); + q[x].cbFormat = sizeof(VIDEOINFOHEADER); + q[x].pbFormat = CoTaskMemAlloc(q[x].cbFormat); + pvi = (VIDEOINFOHEADER *)q[x].pbFormat; + pvi->rcSource.left = 0; pvi->rcSource.top = 0; + pvi->rcTarget.left = 0; pvi->rcTarget.top = 0; + pvi->rcSource.right = 320; pvi->rcSource.bottom = 240; + pvi->rcTarget.right = 320; pvi->rcTarget.bottom = 240; + pvi->dwBitRate = 10; + pvi->dwBitErrorRate = 0; + pvi->AvgTimePerFrame = (LONGLONG)(10000000.0 / 25); + pvi->bmiHeader.biSize = 40; + pvi->bmiHeader.biWidth = 320; + pvi->bmiHeader.biHeight = 240; + pvi->bmiHeader.biBitCount = 24; + pvi->bmiHeader.biCompression = BI_RGB; + pvi->bmiHeader.biSizeImage = 320*240*3; + pvi->bmiHeader.biXPelsPerMeter = 320; + pvi->bmiHeader.biYPelsPerMeter = 240; + pvi->bmiHeader.biClrUsed = 0; + pvi->bmiHeader.biPlanes = 1; + pvi->bmiHeader.biClrImportant = 0; + } + emd.pMediaTypes = q; + hr = IEnumMediaTypesImpl_Construct(&emd, ppEnum); + TRACE("%p -- %lx\n", This, hr); + /* CoTaskMemFree(q[0].pbFormat); */ + return hr; +} + +static const IPinVtbl VfwPin_Vtbl = +{ + VfwPin_QueryInterface, + IPinImpl_AddRef, + VfwPin_Release, + OutputPin_Connect, + OutputPin_ReceiveConnection, + IPinImpl_Disconnect, + IPinImpl_ConnectedTo, + IPinImpl_ConnectionMediaType, + IPinImpl_QueryPinInfo, + IPinImpl_QueryDirection, + IPinImpl_QueryId, + IPinImpl_QueryAccept, + VfwPin_EnumMediaTypes, + IPinImpl_QueryInternalConnections, + OutputPin_EndOfStream, + OutputPin_BeginFlush, + OutputPin_EndFlush, + OutputPin_NewSegment +}; + diff -Nru wine-old/include/axextend.idl wine-new/include/axextend.idl --- wine-old/include/axextend.idl 2003-07-01 06:33:35.000000000 +0200 +++ wine-new/include/axextend.idl 2005-04-15 21:23:47.000000000 +0200 @@ -69,6 +69,23 @@ interface IQualityControl; interface ISeekingPassThru; +/***************************************************************************** + * IAMStreamConfig interface + */ +[ + object, + uuid(c6e13340-30ac-11d0-a18c-00a0c9118956), + pointer_default(unique) +] +interface IAMStreamConfig : IUnknown +{ + HRESULT SetFormat( [in] AM_MEDIA_TYPE *pmt); + HRESULT GetFormat( [in] AM_MEDIA_TYPE **pmt); + HRESULT GetNumberOfCapabilities( [out] int *piCount, [out] int *piSize); + HRESULT GetStreamCaps( [in] int iIndex, [out] AM_MEDIA_TYPE **pmt, + [out] BYTE *pSCC); +} + typedef struct { CLSID Clsid;

1 0

Moved emails
by Dustin Navea 17 Apr '05

17 Apr '05

Hey everyone I have moved to a gmail account, since they offer free POP access. I have 49 invites left if anyone wants an account, I am in the process of manually forwarding all of my emails from Yahoo to GMail, and saving to get a 2nd computer so I can have a dedicated linux box to come back here on.. -Dustin

1 0

Re: NT4 gdi test fix
by Dmitry Timoshkov 17 Apr '05

17 Apr '05

"Jakob Eriksson" <jakov(a)vmlinux.org> wrote: > As per: > > http://test.winehq.org/data/200504141000/nt4_IDWASEMPTY/gdi32:gdiobj.txt > > MSDN shows: > http://msdn.microsoft.com/library/default.asp?url=/library/en-us/gdi/devcon… > > Explanation: the struct defined when the test is compiled may have > records not present > in earlier versions of Windows. Hmm, which records were added into LOGFONT structure after NT4? That would make the generated.c, test_pack_LOGFONTA() fail as well? -- Dmitry.

2 3

Progman Implementation ?
by Andrew Neil Ramage 17 Apr '05

17 Apr '05

Is the Wine implementation of the Program Manager complete ? When I start progman.exe I get a blank window with lots of errors about .BMPs. -- Andrew Beneath the noble bird Between the proudest words Behind the beauty, cracks appear Once with heads held high They sang out to the sky Why do their shadows bow in fear? Beneath, Between and Behind by Rush (Fly By Night, 1975) ---------------------------------------

1 0

Multimedia Control Panel question
by Robert Reif 17 Apr '05

17 Apr '05

The proper way to set the default sound card is to use the same registry keys as Windows and either use a native mmsys.cpl or devise a wine specific way of doing the same thing. Creating a builtin mmsys.cpl is one way of accomplishing this and another way is to add this capability to winecfg. You could also have winecfg launch mmsys.cfg (native or builtin). Any ideas on what would be the best way for wine? Here are some of the registry keys and a link to some documentation: http://www.cs.vu.nl/~pboon/md/indexold.htm Index: tools/wine.inf =================================================================== RCS file: /home/wine/wine/tools/wine.inf,v retrieving revision 1.31 diff -u -p -r1.31 wine.inf --- tools/wine.inf 11 Apr 2005 18:49:28 -0000 1.31 +++ tools/wine.inf 12 Apr 2005 04:59:23 -0000 @@ -40,6 +40,7 @@ AddReg=\ Fonts,\ MCI,\ Misc,\ + Multimedia,\ Nls,\ OLE,\ Tapi @@ -558,6 +559,11 @@ HKLM,System\CurrentControlSet\Control\Nl [OLE] HKLM,"Software\Microsoft\OLE","EnableDCOM",,"Y" HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N" + +[Multimedia] +HKCU,Software\Microsoft\Multimedia\Sound Mapper,"PreferredOnly",0x10001,00000000 +HKCU,Software\Microsoft\Multimedia\Sound Mapper,"Playback",,"" +HKCU,Software\Microsoft\Multimedia\Sound Mapper,"Record",,"" [Tapi] HKLM,%CurrentVersion%\Telephony,"Perf1",0x10001,5045524a

3 2

Re: wine.inf: powrprof registry entries
by Vincent Béron 17 Apr '05

17 Apr '05

Le sam 16/04/2005 à 23:35, Benjamin Cutler a écrit : > Ok, one more try at this. [snip] > --- tools/wine.inf 11 Apr 2005 18:49:28 -0000 1.31 > +++ tools/wine.inf 17 Apr 2005 03:28:19 -0000 > @@ -41,6 +41,7 @@ > MCI,\ > Misc,\ > Nls,\ > + PowrProf,\ > OLE,\ > Tapi > I guess AJ will want to keep them in alphabetical order... > @@ -554,6 +555,11 @@ > HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021004",,"a" > HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021404",,"9" > HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00030404",,"9" > + > +[PowrProf] > +HKLM,"Software\Microsoft\Windows\CurrentVersion\Controls Folder\PowerCfg","DiskSpinDownMax","3600" > +HKLM,"Software\Microsoft\Windows\CurrentVersion\Controls Folder\PowerCfg","DiskSpinDownMin","3" > +HKLM,"Software\Microsoft\Windows\CurrentVersion\Controls Folder\PowerCfg","LastID","5" Your previous patch had the missing comma in each of those. Also, same comment about alphabetical order here too. Don't worry, the first patches are usually the toughest. Vincent

1 0

Hi all (after a long absence...) and here's a patch for the menu and the caption buttons
by William Poetra Yoga H 17 Apr '05

17 Apr '05

Hi guys (and gals), sorry for the long absence but my time got taken up in something else (a problem with my isp, see http://sourceforge.net/projects/drcom-client) and I couldn't spend my time here... Anyway, here are patches for the menu (it fixes some menu sizes, and also the shift-down-by-1-pixel bug in winemine), and the caption (fixes the size and position of the caption buttons). Comments? William Poetra Yoga Hadisoeseno __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com Index: dlls/user/menu.c =================================================================== RCS file: /home/wine/wine/dlls/user/menu.c,v retrieving revision 1.25 diff -u -p -r1.25 menu.c --- dlls/user/menu.c 14 Apr 2005 13:56:29 -0000 1.25 +++ dlls/user/menu.c 15 Apr 2005 04:37:27 -0000 @@ -1090,7 +1090,7 @@ static void MENU_MenuBarCalcSize( HDC hd lprect->left, lprect->top, lprect->right, lprect->bottom); lppop->Width = lprect->right - lprect->left; lppop->Height = 0; - maxY = lprect->top+1; + maxY = lprect->top; start = 0; helpPos = -1; lppop->maxBmpSize.cx = 0; @@ -1126,7 +1126,7 @@ static void MENU_MenuBarCalcSize( HDC hd while (start < i) lppop->items[start++].rect.bottom = maxY; } - lprect->bottom = maxY; + lprect->bottom = maxY + 1; lppop->Height = lprect->bottom - lprect->top; /* Flush right all items between the MF_RIGHTJUSTIFY and */ @@ -1514,7 +1514,7 @@ UINT MENU_DrawMenuBar( HDC hDC, LPRECT l lppop = MENU_GetMenu( hMenu ); if (lppop == NULL || lprect == NULL) { - return GetSystemMetrics(SM_CYMENU); + return GetSystemMetrics(SM_CYMENU) + 1; } if (suppress_draw) @@ -3857,7 +3857,7 @@ DWORD WINAPI DrawMenuBarTemp(HWND hwnd, lppop = MENU_GetMenu( hMenu ); if (lppop == NULL || lprect == NULL) { - retvalue = GetSystemMetrics(SM_CYMENU); + retvalue = GetSystemMetrics(SM_CYMENU) + 1; goto END; } @@ -3878,7 +3878,7 @@ DWORD WINAPI DrawMenuBarTemp(HWND hwnd, if (lppop->nItems == 0) { - retvalue = GetSystemMetrics(SM_CYMENU); + retvalue = GetSystemMetrics(SM_CYMENU) + 1; goto END; } Index: windows/nonclient.c =================================================================== RCS file: /home/wine/wine/windows/nonclient.c,v retrieving revision 1.141 diff -u -p -r1.141 nonclient.c --- windows/nonclient.c 13 Apr 2005 16:13:45 -0000 1.141 +++ windows/nonclient.c 15 Apr 2005 04:37:28 -0000 @@ -398,7 +398,7 @@ LONG NC_HandleNCCalcSize( HWND hwnd, REC winRect->top += MENU_GetMenuBarHeight( hwnd, winRect->right - winRect->left, - -tmpRect.left, -tmpRect.top ) + 1; + -tmpRect.left, -tmpRect.top ); } if( exStyle & WS_EX_CLIENTEDGE) Index: windows/nonclient.c =================================================================== RCS file: /home/wine/wine/windows/nonclient.c,v retrieving revision 1.141 diff -u -p -r1.141 nonclient.c --- windows/nonclient.c 13 Apr 2005 16:13:45 -0000 1.141 +++ windows/nonclient.c 15 Apr 2005 04:37:28 -0000 @@ -691,21 +691,21 @@ static void NC_DrawCloseButton (HWND hwn /* A tool window has a smaller Close button */ if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_TOOLWINDOW) { - INT iBmpHeight = 11; /* Windows does not use SM_CXSMSIZE and SM_CYSMSIZE */ - INT iBmpWidth = 11; /* it uses 11x11 for the close button in tool window */ - INT iCaptionHeight = GetSystemMetrics(SM_CYSMCAPTION); + INT iCaptionHeight = GetSystemMetrics(SM_CYSMCAPTION) - 1; + INT iBmpHeight = iCaptionHeight - 4; + INT iBmpWidth = iCaptionHeight - 5; - rect.top = rect.top + (iCaptionHeight - 1 - iBmpHeight) / 2; - rect.left = rect.right - (iCaptionHeight + 1 + iBmpWidth) / 2; + rect.top += 2; + rect.right -= 2; rect.bottom = rect.top + iBmpHeight; - rect.right = rect.left + iBmpWidth; + rect.left = rect.right - iBmpWidth; } else { - rect.left = rect.right - GetSystemMetrics(SM_CXSIZE) - 1; - rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 1; rect.top += 2; rect.right -= 2; + rect.bottom = rect.top + (GetSystemMetrics(SM_CYSIZE) - 4); + rect.left = rect.right - (GetSystemMetrics(SM_CXSIZE) - 2); } DrawFrameControl( hdc, &rect, DFC_CAPTION, (DFCS_CAPTIONCLOSE | @@ -731,12 +731,12 @@ static void NC_DrawMaxButton(HWND hwnd,H flags = IsZoomed(hwnd) ? DFCS_CAPTIONRESTORE : DFCS_CAPTIONMAX; NC_GetInsideRect( hwnd, &rect ); - if (GetWindowLongW( hwnd, GWL_STYLE) & WS_SYSMENU) - rect.right -= GetSystemMetrics(SM_CXSIZE) + 1; - rect.left = rect.right - GetSystemMetrics(SM_CXSIZE); - rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 1; rect.top += 2; + if (GetWindowLongA( hwnd, GWL_STYLE) & WS_SYSMENU) + rect.right -= (GetSystemMetrics(SM_CXSIZE) - 2) + 2; rect.right -= 2; + rect.bottom = rect.top + (GetSystemMetrics(SM_CYSIZE) - 4); + rect.left = rect.right - (GetSystemMetrics(SM_CXSIZE) - 2); if (down) flags |= DFCS_PUSHED; if (bGrayed) flags |= DFCS_INACTIVE; DrawFrameControl( hdc, &rect, DFC_CAPTION, flags ); @@ -759,14 +759,14 @@ static void NC_DrawMinButton(HWND hwnd, return; NC_GetInsideRect( hwnd, &rect ); + rect.top += 2; if (style & WS_SYSMENU) - rect.right -= GetSystemMetrics(SM_CXSIZE) + 1; + rect.right -= (GetSystemMetrics(SM_CXSIZE) - 2) + 2; + rect.right -= 2; if (style & (WS_MAXIMIZEBOX|WS_MINIMIZEBOX)) rect.right -= GetSystemMetrics(SM_CXSIZE) - 2; - rect.left = rect.right - GetSystemMetrics(SM_CXSIZE); - rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 1; - rect.top += 2; - rect.right -= 2; + rect.left = rect.right - (GetSystemMetrics(SM_CXSIZE) - 2); + rect.bottom = rect.top + (GetSystemMetrics(SM_CYSIZE) - 4); if (down) flags |= DFCS_PUSHED; if (bGrayed) flags |= DFCS_INACTIVE; DrawFrameControl( hdc, &rect, DFC_CAPTION, flags ); @@ -893,19 +893,23 @@ static void NC_DrawCaption( HDC hdc, R /* Draw a grayed close button if disabled or if SC_CLOSE is not there */ NC_DrawCloseButton (hwnd, hdc, FALSE, - (state & (MF_DISABLED | MF_GRAYED)) || (state == 0xFFFFFFFF)); - r.right -= GetSystemMetrics(SM_CYCAPTION) - 1; + ((((state & MF_DISABLED) || (state & MF_GRAYED))) && (state != 0xFFFFFFFF))); + r.right -= (GetSystemMetrics(SM_CXSIZE) - 2) + 2; if ((style & WS_MAXIMIZEBOX) || (style & WS_MINIMIZEBOX)) { + /* There's a 2-pixel space between Maximize and Close buttons */ + + r.right -= 2; + /* In win95 the two buttons are always there */ /* But if the menu item is not in the menu they're disabled*/ NC_DrawMaxButton( hwnd, hdc, FALSE, (!(style & WS_MAXIMIZEBOX))); - r.right -= GetSystemMetrics(SM_CXSIZE) + 1; + r.right -= GetSystemMetrics(SM_CXSIZE) - 2; NC_DrawMinButton( hwnd, hdc, FALSE, (!(style & WS_MINIMIZEBOX))); - r.right -= GetSystemMetrics(SM_CXSIZE) + 1; + r.right -= GetSystemMetrics(SM_CXSIZE) - 2; } } @@ -924,6 +928,7 @@ static void NC_DrawCaption( HDC hdc, R else SetTextColor( hdc, GetSysColor( COLOR_INACTIVECAPTIONTEXT ) ); SetBkMode( hdc, TRANSPARENT ); r.left += 2; + r.right -= 2; DrawTextW( hdc, buffer, -1, &r, DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT ); DeleteObject (SelectObject (hdc, hOldFont)); @@ -1025,7 +1030,7 @@ static void NC_DoNCPaint( HWND hwnd, H TRACE("Calling DrawMenuBar with rect (%ld, %ld)-(%ld, %ld)\n", r.left, r.top, r.right, r.bottom); - rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ) + 1; + rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ); } TRACE("After MenuBar, rect is (%ld, %ld)-(%ld, %ld).\n",

1 1

Re: Still more fun?
by Steven Edwards 17 Apr '05

17 Apr '05

Hi, --- Jakob Eriksson <jakov(a)vmlinux.org> wrote: > Has anybody else thought of using DLLs (like ReactOS' dlls) as a > compatibility > layer to different Windows versions? I think it would be good in testing Wine/ReactOS vs Windows for Winelib applications developers. You can make a dummy file in your application directory called application.exe.local to force Windows to use the dlls in the local directory. So say you have IEXPLORE.EXE you would create IEXPLORE.EXE.LOCAL and drop the Mingw compiled dlls in to the application folder and see how it runs. Thanks Steven __________________________________ Do you Yahoo!? Plan great trips with Yahoo! Travel: Now over 17,000 guides! http://travel.yahoo.com/p-travelguide

1 0

Re: Fun projects
by Steven Edwards 17 Apr '05

17 Apr '05

--- Jakob Eriksson <jakov(a)vmlinux.org> wrote: > Wasn't there talk about making DLLs for use in Windows, to > export a native Windows desktop to an X11 server? There was someone who did this by compiling parts of Wine under Cygwin with Detours from research.microsoft.com Look around the mailing list for win32-x11 on sources.redhat.com Thanks Steven __________________________________ Do you Yahoo!? Plan great trips with Yahoo! Travel: Now over 17,000 guides! http://travel.yahoo.com/p-travelguide

1 0

Re: [DINPUT] add keyboard data format
by Robert Reif 16 Apr '05

16 Apr '05

Robert Reif wrote: > Add keyboard data format. With Dmitry's const changes. Index: dlls/dinput/data_formats.c =================================================================== RCS file: /home/wine/wine/dlls/dinput/data_formats.c,v retrieving revision 1.2 diff -p -u -r1.2 data_formats.c --- dlls/dinput/data_formats.c 3 Sep 2004 17:27:58 -0000 1.2 +++ dlls/dinput/data_formats.c 16 Apr 2005 21:44:08 -0000 @@ -16,10 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* TODO: - * add keyboard - */ - #include <stdarg.h> #include "windef.h" @@ -27,7 +23,7 @@ #define numObjects(x) (sizeof(x) / sizeof(x[0])) -DIOBJECTDATAFORMAT dfDIJoystick[] = { +static const DIOBJECTDATAFORMAT dfDIJoystick[] = { { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, @@ -80,10 +76,10 @@ const DIDATAFORMAT c_dfDIJoystick = { DIDF_ABSAXIS, sizeof(DIJOYSTATE2), numObjects(dfDIJoystick), - dfDIJoystick + (LPDIOBJECTDATAFORMAT)dfDIJoystick }; -DIOBJECTDATAFORMAT dfDIJoystick2[] = { +static const DIOBJECTDATAFORMAT dfDIJoystick2[] = { { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, @@ -256,10 +252,10 @@ const DIDATAFORMAT c_dfDIJoystick2 = { DIDF_ABSAXIS, sizeof(DIJOYSTATE2), numObjects(dfDIJoystick2), - dfDIJoystick2 + (LPDIOBJECTDATAFORMAT)dfDIJoystick2 }; -DIOBJECTDATAFORMAT dfDIMouse[] = { +static const DIOBJECTDATAFORMAT dfDIMouse[] = { { &GUID_XAxis, DIMOFS_X, DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, { &GUID_YAxis, DIMOFS_Y, DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, { &GUID_ZAxis, DIMOFS_Z, DIDFT_OPTIONAL | DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, @@ -275,10 +271,10 @@ const DIDATAFORMAT c_dfDIMouse = { DIDF_RELAXIS, sizeof(DIMOUSESTATE), numObjects(dfDIMouse), - dfDIMouse + (LPDIOBJECTDATAFORMAT)dfDIMouse }; -DIOBJECTDATAFORMAT dfDIMouse2[] = { +static const DIOBJECTDATAFORMAT dfDIMouse2[] = { { &GUID_XAxis, DIMOFS_X, DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, { &GUID_YAxis, DIMOFS_Y, DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, { &GUID_ZAxis, DIMOFS_Z, DIDFT_OPTIONAL | DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, @@ -298,5 +294,273 @@ const DIDATAFORMAT c_dfDIMouse2 = { DIDF_RELAXIS, sizeof(DIMOUSESTATE2), numObjects(dfDIMouse2), - dfDIMouse2 + (LPDIOBJECTDATAFORMAT)dfDIMouse2 +}; + +static const DIOBJECTDATAFORMAT dfDIKeyboard[] = { + { &GUID_Key,0,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(0),0}, + { &GUID_Key,1,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(1),0}, + { &GUID_Key,2,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(2),0}, + { &GUID_Key,3,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(3),0}, + { &GUID_Key,4,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(4),0}, + { &GUID_Key,5,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(5),0}, + { &GUID_Key,6,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(6),0}, + { &GUID_Key,7,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(7),0}, + { &GUID_Key,8,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(8),0}, + { &GUID_Key,9,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(9),0}, + { &GUID_Key,10,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(10),0}, + { &GUID_Key,11,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(11),0}, + { &GUID_Key,12,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(12),0}, + { &GUID_Key,13,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(13),0}, + { &GUID_Key,14,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(14),0}, + { &GUID_Key,15,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(15),0}, + { &GUID_Key,16,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(16),0}, + { &GUID_Key,17,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(17),0}, + { &GUID_Key,18,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(18),0}, + { &GUID_Key,19,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(19),0}, + { &GUID_Key,20,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(20),0}, + { &GUID_Key,21,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(21),0}, + { &GUID_Key,22,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(22),0}, + { &GUID_Key,23,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(23),0}, + { &GUID_Key,24,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(24),0}, + { &GUID_Key,25,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(25),0}, + { &GUID_Key,26,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(26),0}, + { &GUID_Key,27,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(27),0}, + { &GUID_Key,28,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(28),0}, + { &GUID_Key,29,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(29),0}, + { &GUID_Key,30,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(30),0}, + { &GUID_Key,31,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(31),0}, + { &GUID_Key,32,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(32),0}, + { &GUID_Key,33,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(33),0}, + { &GUID_Key,34,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(34),0}, + { &GUID_Key,35,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(35),0}, + { &GUID_Key,36,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(36),0}, + { &GUID_Key,37,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(37),0}, + { &GUID_Key,38,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(38),0}, + { &GUID_Key,39,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(39),0}, + { &GUID_Key,40,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(40),0}, + { &GUID_Key,41,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(41),0}, + { &GUID_Key,42,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(42),0}, + { &GUID_Key,43,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(43),0}, + { &GUID_Key,44,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(44),0}, + { &GUID_Key,45,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(45),0}, + { &GUID_Key,46,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(46),0}, + { &GUID_Key,47,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(47),0}, + { &GUID_Key,48,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(48),0}, + { &GUID_Key,49,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(49),0}, + { &GUID_Key,50,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(50),0}, + { &GUID_Key,51,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(51),0}, + { &GUID_Key,52,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(52),0}, + { &GUID_Key,53,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(53),0}, + { &GUID_Key,54,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(54),0}, + { &GUID_Key,55,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(55),0}, + { &GUID_Key,56,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(56),0}, + { &GUID_Key,57,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(57),0}, + { &GUID_Key,58,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(58),0}, + { &GUID_Key,59,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(59),0}, + { &GUID_Key,60,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(60),0}, + { &GUID_Key,61,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(61),0}, + { &GUID_Key,62,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(62),0}, + { &GUID_Key,63,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(63),0}, + { &GUID_Key,64,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(64),0}, + { &GUID_Key,65,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(65),0}, + { &GUID_Key,66,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(66),0}, + { &GUID_Key,67,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(67),0}, + { &GUID_Key,68,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(68),0}, + { &GUID_Key,69,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(69),0}, + { &GUID_Key,70,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(70),0}, + { &GUID_Key,71,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(71),0}, + { &GUID_Key,72,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(72),0}, + { &GUID_Key,73,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(73),0}, + { &GUID_Key,74,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(74),0}, + { &GUID_Key,75,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(75),0}, + { &GUID_Key,76,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(76),0}, + { &GUID_Key,77,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(77),0}, + { &GUID_Key,78,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(78),0}, + { &GUID_Key,79,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(79),0}, + { &GUID_Key,80,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(80),0}, + { &GUID_Key,81,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(81),0}, + { &GUID_Key,82,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(82),0}, + { &GUID_Key,83,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(83),0}, + { &GUID_Key,84,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(84),0}, + { &GUID_Key,85,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(85),0}, + { &GUID_Key,86,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(86),0}, + { &GUID_Key,87,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(87),0}, + { &GUID_Key,88,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(88),0}, + { &GUID_Key,89,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(89),0}, + { &GUID_Key,90,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(90),0}, + { &GUID_Key,91,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(91),0}, + { &GUID_Key,92,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(92),0}, + { &GUID_Key,93,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(93),0}, + { &GUID_Key,94,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(94),0}, + { &GUID_Key,95,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(95),0}, + { &GUID_Key,96,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(96),0}, + { &GUID_Key,97,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(97),0}, + { &GUID_Key,98,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(98),0}, + { &GUID_Key,99,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(99),0}, + { &GUID_Key,100,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(100),0}, + { &GUID_Key,101,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(101),0}, + { &GUID_Key,102,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(102),0}, + { &GUID_Key,103,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(103),0}, + { &GUID_Key,104,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(104),0}, + { &GUID_Key,105,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(105),0}, + { &GUID_Key,106,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(106),0}, + { &GUID_Key,107,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(107),0}, + { &GUID_Key,108,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(108),0}, + { &GUID_Key,109,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(109),0}, + { &GUID_Key,110,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(110),0}, + { &GUID_Key,111,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(111),0}, + { &GUID_Key,112,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(112),0}, + { &GUID_Key,113,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(113),0}, + { &GUID_Key,114,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(114),0}, + { &GUID_Key,115,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(115),0}, + { &GUID_Key,116,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(116),0}, + { &GUID_Key,117,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(117),0}, + { &GUID_Key,118,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(118),0}, + { &GUID_Key,119,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(119),0}, + { &GUID_Key,120,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(120),0}, + { &GUID_Key,121,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(121),0}, + { &GUID_Key,122,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(122),0}, + { &GUID_Key,123,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(123),0}, + { &GUID_Key,124,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(124),0}, + { &GUID_Key,125,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(125),0}, + { &GUID_Key,126,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(126),0}, + { &GUID_Key,127,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(127),0}, + { &GUID_Key,128,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(128),0}, + { &GUID_Key,129,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(129),0}, + { &GUID_Key,130,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(130),0}, + { &GUID_Key,131,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(131),0}, + { &GUID_Key,132,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(132),0}, + { &GUID_Key,133,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(133),0}, + { &GUID_Key,134,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(134),0}, + { &GUID_Key,135,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(135),0}, + { &GUID_Key,136,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(136),0}, + { &GUID_Key,137,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(137),0}, + { &GUID_Key,138,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(138),0}, + { &GUID_Key,139,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(139),0}, + { &GUID_Key,140,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(140),0}, + { &GUID_Key,141,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(141),0}, + { &GUID_Key,142,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(142),0}, + { &GUID_Key,143,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(143),0}, + { &GUID_Key,144,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(144),0}, + { &GUID_Key,145,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(145),0}, + { &GUID_Key,146,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(146),0}, + { &GUID_Key,147,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(147),0}, + { &GUID_Key,148,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(148),0}, + { &GUID_Key,149,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(149),0}, + { &GUID_Key,150,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(150),0}, + { &GUID_Key,151,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(151),0}, + { &GUID_Key,152,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(152),0}, + { &GUID_Key,153,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(153),0}, + { &GUID_Key,154,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(154),0}, + { &GUID_Key,155,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(155),0}, + { &GUID_Key,156,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(156),0}, + { &GUID_Key,157,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(157),0}, + { &GUID_Key,158,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(158),0}, + { &GUID_Key,159,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(159),0}, + { &GUID_Key,160,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(160),0}, + { &GUID_Key,161,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(161),0}, + { &GUID_Key,162,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(162),0}, + { &GUID_Key,163,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(163),0}, + { &GUID_Key,164,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(164),0}, + { &GUID_Key,165,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(165),0}, + { &GUID_Key,166,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(166),0}, + { &GUID_Key,167,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(167),0}, + { &GUID_Key,168,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(168),0}, + { &GUID_Key,169,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(169),0}, + { &GUID_Key,170,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(170),0}, + { &GUID_Key,171,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(171),0}, + { &GUID_Key,172,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(172),0}, + { &GUID_Key,173,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(173),0}, + { &GUID_Key,174,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(174),0}, + { &GUID_Key,175,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(175),0}, + { &GUID_Key,176,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(176),0}, + { &GUID_Key,177,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(177),0}, + { &GUID_Key,178,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(178),0}, + { &GUID_Key,179,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(179),0}, + { &GUID_Key,180,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(180),0}, + { &GUID_Key,181,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(181),0}, + { &GUID_Key,182,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(182),0}, + { &GUID_Key,183,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(183),0}, + { &GUID_Key,184,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(184),0}, + { &GUID_Key,185,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(185),0}, + { &GUID_Key,186,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(186),0}, + { &GUID_Key,187,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(187),0}, + { &GUID_Key,188,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(188),0}, + { &GUID_Key,189,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(189),0}, + { &GUID_Key,190,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(190),0}, + { &GUID_Key,191,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(191),0}, + { &GUID_Key,192,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(192),0}, + { &GUID_Key,193,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(193),0}, + { &GUID_Key,194,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(194),0}, + { &GUID_Key,195,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(195),0}, + { &GUID_Key,196,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(196),0}, + { &GUID_Key,197,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(197),0}, + { &GUID_Key,198,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(198),0}, + { &GUID_Key,199,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(199),0}, + { &GUID_Key,200,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(200),0}, + { &GUID_Key,201,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(201),0}, + { &GUID_Key,202,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(202),0}, + { &GUID_Key,203,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(203),0}, + { &GUID_Key,204,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(204),0}, + { &GUID_Key,205,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(205),0}, + { &GUID_Key,206,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(206),0}, + { &GUID_Key,207,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(207),0}, + { &GUID_Key,208,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(208),0}, + { &GUID_Key,209,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(209),0}, + { &GUID_Key,210,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(210),0}, + { &GUID_Key,211,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(211),0}, + { &GUID_Key,212,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(212),0}, + { &GUID_Key,213,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(213),0}, + { &GUID_Key,214,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(214),0}, + { &GUID_Key,215,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(215),0}, + { &GUID_Key,216,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(216),0}, + { &GUID_Key,217,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(217),0}, + { &GUID_Key,218,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(218),0}, + { &GUID_Key,219,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(219),0}, + { &GUID_Key,220,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(220),0}, + { &GUID_Key,221,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(221),0}, + { &GUID_Key,222,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(222),0}, + { &GUID_Key,223,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(223),0}, + { &GUID_Key,224,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(224),0}, + { &GUID_Key,225,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(225),0}, + { &GUID_Key,226,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(226),0}, + { &GUID_Key,227,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(227),0}, + { &GUID_Key,228,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(228),0}, + { &GUID_Key,229,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(229),0}, + { &GUID_Key,230,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(230),0}, + { &GUID_Key,231,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(231),0}, + { &GUID_Key,232,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(232),0}, + { &GUID_Key,233,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(233),0}, + { &GUID_Key,234,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(234),0}, + { &GUID_Key,235,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(235),0}, + { &GUID_Key,236,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(236),0}, + { &GUID_Key,237,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(237),0}, + { &GUID_Key,238,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(238),0}, + { &GUID_Key,239,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(239),0}, + { &GUID_Key,240,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(240),0}, + { &GUID_Key,241,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(241),0}, + { &GUID_Key,242,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(242),0}, + { &GUID_Key,243,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(243),0}, + { &GUID_Key,244,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(244),0}, + { &GUID_Key,245,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(245),0}, + { &GUID_Key,246,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(246),0}, + { &GUID_Key,247,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(247),0}, + { &GUID_Key,248,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(248),0}, + { &GUID_Key,249,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(249),0}, + { &GUID_Key,250,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(250),0}, + { &GUID_Key,251,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(251),0}, + { &GUID_Key,252,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(252),0}, + { &GUID_Key,253,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(253),0}, + { &GUID_Key,254,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(254),0}, + { &GUID_Key,255,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(255),0} +}; + +const DIDATAFORMAT c_dfDIKeyboard = { + sizeof(DIDATAFORMAT), + sizeof(DIOBJECTDATAFORMAT), + DIDF_RELAXIS, + 256, + numObjects(dfDIKeyboard), + (LPDIOBJECTDATAFORMAT)dfDIKeyboard };

1 0

Re: [DINPUT] add keyboard data format
by Dmitry Timoshkov 16 Apr '05

16 Apr '05

"Robert Reif" <reif(a)earthlink.net> wrote: > +DIOBJECTDATAFORMAT dfDIKeyboard[] = { > + { &GUID_Key,0,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(0),0}, Is it possible to make it 'static const'? -- Dmitry.

1 0

Re: wine.inf: Better powrprof patch
by Vincent Béron 16 Apr '05

16 Apr '05

Le sam 16/04/2005 à 07:00, Benjamin Cutler a écrit : > Oops, last one was missing commas, wasn't it? I guess you also need to add powrprof to the list of sections in [DefaultInstall] at the start of wine.inf. Vincent

1 0

USB status ...
by Lars Segerlund 16 Apr '05

16 Apr '05

What is the status of wines USB support ? I have an IDE for a developement board and I really would like to flash it from Linux, ( I don't have windows), and this uses USB to talk to the board. Is there anything done yet or am I on my own ? Can someone also giva a hint on the feasibiliyt, complexity of managing a USB implementation for wine ? I am rather good at linux device drivers and such. / regards, Lars Segerlund.

2 1

Still more fun?
by Jakob Eriksson 16 Apr '05

16 Apr '05

Has anybody else thought of using DLLs (like ReactOS' dlls) as a compatibility layer to different Windows versions? I.e. when you distribute your Windows app, you also throw in a bunch of DLLs that implement lots of functionality you aren't sure exists on your target otherwise. (Windows 2003 functionality on Windows XP, 2000 and NT for instance.) It would be a way to avoid upgrading Windows. This would be good for developers, users and the Open Source community. The longer it takes for Microsoft to shove out a new version of their OS, the more time Open Source has to infiltrate. :-) I first had the idea when a program of mine refused to run on Windows 95 when it was compiled with Visual C++ .NET. It "needed" some XP functionality in a DLL not present on Windows 95. Well, I created a dll with the same name and distributed it with my program. //Jakob

1 0

Fun projects
by Jakob Eriksson 16 Apr '05

16 Apr '05

Wasn't there talk about making DLLs for use in Windows, to export a native Windows desktop to an X11 server? //Jakob

1 0

Threading Issues with DInput/Joysticks
by Dylan Taft 16 Apr '05

16 Apr '05

http://veracity.ath.cx/~diefool/failure.gz Log is about 100 megs unzipped. This is pretty bizzare. I gzipped a +all log. When a joystick is plugged into my machine, many dinput apps crash with meaningless backtraces unrelated to dinput. It affects a fair amount of apps http://www.blockland.us/blockland/index.asp is an easy one to work on since it crashes as soon as the program starts. It also only crashes when my joystick is plugged in and wine can see /dev/js0. 0047:trace:dinput:create_DataFormat Matching : 0047:trace:dinput:create_DataFormat - Asked (5) : 0047:trace:dinput:create_DataFormat * GUID: {a36d02e3-c9f3-11cf-bfc7-444553540000} ('GUID_RzAxis') 0047:trace:dinput:create_DataFormat * Offset: 20 0047:trace:dinput:create_DataFormat * dwType: 00000603 0047:trace:dinput:create_DataFormat Type: DIDFT_RELAXIS DIDFT_ABSAXIS / Instance: 6 0047:trace:dinput:create_DataFormat - Wine (5) : 0047:trace:dinput:create_DataFormat * GUID: {a36d02e3-c9f3-11cf-bfc7-444553540000} ('GUID_RzAxis') 0047:trace:dinput:create_DataFormat * Offset: 20 0047:trace:dinput:create_DataFormat * dwType: 80ffff03 0047:trace:dinput:create_DataFormat Type: DIDFT_RELAXIS DIDFT_ABSAXIS (unhandled: 80000000) / Instance: DIDFT_ANYINSTANCE 0047:trace:seh:EXC_RtlRaiseException code=c0000005 flags=0 addr=0x7e98f3a8 0047:trace:seh:EXC_RtlRaiseException info[0]=00000000 0047:trace:seh:EXC_RtlRaiseException info[1]=00000000 0047:trace:seh:EXC_RtlRaiseException eax=00000010 ebx=7e9aa5d8 ecx=00000010 edx=77c5bd50 esi=00000000 edi=7eda3bcc 0047:trace:seh:EXC_RtlRaiseException ebp=77aefad4 esp=77aefa3c cs=0073 ds=007b es=007b fs=003b gs=0033 flags=00010216 0047:trace:seh:EXC_CallHandler calling handler at 0x6437c8 code=c0000005 flags=0 0047:Call kernel32.UnhandledExceptionFilter(77aef5e8) ret=00649b15 I think this is where it gives up in the log. ^^ I'd like to debug this, anyone know where to start? __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

3 2

Re: TreeView fix endless loop and colors with custom draw
by Alexandre Julliard 16 Apr '05

16 Apr '05

Vitaliy Margolen <wine-patch(a)kievinfo.com> writes: > + if (((tvItem->mask & TVIF_CHILDREN ) && (originalItem.cChildren != wineItem->cChildren ) ) || > + ((tvItem->mask & TVIF_IMAGE ) && (originalItem.iImage != wineItem->iImage )&& > + wineItem->iImage != I_IMAGECALLBACK ) || > + ((tvItem->mask & TVIF_SELECTEDIMAGE) && (originalItem.iSelectedImage != wineItem->iSelectedImage)&& > + wineItem->iSelectedImage != I_IMAGECALLBACK ) || > + ((tvItem->mask & TVIF_TEXT ) && (originalItem.pszText != wineItem->pszText )&& > + wineItem->pszText != LPSTR_TEXTCALLBACKW ) || > + ((tvItem->mask & TVIF_INTEGRAL ) && (originalItem.iIntegral != wineItem->iIntegral ) ) || > + ((tvItem->mask & TVIF_STATE ) && ((originalItem.state ^ wineItem->state) & tvItem->stateMask )) > + ) That's one ugly if... I'd suggest abstracting that test into a separate inline function. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: widl: generate header when proxy/stub is generated
by Alexandre Julliard 16 Apr '05

16 Apr '05

Juan Lang <juan_lang(a)yahoo.com> writes: > ChangeLog: generate header when proxy/stub is generated to prevent > "#include(null)" from appearing in generated file Surely there's a better way to fix this than by forcing generation of the header even when it's not requested. -- Alexandre Julliard julliard(a)winehq.org

1 0

[NtQuerySystemInformation #1] Fixes + tests
by Paul Vriens 16 Apr '05

16 Apr '05

Hi, this is a first go at some unit tests and related fixes for NtQuerySystemInformation. The ultimate goal is to get SysInternal's Process Explorer running. I welcome suggestions and remarks. If none I will submit this to wine-patches and start the further works. Cheers, Paul Vriens. Changelog Start of unit tests for NtQuerySystemInformation Return STATUS_INVALID_INFO_CLASS for non-implemented classes Return len for SystemCpuInformation Return STATUS_ACCESS_VIOLATION if no buffer given

2 1

Re: Broken cross-build, again.
by Paul Vriens 16 Apr '05

16 Apr '05

On Wed, 2005-02-09 at 16:59, Paul Millar wrote: > I haven't worked on any of winetest's innards, so this is largely > guess work... > > On Wednesday 09 February 2005 13:22, you wrote: > > If I run winetest-200502091000-paul-mingw manually on my win98 box > > I get several messages "Can't parse subtests output of" for the > > following tests [...] > > just before the tests actually start. > > My guess is that winetest is attempting to run these tests, but that > they are dying straight away, with some error message. This error > message is not the expected output, hence the error messsage. > > [...] > > Does this mean that we have a deeper lying problem? > > Yes, obviously! The tests are failing and we have no mechanism for > detecting this. This, in itself, is a bug. > > > Or just that > > more tests are somehow not correct (in combination with mingw)? > > I've bundled the individual tests in: > http://www.astro.gla.ac.uk/users/paulm/WRT/winetest-bin-20050209.zip > (its some 2.6MiB in size, though) > > I image you should be able to run the shlwapi test individually, which > should help narrow down the cause. > > HTH, > > Paul. Hi Paul, I've included wine-devel again as this must touch others as well. I wasn't able to run the shlwapi tests on my win98 box, by itself. Running this gives an error box: The SHLWAPI_.EXE file is linked to missing export SHLWAPI.DLL:PathIsValidCharA and just for completeness sake: dsound: ... linked to missing export DSOUND.DLL:DirectSoundCreate8 mlang: ... linked to missing export NTDLL.DLL:atoi msvcrtd: A required .DLL, MSVCRTD.DLL, was not found ole32: ... linked to missing export NTDLL.DLL:atoi Cheers, Paul Vriens.

7 10

Re: Move notifies around to match native
by Dimitrie O. Paun 16 Apr '05

16 Apr '05

On Tue, Apr 12, 2005 at 12:24:11PM -0600, Vitaliy Margolen wrote: > Also small fix for custom draw color. Native does not use colors returned from > NM_CUSTOMDRAW notify. This is odd, and it deserves at the very least a comment in the code, but more preferably a unit test. -- Dimi.

3 7

Hexdumping function?
by Benjamin Cutler 16 Apr '05

16 Apr '05

I'm writing a conformance test for my implementation of powrprof.dll that I've been working on, and something I'd like to do in the test is dump the contents of some structs to the screen without trying to make it pretty. I cobbled together the following function, but I'd like to know if there's something like this already so I don't reinvent the wheel: void hexdump(void *p, int len) { int i; long *src = (long *)p; len /= 4; for(i = 0; i < len; i++) { printf("%08lX", src[i]); } }

2 1

Exception in wcstombs_sbcs
by Paul Vriens 16 Apr '05

16 Apr '05

Hi, when I run the latest Process Explorer (Version 9.0.3) I sometimes get an exception: fixme:ntdll:NtQuerySymbolicLinkObject (0x777e2ce4,0x777ebc28,0x12e4f878) stub wine: Unhandled exception (thread 000b), starting debugger... WineDbg starting on pid 0xa Unhandled exception: page fault on read access to 0x12e5001a in 32-bit code (0x1014df10). In 32 bit mode. Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:1014df10 ESP:12e4f7bc EBP:12e4f7d0 EFLAGS:00210202( - 00 - -RI1) EAX:00000000 EBX:1023d978 ECX:77e2dae0 EDX:101fcb40 ESI:12e4fffc EDI:101fdd40 Stack dump: 0x12e4f7bc: 00001bb0 101fcb40 777e2ce4 00001bb0 0x12e4f7cc: 00000000 12e4f804 777c802e 1023d3fc 0x12e4f7dc: 12e4f8fc 00001830 77e2d760 00001bb0 0x12e4f7ec: 00001bb0 00000000 00000000 777e2ce4 0x12e4f7fc: 12e4f87c 12e4f8f0 12e4f834 777c7e5b 0x12e4f80c: 77e2d760 00001bb0 00000000 12e4f8fc Backtrace: =>1 0x1014df10 wcstombs_sbcs(table=0x1023d3fc, src=0x12e4f8fc, srclen=0x1830, dst=0x77e2d760, dstlen=0x1bb0) [wctomb.c:161] in libwine_unicode.so.1 (0x12e4f7d0) 2 0x777c802e RtlUnicodeToMultiByteN(dst=0x77e2d760, dstlen=0x1bb0, reslen=0x0, src=0x12e4f8fc, srclen=0x3760) [/data/install/linux/wine-src/wine/dlls/ntdll/rtlstr.c:800] in ntdll (0x12e4f804) 3 0x777c7e5b RtlUnicodeStringToAnsiString(ansi=0x12e4f87c, uni=0x12e4f8f0, doalloc=0x1) [/data/install/linux/wine-src/wine/dlls/ntdll/rtlstr.c:696] in ntdll (0x12e4f834) 4 0x004195ff in procexp (+0x195ff) (0x00000043) 5 0x00000000 (0x00000000) 0x1014df10 wcstombs_sbcs+0x98 [wctomb.c:161] in libwine_unicode.so.1: movw 0x1e(%esi),%dx The information above is from an older (Mar-01-05) version of wine but CVS has the same problem. Is there a way we can trace the stuff in libs/unicode ? This exception occurs not every time (I guess 3 out of 5 runs) and the only similarity is the exception is in wcstombs_sbcs. Cheers, Paul.

2 1

Re: Is this an acceptable fix? If so I'll fix the rest of the file.
by Dmitry Timoshkov 16 Apr '05

16 Apr '05

"Jakob Eriksson" <jakov(a)vmlinux.org> wrote: > @@ -1109,7 +1109,7 @@ > bufdesc.dwSize=sizeof(bufdesc); > bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRL3D; > rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); > - ok(rc==DS_OK && primary!=NULL,"IDirectSound_CreateSoundBuffer() failed " > + ok(rc==E_INVALIDARG || (rc==DS_OK && primary!=NULL),"IDirectSound_CreateSoundBuffer() failed " > "to create a 3D primary buffer: %s\n",DXGetErrorString8(rc)); I'm afraid you need to find what exactly IDirectSound_CreateSoundBuffer doesn't like in the passed arguments. This might be DSBCAPS_CTRL3D flag. -- Dmitry.

1 0

Re: advapi32 registry test, fail gracefully when no permissions
by James Hawkins 16 Apr '05

16 Apr '05

On 4/14/05, Jakob Eriksson <jakov(a)vmlinux.org> wrote: > > ERROR_PRIVILEGE_NOT_HELD returned for NT4 here: > > http://test.winehq.org/data/200504141000/nt4_IDWASEMPTY/advapi32:registry.t… > > > Index: dlls/advapi32/tests/registry.c > =================================================================== > RCS file: /home/wine/wine/dlls/advapi32/tests/registry.c,v > retrieving revision 1.18 > diff -u -r1.18 registry.c > --- dlls/advapi32/tests/registry.c 13 Apr 2005 14:40:58 -0000 1.18 > +++ dlls/advapi32/tests/registry.c 14 Apr 2005 18:35:54 -0000 > @@ -357,6 +357,7 @@ > DWORD ret; > > ret = RegSaveKey(hkey_main, "saved_key", NULL); > + if (ERROR_PRIVILEGE_NOT_HELD == ret) return; > ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); > } > > @@ -366,6 +367,7 @@ > HKEY hkHandle; > > ret = RegLoadKey(HKEY_LOCAL_MACHINE, "Test", "saved_key"); > + if (ERROR_PRIVILEGE_NOT_HELD == ret) return; > ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); > > ret = RegOpenKey(HKEY_LOCAL_MACHINE, "Test", &hkHandle); I have a better fix for this to send in. As the test stands now, it doesn't pass on any windows machines because you have to manually set the backup and restore privileges. The patch I have sets these permissions then unsets them after the tests are run. -- James Hawkins

1 0

winiet/ftp.c question about a strncpy elimination
by Peter Berg Larsen 15 Apr '05

15 Apr '05

What is the correct behaviour in FtpGetCurrentDirectory if the buffer parameter is to small? http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wininet/wi… Index: dlls/wininet/ftp.c =================================================================== RCS file: /home/wine/wine/dlls/wininet/ftp.c,v retrieving revision 1.53 diff -u -r1.53 ftp.c --- dlls/wininet/ftp.c 28 Mar 2005 14:58:52 -0000 1.53 +++ dlls/wininet/ftp.c 15 Apr 2005 20:15:04 -0000 @@ -813,6 +813,13 @@ * FTP_FtpGetCurrentDirectoryA (Internal) * * Retrieves the current directory + * + * Parameters + * + * lpwfs [I] Handle + * lpszCurrentDirectory [O] The absolute current path with '\0' termination. + * lpwdCurrentDirectory [I] The size of lpszCurrentDirectory. + * [O] The length of the absolute current path in lpszCurrentDirectory. * * RETURNS * TRUE on success @@ -864,11 +871,19 @@ } len = lastpos - firstpos - 1; - strncpyW(lpszCurrentDirectory, &lpszResponseBuffer[firstpos+1], - len < *lpdwCurrentDirectory ? len : *lpdwCurrentDirectory); - HeapFree(GetProcessHeap(), 0, lpszResponseBuffer); - *lpdwCurrentDirectory = len; - bSuccess = TRUE; + if (len >= *lpdwCurrentDirectory) + { + *lpdwCurrentDirectory = len + 1; + FTP_SetResponseError(ERROR_INTERNET_BAD_OPTION_LENGTH); + } + else + { + *lpdwCurrentDirectory = len; + memcpy(lpszCurrentDirectory, &lpszResponseBuffer[firstpos+1], len*sizeof(WCHAR)); + lpszCurrentDirectory[len] = '\0'; + bSuccess = TRUE; + } + HeapFree(GetProcessHeap(), 0, lpszResponseBuffer); } else FTP_SetResponseError(nResCode);

1 0

Re: TrashCan Day 3 - Use FreeDesktop TrashCan
by Steven Edwards 15 Apr '05

15 Apr '05

Hi, --- Diego 'Flameeyes' Petten� <flameeyes(a)users.berlios.de> wrote: > Well actually KDE 3.4 uses the trash specs. Was the ones before which doesn't > use it. Ok great. I only have 3.3 on my devel system. I will update and check it out. Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

1 0

TrashCan Day 3 - Use FreeDesktop TrashCan
by Steven Edwards 15 Apr '05

15 Apr '05

Hi, Yes I know this does not look that nice atm. Its still a work in progress but you get the idea of where I am going with it. With this patch any SHFileOperation with the FOF_ALLOWUNDO flag will move files to the users ~/.Trash. There is a draft spec on www.freedesktop.org on how the Trash is supposed to work but currently KDE does something totally different and GNOME is not compliant so I am not sure how I am going to deal with that yet. Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

2 1

Re: USB status ...
by Hiji 15 Apr '05

15 Apr '05

--- Lars Segerlund <lars.segerlund(a)comsys.se> wrote: > > What is the status of wines USB support ? > > I have an IDE for a developement board and I really > would like to flash it from > Linux, ( I don't have windows), and this uses USB > to talk to the board. > Is there anything done yet or am I on my own ? > > Can someone also giva a hint on the feasibiliyt, > complexity of managing a USB > implementation for wine ? I am rather good at linux > device drivers and such. > > / regards, Lars Segerlund. There's not much I can say in the way of development, but as a user, getting USB support (beyond what's supported in the kernel) would be a HUGE leap of improvement for Wine. I think others have said before that there are a lot of apps out there that will run on Wine, but are useless because they depend on their hardware counterpart. (In the music world, Guitarport comes to mind.) Hiji __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

script for quickly finding large functions
by Joris Huizer 15 Apr '05

15 Apr '05

Hello, I made this script to find large functions; I think it may be usefull to add at the janitorial page where the note on large functions was placed; It assumes no things are between functions, so it gives some incorrect matches; also, it accidentilly reads some if() and switch() statements, but in some (most) cases those are actually in large functions if they show up high. I hope this is usefull, it did find some interesting large functions like HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (dlls/dmloader/container.c) which has like 7 levels of nested switch statements regards, Joris BEGIN {line_no = 0; file="";} { if ($1 != file) { if (line_no != 0 && index(file,".c") != 0) { printf("?: %s %s\n",file,var); } line_no = 0; file = $1 } if (line_no != 0 && index(file,".c") != 0) { printf("%6d: %s %s\n",($2 - line_no),file,var); } line_no = $2 var = ""; for (i = 3; i <= NF; i++) { var = sprintf("%s%s ",var,$i); } }

1 0

Re: Updown: keep track of WS_DISABLED
by Peter Berg Larsen 15 Apr '05

15 Apr '05

diff -u -p -r1.66 updown.c --- dlls/comctl32/updown.c 25 Mar 2005 10:27:11 -0000 1.66 +++ dlls/comctl32/updown.c 14 Apr 2005 12:44:29 -0000 @@ -775,6 +775,8 @@ static LRESULT WINAPI UpDownWindowProc(H break; case WM_ENABLE: + infoPtr->dwStyle &= ~WS_DISABLED; + infoPtr->dwStyle |= (wParam ? 0 : WS_DISABLED); if (infoPtr->dwStyle & WS_DISABLED) UPDOWN_CancelMode (infoPtr); InvalidateRect (infoPtr->Self, NULL, FALSE); break; I had to look twice at this - I think it would added cleaner with: if (wParam) infoPtr->dwStyle &= ~WS_DISABLED; else infoPtr->dwStyle |= WS_DISABLED; or less clean infoPtr->dwStyle &= ~WS_DISABLED; if (!wParam) infoPtr->dwStyle |= WS_DISABLED; or looking at the next diff line: if (wParam) infoPtr->dwStyle &= ~WS_DISABLED; else { infoPtr->dwStyle |= WS_DISABLED; UPDOWN_CancelMode(infoPtr); } Peter

1 0

Re: powrprof: Partial implementation of powrprof.dll
by Andreas Mohr 15 Apr '05

15 Apr '05

Hi, On Fri, Apr 15, 2005 at 06:17:23AM -0600, Benjamin Cutler wrote: > Spend most of the night and some of the morning researching powrprof.dll It shows ;-) (where are the attachments?) Thank you for another stone in the wall, Andreas Mohr

1 0

Re: powrprof: Partial implementation of powrprof.dll
by Michael Stefaniuc 15 Apr '05

15 Apr '05

Benjamin Cutler wrote: > Spend most of the night and some of the morning researching powrprof.dll > and came up with the following partial implementation. > > new directory: dlls/powrprof > new files: dlls/powrprof: powrprof.c, Makefile.in, powrprof.spec, > .cvsignore > changed files: configure.ac > > Changelog: > -Added partial implementation of powrprof.dll. You forgot the patch ... bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 Sr. Network Engineer Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

1 0

safedisk 1 update, get your safedisk 1 games out (Not running just yet, but getting there)
by Ivan Leo Puoti 14 Apr '05

14 Apr '05

OK, here is a little summary on where we are with safedisk, here by safedisk I always mean safedisk 1. Safedisk protected games are packed into an encrypted ICD file, in my case the game executable is called EMPIRES2.ICD. Safedisk is actually made up of a little loader, empires2.exe (But this depends on the name of the game), and a kernel mode driver, Secdrv.sys. A safedisk service is installed, and in windows a kernel mode service is just a driver. The loader starts the secdrv service, so I've hacked advapi32 to call the NT function NtLoadDriver when it detects a kernel mode service. This function, after a couple of checks, passes the call to the ntoskrnl program I've written, Microsoft has ntoskrnl<->ntdll communication done by a fancy exception rising/handling system, I have just gone for a named pipe, as we don't use ntoskrnl as a real kernel (In windows everything you do causes loads of calls to ntoskrnl, in wine ntoskrnl is seldom used at all and only handles very few calls). Ntoskrnl loads the driver, and it successfully initialises. At this point the safedisk loader communicates with its driver using DeviceIoControl, it passes an input buffer, that contains some instructions for the driver, and an output buffer that is meant to receive some well defined values that are meant to tell the user mode loader if everything is OK (For example a debugger isn't loaded). The loader also tries to get device handles for well known debuggers, this isn't an issue for us. DeviceIoControl passes the call to NtDeviceIoControlFile, that passes the call on to ntoskrnl. A windows driver handles user mode IO requests via a function called DeviceDispatchControl, it's address is put in the member of the DEVICE_OBJECT struct that the driver's initialisation function fills for the system (This is the DriverEntry routine). In wine currently a device handle is a pointer to a DEVICE_OBJECT struct, guys in #reactos have confirmed this is how things work in windows, and even if AJ thinks we should have real file handles this approach makes no sense to me whatsoever. DeviceDispatchControl in safedisk 1 check the control code passed to DeviceIoControl (It must always be 0xef002407), it then reads the input buffer, if byte 0xc in the buffer is 0x3c it checks the debug registers, other values trigger other checks. It also checks the length of both input and output buffers. It should then read the debug registers, and this should rise and exception that we will somehow handle. However for some unknown reason this doesn't happen, and the status of the IO operation is STATUS_UNSUCCESSFUL, note that this value is in the IRP sturct under Irp.IoStatus.Status, DispatchDeviceControl always returns 0. At this point I would like to know if other safedisk 1 protected games yield different results. I would love to step trough secdrv.sys with winedbg, but it just hangs or crashes. The code in ntoskrnl prints the interesting buffer values that secdrv.sys checks for, it currently prints trace:ntoskrnl:NtDeviceIoControlFile (0x40340ba8,(nil),(nil),(nil),0x4068d9c8,0xef002407,0x414e1498,0x00000514,0x414e19ac,0x00000610) trace:ntoskrnl:driver_control driver_control is at 0x405cea80 trace:ntoskrnl:driver_control Handling IoContorl, handle is 0x40340ba8, ControlCode is ef002407, OutputBufferLength is 610, InputBufferLength is 514 trace:ntoskrnl:driver_control InputBuffer[0xc] is 3c, InputBuffer[410] is 0 fixme:ntoskrnl:IofCompleteRequest stub! trace:ntoskrnl:driver_control IRP_MJ_DEVICE_CONTROL returned 0, IoStatus it c0000001, Infomation is 0 trace:ntoskrnl:driver_control Irp.UserBuffer[0x410] is 0, Irp.UserBuffer[0x40c] is 0 In case of success Irp.UserBuffer[0x410] should be 0x00000500 and Irp.UserBuffer[0x40c] should be 4. All that is needed to run safedisk up to the point where it can run ATM is at http://spazioinwind.libero.it/nonsolomicrosoft/safedisk.html Please get all your safedisk 1 games and try it out, the more people try it the better.

1 0

Heap problems ?
by Paul Vriens 14 Apr '05

14 Apr '05

Hi, is anybody having heap problems with current CVS? I'm seeing random crashes of an application and it seems to point to heap. How can I best go about testing this? Cheers, Paul.

2 1

Re: Datetime scroll fixes
by Robert Shearman 14 Apr '05

14 Apr '05

Duane Clark wrote: > Changelog: > Hour '0' corresponds to 12AM. > Scroll cleanly. > >------------------------------------------------------------------------ > >Index: dlls/comctl32/datetime.c >=================================================================== >RCS file: /home/wine/wine/dlls/comctl32/datetime.c,v >retrieving revision 1.55 >diff -u -p -r1.55 datetime.c >--- dlls/comctl32/datetime.c 14 Apr 2005 11:31:17 -0000 1.55 >+++ dlls/comctl32/datetime.c 14 Apr 2005 18:20:35 -0000 >@@ -630,8 +642,12 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr > DeleteObject (hbr); > oldTextColor = SetTextColor (hdc, comctl32_color.clrWindow); > } >- else >+ else { >+ HBRUSH hbr = CreateSolidBrush (comctl32_color.clrWindow); >+ FillRect(hdc, field, hbr); >+ DeleteObject (hbr); > oldTextColor = SetTextColor (hdc, comctl32_color.clrWindowText); >+ } > > /* draw the date text using the colour set above */ > DrawTextW (hdc, txt, strlenW(txt), field, DT_RIGHT | DT_VCENTER | DT_SINGLELINE); > > This change is wrong. The reason you get the mess when using anti-aliased fonts is that you don't clear the background in the WM_VSCROLL handler. I fixed this in the patch I sent you. Rob

1 0

Re: Datetime picker updown support
by Rob Shearman 14 Apr '05

14 Apr '05

Duane Clark wrote: > This adds support for the updown control in the datetime picker > (previously it existed but did nothing). ... >@@ -874,13 +1008,23 @@ DATETIME_Size (DATETIME_INFO *infoPtr, W > TRACE("Height=%ld, Width=%ld\n", infoPtr->rcClient.bottom, infoPtr->rcClient.right); > > infoPtr->rcDraw = infoPtr->rcClient; >- >- /* set the size of the button that drops the calendar down */ >- /* FIXME: account for style that allows button on left side */ >- infoPtr->calbutton.top = infoPtr->rcDraw.top; >- infoPtr->calbutton.bottom= infoPtr->rcDraw.bottom; >- infoPtr->calbutton.left = infoPtr->rcDraw.right-15; >- infoPtr->calbutton.right = infoPtr->rcDraw.right; >+ >+ if (infoPtr->dwStyle & DTS_UPDOWN) { >+ /* the updown control seems to ignore SetWindowPos messages */ >+ DestroyWindow(infoPtr->hUpdown); >+ /* hmmm... the updown control seems to ignore the width parameter */ >+ infoPtr->hUpdown = CreateUpDownControl (WS_CHILD | WS_BORDER | WS_VISIBLE, >+ infoPtr->rcClient.right-14, 0, 20, infoPtr->rcClient.bottom, >+ infoPtr->hwndSelf, 1, 0, 0, UD_MAXVAL, UD_MINVAL, 0); >+ } >+ else { >+ /* set the size of the button that drops the calendar down */ >+ /* FIXME: account for style that allows button on left side */ >+ infoPtr->calbutton.top = infoPtr->rcDraw.top; >+ infoPtr->calbutton.bottom= infoPtr->rcDraw.bottom; >+ infoPtr->calbutton.left = infoPtr->rcDraw.right-15; >+ infoPtr->calbutton.right = infoPtr->rcDraw.right; >+ } > > /* set enable/disable button size for show none style being enabled */ > /* FIXME: these dimensions are completely incorrect */ > > This seems really wrong. You are destroying and creating the updown control on every size event?!?! That's really going to slow resizes down. Is there any evidence that the native version does it like this? Rob

3 3

Re: ole32: implement FmtIdToPropStgName & PropStgNameToFmtId
by Juan Lang 14 Apr '05

14 Apr '05

--- Alexandre Julliard <julliard(a)winehq.org> wrote: > I get a test failure here (and the heap messages are worrying too, > though they also occur without the patch): > > err:heap:HEAP_ValidateInUseArena Heap 77c10000: prev arena 77c48518 is > not prev for in-use 77c48570 > err:heap:HEAP_ValidateInUseArena Heap 77c10000: prev arena 77c48518 is > not prev for in-use 77c48570 Some tests snuck in that I didn't mean to, I'll omit those. How do I go about debugging heap errors? --Juan __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

2 1

TrashCan: Day 2
by Steven Edwards 14 Apr '05

14 Apr '05

Hi, There are still a whole set of RecycleBin APIs that need to be implemented to query and empty the trash but this should work for explorer sending files to the trash. Also note someone else will need to implement the RecycleBin ShellFolder. Thanks Steven __________________________________ Do you Yahoo!? Read only the mail you want - Yahoo! Mail SpamGuard. http://promotions.yahoo.com/new_mail

1 0

Re: ole32: implement FmtIdToPropStgName & PropStgNameToFmtId
by Alexandre Julliard 14 Apr '05

14 Apr '05

Juan Lang <juan_lang(a)yahoo.com> writes: > ChangeLog: implement FmtIdToPropStgName & PropStgNameToFmtId, with tests, > plus a few more IPropertyStorage tests I get a test failure here (and the heap messages are worrying too, though they also occur without the patch): err:heap:HEAP_ValidateInUseArena Heap 77c10000: prev arena 77c48518 is not prev for in-use 77c48570 err:heap:HEAP_ValidateInUseArena Heap 77c10000: prev arena 77c48518 is not prev for in-use 77c48570 stg_prop.c:285: Test failed: Didn't get expected type or value for property (got type 0, value 0) -- Alexandre Julliard julliard(a)winehq.org

1 0

Borrowing NTVFS layer from Samba4 for Wine?
by Daniel Kegel 14 Apr '05

14 Apr '05

Apologies if this is an old idea, but: Tridge's remarks in his recent interview make me think maybe Wine should be using the same NTVFS layer that Samba4 does. Who knows, maybe it'd be an easy fit... - Dan http://software.newsforge.com/article.pl?sid=05/04/08/2132221&from=rss NF: What are the biggest improvements that have come to fruition in Samba4 and what are the biggest ones that didn't make it or had to be significantly trimmed? Tridge: From my point of view, the biggest improvement is in the code structure. Over half the code in Samba4 is now auto-generated using a new compiler we wrote for the task. That change alone would be worth the effort for me. The code that isn't auto-generated is structured in a modular and very efficient manner. That point of view isn't what users care about, of course, but it does lead to lots and lots of user-visible improvements due to the ease of programming with the new structure. We now commonly come across situations where we say, "OK, let's start on the following feature," and a couple of hours later it's finished, where we might have spent a week or more on the same feature in Samba3. The most user-visible changes in Samba4 will be those associated with the ADS support, and the additional file system features. The file system features are what started the whole Samba4 effort -- Samba4 was initially called the "Samba NTVFS" project, referring to the new virtual file system layer that allows for NT semantics on top of both POSIX and non-POSIX file systems. One simple but important example of how the new NTVFS layer helps is the addition of support for "NT file streams." A file in a NT filesystem can have multiple "streams," where the primary stream (called ":$DATA") is the normal file data that people are used to thinking about, but there can be any number of other named streams containing other types of data, such as meta-data describing who wrote the file, or an audio stream, or even some data from an anti-virus scan of the file. Importantly, recent updates to WindowsXP use streams to store security information about where a file came from, which allows Windows to display a warning when you try to execute a file that comes from an untrusted "security zone." POSIX file systems have no concept of multiple streams, and as Samba was originally designed as a tool for representing a POSIX filesystem to Windows clients, there was no attempt to add stream support. The situation has now changed, with streams becoming a more essential feature for a file server for Windows clients, and at the same time user expectations for compatibility with WindowsNT have risen. This means we really need to support streams, but in order to do that properly, a lot of the internals of Samba needed to be updated. This is achieved in Samba4 using the new NTVFS layer, which allows streams to be represented either using an external database or using "file xattrs," which is an extension recently added to Linux, and which is also present in a number of other, Unix-like systems

4 7

Threading issue with dinput/joysticks
by d13f00l 14 Apr '05

14 Apr '05

http://veracity.ath.cx/~diefool/failure.gz Log is about 100 megs unzipped. This is pretty bizzare. I gzipped a +all log. When a joystick is plugged into my machine, many dinput apps crash with meaningless backtraces unrelated to dinput. It affects a fair amount of apps http://www.blockland.us/blockland/index.asp is an easy one to work on since it crashes as soon as the program starts. It also only crashes when my joystick is plugged in and wine can see /dev/js0. 0047:trace:dinput:create_DataFormat Matching : 0047:trace:dinput:create_DataFormat - Asked (5) : 0047:trace:dinput:create_DataFormat * GUID: {a36d02e3-c9f3-11cf-bfc7-444553540000} ('GUID_RzAxis') 0047:trace:dinput:create_DataFormat * Offset: 20 0047:trace:dinput:create_DataFormat * dwType: 00000603 0047:trace:dinput:create_DataFormat Type: DIDFT_RELAXIS DIDFT_ABSAXIS / Instance: 6 0047:trace:dinput:create_DataFormat - Wine (5) : 0047:trace:dinput:create_DataFormat * GUID: {a36d02e3-c9f3-11cf-bfc7-444553540000} ('GUID_RzAxis') 0047:trace:dinput:create_DataFormat * Offset: 20 0047:trace:dinput:create_DataFormat * dwType: 80ffff03 0047:trace:dinput:create_DataFormat Type: DIDFT_RELAXIS DIDFT_ABSAXIS (unhandled: 80000000) / Instance: DIDFT_ANYINSTANCE 0047:trace:seh:EXC_RtlRaiseException code=c0000005 flags=0 addr=0x7e98f3a8 0047:trace:seh:EXC_RtlRaiseException info[0]=00000000 0047:trace:seh:EXC_RtlRaiseException info[1]=00000000 0047:trace:seh:EXC_RtlRaiseException eax=00000010 ebx=7e9aa5d8 ecx=00000010 edx=77c5bd50 esi=00000000 edi=7eda3bcc 0047:trace:seh:EXC_RtlRaiseException ebp=77aefad4 esp=77aefa3c cs=0073 ds=007b es=007b fs=003b gs=0033 flags=00010216 0047:trace:seh:EXC_CallHandler calling handler at 0x6437c8 code=c0000005 flags=0 0047:Call kernel32.UnhandledExceptionFilter(77aef5e8) ret=00649b15 I think this is where it gives up in the log. ^^ I'd like to debug this, anyone know where to start?

1 0

fedora core 4 load error
by James Hawkins 13 Apr '05

13 Apr '05

Hi, Fedora Core 4 test2 Wine cvs compiled with gcc4 Running notepad or regedit with wine works fine, but if I try to run any other program or the regression tests, I get this error: [truiken@dynamic-129-120-169-13 tests]$ wine advapi32_test.exe.so registry wine: could not load L"Z:\\home\\truiken\\workspace\\wine\\dlls\\advapi32\\tests\\advapi32_test.exe.so": /home/truiken/.wine/dosdevices/z:/home/truiken/workspace/wine/dlls/advapi32/tests/advapi32_test.exe.so: cannot restore segment prot after reloc: Permission denied This error happens even if I move advapi32_test.exe.so to .wine/drive_c/ The last few lines of +all: 0009:Call ntdll.wine_server_handle_to_fd(00000014,00000000,bfbfda34,00000000) ret=3f30e804 0009: get_handle_fd( handle=0x14, access=00000000 ) 0009: *fd* 0x14 -> 24 0009: get_handle_fd() = 0 { fd=-1, flags=0 } 0009: set_handle_info( handle=0x14, flags=0, mask=0, fd=9 ) 0009: set_handle_info() = 0 { old_flags=0, cur_fd=9 } 0009:Ret ntdll.wine_server_handle_to_fd() retval=00000000 ret=3f30e804 0009:Call ntdll.wine_server_release_fd(00000014,0000000a) ret=3f30e84a 0009:Ret ntdll.wine_server_release_fd() retval=00000000 ret=3f30e84a 0009:trace:file:ReadFile 0x14 0xbfbfdbbc 64 0xbfbfdc00 (nil) 0009:Call ntdll.NtReadFile(00000014,00000000,00000000,00000000,bfbfda50,bfbfdbbc,00000040,00000000,00000000) ret=3f30f176 0009:trace:ntdll:NtReadFile (0x14,(nil),(nil),(nil),0xbfbfda50,0xbfbfdbbc,0x00000040,(nil),(nil)),partial stub! 0009: get_handle_fd( handle=0x14, access=80000000 ) 0009: get_handle_fd() = 0 { fd=9, flags=0 } 0009:trace:ntdll:NtReadFile = 0x00000000 0009:Ret ntdll.NtReadFile() retval=00000000 ret=3f30f176 0009:trace:process:__wine_kernel_init starting Winelib app L"Z:\\home\\truiken\\workspace\\wine\\dlls\\advapi32\\tests\\advapi32_test.exe.so" 0009:Call ntdll.NtClose(00000014) ret=3f32fa15 0009: close_handle( handle=0x14 ) 0009: close_handle() = 0 { fd=9 } 0009:Ret ntdll.NtClose() retval=00000000 ret=3f32fa15 0009:Call ntdll.RtlDosPathNameToNtPathName_U(7fee0540 L"Z:\\home\\truiken\\workspace\\wine\\dlls\\advapi32\\tests\\advapi32_test.exe.so",bfbfdc04,00000000,00000000) ret=3f32be41 0009:trace:file:RtlDosPathNameToNtPathName_U (L"Z:\\home\\truiken\\workspace\\wine\\dlls\\advapi32\\tests\\advapi32_test.exe.so",0xbfbfdc04,(nil),(nil)) 0009:trace:file:RtlGetFullPathName_U (L"Z:\\home\\truiken\\workspace\\wine\\dlls\\advapi32\\tests\\advapi32_test.exe.so" 520 0xbfbfd92c (nil)) 0009:trace:heap:RtlAllocateHeap (0x7fee0000,00000002,000000a0): returning 7fee06c0 0009:Ret ntdll.RtlDosPathNameToNtPathName_U() retval=00000001 ret=3f32be41 0009:Call ntdll.wine_nt_to_unix_file_name(bfbfdc04,bfbfdbfc,00000003,00000000) ret=3f32be5e 0009:trace:heap:RtlAllocateHeap (0x7fee0000,00000002,00000170): returning 7fee0768 0009:trace:file:wine_nt_to_unix_file_name L"\\??\\Z:\\home\\truiken\\workspace\\wine\\dlls\\advapi32\\tests\\advapi32_test.exe.so" -> "/home/truiken/.wine/dosdevices/z:/home/truiken/workspace/wine/dlls/advapi32/tests/advapi32_test.exe.so" 0009:Ret ntdll.wine_nt_to_unix_file_name() retval=00000000 ret=3f32be5e 0009:Call ntdll.RtlFreeUnicodeString(bfbfdc04) ret=3f32be66 0009:trace:heap:RtlFreeHeap (0x7fee0000,00000002,7fee06c0): returning TRUE 0009:Ret ntdll.RtlFreeUnicodeString() retval=00000001 ret=3f32be66 wine: could not load L"Z:\\home\\truiken\\workspace\\wine\\dlls\\advapi32\\tests\\advapi32_test.exe.so": /home/truiken/.wine/dosdevices/z:/home/truiken/workspace/wine/dlls/advapi32/tests/advapi32_test.exe.so: cannot restore segment prot after reloc: Permission denied 0009:Call ntdll.LdrShutdownProcess() ret=3f32eb0d 0009:trace:module:LdrShutdownProcess () 0009:Ret ntdll.LdrShutdownProcess() retval=00000000 ret=3f32eb0d 0009: terminate_process( handle=0xffffffff, exit_code=1 ) 0009: terminate_process() = 0 { self=1 } 0009: *killed* exit_code=1 /home/truiken/.wine/system.reg: saving key \\Machine /home/truiken/.wine/userdef.reg: saving key \\User\\.Default /home/truiken/.wine/user.reg: saving key \\User\\truiken wineserver: exiting (pid=7150) Any ideas? -- James Hawkins

3 4

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-devel