February 2006 - Wine-commits

Alexandre Julliard : configure: Added a WINE_CHECK_LIB_FUNCS macro to check for functions
by Alexandre Julliard 13 Feb '06

13 Feb '06

Module: wine Branch: refs/heads/master Commit: 2d1a6274ee8c8fc8ac33f5ed53892711492321db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d1a6274ee8c8fc8ac33f5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 11 20:54:06 2006 +0100 configure: Added a WINE_CHECK_LIB_FUNCS macro to check for functions when linking with specific libraries. --- aclocal.m4 | 10 ++++++++++ configure | 13 ++++++------- configure.ac | 17 ++++++----------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index ef987a2..fb73a06 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -94,6 +94,16 @@ AS_IF([test AS_VAR_GET(ac_var) = yes], LINTFLAGS="$LINTFLAGS -D$1"])dnl AS_VAR_POPDEF([ac_var])]) +dnl **** Check for functions with some extra libraries **** +dnl +dnl Usage: WINE_CHECK_LIB_FUNCS(funcs,libs,[action-if-found,[action-if-not-found]]) +dnl +AC_DEFUN([WINE_CHECK_LIB_FUNCS], +[ac_wine_check_funcs_save_LIBS="$LIBS" +LIBS="$LIBS $2" +AC_CHECK_FUNCS([$1],[$3],[$4]) +LIBS="$ac_wine_check_funcs_save_LIBS"]) + dnl **** Check for ln **** dnl dnl Usage: WINE_PROG_LN diff --git a/configure b/configure index 5e8852a..daee535 100755 --- a/configure +++ b/configure @@ -9757,8 +9757,8 @@ fi fi - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LDAPLIBS $LIBPTHREAD" + ac_wine_check_funcs_save_LIBS="$LIBS" +LIBS="$LIBS $LDAPLIBS $LIBPTHREAD" @@ -9867,7 +9867,7 @@ _ACEOF fi done - LIBS="$ac_save_LIBS" +LIBS="$ac_wine_check_funcs_save_LIBS" fi FREETYPELIBS="" @@ -10567,7 +10567,7 @@ _ACEOF fi -ac_save_LIBS="$LIBS" +ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $LIBPTHREAD" @@ -10575,8 +10575,7 @@ LIBS="$LIBS $LIBPTHREAD" for ac_func in \ pthread_getattr_np \ pthread_get_stackaddr_np \ - pthread_get_stacksize_np \ - + pthread_get_stacksize_np do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -10676,7 +10675,7 @@ _ACEOF fi done -LIBS="$ac_save_LIBS" +LIBS="$ac_wine_check_funcs_save_LIBS" # Extract the first word of "artsc-config", so it can be a program name with args. set dummy artsc-config; ac_word=$2 diff --git a/configure.ac b/configure.ac index 7765266..6532db1 100644 --- a/configure.ac +++ b/configure.ac @@ -553,14 +553,12 @@ then LDAPLIBS="-lldap_r -llber"],, [$LIBPTHREAD])],, [$LIBPTHREAD]) - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LDAPLIBS $LIBPTHREAD" - AC_CHECK_FUNCS(\ + WINE_CHECK_LIB_FUNCS(\ ldap_count_references \ ldap_first_reference \ ldap_next_reference \ - ldap_parse_reference) - LIBS="$ac_save_LIBS" + ldap_parse_reference, + [$LDAPLIBS $LIBPTHREAD]) fi dnl **** Check for FreeType 2 **** @@ -689,14 +687,11 @@ AC_CHECK_TYPES([pthread_rwlock_t, pthrea #include <pthread.h>]) dnl **** Check for pthread functions **** -ac_save_LIBS="$LIBS" -LIBS="$LIBS $LIBPTHREAD" -AC_CHECK_FUNCS(\ +WINE_CHECK_LIB_FUNCS(\ pthread_getattr_np \ pthread_get_stackaddr_np \ - pthread_get_stacksize_np \ -) -LIBS="$ac_save_LIBS" + pthread_get_stacksize_np, + [$LIBPTHREAD]) dnl **** Check for aRts Sound Server **** AC_PATH_PROG(ARTSCCONFIG, artsc-config)

1 0

Stefan Dösinger : ddraw: Small function corrections.
by Alexandre Julliard 11 Feb '06

11 Feb '06

Module: wine Branch: refs/heads/master Commit: 6e27152c964bff5a8465fbfb88c4a86e8c8d9bee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e27152c964bff5a8465fbf… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Feb 11 20:30:48 2006 +0100 ddraw: Small function corrections. The pPlaneEquation parameter of IDirect3DDevice7::SetClipPlane is not const IDirect3DDevice2::NextViewport takes an IDirect3DDevice2 interface, not an IDirect3DDevice3, the same for IDirect3DDevice::NextViewport. --- dlls/ddraw/d3d_private.h | 4 ++-- dlls/ddraw/device_main.c | 4 ++-- dlls/ddraw/device_opengl.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/d3d_private.h b/dlls/ddraw/d3d_private.h index 9503768..d55b80c 100644 --- a/dlls/ddraw/d3d_private.h +++ b/dlls/ddraw/d3d_private.h @@ -957,13 +957,13 @@ Thunk_IDirect3DDeviceImpl_1_DeleteViewpo LPDIRECT3DVIEWPORT lpDirect3DViewport); HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_2_NextViewport(LPDIRECT3DDEVICE3 iface, +Thunk_IDirect3DDeviceImpl_2_NextViewport(LPDIRECT3DDEVICE2 iface, LPDIRECT3DVIEWPORT2 lpDirect3DViewport2, LPDIRECT3DVIEWPORT2* lplpDirect3DViewport2, DWORD dwFlags); HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_NextViewport(LPDIRECT3DDEVICE3 iface, +Thunk_IDirect3DDeviceImpl_1_NextViewport(LPDIRECT3DDEVICE iface, LPDIRECT3DVIEWPORT lpDirect3DViewport, LPDIRECT3DVIEWPORT* lplpDirect3DViewport, DWORD dwFlags); diff --git a/dlls/ddraw/device_main.c b/dlls/ddraw/device_main.c index 98efdf2..087e8ed 100644 --- a/dlls/ddraw/device_main.c +++ b/dlls/ddraw/device_main.c @@ -1599,7 +1599,7 @@ Thunk_IDirect3DDeviceImpl_1_DeleteViewpo } HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_2_NextViewport(LPDIRECT3DDEVICE3 iface, +Thunk_IDirect3DDeviceImpl_2_NextViewport(LPDIRECT3DDEVICE2 iface, LPDIRECT3DVIEWPORT2 lpDirect3DViewport2, LPDIRECT3DVIEWPORT2* lplpDirect3DViewport2, DWORD dwFlags) @@ -1612,7 +1612,7 @@ Thunk_IDirect3DDeviceImpl_2_NextViewport } HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_NextViewport(LPDIRECT3DDEVICE3 iface, +Thunk_IDirect3DDeviceImpl_1_NextViewport(LPDIRECT3DDEVICE iface, LPDIRECT3DVIEWPORT lpDirect3DViewport, LPDIRECT3DVIEWPORT* lplpDirect3DViewport, DWORD dwFlags) diff --git a/dlls/ddraw/device_opengl.c b/dlls/ddraw/device_opengl.c index 16c5e94..e2e6299 100644 --- a/dlls/ddraw/device_opengl.c +++ b/dlls/ddraw/device_opengl.c @@ -2615,7 +2615,7 @@ GL_IDirect3DDeviceImpl_7_LightEnable(LPD } HRESULT WINAPI -GL_IDirect3DDeviceImpl_7_SetClipPlane(LPDIRECT3DDEVICE7 iface, DWORD dwIndex, CONST D3DVALUE* pPlaneEquation) +GL_IDirect3DDeviceImpl_7_SetClipPlane(LPDIRECT3DDEVICE7 iface, DWORD dwIndex, D3DVALUE* pPlaneEquation) { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; IDirect3DDeviceGLImpl* glThis = (IDirect3DDeviceGLImpl*) This;

1 0

Phil Krylov : ntdll: Fix tape.c compilation on Darwin.
by Alexandre Julliard 11 Feb '06

11 Feb '06

Module: wine Branch: refs/heads/master Commit: 368dab37ecdfac8c60d252e844df7b289fa83d0c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=368dab37ecdfac8c60d252e… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Sat Feb 11 20:26:33 2006 +0100 ntdll: Fix tape.c compilation on Darwin. --- configure | 6 ++++++ configure.ac | 3 ++- dlls/ntdll/tape.c | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 30281cb..5e8852a 100755 --- a/configure +++ b/configure @@ -17836,6 +17836,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include <sys/types.h> #ifdef HAVE_SYS_MTIO_H #include <sys/mtio.h> #endif @@ -17882,6 +17883,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include <sys/types.h> #ifdef HAVE_SYS_MTIO_H #include <sys/mtio.h> #endif @@ -17949,6 +17951,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include <sys/types.h> #ifdef HAVE_SYS_MTIO_H #include <sys/mtio.h> #endif @@ -17995,6 +17998,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include <sys/types.h> #ifdef HAVE_SYS_MTIO_H #include <sys/mtio.h> #endif @@ -18062,6 +18066,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include <sys/types.h> #ifdef HAVE_SYS_MTIO_H #include <sys/mtio.h> #endif @@ -18108,6 +18113,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include <sys/types.h> #ifdef HAVE_SYS_MTIO_H #include <sys/mtio.h> #endif diff --git a/configure.ac b/configure.ac index d802373..7765266 100644 --- a/configure.ac +++ b/configure.ac @@ -1357,7 +1357,8 @@ AC_CHECK_MEMBERS([siginfo_t.si_fd],,,[#i dnl Check for struct mtget members AC_CHECK_MEMBERS([struct mtget.mt_blksiz, struct mtget.mt_gstat, struct mtget.mt_blkno],,, -[#ifdef HAVE_SYS_MTIO_H +[#include <sys/types.h> +#ifdef HAVE_SYS_MTIO_H #include <sys/mtio.h> #endif]) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index 32f2684..b02e76a 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -344,7 +344,7 @@ static NTSTATUS TAPE_Prepare( int fd, TA */ static NTSTATUS TAPE_SetDriveParams( int fd, TAPE_SET_DRIVE_PARAMETERS *data ) { -#ifdef HAVE_SYS_MTIO_H +#if defined(HAVE_SYS_MTIO_H) && defined(MTCOMPRESSION) struct mtop cmd; TRACE( "fd: %d ECC: 0x%02x, compression: 0x%02x padding: 0x%02x\n", @@ -425,6 +425,7 @@ static NTSTATUS TAPE_SetPosition( int fd cmd.mt_count = -data->Offset.u.LowPart; } break; +#if defined(MTFSS) && defined(MTBSS) case TAPE_SPACE_SETMARKS: if (data->Offset.u.LowPart >= 0) { cmd.mt_op = MTFSS; @@ -435,6 +436,7 @@ static NTSTATUS TAPE_SetPosition( int fd cmd.mt_count = -data->Offset.u.LowPart; } break; +#endif case TAPE_LOGICAL_BLOCK: case TAPE_PSEUDO_LOGICAL_BLOCK: case TAPE_SPACE_RELATIVE_BLOCKS:

1 0

Stefan Dösinger : ddraw: ProcessVertices correction.
by Alexandre Julliard 11 Feb '06

11 Feb '06

Module: wine Branch: refs/heads/master Commit: 531c4878078a899b1617bc2deea24381d503fc96 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=531c4878078a899b1617bc2… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Feb 11 20:30:13 2006 +0100 ddraw: ProcessVertices correction. Use the texture index to get the texcoord size from the fvf, not the vertex index. --- dlls/ddraw/vertexbuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 0702f0f..37c478f 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -360,7 +360,7 @@ process_vertices_strided(IDirect3DVertex D3DVALUE *tex_coord = (D3DVALUE *) (((char *) lpStrideData->textureCoords[tex_index].lpvData) + i * lpStrideData->textureCoords[tex_index].dwStride); - copy_and_next(dest_ptr, tex_coord, GET_TEXCOORD_SIZE_FROM_FVF(dwVertexTypeDesc, i) * sizeof(D3DVALUE)); + copy_and_next(dest_ptr, tex_coord, GET_TEXCOORD_SIZE_FROM_FVF(dwVertexTypeDesc, tex_index) * sizeof(D3DVALUE)); } if (TRACE_ON(ddraw_geom)) {

1 0

Andrey Turkin : shell32: IShellView list's control id should be 1, not 2000 .
by Alexandre Julliard 11 Feb '06

11 Feb '06

Module: wine Branch: refs/heads/master Commit: 06188b6d340ff1d4c7dab1c73c583cc1fa6f1a40 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06188b6d340ff1d4c7dab1c… Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Sat Feb 11 18:41:34 2006 +0100 shell32: IShellView list's control id should be 1, not 2000. --- dlls/shell32/shlview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index f9f07ce..2cce8eb 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -146,7 +146,7 @@ static inline IShellViewImpl *impl_from_ #define IDM_VIEW_IDW (FCIDM_SHVIEWFIRST + 0x501) #define IDM_MYFILEITEM (FCIDM_SHVIEWFIRST + 0x502) -#define ID_LISTVIEW 2000 +#define ID_LISTVIEW 1 #define SHV_CHANGE_NOTIFY WM_USER + 0x1111

1 0

Andrey Turkin : commdlg: IShellBrowser sets IShellView window' s control id to 5002.
by Alexandre Julliard 11 Feb '06

11 Feb '06

Module: wine Branch: refs/heads/master Commit: 6a80a492fb670b8281567afd7c6dd1da26423230 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a80a492fb670b8281567af… Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Sat Feb 11 18:41:23 2006 +0100 commdlg: IShellBrowser sets IShellView window's control id to 5002. --- dlls/commdlg/filedlgbrowser.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c index c8731b9..0236c35 100644 --- a/dlls/commdlg/filedlgbrowser.c +++ b/dlls/commdlg/filedlgbrowser.c @@ -472,6 +472,9 @@ static HRESULT WINAPI IShellBrowserImpl_ fodInfos->ShellInfos.hwndView = hwndView; + /* Set view window control id to 5002 */ + SetWindowLongPtrW(hwndView, GWLP_ID, lst2); + /* Select the new folder in the Look In combo box of the Open file dialog */ FILEDLG95_LOOKIN_SelectItem(fodInfos->DlgInfos.hwndLookInCB,fodInfos->ShellInfos.pidlAbsCurrent);

1 0

Troy Rollo : ntdll: Implement DVD_ReadStructure.
by Alexandre Julliard 11 Feb '06

11 Feb '06

Module: wine Branch: refs/heads/master Commit: 721621b34eec8a44e409c82e3e84cef475b8500a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=721621b34eec8a44e409c82… Author: Troy Rollo <wine(a)troy.rollo.name> Date: Sat Feb 11 18:40:32 2006 +0100 ntdll: Implement DVD_ReadStructure. --- dlls/ntdll/cdrom.c | 253 ++++++++++++++++++++---------------------------- include/Makefile.in | 1 include/ddk/ntddcdvd.h | 189 ++++++++++++++++++++++++++++++++++++ 3 files changed, 296 insertions(+), 147 deletions(-) create mode 100644 include/ddk/ntddcdvd.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=721621b34eec8a44e40…

1 0

Thomas Kho : riched20: Fixed bounds error when finding text forward.
by Alexandre Julliard 11 Feb '06

11 Feb '06

Module: wine Branch: refs/heads/master Commit: caffa53227d37f35bc32c03733dfc94556ff513f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=caffa53227d37f35bc32c03… Author: Thomas Kho <tkho(a)ucla.edu> Date: Sat Feb 11 18:39:17 2006 +0100 riched20: Fixed bounds error when finding text forward. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6f43cb4..0eca070 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -771,7 +771,7 @@ ME_FindText(ME_TextEditor *editor, DWORD para = ME_GetParagraph(item); while (item - && para->member.para.nCharOfs + item->member.run.nCharOfs + nStart + nLen < nMax) + && para->member.para.nCharOfs + item->member.run.nCharOfs + nStart + nLen <= nMax) { ME_DisplayItem *pCurItem = item; int nCurStart = nStart;

1 0

Thomas Kho : riched20: Added tests for EM_FINDTEXT and EM_FINDTEXTEX messages.
by Alexandre Julliard 11 Feb '06

11 Feb '06

Module: wine Branch: refs/heads/master Commit: 482ab27e8d3cf6414d4db7c940328d07e14776f4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=482ab27e8d3cf6414d4db7c… Author: Thomas Kho <tkho(a)ucla.edu> Date: Sat Feb 11 18:39:07 2006 +0100 riched20: Added tests for EM_FINDTEXT and EM_FINDTEXTEX messages. --- configure | 3 - configure.ac | 1 dlls/riched20/Makefile.in | 2 dlls/riched20/tests/.gitignore | 3 + dlls/riched20/tests/Makefile.in | 13 +++ dlls/riched20/tests/editor.c | 191 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 212 insertions(+), 1 deletions(-) create mode 100644 dlls/riched20/tests/.gitignore create mode 100644 dlls/riched20/tests/Makefile.in create mode 100644 dlls/riched20/tests/editor.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=482ab27e8d3cf6414d4…

1 0

Martin Fuchs : shell32: SHELL32_GetItemAttributes()
by Alexandre Julliard 11 Feb '06

11 Feb '06

Module: wine Branch: refs/heads/master Commit: c362d7c35ba3c02d68a9b7e42b48db210a901667 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c362d7c35ba3c02d68a9b7e… Author: Martin Fuchs <martin-fuchs(a)gmx.net> Date: Sat Feb 11 12:16:56 2006 +0100 shell32: SHELL32_GetItemAttributes() - correct documentation which incorrectly claimed not to set any attribute bits - retrieve file attributes using SHGetPathFromIDListW() when they are not already present in the internal PIDL structures - add test case to show the previously wrong folder attributes when using absolute PIDLs - fix some memory leaks in the tests --- dlls/shell32/shlfolder.c | 16 +++++++- dlls/shell32/tests/shlfolder.c | 76 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 29fd408..e81056b 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -380,11 +380,13 @@ HRESULT SHELL32_GetDisplayNameOfChild (I * file: 0x40400177 FILESYSTEM | CANMONIKER * drive 0xF0400154 FILESYSTEM | HASSUBFOLDER | FOLDER | FILESYSANCESTOR | CANMONIKER | CANRENAME (LABEL) * - * This function does not set flags!! It only resets flags when necessary. + * According to the MSDN documentation this function should not set flags. It claimes only to reset flags when necessary. + * However it turns out the native shell32.dll _sets_ flags in several cases - so do we. */ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) { DWORD dwAttributes; + BOOL has_guid; static const DWORD dwSupportedAttr= SFGAO_CANCOPY | /*0x00000001 */ SFGAO_CANMOVE | /*0x00000002 */ @@ -409,16 +411,26 @@ HRESULT SHELL32_GetItemAttributes (IShel *pdwAttributes &= dwSupportedAttr; } + has_guid = _ILGetGUIDPointer(pidl) != NULL; + dwAttributes = *pdwAttributes; if (_ILIsDrive (pidl)) { *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK; - } else if (_ILGetGUIDPointer (pidl) && HCR_GetFolderAttributes(pidl, &dwAttributes)) { + } else if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) { *pdwAttributes = dwAttributes; } else if (_ILGetDataPointer (pidl)) { dwAttributes = _ILGetFileAttributes (pidl, NULL, 0); + if (!dwAttributes && has_guid) { + WCHAR path[MAX_PATH]; + + /* File attributes are not present in the internal PIDL structure, so get them from the file system. */ + if (SHGetPathFromIDListW(pidl, path)) + dwAttributes = GetFileAttributesW(path); + } + /* Set common attributes */ *pdwAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | SFGAO_CANRENAME | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANCOPY; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 6ab6044..fbbc06d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -102,6 +102,9 @@ static void test_ParseDisplayName(void) NULL, NULL, cTestDirW, NULL, &newPIDL, 0); ok((hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || (hr == E_FAIL) || (hr == E_INVALIDARG), "ParseDisplayName returned %08lx, expected 80070002, E_FAIL or E_INVALIDARG\n", hr); + + hr = IShellFolder_Release(IDesktopFolder); + ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr); } /* creates a file with the specified name for tests */ @@ -602,6 +605,13 @@ static void test_GetAttributesOf(void) WCHAR wszMyComputer[] = { ':',':','{','2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-', 'A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D','}',0 }; + char cCurrDirA [MAX_PATH] = {0}; + WCHAR cCurrDirW [MAX_PATH]; + static const WCHAR cTestDirW[] = {'t','e','s','t','d','i','r',0}; + static const WCHAR cBackSlash[] = {'\\',0}; + IShellFolder *IDesktopFolder, *testIShellFolder; + ITEMIDLIST *newPIDL; + int len; hr = SHGetDesktopFolder(&psfDesktop); ok (SUCCEEDED(hr), "SHGetDesktopFolder failed! hr = %08lx\n", hr); @@ -658,6 +668,69 @@ static void test_GetAttributesOf(void) "Wrong MyComputer attributes: %08lx, expected: %08lx\n", dwFlags, dwMyComputerFlags); } IShellFolder_Release(psfMyComputer); + + /* create test directory */ + CreateFilesFolders(); + + GetCurrentDirectoryA(MAX_PATH, cCurrDirA); + len = lstrlenA(cCurrDirA); + + if (len == 0) { + trace("GetCurrentDirectoryA returned empty string. Skipping test_EnumObjects_and_CompareIDs\n"); + return; + } + if(cCurrDirA[len-1] == '\\') + cCurrDirA[len-1] = 0; + + MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH); + + hr = SHGetDesktopFolder(&IDesktopFolder); + ok(hr == S_OK, "SHGetDesktopfolder failed %08lx\n", hr); + + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cCurrDirW, NULL, &newPIDL, 0); + ok(hr == S_OK, "ParseDisplayName failed %08lx\n", hr); + + hr = IShellFolder_BindToObject(IDesktopFolder, newPIDL, NULL, (REFIID)&IID_IShellFolder, (LPVOID *)&testIShellFolder); + ok(hr == S_OK, "BindToObject failed %08lx\n", hr); + + IMalloc_Free(ppM, newPIDL); + + /* get relative PIDL */ + hr = IShellFolder_ParseDisplayName(testIShellFolder, NULL, NULL, (LPWSTR)cTestDirW, NULL, &newPIDL, 0); + ok(hr == S_OK, "ParseDisplayName failed %08lx\n", hr); + + /* test the shell attributes of the test directory using the relative PIDL */ + dwFlags = SFGAO_FOLDER; + hr = IShellFolder_GetAttributesOf(testIShellFolder, 1, (LPCITEMIDLIST*)&newPIDL, &dwFlags); + ok (SUCCEEDED(hr), "Desktop->GetAttributesOf() failed! hr = %08lx\n", hr); + ok ((dwFlags&SFGAO_FOLDER), "Wrong directory attribute for relative PIDL: %08lx\n", dwFlags); + + /* free memory */ + IMalloc_Free(ppM, newPIDL); + + /* append testdirectory name to path */ + strcatW(cCurrDirW, cBackSlash); + strcatW(cCurrDirW, cTestDirW); + + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cCurrDirW, NULL, &newPIDL, 0); + ok(hr == S_OK, "ParseDisplayName failed %08lx\n", hr); + + /* test the shell attributes of the test directory using the absolute PIDL */ + dwFlags = SFGAO_FOLDER; + hr = IShellFolder_GetAttributesOf(IDesktopFolder, 1, (LPCITEMIDLIST*)&newPIDL, &dwFlags); + ok (SUCCEEDED(hr), "Desktop->GetAttributesOf() failed! hr = %08lx\n", hr); + ok ((dwFlags&SFGAO_FOLDER), "Wrong directory attribute for absolute PIDL: %08lx\n", dwFlags); + + /* free memory */ + IMalloc_Free(ppM, newPIDL); + + hr = IShellFolder_Release(testIShellFolder); + ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr); + + Cleanup(); + + hr = IShellFolder_Release(IDesktopFolder); + ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr); } static void test_SHGetPathFromIDList(void) @@ -822,6 +895,9 @@ static void test_EnumObjects_and_Compare Cleanup(); IMalloc_Free(ppM, newPIDL); + + hr = IShellFolder_Release(IDesktopFolder); + ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr); } /* A simple implementation of an IPropertyBag, which returns fixed values for

1 0