September 2020 - Wine-commits

Gijs Vermeulen : msvcirt: Implement ofstream class.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: d18a9b963081cae4d3e824fa77756f2f9035319c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d18a9b963081cae4d3e824fa… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Sep 22 16:07:55 2020 +0200 msvcirt: Implement ofstream class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31342 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 205 ++++++++++++++++++++++- dlls/msvcirt/msvcirt.spec | 72 ++++---- dlls/msvcirt/tests/msvcirt.c | 388 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 72 ++++---- dlls/msvcrt40/msvcrt40.spec | 72 ++++---- 5 files changed, 699 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d18a9b963081cae4d3e8…

1 0

Jacek Caban : conhost: Fix a leak in create_screen_buffer.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: c840de2839f67793483bae633362b2daf00e3949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c840de2839f67793483bae63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 22 16:46:09 2020 +0200 conhost: Fix a leak in create_screen_buffer. Based on patch by Haidong Yu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index c0a0e08e6d..82cee8bdf0 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -166,41 +166,48 @@ static int screen_buffer_compare_id( const void *key, const struct wine_rb_entry static struct wine_rb_tree screen_buffer_map = { screen_buffer_compare_id }; +static void destroy_screen_buffer( struct screen_buffer *screen_buffer ) +{ + if (screen_buffer->console->active == screen_buffer) + screen_buffer->console->active = NULL; + wine_rb_remove( &screen_buffer_map, &screen_buffer->entry ); + free( screen_buffer->data ); + free( screen_buffer ); +} + static struct screen_buffer *create_screen_buffer( struct console *console, int id, int width, int height ) { struct screen_buffer *screen_buffer; unsigned int i; - if (!(screen_buffer = malloc( sizeof(*screen_buffer) ))) return NULL; + if (!(screen_buffer = calloc( 1, sizeof(*screen_buffer) ))) return NULL; screen_buffer->console = console; screen_buffer->id = id; screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; screen_buffer->cursor_size = 100; screen_buffer->cursor_visible = 1; - screen_buffer->cursor_x = 0; - screen_buffer->cursor_y = 0; screen_buffer->width = width; screen_buffer->height = height; screen_buffer->attr = 0x07; screen_buffer->popup_attr = 0xf5; screen_buffer->max_width = 80; screen_buffer->max_height = 25; - screen_buffer->win.left = 0; screen_buffer->win.right = min( screen_buffer->max_width - 1, width - 1 ); - screen_buffer->win.top = 0; screen_buffer->win.bottom = min( screen_buffer->max_height - 1, height - 1); - screen_buffer->font.width = 0; - screen_buffer->font.height = 0; screen_buffer->font.weight = FW_NORMAL; screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; - screen_buffer->font.face_name = NULL; - screen_buffer->font.face_len = 0; - memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); + + if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry )) + { + free( screen_buffer ); + ERR( "id %x already exists\n", id ); + return NULL; + } if (!(screen_buffer->data = malloc( screen_buffer->width * screen_buffer->height * sizeof(*screen_buffer->data) ))) { - free( screen_buffer ); + destroy_screen_buffer( screen_buffer ); return NULL; } @@ -211,24 +218,9 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int memcpy( &screen_buffer->data[i * screen_buffer->width], screen_buffer->data, screen_buffer->width * sizeof(char_info_t) ); - if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry )) - { - ERR( "id %x already exists\n", id ); - return NULL; - } - return screen_buffer; } -static void destroy_screen_buffer( struct screen_buffer *screen_buffer ) -{ - if (screen_buffer->console->active == screen_buffer) - screen_buffer->console->active = NULL; - wine_rb_remove( &screen_buffer_map, &screen_buffer->entry ); - free( screen_buffer->data ); - free( screen_buffer ); -} - static BOOL is_active( struct screen_buffer *screen_buffer ) { return screen_buffer == screen_buffer->console->active;

1 0

Alexandre Julliard : ntdll: Add inline wrappers for pthread mutex locking.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: d8f7d5457355cd226f0490d849dcd7a34d5f82f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8f7d5457355cd226f0490d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 22 11:28:25 2020 +0200 ntdll: Add inline wrappers for pthread mutex locking. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/cdrom.c | 24 ++++++++++++------------ dlls/ntdll/unix/file.c | 40 ++++++++++++++++++++-------------------- dlls/ntdll/unix/server.c | 6 +++--- dlls/ntdll/unix/sync.c | 12 ++++++------ dlls/ntdll/unix/system.c | 6 +++--- dlls/ntdll/unix/unix_private.h | 10 ++++++++++ dlls/ntdll/unix/virtual.c | 8 ++++---- 7 files changed, 58 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8f7d5457355cd226f04…

1 0

Alexandre Julliard : ntdll: Don't lock mutexes during process exit.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 9c8dce215512ac42ed657ce0dd6681712a4c29c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c8dce215512ac42ed657ce0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 22 11:28:41 2020 +0200 ntdll: Don't lock mutexes during process exit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 5 ++--- dlls/ntdll/unix/server.c | 1 + dlls/ntdll/unix/unix_private.h | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 64380aba03..3e0bd02a59 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1042,7 +1042,6 @@ done: */ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) { - static BOOL clean_exit; NTSTATUS ret; BOOL self; @@ -1056,8 +1055,8 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) SERVER_END_REQ; if (self) { - if (!handle) clean_exit = TRUE; - else if (clean_exit) exit_process( exit_code ); + if (!handle) process_exiting = TRUE; + else if (process_exiting) exit_process( exit_code ); else abort_process( exit_code ); } return ret; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index b9ec66537a..81a903ca77 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -105,6 +105,7 @@ static const char *server_dir; unsigned int server_cpus = 0; BOOL is_wow64 = FALSE; +BOOL process_exiting = FALSE; timeout_t server_start_time = 0; /* time of server startup */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c737a3a842..3d9dca3c51 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -132,6 +132,7 @@ extern char **main_envp DECLSPEC_HIDDEN; extern WCHAR **main_wargv DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; extern BOOL is_wow64 DECLSPEC_HIDDEN; +extern BOOL process_exiting DECLSPEC_HIDDEN; extern HANDLE keyed_event DECLSPEC_HIDDEN; extern timeout_t server_start_time DECLSPEC_HIDDEN; extern sigset_t server_block_set DECLSPEC_HIDDEN; @@ -280,12 +281,12 @@ static inline void *get_signal_stack(void) static inline void mutex_lock( pthread_mutex_t *mutex ) { - pthread_mutex_lock( mutex ); + if (!process_exiting) pthread_mutex_lock( mutex ); } static inline void mutex_unlock( pthread_mutex_t *mutex ) { - pthread_mutex_unlock( mutex ); + if (!process_exiting) pthread_mutex_unlock( mutex ); } #ifndef _WIN64

1 0

Rémi Bernon : gdi32: Use explicit CDECL in gdi_image_bits.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: a404eb7272db53883cc6d74db044a5443daec71f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a404eb7272db53883cc6d74d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 22 10:26:25 2020 +0200 gdi32: Use explicit CDECL in gdi_image_bits. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- dlls/wineps.drv/bitmap.c | 2 +- dlls/winex11.drv/bitblt.c | 4 ++-- include/wine/gdi_driver.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index d46d7bada4..f3b866057e 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -163,7 +163,7 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, return intersect_vis_rectangles( dst, src ); } -void free_heap_bits( struct gdi_image_bits *bits ) +void CDECL free_heap_bits( struct gdi_image_bits *bits ) { HeapFree( GetProcessHeap(), 0, bits->ptr ); } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index f818aa0228..727f3837e3 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -565,7 +565,7 @@ static inline void unlock_surface( struct windrv_physdev *dev ) if (GetTickCount() - dev->start_ticks > FLUSH_PERIOD) dev->surface->funcs->flush( dev->surface ); } -static void unlock_bits_surface( struct gdi_image_bits *bits ) +static void CDECL unlock_bits_surface( struct gdi_image_bits *bits ) { struct window_surface *surface = bits->param; surface->funcs->unlock( surface ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6b2502c458..4bb4661966 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -620,7 +620,7 @@ static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) memcpy( dst, src, get_dib_info_size( src, DIB_RGB_COLORS )); } -extern void free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; +extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HMODULE gdi32_module DECLSPEC_HIDDEN; diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 1a98f16270..bafc86e9a2 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -148,7 +148,7 @@ static inline DWORD max_ascii85_size(DWORD size) return (size + 3) / 4 * 5; } -static void free_heap_bits( struct gdi_image_bits *bits ) +static void CDECL free_heap_bits( struct gdi_image_bits *bits ) { HeapFree( GetProcessHeap(), 0, bits->ptr ); } diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index b530ba7ba6..46e52612a2 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -914,12 +914,12 @@ BOOL CDECL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } -static void free_heap_bits( struct gdi_image_bits *bits ) +static void CDECL free_heap_bits( struct gdi_image_bits *bits ) { HeapFree( GetProcessHeap(), 0, bits->ptr ); } -static void free_ximage_bits( struct gdi_image_bits *bits ) +static void CDECL free_ximage_bits( struct gdi_image_bits *bits ) { XFree( bits->ptr ); } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 971618e19a..0bd169c653 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -54,7 +54,7 @@ struct gdi_image_bits { void *ptr; /* pointer to the bits */ BOOL is_copy; /* whether this is a copy of the bits that can be modified */ - void (*free)(struct gdi_image_bits *); /* callback for freeing the bits */ + void (CDECL *free)(struct gdi_image_bits *); /* callback for freeing the bits */ void *param; /* extra parameter for callback private use */ };

1 0

Rémi Bernon : gdi32: Use explicit CDECL in window_surface_funcs.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: b16f552e195048f434d486a084fad0fa3afcf712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b16f552e195048f434d486a0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 22 10:26:26 2020 +0200 gdi32: Use explicit CDECL in window_surface_funcs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi.exe16/gdi.c | 14 +++++++------- dlls/user32/win.c | 14 +++++++------- dlls/wineandroid.drv/window.c | 14 +++++++------- dlls/winemac.drv/surface.c | 16 ++++++++-------- dlls/winex11.drv/bitblt.c | 14 +++++++------- include/wine/gdi_driver.h | 14 +++++++------- 6 files changed, 43 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b16f552e195048f434d4…

1 0

Michael Stefaniuc : directmanipulation: Print the debug string and not the pointer to it.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: b4c890e37c5d51ee60dd738e5e2ca6dd2e557626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4c890e37c5d51ee60dd738e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 21 22:52:31 2020 +0200 directmanipulation: Print the debug string and not the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 987f780c6c..36a863c7c6 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -363,14 +363,14 @@ static HRESULT WINAPI content_SetContentRect(IDirectManipulationContent *iface, static HRESULT WINAPI content_GetViewport(IDirectManipulationContent *iface, REFIID riid, void **object) { struct primarycontext *This = impl_from_IDirectManipulationContent(iface); - FIXME("%p, %p, %p\n", This, debugstr_guid(riid), object); + FIXME("%p, %s, %p\n", This, debugstr_guid(riid), object); return E_NOTIMPL; } static HRESULT WINAPI content_GetTag(IDirectManipulationContent *iface, REFIID riid, void **object, UINT32 *id) { struct primarycontext *This = impl_from_IDirectManipulationContent(iface); - FIXME("%p, %p, %p, %p\n", This, debugstr_guid(riid), object, id); + FIXME("%p, %s, %p, %p\n", This, debugstr_guid(riid), object, id); return E_NOTIMPL; }

1 0

Michael Stefaniuc : winegstreamer: Drop redundant NULL check before heap_free().
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 60a8f050a5b438ea06898f09d081206977ebde9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=60a8f050a5b438ea06898f09… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 21 22:52:32 2020 +0200 winegstreamer: Drop redundant NULL check before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 84ecf305d4..f365c8a182 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -394,8 +394,7 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface) IPropertyStore_Release(context->props); if (context->stream) IMFByteStream_Release(context->stream); - if (context->url) - heap_free(context->url); + heap_free(context->url); heap_free(context); }

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.154.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: de508759c67543e3bd21ee6a0873b06aa4014418 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de508759c67543e3bd21ee6a… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Sep 21 12:01:34 2020 -0700 winevulkan: Update to VK spec version 1.2.154. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 253 ++++++++++ dlls/winevulkan/vulkan_thunks.h | 134 ++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 993 +++++++++++++++++++++++----------------- 5 files changed, 959 insertions(+), 425 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de508759c67543e3bd21…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: a62ae1bcc2fa0f6d9bea2afa0e957a2a0595c1b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a62ae1bcc2fa0f6d9bea2afa… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Sep 21 23:30:03 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 210a8ef9d5..437128fd4c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-09-16 23:11+0300\n" +"PO-Revision-Date: 2020-09-21 23:29+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -6936,16 +6936,12 @@ msgid "No Signature found in file.\n" msgstr "Joks parašas nerastas faile.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Neteisingas lygis.\n" +msgstr "Neteisingas kreipinys.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Reikšmė neprieinama.\n" +msgstr "Išteklius šiuo metu neprieinamas.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30

1 0