wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Dylan Smith : richedit: Fix streaming rtf with table at the start of the text.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: be3073fce1586bc2d5a888007f89cde510392964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3073fce1586bc2d5a888007… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Jul 17 15:29:28 2010 -0400 richedit: Fix streaming rtf with table at the start of the text. The first paragraph was being handled just by ME_StreamOutParaProps, but subsequent paragraphs would check if the paragraph was starting or ending a table. So I moved the code to check for tables into ME_StreamOutParaProps. --- dlls/riched20/writer.c | 71 ++++++++++++++++++++++++----------------------- 1 files changed, 36 insertions(+), 35 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index dfc4dd4..8c87145 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -406,12 +406,44 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, static BOOL ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, - const ME_DisplayItem *para) + ME_DisplayItem *para) { PARAFORMAT2 *fmt = para->member.para.pFmt; char props[STREAMOUT_BUFFER_SIZE] = ""; int i; - + + if (!editor->bEmulateVersion10) { /* v4.1 */ + if (para->member.para.nFlags & MEPF_ROWSTART) { + pStream->nNestingLevel++; + if (pStream->nNestingLevel == 1) { + if (!ME_StreamOutRTFTableProps(editor, pStream, para)) + return FALSE; + } + return TRUE; + } else if (para->member.para.nFlags & MEPF_ROWEND) { + pStream->nNestingLevel--; + if (pStream->nNestingLevel >= 1) { + if (!ME_StreamOutPrint(pStream, "{\\*\\nesttableprops")) + return FALSE; + if (!ME_StreamOutRTFTableProps(editor, pStream, para)) + return FALSE; + if (!ME_StreamOutPrint(pStream, "\\nestrow}{\\nonesttables\\par}\r\n")) + return FALSE; + } else { + if (!ME_StreamOutPrint(pStream, "\\row \r\n")) + return FALSE; + } + return TRUE; + } + } else { /* v1.0 - 3.0 */ + if (para->member.para.pFmt->dwMask & PFM_TABLE && + para->member.para.pFmt->wEffects & PFE_TABLE) + { + if (!ME_StreamOutRTFTableProps(editor, pStream, para)) + return FALSE; + } + } + /* TODO: Don't emit anything if the last PARAFORMAT2 is inherited */ if (!ME_StreamOutPrint(pStream, "\\pard")) return FALSE; @@ -798,39 +830,8 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, if (cursor.pPara != prev_para) { prev_para = cursor.pPara; - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (cursor.pPara->member.para.nFlags & MEPF_ROWSTART) { - pStream->nNestingLevel++; - if (pStream->nNestingLevel == 1) { - if (!ME_StreamOutRTFTableProps(editor, pStream, cursor.pPara)) - return FALSE; - } - } else if (cursor.pPara->member.para.nFlags & MEPF_ROWEND) { - pStream->nNestingLevel--; - if (pStream->nNestingLevel >= 1) { - if (!ME_StreamOutPrint(pStream, "{\\*\\nesttableprops")) - return FALSE; - if (!ME_StreamOutRTFTableProps(editor, pStream, cursor.pPara)) - return FALSE; - if (!ME_StreamOutPrint(pStream, "\\nestrow}{\\nonesttables\\par}\r\n")) - return FALSE; - } else { - if (!ME_StreamOutPrint(pStream, "\\row \r\n")) - return FALSE; - } - } else if (!ME_StreamOutRTFParaProps(editor, pStream, cursor.pPara)) { - return FALSE; - } - } else { /* v1.0 - 3.0 */ - if (cursor.pPara->member.para.pFmt->dwMask & PFM_TABLE && - cursor.pPara->member.para.pFmt->wEffects & PFE_TABLE) - { - if (!ME_StreamOutRTFTableProps(editor, pStream, cursor.pPara)) - return FALSE; - } - if (!ME_StreamOutRTFParaProps(editor, pStream, cursor.pPara)) - return FALSE; - } + if (!ME_StreamOutRTFParaProps(editor, pStream, cursor.pPara)) + return FALSE; } if (cursor.pRun == endCur.pRun && !endCur.nOffset)

1 0

Dylan Smith : richedit: Don't break when streaming out a table, just continue.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: e2f6b1d83d15a069b2f07415f6ff9029dbe9f6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f6b1d83d15a069b2f07415f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Jul 17 15:29:08 2010 -0400 richedit: Don't break when streaming out a table, just continue. This is a regression caused by commit 54b53b6018da93cf82a4ee60ae5a4d3357cd7cfc which change the code to use if statements instead of a switch, so the break statement should have been changed to a continue statement. --- dlls/riched20/writer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 107fadf..dfc4dd4 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -838,7 +838,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, TRACE("flags %xh\n", cursor.pRun->member.run.nFlags); /* TODO: emit embedded objects */ if (cursor.pPara->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND)) - break; + continue; if (cursor.pRun->member.run.nFlags & MERF_GRAPHICS) { FIXME("embedded objects are not handled\n"); } else if (cursor.pRun->member.run.nFlags & MERF_TAB) {

1 0

Vincent Povirk : ole32: Flush the ILockBytes object of a storage on commit and final release.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 5116b979b212981efa5312ac0fa47147d92f9295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5116b979b212981efa5312ac0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jul 17 13:07:21 2010 -0500 ole32: Flush the ILockBytes object of a storage on commit and final release. Some ILockBytes objects will not really write changes until their Flush method is called. Also, further optimizations to the storage implementation will involve caching writes, which will have to be flushed at times. --- dlls/ole32/stg_stream.c | 2 +- dlls/ole32/storage32.c | 55 +++++++++++++++++++++++++++++++++++++++------- dlls/ole32/storage32.h | 6 +++++ 3 files changed, 53 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index bfecbc7..1fdb963 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -517,7 +517,7 @@ static HRESULT WINAPI StgStreamImpl_Commit( return STG_E_REVERTED; } - return S_OK; + return StorageBaseImpl_Flush(This->parentStorage); } /*** diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 64db9f6..185b8b0 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -92,6 +92,7 @@ static StorageInternalImpl* StorageInternalImpl_Construct(StorageBaseImpl* paren DWORD openFlags, DirRef storageDirEntry); static void StorageImpl_Destroy(StorageBaseImpl* iface); static void StorageImpl_Invalidate(StorageBaseImpl* iface); +static HRESULT StorageImpl_Flush(StorageBaseImpl* iface); static BOOL StorageImpl_ReadBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer); static BOOL StorageImpl_WriteBigBlock(StorageImpl* This, ULONG blockIndex, const void* buffer); static void StorageImpl_SetNextBlockInChain(StorageImpl* This, ULONG blockIndex, ULONG nextBlock); @@ -1815,16 +1816,15 @@ static HRESULT WINAPI StorageBaseImpl_MoveElementTo( * Ensures that any changes made to a storage object open in transacted mode * are reflected in the parent storage * - * NOTES - * Wine doesn't implement transacted mode, which seems to be a basic - * optimization, so we can ignore this stub for now. + * In a non-transacted mode, this ensures all cached writes are completed. */ static HRESULT WINAPI StorageImpl_Commit( IStorage* iface, DWORD grfCommitFlags)/* [in] */ { - FIXME("(%p %d): stub\n", iface, grfCommitFlags); - return S_OK; + StorageBaseImpl* const base=(StorageBaseImpl*)iface; + TRACE("(%p %d)\n", iface, grfCommitFlags); + return StorageBaseImpl_Flush(base); } /************************************************************************* @@ -2625,6 +2625,7 @@ static const StorageBaseImplVtbl StorageImpl_BaseVtbl = { StorageImpl_Destroy, StorageImpl_Invalidate, + StorageImpl_Flush, StorageImpl_GetFilename, StorageImpl_CreateDirEntry, StorageImpl_BaseWriteDirEntry, @@ -2868,6 +2869,8 @@ static void StorageImpl_Destroy(StorageBaseImpl* iface) int i; TRACE("(%p)\n", This); + StorageImpl_Flush(iface); + StorageImpl_Invalidate(iface); BlockChainStream_Destroy(This->smallBlockRootChain); @@ -2882,6 +2885,13 @@ static void StorageImpl_Destroy(StorageBaseImpl* iface) HeapFree(GetProcessHeap(), 0, This); } +static HRESULT StorageImpl_Flush(StorageBaseImpl* iface) +{ + StorageImpl *This = (StorageImpl*) iface; + + return ILockBytes_Flush(This->lockBytes); +} + /****************************************************************************** * Storage32Impl_GetNextFreeBigBlock * @@ -4525,9 +4535,12 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( else dir_root_ref = This->entries[root_entry->data.dirRootEntry].newTransactedParentEntry; + hr = StorageBaseImpl_Flush(This->transactedParent); + /* Update the storage to use the new data in one step. */ - hr = StorageBaseImpl_ReadDirEntry(This->transactedParent, - root_entry->transactedParentEntry, &data); + if (SUCCEEDED(hr)) + hr = StorageBaseImpl_ReadDirEntry(This->transactedParent, + root_entry->transactedParentEntry, &data); if (SUCCEEDED(hr)) { @@ -4540,6 +4553,11 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( root_entry->transactedParentEntry, &data); } + /* Try to flush after updating the root storage, but if the flush fails, keep + * going, on the theory that it'll either succeed later or the subsequent + * writes will fail. */ + StorageBaseImpl_Flush(This->transactedParent); + if (SUCCEEDED(hr)) { /* Destroy the old now-orphaned data. */ @@ -4579,6 +4597,9 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( TransactedSnapshotImpl_DestroyTemporaryCopy(This, DIRENTRY_NULL); } + if (SUCCEEDED(hr)) + hr = StorageBaseImpl_Flush(This->transactedParent); + return hr; } @@ -4642,6 +4663,12 @@ static void TransactedSnapshotImpl_Destroy( StorageBaseImpl *iface) HeapFree(GetProcessHeap(), 0, This); } +static HRESULT TransactedSnapshotImpl_Flush(StorageBaseImpl* iface) +{ + /* We only need to flush when committing. */ + return S_OK; +} + static HRESULT TransactedSnapshotImpl_GetFilename(StorageBaseImpl* iface, LPWSTR *result) { TransactedSnapshotImpl* This = (TransactedSnapshotImpl*) iface; @@ -4896,6 +4923,7 @@ static const StorageBaseImplVtbl TransactedSnapshotImpl_BaseVtbl = { TransactedSnapshotImpl_Destroy, TransactedSnapshotImpl_Invalidate, + TransactedSnapshotImpl_Flush, TransactedSnapshotImpl_GetFilename, TransactedSnapshotImpl_CreateDirEntry, TransactedSnapshotImpl_WriteDirEntry, @@ -5042,6 +5070,13 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) HeapFree(GetProcessHeap(), 0, This); } +static HRESULT StorageInternalImpl_Flush(StorageBaseImpl* iface) +{ + StorageInternalImpl* This = (StorageInternalImpl*) iface; + + return StorageBaseImpl_Flush(This->parentStorage); +} + static HRESULT StorageInternalImpl_GetFilename(StorageBaseImpl* iface, LPWSTR *result) { StorageInternalImpl* This = (StorageInternalImpl*) iface; @@ -5130,8 +5165,9 @@ static HRESULT WINAPI StorageInternalImpl_Commit( IStorage* iface, DWORD grfCommitFlags) /* [in] */ { - FIXME("(%p,%x): stub\n", iface, grfCommitFlags); - return S_OK; + StorageBaseImpl* base = (StorageBaseImpl*) iface; + TRACE("(%p,%x)\n", iface, grfCommitFlags); + return StorageBaseImpl_Flush(base); } /****************************************************************************** @@ -5474,6 +5510,7 @@ static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl = { StorageInternalImpl_Destroy, StorageInternalImpl_Invalidate, + StorageInternalImpl_Flush, StorageInternalImpl_GetFilename, StorageInternalImpl_CreateDirEntry, StorageInternalImpl_WriteDirEntry, diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 4baa099..9e7fe10 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -234,6 +234,7 @@ struct StorageBaseImpl struct StorageBaseImplVtbl { void (*Destroy)(StorageBaseImpl*); void (*Invalidate)(StorageBaseImpl*); + HRESULT (*Flush)(StorageBaseImpl*); HRESULT (*GetFilename)(StorageBaseImpl*,LPWSTR*); HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*); HRESULT (*WriteDirEntry)(StorageBaseImpl*,DirRef,const DirEntry*); @@ -255,6 +256,11 @@ static inline void StorageBaseImpl_Invalidate(StorageBaseImpl *This) This->baseVtbl->Invalidate(This); } +static inline HRESULT StorageBaseImpl_Flush(StorageBaseImpl *This) +{ + return This->baseVtbl->Flush(This); +} + static inline HRESULT StorageBaseImpl_GetFilename(StorageBaseImpl *This, LPWSTR *result) { return This->baseVtbl->GetFilename(This, result);

1 0

Vincent Povirk : ole32: Remove an unused variable.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: b7dbfcbd48bd7d4352c2ff188805972f732f2b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7dbfcbd48bd7d4352c2ff188… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jul 17 13:01:00 2010 -0500 ole32: Remove an unused variable. --- dlls/ole32/storage32.c | 2 -- dlls/ole32/storage32.h | 6 ------ 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0eefb09..64db9f6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2673,8 +2673,6 @@ static HRESULT StorageImpl_Construct( This->base.reverted = 0; - This->hFile = hFile; - /* * Initialize the big block cache. */ diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 7f0a6d5..4baa099 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -336,12 +336,6 @@ struct StorageImpl struct StorageBaseImpl base; /* - * The following data members are specific to the Storage32Impl - * class - */ - HANDLE hFile; /* Physical support for the Docfile */ - - /* * File header */ WORD bigBlockSizeBits;

1 0

Vincent Povirk : ole32: Use ILockBytes_Stat to get the filename of a storage.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: d0e6e4aa828a73866bc7307550d6553c6869eefb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e6e4aa828a73866bc730755… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jul 17 13:00:17 2010 -0500 ole32: Use ILockBytes_Stat to get the filename of a storage. --- dlls/ole32/filelockbytes.c | 33 ++++++++++++++++-- dlls/ole32/storage32.c | 80 ++++++++++++++++++++++--------------------- dlls/ole32/storage32.h | 12 ++++--- 3 files changed, 77 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0e6e4aa828a73866bc73…

1 0

Vincent Povirk : ole32: Remove the BigBlockFile abstraction and always use an ILockBytes.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 14f8f9d5b56ee569ea50e72dc7911b785089539c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f8f9d5b56ee569ea50e72dc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jul 17 11:56:17 2010 -0500 ole32: Remove the BigBlockFile abstraction and always use an ILockBytes. --- dlls/ole32/Makefile.in | 2 +- dlls/ole32/{stg_bigblockfile.c => filelockbytes.c} | 298 ++++++++------------ dlls/ole32/storage32.c | 33 ++- dlls/ole32/storage32.h | 32 +-- 4 files changed, 144 insertions(+), 221 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14f8f9d5b56ee569ea50e…

1 0

Vincent Povirk : ole32: Don't map storage files in memory.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 4171499411295dd94aa40bb6303a457eaf15ffc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4171499411295dd94aa40bb63… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 7 09:54:51 2010 -0500 ole32: Don't map storage files in memory. --- dlls/ole32/stg_bigblockfile.c | 495 +++-------------------------------------- 1 files changed, 37 insertions(+), 458 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4171499411295dd94aa40…

1 0

Vincent Povirk : ole32: Update storage header saving code based on the latest MS spec.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 7f3c92b2a0daf53dbcc22ac111929ecf0c22e6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3c92b2a0daf53dbcc22ac11… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jul 17 09:46:43 2010 -0500 ole32: Update storage header saving code based on the latest MS spec. These fields are needed for the MS storage implementation to load files that were created by Wine with a block size of 4096. --- dlls/ole32/storage32.c | 52 +++++++++++++++++++++++++++++++++++++++++------ dlls/ole32/storage32.h | 4 +++ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 98df144..15fe143 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1306,6 +1306,8 @@ static HRESULT StorageImpl_CreateDirEntry( entryIndex, emptyData); } + + StorageImpl_SaveFileHeader(storage); } UpdateRawDirEntry(currentData, newData); @@ -3465,6 +3467,7 @@ static void StorageImpl_SaveFileHeader( HRESULT hr; ULARGE_INTEGER offset; DWORD bytes_read, bytes_written; + DWORD major_version, dirsectorcount; /* * Get a pointer to the big block of data containing the header. @@ -3475,6 +3478,16 @@ static void StorageImpl_SaveFileHeader( if (SUCCEEDED(hr) && bytes_read != HEADER_SIZE) hr = STG_E_FILENOTFOUND; + if (This->bigBlockSizeBits == 0x9) + major_version = 3; + else if (This->bigBlockSizeBits == 0xc) + major_version = 4; + else + { + ERR("invalid big block shift 0x%x\n", This->bigBlockSizeBits); + major_version = 4; + } + /* * If the block read failed, the file is probably new. */ @@ -3489,13 +3502,6 @@ static void StorageImpl_SaveFileHeader( * Initialize the magic number. */ memcpy(headerBigBlock, STORAGE_magic, sizeof(STORAGE_magic)); - - /* - * And a bunch of things we don't know what they mean - */ - StorageUtl_WriteWord(headerBigBlock, 0x18, 0x3b); - StorageUtl_WriteWord(headerBigBlock, 0x1a, 0x3); - StorageUtl_WriteWord(headerBigBlock, 0x1c, (WORD)-2); } /* @@ -3503,6 +3509,21 @@ static void StorageImpl_SaveFileHeader( */ StorageUtl_WriteWord( headerBigBlock, + OFFSET_MINORVERSION, + 0x3e); + + StorageUtl_WriteWord( + headerBigBlock, + OFFSET_MAJORVERSION, + major_version); + + StorageUtl_WriteWord( + headerBigBlock, + OFFSET_BYTEORDERMARKER, + (WORD)-2); + + StorageUtl_WriteWord( + headerBigBlock, OFFSET_BIGBLOCKSIZEBITS, This->bigBlockSizeBits); @@ -3511,6 +3532,23 @@ static void StorageImpl_SaveFileHeader( OFFSET_SMALLBLOCKSIZEBITS, This->smallBlockSizeBits); + if (major_version >= 4) + { + if (This->rootBlockChain) + dirsectorcount = BlockChainStream_GetCount(This->rootBlockChain); + else + /* This file is being created, and it will start out with one block. */ + dirsectorcount = 1; + } + else + /* This field must be 0 in versions older than 4 */ + dirsectorcount = 0; + + StorageUtl_WriteDWord( + headerBigBlock, + OFFSET_DIRSECTORCOUNT, + dirsectorcount); + StorageUtl_WriteDWord( headerBigBlock, OFFSET_BBDEPOTCOUNT, diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 19f3f2d..524ff7d 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -42,8 +42,12 @@ /* * Definitions for the file format offsets. */ +static const ULONG OFFSET_MINORVERSION = 0x00000018; +static const ULONG OFFSET_MAJORVERSION = 0x0000001a; +static const ULONG OFFSET_BYTEORDERMARKER = 0x0000001c; static const ULONG OFFSET_BIGBLOCKSIZEBITS = 0x0000001e; static const ULONG OFFSET_SMALLBLOCKSIZEBITS = 0x00000020; +static const ULONG OFFSET_DIRSECTORCOUNT = 0x00000028; static const ULONG OFFSET_BBDEPOTCOUNT = 0x0000002C; static const ULONG OFFSET_ROOTSTARTBLOCK = 0x00000030; static const ULONG OFFSET_SMALLBLOCKLIMIT = 0x00000038;

1 0

Sven Baars : user32: Fix the Dutch translation.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: cb07a59a805b6d55636fce02da0a6b0d8ed360e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb07a59a805b6d55636fce02d… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Jul 17 14:41:22 2010 +0200 user32: Fix the Dutch translation. --- dlls/user32/resources/user32_Nl.rc | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/resources/user32_Nl.rc b/dlls/user32/resources/user32_Nl.rc index 2216976..0f15806 100644 --- a/dlls/user32/resources/user32_Nl.rc +++ b/dlls/user32/resources/user32_Nl.rc @@ -20,6 +20,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE { MENUITEM "&Vorig formaat", 61728 @@ -40,7 +42,7 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE MENUITEM "&Ongedaan maken", EM_UNDO MENUITEM SEPARATOR MENUITEM "K&nippen", WM_CUT - MENUITEM "&Kopieren", WM_COPY + MENUITEM "&Kopiëren", WM_COPY MENUITEM "&Plakken", WM_PASTE MENUITEM "&Wissen", WM_CLEAR MENUITEM SEPARATOR @@ -56,11 +58,11 @@ BEGIN PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Annuleren", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "A&fbreken", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Herhaal", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "N&egeer", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "O&pnieuw", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "N&egeren", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nee", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Probeer opnieuw", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "P&robeer opnieuw", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Verder", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

1 0

Alexandre Julliard : gdi32/tests: Fixed coordinates matching to use a relative error.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: e36f326f354f13926de3d3b21cd67ac04441b0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36f326f354f13926de3d3b21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 19 11:17:14 2010 +0200 gdi32/tests: Fixed coordinates matching to use a relative error. --- dlls/gdi32/tests/mapping.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 8c53e2f..655ab2c 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -29,7 +29,7 @@ #include "winuser.h" #include "winerror.h" -#define rough_match(got, expected) (abs((got) - (expected)) <= 5) +#define rough_match(got, expected) (abs( MulDiv( (got) - (expected), 1000, (expected) )) <= 5) #define expect_LPtoDP(_hdc, _x, _y) \ { \ @@ -121,11 +121,11 @@ static void test_world_transform(void) { expect_viewport_ext(hdc, res_x, -res_y); ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" ); - ok( size.cx == size_cx * 10 || - size.cx == MulDiv( res_x, 254, dpi_x ), /* Vista uses a more precise method */ + ok( rough_match( size.cx, size_cx * 10 ) || + rough_match( size.cx, MulDiv( res_x, 254, dpi_x )), /* Vista uses a more precise method */ "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254, dpi_x ), size.cx ); - ok( size.cy == size_cy * 10 || - size.cy == MulDiv( res_y, 254, dpi_y ), /* Vista uses a more precise method */ + ok( rough_match( size.cy, size_cy * 10 ) || + rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); } expect_world_trasform(hdc, 1.0, 1.0); @@ -186,11 +186,11 @@ static void test_world_transform(void) expect_viewport_ext(hdc, res_x, -res_y); ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" ); - ok( size.cx == size_cx * 10 || - size.cx == MulDiv( res_x, 254, dpi_x ), /* Vista uses a more precise method */ + ok( rough_match( size.cx, size_cx * 10 ) || + rough_match( size.cx, MulDiv( res_x, 254, dpi_x )), /* Vista uses a more precise method */ "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254, dpi_x ), size.cx ); - ok( size.cy == size_cy * 10 || - size.cy == MulDiv( res_y, 254, dpi_y ), /* Vista uses a more precise method */ + ok( rough_match( size.cy, size_cy * 10 ) || + rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); expect_world_trasform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, MulDiv(20000, res_x, size.cx), -MulDiv(20000, res_y, size.cy));

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2010