November 2005 - Wine-Commits

wine/dlls/wined3d swapchain.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21150 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 04:55:49 Modified files: dlls/wined3d : swapchain.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Fixed an error in Swapchain_GetFrontBufferData. Patch: http://cvs.winehq.org/patch.py?id=21150 Old revision New revision Changes Path 1.9 1.10 +1 -0 wine/dlls/wined3d/swapchain.c Index: wine/dlls/wined3d/swapchain.c diff -u -p wine/dlls/wined3d/swapchain.c:1.9 wine/dlls/wined3d/swapchain.c:1.10 --- wine/dlls/wined3d/swapchain.c:1.9 8 Nov 2005 10:55:49 -0000 +++ wine/dlls/wined3d/swapchain.c 8 Nov 2005 10:55:49 -0000 @@ -332,6 +332,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Get TRACE("(%p) : iface(%p) pDestSurface(%p) \n", This, iface, pDestSurface); ENTER_GL(); + memset(&desc, 0, sizeof(desc)); desc.Width = &width; desc.Height = &height; desc.Format = &d3dformat;

1 0

wine/programs/winemenubuilder winemenubuilder.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21149 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 04:55:26 Modified files: programs/winemenubuilder: winemenubuilder.c Log message: Mike McCormack <mike(a)codeweavers.com> Extract the executable name for msi advertised shortcuts. Patch: http://cvs.winehq.org/patch.py?id=21149 Old revision New revision Changes Path 1.35 1.36 +29 -2 wine/programs/winemenubuilder/winemenubuilder.c Index: wine/programs/winemenubuilder/winemenubuilder.c diff -u -p wine/programs/winemenubuilder/winemenubuilder.c:1.35 wine/programs/winemenubuilder/winemenubuilder.c:1.36 --- wine/programs/winemenubuilder/winemenubuilder.c:1.35 8 Nov 2005 10:55:26 -0000 +++ wine/programs/winemenubuilder/winemenubuilder.c 8 Nov 2005 10:55:26 -0000 @@ -52,6 +52,7 @@ #include <shlobj.h> #include <objidl.h> #include <shlguid.h> +#include <appmgmt.h> #include "wine/unicode.h" #include "wine/debug.h" @@ -726,6 +727,33 @@ static BOOL GetLinkLocation( LPCWSTR lin return FALSE; } +/* gets the target path directly or through MSI */ +static HRESULT get_path( IShellLinkW *sl, LPWSTR szPath, DWORD sz ) +{ + IShellLinkDataList *dl = NULL; + EXP_DARWIN_LINK *dar = NULL; + HRESULT hr; + + szPath[0] = 0; + hr = IShellLinkW_GetPath( sl, szPath, MAX_PATH, NULL, SLGP_RAWPATH ); + if (hr == S_OK && szPath[0]) + return hr; + + hr = IShellLinkW_QueryInterface( sl, &IID_IShellLinkDataList, (LPVOID*) &dl ); + if (FAILED(hr)) + return hr; + + hr = IShellLinkDataList_CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar ); + if (SUCCEEDED(hr)) + { + CommandLineFromMsiDescriptor( dar->szwDarwinID, szPath, &sz ); + LocalFree( dar ); + } + + IShellLinkDataList_Release( dl ); + return hr; +} + static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bAgain ) { char *link_name = NULL, *icon_name = NULL, *work_dir = NULL; @@ -760,8 +788,7 @@ static BOOL InvokeShellLinker( IShellLin IShellLinkW_GetDescription( sl, szDescription, INFOTIPSIZE ); WINE_TRACE("description: %s\n", wine_dbgstr_w(szDescription)); - szPath[0] = 0; - IShellLinkW_GetPath( sl, szPath, MAX_PATH, NULL, SLGP_RAWPATH ); + get_path( sl, szPath, MAX_PATH ); WINE_TRACE("path : %s\n", wine_dbgstr_w(szPath)); szArgs[0] = 0;

1 0

wine/dlls/shell32 shelllink.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21148 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 04:55:15 Modified files: dlls/shell32 : shelllink.c Log message: Mike McCormack <mike(a)codeweavers.com> Fix a problem spotted by Dmitry and another one stopping correctly formatted lnk files from being generated. Patch: http://cvs.winehq.org/patch.py?id=21148 Old revision New revision Changes Path 1.112 1.113 +2 -2 wine/dlls/shell32/shelllink.c Index: wine/dlls/shell32/shelllink.c diff -u -p wine/dlls/shell32/shelllink.c:1.112 wine/dlls/shell32/shelllink.c:1.113 --- wine/dlls/shell32/shelllink.c:1.112 8 Nov 2005 10:55:15 -0000 +++ wine/dlls/shell32/shelllink.c 8 Nov 2005 10:55:15 -0000 @@ -1019,7 +1019,7 @@ static EXP_DARWIN_LINK* shelllink_build_ EXP_DARWIN_LINK *buffer; buffer = LocalAlloc( LMEM_ZEROINIT, sizeof *buffer ); - buffer->dbh.cbSize = sizeof buffer; + buffer->dbh.cbSize = sizeof *buffer; buffer->dbh.dwSignature = magic; lstrcpynW( buffer->szwDarwinID, string, MAX_PATH ); WideCharToMultiByte(CP_ACP, 0, string, -1, buffer->szDarwinID, MAX_PATH, NULL, NULL ); @@ -1036,7 +1036,7 @@ static HRESULT Stream_WriteAdvertiseInfo buffer = shelllink_build_darwinid( string, magic ); - return IStream_Write( stm, &buffer, buffer->dbh.cbSize, &count ); + return IStream_Write( stm, buffer, buffer->dbh.cbSize, &count ); } /************************************************************************

1 0

wine/dlls/shlwapi shlwapi.spec reg.c
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21147 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 14:14:27 Modified files: dlls/shlwapi : shlwapi.spec reg.c Log message: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Semi-stub implementation for SHRegGetValue(A|W). Patch: http://cvs.winehq.org/patch.py?id=21147 Old revision New revision Changes Path 1.111 1.112 +2 -0 wine/dlls/shlwapi/shlwapi.spec 1.63 1.64 +62 -0 wine/dlls/shlwapi/reg.c Index: wine/dlls/shlwapi/shlwapi.spec diff -u -p wine/dlls/shlwapi/shlwapi.spec:1.111 wine/dlls/shlwapi/shlwapi.spec:1.112 --- wine/dlls/shlwapi/shlwapi.spec:1.111 7 Nov 2005 20:14:27 -0000 +++ wine/dlls/shlwapi/shlwapi.spec 7 Nov 2005 20:14:27 -0000 @@ -726,6 +726,8 @@ @ stdcall SHRegGetPathW(long wstr wstr ptr long) @ stdcall SHRegGetUSValueA ( str str ptr ptr ptr long ptr long ) @ stdcall SHRegGetUSValueW ( wstr wstr ptr ptr ptr long ptr long ) +@ stdcall SHRegGetValueA ( long str str long ptr ptr ptr ) +@ stdcall SHRegGetValueW ( long wstr wstr long ptr ptr ptr ) @ stdcall SHRegOpenUSKeyA ( str long long long long ) @ stdcall SHRegOpenUSKeyW ( wstr long long long long ) @ stdcall SHRegQueryInfoUSKeyA ( long ptr ptr ptr ptr long ) Index: wine/dlls/shlwapi/reg.c diff -u -p wine/dlls/shlwapi/reg.c:1.63 wine/dlls/shlwapi/reg.c:1.64 --- wine/dlls/shlwapi/reg.c:1.63 7 Nov 2005 20:14:27 -0000 +++ wine/dlls/shlwapi/reg.c 7 Nov 2005 20:14:27 -0000 @@ -1140,6 +1140,68 @@ DWORD WINAPI SHGetValueA(HKEY hKey, LPCS } /************************************************************************* + * SHRegGetValueA [SHLWAPI.@] + * + * Get a value from the registry. + * + * PARAMS + * hKey [I] Handle to registry key + * lpszSubKey [I] Name of sub key containing value to get + * lpszValue [I] Name of value to get + * srrf [I] Flags for restricting returned data + * pwType [O] Pointer to the values type + * pvData [O] Pointer to the values data + * pcbData [O] Pointer to the values size + * + * RETURNS + * Success: ERROR_SUCCESS. Output parameters contain the details read. + * Failure: An error code from RegOpenKeyExA() or SHQueryValueExA(). + */ +DWORD WINAPI SHRegGetValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, DWORD srrfFlags, + LPDWORD pwType, LPVOID pvData, LPDWORD pcbData) +{ + DWORD dwRet = 0; + HKEY hSubKey = 0; + + TRACE("(hkey=%p,%s,%s,%p,%p,%p)\n", hKey, debugstr_a(lpszSubKey), + debugstr_a(lpszValue), pwType, pvData, pcbData); + FIXME("Semi-Stub: Find meaning and implement handling of SRFF Flags 0x%08lx\n", srrfFlags); + + dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_QUERY_VALUE, &hSubKey); + if (! dwRet) + { + /* SHQueryValueEx expands Environment strings */ + dwRet = SHQueryValueExA(hSubKey, lpszValue, 0, pwType, pvData, pcbData); + RegCloseKey(hSubKey); + } + return dwRet; +} + +/************************************************************************* + * SHReg GetRegValueW [SHLWAPI.@] + * + * See SHGetValueA. + */ +DWORD WINAPI SHRegGetValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, DWORD srrfFlags, + LPDWORD pwType, LPVOID pvData, LPDWORD pcbData) +{ + DWORD dwRet = 0; + HKEY hSubKey = 0; + + TRACE("(hkey=%p,%s,%s,0x%08lx, %p,%p,%p)\n", hKey, debugstr_w(lpszSubKey), + debugstr_w(lpszValue), srrfFlags,pwType, pvData, pcbData); + FIXME("Semi-Stub: Find meaning and implement handling of SRFF Flags 0x%08lx\n", srrfFlags); + + dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_QUERY_VALUE, &hSubKey); + if (! dwRet) + { + dwRet = SHQueryValueExW(hSubKey, lpszValue, 0, pwType, pvData, pcbData); + RegCloseKey(hSubKey); + } + return dwRet; +} + +/************************************************************************* * SHGetValueW [SHLWAPI.@] * * See SHGetValueA.

1 0

wine/include winerror.h
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21146 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 14:12:55 Modified files: include : winerror.h Log message: James Hawkins <truiken(a)gmail.com> Define the setupapi hresult errors. Patch: http://cvs.winehq.org/patch.py?id=21146 Old revision New revision Changes Path 1.57 1.58 +67 -0 wine/include/winerror.h Index: wine/include/winerror.h diff -u -p wine/include/winerror.h:1.57 wine/include/winerror.h:1.58 --- wine/include/winerror.h:1.57 7 Nov 2005 20:12:55 -0000 +++ wine/include/winerror.h 7 Nov 2005 20:12:55 -0000 @@ -2197,6 +2197,73 @@ #define TRUST_E_SUBJECT_FORM_UNKNOWN _HRESULT_TYPEDEF_(0x800B0003L) #define TRUST_E_SUBJECT_NOT_TRUSTED _HRESULT_TYPEDEF_(0x800B0004L) +#define SPAPI_E_EXPECTED_SECTION_NAME _HRESULT_TYPEDEF_(0x800F0000L) +#define SPAPI_E_BAD_SECTION_NAME_LINE _HRESULT_TYPEDEF_(0x800F0001L) +#define SPAPI_E_SECTION_NAME_TOO_LONG _HRESULT_TYPEDEF_(0x800F0002L) +#define SPAPI_E_GENERAL_SYNTAX _HRESULT_TYPEDEF_(0x800F0003L) +#define SPAPI_E_WRONG_INF_STYLE _HRESULT_TYPEDEF_(0x800F0100L) +#define SPAPI_E_SECTION_NOT_FOUND _HRESULT_TYPEDEF_(0x800F0101L) +#define SPAPI_E_LINE_NOT_FOUND _HRESULT_TYPEDEF_(0x800F0102L) +#define SPAPI_E_NO_BACKUP _HRESULT_TYPEDEF_(0x800F0103L) +#define SPAPI_E_NO_ASSOCIATED_CLASS _HRESULT_TYPEDEF_(0x800F0200L) +#define SPAPI_E_CLASS_MISMATCH _HRESULT_TYPEDEF_(0x800F0201L) +#define SPAPI_E_DUPLICATE_FOUND _HRESULT_TYPEDEF_(0x800F0202L) +#define SPAPI_E_NO_DRIVER_SELECTED _HRESULT_TYPEDEF_(0x800F0203L) +#define SPAPI_E_KEY_DOES_NOT_EXIST _HRESULT_TYPEDEF_(0x800F0204L) +#define SPAPI_E_INVALID_DEVINST_NAME _HRESULT_TYPEDEF_(0x800F0205L) +#define SPAPI_E_INVALID_CLASS _HRESULT_TYPEDEF_(0x800F0206L) +#define SPAPI_E_DEVINST_ALREADY_EXISTS _HRESULT_TYPEDEF_(0x800F0207L) +#define SPAPI_E_DEVINFO_NOT_REGISTERED _HRESULT_TYPEDEF_(0x800F0208L) +#define SPAPI_E_INVALID_REG_PROPERTY _HRESULT_TYPEDEF_(0x800F0209L) +#define SPAPI_E_NO_INF _HRESULT_TYPEDEF_(0x800F020AL) +#define SPAPI_E_NO_SUCH_DEVINST _HRESULT_TYPEDEF_(0x800F020BL) +#define SPAPI_E_CANT_LOAD_CLASS_ICON _HRESULT_TYPEDEF_(0x800F020CL) +#define SPAPI_E_INVALID_CLASS_INSTALLER _HRESULT_TYPEDEF_(0x800F020DL) +#define SPAPI_E_DI_DO_DEFAULT _HRESULT_TYPEDEF_(0x800F020EL) +#define SPAPI_E_DI_NOFILECOPY _HRESULT_TYPEDEF_(0x800F020FL) +#define SPAPI_E_INVALID_HWPROFILE _HRESULT_TYPEDEF_(0x800F0210L) +#define SPAPI_E_NO_DEVICE_SELECTED _HRESULT_TYPEDEF_(0x800F0211L) +#define SPAPI_E_DEVINFO_LIST_LOCKED _HRESULT_TYPEDEF_(0x800F0212L) +#define SPAPI_E_DEVINFO_DATA_LOCKED _HRESULT_TYPEDEF_(0x800F0213L) +#define SPAPI_E_DI_BAD_PATH _HRESULT_TYPEDEF_(0x800F0214L) +#define SPAPI_E_NO_CLASSINSTALL_PARAMS _HRESULT_TYPEDEF_(0x800F0215L) +#define SPAPI_E_FILEQUEUE_LOCKED _HRESULT_TYPEDEF_(0x800F0216L) +#define SPAPI_E_BAD_SERVICE_INSTALLSECT _HRESULT_TYPEDEF_(0x800F0217L) +#define SPAPI_E_NO_CLASS_DRIVER_LIST _HRESULT_TYPEDEF_(0x800F0218L) +#define SPAPI_E_NO_ASSOCIATED_SERVICE _HRESULT_TYPEDEF_(0x800F0219L) +#define SPAPI_E_NO_DEFAULT_DEVICE_INTERFACE _HRESULT_TYPEDEF_(0x800F021AL) +#define SPAPI_E_DEVICE_INTERFACE_ACTIVE _HRESULT_TYPEDEF_(0x800F021BL) +#define SPAPI_E_DEVICE_INTERFACE_REMOVED _HRESULT_TYPEDEF_(0x800F021CL) +#define SPAPI_E_BAD_INTERFACE_INSTALLSECT _HRESULT_TYPEDEF_(0x800F021DL) +#define SPAPI_E_NO_SUCH_INTERFACE_CLASS _HRESULT_TYPEDEF_(0x800F021EL) +#define SPAPI_E_INVALID_REFERENCE_STRING _HRESULT_TYPEDEF_(0x800F021FL) +#define SPAPI_E_INVALID_MACHINENAME _HRESULT_TYPEDEF_(0x800F0220L) +#define SPAPI_E_REMOTE_COMM_FAILURE _HRESULT_TYPEDEF_(0x800F0221L) +#define SPAPI_E_MACHINE_UNAVAILABLE _HRESULT_TYPEDEF_(0x800F0222L) +#define SPAPI_E_NO_CONFIGMGR_SERVICES _HRESULT_TYPEDEF_(0x800F0223L) +#define SPAPI_E_INVALID_PROPPAGE_PROVIDER _HRESULT_TYPEDEF_(0x800F0224L) +#define SPAPI_E_NO_SUCH_DEVICE_INTERFACE _HRESULT_TYPEDEF_(0x800F0225L) +#define SPAPI_E_DI_POSTPROCESSING_REQUIRED _HRESULT_TYPEDEF_(0x800F0226L) +#define SPAPI_E_INVALID_COINSTALLER _HRESULT_TYPEDEF_(0x800F0227L) +#define SPAPI_E_NO_COMPAT_DRIVERS _HRESULT_TYPEDEF_(0x800F0228L) +#define SPAPI_E_NO_DEVICE_ICON _HRESULT_TYPEDEF_(0x800F0229L) +#define SPAPI_E_INVALID_INF_LOGCONFIG _HRESULT_TYPEDEF_(0x800F022AL) +#define SPAPI_E_DI_DONT_INSTALL _HRESULT_TYPEDEF_(0x800F022BL) +#define SPAPI_E_INVALID_FILTER_DRIVER _HRESULT_TYPEDEF_(0x800F022CL) +#define SPAPI_E_NON_WINDOWS_NT_DRIVER _HRESULT_TYPEDEF_(0x800F022DL) +#define SPAPI_E_NON_WINDOWS_DRIVER _HRESULT_TYPEDEF_(0x800F022EL) +#define SPAPI_E_NO_CATALOG_FOR_OEM_INF _HRESULT_TYPEDEF_(0x800F022FL) +#define SPAPI_E_DEVINSTALL_QUEUE_NONNATIVE _HRESULT_TYPEDEF_(0x800F0230L) +#define SPAPI_E_NOT_DISABLEABLE _HRESULT_TYPEDEF_(0x800F0231L) +#define SPAPI_E_CANT_REMOVE_DEVINST _HRESULT_TYPEDEF_(0x800F0232L) +#define SPAPI_E_INVALID_TARGET _HRESULT_TYPEDEF_(0x800F0233L) +#define SPAPI_E_DRIVER_NONNATIVE _HRESULT_TYPEDEF_(0x800F0234L) +#define SPAPI_E_IN_WOW64 _HRESULT_TYPEDEF_(0x800F0235L) +#define SPAPI_E_SET_SYSTEM_RESTORE_POINT _HRESULT_TYPEDEF_(0x800F0236L) +#define SPAPI_E_INCORRECTLY_COPIED_INF _HRESULT_TYPEDEF_(0x800F0237L) +#define SPAPI_E_SCE_DISABLED _HRESULT_TYPEDEF_(0x800F0238L) +#define SPAPI_E_ERROR_NOT_INSTALLED _HRESULT_TYPEDEF_(0x800F1000L) + /* Smart card management error codes */ #define SCARD_E_NO_SMARTCARD _HRESULT_TYPEDEF_(0x8010000CL) #define SCARD_E_NO_SUCH_CERTIFICATE _HRESULT_TYPEDEF_(0x8010002CL)

1 0

wine/include wininet.h
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21145 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 14:12:13 Modified files: include : wininet.h Log message: Peter Lemenkov <petro(a)mail.ru> Added some missing definitions in wininet.h. Patch: http://cvs.winehq.org/patch.py?id=21145 Old revision New revision Changes Path 1.28 1.29 +3 -0 wine/include/wininet.h Index: wine/include/wininet.h diff -u -p wine/include/wininet.h:1.28 wine/include/wininet.h:1.29 --- wine/include/wininet.h:1.28 7 Nov 2005 20:12:13 -0000 +++ wine/include/wininet.h 7 Nov 2005 20:12:13 -0000 @@ -1328,6 +1328,9 @@ INTERNETAPI DWORD WINAPI InternetConfirm #define ERROR_INTERNET_RETRY_DIALOG (INTERNET_ERROR_BASE + 50) #define ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR (INTERNET_ERROR_BASE + 52) #define ERROR_INTERNET_INSERT_CDROM (INTERNET_ERROR_BASE + 53) +#define ERROR_INTERNET_SEC_CERT_ERRORS (INTERNET_ERROR_BASE + 55) +#define ERROR_INTERNET_SEC_CERT_NO_REV (INTERNET_ERROR_BASE + 56) +#define ERROR_INTERNET_SEC_CERT_REV_FAILED (INTERNET_ERROR_BASE + 57) #define ERROR_FTP_TRANSFER_IN_PROGRESS (INTERNET_ERROR_BASE + 110) #define ERROR_FTP_DROPPED (INTERNET_ERROR_BASE + 111) #define ERROR_FTP_NO_PASSIVE_MODE (INTERNET_ERROR_BASE + 112)

1 0

wine/include xmldomdid.h xmldom.idl
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21144 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 14:11:43 Modified files: include : xmldomdid.h xmldom.idl Log message: Huw Davies <huw(a)codeweavers.com> Add IXMLDOMParseError. Patch: http://cvs.winehq.org/patch.py?id=21144 Old revision New revision Changes Path 1.2 1.3 +12 -0 wine/include/xmldomdid.h 1.4 1.5 +35 -0 wine/include/xmldom.idl Index: wine/include/xmldomdid.h diff -u -p wine/include/xmldomdid.h:1.2 wine/include/xmldomdid.h:1.3 --- wine/include/xmldomdid.h:1.2 7 Nov 2005 20:11:43 -0000 +++ wine/include/xmldomdid.h 7 Nov 2005 20:11:43 -0000 @@ -171,4 +171,16 @@ #define DISPID_DOM_DOCUMENTTYPE_NOTATIONS 131 #define DISPID_DOM_DOCUMENTTYPE__TOP 132 + +#define DISPID_DOM_ERROR 0x000000b0 +#define DISPID_DOM_ERROR_ERRORCODE 0x000000b1 +#define DISPID_DOM_ERROR_URL 0x000000b2 +#define DISPID_DOM_ERROR_REASON 0x000000b3 +#define DISPID_DOM_ERROR_SRCTEXT 0x000000b4 +#define DISPID_DOM_ERROR_LINE 0x000000b5 +#define DISPID_DOM_ERROR_LINEPOS 0x000000b6 +#define DISPID_DOM_ERROR_FILEPOS 0x000000b7 +#define DISPID_DOM_ERROR__TOP 0x000000b8 + + #endif /* __XMLDOMDID_H__ */ Index: wine/include/xmldom.idl diff -u -p wine/include/xmldom.idl:1.4 wine/include/xmldom.idl:1.5 --- wine/include/xmldom.idl:1.4 7 Nov 2005 20:11:43 -0000 +++ wine/include/xmldom.idl 7 Nov 2005 20:11:43 -0000 @@ -613,6 +613,41 @@ interface IXMLDOMDocumentType : IXMLDOMN HRESULT notations( [out,retval] IXMLDOMNamedNodeMap **notationMap ); }; +[ +local, +object, +odl, +dual, +oleautomation, +/*nonextensible,*/ +helpstring("structure for reporting parse errors"), +pointer_default(unique), +uuid (3efaa426-272f-11d2-836f-0000f87a7782) +] +interface IXMLDOMParseError : IDispatch +{ + [propget, id(DISPID_VALUE)] + HRESULT errorCode([retval, out] long *errCode); + + [propget, id(DISPID_DOM_ERROR_URL)] + HRESULT url([retval, out] BSTR *p); + + [propget, id(DISPID_DOM_ERROR_REASON)] + HRESULT reason([retval, out] BSTR *p); + + [propget, id(DISPID_DOM_ERROR_SRCTEXT)] + HRESULT srcText([retval, out] BSTR *p); + + [propget, id(DISPID_DOM_ERROR_LINE)] + HRESULT line([retval, out] long *lineNo); + + [propget, id(DISPID_DOM_ERROR_LINEPOS)] + HRESULT linepos([retval, out] long * linePos); + + [propget, id(DISPID_DOM_ERROR_FILEPOS)] + HRESULT filepos([retval, out] long * filePos); +}; + [ uuid(2933bf90-7b36-11d2-b20e-00c04f983e60)

1 0

wine/dlls/shell32 brsfolder.c
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21143 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 14:11:27 Modified files: dlls/shell32 : brsfolder.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> More robust code for querying ShellFolder attributes (some ShellFolders ignore the flag mask in GetAttributesOf). Patch: http://cvs.winehq.org/patch.py?id=21143 Old revision New revision Changes Path 1.64 1.65 +5 -2 wine/dlls/shell32/brsfolder.c Index: wine/dlls/shell32/brsfolder.c diff -u -p wine/dlls/shell32/brsfolder.c:1.64 wine/dlls/shell32/brsfolder.c:1.65 --- wine/dlls/shell32/brsfolder.c:1.64 7 Nov 2005 20:11:27 -0000 +++ wine/dlls/shell32/brsfolder.c 7 Nov 2005 20:11:27 -0000 @@ -388,7 +388,7 @@ static void BrsFolder_CheckValidSelectio dwAttributes = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM; r = IShellFolder_GetAttributesOf(lptvid->lpsfParent, 1, (LPCITEMIDLIST*)&lptvid->lpi, &dwAttributes); - if (FAILED(r) || !dwAttributes) + if (FAILED(r) || !(dwAttributes & (SFGAO_FILESYSANCESTOR|SFGAO_FILESYSTEM))) bEnabled = FALSE; } if (lpBrowseInfo->ulFlags & BIF_RETURNONLYFSDIRS) @@ -396,8 +396,11 @@ static void BrsFolder_CheckValidSelectio dwAttributes = SFGAO_FOLDER | SFGAO_FILESYSTEM; r = IShellFolder_GetAttributesOf(lptvid->lpsfParent, 1, (LPCITEMIDLIST*)&lptvid->lpi, &dwAttributes); - if (FAILED(r) || (dwAttributes != (SFGAO_FOLDER | SFGAO_FILESYSTEM))) + if (FAILED(r) || + ((dwAttributes & (SFGAO_FOLDER|SFGAO_FILESYSTEM)) != (SFGAO_FOLDER|SFGAO_FILESYSTEM))) + { bEnabled = FALSE; + } } SendMessageW(info->hWnd, BFFM_ENABLEOK, 0, (LPARAM)bEnabled); }

1 0

wine/dlls/setupapi tests/Makefile.in tests/.cv ...
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21142 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 10:41:37 Modified files: dlls/setupapi/tests: Makefile.in .cvsignore dlls/setupapi : parser.c Added files: dlls/setupapi/tests: parser.c Log message: Added a bunch of tests for the INF parser. Patch: http://cvs.winehq.org/patch.py?id=21142 Old revision New revision Changes Path 1.1 1.2 +1 -0 wine/dlls/setupapi/tests/Makefile.in 1.1 1.2 +1 -0 wine/dlls/setupapi/tests/.cvsignore Added 1.1 +0 -0 wine/dlls/setupapi/tests/parser.c 1.20 1.21 +2 -1 wine/dlls/setupapi/parser.c

1 0

wine/dlls/gdi tests/metafile.c enhmfdrv/graphi ...
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21141 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 10:40:20 Modified files: dlls/gdi/tests : metafile.c dlls/gdi/enhmfdrv: graphics.c dlls/gdi : path.c gdi_private.h font.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> First draft of ExtTextOut on an open path. Patch: http://cvs.winehq.org/patch.py?id=21141 Old revision New revision Changes Path 1.19 1.20 +265 -5 wine/dlls/gdi/tests/metafile.c 1.17 1.18 +2 -1 wine/dlls/gdi/enhmfdrv/graphics.c 1.10 1.11 +204 -0 wine/dlls/gdi/path.c 1.28 1.29 +2 -0 wine/dlls/gdi/gdi_private.h 1.23 1.24 +22 -13 wine/dlls/gdi/font.c

1 0