- Wine-Commits - list.winehq.org

Vitaly Lipatov : include: Include ncrypt.h in wincrypt.h.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: aa4d0dd8188fc8541d36f8926f67d6b6360bdcf1 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa4d0dd8188fc8541d36f8926f67d6… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:17:38 2023 +0300 include: Include ncrypt.h in wincrypt.h. --- include/wincrypt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 81ae7d040da..0da94a31f73 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -26,7 +26,7 @@ extern "C" { #endif #include <bcrypt.h> -/* FIXME: #include <ncrypt.h> */ +#include <ncrypt.h> #ifndef WINADVAPI #ifdef _ADVAPI32_

1 0

Vitaly Lipatov : include: Add standalone LSA_OBJECT_ATTRIBUTES prototype if ntdef.h is not included.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: d173bc6a534c03fac60920b67d136d11cdee96e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/d173bc6a534c03fac60920b67d136d… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:23:13 2023 +0300 include: Add standalone LSA_OBJECT_ATTRIBUTES prototype if ntdef.h is not included. --- include/ntsecapi.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 849e72ef33e..d01c04c6867 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -188,7 +188,21 @@ typedef struct _SecHandle typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; typedef STRING LSA_STRING, *PLSA_STRING; + +#ifdef _NTDEF_ typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; +#else +typedef struct _LSA_OBJECT_ATTRIBUTES +{ + ULONG Length; + HANDLE RootDirectory; + PLSA_UNICODE_STRING ObjectName; + ULONG Attributes; + PVOID SecurityDescriptor; + PVOID SecurityQualityOfService; +} LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; +#endif + typedef PVOID LSA_HANDLE, *PLSA_HANDLE; typedef ULONG LSA_ENUMERATION_HANDLE, *PLSA_ENUMERATION_HANDLE;

1 0

Vitaly Lipatov : include: Add missing PCWCHAR to winnt.h.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: 7377b53681cd2a96fb087b9b7790ca74121704e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/7377b53681cd2a96fb087b9b7790ca… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:18:02 2023 +0300 include: Add missing PCWCHAR to winnt.h. --- include/winnt.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index c04f25b29bd..2e1aac0f477 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -536,7 +536,8 @@ typedef CHAR *PZZSTR; typedef const CHAR *PCZZSTR; /* Unicode string types */ -typedef const WCHAR *PCWCHAR, *LPCUWCHAR, *PCUWCHAR; +typedef const WCHAR *PCWCHAR, *LPCWCHAR; +typedef const WCHAR *PCUWCHAR, *LPCUWCHAR; typedef WCHAR *PWCH, *LPWCH; typedef const WCHAR *PCWCH, *LPCWCH; typedef WCHAR *PNZWCH, *PUNZWCH;

1 0

Vitaly Lipatov : include: Use compatible file guard name (_NTSECAPI_, _NTSECPKG_).
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: caae33a8534cfd4beced1be3ca7cf21edc28c4f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/caae33a8534cfd4beced1be3ca7cf2… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:16:29 2023 +0300 include: Use compatible file guard name (_NTSECAPI_, _NTSECPKG_). --- include/ntsecapi.h | 6 +++--- include/ntsecpkg.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index b06a9628e61..849e72ef33e 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_NTSECAPI_H -#define __WINE_NTSECAPI_H +#ifndef _NTSECAPI_ +#define _NTSECAPI_ #ifndef GUID_DEFINED # include <guiddef.h> @@ -712,4 +712,4 @@ NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING,PHANDLE,PLSA_OPERATIONAL_MOD } /* extern "C" */ #endif /* defined(__cplusplus) */ -#endif /* !defined(__WINE_NTSECAPI_H) */ +#endif /* !defined(_NTSECAPI_) */ diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 609be585d24..836c9c650ef 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _NTSECPKG_H -#define _NTSECPKG_H +#ifndef _NTSECPKG_ +#define _NTSECPKG_ #ifdef __cplusplus extern "C" { @@ -511,4 +511,4 @@ typedef NTSTATUS (WINAPI *SpUserModeInitializeFn)(ULONG, PULONG, #ifdef __cplusplus } #endif -#endif /* _NTSECPKG_H */ +#endif /* _NTSECPKG_ */

1 0

Vitaly Lipatov : include: Add specstrings_strict.h with some defines.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: 6bcdbbe5736f8c5f9adb1c4c687a3f23a4e5c261 URL: https://gitlab.winehq.org/wine/wine/-/commit/6bcdbbe5736f8c5f9adb1c4c687a3f… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:17:04 2023 +0300 include: Add specstrings_strict.h with some defines. --- include/Makefile.in | 1 + include/specstrings.h | 4 ++++ include/specstrings_strict.h | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 54b4ab5925e..c5ba156f50e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -710,6 +710,7 @@ SOURCES = \ softpub.h \ spatialaudioclient.idl \ specstrings.h \ + specstrings_strict.h \ sperror.h \ sql.h \ sqlext.h \ diff --git a/include/specstrings.h b/include/specstrings.h index f2636a49779..4d404759c2e 100644 --- a/include/specstrings.h +++ b/include/specstrings.h @@ -323,6 +323,10 @@ extern "C" { #endif #endif +#ifndef RC_INVOKED +#include <specstrings_strict.h> +#endif /* RC_INVOKED */ + #ifndef DECLSPEC_ADDRSAFE #if (_MSC_VER >= 1200) && (defined(_M_ALPHA) || defined(_M_AXP64)) #define DECLSPEC_ADDRSAFE __declspec(address_safe) diff --git a/include/specstrings_strict.h b/include/specstrings_strict.h new file mode 100644 index 00000000000..07a30db765c --- /dev/null +++ b/include/specstrings_strict.h @@ -0,0 +1,37 @@ +/* + * Copyright 2023 Vitaly Lipatov + * + * 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 __SPECSTRINGS_STRICT_LEVEL +#define __SPECSTRINGS_STRICT_LEVEL 1 +#endif + +#if !defined(__midl) && !defined(__WIDL__) && (__SPECSTRINGS_STRICT_LEVEL > 0) + +#define __field_bcount(size) +#define __field_ecount(size) +#define __field_xcount(size) +#define __success(status) +#define __range(lb,ub) + +#ifdef _MSC_VER +#define __in +#define __out +#define __reserved +#endif + +#endif

1 0

Ilia Docin : sane.ds: Set monochrome DIB color table.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: b830a46dfbf86fe6dcd23d3dcfd7ed709f50ffc6 URL: https://gitlab.winehq.org/wine/wine/-/commit/b830a46dfbf86fe6dcd23d3dcfd7ed… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Sun Aug 6 14:04:46 2023 +0300 sane.ds: Set monochrome DIB color table. --- dlls/sane.ds/ds_image.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index 2c52184a056..250b4aba6f9 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -335,10 +335,8 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, switch (activeDS.frame_params.format) { case FMT_GRAY: - if (activeDS.frame_params.depth == 8) - color_size = (1 << 8) * sizeof(*colors); - else if (activeDS.frame_params.depth == 1) - ; + if (activeDS.frame_params.depth == 8 || activeDS.frame_params.depth == 1) + color_size = (1 << activeDS.frame_params.depth) * sizeof(*colors); else { FIXME("For NATIVE, we support only 1 bit monochrome and 8 bit Grayscale, not %d\n", activeDS.frame_params.depth); @@ -405,8 +403,15 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, { colors = (RGBQUAD *) p; p += color_size; - for (i = 0; i < (color_size / sizeof(*colors)); i++) - colors[i].rgbBlue = colors[i].rgbRed = colors[i].rgbGreen = i; + if (activeDS.frame_params.depth == 1) + { + /* Sane uses 1 to represent minimum intensity (black) and 0 for maximum (white) */ + colors[0].rgbBlue = colors[0].rgbRed = colors[0].rgbGreen = 255; + colors[1].rgbBlue = colors[1].rgbRed = colors[1].rgbGreen = 0; + } + else + for (i = 0; i < (color_size / sizeof(*colors)); i++) + colors[i].rgbBlue = colors[i].rgbRed = colors[i].rgbGreen = i; }

1 0

Alex Henrie : include: Add __WINE_ALLOC_SIZE to the definition of FNALLOC.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: 9d509c0383b62b7779556028935ad73b783bb3be URL: https://gitlab.winehq.org/wine/wine/-/commit/9d509c0383b62b7779556028935ad7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 15 19:52:47 2023 -0600 include: Add __WINE_ALLOC_SIZE to the definition of FNALLOC. --- include/fdi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/fdi.h b/include/fdi.h index a4928b06f95..6659ce462ef 100644 --- a/include/fdi.h +++ b/include/fdi.h @@ -204,7 +204,7 @@ typedef struct { /**********************************************************************/ typedef void * (__WINE_ALLOC_SIZE(1) __cdecl *PFNALLOC)(ULONG cb); -#define FNALLOC(fn) void * __cdecl fn(ULONG cb) +#define FNALLOC(fn) void * __WINE_ALLOC_SIZE(1) __cdecl fn(ULONG cb) typedef void (__cdecl *PFNFREE)(void *pv); #define FNFREE(fn) void __cdecl fn(void *pv)

1 0

Vitaly Lipatov : include: Add some missing defines.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: de17a77b2f1923fd2a487de33e96ec4a9126742b URL: https://gitlab.winehq.org/wine/wine/-/commit/de17a77b2f1923fd2a487de33e96ec… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:13:46 2023 +0300 include: Add some missing defines. --- include/lmshare.h | 2 ++ include/msasn1.h | 4 ++++ include/ntstatus.h | 1 + 3 files changed, 7 insertions(+) diff --git a/include/lmshare.h b/include/lmshare.h index 442cf5ef306..2cb71df4756 100644 --- a/include/lmshare.h +++ b/include/lmshare.h @@ -74,6 +74,8 @@ NET_API_STATUS WINAPI NetShareSetInfo(LMSTR,LMSTR,DWORD,LPBYTE,LPDWORD); #define STYPE_IPC 3 #define STYPE_SPECIAL 0x80000000 +#define SHI_USES_UNLIMITED (DWORD)(-1) + NET_API_STATUS WINAPI NetSessionDel(LMSTR,LMSTR,LMSTR); NET_API_STATUS WINAPI NetSessionEnum(LMSTR,LMSTR,LMSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetSessionGetInfo(LMSTR,LMSTR,LMSTR,DWORD,LPBYTE*); diff --git a/include/msasn1.h b/include/msasn1.h index 244ed61487b..89539d48c0d 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -46,6 +46,10 @@ typedef ASN1uint16_t ASN1choice_t; typedef ASN1uint32_t ASN1magic_t; typedef ASN1ztcharstring_t ASN1objectdescriptor_t; +#define ASN1_PUBLIC DECLSPEC_IMPORT +#define ASN1API __stdcall +#define ASN1CALL __stdcall + #define ASN1_MAKE_VERSION(major,minor) (((major) << 16) | (minor)) #define ASN1_THIS_VERSION ASN1_MAKE_VERSION(1,0) diff --git a/include/ntstatus.h b/include/ntstatus.h index e049be0bdbd..15bc7d6668b 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1413,6 +1413,7 @@ #define STATUS_SMI_PRIMITIVE_INSTALLER_FAILED ((NTSTATUS) 0xC0150025) #define STATUS_GENERIC_COMMAND_FAILED ((NTSTATUS) 0xC0150026) #define STATUS_SXS_FILE_HASH_MISSING ((NTSTATUS) 0xC0150027) +#define STATUS_HANDLE_NO_LONGER_VALID ((NTSTATUS) 0xC0190028) #define STATUS_GRAPHICS_NOT_EXCLUSIVE_MODE_OWNER ((NTSTATUS) 0xC01E0000) #define STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER ((NTSTATUS) 0xC01E0001)

1 0

Gabriel Ivăncescu : mshtml: Release the event target during node unlink.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: 76f622a663bfb6e1cd46baaf25d4c55b7a236198 URL: https://gitlab.winehq.org/wine/wine/-/commit/76f622a663bfb6e1cd46baaf25d4c5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:27 2023 +0300 mshtml: Release the event target during node unlink. The event target can participate in a cycle. Also since release_event_target can now potentially be called multiple times, we have to NULL the rb tree to make it re-entrant safe. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 3 ++- dlls/mshtml/htmlnode.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3b012980960..9f3dbae81d7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -4552,11 +4552,12 @@ void release_event_target(EventTarget *event_target) WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR(iter, iter2, &event_target->handler_map, listener_container_t, entry) { while(!list_empty(&iter->listeners)) { event_listener_t *listener = LIST_ENTRY(list_head(&iter->listeners), event_listener_t, entry); + list_remove(&listener->entry); if(listener->function) IDispatch_Release(listener->function); - list_remove(&listener->entry); free(listener); } free(iter); } + rb_destroy(&event_target->handler_map, NULL, NULL); } diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 192e9c5b685..893a1a738f7 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1443,6 +1443,7 @@ void HTMLDOMNode_unlink(DispatchEx *dispex) if(This->vtbl->unlink) This->vtbl->unlink(This); + release_event_target(&This->event_target); unlink_ref(&This->nsnode); if(This->doc) { @@ -1456,7 +1457,6 @@ void HTMLDOMNode_unlink(DispatchEx *dispex) void HTMLDOMNode_destructor(DispatchEx *dispex) { HTMLDOMNode *This = HTMLDOMNode_from_DispatchEx(dispex); - release_event_target(&This->event_target); if(This->vtbl->destructor) This->vtbl->destructor(This); free(This);

1 0

Gabriel Ivăncescu : mshtml: Implement node cycle collection using the dispex.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: a54b322f6b557d6c2ee950abc27752d2bf462482 URL: https://gitlab.winehq.org/wine/wine/-/commit/a54b322f6b557d6c2ee950abc27752… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:27 2023 +0300 mshtml: Implement node cycle collection using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 70 +++++++++++++++++++-- dlls/mshtml/htmldoc.c | 15 ++--- dlls/mshtml/htmlelem.c | 5 +- dlls/mshtml/htmlevent.c | 21 +++++++ dlls/mshtml/htmlnode.c | 144 ++++++++++++++++--------------------------- dlls/mshtml/htmltextnode.c | 9 ++- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 27 ++++++-- dlls/mshtml/nsembed.c | 2 +- 9 files changed, 180 insertions(+), 115 deletions(-)

1 0