August 2006 - Wine-commits - list.winehq.org

Krzysztof Foltman : riched20: Make EM_LINELENGTH work correctly for non-final paragraphs containing exactly one screen line .
by Alexandre Julliard 03 Aug '06

03 Aug '06

Module: wine Branch: refs/heads/master Commit: f07740b28be46ce0420eea4436e616b5dc8fee34 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f07740b28be46ce0420eea4… Author: Krzysztof Foltman <wdev(a)foltman.com> Date: Thu Aug 3 20:37:45 2006 +0200 riched20: Make EM_LINELENGTH work correctly for non-final paragraphs containing exactly one screen line. --- dlls/riched20/editor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c636023..7389407 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2154,8 +2154,8 @@ LRESULT WINAPI RichEditANSIWndProc(HWND item = ME_FindItemAtOffset(editor, diRun, wParam, NULL); item = ME_RowStart(item); nThisLineOfs = ME_CharOfsFromRunOfs(editor, ME_FindItemFwd(item, diRun), 0); - item_end = ME_FindItemFwd(item, diStartRow); - if (item_end) + item_end = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); + if (item_end->type == diStartRow) nNextLineOfs = ME_CharOfsFromRunOfs(editor, ME_FindItemFwd(item_end, diRun), 0); else nNextLineOfs = ME_FindItemFwd(item, diParagraphOrEnd)->member.para.nCharOfs

1 0

Krzysztof Foltman : riched20: Make EM_GETLINE work properly in 1. 0 emulation mode.
by Alexandre Julliard 03 Aug '06

03 Aug '06

Module: wine Branch: refs/heads/master Commit: 9667a891ffb769f2f0bdc0f7362122fe97d2025d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9667a891ffb769f2f0bdc0f… Author: Krzysztof Foltman <wdev(a)foltman.com> Date: Thu Aug 3 20:35:01 2006 +0200 riched20: Make EM_GETLINE work properly in 1.0 emulation mode. --- dlls/riched20/editor.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 99422e2..c636023 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2048,6 +2048,9 @@ LRESULT WINAPI RichEditANSIWndProc(HWND const unsigned int nMaxChars = *(WORD *) lParam; unsigned int nEndChars, nCharsLeft = nMaxChars; char *dest = (char *) lParam; + /* rich text editor 1.0 uses \r\n for line end, 2.0 uses just \r; + we need to know how if we have the extra \n or not */ + int nLF = editor->bEmulateVersion10; TRACE("EM_GETLINE: row=%d, nMaxChars=%d (%s)\n", (int) wParam, nMaxChars, bUnicode ? "Unicode" : "Ansi"); @@ -2075,20 +2078,21 @@ LRESULT WINAPI RichEditANSIWndProc(HWND nCharsLeft -= nCopy; } - /* append \r\0, space allowing */ - nEndChars = min(nCharsLeft, 2); + /* append \r\0 (or \r\n\0 in 1.0), space allowing */ + nEndChars = min(nCharsLeft, 2 + nLF); nCharsLeft -= nEndChars; if (bUnicode) { const WCHAR src[] = {'\r', '\0'}; - lstrcpynW((LPWSTR) dest, src, nEndChars); + const WCHAR src10[] = {'\r', '\n', '\0'}; + lstrcpynW((LPWSTR) dest, nLF ? src10 : src, nEndChars); } else - lstrcpynA(dest, "\r", nEndChars); + lstrcpynA(dest, nLF ? "\r\n" : "\r", nEndChars); TRACE("EM_GETLINE: got %u bytes\n", nMaxChars - nCharsLeft); - if (nEndChars == 2) + if (nEndChars == 2 + nLF) return nMaxChars - nCharsLeft - 1; /* don't count \0 */ else return nMaxChars - nCharsLeft;

1 0

Krzysztof Foltman : riched20: Ctrl+A should be allowed in read-only controls too.
by Alexandre Julliard 03 Aug '06

03 Aug '06

Module: wine Branch: refs/heads/master Commit: 5f32291ace3f56884a5cb6d5affc1907bac62425 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f32291ace3f56884a5cb6d… Author: Krzysztof Foltman <wdev(a)foltman.com> Date: Thu Aug 3 19:53:54 2006 +0200 riched20: Ctrl+A should be allowed in read-only controls too. --- dlls/riched20/editor.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 72a6a78..99422e2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2302,6 +2302,9 @@ LRESULT WINAPI RichEditANSIWndProc(HWND switch (wstr) { + case 1: /* Ctrl-A */ + ME_SetSelection(editor, 0, -1); + return 0; case 3: /* Ctrl-C */ SendMessageW(editor->hWnd, WM_COPY, 0, 0); return 0; @@ -2314,9 +2317,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND switch (wstr) { - case 1: /* Ctrl-A */ - ME_SetSelection(editor, 0, -1); - return 0; case 22: /* Ctrl-V */ SendMessageW(editor->hWnd, WM_PASTE, 0, 0); return 0;

1 0

Robert Shearman : ole32: Ensure that a returned free block is valid in storage.
by Alexandre Julliard 03 Aug '06

03 Aug '06

Module: wine Branch: refs/heads/master Commit: f0dc9deff0dd6d0e366257b26ecdfb373f004749 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f0dc9deff0dd6d0e366257b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 3 20:25:14 2006 +0100 ole32: Ensure that a returned free block is valid in storage. Otherwise, an IStream_SetSize call followed by an IStream_Read call could fail with STG_E_DOCFILECORRUPT. --- dlls/ole32/stg_bigblockfile.c | 28 ++++++++++++++++++++++++---- dlls/ole32/storage32.c | 5 +++++ dlls/ole32/storage32.h | 1 + 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index 0d28586..b946ab0 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -351,12 +351,11 @@ void* BIGBLOCKFILE_GetROBigBlock( } /****************************************************************************** - * BIGBLOCKFILE_GetBigBlock + * BIGBLOCKFILE_EnsureExists * - * Returns the specified block. - * Will grow the file if necessary. + * Grows the file if necessary to make sure the block is valid. */ -void* BIGBLOCKFILE_GetBigBlock(LPBIGBLOCKFILE This, ULONG index) +void BIGBLOCKFILE_EnsureExists(LPBIGBLOCKFILE This, ULONG index) { /* * block index starts at -1 @@ -379,6 +378,27 @@ void* BIGBLOCKFILE_GetBigBlock(LPBIGBLOC BIGBLOCKFILE_SetSize(This, newSize); } +} + +/****************************************************************************** + * BIGBLOCKFILE_GetBigBlock + * + * Returns the specified block. + * Will grow the file if necessary. + */ +void* BIGBLOCKFILE_GetBigBlock(LPBIGBLOCKFILE This, ULONG index) +{ + /* FIXME: is this necessary? */ + BIGBLOCKFILE_EnsureExists(This, index); + + /* + * block index starts at -1 + * translate to zero based index + */ + if (index == 0xffffffff) + index = 0; + else + index++; return BIGBLOCKFILE_GetBigBlockPointer(This, index, FILE_MAP_WRITE); } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a8a8f0b..abf944a 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2717,6 +2717,11 @@ static ULONG StorageImpl_GetNextFreeBigB depotBlockOffset = 0; } + /* + * make sure that the block physically exists before using it + */ + BIGBLOCKFILE_EnsureExists(This->bigBlockFile, freeBlock); + This->prevFreeBlock = freeBlock; return freeBlock; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 884dc0e..4562772 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -190,6 +190,7 @@ BigBlockFile* BIGBLOCKFILE_Construct(HA ULONG blocksize, BOOL fileBased); void BIGBLOCKFILE_Destructor(LPBIGBLOCKFILE This); +void BIGBLOCKFILE_EnsureExists(LPBIGBLOCKFILE This, ULONG index); void* BIGBLOCKFILE_GetBigBlock(LPBIGBLOCKFILE This, ULONG index); void* BIGBLOCKFILE_GetROBigBlock(LPBIGBLOCKFILE This, ULONG index); void BIGBLOCKFILE_ReleaseBigBlock(LPBIGBLOCKFILE This, void *pBlock);

1 0

Jacek Caban : mshtml: Added nsInputStream::Read implementation.
by Alexandre Julliard 03 Aug '06

03 Aug '06

Module: wine Branch: refs/heads/master Commit: 0fbb175d64da106bcc8d7c92e745bee4d518854d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0fbb175d64da106bcc8d7c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 3 21:38:08 2006 +0200 mshtml: Added nsInputStream::Read implementation. --- dlls/mshtml/navigate.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 8dc4a14..ecd8333 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -108,8 +108,19 @@ static nsresult NSAPI nsInputStream_Read PRUint32 *_retval) { nsProtocolStream *This = NSINSTREAM_THIS(iface); - FIXME("(%p)->(%p %ld %p)\n", This, aBuf, aCount, _retval); - return NS_ERROR_NOT_IMPLEMENTED; + + TRACE("(%p)->(%p %ld %p)\n", This, aBuf, aCount, _retval); + + /* Gecko always calls Read with big enough buffer */ + if(aCount < This->buf_size) + FIXME("aCount < This->buf_size\n"); + + *_retval = This->buf_size; + if(This->buf_size) + memcpy(aBuf, This->buf, This->buf_size); + This->buf_size = 0; + + return NS_OK; } static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface,

1 0

Robert Shearman : ole32: Fix CoLockObjectExternal to respect fLastUnlockReleases.
by Alexandre Julliard 03 Aug '06

03 Aug '06

Module: wine Branch: refs/heads/master Commit: 6455b9e1a07c73c0b4c0762147e54649f63c79df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6455b9e1a07c73c0b4c0762… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 3 20:24:57 2006 +0100 ole32: Fix CoLockObjectExternal to respect fLastUnlockReleases. --- dlls/ole32/compobj.c | 2 +- dlls/ole32/compobj_private.h | 2 +- dlls/ole32/marshal.c | 2 +- dlls/ole32/stubmanager.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 683e24d..c291e81 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2234,7 +2234,7 @@ HRESULT WINAPI CoLockObjectExternal( if (fLock) stub_manager_ext_addref(stubmgr, 1); else - stub_manager_ext_release(stubmgr, 1); + stub_manager_ext_release(stubmgr, 1, fLastUnlockReleases); stub_manager_int_release(stubmgr); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index a542cc6..4d27bab 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -187,7 +187,7 @@ ULONG stub_manager_int_addref(struct stu ULONG stub_manager_int_release(struct stub_manager *This); struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object); ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs); -ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs); +ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL last_unlock_releases); struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, IUnknown *iptr, REFIID iid, MSHLFLAGS flags); struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags); struct stub_manager *get_stub_manager(APARTMENT *apt, OID oid); diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 152647b..cbe4a0f 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1190,7 +1190,7 @@ StdMarshalImpl_UnmarshalInterface(LPMARS /* unref the ifstub. FIXME: only do this on success? */ if (!stub_manager_is_table_marshaled(stubmgr, &stdobjref.ipid)) - stub_manager_ext_release(stubmgr, stdobjref.cPublicRefs); + stub_manager_ext_release(stubmgr, stdobjref.cPublicRefs, TRUE); stub_manager_int_release(stubmgr); return hres; diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index e5f8741..e0b0007 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -253,7 +253,7 @@ ULONG stub_manager_ext_addref(struct stu } /* remove some external references */ -ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs) +ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL last_unlock_releases) { ULONG rc; @@ -267,7 +267,7 @@ ULONG stub_manager_ext_release(struct st TRACE("removed %lu refs from %p (oid %s), rc is now %lu\n", refs, m, wine_dbgstr_longlong(m->oid), rc); - if (rc == 0) + if (rc == 0 && last_unlock_releases) stub_manager_int_release(m); return rc; @@ -537,7 +537,7 @@ void stub_manager_release_marshal_data(s else if (ifstub->flags & MSHLFLAGS_TABLESTRONG) refs = 1; - stub_manager_ext_release(m, refs); + stub_manager_ext_release(m, refs, TRUE); } /* is an ifstub table marshaled? */ @@ -717,7 +717,7 @@ static HRESULT WINAPI RemUnknown_RemRele break; } - stub_manager_ext_release(stubmgr, InterfaceRefs[i].cPublicRefs); + stub_manager_ext_release(stubmgr, InterfaceRefs[i].cPublicRefs, TRUE); if (InterfaceRefs[i].cPrivateRefs) FIXME("Releasing %ld refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs);

1 0

Andrew Talbot : msvfw32: Write-strings warning fix.
by Alexandre Julliard 03 Aug '06

03 Aug '06

Module: wine Branch: refs/heads/master Commit: a92e7b1a9fad167564c171281e677ae1f3ff6952 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a92e7b1a9fad167564c1712… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Aug 3 19:33:40 2006 +0100 msvfw32: Write-strings warning fix. --- dlls/msvfw32/msvideo16.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvfw32/msvideo16.c b/dlls/msvfw32/msvideo16.c index f35c2b7..c812592 100644 --- a/dlls/msvfw32/msvideo16.c +++ b/dlls/msvfw32/msvideo16.c @@ -772,6 +772,7 @@ DWORD WINAPI VideoCapDriverDescAndVer16( DWORD infosize; UINT subblocklen; char *s, buf[2048], fn[260]; + static char version_info_spec[] = "\\StringFileInfo\\040904E4\\FileDescription"; LPBYTE infobuf; LPVOID subblock; DWORD i, cnt = 0, lRet; @@ -844,7 +845,7 @@ DWORD WINAPI VideoCapDriverDescAndVer16( } /* FIXME: language problem? */ if (VerQueryValueA( infobuf, - "\\StringFileInfo\\040904E4\\FileDescription", + version_info_spec, &subblock, &subblocklen ))

1 0

Robert Shearman : msi: Fix the creation of shortcuts with a null icon index by mapping it to zero .
by Alexandre Julliard 03 Aug '06

03 Aug '06

Module: wine Branch: refs/heads/master Commit: ab378803ef71e5dbfcb03698ca1a9a79f963403e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab378803ef71e5dbfcb0369… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 3 20:24:10 2006 +0100 msi: Fix the creation of shortcuts with a null icon index by mapping it to zero. --- dlls/msi/action.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cce2a59..e2d78b1 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2934,6 +2934,10 @@ static UINT ITERATE_CreateShortcuts(MSIR Path = build_icon_path(package,buffer); index = MSI_RecordGetInteger(row,10); + /* no value means 0 */ + if (index == MSI_NULL_INTEGER) + index = 0; + IShellLinkW_SetIconLocation(sl,Path,index); msi_free(Path); }

1 0

Andrew Talbot : ole32/tests: Write-strings warnings fix.
by Alexandre Julliard 03 Aug '06

03 Aug '06

Module: wine Branch: refs/heads/master Commit: 6bb8a7f726375048022eda75e8dd012cf1e16715 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6bb8a7f726375048022eda7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Aug 3 18:27:12 2006 +0100 ole32/tests: Write-strings warnings fix. --- dlls/ole32/tests/clipboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index cf540a9..c4c5882 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -297,7 +297,7 @@ static const IDataObjectVtbl VT_DataObje DataObjectImpl_EnumDAdvise }; -static HRESULT DataObjectImpl_CreateText(LPSTR text, LPDATAOBJECT *lplpdataobj) +static HRESULT DataObjectImpl_CreateText(LPCSTR text, LPDATAOBJECT *lplpdataobj) { DataObjectImpl *obj;

1 0

Andrew Talbot : riched20/tests: Write-strings warnings fix.
by Alexandre Julliard 03 Aug '06

03 Aug '06

Module: wine Branch: refs/heads/master Commit: 3f8e2efc18005321122adfed0d40b11c4992dd03 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f8e2efc18005321122adfe… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Aug 3 18:51:22 2006 +0100 riched20/tests: Write-strings warnings fix. --- dlls/riched20/tests/editor.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index dd4f2dd..ccb81de 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -120,7 +120,7 @@ struct find_s find_tests2[] = { {0, 20, "WINE", FR_MATCHCASE, -1, 0} }; -static void check_EM_FINDTEXT(HWND hwnd, char *name, struct find_s *f, int id) { +static void check_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *f, int id) { int findloc; FINDTEXT ft; memset(&ft, 0, sizeof(ft)); @@ -133,7 +133,7 @@ static void check_EM_FINDTEXT(HWND hwnd, name, id, f->needle, f->start, f->end, f->flags, findloc); } -static void check_EM_FINDTEXTEX(HWND hwnd, char *name, struct find_s *f, +static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f, int id) { int findloc; FINDTEXTEX ft; @@ -154,7 +154,7 @@ static void check_EM_FINDTEXTEX(HWND hwn name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMax); } -static void run_tests_EM_FINDTEXT(HWND hwnd, char *name, struct find_s *find, +static void run_tests_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *find, int num_tests) { int i;

1 0