January 2006 - Wine-Commits

Mike McCormack : msi: Make the MSI SelectionTree control do something useful.
by Alexandre Julliard Jan. 11, 2006

Jan. 11, 2006

Module: wine Branch: refs/heads/master Commit: 848f67e13e5ef4150362aaed6c2235c724a6a871 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=848f67e13e5ef4150362aae… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 11 21:12:06 2006 +0100 msi: Make the MSI SelectionTree control do something useful. --- dlls/msi/.gitignore | 3 + dlls/msi/Makefile.in | 7 +- dlls/msi/dialog.c | 220 +++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msi/msi.rc | 87 ++++++++++++++++++++ 4 files changed, 301 insertions(+), 16 deletions(-)

1 0

Alexandre Julliard : server: Don't round up the header size for image mappings.
by Alexandre Julliard Jan. 11, 2006

Jan. 11, 2006

Module: wine Branch: refs/heads/master Commit: b54e9e94e98624acde1bb00e10c2055dfed9c2d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b54e9e94e98624acde1bb00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 11 20:59:26 2006 +0100 server: Don't round up the header size for image mappings. --- server/mapping.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 6701e44..e636ae8 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -105,9 +105,6 @@ static void init_page_size(void) } #endif /* __i386__ */ -#define ROUND_SIZE_MASK(addr,size,mask) \ - (((int)(size) + ((int)(addr) & (mask)) + (mask)) & ~(mask)) - #define ROUND_SIZE(size) (((size) + page_mask) & ~page_mask) @@ -246,8 +243,7 @@ static int get_image_params( struct mapp mapping->size = ROUND_SIZE( nt.OptionalHeader.SizeOfImage ); mapping->base = (void *)nt.OptionalHeader.ImageBase; - mapping->header_size = ROUND_SIZE_MASK( mapping->base, nt.OptionalHeader.SizeOfHeaders, - nt.OptionalHeader.SectionAlignment - 1 ); + mapping->header_size = nt.OptionalHeader.SizeOfHeaders; mapping->protect = VPROT_IMAGE; /* sanity check */

1 0

Alexandre Julliard : ntdll: Round up the mapping size in map_file_into_view when setting
by Alexandre Julliard Jan. 11, 2006

Jan. 11, 2006

Module: wine Branch: refs/heads/master Commit: 9eae2d714de1732f6279ce8eca393eb959922983 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9eae2d714de1732f6279ce8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 11 20:59:07 2006 +0100 ntdll: Round up the mapping size in map_file_into_view when setting the protection bytes. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 912f5c4..e6d0236 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -727,7 +727,7 @@ static NTSTATUS map_file_into_view( stru pread( fd, ptr, size, offset ); if (prot != (PROT_READ|PROT_WRITE)) mprotect( ptr, size, prot ); /* Set the right protection */ done: - memset( view->prot + (start >> page_shift), vprot, size >> page_shift ); + memset( view->prot + (start >> page_shift), vprot, ROUND_SIZE(start,size) >> page_shift ); return STATUS_SUCCESS; }

1 0

Juan Lang : crypt32: Fix a test that fails on Windows.
by Alexandre Julliard Jan. 11, 2006

Jan. 11, 2006

Module: wine Branch: refs/heads/master Commit: 79575a8aff807dccdceda4cbaf5fe4df78384b24 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=79575a8aff807dccdceda4c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jan 11 20:57:41 2006 +0100 crypt32: Fix a test that fails on Windows. --- dlls/crypt32/tests/main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index f217b40..c3bea63 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -92,8 +92,10 @@ static void testOIDToAlgID(void) /* Test with a bogus one */ SetLastError(0xdeadbeef); alg = CertOIDToAlgId("1.2.3"); - ok(!alg && GetLastError() == 0xdeadbeef, - "Didn't expect last error (%08lx) to be set\n", GetLastError()); + ok(!alg && (GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND), + "Expected ERROR_RESOURCE_NAME_NOT_FOUND or no error set, got %08lx\n", + GetLastError()); for (i = 0; i < sizeof(oidToAlgID) / sizeof(oidToAlgID[0]); i++) {

1 0

Jacek Caban : urlmon: Reimplement CoInternetCombineUrl to use pluggable protocol.
by Alexandre Julliard Jan. 11, 2006

Jan. 11, 2006

Module: wine Branch: refs/heads/master Commit: ab6adcb07798dacf62ce709ee716d9e8d02ff421 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab6adcb07798dacf62ce709… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 11 20:57:23 2006 +0100 urlmon: Reimplement CoInternetCombineUrl to use pluggable protocol. --- dlls/urlmon/internet.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/urlmon/urlmon_main.c | 13 ------------- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 7f5253b..94b7330 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -166,7 +166,9 @@ static HRESULT parse_security_domain(LPC return E_FAIL; } - +/************************************************************************** + * CoInternetParseUrl (URLMON.@) + */ HRESULT WINAPI CoInternetParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, DWORD dwFlags, LPWSTR pszResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) { @@ -190,3 +192,36 @@ HRESULT WINAPI CoInternetParseUrl(LPCWST return E_NOTIMPL; } + +/************************************************************************** + * CoInternetCombineUrl (URLMON.@) + */ +HRESULT WINAPI CoInternetCombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, + DWORD dwCombineFlags, LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, + DWORD dwReserved) +{ + IInternetProtocolInfo *protocol_info; + DWORD size = cchResult; + HRESULT hres; + + TRACE("(%s,%s,0x%08lx,%p,%ld,%p,%ld)\n", debugstr_w(pwzBaseUrl), + debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, pcchResult, + dwReserved); + + protocol_info = get_protocol_info(pwzBaseUrl); + + if(protocol_info) { + hres = IInternetProtocolInfo_CombineUrl(protocol_info, pwzBaseUrl, pwzRelativeUrl, + dwCombineFlags, pwzResult, cchResult, pcchResult, dwReserved); + if(SUCCEEDED(hres)) + return hres; + } + + + hres = UrlCombineW(pwzBaseUrl, pwzRelativeUrl, pwzResult, &size, dwCombineFlags); + + if(pcchResult) + *pcchResult = size; + + return hres; +} diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index fa2e195..c94eb70 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -293,19 +293,6 @@ HRESULT WINAPI ObtainUserAgentString(DWO return S_OK; } -HRESULT WINAPI CoInternetCombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, - LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) -{ - HRESULT hres; - DWORD size = cchResult; - - TRACE("(%s,%s,0x%08lx,%p,%ld,%p,%ld)\n", debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl), dwCombineFlags, - pwzResult, cchResult, pcchResult, dwReserved); - hres = UrlCombineW(pwzBaseUrl, pwzRelativeUrl, pwzResult, &size, dwCombineFlags); - if(pcchResult) *pcchResult = size; - return hres; -} - HRESULT WINAPI CoInternetCompareUrl(LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCompareFlags) { TRACE("(%s,%s,%08lx)\n", debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);

1 0

Jacek Caban : urlmon: Use CoInternetCombineUrl in URLMonikerImpl_Construct.
by Alexandre Julliard Jan. 11, 2006

Jan. 11, 2006

Module: wine Branch: refs/heads/master Commit: 0d57265a164038e2d293d8ac26a6af069a5bed2f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d57265a164038e2d293d8a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 11 20:55:51 2006 +0100 urlmon: Use CoInternetCombineUrl in URLMonikerImpl_Construct. --- dlls/urlmon/umon.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index affcdfa..03ddefc 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -1065,29 +1065,19 @@ static HRESULT URLMonikerImpl_Construct( DWORD sizeStr = INTERNET_MAX_URL_LENGTH; TRACE("(%p,%s,%s)\n",This,debugstr_w(lpszLeftURLName),debugstr_w(lpszURLName)); - memset(This, 0, sizeof(*This)); - /* Initialize the virtual function table. */ This->lpvtbl = &VT_URLMonikerImpl; This->ref = 0; - if(lpszLeftURLName) { - hres = UrlCombineW(lpszLeftURLName, lpszURLName, NULL, &sizeStr, 0); - if(FAILED(hres)) { - return hres; - } - sizeStr++; - } - else - sizeStr = lstrlenW(lpszURLName)+1; - - This->URLName=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(sizeStr)); + sizeStr = lstrlenW(lpszURLName)+1; + if(lpszLeftURLName) + sizeStr += strlenW(lpszLeftURLName)+32; - if (This->URLName==NULL) - return E_OUTOFMEMORY; + This->URLName = HeapAlloc(GetProcessHeap(), 0, sizeStr*sizeof(WCHAR)); if(lpszLeftURLName) { - hres = UrlCombineW(lpszLeftURLName, lpszURLName, This->URLName, &sizeStr, 0); + hres = CoInternetCombineUrl(lpszLeftURLName, lpszURLName, 0, This->URLName, sizeStr, + &sizeStr, 0); if(FAILED(hres)) { HeapFree(GetProcessHeap(), 0, This->URLName); return hres;

1 0

Aric Stewart : msvcrt: Modify dir test to create its own directory to ensure the
by Alexandre Julliard Jan. 11, 2006

Jan. 11, 2006

Module: wine Branch: refs/heads/master Commit: 4bc3b16b449d0508f16f324e82228d752d4792da URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4bc3b16b449d0508f16f324… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 11 20:55:38 2006 +0100 msvcrt: Modify dir test to create its own directory to ensure the directory exists for the test. Using the temp dir as the root. --- dlls/msvcrt/tests/dir.c | 49 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index 5e12f84..b7d1aa2 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -34,22 +34,55 @@ void test_fullpath() { char full[MAX_PATH]; + char tmppath[MAX_PATH]; + char level1[MAX_PATH]; + char level2[MAX_PATH]; + char teststring[MAX_PATH]; char *freeme; + BOOL rc,free1,free2; - SetCurrentDirectory("C:\\Windows\\System\\"); + free1=free2=TRUE; + GetTempPath(MAX_PATH,tmppath); + strcpy(level1,tmppath); + strcat(level1,"msvcrt-test\\"); - ok(_fullpath(full,"test", MAX_PATH)>0,"_fullpath failed\n"); - ok(strcmp(full,"C:\\Windows\\System\\test")==0,"Invalid Path\n"); - ok(_fullpath(full,"\\test", MAX_PATH)>0,"_fullpath failed\n"); - ok(strcmp(full,"C:\\test")==0,"Invalid Path\n"); - ok(_fullpath(full,"..\\test", MAX_PATH)>0,"_fullpath failed\n"); - ok(strcmp(full,"C:\\Windows\\test")==0,"Invalid Path\n"); + rc = CreateDirectory(level1,NULL); + if (!rc && GetLastError()==ERROR_ALREADY_EXISTS) + free1=FALSE; + + strcpy(level2,level1); + strcat(level2,"nextlevel\\"); + rc = CreateDirectory(level2,NULL); + if (!rc && GetLastError()==ERROR_ALREADY_EXISTS) + free2=FALSE; + SetCurrentDirectory(level2); + + ok(_fullpath(full,"test", MAX_PATH)!=NULL,"_fullpath failed\n"); + strcpy(teststring,level2); + strcat(teststring,"test"); + ok(strcmp(full,teststring)==0,"Invalid Path returned %s\n",full); + ok(_fullpath(full,"\\test", MAX_PATH)!=NULL,"_fullpath failed\n"); + strncpy(teststring,level2,3); + teststring[3]=0; + strcat(teststring,"test"); + ok(strcmp(full,teststring)==0,"Invalid Path returned %s\n",full); + ok(_fullpath(full,"..\\test", MAX_PATH)!=NULL,"_fullpath failed\n"); + strcpy(teststring,level1); + strcat(teststring,"test"); + ok(strcmp(full,teststring)==0,"Invalid Path returned %s\n",full); ok(_fullpath(full,"..\\test", 10)==NULL,"_fullpath failed to generate error\n"); freeme = _fullpath(NULL,"test", 0); ok(freeme!=NULL,"No path returned\n"); - ok(strcmp(freeme,"C:\\Windows\\System\\test")==0,"Invalid Path\n"); + strcpy(teststring,level2); + strcat(teststring,"test"); + ok(strcmp(freeme,teststring)==0,"Invalid Path returned %s\n",freeme); free(freeme); + + if (free2) + RemoveDirectory(level2); + if (free1) + RemoveDirectory(level1); } START_TEST(dir)

1 0

Phil Krylov : riched20: Added \n to trace output.
by Alexandre Julliard Jan. 11, 2006

Jan. 11, 2006

Module: wine Branch: refs/heads/master Commit: 2eb59ee2b08c541f6258dbc9451aa4931c20832f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2eb59ee2b08c541f6258dbc… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Wed Jan 11 20:55:18 2006 +0100 riched20: Added \n to trace output. --- dlls/riched20/list.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 857fcf3..f0d15dd 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -168,20 +168,20 @@ void ME_DumpDocument(ME_TextBuffer *buff switch(pItem->type) { case diTextStart: - TRACE("Start"); + TRACE("Start\n"); break; case diParagraph: - TRACE("\nParagraph(ofs=%d)", pItem->member.para.nCharOfs); + TRACE("Paragraph(ofs=%d)\n", pItem->member.para.nCharOfs); break; case diStartRow: - TRACE(" - StartRow"); + TRACE(" - StartRow\n"); break; case diRun: - TRACE(" - Run(\"%s\", %d)", debugstr_w(pItem->member.run.strText->szData), + TRACE(" - Run(\"%s\", %d)\n", debugstr_w(pItem->member.run.strText->szData), pItem->member.run.nCharOfs); break; case diTextEnd: - TRACE("\nEnd(ofs=%d)\n", pItem->member.para.nCharOfs); + TRACE("End(ofs=%d)\n", pItem->member.para.nCharOfs); break; default: break;

1 0

Marcus Meissner : ole: ITypeInfo::Invoke stack overwrite fix.
by Alexandre Julliard Jan. 11, 2006

Jan. 11, 2006

Module: wine Branch: refs/heads/master Commit: cf173911a36294fe642bc39793919855607769fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf173911a36294fe642bc39… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 11 20:55:07 2006 +0100 ole: ITypeInfo::Invoke stack overwrite fix. Have enough stack space up to even VT_VARIANTs, fixes a stack corruption. --- dlls/oleaut32/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9fb1cda..b808243 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5205,7 +5205,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke VARIANT varresult; SHORT missing_param_offset = func_desc->cParams; SHORT missing_params = 0; - void *retval; /* pointer for storing byref retvals in */ + VARIANT retval; /* pointer for storing byref retvals in */ hres = S_OK; for (i = 0; i < func_desc->cParams; i++) @@ -5238,7 +5238,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke arg = prgpvarg[i] = &rgvarg[i]; memset(arg, 0, sizeof(*arg)); V_VT(arg) = rgvt[i]; - retval = NULL; + memset(&retval, 0, sizeof(retval)); V_BYREF(arg) = &retval; } else

1 0

Huw Davies : msxml: Fix for selectNodes when the node has no children.
by Alexandre Julliard Jan. 11, 2006

Jan. 11, 2006

Module: wine Branch: refs/heads/master Commit: bce90cfb85339a66873c490fe2f16757dd8dc592 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bce90cfb85339a66873c490… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 11 20:54:32 2006 +0100 msxml: Fix for selectNodes when the node has no children. --- dlls/msxml3/node.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 704e92e..b067926 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -563,6 +563,9 @@ static HRESULT WINAPI xmlnode_selectNode if (!str) return r; + if( !This->node->children ) + return S_FALSE; + *resultList = create_filtered_nodelist( This->node->children, str ); HeapFree( GetProcessHeap(), 0, str ); return S_OK; @@ -580,7 +583,7 @@ static HRESULT WINAPI xmlnode_selectSing TRACE("%p %s %p\n", This, debugstr_w(queryString), resultNode ); r = IXMLDOMNode_selectNodes(iface, queryString, &list); - if(SUCCEEDED(r)) + if(r == S_OK) { r = IXMLDOMNodeList_nextNode(list, resultNode); IXMLDOMNodeList_Release(list);

1 0