February 2023 - Wine-Commits

Max Figura : wined3d: Move the WINED3D_RS_LASTPIXEL stub to wined3d_device_apply_stateblock.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: db5952e40654753cd52356350e879bc8e2177086 URL: https://gitlab.winehq.org/wine/wine/-/commit/db5952e40654753cd52356350e879b… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 13:37:46 2022 -0600 wined3d: Move the WINED3D_RS_LASTPIXEL stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 12 ++++++++++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 21 +-------------------- 4 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 710ba2ca71d..f7d9ae07a1c 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -97,7 +97,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, - {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_RENDER(WINED3D_RS_LASTPIXEL), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SUBPIXEL), {STATE_RENDER(WINED3D_RS_SUBPIXEL), state_nop}}, {STATE_RENDER(WINED3D_RS_SUBPIXELX), {STATE_RENDER(WINED3D_RS_SUBPIXELX), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b7745a18d42..68ba69d8a26 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4072,6 +4072,18 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_PLANEMASK not implemented yet.\n"); break; + case WINED3D_RS_LASTPIXEL: + if (!state->rs[WINED3D_RS_LASTPIXEL]) + { + static bool warned; + if (!warned) + { + FIXME("Last Pixel Drawing Disabled, not handled yet.\n"); + warned = true; + } + } + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c2d705f2ff5..68728a65952 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2809,7 +2809,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SUBPIXEL), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 88f5b9183c6..8707ce6a561 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1787,24 +1787,6 @@ static void state_localviewer(struct wined3d_context *context, const struct wine } } -static void state_lastpixel(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_LASTPIXEL]) - { - TRACE("Last Pixel Drawing Enabled\n"); - } - else - { - static BOOL warned; - if (!warned) { - FIXME("Last Pixel Drawing Disabled, not handled yet\n"); - warned = TRUE; - } else { - TRACE("Last Pixel Drawing Disabled, not handled yet\n"); - } - } -} - void state_pointsprite_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { static BOOL warned; @@ -4752,7 +4734,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SUBPIXEL), { STATE_RENDER(WINED3D_RS_SUBPIXEL), state_subpixel }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SUBPIXELX), { STATE_RENDER(WINED3D_RS_SUBPIXELX), state_subpixelx }, WINED3D_GL_EXT_NONE }, @@ -5552,7 +5533,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { { 1, 8}, { 11, 14}, - { 17, 23}, + { 16, 23}, { 27, 27}, { 40, 40}, { 42, 45},

1 0

Piotr Caban : wineps: Remove no longer used output parameter handling from PSDRV_CreateDC.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 2bfe9ce883e1f0f18dada51e836ea61286abb0dc URL: https://gitlab.winehq.org/wine/wine/-/commit/2bfe9ce883e1f0f18dada51e836ea6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 21 12:40:12 2023 +0100 wineps: Remove no longer used output parameter handling from PSDRV_CreateDC. We're storing it now in DC attributes. --- dlls/wineps.drv/escape.c | 10 +--------- dlls/wineps.drv/init.c | 3 --- dlls/wineps.drv/psdrv.h | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 0149e192520..9ced2221b1c 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -459,17 +459,9 @@ INT CDECL PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) } di.pDocName = (LPWSTR) doc->lpszDocName; + di.pOutputFile = (LPWSTR) doc->lpszOutput; di.pDatatype = NULL; - if(doc->lpszOutput) - di.pOutputFile = (LPWSTR) doc->lpszOutput; - else if(physDev->job.output) - di.pOutputFile = physDev->job.output; - else - di.pOutputFile = NULL; - - TRACE("using output: %s\n", debugstr_w(di.pOutputFile)); - /* redirection located in HKCU\Software\Wine\Printing\Spooler is done during winspool.drv,ScheduleJob */ physDev->job.id = StartDocPrinterW(physDev->job.hprinter, 1, (LPBYTE) &di); diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 0d4467b6964..579e59e621b 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -387,8 +387,6 @@ static BOOL CDECL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, if (!(physDev = create_psdrv_physdev( pi ))) return FALSE; - if (output && *output) physDev->job.output = strdupW( output ); - if(initData) { dump_devmode(initData); @@ -432,7 +430,6 @@ static BOOL CDECL PSDRV_DeleteDC( PHYSDEV dev ) TRACE("\n"); HeapFree( GetProcessHeap(), 0, physDev->Devmode ); - HeapFree( GetProcessHeap(), 0, physDev->job.output ); HeapFree( GetProcessHeap(), 0, physDev ); return TRUE; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 2af021508b7..153601d4c86 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -352,7 +352,6 @@ enum passthrough typedef struct { DWORD id; /* Job id */ HANDLE hprinter; /* Printer handle */ - LPWSTR output; /* Output file/port */ LPWSTR doc_name; /* Document Name */ BOOL banding; /* Have we received a NEXTBAND */ BOOL OutOfPage; /* Page header not sent yet */

1 0

Max Figura : wined3d: Move the WINED3D_RS_ROP2 stub to wined3d_device_apply_stateblock.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: a9967c947a09e156a20618412fed29aaea79a773 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9967c947a09e156a20618412fed29… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 13:22:34 2022 -0600 wined3d: Move the WINED3D_RS_ROP2 stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 9 +-------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cdf71270d8c..0fbbb378847 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -97,7 +97,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, - {STATE_RENDER(WINED3D_RS_ROP2), {STATE_RENDER(WINED3D_RS_ROP2), state_nop}}, {STATE_RENDER(WINED3D_RS_PLANEMASK), {STATE_RENDER(WINED3D_RS_PLANEMASK), state_nop}}, {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_RENDER(WINED3D_RS_LASTPIXEL), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 477a6e9af34..4182a13a58a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4062,6 +4062,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_MONOENABLE not implemented yet.\n"); break; + case WINED3D_RS_ROP2: + if (state->rs[WINED3D_RS_ROP2]) + FIXME("Render state WINED3D_RS_ROP2 not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 75b2a90d20a..64029552910 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2809,7 +2809,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_ROP2), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_PLANEMASK), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a570bbb11b8..4007ee25658 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2072,12 +2072,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_rop2(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_ROP2]) - FIXME("Render state WINED3D_RS_ROP2 not implemented yet.\n"); -} - static void state_planemask(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_PLANEMASK]) @@ -4764,7 +4758,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_ROP2), { STATE_RENDER(WINED3D_RS_ROP2), state_rop2 }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PLANEMASK), { STATE_RENDER(WINED3D_RS_PLANEMASK), state_planemask }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, @@ -5565,7 +5558,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) rs_holes[] = { { 1, 8}, - { 11, 11}, + { 11, 12}, { 14, 14}, { 17, 23}, { 27, 27},

1 0

Piotr Caban : localspl: Ignore an empty output string.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 48d3271f963319b6e45eeaf18b44ac1a1bd3c190 URL: https://gitlab.winehq.org/wine/wine/-/commit/48d3271f963319b6e45eeaf18b44ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 21 14:45:16 2023 +0100 localspl: Ignore an empty output string. We should probably ignore all incorrect ports. This is a minimal change that restores 5dadeeb29d36a93b3bbeec8d7b1d237f29bf8f67 commit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54379 --- dlls/localspl/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 7ab68b62c3d..d09ac4420c3 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3697,7 +3697,7 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) } port = job->port; - if (!port) + if (!port || !*port) port = printer->info->port; TRACE("need to schedule job %ld filename %s to port %s\n", job->id, debugstr_w(job->filename), debugstr_w(port));

1 0

Alexandros Frantzis : win32u: Reset draw_start_ticks for new window_surface.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 6d2bd75c4a82d10ee98c63010a5701d428ccc5d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d2bd75c4a82d10ee98c63010a5701… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Feb 16 18:20:56 2023 +0200 win32u: Reset draw_start_ticks for new window_surface. Normally, a new window_surface has no damage so its draw_start_ticks value is reset at the time of the first lock_surface. However, if contents from the old window_surface are copied to the new one when the window_surface for a window is updated, the new window_surface will be initially damaged. We want to reset the draw_start_ticks value in this case too, to avoid flushes occuring soon after such updates, during the initial redraw of the window_surface. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/win32u/dibdrv/dc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index f96374c1229..23ef7f64390 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -744,7 +744,8 @@ static inline void lock_surface( struct windrv_physdev *dev ) { /* gdi_lock should not be locked */ dev->surface->funcs->lock( dev->surface ); - if (IsRectEmpty( dev->dibdrv->bounds )) dev->surface->draw_start_ticks = NtGetTickCount(); + if (IsRectEmpty( dev->dibdrv->bounds ) || dev->surface->draw_start_ticks == 0) + dev->surface->draw_start_ticks = NtGetTickCount(); } static inline void unlock_surface( struct windrv_physdev *dev )

1 0

Alexandros Frantzis : gdi32: Track ticks since draw start per window_surface.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: aa72d7d42d64a8fd9ded6d870f261eeaccf632fb URL: https://gitlab.winehq.org/wine/wine/-/commit/aa72d7d42d64a8fd9ded6d870f261e… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Feb 16 18:17:03 2023 +0200 gdi32: Track ticks since draw start per window_surface. Track ticks since draw start per window_surface, instead of per DC as is currently the case. This change helps reduce visual glitches caused by badly timed flushes when drawing to the same window_surface from multiple DCs (e.g., for child windows). This approach is a better fit for the current heuristic for forcing flushing, which consults the shared window_surface bounds to decide whether this is the start of a draw in order to reset the (currently per DC) draw start time. The problem in the current implementation occurs when a drawing to a DC begins with an already damaged window_surface, e.g., due to draws from other DCs targeting that window_surface. In such a case, the DC draw start time is not reset and refers to the start of some previous draw sequence using this DC, thus increasing the chances that the 50ms time flush limit will be eventually exceeded in the middle of the current draw sequence. In other words, the state of the (shared) window_surface damage is not a reliable indicator of the beginning (or not) of a draw to a DC. An example, assuming DC1 and DC2 target the same window_surface: DC1.start_ticks = 0 DC2.start_ticks = 0 FLUSH_PERIOD = 50 0 flush 1 draw to DC1 -> DC1.start_ticks = 1 ... [no flush] ... 2 draw to DC2 -> DC2.start_ticks remains 0 since surface is damaged ... 50 flush 51 draw to DC1 -> DC1.start_ticks = 51 ... [no flush] ... 52 draw to DC2 -> DC2.start_ticks remains 0 since surface is damaged, current - DC2.start_ticks > FLUSH_PERIOD so we are forced to flush in the middle of the drawing sequence => potential glitch Tracking the draw start per window_surface ameliorates the problem because the beginning of a draw on a DC targeting an undamaged window_surface resets the start time for all DCs targeting that window_surface: ... 50 flush 51 draw to DC1 -> surface.draw_ticks = 51 ... [no flush] ... 52 draw to DC2 -> surface.draw_ticks remains 51 since surface is damaged, but current - surface.draw_ticks < FLUSH_PERIOD, so we do not flush Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/win32u/dibdrv/dc.c | 6 +++--- include/wine/gdi_driver.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index 68a009f576e..f96374c1229 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -731,7 +731,6 @@ struct windrv_physdev struct gdi_physdev dev; struct dibdrv_physdev *dibdrv; struct window_surface *surface; - DWORD start_ticks; }; static const struct gdi_dc_funcs window_driver; @@ -745,13 +744,14 @@ static inline void lock_surface( struct windrv_physdev *dev ) { /* gdi_lock should not be locked */ dev->surface->funcs->lock( dev->surface ); - if (IsRectEmpty( dev->dibdrv->bounds )) dev->start_ticks = NtGetTickCount(); + if (IsRectEmpty( dev->dibdrv->bounds )) dev->surface->draw_start_ticks = NtGetTickCount(); } static inline void unlock_surface( struct windrv_physdev *dev ) { + BOOL should_flush = NtGetTickCount() - dev->surface->draw_start_ticks > FLUSH_PERIOD; dev->surface->funcs->unlock( dev->surface ); - if (NtGetTickCount() - dev->start_ticks > FLUSH_PERIOD) dev->surface->funcs->flush( dev->surface ); + if (should_flush) dev->surface->funcs->flush( dev->surface ); } static void CDECL unlock_bits_surface( struct gdi_image_bits *bits ) diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 3de7e20af9a..fe0894b2820 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -217,6 +217,7 @@ struct window_surface struct list entry; /* entry in global list managed by user32 */ LONG ref; /* reference count */ RECT rect; /* constant, no locking needed */ + DWORD draw_start_ticks; /* start ticks of fresh draw */ /* driver-specific fields here */ };

1 0

Max Figura : wined3d: Move the WINED3D_RS_PLANEMASK stub to wined3d_device_apply_stateblock.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: abebd41e973e6e0c427a6334418f4cf4f12c1c19 URL: https://gitlab.winehq.org/wine/wine/-/commit/abebd41e973e6e0c427a6334418f4c… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 13:32:09 2022 -0600 wined3d: Move the WINED3D_RS_PLANEMASK stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 10 +--------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0fbbb378847..710ba2ca71d 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -97,7 +97,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, - {STATE_RENDER(WINED3D_RS_PLANEMASK), {STATE_RENDER(WINED3D_RS_PLANEMASK), state_nop}}, {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_RENDER(WINED3D_RS_LASTPIXEL), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SUBPIXEL), {STATE_RENDER(WINED3D_RS_SUBPIXEL), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4182a13a58a..b7745a18d42 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4067,6 +4067,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_ROP2 not implemented yet.\n"); break; + case WINED3D_RS_PLANEMASK: + if (state->rs[WINED3D_RS_PLANEMASK]) + FIXME("Render state WINED3D_RS_PLANEMASK not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 64029552910..c2d705f2ff5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2809,7 +2809,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_PLANEMASK), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4007ee25658..88f5b9183c6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2072,12 +2072,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_planemask(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_PLANEMASK]) - FIXME("Render state WINED3D_RS_PLANEMASK not implemented yet.\n"); -} - static void state_subpixel(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_SUBPIXEL]) @@ -4758,7 +4752,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_PLANEMASK), { STATE_RENDER(WINED3D_RS_PLANEMASK), state_planemask }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SUBPIXEL), { STATE_RENDER(WINED3D_RS_SUBPIXEL), state_subpixel }, WINED3D_GL_EXT_NONE }, @@ -5558,8 +5551,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) rs_holes[] = { { 1, 8}, - { 11, 12}, - { 14, 14}, + { 11, 14}, { 17, 23}, { 27, 27}, { 40, 40},

1 0

Piotr Caban : winspool: Fix FILE: output handling in StartDocDlgW.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 4a8cdc2b4981cc776d02a02de32fcb70dd86c0cd URL: https://gitlab.winehq.org/wine/wine/-/commit/4a8cdc2b4981cc776d02a02de32fcb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Feb 19 17:18:38 2023 +0100 winspool: Fix FILE: output handling in StartDocDlgW. --- dlls/winspool.drv/info.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 456d5e2ecdf..54ecb81d3be 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7490,9 +7490,6 @@ static BOOL is_port(const WCHAR *port_list, const WCHAR *output) { size_t len; - if (!output) - return FALSE; - if (wcschr(output, ':')) return TRUE; @@ -7532,7 +7529,7 @@ LPWSTR WINAPI StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) /* Check whether default port is FILE: */ b = !doc->lpszOutput && (!pi5->pPortName || wcscmp( pi5->pPortName, L"FILE:" )); - if (!b) + if (!b && doc->lpszOutput && wcscmp( doc->lpszOutput, L"FILE:" )) b = is_port(pi5->pPortName, doc->lpszOutput); free(pi5); if (b)

1 0

Mohamad Al-Jaf : bluetoothapis: Add BluetoothUnregisterAuthentication stub.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: c9285f324b7ed6e9688c0dccf4fd2200d19845d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9285f324b7ed6e9688c0dccf4fd22… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Feb 18 18:24:21 2023 -0500 bluetoothapis: Add BluetoothUnregisterAuthentication stub. --- dlls/bluetoothapis/bluetoothapis.spec | 2 +- dlls/bluetoothapis/main.c | 10 ++++++++++ dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/irprops.cpl/irprops.cpl.spec | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/bluetoothapis/bluetoothapis.spec b/dlls/bluetoothapis/bluetoothapis.spec index f6fc3142d76..625dffb8254 100644 --- a/dlls/bluetoothapis/bluetoothapis.spec +++ b/dlls/bluetoothapis/bluetoothapis.spec @@ -63,7 +63,7 @@ @ stub BluetoothSetLocalServiceInfo @ stub BluetoothSetServiceState @ stub BluetoothSetServiceStateEx -@ stub BluetoothUnregisterAuthentication +@ stdcall BluetoothUnregisterAuthentication(long) @ stub BluetoothUpdateDeviceRecord @ stub BthpCheckForUnsupportedGuid @ stub BthpCleanupBRDeviceNode diff --git a/dlls/bluetoothapis/main.c b/dlls/bluetoothapis/main.c index f16357559e4..5d9087a9a47 100644 --- a/dlls/bluetoothapis/main.c +++ b/dlls/bluetoothapis/main.c @@ -109,3 +109,13 @@ DWORD WINAPI BluetoothRegisterForAuthenticationEx(const BLUETOOTH_DEVICE_INFO *i FIXME("(%p, %p, %p, %p): stub!\n", info, out, callback, param); return ERROR_CALL_NOT_IMPLEMENTED; } + +/********************************************************************* + * BluetoothUnregisterAuthentication + */ +BOOL WINAPI BluetoothUnregisterAuthentication(HBLUETOOTH_AUTHENTICATION_REGISTRATION handle) +{ + FIXME("(%p): stub!\n", handle); + if (!handle) SetLastError(ERROR_INVALID_HANDLE); + return FALSE; +} diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index 3a5d9ef622c..1698344581e 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -55,7 +55,7 @@ @ stub BluetoothSendAuthenticationResponseEx @ stub BluetoothSetLocalServiceInfo @ stub BluetoothSetServiceState -@ stub BluetoothUnregisterAuthentication +@ stdcall -import BluetoothUnregisterAuthentication(long) @ stub BluetoothUpdateDeviceRecord @ stub BthpEnableAllServices @ stub BthpFindPnpInfo diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index 8ca19fc9631..b2bdf3c3b2a 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -47,6 +47,6 @@ @ stub BluetoothSelectDevicesFree @ stub BluetoothSendAuthenticationResponse @ stub BluetoothSetServiceState -@ stub BluetoothUnregisterAuthentication +@ stdcall -import BluetoothUnregisterAuthentication(long) @ stub BluetoothUpdateDeviceRecord #@ stub CPlApplet

1 0

Paul Gofman : server: Set TCP SYN count on sockets.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 74240a354558ce8dd3c98b4a190005de471b4c95 URL: https://gitlab.winehq.org/wine/wine/-/commit/74240a354558ce8dd3c98b4a190005… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 15 16:30:37 2023 -0600 server: Set TCP SYN count on sockets. --- server/sock.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 610e0a94cc0..088e6d63079 100644 --- a/server/sock.c +++ b/server/sock.c @@ -39,6 +39,9 @@ #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif +#ifdef HAVE_NETINET_TCP_H +# include <netinet/tcp.h> +#endif #include <poll.h> #include <sys/time.h> #include <sys/types.h> @@ -1921,9 +1924,12 @@ static int init_socket( struct sock *sock, int family, int type, int protocol ) if (is_tcp_socket( sock )) { - int reuse = 1; - - setsockopt( sockfd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse) ); + value = 1; + setsockopt( sockfd, SOL_SOCKET, SO_REUSEADDR, &value, sizeof(value) ); +#ifdef TCP_SYNCNT + value = 4; + setsockopt( sockfd, IPPROTO_TCP, TCP_SYNCNT, &value, sizeof(value) ); +#endif } if (sock->fd)

1 0