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

Francois Gouget : odbccp32: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 8110b3cb09c395ac49777a3e590ac503537e7440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8110b3cb09c395ac49777a3e5… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:06:34 2015 +0100 odbccp32: Remove an uneeded NONAMELESSUNION directive. --- dlls/odbccp32/odbccp32.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index fb4ea2c..0483f1e 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -24,7 +24,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : winemenubuilder: Avoid a couple of forward declarations.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: d4b9ac46a0a474d6f2cd3514db7ef07e7a3e6178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b9ac46a0a474d6f2cd3514d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 17:44:39 2015 +0100 winemenubuilder: Avoid a couple of forward declarations. --- programs/winemenubuilder/winemenubuilder.c | 46 ++++++++++++++---------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index d902e93..2bdbdbf 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -195,8 +195,6 @@ static char *xdg_config_dir; static char *xdg_data_dir; static char *xdg_desktop_dir; -static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra); -static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream); /* Utility routines */ static unsigned short crc16(const char* string) @@ -1004,6 +1002,28 @@ end: return hr; } +static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra) +{ + HRESULT hr; + WCHAR *value = NULL; + DWORD size = 0; + hr = AssocQueryStringW(0, assocStr, name, extra, NULL, &size); + if (SUCCEEDED(hr)) + { + value = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (value) + { + hr = AssocQueryStringW(0, assocStr, name, extra, value, &size); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, value); + value = NULL; + } + } + } + return value; +} + static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream) { static const WCHAR openW[] = {'o','p','e','n',0}; @@ -1939,28 +1959,6 @@ static HRESULT get_cmdline( IShellLinkW *sl, LPWSTR szPath, DWORD pathSize, return hr; } -static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra) -{ - HRESULT hr; - WCHAR *value = NULL; - DWORD size = 0; - hr = AssocQueryStringW(0, assocStr, name, extra, NULL, &size); - if (SUCCEEDED(hr)) - { - value = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (value) - { - hr = AssocQueryStringW(0, assocStr, name, extra, value, &size); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(), 0, value); - value = NULL; - } - } - } - return value; -} - static char *slashes_to_minuses(const char *string) { int i;

1 0

Francois Gouget : d3dx9_36: Make d3dx_decltype_size[] static.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 3266ff8ab2dcdb81d29a758b85a98895297dca2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3266ff8ab2dcdb81d29a758b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 18:58:56 2015 +0100 d3dx9_36: Make d3dx_decltype_size[] static. --- dlls/d3dx9_36/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6f268f2..b1a1a76 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -69,7 +69,7 @@ struct d3dx9_mesh D3DXATTRIBUTERANGE *attrib_table; }; -const UINT d3dx_decltype_size[] = +static const UINT d3dx_decltype_size[] = { /* D3DDECLTYPE_FLOAT1 */ sizeof(FLOAT), /* D3DDECLTYPE_FLOAT2 */ sizeof(D3DXVECTOR2),

1 0

Francois Gouget : d3drm: Mark internal symbols with hidden visibility.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: f289bab06a144f13a00f06a48372ec20f21a2619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f289bab06a144f13a00f06a48… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 18:58:17 2015 +0100 d3drm: Mark internal symbols with hidden visibility. --- dlls/d3drm/d3drm_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 3daf96a..80da952 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -44,6 +44,6 @@ struct d3drm_file_header DWORD flags; }; -extern char templates[]; +extern char templates[] DECLSPEC_HIDDEN; #endif /* __D3DRM_PRIVATE_INCLUDED__ */

1 0

Francois Gouget : ole2.dll16: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: fe1a57c2903af264c90b2a2b6ee6315624623db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1a57c2903af264c90b2a2b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:06:46 2015 +0100 ole2.dll16: Remove unneeded NONAMELESSXXX directives. --- dlls/ole2.dll16/memlockbytes.c | 2 +- dlls/ole2.dll16/ole2.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ole2.dll16/memlockbytes.c b/dlls/ole2.dll16/memlockbytes.c index 80153df..93f91bc 100644 --- a/dlls/ole2.dll16/memlockbytes.c +++ b/dlls/ole2.dll16/memlockbytes.c @@ -25,7 +25,7 @@ #include <string.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "wine/winbase16.h" diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 3a27132..0052142 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -29,8 +29,6 @@ #include <stdio.h> #include <string.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Francois Gouget : ole32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 7fe0600237b924fa1c5282f677e202ac22d8aef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe0600237b924fa1c5282f67… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:07:43 2015 +0100 ole32: Remove unneeded NONAMELESSXXX directives. --- dlls/ole32/antimoniker.c | 1 - dlls/ole32/classmoniker.c | 2 -- dlls/ole32/clipboard.c | 1 - dlls/ole32/compobj.c | 1 - dlls/ole32/compositemoniker.c | 2 -- dlls/ole32/datacache.c | 2 +- dlls/ole32/filemoniker.c | 1 - dlls/ole32/git.c | 2 -- dlls/ole32/hglobalstream.c | 1 - dlls/ole32/itemmoniker.c | 1 - dlls/ole32/memlockbytes.c | 1 - dlls/ole32/ole2.c | 1 - dlls/ole32/ole2impl.c | 1 - dlls/ole32/ole2stubs.c | 2 -- dlls/ole32/oleobj.c | 1 - dlls/ole32/oleproxy.c | 2 -- dlls/ole32/pointermoniker.c | 1 - dlls/ole32/rpc.c | 1 - dlls/ole32/stg_prop.c | 1 - dlls/ole32/stg_stream.c | 1 - dlls/ole32/storage32.c | 1 - dlls/ole32/stubmanager.c | 2 -- dlls/ole32/usrmarshal.c | 1 - 23 files changed, 1 insertion(+), 29 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 6b62f5e..83eb71b 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -24,7 +24,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 89c7297..1bcf58f 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -24,8 +24,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index d40ee59..c7d58d6 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -65,7 +65,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 82cc77d..e2efe58 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -45,7 +45,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index faadca1..e431bfc 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -23,8 +23,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 3e5e99c..6ae9367 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -43,12 +43,12 @@ * header. I was able to figure-out where the extent of the object * was stored and the aspect, but that's about it. */ + #include <stdarg.h> #include <string.h> #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 732d6ac..c9b4e50 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -25,7 +25,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index b83d415..f7a0460 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -27,8 +27,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index ce0f34c..ff1dfa2 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -31,7 +31,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index d5fb0a8..e8e5d23 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -24,7 +24,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c index 81d3b32..b2fc5b4 100644 --- a/dlls/ole32/memlockbytes.c +++ b/dlls/ole32/memlockbytes.c @@ -27,7 +27,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 38b23dc..b0a8c3b 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -33,7 +33,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index 152132b..4be79a7 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 5a90e2d..ba32165 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h> #include "windef.h" diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 968456d..edbef55 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -25,7 +25,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 184aca1..8351f27 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -27,8 +27,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 96b580a..212a8aa 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -24,7 +24,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index ce39849..2455464 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -28,7 +28,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index b0cd542..da361ce 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -47,7 +47,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 7738cf1..a3abf46 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -31,7 +31,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b4401a6..f09beec 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -38,7 +38,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index fbbf413..fda4944 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -24,8 +24,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <assert.h> #include <stdarg.h> diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 6687ac2..cd16fb2 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -24,7 +24,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : winemenubuilder: Handle icons disguised as executables and better validate icon streams.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 520dcb4c23d7aad280ddaee8254cd847c5baf038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=520dcb4c23d7aad280ddaee82… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 17:44:43 2015 +0100 winemenubuilder: Handle icons disguised as executables and better validate icon streams. For some applications the shortcut's icon points to a .exe file which in fact contains a .ico file. This means open_icon() cannot rely on the file extension. Also reject icon streams that don't actually contain a valid icon and use the next source as a fallback. --- programs/winemenubuilder/winemenubuilder.c | 84 ++++++++++++++++++------------ 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 2bdbdbf..4a5639b 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -103,7 +103,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(menubuilder); (csidl)==CSIDL_COMMON_DESKTOPDIRECTORY) #define in_startmenu(csidl) ((csidl)==CSIDL_STARTMENU || \ (csidl)==CSIDL_COMMON_STARTMENU) - + /* link file formats */ #include "pshpack1.h" @@ -964,20 +964,32 @@ end: return hr; } -static HRESULT write_native_icon(IStream *iconStream, const char *icon_name, LPCWSTR szFileName) +static HRESULT validate_ico(IStream **ppStream, ICONDIRENTRY **ppIconDirEntries, int *numEntries) +{ + HRESULT hr; + + hr = read_ico_direntries(*ppStream, ppIconDirEntries, numEntries); + if (SUCCEEDED(hr)) + { + if (*numEntries) + return hr; + HeapFree(GetProcessHeap(), 0, *ppIconDirEntries); + *ppIconDirEntries = NULL; + } + IStream_Release(*ppStream); + *ppStream = NULL; + return E_FAIL; +} + +static HRESULT write_native_icon(IStream *iconStream, ICONDIRENTRY *pIconDirEntry, + int numEntries, const char *icon_name, LPCWSTR szFileName) { - ICONDIRENTRY *pIconDirEntry = NULL; - int numEntries; int nMax = 0, nMaxBits = 0; int nIndex = 0; int i; LARGE_INTEGER position; HRESULT hr; - hr = read_ico_direntries(iconStream, &pIconDirEntry, &numEntries); - if (FAILED(hr)) - goto end; - for (i = 0; i < numEntries; i++) { WINE_TRACE("[%d]: %d x %d @ %d\n", i, pIconDirEntry[i].bWidth, pIconDirEntry[i].bHeight, pIconDirEntry[i].wBitCount); @@ -1069,7 +1081,7 @@ static HRESULT open_default_icon(IStream **ppStream) return open_module_icon(user32W, -(INT_PTR)IDI_WINLOGO, ppStream); } -static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream) +static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream, ICONDIRENTRY **ppIconDirEntries, int *numEntries) { HRESULT hr; @@ -1084,16 +1096,25 @@ static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppSt } else { - static const WCHAR dot_icoW[] = {'.','i','c','o',0}; - int len = strlenW(filename); - if (len >= 4 && strcmpiW(&filename[len - 4], dot_icoW) == 0) - hr = SHCreateStreamOnFileW(filename, STGM_READ, ppStream); + /* This might be a raw .ico file */ + hr = SHCreateStreamOnFileW(filename, STGM_READ, ppStream); } } + if (SUCCEEDED(hr)) + hr = validate_ico(ppStream, ppIconDirEntries, numEntries); + if (FAILED(hr)) + { hr = open_file_type_icon(filename, ppStream); + if (SUCCEEDED(hr)) + hr = validate_ico(ppStream, ppIconDirEntries, numEntries); + } if (FAILED(hr) && !bWait) + { hr = open_default_icon(ppStream); + if (SUCCEEDED(hr)) + hr = validate_ico(ppStream, ppIconDirEntries, numEntries); + } return hr; } @@ -1147,11 +1168,10 @@ static inline int size_to_slot(int size) #define CLASSIC_SLOT 3 -static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR icoPathW, +static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *pIconDirEntry, + int numEntries, int exeIndex, LPCWSTR icoPathW, const char *destFilename, char **nativeIdentifier) { - ICONDIRENTRY *iconDirEntries = NULL; - int numEntries; struct { int index; int maxBits; @@ -1164,9 +1184,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico LARGE_INTEGER zero; HRESULT hr; - hr = read_ico_direntries(icoStream, &iconDirEntries, &numEntries); - if (FAILED(hr)) - goto end; for (i = 0; i < ICNS_SLOTS; i++) { best[i].index = -1; @@ -1254,7 +1271,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico } end: - HeapFree(GetProcessHeap(), 0, iconDirEntries); HeapFree(GetProcessHeap(), 0, icnsPath); return hr; } @@ -1279,20 +1295,15 @@ static void refresh_icon_cache(const char *iconsDir) } } -static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR icoPathW, +static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntries, + int numEntries, int exeIndex, LPCWSTR icoPathW, const char *destFilename, char **nativeIdentifier) { - ICONDIRENTRY *iconDirEntries = NULL; - int numEntries; int i; char *iconsDir = NULL; HRESULT hr = S_OK; LARGE_INTEGER zero; - hr = read_ico_direntries(icoStream, &iconDirEntries, &numEntries); - if (FAILED(hr)) - goto end; - if (destFilename) *nativeIdentifier = heap_printf("%s", destFilename); else @@ -1372,7 +1383,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico refresh_icon_cache(iconsDir); end: - HeapFree(GetProcessHeap(), 0, iconDirEntries); HeapFree(GetProcessHeap(), 0, iconsDir); return hr; } @@ -1382,24 +1392,27 @@ end: static char *extract_icon(LPCWSTR icoPathW, int index, const char *destFilename, BOOL bWait) { IStream *stream = NULL; + ICONDIRENTRY *pIconDirEntries = NULL; + int numEntries; HRESULT hr; char *nativeIdentifier = NULL; WINE_TRACE("path=[%s] index=%d destFilename=[%s]\n", wine_dbgstr_w(icoPathW), index, wine_dbgstr_a(destFilename)); - hr = open_icon(icoPathW, index, bWait, &stream); + hr = open_icon(icoPathW, index, bWait, &stream, &pIconDirEntries, &numEntries); if (FAILED(hr)) { WINE_WARN("opening icon %s index %d failed, hr=0x%08X\n", wine_dbgstr_w(icoPathW), index, hr); goto end; } - hr = platform_write_icon(stream, index, icoPathW, destFilename, &nativeIdentifier); + hr = platform_write_icon(stream, pIconDirEntries, numEntries, index, icoPathW, destFilename, &nativeIdentifier); if (FAILED(hr)) WINE_WARN("writing icon failed, error 0x%08X\n", hr); end: if (stream) IStream_Release(stream); + HeapFree(GetProcessHeap(), 0, pIconDirEntries); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, nativeIdentifier); @@ -3472,6 +3485,8 @@ static void thumbnail_lnk(LPCWSTR lnkPath, LPCWSTR outputPath) WCHAR szIconPath[MAX_PATH]; int iconId; IStream *stream = NULL; + ICONDIRENTRY *pIconDirEntries = NULL; + int numEntries; HRESULT hr; utf8lnkPath = wchars_to_utf8_chars(lnkPath); @@ -3533,15 +3548,15 @@ static void thumbnail_lnk(LPCWSTR lnkPath, LPCWSTR outputPath) if (szIconPath[0]) { - hr = open_icon(szIconPath, iconId, FALSE, &stream); + hr = open_icon(szIconPath, iconId, FALSE, &stream, &pIconDirEntries, &numEntries); if (SUCCEEDED(hr)) - hr = write_native_icon(stream, utf8OutputPath, NULL); + hr = write_native_icon(stream, pIconDirEntries, numEntries, utf8OutputPath, NULL); } else { - hr = open_icon(szPath, iconId, FALSE, &stream); + hr = open_icon(szPath, iconId, FALSE, &stream, &pIconDirEntries, &numEntries); if (SUCCEEDED(hr)) - hr = write_native_icon(stream, utf8OutputPath, NULL); + hr = write_native_icon(stream, pIconDirEntries, numEntries, utf8OutputPath, NULL); } end: @@ -3554,6 +3569,7 @@ end: IPersistFile_Release(persistFile); if (stream != NULL) IStream_Release(stream); + HeapFree(GetProcessHeap(), 0, pIconDirEntries); } static WCHAR *next_token( LPWSTR *p )

1 0

Francois Gouget : ws2_32: Add support for WSA_FLAG_NO_HANDLE_INHERIT.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: ae6e1e2e38a50c6c7b14cb1febd421ba744197e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6e1e2e38a50c6c7b14cb1fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 17:45:40 2015 +0100 ws2_32: Add support for WSA_FLAG_NO_HANDLE_INHERIT. --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 960556d..e7e3de5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6386,8 +6386,8 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, req->type = unixtype; req->protocol = protocol; req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; - req->attributes = OBJ_INHERIT; - req->flags = dwFlags; + req->attributes = (dwFlags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT; + req->flags = dwFlags & ~WSA_FLAG_NO_HANDLE_INHERIT; set_error( wine_server_call( req ) ); ret = HANDLE2SOCKET( wine_server_ptr_handle( reply->handle )); }

1 0

Jactry Zeng : riched20: Add tests for IRichEditOle::QueryInterface.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 879261dd8b90cb258604dc810623095efece94f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=879261dd8b90cb258604dc810… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Mar 16 17:27:07 2015 +0800 riched20: Add tests for IRichEditOle::QueryInterface. --- dlls/riched20/tests/richole.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index eed335c..ee31a16 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -156,6 +156,14 @@ static void test_Interfaces(void) ok(punk != NULL, "ITextSelection_QueryInterface\n"); IUnknown_Release(punk); + punk = NULL; + hres = IRichEditOle_QueryInterface(reOle, &IID_IOleClientSite, (void **) &punk); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface\n"); + + punk = NULL; + hres = IRichEditOle_QueryInterface(reOle, &IID_IOleWindow, (void **) &punk); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface\n"); + ITextDocument_Release(txtDoc); IRichEditOle_Release(reOle); refcount = IRichEditOle_Release(reOle);

1 0

Alexandre Julliard : winhttp: Remove const to fix a warning with the Microsoft headers.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 0d7613fc98a8b7b8edbff8dbaae09e8b205d1c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7613fc98a8b7b8edbff8dba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 00:19:19 2015 +0900 winhttp: Remove const to fix a warning with the Microsoft headers. --- dlls/winhttp/request.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a12d73a..4efe2d8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -983,10 +983,10 @@ static BOOL secure_proxy_connect( request_t *request ) #define INET6_ADDRSTRLEN 46 #endif -static WCHAR *addr_to_str( const struct sockaddr *addr ) +static WCHAR *addr_to_str( struct sockaddr *addr ) { char buf[INET6_ADDRSTRLEN]; - const void *src; + void *src; switch (addr->sa_family) {

1 0