March 2019 - Wine-Commits - list.winehq.org

Fabian Maurer : winealsa.drv: Don' t crash when getting NULL event from midi.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 94ae72aeac23e9f22b038f7eb2fb085e51b292e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94ae72aeac23e9f22b038f7e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Nov 20 21:09:27 2018 +0100 winealsa.drv: Don't crash when getting NULL event from midi. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46170 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 20e5920135476cc4e380823a694537fca7fdf7e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winealsa.drv/midi.c | 226 +++++++++++++++++++++++++---------------------- 1 file changed, 118 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94ae72aeac23e9f22b03…

1 0

Nikolay Sivov : inetcomm: Fix a leak on DeleteProp() (Valgrind).
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 5211743a93baf60e8d5643f05aec822ca98a48f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5211743a93baf60e8d5643f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 03:43:25 2018 +0300 inetcomm: Fix a leak on DeleteProp() (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 05f6769f24a6db40ac1ea3d60cdbc3ac9c5f2513) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcomm/mimeole.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f0e186c..2b307e1 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -818,16 +818,21 @@ static void empty_param_list(struct list *list) } } +static void free_header(header_t *header) +{ + list_remove(&header->entry); + PropVariantClear(&header->value); + empty_param_list(&header->params); + heap_free(header); +} + static void empty_header_list(struct list *list) { header_t *header, *cursor2; LIST_FOR_EACH_ENTRY_SAFE(header, cursor2, list, header_t, entry) { - list_remove(&header->entry); - PropVariantClear(&header->value); - empty_param_list(&header->params); - HeapFree(GetProcessHeap(), 0, header); + free_header(header); } } @@ -1231,8 +1236,7 @@ static HRESULT WINAPI MimeBody_DeleteProp( if(found) { - list_remove(&cursor->entry); - HeapFree(GetProcessHeap(), 0, cursor); + free_header(cursor); return S_OK; } }

1 0

Jacek Caban : include: Don' t use unnamed struct for NDR_SCONTEXT declaration.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 52891e39f5e6a5296d0492c96293f1bf12b3ac12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52891e39f5e6a5296d0492c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 8 20:32:04 2019 +0100 include: Don't use unnamed struct for NDR_SCONTEXT declaration. Fixes C++ warning. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3c5ae5a105d456f44a62e5a1f64834e73c112986) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/rpcndr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 0f751d7..077e02a 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -136,7 +136,7 @@ void __RPC_USER MIDL_user_free(void *); (RpcExceptionCode() == RPC_X_BAD_STUB_DATA) || \ (RpcExceptionCode() == RPC_S_INVALID_BOUND)) -typedef struct +typedef struct _NDR_SCONTEXT { void *pad[2]; void *userContext;

1 0

Alexandre Julliard : msi: Return an error code instead of a button id in msi_change_media().
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: def4f69223e2b7444f922101e106b2c1bb7707ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=def4f69223e2b7444f922101… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 2 19:39:13 2019 +0100 msi: Return an error code instead of a button id in msi_change_media(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a47343b97369e5f64bb78a7421f2d75258da282a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 3d4a8c0..5f8c26a 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -97,7 +97,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) msiobj_release(&record->hdr); msi_free(source_dir); - return r; + return r == IDRETRY ? ERROR_SUCCESS : ERROR_INSTALL_SOURCE_ABSENT; } static MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id )

1 0

Nikolay Sivov : xmllite/reader: Fix compiler warning.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: f5e7ed59944efa620a8eb6c58b3da7949c357237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e7ed59944efa620a8eb6c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 5 18:42:38 2018 +0300 xmllite/reader: Fix compiler warning. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fc62dac4dcee46343c7d8b20f0707e2875594a12) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 495d4e3..cc6c958 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1019,9 +1019,9 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding encoded_buffer *src = &readerinput->buffer->encoded; encoded_buffer *dest = &readerinput->buffer->utf16; int len, dest_len; + UINT cp = ~0u; HRESULT hr; WCHAR *ptr; - UINT cp; hr = get_code_page(enc, &cp); if (FAILED(hr)) return;

1 0

Alexandre Julliard : winspool.drv: Make cupsGetPPD optional to work around deprecation warning.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 2cd5ada63ee42f6f726d6c80e5475ec029dc4ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cd5ada63ee42f6f726d6c80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 11:21:00 2018 +0100 winspool.drv: Make cupsGetPPD optional to work around deprecation warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d4bc97c5546f446a241c1e18bd4d3cc9d9a47cb6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winspool.drv/info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bbdcaac..2a25630 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -786,11 +786,11 @@ static void *cupshandle; DO_FUNC(cupsFreeOptions); \ DO_FUNC(cupsGetDests); \ DO_FUNC(cupsGetOption); \ - DO_FUNC(cupsGetPPD); \ DO_FUNC(cupsParseOptions); \ DO_FUNC(cupsPrintFile) #define CUPS_OPT_FUNCS \ DO_FUNC(cupsGetNamedDest); \ + DO_FUNC(cupsGetPPD); \ DO_FUNC(cupsGetPPD3); \ DO_FUNC(cupsLastErrorString) @@ -798,6 +798,7 @@ static void *cupshandle; CUPS_FUNCS; #undef DO_FUNC static cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); +static const char * (*pcupsGetPPD)(const char *); static http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); static const char * (*pcupsLastErrorString)(void);

1 0

Zhiyi Zhang : riched20: Fix a use after free.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: ceea7138b4d1cec4006e09fc16f43157b144baa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceea7138b4d1cec4006e09fc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 2 00:03:29 2019 +0800 riched20: Fix a use after free. In ME_DestroyEditor(), the item list is being freed when calling get_total_width() in destroy_para(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46328 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 62d80cff6917d6809614885f833358baeb310f20) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index daafe80..617a618 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3126,13 +3126,13 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) void ME_DestroyEditor(ME_TextEditor *editor) { - ME_DisplayItem *pFirst = editor->pBuffer->pFirst; - ME_DisplayItem *p = pFirst, *pNext = NULL; + ME_DisplayItem *p = editor->pBuffer->pFirst, *pNext = NULL; ME_Style *s, *cursor2; int i; ME_ClearTempStyle(editor); ME_EmptyUndoStack(editor); + editor->pBuffer->pFirst = NULL; while(p) { pNext = p->next; ME_DestroyDisplayItem(p);

1 0

Alexandre Julliard : ntdll: Also store FPU registers in RtlRaiseException( ).
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 0dbeb9c8e94421381ae369e8f01facf0d88eefe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dbeb9c8e94421381ae369e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 2 17:24:48 2019 +0100 ntdll: Also store FPU registers in RtlRaiseException(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44485 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dc80a0032927421d61b95659af570c21439e4a76) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_i386.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b411749..d3470e0 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2791,6 +2791,19 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL } +/******************************************************************* + * raise_exception_full_context + * + * Raise an exception with the full CPU context. + */ +void raise_exception_full_context( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) +{ + save_fpu( context ); + /* FIXME: extended registers, debug registers */ + RtlRaiseStatus( NtRaiseException( rec, context, first_chance )); +} + + /*********************************************************************** * RtlRaiseException (NTDLL.@) */ @@ -2812,9 +2825,7 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "pushl $1\n\t" "pushl %eax\n\t" "pushl %ecx\n\t" - "call " __ASM_NAME("NtRaiseException") __ASM_STDCALL(12) "\n\t" - "pushl %eax\n\t" - "call " __ASM_NAME("RtlRaiseStatus") __ASM_STDCALL(4) "\n\t" + "call " __ASM_NAME("raise_exception_full_context") "\n\t" "leave\n\t" __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t")

1 0

Olivier F. R. Dierick : explorer: Don' t change Z-order of the taskbar when displaying it.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 2076cb6c33d75098bfe3b32130ce25f140c0a654 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2076cb6c33d75098bfe3b321… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Mon Jan 7 01:51:18 2019 +0100 explorer: Don't change Z-order of the taskbar when displaying it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40828 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Hamish Claxton <hamishclaxton(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5afd80307ed2487998c0ccd552f883560ac24cfd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/systray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 9e58ad4..a75b92c 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -766,8 +766,8 @@ static void do_show_systray(void) tray_width = GetSystemMetrics( SM_CXSCREEN ); tray_height = max( icon_cy, size.cy ); start_button_width = size.cx; - SetWindowPos( tray_window, HWND_TOPMOST, 0, GetSystemMetrics( SM_CYSCREEN ) - tray_height, - tray_width, tray_height, SWP_NOACTIVATE | SWP_SHOWWINDOW ); + SetWindowPos( tray_window, 0, 0, GetSystemMetrics( SM_CYSCREEN ) - tray_height, + tray_width, tray_height, SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); sync_taskbar_buttons(); }

1 0

Serge Gautherie : jscript: Fix a MSVC-x64 warning about to_uint32().
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 427a7a2bcd546a38d7ac26bd31e7f6f0fbaef6ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=427a7a2bcd546a38d7ac26bd… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Tue Dec 18 02:11:41 2018 +0100 jscript: Fix a MSVC-x64 warning about to_uint32(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 961d5c8ed05eeccbe216ff24faa0e3d6a0c2b332) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/jsutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 4556ec4..3f42da4 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -668,7 +668,7 @@ HRESULT to_int32(script_ctx_t *ctx, jsval_t v, INT *ret) } /* ECMA-262 3rd Edition 9.6 */ -HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, DWORD *ret) +HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, UINT32 *ret) { INT32 n; HRESULT hres;

1 0