September 2013 - Wine-commits

Michael Stefaniuc : setupapi: Avoid using CONST.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 09524be58380b612d0a9d2ba023ac25791e3fe03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09524be58380b612d0a9d2ba0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 23 00:37:16 2013 +0200 setupapi: Avoid using CONST. --- dlls/setupapi/devinst.c | 53 ++++++++++------------------------------- dlls/setupapi/tests/devinst.c | 4 +- 2 files changed, 15 insertions(+), 42 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 6ddebb0..b1d6be0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1310,14 +1310,9 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( /*********************************************************************** * SetupDiCreateDeviceInfoA (SETUPAPI.@) */ -BOOL WINAPI SetupDiCreateDeviceInfoA( - HDEVINFO DeviceInfoSet, - PCSTR DeviceName, - CONST GUID *ClassGuid, - PCSTR DeviceDescription, - HWND hwndParent, - DWORD CreationFlags, - PSP_DEVINFO_DATA DeviceInfoData) +BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceName, + const GUID *ClassGuid, PCSTR DeviceDescription, HWND hwndParent, DWORD CreationFlags, + PSP_DEVINFO_DATA DeviceInfoData) { BOOL ret = FALSE; LPWSTR DeviceNameW = NULL; @@ -1373,14 +1368,9 @@ static DWORD SETUPDI_DevNameToDevID(LPCWSTR devName) /*********************************************************************** * SetupDiCreateDeviceInfoW (SETUPAPI.@) */ -BOOL WINAPI SetupDiCreateDeviceInfoW( - HDEVINFO DeviceInfoSet, - PCWSTR DeviceName, - CONST GUID *ClassGuid, - PCWSTR DeviceDescription, - HWND hwndParent, - DWORD CreationFlags, - PSP_DEVINFO_DATA DeviceInfoData) +BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO DeviceInfoSet, PCWSTR DeviceName, + const GUID *ClassGuid, PCWSTR DeviceDescription, HWND hwndParent, DWORD CreationFlags, + PSP_DEVINFO_DATA DeviceInfoData) { struct DeviceInfoSet *set = DeviceInfoSet; BOOL ret = FALSE, allocatedInstanceId = FALSE; @@ -1922,11 +1912,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExW( /*********************************************************************** * SetupDiGetClassDevsA (SETUPAPI.@) */ -HDEVINFO WINAPI SetupDiGetClassDevsA( - CONST GUID *class, - LPCSTR enumstr, - HWND parent, - DWORD flags) +HDEVINFO WINAPI SetupDiGetClassDevsA(const GUID *class, LPCSTR enumstr, HWND parent, DWORD flags) { HDEVINFO ret; LPWSTR enumstrW = NULL; @@ -2328,11 +2314,7 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class, /*********************************************************************** * SetupDiGetClassDevsW (SETUPAPI.@) */ -HDEVINFO WINAPI SetupDiGetClassDevsW( - CONST GUID *class, - LPCWSTR enumstr, - HWND parent, - DWORD flags) +HDEVINFO WINAPI SetupDiGetClassDevsW(const GUID *class, LPCWSTR enumstr, HWND parent, DWORD flags) { return SetupDiGetClassDevsExW(class, enumstr, parent, flags, NULL, NULL, NULL); @@ -2341,14 +2323,8 @@ HDEVINFO WINAPI SetupDiGetClassDevsW( /*********************************************************************** * SetupDiGetClassDevsExW (SETUPAPI.@) */ -HDEVINFO WINAPI SetupDiGetClassDevsExW( - CONST GUID *class, - PCWSTR enumstr, - HWND parent, - DWORD flags, - HDEVINFO deviceset, - PCWSTR machine, - PVOID reserved) +HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND parent, DWORD flags, + HDEVINFO deviceset, PCWSTR machine, void *reserved) { static const DWORD unsupportedFlags = DIGCF_DEFAULT | DIGCF_PRESENT | DIGCF_PROFILE; @@ -2790,12 +2766,9 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey( * Success: non-zero value. * Failure: FALSE. Call GetLastError() for more info. */ -BOOL WINAPI SetupDiEnumDeviceInterfaces( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - CONST GUID * InterfaceClassGuid, - DWORD MemberIndex, - PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) +BOOL WINAPI SetupDiEnumDeviceInterfaces(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, + const GUID *InterfaceClassGuid, DWORD MemberIndex, + PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { struct DeviceInfoSet *set = DeviceInfoSet; BOOL ret = FALSE; diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 77962b0..14bb934 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -52,8 +52,8 @@ static BOOL (WINAPI *pSetupDiGetDeviceInstanceIdA)(HDEVINFO, PSP_DEVINFO_DAT static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailA)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailW)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiRegisterDeviceInfo)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); -static HDEVINFO (WINAPI *pSetupDiGetClassDevsA)(CONST GUID *, LPCSTR, HWND, DWORD); -static HDEVINFO (WINAPI *pSetupDiGetClassDevsW)(CONST GUID *, LPCWSTR, HWND, DWORD); +static HDEVINFO (WINAPI *pSetupDiGetClassDevsA)(const GUID *, LPCSTR, HWND, DWORD); +static HDEVINFO (WINAPI *pSetupDiGetClassDevsW)(const GUID *, LPCWSTR, HWND, DWORD); static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD);

1 0

Dmitry Timoshkov : shlwapi/tests: Skip some of IStream invalid parameter tests under Windows 2000 + IE5.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 50c4723aec7610e7cd6c7ff918f0a1fd5aa2994e URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c4723aec7610e7cd6c7ff91… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 23 16:54:34 2013 +0900 shlwapi/tests: Skip some of IStream invalid parameter tests under Windows 2000 + IE5. --- dlls/shlwapi/tests/istream.c | 40 +++++++++++++++++++++++++++------------- 1 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 48f417f..a61e293 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -35,6 +35,7 @@ static HRESULT (WINAPI *pSHCreateStreamOnFileA)(LPCSTR file, DWORD mode, IStream static HRESULT (WINAPI *pSHCreateStreamOnFileW)(LPCWSTR file, DWORD mode, IStream **stream); static HRESULT (WINAPI *pSHCreateStreamOnFileEx)(LPCWSTR file, DWORD mode, DWORD attributes, BOOL create, IStream *template, IStream **stream); +static BOOL is_win2000_IE5 = FALSE; static void test_IStream_invalid_operations(IStream * stream, DWORD mode) { @@ -76,40 +77,53 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) ret = stream->lpVtbl->Write(stream, NULL, 0, &count); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, - "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); + { + ok(ret == STG_E_ACCESSDENIED /* XP */ || broken(ret == S_OK) /* Win2000 + IE5 */, + "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); + if (ret == S_OK) + is_win2000_IE5 = TRUE; + } else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); + /* IStream::Write calls below hang under Win2000 + IE5, Win2000 + IE6 SP1 + * and newer Windows versions pass these tests. + */ + if (is_win2000_IE5) + { + win_skip("broken IStream::Write implementation (win2000)\n"); + return; + } + strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 5, NULL); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, - "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED, + "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 0, NULL); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, - "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED, + "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 0, &count); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, - "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED, + "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 3, &count); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, - "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED, + "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); @@ -119,8 +133,8 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); ret = IStream_Seek(stream, zero, 20, NULL); - ok(ret == E_INVALIDARG /* XP */ || ret == S_OK /* 2000 */, - "expected E_INVALIDARG or S_OK, got 0x%08x\n", ret); + ok(ret == E_INVALIDARG, + "expected E_INVALIDARG, got 0x%08x\n", ret); /* IStream::CopyTo */ @@ -172,7 +186,7 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) /* IStream::Stat */ ret = IStream_Stat(stream, NULL, 0); - ok(ret == STG_E_INVALIDPOINTER /* XP */ || ret == E_NOTIMPL /* 2000 */, + ok(ret == STG_E_INVALIDPOINTER, "expected STG_E_INVALIDPOINTER or E_NOTIMPL, got 0x%08x\n", ret); /* IStream::Clone */

1 0

Hans Leidekker : winhttp/tests: Remove explicit zero-intialization of static data.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: bee390e1ef640eb78f5cdff182856834a3bb68cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee390e1ef640eb78f5cdff18… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 23 10:03:01 2013 +0200 winhttp/tests: Remove explicit zero-intialization of static data. --- dlls/winhttp/tests/notification.c | 100 ++++++++++++++++++------------------ 1 files changed, 50 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bee390e1ef640eb78f5cd…

1 0

Hans Leidekker : winhttp: Don' t assume that end of chunk means end of stream.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 59b0374710ea735d71ceaa58fe2b311801160bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b0374710ea735d71ceaa58f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 23 10:03:40 2013 +0200 winhttp: Don't assume that end of chunk means end of stream. --- dlls/winhttp/request.c | 199 +++++++++++++++++----------------------- dlls/winhttp/winhttp_private.h | 4 +- 2 files changed, 87 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59b0374710ea735d71cea…

1 0

Hans Leidekker : rsaenh: Add support for setting the security descriptor on key containers.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: cabeb962cc19a87fdf1d235e14c7b3ce6f0e663c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cabeb962cc19a87fdf1d235e1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 23 10:04:34 2013 +0200 rsaenh: Add support for setting the security descriptor on key containers. --- dlls/rsaenh/rsaenh.c | 62 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 55 insertions(+), 7 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 2cf6d8b..7d4cdb9 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1098,7 +1098,7 @@ static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY * * dwFlags [I] Flags indicating which keyset to be opened. * phKey [O] Returned key */ -static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, HKEY *phKey) +static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM access, HKEY *phKey) { CHAR szRSABase[MAX_PATH]; HKEY hRootKey; @@ -1112,7 +1112,7 @@ static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, HKEY *phK /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ - return RegOpenKeyExA(hRootKey, szRSABase, 0, KEY_READ, phKey) == + return RegOpenKeyExA(hRootKey, szRSABase, 0, access, phKey) == ERROR_SUCCESS; } @@ -1382,7 +1382,7 @@ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, cons HCRYPTPROV hKeyContainer; HCRYPTKEY hCryptKey; - if (!open_container_key(pszContainerName, dwFlags, &hKey)) + if (!open_container_key(pszContainerName, dwFlags, KEY_READ, &hKey)) { SetLastError(NTE_BAD_KEYSET); return (HCRYPTPROV)INVALID_HANDLE_VALUE; @@ -3769,7 +3769,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, return TRUE; } - if (!open_container_key("", dwFlags, &hKey)) + if (!open_container_key("", dwFlags, KEY_READ, &hKey)) { SetLastError(ERROR_NO_MORE_ITEMS); return FALSE; @@ -3841,7 +3841,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, SECURITY_DESCRIPTOR *sd; DWORD err, len, flags = (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET); - if (!open_container_key(pKeyContainer->szName, flags, &hKey)) + if (!open_container_key(pKeyContainer->szName, flags, KEY_READ, &hKey)) { SetLastError(NTE_BAD_KEYSET); return FALSE; @@ -4339,8 +4339,56 @@ BOOL WINAPI RSAENH_CPSetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa */ BOOL WINAPI RSAENH_CPSetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD dwFlags) { - FIXME("(stub)\n"); - return FALSE; + KEYCONTAINER *pKeyContainer; + HKEY hKey; + + TRACE("(hProv=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n", hProv, dwParam, pbData, dwFlags); + + if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR **)&pKeyContainer)) + { + SetLastError(NTE_BAD_UID); + return FALSE; + } + + switch (dwParam) + { + case PP_KEYSET_SEC_DESCR: + { + SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)pbData; + DWORD err, flags = (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET); + BOOL def, present; + REGSAM access = WRITE_DAC | WRITE_OWNER | ACCESS_SYSTEM_SECURITY; + PSID owner = NULL, group = NULL; + PACL dacl = NULL, sacl = NULL; + + if (!open_container_key(pKeyContainer->szName, flags, access, &hKey)) + { + SetLastError(NTE_BAD_KEYSET); + return FALSE; + } + + if ((dwFlags & OWNER_SECURITY_INFORMATION && !GetSecurityDescriptorOwner(sd, &owner, &def)) || + (dwFlags & GROUP_SECURITY_INFORMATION && !GetSecurityDescriptorGroup(sd, &group, &def)) || + (dwFlags & DACL_SECURITY_INFORMATION && !GetSecurityDescriptorDacl(sd, &present, &dacl, &def)) || + (dwFlags & SACL_SECURITY_INFORMATION && !GetSecurityDescriptorSacl(sd, &present, &sacl, &def))) + { + RegCloseKey(hKey); + return FALSE; + } + + err = SetSecurityInfo(hKey, SE_REGISTRY_KEY, dwFlags, owner, group, dacl, sacl); + RegCloseKey(hKey); + if (err) + { + SetLastError(err); + return FALSE; + } + return TRUE; + } + default: + FIXME("unimplemented parameter %08x\n", dwParam); + return FALSE; + } } /******************************************************************************

1 0

Hans Leidekker : advapi32/tests: Mark a test result as broken.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 51acdc6b271f499bdfad06bd06b917638be22660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51acdc6b271f499bdfad06bd0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 23 10:05:02 2013 +0200 advapi32/tests: Mark a test result as broken. --- dlls/advapi32/tests/crypt.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index dc10cce..89a0e27 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -1144,7 +1144,7 @@ static void test_container_sd(void) { HCRYPTPROV prov; SECURITY_DESCRIPTOR *sd; - DWORD len; + DWORD len, err; BOOL ret; ret = CryptAcquireContextA(&prov, "winetest", "Microsoft Enhanced Cryptographic Provider v1.0", @@ -1154,8 +1154,9 @@ static void test_container_sd(void) len = 0; SetLastError(0xdeadbeef); ret = CryptGetProvParam(prov, PP_KEYSET_SEC_DESCR, NULL, &len, OWNER_SECURITY_INFORMATION); - ok(ret, "got %u\n", GetLastError()); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + err = GetLastError(); + ok(ret, "got %u\n", err); + ok(err == ERROR_INSUFFICIENT_BUFFER || broken(err == ERROR_INVALID_PARAMETER), "got %u\n", err); ok(len, "expected len > 0\n"); sd = HeapAlloc(GetProcessHeap(), 0, len);

1 0

Alexandre Julliard : makefiles: Generate dependencies for symlinks that are needed at build time.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 83eb4fd9b3cff08ad7483bcc876a0cf8e95175c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83eb4fd9b3cff08ad7483bcc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 23 12:52:14 2013 +0200 makefiles: Generate dependencies for symlinks that are needed at build time. --- Makefile.in | 2 -- aclocal.m4 | 29 ++++++++++++++++++++--------- configure | 29 ++++++++++++++--------------- configure.ac | 17 +++++++---------- 4 files changed, 41 insertions(+), 36 deletions(-) diff --git a/Makefile.in b/Makefile.in index 72161fc..a07abd2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -77,8 +77,6 @@ tools/wmc tools/wrc: tools tools tools/wmc tools/wrc: libs/wine tools/widl tools/wmc tools/wrc: libs/wpp -dlls/shell32/Makefile dlls/shell32/__depend__: dlls/shell32/AUTHORS - $(MAKEDEP): include/config.h @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT) diff --git a/aclocal.m4 b/aclocal.m4 index 08ba797..1e1bece 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -599,12 +599,20 @@ distclean:: wine_fn_config_symlink () { - ac_link=$[1] + ac_linkdir= + if test "x$[1]" = "x-d" + then + ac_linkdir=$[2] + shift; shift + fi + ac_links=$[@] wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_link: - @./config.status $ac_link +"$ac_links: + @./config.status \$[@] distclean:: - \$(RM) $ac_link" + \$(RM) $ac_links" + test -n "$ac_linkdir" || return + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_linkdir/Makefile $ac_linkdir/__depend__: $ac_links" } if test "x$CROSSTEST_DISABLE" != x @@ -635,13 +643,16 @@ AC_DEFUN([WINE_CONFIG_EXTRA_DIR], dnl **** Create symlinks from config.status **** dnl -dnl Usage: WINE_CONFIG_SYMLINK(name,target,enable) +dnl Usage: WINE_CONFIG_SYMLINK(target,src,files,enable,srcfile) dnl AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl -m4_ifval([$3],[if test "x$[$3]" != xno; then -])AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl -m4_if([$2],,[test "$srcdir" = "." || ])wine_fn_config_symlink $1[]m4_ifval([$3],[ -fi])]) +m4_ifval([$4],[if test "x$[$4]" != xno; then +])m4_foreach([f],[$3], +[AC_CONFIG_LINKS(m4_ifval([$1],[$1/])f[:]m4_ifval([$2],[$2/])m4_ifval([$5],[$5],f))])dnl +m4_if([$1],[$2],[test "$srcdir" = "." || ])dnl +wine_fn_config_symlink[]m4_if([$1],[$2],,m4_ifval([$1],[ -d $1]))[]m4_foreach([f],[$3],[ ]m4_ifval([$1],[$1/])f)m4_ifval([$4],[ +fi])[]dnl +])]) dnl **** Create a make rules file from config.status **** dnl diff --git a/configure b/configure index a2f8e22..7cbe217 100755 --- a/configure +++ b/configure @@ -15830,12 +15830,20 @@ distclean:: wine_fn_config_symlink () { - ac_link=$1 + ac_linkdir= + if test "x$1" = "x-d" + then + ac_linkdir=$2 + shift; shift + fi + ac_links=$@ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_link: - @./config.status $ac_link +"$ac_links: + @./config.status \$@ distclean:: - \$(RM) $ac_link" + \$(RM) $ac_links" + test -n "$ac_linkdir" || return + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_linkdir/Makefile $ac_linkdir/__depend__: $ac_links" } if test "x$CROSSTEST_DISABLE" != x @@ -15845,24 +15853,15 @@ then @echo \"crosstest is not supported (mingw not installed?)\" && false" fi ac_config_links="$ac_config_links dlls/shell32/AUTHORS:AUTHORS" -wine_fn_config_symlink dlls/shell32/AUTHORS +wine_fn_config_symlink -d dlls/shell32 dlls/shell32/AUTHORS ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" test "$srcdir" = "." || wine_fn_config_symlink dlls/wineps.drv/generic.ppd if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" -test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf -fi -if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" -test "$srcdir" = "." || wine_fn_config_symlink fonts/symbol.ttf -fi -if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" -test "$srcdir" = "." || wine_fn_config_symlink fonts/tahoma.ttf -fi -if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" -test "$srcdir" = "." || wine_fn_config_symlink fonts/tahomabd.ttf +test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf fonts/symbol.ttf fonts/tahoma.ttf fonts/tahomabd.ttf fi ac_config_links="$ac_config_links po/LINGUAS:po/LINGUAS" test "$srcdir" = "." || wine_fn_config_symlink po/LINGUAS diff --git a/configure.ac b/configure.ac index b687119..8b78cfe 100644 --- a/configure.ac +++ b/configure.ac @@ -2554,16 +2554,13 @@ AH_BOTTOM([#endif /* WINE_CROSSTEST */ AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) -WINE_CONFIG_SYMLINK(dlls/shell32/AUTHORS,AUTHORS) -WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd) -WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts) -WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts) -WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts) -WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts) -WINE_CONFIG_SYMLINK(po/LINGUAS) -WINE_CONFIG_SYMLINK(tools/l_intl.nls,,enable_tools) -WINE_CONFIG_SYMLINK(wine,tools/winewrapper) -WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,enable_win64) +WINE_CONFIG_SYMLINK(dlls/shell32,,[AUTHORS]) +WINE_CONFIG_SYMLINK(dlls/wineps.drv,dlls/wineps.drv,[generic.ppd]) +WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) +WINE_CONFIG_SYMLINK(po,po,[LINGUAS]) +WINE_CONFIG_SYMLINK(tools,tools,[l_intl.nls],enable_tools) +WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) +WINE_CONFIG_SYMLINK(,tools,[wine64],enable_win64,winewrapper) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/dibdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)

1 0

Dmitry Timoshkov : ntdll/tests: Extend the FILE_APPEND_DATA test.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: ab8d704e2413cd0ee32e66620cf60065ec6ad31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8d704e2413cd0ee32e66620… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 20 16:00:37 2013 +0900 ntdll/tests: Extend the FILE_APPEND_DATA test. --- dlls/ntdll/tests/file.c | 88 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 65 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 66299ea..ddfa562 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -851,43 +851,85 @@ todo_wine static void append_file_test(void) { - const char text[] = "foobar"; + static const char text[6] = "foobar"; HANDLE handle; NTSTATUS status; IO_STATUS_BLOCK iosb; - DWORD written; - char path[MAX_PATH], buffer[MAX_PATH]; + LARGE_INTEGER offset; + char path[MAX_PATH], buffer[MAX_PATH], buf[16]; GetTempPathA( MAX_PATH, path ); GetTempFileNameA( path, "foo", 0, buffer ); + + handle = CreateFile(buffer, FILE_WRITE_DATA, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + U(iosb).Status = -1; + iosb.Information = -1; + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text, 3, NULL, NULL); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); + ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); + ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information); + + CloseHandle(handle); + /* It is possible to open a file with only FILE_APPEND_DATA access flags. It matches the O_WRONLY|O_APPEND open() posix behavior */ - handle = CreateFileA(buffer, FILE_APPEND_DATA, 0, NULL, CREATE_ALWAYS, - FILE_FLAG_DELETE_ON_CLOSE, 0); - ok( handle != INVALID_HANDLE_VALUE, "Failed to create a temp file in FILE_APPEND_DATA mode.\n" ); - if(handle == INVALID_HANDLE_VALUE) - { - skip("Couldn't create a temporary file, skipping FILE_APPEND_DATA test\n"); - return; - } + handle = CreateFile(buffer, FILE_APPEND_DATA, 0, NULL, OPEN_EXISTING, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + U(iosb).Status = -1; + iosb.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 3, 3, &offset, NULL); +todo_wine + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); +todo_wine + ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); +todo_wine + ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information); - U(iosb).Status = STATUS_PENDING; - iosb.Information = 0; + CloseHandle(handle); - status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, - text, sizeof(text), NULL, NULL); + handle = CreateFile(buffer, FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA, 0, NULL, OPEN_EXISTING, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); - if (status == STATUS_PENDING) - { - WaitForSingleObject( handle, 1000 ); - status = U(iosb).Status; - } - written = iosb.Information; + memset(buf, 0, sizeof(buf)); + U(iosb).Status = -1; + iosb.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(handle, 0, NULL, NULL, &iosb, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); + ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); +todo_wine + ok(iosb.Information == 6, "expected 6, got %lu\n", iosb.Information); + buf[6] = 0; +todo_wine + ok(memcmp(buf, text, 6) == 0, "wrong file contents: %s\n", buf); - todo_wine - ok(status == STATUS_SUCCESS && written == sizeof(text), "FILE_APPEND_DATA NtWriteFile failed\n"); + U(iosb).Status = -1; + iosb.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 3, 3, &offset, NULL); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); + ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); + ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information); + + memset(buf, 0, sizeof(buf)); + U(iosb).Status = -1; + iosb.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(handle, 0, NULL, NULL, &iosb, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); + ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); +todo_wine + ok(iosb.Information == 6, "expected 6, got %lu\n", iosb.Information); + buf[6] = 0; +todo_wine + ok(memcmp(buf, "barbar", 6) == 0, "wrong file contents: %s\n", buf); CloseHandle(handle); + DeleteFile(buffer); } static void nt_mailslot_test(void)

1 0

Dmitry Timoshkov : kernel32/tests: Add FILE_APPEND_DATA case to the file access tests.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 96c6ad4aa73a202f87349b924c4e2421fc2e73a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c6ad4aa73a202f87349b924… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 20 16:01:26 2013 +0900 kernel32/tests: Add FILE_APPEND_DATA case to the file access tests. --- dlls/kernel32/tests/file.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 288fc5e..a428672 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3903,6 +3903,9 @@ static void test_file_access(void) { FILE_READ_DATA | FILE_WRITE_DATA, 0, 0, 0 }, { FILE_WRITE_DATA, 0, 0, ERROR_ACCESS_DENIED }, { FILE_READ_DATA, 0, ERROR_ACCESS_DENIED, 0 }, + { FILE_APPEND_DATA, 0, 0, ERROR_ACCESS_DENIED }, + { FILE_READ_DATA | FILE_APPEND_DATA, 0, 0, 0 }, + { FILE_WRITE_DATA | FILE_APPEND_DATA, 0, 0, ERROR_ACCESS_DENIED }, { 0, 0, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED }, }; char path[MAX_PATH], fname[MAX_PATH]; @@ -3938,6 +3941,17 @@ static void test_file_access(void) } else { + /* FIXME: remove once Wine is fixed */ + if (!ret && (td[i].access & FILE_APPEND_DATA)) + { +todo_wine + ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); +todo_wine + ok(bytes == 2, "%d: expected 2, got %u\n", i, bytes); + CloseHandle(hfile); + continue; + } + ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); ok(bytes == 2, "%d: expected 2, got %u\n", i, bytes); }

1 0

Michael Müller : quartz: Pass correct interface to IBaseFilter:: JoinFilterGraph in function FilterGraph2_AddFilter.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 2fcfde0f627e0e466c897d47b4793e851faf2d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fcfde0f627e0e466c897d47b… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Aug 31 07:04:05 2013 +0200 quartz: Pass correct interface to IBaseFilter::JoinFilterGraph in function FilterGraph2_AddFilter. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0a0beba..0bfef6d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -450,7 +450,7 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter * This->filterCapacity = newCapacity; } - hr = IBaseFilter_JoinFilterGraph(pFilter, (IFilterGraph *)This, wszFilterName); + hr = IBaseFilter_JoinFilterGraph(pFilter, (IFilterGraph *)&This->IFilterGraph2_iface, wszFilterName); if (SUCCEEDED(hr)) {

1 0