September 2021 - Wine-Commits

Bernhard Übelacker : cmd: Load start.exe from the system directory.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 810de9d1a733f3aaa7ffaf3f61808fb9582d92e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=810de9d1a733f3aaa7ffaf3f… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Wed Sep 8 14:17:14 2021 +0200 cmd: Load start.exe from the system directory. Fixes cmd test in pure 64-bit wine. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c7df724ae00..a55ce6e0244 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4351,8 +4351,8 @@ void WCMD_start(WCHAR *args) STARTUPINFOW st; PROCESS_INFORMATION pi; - GetWindowsDirectoryW( file, MAX_PATH ); - lstrcatW(file, L"\\command\\start.exe"); + GetSystemDirectoryW( file, MAX_PATH ); + lstrcatW(file, L"\\start.exe"); cmdline = heap_xalloc( (lstrlenW(file) + lstrlenW(args) + 8) * sizeof(WCHAR) ); lstrcpyW( cmdline, file ); lstrcatW(cmdline, L" ");

1 0

Zebediah Figura : server: Don't wake up always-blocking asyncs.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: a1c42293a2b0b4e039a00bfb8d73fdd0c543b0bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1c42293a2b0b4e039a00bfb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 3 23:11:42 2021 -0500 server: Don't wake up always-blocking asyncs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 12 ++++++------ server/async.c | 4 ++-- server/device.c | 2 +- server/file.h | 2 +- server/sock.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 682af256b43..f3bdc2cb477 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1169,15 +1169,15 @@ static void test_blocking_irp(void) memset(&io, 0xcc, sizeof(io)); status = NtQueryVolumeInformationFile(file, &io, buffer, sizeof(buffer), FileFsSizeInformation); - todo_wine ok(!status, "got %#x\n", status); - todo_wine ok(!io.Status, "got iosb status %#x\n", io.Status); - todo_wine ok(!io.Information, "got information %#Ix\n", io.Information); + ok(!status, "got %#x\n", status); + ok(!io.Status, "got iosb status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); memset(&io, 0xcc, sizeof(io)); status = NtQueryVolumeInformationFile(file, &io, buffer, sizeof(buffer), FileFsFullSizeInformation); - todo_wine ok(status == STATUS_DEVICE_NOT_READY, "got %#x\n", status); - todo_wine ok(io.Status == STATUS_DEVICE_NOT_READY, "got iosb status %#x\n", io.Status); - todo_wine ok(!io.Information, "got information %#Ix\n", io.Information); + ok(status == STATUS_DEVICE_NOT_READY, "got %#x\n", status); + ok(io.Status == STATUS_DEVICE_NOT_READY, "got iosb status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); CloseHandle(file); } diff --git a/server/async.c b/server/async.c index 8dba55afb01..2dbdfc76a59 100644 --- a/server/async.c +++ b/server/async.c @@ -285,13 +285,13 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da return async; } -void set_async_pending( struct async *async, int signal ) +void set_async_pending( struct async *async ) { if (!async->terminated) { async->pending = 1; async->unknown_status = 0; - if (signal && !async->signaled) + if (!async->blocking && !async->signaled) { async->signaled = 1; wake_up( &async->obj, 0 ); diff --git a/server/device.c b/server/device.c index 9515d238fb4..a2383ecdc7c 100644 --- a/server/device.c +++ b/server/device.c @@ -961,7 +961,7 @@ DECL_HANDLER(get_next_device_request) * so we need to do it now */ cancel_irp_call( irp ); else if (irp->async) - set_async_pending( irp->async, irp->file && is_fd_overlapped( irp->file->fd ) ); + set_async_pending( irp->async ); free_irp_params( irp ); release_object( irp ); diff --git a/server/file.h b/server/file.h index 22879b75c05..80f2191c050 100644 --- a/server/file.h +++ b/server/file.h @@ -229,7 +229,7 @@ extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); extern void async_set_completion_callback( struct async *async, async_completion_callback func, void *private ); extern void async_set_unknown_status( struct async *async ); -extern void set_async_pending( struct async *async, int signal ); +extern void set_async_pending( struct async *async ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); extern void async_request_complete( struct async *async, unsigned int status, data_size_t result, diff --git a/server/sock.c b/server/sock.c index 3d2e8c005f0..fc234e89865 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2399,7 +2399,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) obj_handle_t event_handle; int mask; - set_async_pending( async, 0 ); + set_async_pending( async ); if (is_machine_64bit( current->process->machine )) { @@ -2530,7 +2530,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) #endif } - set_async_pending( async, 0 ); + set_async_pending( async ); if (bind( unix_fd, &bind_addr.addr, unix_len ) < 0) {

1 0

Jan Sikorski : wined3d: Remove wined3d_texture_copy_sysmem_location().
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: d23f1007d2e8cba5d92688aa3d6b70ee891ea5b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d23f1007d2e8cba5d92688aa… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Sep 2 15:14:20 2021 +0200 wined3d: Remove wined3d_texture_copy_sysmem_location(). Use wined3d_context_copy_bo_address() instead. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 58 ++++++++++---------------------------------------- 1 file changed, 11 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f5f7fab49a6..6663e788e9c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -745,52 +745,6 @@ void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) } } -static BOOL wined3d_texture_copy_sysmem_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) -{ - unsigned int size = texture->sub_resources[sub_resource_idx].size; - struct wined3d_device *device = texture->resource.device; - const struct wined3d_gl_info *gl_info; - struct wined3d_bo_gl *src_bo, *dst_bo; - struct wined3d_bo_address dst, src; - - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) - return FALSE; - - wined3d_texture_get_memory(texture, sub_resource_idx, &dst, location); - wined3d_texture_get_memory(texture, sub_resource_idx, &src, - texture->sub_resources[sub_resource_idx].locations); - - if ((dst_bo = (struct wined3d_bo_gl *)dst.buffer_object)) - { - context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, dst_bo->id)); - GL_EXTCALL(glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, size, src.addr)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - wined3d_context_gl_reference_bo(wined3d_context_gl(context), dst_bo); - checkGLcall("PBO upload"); - context_release(context); - return TRUE; - } - - if ((src_bo = (struct wined3d_bo_gl *)src.buffer_object)) - { - context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, src_bo->id)); - GL_EXTCALL(glGetBufferSubData(GL_PIXEL_PACK_BUFFER, 0, size, dst.addr)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); - wined3d_context_gl_reference_bo(wined3d_context_gl(context), src_bo); - checkGLcall("PBO download"); - context_release(context); - return TRUE; - } - - memcpy(dst.addr, src.addr, size); - return TRUE; -} - /* Context activation is done by the caller. Context may be NULL in * WINED3D_NO3D mode. */ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, @@ -837,7 +791,17 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, } if ((location & wined3d_texture_sysmem_locations) && (current & wined3d_texture_sysmem_locations)) - ret = wined3d_texture_copy_sysmem_location(texture, sub_resource_idx, context, location); + { + unsigned int size = texture->sub_resources[sub_resource_idx].size; + struct wined3d_bo_address source, destination; + + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) + return FALSE; + wined3d_texture_get_memory(texture, sub_resource_idx, &source, current); + wined3d_texture_get_memory(texture, sub_resource_idx, &destination, location); + wined3d_context_copy_bo_address(context, &destination, &source, size); + ret = TRUE; + } else ret = texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location);

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 07beacb74224f922356efa8154978fadc9764edf URL: https://source.winehq.org/git/wine.git/?a=commit;h=07beacb74224f922356efa81… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu Sep 9 20:25:38 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 464 ++++++++++++++++++++++++++------------------------------------- 1 file changed, 190 insertions(+), 274 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07beacb74224f922356e…

1 0

Akihiro Sagawa : dbghelp: Get rid of useless while loop.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 70032f88639eb4a36aadb637fe54856541d88e30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70032f88639eb4a36aadb637… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Sep 9 22:33:14 2021 +0900 dbghelp: Get rid of useless while loop. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index af84fb660b8..c6657c87f18 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2188,7 +2188,6 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, vector_init(&dirs, sizeof(const char*), 4); p = vector_add(&dirs, &ctx->pool); *p = compile_dir ? compile_dir : "."; - while (*traverse.data) while (traverse.data < traverse.end_data && *traverse.data) { const char* rel = (const char*)traverse.data;

1 0

Jacek Caban : gdi32: Support NULL prev_value in NtGdiGetAndSetDCDword.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: bf4cdfad5be250e4fc34441da3133e96a92c04fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf4cdfad5be250e4fc34441d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 9 14:01:47 2021 +0200 gdi32: Support NULL prev_value in NtGdiGetAndSetDCDword. 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 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 4ed09e91eb1..ae6119529f5 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -830,6 +830,7 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre { PHYSDEV physdev; BOOL ret = TRUE; + DWORD prev; DC *dc; if (!(dc = get_dc_ptr( hdc ))) return 0; @@ -837,36 +838,36 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre switch (method) { case NtGdiSetMapMode: - *prev_value = dc->attr->map_mode; + prev = dc->attr->map_mode; ret = set_map_mode( dc, value ); break; case NtGdiSetBkColor: - *prev_value = dc->attr->background_color; + prev = dc->attr->background_color; set_bk_color( dc, value ); break; case NtGdiSetTextColor: - *prev_value = dc->attr->text_color; + prev = dc->attr->text_color; set_text_color( dc, value ); break; case NtGdiSetDCBrushColor: physdev = GET_DC_PHYSDEV( dc, pSetDCBrushColor ); - *prev_value = dc->attr->brush_color; + prev = dc->attr->brush_color; value = physdev->funcs->pSetDCBrushColor( physdev, value ); if (value != CLR_INVALID) dc->attr->brush_color = value; break; case NtGdiSetDCPenColor: physdev = GET_DC_PHYSDEV( dc, pSetDCPenColor ); - *prev_value = dc->attr->pen_color; + prev = dc->attr->pen_color; value = physdev->funcs->pSetDCPenColor( physdev, value ); if (value != CLR_INVALID) dc->attr->pen_color = value; break; case NtGdiSetGraphicsMode: - if (prev_value) *prev_value = dc->attr->graphics_mode; + prev = dc->attr->graphics_mode; ret = set_graphics_mode( dc, value ); break; @@ -877,7 +878,9 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre } release_dc_ptr( dc ); - return ret; + if (!ret || !prev_value) return FALSE; + *prev_value = prev; + return TRUE; }

1 0

Jacek Caban : gdi32: Use GetICMProfile driver entry point for EnumICMProfilesW.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 6403e88140895b50cbe08bd4e42601a9e4101349 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6403e88140895b50cbe08bd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 9 14:01:51 2021 +0200 gdi32: Use GetICMProfile driver entry point for EnumICMProfilesW. When display ICM is not explicitly configured on Windows, GetICMProfile returns the default profile, but EnumICMProfiles does not enumerate anything. For non-default configuration, EnumICMProfiles returns configured profiles. 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/dibdrv/dc.c | 2 -- dlls/gdi32/driver.c | 8 +------ dlls/gdi32/emfdrv.c | 1 - dlls/gdi32/font.c | 1 - dlls/gdi32/icm.c | 15 +++++++----- dlls/gdi32/path.c | 1 - dlls/wineandroid.drv/init.c | 1 - dlls/winemac.drv/gdi.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/graphics.c | 58 ++------------------------------------------- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/x11drv.h | 3 +-- dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 5 ++-- 14 files changed, 15 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6403e88140895b50cbe0…

1 0

Alex Henrie : wpp: Allow fully variadic macros.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 1cad3c00fefa635a0e3b1df12aaa295007b43028 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cad3c00fefa635a0e3b1df1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 8 23:29:24 2021 -0600 wpp: Allow fully variadic macros. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wpp/ppy.y | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index 5b7083b3813..0afc642d3e0 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -327,6 +327,7 @@ allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; } emargs : margs { $$ = $1; } | margs ',' tELLIPSIS { nmacro_args *= -1; } + | tELLIPSIS { macro_args = NULL; nmacro_args = 0; } ; margs : margs ',' tIDENT { $$ = add_new_marg($3); }

1 0

Alex Henrie : include: Provide a definition of NOP_FUNCTION that works on GCC.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 3ad4def46aaee37c9bf50cd1e8e0138c995c2ac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ad4def46aaee37c9bf50cd1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 8 23:29:25 2021 -0600 include: Provide a definition of NOP_FUNCTION that works on GCC. NOP_FUNCTION is a drop-in function replacement that ignores its arguments but also suppresses compiler warnings about them being unused. For example, on MSVC, 0(foo, bar, baz()); or __noop(foo, bar, baz()); would suppress warnings about foo and bar being unused and not call baz at all. Neither of those syntaxes is supported on GCC, which provides no similar way to suppress unused variable warnings, but we can at least allow such code to compile by defining NOP_FUNCTION to be an empty variadic macro. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index b83f588a16d..c230fa0cd7f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -123,10 +123,14 @@ extern "C" { #endif #ifndef NOP_FUNCTION -# if defined(_MSC_VER) && (_MSC_VER >= 1210) -# define NOP_FUNCTION __noop +# if defined(_MSC_VER) +# if (_MSC_VER >= 1210) +# define NOP_FUNCTION __noop +# else +# define NOP_FUNCTION (void)0 +# endif # else -# define NOP_FUNCTION (void)0 +# define NOP_FUNCTION(...) # endif #endif

1 0

Nikolay Sivov : wined3d: Handle null semantics in stream output description cache.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: a408fdf5f52a4de94ab06318bfa86a205bd9a2c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a408fdf5f52a4de94ab06318… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 9 18:58:03 2021 +0300 wined3d: Handle null semantics in stream output description cache. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d2147447ee0..07bd7c65ad7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5620,7 +5620,9 @@ static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry * if ((ret = (a->stream_idx - b->stream_idx))) return ret; - if ((ret = strcmp(a->semantic_name, b->semantic_name))) + if ((ret = (!a->semantic_name - !b->semantic_name))) + return ret; + if (a->semantic_name && (ret = strcmp(a->semantic_name, b->semantic_name))) return ret; if ((ret = (a->semantic_idx - b->semantic_idx))) return ret;

1 0