wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Matteo Bruni : msctf: Add ITfUIElementMgr stub.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 585028be180ad2062cf4a938811e58a4ec1d1ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585028be180ad2062cf4a9388… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 28 22:27:26 2015 +0100 msctf: Add ITfUIElementMgr stub. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++- include/msctf.idl | 70 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 161 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index b56d558..d997cda 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -87,7 +87,7 @@ typedef struct tagACLMulti { /* const ITfThreadMgrExVtbl *ThreadMgrExVtbl; */ /* const ITfConfigureSystemKeystrokeFeedVtbl *ConfigureSystemKeystrokeFeedVtbl; */ /* const ITfLangBarItemMgrVtbl *LangBarItemMgrVtbl; */ - /* const ITfUIElementMgrVtbl *UIElementMgrVtbl; */ + ITfUIElementMgr ITfUIElementMgr_iface; ITfSourceSingle ITfSourceSingle_iface; LONG refCount; @@ -157,6 +157,11 @@ static inline ThreadMgr *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEventSink * return CONTAINING_RECORD(iface, ThreadMgr, ITfThreadMgrEventSink_iface); } +static inline ThreadMgr *impl_from_ITfUIElementMgr(ITfUIElementMgr *iface) +{ + return CONTAINING_RECORD(iface, ThreadMgr, ITfUIElementMgr_iface); +} + static inline ThreadMgr *impl_from_ITfSourceSingle(ITfSourceSingle *iface) { return CONTAINING_RECORD(iface, ThreadMgr, ITfSourceSingle_iface); @@ -282,6 +287,10 @@ static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgrEx *iface, REFIID iid { *ppvOut = This->CompartmentMgr; } + else if (IsEqualIID(iid, &IID_ITfUIElementMgr)) + { + *ppvOut = &This->ITfUIElementMgr_iface; + } else if (IsEqualIID(iid, &IID_ITfSourceSingle)) { *ppvOut = &This->ITfSourceSingle_iface; @@ -1239,6 +1248,86 @@ static const ITfThreadMgrEventSinkVtbl ThreadMgrEventSinkVtbl = }; /***************************************************** + * ITfUIElementMgr functions + *****************************************************/ +static HRESULT WINAPI UIElementMgr_QueryInterface(ITfUIElementMgr *iface, REFIID iid, void **ppvOut) +{ + ThreadMgr *This = impl_from_ITfUIElementMgr(iface); + + return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, *ppvOut); +} + +static ULONG WINAPI UIElementMgr_AddRef(ITfUIElementMgr *iface) +{ + ThreadMgr *This = impl_from_ITfUIElementMgr(iface); + + return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface); +} + +static ULONG WINAPI UIElementMgr_Release(ITfUIElementMgr *iface) +{ + ThreadMgr *This = impl_from_ITfUIElementMgr(iface); + + return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface); +} + +static HRESULT WINAPI UIElementMgr_BeginUIElement(ITfUIElementMgr *iface, ITfUIElement *element, + BOOL *show, DWORD *id) +{ + ThreadMgr *This = impl_from_ITfUIElementMgr(iface); + + FIXME("STUB:(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI UIElementMgr_UpdateUIElement(ITfUIElementMgr *iface, DWORD id) +{ + ThreadMgr *This = impl_from_ITfUIElementMgr(iface); + + FIXME("STUB:(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI UIElementMgr_EndUIElement(ITfUIElementMgr *iface, DWORD id) +{ + ThreadMgr *This = impl_from_ITfUIElementMgr(iface); + + FIXME("STUB:(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI UIElementMgr_GetUIElement(ITfUIElementMgr *iface, DWORD id, + ITfUIElement **element) +{ + ThreadMgr *This = impl_from_ITfUIElementMgr(iface); + + FIXME("STUB:(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI UIElementMgr_EnumUIElements(ITfUIElementMgr *iface, + IEnumTfUIElements **enum_elements) +{ + ThreadMgr *This = impl_from_ITfUIElementMgr(iface); + + FIXME("STUB:(%p)\n", This); + return E_NOTIMPL; +} + +static const ITfUIElementMgrVtbl ThreadMgrUIElementMgrVtbl = +{ + UIElementMgr_QueryInterface, + UIElementMgr_AddRef, + UIElementMgr_Release, + + UIElementMgr_BeginUIElement, + UIElementMgr_UpdateUIElement, + UIElementMgr_EndUIElement, + UIElementMgr_GetUIElement, + UIElementMgr_EnumUIElements +}; + +/***************************************************** * ITfSourceSingle functions *****************************************************/ static HRESULT WINAPI ThreadMgrSourceSingle_QueryInterface(ITfSourceSingle *iface, REFIID iid, LPVOID *ppvOut) @@ -1309,6 +1398,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->ITfMessagePump_iface.lpVtbl = &MessagePumpVtbl; This->ITfClientId_iface.lpVtbl = &ClientIdVtbl; This->ITfThreadMgrEventSink_iface.lpVtbl = &ThreadMgrEventSinkVtbl; + This->ITfUIElementMgr_iface.lpVtbl = &ThreadMgrUIElementMgrVtbl; This->ITfSourceSingle_iface.lpVtbl = &SourceSingleVtbl; This->refCount = 1; TlsSetValue(tlsIndex,This); diff --git a/include/msctf.idl b/include/msctf.idl index 0fe2d71..0cfaacf 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -1655,6 +1655,76 @@ interface IEnumTfDocumentMgrs : IUnknown } [ + object, + local, + uuid(ea1ea137-19df-11d7-a6d2-00065b84435c), + pointer_default(unique) +] +interface ITfUIElement : IUnknown +{ + HRESULT GetDescription( + [out] BSTR *description); + + HRESULT GetGUID( + [out] GUID *guid); + + HRESULT Show( + [in] BOOL show); + + HRESULT IsShown( + [out] BOOL *show); +} + +[ + object, + local, + uuid(887aa91e-acba-4931-84da-3c5208cf543f), + pointer_default(unique) +] +interface IEnumTfUIElements : IUnknown +{ + HRESULT Clone( + [out] IEnumTfUIElements **enum_elements); + + HRESULT Next( + [in] ULONG count, + [out, size_is(count), length_is(fetched)] ITfUIElement **element, + [out] ULONG fetched); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG count); +} + +[ + object, + local, + uuid(ea1ea135-19df-11d7-a6d2-00065b84435c), + pointer_default(unique) +] +interface ITfUIElementMgr : IUnknown +{ + HRESULT BeginUIElement( + [in] ITfUIElement *element, + [in, out] BOOL *show, + [out] DWORD *id); + + HRESULT UpdateUIElement( + [in] DWORD id); + + HRESULT EndUIElement( + [in] DWORD id); + + HRESULT GetUIElement( + [in] DWORD id, + [out] ITfUIElement **element); + + HRESULT EnumUIElements( + [out] IEnumTfUIElements **enum_elements); +} + +[ object, uuid(73131f9c-56a9-49dd-b0ee-d046633f7528), pointer_default(unique)

1 0

Matteo Bruni : msctf: Add ITfThreadMgrEx stub.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: ccff353a0b366b5e44c06cb00b4a983a70df3143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccff353a0b366b5e44c06cb00… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 28 22:27:25 2015 +0100 msctf: Add ITfThreadMgrEx stub. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 145 ++++++++++++++++++++++++++++--------------------- include/msctf.idl | 14 +++++ 2 files changed, 96 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccff353a0b366b5e44c06…

1 0

Piotr Caban : shlwapi: Don' t crash in PathStripPath when read-only string is passed and it' s not modified.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 31c49c2851d7557271dbf44a6c9239c6bcc24d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31c49c2851d7557271dbf44a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 28 20:05:12 2015 +0100 shlwapi: Don't crash in PathStripPath when read-only string is passed and it's not modified. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/path.c | 4 ++-- dlls/shlwapi/tests/path.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index dae949a..3c07bb8 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -661,7 +661,7 @@ void WINAPI PathStripPathA(LPSTR lpszPath) if (lpszPath) { LPSTR lpszFileName = PathFindFileNameA(lpszPath); - if(lpszFileName) + if(lpszFileName != lpszPath) RtlMoveMemory(lpszPath, lpszFileName, strlen(lpszFileName)+1); } } @@ -677,7 +677,7 @@ void WINAPI PathStripPathW(LPWSTR lpszPath) TRACE("(%s)\n", debugstr_w(lpszPath)); lpszFileName = PathFindFileNameW(lpszPath); - if(lpszFileName) + if(lpszFileName != lpszPath) RtlMoveMemory(lpszPath, lpszFileName, (strlenW(lpszFileName)+1)*sizeof(WCHAR)); } diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index ab4ae47..03079a3 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1639,6 +1639,19 @@ static void test_PathIsRelativeW(void) } } +static void test_PathStripPathA(void) +{ + const char const_path[] = "test"; + char path[] = "short//path\\file.txt"; + + PathStripPathA(path); + ok(!strcmp(path, "file.txt"), "path = %s\n", path); + + /* following test should not crash */ + /* LavView 2013 depends on that behaviour */ + PathStripPathA((char*)const_path); +} + START_TEST(path) { HMODULE hShlwapi = GetModuleHandleA("shlwapi.dll"); @@ -1684,4 +1697,5 @@ START_TEST(path) test_PathUnExpandEnvStrings(); test_PathIsRelativeA(); test_PathIsRelativeW(); + test_PathStripPathA(); }

1 0

Nikolay Sivov : ntdll: Fix printf format to use unsigned integers ( PVS-Studio).
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: c1a46db98b91332a4f4497393d2a4948a495e528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a46db98b91332a4f4497393… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 28 21:36:15 2015 +0300 ntdll: Fix printf format to use unsigned integers (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index d2ed9c5..8ea1ddd 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1307,9 +1307,9 @@ static inline BOOL logical_proc_info_add_numa_node(SYSTEM_LOGICAL_PROCESSOR_INFO static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, DWORD *max_len) { - static const char core_info[] = "/sys/devices/system/cpu/cpu%d/%s"; - static const char cache_info[] = "/sys/devices/system/cpu/cpu%d/cache/index%d/%s"; - static const char numa_info[] = "/sys/devices/system/node/node%d/cpumap"; + static const char core_info[] = "/sys/devices/system/cpu/cpu%u/%s"; + static const char cache_info[] = "/sys/devices/system/cpu/cpu%u/cache/index%u/%s"; + static const char numa_info[] = "/sys/devices/system/node/node%u/cpumap"; FILE *fcpu_list, *fnuma_list, *f; DWORD len = 0, beg, end, i, j, r;

1 0

Nikolay Sivov : dwrite: Fix analysis leak on error path.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: edea5fc342a58928137c20f0c4ff56c2f0193a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=edea5fc342a58928137c20f0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 28 21:00:49 2015 +0300 dwrite: Fix analysis leak on error path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 53c9c51..7c8d319 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -408,6 +408,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_CLEARTYPE_3x1, &bounds); if (FAILED(hr)) { WARN("GetAlphaTextureBounds() failed, 0x%08x\n", hr); + IDWriteGlyphRunAnalysis_Release(analysis); return hr; } texturetype = DWRITE_TEXTURE_CLEARTYPE_3x1;

1 0

Jacek Caban : ws2def.h: Fixed ADDRINFOEX declaration.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 22fca3a11041e136f4cc7867426179635db5d295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22fca3a11041e136f4cc78674… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 17:55:51 2015 +0100 ws2def.h: Fixed ADDRINFOEX declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2def.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/ws2def.h b/include/ws2def.h index 5ea8ff3..cbd6f74 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -115,11 +115,11 @@ typedef struct addrinfoexA { int ai_family; int ai_socktype; int ai_protocol; - size_t ai_addrlen; + SIZE_T ai_addrlen; char *ai_canonname; - struct sockaddr *ai_addr; + struct WS(sockaddr) *ai_addr; void *ai_blob; - size_t ai_bloblen; + SIZE_T ai_bloblen; GUID *ai_provider; struct addrinfoexA *ai_next; } ADDRINFOEXA, *PADDRINFOEXA, *LPADDRINFOEXA; @@ -129,11 +129,11 @@ typedef struct addrinfoexW { int ai_family; int ai_socktype; int ai_protocol; - size_t ai_addrlen; + SIZE_T ai_addrlen; WCHAR *ai_canonname; - struct sockaddr *ai_addr; + struct WS(sockaddr) *ai_addr; void *ai_blob; - size_t ai_bloblen; + SIZE_T ai_bloblen; GUID *ai_provider; struct addrinfoexW *ai_next; } ADDRINFOEXW, *PADDRINFOEXW, *LPADDRINFOEXW;

1 0

Jacek Caban : ws2_32: Added GetAddrInfoExW stub.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 9d452e2ccdebd8dfd579eeeb2603879315e60ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d452e2ccdebd8dfd579eeeb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 16:51:51 2015 +0100 ws2_32: Added GetAddrInfoExW stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 ++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1cad112..9e8510d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6542,6 +6542,18 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) } /*********************************************************************** + * GetAddrInfoExW (WS2_32.@) + */ +int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namespace, GUID *namespace_id, + const ADDRINFOEXW *hints, ADDRINFOEXW **result, struct timeval *timeout, OVERLAPPED *overlapped, + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle) +{ + FIXME("(%s %s %x %s %p %p %p %p %p %p)\n", debugstr_w(name), debugstr_w(servname), namespace, + debugstr_guid(namespace_id), hints, result, timeout, overlapped, completion_routine, handle); + return WSAHOST_NOT_FOUND; +} + +/*********************************************************************** * GetAddrInfoW (WS2_32.@) */ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 1b096b5..6de888f 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -51,6 +51,7 @@ 500 stub WEP @ stdcall FreeAddrInfoW(ptr) +@ stdcall GetAddrInfoExW(wstr wstr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall GetNameInfoW(ptr long ptr long ptr long long) @ stdcall InetPtonW(long wstr ptr)

1 0

Sebastian Lackner : gdiplus: Use helper function for remaining HeapFree calls.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: ffa467691df932f0a346c5fba943f32cf77baecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa467691df932f0a346c5fba… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 21 00:53:48 2015 +0200 gdiplus: Use helper function for remaining HeapFree calls. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 4 ++-- dlls/gdiplus/image.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index dffba1e..63eaed2 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1590,7 +1590,7 @@ void free_installed_fonts(void) { while (installedFontCollection.count) GdipDeleteFontFamily(installedFontCollection.FontFamilies[--installedFontCollection.count]); - HeapFree(GetProcessHeap(), 0, installedFontCollection.FontFamilies); + heap_free(installedFontCollection.FontFamilies); installedFontCollection.FontFamilies = NULL; installedFontCollection.allocated = 0; } @@ -1618,7 +1618,7 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, return 0; memcpy(new_family_list, fonts->FontFamilies, fonts->count*sizeof(void*)); - HeapFree(GetProcessHeap(), 0, fonts->FontFamilies); + heap_free(fonts->FontFamilies); fonts->FontFamilies = new_family_list; fonts->allocated = new_alloc_count; } diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f475f9b..53ace05 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1716,7 +1716,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) dst_row += lockeddata.Stride; } - HeapFree(GetProcessHeap(), 0, bits); + heap_free(bits); } else { @@ -2884,7 +2884,7 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, memcpy(item_value, item->value, item_size); item_value += item_size; - HeapFree(GetProcessHeap(), 0, item); + heap_free(item); } PropVariantClear(&id);

1 0

Sebastian Lackner : gdiplus: Use helper function for HeapReAlloc calls.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 1250af4986c6d9ebb6a26726db09f2ffe818d209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1250af4986c6d9ebb6a26726d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 21 00:53:31 2015 +0200 gdiplus: Use helper function for HeapReAlloc calls. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.c | 6 ++---- dlls/gdiplus/gdiplus_private.h | 6 ++++++ dlls/gdiplus/stringformat.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 32f20d8..1281455 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -420,12 +420,10 @@ BOOL lengthen_path(GpPath *path, INT len) while(path->datalen - path->pathdata.Count < len) path->datalen *= 2; - path->pathdata.Points = HeapReAlloc(GetProcessHeap(), 0, - path->pathdata.Points, path->datalen * sizeof(PointF)); + path->pathdata.Points = heap_realloc(path->pathdata.Points, path->datalen * sizeof(PointF)); if(!path->pathdata.Points) return FALSE; - path->pathdata.Types = HeapReAlloc(GetProcessHeap(), 0, - path->pathdata.Types, path->datalen); + path->pathdata.Types = heap_realloc(path->pathdata.Types, path->datalen); if(!path->pathdata.Types) return FALSE; } diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d0faac2..1af0bd0 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -60,6 +60,12 @@ static inline void *heap_alloc_zero(size_t len) return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } +static void *heap_realloc(void *mem, size_t len) __WINE_ALLOC_SIZE(2); +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 8791ceb..b89458b 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -291,7 +291,7 @@ GpStatus WINGDIPAPI GdipSetStringFormatTabStops(GpStringFormat *format, REAL fir /* reallocation */ if((format->tabcount < count) && (format->tabcount > 0)){ REAL *ptr; - ptr = HeapReAlloc(GetProcessHeap(), 0, format->tabs, sizeof(REAL)*count); + ptr = heap_realloc(format->tabs, sizeof(REAL)*count); if(!ptr) return OutOfMemory; format->tabs = ptr;

1 0

Sebastian Lackner : gdiplus: Use helper function for HeapAlloc calls.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: ff1b209be898d665ce03053bcb5b7208195f3503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff1b209be898d665ce03053bc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 21 00:53:12 2015 +0200 gdiplus: Use helper function for HeapAlloc calls. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 2 +- dlls/gdiplus/gdiplus_private.h | 6 ++++++ dlls/gdiplus/image.c | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index cd9041e..dffba1e 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1612,7 +1612,7 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, if (fonts->allocated == fonts->count) { INT new_alloc_count = fonts->allocated+50; - GpFontFamily** new_family_list = HeapAlloc(GetProcessHeap(), 0, new_alloc_count*sizeof(void*)); + GpFontFamily** new_family_list = heap_alloc(new_alloc_count*sizeof(void*)); if (!new_family_list) return 0; diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 4b7e4c8..d0faac2 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -48,6 +48,12 @@ #define GIF_DISPOSE_RESTORE_TO_BKGND 2 #define GIF_DISPOSE_RESTORE_TO_PREV 3 +static void *heap_alloc(size_t len) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + static void *heap_alloc_zero(size_t len) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc_zero(size_t len) { diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1cef100..f475f9b 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -92,7 +92,7 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT UINT count; IWICPalette_GetColorCount(wic_palette, &count); - palette = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(UINT) + count * sizeof(ARGB)); + palette = heap_alloc(2 * sizeof(UINT) + count * sizeof(ARGB)); IWICPalette_GetColors(wic_palette, count, palette->Entries, &palette->Count); IWICPalette_GetType(wic_palette, &type); @@ -1692,7 +1692,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) { if (iinfo.hbmMask) { - BYTE *bits = HeapAlloc(GetProcessHeap(), 0, height * stride); + BYTE *bits = heap_alloc(height * stride); /* read alpha data from the mask */ if (iinfo.hbmColor) @@ -2874,7 +2874,7 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, item_size = propvariant_size(&value); if (item_size) { - item = HeapAlloc(GetProcessHeap(), 0, item_size + sizeof(*item)); + item = heap_alloc(item_size + sizeof(*item)); propvariant_to_item(&value, item, item_size + sizeof(*item), id.u.uiVal); buf[i].id = item->id;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
75
Older →

Jump to page:

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-commits October 2015