November 2015 - Wine-Commits

Jactry Zeng : riched20: Implement alignment styles support.
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: 6401ab45c0a45f328dcf364519553f20a360e672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6401ab45c0a45f328dcf36451… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Nov 6 17:35:35 2015 +0800 riched20: Implement alignment styles support. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 17 +++++++---- dlls/riched20/editor.h | 4 +-- dlls/riched20/editstr.h | 1 + dlls/riched20/para.c | 6 ++-- dlls/riched20/tests/editor.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/txthost.c | 2 +- dlls/riched20/txtsrv.c | 2 +- 8 files changed, 91 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6401ab45c0a45f328dcf3…

1 0

Alex Henrie : user32: Turn magic values into static constants.
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: 4a3065c5d72bae0e62da0e391bff9c2d9717d366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3065c5d72bae0e62da0e391… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 5 21:00:40 2015 -0700 user32: Turn magic values into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 2 +- dlls/user32/edit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index db479a8..890d154 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -201,7 +201,7 @@ static inline void paint_button( HWND hwnd, LONG style, UINT action ) /* retrieve the button text; returned buffer must be freed by caller */ static inline WCHAR *get_button_text( HWND hwnd ) { - INT len = 512; + static const INT len = 512; WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); if (buffer) InternalGetWindowText( hwnd, buffer, len + 1 ); return buffer; diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index dfd72e8..4570073 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2883,7 +2883,7 @@ static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit) */ static int calc_min_set_margin_size(HDC dc, INT left, INT right) { - WCHAR magic_string[] = {'\'','*','*','\'', 0}; + static const WCHAR magic_string[] = {'\'','*','*','\'', 0}; SIZE sz; GetTextExtentPointW(dc, magic_string, sizeof(magic_string)/sizeof(WCHAR) - 1, &sz);

1 0

Martin Storsjo : ucrtbase: Add a test for snprintf to a NULL buffer.
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: 5e2f6fa9a38d2719e9d6980514a2b83dd397e7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e2f6fa9a38d2719e9d698051… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Nov 6 12:20:44 2015 +0200 ucrtbase: Add a test for snprintf to a NULL buffer. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 6c719ea..d3ed0a2 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -156,6 +156,9 @@ static void test_snprintf (void) ok (buffer[valid] == '\0', "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); } + + ok (vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, "abcd") == 4, + "Failure to snprintf to NULL\n"); } static int __cdecl vswprintf_wrapper(unsigned __int64 options, wchar_t *str,

1 0

Jacek Caban : ntdll: Fixed argument order in NtNotifyChangeKey.
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: a0d0d0dd0a5b4a500ab8d37cc6e687a202997d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d0d0dd0a5b4a500ab8d37cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 6 13:58:44 2015 +0100 ntdll: Fixed argument order in NtNotifyChangeKey. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 4 ++-- dlls/ntdll/reg.c | 4 ++-- dlls/ntdll/tests/reg.c | 25 +++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 8d97af9..67120cd 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2674,8 +2674,8 @@ LSTATUS WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL fWatchSubTree, hEvent, fAsync); status = NtNotifyChangeKey( hkey, hEvent, NULL, NULL, &iosb, - fdwNotifyFilter, fAsync, NULL, 0, - fWatchSubTree); + fdwNotifyFilter, fWatchSubTree, NULL, 0, + fAsync); if (status && status != STATUS_TIMEOUT) return RtlNtStatusToDosError( status ); diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index c0fc641..4dff186 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -643,10 +643,10 @@ NTSTATUS WINAPI NtNotifyChangeKey( IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, IN ULONG CompletionFilter, - IN BOOLEAN Asynchronous, + IN BOOLEAN WatchSubtree, OUT PVOID ChangeBuffer, IN ULONG Length, - IN BOOLEAN WatchSubtree) + IN BOOLEAN Asynchronous) { NTSTATUS ret; diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index ecfe1b2..1fe9ef3 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -146,6 +146,7 @@ static NTSTATUS (WINAPI * pRtlFreeHeap)(PVOID, ULONG, PVOID); static LPVOID (WINAPI * pRtlAllocateHeap)(PVOID,ULONG,ULONG); static NTSTATUS (WINAPI * pRtlZeroMemory)(PVOID, ULONG); static NTSTATUS (WINAPI * pRtlpNtQueryValueKey)(HANDLE,ULONG*,PBYTE,DWORD*,void *); +static NTSTATUS (WINAPI * pNtNotifyChangeKey)(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); static HMODULE hntdll = 0; static int CurrentTest = 0; @@ -183,6 +184,7 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtQueryInformationProcess) NTDLL_GET_PROC(NtSetValueKey) NTDLL_GET_PROC(NtOpenKey) + NTDLL_GET_PROC(NtNotifyChangeKey) NTDLL_GET_PROC(RtlFormatCurrentUserKeyPath) NTDLL_GET_PROC(RtlCompareUnicodeString) NTDLL_GET_PROC(RtlReAllocateHeap) @@ -1502,6 +1504,28 @@ static void test_NtQueryKey(void) pNtClose(key); } +static void test_notify(void) +{ + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + HANDLE key, event; + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + + status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "CreateEvent failed: %u\n", GetLastError()); + + status = pNtNotifyChangeKey(key, event, NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); + todo_wine ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + + pNtClose(key); + pNtClose(event); +} + START_TEST(reg) { static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t',0}; @@ -1526,6 +1550,7 @@ START_TEST(reg) test_NtQueryLicenseKey(); test_NtQueryValueKey(); test_long_value_name(); + test_notify(); test_NtDeleteKey(); test_symlinks(); test_redirection();

1 0

Ken Thomases : winemac: Remove the live-resize display timer.
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: bb44de787d4880b4f5cd8c7b49181dcb3e115228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb44de787d4880b4f5cd8c7b4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 6 06:57:54 2015 -0600 winemac: Remove the live-resize display timer. It's redundant with the new CVDisplayLink-driven display mechanism. This reverts commits d55d2ec85 and 94dc91a45. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.h | 1 - dlls/winemac.drv/cocoa_window.m | 40 ---------------------------------------- 2 files changed, 41 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index f245701..5d581b2 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -56,7 +56,6 @@ NSUInteger lastModifierFlags; - NSTimer* liveResizeDisplayTimer; NSRect frameAtResizeStart; BOOL resizingFromLeft, resizingFromTop; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index cd1a26b..666a953 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -293,8 +293,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @property (assign, nonatomic) void* imeData; @property (nonatomic) BOOL commandDone; -(a)property (retain, nonatomic) NSTimer* liveResizeDisplayTimer; - @property (readonly, copy, nonatomic) NSArray* childWineWindows; - (void) updateColorSpace; @@ -654,7 +652,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @synthesize usePerPixelAlpha; @synthesize imeData, commandDone; - @synthesize liveResizeDisplayTimer; + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf windowFrame:(NSRect)window_frame @@ -744,8 +741,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; - [liveResizeDisplayTimer invalidate]; - [liveResizeDisplayTimer release]; [queue release]; [latentChildWindows release]; [latentParentWindow release]; @@ -1556,16 +1551,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self checkTransparency]; } - - (void) setLiveResizeDisplayTimer:(NSTimer*)newTimer - { - if (newTimer != liveResizeDisplayTimer) - { - [liveResizeDisplayTimer invalidate]; - [liveResizeDisplayTimer release]; - liveResizeDisplayTimer = [newTimer retain]; - } - } - - (void) makeFocused:(BOOL)activate { if (activate) @@ -2248,8 +2233,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [queue postEvent:event]; macdrv_release_event(event); } - - self.liveResizeDisplayTimer = nil; } - (void) windowDidEnterFullScreen:(NSNotification*)notification @@ -2465,29 +2448,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi frameAtResizeStart = [self frame]; resizingFromLeft = resizingFromTop = FALSE; - - // There's a strange restriction in window redrawing during Cocoa- - // managed window resizing. Only calls to -[NSView setNeedsDisplay...] - // that happen synchronously when Cocoa tells us that our window size - // has changed or asynchronously in a short interval thereafter provoke - // the window to redraw. Calls to those methods that happen asynchronously - // a half second or more after the last change of the window size aren't - // heeded until the next resize-related user event (e.g. mouse movement). - // - // Wine often has a significant delay between when it's been told that - // the window has changed size and when it can flush completed drawing. - // So, our windows would get stuck with incomplete drawing for as long - // as the user holds the mouse button down and doesn't move it. - // - // We address this by "manually" asking our windows to check if they need - // redrawing every so often (during live resize only). - self.liveResizeDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:1.0/30.0 - target:self - selector:@selector(displayIfNeeded) - userInfo:nil - repeats:YES]; - [[NSRunLoop currentRunLoop] addTimer:liveResizeDisplayTimer - forMode:NSRunLoopCommonModes]; } - (NSRect) windowWillUseStandardFrame:(NSWindow*)window defaultFrame:(NSRect)proposedFrame

1 0

Ken Thomases : winemac: Use CVDisplayLink to limit window redrawing to the display refresh rate.
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: 3beec95a092a261f3c265fd30a10e0c0ead524bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3beec95a092a261f3c265fd30… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 6 06:57:53 2015 -0600 winemac: Use CVDisplayLink to limit window redrawing to the display refresh rate. Some Windows apps cause user32 to flush the window surface much faster than the display refresh rate. The Mac driver only marks its window as needing to be redrawn and lets Cocoa decide how often to actually redraw. Unfortunately, Cocoa redraws each time through the run loop and, since the Mac driver uses a run loop source to convey messages from background threads to the main thread, it redraws after every batch of messages. On some versions of OS X, this excessive drawing provokes synchronization with the window server's buffer swaps, preventing the main thread from being responsive. Even when that doesn't happen, it's wasteful. So, we set our windows' autodisplay property to false so that Cocoa never displays windows itself. Then, we arrange to call -displayIfNeeded once per display refresh cycle using a CVDisplayLink. We maintain one CVDisplayLink per display (on demand), move windows among them as the windows change screens, start them when they acquire their first window, and stop them when they have none left. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/cocoa_window.h | 2 + dlls/winemac.drv/cocoa_window.m | 167 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 170 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3beec95a092a261f3c265…

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: 190388ed1f449b21b7db1c6786f36fb466a779ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=190388ed1f449b21b7db1c678… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 6 12:47:15 2015 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index 7314307..08b1141 100644 --- a/po/de.po +++ b/po/de.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-09-13 17:46+0200\n" -"Last-Translator: Florian Pelz\n" +"PO-Revision-Date: 2015-11-06 12:55+0100\n" +"Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -7461,16 +7461,12 @@ msgid "&Convert..." msgstr "&Konvertieren..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "&Objekt" +msgstr "%2-&Objekt %1" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "&Objekt" +msgstr "&Objekt %1" #: oledlg.rc:33 oleview.rc:40 msgid "&Object"

1 0

Alex Henrie : user32: Remove redundant check for buf's existence.
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: 6771fa22e9e0558425047da00486cab9b9f80c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6771fa22e9e0558425047da00… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 5 21:00:41 2015 -0700 user32: Remove redundant check for buf's existence. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 4570073..488141b 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2577,7 +2577,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac LPWSTR p; HRGN hrgn = 0; LPWSTR buf = NULL; - UINT bufl = 0; + UINT bufl; TRACE("%s, can_undo %d, send_update %d\n", debugstr_w(lpsz_replace), can_undo, send_update); @@ -2726,8 +2726,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac EDIT_EM_EmptyUndoBuffer(es); } - if (bufl) - HeapFree(GetProcessHeap(), 0, buf); + HeapFree(GetProcessHeap(), 0, buf); s += strl;

1 0

Jactry Zeng : riched20: Set pStream->written in ME_StreamOutFlush.
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: dc6b2853f512e3193aebcf0606c67043954255eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc6b2853f512e3193aebcf060… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Nov 6 14:18:10 2015 +0800 riched20: Set pStream->written in ME_StreamOutFlush. Superseded patch 115907. ChangeLog: - Add tests. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 34 ++++++++++++++++++++++++---------- dlls/riched20/writer.c | 2 ++ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 4705dd6..da9671b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3307,6 +3307,8 @@ static void test_ES_PASSWORD(void) DestroyWindow(hwndRichEdit); } +LONG streamout_written = 0; + static DWORD CALLBACK test_WM_SETTEXT_esCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, @@ -3318,6 +3320,7 @@ static DWORD CALLBACK test_WM_SETTEXT_esCallback(DWORD_PTR dwCookie, memcpy(*str, pbBuff, *pcb); *str += *pcb; } + streamout_written = *pcb; return 0; } @@ -3442,6 +3445,7 @@ static void test_EM_STREAMOUT(void) EDITSTREAM es; char buf[1024] = {0}; char * p; + LRESULT result; const char * TestItem1 = "TestSomeText"; const char * TestItem2 = "TestSomeText\r"; @@ -3453,24 +3457,28 @@ static void test_EM_STREAMOUT(void) es.dwError = 0; es.pfnCallback = test_WM_SETTEXT_esCallback; memset(buf, 0, sizeof(buf)); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); r = strlen(buf); ok(r == 12, "streamed text length is %d, expecting 12\n", r); ok(strcmp(buf, TestItem1) == 0, "streamed text different, got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); /* RTF mode writes the final end of para \r if it's part of the selection */ p = buf; - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); ok (count_pars(buf) == 1, "got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); p = buf; SendMessageA(hwndRichEdit, EM_SETSEL, 0, 12); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); ok (count_pars(buf) == 0, "got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); p = buf; SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); ok (count_pars(buf) == 1, "got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem2); p = buf; @@ -3478,7 +3486,8 @@ static void test_EM_STREAMOUT(void) es.dwError = 0; es.pfnCallback = test_WM_SETTEXT_esCallback; memset(buf, 0, sizeof(buf)); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); r = strlen(buf); /* Here again, \r gets converted to \r\n, like WM_GETTEXT */ ok(r == 14, "streamed text length is %d, expecting 14\n", r); @@ -3487,16 +3496,19 @@ static void test_EM_STREAMOUT(void) /* And again RTF mode writes the final end of para \r if it's part of the selection */ p = buf; - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); ok (count_pars(buf) == 2, "got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); p = buf; SendMessageA(hwndRichEdit, EM_SETSEL, 0, 13); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); ok (count_pars(buf) == 1, "got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); p = buf; SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); ok (count_pars(buf) == 2, "got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem3); p = buf; @@ -3504,7 +3516,8 @@ static void test_EM_STREAMOUT(void) es.dwError = 0; es.pfnCallback = test_WM_SETTEXT_esCallback; memset(buf, 0, sizeof(buf)); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); r = strlen(buf); ok(r == 14, "streamed text length is %d, expecting 14\n", r); ok(strcmp(buf, TestItem3) == 0, @@ -3516,11 +3529,12 @@ static void test_EM_STREAMOUT(void) es.dwError = 0; es.pfnCallback = test_esCallback_written_1; memset(buf, 0, sizeof(buf)); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); r = strlen(buf); ok(r == 14, "streamed text length is %d, expecting 14\n", r); ok(strcmp(buf, TestItem3) == 0, "streamed text different, got %s\n", buf); + ok(result == 0, "got %ld expected 0\n", result); DestroyWindow(hwndRichEdit); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 2c7386a..76cf5d7 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -62,6 +62,8 @@ ME_StreamOutFlush(ME_OutStream *pStream) return FALSE; /* Don't resend partial chunks if nWritten < pStream->pos */ } + if (nWritten == pStream->pos) + pStream->written += nWritten; pStream->pos = 0; return TRUE; }

1 0

Józef Kucia : d3d11/tests: Port test_blend() from d3d10core.
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: c3e48c9b190b5f02a2624d27918fdb97d36e05bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e48c9b190b5f02a2624d279… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 01:28:28 2015 +0100 d3d11/tests: Port test_blend() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 258 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 258 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3e48c9b190b5f02a2624…

1 0