July 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : kernel32/tests: Add tests for file sharing with file-specific access bits.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 76546888868efe47960993a5609e524cc76f4597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76546888868efe47960993a56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 1 18:14:06 2011 +0200 kernel32/tests: Add tests for file sharing with file-specific access bits. --- dlls/kernel32/tests/file.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index c2523ae..59803c6 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1768,16 +1768,30 @@ static BOOL create_fake_dll( LPCSTR filename ) return ret; } +static unsigned int map_file_access( unsigned int access ) +{ + if (access & GENERIC_READ) access |= FILE_GENERIC_READ; + if (access & GENERIC_WRITE) access |= FILE_GENERIC_WRITE; + if (access & GENERIC_EXECUTE) access |= FILE_GENERIC_EXECUTE; + if (access & GENERIC_ALL) access |= FILE_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static int is_sharing_compatible( DWORD access1, DWORD sharing1, DWORD access2, DWORD sharing2 ) { + access1 = map_file_access( access1 ); + access2 = map_file_access( access2 ); + access1 &= FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA | FILE_EXECUTE | DELETE; + access2 &= FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA | FILE_EXECUTE | DELETE; + if (!access1) sharing1 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; if (!access2) sharing2 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; - if ((access1 & GENERIC_READ) && !(sharing2 & FILE_SHARE_READ)) return 0; - if ((access1 & GENERIC_WRITE) && !(sharing2 & FILE_SHARE_WRITE)) return 0; + if ((access1 & (FILE_READ_DATA|FILE_EXECUTE)) && !(sharing2 & FILE_SHARE_READ)) return 0; + if ((access1 & (FILE_WRITE_DATA|FILE_APPEND_DATA)) && !(sharing2 & FILE_SHARE_WRITE)) return 0; if ((access1 & DELETE) && !(sharing2 & FILE_SHARE_DELETE)) return 0; - if ((access2 & GENERIC_READ) && !(sharing1 & FILE_SHARE_READ)) return 0; - if ((access2 & GENERIC_WRITE) && !(sharing1 & FILE_SHARE_WRITE)) return 0; + if ((access2 & (FILE_READ_DATA|FILE_EXECUTE)) && !(sharing1 & FILE_SHARE_READ)) return 0; + if ((access2 & (FILE_WRITE_DATA|FILE_APPEND_DATA)) && !(sharing1 & FILE_SHARE_WRITE)) return 0; if ((access2 & DELETE) && !(sharing1 & FILE_SHARE_DELETE)) return 0; return 1; } @@ -1786,7 +1800,8 @@ static int is_sharing_map_compatible( DWORD map_access, DWORD access2, DWORD sha { if ((map_access == PAGE_READWRITE || map_access == PAGE_EXECUTE_READWRITE) && !(sharing2 & FILE_SHARE_WRITE)) return 0; - if ((map_access & SEC_IMAGE) && (access2 & GENERIC_WRITE)) return 0; + access2 = map_file_access( access2 ); + if ((map_access & SEC_IMAGE) && (access2 & FILE_WRITE_DATA)) return 0; return 1; } @@ -1794,7 +1809,12 @@ static void test_file_sharing(void) { static const DWORD access_modes[] = { 0, GENERIC_READ, GENERIC_WRITE, GENERIC_READ|GENERIC_WRITE, - DELETE, GENERIC_READ|DELETE, GENERIC_WRITE|DELETE, GENERIC_READ|GENERIC_WRITE|DELETE }; + DELETE, GENERIC_READ|DELETE, GENERIC_WRITE|DELETE, GENERIC_READ|GENERIC_WRITE|DELETE, + GENERIC_EXECUTE, GENERIC_EXECUTE | DELETE, + FILE_READ_DATA, FILE_WRITE_DATA, FILE_APPEND_DATA, FILE_READ_EA, FILE_WRITE_EA, + FILE_READ_DATA | FILE_EXECUTE, FILE_WRITE_DATA | FILE_EXECUTE, FILE_APPEND_DATA | FILE_EXECUTE, + FILE_READ_EA | FILE_EXECUTE, FILE_WRITE_EA | FILE_EXECUTE, FILE_EXECUTE, + FILE_DELETE_CHILD, FILE_READ_ATTRIBUTES, FILE_WRITE_ATTRIBUTES }; static const DWORD sharing_modes[] = { 0, FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE,

1 0

Alexandre Julliard : kernel32/tests: Get rid of the Win9x support in the file sharing tests.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: d0f3d06172f1adce751e450357c4992f31c35a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f3d06172f1adce751e45035… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 1 17:47:10 2011 +0200 kernel32/tests: Get rid of the Win9x support in the file sharing tests. --- dlls/kernel32/tests/file.c | 53 ++++++++----------------------------------- 1 files changed, 10 insertions(+), 43 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 90b90e8..c2523ae 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1768,21 +1768,10 @@ static BOOL create_fake_dll( LPCSTR filename ) return ret; } -static int is_sharing_compatible( DWORD access1, DWORD sharing1, DWORD access2, DWORD sharing2, BOOL is_win9x ) +static int is_sharing_compatible( DWORD access1, DWORD sharing1, DWORD access2, DWORD sharing2 ) { - if (!is_win9x) - { - if (!access1) sharing1 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; - if (!access2) sharing2 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; - } - else - { - access1 &= ~DELETE; - if (!access1) access1 = GENERIC_READ; - - access2 &= ~DELETE; - if (!access2) access2 = GENERIC_READ; - } + if (!access1) sharing1 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; + if (!access2) sharing2 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; if ((access1 & GENERIC_READ) && !(sharing2 & FILE_SHARE_READ)) return 0; if ((access1 & GENERIC_WRITE) && !(sharing2 & FILE_SHARE_WRITE)) return 0; @@ -1816,7 +1805,6 @@ static void test_file_sharing(void) int a1, s1, a2, s2; int ret; HANDLE h, h2; - BOOL is_win9x = FALSE; /* make sure the file exists */ if (!create_fake_dll( filename )) @@ -1824,16 +1812,11 @@ static void test_file_sharing(void) ok(0, "couldn't create file \"%s\" (err=%d)\n", filename, GetLastError()); return; } - is_win9x = GetFileAttributesW(filenameW) == INVALID_FILE_ATTRIBUTES; for (a1 = 0; a1 < sizeof(access_modes)/sizeof(access_modes[0]); a1++) { for (s1 = 0; s1 < sizeof(sharing_modes)/sizeof(sharing_modes[0]); s1++) { - /* Win9x doesn't support FILE_SHARE_DELETE */ - if (is_win9x && (sharing_modes[s1] & FILE_SHARE_DELETE)) - continue; - SetLastError(0xdeadbeef); h = CreateFileA( filename, access_modes[a1], sharing_modes[s1], NULL, OPEN_EXISTING, 0, 0 ); @@ -1846,24 +1829,18 @@ static void test_file_sharing(void) { for (s2 = 0; s2 < sizeof(sharing_modes)/sizeof(sharing_modes[0]); s2++) { - /* Win9x doesn't support FILE_SHARE_DELETE */ - if (is_win9x && (sharing_modes[s2] & FILE_SHARE_DELETE)) - continue; - SetLastError(0xdeadbeef); h2 = CreateFileA( filename, access_modes[a2], sharing_modes[s2], NULL, OPEN_EXISTING, 0, 0 ); ret = GetLastError(); if (is_sharing_compatible( access_modes[a1], sharing_modes[s1], - access_modes[a2], sharing_modes[s2], is_win9x )) + access_modes[a2], sharing_modes[s2] )) { ok( h2 != INVALID_HANDLE_VALUE, "open failed for modes %x/%x/%x/%x\n", access_modes[a1], sharing_modes[s1], access_modes[a2], sharing_modes[s2] ); - ok( ret == 0xdeadbeef /* Win9x */ || - ret == 0, /* XP */ - "wrong error code %d\n", ret ); + ok( ret == 0, "wrong error code %d\n", ret ); } else { @@ -1902,10 +1879,6 @@ static void test_file_sharing(void) { for (s2 = 0; s2 < sizeof(sharing_modes)/sizeof(sharing_modes[0]); s2++) { - /* Win9x doesn't support FILE_SHARE_DELETE */ - if (is_win9x && (sharing_modes[s2] & FILE_SHARE_DELETE)) - continue; - SetLastError(0xdeadbeef); h2 = CreateFileA( filename, access_modes[a2], sharing_modes[s2], NULL, OPEN_EXISTING, 0, 0 ); @@ -1913,10 +1886,9 @@ static void test_file_sharing(void) ret = GetLastError(); if (h2 == INVALID_HANDLE_VALUE) { - if (is_sharing_map_compatible(mapping_modes[a1], access_modes[a2], sharing_modes[s2])) - ok( is_win9x, /* there's no sharing at all with a mapping on win9x */ - "open failed for modes map %x/%x/%x\n", - mapping_modes[a1], access_modes[a2], sharing_modes[s2] ); + ok( !is_sharing_map_compatible(mapping_modes[a1], access_modes[a2], sharing_modes[s2]), + "open failed for modes map %x/%x/%x\n", + mapping_modes[a1], access_modes[a2], sharing_modes[s2] ); ok( ret == ERROR_SHARING_VIOLATION, "wrong error code %d\n", ret ); } @@ -1939,7 +1911,7 @@ static void test_file_sharing(void) h2 = CreateFileA( filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0 ); ret = GetLastError(); - if ((mapping_modes[a1] & SEC_IMAGE) || is_win9x) + if (mapping_modes[a1] & SEC_IMAGE) { ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); ok( ret == ERROR_SHARING_VIOLATION, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); @@ -1956,12 +1928,7 @@ static void test_file_sharing(void) h2 = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, 0 ); ret = GetLastError(); - if (is_win9x) - { - ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); - ok( ret == ERROR_SHARING_VIOLATION, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); - } - else if (mapping_modes[a1] & SEC_IMAGE) + if (mapping_modes[a1] & SEC_IMAGE) { ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); ok( ret == ERROR_ACCESS_DENIED, "wrong error code %d for %x\n", ret, mapping_modes[a1] );

1 0

Lauri Kenttä : netapi32: Fix h_addr_list handling.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 46328eff5e8f5855ecbb28c445179515654ccb4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=46328eff5e8f5855ecbb28c44… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Jul 1 16:10:25 2011 +0300 netapi32: Fix h_addr_list handling. --- dlls/netapi32/nbt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 8c76b6e..1115967 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -577,7 +577,7 @@ static UCHAR NetBTinetResolve(const UCHAR name[NCBNAMSZ], (*cacheEntry)->numAddresses = i; for (i = 0; i < (*cacheEntry)->numAddresses; i++) (*cacheEntry)->addresses[i] = - (DWORD)host->h_addr_list[i]; + *(DWORD*)host->h_addr_list[i]; } else ret = NRC_OSRESNOTAV;

1 0

Alexandre Julliard : server: Only check read/ write-specific access bits for file sharing access checks.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: b00d60f125abeb9b6a777316deaad20d1a310635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b00d60f125abeb9b6a777316d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 1 18:33:33 2011 +0200 server: Only check read/write-specific access bits for file sharing access checks. --- server/fd.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/server/fd.c b/server/fd.c index fd0e2fc..798f99e 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1476,6 +1476,11 @@ static void fd_destroy( struct object *obj ) static unsigned int check_sharing( struct fd *fd, unsigned int access, unsigned int sharing, unsigned int open_flags, unsigned int options ) { + /* only a few access bits are meaningful wrt sharing */ + const unsigned int read_access = FILE_READ_DATA | FILE_EXECUTE; + const unsigned int write_access = FILE_WRITE_DATA | FILE_APPEND_DATA; + const unsigned int all_access = read_access | write_access | DELETE; + unsigned int existing_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; unsigned int existing_access = 0; struct list *ptr; @@ -1489,25 +1494,26 @@ static unsigned int check_sharing( struct fd *fd, unsigned int access, unsigned if (fd_ptr != fd) { /* if access mode is 0, sharing mode is ignored */ - if (fd_ptr->access) existing_sharing &= fd_ptr->sharing; - existing_access |= fd_ptr->access; + if (fd_ptr->access & all_access) existing_sharing &= fd_ptr->sharing; + existing_access |= fd_ptr->access; } } - if (((access & FILE_UNIX_READ_ACCESS) && !(existing_sharing & FILE_SHARE_READ)) || - ((access & FILE_UNIX_WRITE_ACCESS) && !(existing_sharing & FILE_SHARE_WRITE)) || + if (((access & read_access) && !(existing_sharing & FILE_SHARE_READ)) || + ((access & write_access) && !(existing_sharing & FILE_SHARE_WRITE)) || ((access & DELETE) && !(existing_sharing & FILE_SHARE_DELETE))) return STATUS_SHARING_VIOLATION; if (((existing_access & FILE_MAPPING_WRITE) && !(sharing & FILE_SHARE_WRITE)) || - ((existing_access & FILE_MAPPING_IMAGE) && (access & FILE_UNIX_WRITE_ACCESS))) + ((existing_access & FILE_MAPPING_IMAGE) && (access & FILE_WRITE_DATA))) return STATUS_SHARING_VIOLATION; if ((existing_access & FILE_MAPPING_IMAGE) && (options & FILE_DELETE_ON_CLOSE)) return STATUS_CANNOT_DELETE; if ((existing_access & FILE_MAPPING_ACCESS) && (open_flags & O_TRUNC)) return STATUS_USER_MAPPED_FILE; - if (!access) return 0; /* if access mode is 0, sharing mode is ignored (except for mappings) */ - if (((existing_access & FILE_UNIX_READ_ACCESS) && !(sharing & FILE_SHARE_READ)) || - ((existing_access & FILE_UNIX_WRITE_ACCESS) && !(sharing & FILE_SHARE_WRITE)) || + if (!(access & all_access)) + return 0; /* if access mode is 0, sharing mode is ignored (except for mappings) */ + if (((existing_access & read_access) && !(sharing & FILE_SHARE_READ)) || + ((existing_access & write_access) && !(sharing & FILE_SHARE_WRITE)) || ((existing_access & DELETE) && !(sharing & FILE_SHARE_DELETE))) return STATUS_SHARING_VIOLATION; return 0;

1 0

Jacek Caban : include: Added objectarray.idl.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 8edcb6ce4b075da51e42c0ea5147add9075a2ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8edcb6ce4b075da51e42c0ea5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 14:11:42 2011 +0200 include: Added objectarray.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/objectarray.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index aa73888..e08d0d8 100644 --- a/.gitignore +++ b/.gitignore @@ -204,6 +204,7 @@ include/msxml6.h include/netcon.h include/netfw.h include/oaidl.h +include/objectarray.h include/objidl.h include/objsafe.h include/ocidl.h diff --git a/include/Makefile.in b/include/Makefile.in index 074160f..b691ffa 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -64,6 +64,7 @@ PUBLIC_IDL_H_SRCS = \ netcon.idl \ netfw.idl \ oaidl.idl \ + objectarray.idl \ objidl.idl \ objsafe.idl \ ocidl.idl \ diff --git a/include/objectarray.idl b/include/objectarray.idl new file mode 100644 index 0000000..0112503 --- /dev/null +++ b/include/objectarray.idl @@ -0,0 +1,47 @@ +/* + * Copyright 2011 Jacek Caban 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 + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +[ + uuid(92ca9dcd-5622-4bba-a805-5e9f541bd8c9), + object, + pointer_default(unique) +] +interface IObjectArray : IUnknown +{ + HRESULT GetCount([out] UINT *pcObjects); + HRESULT GetAt( + [in] UINT uiIndex, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); +} + +[ + uuid(5632b1a4-e38a-400a-928a-d4cd63230295), + object, + pointer_default(unique) +] +interface IObjectCollection : IObjectArray +{ + HRESULT AddObject([in] IUnknown *punk); + HRESULT AddFromArray([in] IObjectArray *poaSource); + HRESULT RemoveObjectAt([in] UINT uiIndex); + HRESULT Clear(); +}

1 0

Jacek Caban : propvarutil.h: Added InitPropVariantFromBoolean and InitPropVariantFromString implementations .
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: ad2f8bdd5c9b2470cf1e712ae0d2d20904517ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2f8bdd5c9b2470cf1e712ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 14:15:21 2011 +0200 propvarutil.h: Added InitPropVariantFromBoolean and InitPropVariantFromString implementations. --- include/propvarutil.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/propvarutil.h b/include/propvarutil.h index 2573d38..1764422 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -38,4 +38,35 @@ typedef int PROPVAR_CHANGE_FLAGS; HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); + +#ifdef __cplusplus + +HRESULT InitPropVariantFromBoolean(BOOL fVal, PROPVARIANT *ppropvar); +HRESULT InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar); + +#ifndef NO_PROPVAR_INLINES + +HRESULT inline InitPropVariantFromBoolean(BOOL fVal, PROPVARIANT *ppropvar) +{ + ppropvar->vt = VT_BOOL; + ppropvar->boolVal = fVal ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; +} + +HRESULT inline InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar) +{ + HRESULT hres; + + hres = SHStrDupW(psz, &ppropvar->pwszVal); + if(SUCCEEDED(hres)) + ppropvar->vt = VT_LPWSTR; + else + PropVariantInit(ppropvar); + + return hres; +} + +#endif +#endif + #endif /* __WINE_PROPVARUTIL_H */

1 0

Jacek Caban : propkey.h: Added more PROPERTYKEY declarations.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 8e5eaf7f7b6a1e83909a88c369eb24a94360978d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5eaf7f7b6a1e83909a88c36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 14:12:59 2011 +0200 propkey.h: Added more PROPERTYKEY declarations. --- include/propkey.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/propkey.h b/include/propkey.h index 1d09d6f..de57e02 100644 --- a/include/propkey.h +++ b/include/propkey.h @@ -31,4 +31,16 @@ DEFINE_PROPERTYKEY(PKEY_Audio_SampleSize, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80 DEFINE_PROPERTYKEY(PKEY_Audio_StreamName, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 9); DEFINE_PROPERTYKEY(PKEY_Audio_StreamNumber, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 8); +DEFINE_PROPERTYKEY(PKEY_Title, 0xf29f85e0,0x4ff9,0x1068,0xab,0x91,0x08,0x00,0x2b,0x27,0xb3,0xd9,2); + +DEFINE_PROPERTYKEY(PKEY_ItemName, 0x6b8da074,0x3b5c,0x43bc,0x88,0x6f,0x0a,0x2c,0xdc,0xe0,0x0b,0x6f,100); + +DEFINE_PROPERTYKEY(PKEY_AppUserModel_ExcludeFromShowInNewInstall, 0x9f4c2855,0x9f79,0x4b39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,8); +DEFINE_PROPERTYKEY(PKEY_AppUserModel_ID, 0x9f4c2855,0x9f79,0x4B39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,5); +DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDestListSeparator, 0x9f4c2855,0x9f79,0x4b39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,6); +DEFINE_PROPERTYKEY(PKEY_AppUserModel_PreventPinning, 0x9f4c2855,0x9F79,0x4b39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,9); +DEFINE_PROPERTYKEY(PKEY_AppUserModel_RelaunchCommand, 0x9f4c2855,0x9f79,0x4b39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,2); +DEFINE_PROPERTYKEY(PKEY_AppUserModel_RelaunchDisplayNameResource, 0x9f4c2855,0x9f79,0x4b39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,4); +DEFINE_PROPERTYKEY(PKEY_AppUserModel_RelaunchIconResource, 0x9f4c2855,0x9f79,0x4b39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,3); + #endif /*_INC_PROPKEY*/

1 0

Jacek Caban : shobjidl.idl: Added ITaskbarList[34] and ICustomDestinationList declarations.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 34588b3969bc86fbc363aa0660a18c9157cc2c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34588b3969bc86fbc363aa066… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 1 14:12:02 2011 +0200 shobjidl.idl: Added ITaskbarList[34] and ICustomDestinationList declarations. --- include/shobjidl.idl | 164 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 160 insertions(+), 4 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 8dd9926..1b4d385 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -31,6 +31,7 @@ import "propidl.idl"; import "msxml.idl"; import "wtypes.idl"; import "propsys.idl"; +import "objectarray.idl"; /* FIXME: import "structuredquery.idl"; */ cpp_quote("/* FIXME: #include <sherrors.h> */") @@ -1871,6 +1872,130 @@ interface ITaskbarList2 : ITaskbarList [in] BOOL fullscreen); } +cpp_quote("#ifdef MIDL_PASS") +typedef IUnknown* HIMAGELIST; +cpp_quote("#endif") + +typedef [v1_enum] enum THUMBBUTTONFLAGS { + THBF_ENABLED = 0x0000, + THBF_DISABLED = 0x0001, + THBF_DISMISSONCLICK = 0x0002, + THBF_NOBACKGROUND = 0x0004, + THBF_HIDDEN = 0x0008, + THBF_NONINTERACTIVE = 0x0010 +} THUMBBUTTONFLAGS; + +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(THUMBBUTTONFLAGS)") + +typedef [v1_enum] enum THUMBBUTTONMASK { + THB_BITMAP = 0x0001, + THB_ICON = 0x0002, + THB_TOOLTIP = 0x0004, + THB_FLAGS = 0x0008 +} THUMBBUTTONMASK; + +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(THUMBBUTTONMASK)") + +cpp_quote("#include <pshpack8.h>") +typedef struct THUMBBUTTON { + THUMBBUTTONMASK dwMask; + UINT iId; + UINT iBitmap; + HICON hIcon; + WCHAR szTip[260]; + THUMBBUTTONFLAGS dwFlags; +} THUMBBUTTON, *LPTHUMBBUTTON; +cpp_quote("#include <poppack.h>") + +[ + uuid(ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf), + object +] +interface ITaskbarList3 : ITaskbarList2 +{ + typedef [v1_enum] enum TBPFLAG { + TBPF_NOPROGRESS = 0x0000, + TBPF_INDETERMINATE = 0x0001, + TBPF_NORMAL = 0x0002, + TBPF_ERROR = 0x0004, + TBPF_PAUSED = 0x0008 + } TBPFLAG; + + cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(TBPFLAG)") + + HRESULT SetProgressValue( + [in] HWND hwnd, + [in] ULONGLONG ullCompleted, + [in] ULONGLONG ullTotal); + + HRESULT SetProgressState( + [in] HWND hwnd, + [in] TBPFLAG tbpFlags); + + HRESULT RegisterTab( + [in] HWND hwndTab, + [in] HWND hwndMDI); + + HRESULT UnregisterTab([in] HWND hwndTab); + + HRESULT SetTabOrder( + [in] HWND hwndTab, + [in] HWND hwndInsertBefore); + + HRESULT SetTabActive( + [in] HWND hwndTab, + [in] HWND hwndMDI, + [in] DWORD dwReserved); + + HRESULT ThumbBarAddButtons( + [in] HWND hwnd, + [in] UINT cButtons, + [in, size_is(cButtons)] LPTHUMBBUTTON pButton); + + HRESULT ThumbBarUpdateButtons( + [in] HWND hwnd, + [in] UINT cButtons, + [in, size_is(cButtons)] LPTHUMBBUTTON pButton); + + HRESULT ThumbBarSetImageList( + [in] HWND hwnd, + [in] HIMAGELIST himl); + + HRESULT SetOverlayIcon( + [in] HWND hwnd, + [in] HICON hIcon, + [in, unique, string] LPCWSTR pszDescription); + + HRESULT SetThumbnailTooltip( + [in] HWND hwnd, + [in, unique, string] LPCWSTR pszTip); + + HRESULT SetThumbnailClip( + [in] HWND hwnd, + [in] RECT *prcClip); +} + +[ + uuid(c43dc798-95d1-4bea-9030-bb99e2983a1a), + object +] +interface ITaskbarList4 : ITaskbarList3 +{ + typedef [v1_enum] enum STPFLAG { + STPF_NONE = 0x0000, + STPF_USEAPPTHUMBNAILALWAYS = 0x0001, + STPF_USEAPPTHUMBNAILWHENACTIVE = 0x0002, + STPF_USEAPPPEEKALWAYS = 0x0004, + STPF_USEAPPPEEKWHENACTIVE = 0x0008 + } STPFLAG; + + cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(STPFLAG)") + + HRESULT SetTabProperties( + [in] HWND hwndTab, + [in] STPFLAG stpFlags); +} + /***************************************************************************** * IAutoCompleteDropDown interface */ @@ -2327,10 +2452,6 @@ interface INameSpaceTreeControlEvents : IUnknown [out] int *piOpenIcon); } -cpp_quote("#ifdef MIDL_PASS") -typedef IUnknown *HIMAGELIST; -cpp_quote("#endif") - /***************************************************************************** * INameSpaceTreeControlCustomDraw interface */ @@ -3137,6 +3258,41 @@ interface IApplicationAssociationRegistration : IUnknown HRESULT ClearUserAssociations(); } +[ + uuid(6332debf-87b5-4670-90c0-5e57b408a49e), + object, + pointer_default(unique) +] +interface ICustomDestinationList : IUnknown +{ + typedef [v1_enum] enum KNOWNDESTCATEGORY { + KDC_FREQUENT = 1, + KDC_RECENT + } KNOWNDESTCATEGORY; + + HRESULT SetAppID([in, string] LPCWSTR pszAppID); + + HRESULT BeginList( + [out] UINT *pcMinSlots, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT AppendCategory( + [in, string] LPCWSTR pszCategory, + [in] IObjectArray *poa); + + HRESULT AppendKnownCategory([in] KNOWNDESTCATEGORY category); + HRESULT AddUserTasks([in] IObjectArray *poa); + HRESULT CommitList(); + + HRESULT GetRemovedDestinations( + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT DeleteList([in, unique, string] LPCWSTR pszAppID); + HRESULT AbortList(); +} + /***************************************************************************** * ShellObjects typelibrary */

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: aca1f06b05ae462cd370b011ada5968ce0986e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca1f06b05ae462cd370b011a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 1 14:13:43 2011 +0200 po: Update French translation. --- po/fr.po | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index b84114a..6fd68b4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8483,9 +8483,8 @@ msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" msgstr "Usage : dxdiag [/whql:off | /whql:on] [/t fichier | /x fichier]" #: explorer.rc:28 -#, fuzzy msgid "Wine Explorer" -msgstr "Internet Explorer de Wine" +msgstr "Explorateur de Wine" #: hostname.rc:27 msgid "Usage: hostname\n" @@ -9969,12 +9968,10 @@ msgid "Tiles the windows vertically on the desktop" msgstr "Arrange les fenêtres verticalement sur le bureau" #: taskmgr.rc:207 -#, fuzzy msgid "Minimizes the windows" msgstr "Réduit les fenêtres" #: taskmgr.rc:208 -#, fuzzy msgid "Maximizes the windows" msgstr "Agrandit les fenêtres"

1 0

Rico Schüller : d3dx9: Handle ST_PARAMETER in d3dx9_parse resource().
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 7e7549abc54c8a243bdd6ea509bdf1eff8920188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7549abc54c8a243bdd6ea50… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jul 1 13:50:27 2011 +0200 d3dx9: Handle ST_PARAMETER in d3dx9_parse resource(). --- dlls/d3dx9_36/effect.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5d76917..b4f1932 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -88,6 +88,7 @@ enum SHADER_CONSTANT_TYPE enum STATE_TYPE { ST_CONSTANT, + ST_PARAMETER, ST_FXLC, }; @@ -4739,7 +4740,7 @@ static HRESULT d3dx9_parse_resource(struct ID3DXBaseEffectImpl *base, const char DWORD index, state_index, usage; struct d3dx_state *state; struct d3dx_parameter *param; - HRESULT hr; + HRESULT hr = E_FAIL; read_dword(ptr, &technique_index); TRACE("techn: %u\n", technique_index); @@ -4828,14 +4829,21 @@ static HRESULT d3dx9_parse_resource(struct ID3DXBaseEffectImpl *base, const char default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); - hr=E_FAIL; break; } break; + case 1: + state->type = ST_PARAMETER; + hr = d3dx9_copy_data(param->data, ptr); + if (hr == D3D_OK) + { + TRACE("Mapping to parameter %s\n", *(char **)param->data); + } + break; + default: FIXME("Unknown usage %x\n", usage); - hr=E_FAIL; break; }

1 0