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

Jacek Caban : gdi32: Use NtGdiGetTextExtentExPointW for GetTextExtentExPoint.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: c0486678ebb55cbb8beeed6cbbe59021daf205a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0486678ebb55cbb8beeed6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:41:56 2021 +0200 gdi32: Use NtGdiGetTextExtentExPointW for GetTextExtentExPoint. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 215 +++--------------------------------------------------- dlls/gdi32/text.c | 95 ++++++++++++++++++++++++ include/ntgdi.h | 4 +- 3 files changed, 107 insertions(+), 207 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0486678ebb55cbb8bee…

1 0

Jacek Caban : gdi32: Use NtGdiGetTextMetricsW for GetTextMetrics.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 6caf861a63403dd2a0b58237271d89cbc58af171 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6caf861a63403dd2a0b58237… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:42:10 2021 +0200 gdi32: Use NtGdiGetTextMetricsW for GetTextMetrics. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 16 ++------------- dlls/gdi32/text.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 029990bf847..bfb27ccd1af 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4820,21 +4820,9 @@ BOOL WINAPI NtGdiGetTextExtentExW( HDC hdc, const WCHAR *str, INT count, INT max } /*********************************************************************** - * GetTextMetricsA (GDI32.@) + * NtGdiGetTextMetricsW (win32u.@) */ -BOOL WINAPI GetTextMetricsA( HDC hdc, TEXTMETRICA *metrics ) -{ - TEXTMETRICW tm32; - - if (!GetTextMetricsW( hdc, &tm32 )) return FALSE; - FONT_TextMetricWToA( &tm32, metrics ); - return TRUE; -} - -/*********************************************************************** - * GetTextMetricsW (GDI32.@) - */ -BOOL WINAPI GetTextMetricsW( HDC hdc, TEXTMETRICW *metrics ) +BOOL WINAPI NtGdiGetTextMetricsW( HDC hdc, TEXTMETRICW *metrics, ULONG flags ) { PHYSDEV physdev; BOOL ret = FALSE; diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 86b58555ad5..2d3902d2433 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -699,6 +699,44 @@ static WCHAR *text_mbtowc( HDC hdc, const char *str, INT count, INT *plenW, UINT return strW; } +static void text_metric_WtoA( const TEXTMETRICW *tmW, TEXTMETRICA *tmA ) +{ + tmA->tmHeight = tmW->tmHeight; + tmA->tmAscent = tmW->tmAscent; + tmA->tmDescent = tmW->tmDescent; + tmA->tmInternalLeading = tmW->tmInternalLeading; + tmA->tmExternalLeading = tmW->tmExternalLeading; + tmA->tmAveCharWidth = tmW->tmAveCharWidth; + tmA->tmMaxCharWidth = tmW->tmMaxCharWidth; + tmA->tmWeight = tmW->tmWeight; + tmA->tmOverhang = tmW->tmOverhang; + tmA->tmDigitizedAspectX = tmW->tmDigitizedAspectX; + tmA->tmDigitizedAspectY = tmW->tmDigitizedAspectY; + tmA->tmFirstChar = min( tmW->tmFirstChar, 255 ); + if (tmW->tmCharSet == SYMBOL_CHARSET) + { + tmA->tmFirstChar = 0x1e; + tmA->tmLastChar = 0xff; /* win9x behaviour - we need the OS2 table data to calculate correctly */ + } + else if (tmW->tmPitchAndFamily & TMPF_TRUETYPE) + { + tmA->tmFirstChar = tmW->tmDefaultChar - 1; + tmA->tmLastChar = min( tmW->tmLastChar, 0xff ); + } + else + { + tmA->tmFirstChar = min( tmW->tmFirstChar, 0xff ); + tmA->tmLastChar = min( tmW->tmLastChar, 0xff ); + } + tmA->tmDefaultChar = tmW->tmDefaultChar; + tmA->tmBreakChar = tmW->tmBreakChar; + tmA->tmItalic = tmW->tmItalic; + tmA->tmUnderlined = tmW->tmUnderlined; + tmA->tmStruckOut = tmW->tmStruckOut; + tmA->tmPitchAndFamily = tmW->tmPitchAndFamily; + tmA->tmCharSet = tmW->tmCharSet; +} + /*********************************************************************** * ExtTextOutW (GDI32.@) */ @@ -1183,3 +1221,23 @@ BOOL WINAPI GetTextExtentPointW( HDC hdc, const WCHAR *str, INT count, SIZE *siz { return GetTextExtentPoint32W( hdc, str, count, size ); } + +/*********************************************************************** + * GetTextMetricsW (GDI32.@) + */ +BOOL WINAPI GetTextMetricsW( HDC hdc, TEXTMETRICW *metrics ) +{ + return NtGdiGetTextMetricsW( hdc, metrics, 0 ); +} + +/*********************************************************************** + * GetTextMetricsA (GDI32.@) + */ +BOOL WINAPI GetTextMetricsA( HDC hdc, TEXTMETRICA *metrics ) +{ + TEXTMETRICW tm32; + + if (!GetTextMetricsW( hdc, &tm32 )) return FALSE; + text_metric_WtoA( &tm32, metrics ); + return TRUE; +}

1 0

Jacek Caban : gdi32: Store font code page in DC_ATTR.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 7ad7ec5b8b903733bc521cfdc1200bf4d76fb182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ad7ec5b8b903733bc521cfd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:42:24 2021 +0200 gdi32: Store font code page in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/font.c | 28 ++++++---------------------- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/text.c | 9 +++++++++ include/ntgdi.h | 1 + 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 51b754d1ccd..e4f643389d5 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -80,8 +80,8 @@ static void set_initial_dc_state( DC *dc ) dc->attr->vport_ext.cy = 1; dc->attr->miter_limit = 10.0f; /* 10.0 is the default, from MSDN */ dc->attr->layout = 0; - dc->font_code_page = CP_ACP; dc->attr->rop_mode = R2_COPYPEN; + dc->attr->font_code_page = CP_ACP; dc->attr->poly_fill_mode = ALTERNATE; dc->attr->stretch_blt_mode = BLACKONWHITE; dc->attr->rel_abs_mode = ABSOLUTE; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index bfb27ccd1af..e267190fb64 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4163,22 +4163,6 @@ static BOOL get_char_positions_indices( DC *dc, const WORD *indices, INT count, return TRUE; } -/*********************************************************************** - * GdiGetCodePage (GDI32.@) - */ -DWORD WINAPI GdiGetCodePage( HDC hdc ) -{ - UINT cp = CP_ACP; - DC *dc = get_dc_ptr( hdc ); - - if (dc) - { - cp = dc->font_code_page; - release_dc_ptr( dc ); - } - return cp; -} - /*********************************************************************** * get_text_charset_info * @@ -4457,14 +4441,14 @@ static void update_font_code_page( DC *dc, HANDLE font ) /* Hmm, nicely designed api this one! */ if (TranslateCharsetInfo( ULongToPtr(charset), &csi, TCI_SRCCHARSET) ) - dc->font_code_page = csi.ciACP; + dc->attr->font_code_page = csi.ciACP; else { switch(charset) { case OEM_CHARSET: - dc->font_code_page = GetOEMCP(); + dc->attr->font_code_page = GetOEMCP(); break; case DEFAULT_CHARSET: - dc->font_code_page = GetACP(); + dc->attr->font_code_page = GetACP(); break; case VISCII_CHARSET: @@ -4481,17 +4465,17 @@ static void update_font_code_page( DC *dc, HANDLE font ) each of these, but since it's broken anyway we'll just use CP_ACP and hope it'll go away... */ - dc->font_code_page = CP_ACP; + dc->attr->font_code_page = CP_ACP; break; default: FIXME("Can't find codepage for charset %d\n", charset); - dc->font_code_page = CP_ACP; + dc->attr->font_code_page = CP_ACP; break; } } - TRACE("charset %d => cp %d\n", charset, dc->font_code_page); + TRACE( "charset %d => cp %d\n", charset, dc->attr->font_code_page ); } /*********************************************************************** diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 522bd51b6cc..91230666fad 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -99,7 +99,6 @@ typedef struct tagDC const struct font_gamma_ramp *font_gamma_ramp; - UINT font_code_page; INT breakExtra; /* breakTotalExtra / breakCount */ INT breakRem; /* breakTotalExtra % breakCount */ ABORTPROC pAbortProc; /* AbortProc for Printing */ diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 2d3902d2433..ffbc9806e78 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -737,6 +737,15 @@ static void text_metric_WtoA( const TEXTMETRICW *tmW, TEXTMETRICA *tmA ) tmA->tmCharSet = tmW->tmCharSet; } +/*********************************************************************** + * GdiGetCodePage (GDI32.@) + */ +DWORD WINAPI GdiGetCodePage( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->font_code_page : CP_ACP; +} + /*********************************************************************** * ExtTextOutW (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 52eb0767617..14808593501 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -156,6 +156,7 @@ typedef struct DC_ATTR SIZE vport_ext; /* viewport extent */ SIZE virtual_res; SIZE virtual_size; + UINT font_code_page; void *emf; } DC_ATTR;

1 0

Piotr Caban : msvcrt: Introduce macro for creating exception class.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: f6f8b30c47bc28be5df692743fcf81c7952153ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f8b30c47bc28be5df69274… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:38 2021 +0200 msvcrt: Introduce macro for creating exception class. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 192 +++++++----------------------------------------- dlls/msvcrt/cppexcept.h | 101 +++++++++++++++++++++++-- 2 files changed, 121 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6f8b30c47bc28be5df6…

1 0

Alexandre Julliard : ntdll: Fix exception information for SSE floating point faults.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 8a8889340fbe6553e1a339efb980ff7bd800bad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a8889340fbe6553e1a339ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 20 11:18:36 2021 +0200 ntdll: Fix exception information for SSE floating point faults. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 17 ++++++++--------- dlls/ntdll/unix/signal_i386.c | 5 ++--- dlls/ntdll/unix/signal_x86_64.c | 8 ++++++++ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8140a3aefb6..6af68317732 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1332,8 +1332,11 @@ static DWORD simd_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_R "exception code: %#x, should be %#x\n", rec->ExceptionCode, STATUS_FLOAT_MULTIPLE_TRAPS); ok( rec->NumberParameters == is_wow64 ? 2 : 1, "# of params: %i\n", rec->NumberParameters); - if (rec->NumberParameters >= 1) - ok( rec->ExceptionInformation[0] == 0, "param #1: %lx, should be 0\n", rec->ExceptionInformation[0]); + ok( rec->ExceptionInformation[0] == 0, "param #1: %lx, should be 0\n", rec->ExceptionInformation[0]); + if (rec->NumberParameters == 2) + ok( rec->ExceptionInformation[1] == ((XSAVE_FORMAT *)context->ExtendedRegisters)->MxCsr, + "param #1: %lx / %x\n", rec->ExceptionInformation[1], + ((XSAVE_FORMAT *)context->ExtendedRegisters)->MxCsr); } context->Eip += 3; /* skip divps */ } @@ -3413,14 +3416,10 @@ static DWORD WINAPI simd_fault_handler( EXCEPTION_RECORD *rec, ULONG64 frame, ULONG expect = *stage == 2 ? EXCEPTION_FLT_DIVIDE_BY_ZERO : EXCEPTION_FLT_INVALID_OPERATION; ok( rec->ExceptionCode == expect, "exception code: %#x, should be %#x\n", rec->ExceptionCode, expect ); - todo_wine ok( rec->NumberParameters == 2, "# of params: %i, should be 2\n", rec->NumberParameters); - if (rec->NumberParameters == 2) - { - /* no idea what these mean */ - ok( rec->ExceptionInformation[0] == 0, "param #0: %lx\n", rec->ExceptionInformation[0]); - ok( rec->ExceptionInformation[1] != 0, "param #1: %lx\n", rec->ExceptionInformation[1]); - } + ok( rec->ExceptionInformation[0] == 0, "param #0: %lx\n", rec->ExceptionInformation[0]); + ok( rec->ExceptionInformation[1] == context->MxCsr, "param #1: %lx / %lx\n", + rec->ExceptionInformation[1], context->MxCsr); } context->Rip += 3; /* skip divps */ } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 0b120ad95be..1cd6ef7bb39 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1956,9 +1956,8 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) siginfo->si_code); rec.ExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS; - rec.NumberParameters = 1; - /* no idea what meaning is actually behind this but that's what native does */ - rec.ExceptionInformation[0] = 0; + rec.ExceptionInformation[rec.NumberParameters++] = 0; + if (is_wow64) rec.ExceptionInformation[rec.NumberParameters++] = ((XSAVE_FORMAT *)xcontext.c.ExtendedRegisters)->MxCsr; break; default: WINE_ERR( "Got unexpected trap %d\n", TRAP_sig(ucontext) ); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 471ab8f8f90..2d55bd006c7 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2664,6 +2664,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; + ucontext_t *ucontext = sigcontext; switch (siginfo->si_code) { @@ -2693,6 +2694,13 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } + + if (TRAP_sig(ucontext) == TRAP_x86_CACHEFLT) + { + rec.NumberParameters = 2; + rec.ExceptionInformation[0] = 0; + rec.ExceptionInformation[1] = FPU_sig(ucontext) ? FPU_sig(ucontext)->MxCsr : 0; + } setup_exception( sigcontext, &rec ); }

1 0

Alexandre Julliard : ntdll: Don't handle breakpoint interrupts in Wow64 mode.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 2736fabc585b89328ae64dafaafabd262d2f200b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2736fabc585b89328ae64daf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 20 11:33:32 2021 +0200 ntdll: Don't handle breakpoint interrupts in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 2d55bd006c7..f541306d950 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2436,8 +2436,10 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r rec->ExceptionCode = STATUS_ASSERTION_FAILURE; break; case 0x2d: - switch (context->Rax) + if (CS_sig(sigcontext) == cs64_sel) { + switch (context->Rax) + { case 1: /* BREAKPOINT_PRINT */ case 3: /* BREAKPOINT_LOAD_SYMBOLS */ case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ @@ -2445,6 +2447,7 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r RIP_sig(sigcontext) += 3; leave_handler( sigcontext ); return TRUE; + } } context->Rip += 3; rec->ExceptionCode = EXCEPTION_BREAKPOINT;

1 0

Esdras Tarsis : api-ms-win-core-psm-appnotify-l1-1-0: Add dll.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 17ba916c564236c9940ad736ff15a87fc5d1b12f URL: https://source.winehq.org/git/wine.git/?a=commit;h=17ba916c564236c9940ad736… Author: Esdras Tarsis <esdrastarsis(a)gmail.com> Date: Fri Aug 13 16:40:03 2021 -0300 api-ms-win-core-psm-appnotify-l1-1-0: Add dll. Needed for The Riftbreaker. Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-psm-appnotify-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-psm-appnotify-l1-1-0.spec | 2 ++ 4 files changed, 6 insertions(+) diff --git a/configure b/configure index 5608de31912..cc4f64347f1 100755 --- a/configure +++ b/configure @@ -1017,6 +1017,7 @@ enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_ansi_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 enable_api_ms_win_core_psapi_obsolete_l1_1_0 +enable_api_ms_win_core_psm_appnotify_l1_1_0 enable_api_ms_win_core_quirks_l1_1_0 enable_api_ms_win_core_realtime_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 @@ -20136,6 +20137,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-profile-l1-1-0 enable_api_ms_win_co wine_fn_config_makefile dlls/api-ms-win-core-psapi-ansi-l1-1-0 enable_api_ms_win_core_psapi_ansi_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-psapi-l1-1-0 enable_api_ms_win_core_psapi_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-psapi-obsolete-l1-1-0 enable_api_ms_win_core_psapi_obsolete_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-psm-appnotify-l1-1-0 enable_api_ms_win_core_psm_appnotify_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-quirks-l1-1-0 enable_api_ms_win_core_quirks_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-realtime-l1-1-0 enable_api_ms_win_core_realtime_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 diff --git a/configure.ac b/configure.ac index 53c1a36a169..cb8fa573c37 100644 --- a/configure.ac +++ b/configure.ac @@ -2837,6 +2837,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-profile-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-ansi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-obsolete-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psm-appnotify-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-quirks-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l1-1-0) diff --git a/dlls/api-ms-win-core-psm-appnotify-l1-1-0/Makefile.in b/dlls/api-ms-win-core-psm-appnotify-l1-1-0/Makefile.in new file mode 100644 index 00000000000..8a3d2ad98cb --- /dev/null +++ b/dlls/api-ms-win-core-psm-appnotify-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-psm-appnotify-l1-1-0.dll diff --git a/dlls/api-ms-win-core-psm-appnotify-l1-1-0/api-ms-win-core-psm-appnotify-l1-1-0.spec b/dlls/api-ms-win-core-psm-appnotify-l1-1-0/api-ms-win-core-psm-appnotify-l1-1-0.spec new file mode 100644 index 00000000000..8b069d66e62 --- /dev/null +++ b/dlls/api-ms-win-core-psm-appnotify-l1-1-0/api-ms-win-core-psm-appnotify-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stub RegisterAppStateChangeNotification +@ stub UnregisterAppStateChangeNotification

1 0

Zebediah Figura : ws2_32: Use realloc() in get_{host, proto, serv}ent_buffer().
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 4af902eb4eacc33b9cf89a9093362115d9ebf6ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=4af902eb4eacc33b9cf89a90… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 18 23:25:49 2021 -0500 ws2_32: Use realloc() in get_{host, proto, serv}ent_buffer(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 93464232d32..492400b17a7 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -591,13 +591,18 @@ int WINAPI GetNameInfoW( const SOCKADDR *addr, socklen_t addr_len, WCHAR *host, static struct hostent *get_hostent_buffer( unsigned int size ) { struct per_thread_data *data = get_per_thread_data(); - if (data->he_buffer) + struct hostent *new_buffer; + + if (data->he_len < size) { - if (data->he_len >= size) return data->he_buffer; - free( data->he_buffer ); + if (!(new_buffer = realloc( data->he_buffer, size ))) + { + SetLastError( WSAENOBUFS ); + return NULL; + } + data->he_buffer = new_buffer; + data->he_len = size; } - data->he_buffer = malloc( (data->he_len = size) ); - if (!data->he_buffer) SetLastError(WSAENOBUFS); return data->he_buffer; } @@ -1004,15 +1009,18 @@ static char *next_non_space( const char *p, const char *end ) static struct protoent *get_protoent_buffer( unsigned int size ) { struct per_thread_data *data = get_per_thread_data(); + struct protoent *new_buffer; - if (data->pe_buffer) + if (data->pe_len < size) { - if (data->pe_len >= size) return data->pe_buffer; - free( data->pe_buffer ); + if (!(new_buffer = realloc( data->pe_buffer, size ))) + { + SetLastError( WSAENOBUFS ); + return NULL; + } + data->pe_buffer = new_buffer; + data->pe_len = size; } - data->pe_len = size; - data->pe_buffer = malloc( size ); - if (!data->pe_buffer) SetLastError( WSAENOBUFS ); return data->pe_buffer; } @@ -1187,14 +1195,18 @@ struct protoent * WINAPI getprotobynumber( int number ) static struct servent *get_servent_buffer( int size ) { struct per_thread_data *data = get_per_thread_data(); - if (data->se_buffer) + struct servent *new_buffer; + + if (data->se_len < size) { - if (data->se_len >= size) return data->se_buffer; - free( data->se_buffer ); + if (!(new_buffer = realloc( data->se_buffer, size ))) + { + SetLastError( WSAENOBUFS ); + return NULL; + } + data->se_buffer = new_buffer; + data->se_len = size; } - data->se_len = size; - data->se_buffer = malloc( size ); - if (!data->se_buffer) SetLastError( WSAENOBUFS ); return data->se_buffer; }

1 0

Zebediah Figura : ws2_32: Properly implement getsockopt(SO_CONNECT_TIME).
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: eec47af63865ceb9eb24b3c5d9a628027b4965c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eec47af63865ceb9eb24b3c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 18 23:25:50 2021 -0500 ws2_32: Properly implement getsockopt(SO_CONNECT_TIME). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 29 ++++++++--------------------- include/wine/afd.h | 1 + server/sock.c | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fd6ea25c751..30f233fa78f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1424,6 +1424,14 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return 0; } + case SO_CONNECT_TIME: + if (!optlen || !optval) + { + SetLastError( WSAEFAULT ); + return -1; + } + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_CONNECT_TIME, optval, optlen ); + case SO_DEBUG: WARN( "returning 0 for SO_DEBUG\n" ); *(DWORD *)optval = 0; @@ -1450,27 +1458,6 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return ret; } - case SO_CONNECT_TIME: - { - static int pretendtime = 0; - struct sockaddr addr; - int len = sizeof(addr); - - if (!optlen || *optlen < sizeof(DWORD) || !optval) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - if (getpeername(s, &addr, &len) == SOCKET_ERROR) - *(DWORD *)optval = ~0u; - else - { - if (!pretendtime) FIXME("SO_CONNECT_TIME - faking results\n"); - *(DWORD *)optval = pretendtime++; - } - *optlen = sizeof(DWORD); - return ret; - } /* As mentioned in setsockopt, Windows ignores this, so we * always return true here */ case SO_DONTROUTE: diff --git a/include/wine/afd.h b/include/wine/afd.h index 49bbcccd3af..e67ecae25a9 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -233,6 +233,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO WINE_AFD_IOC(289) #define IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS WINE_AFD_IOC(290) #define IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS WINE_AFD_IOC(291) +#define IOCTL_AFD_WINE_GET_SO_CONNECT_TIME WINE_AFD_IOC(292) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 27477200ed0..50bfc08e145 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2807,6 +2807,23 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_WINE_GET_SO_CONNECT_TIME: + { + DWORD time = ~0u; + + if (get_reply_max_size() < sizeof(time)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + if (sock->state == SOCK_CONNECTED) + time = (current_time - sock->connect_time) / 10000000; + + set_reply_data( &time, sizeof(time) ); + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Jacek Caban : gdi32: Use NtGdiStrokeAndFillPath for StrokeAndFillPath.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: dc19c31d8baf841c2201204137d4c7b9aceb9484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc19c31d8baf841c22012041… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 19 10:23:15 2021 +0200 gdi32: Use NtGdiStrokeAndFillPath for StrokeAndFillPath. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 11 ++++++++++- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 6 ++---- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 0f48d6876dd..e567808016b 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -1197,7 +1197,16 @@ BOOL EMFDC_FillPath( DC_ATTR *dc_attr ) */ BOOL CDECL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) { - return emfdrv_stroke_and_fill_path( dev, EMR_STROKEANDFILLPATH ); + /* FIXME: update bound rect */ + return TRUE; +} + +/********************************************************************** + * EMFDC_StrokeAndFillPath + */ +BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr ) +{ + return emfdrv_stroke_and_fill_path( dc_attr->emf, EMR_STROKEANDFILLPATH ); } /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index bb90ee471f1..a159aa875a6 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -217,5 +217,6 @@ extern BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT wid INT height_dst, INT x_src, INT y_src, INT width_src, INT height_src, const void *bits, const BITMAPINFO *info, UINT coloruse, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index c5e8d29837a..0e7c0574024 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1531,6 +1531,18 @@ BOOL WINAPI FillPath( HDC hdc ) return NtGdiFillPath( hdc ); } +/******************************************************************* + * StrokeAndFillPath (GDI32.@) + */ +BOOL WINAPI StrokeAndFillPath( HDC hdc ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_StrokeAndFillPath( dc_attr )) return FALSE; + return NtGdiStrokeAndFillPath( hdc ); +} + /*********************************************************************** * FlattenPath (GDI32.@) */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index b903ebc0c15..f08592598b9 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1901,11 +1901,9 @@ static struct gdi_path *PATH_WidenPath(DC *dc) /******************************************************************* - * StrokeAndFillPath [GDI32.@] - * - * + * NtGdiStrokeAndFillPath (win32u.@) */ -BOOL WINAPI StrokeAndFillPath(HDC hdc) +BOOL WINAPI NtGdiStrokeAndFillPath( HDC hdc ) { BOOL ret = FALSE; DC *dc = get_dc_ptr( hdc );

1 0