February 2006 - Wine-commits

Michael Jung : shell32/tests: Added test for Desktop::ParseDisplayName( SHGetFolderPath(CSIDL_PERSONAL))
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: 50f3eaef773842c28260dfb94a57ada2aca1f69a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50f3eaef773842c28260dfb… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Fri Feb 24 22:24:12 2006 +0100 shell32/tests: Added test for Desktop::ParseDisplayName(SHGetFolderPath(CSIDL_PERSONAL)) Test if the Desktop Folder's ParseDisplayName recognizes MyDocument's path. Removed some HRESULT tests on IUnknown_Release calls, which returns ULONG. --- dlls/shell32/tests/shlfolder.c | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index fbbc06d..ce638e0 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -81,6 +81,7 @@ static void test_ParseDisplayName(void) DWORD res; WCHAR cTestDirW [MAX_PATH] = {0}; ITEMIDLIST *newPIDL; + BOOL bRes; hr = SHGetDesktopFolder(&IDesktopFolder); if(hr != S_OK) return; @@ -103,8 +104,25 @@ static void test_ParseDisplayName(void) ok((hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || (hr == E_FAIL) || (hr == E_INVALIDARG), "ParseDisplayName returned %08lx, expected 80070002, E_FAIL or E_INVALIDARG\n", hr); - hr = IShellFolder_Release(IDesktopFolder); - ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr); + /* I thought that perhaps the DesktopFolder's ParseDisplayName would recognize the + * path corresponding to CSIDL_PERSONAL and return a CLSID_MyDocuments PIDL. Turns + * out it doesn't. The magic seems to happen in the file dialogs, then. */ + if (!pSHGetSpecialFolderPathW || !pILFindLastID) goto finished; + + bRes = pSHGetSpecialFolderPathW(NULL, cTestDirW, CSIDL_PERSONAL, FALSE); + ok(bRes, "SHGetSpecialFolderPath(CSIDL_PERSONAL) failed! %ld\n", GetLastError()); + if (!bRes) goto finished; + + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); + ok(SUCCEEDED(hr), "DesktopFolder->ParseDisplayName failed. hr = %08lx.\n", hr); + if (FAILED(hr)) goto finished; + + ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x31, "Last pidl should be of type " + "PT_FOLDER, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]); + IMalloc_Free(ppM, newPIDL); + +finished: + IShellFolder_Release(IDesktopFolder); } /* creates a file with the specified name for tests */ @@ -724,13 +742,11 @@ static void test_GetAttributesOf(void) /* free memory */ IMalloc_Free(ppM, newPIDL); - hr = IShellFolder_Release(testIShellFolder); - ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr); + IShellFolder_Release(testIShellFolder); Cleanup(); - hr = IShellFolder_Release(IDesktopFolder); - ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr); + IShellFolder_Release(IDesktopFolder); } static void test_SHGetPathFromIDList(void) @@ -889,15 +905,13 @@ static void test_EnumObjects_and_Compare test_EnumObjects(testIShellFolder); - hr = IShellFolder_Release(testIShellFolder); - ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr); + IShellFolder_Release(testIShellFolder); Cleanup(); IMalloc_Free(ppM, newPIDL); - hr = IShellFolder_Release(IDesktopFolder); - ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr); + IShellFolder_Release(IDesktopFolder); } /* A simple implementation of an IPropertyBag, which returns fixed values for

1 0

Jacek Caban : mshtml: Return error in NewChannelFromURL if retval is NULL.
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: b7e8057eecc14d38d41b9b28cb52c77557655330 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7e8057eecc14d38d41b9b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 24 20:32:23 2006 +0100 mshtml: Return error in NewChannelFromURL if retval is NULL. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 393d088..819d3f8 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1427,7 +1427,7 @@ static nsresult NSAPI nsIOService_NewCha if(NS_FAILED(nsres)) { WARN("Could not get nsIWineURI: %08lx\n", nsres); *_retval = channel; - return NS_OK; + return channel ? NS_OK : NS_ERROR_UNEXPECTED; } ret = HeapAlloc(GetProcessHeap(), 0, sizeof(nsChannel));

1 0

Jacek Caban : mshtml: Added nsIURI::Clone implementation.
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: 9b6c08a243c374bdd6dd58fcec5d6e72b2300bb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9b6c08a243c374bdd6dd58f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 24 20:31:12 2006 +0100 mshtml: Added nsIURI::Clone implementation. --- dlls/mshtml/nsio.c | 45 ++++++++++++++++++++++++++++++++------------- 1 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 8c86de7..393d088 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NS_IOSERVICE_CLASSNAME "nsIOService" #define NS_IOSERVICE_CONTRACTID "@mozilla.org/network/io-service;1" -static IID NS_IOSERVICE_CID = +static const IID NS_IOSERVICE_CID = {0x9ac9e770, 0x18bc, 0x11d3, {0x93, 0x37, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40}}; static nsIIOService *nsio = NULL; @@ -75,6 +75,8 @@ typedef struct { #define NSUPCHANNEL(x) ((nsIUploadChannel*) &(x)->lpUploadChannelVtbl) #define NSURI(x) ((nsIURI*) &(x)->lpWineURIVtbl) +static nsresult create_uri(nsIURI*,NSContainer*,nsIURI**); + static BOOL exec_shldocvw_67(NSContainer *container, LPCWSTR url) { IOleCommandTarget *cmdtrg = NULL; @@ -1180,8 +1182,18 @@ static nsresult NSAPI nsURI_SchemeIs(nsI static nsresult NSAPI nsURI_Clone(nsIWineURI *iface, nsIURI **_retval) { nsURI *This = NSURI_THIS(iface); + nsIURI *uri; + nsresult nsres; + TRACE("(%p)->(%p)\n", This, _retval); - return nsIURI_Clone(This->uri, _retval); + + nsres = nsIURI_Clone(This->uri, &uri); + if(NS_FAILED(nsres)) { + WARN("Clone failed: %08lx\n", nsres); + return nsres; + } + + return create_uri(uri, This->container, _retval); } static nsresult NSAPI nsURI_Resolve(nsIWineURI *iface, const nsACString *arelativePath, @@ -1280,6 +1292,23 @@ static const nsIWineURIVtbl nsWineURIVtb nsURI_SetNSContainer, }; +static nsresult create_uri(nsIURI *uri, NSContainer *container, nsIURI **_retval) +{ + nsURI *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(nsURI)); + + ret->lpWineURIVtbl = &nsWineURIVtbl; + ret->ref = 1; + ret->uri = uri; + ret->container = container; + + if(container) + nsIWebBrowserChrome_AddRef(NSWBCHROME(container)); + + TRACE("retval=%p\n", ret); + *_retval = NSURI(ret); + return NS_OK; +} + static nsresult NSAPI nsIOService_QueryInterface(nsIIOService *iface, nsIIDRef riid, nsQIResult result) { @@ -1331,7 +1360,6 @@ static nsresult NSAPI nsIOService_NewURI { const char *spec = NULL; nsIURI *uri; - nsURI *ret; PRBool is_javascript = FALSE; nsresult nsres; @@ -1368,16 +1396,7 @@ static nsresult NSAPI nsIOService_NewURI return NS_OK; } - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(nsURI)); - - ret->lpWineURIVtbl = &nsWineURIVtbl; - ret->ref = 1; - ret->uri = uri; - ret->container = NULL; - - TRACE("_retval = %p\n", ret); - *_retval = NSURI(ret); - return NS_OK; + return create_uri(uri, NULL, _retval); } static nsresult NSAPI nsIOService_NewFileURI(nsIIOService *iface, nsIFile *aFile,

1 0

Jacek Caban : mshtml: Don't add null byte to post data.
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: 71b881e4ba75bd2cccde863e55cdd4189d946c35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=71b881e4ba75bd2cccde863… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 24 20:29:37 2006 +0100 mshtml: Don't add null byte to post data. --- dlls/mshtml/navigate.c | 21 ++++++++++----------- dlls/mshtml/persist.c | 10 +++++----- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index c1cd9f6..eb64656 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -399,7 +399,7 @@ static void parse_post_data(nsIInputStre HGLOBAL post_data = NULL; LPWSTR headers = NULL; DWORD headers_len = 0, len; - const char *ptr, *ptr2; + const char *ptr, *ptr2, *post_data_end; nsIInputStream_Available(post_data_stream, &available); post_data = GlobalAlloc(0, available+1); @@ -408,9 +408,10 @@ static void parse_post_data(nsIInputStre TRACE("post_data = %s\n", debugstr_an(post_data, post_data_len)); ptr = ptr2 = post_data; + post_data_end = (const char*)post_data+post_data_len; - while(*ptr && (*ptr != '\r' || ptr[1] != '\n')) { - while(*ptr && (*ptr != '\r' || ptr[1] != '\n')) + while(ptr < post_data_end && (*ptr != '\r' || ptr[1] != '\n')) { + while(ptr < post_data_end && (*ptr != '\r' || ptr[1] != '\n')) ptr++; if(!*ptr) { @@ -445,24 +446,21 @@ static void parse_post_data(nsIInputStre headers[headers_len] = 0; *headers_ret = headers; - if(*ptr) - ptr += 2; - - if(!*ptr || !(ptr-(const char*)post_data)) { + if(ptr >= post_data_end-2) { GlobalFree(post_data); return; } + ptr += 2; + if(headers_len) { post_data_len -= ptr-(const char*)post_data; memmove(post_data, ptr, post_data_len); post_data = GlobalReAlloc(post_data, post_data_len+1, 0); } - *((PBYTE)post_data+post_data_len) = 0; - *post_data_ret = post_data; - *post_data_len_ret = post_data_len+1; + *post_data_len_ret = post_data_len; } void hlink_frame_navigate(NSContainer *container, IHlinkFrame *hlink_frame, @@ -478,7 +476,8 @@ void hlink_frame_navigate(NSContainer *c if(post_data_stream) { parse_post_data(post_data_stream, &headers, &post_data, &post_data_len); - TRACE("headers = %s post_data = %s\n", debugstr_w(headers), debugstr_a(post_data)); + TRACE("headers = %s post_data = %s\n", debugstr_w(headers), + debugstr_an(post_data, post_data_len)); } callback = BSCallback_Create(container->doc, uri, post_data, post_data_len, headers); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 7649ee6..6f181a6 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -332,10 +332,10 @@ static nsIInputStream *get_post_data_str hres = IBindStatusCallback_GetBindInfo(callback, &bindf, &bindinfo); if(SUCCEEDED(hres) && bindinfo.dwBindVerb == BINDVERB_POST) - post_len = bindinfo.cbStgmedData-1; + post_len = bindinfo.cbStgmedData; if(headers_len || post_len) { - int len = headers_len; + int len = headers_len ? headers_len-1 : 0; static const char content_length[] = "Content-Length: %lu\r\n\r\n"; @@ -347,7 +347,7 @@ static nsIInputStream *get_post_data_str } if(post_len) { - sprintf(data+headers_len-1, content_length, post_len); + sprintf(data+len, content_length, post_len); len = strlen(data); memcpy(data+len, bindinfo.stgmedData.u.hGlobal, post_len); @@ -355,7 +355,7 @@ static nsIInputStream *get_post_data_str TRACE("data = %s\n", debugstr_an(data, len+post_len)); - ret = create_nsstream(data, strlen(data)); + ret = create_nsstream(data, len+post_len); } ReleaseBindInfo(&bindinfo); @@ -438,7 +438,7 @@ static HRESULT WINAPI PersistMoniker_Loa * it (to do so we'd have to use not frozen interfaces)? */ - nsIInputStream *post_data_stream = get_post_data_stream(pibc);; + nsIInputStream *post_data_stream = get_post_data_stream(pibc); This->nscontainer->load_call = TRUE; nsres = nsIWebNavigation_LoadURI(This->nscontainer->navigation, url,

1 0

Jacek Caban : mshtml: Init nsIOService as soon as possible.
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: 4f9c9a16ad24af79a0de60053290bc210c1f3e00 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f9c9a16ad24af79a0de600… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 24 20:27:38 2006 +0100 mshtml: Init nsIOService as soon as possible. --- dlls/mshtml/nsembed.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index dbe0d56..beffd86 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -338,6 +338,8 @@ static BOOL load_gecko(void) nsres = nsIComponentRegistrar_AutoRegister(registrar, gre_dir); if(NS_FAILED(nsres)) ERR("AutoRegister(gre_dir) failed: %08lx\n", nsres); + + init_nsio(pCompMgr, registrar); }else { ERR("NS_GetComponentRegistrar failed: %08lx\n", nsres); } @@ -358,7 +360,6 @@ static BOOL load_gecko(void) if(registrar) { register_nsservice(registrar); - init_nsio(pCompMgr, registrar); nsIComponentRegistrar_Release(registrar); }

1 0

lostwages/ news/2006022601.xml wwn/wn20060226_ ...
by WineHQ 27 Feb '06

27 Feb '06

ChangeSet ID: 23281 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/02/27 02:06:02 Added files: news : 2006022601.xml wwn : wn20060226_306.xml Log message: WWN #306 Patch: http://cvs.winehq.org/patch.py?id=23281 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006022601.xml Added 1.1 +0 -0 lostwages/wwn/wn20060226_306.xml

1 0

Vitaly Lipatov : iphplapi: Define IF_NAMESIZE if missing.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: f382722390ad37f170c6deec7ae1f0785ab8de77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f382722390ad37f170c6dee… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Fri Feb 24 13:27:45 2006 +0300 iphplapi: Define IF_NAMESIZE if missing. --- dlls/iphlpapi/ifenum.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index c6ab7e1..bcd7423 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -97,6 +97,10 @@ #define ETH_ALEN 6 #endif +#ifndef IF_NAMESIZE +#define IF_NAMESIZE 16 +#endif + #ifndef INADDR_NONE #define INADDR_NONE (~0U) #endif

1 0

Alexander N. Sørnes : Updated/ new Norwegian Bokmål resources.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: 46a96312e5eb023cef10b925b586da79ae297306 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46a96312e5eb023cef10b92… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Fri Feb 24 18:53:33 2006 +0100 Updated/new Norwegian Bokmål resources. --- dlls/crypt32/crypt32.rc | 1 dlls/crypt32/crypt32_No.rc | 166 ++++++++++++++++++++++++++++++++++++++++++++ programs/notepad/No.rc | 34 ++++++++- programs/winecfg/No.rc | 8 +- programs/wordpad/No.rc | 66 +++++++++++++++++ programs/wordpad/rsrc.rc | 1 6 files changed, 267 insertions(+), 9 deletions(-) create mode 100644 dlls/crypt32/crypt32_No.rc create mode 100644 programs/wordpad/No.rc Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=46a96312e5eb023cef1…

1 0

Vitaly Lipatov : ole32: Add descriptions for StgCreateDocfile and StgIsStorageFile functions.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: aee52b747e9ac0115b97bdaada6e129d8096c352 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aee52b747e9ac0115b97bda… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Fri Feb 24 20:06:35 2006 +0300 ole32: Add descriptions for StgCreateDocfile and StgIsStorageFile functions. --- dlls/ole32/storage32.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index ae01174..12ca1cc 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2424,7 +2424,7 @@ HRESULT StorageImpl_Construct( return STG_E_READFAULT; /* - * Write the root property + * Write the root property (memory only) */ if (fileCreate) { @@ -3000,6 +3000,7 @@ HRESULT StorageImpl_LoadFileHeader( void* headerBigBlock = NULL; int index; + TRACE("\n"); /* * Get a pointer to the big block of data containing the header. */ @@ -5589,6 +5590,22 @@ ULARGE_INTEGER SmallBlockChainStream_Get /****************************************************************************** * StgCreateDocfile [OLE32.@] + * Creates a new compound file storage object + * + * PARAMS + * pwcsName [ I] Unicode string with filename (can be relative or NULL) + * grfMode [ I] Access mode for opening the new storage object (see STGM_ constants) + * reserved [ ?] unused?, usually 0 + * ppstgOpen [IO] A pointer to IStorage pointer to the new onject + * + * RETURNS + * S_OK if the file was succesfully created + * some STG_E_ value if error + * NOTES + * if pwcsName is NULL, create file with new unique name + * the function can returns + * STG_S_CONVERTED if the specified file was successfully converted to storage format + * (unrealized now) */ HRESULT WINAPI StgCreateDocfile( LPCOLESTR pwcsName, @@ -7736,6 +7753,14 @@ HRESULT WINAPI GetConvertStg(IStorage *s /****************************************************************************** * StgIsStorageFile [OLE32.@] + * Verify if the file contains a storage object + * + * PARAMS + * fn [ I] Filename + * + * RETURNS + * S_OK if file has magic bytes as a storage object + * S_FALSE if file is not storage */ HRESULT WINAPI StgIsStorageFile(LPCOLESTR fn)

1 0

Phil Krylov : riched20: Added a comment to make life easier.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: 69ae27ed2ff350ac8a758a593e9910c3637be1d5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69ae27ed2ff350ac8a758a5… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Fri Feb 24 15:49:05 2006 +0300 riched20: Added a comment to make life easier. --- dlls/riched20/editor.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index cf6080a..6f4a8a5 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -889,6 +889,8 @@ ME_FindText(ME_TextEditor *editor, DWORD if (nCurEnd - nMatched == 0) { pCurItem = ME_FindItemBack(pCurItem, diRun); + /* Don't care about pCurItem becoming NULL here; it's already taken + * care of in the exterior loop condition */ para = ME_GetParagraph(pCurItem); nCurEnd = ME_StrLen(pCurItem->member.run.strText) + nMatched; }

1 0