November 2005 - Wine-commits

wine/dlls/gdi bitmap.c
by Alexandre Julliard 29 Nov '05

29 Nov '05

ChangeSet ID: 21530 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:06:17 Modified files: dlls/gdi : bitmap.c Log message: Added support for doing SetBitmapBits on a DIB section. Patch: http://cvs.winehq.org/patch.py?id=21530 Old revision New revision Changes Path 1.8 1.9 +25 -0 wine/dlls/gdi/bitmap.c Index: wine/dlls/gdi/bitmap.c diff -u -p wine/dlls/gdi/bitmap.c:1.8 wine/dlls/gdi/bitmap.c:1.9 --- wine/dlls/gdi/bitmap.c:1.8 29 Nov 2005 11: 6:17 -0000 +++ wine/dlls/gdi/bitmap.c 29 Nov 2005 11: 6:17 -0000 @@ -381,6 +381,31 @@ LONG WINAPI SetBitmapBits( count = -count; } + if (bmp->dib) /* simply copy the bits into the DIB */ + { + DIBSECTION *dib = bmp->dib; + char *dest = dib->dsBm.bmBits; + DWORD max = dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; + if (count > max) count = max; + ret = count; + + if (bmp->dib->dsBmih.biHeight >= 0) /* not top-down, need to flip contents vertically */ + { + dest += dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; + while (count > 0) + { + dest -= dib->dsBm.bmWidthBytes; + memcpy( dest, bits, min( count, dib->dsBm.bmWidthBytes ) ); + bits = (char *)bits + dib->dsBm.bmWidthBytes; + count -= dib->dsBm.bmWidthBytes; + } + } + else memcpy( dest, bits, count ); + + GDI_ReleaseObj( hbitmap ); + return ret; + } + /* Only get entire lines */ height = count / bmp->bitmap.bmWidthBytes; if (height > bmp->bitmap.bmHeight) height = bmp->bitmap.bmHeight;

1 0

wine/include advpub.h
by Alexandre Julliard 29 Nov '05

29 Nov '05

ChangeSet ID: 21529 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:06:09 Modified files: include : advpub.h Log message: James Hawkins <truiken(a)gmail.com> Add ADN_DEL_UNC_PATHS define to advpub.h. Patch: http://cvs.winehq.org/patch.py?id=21529 Old revision New revision Changes Path 1.6 1.7 +1 -0 wine/include/advpub.h Index: wine/include/advpub.h diff -u -p wine/include/advpub.h:1.6 wine/include/advpub.h:1.7 --- wine/include/advpub.h:1.6 29 Nov 2005 11: 6: 9 -0000 +++ wine/include/advpub.h 29 Nov 2005 11: 6: 9 -0000 @@ -59,6 +59,7 @@ typedef CSTRTABLE *LPCSTRTABLE; #define ADN_DEL_IF_EMPTY 0x00000001 #define ADN_DONT_DEL_SUBDIRS 0x00000002 #define ADN_DONT_DEL_DIR 0x00000004 +#define ADN_DEL_UNC_PATHS 0x00000008 HRESULT WINAPI DelNode(LPCSTR pszFileOrDirName, DWORD dwFlags); HRESULT WINAPI DelNodeRunDLL32(HWND,HINSTANCE,LPSTR,INT);

1 0

wine/dlls/wininet http.c
by Alexandre Julliard 29 Nov '05

29 Nov '05

ChangeSet ID: 21528 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:06:06 Modified files: dlls/wininet : http.c Log message: Robert Shearman <rob(a)codeweavers.com> Change all SendAsyncCallback calls into the synchronous INTERNET_SendCallback where INTERNET_FLAG_ASYNC is already handled properly. Patch: http://cvs.winehq.org/patch.py?id=21528 Old revision New revision Changes Path 1.124 1.125 +50 -50 wine/dlls/wininet/http.c

1 0

wine/include objidl.idl
by Alexandre Julliard 29 Nov '05

29 Nov '05

ChangeSet ID: 21527 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:05:54 Modified files: include : objidl.idl Log message: Robert Shearman <rob(a)codeweavers.com> Make IAdviseSink methods non-async and remove the IAsyncManager parameter hack that native COM used to use (but not any more). Async calls are an optimisation that we're not going to support in the near future. Patch: http://cvs.winehq.org/patch.py?id=21527 Old revision New revision Changes Path 1.12 1.13 +6 -11 wine/include/objidl.idl Index: wine/include/objidl.idl diff -u -p wine/include/objidl.idl:1.12 wine/include/objidl.idl:1.13 --- wine/include/objidl.idl:1.12 29 Nov 2005 11: 5:54 -0000 +++ wine/include/objidl.idl 29 Nov 2005 11: 5:54 -0000 @@ -1454,9 +1454,8 @@ interface IAdviseSink : IUnknown [in, unique] FORMATETC *pFormatetc, [in, unique] STGMEDIUM *pStgmed); - [call_as(OnDataChange), async] + [call_as(OnDataChange)] HRESULT RemoteOnDataChange( - [in] IAsyncManager **ppIAM, [in, unique] FORMATETC *pFormatetc, [in, unique] ASYNC_STGMEDIUM *pStgmed); @@ -1465,9 +1464,8 @@ interface IAdviseSink : IUnknown [in] DWORD dwAspect, [in] LONG lindex); - [call_as(OnViewChange), async] + [call_as(OnViewChange)] HRESULT RemoteOnViewChange( - [in] IAsyncManager **ppIAM, [in] DWORD dwAspect, [in] LONG lindex); @@ -1475,17 +1473,15 @@ interface IAdviseSink : IUnknown void OnRename( [in] IMoniker *pmk); - [call_as(OnRename), async] + [call_as(OnRename)] HRESULT RemoteOnRename( - [in] IAsyncManager **ppIAM, [in] IMoniker *pmk); [local] void OnSave(); - [call_as(OnSave), async] - HRESULT RemoteOnSave( - [in] IAsyncManager **ppIAM); + [call_as(OnSave)] + HRESULT RemoteOnSave(); [local] void OnClose(); @@ -1507,9 +1503,8 @@ interface IAdviseSink2 : IAdviseSink void OnLinkSrcChange( [in, unique] IMoniker *pmk); - [call_as(OnLinkSrcChange), async] + [call_as(OnLinkSrcChange)] HRESULT RemoteOnLinkSrcChange( - [in] IAsyncManager **ppIAM, [in, unique] IMoniker *pmk); }

1 0

wine/dlls/opengl32 wgl.c
by Alexandre Julliard 29 Nov '05

29 Nov '05

ChangeSet ID: 21526 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:05:45 Modified files: dlls/opengl32 : wgl.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> Fixed crash in wglShareList. Patch: http://cvs.winehq.org/patch.py?id=21526 Old revision New revision Changes Path 1.67 1.68 +10 -9 wine/dlls/opengl32/wgl.c Index: wine/dlls/opengl32/wgl.c diff -u -p wine/dlls/opengl32/wgl.c:1.67 wine/dlls/opengl32/wgl.c:1.68 --- wine/dlls/opengl32/wgl.c:1.67 29 Nov 2005 11: 5:45 -0000 +++ wine/dlls/opengl32/wgl.c 29 Nov 2005 11: 5:45 -0000 @@ -560,7 +560,7 @@ BOOL WINAPI wglShareLists(HGLRC hglrc1, TRACE("(%p, %p)\n", org, dest); - if (dest->ctx != NULL) { + if (NULL != dest && dest->ctx != NULL) { ERR("Could not share display lists, context already created !\n"); return FALSE; } else { @@ -570,15 +570,16 @@ BOOL WINAPI wglShareLists(HGLRC hglrc1, LEAVE_GL(); TRACE(" created a delayed OpenGL context (%p) for Wine context %p\n", org->ctx, org); } - - ENTER_GL(); - /* Create the destination context with display lists shared */ - dest->ctx = glXCreateContext(org->display, dest->vis, org->ctx, True); - LEAVE_GL(); - TRACE(" created a delayed OpenGL context (%p) for Wine context %p sharing lists with OpenGL ctx %p\n", dest->ctx, dest, org->ctx); + if (NULL != dest) { + ENTER_GL(); + /* Create the destination context with display lists shared */ + dest->ctx = glXCreateContext(org->display, dest->vis, org->ctx, True); + LEAVE_GL(); + TRACE(" created a delayed OpenGL context (%p) for Wine context %p sharing lists with OpenGL ctx %p\n", dest->ctx, dest, org->ctx); + return TRUE; + } } - - return TRUE; + return FALSE; } /***********************************************************************

1 0

wine/dlls/dmusic dmusic.c dmusic_private.h port.c
by Alexandre Julliard 29 Nov '05

29 Nov '05

ChangeSet ID: 21525 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:05:40 Modified files: dlls/dmusic : dmusic.c dmusic_private.h port.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> Fix implementation of IDirectMusic8Impl_CreatePort. Patch: http://cvs.winehq.org/patch.py?id=21525 Old revision New revision Changes Path 1.23 1.24 +18 -44 wine/dlls/dmusic/dmusic.c 1.28 1.29 +7 -3 wine/dlls/dmusic/dmusic_private.h 1.11 1.12 +50 -1 wine/dlls/dmusic/port.c Index: wine/dlls/dmusic/dmusic.c diff -u -p wine/dlls/dmusic/dmusic.c:1.23 wine/dlls/dmusic/dmusic.c:1.24 --- wine/dlls/dmusic/dmusic.c:1.23 29 Nov 2005 11: 5:40 -0000 +++ wine/dlls/dmusic/dmusic.c 29 Nov 2005 11: 5:40 -0000 @@ -67,8 +67,8 @@ ULONG WINAPI IDirectMusic8Impl_Release ( /* IDirectMusic8Impl IDirectMusic part: */ HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD dwIndex, LPDMUS_PORTCAPS pPortCaps) { IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; - TRACE("(%p, %ld, %p)\n", This, dwIndex, pPortCaps); + if (NULL == pPortCaps) { return E_POINTER; } /* i guess the first port shown is always software synthesizer */ if (dwIndex == 0) { @@ -116,51 +116,25 @@ HRESULT WINAPI IDirectMusic8Impl_CreateP IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; int i/*, j*/; DMUS_PORTCAPS PortCaps; - - TRACE("(%p, %s, %p, %p, %p)\n", This, debugstr_dmguid(rclsidPort), pPortParams, ppPort, pUnkOuter); - for (i = 0; S_FALSE != IDirectMusic8Impl_EnumPort(iface, i, &PortCaps); i++) { - if (IsEqualCLSID (rclsidPort, &PortCaps.guidPort)) { - if(!This->ppPorts) This->ppPorts = HeapAlloc(GetProcessHeap(), 0, sizeof(LPDIRECTMUSICPORT) * This->nrofports); - else This->ppPorts = HeapReAlloc(GetProcessHeap(), 0, This->ppPorts, sizeof(LPDIRECTMUSICPORT) * This->nrofports); - if (NULL == This->ppPorts[This->nrofports]) { - *ppPort = (LPDIRECTMUSICPORT)NULL; - return E_OUTOFMEMORY; - } - This->ppPorts[This->nrofports]->lpVtbl = &DirectMusicPort_Vtbl; - This->ppPorts[This->nrofports]->ref = 1; - This->ppPorts[This->nrofports]->fActive = FALSE; - This->ppPorts[This->nrofports]->pCaps = &PortCaps; - This->ppPorts[This->nrofports]->pParams = pPortParams; /* this one is here just because there's a funct. which retrieves it back */ - This->ppPorts[This->nrofports]->pDirectSound = NULL; - DMUSIC_CreateReferenceClockImpl (&IID_IReferenceClock, (LPVOID*)&This->ppPorts[This->nrofports]->pLatencyClock, NULL); + IDirectMusicPort* pNewPort = NULL; + HRESULT hr = E_FAIL; -#if 0 - if (pPortParams->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS) { - This->ports[This->nrofports]->nrofgroups = pPortParams->dwChannelGroups; - /* setting default priorities */ - for (j = 0; j < This->ports[This->nrofports]->nrofgroups; j++) { - TRACE ("Setting default channel priorities on channel group %i\n", j + 1); - This->ports[This->nrofports]->group[j].channel[0].priority = DAUD_CHAN1_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[1].priority = DAUD_CHAN2_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[2].priority = DAUD_CHAN3_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[3].priority = DAUD_CHAN4_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[4].priority = DAUD_CHAN5_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[5].priority = DAUD_CHAN6_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[6].priority = DAUD_CHAN7_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[7].priority = DAUD_CHAN8_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[8].priority = DAUD_CHAN9_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[9].priority = DAUD_CHAN10_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[10].priority = DAUD_CHAN11_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[11].priority = DAUD_CHAN12_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[12].priority = DAUD_CHAN13_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[13].priority = DAUD_CHAN14_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[14].priority = DAUD_CHAN15_DEF_VOICE_PRIORITY; - This->ports[This->nrofports]->group[j].channel[15].priority = DAUD_CHAN16_DEF_VOICE_PRIORITY; - } + TRACE("(%p, %s, %p, %p, %p)\n", This, debugstr_dmguid(rclsidPort), pPortParams, ppPort, pUnkOuter); + ZeroMemory(&PortCaps, sizeof(DMUS_PORTCAPS)); + PortCaps.dwSize = sizeof(DMUS_PORTCAPS); + + for (i = 0; S_FALSE != IDirectMusic8Impl_EnumPort(iface, i, &PortCaps); i++) { + if (IsEqualCLSID (rclsidPort, &PortCaps.guidPort)) { + hr = DMUSIC_CreateDirectMusicPortImpl(&IID_IDirectMusicPort, (LPVOID*) &pNewPort, (LPUNKNOWN) This, pPortParams, &PortCaps); + if (FAILED(hr)) { + *ppPort = (LPDIRECTMUSICPORT) NULL; + return hr; } -#endif - *ppPort = (LPDIRECTMUSICPORT) This->ppPorts[This->nrofports]; This->nrofports++; + if (!This->ppPorts) This->ppPorts = HeapAlloc(GetProcessHeap(), 0, sizeof(LPDIRECTMUSICPORT) * This->nrofports); + else This->ppPorts = HeapReAlloc(GetProcessHeap(), 0, This->ppPorts, sizeof(LPDIRECTMUSICPORT) * This->nrofports); + This->ppPorts[This->nrofports] = pNewPort; + *ppPort = (LPDIRECTMUSICPORT) pNewPort; return S_OK; } } @@ -198,7 +172,7 @@ HRESULT WINAPI IDirectMusic8Impl_Activat FIXME("(%p, %d): stub\n", This, fEnable); for (i = 0; i < This->nrofports; i++) { - This->ppPorts[i]->fActive = fEnable; + IDirectMusicPortImpl_Activate(This->ppPorts[i], fEnable); } return S_OK; Index: wine/dlls/dmusic/dmusic_private.h diff -u -p wine/dlls/dmusic/dmusic_private.h:1.28 wine/dlls/dmusic/dmusic_private.h:1.29 --- wine/dlls/dmusic/dmusic_private.h:1.28 29 Nov 2005 11: 5:40 -0000 +++ wine/dlls/dmusic/dmusic_private.h 29 Nov 2005 11: 5:40 -0000 @@ -99,7 +99,7 @@ struct IDirectMusic8Impl { /* IDirectMusicImpl fields */ IReferenceClockImpl* pMasterClock; - IDirectMusicPortImpl** ppPorts; + IDirectMusicPort** ppPorts; int nrofports; }; @@ -176,14 +176,18 @@ struct IDirectMusicPortImpl { IDirectSound* pDirectSound; IReferenceClock* pLatencyClock; BOOL fActive; - LPDMUS_PORTCAPS pCaps; - LPDMUS_PORTPARAMS pParams; + DMUS_PORTCAPS caps; + DMUS_PORTPARAMS params; int nrofgroups; DMUSIC_PRIVATE_CHANNEL_GROUP group[1]; }; /* IUnknown: */ extern ULONG WINAPI IDirectMusicPortImpl_AddRef (LPDIRECTMUSICPORT iface); +extern HRESULT WINAPI IDirectMusicPortImpl_Activate (LPDIRECTMUSICPORT iface, BOOL fActive); + +/** Internal factory */ +extern HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps); /***************************************************************************** * IDirectMusicThruImpl implementation structure Index: wine/dlls/dmusic/port.c diff -u -p wine/dlls/dmusic/port.c:1.11 wine/dlls/dmusic/port.c:1.12 --- wine/dlls/dmusic/port.c:1.11 29 Nov 2005 11: 5:40 -0000 +++ wine/dlls/dmusic/port.c 29 Nov 2005 11: 5:40 -0000 @@ -115,7 +115,7 @@ HRESULT WINAPI IDirectMusicPortImpl_Comp HRESULT WINAPI IDirectMusicPortImpl_GetCaps (LPDIRECTMUSICPORT iface, LPDMUS_PORTCAPS pPortCaps) { IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface; TRACE("(%p, %p)\n", This, pPortCaps); - pPortCaps = This->pCaps; + memcpy(pPortCaps, &This->caps, sizeof(DMUS_PORTCAPS)); return S_OK; } @@ -197,3 +197,52 @@ const IDirectMusicPortVtbl DirectMusicPo IDirectMusicPortImpl_SetDirectSound, IDirectMusicPortImpl_GetFormat }; + +HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) { + IDirectMusicPortImpl *obj; + HRESULT hr = E_FAIL; + + TRACE("(%p,%p,%p)\n", lpcGUID, ppobj, pUnkOuter); + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicPortImpl)); + if (NULL == obj) { + *ppobj = (LPDIRECTMUSICPORT) NULL; + return E_OUTOFMEMORY; + } + obj->lpVtbl = &DirectMusicPort_Vtbl; + obj->ref = 0; /* will be inited by QueryInterface */ + obj->fActive = FALSE; + memcpy(&obj->params, pPortParams, sizeof(DMUS_PORTPARAMS)); + memcpy(&obj->caps, pPortCaps, sizeof(DMUS_PORTCAPS)); + obj->pDirectSound = NULL; + obj->pLatencyClock = NULL; + hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&obj->pLatencyClock, NULL); + +#if 0 + if (pPortParams->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS) { + obj->nrofgroups = pPortParams->dwChannelGroups; + /* setting default priorities */ + for (j = 0; j < obj->nrofgroups; j++) { + TRACE ("Setting default channel priorities on channel group %i\n", j + 1); + obj->group[j].channel[0].priority = DAUD_CHAN1_DEF_VOICE_PRIORITY; + obj->group[j].channel[1].priority = DAUD_CHAN2_DEF_VOICE_PRIORITY; + obj->group[j].channel[2].priority = DAUD_CHAN3_DEF_VOICE_PRIORITY; + obj->group[j].channel[3].priority = DAUD_CHAN4_DEF_VOICE_PRIORITY; + obj->group[j].channel[4].priority = DAUD_CHAN5_DEF_VOICE_PRIORITY; + obj->group[j].channel[5].priority = DAUD_CHAN6_DEF_VOICE_PRIORITY; + obj->group[j].channel[6].priority = DAUD_CHAN7_DEF_VOICE_PRIORITY; + obj->group[j].channel[7].priority = DAUD_CHAN8_DEF_VOICE_PRIORITY; + obj->group[j].channel[8].priority = DAUD_CHAN9_DEF_VOICE_PRIORITY; + obj->group[j].channel[9].priority = DAUD_CHAN10_DEF_VOICE_PRIORITY; + obj->group[j].channel[10].priority = DAUD_CHAN11_DEF_VOICE_PRIORITY; + obj->group[j].channel[11].priority = DAUD_CHAN12_DEF_VOICE_PRIORITY; + obj->group[j].channel[12].priority = DAUD_CHAN13_DEF_VOICE_PRIORITY; + obj->group[j].channel[13].priority = DAUD_CHAN14_DEF_VOICE_PRIORITY; + obj->group[j].channel[14].priority = DAUD_CHAN15_DEF_VOICE_PRIORITY; + obj->group[j].channel[15].priority = DAUD_CHAN16_DEF_VOICE_PRIORITY; + } + } +#endif + + return IDirectMusicPortImpl_QueryInterface ((LPDIRECTMUSICPORT)obj, lpcGUID, ppobj); +}

1 0

wine/include cvconst.h
by Alexandre Julliard 29 Nov '05

29 Nov '05

ChangeSet ID: 21524 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:05:33 Modified files: include : cvconst.h Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Added calling convention definitions. Patch: http://cvs.winehq.org/patch.py?id=21524 Old revision New revision Changes Path 1.2 1.3 +21 -0 wine/include/cvconst.h Index: wine/include/cvconst.h diff -u -p wine/include/cvconst.h:1.2 wine/include/cvconst.h:1.3 --- wine/include/cvconst.h:1.2 29 Nov 2005 11: 5:33 -0000 +++ wine/include/cvconst.h 29 Nov 2005 11: 5:33 -0000 @@ -430,3 +430,24 @@ typedef enum THUNK_ORDINAL_PCODE, THUNK_ORDINAL_LOAD } THUNK_ORDINAL; + +typedef enum CV_call_e +{ + CV_CALL_NEAR_C, + CV_CALL_FAR_C, + CV_CALL_NEAR_PASCAL, + CV_CALL_FAR_PASCAL, + CV_CALL_NEAR_FAST, + CV_CALL_FAR_FAST, + CV_CALL_SKIPPED, + CV_CALL_NEAR_STD, + CV_CALL_FAR_STD, + CV_CALL_NEAR_SYS, + CV_CALL_FAR_SYS, + CV_CALL_THISCALL, + CV_CALL_MIPSCALL, + CV_CALL_GENERIC, + CV_CALL_ALPHACALL, + CV_CALL_PPCCALL, + CV_CALL_RESERVED, +} CV_call_e;

1 0

wine/ dlls/dbghelp/dbghelp.c dlls/dbghelp/dbgh ...
by Alexandre Julliard 29 Nov '05

29 Nov '05

ChangeSet ID: 21523 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:05:28 Modified files: dlls/dbghelp : dbghelp.c dbghelp.spec include : dbghelp.h Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Added stub for dbghelp.SymRegisterCallback64. Patch: http://cvs.winehq.org/patch.py?id=21523 Old revision New revision Changes Path 1.14 1.15 +13 -0 wine/dlls/dbghelp/dbghelp.c 1.12 1.13 +1 -1 wine/dlls/dbghelp/dbghelp.spec 1.17 1.18 +2 -0 wine/include/dbghelp.h Index: wine/dlls/dbghelp/dbghelp.c diff -u -p wine/dlls/dbghelp/dbghelp.c:1.14 wine/dlls/dbghelp/dbghelp.c:1.15 --- wine/dlls/dbghelp/dbghelp.c:1.14 29 Nov 2005 11: 5:28 -0000 +++ wine/dlls/dbghelp/dbghelp.c 29 Nov 2005 11: 5:28 -0000 @@ -318,6 +318,19 @@ BOOL WINAPI SymRegisterCallback(HANDLE h return FALSE; } +/*********************************************************************** + * SymRegisterCallback64 (DBGHELP.@) + */ +BOOL WINAPI SymRegisterCallback64(HANDLE hProcess, + PSYMBOL_REGISTERED_CALLBACK64 CallbackFunction, + ULONG64 UserContext) +{ + FIXME("(%p, %p, %s): stub\n", + hProcess, CallbackFunction, wine_dbgstr_longlong(UserContext)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /* This is imagehlp version not dbghelp !! */ static API_VERSION api_version = { 4, 0, 2, 0 }; Index: wine/dlls/dbghelp/dbghelp.spec diff -u -p wine/dlls/dbghelp/dbghelp.spec:1.12 wine/dlls/dbghelp/dbghelp.spec:1.13 --- wine/dlls/dbghelp/dbghelp.spec:1.12 29 Nov 2005 11: 5:28 -0000 +++ wine/dlls/dbghelp/dbghelp.spec 29 Nov 2005 11: 5:28 -0000 @@ -75,7 +75,7 @@ @ stub SymLoadModuleEx @ stdcall SymMatchFileName(str str ptr ptr) @ stub SymMatchString -@ stub SymRegisterCallback64 +@ stdcall SymRegisterCallback64(long ptr double) @ stdcall SymRegisterCallback(long ptr ptr) @ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) @ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) Index: wine/include/dbghelp.h diff -u -p wine/include/dbghelp.h:1.17 wine/include/dbghelp.h:1.18 --- wine/include/dbghelp.h:1.17 29 Nov 2005 11: 5:28 -0000 +++ wine/include/dbghelp.h 29 Nov 2005 11: 5:28 -0000 @@ -736,6 +736,8 @@ typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS BOOL WINAPI SymEnumerateSymbols(HANDLE, DWORD, PSYM_ENUMSYMBOLS_CALLBACK, PVOID); typedef BOOL (CALLBACK *PSYMBOL_REGISTERED_CALLBACK)(HANDLE, ULONG, PVOID, PVOID); BOOL WINAPI SymRegisterCallback(HANDLE, PSYMBOL_REGISTERED_CALLBACK, PVOID); +typedef BOOL (CALLBACK *PSYMBOL_REGISTERED_CALLBACK64)(HANDLE, ULONG, ULONG64, ULONG64); +BOOL WINAPI SymRegisterCallback64(HANDLE, PSYMBOL_REGISTERED_CALLBACK64, ULONG64); BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL, PSTR, DWORD); DWORD WINAPI UnDecorateSymbolName(LPCSTR, LPSTR, DWORD, DWORD);

1 0

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard 29 Nov '05

29 Nov '05

ChangeSet ID: 21522 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:05:20 Modified files: dlls/oleaut32 : typelib.c Log message: Robert Shearman <rob(a)codeweavers.com> Add functions for doing a deep copy of a TYPEDESC into a flat buffer. Copy VARDESC structures returned to calling applications instead of passing a pointer to the master structure used internally. Patch: http://cvs.winehq.org/patch.py?id=21522 Old revision New revision Changes Path 1.176 1.177 +129 -44 wine/dlls/oleaut32/typelib.c

1 0

wine/dlls/rpcrt4 cpsf.h cstub.c
by Alexandre Julliard 29 Nov '05

29 Nov '05

ChangeSet ID: 21521 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:05:02 Modified files: dlls/rpcrt4 : cpsf.h cstub.c Log message: Robert Shearman <rob(a)codeweavers.com> Add a function to retrieve the MIDL_SERVER_INFO struct from an object. Patch: http://cvs.winehq.org/patch.py?id=21521 Old revision New revision Changes Path 1.2 1.3 +2 -0 wine/dlls/rpcrt4/cpsf.h 1.10 1.11 +6 -0 wine/dlls/rpcrt4/cstub.c Index: wine/dlls/rpcrt4/cpsf.h diff -u -p wine/dlls/rpcrt4/cpsf.h:1.2 wine/dlls/rpcrt4/cpsf.h:1.3 --- wine/dlls/rpcrt4/cpsf.h:1.2 29 Nov 2005 11: 5: 2 -0000 +++ wine/dlls/rpcrt4/cpsf.h 29 Nov 2005 11: 5: 2 -0000 @@ -41,4 +41,6 @@ HRESULT WINAPI CStdStubBuffer_Construct( LPPSFACTORYBUFFER pPSFactory, LPRPCSTUBBUFFER *ppStub); +const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface); + #endif /* __WINE_CPSF_H */ Index: wine/dlls/rpcrt4/cstub.c diff -u -p wine/dlls/rpcrt4/cstub.c:1.10 wine/dlls/rpcrt4/cstub.c:1.11 --- wine/dlls/rpcrt4/cstub.c:1.10 29 Nov 2005 11: 5: 2 -0000 +++ wine/dlls/rpcrt4/cstub.c 29 Nov 2005 11: 5: 2 -0000 @@ -177,3 +177,9 @@ void WINAPI CStdStubBuffer_DebugServerRe CStdStubBuffer *This = (CStdStubBuffer *)iface; TRACE("(%p)->DebugServerRelease(%p)\n",This,pv); } + +const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface) +{ + CStdStubBuffer *This = (CStdStubBuffer *)iface; + return STUB_HEADER(This).pServerInfo; +}

1 0