May 2014 - Wine-commits - list.winehq.org

Vincent Povirk : shell32/tests: Use SW_HIDE with ShellExecuteA in tests.
by Alexandre Julliard 07 May '14

07 May '14

Module: wine Branch: master Commit: 3ebb9b7b7530a14acec574af127aec5d7a26b053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ebb9b7b7530a14acec574af1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 7 13:55:01 2014 -0500 shell32/tests: Use SW_HIDE with ShellExecuteA in tests. --- dlls/shell32/tests/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index e3169c8..7f07c70 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -118,7 +118,7 @@ static INT_PTR shell_execute(LPCSTR verb, LPCSTR file, LPCSTR parameters, LPCSTR * association it displays the 'Open With' dialog and I could not find * a flag to prevent this. */ - rc=(INT_PTR)ShellExecuteA(NULL, verb, file, parameters, directory, SW_SHOWNORMAL); + rc=(INT_PTR)ShellExecuteA(NULL, verb, file, parameters, directory, SW_HIDE); if (rc > 32) {

1 0

Alistair Leslie-Hughes : dplayx: Initial msgtid variable (Valgrind).
by Alexandre Julliard 07 May '14

07 May '14

Module: wine Branch: master Commit: e95f42fca418dbaa815997de9817b6f1aca98674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95f42fca418dbaa815997de9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 7 12:06:17 2014 +1000 dplayx: Initial msgtid variable (Valgrind). --- dlls/dplayx/dplobby.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 7b0c57a..3a968de 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -2044,6 +2044,7 @@ HRESULT dplobby_create( REFIID riid, void **ppv ) obj->IDirectPlayLobby3_iface.lpVtbl = &dpl3_vt; obj->IDirectPlayLobby3A_iface.lpVtbl = &dpl3A_vt; obj->numIfaces = 1; + obj->msgtid = 0; obj->ref = 0; obj->refA = 0; obj->ref2 = 0;

1 0

Alistair Leslie-Hughes : netcfgx: Fix memory leak (valgrind).
by Alexandre Julliard 07 May '14

07 May '14

Module: wine Branch: master Commit: 2aaef5e48fa0d4881ed4f3fcd18d9a2dd4d8b8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aaef5e48fa0d4881ed4f3fcd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 7 14:02:01 2014 +1000 netcfgx: Fix memory leak (valgrind). --- dlls/netcfgx/tests/netcfgx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index 084f8cd..fda39f5 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -74,6 +74,7 @@ static void create_configuration(void) hr = INetCfgLock_ReleaseWriteLock(netlock); ok(hr == S_OK, "got 0x%08x\n", hr); + INetCfgLock_Release(netlock); INetCfg_Release(config); } }

1 0

Piotr Caban : msvcrt: Fix ioinfo structure size.
by Alexandre Julliard 07 May '14

07 May '14

Module: wine Branch: master Commit: 42e800fe796665d914f8ab7f93495e0c1d9602c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e800fe796665d914f8ab7f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 7 09:27:59 2014 +0200 msvcrt: Fix ioinfo structure size. --- dlls/msvcr100/msvcr100.spec | 3 +-- dlls/msvcr110/msvcr110.spec | 3 +-- dlls/msvcr80/msvcr80.spec | 3 +-- dlls/msvcr90/msvcr90.spec | 3 +-- dlls/msvcrt/file.c | 11 +++++++++++ 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 98e9539..77ba21d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -573,7 +573,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -648,7 +648,6 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cdca5c3..1afb3f2 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -900,7 +900,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -997,7 +997,6 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 13ea9f0..2aee520 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -207,7 +207,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -297,7 +297,6 @@ @ cdecl __p__winver() @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 710cb15..766d62e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -198,7 +198,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -281,7 +281,6 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 957cfaf..77a0fed 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -88,6 +88,17 @@ typedef struct { char lookahead[3]; int exflag; CRITICAL_SECTION crit; +#if _MSVCR_VER >= 80 + char textmode : 7; + char unicode : 1; + char pipech2[2]; + __int64 startpos; + BOOL utf8translations; +#endif +#if _MSVCR_VER >= 90 + char dbcsBuffer; + BOOL dbcsBufferUsed; +#endif } ioinfo; /*********************************************************************

1 0

Qian Hong : include: Added atlcom.h.
by Alexandre Julliard 07 May '14

07 May '14

Module: wine Branch: master Commit: e7aaeae73ba94e51c09c2198a9e680cdbb0339f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7aaeae73ba94e51c09c2198a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed May 7 15:38:46 2014 +0800 include: Added atlcom.h. --- include/Makefile.in | 1 + include/atlcom.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index cdb7b09..383bef28 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -160,6 +160,7 @@ SRCDIR_INCLUDES = \ asynot.idl \ asysta.idl \ atlbase.h \ + atlcom.h \ atlwin.h \ audevcod.h \ audiosessiontypes.h \ diff --git a/include/atlcom.h b/include/atlcom.h new file mode 100644 index 0000000..c141fbe --- /dev/null +++ b/include/atlcom.h @@ -0,0 +1,50 @@ +/* + * Copyright 2014 Qian Hong for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ATLCOM_H__ +#define __WINE_ATLCOM_H__ + +#ifndef __WINE_ATLBASE_H__ +# error You must include atlbase.h to use this header +#endif + +typedef struct ATL_PROPMAP_ENTRY +{ + LPCOLESTR szDesc; +#if _ATL_VER < _ATL_VER_100 + DISPID dispid; + const CLSID *pclsidPropPage; + const IID *piidDispatch; +#else + const CLSID *pclsidPropPage; + const IID *piidDispatch; + void *rgclsidAllowed; + DWORD cclsidAllowed; + DISPID dispid; +#endif + DWORD dwOffsetData; + DWORD dwSizeData; + VARTYPE vt; +} ATL_PROPMAP_ENTRY; + +HRESULT WINAPI AtlIPersistStreamInit_Load(IStream*, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistStreamInit_Save(IStream*, BOOL, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistPropertyBag_Load(IPropertyBag*, IErrorLog*, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistPropertyBag_Save(IPropertyBag*, BOOL, BOOL, ATL_PROPMAP_ENTRY*, void*, IUnknown*); + +#endif /* __WINE_ATLCOM_H__ */

1 0

Qian Hong : atl: Include atlcom.h for ATL_PROPMAP_ENTRY.
by Alexandre Julliard 07 May '14

07 May '14

Module: wine Branch: master Commit: 2d80b3ed54891f5f897bf55fd300fa634870a611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d80b3ed54891f5f897bf55fd… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed May 7 15:39:02 2014 +0800 atl: Include atlcom.h for ATL_PROPMAP_ENTRY. --- dlls/atl/atl.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 53c7181..795ca9b 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "atlbase.h" +#include "atlcom.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -249,18 +250,6 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE return rc; } -/* FIXME: should be in a header file */ -typedef struct ATL_PROPMAP_ENTRY -{ - LPCOLESTR szDesc; - DISPID dispid; - const CLSID* pclsidPropPage; - const IID* piidDispatch; - DWORD dwOffsetData; - DWORD dwSizeData; - VARTYPE vt; -} ATL_PROPMAP_ENTRY; - /*********************************************************************** * AtlIPersistStreamInit_Load [atl100.@] */

1 0

Erich E. Hoover : hhctrl.ocx: Fix an off by one mistake in searching for the node endpoint.
by Alexandre Julliard 07 May '14

07 May '14

Module: wine Branch: master Commit: 74c5e38b7c229fbd427a1dcc63507e687db4f69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c5e38b7c229fbd427a1dcc6… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Mon May 5 23:12:10 2014 -0600 hhctrl.ocx: Fix an off by one mistake in searching for the node endpoint. --- dlls/hhctrl.ocx/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/stream.c b/dlls/hhctrl.ocx/stream.c index 6e831e5..84ed317 100644 --- a/dlls/hhctrl.ocx/stream.c +++ b/dlls/hhctrl.ocx/stream.c @@ -122,7 +122,7 @@ static BOOL find_node_end(stream_t *stream, strbuf_t *buf) if(buf->len == 0) break; p = &buf->buf[b]; - while((p = memchr(p+1, '"', buf->len-(p-buf->buf))) != NULL) + while((p = memchr(p+1, '"', buf->len-(p+1-buf->buf))) != NULL) tag_count++; b = buf->len; if(tag_count % 2 != 0)

1 0

Christoph von Wittich : comctl32/treeview: Notify the parent on a return key press.
by Alexandre Julliard 07 May '14

07 May '14

Module: wine Branch: master Commit: 4cc503d164ab00b75567d1a206a303c373cbe044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cc503d164ab00b75567d1a20… Author: Christoph von Wittich <Christoph_vW(a)ReactOS.org> Date: Tue May 6 23:27:44 2014 +0200 comctl32/treeview: Notify the parent on a return key press. --- dlls/comctl32/treeview.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index dcc2be4..bb42b21 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5259,6 +5259,10 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) newSelection = TREEVIEW_GetNextListItem(infoPtr, prevItem); break; + case VK_RETURN: + TREEVIEW_SendSimpleNotify(infoPtr, NM_RETURN); + break; + case VK_HOME: newSelection = infoPtr->root->firstChild; break;

1 0

Huw Davies : include: Add a couple of new win 8 access rights.
by Alexandre Julliard 07 May '14

07 May '14

Module: wine Branch: master Commit: 76fca0f953505209fd9b2a12f506895ffbfb40a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76fca0f953505209fd9b2a12f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 7 09:42:15 2014 +0100 include: Add a couple of new win 8 access rights. --- include/winnt.h | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 3f33c6b..bae8aed 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4533,31 +4533,33 @@ typedef enum tagSID_NAME_USE { #define TIMER_MODIFY_STATE 0x0002 #define TIMER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) -#define PROCESS_TERMINATE 0x0001 -#define PROCESS_CREATE_THREAD 0x0002 -#define PROCESS_VM_OPERATION 0x0008 -#define PROCESS_VM_READ 0x0010 -#define PROCESS_VM_WRITE 0x0020 -#define PROCESS_DUP_HANDLE 0x0040 -#define PROCESS_CREATE_PROCESS 0x0080 -#define PROCESS_SET_QUOTA 0x0100 -#define PROCESS_SET_INFORMATION 0x0200 -#define PROCESS_QUERY_INFORMATION 0x0400 -#define PROCESS_SUSPEND_RESUME 0x0800 +#define PROCESS_TERMINATE 0x0001 +#define PROCESS_CREATE_THREAD 0x0002 +#define PROCESS_VM_OPERATION 0x0008 +#define PROCESS_VM_READ 0x0010 +#define PROCESS_VM_WRITE 0x0020 +#define PROCESS_DUP_HANDLE 0x0040 +#define PROCESS_CREATE_PROCESS 0x0080 +#define PROCESS_SET_QUOTA 0x0100 +#define PROCESS_SET_INFORMATION 0x0200 +#define PROCESS_QUERY_INFORMATION 0x0400 +#define PROCESS_SUSPEND_RESUME 0x0800 #define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 +#define PROCESS_SET_LIMITED_INFORMATION 0x2000 #define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xffff) -#define THREAD_TERMINATE 0x0001 -#define THREAD_SUSPEND_RESUME 0x0002 -#define THREAD_GET_CONTEXT 0x0008 -#define THREAD_SET_CONTEXT 0x0010 -#define THREAD_SET_INFORMATION 0x0020 -#define THREAD_QUERY_INFORMATION 0x0040 -#define THREAD_SET_THREAD_TOKEN 0x0080 -#define THREAD_IMPERSONATE 0x0100 -#define THREAD_DIRECT_IMPERSONATION 0x0200 -#define THREAD_SET_LIMITED_INFORMATION 0x0400 -#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 +#define THREAD_TERMINATE 0x0001 +#define THREAD_SUSPEND_RESUME 0x0002 +#define THREAD_GET_CONTEXT 0x0008 +#define THREAD_SET_CONTEXT 0x0010 +#define THREAD_SET_INFORMATION 0x0020 +#define THREAD_QUERY_INFORMATION 0x0040 +#define THREAD_SET_THREAD_TOKEN 0x0080 +#define THREAD_IMPERSONATE 0x0100 +#define THREAD_DIRECT_IMPERSONATION 0x0200 +#define THREAD_SET_LIMITED_INFORMATION 0x0400 +#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 +#define THREAD_RESUME 0x1000 #define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xffff) #define THREAD_BASE_PRIORITY_LOWRT 15

1 0

Huw Davies : advapi32/tests: Fix access rights tests in win 8.
by Alexandre Julliard 07 May '14

07 May '14

Module: wine Branch: master Commit: 0451a89ca12690e1d97a69fb1b178f10f74da909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0451a89ca12690e1d97a69fb1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 7 09:42:16 2014 +0100 advapi32/tests: Fix access rights tests in win 8. --- dlls/advapi32/tests/security.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a0574c4..05da0ae 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5073,12 +5073,16 @@ static void test_thread_security(void) { case GENERIC_READ: case GENERIC_EXECUTE: - ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, + ok(access == map[i].mapped || + access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */ || + access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION | THREAD_RESUME) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_WRITE: todo_wine - ok(access == map[i].mapped || access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */, + ok(access == map[i].mapped || + access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */ || + access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION | THREAD_RESUME) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_ALL: @@ -5144,7 +5148,9 @@ static void test_process_access(void) "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_WRITE: - ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */, + ok(access == map[i].mapped || + access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */ || + access == (map[i].mapped | PROCESS_SET_LIMITED_INFORMATION) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_EXECUTE:

1 0