May 2018 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : mstask: Export the AT Service RPC API.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 31fa7454582a16faa9bf78263fea712ea8dbd397 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31fa7454582a16faa9bf7826… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 8 17:40:43 2018 +0800 mstask: Export the AT Service RPC API. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/Makefile.in | 3 ++- dlls/mstask/atsvc.idl | 21 +++++++++++++++++++++ dlls/mstask/mstask.spec | 16 ++++++++-------- dlls/mstask/mstask_main.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 9 deletions(-) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index d914666..086d3c0 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -1,5 +1,5 @@ MODULE = mstask.dll -IMPORTS = ole32 oleaut32 +IMPORTS = rpcrt4 ole32 oleaut32 C_SRCS = \ factory.c \ @@ -9,4 +9,5 @@ C_SRCS = \ task_trigger.c IDL_SRCS = \ + atsvc.idl \ mstask_local.idl diff --git a/dlls/mstask/atsvc.idl b/dlls/mstask/atsvc.idl new file mode 100644 index 0000000..b5a2cee --- /dev/null +++ b/dlls/mstask/atsvc.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2018 Dmitry Timoshkov + * + * 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 + */ + +#pragma makedep client + +#include "wine/atsvc.idl" diff --git a/dlls/mstask/mstask.spec b/dlls/mstask/mstask.spec index 0b6c23b..dcfb20c 100644 --- a/dlls/mstask/mstask.spec +++ b/dlls/mstask/mstask.spec @@ -2,10 +2,10 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub GetNetScheduleAccountInformation -@ stub NetrJobAdd -@ stub NetrJobDel -@ stub NetrJobEnum -@ stub NetrJobGetInfo +@ stdcall NetrJobAdd(wstr ptr ptr) +@ stdcall NetrJobDel(wstr long long) +@ stdcall NetrJobEnum(wstr ptr long ptr ptr) +@ stdcall NetrJobGetInfo(wstr long ptr) @ stub SAGetAccountInformation @ stub SAGetNSAccountInformation @ stub SASetAccountInformation @@ -15,10 +15,10 @@ @ stub _DllCanUnloadNow(a)0 @ stub _DllGetClassObject(a)12 @ stub _GetNetScheduleAccountInformation(a)12 -@ stub _NetrJobAdd(a)12 -@ stub _NetrJobDel(a)12 -@ stub _NetrJobEnum(a)20 -@ stub _NetrJobGetInfo(a)12 +@ stdcall _NetrJobAdd(a)12(wstr ptr ptr) NetrJobAdd +@ stdcall _NetrJobDel(a)12(wstr long long) NetrJobDel +@ stdcall _NetrJobEnum(a)20(wstr ptr long ptr ptr) NetrJobEnum +@ stdcall _NetrJobGetInfo(a)12(wstr long ptr) NetrJobGetInfo @ stub _SAGetAccountInformation(a)16 @ stub _SAGetNSAccountInformation(a)12 @ stub _SASetAccountInformation(a)20 diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index eae8556..c1e903681 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -27,6 +27,7 @@ #include "taskschd.h" #include "mstask.h" #include "mstask_private.h" +#include "atsvc.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mstask); @@ -77,3 +78,32 @@ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( hInst ); } + +DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) +{ + return HeapAlloc(GetProcessHeap(), 0, n); +} + +DECLSPEC_HIDDEN void __RPC_USER MIDL_user_free(void __RPC_FAR *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} + +DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) +{ + static unsigned char ncalrpc[] = "ncalrpc"; + unsigned char *binding_str; + handle_t rpc_handle = 0; + + if (RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str) == RPC_S_OK) + { + RpcBindingFromStringBindingA(binding_str, &rpc_handle); + RpcStringFreeA(&binding_str); + } + return rpc_handle; +} + +DECLSPEC_HIDDEN void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle) +{ + RpcBindingFree(&rpc_handle); +}

1 0

Dmitry Timoshkov : schedsvc: Explicitly terminate the received name in the notification buffer.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 7d9670301642a4c5ca5228a6ddefa1c99c054146 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d9670301642a4c5ca5228a6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 8 17:40:41 2018 +0800 schedsvc: Explicitly terminate the received name in the notification buffer. And print a FIXME if we've got multiple entries. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/svc_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index ba8de04..937d1c2 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -82,12 +82,17 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) NULL, &ov, NULL); if (!ret) break; + if (info.data.NextEntryOffset) + FIXME("got multiple entries\n"); + events[0] = done_event; events[1] = ov.hEvent; ret = WaitForMultipleObjects(2, events, FALSE, INFINITE); if (ret == WAIT_OBJECT_0) break; + info.data.FileName[info.data.FileNameLength/sizeof(WCHAR)] = 0; + switch (info.data.Action) { case FILE_ACTION_ADDED:

1 0

Michael Müller : include: Add IApplicationActivationManager interface declaration.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 4913497457c16060ffff18a3e7f67fab7cb18643 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4913497457c16060ffff18a3… Author: Michael Müller <michael(a)fds-team.de> Date: Tue May 8 04:42:02 2018 +0000 include: Add IApplicationActivationManager interface declaration. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shobjidl.idl | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index e0fe01c..73278e4 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3713,6 +3713,35 @@ interface IItemNameLimits : IUnknown [out] int *max_length); } +typedef [v1_enum] enum ACTIVATEOPTIONS +{ + AO_NONE = 0x00000000, + AO_DESIGNMODE = 0x00000001, + AO_NOERRORUI = 0x00000002, + AO_NOSPLASHSCREEN = 0x00000004, + AO_PRELAUNCH = 0x02000000 +} ACTIVATEOPTIONS; + +[ + uuid(2e941141-7f97-4756-ba1d-9decde894a3d), + object, + pointer_default(unique) +] +interface IApplicationActivationManager : IUnknown +{ + HRESULT ActivateApplication([in] LPCWSTR appusermodelid, + [in, unique] LPCWSTR arguments, + [in] ACTIVATEOPTIONS options, + [out] DWORD *processid); + HRESULT ActivateForFile([in] LPCWSTR appusermodelid, + [in] IShellItemArray *itemarray, + [in, unique] LPCWSTR verb, + [out] DWORD *processid); + HRESULT ActivateForProtocol([in] LPCWSTR appusermodelid, + [in] IShellItemArray *itemarray, + [out] DWORD *processid); +} + /***************************************************************************** * ShellObjects typelibrary */ @@ -3817,4 +3846,12 @@ library ShellObjects { interface IQueryCancelAutoPlay; } + + [ + uuid(45ba127d-10a8-46ea-8ab7-56ea9078943c) + ] + coclass ApplicationActivationManager + { + interface IApplicationActivationManager; + } }

1 0

Michael Müller : shell32: Add general tab in file property dialog.
by Alexandre Julliard May 8, 2018

May 8, 2018

1 0

Michael Müller : ntdll: Add stub for RtlQueryPackageIdentity.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 7aec33ef5582f39440abf3a565f80b5ce05765d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aec33ef5582f39440abf3a5… Author: Michael Müller <michael(a)fds-team.de> Date: Tue May 8 04:42:01 2018 +0000 ntdll: Add stub for RtlQueryPackageIdentity. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c260b0d..38ffad3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -813,6 +813,7 @@ @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) @ stub RtlQueryInformationActiveActivationContext @ stub RtlQueryInterfaceMemoryStream +@ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) @ stub RtlQueryProcessBackTraceInformation @ stdcall RtlQueryProcessDebugInformation(long long ptr) @ stub RtlQueryProcessHeapInformation diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 09a9c92..8ade752 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1672,3 +1672,13 @@ RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void) FIXME("stub!\n"); return NULL; } + +/********************************************************************* + * RtlQueryPackageIdentity [NTDLL.@] + */ +NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *fullname_size, + WCHAR *appid, SIZE_T *appid_size, BOOLEAN *packaged) +{ + FIXME("(%p, %p, %p, %p, %p, %p): stub\n", token, fullname, fullname_size, appid, appid_size, packaged); + return STATUS_NOT_FOUND; +}

1 0

Alistair Leslie-Hughes : include: Move AllocateAndGet* functions to public header.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: b9e082fc07807b238b13332a71e6c83b23515339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9e082fc07807b238b13332a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 8 06:11:52 2018 +0000 include: Move AllocateAndGet* functions to public header. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 1 + dlls/iphlpapi/ipstats.h | 5 ----- include/iphlpapi.h | 5 +++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 327a601..863edd3 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -153,6 +153,7 @@ #define NONAMELESSUNION #include "ifenum.h" #include "ipstats.h" +#include "iphlpapi.h" #include "wine/debug.h" #include "wine/server.h" diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index bf5bb92..d742d63 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -32,11 +32,6 @@ */ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDEN; -DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; -DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; -DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; -DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; - DWORD build_tcp_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_udp_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; diff --git a/include/iphlpapi.h b/include/iphlpapi.h index ca8e48f..54d93d1 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -154,6 +154,11 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, PIP_ADAPTER_ADDRESSES aa, PULONG buflen); #endif +DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags); +DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags); +DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags); +DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags); + #ifdef __cplusplus } #endif

1 0

Dmitry Timoshkov : schedsvc: Reimplement FILE_ACTION_MODIFIED by remove_job()/add_job() sequence as MSDN suggests.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 9823191a771a32c8abeb85b211d4d5567b288254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9823191a771a32c8abeb85b2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 8 19:13:01 2018 +0800 schedsvc: Reimplement FILE_ACTION_MODIFIED by remove_job()/add_job() sequence as MSDN suggests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 21 --------------------- dlls/schedsvc/schedsvc_private.h | 1 - dlls/schedsvc/svc_main.c | 3 ++- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 53a18fd..cb9bc1f 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -546,27 +546,6 @@ void remove_job(const WCHAR *name) LeaveCriticalSection(&at_job_list_section); } -void modify_job(const WCHAR *name) -{ - AT_ENUM info; - - if (load_job(name, &info)) - { - struct job_t *job; - - EnterCriticalSection(&at_job_list_section); - job = find_job(0, name); - if (job) - { - free_job_info(&job->info); - job->info = info; - } - else - free_job_info(&info); - LeaveCriticalSection(&at_job_list_section); - } -} - DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) { WCHAR windir[MAX_PATH]; diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index c0aa188..215bba0 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -25,7 +25,6 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; void add_job(const WCHAR *name) DECLSPEC_HIDDEN; void remove_job(const WCHAR *name) DECLSPEC_HIDDEN; -void modify_job(const WCHAR *name) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 937d1c2..848e4fc 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -118,7 +118,8 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) GetWindowsDirectoryW(path, MAX_PATH); lstrcatW(path, tasksW); lstrcatW(path, info.data.FileName); - modify_job(path); + remove_job(info.data.FileName); + add_job(info.data.FileName); break; default:

1 0

Zhiyi Zhang : user32: Use common cleanup code in DrawTextExW().
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 18df0bc05ba4bf294e1b08d0d6e1acb88ffef8b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18df0bc05ba4bf294e1b08d0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 4 11:12:06 2018 +0800 user32: Use common cleanup code in DrawTextExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/text.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index e9c6c71..3ba4a12 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -886,6 +886,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, int prefix_offset; ellipsis_data ellip; BOOL invert_y=FALSE; + int ret = 0; TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); @@ -1002,11 +1003,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, const WCHAR *p; p = str; while (p < str+len && *p != TAB) p++; len_seg = p - str; - if (len_seg != len && !GetTextExtentPointW(hdc, str, len_seg, &size)) - { - heap_free(retstr); - return 0; - } + if (len_seg != len && !GetTextExtentPointW(hdc, str, len_seg, &size)) goto done; } else len_seg = len; @@ -1015,10 +1012,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) | ((flags & DT_RTLREADING) ? ETO_RTLREADING : 0), rect, str, len_seg, NULL )) - { - heap_free(retstr); - return 0; - } + goto done; if (prefix_offset != -1 && prefix_offset < len_seg) { TEXT_DrawUnderscore (hdc, xseg, y + tm.tmAscent + 1, str, prefix_offset, (flags & DT_NOCLIP) ? NULL : rect); @@ -1067,12 +1061,13 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (dtp) rect->right += lmargin + rmargin; } - if (retstr) - { - memcpy (str, retstr, size_retstr); - heap_free(retstr); - } - return y - rect->top; + + if (retstr) memcpy(str, retstr, size_retstr); + + ret = y - rect->top; +done: + heap_free(retstr); + return ret; } /***********************************************************************

1 0

Zhiyi Zhang : user32: Use the heap_*() functions in text.c where possible.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 661528a119ad7ce312ab898cfd275680eba4b97a URL: https://source.winehq.org/git/wine.git/?a=commit;h=661528a119ad7ce312ab898c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 4 11:11:43 2018 +0800 user32: Use the heap_*() functions in text.c where possible. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/text.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 0b5bd47..e9c6c71 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -41,6 +41,7 @@ #include "usp10.h" #include "user_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(text); @@ -365,7 +366,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, assert (format & DT_WORDBREAK); assert (chars_fit < *len_str); - sla = HeapAlloc(GetProcessHeap(), 0, sizeof(SCRIPT_LOGATTR) * *len_str); + sla = heap_alloc(sizeof(SCRIPT_LOGATTR) * *len_str); memset(&sa, 0, sizeof(SCRIPT_ANALYSIS)); sa.eScript = SCRIPT_UNDEFINED; @@ -445,7 +446,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, } /* Remeasure the string */ GetTextExtentExPointW (hdc, str, *len_str, 0, NULL, NULL, size); - HeapFree(GetProcessHeap(),0, sla); + heap_free(sla); } /********************************************************************* @@ -957,7 +958,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (flags & DT_MODIFYSTRING) { size_retstr = (count + 4) * sizeof (WCHAR); - retstr = HeapAlloc(GetProcessHeap(), 0, size_retstr); + retstr = heap_alloc(size_retstr); if (!retstr) return 0; memcpy (retstr, str, size_retstr); } @@ -1003,7 +1004,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, len_seg = p - str; if (len_seg != len && !GetTextExtentPointW(hdc, str, len_seg, &size)) { - HeapFree (GetProcessHeap(), 0, retstr); + heap_free(retstr); return 0; } } @@ -1015,7 +1016,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, ((flags & DT_RTLREADING) ? ETO_RTLREADING : 0), rect, str, len_seg, NULL )) { - HeapFree (GetProcessHeap(), 0, retstr); + heap_free(retstr); return 0; } if (prefix_offset != -1 && prefix_offset < len_seg) @@ -1069,7 +1070,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (retstr) { memcpy (str, retstr, size_retstr); - HeapFree (GetProcessHeap(), 0, retstr); + heap_free(retstr); } return y - rect->top; } @@ -1128,7 +1129,7 @@ INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count, wmax += 4; amax += 4; } - wstr = HeapAlloc(GetProcessHeap(), 0, wmax * sizeof(WCHAR)); + wstr = heap_alloc(wmax * sizeof(WCHAR)); if (wstr) { MultiByteToWideChar( cp, 0, str, count, wstr, wcount ); @@ -1147,7 +1148,7 @@ INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count, for (i=4, p=wstr+wcount; i-- && *p != 0xFFFE; p++) wcount++; WideCharToMultiByte( cp, 0, wstr, wcount, str, amax, NULL, NULL ); } - HeapFree(GetProcessHeap(), 0, wstr); + heap_free(wstr); } return ret; } @@ -1417,11 +1418,11 @@ LONG WINAPI TabbedTextOutA( HDC hdc, INT x, INT y, LPCSTR lpstr, INT count, { LONG ret; DWORD len = MultiByteToWideChar( CP_ACP, 0, lpstr, count, NULL, 0 ); - LPWSTR strW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + LPWSTR strW = heap_alloc( len * sizeof(WCHAR) ); if (!strW) return 0; MultiByteToWideChar( CP_ACP, 0, lpstr, count, strW, len ); ret = TabbedTextOutW( hdc, x, y, strW, len, cTabStops, lpTabPos, nTabOrg ); - HeapFree( GetProcessHeap(), 0, strW ); + heap_free( strW ); return ret; } @@ -1470,11 +1471,11 @@ DWORD WINAPI GetTabbedTextExtentA( HDC hdc, LPCSTR lpstr, INT count, { LONG ret; DWORD len = MultiByteToWideChar( CP_ACP, 0, lpstr, count, NULL, 0 ); - LPWSTR strW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + LPWSTR strW = heap_alloc( len * sizeof(WCHAR) ); if (!strW) return 0; MultiByteToWideChar( CP_ACP, 0, lpstr, count, strW, len ); ret = GetTabbedTextExtentW( hdc, strW, len, cTabStops, lpTabPos ); - HeapFree( GetProcessHeap(), 0, strW ); + heap_free( strW ); return ret; }

1 0

Nikolay Sivov : user32: Avoid touching last error on successful path of GetClassInfo().
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: c4fd1099dd34e6a26af64da5f0fd672dcad1ad59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4fd1099dd34e6a26af64da5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 8 10:54:40 2018 +0300 user32: Avoid touching last error on successful path of GetClassInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 5 ++++- dlls/user32/tests/class.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index d4e7951..ce2830f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -333,6 +333,7 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B ULONG module_offset; } *wndclass; const WCHAR *module, *ret; + UNICODE_STRING name_us; HMODULE hmod; if (basename_offset) @@ -345,7 +346,9 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B return name; data.cbSize = sizeof(data); - if (!FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, name, &data)) + RtlInitUnicodeString(&name_us, name); + if (RtlFindActivationContextSectionString(0, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, + &name_us, &data)) return name; wndclass = (struct wndclass_redirect_data *)data.lpData; diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index a9eee41..92b9ad9 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -998,6 +998,7 @@ if (0) { /* crashes under XP */ SetLastError(0xdeadbeef); ret = GetClassInfoExA(0, "static", &wcx); ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "Unexpected error code %d\n", GetLastError()); ok(wcx.cbSize == 0, "expected 0, got %u\n", wcx.cbSize); ok(wcx.lpfnWndProc != NULL, "got null proc\n");

1 0