September 2023 - Wine-commits

Alexandre Julliard : scrrun: Fix pointer hashing on 64-bit.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: f69bb9d6c5e731d69b61bb715f3de5c3cd47f68c URL: https://gitlab.winehq.org/wine/wine/-/commit/f69bb9d6c5e731d69b61bb715f3de5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 17:24:06 2023 +0200 scrrun: Fix pointer hashing on 64-bit. --- dlls/scrrun/dictionary.c | 6 +++++- dlls/scrrun/tests/dictionary.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index d69b513efc2..364d8b52ff6 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -846,7 +846,11 @@ static HRESULT get_flt_hash(FLOAT flt, LONG *hash) static DWORD get_ptr_hash(void *ptr) { - return PtrToUlong(ptr) % DICT_HASH_MOD; + DWORD hash = PtrToUlong(ptr); +#ifdef _WIN64 + hash ^= (ULONG_PTR)ptr >> 32; +#endif + return hash % 1201; } static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, VARIANT *hash) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 3232ef7321a..a6369b77831 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -193,7 +193,11 @@ static DWORD get_num_hash(FLOAT num) static DWORD get_ptr_hash(void *ptr) { - return PtrToUlong(ptr) % 1201; + DWORD hash = PtrToUlong(ptr); +#ifdef _WIN64 + hash ^= (ULONG_PTR)ptr >> 32; +#endif + return hash % 1201; } typedef union

1 0

Alexandre Julliard : gdi32: Fix buffer size parameter in GetFontFileData for 64-bit.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: f078d5b4f9fda20b09d6cda622497dbef1d8601b URL: https://gitlab.winehq.org/wine/wine/-/commit/f078d5b4f9fda20b09d6cda622497d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 17:32:39 2023 +0200 gdi32: Fix buffer size parameter in GetFontFileData for 64-bit. --- dlls/dwrite/gdiinterop.c | 2 +- dlls/gdi32/tests/font.c | 2 +- dlls/gdi32/text.c | 2 +- dlls/win32u/font.c | 2 +- dlls/wow64win/gdi.c | 2 +- include/ntgdi.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 2fec7e9fff1..5b542d93e32 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -758,7 +758,7 @@ struct font_fileinfo /* Undocumented gdi32 exports, used to access actually selected font information */ extern BOOL WINAPI GetFontRealizationInfo(HDC hdc, struct font_realization_info *info); extern BOOL WINAPI GetFontFileInfo(DWORD instance_id, DWORD file_index, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed); -extern BOOL WINAPI GetFontFileData(DWORD instance_id, DWORD file_index, UINT64 offset, void *buff, DWORD buff_size); +extern BOOL WINAPI GetFontFileData(DWORD instance_id, DWORD file_index, UINT64 offset, void *buff, SIZE_T buff_size); static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop1 *iface, HDC hdc, IDWriteFontFace **fontface) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 82cec09e982..711c9ca4a32 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -46,7 +46,7 @@ static BOOL (WINAPI *pGetCharWidthInfo)(HDC hdc, void *); static BOOL (WINAPI *pGdiRealizationInfo)(HDC hdc, DWORD *); static BOOL (WINAPI *pGetFontRealizationInfo)(HDC hdc, DWORD *); static BOOL (WINAPI *pGetFontFileInfo)(DWORD, DWORD, void *, SIZE_T, SIZE_T *); -static BOOL (WINAPI *pGetFontFileData)(DWORD, DWORD, UINT64, void *, DWORD); +static BOOL (WINAPI *pGetFontFileData)(DWORD, DWORD, UINT64, void *, SIZE_T); static HMODULE hgdi32 = 0; static const MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 155e798bafc..b61c8ed4542 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -2015,7 +2015,7 @@ BOOL WINAPI EnableEUDC( BOOL enable ) * GetFontFileData (GDI32.@) */ BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD file_index, UINT64 offset, - void *buff, DWORD buff_size ) + void *buff, SIZE_T buff_size ) { return NtGdiGetFontFileData( instance_id, file_index, &offset, buff, buff_size ); } diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 4a341453012..c21d87c1fbc 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -7008,7 +7008,7 @@ BOOL WINAPI NtGdiGetRasterizerCaps( RASTERIZER_STATUS *status, UINT size ) * NtGdiGetFontFileData (win32u.@) */ BOOL WINAPI NtGdiGetFontFileData( DWORD instance_id, DWORD file_index, UINT64 *offset, - void *buff, DWORD buff_size ) + void *buff, SIZE_T buff_size ) { struct gdi_font *font; DWORD tag = 0, size; diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index c846e47ba5e..1bcfd17cdfb 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -1136,7 +1136,7 @@ NTSTATUS WINAPI wow64_NtGdiGetFontFileData( UINT *args ) DWORD file_index = get_ulong( &args ); UINT64 *offset = get_ptr( &args ); void *buff = get_ptr( &args ); - DWORD buff_size = get_ulong( &args ); + SIZE_T buff_size = get_ulong( &args ); return NtGdiGetFontFileData( instance_id, file_index, offset, buff, buff_size ); } diff --git a/include/ntgdi.h b/include/ntgdi.h index 55c6739a54f..f93708d5400 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -341,7 +341,7 @@ INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap ); BOOL WINAPI NtGdiGetDeviceGammaRamp( HDC hdc, void *ptr ); DWORD WINAPI NtGdiGetFontData( HDC hdc, DWORD table, DWORD offset, void *buffer, DWORD length ); BOOL WINAPI NtGdiGetFontFileData( DWORD instance_id, DWORD file_index, UINT64 *offset, - void *buff, DWORD buff_size ); + void *buff, SIZE_T buff_size ); BOOL WINAPI NtGdiGetFontFileInfo( DWORD instance_id, DWORD file_index, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed ); DWORD WINAPI NtGdiGetFontUnicodeRanges( HDC hdc, GLYPHSET *lpgs );

1 0

Alistair Leslie-Hughes : msvcrt: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: e9003720d6d96e4489452c59c21d967c71bb4338 URL: https://gitlab.winehq.org/wine/wine/-/commit/e9003720d6d96e4489452c59c21d96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 31 17:40:55 2023 +1000 msvcrt: Remove DECLSPEC_HIDDEN usage. --- dlls/msvcrt/cxx.h | 4 +- dlls/msvcrt/except_i386.c | 6 +-- dlls/msvcrt/misc.c | 2 +- dlls/msvcrt/msvcrt.h | 98 +++++++++++++++++++++++------------------------ 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index aa73aabf797..a39e8e95f82 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -315,8 +315,8 @@ typedef struct LONG *ref; /* not binary compatible with native msvcr100 */ } exception_ptr; -void throw_exception(const char*) DECLSPEC_HIDDEN; -void exception_ptr_from_record(exception_ptr*,EXCEPTION_RECORD*) DECLSPEC_HIDDEN; +void throw_exception(const char*); +void exception_ptr_from_record(exception_ptr*,EXCEPTION_RECORD*); void __cdecl __ExceptionPtrCreate(exception_ptr*); void __cdecl __ExceptionPtrDestroy(exception_ptr*); diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index d4d45c74d17..a870b26edaa 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -144,7 +144,7 @@ typedef struct DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, - catch_func_nested_frame* nested_frame ) DECLSPEC_HIDDEN; + catch_func_nested_frame* nested_frame ); /* call a copy constructor */ extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); @@ -1025,7 +1025,7 @@ typedef void (__stdcall *MSVCRT_unwind_function)(const _JUMP_BUFFER *); * _setjmp (MSVCRT.@) */ DEFINE_SETJMP_ENTRYPOINT(MSVCRT__setjmp) -int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp(_JUMP_BUFFER *jmp) +int CDECL __regs_MSVCRT__setjmp(_JUMP_BUFFER *jmp) { jmp->Registration = (unsigned long)NtCurrentTeb()->Tib.ExceptionList; if (jmp->Registration == ~0UL) @@ -1042,7 +1042,7 @@ int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp(_JUMP_BUFFER *jmp) * _setjmp3 (MSVCRT.@) */ DEFINE_SETJMP_ENTRYPOINT( MSVCRT__setjmp3 ) -int WINAPIV DECLSPEC_HIDDEN __regs_MSVCRT__setjmp3(_JUMP_BUFFER *jmp, int nb_args, ...) +int WINAPIV __regs_MSVCRT__setjmp3(_JUMP_BUFFER *jmp, int nb_args, ...) { jmp->Cookie = MSVCRT_JMP_MAGIC; jmp->UnwindFunc = 0; diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 16188394b98..559bb7288b3 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -236,7 +236,7 @@ __ASM_GLOBAL_FUNC(_chkesp, __ASM_CFI(".cfi_same_value %ebp\n\t") "ret") -void CDECL DECLSPEC_HIDDEN chkesp_fail(void) +void CDECL chkesp_fail(void) { ERR("Stack pointer incorrect after last function call - Bad prototype/spec entry?\n"); DebugBreak(); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9f253d45579..0e2edc631e9 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -33,7 +33,7 @@ #undef strncpy #undef wcsncpy -extern BOOL sse2_supported DECLSPEC_HIDDEN; +extern BOOL sse2_supported; #define DBL80_MAX_10_EXP 4932 #define DBL80_MIN_10_EXP -4951 @@ -128,7 +128,7 @@ void msvcrt_free_handler4(void); #endif /* TLS data */ -extern DWORD msvcrt_tls_index DECLSPEC_HIDDEN; +extern DWORD msvcrt_tls_index; #define LOCALE_FREE 0x1 #define LOCALE_THREAD 0x2 @@ -184,20 +184,20 @@ struct __thread_data { typedef struct __thread_data thread_data_t; -extern thread_data_t *CDECL msvcrt_get_thread_data(void) DECLSPEC_HIDDEN; +extern thread_data_t *CDECL msvcrt_get_thread_data(void); -BOOL locale_to_sname(const char*, unsigned short*, BOOL*, WCHAR*) DECLSPEC_HIDDEN; -extern _locale_t MSVCRT_locale DECLSPEC_HIDDEN; -extern __lc_time_data cloc_time_data DECLSPEC_HIDDEN; +BOOL locale_to_sname(const char*, unsigned short*, BOOL*, WCHAR*); +extern _locale_t MSVCRT_locale; +extern __lc_time_data cloc_time_data; extern unsigned int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257]; -extern BOOL initial_locale DECLSPEC_HIDDEN; +extern BOOL initial_locale; extern WORD *MSVCRT__pwctype; -void msvcrt_set_errno(int) DECLSPEC_HIDDEN; +void msvcrt_set_errno(int); #if _MSVCR_VER >= 80 -void throw_bad_alloc(void) DECLSPEC_HIDDEN; +void throw_bad_alloc(void); #endif void __cdecl _purecall(void); @@ -206,10 +206,10 @@ void __cdecl _amsg_exit(int errnum); extern char **MSVCRT__environ; extern wchar_t **MSVCRT__wenviron; -extern char ** msvcrt_SnapshotOfEnvironmentA(char **) DECLSPEC_HIDDEN; -extern wchar_t ** msvcrt_SnapshotOfEnvironmentW(wchar_t **) DECLSPEC_HIDDEN; +extern char ** msvcrt_SnapshotOfEnvironmentA(char **); +extern wchar_t ** msvcrt_SnapshotOfEnvironmentW(wchar_t **); -wchar_t *msvcrt_wstrdupa(const char *) DECLSPEC_HIDDEN; +wchar_t *msvcrt_wstrdupa(const char *); extern unsigned int MSVCRT__commode; @@ -224,31 +224,31 @@ typedef void* (__cdecl *malloc_func_t)(size_t); typedef void (__cdecl *free_func_t)(void*); /* Setup and teardown multi threaded locks */ -extern void msvcrt_init_mt_locks(void) DECLSPEC_HIDDEN; -extern void msvcrt_free_locks(void) DECLSPEC_HIDDEN; - -extern void msvcrt_init_exception(void*) DECLSPEC_HIDDEN; -extern BOOL msvcrt_init_locale(void) DECLSPEC_HIDDEN; -extern void msvcrt_init_math(void*) DECLSPEC_HIDDEN; -extern void msvcrt_init_io(void) DECLSPEC_HIDDEN; -extern void msvcrt_free_io(void) DECLSPEC_HIDDEN; -extern void msvcrt_free_console(void) DECLSPEC_HIDDEN; -extern void msvcrt_init_args(void) DECLSPEC_HIDDEN; -extern void msvcrt_free_args(void) DECLSPEC_HIDDEN; -extern void msvcrt_init_signals(void) DECLSPEC_HIDDEN; -extern void msvcrt_free_signals(void) DECLSPEC_HIDDEN; -extern void msvcrt_free_popen_data(void) DECLSPEC_HIDDEN; -extern BOOL msvcrt_init_heap(void) DECLSPEC_HIDDEN; -extern void msvcrt_destroy_heap(void) DECLSPEC_HIDDEN; -extern void msvcrt_init_clock(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_mt_locks(void); +extern void msvcrt_free_locks(void); + +extern void msvcrt_init_exception(void*); +extern BOOL msvcrt_init_locale(void); +extern void msvcrt_init_math(void*); +extern void msvcrt_init_io(void); +extern void msvcrt_free_io(void); +extern void msvcrt_free_console(void); +extern void msvcrt_init_args(void); +extern void msvcrt_free_args(void); +extern void msvcrt_init_signals(void); +extern void msvcrt_free_signals(void); +extern void msvcrt_free_popen_data(void); +extern BOOL msvcrt_init_heap(void); +extern void msvcrt_destroy_heap(void); +extern void msvcrt_init_clock(void); #if _MSVCR_VER >= 100 -extern void msvcrt_init_concurrency(void*) DECLSPEC_HIDDEN; -extern void msvcrt_free_concurrency(void) DECLSPEC_HIDDEN; -extern void msvcrt_free_scheduler_thread(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_concurrency(void*); +extern void msvcrt_free_concurrency(void); +extern void msvcrt_free_scheduler_thread(void); #endif -extern BOOL msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; +extern BOOL msvcrt_create_io_inherit_block(WORD*, BYTE**); /* run-time error codes */ #define _RT_STACK 0 @@ -299,14 +299,14 @@ extern FILE MSVCRT__iob[]; #define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF) -_locale_t CDECL get_current_locale_noalloc(_locale_t locale) DECLSPEC_HIDDEN; -void CDECL free_locale_noalloc(_locale_t locale) DECLSPEC_HIDDEN; -pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN; -pthreadmbcinfo CDECL get_mbcinfo(void) DECLSPEC_HIDDEN; -threadmbcinfo* create_mbcinfo(int, LCID, threadmbcinfo*) DECLSPEC_HIDDEN; -void free_locinfo(pthreadlocinfo) DECLSPEC_HIDDEN; -void free_mbcinfo(pthreadmbcinfo) DECLSPEC_HIDDEN; -int __cdecl __crtLCMapStringA(LCID, DWORD, const char*, int, char*, int, unsigned int, int) DECLSPEC_HIDDEN; +_locale_t CDECL get_current_locale_noalloc(_locale_t locale); +void CDECL free_locale_noalloc(_locale_t locale); +pthreadlocinfo CDECL get_locinfo(void); +pthreadmbcinfo CDECL get_mbcinfo(void); +threadmbcinfo* create_mbcinfo(int, LCID, threadmbcinfo*); +void free_locinfo(pthreadlocinfo); +void free_mbcinfo(pthreadmbcinfo); +int __cdecl __crtLCMapStringA(LCID, DWORD, const char*, int, char*, int, unsigned int, int); enum fpmod { FP_ROUND_ZERO, /* only used when dropped part contains only zeros */ @@ -324,8 +324,8 @@ struct fpnum { enum fpmod mod; }; struct fpnum fpnum_parse(wchar_t (*)(void*), void (*)(void*), - void*, pthreadlocinfo, BOOL) DECLSPEC_HIDDEN; -int fpnum_double(struct fpnum*, double*) DECLSPEC_HIDDEN; + void*, pthreadlocinfo, BOOL); +int fpnum_double(struct fpnum*, double*); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) * #define MSVCRT_CHECK_PMT(x) ((x) ? TRUE : MSVCRT_INVALID_PMT(#x),FALSE) @@ -349,13 +349,13 @@ typedef union _printf_arg } printf_arg; typedef printf_arg (*args_clbk)(void*, int, int, va_list*); int pf_printf_a(puts_clbk_a, void*, const char*, _locale_t, - DWORD, args_clbk, void*, va_list*) DECLSPEC_HIDDEN; + DWORD, args_clbk, void*, va_list*); int pf_printf_w(puts_clbk_w, void*, const wchar_t*, _locale_t, - DWORD, args_clbk, void*, va_list*) DECLSPEC_HIDDEN; -int create_positional_ctx_a(void*, const char*, va_list) DECLSPEC_HIDDEN; -int create_positional_ctx_w(void*, const wchar_t*, va_list) DECLSPEC_HIDDEN; -printf_arg arg_clbk_valist(void*, int, int, va_list*) DECLSPEC_HIDDEN; -printf_arg arg_clbk_positional(void*, int, int, va_list*) DECLSPEC_HIDDEN; + DWORD, args_clbk, void*, va_list*); +int create_positional_ctx_a(void*, const char*, va_list); +int create_positional_ctx_w(void*, const wchar_t*, va_list); +printf_arg arg_clbk_valist(void*, int, int, va_list*); +printf_arg arg_clbk_positional(void*, int, int, va_list*); extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int);

1 0

Louis Lenders : wldp: Add WldpGetLockdownPolicy stub.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: b71a0e33ac64795b9a64b448affd2f5d66723284 URL: https://gitlab.winehq.org/wine/wine/-/commit/b71a0e33ac64795b9a64b448affd2f… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Sep 1 13:29:28 2023 +0200 wldp: Add WldpGetLockdownPolicy stub. --- dlls/wldp/wldp.c | 13 +++++++++++++ dlls/wldp/wldp.spec | 2 +- include/Makefile.in | 1 + include/wldp.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/wldp/wldp.c b/dlls/wldp/wldp.c index 64c0c58aae8..ffd9b6084c7 100644 --- a/dlls/wldp/wldp.c +++ b/dlls/wldp/wldp.c @@ -22,6 +22,8 @@ #include "windef.h" #include "winbase.h" +#include "wldp.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wldp); @@ -36,3 +38,14 @@ HRESULT WINAPI WldpIsDynamicCodePolicyEnabled(BOOL *is_enabled) *is_enabled = FALSE; return S_OK; } + +/*********************************************************************** + * WldpGetLockdownPolicy (wldp.@) + */ +HRESULT WINAPI WldpGetLockdownPolicy(WLDP_HOST_INFORMATION *info, DWORD *state, DWORD flags) +{ + FIXME("%p %p %lu\n", info, state, flags); + + *state = 0; + return S_OK; +} diff --git a/dlls/wldp/wldp.spec b/dlls/wldp/wldp.spec index a692efca291..7e5de1d372d 100644 --- a/dlls/wldp/wldp.spec +++ b/dlls/wldp/wldp.spec @@ -16,7 +16,7 @@ @ stub WldpCheckWcosDeviceEncryptionSecure @ stub WldpDisableDeveloperMode @ stub WldpEnableDeveloperMode -@ stub WldpGetLockdownPolicy +@ stdcall WldpGetLockdownPolicy(ptr ptr long) @ stub WldpIsAllowedEntryPoint @ stub WldpIsClassInApprovedList @ stub WldpIsDebugAllowed diff --git a/include/Makefile.in b/include/Makefile.in index ec49c1f7a35..d2df2383ea2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -953,6 +953,7 @@ SOURCES = \ winuser.rh \ winver.h \ wlanapi.h \ + wldp.h \ wmcodecdsp.idl \ wmdrmsdk.idl \ wmistr.h \ diff --git a/include/wldp.h b/include/wldp.h new file mode 100644 index 00000000000..c70e5feb8f8 --- /dev/null +++ b/include/wldp.h @@ -0,0 +1,46 @@ +/* + * Copyright 2023 Louis Lenders + * + * 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 WLDP_H +#define WLDP_H + +typedef enum WLDP_HOST_ID +{ + WLDP_HOST_ID_UNKNOWN, + WLDP_HOST_ID_GLOBAL, + WLDP_HOST_ID_VBA, + WLDP_HOST_ID_WSH, + WLDP_HOST_ID_POWERSHELL, + WLDP_HOST_ID_IE, + WLDP_HOST_ID_MSI, + WLDP_HOST_ID_ALL, + WLDP_HOST_ID_MAX +} WLDP_HOST_ID; + +typedef struct WLDP_HOST_INFORMATION +{ + DWORD dwRevision; + WLDP_HOST_ID dwHostId; + const WCHAR* szSource; + HANDLE hSource; +} WLDP_HOST_INFORMATION, *PWLDP_HOST_INFORMATION; + +HRESULT WINAPI WldpGetLockdownPolicy(WLDP_HOST_INFORMATION*,DWORD*,DWORD); +HRESULT WINAPI WldpIsDynamicCodePolicyEnabled(BOOL*); + +#endif

1 0

Brendan Shanks : winebus.sys: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: 516c6af58e6aadcf7760d86859a40c03bca28890 URL: https://gitlab.winehq.org/wine/wine/-/commit/516c6af58e6aadcf7760d86859a40c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Aug 31 14:19:51 2023 -0700 winebus.sys: Ensure unixlib function tables and enum stay in sync. --- dlls/winebus.sys/unixlib.c | 2 ++ dlls/winebus.sys/unixlib.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 75d33399738..74b4992f07b 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -351,6 +351,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = unix_device_set_feature_report, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count); + void bus_event_cleanup(struct bus_event *event) { struct unix_device *iface = (struct unix_device *)(UINT_PTR)event->device; diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 68d59ac0333..731745bb9a4 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -141,6 +141,7 @@ enum unix_funcs device_set_output_report, device_get_feature_report, device_set_feature_report, + unix_funcs_count, }; static inline const char *debugstr_device_desc(struct device_desc *desc)

1 0

Davide Beatrici : mmdevapi: Simplify load_driver_devices() by combining loops and removing unneeded allocation(s).
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: b1b231f370c7772bbbaa158d2adbf02747826ec4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1b231f370c7772bbbaa158d2adbf0… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Aug 25 14:40:46 2023 +0200 mmdevapi: Simplify load_driver_devices() by combining loops and removing unneeded allocation(s). --- dlls/mmdevapi/devenum.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 2900d222795..f93bfa83ec7 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -528,8 +528,6 @@ static HRESULT set_format(MMDevice *dev) HRESULT load_driver_devices(EDataFlow flow) { struct get_endpoint_ids_params params; - WCHAR **ids = NULL; - GUID *guids = NULL; UINT i; params.flow = flow; @@ -544,38 +542,28 @@ HRESULT load_driver_devices(EDataFlow flow) if (FAILED(params.result)) goto end; - ids = malloc(params.num * sizeof(*ids)); - guids = malloc(params.num * sizeof(*guids)); - if (!ids || !guids) { - params.result = E_OUTOFMEMORY; - goto end; - } - for (i = 0; i < params.num; i++) { + GUID guid; + WCHAR *id; + MMDevice *dev; const WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); const char *dev_name = (char *)params.endpoints + params.endpoints[i].device; const unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); - if (!(ids[i] = malloc(size))) { - while (i--) free(ids[i]); + if (!(id = malloc(size))) { params.result = E_OUTOFMEMORY; goto end; } - memcpy(ids[i], name, size); - drvs.pget_device_guid(flow, dev_name, &guids[i]); - } + memcpy(id, name, size); - for (i = 0; i < params.num; i++) { - MMDevice *dev; - dev = MMDevice_Create(ids[i], &guids[i], flow, DEVICE_STATE_ACTIVE, - params.default_idx == i); + drvs.pget_device_guid(flow, dev_name, &guid); + + dev = MMDevice_Create(id, &guid, flow, DEVICE_STATE_ACTIVE, params.default_idx == i); set_format(dev); } end: free(params.endpoints); - free(guids); - free(ids); return params.result; }

1 0

Davide Beatrici : mmdevapi: Move name string duplication in MMDevice_Create() from caller.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: cdfb85220ffa6e1bd2b701306492380ef3c74fd7 URL: https://gitlab.winehq.org/wine/wine/-/commit/cdfb85220ffa6e1bd2b70130649238… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Aug 30 00:43:30 2023 +0200 mmdevapi: Move name string duplication in MMDevice_Create() from caller. --- dlls/mmdevapi/devenum.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index f93bfa83ec7..10037a7affe 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -312,7 +312,7 @@ static const WCHAR *find_product_name_override(const WCHAR *device_id) * If GUID is null, a random guid will be assigned * and the device will be created */ -static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD state, BOOL setdefault) +static MMDevice *MMDevice_Create(const WCHAR *name, GUID *id, EDataFlow flow, DWORD state, BOOL setdefault) { HKEY key, root; MMDevice *device, *cur = NULL; @@ -351,7 +351,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st WARN("Modifying an MMDevice with postitive reference count!\n"); free(cur->drv_id); - cur->drv_id = name; + cur->drv_id = wcsdup(name); cur->flow = flow; cur->state = state; @@ -373,7 +373,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st PROPVARIANT pv; pv.vt = VT_LPWSTR; - pv.pwszVal = name; + pv.pwszVal = cur->drv_id; if (SUCCEEDED(set_driver_prop_value(id, flow, &devicepath_key))) { PROPVARIANT pv2; @@ -482,10 +482,7 @@ HRESULT load_devices_from_reg(void) && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv)) && pv.vt == VT_LPWSTR) { - DWORD size_bytes = (lstrlenW(pv.pwszVal) + 1) * sizeof(WCHAR); - WCHAR *name = malloc(size_bytes); - memcpy(name, pv.pwszVal, size_bytes); - MMDevice_Create(name, &guid, curflow, + MMDevice_Create(pv.pwszVal, &guid, curflow, DEVICE_STATE_NOTPRESENT, FALSE); CoTaskMemFree(pv.pwszVal); } @@ -544,21 +541,13 @@ HRESULT load_driver_devices(EDataFlow flow) for (i = 0; i < params.num; i++) { GUID guid; - WCHAR *id; MMDevice *dev; const WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); const char *dev_name = (char *)params.endpoints + params.endpoints[i].device; - const unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); - - if (!(id = malloc(size))) { - params.result = E_OUTOFMEMORY; - goto end; - } - memcpy(id, name, size); drvs.pget_device_guid(flow, dev_name, &guid); - dev = MMDevice_Create(id, &guid, flow, DEVICE_STATE_ACTIVE, params.default_idx == i); + dev = MMDevice_Create(name, &guid, flow, DEVICE_STATE_ACTIVE, params.default_idx == i); set_format(dev); }

1 0

Jeff Smith : shlwapi/tests: Fix SHFormatDateTime test during DST.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: 9bc503b6bb269f314e593726386c3cba6b1a5681 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bc503b6bb269f314e593726386c3c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Aug 31 21:12:51 2023 -0500 shlwapi/tests: Fix SHFormatDateTime test during DST. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54683 --- dlls/shlwapi/tests/ordinal.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 7cb997c304c..2b9cb9f3127 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1669,13 +1669,21 @@ static void test_SHSetWindowBits(void) static void test_SHFormatDateTimeA(const SYSTEMTIME *st) { FILETIME UNALIGNED filetime; + FILETIME UNALIGNED filetimeCheck; + SYSTEMTIME universalSystemTime; CHAR buff[100], buff2[100], buff3[100]; + BOOL dstMatch; DWORD flags; INT ret; - SystemTimeToFileTime(st, &filetime); /* SHFormatDateTime expects input as utc */ - LocalFileTimeToFileTime(&filetime, &filetime); + TzSpecificLocalTimeToSystemTime(NULL, st, &universalSystemTime); + SystemTimeToFileTime(&universalSystemTime, &filetime); + + SystemTimeToFileTime(st, &filetimeCheck); + LocalFileTimeToFileTime(&filetimeCheck, &filetimeCheck); + dstMatch = (filetime.dwHighDateTime == filetimeCheck.dwHighDateTime) && + (filetime.dwLowDateTime == filetimeCheck.dwLowDateTime); /* no way to get required buffer length here */ ret = pSHFormatDateTimeA(&filetime, NULL, NULL, 0); @@ -1731,14 +1739,18 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, + "expected (%s), got (%s)\n", buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, + "expected (%s), got (%s)\n", buff2, buff); /* both time flags */ flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGTIME | FDTF_SHORTTIME; @@ -1746,7 +1758,9 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, + "expected (%s), got (%s)\n", buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); @@ -1776,7 +1790,8 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d, length %d\n", ret, lstrlenA(buff)+1); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); - ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0, + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s) for time part\n", buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); @@ -1790,7 +1805,8 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); - ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0, + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s) for time part\n", buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); @@ -1808,7 +1824,9 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); strcat(buff2, buff3); - ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, + "expected (%s), got (%s)\n", buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); @@ -1819,12 +1837,15 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); strcat(buff2, buff3); - ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, + "expected (%s), got (%s)\n", buff2, buff); } static void test_SHFormatDateTimeW(void) { FILETIME UNALIGNED filetime; + SYSTEMTIME universalSystemTime; WCHAR buff[100], buff2[100], buff3[100], *p1, *p2; SYSTEMTIME st; DWORD flags; @@ -1840,9 +1861,9 @@ if (0) } GetLocalTime(&st); - SystemTimeToFileTime(&st, &filetime); /* SHFormatDateTime expects input as utc */ - LocalFileTimeToFileTime(&filetime, &filetime); + TzSpecificLocalTimeToSystemTime(NULL, &st, &universalSystemTime); + SystemTimeToFileTime(&universalSystemTime, &filetime); /* no way to get required buffer length here */ SetLastError(0xdeadbeef);

1 0

Jeff Smith : shlwapi: Fix SHFormatDateTime implementation during DST.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: 95efcca3151995fd30eeebf7d348f7c573ed065d URL: https://gitlab.winehq.org/wine/wine/-/commit/95efcca3151995fd30eeebf7d348f7… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Aug 31 22:34:08 2023 -0500 shlwapi: Fix SHFormatDateTime implementation during DST. --- dlls/shlwapi/ordinal.c | 5 ++--- dlls/shlwapi/tests/ordinal.c | 7 ------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 885da3f2269..6e21bd9e075 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4288,7 +4288,6 @@ INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags, #define SHFORMATDT_UNSUPPORTED_FLAGS (FDTF_RELATIVE | FDTF_LTRDATE | FDTF_RTLDATE | FDTF_NOAUTOREADINGORDER) DWORD fmt_flags = flags ? *flags : FDTF_DEFAULT; SYSTEMTIME st; - FILETIME ft; INT ret = 0; TRACE("%p %p %p %u\n", fileTime, flags, buf, size); @@ -4299,8 +4298,8 @@ INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags, if (fmt_flags & SHFORMATDT_UNSUPPORTED_FLAGS) FIXME("ignoring some flags - 0x%08lx\n", fmt_flags & SHFORMATDT_UNSUPPORTED_FLAGS); - FileTimeToLocalFileTime(fileTime, &ft); - FileTimeToSystemTime(&ft, &st); + FileTimeToSystemTime(fileTime, &st); + SystemTimeToTzSpecificLocalTime(NULL, &st, &st); /* first of all date */ if (fmt_flags & (FDTF_LONGDATE | FDTF_SHORTDATE)) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 2b9cb9f3127..676a537744d 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1739,7 +1739,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s)\n", buff2, buff); @@ -1748,7 +1747,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s)\n", buff2, buff); @@ -1758,7 +1756,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s)\n", buff2, buff); @@ -1790,7 +1787,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d, length %d\n", ret, lstrlenA(buff)+1); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s) for time part\n", buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); @@ -1805,7 +1801,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s) for time part\n", buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); @@ -1824,7 +1819,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); strcat(buff2, buff3); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s)\n", buff2, buff); @@ -1837,7 +1831,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); strcat(buff2, buff3); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s)\n", buff2, buff); }

1 0

Brendan Shanks : mountmgr.sys: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: 9139d8705d7b7af7b8e0b4ff21cc2e3a71fcd6f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/9139d8705d7b7af7b8e0b4ff21cc2e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Aug 31 14:51:08 2023 -0700 mountmgr.sys: Ensure unixlib function tables and enum stay in sync. --- dlls/mountmgr.sys/unixlib.c | 2 ++ dlls/mountmgr.sys/unixlib.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index 13f6fbecf09..b74b2336a34 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -586,3 +586,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = delete_credential, enumerate_credentials, }; + +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index efbce71b979..93e812a516f 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -172,6 +172,7 @@ enum mountmgr_funcs unix_write_credential, unix_delete_credential, unix_enumerate_credentials, + unix_funcs_count }; #define MOUNTMGR_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )

1 0