October 2015 - Wine-Commits

Matteo Bruni : msctf: Add ITfUIElementMgr stub.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

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

Sebastian Lackner : server: Remove unused device manager argument from set_irp_result call.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 408b7ea6b3607217152a0af34ea9d700d8573c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=408b7ea6b3607217152a0af34… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 28 23:18:49 2015 +0100 server: Remove unused device manager argument from set_irp_result call. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 -- include/wine/server_protocol.h | 6 ++---- server/device.c | 6 ------ server/protocol.def | 3 +-- server/request.h | 9 ++++----- server/trace.c | 5 ++--- 6 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 96af772..31f0b15 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1271,13 +1271,11 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) handle = (HANDLE)irp->UserIosb; if (handle) { - HANDLE manager = get_device_manager(); void *out_buff = irp->UserBuffer; FILE_OBJECT *file = irp->Tail.Overlay.OriginalFileObject; SERVER_START_REQ( set_irp_result ) { - req->manager = wine_server_obj_handle( manager ); req->handle = wine_server_obj_handle( handle ); req->status = irp->IoStatus.u.Status; req->file_ptr = wine_server_client_ptr( file ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 2ba71e8..105273d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3228,13 +3228,11 @@ struct ioctl_reply struct set_irp_result_request { struct request_header __header; - obj_handle_t manager; obj_handle_t handle; unsigned int status; - client_ptr_t file_ptr; data_size_t size; + client_ptr_t file_ptr; /* VARARG(data,bytes); */ - char __pad_36[4]; }; struct set_irp_result_reply { @@ -6149,6 +6147,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 487 +#define SERVER_PROTOCOL_VERSION 488 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 9ef587c..fb91c02 100644 --- a/server/device.c +++ b/server/device.c @@ -807,11 +807,6 @@ DECL_HANDLER(get_next_device_request) DECL_HANDLER(set_irp_result) { struct irp_call *irp; - struct device_manager *manager; - - if (!(manager = (struct device_manager *)get_handle_obj( current->process, req->manager, - 0, &device_manager_ops ))) - return; if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops ))) { @@ -820,7 +815,6 @@ DECL_HANDLER(set_irp_result) close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ release_object( irp ); } - release_object( manager ); } diff --git a/server/protocol.def b/server/protocol.def index c313006..5b45078 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2345,11 +2345,10 @@ enum message_type /* Store results of an async irp */ @REQ(set_irp_result) - obj_handle_t manager; /* handle to the device manager */ obj_handle_t handle; /* handle to the irp */ unsigned int status; /* status of the irp */ - client_ptr_t file_ptr; /* opaque pointer to the file object */ data_size_t size; /* result size (input or output depending on the operation) */ + client_ptr_t file_ptr; /* opaque pointer to the file object */ VARARG(data,bytes); /* output data of the irp */ @END diff --git a/server/request.h b/server/request.h index 9405179..fefabaa 100644 --- a/server/request.h +++ b/server/request.h @@ -1563,12 +1563,11 @@ C_ASSERT( sizeof(struct ioctl_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct ioctl_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct ioctl_reply, options) == 12 ); C_ASSERT( sizeof(struct ioctl_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, manager) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, handle) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, status) == 20 ); +C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, status) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, size) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, file_ptr) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, size) == 32 ); -C_ASSERT( sizeof(struct set_irp_result_request) == 40 ); +C_ASSERT( sizeof(struct set_irp_result_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_irp_result_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_irp_result_request, user_arg) == 16 ); C_ASSERT( sizeof(struct get_irp_result_request) == 24 ); diff --git a/server/trace.c b/server/trace.c index 07aee80..62867c2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2834,11 +2834,10 @@ static void dump_ioctl_reply( const struct ioctl_reply *req ) static void dump_set_irp_result_request( const struct set_irp_result_request *req ) { - fprintf( stderr, " manager=%04x", req->manager ); - fprintf( stderr, ", handle=%04x", req->handle ); + fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", status=%08x", req->status ); - dump_uint64( ", file_ptr=", &req->file_ptr ); fprintf( stderr, ", size=%u", req->size ); + dump_uint64( ", file_ptr=", &req->file_ptr ); dump_varargs_bytes( ", data=", cur_size ); }

1 0

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

Oct. 29, 2015

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 : server: Unconditionally close APC handle in get_apc_result call.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 23cdc7e529c616e6a26adbd8875e36ad992ea683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23cdc7e529c616e6a26adbd88… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 29 02:34:02 2015 +0100 server: Unconditionally close APC handle in get_apc_result call. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 1 - server/thread.c | 13 ++++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index f6457db..356d631 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -677,7 +677,6 @@ unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, a SERVER_END_REQ; if (!ret && result->type == APC_NONE) continue; /* APC didn't run, try again */ - if (ret) NtClose( handle ); } return ret; } diff --git a/server/thread.c b/server/thread.c index 6383000..d65ea89 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1602,13 +1602,12 @@ DECL_HANDLER(get_apc_result) if (!(apc = (struct thread_apc *)get_handle_obj( current->process, req->handle, 0, &thread_apc_ops ))) return; - if (!apc->executed) set_error( STATUS_PENDING ); - else - { - reply->result = apc->result; - /* close the handle directly to avoid an extra round-trip */ - close_handle( current->process, req->handle ); - } + + if (apc->executed) reply->result = apc->result; + else set_error( STATUS_PENDING ); + + /* close the handle directly to avoid an extra round-trip */ + close_handle( current->process, req->handle ); release_object( apc ); }

1 0

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

Oct. 29, 2015

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

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

Oct. 29, 2015

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

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

Oct. 29, 2015

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

Ken Thomases : winemac: Add another workaround for bad side effects of CGWarpMouseCursorPosition( ).
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 9d6a14305a42b1595344429ac04d5122bc1cab5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6a14305a42b1595344429ac… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 28 17:01:54 2015 -0500 winemac: Add another workaround for bad side effects of CGWarpMouseCursorPosition(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 8e1f318..7f6ca23 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1307,20 +1307,27 @@ int macdrv_err_on; } else { + // Annoyingly, CGWarpMouseCursorPosition() effectively disassociates + // the mouse from the cursor position for 0.25 seconds. This means + // that mouse movement during that interval doesn't move the cursor + // and events carry a constant location (the warped-to position) + // even though they have delta values. For apps which warp the + // cursor frequently (like after every mouse move), this makes + // cursor movement horribly laggy and jerky, as only a fraction of + // mouse move events have any effect. + // + // On some versions of OS X, it's sufficient to forcibly reassociate + // the mouse and cursor position. On others, it's necessary to set + // the local events suppression interval to 0 for the warp. That's + // deprecated, but I'm not aware of any other way. For good + // measure, we do both. + CGSetLocalEventsSuppressionInterval(0); ret = (CGWarpMouseCursorPosition(pos) == kCGErrorSuccess); + CGSetLocalEventsSuppressionInterval(0.25); if (ret) { lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; - // Annoyingly, CGWarpMouseCursorPosition() effectively disassociates - // the mouse from the cursor position for 0.25 seconds. This means - // that mouse movement during that interval doesn't move the cursor - // and events carry a constant location (the warped-to position) - // even though they have delta values. This screws us up because - // the accumulated deltas we send to Wine don't match any eventual - // absolute position we send (like with a button press). We can - // work around this by simply forcibly reassociating the mouse and - // cursor position. CGAssociateMouseAndMouseCursorPosition(true); } }

1 0

Sebastian Lackner : server: Remove a wrong release_object in write_console_input.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 51d17bfd2f47ff65cd48a02d5bfc476a96c1f23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d17bfd2f47ff65cd48a02d5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 29 01:32:25 2015 +0100 server: Remove a wrong release_object in write_console_input. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 1 - 1 file changed, 1 deletion(-) diff --git a/server/console.c b/server/console.c index 10b1350..78e91d6 100644 --- a/server/console.c +++ b/server/console.c @@ -632,7 +632,6 @@ static int write_console_input( struct console_input* console, int count, (console->recnum + count) * sizeof(INPUT_RECORD) ))) { set_error( STATUS_NO_MEMORY ); - release_object( console ); return -1; } console->records = new_rec;

1 0

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

Oct. 29, 2015

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