November 2005 - Wine-Commits

wine/ include/urlmon.idl dlls/urlmon/urlmon.sp ...
by Alexandre Julliard Nov. 10, 2005

Nov. 10, 2005

ChangeSet ID: 21200 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:04:21 Modified files: include : urlmon.idl dlls/urlmon : urlmon.spec umon.c Log message: Jacek Caban <jack(a)itma.pwr.wroc.pl> Added URLDownloadToCacheFile[AW] stub. Patch: http://cvs.winehq.org/patch.py?id=21200 Old revision New revision Changes Path 1.24 1.25 +4 -2 wine/include/urlmon.idl 1.39 1.40 +2 -2 wine/dlls/urlmon/urlmon.spec 1.65 1.66 +45 -0 wine/dlls/urlmon/umon.c Index: wine/include/urlmon.idl diff -u -p wine/include/urlmon.idl:1.24 wine/include/urlmon.idl:1.25 --- wine/include/urlmon.idl:1.24 10 Nov 2005 11: 4:21 -0000 +++ wine/include/urlmon.idl 10 Nov 2005 11: 4:21 -0000 @@ -1166,8 +1166,10 @@ cpp_quote("HRESULT WINAPI CoGetClassObje cpp_quote("HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPCWSTR szURL, IMoniker **ppmk);") cpp_quote("HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pbsc, IBindStatusCallback **ppbsc, DWORD dwReserved);") cpp_quote("HRESULT WINAPI CompareSecurityIds(BYTE*,DWORD,BYTE*,DWORD,DWORD);") -cpp_quote("HRESULT WINAPI URLDownloadToFileA(LPUNKNOWN pCaller, LPCSTR szURL, LPCSTR szFileName, DWORD dwReserved, LPBINDSTATUSCALLBACK lpfnCB);") -cpp_quote("HRESULT WINAPI URLDownloadToFileW(LPUNKNOWN pCaller, LPCWSTR szURL, LPCWSTR szFileName, DWORD dwReserved, LPBINDSTATUSCALLBACK lpfnCB);") +cpp_quote("HRESULT WINAPI URLDownloadToFileA(LPUNKNOWN,LPCSTR,LPCSTR,DWORD,LPBINDSTATUSCALLBACK);") +cpp_quote("HRESULT WINAPI URLDownloadToFileW(LPUNKNOWN,LPCWSTR,LPCWSTR,DWORD,LPBINDSTATUSCALLBACK);") +cpp_quote("HRESULT WINAPI URLDownloadToCacheFileA(LPUNKNOWN,LPCSTR,LPSTR,DWORD,DWORD,LPBINDSTATUSCALLBACK);") +cpp_quote("HRESULT WINAPI URLDownloadToCacheFileW(LPUNKNOWN,LPCWSTR,LPWSTR,DWORD,DWORD,LPBINDSTATUSCALLBACK);") cpp_quote("HRESULT WINAPI CoInternetGetSession(DWORD,IInternetSession**,DWORD);") cpp_quote("HRESULT WINAPI MkParseDisplayNameEx(IBindCtx*,LPCWSTR,ULONG*,IMoniker**);") cpp_quote("HRESULT WINAPI IsAsyncMoniker(IMoniker* pmk);") Index: wine/dlls/urlmon/urlmon.spec diff -u -p wine/dlls/urlmon/urlmon.spec:1.39 wine/dlls/urlmon/urlmon.spec:1.40 --- wine/dlls/urlmon/urlmon.spec:1.39 10 Nov 2005 11: 4:21 -0000 +++ wine/dlls/urlmon/urlmon.spec 10 Nov 2005 11: 4:21 -0000 @@ -64,8 +64,8 @@ @ stdcall RevokeFormatEnumerator(ptr ptr) @ stub SetSoftwareUpdateAdvertisementState @ stub URLDownloadA -@ stub URLDownloadToCacheFileA -@ stub URLDownloadToCacheFileW +@ stdcall URLDownloadToCacheFileA(ptr str str long ptr) +@ stdcall URLDownloadToCacheFileW(ptr wstr wstr long ptr) @ stdcall URLDownloadToFileA(ptr str str long ptr) @ stdcall URLDownloadToFileW(ptr wstr wstr long ptr) @ stub URLDownloadW Index: wine/dlls/urlmon/umon.c diff -u -p wine/dlls/urlmon/umon.c:1.65 wine/dlls/urlmon/umon.c:1.66 --- wine/dlls/urlmon/umon.c:1.65 10 Nov 2005 11: 4:21 -0000 +++ wine/dlls/urlmon/umon.c 10 Nov 2005 11: 4:21 -0000 @@ -1609,6 +1609,51 @@ HRESULT WINAPI URLDownloadToFileW(LPUNKN } /*********************************************************************** + * URLDownloadToCacheFileA (URLMON.@) + */ +HRESULT WINAPI URLDownloadToCacheFileA(LPUNKNOWN lpUnkCaller, LPCSTR szURL, LPSTR szFileName, + DWORD dwBufLength, DWORD dwReserved, LPBINDSTATUSCALLBACK pBSC) +{ + LPWSTR url = NULL, file_name = NULL; + int len; + HRESULT hres; + + TRACE("(%p %s %p %ld %ld %p)\n", lpUnkCaller, debugstr_a(szURL), szFileName, + dwBufLength, dwReserved, pBSC); + + if(szURL) { + len = MultiByteToWideChar(CP_ACP, 0, szURL, -1, NULL, 0); + url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, szURL, -1, url, -1); + } + + if(szFileName) + file_name = HeapAlloc(GetProcessHeap(), 0, dwBufLength*sizeof(WCHAR)); + + hres = URLDownloadToCacheFileW(lpUnkCaller, url, file_name, dwBufLength*sizeof(WCHAR), + dwReserved, pBSC); + + if(SUCCEEDED(hres) && file_name) + WideCharToMultiByte(CP_ACP, 0, file_name, -1, szFileName, dwBufLength, NULL, NULL); + + HeapFree(GetProcessHeap(), 0, url); + HeapFree(GetProcessHeap(), 0, file_name); + + return hres; +} + +/*********************************************************************** + * URLDownloadToCacheFileW (URLMON.@) + */ +HRESULT WINAPI URLDownloadToCacheFileW(LPUNKNOWN lpUnkCaller, LPCWSTR szURL, LPWSTR szFileName, + DWORD dwBufLength, DWORD dwReserved, LPBINDSTATUSCALLBACK pBSC) +{ + FIXME("(%p %s %p %ld %ld %p)\n", lpUnkCaller, debugstr_w(szURL), szFileName, + dwBufLength, dwReserved, pBSC); + return E_NOTIMPL; +} + +/*********************************************************************** * HlinkSimpleNavigateToString (URLMON.@) */ HRESULT WINAPI HlinkSimpleNavigateToString( LPCWSTR szTarget,

1 0

wine/dlls/wininet version.rc
by Alexandre Julliard Nov. 10, 2005

Nov. 10, 2005

ChangeSet ID: 21199 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:03:52 Modified files: dlls/wininet : version.rc Log message: Mike Hearn <mike(a)plan99.net> Update wininet version info. Patch: http://cvs.winehq.org/patch.py?id=21199 Old revision New revision Changes Path 1.2 1.3 +5 -5 wine/dlls/wininet/version.rc Index: wine/dlls/wininet/version.rc diff -u -p wine/dlls/wininet/version.rc:1.2 wine/dlls/wininet/version.rc:1.3 --- wine/dlls/wininet/version.rc:1.2 10 Nov 2005 11: 3:52 -0000 +++ wine/dlls/wininet/version.rc 10 Nov 2005 11: 3:52 -0000 @@ -18,11 +18,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define WINE_FILEDESCRIPTION_STR "Wine WinInet" +#define WINE_FILEDESCRIPTION_STR "Wine Internet Connectivity" #define WINE_FILENAME_STR "wininet.dll" -#define WINE_FILEVERSION 5,0,0,0 -#define WINE_FILEVERSION_STR "5.0.0.0" -#define WINE_PRODUCTVERSION 5,0,0,0 -#define WINE_PRODUCTVERSION_STR "5.0" +#define WINE_FILEVERSION 6,0,2800,1106 +#define WINE_FILEVERSION_STR "6.0.2800.1106" +#define WINE_PRODUCTVERSION 6,0,2800,1106 +#define WINE_PRODUCTVERSION_STR "6.0.2800.1106" #include "wine/wine_common_ver.rc"

1 0

lostwages/news 2005110901.xml
by WineHQ Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21198 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/11/09 10:02:36 Modified files: news : 2005110901.xml Log message: Typo in last news article Patch: http://cvs.winehq.org/patch.py?id=21198 Old revision New revision Changes Path 1.1 1.2 +1 -1 lostwages/news/2005110901.xml Index: lostwages/news/2005110901.xml diff -u -p lostwages/news/2005110901.xml:1.1 lostwages/news/2005110901.xml:1.2 --- lostwages/news/2005110901.xml:1.1 9 Nov 2005 16: 2:36 -0000 +++ lostwages/news/2005110901.xml 9 Nov 2005 16: 2:36 -0000 @@ -3,7 +3,7 @@ <title>Wine 0.9.1 Released</title> <body> -A CVS drop came out today with tag wine-0.9.1. Alexandre noted the +A CVS drop came out today with the tag wine-0.9.1. Alexandre noted the following additions: <ul> <li>Support for Find function in regedit.</li>

1 0

lostwages/ include/winehq.conf news/2005110901.xml
by WineHQ Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21197 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/11/09 10:00:54 Modified files: include : winehq.conf Added files: news : 2005110901.xml Log message: News about wine-0.9.1 Patch: http://cvs.winehq.org/patch.py?id=21197 Old revision New revision Changes Path 1.22 1.23 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2005110901.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.22 lostwages/include/winehq.conf:1.23 --- lostwages/include/winehq.conf:1.22 9 Nov 2005 16: 0:54 -0000 +++ lostwages/include/winehq.conf 9 Nov 2005 16: 0:54 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9 +snapshot_date: 0.9.1 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9 Index: lostwages/news/2005110901.xml diff -u -p /dev/null lostwages/news/2005110901.xml:1.1 --- /dev/null 9 Nov 2005 16: 0:54 -0000 +++ lostwages/news/2005110901.xml 9 Nov 2005 16: 0:54 -0000 @@ -0,0 +1,24 @@ +<news> + <date>November 9, 2005</date> + <title>Wine 0.9.1 Released</title> + <body> + +A CVS drop came out today with tag wine-0.9.1. Alexandre noted the +following additions: +<ul> + <li>Support for Find function in regedit.</li> + <li>Winelib app to eject a CD.</li> + <li>Many MSI improvements.</li> + <li>Better support for running text-mode apps without X.</li> + <li>Improved support for various code obfuscation tools.</li> +</ul> + + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.1.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.105">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. + + </body> +</news>

1 0

wine/. ANNOUNCE ChangeLog VERSION configure
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21196 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 07:41:27 Modified files: . : ANNOUNCE ChangeLog VERSION configure Log message: Release 0.9.1. Patch: http://cvs.winehq.org/patch.py?id=21196 Old revision New revision Changes Path 1.104 1.105 +16 -10 wine/ANNOUNCE 1.100 1.101 +2067 -1 wine/ChangeLog 1.46 1.47 +1 -1 wine/VERSION 1.714 1.715 +9 -9 wine/configure

1 0

wine/dlls/wineps ps.c
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21195 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 06:55:18 Modified files: dlls/wineps : ps.c Log message: Huw Davies <huw(a)codeweavers.com> Escape non-printable characters in the document title and also truncate it to 0x80 characters. Patch: http://cvs.winehq.org/patch.py?id=21195 Old revision New revision Changes Path 1.33 1.34 +60 -4 wine/dlls/wineps/ps.c Index: wine/dlls/wineps/ps.c diff -u -p wine/dlls/wineps/ps.c:1.33 wine/dlls/wineps/ps.c:1.34 --- wine/dlls/wineps/ps.c:1.33 9 Nov 2005 12:55:18 -0000 +++ wine/dlls/wineps/ps.c 9 Nov 2005 12:55:18 -0000 @@ -250,11 +250,65 @@ INT PSDRV_WriteFeature(HANDLE16 hJob, ch return 1; } - +/******************************************************** + * escape_title + * + * Helper for PSDRV_WriteHeader. Escape any non-printable characters + * as octal. If we've had to use an escape then surround the entire string + * in brackets. Truncate string to represent at most 0x80 characters. + * + */ +static char *escape_title(LPCSTR str) +{ + char *ret, *cp; + int i, extra = 0; + + if(!str) + { + ret = HeapAlloc(GetProcessHeap(), 0, 1); + *ret = '\0'; + return ret; + } + + for(i = 0; i < 0x80 && str[i]; i++) + { + if(!isprint(str[i])) + extra += 3; + } + + if(!extra) + { + ret = HeapAlloc(GetProcessHeap(), 0, i + 1); + memcpy(ret, str, i); + ret[i] = '\0'; + return ret; + } + + extra += 2; /* two for the brackets */ + cp = ret = HeapAlloc(GetProcessHeap(), 0, i + extra + 1); + *cp++ = '('; + for(i = 0; i < 0x80 && str[i]; i++) + { + if(!isprint(str[i])) + { + BYTE b = (BYTE)str[i]; + *cp++ = '\\'; + *cp++ = ((b >> 6) & 0x7) + '0'; + *cp++ = ((b >> 3) & 0x7) + '0'; + *cp++ = ((b) & 0x7) + '0'; + } + else + *cp++ = str[i]; + } + *cp++ = ')'; + *cp = '\0'; + return ret; +} + INT PSDRV_WriteHeader( PSDRV_PDEVICE *physDev, LPCSTR title ) { - char *buf; + char *buf, *escaped_title; INPUTSLOT *slot; PAGESIZE *page; DUPLEX *duplex; @@ -263,8 +317,9 @@ INT PSDRV_WriteHeader( PSDRV_PDEVICE *ph TRACE("'%s'\n", debugstr_a(title)); + escaped_title = escape_title(title); buf = HeapAlloc( PSDRV_Heap, 0, sizeof(psheader) + - (title ? strlen(title) : 0) + 30 ); + strlen(escaped_title) + 30 ); if(!buf) { WARN("HeapAlloc failed\n"); return 0; @@ -278,8 +333,9 @@ INT PSDRV_WriteHeader( PSDRV_PDEVICE *ph ury = physDev->ImageableArea.top * 72.0 / physDev->logPixelsY; /* FIXME should do something better with BBox */ - sprintf(buf, psheader, title ? title : "", llx, lly, urx, ury); + sprintf(buf, psheader, escaped_title, llx, lly, urx, ury); + HeapFree(GetProcessHeap(), 0, escaped_title); if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) != strlen(buf) ) { WARN("WriteSpool error\n");

1 0

wine/dlls/commdlg filedlg.c Makefile.in
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21194 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 06:55:01 Modified files: dlls/commdlg : filedlg.c Makefile.in Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Initialize COM prior to displaying the file dialog. Patch: http://cvs.winehq.org/patch.py?id=21194 Old revision New revision Changes Path 1.115 1.116 +6 -0 wine/dlls/commdlg/filedlg.c 1.44 1.45 +1 -0 wine/dlls/commdlg/Makefile.in Index: wine/dlls/commdlg/filedlg.c diff -u -p wine/dlls/commdlg/filedlg.c:1.115 wine/dlls/commdlg/filedlg.c:1.116 --- wine/dlls/commdlg/filedlg.c:1.115 9 Nov 2005 12:55: 1 -0000 +++ wine/dlls/commdlg/filedlg.c 9 Nov 2005 12:55: 1 -0000 @@ -250,6 +250,7 @@ static BOOL WINAPI GetFileName95(FileOpe LPCVOID template; HRSRC hRes; HANDLE hDlgTmpl = 0; + HRESULT hr; /* test for missing functionality */ if (fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS) @@ -281,11 +282,16 @@ static BOOL WINAPI GetFileName95(FileOpe fodInfos->HookMsg.sharevistring = RegisterWindowMessageA(SHAREVISTRINGA); } + /* Some shell namespace extensions depend on COM being initialized. */ + hr = CoInitialize(NULL); + lRes = DialogBoxIndirectParamA(COMDLG32_hInstance, (LPDLGTEMPLATEA) template, fodInfos->ofnInfos->hwndOwner, FileOpenDlgProc95, (LPARAM) fodInfos); + if (SUCCEEDED(hr)) + CoUninitialize(); /* Unable to create the dialog */ if( lRes == -1) Index: wine/dlls/commdlg/Makefile.in diff -u -p wine/dlls/commdlg/Makefile.in:1.44 wine/dlls/commdlg/Makefile.in:1.45 --- wine/dlls/commdlg/Makefile.in:1.44 9 Nov 2005 12:55: 1 -0000 +++ wine/dlls/commdlg/Makefile.in 9 Nov 2005 12:55: 1 -0000 @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = comdlg32.dll IMPORTLIB = libcomdlg32.$(IMPLIBEXT) IMPORTS = shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 kernel32 ntdll +DELAYIMPORTS = ole32 EXTRALIBS = -luuid C_SRCS = \

1 0

tools/. wine_release
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21193 CVSROOT: /opt/cvs-commit Module name: tools Changes by: julliard(a)winehq.org 2005/11/09 05:30:22 Modified files: . : wine_release Log message: Added generation of the HTML API docs. Patch: http://cvs.winehq.org/patch.py?id=21193 Old revision New revision Changes Path 1.15 1.16 +2 -0 tools/wine_release Index: tools/wine_release diff -u -p tools/wine_release:1.15 tools/wine_release:1.16 --- tools/wine_release:1.15 9 Nov 2005 11:30:22 -0000 +++ tools/wine_release 9 Nov 2005 11:30:22 -0000 @@ -75,6 +75,8 @@ do nroff -man $f | ../bin/man2html | ../html2template -o /home/winehq/opt/lostwages/templates/en/docs/$name.template done +make htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI + # Wine API Stats echo "==== UPDATING WINE API STATS PAGE ====" ./tools/winapi/winapi_extract --pseudo-stub-statistics --no-verbose --no-progress > winapi_stats.txt

1 0

wine/dlls/msi tests/db.c registry.c
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21192 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:59:20 Modified files: dlls/msi/tests : db.c dlls/msi : registry.c Log message: Mike McCormack <mike(a)codeweavers.com> Fix passing of NULL pointers to MsiDecomposeDescriptor and add a test. Patch: http://cvs.winehq.org/patch.py?id=21192 Old revision New revision Changes Path 1.17 1.18 +26 -6 wine/dlls/msi/tests/db.c 1.12 1.13 +27 -15 wine/dlls/msi/registry.c Index: wine/dlls/msi/tests/db.c diff -u -p wine/dlls/msi/tests/db.c:1.17 wine/dlls/msi/tests/db.c:1.18 --- wine/dlls/msi/tests/db.c:1.17 9 Nov 2005 10:59:20 -0000 +++ wine/dlls/msi/tests/db.c 9 Nov 2005 10:59:20 -0000 @@ -128,7 +128,7 @@ static void test_msiinsert(void) } typedef UINT (WINAPI *fnMsiDecomposeDescriptorA)(LPCSTR, LPCSTR, LPSTR, LPSTR, DWORD *); -fnMsiDecomposeDescriptorA MsiDecomposeDescriptorA; +static fnMsiDecomposeDescriptorA pMsiDecomposeDescriptorA; static void test_msidecomposedesc(void) { @@ -141,15 +141,15 @@ static void test_msidecomposedesc(void) hmod = GetModuleHandle("msi.dll"); if (!hmod) return; - MsiDecomposeDescriptorA = (fnMsiDecomposeDescriptorA) + pMsiDecomposeDescriptorA = (fnMsiDecomposeDescriptorA) GetProcAddress(hmod, "MsiDecomposeDescriptorA"); - if (!MsiDecomposeDescriptorA) + if (!pMsiDecomposeDescriptorA) return; /* test a valid feature descriptor */ desc = "']gAVn-}f(ZXfeAR6.jiFollowTheWhiteRabbit>3w2x^IGfe?CxI5heAvk."; len = 0; - r = MsiDecomposeDescriptorA(desc, prod, feature, comp, &len); + r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len); ok(r == ERROR_SUCCESS, "returned an error\n"); ok(len == strlen(desc), "length was wrong\n"); ok(strcmp(prod,"{90110409-6000-11D3-8CFE-0150048383C9}")==0, "product wrong\n"); @@ -161,7 +161,7 @@ static void test_msidecomposedesc(void) "ThisWillFailIfTheresMoreThanAGuidsChars>" "3w2x^IGfe?CxI5heAvk."; len = 0; - r = MsiDecomposeDescriptorA(desc, prod, feature, comp, &len); + r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len); ok(r == ERROR_INVALID_PARAMETER, "returned wrong error\n"); /* @@ -173,9 +173,29 @@ static void test_msidecomposedesc(void) "3w2x^IGfe?CxI5heAvk." "extra"; len = 0; - r = MsiDecomposeDescriptorA(desc, prod, feature, comp, &len); + r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len); ok(r == ERROR_SUCCESS, "returned wrong error\n"); ok(len == (strlen(desc) - strlen("extra")), "length wrong\n"); + + len = 0; + r = pMsiDecomposeDescriptorA(desc, prod, feature, NULL, &len); + ok(r == ERROR_SUCCESS, "returned wrong error\n"); + ok(len == (strlen(desc) - strlen("extra")), "length wrong\n"); + + len = 0; + r = pMsiDecomposeDescriptorA(desc, prod, NULL, NULL, &len); + ok(r == ERROR_SUCCESS, "returned wrong error\n"); + ok(len == (strlen(desc) - strlen("extra")), "length wrong\n"); + + len = 0; + r = pMsiDecomposeDescriptorA(desc, NULL, NULL, NULL, &len); + ok(r == ERROR_SUCCESS, "returned wrong error\n"); + ok(len == (strlen(desc) - strlen("extra")), "length wrong\n"); + + len = 0; + r = pMsiDecomposeDescriptorA(NULL, NULL, NULL, NULL, &len); + ok(r == ERROR_INVALID_PARAMETER, "returned wrong error\n"); + ok(len == 0, "length wrong\n"); } static UINT try_query_param( MSIHANDLE hdb, LPCSTR szQuery, MSIHANDLE hrec ) Index: wine/dlls/msi/registry.c diff -u -p wine/dlls/msi/registry.c:1.12 wine/dlls/msi/registry.c:1.13 --- wine/dlls/msi/registry.c:1.12 9 Nov 2005 10:59:20 -0000 +++ wine/dlls/msi/registry.c 9 Nov 2005 10:59:20 -0000 @@ -253,6 +253,9 @@ BOOL decode_base85_guid( LPCWSTR str, GU { DWORD i, val = 0, base = 1, *p; + if (!str) + return FALSE; + p = (DWORD*) guid; for( i=0; i<20; i++ ) { @@ -532,8 +535,11 @@ UINT WINAPI MsiDecomposeDescriptorW( LPC len = (p - &szDescriptor[20]); if( len > MAX_FEATURE_CHARS ) return ERROR_INVALID_PARAMETER; - memcpy( szFeature, &szDescriptor[20], len*sizeof(WCHAR) ); - szFeature[len] = 0; + if (szFeature) + { + memcpy( szFeature, &szDescriptor[20], len*sizeof(WCHAR) ); + szFeature[len] = 0; + } TRACE("feature %s\n", debugstr_w( szFeature )); @@ -543,8 +549,10 @@ UINT WINAPI MsiDecomposeDescriptorW( LPC TRACE("component %s\n", debugstr_guid( &component )); - StringFromGUID2( &product, szProduct, MAX_FEATURE_CHARS+1 ); - StringFromGUID2( &component, szComponent, MAX_FEATURE_CHARS+1 ); + if (szProduct) + StringFromGUID2( &product, szProduct, MAX_FEATURE_CHARS+1 ); + if (szComponent) + StringFromGUID2( &component, szComponent, MAX_FEATURE_CHARS+1 ); len = ( &p[21] - szDescriptor ); TRACE("length = %d\n", len); @@ -559,26 +567,30 @@ UINT WINAPI MsiDecomposeDescriptorA( LPC WCHAR product[MAX_FEATURE_CHARS+1]; WCHAR feature[MAX_FEATURE_CHARS+1]; WCHAR component[MAX_FEATURE_CHARS+1]; - LPWSTR str = NULL; + LPWSTR str = NULL, p = NULL, f = NULL, c = NULL; UINT r; TRACE("%s %p %p %p %p\n", debugstr_a(szDescriptor), szProduct, szFeature, szComponent, pUsed); - if( szDescriptor ) - { - str = strdupAtoW( szDescriptor ); - if( !str ) - return ERROR_OUTOFMEMORY; - } + str = strdupAtoW( szDescriptor ); + if( szDescriptor && !str ) + return ERROR_OUTOFMEMORY; + + if (szProduct) + p = product; + if (szFeature) + f = feature; + if (szComponent) + c = component; - r = MsiDecomposeDescriptorW( str, product, feature, component, pUsed ); + r = MsiDecomposeDescriptorW( str, p, f, c, pUsed ); - WideCharToMultiByte( CP_ACP, 0, product, MAX_FEATURE_CHARS+1, + WideCharToMultiByte( CP_ACP, 0, p, MAX_FEATURE_CHARS+1, szProduct, MAX_FEATURE_CHARS+1, NULL, NULL ); - WideCharToMultiByte( CP_ACP, 0, feature, MAX_FEATURE_CHARS+1, + WideCharToMultiByte( CP_ACP, 0, f, MAX_FEATURE_CHARS+1, szFeature, MAX_FEATURE_CHARS+1, NULL, NULL ); - WideCharToMultiByte( CP_ACP, 0, component, MAX_FEATURE_CHARS+1, + WideCharToMultiByte( CP_ACP, 0, c, MAX_FEATURE_CHARS+1, szComponent, MAX_FEATURE_CHARS+1, NULL, NULL ); msi_free( str );

1 0

wine/dlls/ole32 storage32.c storage.c ole2.c o ...
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21191 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:59:11 Modified files: dlls/ole32 : storage32.c storage.c ole2.c ole16.c memlockbytes16.c clipboard.c Log message: Markus Amsler <markus.amsler(a)oribi.org> Improve c2man Documented-Total count. Patch: http://cvs.winehq.org/patch.py?id=21191 Old revision New revision Changes Path 1.95 1.96 +10 -1 wine/dlls/ole32/storage32.c 1.51 1.52 +6 -1 wine/dlls/ole32/storage.c 1.78 1.79 +8 -6 wine/dlls/ole32/ole2.c 1.23 1.24 +8 -2 wine/dlls/ole32/ole16.c 1.14 1.15 +2 -2 wine/dlls/ole32/memlockbytes16.c 1.46 1.47 +1 -1 wine/dlls/ole32/clipboard.c Index: wine/dlls/ole32/storage32.c diff -u -p wine/dlls/ole32/storage32.c:1.95 wine/dlls/ole32/storage32.c:1.96 --- wine/dlls/ole32/storage32.c:1.95 9 Nov 2005 10:59:11 -0000 +++ wine/dlls/ole32/storage32.c 9 Nov 2005 10:59:11 -0000 @@ -6140,7 +6140,16 @@ HRESULT WINAPI WriteClassStg(IStorage* p /*********************************************************************** * ReadClassStg (OLE32.@) * - * This method reads the CLSID previously written to a storage object with the WriteClassStg. + * This method reads the CLSID previously written to a storage object with + * the WriteClassStg. + * + * PARAMS + * pstg [I] IStorage pointer + * pclsid [O] Pointer to where the CLSID is written + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. */ HRESULT WINAPI ReadClassStg(IStorage *pstg,CLSID *pclsid){ Index: wine/dlls/ole32/storage.c diff -u -p wine/dlls/ole32/storage.c:1.51 wine/dlls/ole32/storage.c:1.52 --- wine/dlls/ole32/storage.c:1.51 9 Nov 2005 10:59:11 -0000 +++ wine/dlls/ole32/storage.c 9 Nov 2005 10:59:11 -0000 @@ -2227,7 +2227,12 @@ HRESULT WINAPI StgOpenStorageOnILockByte * the WriteClassStg. * * PARAMS - * pstg Segmented LPSTORAGE pointer. + * pstg [I] Segmented LPSTORAGE pointer. + * pclsid [O] Pointer to where the CLSID is written + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. */ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid) { Index: wine/dlls/ole32/ole2.c diff -u -p wine/dlls/ole32/ole2.c:1.78 wine/dlls/ole32/ole2.c:1.79 --- wine/dlls/ole32/ole2.c:1.78 9 Nov 2005 10:59:11 -0000 +++ wine/dlls/ole32/ole2.c 9 Nov 2005 10:59:11 -0000 @@ -1553,21 +1553,23 @@ HRESULT WINAPI OleDestroyMenuDescriptor( /*********************************************************************** * OleSetMenuDescriptor [OLE32.@] - * Installs or removes OLE dispatching code for the containers frame window - * FIXME: The lpFrame and lpActiveObject parameters are currently ignored - * OLE should install context sensitive help F1 filtering for the app when - * these are non null. + * Installs or removes OLE dispatching code for the containers frame window. * - * PARAMS: + * PARAMS * hOleMenu Handle to composite menu descriptor * hwndFrame Handle to containers frame window * hwndActiveObject Handle to objects in-place activation window * lpFrame Pointer to IOleInPlaceFrame on containers window * lpActiveObject Pointer to IOleInPlaceActiveObject on active in-place object * - * RETURNS: + * RETURNS * S_OK - menu installed correctly * E_FAIL, E_INVALIDARG, E_UNEXPECTED - failure + * + * FIXME + * The lpFrame and lpActiveObject parameters are currently ignored + * OLE should install context sensitive help F1 filtering for the app when + * these are non null. */ HRESULT WINAPI OleSetMenuDescriptor( HOLEMENU hOleMenu, Index: wine/dlls/ole32/ole16.c diff -u -p wine/dlls/ole32/ole16.c:1.23 wine/dlls/ole32/ole16.c:1.24 --- wine/dlls/ole32/ole16.c:1.23 9 Nov 2005 10:59:11 -0000 +++ wine/dlls/ole32/ole16.c 9 Nov 2005 10:59:11 -0000 @@ -204,6 +204,9 @@ IMalloc16_Constructor() /*********************************************************************** * CoGetMalloc [COMPOBJ.4] + * + * Retrieve the current win16 IMalloc interface. + * * RETURNS * The current win16 IMalloc */ @@ -344,9 +347,12 @@ HRESULT WINAPI StringFromCLSID16( /****************************************************************************** * ProgIDFromCLSID [COMPOBJ.62] + * * Converts a class id into the respective Program ID. (By using a registry lookup) - * RETURNS S_OK on success - * riid associated with the progid + * + * RETURNS + * S_OK on success + * riid associated with the progid */ HRESULT WINAPI ProgIDFromCLSID16( REFCLSID clsid, /* [in] class id as found in registry */ Index: wine/dlls/ole32/memlockbytes16.c diff -u -p wine/dlls/ole32/memlockbytes16.c:1.14 wine/dlls/ole32/memlockbytes16.c:1.15 --- wine/dlls/ole32/memlockbytes16.c:1.14 9 Nov 2005 10:59:11 -0000 +++ wine/dlls/ole32/memlockbytes16.c 9 Nov 2005 10:59:11 -0000 @@ -500,12 +500,12 @@ HRESULT HGLOBALLockBytesImpl16_Stat( * * Creates an ILockBytes interface for a HGLOBAL handle. * - * Params: + * PARAMS * hGlobal the global handle (16bit) * fDeleteOnRelease delete handle on release. * ppLkbyt pointer to ILockBytes interface. * - * Returns: + * RETURNS * Staddard OLE error return codes. * */ Index: wine/dlls/ole32/clipboard.c diff -u -p wine/dlls/ole32/clipboard.c:1.46 wine/dlls/ole32/clipboard.c:1.47 --- wine/dlls/ole32/clipboard.c:1.46 9 Nov 2005 10:59:11 -0000 +++ wine/dlls/ole32/clipboard.c 9 Nov 2005 10:59:11 -0000 @@ -303,7 +303,7 @@ typedef struct tagClipboardWindowInfo * Places a pointer to the specified data object onto the clipboard, * making the data object accessible to the OleGetClipboard function. * - * RETURNS: + * RETURNS * * S_OK IDataObject pointer placed on the clipboard * CLIPBRD_E_CANT_OPEN OpenClipboard failed

1 0