wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

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

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

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

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

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

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

Michael Stefaniuc : localspl: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: b5f4647f90a5cf6ce3dde73a358e9c71eee2faef URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5f4647f90a5cf6ce3dde73a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jan 25 20:55:42 2018 +0100 localspl: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/localmon.c | 1 + dlls/localspl/localspl_private.h | 23 ----------------------- dlls/localspl/provider.c | 3 ++- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 4ee3efb..4be1ad6 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -33,6 +33,7 @@ #include "localspl_private.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 8c49623..f27005c 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -51,27 +51,4 @@ void setup_provider(void) DECLSPEC_HIDDEN; #define PORT_IS_LPR 8 -/* ## Memory allocation functions ## */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero( void * mem, size_t len ) -{ - return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - - #endif /* __WINE_LOCALSPL_PRIVATE__ */ diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4f6bac3..3538947 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -31,8 +31,9 @@ #include "ddk/winddiui.h" #include "ddk/winsplp.h" -#include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/list.h" #include "wine/unicode.h" #include "localspl_private.h"

1 0

Michael Stefaniuc : dwrite: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: b01b1383d9bdf93325100335d3f78b91e19b262f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b01b1383d9bdf93325100335… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jan 25 20:55:41 2018 +0100 dwrite: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 457d863..31b977a 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -20,6 +20,7 @@ #include "d2d1.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -30,31 +31,6 @@ static const DWRITE_MATRIX identity = 0.0f, 0.0f }; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(const WCHAR *str) { LPWSTR ret = NULL;

1 0

Michael Stefaniuc : browseui: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: b48aef8a9ead21dd31ba7cf16d665281b890947b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b48aef8a9ead21dd31ba7cf1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jan 29 22:50:42 2018 +0100 browseui: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/aclmulti.c | 1 + dlls/browseui/aclsource.c | 1 + dlls/browseui/browseui.h | 21 --------------------- dlls/browseui/browseui_main.c | 1 + dlls/browseui/compcatcachedaemon.c | 1 + dlls/browseui/progressdlg.c | 1 + 6 files changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 3a6525f..412a18d 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 71e9d39..0ade9cc 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index 27691a1..73780f1 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -31,25 +31,4 @@ extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut) extern const GUID CLSID_CompCatCacheDaemon; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - if (!mem) return heap_alloc(size); - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* __WINE_BROWSEUI_H */ diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 1b3cecc..2e31b37 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -34,6 +34,7 @@ #include "shlguid.h" #include "rpcproxy.h" +#include "wine/heap.h" #include "browseui.h" #include "initguid.h" diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index a5c97e9..1f62441 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 24183bd..09c1996 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h"

1 0

Michael Stefaniuc : atl: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 30d41b2289b681798c172af867163869391b603c URL: https://source.winehq.org/git/wine.git/?a=commit;h=30d41b2289b681798c172af8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jan 29 22:50:41 2018 +0100 atl: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 0e48a39..e753429 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -23,6 +23,7 @@ #include "atlcom.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(atl); @@ -33,16 +34,6 @@ HINSTANCE atl_instance; typedef unsigned char cpp_bool; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static ICatRegister *catreg; /***********************************************************************

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
64
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 January 2018