wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Fabian Maurer : winealsa.drv: Don' t crash when getting NULL event from midi.
by Alexandre Julliard 03 Mar '19

03 Mar '19

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

Brendan McGrath : msi: Set stale function pointers to NULL.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 00d9b82035cb51c3cf893f08b8df22c1ce159c95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00d9b82035cb51c3cf893f08… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Mon Nov 26 20:23:34 2018 +1100 msi: Set stale function pointers to NULL. A crash occurs during install of dotnet35 on a 64-bit prefix as when msi_destroy_assembly_caches is called, the mscoree library is unloaded but the function pointers are not set back to NULL. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 256ca317a2871c62ca121e49f29fc37a64b4fb64) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/assembly.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index bccd114..3ed815e 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -36,7 +36,6 @@ static HRESULT (WINAPI *pCreateAssemblyCacheNet11)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet20)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet40)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheSxs)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, DWORD, LPVOID ); static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); @@ -52,6 +51,7 @@ static BOOL init_function_pointers( void ) static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; + HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); WCHAR path[MAX_PATH]; DWORD len = GetSystemDirectoryW( path, MAX_PATH ); @@ -121,6 +121,9 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; pCreateAssemblyCacheNet40 = NULL; + pGetFileVersion = NULL; + pCreateAssemblyNameObject = NULL; + pCreateAssemblyEnum = NULL; FreeLibrary( hfusion10 ); FreeLibrary( hfusion11 ); FreeLibrary( hfusion20 );

1 0

Jacek Caban : include: Don' t use unnamed struct for NDR_SCONTEXT declaration.
by Alexandre Julliard 03 Mar '19

03 Mar '19

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

Serge Gautherie : jscript: Fix a MSVC-x64 warning about to_uint32().
by Alexandre Julliard 03 Mar '19

03 Mar '19

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

Nikolay Sivov : xmllite/reader: Fix compiler warning.
by Alexandre Julliard 03 Mar '19

03 Mar '19

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 03 Mar '19

03 Mar '19

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

Hans Leidekker : msi: Only perform the media check if the label of the disk entry differs from the last.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: bc2095b94a2790efd50da6f739fb87b6c404efee URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc2095b94a2790efd50da6f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 7 08:55:15 2019 +0100 msi: Only perform the media check if the label of the disk entry differs from the last. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40433 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85fea53af80d324a4cf7f80a45f43fed8d8d65e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/media.c | 26 +++++++++++++++++--------- dlls/msi/msipriv.h | 1 + 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 5f8c26a..09aac09 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -664,6 +664,7 @@ void msi_free_media_info(MSIMEDIAINFO *mi) msi_free(mi->disk_prompt); msi_free(mi->cabinet); msi_free(mi->volume_label); + msi_free(mi->last_volume); msi_free(mi); } @@ -898,20 +899,27 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) } } /* check volume matches, change media if not */ - if (mi->volume_label && mi->disk_id > 1) + if (mi->volume_label) { - WCHAR *source = msi_dup_property( package->db, szSourceDir ); - BOOL match = source_matches_volume( mi, source ); - msi_free( source ); - - if (!match && (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE)) + /* assume first volume is in the drive */ + if (mi->last_volume && strcmpiW( mi->last_volume, mi->volume_label )) { - if ((rc = msi_change_media( package, mi )) != ERROR_SUCCESS) + WCHAR *source = msi_dup_property( package->db, szSourceDir ); + BOOL match = source_matches_volume( mi, source ); + msi_free( source ); + + if (!match && (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE)) { - msi_free( cabinet_file ); - return rc; + if ((rc = msi_change_media( package, mi )) != ERROR_SUCCESS) + { + msi_free( cabinet_file ); + return rc; + } } } + + msi_free(mi->last_volume); + mi->last_volume = strdupW(mi->volume_label); } if (mi->cabinet) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 27d654b..fdafeec 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -170,6 +170,7 @@ typedef struct tagMSIMEDIAINFO LPWSTR disk_prompt; LPWSTR cabinet; LPWSTR volume_label; + LPWSTR last_volume; BOOL is_continuous; BOOL is_extracted; WCHAR sourcedir[MAX_PATH];

1 0

Alexandre Julliard : msi: Return an error code instead of a button id in msi_change_media().
by Alexandre Julliard 03 Mar '19

03 Mar '19

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

Paul Gofman : d3dx9: Return correct comment length from get_instr_length() .
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 373156d002fc5f3883fc1f8d7d08a5d3e8d0e73b URL: https://source.winehq.org/git/wine.git/?a=commit;h=373156d002fc5f3883fc1f8d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jan 9 20:17:52 2019 +0100 d3dx9: Return correct comment length from get_instr_length(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46435 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 807e5fc04af7a7ea563af1e7da6ebe6662536e6b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/shader.c | 8 +++++--- dlls/d3dx9_36/tests/shader.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index f372494..ac5b824 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2419,18 +2419,20 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader static unsigned int get_instr_length(const DWORD *byte_code, unsigned int major, unsigned int minor) { + DWORD opcode = *byte_code & 0xffff; unsigned int len = 0; + if (opcode == D3DSIO_COMMENT) + return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + if (major > 1) return (*byte_code & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT; - switch (*byte_code & 0xffff) + switch (opcode) { case D3DSIO_END: ERR("Unexpected END token.\n"); return 0; - case D3DSIO_COMMENT: - return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; case D3DSIO_DEF: case D3DSIO_DEFI: return 5; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 2f01a46..b8363af 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6534,6 +6534,7 @@ static void test_shader_semantics(void) vs_3_0[] = { 0xfffe0300, /* vs_3_0 */ + 0x0002fffe, 0x0200000f, 0x00000000, /* comment */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */

1 0

Olivier F. R. Dierick : explorer: Don' t change Z-order of the taskbar when displaying it.
by Alexandre Julliard 03 Mar '19

03 Mar '19

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019