November 2005 - Wine-Commits

wine/dlls/oleaut32 tests/vartype.c variant.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21091 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 07:21:12 Modified files: dlls/oleaut32/tests: vartype.c dlls/oleaut32 : variant.c Log message: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Extend VarCmp() and add test cases. Patch: http://cvs.winehq.org/patch.py?id=21091 Old revision New revision Changes Path 1.34 1.35 +76 -0 wine/dlls/oleaut32/tests/vartype.c 1.126 1.127 +51 -2 wine/dlls/oleaut32/variant.c

1 0

wine/ include/msvcrt/stddef.h include/msvcrt/p ...
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21090 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 07:17:51 Modified files: include/msvcrt : stddef.h process.h dlls/msvcrt/tests: headers.c dlls/msvcrt : thread.c string.c process.c msvcrt.h Log message: Kevin Koltzau <kevin(a)plop.org> Fix warnings and errors in 64bit. Patch: http://cvs.winehq.org/patch.py?id=21090 Old revision New revision Changes Path 1.9 1.10 +30 -0 wine/include/msvcrt/stddef.h 1.12 1.13 +52 -52 wine/include/msvcrt/process.h 1.8 1.9 +2 -0 wine/dlls/msvcrt/tests/headers.c 1.13 1.14 +4 -4 wine/dlls/msvcrt/thread.c 1.12 1.13 +1 -1 wine/dlls/msvcrt/string.c 1.30 1.31 +32 -35 wine/dlls/msvcrt/process.c 1.38 1.39 +10 -2 wine/dlls/msvcrt/msvcrt.h

1 0

wine/dlls/shell32 shfldr_unixfs.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21089 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 07:17:32 Modified files: dlls/shell32 : shfldr_unixfs.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Replaced tabs with spaces. Patch: http://cvs.winehq.org/patch.py?id=21089 Old revision New revision Changes Path 1.58 1.59 +2 -2 wine/dlls/shell32/shfldr_unixfs.c Index: wine/dlls/shell32/shfldr_unixfs.c diff -u -p wine/dlls/shell32/shfldr_unixfs.c:1.58 wine/dlls/shell32/shfldr_unixfs.c:1.59 --- wine/dlls/shell32/shfldr_unixfs.c:1.58 3 Nov 2005 13:17:32 -0000 +++ wine/dlls/shell32/shfldr_unixfs.c 3 Nov 2005 13:17:32 -0000 @@ -688,8 +688,8 @@ static HRESULT WINAPI UnixFolder_IShellF iface, hwndOwner, grfFlags, ppEnumIDList); if (!This->m_pszPath) { - WARN("EnumObjects called on uninitialized UnixFolder-object!\n"); - return E_UNEXPECTED; + WARN("EnumObjects called on uninitialized UnixFolder-object!\n"); + return E_UNEXPECTED; } newIterator = UnixSubFolderIterator_Constructor(This, grfFlags);

1 0

wine/dlls/commdlg printdlg.c cdlg_Uk.rc cdlg_T ...
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21088 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 06:12:19 Modified files: dlls/commdlg : printdlg.c cdlg_Uk.rc cdlg_Th.rc cdlg_Sv.rc cdlg_Sk.rc cdlg_Si.rc cdlg_Ru.rc cdlg_Pt.rc cdlg_Pl.rc cdlg_No.rc cdlg_Nl.rc cdlg_It.rc cdlg_Fr.rc cdlg_Fi.rc cdlg_Es.rc cdlg_En.rc cdlg_De.rc cdlg_Cn.rc cdlg_Bg.rc cdlg.h Log message: Vijay Kiran Kamuju <infyquest(a)gmail.com> Jonathan Ernst <Jonathan(a)ErnstFamily.ch> Display an error if no printer is installed. Patch: http://cvs.winehq.org/patch.py?id=21088 Old revision New revision Changes Path 1.96 1.97 +35 -0 wine/dlls/commdlg/printdlg.c 1.7 1.8 +3 -0 wine/dlls/commdlg/cdlg_Uk.rc 1.6 1.7 +3 -0 wine/dlls/commdlg/cdlg_Th.rc 1.17 1.18 +3 -0 wine/dlls/commdlg/cdlg_Sv.rc 1.15 1.16 +3 -0 wine/dlls/commdlg/cdlg_Sk.rc 1.14 1.15 +3 -0 wine/dlls/commdlg/cdlg_Si.rc 1.22 1.23 +3 -0 wine/dlls/commdlg/cdlg_Ru.rc 1.21 1.22 +3 -0 wine/dlls/commdlg/cdlg_Pt.rc 1.20 1.21 +3 -0 wine/dlls/commdlg/cdlg_Pl.rc 1.10 1.11 +3 -0 wine/dlls/commdlg/cdlg_No.rc 1.14 1.15 +3 -0 wine/dlls/commdlg/cdlg_Nl.rc 1.19 1.20 +3 -0 wine/dlls/commdlg/cdlg_It.rc 1.21 1.22 +3 -0 wine/dlls/commdlg/cdlg_Fr.rc 1.13 1.14 +3 -0 wine/dlls/commdlg/cdlg_Fi.rc 1.18 1.19 +3 -0 wine/dlls/commdlg/cdlg_Es.rc 1.41 1.42 +3 -0 wine/dlls/commdlg/cdlg_En.rc 1.24 1.25 +3 -0 wine/dlls/commdlg/cdlg_De.rc 1.9 1.10 +3 -0 wine/dlls/commdlg/cdlg_Cn.rc 1.1 1.2 +3 -0 wine/dlls/commdlg/cdlg_Bg.rc 1.36 1.37 +1 -0 wine/dlls/commdlg/cdlg.h

1 0

wine/dlls/msvcrt Makefile.in .cvsignore rsrc.rc
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21087 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 06:05:05 Modified files: dlls/msvcrt : Makefile.in .cvsignore Added files: dlls/msvcrt : rsrc.rc Log message: Marcus Meissner <marcus(a)jet.franken.de> Specify a DLL version for msvcrt.dll. Patch: http://cvs.winehq.org/patch.py?id=21087 Old revision New revision Changes Path 1.18 1.19 +3 -0 wine/dlls/msvcrt/Makefile.in 1.6 1.7 +1 -0 wine/dlls/msvcrt/.cvsignore Added 1.1 +0 -0 wine/dlls/msvcrt/rsrc.rc Index: wine/dlls/msvcrt/Makefile.in diff -u -p wine/dlls/msvcrt/Makefile.in:1.18 wine/dlls/msvcrt/Makefile.in:1.19 --- wine/dlls/msvcrt/Makefile.in:1.18 3 Nov 2005 12: 5: 5 -0000 +++ wine/dlls/msvcrt/Makefile.in 3 Nov 2005 12: 5: 5 -0000 @@ -36,6 +36,9 @@ C_SRCS = \ undname.c \ wcs.c +RC_SRCS = \ + rsrc.rc + SUBDIRS = tests @MAKE_DLL_RULES@ Index: wine/dlls/msvcrt/.cvsignore diff -u -p wine/dlls/msvcrt/.cvsignore:1.6 wine/dlls/msvcrt/.cvsignore:1.7 --- wine/dlls/msvcrt/.cvsignore:1.6 3 Nov 2005 12: 5: 5 -0000 +++ wine/dlls/msvcrt/.cvsignore 3 Nov 2005 12: 5: 5 -0000 @@ -1,2 +1,3 @@ Makefile libmsvcrt.def +rsrc.res Index: wine/dlls/msvcrt/rsrc.rc diff -u -p /dev/null wine/dlls/msvcrt/rsrc.rc:1.1 --- /dev/null 3 Nov 2005 12: 5: 5 -0000 +++ wine/dlls/msvcrt/rsrc.rc 3 Nov 2005 12: 5: 5 -0000 @@ -0,0 +1,33 @@ +/* + * Top level resource file for msvcrt.dll + * + * Copyright 2005 Marcus Meissner + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winver.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine CRT library" +#define WINE_FILENAME_STR "msvcrt.dll" +#define WINE_FILEVERSION 7,0,2600,2180 +#define WINE_FILEVERSION_STR "7.0.2600" + +#include "wine/wine_common_ver.rc"

1 0

wine/dlls/msxml3 tests/domdoc.c nodemap.c node ...
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21086 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 06:04:52 Modified files: dlls/msxml3/tests: domdoc.c dlls/msxml3 : nodemap.c nodelist.c Log message: Stefan Huehner <stefan(a)huehner.org> Add indexed access to attributes (nodemap) and childNodes (nodelist), with some testcases. Patch: http://cvs.winehq.org/patch.py?id=21086 Old revision New revision Changes Path 1.4 1.5 +33 -0 wine/dlls/msxml3/tests/domdoc.c 1.6 1.7 +53 -4 wine/dlls/msxml3/nodemap.c 1.3 1.4 +44 -4 wine/dlls/msxml3/nodelist.c Index: wine/dlls/msxml3/tests/domdoc.c diff -u -p wine/dlls/msxml3/tests/domdoc.c:1.4 wine/dlls/msxml3/tests/domdoc.c:1.5 --- wine/dlls/msxml3/tests/domdoc.c:1.4 3 Nov 2005 12: 4:52 -0000 +++ wine/dlls/msxml3/tests/domdoc.c 3 Nov 2005 12: 4:52 -0000 @@ -242,6 +242,7 @@ void test_domnode( void ) VARIANT_BOOL b; BSTR str; VARIANT var; + long count; r = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); @@ -325,6 +326,38 @@ void test_domnode( void ) r = IXMLDOMNamedNodeMap_getNamedItem( map, str, &node ); ok( r == S_OK, "getNamedItem returned wrong code\n"); ok( node != NULL, "should be attributes\n"); + SysFreeString( str ); + + /* test indexed access of attributes */ + r = IXMLDOMNamedNodeMap_get_length( map, &count ); + ok ( r == S_OK, "get_length wrong code\n"); + ok ( count == 1, "get_length != 1\n"); + + node = NULL; + r = IXMLDOMNamedNodeMap_get_item( map, -1, &node); + ok ( r == S_FALSE, "get_item (-1) wrong code\n"); + ok ( node == NULL, "there is no node\n"); + + node = NULL; + r = IXMLDOMNamedNodeMap_get_item( map, 1, &node); + ok ( r == S_FALSE, "get_item (1) wrong code\n"); + ok ( node == NULL, "there is no attribute\n"); + + node = NULL; + r = IXMLDOMNamedNodeMap_get_item( map, 0, &node); + ok ( r == S_OK, "get_item (0) wrong code\n"); + ok ( node != NULL, "should be attribute\n"); + + r = IXMLDOMNode_get_nodeName( node, NULL ); + ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code"); + + /* content doesn't matter here */ + str = SysAllocString( szNonExistentFile ); + r = IXMLDOMNode_get_nodeName( node, &str ); + ok ( r == S_OK, "get_nodeName wrong code\n"); + ok ( str != NULL, "str is null\n"); + ok( !lstrcmpW( str, szdl ), "incorrect node name\n"); + SysFreeString( str ); } else ok( FALSE, "no map\n"); Index: wine/dlls/msxml3/nodemap.c diff -u -p wine/dlls/msxml3/nodemap.c:1.6 wine/dlls/msxml3/nodemap.c:1.7 --- wine/dlls/msxml3/nodemap.c:1.6 3 Nov 2005 12: 4:52 -0000 +++ wine/dlls/msxml3/nodemap.c 3 Nov 2005 12: 4:52 -0000 @@ -196,16 +196,65 @@ static HRESULT WINAPI xmlnodemap_get_ite long index, IXMLDOMNode** listItem) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); + xmlNodePtr node; + xmlAttrPtr curr; + long attrIndex; + + TRACE("%p %ld\n", This, index); + + *listItem = NULL; + + if (index < 0) + return S_FALSE; + + node = xmlNodePtr_from_domnode( This->node, 0 ); + curr = node->properties; + + for (attrIndex = 0; attrIndex < index; attrIndex++) { + if (curr->next == NULL) + return S_FALSE; + else + curr = curr->next; + } + + *listItem = create_node( (xmlNodePtr) curr ); + + return S_OK; } static HRESULT WINAPI xmlnodemap_get_length( IXMLDOMNamedNodeMap *iface, long* listLength) { - FIXME("\n"); - return E_NOTIMPL; + xmlNodePtr node; + xmlAttrPtr first; + xmlAttrPtr curr; + long attrCount; + + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); + + TRACE("%p\n", This); + + node = xmlNodePtr_from_domnode( This->node, 0 ); + if ( !node ) + return E_FAIL; + + first = node->properties; + if (first == NULL) { + *listLength = 0; + return S_OK; + } + + curr = first; + attrCount = 1; + while (curr->next != NULL) { + attrCount++; + curr = curr->next; + } + *listLength = attrCount; + + return S_OK; } static HRESULT WINAPI xmlnodemap_getQualifiedItem( Index: wine/dlls/msxml3/nodelist.c diff -u -p wine/dlls/msxml3/nodelist.c:1.3 wine/dlls/msxml3/nodelist.c:1.4 --- wine/dlls/msxml3/nodelist.c:1.3 3 Nov 2005 12: 4:52 -0000 +++ wine/dlls/msxml3/nodelist.c 3 Nov 2005 12: 4:52 -0000 @@ -251,16 +251,56 @@ static HRESULT WINAPI xmlnodelist_get_it long index, IXMLDOMNode** listItem) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); + xmlNodePtr curr; + long nodeIndex = 0; + + TRACE("%p %ld\n", This, index); + + *listItem = NULL; + + if (index < 0) + return S_FALSE; + + curr = This->node; + + for (nodeIndex = 0; nodeIndex < index; nodeIndex++) { + if (curr->next == NULL) + return S_FALSE; + else + curr = curr->next; + } + + *listItem = create_node( curr ); + + return S_OK; } static HRESULT WINAPI xmlnodelist_get_length( IXMLDOMNodeList* iface, long* listLength) { - FIXME("\n"); - return E_NOTIMPL; + + xmlNodePtr curr; + long nodeCount = 0; + + xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); + + TRACE("%p\n", This); + + if (This->node == NULL) { + *listLength = 0; + return S_OK; + } + + curr = This->node; + nodeCount = 1; + while (curr->next != NULL) { + nodeCount++; + curr = curr->next; + } + *listLength = nodeCount; + return S_OK; } static HRESULT WINAPI xmlnodelist_nextNode(

1 0

wine/dlls/shell32/tests shlfolder.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21085 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 06:04:24 Modified files: dlls/shell32/tests: shlfolder.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Added some more unit tests for FolderShortcut objects. Patch: http://cvs.winehq.org/patch.py?id=21085 Old revision New revision Changes Path 1.40 1.41 +94 -9 wine/dlls/shell32/tests/shlfolder.c Index: wine/dlls/shell32/tests/shlfolder.c diff -u -p wine/dlls/shell32/tests/shlfolder.c:1.40 wine/dlls/shell32/tests/shlfolder.c:1.41 --- wine/dlls/shell32/tests/shlfolder.c:1.40 3 Nov 2005 12: 4:24 -0000 +++ wine/dlls/shell32/tests/shlfolder.c 3 Nov 2005 12: 4:24 -0000 @@ -804,10 +804,15 @@ static HRESULT WINAPI InitPropertyBag_IP 'A','t','t','r','i','b','u','t','e','s',0 }; static const WCHAR wszResolveLinkFlags[] = { 'R','e','s','o','l','v','e','L','i','n','k','F','l','a','g','s',0 }; - - if (!lstrcmpW(pszPropName, wszTargetSpecialFolder) || - !lstrcmpW(pszPropName, wszResolveLinkFlags)) + + if (!lstrcmpW(pszPropName, wszTargetSpecialFolder)) { + ok(V_VT(pVar) == VT_I4, "Wrong variant type for 'TargetSpecialFolder' property!\n"); + return E_INVALIDARG; + } + + if (!lstrcmpW(pszPropName, wszResolveLinkFlags)) { + ok(V_VT(pVar) == VT_UI4, "Wrong variant type for 'ResolveLinkFlags' property!\n"); return E_INVALIDARG; } @@ -859,14 +864,18 @@ struct IPropertyBag InitPropertyBag = { void test_FolderShortcut(void) { IPersistPropertyBag *pPersistPropertyBag; - IShellFolder *pShellFolder; + IShellFolder *pShellFolder, *pDesktopFolder; IPersistFolder3 *pPersistFolder3; HRESULT hr; STRRET strret; - WCHAR wszPath[MAX_PATH], wszBuffer[MAX_PATH]; + WCHAR wszDesktopPath[MAX_PATH], wszBuffer[MAX_PATH]; BOOL result; CLSID clsid; - LPITEMIDLIST pidlCurrentFolder; + LPITEMIDLIST pidlCurrentFolder, pidlWineTestFolder, pidlSubFolder; + WCHAR wszWineTestFolder[] = { + ':',':','{','9','B','3','5','2','E','B','F','-','2','7','6','5','-','4','5','C','1','-', + 'B','4','C','6','-','8','5','C','C','7','F','7','A','B','C','6','4','}',0 }; + WCHAR wszSomeSubFolder[] = { 'S','u','b','F','o','l','d','e','r', 0}; if (!pSHGetSpecialFolderPathW || !pStrRetToBufW) return; @@ -899,12 +908,12 @@ void test_FolderShortcut(void) { return; } - result = pSHGetSpecialFolderPathW(NULL, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE); - ok(result, "SHGetSpecialFolderPathW(CSIDL_MYDOCUMENTS) failed! 0x%08lx\n", GetLastError()); + result = pSHGetSpecialFolderPathW(NULL, wszDesktopPath, CSIDL_DESKTOPDIRECTORY, FALSE); + ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOPDIRECTORY) failed! 0x%08lx\n", GetLastError()); if (!result) return; pStrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); - ok(!lstrcmpiW(wszPath, wszBuffer), "FolderShortcut returned incorrect folder!\n"); + ok(!lstrcmpiW(wszDesktopPath, wszBuffer), "FolderShortcut returned incorrect folder!\n"); hr = IShellFolder_QueryInterface(pShellFolder, &IID_IPersistFolder3, (LPVOID*)&pPersistFolder3); IShellFolder_Release(pShellFolder); @@ -919,6 +928,82 @@ void test_FolderShortcut(void) { ok(SUCCEEDED(hr), "IPersistFolder3_GetCurFolder failed! hr=0x%08lx\n", hr); ok(!pidlCurrentFolder, "IPersistFolder3_GetCurFolder should return a NULL pidl!\n"); + /* For FolderShortcut objects, the Initialize method initialized the folder's position in the + * shell namespace. The target folder, read from the property bag above, remains untouched. + * The following tests show this: The itemidlist for some imaginary shellfolder object + * is created and the FolderShortcut is initialized with it. GetCurFolder now returns this + * itemidlist, but GetDisplayNameOf still returns the path from above. + */ + hr = SHGetDesktopFolder(&pDesktopFolder); + ok (SUCCEEDED(hr), "SHGetDesktopFolder failed! hr = %08lx\n", hr); + if (FAILED(hr)) return; + + hr = IShellFolder_ParseDisplayName(pDesktopFolder, NULL, NULL, wszWineTestFolder, NULL, + &pidlWineTestFolder, NULL); + IShellFolder_Release(pDesktopFolder); + ok (SUCCEEDED(hr), "IShellFolder::ParseDisplayName failed! hr = %08lx\n", hr); + if (FAILED(hr)) return; + + hr = IPersistFolder3_Initialize(pPersistFolder3, pidlWineTestFolder); + todo_wine { ok (SUCCEEDED(hr), "IPersistFolder3::Initialize failed! hr = %08lx\n", hr); } + if (FAILED(hr)) { + IPersistFolder3_Release(pPersistFolder3); + ILFree(pidlWineTestFolder); + return; + } + + hr = IPersistFolder3_GetCurFolder(pPersistFolder3, &pidlCurrentFolder); + ok(SUCCEEDED(hr), "IPersistFolder3_GetCurFolder failed! hr=0x%08lx\n", hr); + ok(ILIsEqual(pidlCurrentFolder, pidlWineTestFolder), + "IPersistFolder3_GetCurFolder should return pidlWineTestFolder!\n"); + ILFree(pidlCurrentFolder); + ILFree(pidlWineTestFolder); + + hr = IPersistFolder3_QueryInterface(pPersistFolder3, &IID_IShellFolder, (LPVOID*)&pShellFolder); + IPersistFolder3_Release(pPersistFolder3); + ok(SUCCEEDED(hr), "IPersistFolder3_QueryInterface(IShellFolder) failed! hr = %08lx\n", hr); + if (FAILED(hr)) return; + + hr = IShellFolder_GetDisplayNameOf(pShellFolder, NULL, SHGDN_FORPARSING, &strret); + ok(SUCCEEDED(hr), "IShellFolder_GetDisplayNameOf(NULL) failed! hr = %08lx\n", hr); + if (FAILED(hr)) { + IShellFolder_Release(pShellFolder); + return; + } + + pStrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); + ok(!lstrcmpiW(wszDesktopPath, wszBuffer), "FolderShortcut returned incorrect folder!\n"); + + /* Next few lines are meant to show that children of FolderShortcuts are not FolderShortcuts, + * but ShellFSFolders. */ + PathAddBackslashW(wszDesktopPath); + lstrcatW(wszDesktopPath, wszSomeSubFolder); + if (!CreateDirectoryW(wszDesktopPath, NULL)) { + IShellFolder_Release(pShellFolder); + return; + } + + hr = IShellFolder_ParseDisplayName(pShellFolder, NULL, NULL, wszSomeSubFolder, NULL, + &pidlSubFolder, NULL); + RemoveDirectoryW(wszSomeSubFolder); + ok (SUCCEEDED(hr), "IShellFolder::ParseDisplayName failed! hr = %08lx\n", hr); + if (FAILED(hr)) { + IShellFolder_Release(pShellFolder); + return; + } + + hr = IShellFolder_BindToObject(pShellFolder, pidlSubFolder, NULL, &IID_IPersistFolder3, + (LPVOID*)&pPersistFolder3); + IShellFolder_Release(pShellFolder); + ILFree(pidlSubFolder); + ok (SUCCEEDED(hr), "IShellFolder::BindToObject failed! hr = %08lx\n", hr); + if (FAILED(hr)) + return; + + hr = IPersistFolder3_GetClassID(pPersistFolder3, &clsid); + ok(SUCCEEDED(hr), "IPersistFolder3_GetClassID failed! hr=0x%08lx\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_ShellFSFolder), "Unexpected CLSID!\n"); + IPersistFolder3_Release(pPersistFolder3); }

1 0

wine/dlls/kernel comm.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21084 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 05:38:48 Modified files: dlls/kernel : comm.c Log message: Fixed fd leaks (spotted by Cihan Altinay). Patch: http://cvs.winehq.org/patch.py?id=21084 Old revision New revision Changes Path 1.97 1.98 +2 -1 wine/dlls/kernel/comm.c Index: wine/dlls/kernel/comm.c diff -u -p wine/dlls/kernel/comm.c:1.97 wine/dlls/kernel/comm.c:1.98 --- wine/dlls/kernel/comm.c:1.97 3 Nov 2005 11:38:48 -0000 +++ wine/dlls/kernel/comm.c 3 Nov 2005 11:38:48 -0000 @@ -2095,7 +2095,6 @@ static BOOL COMM_WaitCommEvent( { TRACE("Event already met\n"); *lpdwEvents = result_mask; - release_comm_fd( commio->handle, fd ); HeapFree(GetProcessHeap(), 0, commio ); res = TRUE; } @@ -2105,10 +2104,12 @@ static BOOL COMM_WaitCommEvent( SetLastError(ERROR_IO_PENDING); res = FALSE; } + release_comm_fd( hFile, fd ); return res; #if !defined(TIOCINQ) || (!(defined(TIOCSERGETLSR) && defined(TIOCSER_TEMT)) || !defined(TIOCINQ)) || !defined(TIOCMGET) || !defined(TIOCM_CTS) ||!defined(TIOCM_DSR) || !defined(TIOCM_RNG) || !defined(TIOCM_CAR) error: FIXME("Returning error because of missing capabilities\n"); + release_comm_fd( hFile, fd ); HeapFree(GetProcessHeap(), 0, commio ); SetLastError(ERROR_INVALID_PARAMETER); return FALSE;

1 0

wine/ include/winver.h dlls/version/ver16.c dl ...
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21083 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 05:35:11 Modified files: include : winver.h dlls/version : ver16.c install.c info.c dlls/msi : msi.c appsearch.c action.c Log message: Ivan Leo Puoti <ivanleo(a)gmail.com> Fix some wrong prototypes. Patch: http://cvs.winehq.org/patch.py?id=21083 Old revision New revision Changes Path 1.18 1.19 +6 -6 wine/include/winver.h 1.9 1.10 +5 -6 wine/dlls/version/ver16.c 1.26 1.27 +9 -9 wine/dlls/version/install.c 1.63 1.64 +2 -2 wine/dlls/version/info.c 1.113 1.114 +1 -1 wine/dlls/msi/msi.c 1.11 1.12 +1 -1 wine/dlls/msi/appsearch.c 1.229 1.230 +1 -2 wine/dlls/msi/action.c Index: wine/include/winver.h diff -u -p wine/include/winver.h:1.18 wine/include/winver.h:1.19 --- wine/include/winver.h:1.18 3 Nov 2005 11:35:11 -0000 +++ wine/include/winver.h 3 Nov 2005 11:35:11 -0000 @@ -150,17 +150,17 @@ typedef struct tagVS_FIXEDFILEINFO { /* function prototypes */ -DWORD WINAPI VerFindFileA(UINT,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT*,LPSTR,UINT*); -DWORD WINAPI VerFindFileW(UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT*,LPWSTR,UINT*); +DWORD WINAPI VerFindFileA(UINT,LPSTR,LPSTR,LPSTR,LPSTR,UINT*,LPSTR,UINT*); +DWORD WINAPI VerFindFileW(UINT,LPWSTR,LPWSTR,LPWSTR,LPWSTR,UINT*,LPWSTR,UINT*); #define VerFindFile WINELIB_NAME_AW(VerFindFile) -DWORD WINAPI VerInstallFileA(UINT,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT*); -DWORD WINAPI VerInstallFileW(UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT*); +DWORD WINAPI VerInstallFileA(UINT,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,UINT*); +DWORD WINAPI VerInstallFileW(UINT,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,UINT*); #define VerInstallFile WINELIB_NAME_AW(VerInstallFile) DWORD WINAPI VerLanguageNameA(UINT,LPSTR,UINT); DWORD WINAPI VerLanguageNameW(UINT,LPWSTR,UINT); #define VerLanguageName WINELIB_NAME_AW(VerLanguageName) -BOOL WINAPI VerQueryValueA(LPVOID,LPCSTR,LPVOID*,UINT*); -BOOL WINAPI VerQueryValueW(LPVOID,LPCWSTR,LPVOID*,UINT*); +BOOL WINAPI VerQueryValueA(LPVOID,LPSTR,LPVOID*,UINT*); +BOOL WINAPI VerQueryValueW(LPVOID,LPWSTR,LPVOID*,UINT*); #define VerQueryValue WINELIB_NAME_AW(VerQueryValue) DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD); DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD); Index: wine/dlls/version/ver16.c diff -u -p wine/dlls/version/ver16.c:1.9 wine/dlls/version/ver16.c:1.10 --- wine/dlls/version/ver16.c:1.9 3 Nov 2005 11:35:11 -0000 +++ wine/dlls/version/ver16.c 3 Nov 2005 11:35:11 -0000 @@ -53,8 +53,8 @@ DWORD WINAPI GetFileVersionInfo16( LPCST /************************************************************************* * VerFindFile [VER.8] */ -DWORD WINAPI VerFindFile16( UINT16 flags, LPCSTR lpszFilename, - LPCSTR lpszWinDir, LPCSTR lpszAppDir, +DWORD WINAPI VerFindFile16( UINT16 flags, LPSTR lpszFilename, + LPSTR lpszWinDir, LPSTR lpszAppDir, LPSTR lpszCurDir, UINT16 *lpuCurDirLen, LPSTR lpszDestDir, UINT16 *lpuDestDirLen ) { @@ -71,8 +71,8 @@ DWORD WINAPI VerFindFile16( UINT16 flags * VerInstallFile [VER.9] */ DWORD WINAPI VerInstallFile16( UINT16 flags, - LPCSTR lpszSrcFilename, LPCSTR lpszDestFilename, - LPCSTR lpszSrcDir, LPCSTR lpszDestDir, LPCSTR lpszCurDir, + LPSTR lpszSrcFilename, LPSTR lpszDestFilename, + LPSTR lpszSrcDir, LPSTR lpszDestDir, LPSTR lpszCurDir, LPSTR lpszTmpFile, UINT16 *lpwTmpFileLen ) { UINT filelen; @@ -95,7 +95,7 @@ DWORD WINAPI VerLanguageName16( UINT16 u /************************************************************************* * VerQueryValue [VER.11] */ -DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPCSTR lpszSubBlock, +DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPSTR lpszSubBlock, SEGPTR *lpspBuffer, UINT16 *lpcb ) { LPVOID lpvBlock = MapSL( spvBlock ); @@ -121,4 +121,3 @@ DWORD WINAPI VerQueryValue16( SEGPTR spv return retv; } - Index: wine/dlls/version/install.c diff -u -p wine/dlls/version/install.c:1.26 wine/dlls/version/install.c:1.27 --- wine/dlls/version/install.c:1.26 3 Nov 2005 11:35:11 -0000 +++ wine/dlls/version/install.c 3 Nov 2005 11:35:11 -0000 @@ -123,9 +123,9 @@ static int testFileExistenceW( const WCH */ DWORD WINAPI VerFindFileA( UINT flags, - LPCSTR lpszFilename, - LPCSTR lpszWinDir, - LPCSTR lpszAppDir, + LPSTR lpszFilename, + LPSTR lpszWinDir, + LPSTR lpszAppDir, LPSTR lpszCurDir, UINT *lpuCurDirLen, LPSTR lpszDestDir, @@ -220,8 +220,8 @@ DWORD WINAPI VerFindFileA( /***************************************************************************** * VerFindFileW [VERSION.@] */ -DWORD WINAPI VerFindFileW( UINT flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir, - LPCWSTR lpszAppDir, LPWSTR lpszCurDir,UINT *lpuCurDirLen, +DWORD WINAPI VerFindFileW( UINT flags,LPWSTR lpszFilename,LPWSTR lpszWinDir, + LPWSTR lpszAppDir, LPWSTR lpszCurDir,UINT *lpuCurDirLen, LPWSTR lpszDestDir,UINT *lpuDestDirLen ) { static const WCHAR emptyW; @@ -361,8 +361,8 @@ _error2vif(DWORD error) { * VerInstallFileA [VERSION.@] */ DWORD WINAPI VerInstallFileA( - UINT flags,LPCSTR srcfilename,LPCSTR destfilename,LPCSTR srcdir, - LPCSTR destdir,LPCSTR curdir,LPSTR tmpfile,UINT *tmpfilelen ) + UINT flags,LPSTR srcfilename,LPSTR destfilename,LPSTR srcdir, + LPSTR destdir,LPSTR curdir,LPSTR tmpfile,UINT *tmpfilelen ) { LPCSTR pdest; char destfn[260],tmpfn[260],srcfn[260]; @@ -528,8 +528,8 @@ DWORD WINAPI VerInstallFileA( * VerInstallFileW [VERSION.@] */ DWORD WINAPI VerInstallFileW( - UINT flags,LPCWSTR srcfilename,LPCWSTR destfilename,LPCWSTR srcdir, - LPCWSTR destdir,LPCWSTR curdir,LPWSTR tmpfile,UINT *tmpfilelen ) + UINT flags,LPWSTR srcfilename,LPWSTR destfilename,LPWSTR srcdir, + LPWSTR destdir,LPWSTR curdir,LPWSTR tmpfile,UINT *tmpfilelen ) { LPSTR wsrcf = NULL, wsrcd = NULL, wdestf = NULL, wdestd = NULL, wtmpf = NULL, wcurd = NULL; DWORD ret; Index: wine/dlls/version/info.c diff -u -p wine/dlls/version/info.c:1.63 wine/dlls/version/info.c:1.64 --- wine/dlls/version/info.c:1.63 3 Nov 2005 11:35:11 -0000 +++ wine/dlls/version/info.c 3 Nov 2005 11:35:11 -0000 @@ -752,7 +752,7 @@ static BOOL WINAPI VersionInfo32_QueryVa /*********************************************************************** * VerQueryValueA [VERSION.@] */ -BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock, +BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { static const char rootA[] = "\\"; @@ -799,7 +799,7 @@ BOOL WINAPI VerQueryValueA( LPVOID pBloc /*********************************************************************** * VerQueryValueW [VERSION.@] */ -BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock, +BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPWSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { static const WCHAR rootW[] = { '\\', 0 }; Index: wine/dlls/msi/msi.c diff -u -p wine/dlls/msi/msi.c:1.113 wine/dlls/msi/msi.c:1.114 --- wine/dlls/msi/msi.c:1.113 3 Nov 2005 11:35:11 -0000 +++ wine/dlls/msi/msi.c 3 Nov 2005 11:35:11 -0000 @@ -1185,7 +1185,7 @@ end: UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, DWORD* pcchVersionBuf, LPWSTR lpLangBuf, DWORD* pcchLangBuf) { - static const WCHAR szVersionResource[] = {'\\',0}; + static WCHAR szVersionResource[] = {'\\',0}; static const WCHAR szVersionFormat[] = { '%','d','.','%','d','.','%','d','.','%','d',0}; static const WCHAR szLangFormat[] = {'%','d',0}; Index: wine/dlls/msi/appsearch.c diff -u -p wine/dlls/msi/appsearch.c:1.11 wine/dlls/msi/appsearch.c:1.12 --- wine/dlls/msi/appsearch.c:1.11 3 Nov 2005 11:35:11 -0000 +++ wine/dlls/msi/appsearch.c 3 Nov 2005 11:35:11 -0000 @@ -549,7 +549,7 @@ static UINT ACTION_FileVersionMatches(MS if (buf) { - static const WCHAR rootW[] = { '\\',0 }; + static WCHAR rootW[] = { '\\',0 }; UINT versionLen; LPVOID subBlock = NULL; Index: wine/dlls/msi/action.c diff -u -p wine/dlls/msi/action.c:1.229 wine/dlls/msi/action.c:1.230 --- wine/dlls/msi/action.c:1.229 3 Nov 2005 11:35:11 -0000 +++ wine/dlls/msi/action.c 3 Nov 2005 11:35:11 -0000 @@ -1881,8 +1881,7 @@ static UINT ACTION_CostFinalize(MSIPACKA DWORD versize; UINT sz; LPVOID version; - static const WCHAR name[] = - {'\\',0}; + static WCHAR name[] = {'\\',0}; static const WCHAR name_fmt[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; WCHAR filever[0x100];

1 0

wine/dlls/dxdiagn provider.c container.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21082 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 05:34:28 Modified files: dlls/dxdiagn : provider.c container.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> Fill provider with some empty containers. Patch: http://cvs.winehq.org/patch.py?id=21082 Old revision New revision Changes Path 1.9 1.10 +151 -12 wine/dlls/dxdiagn/provider.c 1.8 1.9 +44 -10 wine/dlls/dxdiagn/container.c

1 0