January 2018 - Wine-commits

Nikolay Sivov : dbghelp: Make sure returned module info strings are null-terminated.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: da1d075b83cf115c633d17ed5fec5007cbb5f5ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=da1d075b83cf115c633d17ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 16:46:29 2018 +0300 dbghelp: Make sure returned module info strings are null-terminated. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 765a723..9256a8f 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -919,6 +919,12 @@ BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, return sz != 0 && i == sz; } +static void dbghelp_str_WtoA(const WCHAR *src, char *dst, int dst_len) +{ + WideCharToMultiByte(CP_ACP, 0, src, -1, dst, dst_len - 1, NULL, NULL); + dst[dst_len - 1] = 0; +} + /****************************************************************** * SymGetModuleInfo (DBGHELP.@) * @@ -941,12 +947,9 @@ BOOL WINAPI SymGetModuleInfo(HANDLE hProcess, DWORD dwAddr, mi.CheckSum = miw64.CheckSum; mi.NumSyms = miw64.NumSyms; mi.SymType = miw64.SymType; - WideCharToMultiByte(CP_ACP, 0, miw64.ModuleName, -1, - mi.ModuleName, sizeof(mi.ModuleName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, miw64.ImageName, -1, - mi.ImageName, sizeof(mi.ImageName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, miw64.LoadedImageName, -1, - mi.LoadedImageName, sizeof(mi.LoadedImageName), NULL, NULL); + dbghelp_str_WtoA(miw64.ModuleName, mi.ModuleName, sizeof(mi.ModuleName)); + dbghelp_str_WtoA(miw64.ImageName, mi.ImageName, sizeof(mi.ImageName)); + dbghelp_str_WtoA(miw64.LoadedImageName, mi.LoadedImageName, sizeof(mi.LoadedImageName)); memcpy(ModuleInfo, &mi, ModuleInfo->SizeOfStruct); @@ -1010,18 +1013,13 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr, mi64.CheckSum = miw64.CheckSum; mi64.NumSyms = miw64.NumSyms; mi64.SymType = miw64.SymType; - WideCharToMultiByte(CP_ACP, 0, miw64.ModuleName, -1, - mi64.ModuleName, sizeof(mi64.ModuleName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, miw64.ImageName, -1, - mi64.ImageName, sizeof(mi64.ImageName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, miw64.LoadedImageName, -1, - mi64.LoadedImageName, sizeof(mi64.LoadedImageName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, miw64.LoadedPdbName, -1, - mi64.LoadedPdbName, sizeof(mi64.LoadedPdbName), NULL, NULL); + dbghelp_str_WtoA(miw64.ModuleName, mi64.ModuleName, sizeof(mi64.ModuleName)); + dbghelp_str_WtoA(miw64.ImageName, mi64.ImageName, sizeof(mi64.ImageName)); + dbghelp_str_WtoA(miw64.LoadedImageName, mi64.LoadedImageName, sizeof(mi64.LoadedImageName)); + dbghelp_str_WtoA(miw64.LoadedPdbName, mi64.LoadedPdbName, sizeof(mi64.LoadedPdbName)); mi64.CVSig = miw64.CVSig; - WideCharToMultiByte(CP_ACP, 0, miw64.CVData, -1, - mi64.CVData, sizeof(mi64.CVData), NULL, NULL); + dbghelp_str_WtoA(miw64.CVData, mi64.CVData, sizeof(mi64.CVData)); mi64.PdbSig = miw64.PdbSig; mi64.PdbSig70 = miw64.PdbSig70; mi64.PdbAge = miw64.PdbAge;

1 0

Nikolay Sivov : dbghelp: Use correct destination buffer length when initializing module data.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 1d3c14d2d1ae9361bb3f1645c1ae19d9683d5e61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d3c14d2d1ae9361bb3f1645… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 16:46:30 2018 +0300 dbghelp: Use correct destination buffer length when initializing module data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 9256a8f..6c7f2dc 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -100,7 +100,8 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) void module_set_module(struct module* module, const WCHAR* name) { - module_fill_module(name, module->module.ModuleName, sizeof(module->module.ModuleName)); + module_fill_module(name, module->module.ModuleName, + sizeof(module->module.ModuleName) / sizeof(module->module.ModuleName[0])); } const WCHAR *get_wine_loader_name(void) @@ -910,7 +911,7 @@ BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, if (!GetModuleInformation(hProcess, hMods[i], &mi, sizeof(mi)) || !GetModuleBaseNameW(hProcess, hMods[i], baseW, sizeof(baseW) / sizeof(WCHAR))) continue; - module_fill_module(baseW, modW, sizeof(modW) / sizeof(CHAR)); + module_fill_module(baseW, modW, sizeof(modW) / sizeof(modW[0])); EnumLoadedModulesCallback(modW, (DWORD_PTR)mi.lpBaseOfDll, mi.SizeOfImage, UserContext); }

1 0

Nikolay Sivov : winedbg: Remove some unnecessary pointer casts.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 840ebb98330ef5502d2727e83ef8c46df4e662f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=840ebb98330ef5502d2727e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 16:57:03 2018 +0300 winedbg: Remove some unnecessary pointer casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 2 +- programs/winedbg/winedbg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index e521252..89a2dc4 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -218,7 +218,7 @@ void info_win32_module(DWORD64 base) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, (void*)&im); + SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); SymSetOptions(opt); qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 11782fe..e0ad4d8 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -425,7 +425,7 @@ BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(hProcess, mod_loader_cb, (void*)&mli); + SymEnumerateModules64(hProcess, mod_loader_cb, &mli); SymSetOptions(opt); return imh_mod->BaseOfImage != 0;

1 0

Alistair Leslie-Hughes : dpnet: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 2f3594c1dca68755a0e326b12ed629008c74286d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f3594c1dca68755a0e326b1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 29 23:12:30 2018 +0000 dpnet: Use the global HeapAlloc() wrappers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/dpnet_private.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 44ff289d..2e72360 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -25,6 +25,7 @@ # error You must include config.h to use this header #endif +#include "wine/heap.h" #include <wine/list.h> #include "winsock2.h" #include "wine/unicode.h" @@ -154,21 +155,6 @@ typedef struct { #define FE(x) { x, #x } #define GE(x) { &x, #x } -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void __WINE_ALLOC_SIZE(2) *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 ); -} - static inline WCHAR *heap_strdupW( const WCHAR *src ) { WCHAR *dst;

1 0

Alistair Leslie-Hughes : advapi32: Support WinLogonIdsSid in IsWellKnownSid.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 2b01220230b102ba665ce6a5359a3de0fb5a8361 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b01220230b102ba665ce6a5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 29 23:43:44 2018 +0000 advapi32: Support WinLogonIdsSid in IsWellKnownSid. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index f0c133e..6f4fb44 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -94,6 +94,7 @@ static const WELLKNOWNSID WellKnownSids[] = { {'R','C'}, WinRestrictedCodeSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_RESTRICTED_CODE_RID } } }, { {0,0}, WinTerminalServerSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_TERMINAL_SERVER_RID } } }, { {0,0}, WinRemoteLogonIdSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_REMOTE_LOGON_RID } } }, + { {0,0}, WinLogonIdsSid, { SID_REVISION, SECURITY_LOGON_IDS_RID_COUNT, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID } } }, { {'S','Y'}, WinLocalSystemSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } } }, { {'L','S'}, WinLocalServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SERVICE_RID } } }, { {'N','S'}, WinNetworkServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_NETWORK_SERVICE_RID } } },

1 0

Nikolay Sivov : comctl32/tests: Enable IP address control tests on version 6.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 902b004d55f68e0a7fd40a6e2efee181ab786f53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=902b004d55f68e0a7fd40a6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 10:00:45 2018 +0300 comctl32/tests: Enable IP address control tests on version 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/ipaddress.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 6d8e9cc..5258189 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -22,6 +22,7 @@ #include <commctrl.h> #include "wine/test.h" +#include "v6util.h" #define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got) @@ -63,5 +64,15 @@ static void test_get_set_text(void) START_TEST(ipaddress) { + ULONG_PTR cookie; + HANDLE ctxt; + + test_get_set_text(); + + if (!load_v6_module(&cookie, &ctxt)) + return; + test_get_set_text(); + + unload_v6_module(cookie, ctxt); }

1 0

Nikolay Sivov : comctl32/tests: Enable Trackbar tests on version 6.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: abab0a7b96011f569f7b93755abde890a83b447d URL: https://source.winehq.org/git/wine.git/?a=commit;h=abab0a7b96011f569f7b9375… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 10:00:46 2018 +0300 comctl32/tests: Enable Trackbar tests on version 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 31845d1..7b601b8 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -23,6 +23,7 @@ #include "wine/test.h" #include "msg.h" +#include "v6util.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #define NUM_MSG_SEQUENCE 2 @@ -1296,6 +1297,9 @@ static void test_create(void) START_TEST(trackbar) { + ULONG_PTR cookie; + HANDLE ctxt; + LoadLibraryA("comctl32.dll"); init_msg_sequences(sequences, NUM_MSG_SEQUENCE); @@ -1325,5 +1329,25 @@ START_TEST(trackbar) test_ignore_selection(); test_initial_state(); + if (!load_v6_module(&cookie, &ctxt)) + return; + + test_trackbar_buddy(); + test_line_size(); + test_page_size(); + test_position(); + test_range(); + test_selection(); + test_thumb_length(); + test_tic_settings(); + test_tic_placement(); + test_tool_tips(); + test_unicode(); + test_TBS_AUTOTICKS(); + test_ignore_selection(); + test_initial_state(); + + unload_v6_module(cookie, ctxt); + DestroyWindow(hWndParent); }

1 0

Dmitry Timoshkov : kerberos: Add support for KerbQueryTicketCacheMessage.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 0e9922bd3e02f6673371a39664dd4c3597d60053 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e9922bd3e02f6673371a396… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 29 11:10:06 2018 +0800 kerberos: Add support for KerbQueryTicketCacheMessage. Based on the code written by George Popoff. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 417 +++++++++++++++++++++++++++++++++++++++++++++++- include/ntsecapi.h | 105 ++++++++++++ 2 files changed, 519 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e9922bd3e02f6673371…

1 0

Michael Müller : include: Add activation.idl with IActivationFactory interface.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 40a1dcd591b971ed3fb11b00e65050f59fe76f98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a1dcd591b971ed3fb11b00… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Jan 30 11:41:03 2018 +0300 include: Add activation.idl with IActivationFactory interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/activation.idl | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index b975dd5..fdf736e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,5 +1,6 @@ IDL_SRCS = \ access.idl \ + activation.idl \ activaut.idl \ activdbg.idl \ activscp.idl \ diff --git a/include/activation.idl b/include/activation.idl new file mode 100644 index 0000000..b86c9f6 --- /dev/null +++ b/include/activation.idl @@ -0,0 +1,31 @@ +/* + * Copyright 2016 Michael Müller + * + * 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 + */ + +#ifndef DO_NO_IMPORTS +import "inspectable.idl"; +#endif + +[ + object, + uuid(00000035-0000-0000-c000-000000000046), + pointer_default(unique) +] +interface IActivationFactory : IInspectable +{ + HRESULT ActivateInstance([out] IInspectable **instance); +}

1 0

Michael Müller : include/objidl.idl: Add IApartmentShutdown interface.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 7950d6e8cc9101010cc948551a932837539eccad URL: https://source.winehq.org/git/wine.git/?a=commit;h=7950d6e8cc9101010cc94855… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Jan 30 11:41:04 2018 +0300 include/objidl.idl: Add IApartmentShutdown interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/objidl.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/objidl.idl b/include/objidl.idl index 168e533..a0ad1f6 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -2460,6 +2460,17 @@ interface IDummyHICONIncluder : IUnknown HRESULT Dummy([in] HICON hIcon, [in] HDC hdc); } +[ + object, + local, + pointer_default(unique), + uuid(a2f05a09-27a2-42b5-bc0e-ac163ef49d9b) +] +interface IApartmentShutdown : IUnknown +{ + void OnUninitialize([in] UINT64 identifier); +} + cpp_quote("#ifdef USE_COM_CONTEXT_DEF") typedef DWORD CPFLAGS;

1 0