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

Francois Gouget : ws2_32: Add support for WSA_FLAG_NO_HANDLE_INHERIT.
by Alexandre Julliard 17 Mar '15

17 Mar '15

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

Francois Gouget : d3drm: Mark internal symbols with hidden visibility.
by Alexandre Julliard 17 Mar '15

17 Mar '15

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 : d3dx9_36: Make d3dx_decltype_size[] static.
by Alexandre Julliard 17 Mar '15

17 Mar '15

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 : devenum: Mark internal symbols with hidden visibility.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 8c3170d7f47c4a5e8f7161c827b5f545e445de0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3170d7f47c4a5e8f7161c82… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 18:59:09 2015 +0100 devenum: Mark internal symbols with hidden visibility. --- dlls/devenum/devenum_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 4f14423..347aebb 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -82,8 +82,8 @@ HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR /********************************************************************** * Global string constant declarations */ -extern const WCHAR clsid_keyname[6]; -extern const WCHAR wszInstanceKeyName[]; +extern const WCHAR clsid_keyname[6] DECLSPEC_HIDDEN; +extern const WCHAR wszInstanceKeyName[] DECLSPEC_HIDDEN; #define CLSID_STR_LEN (sizeof(clsid_keyname) / sizeof(WCHAR)) /**********************************************************************

1 0

Francois Gouget : odbccp32: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard 17 Mar '15

17 Mar '15

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 : ole2.dll16: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 17 Mar '15

17 Mar '15

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 17 Mar '15

17 Mar '15

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 : oleaut32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 4d65584f8a593d34456868bb63722e646df3526a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d65584f8a593d34456868bb6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:08:17 2015 +0100 oleaut32: Remove unneeded NONAMELESSXXX directives. --- dlls/oleaut32/olepicture.c | 1 - dlls/oleaut32/olepropframe.c | 1 - dlls/oleaut32/recinfo.c | 1 - dlls/oleaut32/tmarshal.c | 1 - dlls/oleaut32/typelib.c | 1 - dlls/oleaut32/usrmarshal.c | 1 - dlls/oleaut32/varformat.c | 2 -- dlls/oleaut32/variant.h | 3 +-- 8 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index dfaf6f4..5d0d801 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -48,7 +48,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 9a563f1..b89d3a6 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index be61fd5..f60fb8a 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -20,7 +20,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 89dc894..7bf62b7 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -33,7 +33,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c6c539e..54dbc05 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -58,7 +58,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 108f819..3187ca2 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -24,7 +24,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 27bedce..5d220fa 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -32,8 +32,6 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "wine/unicode.h" diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index 1e75bd8..e5d9a56 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -17,8 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winerror.h" #include "objbase.h"

1 0

Nikolay Sivov : scrrun: Implement Path() property for IFile.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 574350d838da872d6e9d4cdbcb03128ddb86db59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574350d838da872d6e9d4cdbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 23:31:04 2015 +0300 scrrun: Implement Path() property for IFile. --- dlls/scrrun/filesystem.c | 15 ++++++++++++--- dlls/scrrun/tests/filesystem.c | 10 +++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 74e5432..5e0fc28 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2546,11 +2546,20 @@ static HRESULT WINAPI file_Invoke(IFile *iface, DISPID dispIdMember, REFIID riid return hr; } -static HRESULT WINAPI file_get_Path(IFile *iface, BSTR *pbstrPath) +static HRESULT WINAPI file_get_Path(IFile *iface, BSTR *path) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%p)\n", This, pbstrPath); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, path); + + if (!path) + return E_POINTER; + + *path = SysAllocString(This->path); + if (!*path) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI file_get_Name(IFile *iface, BSTR *name) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 210b90c..987ecba 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -538,7 +538,7 @@ static void test_GetAbsolutePathName(void) static void test_GetFile(void) { static const WCHAR slW[] = {'\\',0}; - BSTR path; + BSTR path, str; WCHAR pathW[MAX_PATH]; FileAttribute fa; VARIANT size; @@ -572,6 +572,14 @@ static void test_GetFile(void) hr = IFileSystem3_GetFile(fs3, path, &file); ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); + hr = IFile_get_Path(file, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IFile_get_Path(file, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, pathW), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hr = IFile_get_Attributes(file, &fa); gfa = GetFileAttributesW(pathW) & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ARCHIVE |

1 0

Alexandre Julliard : msvcp: Add a macro to access the locale field of I/ O streams.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 90aad327ae6d1c8dab95b6a6a8ae5b0c636607a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90aad327ae6d1c8dab95b6a6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 16 17:25:08 2015 +0900 msvcp: Add a macro to access the locale field of I/O streams. --- dlls/msvcp60/ios.c | 156 ++++++++++++++++----------------- dlls/msvcp60/locale.c | 90 +++++++++---------- dlls/msvcp60/msvcp.h | 2 + dlls/msvcp90/ios.c | 232 ++++++++++++++++++++++++++----------------------- dlls/msvcp90/locale.c | 88 +++++++++---------- dlls/msvcp90/msvcp90.h | 6 ++ 6 files changed, 296 insertions(+), 278 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90aad327ae6d1c8dab95b…

1 0