August 2021 - Wine-commits - list.winehq.org

Francois Gouget : kernel32: Fix ASCII / ANSI mixups in comments.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: e87e24a3c124594c67f82f83f356dcd6a9eefdf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87e24a3c124594c67f82f83… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:45:34 2021 +0200 kernel32: Fix ASCII / ANSI mixups in comments. It's quite possible that the device name is entirely composed of ASCII characters but, as far as the API is concerned, it's still an ANSI string. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 12 ++++++------ dlls/kernel32/lcformat.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index e9dd0feac58..e6d1c06b11e 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -398,7 +398,7 @@ static BOOL COMM_BuildNewCommDCB(LPCWSTR device, LPDCB lpdcb, LPCOMMTIMEOUTS lpt * BuildCommDCBA (KERNEL32.@) * * Updates a device control block data structure with values from an - * ascii device control string. The device control string has two forms + * ANSI device control string. The device control string has two forms * normal and extended, it must be exclusively in one or the other form. * * RETURNS @@ -406,7 +406,7 @@ static BOOL COMM_BuildNewCommDCB(LPCWSTR device, LPDCB lpdcb, LPCOMMTIMEOUTS lpt * True on success, false on a malformed control string. */ BOOL WINAPI BuildCommDCBA( - LPCSTR device, /* [in] The ascii device control string used to update the DCB. */ + LPCSTR device, /* [in] The ANSI device control string used to update the DCB. */ LPDCB lpdcb) /* [out] The device control block to be updated. */ { return BuildCommDCBAndTimeoutsA(device,lpdcb,NULL); @@ -416,7 +416,7 @@ BOOL WINAPI BuildCommDCBA( * BuildCommDCBAndTimeoutsA (KERNEL32.@) * * Updates a device control block data structure with values from an - * ascii device control string. Taking timeout values from a timeouts + * ANSI device control string. Taking timeout values from a timeouts * struct if desired by the control string. * * RETURNS @@ -424,7 +424,7 @@ BOOL WINAPI BuildCommDCBA( * True on success, false bad handles etc. */ BOOL WINAPI BuildCommDCBAndTimeoutsA( - LPCSTR device, /* [in] The ascii device control string. */ + LPCSTR device, /* [in] The ANSI device control string. */ LPDCB lpdcb, /* [out] The device control block to be updated. */ LPCOMMTIMEOUTS lptimeouts) /* [in] The COMMTIMEOUTS structure to be updated. */ { @@ -705,7 +705,7 @@ BOOL WINAPI GetDefaultCommConfigW( /************************************************************************** * GetDefaultCommConfigA (KERNEL32.@) * - * Acquires the default configuration of the specified communication device. (ascii) + * Acquires the default configuration of the specified communication device. * * RETURNS * @@ -713,7 +713,7 @@ BOOL WINAPI GetDefaultCommConfigW( * if the device is not found or the buffer is too small. */ BOOL WINAPI GetDefaultCommConfigA( - LPCSTR lpszName, /* [in] The ascii name of the device targeted for configuration. */ + LPCSTR lpszName, /* [in] The ANSI name of the device targeted for configuration. */ LPCOMMCONFIG lpCC, /* [out] The default configuration for the device. */ LPDWORD lpdwSize) /* [in/out] Initially the size of the default configuration buffer, afterwards the number of bytes copied to the buffer or diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 5711d05b76f..22a9efb24c7 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -315,7 +315,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags) /************************************************************************** * NLS_IsUnicodeOnlyLcid <internal> * - * Determine if a locale is Unicode only, and thus invalid in ASCII calls. + * Determine if a locale is Unicode only, and thus invalid in ANSI calls. */ static BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) { @@ -816,7 +816,7 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags, *| gg Era string, for example 'AD'. * - To output any literal character that could be misidentified as a token, * enclose it in single quotes. - * - The Ascii version of this function fails if lcid is Unicode only. + * - The ANSI version of this function fails if lcid is Unicode only. * * RETURNS * Success: The number of character written to lpDateStr, or that would @@ -922,7 +922,7 @@ INT WINAPI GetDateFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, *| tt Long time marker (e.g. "AM", "PM") * - To output any literal character that could be misidentified as a token, * enclose it in single quotes. - * - The Ascii version of this function fails if lcid is Unicode only. + * - The ANSI version of this function fails if lcid is Unicode only. * * RETURNS * Success: The number of character written to lpTimeStr, or that would @@ -1006,7 +1006,7 @@ INT WINAPI GetTimeFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, * - This function rounds the number string if the number of decimals exceeds the * locales normal number of decimal places. * - If cchOut is 0, this function does not write to lpNumberStr. - * - The Ascii version of this function fails if lcid is Unicode only. + * - The ANSI version of this function fails if lcid is Unicode only. * * RETURNS * Success: The number of character written to lpNumberStr, or that would @@ -1370,7 +1370,7 @@ INT WINAPI GetNumberFormatEx(LPCWSTR name, DWORD flags, * - This function rounds the currency if the number of decimals exceeds the * locales number of currency decimal places. * - If cchOut is 0, this function does not write to lpCurrencyStr. - * - The Ascii version of this function fails if lcid is Unicode only. + * - The ANSI version of this function fails if lcid is Unicode only. * * RETURNS * Success: The number of character written to lpNumberStr, or that would

1 0

Francois Gouget : kernel32/tests: Fix ASCII / ANSI mixups in comments.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 463850baa6db02251432dfb569a013be26626e70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=463850baa6db02251432dfb5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:46:26 2021 +0200 kernel32/tests: Fix ASCII / ANSI mixups in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 4 ++-- dlls/kernel32/tests/process.c | 4 ++-- dlls/kernel32/tests/profile.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 4997f8991bd..794069e341d 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -144,7 +144,7 @@ static void test_message_from_string_wide(void) ok(!lstrcmpW(L"test", out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4, "failed: r=%d\n", r); - /* S is ascii */ + /* S is ansi */ r = doitW(FORMAT_MESSAGE_FROM_STRING, L"%1!S!", 0, 0, out, ARRAY_SIZE(out), "test"); ok(!lstrcmpW(L"test", out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4, "failed: r=%d\n", r); @@ -417,7 +417,7 @@ static void test_message_from_string(void) ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); - /* s is ascii */ + /* s is ansi */ r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!s!", 0, 0, out, ARRAY_SIZE(out), "test"); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e729bca87ef..b1b76a88878 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1952,9 +1952,9 @@ static void test_QueryFullProcessImageNameA(void) expect_eq_d(4, size); expect_eq_s(INIT_STR, buf); - /* this is a difference between the ascii and the unicode version + /* this is a difference between the ansi and the unicode version * the unicode version crashes when the size is big enough to hold - * the result while the ascii version throws an error + * the result while the ansi version throws an error */ size = 1024; expect_eq_d(FALSE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, NULL, &size)); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index f9815585480..94ef0a85467 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -150,7 +150,7 @@ static void test_profile_string(void) WriteFile( h, content2, sizeof(content2), &count, NULL); CloseHandle( h); - /* works only in unicode, ascii crashes */ + /* works only in unicode, ansi crashes */ ret=GetPrivateProfileStringW(emptyW, keyW, emptyW, bufW, ARRAY_SIZE(bufW), TESTFILE2W); todo_wine ok(ret == 13, "expected 13, got %u\n", ret); @@ -158,7 +158,7 @@ static void test_profile_string(void) ok(!lstrcmpW(valsectionW,bufW), "expected %s, got %s\n", wine_dbgstr_w(valsectionW), wine_dbgstr_w(bufW) ); - /* works only in unicode, ascii crashes */ + /* works only in unicode, ansi crashes */ ret=GetPrivateProfileStringW(sW, emptyW, emptyW, bufW, ARRAY_SIZE(bufW), TESTFILE2W); ok(ret == 10, "expected 10, got %u\n", ret); ok(!lstrcmpW(valnokeyW,bufW), "expected %s, got %s\n",

1 0

Francois Gouget : kernel32/tests: Fix a couple of ASCII / ANSI mixups in ok() messages.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: eae25715f5d2dda369514f94d9e885cec613735e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae25715f5d2dda369514f94… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:46:39 2021 +0200 kernel32/tests: Fix a couple of ASCII / ANSI mixups in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/atom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index ad9e91ba257..4796d41d23d 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -86,7 +86,7 @@ static void test_add_atom(void) if (unicode_OS) { - ok( w_atom == atom, "Unicode atom does not match ASCII\n" ); + ok( w_atom == atom, "Unicode atom does not match ANSI one\n" ); ok( GetLastError() == 0xdeadbeef, "GlobalAddAtomW set last error\n" ); } @@ -344,7 +344,7 @@ static void test_local_add_atom(void) if (unicode_OS) { - ok( w_atom == atom, "Unicode atom does not match ASCII\n" ); + ok( w_atom == atom, "Unicode atom does not match ANSI one\n" ); ok( GetLastError() == 0xdeadbeef, "AddAtomW set last error\n" ); }

1 0

Francois Gouget : winedump: Fix the spelling of a trace and a comment.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: d5e85d975f1346569e101001c30b8b6e1c3516fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5e85d975f1346569e101001… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:57:32 2021 +0200 winedump: Fix the spelling of a trace and a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 25cfcba0630..12ec25b1a1c 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -299,7 +299,7 @@ static const char* get_varflags(unsigned flags) if (flags & 0x0002) X("addr-taken"); if (flags & 0x0004) X("compiler-gen"); if (flags & 0x0008) X("aggregated"); - if (flags & 0x0010) X("in-aggreate"); + if (flags & 0x0010) X("in-aggregate"); if (flags & 0x0020) X("aliased"); if (flags & 0x0040) X("alias"); if (flags & 0x0080) X("retval"); @@ -1189,7 +1189,7 @@ static void dump_defrange(const struct cv_addr_range* range, const void* last, c printf("%s\toffset:%x range:#%x\n", pfx, gap->gapStartOffset, gap->cbRange); } -/* return adress of first byte after the symbol */ +/* return address of first byte after the symbol */ static inline const char* get_last(const union codeview_symbol* sym) { return (const char*)sym + sym->generic.len + 2;

1 0

Francois Gouget : wpcap: Make wrap_pcap_handler() static.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: d7b3451f8a7893dbca76b8bba4b6611ec8caf42e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7b3451f8a7893dbca76b8bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:57:40 2021 +0200 wpcap: Make wrap_pcap_handler() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index 531fa05941f..f3eb06a2849 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -90,7 +90,7 @@ static const char * CDECL wrap_datalink_val_to_name( int link ) return pcap_datalink_val_to_name( link ); } -void wrap_pcap_handler( unsigned char *user, const struct pcap_pkthdr *hdr, const unsigned char *packet ) +static void wrap_pcap_handler( unsigned char *user, const struct pcap_pkthdr *hdr, const unsigned char *packet ) { struct handler_callback *cb = (struct handler_callback *)user; callbacks->handler( cb, hdr, packet );

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Implement PsGetCurrentProcessSessionId.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 5aec01a7af42cd0b026a763f0c5d13e609a254f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aec01a7af42cd0b026a763f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 27 16:45:05 2021 +1000 ntoskrnl.exe: Implement PsGetCurrentProcessSessionId. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36887 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f1248300683..5c3a42c3d76 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3008,6 +3008,13 @@ HANDLE WINAPI PsGetCurrentProcessId(void) return KeGetCurrentThread()->id.UniqueProcess; } +/*********************************************************************** + * PsGetCurrentProcessSessionId (NTOSKRNL.EXE.@) + */ +ULONG WINAPI PsGetCurrentProcessSessionId(void) +{ + return PsGetCurrentProcess()->info.PebBaseAddress->SessionId; +} /*********************************************************************** * PsGetCurrentThreadId (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 071dae6ceca..0208e2f633f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -888,7 +888,7 @@ @ stub PsGetContextThread @ stdcall PsGetCurrentProcess() IoGetCurrentProcess @ stdcall PsGetCurrentProcessId() -@ stub PsGetCurrentProcessSessionId +@ stdcall PsGetCurrentProcessSessionId() @ stdcall PsGetCurrentThread() KeGetCurrentThread @ stdcall PsGetCurrentThreadId() @ stub PsGetCurrentThreadPreviousMode

1 0

Huw Davies : ntdll: Remove old macOS register names.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 3fa8503de528eb8f86cc95e5b8e14db71a284a84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fa8503de528eb8f86cc95e5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 27 07:48:52 2021 +0100 ntdll: Remove old macOS register names. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 7067435bf0b..e033a3987ee 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -299,8 +299,6 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #include <i386/user_ldt.h> -/* work around silly renaming of struct members in OS X 10.5 */ -#if __DARWIN_UNIX03 && defined(_STRUCT_X86_EXCEPTION_STATE32) #define EAX_sig(context) ((context)->uc_mcontext->__ss.__eax) #define EBX_sig(context) ((context)->uc_mcontext->__ss.__ebx) #define ECX_sig(context) ((context)->uc_mcontext->__ss.__ecx) @@ -322,29 +320,6 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #define FPU_sig(context) NULL #define FPUX_sig(context) ((XSAVE_FORMAT *)&(context)->uc_mcontext->__fs.__fpu_fcw) #define XState_sig(context) NULL /* FIXME */ -#else -#define EAX_sig(context) ((context)->uc_mcontext->ss.eax) -#define EBX_sig(context) ((context)->uc_mcontext->ss.ebx) -#define ECX_sig(context) ((context)->uc_mcontext->ss.ecx) -#define EDX_sig(context) ((context)->uc_mcontext->ss.edx) -#define ESI_sig(context) ((context)->uc_mcontext->ss.esi) -#define EDI_sig(context) ((context)->uc_mcontext->ss.edi) -#define EBP_sig(context) ((context)->uc_mcontext->ss.ebp) -#define CS_sig(context) ((context)->uc_mcontext->ss.cs) -#define DS_sig(context) ((context)->uc_mcontext->ss.ds) -#define ES_sig(context) ((context)->uc_mcontext->ss.es) -#define FS_sig(context) ((context)->uc_mcontext->ss.fs) -#define GS_sig(context) ((context)->uc_mcontext->ss.gs) -#define SS_sig(context) ((context)->uc_mcontext->ss.ss) -#define EFL_sig(context) ((context)->uc_mcontext->ss.eflags) -#define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->ss.eip)) -#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->ss.esp)) -#define TRAP_sig(context) ((context)->uc_mcontext->es.trapno) -#define ERROR_sig(context) ((context)->uc_mcontext->es.err) -#define FPU_sig(context) NULL -#define FPUX_sig(context) ((XSAVE_FORMAT *)&(context)->uc_mcontext->fs.fpu_fcw) -#define XState_sig(context) NULL /* FIXME */ -#endif #elif defined(__NetBSD__)

1 0

Huw Davies : ntdll: Remove unnecessary casts on macOS registers.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: dd37c3c4a04ef783ada136f561c0d4884a698713 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd37c3c4a04ef783ada136f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 27 07:48:53 2021 +0100 ntdll: Remove unnecessary casts on macOS registers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index e033a3987ee..1c1022886fc 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -313,8 +313,8 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #define GS_sig(context) ((context)->uc_mcontext->__ss.__gs) #define SS_sig(context) ((context)->uc_mcontext->__ss.__ss) #define EFL_sig(context) ((context)->uc_mcontext->__ss.__eflags) -#define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__eip)) -#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__esp)) +#define EIP_sig(context) ((context)->uc_mcontext->__ss.__eip) +#define ESP_sig(context) ((context)->uc_mcontext->__ss.__esp) #define TRAP_sig(context) ((context)->uc_mcontext->__es.__trapno) #define ERROR_sig(context) ((context)->uc_mcontext->__es.__err) #define FPU_sig(context) NULL diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 8065f1b8220..a9bdbf62929 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -229,8 +229,8 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, #define FS_sig(context) ((context)->uc_mcontext->__ss.__fs) #define GS_sig(context) ((context)->uc_mcontext->__ss.__gs) #define EFL_sig(context) ((context)->uc_mcontext->__ss.__rflags) -#define RIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__rip)) -#define RSP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__rsp)) +#define RIP_sig(context) ((context)->uc_mcontext->__ss.__rip) +#define RSP_sig(context) ((context)->uc_mcontext->__ss.__rsp) #define TRAP_sig(context) ((context)->uc_mcontext->__es.__trapno) #define ERROR_sig(context) ((context)->uc_mcontext->__es.__err) #define FPU_sig(context) ((XMM_SAVE_AREA32 *)&(context)->uc_mcontext->__fs.__fpu_fcw)

1 0

Tim Clem : user32: Load libpng in DllMain.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: b4333216a73dbc97e09dcbcf194e8abed5f41ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4333216a73dbc97e09dcbcf… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Aug 26 13:01:19 2021 -0700 user32: Load libpng in DllMain. libpng is currently loaded on the first attempt to access a PNG icon or cursor. That creates a race condition that can deadlock the loader in certain circumstances if LoadIcon or LoadCursor is called while the loader lock is held, e.g. from a DllMain. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 21 +++------------------ dlls/user32/png.c | 4 ++-- dlls/user32/user_main.c | 3 +++ dlls/user32/user_private.h | 3 +++ 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7ad0a04a551..dc831db9287 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -111,21 +111,6 @@ static int get_display_bpp(void) return ret; } -static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - -static const struct png_funcs *png_funcs; - -static BOOL WINAPI load_libpng( INIT_ONCE *once, void *param, void **context ) -{ - __wine_init_unix_lib( user32_module, DLL_PROCESS_ATTACH, NULL, &png_funcs ); - return TRUE; -} - -static BOOL have_libpng(void) -{ - return InitOnceExecuteOnce( &init_once, load_libpng, NULL, NULL ) && png_funcs; -} - static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) { struct cursoricon_object *obj; @@ -571,7 +556,7 @@ static BOOL CURSORICON_GetResIconEntry( LPCVOID dir, DWORD size, int n, *width = icon->bWidth; *height = icon->bHeight; *bits = resdir->idEntries[n].wBitCount; - if (!*width && !*height && have_libpng()) *width = *height = 256; + if (!*width && !*height && png_funcs) *width = *height = 256; return TRUE; } @@ -704,7 +689,7 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, if (info->biSize == PNG_SIGN) { - if (have_libpng()) return png_funcs->get_png_info(info, size, width, height, bits); + if (png_funcs) return png_funcs->get_png_info(info, size, width, height, bits); *width = *height = *bits = 0; return TRUE; } @@ -858,7 +843,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE { BITMAPINFO *bmi_png; - if (!have_libpng()) return 0; + if (!png_funcs) return 0; bmi_png = png_funcs->load_png( (const char *)bmi, &maxsize ); if (bmi_png) { diff --git a/dlls/user32/png.c b/dlls/user32/png.c index a994c6de5c2..bcd619fe52b 100644 --- a/dlls/user32/png.c +++ b/dlls/user32/png.c @@ -293,7 +293,7 @@ static BITMAPINFO * CDECL load_png(const char *png_data, DWORD *size) return info; } -static const struct png_funcs png_funcs = +static const struct png_funcs funcs = { get_png_info, load_png @@ -335,7 +335,7 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p LOAD_FUNCPTR(png_set_read_fn); #undef LOAD_FUNCPTR - *(const struct png_funcs **)ptr_out = &png_funcs; + *(const struct png_funcs **)ptr_out = &funcs; return STATUS_SUCCESS; } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 303f19accfc..30e5d154d3d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -52,6 +52,8 @@ static HPALETTE hPrimaryPalette; static DWORD exiting_thread_id; +const struct png_funcs *png_funcs = NULL; + extern void WDML_NotifyThreadDetach(void); #ifdef __MINGW32__ @@ -332,6 +334,7 @@ static BOOL process_attach(void) palette_init(); keyboard_init(); + __wine_init_unix_lib( user32_module, DLL_PROCESS_ATTACH, NULL, &png_funcs ); return TRUE; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7c4d9015976..0be02919bbe 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -380,6 +380,9 @@ struct png_funcs BITMAPINFO * (CDECL *load_png)(const char *png_data, DWORD *size); }; +/* May be NULL if libpng cannot be loaded. */ +extern const struct png_funcs *png_funcs DECLSPEC_HIDDEN; + /* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */ #ifdef __MINGW32__ #undef assert

1 0

Alexandre Julliard : winegcc: Fix subsystem check to avoid running winebuild on Unix libraries.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: a7076690b186ad876d2d12d9cc4b49cb692feed0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7076690b186ad876d2d12d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 27 12:25:26 2021 +0200 winegcc: Fix subsystem check to avoid running winebuild on Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 710f6dc900d..5f8e6c0e086 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1387,7 +1387,7 @@ static void build(struct options* opts) else entry_point = opts->entry_point; /* run winebuild to generate the .spec.o file */ - if (!(opts->unix_lib && opts->subsystem && !strcmp(opts->subsystem, "native"))) + if (!(opts->unix_lib && opts->subsystem && !strcmp(opts->subsystem, "unixlib"))) spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); if (fake_module) return; /* nothing else to do */

1 0