September 2023 - Wine-Commits

Alistair Leslie-Hughes : msvcrt: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

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 Sept. 1, 2023

Sept. 1, 2023

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

Alexandre Julliard : scrrun: Fix pointer hashing on 64-bit.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

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 : winmm/tests: Fix a pointer truncation issue on 64-bit.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: 863c57e956fffaef97b8ff5acf581a8e863b1331 URL: https://gitlab.winehq.org/wine/wine/-/commit/863c57e956fffaef97b8ff5acf581a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 17:40:21 2023 +0200 winmm/tests: Fix a pointer truncation issue on 64-bit. --- dlls/winmm/tests/wave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index c0c22bee4d8..608bcaa3118 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -687,7 +687,7 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in "waveOutGetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); /* waveOutGetDevCaps allows an open handle instead of a device id */ - rc=waveOutGetDevCapsW(HandleToUlong(wout),&capsW,sizeof(capsW)); + rc=waveOutGetDevCapsW((UINT_PTR)wout,&capsW,sizeof(capsW)); ok(rc==MMSYSERR_NOERROR, "waveOutGetDevCapsW(%s): MMSYSERR_NOERROR " "expected, got %s\n",dev_name(device),wave_out_error(rc));

1 0

Alexandre Julliard : gdi32: Fix buffer size parameter in GetFontFileData for 64-bit.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

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

Alexandre Julliard : oleaut32/tests: Fix a pointer truncation issue on 64-bit.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: ab959b91cd029972dc1d2a40064f7e70c63dbdcf URL: https://gitlab.winehq.org/wine/wine/-/commit/ab959b91cd029972dc1d2a40064f7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 17:07:26 2023 +0200 oleaut32/tests: Fix a pointer truncation issue on 64-bit. --- dlls/oleaut32/tests/usrmarshal.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index fee8097fac8..bb08ba1a1e3 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1625,8 +1625,7 @@ static void test_marshal_VARIANT(void) wirev = (DWORD*)buffer; wirev = check_variant_header(wirev, &v, next - buffer); - ok(*wirev == (DWORD_PTR)V_UNKNOWN(&v) /* Win9x */ || - *wirev == (DWORD_PTR)V_UNKNOWN(&v) + 1 /* NT */, "wv[5] %08lx\n", *wirev); + ok(*wirev == (DWORD)(DWORD_PTR)V_UNKNOWN(&v) + 1, "wv[5] %08lx\n", *wirev); wirev++; ok(*wirev == next - buffer - 0x20, "wv[6] %08lx\n", *wirev); wirev++; @@ -1694,8 +1693,7 @@ static void test_marshal_VARIANT(void) ok(*wirev == 4, "wv[5] %08lx\n", *wirev); wirev++; - ok(*wirev == (DWORD_PTR)heap_unknown /* Win9x, Win2000 */ || - *wirev == (DWORD_PTR)heap_unknown + 1 /* XP */, "wv[6] %08lx\n", *wirev); + ok(*wirev == (DWORD)(DWORD_PTR)heap_unknown + 1, "wv[6] %08lx\n", *wirev); wirev++; ok(*wirev == next - buffer - 0x24, "wv[7] %08lx\n", *wirev); wirev++;

1 0

Alexandre Julliard : ntdll/tests: Work around a Windows pointer truncation bug in CPU info.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: ff1dfb42b9675cd8d4920a5a37d3db7163fa8e79 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff1dfb42b9675cd8d4920a5a37d3db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 17:01:20 2023 +0200 ntdll/tests: Work around a Windows pointer truncation bug in CPU info. --- dlls/ntdll/tests/exception.c | 6 ++++++ dlls/ntdll/tests/wow64.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 19aa9992c2d..cdfa4b026b8 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4350,6 +4350,12 @@ static void test_wow64_context(void) ok( cpu->Machine == IMAGE_FILE_MACHINE_I386, "wrong machine %04x\n", cpu->Machine ); ret = pRtlWow64GetCpuAreaInfo( cpu, 0, &cpu_info ); ok( !ret, "RtlWow64GetCpuAreaInfo failed %lx\n", ret ); + /* work around pointer truncation bug on win10 <= 1709 */ + if (!((ULONG_PTR)cpu_info.Context >> 32)) + { + cpu_info.Context = (char *)cpu + (ULONG)((char *)cpu_info.Context - (char *)cpu); + cpu_info.ContextEx = (char *)cpu + (ULONG)((char *)cpu_info.ContextEx - (char *)cpu); + } ctx_ptr = (WOW64_CONTEXT *)cpu_info.Context; ok(!*(void **)cpu_info.ContextEx, "got context_ex %p\n", *(void **)cpu_info.ContextEx); ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#lx\n", ctx_ptr->ContextFlags); diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 485b9006b14..4e9107ded9d 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -1340,8 +1340,10 @@ static void test_cpu_area(void) status = pRtlWow64GetCpuAreaInfo( cpu, 0, &info ); ok( status == tests[i].expect, "%lu:%lu: failed %lx\n", i, j, status ); if (status) continue; - ok( info.Context == ALIGN( cpu + 1, tests[i].align ), "%lu:%lu: wrong offset %lu\n", - i, j, (ULONG)((char *)info.Context - (char *)cpu) ); + ok( info.Context == ALIGN( cpu + 1, tests[i].align ) || + broken( (ULONG_PTR)info.Context == (ULONG)(ULONG_PTR)ALIGN( cpu + 1, tests[i].align ) ), /* win10 <= 1709 */ + "%lu:%lu: wrong offset %Iu cpu %p context %p\n", + i, j, (ULONG_PTR)((char *)info.Context - (char *)cpu), cpu, info.Context ); ok( info.ContextEx == ALIGN( (char *)info.Context + tests[i].size, sizeof(void*) ), "%lu:%lu: wrong ex offset %lu\n", i, j, (ULONG)((char *)info.ContextEx - (char *)cpu) ); ok( info.ContextFlagsLocation == (char *)info.Context + tests[i].offset,

1 0

Alexandre Julliard : ntdll/tests: Fix alignment issues on 64-bit.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: e33cd0d18aa24bc371018a21c7f2242e3899858e URL: https://gitlab.winehq.org/wine/wine/-/commit/e33cd0d18aa24bc371018a21c7f224… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 16:07:10 2023 +0200 ntdll/tests: Fix alignment issues on 64-bit. --- dlls/ntdll/tests/om.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index a67c987a8c2..f54fb31efda 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2247,7 +2247,7 @@ static void test_token(void) static void *align_ptr( void *ptr ) { - ULONG align = sizeof(DWORD_PTR) - 1; + ULONG_PTR align = sizeof(DWORD_PTR) - 1; return (void *)(((DWORD_PTR)ptr + align) & ~align); }

1 0

Alexandre Julliard : kernel32/tests: Remove tests for the exact value of the stack pointer.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: d3dfed51b37838855c6bcd352a631cc87a4dac6b URL: https://gitlab.winehq.org/wine/wine/-/commit/d3dfed51b37838855c6bcd352a631c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 16:01:57 2023 +0200 kernel32/tests: Remove tests for the exact value of the stack pointer. Stack pointer is randomized on Windows. --- dlls/kernel32/tests/process.c | 4 ---- dlls/kernel32/tests/thread.c | 3 --- 2 files changed, 7 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b80e7ec5ef8..dfb47a84745 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3276,8 +3276,6 @@ static void test_SuspendProcessNewThread(void) } ok( ctx.Eax == (ULONG_PTR)exit_thread_ptr, "wrong eax %08lx/%p\n", ctx.Eax, exit_thread_ptr ); ok( ctx.Ebx == 0x1234, "wrong ebx %08lx\n", ctx.Ebx ); - ok( !((ctx.Esp + 0x10) & 0xfff) || broken( !((ctx.Esp + 4) & 0xfff) ), /* winxp, w2k3 */ - "esp is not at top of stack page or properly aligned: %08lx\n", ctx.Esp ); ok( (ctx.EFlags & ~2) == 0x200, "wrong flags %08lx\n", ctx.EFlags ); ok( (WORD)ctx.FloatSave.ControlWord == 0x27f, "wrong control %08lx\n", ctx.FloatSave.ControlWord ); ok( *(WORD *)ctx.ExtendedRegisters == 0x27f, "wrong control %08x\n", *(WORD *)ctx.ExtendedRegisters ); @@ -3442,8 +3440,6 @@ static void test_SuspendProcessState(void) ok( !ctx.Esi, "esi is not zero %08lx\n", ctx.Esi ); ok( !ctx.Edi, "edi is not zero %08lx\n", ctx.Edi ); } - ok( !((ctx.Esp + 0x10) & 0xfff) || broken( !((ctx.Esp + 4) & 0xfff) ), /* winxp, w2k3 */ - "esp is not at top of stack page or properly aligned: %08lx\n", ctx.Esp ); ok( (ctx.EFlags & ~2) == 0x200, "wrong flags %08lx\n", ctx.EFlags ); ok( (WORD)ctx.FloatSave.ControlWord == 0x27f, "wrong control %08lx\n", ctx.FloatSave.ControlWord ); ok( *(WORD *)ctx.ExtendedRegisters == 0x27f, "wrong control %08x\n", *(WORD *)ctx.ExtendedRegisters ); diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 4addff1e199..9925da32222 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1187,9 +1187,6 @@ static DWORD WINAPI test_stack( void *arg ) ok( stack == NtCurrentTeb()->Tib.StackBase, "wrong stack %p/%p\n", stack, NtCurrentTeb()->Tib.StackBase ); ok( !stack[-1], "wrong data %p = %08lx\n", stack - 1, stack[-1] ); - ok( stack[-2] == (DWORD)arg, "wrong data %p = %08lx\n", stack - 2, stack[-2] ); - ok( stack[-3] == (DWORD)test_stack, "wrong data %p = %08lx\n", stack - 3, stack[-3] ); - ok( !stack[-4], "wrong data %p = %08lx\n", stack - 4, stack[-4] ); return 0; }

1 0

Alexandre Julliard : ntdll/tests: Allow more invalid length values on Windows.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: 5bd5fecbeb3ef50292a38f0265381ea13acc0f82 URL: https://gitlab.winehq.org/wine/wine/-/commit/5bd5fecbeb3ef50292a38f0265381e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 16:08:16 2023 +0200 ntdll/tests: Allow more invalid length values on Windows. --- dlls/ntdll/tests/info.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index ed3e0360c86..e19d4adee7f 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2079,21 +2079,21 @@ static void test_query_process_debug_port(int argc, char **argv) status = NtQueryInformationProcess(NULL, ProcessDebugPort, &debug_port, sizeof(debug_port), &len); ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %#lx.\n", status); - ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */ + ok(len == 0xdeadbeef || broken(len != sizeof(debug_port)), /* wow64 */ "len set to %lx\n", len ); len = 0xdeadbeef; status = NtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, &debug_port, sizeof(debug_port) - 1, &len); ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status); - ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */ + ok(len == 0xdeadbeef || broken(len != sizeof(debug_port)), /* wow64 */ "len set to %lx\n", len ); len = 0xdeadbeef; status = NtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, &debug_port, sizeof(debug_port) + 1, &len); ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status); - ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */ + ok(len == 0xdeadbeef || broken(len != sizeof(debug_port)), /* wow64 */ "len set to %lx\n", len ); len = 0xdeadbeef;

1 0