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

Gerald Pfeifer : nsiproxy: Include sys/types.h from udp.c.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 070185c3412d3e1802248e9aa1a600863a85ae7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=070185c3412d3e1802248e9a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 19 08:39:27 2021 +0200 nsiproxy: Include sys/types.h from udp.c. This addresses failures like In file included from dlls/nsiproxy.sys/udp.c:34: In file included from /usr/include/sys/socketvar.h:38: In file included from /usr/include/sys/selinfo.h:36: /usr/include/sys/event.h:77:2: error: unknown type name 'u_short' on non-Linux platforms. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/udp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index b6109ef9592..9f9966815c2 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -22,6 +22,10 @@ #include <stdarg.h> #include <stddef.h> +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + #ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> #endif

1 0

Gerald Pfeifer : nsiproxy: Add $(PROCSTAT_LIBS) to EXTRALIBS.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: c5d9f2f7c665700f183b81201151ab2096594841 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d9f2f7c665700f183b8120… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 19 11:09:00 2021 +0200 nsiproxy: Add $(PROCSTAT_LIBS) to EXTRALIBS. We try to use libprocstat on non-Linux platforms and detect its presence in the configure phase. Make sure we actually link this library in that case by adding $(PROCSTAT_LIBS) to EXTRALIBS. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index cee4b72c33f..183a6374144 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -1,5 +1,6 @@ MODULE = nsiproxy.sys IMPORTS = ntoskrnl uuid +EXTRALIBS = $(PROCSTAT_LIBS) EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \

1 0

Jacek Caban : gdi32: Move GetCharacterPlacementA to text.c.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: e27c61be21a5abca5520b3e539a1f9bf112c69be URL: https://source.winehq.org/git/wine.git/?a=commit;h=e27c61be21a5abca5520b3e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:41:13 2021 +0200 gdi32: Move GetCharacterPlacementA to text.c. 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 | 53 ----------------------------------------------------- dlls/gdi32/text.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 53 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6905d21751b..4d6f11d5080 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6937,59 +6937,6 @@ DWORD WINAPI GetGlyphIndicesW(HDC hdc, LPCWSTR lpstr, INT count, return ret; } -/************************************************************************* - * GetCharacterPlacementA [GDI32.@] - * - * See GetCharacterPlacementW. - * - * NOTES: - * the web browser control of ie4 calls this with dwFlags=0 - */ -DWORD WINAPI -GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, - INT nMaxExtent, GCP_RESULTSA *lpResults, - DWORD dwFlags) -{ - WCHAR *lpStringW; - INT uCountW; - GCP_RESULTSW resultsW; - DWORD ret; - UINT font_cp; - - TRACE("%s, %d, %d, 0x%08x\n", - debugstr_an(lpString, uCount), uCount, nMaxExtent, dwFlags); - - lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp); - - if (!lpResults) - { - ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, NULL, dwFlags); - HeapFree(GetProcessHeap(), 0, lpStringW); - return ret; - } - - /* both structs are equal in size */ - memcpy(&resultsW, lpResults, sizeof(resultsW)); - - if(lpResults->lpOutString) - resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW); - - ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, &resultsW, dwFlags); - - lpResults->nGlyphs = resultsW.nGlyphs; - lpResults->nMaxFit = resultsW.nMaxFit; - - if(lpResults->lpOutString) { - WideCharToMultiByte(font_cp, 0, resultsW.lpOutString, uCountW, - lpResults->lpOutString, uCount, NULL, NULL ); - } - - HeapFree(GetProcessHeap(), 0, lpStringW); - HeapFree(GetProcessHeap(), 0, resultsW.lpOutString); - - return ret; -} - /************************************************************************* * GetCharABCWidthsFloatA [GDI32.@] * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 66a51e89817..82bf709fe19 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1009,3 +1009,46 @@ DWORD WINAPI GetCharacterPlacementW( HDC hdc, const WCHAR *str, INT count, INT m HeapFree( GetProcessHeap(), 0, kern ); return ret; } + +/************************************************************************* + * GetCharacterPlacementA (GDI32.@) + */ +DWORD WINAPI GetCharacterPlacementA( HDC hdc, const char *str, INT count, INT max_extent, + GCP_RESULTSA *result, DWORD flags ) +{ + GCP_RESULTSW resultsW; + WCHAR *strW; + INT countW; + DWORD ret; + UINT font_cp; + + TRACE( "%s, %d, %d, 0x%08x\n", debugstr_an(str, count), count, max_extent, flags ); + + strW = text_mbtowc( hdc, str, count, &countW, &font_cp ); + + if (!result) + { + ret = GetCharacterPlacementW( hdc, strW, countW, max_extent, NULL, flags ); + HeapFree( GetProcessHeap(), 0, strW ); + return ret; + } + + /* both structs are equal in size */ + memcpy( &resultsW, result, sizeof(resultsW) ); + + if (result->lpOutString) + resultsW.lpOutString = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * countW ); + + ret = GetCharacterPlacementW( hdc, strW, countW, max_extent, &resultsW, flags ); + + result->nGlyphs = resultsW.nGlyphs; + result->nMaxFit = resultsW.nMaxFit; + + if (result->lpOutString) + WideCharToMultiByte( font_cp, 0, resultsW.lpOutString, countW, + result->lpOutString, count, NULL, NULL ); + + HeapFree( GetProcessHeap(), 0, strW ); + HeapFree( GetProcessHeap(), 0, resultsW.lpOutString ); + return ret; +}

1 0

Jacek Caban : gdi32: Use NtGdiGetOutlineTextMetricsInternalW for GetOutlineTextMetrics.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 0669b6cd4868e50dc7c0b41aff9dcb39e00f9d0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0669b6cd4868e50dc7c0b41a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:43:13 2021 +0200 gdi32: Use NtGdiGetOutlineTextMetricsInternalW for GetOutlineTextMetrics. 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 | 188 ++---------------------------------------------------- dlls/gdi32/text.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 183 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0669b6cd4868e50dc7c0…

1 0

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

Aug. 20, 2021

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

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

Aug. 20, 2021

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

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

Aug. 19, 2021

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

Jacek Caban : gdi32: Use NtGdiStrokeAndFillPath for StrokeAndFillPath.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

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

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

Aug. 19, 2021

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

Nikolay Sivov : msxml3: Do not depend on libxml2 for legacy IXMLParser object stub.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: 141155e74cc940015f3ed107ea1e5793c0baaf9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=141155e74cc940015f3ed107… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 17:29:04 2021 +0300 msxml3: Do not depend on libxml2 for legacy IXMLParser object stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/xmlparser.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c index 6fcdb82c56b..0fcb9e34340 100644 --- a/dlls/msxml3/xmlparser.c +++ b/dlls/msxml3/xmlparser.c @@ -19,27 +19,15 @@ */ #define COBJMACROS -#include "config.h" - #include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -# include <libxml/xmlerror.h> -# include <libxml/HTMLtree.h> -#endif - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" -#include "msxml_private.h" +#include "ole2.h" #include "initguid.h" #include "xmlparser.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml);

1 0