February 2013 - Wine-Commits

Huw Davies : riched20: Move the split point calculation to wrap.c.
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 9e8a9f4f657e30de42d422bda3b23810e56976bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8a9f4f657e30de42d422bda… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 8 11:45:03 2013 +0000 riched20: Move the split point calculation to wrap.c. --- dlls/riched20/editor.h | 1 - dlls/riched20/run.c | 50 ------------------------------------------------ dlls/riched20/wrap.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 52 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 9722f36..4401498 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -140,7 +140,6 @@ ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags) DECLSPEC_HIDDEN; void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; -int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run) DECLSPEC_HIDDEN; /* this one accounts for 1/2 char tolerance */ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) DECLSPEC_HIDDEN; int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index aaa6300..6f9d5b5 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -404,56 +404,6 @@ void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) } /****************************************************************************** - * ME_CharFromPoint - * - * Returns a character position inside the run given a run-relative - * pixel horizontal position. This version rounds left (ie. if the second - * character is at pixel position 8, then for cx=0..7 it returns 0). - */ -int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run) -{ - int fit = 0; - HGDIOBJ hOldFont; - SIZE sz; - if (!run->len || cx <= 0) - return 0; - - if (run->nFlags & MERF_TAB || - (run->nFlags & (MERF_ENDCELL|MERF_ENDPARA)) == MERF_ENDCELL) - { - if (cx < run->nWidth/2) - return 0; - return 1; - } - if (run->nFlags & MERF_GRAPHICS) - { - SIZE sz; - ME_GetOLEObjectSize(c, run, &sz); - if (cx < sz.cx) - return 0; - return 1; - } - hOldFont = ME_SelectStyleFont(c, run->style); - - if (c->editor->cPasswordMask) - { - ME_String *strMasked = ME_MakeStringR(c->editor->cPasswordMask, run->len); - GetTextExtentExPointW(c->hDC, strMasked->szData, run->len, - cx, &fit, NULL, &sz); - ME_DestroyString(strMasked); - } - else - { - GetTextExtentExPointW(c->hDC, get_text( run, 0 ), run->len, - cx, &fit, NULL, &sz); - } - - ME_UnselectStyleFont(c, run->style, hOldFont); - - return fit; -} - -/****************************************************************************** * ME_CharFromPointCursor * * Returns a character position inside the run given a run-relative diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 97598e7..0531c97 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -80,6 +80,51 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite return cursor.pRun; } +/****************************************************************************** + * find_split_point + * + * Returns a character position to split inside the run given a run-relative + * pixel horizontal position. This version rounds left (ie. if the second + * character is at pixel position 8, then for cx=0..7 it returns 0). + */ +static int find_split_point( ME_Context *c, int cx, ME_Run *run ) +{ + int fit = 0; + HGDIOBJ hOldFont; + SIZE sz; + + if (!run->len || cx <= 0) return 0; + + if (run->nFlags & MERF_TAB || + (run->nFlags & (MERF_ENDCELL|MERF_ENDPARA)) == MERF_ENDCELL) + { + if (cx < run->nWidth / 2) return 0; + return 1; + } + if (run->nFlags & MERF_GRAPHICS) + { + SIZE sz; + ME_GetOLEObjectSize( c, run, &sz ); + if (cx < sz.cx) return 0; + return 1; + } + hOldFont = ME_SelectStyleFont( c, run->style ); + + if (c->editor->cPasswordMask) + { + ME_String *strMasked = ME_MakeStringR( c->editor->cPasswordMask, run->len ); + GetTextExtentExPointW( c->hDC, strMasked->szData, run->len, cx, &fit, NULL, &sz ); + ME_DestroyString( strMasked ); + } + else + { + GetTextExtentExPointW( c->hDC, get_text( run, 0 ), run->len, cx, &fit, NULL, &sz ); + } + + ME_UnselectStyleFont( c, run->style, hOldFont ); + + return fit; +} static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) { @@ -337,7 +382,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem int i, idesp, len; ME_Run *run = &p->member.run; - idesp = i = ME_CharFromPoint(wc->context, loc, run); + idesp = i = find_split_point( wc->context, loc, run ); len = run->len; assert(len>0); assert(i<len);

1 0

Jacek Caban : atl100: Added AtlComModuleRegisterClassObjects implementation ( based on AtlModuleRegisterClassObjects).
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 68a4c30e8b702e425ea099061dd3e8510e2a7f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a4c30e8b702e425ea099061… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 8 10:59:19 2013 +0100 atl100: Added AtlComModuleRegisterClassObjects implementation (based on AtlModuleRegisterClassObjects). --- dlls/atl100/atl.c | 32 ++++++++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- include/atlbase.h | 1 + 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index ce35b38..ebb47a1 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -456,6 +456,38 @@ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, } /*********************************************************************** + * AtlComModuleRegisterClassObjects [atl100.17] + */ +HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD context, DWORD flags) +{ + _ATL_OBJMAP_ENTRY **iter; + IUnknown *unk; + HRESULT hres; + + TRACE("(%p %x %x)\n", module, context, flags); + + if(!module) + return E_INVALIDARG; + + for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { + if(!(*iter)->pfnGetClassObject) + continue; + + hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&unk); + if(FAILED(hres)) + return hres; + + hres = CoRegisterClassObject((*iter)->pclsid, unk, context, flags, &(*iter)->dwRegister); + IUnknown_Release(unk); + if(FAILED(hres)) + return hres; + } + + return S_OK; + +} + +/*********************************************************************** * AtlComModuleUnregisterServer [atl100.22] */ HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index c959a29..fa5d251 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -4,7 +4,7 @@ 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) 15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) -17 stub AtlComModuleRegisterClassObjects +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) 20 stub AtlComModuleRevokeClassObjects 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index dfc9c43..dbd38aa 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -4,7 +4,7 @@ 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr 15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject -17 stub AtlComModuleRegisterClassObjects +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects 18 stdcall AtlComModuleRegisterServer(ptr long ptr) 19 stdcall AtlRegisterTypeLib(ptr wstr) 20 stub AtlComModuleRevokeClassObjects diff --git a/include/atlbase.h b/include/atlbase.h index 7d18d81..1036b10 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -255,6 +255,7 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE,LPCOLESTR,BSTR*,ITypeLib**); HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE,LPCOLESTR); HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID,const struct _ATL_CATMAP_ENTRY*,BOOL); HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE*,REFCLSID,REFIID,void**); +HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE*,DWORD,DWORD); HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE*,BOOL,const CLSID*); BOOL WINAPI AtlWaitWithMessageLoop(HANDLE); HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown*,GUID*,IID*,unsigned short*,unsigned short*);

1 0

Michael Stefaniuc : dmime: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 5351700223f2879f1bef541141e1a3808a070a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5351700223f2879f1bef54114… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 8 10:51:54 2013 +0100 dmime: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/dmime/segment.c | 5 ++--- dlls/dmime/segtriggertrack.c | 7 +++---- dlls/dmime/tempotrack.c | 12 +++++------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index e0d082d..36766db 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -246,10 +246,9 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicSegment8_InsertTrack } pNewSegTrack = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_SEGMENT_TRACK)); - if (NULL == pNewSegTrack) { - ERR(": no more memory\n"); + if (NULL == pNewSegTrack) return E_OUTOFMEMORY; - } + pNewSegTrack->dwGroupBits = dwGroupBits; pNewSegTrack->pTrack = pTrack; IDirectMusicTrack_Init(pTrack, (IDirectMusicSegment *)iface); diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 221feeb..583561c 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -274,10 +274,9 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegment (LPPERSIS TRACE_(dmfile)(": segment item chunk\n"); /** alloc new item entry */ pNewItem = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_SEGMENT_ITEM)); - if (!pNewItem) { - ERR(": no more memory\n"); - return E_OUTOFMEMORY; - } + if (!pNewItem) + return E_OUTOFMEMORY; + IStream_Read (pStm, &pNewItem->header, sizeof(DMUS_IO_SEGMENT_ITEM_HEADER), NULL); TRACE_(dmfile)(" - lTimePhysical: %u\n", pNewItem->header.lTimeLogical); TRACE_(dmfile)(" - lTimePhysical: %u\n", pNewItem->header.lTimePhysical); diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 21a4685..b8dee90 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -113,10 +113,9 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_InitPlay (LPDIREC FIXME("(%p, %p, %p, %p, %d, %d): semi-stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); pState = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_TEMPO_PLAY_STATE)); - if (NULL == pState) { - ERR(": no more memory\n"); + if (NULL == pState) return E_OUTOFMEMORY; - } + /** TODO real fill useful data */ pState->dummy = 0; *ppStateData = pState; @@ -348,10 +347,9 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA TRACE_(dmfile)(" - lTime = %u\n", item.lTime); TRACE_(dmfile)(" - dblTempo = %g\n", item.dblTempo); pNewItem = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_TEMPO_ITEM)); - if (NULL == pNewItem) { - ERR(": no more memory\n"); - return E_OUTOFMEMORY; - } + if (NULL == pNewItem) + return E_OUTOFMEMORY; + pNewItem->item = item; list_add_tail (&This->Items, &pNewItem->entry); pNewItem = NULL;

1 0

Michael Stefaniuc : d3drm: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 5ef8a8b2f29d34118e7c1389d2c3b7ec2f50e57d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef8a8b2f29d34118e7c1389d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 8 10:27:49 2013 +0100 d3drm: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/d3drm/d3drm.c | 3 --- dlls/d3drm/device.c | 3 --- dlls/d3drm/frame.c | 12 ------------ dlls/d3drm/light.c | 3 --- dlls/d3drm/material.c | 3 --- dlls/d3drm/meshbuilder.c | 6 ------ dlls/d3drm/texture.c | 3 --- dlls/d3drm/viewport.c | 3 --- 8 files changed, 0 insertions(+), 36 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 48b362d..a18eb11 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1686,10 +1686,7 @@ HRESULT Direct3DRM_create(IUnknown** ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRM_iface.lpVtbl = &Direct3DRM_Vtbl; object->IDirect3DRM2_iface.lpVtbl = &Direct3DRM2_Vtbl; diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 6d72d92..e6e0d71 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1161,10 +1161,7 @@ HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMDeviceImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMDevice2_iface.lpVtbl = &Direct3DRMDevice2_Vtbl; object->IDirect3DRMDevice3_iface.lpVtbl = &Direct3DRMDevice3_Vtbl; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 525a3fa..b0bbaa6 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -203,10 +203,7 @@ static HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMFrameArrayImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMFrameArray_iface.lpVtbl = &Direct3DRMFrameArray_Vtbl; object->ref = 1; @@ -319,10 +316,7 @@ static HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMVisualArrayImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMVisualArray_iface.lpVtbl = &Direct3DRMVisualArray_Vtbl; object->ref = 1; @@ -439,10 +433,7 @@ static HRESULT Direct3DRMLightArray_create(IDirect3DRMLightArray** obj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMLightArrayImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMLightArray_iface.lpVtbl = &Direct3DRMLightArray_Vtbl; object->ref = 1; @@ -2665,10 +2656,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMFrameImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMFrame2_iface.lpVtbl = &Direct3DRMFrame2_Vtbl; object->IDirect3DRMFrame3_iface.lpVtbl = &Direct3DRMFrame3_Vtbl; diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 558d836..32500bf 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -426,10 +426,7 @@ HRESULT Direct3DRMLight_create(IUnknown** ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMLightImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMLight_iface.lpVtbl = &Direct3DRMLight_Vtbl; object->ref = 1; diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index 0c1fa8c..2adb20f 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -312,10 +312,7 @@ HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMaterialImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMMaterial2_iface.lpVtbl = &Direct3DRMMaterial2_Vtbl; object->ref = 1; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 59266de..51f981a 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2522,10 +2522,7 @@ HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMeshBuilderImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMMeshBuilder2_iface.lpVtbl = &Direct3DRMMeshBuilder2_Vtbl; object->IDirect3DRMMeshBuilder3_iface.lpVtbl = &Direct3DRMMeshBuilder3_Vtbl; @@ -3086,10 +3083,7 @@ HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMeshImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMMesh_iface.lpVtbl = &Direct3DRMMesh_Vtbl; object->ref = 1; diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 6ff4345..cbaaf63 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -849,10 +849,7 @@ HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown** ret_iface) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMTextureImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMTexture2_iface.lpVtbl = &Direct3DRMTexture2_Vtbl; object->IDirect3DRMTexture3_iface.lpVtbl = &Direct3DRMTexture3_Vtbl; diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index e134bf2..729db03 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -971,10 +971,7 @@ HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMViewportImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMViewport_iface.lpVtbl = &Direct3DRMViewport_Vtbl; object->IDirect3DRMViewport2_iface.lpVtbl = &Direct3DRMViewport2_Vtbl;

1 0

Michael Stefaniuc : amstream: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 76b910514ef060dd981646768ff0be9d26748d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b910514ef060dd981646768… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 8 10:29:36 2013 +0100 amstream: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/amstream/amstream.c | 3 --- dlls/amstream/audiodata.c | 3 --- dlls/amstream/mediastream.c | 12 ------------ dlls/amstream/mediastreamfilter.c | 3 --- 4 files changed, 0 insertions(+), 21 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 94066a1..800e48d 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -63,10 +63,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAMMultiMediaStreamImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl; object->ref = 1; diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 2bd57da..3a62a9f 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -143,10 +143,7 @@ HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AMAudioDataImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IAudioData_iface.lpVtbl = &AudioData_Vtbl; object->ref = 1; diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index dd037fc..f619cbd 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -436,10 +436,7 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DirectDrawMediaStreamImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IAMMediaStream_iface.lpVtbl = &DirectDrawMediaStreamImpl_IAMMediaStream_Vtbl; object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStreamImpl_IDirectDrawMediaStream_Vtbl; @@ -839,10 +836,7 @@ HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AudioMediaStreamImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IAMMediaStream_iface.lpVtbl = &AudioMediaStreamImpl_IAMMediaStream_Vtbl; object->IAudioMediaStream_iface.lpVtbl = &AudioMediaStreamImpl_IAudioMediaStream_Vtbl; @@ -992,10 +986,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawStreamSampleImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; @@ -1133,10 +1124,7 @@ static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *a object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAudioStreamSampleImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IAudioStreamSample_iface.lpVtbl = &AudioStreamSample_Vtbl; object->ref = 1; diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index bfec0f0..49ee6fe 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -516,10 +516,7 @@ HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamFilterImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } BaseFilter_Init(&object->filter, (IBaseFilterVtbl*)&MediaStreamFilter_Vtbl, &CLSID_MediaStreamFilter, (DWORD_PTR)(__FILE__ ": MediaStreamFilterImpl.csFilter"), &BaseFuncTable);

1 0

Austin English : windowscodecsext: Add a stub dll.
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: ac15301b7f7b415f3a2b57a4b6f09b506f194cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac15301b7f7b415f3a2b57a4b… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 2 05:15:03 2013 +0100 windowscodecsext: Add a stub dll. --- configure | 1 + configure.ac | 1 + dlls/windowscodecsext/Makefile.in | 6 +++ dlls/windowscodecsext/main.c | 47 +++++++++++++++++++++++++++ dlls/windowscodecsext/windowscodecsext.spec | 3 ++ 5 files changed, 58 insertions(+), 0 deletions(-) diff --git a/configure b/configure index e3253ee..c5fabba 100755 --- a/configure +++ b/configure @@ -16184,6 +16184,7 @@ wine_fn_config_dll winaspi.dll16 enable_win16 wine_fn_config_dll windebug.dll16 enable_win16 wine_fn_config_dll windowscodecs enable_windowscodecs implib wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test +wine_fn_config_dll windowscodecsext enable_windowscodecsext wine_fn_config_dll winealsa.drv enable_winealsa_drv wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv wine_fn_config_lib winecrt0 diff --git a/configure.ac b/configure.ac index c93cd08..012228c 100644 --- a/configure.ac +++ b/configure.ac @@ -3068,6 +3068,7 @@ WINE_CONFIG_DLL(winaspi.dll16,enable_win16) WINE_CONFIG_DLL(windebug.dll16,enable_win16) WINE_CONFIG_DLL(windowscodecs,,[implib]) WINE_CONFIG_TEST(dlls/windowscodecs/tests) +WINE_CONFIG_DLL(windowscodecsext) WINE_CONFIG_DLL(winealsa.drv) WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) diff --git a/dlls/windowscodecsext/Makefile.in b/dlls/windowscodecsext/Makefile.in new file mode 100644 index 0000000..de6d06c --- /dev/null +++ b/dlls/windowscodecsext/Makefile.in @@ -0,0 +1,6 @@ +MODULE = windowscodecsext.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/windowscodecsext/main.c b/dlls/windowscodecsext/main.c new file mode 100644 index 0000000..608096e --- /dev/null +++ b/dlls/windowscodecsext/main.c @@ -0,0 +1,47 @@ +/* + * Windows Codecs Extensions + * + * Copyright 2013 Austin English + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/windowscodecsext/windowscodecsext.spec b/dlls/windowscodecsext/windowscodecsext.spec new file mode 100644 index 0000000..d6b0e2b --- /dev/null +++ b/dlls/windowscodecsext/windowscodecsext.spec @@ -0,0 +1,3 @@ +@ stub DllGetClassObject +@ stub IWICColorTransform_Initialize_Proxy +@ stub WICCreateColorTransform_Proxy

1 0

Alexander Morozov : ole32: Avoid a deadlock when a being loaded DLL calls CoRegisterClassObject from its DLL_PROCESS_ATTACH handler .
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 5857895684020e513f6f3858938fc5ab7a227676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5857895684020e513f6f38589… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Aug 2 15:52:48 2011 +0400 ole32: Avoid a deadlock when a being loaded DLL calls CoRegisterClassObject from its DLL_PROCESS_ATTACH handler. --- dlls/ole32/rpc.c | 45 ++++++++++++++++++--------------------------- 1 files changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 5c981bb..5070117 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1877,7 +1877,7 @@ struct local_server_params { CLSID clsid; IStream *stream; - HANDLE ready_event; + HANDLE pipe; HANDLE stop_event; HANDLE thread; BOOL multi_use; @@ -1898,7 +1898,7 @@ static DWORD WINAPI local_server_thread(LPVOID param) ULONG res; BOOL multi_use = lsp->multi_use; OVERLAPPED ovl; - HANDLE pipe_event, hPipe, new_pipe; + HANDLE pipe_event, hPipe = lsp->pipe, new_pipe; DWORD bytes; TRACE("Starting threader for %s.\n",debugstr_guid(&lsp->clsid)); @@ -1907,18 +1907,6 @@ static DWORD WINAPI local_server_thread(LPVOID param) get_localserver_pipe_name(pipefn, &lsp->clsid); ovl.hEvent = pipe_event = CreateEventW(NULL, FALSE, FALSE, NULL); - hPipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, - PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, - 4096, 4096, 500 /* 0.5 second timeout */, NULL ); - if (hPipe == INVALID_HANDLE_VALUE) - { - FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); - CloseHandle(pipe_event); - return 1; - } - - SetEvent(lsp->ready_event); - while (1) { if (!ConnectNamedPipe(hPipe, &ovl)) { @@ -2008,8 +1996,9 @@ static DWORD WINAPI local_server_thread(LPVOID param) /* starts listening for a local server */ HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, BOOL multi_use, void **registration) { - DWORD tid; + DWORD tid, err; struct local_server_params *lsp; + WCHAR pipefn[100]; lsp = HeapAlloc(GetProcessHeap(), 0, sizeof(*lsp)); if (!lsp) @@ -2018,34 +2007,36 @@ HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, BOOL multi_use, vo lsp->clsid = *clsid; lsp->stream = stream; IStream_AddRef(stream); - lsp->ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); - if (!lsp->ready_event) - { - HeapFree(GetProcessHeap(), 0, lsp); - return HRESULT_FROM_WIN32(GetLastError()); - } lsp->stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); if (!lsp->stop_event) { - CloseHandle(lsp->ready_event); HeapFree(GetProcessHeap(), 0, lsp); return HRESULT_FROM_WIN32(GetLastError()); } lsp->multi_use = multi_use; + get_localserver_pipe_name(pipefn, &lsp->clsid); + lsp->pipe = CreateNamedPipeW(pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, + 4096, 4096, 500 /* 0.5 second timeout */, NULL); + if (lsp->pipe == INVALID_HANDLE_VALUE) + { + err = GetLastError(); + FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); + CloseHandle(lsp->stop_event); + HeapFree(GetProcessHeap(), 0, lsp); + return HRESULT_FROM_WIN32(err); + } + lsp->thread = CreateThread(NULL, 0, local_server_thread, lsp, 0, &tid); if (!lsp->thread) { - CloseHandle(lsp->ready_event); + CloseHandle(lsp->pipe); CloseHandle(lsp->stop_event); HeapFree(GetProcessHeap(), 0, lsp); return HRESULT_FROM_WIN32(GetLastError()); } - WaitForSingleObject(lsp->ready_event, INFINITE); - CloseHandle(lsp->ready_event); - lsp->ready_event = NULL; - *registration = lsp; return S_OK; }

1 0

Michael Stefaniuc : d3dcompiler_43: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 536bdfde27f2967ac944c83885384a4d3ec52c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=536bdfde27f2967ac944c8388… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 8 10:34:39 2013 +0100 d3dcompiler_43: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/d3dcompiler_43/blob.c | 3 --- dlls/d3dcompiler_43/compiler.c | 12 +++--------- dlls/d3dcompiler_43/reflection.c | 6 ------ 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 6900e87..865d139 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -148,10 +148,7 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D blob object memory\n"); return E_OUTOFMEMORY; - } hr = d3dcompiler_blob_init(object, data_size); if (FAILED(hr)) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index caa6080..86e8b44 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -84,10 +84,8 @@ static void wpp_write_message(const char *fmt, va_list args) { wpp_messages = HeapAlloc(GetProcessHeap(), 0, MESSAGEBUFFER_INITIAL_SIZE); if(wpp_messages == NULL) - { - ERR("Error allocating memory for parser messages\n"); return; - } + wpp_messages_capacity = MESSAGEBUFFER_INITIAL_SIZE; } @@ -189,10 +187,8 @@ static void *wpp_open_mem(const char *filename, int type) if(current_include == NULL) return NULL; desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*desc)); if(!desc) - { - ERR("Error allocating memory\n"); return NULL; - } + hr = ID3DInclude_Open(current_include, type ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, filename, parent_include, (LPCVOID *)&desc->buffer, @@ -275,10 +271,8 @@ static void wpp_write_mem(const char *buffer, unsigned int len) { wpp_output = HeapAlloc(GetProcessHeap(), 0, BUFFER_INITIAL_CAPACITY); if(!wpp_output) - { - ERR("Error allocating memory\n"); return; - } + wpp_output_capacity = BUFFER_INITIAL_CAPACITY; } if(len > wpp_output_capacity - wpp_output_size) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 5dd7c38..f516e4a 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1282,10 +1282,7 @@ static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3d type = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*type)); if (!type) - { - ERR("Failed to allocate type memory.\n"); return NULL; - } type->ID3D11ShaderReflectionType_iface.lpVtbl = &d3dcompiler_shader_reflection_type_vtbl; type->id = offset; @@ -1833,10 +1830,7 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D compiler shader reflection object memory\n"); return E_OUTOFMEMORY; - } hr = d3dcompiler_shader_reflection_init(object, data, data_size); if (FAILED(hr))

1 0

Jörg Höhle : ntdll: Use the monotonic time counter also for timer queues.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 4f6db78ca0f4f01d8a8734ddc332cc3ea1a8587e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6db78ca0f4f01d8a8734ddc… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 5 18:01:04 2013 +0100 ntdll: Use the monotonic time counter also for timer queues. --- dlls/ntdll/threadpool.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 81abac3..f246cfb 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -605,9 +605,9 @@ static DWORD WINAPI timer_callback_wrapper(LPVOID p) static inline ULONGLONG queue_current_time(void) { - LARGE_INTEGER now; - NtQuerySystemTime(&now); - return now.QuadPart / 10000; + LARGE_INTEGER now, freq; + NtQueryPerformanceCounter(&now, &freq); + return now.QuadPart * 1000 / freq.QuadPart; } static void queue_add_timer(struct queue_timer *t, ULONGLONG time,

1 0

Ken Thomases : secur32: On Mac, add support for cipher suites defined in 10 .8 SDK.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 7494f5bc5e4945e4b7828a04f202f06660ab98f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7494f5bc5e4945e4b7828a04f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 7 09:11:24 2013 -0600 secur32: On Mac, add support for cipher suites defined in 10.8 SDK. --- dlls/secur32/schannel_macosx.c | 143 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 140 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7494f5bc5e4945e4b7828…

1 0