August 2010 - Wine-commits - list.winehq.org

Jacek Caban : winegecko: Added Wine Gecko 1.1.0 to the list.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: tools Branch: master Commit: 10f312ca5017ff06995a703ddea54fb49ca4edb9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=10f312ca5017ff06995a703d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 25 14:22:05 2010 +0200 winegecko: Added Wine Gecko 1.1.0 to the list. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index c33ea70..986a235 100644 --- a/winegecko.php +++ b/winegecko.php @@ -30,7 +30,9 @@ $aFileSizes = array( '0.1.0'=>5746895, '0.9.0'=>7806669, '0.9.1'=>7806837, - '1.0.0-x86'=>8119486 + '1.0.0-x86'=>8119486, + '1.1.0-x86'=>8868851, + '1.1.0-x86_64'=>8940997 ); // Exact size of the file:

1 0

Frédéric Delanoy : Ubuntu download page: ensure text and images are in sync
by Jeremy Newman 25 Aug '10

25 Aug '10

Module: website Branch: master Commit: 6299a27bfe62bc153ac7b36d09470ae739cef2fb URL: http://source.winehq.org/git/website.git/?a=commit;h=6299a27bfe62bc153ac7b3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 24 00:05:59 2010 +0200 Ubuntu download page: ensure text and images are in sync --- templates/en/download/deb.template | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index 2168081..a3254df 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -22,10 +22,10 @@ works for you, then you may not want to use these beta packages. <h2>Adding the WineHQ Repository:</h2> Open the Software Sources menu by going to -System->Administration->Software Sources. Then select the Third -Party Software tab and click Add. +System->Administration->Software Sources. Then select the Other +Software tab and click Add. -<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Third Party Software" border="0"> +<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Other Software" border="0"> Then, copy and paste the line below.

1 0

Frédéric Delanoy : French translation of Ubuntu download page
by Jeremy Newman 25 Aug '10

25 Aug '10

Module: website Branch: master Commit: 3e0b6c5367ac5e983233e03f4561a08c062c5a74 URL: http://source.winehq.org/git/website.git/?a=commit;h=3e0b6c5367ac5e983233e0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Aug 25 14:45:52 2010 +0200 French translation of Ubuntu download page --- images/distro/fr_ubuntu-ppa.png | Bin 0 -> 46815 bytes templates/fr/download/deb.template | 64 ++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/images/distro/fr_ubuntu-ppa.png b/images/distro/fr_ubuntu-ppa.png new file mode 100644 index 0000000..4fcdf46 Binary files /dev/null and b/images/distro/fr_ubuntu-ppa.png differ diff --git a/templates/fr/download/deb.template b/templates/fr/download/deb.template new file mode 100644 index 0000000..311add5 --- /dev/null +++ b/templates/fr/download/deb.template @@ -0,0 +1,64 @@ + + + +<h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Logo Ubuntu" border="0"></a> +Wine pour Ubuntu et distributions dérivées +<a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Logo Ubuntu" border="0"></a></h1> + +Ubuntu et les distributions dérivées (comme Kubuntu) fournissent des +logiciels sous forme de paquets qui sont stockés dans des +dépôts. Le dépôt par défaut d'Ubuntu inclut Wine. Néanmoins, si vous +voulez rester à jour avec le dernier paquet bêta de Wine, vous pouvez +utiliser le dépôt WineHQ en suivant les instructions ci-dessous. + + +<h2>Avertissement : ce sont des paquets bêta pour Ubuntu 10.04 ou ultérieur</h2> + +Les paquets mentionnés sont des paquets bêta, c.-à-d. qu'ils +peuvent à l'occasion souffrir de +<a href="http://wiki.winehq.org/Regression">régressions</a>. Par conséquent, une +mise à jour peut casser une fonctionnalité dans Wine. Si la version de Wine +fournie par votre distribution fonctionne dans votre cas, vous ne devriez pas +utiliser de paquets bêta. + +<h2>Ajout du dépôt WineHQ</h2> + +Ouvrez le menu Sources de logiciels en allant sur +Système->Administration->Sources de logiciels. Sélectionnez ensuite +l'onglet Autres logiciels et cliquez sur Ajouter une source de mise à +jour. + +<img src="{$root}/images/distro/fr_ubuntu-ppa.png" width="702" height="467" +alt="Système->Administration->Sources de logiciels->Autres logiciels" border="0"> + +Ensuite, entrez la ligne suivante : + +ppa:ubuntu-wine/ppa + +<h2>Installation de Wine</h2> + +Cliquez sur Fermer pour terminer, et ensuite sur Actualiser +quand on vous le demande. Si Wine est déjà installé, le gestionnaire de mises +à jour vous proposera une mise à jour vers la version stable Wine 1.2. Pour +obtenir la version bêta 1.3 la plus récente de Wine, vous devez installer le +paquet wine1.3 ou <a href="apt://wine1.3">cliquer sur ce lien</a>. + +<h2>Mise à niveau vers une nouvelle version d'Ubuntu</h2> + +Si vous mettez à niveau le système entier, par exemple en passant d'Ubuntu +10.04 à 10.10, vous devrez revenir sur cette page et ré-ajouter le dépôt. Le +gestionnaire de mises à jour intégré n'utilisera pas automatiquement le +dépôt Wine. + + +<h2>Installation alternative de Wine via la ligne de commande</h2> + +Il est également possible d'ajouter le PPA Wine et de procéder à +l'installation en utilisant uniquement le terminal. Cela peut être utile sous +Kubuntu, Xubuntu ou d'autres distributions dérivées. + +sudo add-apt-repository ppa:ubuntu-wine/ppa + +Mettez ensuite à jour les informations sur les paquets d'APT en exécutant + 'sudo apt-get update'. Vous pouvez dès lors installer Wine en tapant + 'sudo apt-get install wine1.3'.

1 0

Louis Lenders : mscoree/tests: Added some simple tests for GetCORVersion.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: a8528706ac897fcfd16654cd444c8032f9da9e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8528706ac897fcfd16654cd4… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Aug 24 11:48:01 2010 +0200 mscoree/tests: Added some simple tests for GetCORVersion. --- configure | 1 + configure.ac | 1 + dlls/mscoree/tests/Makefile.in | 10 +++++ dlls/mscoree/tests/mscoree.c | 73 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 0 deletions(-) diff --git a/configure b/configure index dac6570..8784ec7 100755 --- a/configure +++ b/configure @@ -14713,6 +14713,7 @@ wine_fn_config_dll mscat32 enable_mscat32 wine_fn_config_dll mscms enable_mscms mscms wine_fn_config_test dlls/mscms/tests mscms_test wine_fn_config_dll mscoree enable_mscoree +wine_fn_config_test dlls/mscoree/tests mscoree_test wine_fn_config_dll msctf enable_msctf wine_fn_config_test dlls/msctf/tests msctf_test wine_fn_config_dll msdaps enable_msdaps diff --git a/configure.ac b/configure.ac index 37628f6..790df31 100644 --- a/configure.ac +++ b/configure.ac @@ -2492,6 +2492,7 @@ WINE_CONFIG_DLL(mscat32) WINE_CONFIG_DLL(mscms,,[mscms]) WINE_CONFIG_TEST(dlls/mscms/tests) WINE_CONFIG_DLL(mscoree) +WINE_CONFIG_TEST(dlls/mscoree/tests) WINE_CONFIG_DLL(msctf) WINE_CONFIG_TEST(dlls/msctf/tests) WINE_CONFIG_DLL(msdaps) diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in new file mode 100644 index 0000000..43e16a1 --- /dev/null +++ b/dlls/mscoree/tests/Makefile.in @@ -0,0 +1,10 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = mscoree.dll + +C_SRCS = \ + mscoree.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c new file mode 100644 index 0000000..f0826a5 --- /dev/null +++ b/dlls/mscoree/tests/mscoree.c @@ -0,0 +1,73 @@ +/* + * Copyright 2010 Louis Lenders + * + * 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 + */ + +#include "wine/test.h" + +static HMODULE hmscoree; + +static HRESULT (WINAPI *pGetCORVersion)(LPWSTR, DWORD, DWORD*); + +static BOOL init_functionpointers(void) +{ + hmscoree = LoadLibraryA("mscoree.dll"); + + if (!hmscoree) + { + win_skip("mscoree.dll not available\n"); + return FALSE; + } + + pGetCORVersion = (void *)GetProcAddress(hmscoree, "GetCORVersion"); + + if (!pGetCORVersion) + { + win_skip("functions not available\n"); + FreeLibrary(hmscoree); + return FALSE; + } + + return TRUE; +} + +static void test_versioninfo(void) +{ + WCHAR version[MAX_PATH]; + DWORD size; + HRESULT hr; + + hr = pGetCORVersion(NULL, MAX_PATH, &size); + todo_wine ok(hr == E_POINTER,"GetCORVersion returned %08x\n", hr); + + hr = pGetCORVersion(version, 1, &size); + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),"GetCORVersion returned %08x\n", hr); + + hr = pGetCORVersion(version, MAX_PATH, &size); + ok(hr == S_OK,"GetCORVersion returned %08x\n", hr); + + trace("latest installed .net runtime: %s\n", wine_dbgstr_w(version)); +} + +START_TEST(mscoree) +{ + if (!init_functionpointers()) + return; + + test_versioninfo(); + + FreeLibrary(hmscoree); +}

1 0

Louis Lenders : mscoree: Improve GetCORVersion.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 042f23cacc0d588254bccfaf683f52a60d851e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042f23cacc0d588254bccfaf6… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Aug 24 12:51:33 2010 +0200 mscoree: Improve GetCORVersion. --- dlls/mscoree/mscoree_main.c | 9 ++++----- dlls/mscoree/tests/mscoree.c | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 0e6f252..d1f035c 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -348,20 +348,19 @@ HRESULT WINAPI GetCORSystemDirectory(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwL HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) { - static const WCHAR version[] = {'v','1','.','1','.','4','3','2','2',0}; + static const WCHAR version[] = {'v','2','.','0','.','5','0','7','2','7',0}; FIXME("(%p, %d, %p): semi-stub!\n", pbuffer, cchBuffer, dwLength); - if (!dwLength) + if (!dwLength || !pbuffer) return E_POINTER; *dwLength = lstrlenW(version); if (cchBuffer < *dwLength) - return ERROR_INSUFFICIENT_BUFFER; + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - if (pbuffer) - lstrcpyW(pbuffer, version); + lstrcpyW(pbuffer, version); return S_OK; } diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index f0826a5..ba1e938 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -51,10 +51,10 @@ static void test_versioninfo(void) HRESULT hr; hr = pGetCORVersion(NULL, MAX_PATH, &size); - todo_wine ok(hr == E_POINTER,"GetCORVersion returned %08x\n", hr); + ok(hr == E_POINTER,"GetCORVersion returned %08x\n", hr); hr = pGetCORVersion(version, 1, &size); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),"GetCORVersion returned %08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),"GetCORVersion returned %08x\n", hr); hr = pGetCORVersion(version, MAX_PATH, &size); ok(hr == S_OK,"GetCORVersion returned %08x\n", hr);

1 0

Louis Lenders : wine.inf: Added .NET InstallRoot and v2.0 policy keys.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: d57f3886932aa223dfac3215a08fe017cdd2b126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57f3886932aa223dfac3215a… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Aug 24 13:45:16 2010 +0200 wine.inf: Added .NET InstallRoot and v2.0 policy keys. --- tools/wine.inf.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index ff5c7b2..41c8820 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -489,9 +489,10 @@ HKCU,%Desktop%,"LowPowerActive",,"0" HKCU,%Desktop%,"MenuShowDelay",2,"400" [DotNet] +HKLM,Software\Microsoft\.NETFramework,"InstallRoot",2,"%10%\Microsoft.NET\Framework\" HKLM,Software\Microsoft\.NETFramework\policy\v1.0,,16 HKLM,Software\Microsoft\.NETFramework\policy\v1.1,,16 -HKLM,Software\Microsoft\.NETFramework\policy\v2.0,,16 +HKLM,Software\Microsoft\.NETFramework\policy\v2.0,"50727",2,"50727-50727" HKLM,Software\Microsoft\.NETFramework\policy\v3.0,,16 HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,Install,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,SP,0x10003,1

1 0

Vincent Povirk : winecfg: Don't allow virtual desktops smaller than 640x480 .
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: be1aa20276706f216c76796de91be91300165c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=be1aa20276706f216c76796de… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 23 17:45:26 2010 -0500 winecfg: Don't allow virtual desktops smaller than 640x480. --- programs/winecfg/x11drvdlg.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index bf1950c..d3d7220 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -189,6 +189,8 @@ static void set_from_desktop_edits(HWND dialog) static const WCHAR x[] = {'x',0}; static const WCHAR def_width[] = {'8','0','0',0}; static const WCHAR def_height[] = {'6','0','0',0}; + static const WCHAR min_width[] = {'6','4','0',0}; + static const WCHAR min_height[] = {'4','8','0',0}; WCHAR *width, *height, *new; const WCHAR *desktop_name = current_app ? current_app : defaultW; @@ -203,10 +205,20 @@ static void set_from_desktop_edits(HWND dialog) HeapFree(GetProcessHeap(), 0, width); width = strdupW(def_width); } + else if (atoiW(width) < atoiW(min_width)) + { + HeapFree(GetProcessHeap(), 0, width); + width = strdupW(min_width); + } if (!height || !height[0]) { HeapFree(GetProcessHeap(), 0, height); height = strdupW(def_height); } + else if (atoiW(height) < atoiW(min_height)) + { + HeapFree(GetProcessHeap(), 0, height); + height = strdupW(min_height); + } new = HeapAlloc(GetProcessHeap(), 0, (strlenW(width) + strlenW(height) + 2) * sizeof(WCHAR)); strcpyW( new, width );

1 0

Alexandre Goujon : advapi32: Fix GetNamedSecurityInfo with NULL descriptor.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 2c127dd320ac066b98793bfedefb651bda33786b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c127dd320ac066b98793bfed… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Tue Aug 24 11:04:35 2010 +0200 advapi32: Fix GetNamedSecurityInfo with NULL descriptor. --- dlls/advapi32/security.c | 68 ++++++++++++++++++++++++++++------------ dlls/advapi32/tests/security.c | 28 ++++++++++++++++- 2 files changed, 75 insertions(+), 21 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index aa7f336..3e7699a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5272,15 +5272,24 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, PACL* sacl, PSECURITY_DESCRIPTOR* descriptor ) { DWORD needed, offset; - SECURITY_DESCRIPTOR_RELATIVE *relative; + SECURITY_DESCRIPTOR_RELATIVE *relative = NULL; BYTE *buffer; TRACE( "%s %d %d %p %p %p %p %p\n", debugstr_w(name), type, info, owner, group, dacl, sacl, descriptor ); - if (!name || !descriptor) return ERROR_INVALID_PARAMETER; + /* A NULL descriptor is allowed if any one of the other pointers is not NULL */ + if (!name || !(owner||group||dacl||sacl||descriptor) ) return ERROR_INVALID_PARAMETER; - needed = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + /* If no descriptor, we have to check that there's a pointer for the requested information */ + if( !descriptor && ( + ((info & OWNER_SECURITY_INFORMATION) && !owner) + || ((info & GROUP_SECURITY_INFORMATION) && !group) + || ((info & DACL_SECURITY_INFORMATION) && !dacl) + || ((info & SACL_SECURITY_INFORMATION) && !sacl) )) + return ERROR_INVALID_PARAMETER; + + needed = !descriptor ? 0 : sizeof(SECURITY_DESCRIPTOR_RELATIVE); if (info & OWNER_SECURITY_INFORMATION) needed += sizeof(sidWorld); if (info & GROUP_SECURITY_INFORMATION) @@ -5290,25 +5299,36 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, if (info & SACL_SECURITY_INFORMATION) needed += WINE_SIZE_OF_WORLD_ACCESS_ACL; - /* must be freed by caller */ - *descriptor = HeapAlloc( GetProcessHeap(), 0, needed ); - if (!*descriptor) return ERROR_NOT_ENOUGH_MEMORY; + if(descriptor) + { + /* must be freed by caller */ + *descriptor = HeapAlloc( GetProcessHeap(), 0, needed ); + if (!*descriptor) return ERROR_NOT_ENOUGH_MEMORY; - if (!InitializeSecurityDescriptor( *descriptor, SECURITY_DESCRIPTOR_REVISION )) + if (!InitializeSecurityDescriptor( *descriptor, SECURITY_DESCRIPTOR_REVISION )) + { + HeapFree( GetProcessHeap(), 0, *descriptor ); + return ERROR_INVALID_SECURITY_DESCR; + } + + relative = *descriptor; + relative->Control |= SE_SELF_RELATIVE; + + buffer = (BYTE *)relative; + offset = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + } + else { - HeapFree( GetProcessHeap(), 0, *descriptor ); - return ERROR_INVALID_SECURITY_DESCR; + buffer = HeapAlloc( GetProcessHeap(), 0, needed ); + if (!buffer) return ERROR_NOT_ENOUGH_MEMORY; + offset = 0; } - relative = *descriptor; - relative->Control |= SE_SELF_RELATIVE; - buffer = (BYTE *)relative; - offset = sizeof(SECURITY_DESCRIPTOR_RELATIVE); - if (info & OWNER_SECURITY_INFORMATION) { memcpy( buffer + offset, &sidWorld, sizeof(sidWorld) ); - relative->Owner = offset; + if(relative) + relative->Owner = offset; if (owner) *owner = buffer + offset; offset += sizeof(sidWorld); @@ -5316,28 +5336,36 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, if (info & GROUP_SECURITY_INFORMATION) { memcpy( buffer + offset, &sidWorld, sizeof(sidWorld) ); - relative->Group = offset; + if(relative) + relative->Group = offset; if (group) *group = buffer + offset; offset += sizeof(sidWorld); } if (info & DACL_SECURITY_INFORMATION) { - relative->Control |= SE_DACL_PRESENT; GetWorldAccessACL( (PACL)(buffer + offset) ); - relative->Dacl = offset; + if(relative) + { + relative->Control |= SE_DACL_PRESENT; + relative->Dacl = offset; + } if (dacl) *dacl = (PACL)(buffer + offset); offset += WINE_SIZE_OF_WORLD_ACCESS_ACL; } if (info & SACL_SECURITY_INFORMATION) { - relative->Control |= SE_SACL_PRESENT; GetWorldAccessACL( (PACL)(buffer + offset) ); - relative->Sacl = offset; + if(relative) + { + relative->Control |= SE_SACL_PRESENT; + relative->Sacl = offset; + } if (sacl) *sacl = (PACL)(buffer + offset); } + return ERROR_SUCCESS; } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index cd4624a..424403b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2628,10 +2628,11 @@ static void test_GetNamedSecurityInfoA(void) SECURITY_DESCRIPTOR_CONTROL control; PSID owner; PSID group; + PACL dacl; BOOL owner_defaulted; BOOL group_defaulted; DWORD error; - BOOL ret; + BOOL ret, isNT4; CHAR windows_dir[MAX_PATH]; if (!pGetNamedSecurityInfoA) @@ -2660,13 +2661,38 @@ static void test_GetNamedSecurityInfoA(void) broken((control & (SE_SELF_RELATIVE|SE_DACL_PRESENT)) == SE_DACL_PRESENT), /* NT4 */ "control (0x%x) doesn't have (SE_SELF_RELATIVE|SE_DACL_PRESENT) flags set\n", control); ok(revision == SECURITY_DESCRIPTOR_REVISION1, "revision was %d instead of 1\n", revision); + + isNT4 = (control & (SE_SELF_RELATIVE|SE_DACL_PRESENT)) == SE_DACL_PRESENT; + ret = GetSecurityDescriptorOwner(pSecDesc, &owner, &owner_defaulted); ok(ret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); ok(owner != NULL, "owner should not be NULL\n"); + ret = GetSecurityDescriptorGroup(pSecDesc, &group, &group_defaulted); ok(ret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); ok(group != NULL, "group should not be NULL\n"); LocalFree(pSecDesc); + + + /* NULL descriptor tests */ + if(isNT4) + { + win_skip("NT4 does not support GetNamedSecutityInfo with a NULL descriptor\n"); + return; + } + + error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT,DACL_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, NULL); + ok(error==ERROR_INVALID_PARAMETER, "GetNamedSecurityInfo failed with error %d\n", error); + + error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT,DACL_SECURITY_INFORMATION, + NULL, NULL, &dacl, NULL, NULL); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + ok(dacl != NULL, "dacl should not be NULL\n"); + + error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT,OWNER_SECURITY_INFORMATION, + NULL, NULL, &dacl, NULL, NULL); + ok(error==ERROR_INVALID_PARAMETER, "GetNamedSecurityInfo failed with error %d\n", error); } static void test_ConvertStringSecurityDescriptor(void)

1 0

David Hedberg : shell32: Support BHID_SFUIObject and BHID_DataObject in IShellItem::BindToHandler.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 1f73f3a5910d3d48e5e9a83c1139299f3debb070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f73f3a5910d3d48e5e9a83c1… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 24 10:56:20 2010 +0200 shell32: Support BHID_SFUIObject and BHID_DataObject in IShellItem::BindToHandler. --- dlls/shell32/shellitem.c | 20 +++++++++++++++ dlls/shell32/tests/shlfolder.c | 51 +++++++++++++++++++++++++++++----------- 2 files changed, 57 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 3284020..d9e7e7b 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -190,6 +190,26 @@ static HRESULT WINAPI ShellItem_BindToHandler(IShellItem *iface, IBindCtx *pbc, } return ret; } + else if (IsEqualGUID(rbhid, &BHID_SFUIObject)) + { + IShellFolder *psf_parent; + if (_ILIsDesktop(This->pidl)) + ret = SHGetDesktopFolder(&psf_parent); + else + ret = ShellItem_get_parent_shellfolder(This, &psf_parent); + + if (SUCCEEDED(ret)) + { + LPCITEMIDLIST pidl = ILFindLastID(This->pidl); + ret = IShellFolder_GetUIObjectOf(psf_parent, NULL, 1, &pidl, riid, NULL, ppvOut); + IShellFolder_Release(psf_parent); + } + return ret; + } + else if (IsEqualGUID(rbhid, &BHID_DataObject)) + { + return ShellItem_BindToHandler((IShellItem*)This, pbc, &BHID_SFUIObject, &IID_IDataObject, ppvOut); + } FIXME("Unsupported BHID %s.\n", debugstr_guid(rbhid)); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index e21b44d..34bf59d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1888,7 +1888,7 @@ static void test_SHCreateShellItem(void) { IShellItem *shellitem, *shellitem2; IPersistIDList *persistidl; - LPITEMIDLIST pidl_cwd=NULL, pidl_testfile, pidl_abstestfile, pidl_test; + LPITEMIDLIST pidl_cwd=NULL, pidl_testfile, pidl_abstestfile, pidl_test, pidl_desktop; HRESULT ret; char curdirA[MAX_PATH]; WCHAR curdirW[MAX_PATH]; @@ -1910,6 +1910,17 @@ static void test_SHCreateShellItem(void) return; } + if(pSHGetSpecialFolderLocation) + { + ret = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + ok(ret == S_OK, "Got 0x%08x\n", ret); + } + else + { + win_skip("pSHGetSpecialFolderLocation missing.\n"); + pidl_desktop = NULL; + } + MultiByteToWideChar(CP_ACP, 0, curdirA, -1, curdirW, MAX_PATH); ret = SHGetDesktopFolder(&desktopfolder); @@ -2058,6 +2069,17 @@ static void test_SHCreateShellItem(void) } IPersistIDList_Release(persistidl); } + + IShellItem_Release(shellitem); + } + + ret = pSHCreateShellItem(NULL, NULL, pidl_desktop, &shellitem); + ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IShellItem_GetParent(shellitem, &shellitem2); + ok(FAILED(ret), "Got 0x%08x\n", ret); + if(SUCCEEDED(ret)) IShellItem_Release(shellitem2); IShellItem_Release(shellitem); } @@ -2161,6 +2183,7 @@ static void test_SHCreateShellItem(void) DeleteFileA(".\\testfile"); pILFree(pidl_abstestfile); pILFree(pidl_testfile); + pILFree(pidl_desktop); pILFree(pidl_cwd); IShellFolder_Release(currentfolder); IShellFolder_Release(desktopfolder); @@ -3270,16 +3293,21 @@ static void test_ShellItemBindToHandler(void) IPersistFolder2_Release(ppf2); } + /* BHID_SFUIObject */ + hr = IShellItem_BindToHandler(psi, NULL, &BHID_SFUIObject, &IID_IDataObject, (void**)&punk); + ok(hr == S_OK || broken(hr == E_NOINTERFACE /* XP */), "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IShellItem_BindToHandler(psi, NULL, &BHID_SFUIObject, &IID_IContextMenu, (void**)&punk); + ok(hr == S_OK || broken(hr == E_NOINTERFACE /* XP */), "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + + /* BHID_DataObject */ + hr = IShellItem_BindToHandler(psi, NULL, &BHID_DataObject, &IID_IDataObject, (void**)&punk); + ok(hr == S_OK || broken(hr == MK_E_NOOBJECT /* XP */), "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + todo_wine { - /* BHID_SFUIObject */ - hr = IShellItem_BindToHandler(psi, NULL, &BHID_SFUIObject, &IID_IDataObject, (void**)&punk); - ok(hr == S_OK || broken(hr == E_NOINTERFACE /* XP */), "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(punk); - hr = IShellItem_BindToHandler(psi, NULL, &BHID_SFUIObject, &IID_IContextMenu, (void**)&punk); - ok(hr == S_OK || broken(hr == E_NOINTERFACE /* XP */), "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(punk); - /* BHID_SFViewObject */ hr = IShellItem_BindToHandler(psi, NULL, &BHID_SFViewObject, &IID_IShellView, (void**)&punk); ok(hr == S_OK, "Got 0x%08x\n", hr); @@ -3319,11 +3347,6 @@ static void test_ShellItemBindToHandler(void) ok(hr == S_OK || broken(hr == MK_E_NOOBJECT /* XP */), "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); - /* BHID_DataObject */ - hr = IShellItem_BindToHandler(psi, NULL, &BHID_DataObject, &IID_IDataObject, (void**)&punk); - ok(hr == S_OK || broken(hr == MK_E_NOOBJECT /* XP */), "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(punk); - /* BHID_Filter */ hr = IShellItem_BindToHandler(psi, NULL, &BHID_Filter, &IID_IUnknown, (void**)&punk); ok(hr == S_OK || broken(hr == MK_E_NOOBJECT /* XP */), "Got 0x%08x\n", hr);

1 0

David Hedberg : shell32: Implement IExplorerBrowser:: BrowseToIDList and IShellBrowser::BrowseToObject.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 73100ce6797c97a15919add9f464a6618b641a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73100ce6797c97a15919add9f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 24 10:56:21 2010 +0200 shell32: Implement IExplorerBrowser::BrowseToIDList and IShellBrowser::BrowseToObject. --- dlls/shell32/ebrowser.c | 220 +++++++++++++++++++++++++++++++++- dlls/shell32/tests/ebrowser.c | 266 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 482 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73100ce6797c97a15919a…

1 0